diff --git a/library/device.lib b/library/device.lib
index 3b8dde1d..2b57fdc1 100644
--- a/library/device.lib
+++ b/library/device.lib
@@ -121,8 +121,8 @@ P 2 0 0 0  0 -550  200 -350 N
 P 2 0 0 6  0 550  200 350 N
 P 2 0 0 8  250 -100  450 -300 N
 P 2 0 0 6  350 200  550 0 N
-P 2 0 0 8  450 300  250 100 N
 P 2 0 0 0  450 300  250 100 N
+P 2 0 0 8  450 300  250 100 N
 P 2 0 0 6  550 0  350 -200 N
 P 5 0 0 0  -450 300  -200 350  -250 100  -450 300  -450 300 F
 P 5 0 0 0  -250 -100  -200 -350  -450 -300  -250 -100  -250 -100 F
@@ -590,8 +590,8 @@ ENDDEF
 # DPST
 #
 DEF DPST SW 0 0 N Y 1 F N
-F0 "SW" 0 100 50 H V C CNN
-F1 "DPST" 0 -100 50 H V C CNN
+F0 "SW" 300 50 50 H V C CNN
+F1 "DPST" 300 -50 50 H V C CNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
@@ -647,7 +647,7 @@ ENDDEF
 #
 DEF DUAL_SWITCH_INV SW 0 0 Y Y 2 F N
 F0 "SW" -200 150 50 H V C CNN
-F1 "DUAL_SWITCH_INV" -150 -150 50 H V C CNN
+F1 "DUAL_SWITCH_INV" -250 -150 50 H V C CNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
@@ -910,7 +910,7 @@ ENDDEF
 #
 DEF JUMPER3 JP 0 30 Y N 1 F N
 F0 "JP" 50 -100 50 H V L CNN
-F1 "JUMPER3" 0 100 50 H V C CNN
+F1 "JUMPER3" 0 100 50 H V C BNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
@@ -1061,7 +1061,7 @@ ENDDEF
 #
 DEF MOS_N Q 0 0 N Y 1 F N
 F0 "Q" 10 170 50 H V R CNN
-F1 "MOS_N" 10 -150 50 H V R CNN
+F1 "MOS_N" -50 -150 50 H V R CNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 ALIAS MOSFET_N
@@ -1318,7 +1318,7 @@ ENDDEF
 #
 DEF Photores R 0 0 N Y 1 F N
 F0 "R" 80 0 50 V V C CNN
-F1 "Photores" 210 0 50 V V C CNN
+F1 "Photores" 210 0 50 V V C TNN
 F2 "" -70 0 30 V V C CNN
 F3 "" 0 0 30 H V C CNN
 $FPLIST
@@ -1678,7 +1678,7 @@ ENDDEF
 #
 DEF SWITCH_INV_MSM SW 0 0 N Y 1 F N
 F0 "SW" -199 150 50 H V C CNN
-F1 "SWITCH_INV_MSM" -149 -149 50 H V C CNN
+F1 "SWITCH_INV_MSM" -250 -150 50 H V C CNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
@@ -1746,7 +1746,7 @@ ENDDEF
 #
 DEF THERMISTOR TH 0 0 N Y 1 F N
 F0 "TH" 100 50 50 V V C CNN
-F1 "THERMISTOR" -100 0 50 V V C CNN
+F1 "THERMISTOR" -100 0 50 V V C BNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 $FPLIST
@@ -2017,7 +2017,7 @@ ENDDEF
 # TST
 #
 DEF TST P 0 40 N N 1 F N
-F0 "P" 0 300 50 H V C CNN
+F0 "P" 0 300 50 H V C BNN
 F1 "TST" 0 250 50 H V C CNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
@@ -2047,7 +2047,7 @@ ENDDEF
 #
 DEF VARICAP D 0 40 Y N 1 F N
 F0 "D" 0 130 50 H V C CNN
-F1 "VARICAP" 0 -120 50 H V C CNN
+F1 "VARICAP" 0 -120 50 H V C TNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW