Browse Source

Updated to KiCad 5.0

Kevin Lee 5 years ago
parent
commit
b7264d3d41

+ 24 - 58
Nixie_Bottom_Board/hv_power_supply.sch

@@ -1,40 +1,6 @@
-EESchema Schematic File Version 2
-LIBS:nixie_bottom_board-rescue
-LIBS:power
-LIBS:device
-LIBS:switches
-LIBS:relays
-LIBS:motors
-LIBS:transistors
-LIBS:conn
-LIBS:linear
-LIBS:regul
-LIBS:74xx
-LIBS:cmos4000
-LIBS:adc-dac
-LIBS:memory
-LIBS:xilinx
-LIBS:microcontrollers
-LIBS:dsp
-LIBS:microchip
-LIBS:analog_switches
-LIBS:motorola
-LIBS:texas
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:digital-audio
-LIBS:philips
-LIBS:display
-LIBS:cypress
-LIBS:siliconi
-LIBS:opto
-LIBS:atmel
-LIBS:contrib
-LIBS:valves
-LIBS:Custom_Parts
+EESchema Schematic File Version 4
 LIBS:nixie_bottom_board-cache
-EELAYER 25 0
+EELAYER 26 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
@@ -49,7 +15,7 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L Wurth_Transformer_10.16x13.36mm T1
+L Custom_Parts:Wurth_Transformer_10.16x13.36mm T1
 U 1 1 5A6B88EA
 P 7100 3000
 F 0 "T1" H 7100 3325 60  0000 C CNN
@@ -60,7 +26,7 @@ F 3 "" H 7100 3425 60  0001 C CNN
 	-1   0    0    -1  
 $EndComp
 $Comp
-L R R2
+L Device:R R2
 U 1 1 5A6B8978
 P 4300 3850
 F 0 "R2" V 4380 3850 50  0000 C CNN
@@ -71,7 +37,7 @@ F 3 "" H 4300 3850 50  0001 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L C C3
+L Device:C C3
 U 1 1 5A6B89DB
 P 3750 4150
 F 0 "C3" H 3775 4250 50  0000 L CNN
@@ -82,7 +48,7 @@ F 3 "" H 3750 4150 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Q_NMOS_DGS Q1
+L Device:Q_NMOS_DGS Q1
 U 1 1 5A6B8B05
 P 6600 3600
 F 0 "Q1" H 6800 3650 50  0000 L CNN
@@ -93,7 +59,7 @@ F 3 "" H 6600 3600 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R4
+L Device:R R4
 U 1 1 5A6B8B69
 P 7450 3850
 F 0 "R4" V 7530 3850 50  0000 C CNN
@@ -104,7 +70,7 @@ F 3 "" H 7450 3850 50  0001 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L D D1
+L Device:D D1
 U 1 1 5A6B91C6
 P 7750 3200
 F 0 "D1" H 7750 3300 50  0000 C CNN
@@ -115,7 +81,7 @@ F 3 "" H 7750 3200 50  0001 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L C C5
+L Device:C C5
 U 1 1 5A6B92D0
 P 8050 3000
 F 0 "C5" H 8075 3100 50  0000 L CNN
@@ -126,7 +92,7 @@ F 3 "" H 8050 3000 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C6
+L Device:C C6
 U 1 1 5A6B93C6
 P 8350 3000
 F 0 "C6" H 8375 3100 50  0000 L CNN
@@ -137,7 +103,7 @@ F 3 "" H 8350 3000 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R5
+L Device:R R5
 U 1 1 5A6B9F37
 P 7150 4150
 F 0 "R5" V 7230 4150 50  0000 C CNN
@@ -148,7 +114,7 @@ F 3 "" H 7150 4150 50  0001 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L R R3
+L Device:R R3
 U 1 1 5A6B9FBA
 P 6800 4550
 F 0 "R3" V 6880 4550 50  0000 C CNN
@@ -159,7 +125,7 @@ F 3 "" H 6800 4550 50  0001 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L C C7
+L Device:C C7
 U 1 1 5A6BA4CA
 P 6350 4550
 F 0 "C7" H 6375 4650 50  0000 L CNN
@@ -170,7 +136,7 @@ F 3 "" H 6350 4550 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R1
+L Device:R R1
 U 1 1 5A6BAAF4
 P 4100 4350
 F 0 "R1" V 4180 4350 50  0000 C CNN
@@ -181,7 +147,7 @@ F 3 "" H 4100 4350 50  0001 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L C C2
+L Device:C C2
 U 1 1 5A6C0FBE
 P 4500 3000
 F 0 "C2" H 4525 3100 50  0000 L CNN
@@ -192,7 +158,7 @@ F 3 "" H 4500 3000 50  0001 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L C C1
+L Device:C C1
 U 1 1 5A6C10DF
 P 4150 3000
 F 0 "C1" H 4175 3100 50  0000 L CNN
@@ -204,7 +170,7 @@ F 3 "" H 4150 3000 50  0001 C CNN
 $EndComp
 NoConn ~ 7500 3000
 $Comp
-L C C4
+L Device:C C4
 U 1 1 5A6C6769
 P 4350 4550
 F 0 "C4" H 4375 4650 50  0000 L CNN
@@ -215,7 +181,7 @@ F 3 "" H 4350 4550 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDREF #PWR027
+L power:GNDREF #PWR027
 U 1 1 5A6CD5AE
 P 3950 3250
 F 0 "#PWR027" H 3950 3000 50  0001 C CNN
@@ -226,7 +192,7 @@ F 3 "" H 3950 3250 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDREF #PWR028
+L power:GNDREF #PWR028
 U 1 1 5A6CD8C1
 P 7750 2850
 F 0 "#PWR028" H 7750 2600 50  0001 C CNN
@@ -237,7 +203,7 @@ F 3 "" H 7750 2850 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDREF #PWR029
+L power:GNDREF #PWR029
 U 1 1 5A6D0882
 P 6350 4850
 F 0 "#PWR029" H 6350 4600 50  0001 C CNN
@@ -248,7 +214,7 @@ F 3 "" H 6350 4850 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDREF #PWR030
+L power:GNDREF #PWR030
 U 1 1 5A6D3815
 P 7800 3900
 F 0 "#PWR030" H 7800 3650 50  0001 C CNN
@@ -259,7 +225,7 @@ F 3 "" H 7800 3900 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R6
+L Device:R R6
 U 1 1 5A8E442D
 P 6250 3600
 F 0 "R6" V 6330 3600 50  0000 C CNN
@@ -376,7 +342,7 @@ Wire Wire Line
 Wire Wire Line
 	6350 4300 6100 4300
 $Comp
-L LTC3759 U1
+L Custom_Parts:LTC3759 U1
 U 1 1 5A6BF1D9
 P 5350 3850
 F 0 "U1" H 5350 3850 60  0000 C CNN
@@ -387,7 +353,7 @@ F 3 "" H 5350 3950 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C8
+L Device:C C8
 U 1 1 5A911DC8
 P 4850 3000
 F 0 "C8" H 4875 3100 50  0000 L CNN

+ 410 - 413
Nixie_Bottom_Board/nixie_bottom_board-cache.lib

@@ -1,48 +1,219 @@
-EESchema-LIBRARY Version 2.3
+EESchema-LIBRARY Version 2.4
 #encoding utf-8
 #
-# BQ25890
+# Custom_Parts:BQ25890
 #
-DEF BQ25890 U 0 40 Y Y 1 F N
+DEF Custom_Parts:BQ25890 U 0 40 Y Y 1 F N
 F0 "U" 0 750 60 H V C CNN
-F1 "BQ25890" 0 650 60 H V C CNN
+F1 "Custom_Parts:BQ25890" 0 650 60 H V C CNN
 F2 "" 0 150 60 H I C CNN
 F3 "" 0 150 60 H I C CNN
 DRAW
 S -300 600 300 -600 0 1 0 N
 X VBUS 1 -500 550 200 R 50 50 1 1 I
-X D+ 2 -500 450 200 R 50 50 1 1 I
-X D- 3 -500 350 200 R 50 50 1 1 I
-X STAT 4 -500 250 200 R 50 50 1 1 I
-X SCL 5 -500 150 200 R 50 50 1 1 I
-X SDA 6 -500 50 200 R 50 50 1 1 I
-X INT 7 -500 -50 200 R 50 50 1 1 I
-X OTG 8 -500 -150 200 R 50 50 1 1 I
-X nCE 9 -500 -250 200 R 50 50 1 1 I
 X ILIM 10 -500 -350 200 R 50 50 1 1 I
-X SW 20 500 150 200 L 50 50 1 1 I
 X TS 11 -500 -450 200 R 50 50 1 1 I
-X BTST 21 500 250 200 L 50 50 1 1 I
 X nQON 12 -500 -550 200 R 50 50 1 1 I
-X REGN 22 500 350 200 L 50 50 1 1 I
 X BAT 13 500 -550 200 L 50 50 1 1 I
-X PMID 23 500 450 200 L 50 50 1 1 I
 X BAT 14 500 -450 200 L 50 50 1 1 I
-X DSEL 24 500 550 200 L 50 50 1 1 I
 X SYS 15 500 -350 200 L 50 50 1 1 I
-X EP 25 0 -800 200 U 50 50 1 1 I N
 X SYS 16 500 -250 200 L 50 50 1 1 I
 X PGND 17 500 -150 200 L 50 50 1 1 I
 X PGND 18 500 -50 200 L 50 50 1 1 I
 X SW 19 500 50 200 L 50 50 1 1 I
+X D+ 2 -500 450 200 R 50 50 1 1 I
+X SW 20 500 150 200 L 50 50 1 1 I
+X BTST 21 500 250 200 L 50 50 1 1 I
+X REGN 22 500 350 200 L 50 50 1 1 I
+X PMID 23 500 450 200 L 50 50 1 1 I
+X DSEL 24 500 550 200 L 50 50 1 1 I
+X EP 25 0 -800 200 U 50 50 1 1 I N
+X D- 3 -500 350 200 R 50 50 1 1 I
+X STAT 4 -500 250 200 R 50 50 1 1 I
+X SCL 5 -500 150 200 R 50 50 1 1 I
+X SDA 6 -500 50 200 R 50 50 1 1 I
+X INT 7 -500 -50 200 R 50 50 1 1 I
+X OTG 8 -500 -150 200 R 50 50 1 1 I
+X nCE 9 -500 -250 200 R 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# Custom_Parts:LTC3759
+#
+DEF Custom_Parts:LTC3759 U 0 40 Y Y 1 F N
+F0 "U" 0 0 60 H V C CNN
+F1 "Custom_Parts:LTC3759" 0 -100 60 H V C CNN
+F2 "" 0 100 60 H I C CNN
+F3 "" 0 100 60 H I C CNN
+DRAW
+S -450 550 450 -550 0 1 0 N
+X VC 1 -750 0 300 R 50 50 1 1 I
+X DRIVE 10 100 850 300 D 50 50 1 1 I
+X VIN 11 -50 850 300 D 50 50 1 1 I
+X EN 12 -750 150 300 R 50 50 1 1 I
+X GND 13 -750 -450 300 R 50 50 1 1 O
+X FBX 2 750 -300 300 L 50 50 1 1 I
+X SS 3 -750 -300 300 R 50 50 1 1 I
+X RT 4 -750 -150 300 R 50 50 1 1 I
+X SYNC 5 -750 300 300 R 50 50 1 1 I
+X PGOOD 6 -750 450 300 R 50 50 1 1 I I
+X SENSE 7 750 0 300 L 50 50 1 1 I
+X GATE 8 750 250 300 L 50 50 1 1 O
+X INTVCC 9 750 -450 300 L 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# Custom_Parts:TPD8S300
+#
+DEF Custom_Parts:TPD8S300 U 0 40 Y Y 1 F N
+F0 "U" 0 650 60 H V C CNN
+F1 "Custom_Parts:TPD8S300" 0 550 60 H V C CNN
+F2 "" 0 0 60 H I C CNN
+F3 "" 0 0 60 H I C CNN
+DRAW
+S -350 500 350 -500 0 1 0 N
+X C_SBU1 1 -550 450 200 R 50 50 1 1 I
+X VCC 10 -550 -450 200 R 50 50 1 1 I
+X CC2 11 550 -450 200 L 50 50 1 1 I
+X CC1 12 550 -350 200 L 50 50 1 1 I
+X GND 13 550 -250 200 L 50 50 1 1 I
+X SBU2 14 550 -150 200 L 50 50 1 1 I
+X SBU1 15 550 -50 200 L 50 50 1 1 I
+X D4 16 550 50 200 L 50 50 1 1 I
+X D3 17 550 150 200 L 50 50 1 1 I
+X GND 18 550 250 200 L 50 50 1 1 I
+X D2 19 550 350 200 L 50 50 1 1 I
+X C_SBU2 2 -550 350 200 R 50 50 1 1 I
+X D1 20 550 450 200 L 50 50 1 1 I
+X EP 21 0 -700 200 U 50 50 1 1 I N
+X VBIAS 3 -550 250 200 R 50 50 1 1 I
+X C_CC1 4 -550 150 200 R 50 50 1 1 I
+X C_CC2 5 -550 50 200 R 50 50 1 1 I
+X RPD_G2 6 -550 -50 200 R 50 50 1 1 I
+X RPD_G1 7 -550 -150 200 R 50 50 1 1 I
+X GND 8 -550 -250 200 R 50 50 1 1 I
+X nFLT 9 -550 -350 200 R 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# Custom_Parts:TPS61235
+#
+DEF Custom_Parts:TPS61235 U 0 40 Y Y 1 F N
+F0 "U" 0 400 60 H V C CNN
+F1 "Custom_Parts:TPS61235" 0 300 60 H V C CNN
+F2 "" 0 0 60 H I C CNN
+F3 "" 0 0 60 H I C CNN
+DRAW
+S -250 250 250 -250 0 1 0 N
+X PGND 1 -450 200 200 R 50 50 1 1 I
+X SW 2 -450 100 200 R 50 50 1 1 I
+X VIN 3 -450 0 200 R 50 50 1 1 I
+X CC 4 -450 -100 200 R 50 50 1 1 I
+X AGND 5 -450 -200 200 R 50 50 1 1 I
+X FB 6 450 -200 200 L 50 50 1 1 I
+X EN 7 450 -100 200 L 50 50 1 1 I
+X INACT 8 450 0 200 L 50 50 1 1 I
+X VOUT 9 450 100 200 L 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# Custom_Parts:TPS63025X
+#
+DEF Custom_Parts:TPS63025X U 0 40 Y Y 1 F N
+F0 "U" 0 400 60 H V C CNN
+F1 "Custom_Parts:TPS63025X" 0 300 60 H V C CNN
+F2 "" 0 0 60 H I C CNN
+F3 "" 0 0 60 H I C CNN
+DRAW
+S -250 250 250 -450 0 1 0 N
+X L2 1 -450 200 200 R 50 50 1 1 I
+X PFM 10 450 -200 200 L 50 50 1 1 I
+X FB 11 450 -100 200 L 50 50 1 1 I
+X VOUT 12 450 0 200 L 50 50 1 1 I
+X VOUT 13 450 100 200 L 50 50 1 1 I
+X VOUT 14 450 200 200 L 50 50 1 1 I
+X PGND 2 -450 100 200 R 50 50 1 1 I
+X L1 3 -450 0 200 R 50 50 1 1 I
+X VIN 4 -450 -100 200 R 50 50 1 1 I
+X VIN 5 -450 -200 200 R 50 50 1 1 I
+X VIN 6 -450 -300 200 R 50 50 1 1 I
+X VINA 7 -450 -400 200 R 50 50 1 1 I
+X EN 8 450 -400 200 L 50 50 1 1 I
+X GND 9 450 -300 200 L 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# Custom_Parts:TUSB320
+#
+DEF Custom_Parts:TUSB320 U 0 40 Y Y 1 F N
+F0 "U" 0 450 60 H V C CNN
+F1 "Custom_Parts:TUSB320" 0 350 60 H V C CNN
+F2 "" 350 0 60 H I C CNN
+F3 "" 350 0 60 H I C CNN
+DRAW
+S -250 300 250 -300 0 1 0 N
+X CC1 1 -450 250 200 R 50 50 1 1 I
+X GND 10 450 50 200 L 50 50 1 1 I
+X nEN 11 450 150 200 L 50 50 1 1 I
+X VCC 12 450 250 200 L 50 50 1 1 I
+X CC2 2 -450 150 200 R 50 50 1 1 I
+X PORT 3 -450 50 200 R 50 50 1 1 I
+X VBUS 4 -450 -50 200 R 50 50 1 1 I
+X ADDR 5 -450 -150 200 R 50 50 1 1 I
+X INT_N 6 -450 -250 200 R 50 50 1 1 I
+X SDA 7 450 -250 200 L 50 50 1 1 I
+X SCL 8 450 -150 200 L 50 50 1 1 I
+X ID 9 450 -50 200 L 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# Custom_Parts:Wurth_Transformer_10.16x13.36mm
+#
+DEF Custom_Parts:Wurth_Transformer_10.16x13.36mm T 0 40 Y Y 1 F N
+F0 "T" 0 325 60 H V C CNN
+F1 "Custom_Parts:Wurth_Transformer_10.16x13.36mm" 0 425 60 H V C CNN
+F2 "" 0 425 60 H I C CNN
+F3 "" 0 425 60 H I C CNN
+DRAW
+A -100 -175 25 -899 899 0 1 0 N -100 -200 -100 -150
+A -100 -125 25 -899 899 0 1 0 N -100 -150 -100 -100
+A -100 -75 25 -899 899 0 1 0 N -100 -100 -100 -50
+A -100 -25 25 -899 899 0 1 0 N -100 -50 -100 0
+A -100 25 25 -899 899 0 1 0 N -100 0 -100 50
+A -100 75 25 -899 899 0 1 0 N -100 50 -100 100
+A -100 125 25 -899 899 0 1 0 N -100 100 -100 150
+A -100 175 25 -899 899 0 1 0 N -100 150 -100 200
+A 25 -175 25 901 -901 0 1 0 N 25 -150 25 -200
+A 25 -125 25 901 -901 0 1 0 N 25 -100 25 -150
+A 25 -75 25 901 -901 0 1 0 N 25 -50 25 -100
+A 25 -25 25 901 -901 0 1 0 N 25 0 25 -50
+A 25 25 25 901 -901 0 1 0 N 25 50 25 0
+A 25 75 25 901 -901 0 1 0 N 25 100 25 50
+A 25 125 25 901 -901 0 1 0 N 25 150 25 100
+A 25 175 25 901 -901 0 1 0 N 25 200 25 150
+C -125 -30 14 0 0 0 F
+C -125 170 14 0 0 0 F
+C 50 170 14 0 0 0 F
+T 0 -150 -100 60 0 0 0 3 Italic 0 C C
+T 0 -150 100 60 0 0 0 3 Italic 0 C C
+P 2 0 0 0 -50 200 -50 -200 N
+P 2 0 0 0 -25 200 -25 -200 N
+P 2 0 0 0 25 -200 100 -200 N
+P 2 0 0 0 25 200 75 200 N
+P 2 0 0 0 75 200 100 200 N
+X ~ 1 -400 200 300 R 50 50 1 1 I
+X ~ 2 -400 0 300 R 50 50 1 1 I
+X ~ 3 -400 -200 300 R 50 50 1 1 I
+X ~ 4 400 -200 300 L 50 50 1 1 I
+X ~ 6 400 200 300 L 50 50 1 1 I
 ENDDRAW
 ENDDEF
 #
-# Battery_Cell
+# Device:Battery_Cell
 #
-DEF Battery_Cell BT 0 0 N N 1 F N
+DEF Device:Battery_Cell BT 0 0 N N 1 F N
 F0 "BT" 100 100 50 H V L CNN
-F1 "Battery_Cell" 100 0 50 H V L CNN
+F1 "Device:Battery_Cell" 100 0 50 H V L CNN
 F2 "" 0 60 50 V I C CNN
 F3 "" 0 60 50 V I C CNN
 DRAW
@@ -57,11 +228,11 @@ X - 2 0 -100 100 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# C
+# Device:C
 #
-DEF C C 0 10 N Y 1 F N
+DEF Device:C C 0 10 N Y 1 F N
 F0 "C" 25 100 50 H V L CNN
-F1 "C" 25 -100 50 H V L CNN
+F1 "Device:C" 25 -100 50 H V L CNN
 F2 "" 38 -150 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -75,11 +246,11 @@ X ~ 2 0 -150 110 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# C_Small
+# Device:C_Small
 #
-DEF C_Small C 0 10 N N 1 F N
+DEF Device:C_Small C 0 10 N N 1 F N
 F0 "C" 10 70 50 H V L CNN
-F1 "C_Small" 10 -80 50 H V L CNN
+F1 "Device:C_Small" 10 -80 50 H V L CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -93,65 +264,11 @@ X ~ 2 0 -100 80 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Conn_01x01
-#
-DEF Conn_01x01 J 0 40 Y N 1 F N
-F0 "J" 0 100 50 H V C CNN
-F1 "Conn_01x01" 0 -100 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- Connector*:*_??x*mm*
- Connector*:*1x??x*mm*
- Pin?Header?Straight?1X*
- Pin?Header?Angled?1X*
- Socket?Strip?Straight?1X*
- Socket?Strip?Angled?1X*
-$ENDFPLIST
-DRAW
-S -50 5 0 -5 1 1 6 N
-S -50 50 50 -50 1 1 10 f
-X Pin_1 1 -200 0 150 R 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# Conn_02x03_Odd_Even
-#
-DEF Conn_02x03_Odd_Even J 0 40 Y N 1 F N
-F0 "J" 50 200 50 H V C CNN
-F1 "Conn_02x03_Odd_Even" 50 -200 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- Connector*:*2x??x*mm*
- Connector*:*2x???Pitch*
- Pin_Header_Straight_2X*
- Pin_Header_Angled_2X*
- Socket_Strip_Straight_2X*
- Socket_Strip_Angled_2X*
-$ENDFPLIST
-DRAW
-S -50 -95 0 -105 1 1 6 N
-S -50 5 0 -5 1 1 6 N
-S -50 105 0 95 1 1 6 N
-S -50 150 150 -150 1 1 10 f
-S 150 -95 100 -105 1 1 6 N
-S 150 5 100 -5 1 1 6 N
-S 150 105 100 95 1 1 6 N
-X Pin_1 1 -200 100 150 R 50 50 1 1 P
-X Pin_2 2 300 100 150 L 50 50 1 1 P
-X Pin_3 3 -200 0 150 R 50 50 1 1 P
-X Pin_4 4 300 0 150 L 50 50 1 1 P
-X Pin_5 5 -200 -100 150 R 50 50 1 1 P
-X Pin_6 6 300 -100 150 L 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# Crystal
+# Device:Crystal
 #
-DEF Crystal Y 0 40 N N 1 F N
+DEF Device:Crystal Y 0 40 N N 1 F N
 F0 "Y" 0 150 50 H V C CNN
-F1 "Crystal" 0 -150 50 H V C CNN
+F1 "Device:Crystal" 0 -150 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -168,16 +285,15 @@ X 2 2 150 0 50 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# D
+# Device:D
 #
-DEF D D 0 40 N N 1 F N
+DEF Device:D D 0 40 N N 1 F N
 F0 "D" 0 100 50 H V C CNN
-F1 "D" 0 -100 50 H V C CNN
+F1 "Device:D" 0 -100 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
  TO-???*
- *SingleDiode
  *_Diode_*
  *SingleDiode*
  D_*
@@ -191,16 +307,15 @@ X A 2 150 0 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# D_Small
+# Device:D_Small
 #
-DEF D_Small D 0 10 N N 1 F N
+DEF Device:D_Small D 0 10 N N 1 F N
 F0 "D" -50 80 50 H V L CNN
-F1 "D_Small" -150 -80 50 H V L CNN
+F1 "Device:D_Small" -150 -80 50 H V L CNN
 F2 "" 0 0 50 V I C CNN
 F3 "" 0 0 50 V I C CNN
 $FPLIST
  TO-???*
- *SingleDiode
  *_Diode_*
  *SingleDiode*
  D_*
@@ -214,27 +329,11 @@ X A 2 100 0 70 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# GNDREF
-#
-DEF GNDREF #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 -250 50 H I C CNN
-F1 "GNDREF" 0 -150 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-DRAW
-P 2 0 1 0 -25 -75 25 -75 N
-P 2 0 1 0 -5 -100 5 -100 N
-P 2 0 1 0 0 -50 0 0 N
-P 2 0 1 0 50 -50 -50 -50 N
-X GNDREF 1 0 0 0 D 50 50 1 1 W N
-ENDDRAW
-ENDDEF
-#
-# Jumper_NC_Small
+# Device:Jumper_NC_Small
 #
-DEF Jumper_NC_Small JP 0 30 N N 1 F N
+DEF Device:Jumper_NC_Small JP 0 30 N N 1 F N
 F0 "JP" 0 80 50 H V C CNN
-F1 "Jumper_NC_Small" 10 -60 50 H V C CNN
+F1 "Device:Jumper_NC_Small" 10 -60 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 DRAW
@@ -246,15 +345,17 @@ X 2 2 100 0 40 L 50 50 0 1 P
 ENDDRAW
 ENDDEF
 #
-# LED
+# Device:LED
 #
-DEF LED D 0 40 Y N 1 F N
+DEF Device:LED D 0 40 N N 1 F N
 F0 "D" 0 100 50 H V C CNN
-F1 "LED" 0 -100 50 H V C CNN
+F1 "Device:LED" 0 -100 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
  LED*
+ LED_SMD:*
+ LED_THT:*
 $ENDFPLIST
 DRAW
 P 2 0 1 8 -50 -50 -50 50 N
@@ -267,65 +368,18 @@ X A 2 150 0 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# LMV321
+# Device:L_Small
 #
-DEF LMV321 U 0 20 Y Y 1 F N
-F0 "U" 0 200 50 H V L CNN
-F1 "LMV321" 0 -200 50 H V L CNN
-F2 "" 0 0 50 H I L CNN
+DEF Device:L_Small L 0 10 N N 1 F N
+F0 "L" 30 40 50 H V L CNN
+F1 "Device:L_Small" 30 -40 50 H V L CNN
+F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
-ALIAS MCP6561U MCP6001U OPA333xxDCK OPA376xxDCK
 $FPLIST
- SOT*23*
- *SC*70*
-$ENDFPLIST
-DRAW
-P 4 0 1 10 -200 200 200 0 -200 -200 -200 200 f
-X V- 2 -100 -300 150 U 50 50 0 1 W
-X V+ 5 -100 300 150 D 50 50 0 1 W
-X + 1 -300 100 100 R 50 50 1 1 I
-X - 3 -300 -100 100 R 50 50 1 1 I
-X ~ 4 300 0 100 L 50 50 1 1 O
-ENDDRAW
-ENDDEF
-#
-# LTC3759
-#
-DEF LTC3759 U 0 40 Y Y 1 F N
-F0 "U" 0 0 60 H V C CNN
-F1 "LTC3759" 0 -100 60 H V C CNN
-F2 "" 0 100 60 H I C CNN
-F3 "" 0 100 60 H I C CNN
-DRAW
-S -450 550 450 -550 0 1 0 N
-X VC 1 -750 0 300 R 50 50 1 1 I
-X FBX 2 750 -300 300 L 50 50 1 1 I
-X SS 3 -750 -300 300 R 50 50 1 1 I
-X RT 4 -750 -150 300 R 50 50 1 1 I
-X SYNC 5 -750 300 300 R 50 50 1 1 I
-X PGOOD 6 -750 450 300 R 50 50 1 1 I I
-X SENSE 7 750 0 300 L 50 50 1 1 I
-X GATE 8 750 250 300 L 50 50 1 1 O
-X INTVCC 9 750 -450 300 L 50 50 1 1 I
-X DRIVE 10 100 850 300 D 50 50 1 1 I
-X VIN 11 -50 850 300 D 50 50 1 1 I
-X EN 12 -750 150 300 R 50 50 1 1 I
-X GND 13 -750 -450 300 R 50 50 1 1 O
-ENDDRAW
-ENDDEF
-#
-# L_Small
-#
-DEF L_Small L 0 10 N N 1 F N
-F0 "L" 30 40 50 H V L CNN
-F1 "L_Small" 30 -40 50 H V L CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- Choke_*
- *Coil*
- Inductor_*
- L_*
+ Choke_*
+ *Coil*
+ Inductor_*
+ L_*
 $ENDFPLIST
 DRAW
 A 0 -60 20 -899 899 0 1 0 N 0 -80 0 -40
@@ -337,11 +391,11 @@ X ~ 2 0 -100 20 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Q_NMOS_DGS
+# Device:Q_NMOS_DGS
 #
-DEF Q_NMOS_DGS Q 0 0 Y N 1 F N
+DEF Device:Q_NMOS_DGS Q 0 0 Y N 1 F N
 F0 "Q" 200 50 50 H V L CNN
-F1 "Q_NMOS_DGS" 200 -50 50 H V L CNN
+F1 "Device:Q_NMOS_DGS" 200 -50 50 H V L CNN
 F2 "" 200 100 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 DRAW
@@ -369,16 +423,15 @@ X S 3 100 -200 100 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# R
+# Device:R
 #
-DEF R R 0 0 N Y 1 F N
+DEF Device:R R 0 0 N Y 1 F N
 F0 "R" 80 0 50 V V C CNN
-F1 "R" 0 0 50 V V C CNN
+F1 "Device:R" 0 0 50 V V C CNN
 F2 "" -70 0 50 V I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
  R_*
- R_*
 $ENDFPLIST
 DRAW
 S -40 -100 40 100 0 1 10 N
@@ -387,217 +440,111 @@ X ~ 2 0 -150 50 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# STM32L432K
-#
-DEF STM32L432K U 0 40 Y Y 1 F N
-F0 "U" 0 1000 60 H V C CNN
-F1 "STM32L432K" 0 900 60 H V C CNN
-F2 "" 0 450 60 H I C CNN
-F3 "" 0 450 60 H I C CNN
-DRAW
-S -500 800 500 -800 0 1 0 N
-X VDD 1 -700 750 200 R 50 50 1 1 I
-X PC14/OSC 2 -700 650 200 R 50 50 1 1 I
-X PC15/OSC 3 -700 550 200 R 50 50 1 1 I
-X NRST 4 -700 450 200 R 50 50 1 1 I
-X VDDA 5 -700 350 200 R 50 50 1 1 I
-X PA0 6 -700 250 200 R 50 50 1 1 I
-X PA1 7 -700 150 200 R 50 50 1 1 I
-X PA2 8 -700 50 200 R 50 50 1 1 I
-X PA3 9 -700 -50 200 R 50 50 1 1 I
-X PA4 10 -700 -150 200 R 50 50 1 1 I
-X PA10 20 700 -450 200 L 50 50 1 1 I
-X PB7 30 700 550 200 L 50 50 1 1 I
-X PA5 11 -700 -250 200 R 50 50 1 1 I
-X PA11 21 700 -350 200 L 50 50 1 1 I
-X PH3/BOOT0 31 700 650 200 L 50 50 1 1 I
-X PA6 12 -700 -350 200 R 50 50 1 1 I
-X PA12 22 700 -250 200 L 50 50 1 1 I
-X VSS 32 700 750 200 L 50 50 1 1 I
-X PA7 13 -700 -450 200 R 50 50 1 1 I
-X PA13/SWDIO 23 700 -150 200 L 50 50 1 1 I
-X PB0 14 -700 -550 200 R 50 50 1 1 I
-X PA14/SWCLK 24 700 -50 200 L 50 50 1 1 I
-X PB1 15 -700 -650 200 R 50 50 1 1 I
-X PA15 25 700 50 200 L 50 50 1 1 I
-X VSS 16 -700 -750 200 R 50 50 1 1 I
-X PB3/SWO 26 700 150 200 L 50 50 1 1 I
-X VDD 17 700 -750 200 L 50 50 1 1 I
-X PB4 27 700 250 200 L 50 50 1 1 I
-X PA8 18 700 -650 200 L 50 50 1 1 I
-X PB5 28 700 350 200 L 50 50 1 1 I
-X PA9 19 700 -550 200 L 50 50 1 1 I
-X PB6 29 700 450 200 L 50 50 1 1 I
-ENDDRAW
-ENDDEF
-#
-# SW_Push
+# Device:Thermistor
 #
-DEF SW_Push SW 0 40 N N 1 F N
-F0 "SW" 50 100 50 H V L CNN
-F1 "SW_Push" 0 -60 50 H V C CNN
-F2 "" 0 200 50 H I C CNN
-F3 "" 0 200 50 H I C CNN
-DRAW
-C -80 0 20 0 1 0 N
-C 80 0 20 0 1 0 N
-P 2 0 1 0 0 50 0 120 N
-P 2 0 1 0 100 50 -100 50 N
-X 1 1 -200 0 100 R 50 50 0 1 P
-X 2 2 200 0 100 L 50 50 0 1 P
-ENDDRAW
-ENDDEF
-#
-# TEST_2P
-#
-DEF TEST_2P J 0 30 N N 1 F N
-F0 "J" 0 60 50 H V C CNN
-F1 "TEST_2P" 0 -70 50 H V C CNN
+DEF Device:Thermistor TH 0 0 N Y 1 F N
+F0 "TH" 100 50 50 V V C CNN
+F1 "Device:Thermistor" -100 0 50 V V C BNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
+$FPLIST
+ R_*
+$ENDFPLIST
 DRAW
-C -70 0 30 0 1 0 N
-C 70 0 30 0 1 0 N
-X 1 1 -200 0 100 R 50 50 0 1 P
-X 2 2 200 0 100 L 50 50 0 1 P
-ENDDRAW
-ENDDEF
-#
-# TPD8S300
-#
-DEF TPD8S300 U 0 40 Y Y 1 F N
-F0 "U" 0 650 60 H V C CNN
-F1 "TPD8S300" 0 550 60 H V C CNN
-F2 "" 0 0 60 H I C CNN
-F3 "" 0 0 60 H I C CNN
-DRAW
-S -350 500 350 -500 0 1 0 N
-X C_SBU1 1 -550 450 200 R 50 50 1 1 I
-X C_SBU2 2 -550 350 200 R 50 50 1 1 I
-X VBIAS 3 -550 250 200 R 50 50 1 1 I
-X C_CC1 4 -550 150 200 R 50 50 1 1 I
-X C_CC2 5 -550 50 200 R 50 50 1 1 I
-X RPD_G2 6 -550 -50 200 R 50 50 1 1 I
-X RPD_G1 7 -550 -150 200 R 50 50 1 1 I
-X GND 8 -550 -250 200 R 50 50 1 1 I
-X nFLT 9 -550 -350 200 R 50 50 1 1 I
-X VCC 10 -550 -450 200 R 50 50 1 1 I
-X D1 20 550 450 200 L 50 50 1 1 I
-X CC2 11 550 -450 200 L 50 50 1 1 I
-X EP 21 0 -700 200 U 50 50 1 1 I N
-X CC1 12 550 -350 200 L 50 50 1 1 I
-X GND 13 550 -250 200 L 50 50 1 1 I
-X SBU2 14 550 -150 200 L 50 50 1 1 I
-X SBU1 15 550 -50 200 L 50 50 1 1 I
-X D4 16 550 50 200 L 50 50 1 1 I
-X D3 17 550 150 200 L 50 50 1 1 I
-X GND 18 550 250 200 L 50 50 1 1 I
-X D2 19 550 350 200 L 50 50 1 1 I
-ENDDRAW
-ENDDEF
-#
-# TPS61235
-#
-DEF TPS61235 U 0 40 Y Y 1 F N
-F0 "U" 0 400 60 H V C CNN
-F1 "TPS61235" 0 300 60 H V C CNN
-F2 "" 0 0 60 H I C CNN
-F3 "" 0 0 60 H I C CNN
-DRAW
-S -250 250 250 -250 0 1 0 N
-X PGND 1 -450 200 200 R 50 50 1 1 I
-X SW 2 -450 100 200 R 50 50 1 1 I
-X VIN 3 -450 0 200 R 50 50 1 1 I
-X CC 4 -450 -100 200 R 50 50 1 1 I
-X AGND 5 -450 -200 200 R 50 50 1 1 I
-X FB 6 450 -200 200 L 50 50 1 1 I
-X EN 7 450 -100 200 L 50 50 1 1 I
-X INACT 8 450 0 200 L 50 50 1 1 I
-X VOUT 9 450 100 200 L 50 50 1 1 I
+S -40 100 40 -100 0 1 8 N
+P 5 0 1 10 -75 125 -75 75 75 -75 75 -125 75 -125 N
+X ~ 1 0 200 100 D 50 50 1 1 P
+X ~ 2 0 -200 100 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# TPS63025X
+# conn:Conn_01x01
 #
-DEF TPS63025X U 0 40 Y Y 1 F N
-F0 "U" 0 400 60 H V C CNN
-F1 "TPS63025X" 0 300 60 H V C CNN
-F2 "" 0 0 60 H I C CNN
-F3 "" 0 0 60 H I C CNN
+DEF conn:Conn_01x01 J 0 40 Y N 1 F N
+F0 "J" 0 100 50 H V C CNN
+F1 "conn:Conn_01x01" 0 -100 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ Connector*:*_??x*mm*
+ Connector*:*1x??x*mm*
+ Pin?Header?Straight?1X*
+ Pin?Header?Angled?1X*
+ Socket?Strip?Straight?1X*
+ Socket?Strip?Angled?1X*
+$ENDFPLIST
 DRAW
-S -250 250 250 -450 0 1 0 N
-X L2 1 -450 200 200 R 50 50 1 1 I
-X PGND 2 -450 100 200 R 50 50 1 1 I
-X L1 3 -450 0 200 R 50 50 1 1 I
-X VIN 4 -450 -100 200 R 50 50 1 1 I
-X VIN 5 -450 -200 200 R 50 50 1 1 I
-X VIN 6 -450 -300 200 R 50 50 1 1 I
-X VINA 7 -450 -400 200 R 50 50 1 1 I
-X EN 8 450 -400 200 L 50 50 1 1 I
-X GND 9 450 -300 200 L 50 50 1 1 I
-X PFM 10 450 -200 200 L 50 50 1 1 I
-X FB 11 450 -100 200 L 50 50 1 1 I
-X VOUT 12 450 0 200 L 50 50 1 1 I
-X VOUT 13 450 100 200 L 50 50 1 1 I
-X VOUT 14 450 200 200 L 50 50 1 1 I
+S -50 5 0 -5 1 1 6 N
+S -50 50 50 -50 1 1 10 f
+X Pin_1 1 -200 0 150 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# TUSB320-RESCUE-nixie_bottom_board
+# conn:Conn_02x03_Odd_Even
 #
-DEF TUSB320-RESCUE-nixie_bottom_board U 0 40 Y Y 1 F N
-F0 "U" 0 450 60 H V C CNN
-F1 "TUSB320-RESCUE-nixie_bottom_board" 0 350 60 H V C CNN
-F2 "" 350 0 60 H I C CNN
-F3 "" 350 0 60 H I C CNN
+DEF conn:Conn_02x03_Odd_Even J 0 40 Y N 1 F N
+F0 "J" 50 200 50 H V C CNN
+F1 "conn:Conn_02x03_Odd_Even" 50 -200 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ Connector*:*2x??x*mm*
+ Connector*:*2x???Pitch*
+ Pin_Header_Straight_2X*
+ Pin_Header_Angled_2X*
+ Socket_Strip_Straight_2X*
+ Socket_Strip_Angled_2X*
+$ENDFPLIST
 DRAW
-S -250 300 250 -300 0 1 0 N
-X CC1 1 -450 250 200 R 50 50 1 1 I
-X CC2 2 -450 150 200 R 50 50 1 1 I
-X PORT 3 -450 50 200 R 50 50 1 1 I
-X VBUS 4 -450 -50 200 R 50 50 1 1 I
-X ADDR 5 -450 -150 200 R 50 50 1 1 I
-X INT_N 6 -450 -250 200 R 50 50 1 1 I
-X SDA 7 450 -250 200 L 50 50 1 1 I
-X SCL 8 450 -150 200 L 50 50 1 1 I
-X ID 9 450 -50 200 L 50 50 1 1 I
-X GND 10 450 50 200 L 50 50 1 1 I
-X nEN 11 450 150 200 L 50 50 1 1 I
-X VCC 12 450 250 200 L 50 50 1 1 I
+S -50 -95 0 -105 1 1 6 N
+S -50 5 0 -5 1 1 6 N
+S -50 105 0 95 1 1 6 N
+S -50 150 150 -150 1 1 10 f
+S 150 -95 100 -105 1 1 6 N
+S 150 5 100 -5 1 1 6 N
+S 150 105 100 95 1 1 6 N
+X Pin_1 1 -200 100 150 R 50 50 1 1 P
+X Pin_2 2 300 100 150 L 50 50 1 1 P
+X Pin_3 3 -200 0 150 R 50 50 1 1 P
+X Pin_4 4 300 0 150 L 50 50 1 1 P
+X Pin_5 5 -200 -100 150 R 50 50 1 1 P
+X Pin_6 6 300 -100 150 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Thermistor
+# conn:TEST_2P
 #
-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 BNN
+DEF conn:TEST_2P J 0 30 N N 1 F N
+F0 "J" 0 60 50 H V C CNN
+F1 "conn:TEST_2P" 0 -70 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
-$FPLIST
- R_*
- SM0603
- SM0805
-$ENDFPLIST
 DRAW
-S -40 100 40 -100 0 1 8 N
-P 5 0 1 10 -75 125 -75 75 75 -75 75 -125 75 -125 N
-X ~ 1 0 200 100 D 50 50 1 1 P
-X ~ 2 0 -200 100 U 50 50 1 1 P
+C -70 0 30 0 1 0 N
+C 70 0 30 0 1 0 N
+X 1 1 -200 0 100 R 50 50 0 1 P
+X 2 2 200 0 100 L 50 50 0 1 P
 ENDDRAW
 ENDDEF
 #
-# USB_C_Receptacle
+# conn:USB_C_Receptacle
 #
-DEF USB_C_Receptacle J 0 40 Y Y 1 F N
+DEF conn:USB_C_Receptacle J 0 40 Y Y 1 F N
 F0 "J" -400 1450 50 H V L CNN
-F1 "USB_C_Receptacle" 400 1450 50 H V R CNN
+F1 "conn:USB_C_Receptacle" 400 1450 50 H V R CNN
 F2 "" 150 0 50 H I C CNN
 F3 "" 150 0 50 H I C CNN
 $FPLIST
  USB*C*Receptacle*
 $ENDFPLIST
 DRAW
+A -275 -150 25 -1799 -1 0 1 10 F -300 -150 -250 -150
+A -275 -150 75 -1799 -1 0 1 20 N -350 -150 -200 -150
+A -275 -150 25 -1799 -1 0 1 10 N -300 -150 -250 -150
+A -275 150 25 1 1799 0 1 10 F -250 150 -300 150
+A -275 150 25 1 1799 0 1 10 N -250 150 -300 150
+A -275 150 75 1 1799 0 1 20 N -200 150 -350 150
+C -130 175 25 0 1 10 F
 T 900 -30 -175 200 0 0 0 SS Italic 1 C C
 S -210 -1400 -190 -1360 0 0 0 N
 S -110 -1400 -90 -1360 0 0 0 N
@@ -623,13 +570,6 @@ S 400 1010 360 990 0 0 0 N
 S 400 1110 360 1090 0 0 0 N
 S 400 1210 360 1190 0 0 0 N
 S 400 1310 360 1290 0 0 0 N
-A -275 -150 25 -1799 -1 0 1 10 N -300 -150 -250 -150
-A -275 -150 75 -1799 -1 0 1 20 N -350 -150 -200 -150
-A -275 -150 25 -1799 -1 0 1 10 F -300 -150 -250 -150
-A -275 150 75 1 1799 0 1 20 N -200 150 -350 150
-A -275 150 25 1 1799 0 1 10 N -250 150 -300 150
-A -275 150 25 1 1799 0 1 10 F -250 150 -300 150
-C -130 175 25 0 1 10 F
 S -400 1400 400 -1400 0 1 10 f
 S -300 -150 -250 150 0 1 10 F
 S 45 200 95 250 0 1 10 F
@@ -640,72 +580,129 @@ P 3 0 1 20 -30 0 -130 100 -130 150 N
 P 3 0 1 20 -30 50 70 150 70 200 N
 P 4 0 1 10 -80 300 -30 400 20 300 -80 300 F
 X GND A1 -200 -1600 200 U 50 50 1 1 W
-X GND B1 0 -1600 200 U 50 50 1 1 W
-X SHIELD S1 -300 -1600 200 U 50 50 1 1 P
+X RX2- A10 600 -600 200 L 50 50 1 1 B
+X RX2+ A11 600 -700 200 L 50 50 1 1 B
+X GND A12 -100 -1600 200 U 50 50 1 1 W
 X TX1+ A2 600 -400 200 L 50 50 1 1 B
-X TX2+ B2 600 -1000 200 L 50 50 1 1 B
 X TX1- A3 600 -300 200 L 50 50 1 1 B
-X TX2- B3 600 -900 200 L 50 50 1 1 B
 X VBUS A4 600 1300 200 L 50 50 1 1 W
-X VBUS B4 600 1100 200 L 50 50 1 1 W
 X CC1 A5 600 800 200 L 50 50 1 1 B
-X CC2 B5 600 700 200 L 50 50 1 1 B
 X D+ A6 600 300 200 L 50 50 1 1 B
-X D+ B6 600 200 200 L 50 50 1 1 B
 X D- A7 600 500 200 L 50 50 1 1 B
-X D- B7 600 400 200 L 50 50 1 1 B
 X SBU1 A8 600 -1200 200 L 50 50 1 1 B
-X SBU2 B8 600 -1300 200 L 50 50 1 1 B
 X VBUS A9 600 1200 200 L 50 50 1 1 W
-X VBUS B9 600 1000 200 L 50 50 1 1 W
-X RX2- A10 600 -600 200 L 50 50 1 1 B
+X GND B1 0 -1600 200 U 50 50 1 1 W
 X RX1- B10 600 0 200 L 50 50 1 1 B
-X RX2+ A11 600 -700 200 L 50 50 1 1 B
 X RX1+ B11 600 -100 200 L 50 50 1 1 B
-X GND A12 -100 -1600 200 U 50 50 1 1 W
 X GND B12 100 -1600 200 U 50 50 1 1 W
+X TX2+ B2 600 -1000 200 L 50 50 1 1 B
+X TX2- B3 600 -900 200 L 50 50 1 1 B
+X VBUS B4 600 1100 200 L 50 50 1 1 W
+X CC2 B5 600 700 200 L 50 50 1 1 B
+X D+ B6 600 200 200 L 50 50 1 1 B
+X D- B7 600 400 200 L 50 50 1 1 B
+X SBU2 B8 600 -1300 200 L 50 50 1 1 B
+X VBUS B9 600 1000 200 L 50 50 1 1 W
+X SHIELD S1 -300 -1600 200 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Wurth_Transformer_10.16x13.36mm
+# linear:LMV321
 #
-DEF Wurth_Transformer_10.16x13.36mm T 0 40 Y Y 1 F N
-F0 "T" 0 325 60 H V C CNN
-F1 "Wurth_Transformer_10.16x13.36mm" 0 425 60 H V C CNN
-F2 "" 0 425 60 H I C CNN
-F3 "" 0 425 60 H I C CNN
+DEF linear:LMV321 U 0 20 Y Y 1 F N
+F0 "U" 0 200 50 H V L CNN
+F1 "linear:LMV321" 0 -200 50 H V L CNN
+F2 "" 0 0 50 H I L CNN
+F3 "" 0 0 50 H I C CNN
+ALIAS MCP6561U MCP6001U OPA333xxDCK OPA376xxDCK
+$FPLIST
+ SOT*23*
+ *SC*70*
+$ENDFPLIST
 DRAW
-C -125 -30 14 0 0 0 F
-C -125 170 14 0 0 0 F
-C 50 170 14 0 0 0 F
-T 0 -150 -100 60 0 0 0 3 Italic 0 C C
-T 0 -150 100 60 0 0 0 3 Italic 0 C C
-P 2 0 0 0 -50 200 -50 -200 N
-P 2 0 0 0 -25 200 -25 -200 N
-P 2 0 0 0 25 -200 100 -200 N
-P 2 0 0 0 25 200 75 200 N
-P 2 0 0 0 75 200 100 200 N
-A -100 -175 25 -899 899 0 1 0 N -100 -200 -100 -150
-A -100 -125 25 -899 899 0 1 0 N -100 -150 -100 -100
-A -100 -75 25 -899 899 0 1 0 N -100 -100 -100 -50
-A -100 -25 25 -899 899 0 1 0 N -100 -50 -100 0
-A -100 25 25 -899 899 0 1 0 N -100 0 -100 50
-A -100 75 25 -899 899 0 1 0 N -100 50 -100 100
-A -100 125 25 -899 899 0 1 0 N -100 100 -100 150
-A -100 175 25 -899 899 0 1 0 N -100 150 -100 200
-A 25 -175 25 901 -901 0 1 0 N 25 -150 25 -200
-A 25 -125 25 901 -901 0 1 0 N 25 -100 25 -150
-A 25 -75 25 901 -901 0 1 0 N 25 -50 25 -100
-A 25 -25 25 901 -901 0 1 0 N 25 0 25 -50
-A 25 25 25 901 -901 0 1 0 N 25 50 25 0
-A 25 75 25 901 -901 0 1 0 N 25 100 25 50
-A 25 125 25 901 -901 0 1 0 N 25 150 25 100
-A 25 175 25 901 -901 0 1 0 N 25 200 25 150
-X ~ 1 -400 200 300 R 50 50 1 1 I
-X ~ 2 -400 0 300 R 50 50 1 1 I
-X ~ 3 -400 -200 300 R 50 50 1 1 I
-X ~ 4 400 -200 300 L 50 50 1 1 I
-X ~ 6 400 200 300 L 50 50 1 1 I
+P 4 0 1 10 -200 200 200 0 -200 -200 -200 200 f
+X V- 2 -100 -300 150 U 50 50 0 1 W
+X V+ 5 -100 300 150 D 50 50 0 1 W
+X + 1 -300 100 100 R 50 50 1 1 I
+X - 3 -300 -100 100 R 50 50 1 1 I
+X ~ 4 300 0 100 L 50 50 1 1 O
+ENDDRAW
+ENDDEF
+#
+# nixie_bottom_board-rescue:STM32L432K
+#
+DEF nixie_bottom_board-rescue:STM32L432K U 0 40 Y Y 1 F N
+F0 "U" 0 1000 60 H V C CNN
+F1 "nixie_bottom_board-rescue:STM32L432K" 0 900 60 H V C CNN
+F2 "" 0 450 60 H I C CNN
+F3 "" 0 450 60 H I C CNN
+DRAW
+S -500 800 500 -800 0 1 0 N
+X VDD 1 -700 750 200 R 50 50 1 1 I
+X PA4 10 -700 -150 200 R 50 50 1 1 I
+X PA5 11 -700 -250 200 R 50 50 1 1 I
+X PA6 12 -700 -350 200 R 50 50 1 1 I
+X PA7 13 -700 -450 200 R 50 50 1 1 I
+X PB0 14 -700 -550 200 R 50 50 1 1 I
+X PB1 15 -700 -650 200 R 50 50 1 1 I
+X VSS 16 -700 -750 200 R 50 50 1 1 I
+X VDD 17 700 -750 200 L 50 50 1 1 I
+X PA8 18 700 -650 200 L 50 50 1 1 I
+X PA9 19 700 -550 200 L 50 50 1 1 I
+X PC14/OSC 2 -700 650 200 R 50 50 1 1 I
+X PA10 20 700 -450 200 L 50 50 1 1 I
+X PA11 21 700 -350 200 L 50 50 1 1 I
+X PA12 22 700 -250 200 L 50 50 1 1 I
+X PA13/SWDIO 23 700 -150 200 L 50 50 1 1 I
+X PA14/SWCLK 24 700 -50 200 L 50 50 1 1 I
+X PA15 25 700 50 200 L 50 50 1 1 I
+X PB3/SWO 26 700 150 200 L 50 50 1 1 I
+X PB4 27 700 250 200 L 50 50 1 1 I
+X PB5 28 700 350 200 L 50 50 1 1 I
+X PB6 29 700 450 200 L 50 50 1 1 I
+X PC15/OSC 3 -700 550 200 R 50 50 1 1 I
+X PB7 30 700 550 200 L 50 50 1 1 I
+X PH3/BOOT0 31 700 650 200 L 50 50 1 1 I
+X VSS 32 700 750 200 L 50 50 1 1 I
+X NRST 4 -700 450 200 R 50 50 1 1 I
+X VDDA 5 -700 350 200 R 50 50 1 1 I
+X PA0 6 -700 250 200 R 50 50 1 1 I
+X PA1 7 -700 150 200 R 50 50 1 1 I
+X PA2 8 -700 50 200 R 50 50 1 1 I
+X PA3 9 -700 -50 200 R 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# power:GNDREF
+#
+DEF power:GNDREF #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -250 50 H I C CNN
+F1 "power:GNDREF" 0 -150 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+DRAW
+P 2 0 1 0 -25 -75 25 -75 N
+P 2 0 1 0 -5 -100 5 -100 N
+P 2 0 1 0 0 -50 0 0 N
+P 2 0 1 0 50 -50 -50 -50 N
+X GNDREF 1 0 0 0 D 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# switches:SW_Push
+#
+DEF switches:SW_Push SW 0 40 N N 1 F N
+F0 "SW" 50 100 50 H V L CNN
+F1 "switches:SW_Push" 0 -60 50 H V C CNN
+F2 "" 0 200 50 H I C CNN
+F3 "" 0 200 50 H I C CNN
+DRAW
+C -80 0 20 0 1 0 N
+C 80 0 20 0 1 0 N
+P 2 0 1 0 0 50 0 120 N
+P 2 0 1 0 100 50 -100 50 N
+X 1 1 -200 0 100 R 50 50 0 1 P
+X 2 2 200 0 100 L 50 50 0 1 P
 ENDDRAW
 ENDDEF
 #

+ 0 - 28
Nixie_Bottom_Board/nixie_bottom_board-rescue.lib

@@ -1,28 +0,0 @@
-EESchema-LIBRARY Version 2.3
-#encoding utf-8
-#
-# TUSB320-RESCUE-nixie_bottom_board
-#
-DEF TUSB320-RESCUE-nixie_bottom_board U 0 40 Y Y 1 F N
-F0 "U" 0 450 60 H V C CNN
-F1 "TUSB320-RESCUE-nixie_bottom_board" 0 350 60 H V C CNN
-F2 "" 350 0 60 H I C CNN
-F3 "" 350 0 60 H I C CNN
-DRAW
-S -250 300 250 -300 0 1 0 N
-X CC1 1 -450 250 200 R 50 50 1 1 I
-X CC2 2 -450 150 200 R 50 50 1 1 I
-X PORT 3 -450 50 200 R 50 50 1 1 I
-X VBUS 4 -450 -50 200 R 50 50 1 1 I
-X ADDR 5 -450 -150 200 R 50 50 1 1 I
-X INT_N 6 -450 -250 200 R 50 50 1 1 I
-X SDA 7 450 -250 200 L 50 50 1 1 I
-X SCL 8 450 -150 200 L 50 50 1 1 I
-X ID 9 450 -50 200 L 50 50 1 1 I
-X GND 10 450 50 200 L 50 50 1 1 I
-X nEN 11 450 150 200 L 50 50 1 1 I
-X VCC 12 450 250 200 L 50 50 1 1 I
-ENDDRAW
-ENDDEF
-#
-#End Library

+ 15 - 15
Nixie_Bottom_Board/nixie_bottom_board.bak

@@ -1165,12 +1165,12 @@ $EndComp
 $Comp
 L R R12
 U 1 1 5B0D9940
-P 7350 3850
-F 0 "R12" V 7430 3850 50  0000 C CNN
-F 1 "1M" V 7250 3850 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603" V 7280 3850 50  0001 C CNN
-F 3 "" H 7350 3850 50  0001 C CNN
-	1    7350 3850
+P 7350 3800
+F 0 "R12" V 7430 3800 50  0000 C CNN
+F 1 "1M" V 7250 3800 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603" V 7280 3800 50  0001 C CNN
+F 3 "" H 7350 3800 50  0001 C CNN
+	1    7350 3800
 	0    -1   -1   0   
 $EndComp
 Text Label 7800 3950 0    60   ~ 0
@@ -1790,16 +1790,11 @@ Connection ~ 7200 3650
 Wire Wire Line
 	6800 3750 7150 3750
 Wire Wire Line
-	7150 3750 7150 3850
+	7150 3750 7150 3950
 Wire Wire Line
-	7150 3850 7200 3850
+	7150 3800 7200 3800
 Wire Wire Line
-	7500 3850 7550 3850
-Wire Wire Line
-	7550 3650 7550 3950
-Wire Wire Line
-	7550 3950 7600 3950
-Connection ~ 7550 3850
+	7150 3950 7600 3950
 Wire Wire Line
 	3450 5050 3350 5050
 Wire Wire Line
@@ -1810,7 +1805,6 @@ Connection ~ 7450 3350
 Wire Wire Line
 	7450 3600 7450 3650
 Connection ~ 7450 3650
-Connection ~ 7550 3650
 Connection ~ 3300 4050
 Wire Wire Line
 	3700 4950 3700 5100
@@ -1852,4 +1846,10 @@ F 3 "" H 3800 1850 60  0001 C CNN
 	1    3800 1850
 	1    0    0    -1  
 $EndComp
+Wire Wire Line
+	7500 3800 7550 3800
+Wire Wire Line
+	7550 3800 7550 3650
+Connection ~ 7550 3650
+Connection ~ 7150 3800
 $EndSCHEMATC

+ 13 - 11
Nixie_Bottom_Board/nixie_bottom_board.kicad_pcb

@@ -1,9 +1,6 @@
-(kicad_pcb (version 4) (host pcbnew 4.0.7)
+(kicad_pcb (version 20171130) (host pcbnew "(5.0.0)")
 
   (general
-    (links 279)
-    (no_connects 252)
-    (area 99.949999 89.949999 200.050001 110.050001)
     (thickness 1.6)
     (drawings 12)
     (tracks 28)
@@ -64,6 +61,9 @@
     (pcbplotparams
       (layerselection 0x010fc_80000001)
       (usegerberextensions false)
+      (usegerberattributes false)
+      (usegerberadvancedattributes false)
+      (creategerberjobfile false)
       (excludeedgelayer true)
       (linewidth 0.100000)
       (plotframeref false)
@@ -72,8 +72,7 @@
       (useauxorigin false)
       (hpglpennumber 1)
       (hpglpenspeed 20)
-      (hpglpendiameter 15)
-      (hpglpenoverlay 2)
+      (hpglpendiameter 15.000000)
       (psnegative false)
       (psa4output false)
       (plotreference false)
@@ -85,7 +84,7 @@
       (mirror false)
       (drillshape 0)
       (scaleselection 1)
-      (outputdirectory Gerbers/))
+      (outputdirectory "Gerbers/"))
   )
 
   (net 0 "")
@@ -214,6 +213,7 @@
     (add_net /VSYS)
     (add_net GNDREF)
     (add_net "Net-(BT1-Pad1)")
+    (add_net "Net-(C1-Pad2)")
     (add_net "Net-(C10-Pad1)")
     (add_net "Net-(C11-Pad1)")
     (add_net "Net-(C13-Pad1)")
@@ -224,9 +224,11 @@
     (add_net "Net-(C26-Pad2)")
     (add_net "Net-(C3-Pad1)")
     (add_net "Net-(C4-Pad1)")
+    (add_net "Net-(C5-Pad2)")
     (add_net "Net-(C7-Pad1)")
     (add_net "Net-(D1-Pad2)")
     (add_net "Net-(D3-Pad1)")
+    (add_net "Net-(J2-Pad1)")
     (add_net "Net-(J5-Pad1)")
     (add_net "Net-(J6-Pad1)")
     (add_net "Net-(J9-Pad1)")
@@ -2010,7 +2012,7 @@
     (pad 2 smd trapezoid (at 0.3556 0) (size 0.508 0.762) (rect_delta 0.254 0 ) (layers F.Cu F.Paste F.Mask)
       (net 16 "Net-(BT1-Pad1)") (solder_mask_margin 0.127))
     (model smd\chip_cms.wrl
-      (at (xyz 0 0 0.002))
+      (offset (xyz 0 0 0.05079999923706055))
       (scale (xyz 0.05 0.05 0.05))
       (rotate (xyz 0 0 0))
     )
@@ -2037,7 +2039,7 @@
     (pad 2 smd trapezoid (at 0.3556 0 90) (size 0.508 0.762) (rect_delta 0.254 0 ) (layers F.Cu F.Paste F.Mask)
       (net 41 /HV_EN) (solder_mask_margin 0.127))
     (model smd\chip_cms.wrl
-      (at (xyz 0 0 0.002))
+      (offset (xyz 0 0 0.05079999923706055))
       (scale (xyz 0.05 0.05 0.05))
       (rotate (xyz 0 0 0))
     )
@@ -3457,10 +3459,10 @@
     (descr http://www.tag-connect.com/Materials/TC2030-MCP-NL%20PCB%20Footprint.pdf)
     (path /5B0740EF)
     (fp_text reference J3 (at 0 -4.064) (layer F.SilkS) hide
-      (effects (font (thickness 0.3048)))
+      (effects (font (size 1.524 1.524) (thickness 0.3048)))
     )
     (fp_text value "Tag Connect" (at 0 3.048) (layer F.SilkS) hide
-      (effects (font (thickness 0.3048)))
+      (effects (font (size 1.524 1.524) (thickness 0.3048)))
     )
     (pad 1 smd circle (at -1.27 0.635) (size 0.7874 0.7874) (layers F.Cu F.Paste F.Mask)
       (net 27 /VDD) (clearance 0.4826))

+ 20 - 20
Nixie_Bottom_Board/nixie_bottom_board.kicad_pcb-bak

@@ -2017,7 +2017,7 @@
   )
 
   (module "Custom Parts:SMD_Jumper" (layer F.Cu) (tedit 52B1ED15) (tstamp 5B393D50)
-    (at 159 104 90)
+    (at 172.5 108 90)
     (path /5B0D8B1E)
     (attr smd)
     (fp_text reference JP2 (at 0 1.016 90) (layer F.SilkS)
@@ -2132,18 +2132,18 @@
   )
 
   (module Inductors_SMD:L_Taiyo-Yuden_NR-40xx (layer F.Cu) (tedit 5990349D) (tstamp 5B393D62)
-    (at 166 107 270)
+    (at 165.5 107 90)
     (descr "Inductor, Taiyo Yuden, NR series, Taiyo-Yuden_NR-40xx, 4.0mmx4.0mm")
     (tags "inductor taiyo-yuden nr smd")
     (path /5B15730D)
     (attr smd)
-    (fp_text reference L3 (at 0 -3 270) (layer F.SilkS)
+    (fp_text reference L3 (at 0 -3 90) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 1uH (at 0 3.5 270) (layer F.Fab)
+    (fp_text value 1uH (at 0 3.5 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text user %R (at 0 0 270) (layer F.Fab)
+    (fp_text user %R (at 0 0 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_line (start -2 0) (end -2 -1.25) (layer F.Fab) (width 0.1))
@@ -2164,9 +2164,9 @@
     (fp_line (start -2.25 2.25) (end 2.25 2.25) (layer F.CrtYd) (width 0.05))
     (fp_line (start 2.25 2.25) (end 2.25 -2.25) (layer F.CrtYd) (width 0.05))
     (fp_line (start 2.25 -2.25) (end -2.25 -2.25) (layer F.CrtYd) (width 0.05))
-    (pad 1 smd rect (at -1.4 0 270) (size 1.2 3.9) (layers F.Cu F.Paste F.Mask)
+    (pad 1 smd rect (at -1.4 0 90) (size 1.2 3.9) (layers F.Cu F.Paste F.Mask)
       (net 26 /VSYS))
-    (pad 2 smd rect (at 1.4 0 270) (size 1.2 3.9) (layers F.Cu F.Paste F.Mask)
+    (pad 2 smd rect (at 1.4 0 90) (size 1.2 3.9) (layers F.Cu F.Paste F.Mask)
       (net 44 "Net-(L3-Pad2)"))
     (model ${KISYS3DMOD}/Inductors_SMD.3dshapes/L_Taiyo-Yuden_NR-40xx.wrl
       (at (xyz 0 0 0))
@@ -3099,37 +3099,37 @@
   )
 
   (module "Custom Parts:VQFN-9_2.5x2.5mm_Pitch0.5mm" (layer F.Cu) (tedit 5B393966) (tstamp 5B393E48)
-    (at 161.5 106 180)
+    (at 169.5 107)
     (path /5B154033)
-    (fp_text reference U6 (at 0 -2.6 180) (layer F.SilkS)
+    (fp_text reference U6 (at 0 -2.6) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value TPS61235 (at 0 2.4 180) (layer F.Fab)
+    (fp_text value TPS61235 (at 0 2.4) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_line (start -1.25 -1.25) (end -1.25 1.25) (layer F.SilkS) (width 0.15))
     (fp_line (start -1.25 1.25) (end 1.25 1.25) (layer F.SilkS) (width 0.15))
     (fp_line (start 1.25 1.25) (end 1.25 -1.25) (layer F.SilkS) (width 0.15))
     (fp_line (start 1.25 -1.25) (end -1.25 -1.25) (layer F.SilkS) (width 0.15))
-    (pad 1 smd rect (at -0.9 -0.77 180) (size 1.1 0.3) (layers F.Cu F.Paste F.Mask)
+    (pad 1 smd rect (at -0.9 -0.77) (size 1.1 0.3) (layers F.Cu F.Paste F.Mask)
       (net 1 GNDREF))
-    (pad 2 smd rect (at 0 -0.17 180) (size 2.9 0.3) (layers F.Cu F.Paste F.Mask)
+    (pad 2 smd rect (at 0 -0.17) (size 2.9 0.3) (layers F.Cu F.Paste F.Mask)
       (net 44 "Net-(L3-Pad2)"))
-    (pad 3 smd rect (at -1.15 0.475 180) (size 0.6 0.25) (layers F.Cu F.Paste F.Mask)
+    (pad 3 smd rect (at -1.15 0.475) (size 0.6 0.25) (layers F.Cu F.Paste F.Mask)
       (net 26 /VSYS))
-    (pad 4 smd rect (at -0.75 1.15 180) (size 0.25 0.6) (layers F.Cu F.Paste F.Mask)
+    (pad 4 smd rect (at -0.75 1.15) (size 0.25 0.6) (layers F.Cu F.Paste F.Mask)
       (net 1 GNDREF))
-    (pad 5 smd rect (at -0.25 1.15 180) (size 0.25 0.6) (layers F.Cu F.Paste F.Mask)
+    (pad 5 smd rect (at -0.25 1.15) (size 0.25 0.6) (layers F.Cu F.Paste F.Mask)
       (net 1 GNDREF))
-    (pad 6 smd rect (at 0.25 1.15 180) (size 0.25 0.6) (layers F.Cu F.Paste F.Mask)
+    (pad 6 smd rect (at 0.25 1.15) (size 0.25 0.6) (layers F.Cu F.Paste F.Mask)
       (net 17 /VLOAD))
-    (pad 7 smd rect (at 0.75 1.15 180) (size 0.25 0.6) (layers F.Cu F.Paste F.Mask)
+    (pad 7 smd rect (at 0.75 1.15) (size 0.25 0.6) (layers F.Cu F.Paste F.Mask)
       (net 78 "Net-(JP2-Pad1)"))
-    (pad 8 smd rect (at 1.15 0.475 180) (size 0.6 0.215) (layers F.Cu F.Paste F.Mask)
+    (pad 8 smd rect (at 1.15 0.475) (size 0.6 0.215) (layers F.Cu F.Paste F.Mask)
       (net 1 GNDREF))
-    (pad 9 smd rect (at 0.725 -0.77 180) (size 1.45 0.3) (layers F.Cu F.Paste F.Mask)
+    (pad 9 smd rect (at 0.725 -0.77) (size 1.45 0.3) (layers F.Cu F.Paste F.Mask)
       (net 17 /VLOAD))
-    (pad 2 smd rect (at 0 0.055 180) (size 0.975 0.15) (layers F.Cu F.Paste F.Mask)
+    (pad 2 smd rect (at 0 0.055) (size 0.975 0.15) (layers F.Cu F.Paste F.Mask)
       (net 44 "Net-(L3-Pad2)"))
   )
 

+ 656 - 666
Nixie_Bottom_Board/nixie_bottom_board.net

@@ -1,8 +1,8 @@
 (export (version D)
   (design
-    (source C:/Users/Kevin/Documents/Projects/NixieTubeClock/Nixie_Bottom_Board/nixie_bottom_board.sch)
-    (date "7/1/2018 4:26:08 PM")
-    (tool "Eeschema 4.0.7")
+    (source C:\Users\Kevin\Documents\Projects\NixieTubeClock\Nixie_Bottom_Board\nixie_bottom_board.sch)
+    (date "7/22/2018 6:06:22 PM")
+    (tool "Eeschema (5.0.0)")
     (sheet (number 1) (name /) (tstamps /)
       (title_block
         (title)
@@ -29,563 +29,502 @@
     (comp (ref U7)
       (value STM32L432K)
       (footprint Housings_DFN_QFN:QFN-32-1EP_5x5mm_Pitch0.5mm)
-      (libsource (lib nixie_bottom_board-cache) (part STM32L432K))
+      (libsource (lib "") (part STM32L432K) (description ""))
       (sheetpath (names /) (tstamps /))
       (tstamp 5B073574))
     (comp (ref J1)
       (value USB_C_Receptacle)
       (footprint Connectors_USB:USB_C_Receptacle_Amphenol_12401548E4-2A)
-      (libsource (lib conn) (part USB_C_Receptacle))
+      (libsource (lib "") (part USB_C_Receptacle) (description ""))
       (sheetpath (names /) (tstamps /))
       (tstamp 5B07361E))
     (comp (ref Y1)
       (value 32.78k)
       (footprint Crystals:Crystal_SMD_2520-4pin_2.5x2.0mm)
-      (libsource (lib device) (part Crystal))
+      (libsource (lib Device) (part Crystal) (description "Two pin crystal"))
       (sheetpath (names /) (tstamps /))
       (tstamp 5B073DBF))
     (comp (ref C26)
       (value 10pF)
       (footprint Capacitors_SMD:C_0603)
-      (libsource (lib device) (part C_Small))
+      (libsource (lib Device) (part C_Small) (description "Unpolarized capacitor"))
       (sheetpath (names /) (tstamps /))
       (tstamp 5B073E81))
     (comp (ref C25)
       (value 10pF)
       (footprint Capacitors_SMD:C_0603)
-      (libsource (lib device) (part C_Small))
+      (libsource (lib Device) (part C_Small) (description "Unpolarized capacitor"))
       (sheetpath (names /) (tstamps /))
       (tstamp 5B073EE2))
     (comp (ref J3)
       (value "Tag Connect")
       (footprint "Tag Connect:TC2030-MCP-NL")
-      (libsource (lib conn) (part Conn_02x03_Odd_Even))
+      (libsource (lib "") (part Conn_02x03_Odd_Even) (description ""))
       (sheetpath (names /) (tstamps /))
       (tstamp 5B0740EF))
     (comp (ref BT1)
       (value BAT)
       (footprint Connectors_JST:JST_PH_S2B-PH-SM4-TB_02x2.00mm_Angled)
-      (libsource (lib device) (part Battery_Cell))
+      (libsource (lib Device) (part Battery_Cell) (description "single battery cell"))
       (sheetpath (names /) (tstamps /))
       (tstamp 5B07444B))
     (comp (ref SW4)
       (value SW_Push)
       (footprint Buttons_Switches_SMD:SW_SPST_KMR2)
-      (libsource (lib switches) (part SW_Push))
+      (libsource (lib "") (part SW_Push) (description ""))
       (sheetpath (names /) (tstamps /))
       (tstamp 5B07874F))
     (comp (ref J7)
       (value Nixie_CTRL)
       (footprint "Custom Parts:Pin_Header_Straight_2x03_Pitch2.00mm")
-      (libsource (lib conn) (part Conn_02x03_Odd_Even))
+      (libsource (lib "") (part Conn_02x03_Odd_Even) (description ""))
       (sheetpath (names /) (tstamps /))
       (tstamp 5B0794BA))
     (comp (ref J4)
       (value Nixie_HV)
       (footprint "Custom Parts:Pin_Header_Straight_2x03_Pitch2.00mm")
-      (libsource (lib conn) (part Conn_02x03_Odd_Even))
+      (libsource (lib "") (part Conn_02x03_Odd_Even) (description ""))
       (sheetpath (names /) (tstamps /))
       (tstamp 5B079514))
     (comp (ref C28)
       (value C)
       (footprint Capacitors_SMD:C_0603)
-      (libsource (lib device) (part C_Small))
+      (libsource (lib Device) (part C_Small) (description "Unpolarized capacitor"))
       (sheetpath (names /) (tstamps /))
       (tstamp 5B07ACF8))
     (comp (ref J5)
       (value Conn_01x01)
       (footprint Pin_Headers:Pin_Header_Straight_1x01_Pitch2.54mm)
-      (libsource (lib conn) (part Conn_01x01))
+      (libsource (lib "") (part Conn_01x01) (description ""))
       (sheetpath (names /) (tstamps /))
       (tstamp 5B07B07C))
     (comp (ref J6)
       (value Conn_01x01)
       (footprint Pin_Headers:Pin_Header_Straight_1x01_Pitch2.54mm)
-      (libsource (lib conn) (part Conn_01x01))
+      (libsource (lib "") (part Conn_01x01) (description ""))
       (sheetpath (names /) (tstamps /))
       (tstamp 5B07B125))
     (comp (ref J9)
       (value Conn_01x01)
       (footprint Pin_Headers:Pin_Header_Straight_1x01_Pitch2.54mm)
-      (libsource (lib conn) (part Conn_01x01))
+      (libsource (lib "") (part Conn_01x01) (description ""))
       (sheetpath (names /) (tstamps /))
       (tstamp 5B07B186))
     (comp (ref R17)
       (value 1k)
       (footprint Resistors_SMD:R_0603)
-      (libsource (lib device) (part R))
+      (libsource (lib Device) (part R) (description Resistor))
       (sheetpath (names /) (tstamps /))
       (tstamp 5B07B730))
     (comp (ref R18)
       (value 1k)
       (footprint Resistors_SMD:R_0603)
-      (libsource (lib device) (part R))
+      (libsource (lib Device) (part R) (description Resistor))
       (sheetpath (names /) (tstamps /))
       (tstamp 5B07B7AC))
     (comp (ref R19)
       (value 1k)
       (footprint Resistors_SMD:R_0603)
-      (libsource (lib device) (part R))
+      (libsource (lib Device) (part R) (description Resistor))
       (sheetpath (names /) (tstamps /))
       (tstamp 5B07B818))
     (comp (ref J8)
       (value Conn_01x01)
       (footprint Pin_Headers:Pin_Header_Straight_1x01_Pitch2.54mm)
-      (libsource (lib conn) (part Conn_01x01))
+      (libsource (lib "") (part Conn_01x01) (description ""))
       (sheetpath (names /) (tstamps /))
       (tstamp 5B07BCB9))
     (comp (ref SW1)
       (value SW_Push)
       (footprint Buttons_Switches_SMD:SW_SPST_EVQP7A)
-      (libsource (lib switches) (part SW_Push))
+      (libsource (lib "") (part SW_Push) (description ""))
       (sheetpath (names /) (tstamps /))
       (tstamp 5B07F81C))
     (comp (ref SW2)
       (value SW_Push)
       (footprint Buttons_Switches_SMD:SW_SPST_EVQP7A)
-      (libsource (lib switches) (part SW_Push))
+      (libsource (lib "") (part SW_Push) (description ""))
       (sheetpath (names /) (tstamps /))
       (tstamp 5B07F979))
     (comp (ref SW3)
       (value SW_Push)
       (footprint Buttons_Switches_SMD:SW_SPST_EVQP7A)
-      (libsource (lib switches) (part SW_Push))
+      (libsource (lib "") (part SW_Push) (description ""))
       (sheetpath (names /) (tstamps /))
       (tstamp 5B07F9F1))
     (comp (ref R16)
       (value 1M)
       (footprint Resistors_SMD:R_0603)
-      (libsource (lib device) (part R))
+      (libsource (lib Device) (part R) (description Resistor))
       (sheetpath (names /) (tstamps /))
       (tstamp 5B08854F))
-    (comp (ref U4)
-      (value TUSB320)
-      (footprint "Custom Parts:X2QFN-12_1.6x1.6mm_Pitch0.4mm")
-      (libsource (lib nixie_bottom_board-rescue) (part TUSB320-RESCUE-nixie_bottom_board))
-      (sheetpath (names /) (tstamps /))
-      (tstamp 5B095CC9))
     (comp (ref R9)
       (value 900k)
       (footprint Resistors_SMD:R_0603)
-      (libsource (lib device) (part R))
+      (libsource (lib Device) (part R) (description Resistor))
       (sheetpath (names /) (tstamps /))
       (tstamp 5B096154))
     (comp (ref R14)
       (value 10k)
       (footprint Resistors_SMD:R_0603)
-      (libsource (lib device) (part R))
+      (libsource (lib Device) (part R) (description Resistor))
       (sheetpath (names /) (tstamps /))
       (tstamp 5B0B7874))
     (comp (ref R15)
       (value 10k)
       (footprint Resistors_SMD:R_0603)
-      (libsource (lib device) (part R))
+      (libsource (lib Device) (part R) (description Resistor))
       (sheetpath (names /) (tstamps /))
       (tstamp 5B0B79AE))
     (comp (ref C14)
       (value 100nF)
       (footprint Capacitors_SMD:C_0603)
-      (libsource (lib device) (part C_Small))
+      (libsource (lib Device) (part C_Small) (description "Unpolarized capacitor"))
       (sheetpath (names /) (tstamps /))
       (tstamp 5B0C425E))
     (comp (ref C13)
       (value 47nF)
       (footprint Capacitors_SMD:C_0603)
-      (libsource (lib device) (part C_Small))
+      (libsource (lib Device) (part C_Small) (description "Unpolarized capacitor"))
       (sheetpath (names /) (tstamps /))
       (tstamp 5B0C2749))
     (comp (ref C12)
       (value 4.7uF)
       (footprint Capacitors_SMD:C_0603)
-      (libsource (lib device) (part C_Small))
+      (libsource (lib Device) (part C_Small) (description "Unpolarized capacitor"))
       (sheetpath (names /) (tstamps /))
       (tstamp 5B0C2BAC))
     (comp (ref C9)
       (value 1uF)
       (footprint Capacitors_SMD:C_0603)
-      (libsource (lib device) (part C_Small))
+      (libsource (lib Device) (part C_Small) (description "Unpolarized capacitor"))
       (sheetpath (names /) (tstamps /))
       (tstamp 5B0C33A4))
     (comp (ref D3)
       (value LED)
       (footprint LEDs:LED_0606)
-      (libsource (lib device) (part LED))
+      (libsource (lib Device) (part LED) (description "LED generic"))
       (sheetpath (names /) (tstamps /))
       (tstamp 5B0C55EE))
     (comp (ref R7)
       (value 2.2k)
       (footprint Resistors_SMD:R_0603)
-      (libsource (lib device) (part R))
+      (libsource (lib Device) (part R) (description Resistor))
       (sheetpath (names /) (tstamps /))
       (tstamp 5B0C5697))
     (comp (ref R8)
       (value 260)
       (footprint Resistors_SMD:R_0603)
-      (libsource (lib device) (part R))
+      (libsource (lib Device) (part R) (description Resistor))
       (sheetpath (names /) (tstamps /))
       (tstamp 5B0C68E7))
     (comp (ref TH1)
       (value 103AT)
       (footprint Connectors_JST:JST_PH_S2B-PH-SM4-TB_02x2.00mm_Angled)
-      (libsource (lib device) (part Thermistor))
+      (libsource (lib Device) (part Thermistor) (description "Thermistor, temperature-dependent resistor"))
       (sheetpath (names /) (tstamps /))
       (tstamp 5B0C6F00))
     (comp (ref R11)
       (value 30.31k)
       (footprint Resistors_SMD:R_0603)
-      (libsource (lib device) (part R))
+      (libsource (lib Device) (part R) (description Resistor))
       (sheetpath (names /) (tstamps /))
       (tstamp 5B0C76F2))
     (comp (ref R10)
       (value 5.24k)
       (footprint Resistors_SMD:R_0603)
-      (libsource (lib device) (part R))
+      (libsource (lib Device) (part R) (description Resistor))
       (sheetpath (names /) (tstamps /))
       (tstamp 5B0C7966))
     (comp (ref C11)
       (value 10uF)
       (footprint Capacitors_SMD:C_0805)
-      (libsource (lib device) (part C_Small))
+      (libsource (lib Device) (part C_Small) (description "Unpolarized capacitor"))
       (sheetpath (names /) (tstamps /))
       (tstamp 5B0CC3F6))
     (comp (ref C10)
       (value 47nF)
       (footprint Capacitors_SMD:C_0603)
-      (libsource (lib device) (part C_Small))
+      (libsource (lib Device) (part C_Small) (description "Unpolarized capacitor"))
       (sheetpath (names /) (tstamps /))
       (tstamp 5B0CEA4D))
     (comp (ref L1)
       (value 1uH)
       (footprint Inductors_SMD:L_Taiyo-Yuden_NR-40xx)
-      (libsource (lib device) (part L_Small))
+      (libsource (lib Device) (part L_Small) (description "Inductor, small symbol"))
       (sheetpath (names /) (tstamps /))
       (tstamp 5B0DB40F))
     (comp (ref C15)
       (value 10uF)
       (footprint Capacitors_SMD:C_0805)
-      (libsource (lib device) (part C_Small))
+      (libsource (lib Device) (part C_Small) (description "Unpolarized capacitor"))
       (sheetpath (names /) (tstamps /))
       (tstamp 5B0DC42A))
     (comp (ref C16)
       (value 10uF)
       (footprint Capacitors_SMD:C_0805)
-      (libsource (lib device) (part C_Small))
+      (libsource (lib Device) (part C_Small) (description "Unpolarized capacitor"))
       (sheetpath (names /) (tstamps /))
       (tstamp 5B0DC519))
     (comp (ref C19)
       (value 10uF)
       (footprint Capacitors_SMD:C_0805)
-      (libsource (lib device) (part C_Small))
+      (libsource (lib Device) (part C_Small) (description "Unpolarized capacitor"))
       (sheetpath (names /) (tstamps /))
       (tstamp 5B0DFFED))
     (comp (ref D2)
       (value ESD)
       (footprint Diodes_SMD:D_0603)
-      (libsource (lib device) (part D_Small))
+      (libsource (lib Device) (part D_Small) (description "Diode, small symbol"))
       (sheetpath (names /) (tstamps /))
       (tstamp 5B0E1AC7))
     (comp (ref C20)
       (value 10uF)
       (footprint Capacitors_SMD:C_0805)
-      (libsource (lib device) (part C_Small))
+      (libsource (lib Device) (part C_Small) (description "Unpolarized capacitor"))
       (sheetpath (names /) (tstamps /))
       (tstamp 5B1737BD))
     (comp (ref C24)
       (value 10uF)
       (footprint Capacitors_SMD:C_0805)
-      (libsource (lib device) (part C_Small))
+      (libsource (lib Device) (part C_Small) (description "Unpolarized capacitor"))
       (sheetpath (names /) (tstamps /))
       (tstamp 5B1732A3))
     (comp (ref L2)
       (value 1uH)
       (footprint Inductors_SMD:L_Taiyo-Yuden_NR-40xx)
-      (libsource (lib device) (part L_Small))
+      (libsource (lib Device) (part L_Small) (description "Inductor, small symbol"))
       (sheetpath (names /) (tstamps /))
       (tstamp 5B16755A))
     (comp (ref U5)
       (value TPS63025X)
       (footprint "Custom Parts:VQFN-14_2.5x3mm_Pitch0.5mm")
-      (libsource (lib Custom_Parts) (part TPS63025X))
+      (libsource (lib Custom_Parts) (part TPS63025X) (description ""))
       (sheetpath (names /) (tstamps /))
       (tstamp 5B1672A1))
     (comp (ref C17)
       (value 1uF)
       (footprint Capacitors_SMD:C_0603)
-      (libsource (lib device) (part C_Small))
+      (libsource (lib Device) (part C_Small) (description "Unpolarized capacitor"))
       (sheetpath (names /) (tstamps /))
       (tstamp 5B15DD3E))
     (comp (ref L3)
       (value 1uH)
       (footprint Inductors_SMD:L_Taiyo-Yuden_NR-40xx)
-      (libsource (lib device) (part L_Small))
+      (libsource (lib Device) (part L_Small) (description "Inductor, small symbol"))
       (sheetpath (names /) (tstamps /))
       (tstamp 5B15730D))
     (comp (ref U6)
       (value TPS61235)
       (footprint "Custom Parts:VQFN-9_2.5x2.5mm_Pitch0.5mm")
-      (libsource (lib Custom_Parts) (part TPS61235))
+      (libsource (lib Custom_Parts) (part TPS61235) (description ""))
       (sheetpath (names /) (tstamps /))
       (tstamp 5B154033))
     (comp (ref JP2)
       (value Jumper_5V)
       (footprint "Custom Parts:SMD_Jumper")
-      (libsource (lib device) (part Jumper_NC_Small))
+      (libsource (lib Device) (part Jumper_NC_Small) (description "Jumper, normally closed"))
       (sheetpath (names /) (tstamps /))
       (tstamp 5B0D8B1E))
     (comp (ref D4)
       (value LOAD)
       (footprint Diodes_SMD:D_0805)
-      (libsource (lib device) (part D_Small))
+      (libsource (lib Device) (part D_Small) (description "Diode, small symbol"))
       (sheetpath (names /) (tstamps /))
       (tstamp 5B0E37FA))
     (comp (ref J2)
       (value TEST_BAT)
       (footprint Measurement_Points:Test_Point_2Pads)
-      (libsource (lib conn) (part TEST_2P))
+      (libsource (lib "") (part TEST_2P) (description ""))
       (sheetpath (names /) (tstamps /))
       (tstamp 5B0E5826))
     (comp (ref J10)
       (value Backlight)
       (footprint "Custom Parts:Pin_Header_Straight_2x03_Pitch2.00mm")
-      (libsource (lib conn) (part Conn_02x03_Odd_Even))
+      (libsource (lib "") (part Conn_02x03_Odd_Even) (description ""))
       (sheetpath (names /) (tstamps /))
       (tstamp 5B0EA735))
     (comp (ref JP1)
       (value Jumper_5V)
       (footprint "Custom Parts:SMD_Jumper")
-      (libsource (lib device) (part Jumper_NC_Small))
+      (libsource (lib Device) (part Jumper_NC_Small) (description "Jumper, normally closed"))
       (sheetpath (names /) (tstamps /))
       (tstamp 5B0F1B1A))
     (comp (ref U2)
       (value BQ25890)
       (footprint Housings_DFN_QFN:QFN-24-1EP_4x4mm_Pitch0.5mm)
-      (libsource (lib Custom_Parts) (part BQ25890))
+      (libsource (lib Custom_Parts) (part BQ25890) (description ""))
       (sheetpath (names /) (tstamps /))
       (tstamp 5B0BF1F9))
     (comp (ref C18)
       (value 1uF)
       (footprint Capacitors_SMD:C_0603)
-      (libsource (lib device) (part C_Small))
+      (libsource (lib Device) (part C_Small) (description "Unpolarized capacitor"))
       (sheetpath (names /) (tstamps /))
       (tstamp 5B0C9515))
     (comp (ref R12)
       (value 1M)
       (footprint Resistors_SMD:R_0603)
-      (libsource (lib device) (part R))
+      (libsource (lib Device) (part R) (description Resistor))
       (sheetpath (names /) (tstamps /))
       (tstamp 5B0D9940))
     (comp (ref C21)
       (value 10uF)
       (footprint Capacitors_SMD:C_0805)
-      (libsource (lib device) (part C_Small))
+      (libsource (lib Device) (part C_Small) (description "Unpolarized capacitor"))
       (sheetpath (names /) (tstamps /))
       (tstamp 5B134F37))
     (comp (ref C22)
       (value 10uF)
       (footprint Capacitors_SMD:C_0805)
-      (libsource (lib device) (part C_Small))
+      (libsource (lib Device) (part C_Small) (description "Unpolarized capacitor"))
       (sheetpath (names /) (tstamps /))
       (tstamp 5B1350D4))
     (comp (ref C23)
       (value 10uF)
       (footprint Capacitors_SMD:C_0805)
-      (libsource (lib device) (part C_Small))
+      (libsource (lib Device) (part C_Small) (description "Unpolarized capacitor"))
       (sheetpath (names /) (tstamps /))
       (tstamp 5B141DBB))
     (comp (ref C27)
       (value 1uF)
       (footprint Capacitors_SMD:C_0603)
-      (libsource (lib device) (part C_Small))
+      (libsource (lib Device) (part C_Small) (description "Unpolarized capacitor"))
       (sheetpath (names /) (tstamps /))
       (tstamp 5B143B7A))
     (comp (ref R13)
       (value 10k)
       (footprint Resistors_SMD:R_0603)
-      (libsource (lib device) (part R))
+      (libsource (lib Device) (part R) (description Resistor))
       (sheetpath (names /) (tstamps /))
       (tstamp 5B1468ED))
     (comp (ref U8)
       (value LMV321)
       (footprint TO_SOT_Packages_SMD:SOT-23-5)
-      (libsource (lib linear) (part LMV321))
+      (libsource (lib "") (part LMV321) (description ""))
       (sheetpath (names /) (tstamps /))
       (tstamp 5B2CC27E))
     (comp (ref U3)
       (value TPD8S300)
       (footprint Housings_DFN_QFN:UQFN-20-1EP_3x3mm_Pitch0.4mm)
-      (libsource (lib Custom_Parts) (part TPD8S300))
+      (libsource (lib Custom_Parts) (part TPD8S300) (description ""))
       (sheetpath (names /) (tstamps /))
       (tstamp 5B394534))
+    (comp (ref U4)
+      (value TUSB320)
+      (libsource (lib Custom_Parts) (part TUSB320) (description ""))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 5B5B1CD3))
     (comp (ref T1)
       (value Wurth_Transformer_10.16x13.36mm)
       (footprint "Custom Parts:Wurth_WE-FB_10.18x13.36mm")
-      (libsource (lib Custom_Parts) (part Wurth_Transformer_10.16x13.36mm))
+      (libsource (lib Custom_Parts) (part Wurth_Transformer_10.16x13.36mm) (description ""))
       (sheetpath (names "/HV Power Supply/") (tstamps /5B07197A/))
       (tstamp 5A6B88EA))
     (comp (ref R2)
       (value R_VC)
       (footprint Resistors_SMD:R_0603)
-      (libsource (lib device) (part R))
+      (libsource (lib Device) (part R) (description Resistor))
       (sheetpath (names "/HV Power Supply/") (tstamps /5B07197A/))
       (tstamp 5A6B8978))
     (comp (ref C3)
       (value C_VC)
       (footprint Capacitors_SMD:C_0603)
-      (libsource (lib device) (part C))
+      (libsource (lib Device) (part C) (description "Unpolarized capacitor"))
       (sheetpath (names "/HV Power Supply/") (tstamps /5B07197A/))
       (tstamp 5A6B89DB))
     (comp (ref Q1)
       (value Q_SWITCH)
       (footprint "Custom Parts:EPC2016C")
-      (libsource (lib device) (part Q_NMOS_DGS))
+      (libsource (lib Device) (part Q_NMOS_DGS) (description "Transistor N-MOSFET (general)"))
       (sheetpath (names "/HV Power Supply/") (tstamps /5B07197A/))
       (tstamp 5A6B8B05))
     (comp (ref R4)
       (value R_SENSE)
       (footprint Resistors_SMD:R_0805)
-      (libsource (lib device) (part R))
+      (libsource (lib Device) (part R) (description Resistor))
       (sheetpath (names "/HV Power Supply/") (tstamps /5B07197A/))
       (tstamp 5A6B8B69))
     (comp (ref D1)
       (value D_RECT)
       (footprint "Custom Parts:SOD-123W")
-      (libsource (lib device) (part D))
+      (libsource (lib Device) (part D) (description Diode))
       (sheetpath (names "/HV Power Supply/") (tstamps /5B07197A/))
       (tstamp 5A6B91C6))
     (comp (ref C5)
       (value C_OUT)
       (footprint Capacitors_SMD:C_2220)
-      (libsource (lib device) (part C))
+      (libsource (lib Device) (part C) (description "Unpolarized capacitor"))
       (sheetpath (names "/HV Power Supply/") (tstamps /5B07197A/))
       (tstamp 5A6B92D0))
     (comp (ref C6)
       (value C_OUT)
       (footprint Capacitors_SMD:C_1812)
-      (libsource (lib device) (part C))
+      (libsource (lib Device) (part C) (description "Unpolarized capacitor"))
       (sheetpath (names "/HV Power Supply/") (tstamps /5B07197A/))
       (tstamp 5A6B93C6))
     (comp (ref R5)
       (value R_FB)
       (footprint Resistors_SMD:R_0603)
-      (libsource (lib device) (part R))
+      (libsource (lib Device) (part R) (description Resistor))
       (sheetpath (names "/HV Power Supply/") (tstamps /5B07197A/))
       (tstamp 5A6B9F37))
     (comp (ref R3)
       (value R_BIAS)
       (footprint Resistors_SMD:R_0603)
-      (libsource (lib device) (part R))
+      (libsource (lib Device) (part R) (description Resistor))
       (sheetpath (names "/HV Power Supply/") (tstamps /5B07197A/))
       (tstamp 5A6B9FBA))
     (comp (ref C7)
       (value C_BP)
       (footprint Capacitors_SMD:C_0603)
-      (libsource (lib device) (part C))
+      (libsource (lib Device) (part C) (description "Unpolarized capacitor"))
       (sheetpath (names "/HV Power Supply/") (tstamps /5B07197A/))
       (tstamp 5A6BA4CA))
     (comp (ref R1)
       (value R_FREQ)
       (footprint Resistors_SMD:R_0603)
-      (libsource (lib device) (part R))
+      (libsource (lib Device) (part R) (description Resistor))
       (sheetpath (names "/HV Power Supply/") (tstamps /5B07197A/))
       (tstamp 5A6BAAF4))
     (comp (ref C2)
       (value C_IN)
       (footprint Capacitors_SMD:C_0805)
-      (libsource (lib device) (part C))
+      (libsource (lib Device) (part C) (description "Unpolarized capacitor"))
       (sheetpath (names "/HV Power Supply/") (tstamps /5B07197A/))
       (tstamp 5A6C0FBE))
     (comp (ref C1)
       (value C_IN)
       (footprint Capacitors_SMD:C_1210)
-      (libsource (lib device) (part C))
+      (libsource (lib Device) (part C) (description "Unpolarized capacitor"))
       (sheetpath (names "/HV Power Supply/") (tstamps /5B07197A/))
       (tstamp 5A6C10DF))
     (comp (ref C4)
       (value C_SS)
       (footprint Capacitors_SMD:C_0603)
-      (libsource (lib device) (part C))
+      (libsource (lib Device) (part C) (description "Unpolarized capacitor"))
       (sheetpath (names "/HV Power Supply/") (tstamps /5B07197A/))
       (tstamp 5A6C6769))
     (comp (ref R6)
       (value R_GATE)
       (footprint Resistors_SMD:R_0603)
-      (libsource (lib device) (part R))
+      (libsource (lib Device) (part R) (description Resistor))
       (sheetpath (names "/HV Power Supply/") (tstamps /5B07197A/))
       (tstamp 5A8E442D))
     (comp (ref U1)
       (value LTC3759)
       (footprint Housings_SSOP:MSOP-12-1EP_3x4mm_Pitch0.65mm)
-      (libsource (lib Custom_Parts) (part LTC3759))
+      (libsource (lib Custom_Parts) (part LTC3759) (description ""))
       (sheetpath (names "/HV Power Supply/") (tstamps /5B07197A/))
       (tstamp 5A6BF1D9))
     (comp (ref C8)
       (value C_IN)
       (footprint Capacitors_SMD:C_1210)
-      (libsource (lib device) (part C))
+      (libsource (lib Device) (part C) (description "Unpolarized capacitor"))
       (sheetpath (names "/HV Power Supply/") (tstamps /5B07197A/))
       (tstamp 5A911DC8)))
   (libparts
-    (libpart (lib Custom_Parts) (part BQ25890)
-      (fields
-        (field (name Reference) U)
-        (field (name Value) BQ25890))
-      (pins
-        (pin (num 1) (name VBUS) (type input))
-        (pin (num 2) (name D+) (type input))
-        (pin (num 3) (name D-) (type input))
-        (pin (num 4) (name STAT) (type input))
-        (pin (num 5) (name SCL) (type input))
-        (pin (num 6) (name SDA) (type input))
-        (pin (num 7) (name INT) (type input))
-        (pin (num 8) (name OTG) (type input))
-        (pin (num 9) (name nCE) (type input))
-        (pin (num 10) (name ILIM) (type input))
-        (pin (num 11) (name TS) (type input))
-        (pin (num 12) (name nQON) (type input))
-        (pin (num 13) (name BAT) (type input))
-        (pin (num 14) (name BAT) (type input))
-        (pin (num 15) (name SYS) (type input))
-        (pin (num 16) (name SYS) (type input))
-        (pin (num 17) (name PGND) (type input))
-        (pin (num 18) (name PGND) (type input))
-        (pin (num 19) (name SW) (type input))
-        (pin (num 20) (name SW) (type input))
-        (pin (num 21) (name BTST) (type input))
-        (pin (num 22) (name REGN) (type input))
-        (pin (num 23) (name PMID) (type input))
-        (pin (num 24) (name DSEL) (type input))
-        (pin (num 25) (name EP) (type input))))
-    (libpart (lib device) (part Battery_Cell)
-      (description "single battery cell")
-      (fields
-        (field (name Reference) BT)
-        (field (name Value) Battery_Cell))
-      (pins
-        (pin (num 1) (name +) (type passive))
-        (pin (num 2) (name -) (type passive))))
-    (libpart (lib device) (part C)
-      (description "Unpolarized capacitor")
-      (footprints
-        (fp C_*))
-      (fields
-        (field (name Reference) C)
-        (field (name Value) C))
-      (pins
-        (pin (num 1) (name ~) (type passive))
-        (pin (num 2) (name ~) (type passive))))
-    (libpart (lib device) (part C_Small)
-      (description "Unpolarized capacitor")
-      (footprints
-        (fp C_*))
-      (fields
-        (field (name Reference) C)
-        (field (name Value) C_Small))
-      (pins
-        (pin (num 1) (name ~) (type passive))
-        (pin (num 2) (name ~) (type passive))))
-    (libpart (lib conn) (part Conn_01x01)
-      (description "Generic connector, single row, 01x01")
-      (docs ~)
+    (libpart (lib "") (part conn:Conn_01x01)
       (footprints
         (fp Connector*:*_??x*mm*)
         (fp Connector*:*1x??x*mm*)
@@ -595,12 +534,10 @@
         (fp Socket?Strip?Angled?1X*))
       (fields
         (field (name Reference) J)
-        (field (name Value) Conn_01x01))
+        (field (name Value) conn:Conn_01x01))
       (pins
         (pin (num 1) (name Pin_1) (type passive))))
-    (libpart (lib conn) (part Conn_02x03_Odd_Even)
-      (description "Generic connector, double row, 02x03, odd/even pin numbering scheme (row 1 odd numbers, row 2 even numbers)")
-      (docs ~)
+    (libpart (lib "") (part conn:Conn_02x03_Odd_Even)
       (footprints
         (fp Connector*:*2x??x*mm*)
         (fp Connector*:*2x???Pitch*)
@@ -610,7 +547,7 @@
         (fp Socket_Strip_Angled_2X*))
       (fields
         (field (name Reference) J)
-        (field (name Value) Conn_02x03_Odd_Even))
+        (field (name Value) conn:Conn_02x03_Odd_Even))
       (pins
         (pin (num 1) (name Pin_1) (type passive))
         (pin (num 2) (name Pin_2) (type passive))
@@ -618,137 +555,67 @@
         (pin (num 4) (name Pin_4) (type passive))
         (pin (num 5) (name Pin_5) (type passive))
         (pin (num 6) (name Pin_6) (type passive))))
-    (libpart (lib device) (part Crystal)
-      (description "Two pin crystal")
-      (footprints
-        (fp Crystal*))
-      (fields
-        (field (name Reference) Y)
-        (field (name Value) Crystal))
-      (pins
-        (pin (num 1) (name 1) (type passive))
-        (pin (num 2) (name 2) (type passive))))
-    (libpart (lib device) (part D)
-      (description Diode)
-      (footprints
-        (fp TO-???*)
-        (fp *SingleDiode)
-        (fp *_Diode_*)
-        (fp *SingleDiode*)
-        (fp D_*))
-      (fields
-        (field (name Reference) D)
-        (field (name Value) D))
-      (pins
-        (pin (num 1) (name K) (type passive))
-        (pin (num 2) (name A) (type passive))))
-    (libpart (lib device) (part D_Small)
-      (description "Diode, small symbol")
-      (footprints
-        (fp TO-???*)
-        (fp *SingleDiode)
-        (fp *_Diode_*)
-        (fp *SingleDiode*)
-        (fp D_*))
-      (fields
-        (field (name Reference) D)
-        (field (name Value) D_Small))
-      (pins
-        (pin (num 1) (name K) (type passive))
-        (pin (num 2) (name A) (type passive))))
-    (libpart (lib device) (part Jumper_NC_Small)
-      (description "Jumper, normally closed")
+    (libpart (lib "") (part conn:TEST_2P)
       (fields
-        (field (name Reference) JP)
-        (field (name Value) Jumper_NC_Small))
+        (field (name Reference) J)
+        (field (name Value) conn:TEST_2P))
       (pins
         (pin (num 1) (name 1) (type passive))
         (pin (num 2) (name 2) (type passive))))
-    (libpart (lib device) (part LED)
-      (description "LED generic")
+    (libpart (lib "") (part conn:USB_C_Receptacle)
       (footprints
-        (fp LED*))
+        (fp USB*C*Receptacle*))
       (fields
-        (field (name Reference) D)
-        (field (name Value) LED))
+        (field (name Reference) J)
+        (field (name Value) conn:USB_C_Receptacle))
       (pins
-        (pin (num 1) (name K) (type passive))
-        (pin (num 2) (name A) (type passive))))
-    (libpart (lib linear) (part LMV321)
+        (pin (num A1) (name GND) (type power_in))
+        (pin (num A2) (name TX1+) (type BiDi))
+        (pin (num A3) (name TX1-) (type BiDi))
+        (pin (num A4) (name VBUS) (type power_in))
+        (pin (num A5) (name CC1) (type BiDi))
+        (pin (num A6) (name D+) (type BiDi))
+        (pin (num A7) (name D-) (type BiDi))
+        (pin (num A8) (name SBU1) (type BiDi))
+        (pin (num A9) (name VBUS) (type power_in))
+        (pin (num A10) (name RX2-) (type BiDi))
+        (pin (num A11) (name RX2+) (type BiDi))
+        (pin (num A12) (name GND) (type power_in))
+        (pin (num B1) (name GND) (type power_in))
+        (pin (num B2) (name TX2+) (type BiDi))
+        (pin (num B3) (name TX2-) (type BiDi))
+        (pin (num B4) (name VBUS) (type power_in))
+        (pin (num B5) (name CC2) (type BiDi))
+        (pin (num B6) (name D+) (type BiDi))
+        (pin (num B7) (name D-) (type BiDi))
+        (pin (num B8) (name SBU2) (type BiDi))
+        (pin (num B9) (name VBUS) (type power_in))
+        (pin (num B10) (name RX1-) (type BiDi))
+        (pin (num B11) (name RX1+) (type BiDi))
+        (pin (num B12) (name GND) (type power_in))
+        (pin (num S1) (name SHIELD) (type passive))))
+    (libpart (lib "") (part linear:LMV321)
       (aliases
         (alias MCP6561U)
         (alias MCP6001U)
         (alias OPA333xxDCK)
         (alias OPA376xxDCK))
-      (description "Low-Voltage Rail-to-Rail Output Operational Amplifiers, SOT-23-5/SC-70-5")
-      (docs http://www.ti.com/lit/ds/symlink/lmv324.pdf)
       (footprints
         (fp SOT*23*)
         (fp *SC*70*))
       (fields
         (field (name Reference) U)
-        (field (name Value) LMV321))
+        (field (name Value) linear:LMV321))
       (pins
         (pin (num 1) (name +) (type input))
         (pin (num 2) (name V-) (type power_in))
         (pin (num 3) (name -) (type input))
         (pin (num 4) (name ~) (type output))
         (pin (num 5) (name V+) (type power_in))))
-    (libpart (lib Custom_Parts) (part LTC3759)
-      (fields
-        (field (name Reference) U)
-        (field (name Value) LTC3759))
-      (pins
-        (pin (num 1) (name VC) (type input))
-        (pin (num 2) (name FBX) (type input))
-        (pin (num 3) (name SS) (type input))
-        (pin (num 4) (name RT) (type input))
-        (pin (num 5) (name SYNC) (type input))
-        (pin (num 6) (name PGOOD) (type input))
-        (pin (num 7) (name SENSE) (type input))
-        (pin (num 8) (name GATE) (type output))
-        (pin (num 9) (name INTVCC) (type input))
-        (pin (num 10) (name DRIVE) (type input))
-        (pin (num 11) (name VIN) (type input))
-        (pin (num 12) (name EN) (type input))
-        (pin (num 13) (name GND) (type output))))
-    (libpart (lib device) (part L_Small)
-      (description "Inductor, small symbol")
-      (footprints
-        (fp Choke_*)
-        (fp *Coil*)
-        (fp Inductor_*)
-        (fp L_*))
-      (fields
-        (field (name Reference) L)
-        (field (name Value) L_Small))
-      (pins
-        (pin (num 1) (name ~) (type passive))
-        (pin (num 2) (name ~) (type passive))))
-    (libpart (lib device) (part Q_NMOS_DGS)
-      (description "Transistor N-MOSFET (general)")
-      (fields
-        (field (name Reference) Q)
-        (field (name Value) Q_NMOS_DGS))
-      (pins
-        (pin (num 1) (name D) (type passive))
-        (pin (num 2) (name G) (type input))
-        (pin (num 3) (name S) (type passive))))
-    (libpart (lib device) (part R)
-      (description Resistor)
-      (footprints
-        (fp R_*)
-        (fp R_*))
-      (fields
-        (field (name Reference) R)
-        (field (name Value) R))
-      (pins
-        (pin (num 1) (name ~) (type passive))
-        (pin (num 2) (name ~) (type passive))))
-    (libpart (lib nixie_bottom_board-cache) (part STM32L432K)
+    (libpart (lib "") (part nixie_bottom_board-rescue:STM32L432K)
       (fields
         (field (name Reference) U)
-        (field (name Value) STM32L432K))
+        (field (name Value) nixie_bottom_board-rescue:STM32L432K))
       (pins
         (pin (num 1) (name VDD) (type input))
         (pin (num 2) (name PC14/OSC) (type input))
@@ -782,22 +649,61 @@
         (pin (num 30) (name PB7) (type input))
         (pin (num 31) (name PH3/BOOT0) (type input))
         (pin (num 32) (name VSS) (type input))))
-    (libpart (lib switches) (part SW_Push)
-      (description "Push button switch, generic, two pins")
+    (libpart (lib "") (part switches:SW_Push)
       (fields
         (field (name Reference) SW)
-        (field (name Value) SW_Push))
+        (field (name Value) switches:SW_Push))
       (pins
         (pin (num 1) (name 1) (type passive))
         (pin (num 2) (name 2) (type passive))))
-    (libpart (lib conn) (part TEST_2P)
-      (description point)
+    (libpart (lib Custom_Parts) (part BQ25890)
       (fields
-        (field (name Reference) J)
-        (field (name Value) TEST_2P))
+        (field (name Reference) U)
+        (field (name Value) BQ25890))
       (pins
-        (pin (num 1) (name 1) (type passive))
-        (pin (num 2) (name 2) (type passive))))
+        (pin (num 1) (name VBUS) (type input))
+        (pin (num 2) (name D+) (type input))
+        (pin (num 3) (name D-) (type input))
+        (pin (num 4) (name STAT) (type input))
+        (pin (num 5) (name SCL) (type input))
+        (pin (num 6) (name SDA) (type input))
+        (pin (num 7) (name INT) (type input))
+        (pin (num 8) (name OTG) (type input))
+        (pin (num 9) (name nCE) (type input))
+        (pin (num 10) (name ILIM) (type input))
+        (pin (num 11) (name TS) (type input))
+        (pin (num 12) (name nQON) (type input))
+        (pin (num 13) (name BAT) (type input))
+        (pin (num 14) (name BAT) (type input))
+        (pin (num 15) (name SYS) (type input))
+        (pin (num 16) (name SYS) (type input))
+        (pin (num 17) (name PGND) (type input))
+        (pin (num 18) (name PGND) (type input))
+        (pin (num 19) (name SW) (type input))
+        (pin (num 20) (name SW) (type input))
+        (pin (num 21) (name BTST) (type input))
+        (pin (num 22) (name REGN) (type input))
+        (pin (num 23) (name PMID) (type input))
+        (pin (num 24) (name DSEL) (type input))
+        (pin (num 25) (name EP) (type input))))
+    (libpart (lib Custom_Parts) (part LTC3759)
+      (fields
+        (field (name Reference) U)
+        (field (name Value) LTC3759))
+      (pins
+        (pin (num 1) (name VC) (type input))
+        (pin (num 2) (name FBX) (type input))
+        (pin (num 3) (name SS) (type input))
+        (pin (num 4) (name RT) (type input))
+        (pin (num 5) (name SYNC) (type input))
+        (pin (num 6) (name PGOOD) (type input))
+        (pin (num 7) (name SENSE) (type input))
+        (pin (num 8) (name GATE) (type output))
+        (pin (num 9) (name INTVCC) (type input))
+        (pin (num 10) (name DRIVE) (type input))
+        (pin (num 11) (name VIN) (type input))
+        (pin (num 12) (name EN) (type input))
+        (pin (num 13) (name GND) (type output))))
     (libpart (lib Custom_Parts) (part TPD8S300)
       (fields
         (field (name Reference) U)
@@ -857,10 +763,10 @@
         (pin (num 12) (name VOUT) (type input))
         (pin (num 13) (name VOUT) (type input))
         (pin (num 14) (name VOUT) (type input))))
-    (libpart (lib nixie_bottom_board-rescue) (part TUSB320-RESCUE-nixie_bottom_board)
+    (libpart (lib Custom_Parts) (part TUSB320)
       (fields
         (field (name Reference) U)
-        (field (name Value) TUSB320-RESCUE-nixie_bottom_board))
+        (field (name Value) TUSB320))
       (pins
         (pin (num 1) (name CC1) (type input))
         (pin (num 2) (name CC2) (type input))
@@ -874,470 +780,554 @@
         (pin (num 10) (name GND) (type input))
         (pin (num 11) (name nEN) (type input))
         (pin (num 12) (name VCC) (type input))))
-    (libpart (lib device) (part Thermistor)
-      (description "Thermistor, temperature-dependent resistor")
+    (libpart (lib Custom_Parts) (part Wurth_Transformer_10.16x13.36mm)
+      (fields
+        (field (name Reference) T)
+        (field (name Value) Wurth_Transformer_10.16x13.36mm))
+      (pins
+        (pin (num 1) (name ~) (type input))
+        (pin (num 2) (name ~) (type input))
+        (pin (num 3) (name ~) (type input))
+        (pin (num 4) (name ~) (type input))
+        (pin (num 6) (name ~) (type input))))
+    (libpart (lib Device) (part Battery_Cell)
+      (description "single battery cell")
+      (docs ~)
+      (fields
+        (field (name Reference) BT)
+        (field (name Value) Battery_Cell))
+      (pins
+        (pin (num 1) (name +) (type passive))
+        (pin (num 2) (name -) (type passive))))
+    (libpart (lib Device) (part C)
+      (description "Unpolarized capacitor")
+      (docs ~)
       (footprints
-        (fp R_*)
-        (fp SM0603)
-        (fp SM0805))
+        (fp C_*))
       (fields
-        (field (name Reference) TH)
-        (field (name Value) Thermistor))
+        (field (name Reference) C)
+        (field (name Value) C))
       (pins
         (pin (num 1) (name ~) (type passive))
         (pin (num 2) (name ~) (type passive))))
-    (libpart (lib conn) (part USB_C_Receptacle)
-      (description "USB Type-C Receptacle connector")
-      (docs http://www.usb.org/developers/docs/usb_31_033017.zip)
+    (libpart (lib Device) (part C_Small)
+      (description "Unpolarized capacitor")
+      (docs ~)
       (footprints
-        (fp USB*C*Receptacle*))
+        (fp C_*))
       (fields
-        (field (name Reference) J)
-        (field (name Value) USB_C_Receptacle))
+        (field (name Reference) C)
+        (field (name Value) C_Small))
       (pins
-        (pin (num A1) (name GND) (type power_in))
-        (pin (num A2) (name TX1+) (type BiDi))
-        (pin (num A3) (name TX1-) (type BiDi))
-        (pin (num A4) (name VBUS) (type power_in))
-        (pin (num A5) (name CC1) (type BiDi))
-        (pin (num A6) (name D+) (type BiDi))
-        (pin (num A7) (name D-) (type BiDi))
-        (pin (num A8) (name SBU1) (type BiDi))
-        (pin (num A9) (name VBUS) (type power_in))
-        (pin (num A10) (name RX2-) (type BiDi))
-        (pin (num A11) (name RX2+) (type BiDi))
-        (pin (num A12) (name GND) (type power_in))
-        (pin (num B1) (name GND) (type power_in))
-        (pin (num B2) (name TX2+) (type BiDi))
-        (pin (num B3) (name TX2-) (type BiDi))
-        (pin (num B4) (name VBUS) (type power_in))
-        (pin (num B5) (name CC2) (type BiDi))
-        (pin (num B6) (name D+) (type BiDi))
-        (pin (num B7) (name D-) (type BiDi))
-        (pin (num B8) (name SBU2) (type BiDi))
-        (pin (num B9) (name VBUS) (type power_in))
-        (pin (num B10) (name RX1-) (type BiDi))
-        (pin (num B11) (name RX1+) (type BiDi))
-        (pin (num B12) (name GND) (type power_in))
-        (pin (num S1) (name SHIELD) (type passive))))
-    (libpart (lib Custom_Parts) (part Wurth_Transformer_10.16x13.36mm)
+        (pin (num 1) (name ~) (type passive))
+        (pin (num 2) (name ~) (type passive))))
+    (libpart (lib Device) (part Crystal)
+      (description "Two pin crystal")
+      (docs ~)
+      (footprints
+        (fp Crystal*))
       (fields
-        (field (name Reference) T)
-        (field (name Value) Wurth_Transformer_10.16x13.36mm))
+        (field (name Reference) Y)
+        (field (name Value) Crystal))
       (pins
-        (pin (num 1) (name ~) (type input))
-        (pin (num 2) (name ~) (type input))
-        (pin (num 3) (name ~) (type input))
-        (pin (num 4) (name ~) (type input))
-        (pin (num 6) (name ~) (type input)))))
+        (pin (num 1) (name 1) (type passive))
+        (pin (num 2) (name 2) (type passive))))
+    (libpart (lib Device) (part D)
+      (description Diode)
+      (docs ~)
+      (footprints
+        (fp TO-???*)
+        (fp *_Diode_*)
+        (fp *SingleDiode*)
+        (fp D_*))
+      (fields
+        (field (name Reference) D)
+        (field (name Value) D))
+      (pins
+        (pin (num 1) (name K) (type passive))
+        (pin (num 2) (name A) (type passive))))
+    (libpart (lib Device) (part D_Small)
+      (description "Diode, small symbol")
+      (docs ~)
+      (footprints
+        (fp TO-???*)
+        (fp *_Diode_*)
+        (fp *SingleDiode*)
+        (fp D_*))
+      (fields
+        (field (name Reference) D)
+        (field (name Value) D_Small))
+      (pins
+        (pin (num 1) (name K) (type passive))
+        (pin (num 2) (name A) (type passive))))
+    (libpart (lib Device) (part Jumper_NC_Small)
+      (description "Jumper, normally closed")
+      (docs ~)
+      (fields
+        (field (name Reference) JP)
+        (field (name Value) Jumper_NC_Small))
+      (pins
+        (pin (num 1) (name 1) (type passive))
+        (pin (num 2) (name 2) (type passive))))
+    (libpart (lib Device) (part LED)
+      (description "LED generic")
+      (docs ~)
+      (footprints
+        (fp LED*)
+        (fp LED_SMD:*)
+        (fp LED_THT:*))
+      (fields
+        (field (name Reference) D)
+        (field (name Value) LED))
+      (pins
+        (pin (num 1) (name K) (type passive))
+        (pin (num 2) (name A) (type passive))))
+    (libpart (lib Device) (part L_Small)
+      (description "Inductor, small symbol")
+      (docs ~)
+      (footprints
+        (fp Choke_*)
+        (fp *Coil*)
+        (fp Inductor_*)
+        (fp L_*))
+      (fields
+        (field (name Reference) L)
+        (field (name Value) L_Small))
+      (pins
+        (pin (num 1) (name ~) (type passive))
+        (pin (num 2) (name ~) (type passive))))
+    (libpart (lib Device) (part Q_NMOS_DGS)
+      (description "Transistor N-MOSFET (general)")
+      (docs ~)
+      (fields
+        (field (name Reference) Q)
+        (field (name Value) Q_NMOS_DGS))
+      (pins
+        (pin (num 1) (name D) (type passive))
+        (pin (num 2) (name G) (type input))
+        (pin (num 3) (name S) (type passive))))
+    (libpart (lib Device) (part R)
+      (description Resistor)
+      (docs ~)
+      (footprints
+        (fp R_*))
+      (fields
+        (field (name Reference) R)
+        (field (name Value) R))
+      (pins
+        (pin (num 1) (name ~) (type passive))
+        (pin (num 2) (name ~) (type passive))))
+    (libpart (lib Device) (part Thermistor)
+      (description "Thermistor, temperature-dependent resistor")
+      (docs ~)
+      (footprints
+        (fp R_*))
+      (fields
+        (field (name Reference) TH)
+        (field (name Value) Thermistor))
+      (pins
+        (pin (num 1) (name ~) (type passive))
+        (pin (num 2) (name ~) (type passive)))))
   (libraries
-    (library (logical nixie_bottom_board-rescue)
-      (uri C:\Users\Kevin\Documents\Projects\NixieTubeClock\Nixie_Bottom_Board\nixie_bottom_board-rescue.lib))
-    (library (logical device)
-      (uri "C:\\Program Files\\KiCad\\share\\kicad\\library\\device.lib"))
-    (library (logical switches)
-      (uri "C:\\Program Files\\KiCad\\share\\kicad\\library\\switches.lib"))
-    (library (logical linear)
-      (uri "C:\\Program Files\\KiCad\\share\\kicad\\library\\linear.lib"))
-    (library (logical conn)
-      (uri "C:\\Program Files\\KiCad\\share\\kicad\\library\\conn.lib"))
     (library (logical Custom_Parts)
-      (uri C:\Users\Kevin\Documents\Projects\KiCadLib\EESCHEMA\Custom_Parts.lib))
-    (library (logical nixie_bottom_board-cache)
-      (uri C:\Users\Kevin\Documents\Projects\NixieTubeClock\Nixie_Bottom_Board\nixie_bottom_board-cache.lib)))
+      (uri C:/Users/Kevin/Documents/Projects/KiCadLib/EESCHEMA/Custom_Parts.lib))
+    (library (logical Device)
+      (uri "C:\\Program Files\\KiCad\\share\\kicad\\library/Device.lib")))
   (nets
-    (net (code 1) (name "Net-(C10-Pad1)")
-      (node (ref C10) (pin 1))
-      (node (ref U2) (pin 24)))
-    (net (code 2) (name "Net-(C11-Pad1)")
-      (node (ref C11) (pin 1))
-      (node (ref U2) (pin 23)))
-    (net (code 3) (name "Net-(C13-Pad2)")
-      (node (ref C13) (pin 2))
+    (net (code 1) (name "Net-(C14-Pad2)")
+      (node (ref C14) (pin 2))
+      (node (ref U3) (pin 3)))
+    (net (code 2) (name "Net-(C13-Pad2)")
       (node (ref L1) (pin 1))
-      (node (ref U2) (pin 19))
-      (node (ref U2) (pin 20)))
-    (net (code 4) (name "Net-(R10-Pad2)")
+      (node (ref C13) (pin 2))
+      (node (ref U2) (pin 20))
+      (node (ref U2) (pin 19)))
+    (net (code 3) (name "Net-(R10-Pad2)")
+      (node (ref TH1) (pin 1))
       (node (ref R11) (pin 1))
       (node (ref U2) (pin 11))
-      (node (ref R10) (pin 2))
-      (node (ref TH1) (pin 1)))
-    (net (code 5) (name "Net-(C14-Pad2)")
-      (node (ref C14) (pin 2))
-      (node (ref U3) (pin 3)))
-    (net (code 6) (name "Net-(R7-Pad2)")
+      (node (ref R10) (pin 2)))
+    (net (code 4) (name /REGN)
+      (node (ref U2) (pin 22))
+      (node (ref C12) (pin 1))
+      (node (ref R10) (pin 1))
+      (node (ref D3) (pin 2)))
+    (net (code 5) (name "Net-(R7-Pad2)")
       (node (ref U2) (pin 4))
       (node (ref R7) (pin 2)))
-    (net (code 7) (name /USB_CE)
-      (node (ref U2) (pin 9))
-      (node (ref U7) (pin 25)))
-    (net (code 8) (name "Net-(C13-Pad1)")
-      (node (ref C13) (pin 1))
-      (node (ref U2) (pin 21)))
-    (net (code 9) (name GNDREF)
-      (node (ref J1) (pin B10))
-      (node (ref J1) (pin A10))
-      (node (ref J1) (pin B8))
+    (net (code 6) (name "Net-(C13-Pad1)")
+      (node (ref U2) (pin 21))
+      (node (ref C13) (pin 1)))
+    (net (code 7) (name /SAI_SD)
+      (node (ref U7) (pin 23))
+      (node (ref J3) (pin 3)))
+    (net (code 8) (name /SAI_FS)
+      (node (ref U7) (pin 24))
+      (node (ref J3) (pin 4)))
+    (net (code 9) (name /SAI_MCLK)
+      (node (ref R19) (pin 1))
+      (node (ref U7) (pin 27)))
+    (net (code 10) (name /MCO)
+      (node (ref J8) (pin 1))
+      (node (ref U7) (pin 18)))
+    (net (code 11) (name /QSPI_CS)
+      (node (ref U7) (pin 8)))
+    (net (code 12) (name /QSPI_CLK)
+      (node (ref U7) (pin 9)))
+    (net (code 13) (name /CC2_E)
+      (node (ref U3) (pin 11))
+      (node (ref U4) (pin 2)))
+    (net (code 14) (name /CC1_E)
+      (node (ref U4) (pin 1))
+      (node (ref U3) (pin 12)))
+    (net (code 15) (name /USB_DM)
+      (node (ref U3) (pin 20))
+      (node (ref J1) (pin A7))
+      (node (ref U7) (pin 21))
+      (node (ref U2) (pin 3))
+      (node (ref J1) (pin B7)))
+    (net (code 16) (name /USB_DP)
+      (node (ref J1) (pin A6))
+      (node (ref U3) (pin 19))
+      (node (ref U7) (pin 22))
+      (node (ref J1) (pin B6))
+      (node (ref U2) (pin 2)))
+    (net (code 17) (name /CC2)
+      (node (ref J1) (pin B5))
+      (node (ref U3) (pin 6))
+      (node (ref U3) (pin 5)))
+    (net (code 18) (name /CC1)
+      (node (ref U3) (pin 7))
+      (node (ref U3) (pin 4))
+      (node (ref J1) (pin A5)))
+    (net (code 19) (name "Net-(C11-Pad1)")
+      (node (ref U2) (pin 23))
+      (node (ref C11) (pin 1)))
+    (net (code 20) (name /HV_OUT)
+      (node (ref D1) (pin 1))
+      (node (ref C5) (pin 2))
+      (node (ref C6) (pin 2))
+      (node (ref J4) (pin 2))
+      (node (ref J4) (pin 4))
+      (node (ref J4) (pin 6))
+      (node (ref R5) (pin 1)))
+    (net (code 21) (name /TSC_4)
+      (node (ref C28) (pin 1))
+      (node (ref U7) (pin 30)))
+    (net (code 22) (name GNDREF)
+      (node (ref U3) (pin 1))
       (node (ref J1) (pin A8))
+      (node (ref R4) (pin 1))
+      (node (ref R1) (pin 1))
+      (node (ref C1) (pin 1))
+      (node (ref C2) (pin 1))
+      (node (ref C8) (pin 1))
+      (node (ref J1) (pin B3))
+      (node (ref J1) (pin B8))
+      (node (ref J1) (pin S1))
+      (node (ref J1) (pin B1))
+      (node (ref R11) (pin 2))
+      (node (ref J1) (pin B10))
       (node (ref J1) (pin B11))
-      (node (ref J1) (pin A11))
-      (node (ref BT1) (pin 2))
-      (node (ref U7) (pin 32))
-      (node (ref J1) (pin A12))
-      (node (ref U6) (pin 4))
-      (node (ref U6) (pin 5))
-      (node (ref U2) (pin 17))
-      (node (ref U6) (pin 8))
       (node (ref J1) (pin B12))
-      (node (ref J1) (pin B1))
-      (node (ref U6) (pin 1))
-      (node (ref C17) (pin 1))
+      (node (ref J1) (pin B2))
+      (node (ref C11) (pin 2))
+      (node (ref U2) (pin 18))
+      (node (ref BT1) (pin 2))
+      (node (ref U8) (pin 2))
+      (node (ref R3) (pin 1))
       (node (ref C25) (pin 1))
       (node (ref C26) (pin 1))
-      (node (ref U3) (pin 16))
+      (node (ref C3) (pin 2))
+      (node (ref T1) (pin 1))
+      (node (ref U1) (pin 13))
+      (node (ref U7) (pin 32))
+      (node (ref C14) (pin 1))
+      (node (ref C5) (pin 1))
+      (node (ref J1) (pin A1))
+      (node (ref U1) (pin 6))
+      (node (ref U1) (pin 5))
+      (node (ref J1) (pin A10))
+      (node (ref C7) (pin 2))
+      (node (ref U2) (pin 17))
+      (node (ref J1) (pin A11))
+      (node (ref C6) (pin 1))
+      (node (ref J1) (pin A12))
+      (node (ref J1) (pin A2))
+      (node (ref J1) (pin A3))
+      (node (ref U7) (pin 16))
+      (node (ref C18) (pin 2))
+      (node (ref C16) (pin 1))
+      (node (ref C19) (pin 2))
+      (node (ref D2) (pin 2))
+      (node (ref C12) (pin 2))
+      (node (ref C24) (pin 2))
+      (node (ref U5) (pin 2))
+      (node (ref U3) (pin 2))
       (node (ref U3) (pin 18))
       (node (ref U3) (pin 17))
+      (node (ref U3) (pin 16))
       (node (ref U3) (pin 15))
       (node (ref U3) (pin 14))
-      (node (ref U3) (pin 9))
-      (node (ref U3) (pin 8))
       (node (ref U3) (pin 13))
-      (node (ref U4) (pin 6))
-      (node (ref J1) (pin B3))
-      (node (ref J1) (pin A3))
-      (node (ref J1) (pin B2))
-      (node (ref J1) (pin A2))
-      (node (ref J1) (pin S1))
-      (node (ref J1) (pin A1))
-      (node (ref U7) (pin 16))
-      (node (ref U4) (pin 11))
-      (node (ref U4) (pin 10))
-      (node (ref U4) (pin 9))
-      (node (ref U4) (pin 5))
-      (node (ref U3) (pin 2))
-      (node (ref U3) (pin 1))
-      (node (ref U8) (pin 2))
-      (node (ref C3) (pin 2))
-      (node (ref R4) (pin 1))
-      (node (ref C1) (pin 1))
-      (node (ref C2) (pin 1))
-      (node (ref R1) (pin 1))
-      (node (ref C7) (pin 2))
-      (node (ref R3) (pin 1))
-      (node (ref C6) (pin 1))
-      (node (ref C5) (pin 1))
-      (node (ref T1) (pin 1))
-      (node (ref U1) (pin 5))
-      (node (ref U1) (pin 6))
-      (node (ref C8) (pin 1))
-      (node (ref U1) (pin 13))
-      (node (ref C4) (pin 2))
-      (node (ref C14) (pin 1))
-      (node (ref R11) (pin 2))
-      (node (ref TH1) (pin 2))
+      (node (ref C23) (pin 2))
+      (node (ref C22) (pin 2))
+      (node (ref C21) (pin 2))
+      (node (ref C27) (pin 1))
+      (node (ref R12) (pin 2))
       (node (ref R8) (pin 1))
+      (node (ref TH1) (pin 2))
+      (node (ref U6) (pin 8))
       (node (ref C9) (pin 1))
-      (node (ref C12) (pin 2))
+      (node (ref U6) (pin 5))
+      (node (ref U6) (pin 4))
+      (node (ref U6) (pin 1))
+      (node (ref U4) (pin 6))
+      (node (ref C20) (pin 2))
       (node (ref U5) (pin 10))
-      (node (ref D2) (pin 2))
-      (node (ref C19) (pin 2))
-      (node (ref C16) (pin 1))
+      (node (ref C4) (pin 2))
+      (node (ref U4) (pin 10))
+      (node (ref C17) (pin 1))
+      (node (ref U5) (pin 9))
       (node (ref C15) (pin 1))
       (node (ref C10) (pin 2))
-      (node (ref C11) (pin 2))
-      (node (ref U5) (pin 2))
-      (node (ref C24) (pin 2))
-      (node (ref C20) (pin 2))
-      (node (ref U5) (pin 9))
-      (node (ref U2) (pin 18))
-      (node (ref C18) (pin 2))
-      (node (ref C27) (pin 1))
-      (node (ref C23) (pin 2))
-      (node (ref C22) (pin 2))
-      (node (ref C21) (pin 2))
-      (node (ref R12) (pin 2)))
-    (net (code 10) (name "Net-(JP2-Pad1)")
-      (node (ref U6) (pin 7))
-      (node (ref JP2) (pin 1))
-      (node (ref R12) (pin 1)))
-    (net (code 11) (name /VDD)
-      (node (ref U7) (pin 5))
-      (node (ref U7) (pin 1))
-      (node (ref U7) (pin 17))
-      (node (ref U4) (pin 12))
-      (node (ref C18) (pin 1))
-      (node (ref R13) (pin 1))
-      (node (ref C27) (pin 2))
-      (node (ref R14) (pin 1))
-      (node (ref R15) (pin 1))
-      (node (ref J3) (pin 1))
-      (node (ref C20) (pin 1))
-      (node (ref C24) (pin 1))
-      (node (ref U5) (pin 14))
-      (node (ref U5) (pin 13))
-      (node (ref U5) (pin 12))
-      (node (ref U5) (pin 11))
-      (node (ref U8) (pin 5))
-      (node (ref U3) (pin 10)))
-    (net (code 12) (name /USB_INT)
-      (node (ref R13) (pin 2))
-      (node (ref U2) (pin 7))
-      (node (ref U7) (pin 6)))
-    (net (code 13) (name /HV_OUT)
-      (node (ref J4) (pin 2))
-      (node (ref J4) (pin 4))
-      (node (ref C5) (pin 2))
-      (node (ref J4) (pin 6))
-      (node (ref C6) (pin 2))
-      (node (ref D1) (pin 1))
-      (node (ref R5) (pin 1)))
-    (net (code 14) (name /DAC)
+      (node (ref U4) (pin 11))
+      (node (ref U3) (pin 8))
+      (node (ref U3) (pin 9)))
+    (net (code 23) (name /DAC)
       (node (ref U8) (pin 1))
       (node (ref U7) (pin 11)))
-    (net (code 15) (name "Net-(BT1-Pad1)")
+    (net (code 24) (name "Net-(BT1-Pad1)")
       (node (ref BT1) (pin 1))
-      (node (ref JP1) (pin 2))
-      (node (ref J2) (pin 2)))
-    (net (code 16) (name "Net-(L3-Pad2)")
-      (node (ref U6) (pin 2))
-      (node (ref L3) (pin 2)))
-    (net (code 17) (name "Net-(C26-Pad2)")
-      (node (ref Y1) (pin 2))
-      (node (ref U7) (pin 2))
-      (node (ref C26) (pin 2)))
-    (net (code 18) (name /VSYS)
-      (node (ref U5) (pin 5))
+      (node (ref J2) (pin 2))
+      (node (ref JP1) (pin 2)))
+    (net (code 25) (name "Net-(L3-Pad2)")
+      (node (ref L3) (pin 2))
+      (node (ref U6) (pin 2)))
+    (net (code 26) (name /USB_INT)
+      (node (ref U7) (pin 6))
+      (node (ref U2) (pin 7))
+      (node (ref R13) (pin 2)))
+    (net (code 27) (name /VSYS)
+      (node (ref L3) (pin 1))
       (node (ref U5) (pin 4))
-      (node (ref U5) (pin 7))
-      (node (ref C16) (pin 2))
-      (node (ref U5) (pin 6))
       (node (ref U5) (pin 8))
-      (node (ref C15) (pin 2))
-      (node (ref L1) (pin 2))
-      (node (ref U2) (pin 8))
+      (node (ref U5) (pin 5))
+      (node (ref U5) (pin 6))
+      (node (ref U5) (pin 7))
       (node (ref U6) (pin 3))
-      (node (ref C17) (pin 2))
-      (node (ref L3) (pin 1))
       (node (ref U2) (pin 16))
-      (node (ref U2) (pin 15)))
-    (net (code 19) (name "Net-(C25-Pad2)")
-      (node (ref C25) (pin 2))
-      (node (ref Y1) (pin 1))
-      (node (ref U7) (pin 3)))
-    (net (code 20) (name "Net-(L2-Pad2)")
-      (node (ref U5) (pin 1))
-      (node (ref L2) (pin 2)))
-    (net (code 21) (name "Net-(C19-Pad1)")
+      (node (ref C17) (pin 2))
+      (node (ref L1) (pin 2))
+      (node (ref C15) (pin 2))
+      (node (ref U2) (pin 15))
+      (node (ref U2) (pin 8))
+      (node (ref C16) (pin 2)))
+    (net (code 28) (name "Net-(C10-Pad1)")
+      (node (ref C10) (pin 1))
+      (node (ref U2) (pin 24)))
+    (net (code 29) (name "Net-(C19-Pad1)")
+      (node (ref U2) (pin 14))
       (node (ref J2) (pin 1))
       (node (ref U2) (pin 13))
-      (node (ref U2) (pin 14))
       (node (ref JP1) (pin 1))
       (node (ref C19) (pin 1)))
-    (net (code 22) (name "Net-(U3-Pad21)")
+    (net (code 30) (name /QSPI_IO3)
+      (node (ref U7) (pin 12)))
+    (net (code 31) (name "Net-(U3-Pad21)")
       (node (ref U3) (pin 21)))
-    (net (code 23) (name "Net-(R8-Pad2)")
-      (node (ref U2) (pin 10))
-      (node (ref R8) (pin 2)))
-    (net (code 24) (name /VNIXIE)
-      (node (ref J7) (pin 2))
-      (node (ref U8) (pin 4))
-      (node (ref U8) (pin 3)))
-    (net (code 25) (name /TSC_4)
-      (node (ref C28) (pin 1))
-      (node (ref U7) (pin 30)))
-    (net (code 26) (name /SAI_FS)
-      (node (ref U7) (pin 24))
-      (node (ref J3) (pin 4)))
-    (net (code 27) (name /SW_2)
-      (node (ref U7) (pin 10))
-      (node (ref SW2) (pin 1)))
-    (net (code 28) (name /CC1)
-      (node (ref U3) (pin 4))
-      (node (ref U3) (pin 7))
-      (node (ref J1) (pin A5)))
-    (net (code 29) (name /CC2_E)
-      (node (ref U4) (pin 2))
-      (node (ref U3) (pin 11)))
-    (net (code 30) (name /CC1_E)
-      (node (ref U4) (pin 1))
-      (node (ref U3) (pin 12)))
-    (net (code 31) (name "Net-(R9-Pad2)")
-      (node (ref U4) (pin 4))
-      (node (ref R9) (pin 2)))
-    (net (code 32) (name /USB_DM)
-      (node (ref J1) (pin B7))
-      (node (ref J1) (pin A7))
-      (node (ref U7) (pin 21))
-      (node (ref U2) (pin 3))
-      (node (ref U3) (pin 20)))
-    (net (code 33) (name /USB_DP)
-      (node (ref J1) (pin B6))
-      (node (ref U3) (pin 19))
-      (node (ref U7) (pin 22))
-      (node (ref U2) (pin 2))
-      (node (ref J1) (pin A6)))
-    (net (code 34) (name /CC2)
-      (node (ref J1) (pin B5))
-      (node (ref U3) (pin 6))
-      (node (ref U3) (pin 5)))
-    (net (code 35) (name /SWO)
-      (node (ref J3) (pin 2))
-      (node (ref SW3) (pin 1))
-      (node (ref U7) (pin 26)))
-    (net (code 36) (name /GND)
-      (node (ref SW1) (pin 2))
-      (node (ref C28) (pin 2))
-      (node (ref J10) (pin 5))
-      (node (ref SW4) (pin 2))
-      (node (ref J7) (pin 1))
-      (node (ref SW2) (pin 2))
-      (node (ref SW3) (pin 2))
-      (node (ref R16) (pin 2))
-      (node (ref J7) (pin 4))
-      (node (ref J3) (pin 5))
-      (node (ref J10) (pin 6))
-      (node (ref J7) (pin 6))
-      (node (ref J4) (pin 1))
-      (node (ref J4) (pin 3))
-      (node (ref J4) (pin 5)))
-    (net (code 37) (name /NRST)
-      (node (ref SW4) (pin 1))
-      (node (ref J3) (pin 6))
-      (node (ref U7) (pin 4)))
+    (net (code 32) (name "Net-(U4-Pad3)")
+      (node (ref U4) (pin 3)))
+    (net (code 33) (name "Net-(R9-Pad2)")
+      (node (ref R9) (pin 2))
+      (node (ref U4) (pin 4)))
+    (net (code 34) (name "Net-(U4-Pad5)")
+      (node (ref U4) (pin 5)))
+    (net (code 35) (name "Net-(U4-Pad9)")
+      (node (ref U4) (pin 9)))
+    (net (code 36) (name "Net-(C25-Pad2)")
+      (node (ref U7) (pin 3))
+      (node (ref C25) (pin 2))
+      (node (ref Y1) (pin 1)))
+    (net (code 37) (name "Net-(C26-Pad2)")
+      (node (ref U7) (pin 2))
+      (node (ref Y1) (pin 2))
+      (node (ref C26) (pin 2)))
     (net (code 38) (name "Net-(L2-Pad1)")
       (node (ref U5) (pin 3))
       (node (ref L2) (pin 1)))
-    (net (code 39) (name /SDA)
-      (node (ref R15) (pin 2))
-      (node (ref U7) (pin 20))
-      (node (ref J7) (pin 5))
-      (node (ref J10) (pin 3))
-      (node (ref U2) (pin 6))
-      (node (ref U4) (pin 7)))
-    (net (code 40) (name /SCL)
-      (node (ref R14) (pin 2))
-      (node (ref U4) (pin 8))
-      (node (ref U7) (pin 19))
-      (node (ref J10) (pin 4))
-      (node (ref U2) (pin 5))
-      (node (ref J7) (pin 3)))
-    (net (code 41) (name /TSC_2)
-      (node (ref U7) (pin 28))
-      (node (ref R18) (pin 1)))
-    (net (code 42) (name /SAI_MCLK)
-      (node (ref U7) (pin 27))
-      (node (ref R19) (pin 1)))
-    (net (code 43) (name /TSC_3)
-      (node (ref R17) (pin 1))
-      (node (ref U7) (pin 29)))
-    (net (code 44) (name /MCO)
-      (node (ref U7) (pin 18))
-      (node (ref J8) (pin 1)))
-    (net (code 45) (name /QSPI_CS)
-      (node (ref U7) (pin 8)))
-    (net (code 46) (name /QSPI_CLK)
-      (node (ref U7) (pin 9)))
-    (net (code 47) (name /QSPI_IO3)
-      (node (ref U7) (pin 12)))
-    (net (code 48) (name /QSPI_IO2)
+    (net (code 39) (name "Net-(L2-Pad2)")
+      (node (ref L2) (pin 2))
+      (node (ref U5) (pin 1)))
+    (net (code 40) (name /NRST)
+      (node (ref U7) (pin 4))
+      (node (ref SW4) (pin 1))
+      (node (ref J3) (pin 6)))
+    (net (code 41) (name /QSPI_IO2)
       (node (ref U7) (pin 13)))
-    (net (code 49) (name /QSPI_IO1)
+    (net (code 42) (name /QSPI_IO1)
       (node (ref U7) (pin 14)))
-    (net (code 50) (name /QSPI_IO0)
+    (net (code 43) (name /QSPI_IO0)
       (node (ref U7) (pin 15)))
-    (net (code 51) (name /SAI_SD)
-      (node (ref U7) (pin 23))
-      (node (ref J3) (pin 3)))
-    (net (code 52) (name /SW_1)
-      (node (ref U7) (pin 7))
-      (node (ref SW1) (pin 1)))
-    (net (code 53) (name "Net-(J5-Pad1)")
-      (node (ref R17) (pin 2))
-      (node (ref J5) (pin 1)))
-    (net (code 54) (name "Net-(J6-Pad1)")
+    (net (code 44) (name /SWO)
+      (node (ref SW3) (pin 1))
+      (node (ref U7) (pin 26))
+      (node (ref J3) (pin 2)))
+    (net (code 45) (name /GND)
+      (node (ref J4) (pin 5))
+      (node (ref J4) (pin 3))
+      (node (ref J4) (pin 1))
+      (node (ref C28) (pin 2))
+      (node (ref SW1) (pin 2))
+      (node (ref J3) (pin 5))
+      (node (ref SW4) (pin 2))
+      (node (ref J7) (pin 1))
+      (node (ref J7) (pin 4))
+      (node (ref J7) (pin 6))
+      (node (ref R16) (pin 2))
+      (node (ref SW3) (pin 2))
+      (node (ref J10) (pin 6))
+      (node (ref J10) (pin 5))
+      (node (ref SW2) (pin 2)))
+    (net (code 46) (name "Net-(R8-Pad2)")
+      (node (ref U2) (pin 10))
+      (node (ref R8) (pin 2)))
+    (net (code 47) (name /VDD)
+      (node (ref C27) (pin 2))
+      (node (ref U7) (pin 1))
+      (node (ref U7) (pin 17))
+      (node (ref R15) (pin 1))
+      (node (ref J3) (pin 1))
+      (node (ref U4) (pin 12))
+      (node (ref C24) (pin 1))
+      (node (ref R13) (pin 1))
+      (node (ref U5) (pin 14))
+      (node (ref U5) (pin 13))
+      (node (ref C20) (pin 1))
+      (node (ref U7) (pin 5))
+      (node (ref C18) (pin 1))
+      (node (ref U5) (pin 11))
+      (node (ref U3) (pin 10))
+      (node (ref U5) (pin 12))
+      (node (ref U8) (pin 5))
+      (node (ref R14) (pin 1)))
+    (net (code 48) (name /VNIXIE)
+      (node (ref J7) (pin 2))
+      (node (ref U8) (pin 3))
+      (node (ref U8) (pin 4)))
+    (net (code 49) (name "Net-(JP2-Pad1)")
+      (node (ref U6) (pin 7))
+      (node (ref R12) (pin 1))
+      (node (ref JP2) (pin 1)))
+    (net (code 50) (name "Net-(J6-Pad1)")
       (node (ref R18) (pin 2))
       (node (ref J6) (pin 1)))
-    (net (code 55) (name "Net-(J9-Pad1)")
-      (node (ref R19) (pin 2))
-      (node (ref J9) (pin 1)))
-    (net (code 56) (name "Net-(U4-Pad3)")
-      (node (ref U4) (pin 3)))
-    (net (code 57) (name /VBUS)
-      (node (ref R9) (pin 1))
+    (net (code 51) (name "Net-(J9-Pad1)")
+      (node (ref J9) (pin 1))
+      (node (ref R19) (pin 2)))
+    (net (code 52) (name "Net-(J5-Pad1)")
+      (node (ref J5) (pin 1))
+      (node (ref R17) (pin 2)))
+    (net (code 53) (name /VBUS)
       (node (ref J1) (pin B9))
-      (node (ref J1) (pin B4))
-      (node (ref U2) (pin 1))
-      (node (ref J1) (pin A9))
       (node (ref J1) (pin A4))
-      (node (ref C9) (pin 2))
       (node (ref D4) (pin 2))
+      (node (ref J1) (pin A9))
+      (node (ref R9) (pin 1))
+      (node (ref C9) (pin 2))
+      (node (ref U2) (pin 1))
+      (node (ref J1) (pin B4))
       (node (ref D2) (pin 1)))
-    (net (code 58) (name /VLOAD)
-      (node (ref C2) (pin 2))
-      (node (ref U6) (pin 6))
-      (node (ref C23) (pin 1))
+    (net (code 54) (name /TSC_2)
+      (node (ref R18) (pin 1))
+      (node (ref U7) (pin 28)))
+    (net (code 55) (name /TSC_3)
+      (node (ref U7) (pin 29))
+      (node (ref R17) (pin 1)))
+    (net (code 56) (name /SW_1)
+      (node (ref SW1) (pin 1))
+      (node (ref U7) (pin 7)))
+    (net (code 57) (name /SW_2)
+      (node (ref U7) (pin 10))
+      (node (ref SW2) (pin 1)))
+    (net (code 58) (name /SCL)
+      (node (ref U4) (pin 8))
+      (node (ref J7) (pin 3))
+      (node (ref U7) (pin 19))
+      (node (ref R14) (pin 2))
+      (node (ref U2) (pin 5))
+      (node (ref J10) (pin 4)))
+    (net (code 59) (name /SDA)
+      (node (ref U2) (pin 6))
+      (node (ref U7) (pin 20))
+      (node (ref U4) (pin 7))
+      (node (ref J7) (pin 5))
+      (node (ref J10) (pin 3))
+      (node (ref R15) (pin 2)))
+    (net (code 60) (name /HV_EN)
+      (node (ref JP2) (pin 2))
+      (node (ref U7) (pin 31))
+      (node (ref U1) (pin 12))
+      (node (ref R16) (pin 1)))
+    (net (code 61) (name /USB_CE)
+      (node (ref U2) (pin 9))
+      (node (ref U7) (pin 25)))
+    (net (code 62) (name "Net-(U2-Pad12)")
+      (node (ref U2) (pin 12)))
+    (net (code 63) (name "Net-(U2-Pad25)")
+      (node (ref U2) (pin 25)))
+    (net (code 64) (name "Net-(D3-Pad1)")
+      (node (ref D3) (pin 1))
+      (node (ref R7) (pin 1)))
+    (net (code 65) (name /VLOAD)
       (node (ref C21) (pin 1))
+      (node (ref C22) (pin 1))
+      (node (ref C23) (pin 1))
+      (node (ref T1) (pin 6))
+      (node (ref U6) (pin 6))
+      (node (ref C2) (pin 2))
       (node (ref C1) (pin 2))
       (node (ref D4) (pin 1))
-      (node (ref J10) (pin 2))
       (node (ref J10) (pin 1))
-      (node (ref T1) (pin 6))
-      (node (ref C22) (pin 1))
+      (node (ref J10) (pin 2))
       (node (ref U6) (pin 9))
+      (node (ref C8) (pin 2))
       (node (ref U1) (pin 10))
-      (node (ref U1) (pin 11))
-      (node (ref C8) (pin 2)))
-    (net (code 59) (name /HV_EN)
-      (node (ref JP2) (pin 2))
-      (node (ref R16) (pin 1))
-      (node (ref U7) (pin 31))
-      (node (ref U1) (pin 12)))
-    (net (code 60) (name "Net-(U2-Pad12)")
-      (node (ref U2) (pin 12)))
-    (net (code 61) (name "Net-(U2-Pad25)")
-      (node (ref U2) (pin 25)))
-    (net (code 62) (name "Net-(D3-Pad1)")
-      (node (ref R7) (pin 1))
-      (node (ref D3) (pin 1)))
-    (net (code 63) (name /REGN)
-      (node (ref D3) (pin 2))
-      (node (ref C12) (pin 1))
-      (node (ref U2) (pin 22))
-      (node (ref R10) (pin 1)))
-    (net (code 64) (name "Net-(Q1-Pad3)")
-      (node (ref Q1) (pin 3))
+      (node (ref U1) (pin 11)))
+    (net (code 66) (name "Net-(Q1-Pad3)")
       (node (ref R4) (pin 2))
+      (node (ref Q1) (pin 3))
       (node (ref U1) (pin 7)))
-    (net (code 65) (name "Net-(C4-Pad1)")
+    (net (code 67) (name "Net-(C4-Pad1)")
       (node (ref C4) (pin 1))
       (node (ref U1) (pin 3)))
-    (net (code 66) (name "Net-(C7-Pad1)")
+    (net (code 68) (name "Net-(R6-Pad2)")
+      (node (ref U1) (pin 8))
+      (node (ref R6) (pin 2)))
+    (net (code 69) (name "Net-(C7-Pad1)")
       (node (ref C7) (pin 1))
       (node (ref U1) (pin 9)))
-    (net (code 67) (name "Net-(R6-Pad2)")
-      (node (ref R6) (pin 2))
-      (node (ref U1) (pin 8)))
-    (net (code 68) (name "Net-(R1-Pad2)")
+    (net (code 70) (name "Net-(R1-Pad2)")
       (node (ref R1) (pin 2))
       (node (ref U1) (pin 4)))
-    (net (code 69) (name "Net-(Q1-Pad1)")
-      (node (ref Q1) (pin 1))
-      (node (ref T1) (pin 4)))
-    (net (code 70) (name "Net-(D1-Pad2)")
-      (node (ref T1) (pin 3))
-      (node (ref D1) (pin 2)))
-    (net (code 71) (name "Net-(R3-Pad2)")
-      (node (ref U1) (pin 2))
+    (net (code 71) (name "Net-(Q1-Pad1)")
+      (node (ref T1) (pin 4))
+      (node (ref Q1) (pin 1)))
+    (net (code 72) (name "Net-(D1-Pad2)")
+      (node (ref D1) (pin 2))
+      (node (ref T1) (pin 3)))
+    (net (code 73) (name "Net-(R3-Pad2)")
       (node (ref R5) (pin 2))
-      (node (ref R3) (pin 2)))
-    (net (code 72) (name "Net-(T1-Pad2)")
+      (node (ref R3) (pin 2))
+      (node (ref U1) (pin 2)))
+    (net (code 74) (name "Net-(T1-Pad2)")
       (node (ref T1) (pin 2)))
-    (net (code 73) (name "Net-(Q1-Pad2)")
-      (node (ref R6) (pin 1))
-      (node (ref Q1) (pin 2)))
-    (net (code 74) (name "Net-(C3-Pad1)")
-      (node (ref C3) (pin 1))
-      (node (ref R2) (pin 2)))
-    (net (code 75) (name "Net-(R2-Pad1)")
+    (net (code 75) (name "Net-(Q1-Pad2)")
+      (node (ref Q1) (pin 2))
+      (node (ref R6) (pin 1)))
+    (net (code 76) (name "Net-(C3-Pad1)")
+      (node (ref R2) (pin 2))
+      (node (ref C3) (pin 1)))
+    (net (code 77) (name "Net-(R2-Pad1)")
       (node (ref U1) (pin 1))
       (node (ref R2) (pin 1)))))

+ 1 - 36
Nixie_Bottom_Board/nixie_bottom_board.pro

@@ -1,4 +1,4 @@
-update=5/29/2018 8:59:19 AM
+update=7/22/2018 5:21:28 PM
 version=1
 last_client=kicad
 [general]
@@ -30,38 +30,3 @@ NetIExt=net
 [eeschema]
 version=1
 LibDir=
-[eeschema/libraries]
-LibName1=nixie_bottom_board-rescue
-LibName2=power
-LibName3=device
-LibName4=switches
-LibName5=relays
-LibName6=motors
-LibName7=transistors
-LibName8=conn
-LibName9=linear
-LibName10=regul
-LibName11=74xx
-LibName12=cmos4000
-LibName13=adc-dac
-LibName14=memory
-LibName15=xilinx
-LibName16=microcontrollers
-LibName17=dsp
-LibName18=microchip
-LibName19=analog_switches
-LibName20=motorola
-LibName21=texas
-LibName22=intel
-LibName23=audio
-LibName24=interface
-LibName25=digital-audio
-LibName26=philips
-LibName27=display
-LibName28=cypress
-LibName29=siliconi
-LibName30=opto
-LibName31=atmel
-LibName32=contrib
-LibName33=valves
-LibName34=C:/Users/Kevin/Documents/Projects/KiCadLib/EESCHEMA/Custom_Parts

+ 252 - 250
Nixie_Bottom_Board/nixie_bottom_board.sch

@@ -1,40 +1,6 @@
-EESchema Schematic File Version 2
-LIBS:nixie_bottom_board-rescue
-LIBS:power
-LIBS:device
-LIBS:switches
-LIBS:relays
-LIBS:motors
-LIBS:transistors
-LIBS:conn
-LIBS:linear
-LIBS:regul
-LIBS:74xx
-LIBS:cmos4000
-LIBS:adc-dac
-LIBS:memory
-LIBS:xilinx
-LIBS:microcontrollers
-LIBS:dsp
-LIBS:microchip
-LIBS:analog_switches
-LIBS:motorola
-LIBS:texas
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:digital-audio
-LIBS:philips
-LIBS:display
-LIBS:cypress
-LIBS:siliconi
-LIBS:opto
-LIBS:atmel
-LIBS:contrib
-LIBS:valves
-LIBS:Custom_Parts
+EESchema Schematic File Version 4
 LIBS:nixie_bottom_board-cache
-EELAYER 25 0
+EELAYER 26 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
@@ -60,7 +26,7 @@ F5 "VOUT" I R 9900 3350 60
 F6 "GND" I R 9900 3450 60 
 $EndSheet
 $Comp
-L STM32L432K U7
+L nixie_bottom_board-rescue:STM32L432K U7
 U 1 1 5B073574
 P 4650 5850
 F 0 "U7" H 4650 6850 60  0000 C CNN
@@ -71,7 +37,7 @@ F 3 "" H 4650 6300 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L USB_C_Receptacle J1
+L conn:USB_C_Receptacle J1
 U 1 1 5B07361E
 P 1350 2350
 F 0 "J1" H 950 3800 50  0000 L CNN
@@ -82,7 +48,7 @@ F 3 "" H 1500 2350 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Crystal Y1
+L Device:Crystal Y1
 U 1 1 5B073DBF
 P 3200 5050
 F 0 "Y1" H 3200 5200 50  0000 C CNN
@@ -93,7 +59,7 @@ F 3 "" H 3200 5050 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_Small C26
+L Device:C_Small C26
 U 1 1 5B073E81
 P 3450 4850
 F 0 "C26" H 3460 4920 50  0000 L CNN
@@ -104,7 +70,7 @@ F 3 "" H 3450 4850 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_Small C25
+L Device:C_Small C25
 U 1 1 5B073EE2
 P 2900 4850
 F 0 "C25" H 2910 4920 50  0000 L CNN
@@ -115,7 +81,7 @@ F 3 "" H 2900 4850 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Conn_02x03_Odd_Even J3
+L conn:Conn_02x03_Odd_Even J3
 U 1 1 5B0740EF
 P 1650 4800
 F 0 "J3" H 1700 5000 50  0000 C CNN
@@ -134,7 +100,7 @@ SWCLK
 Text Label 5350 5700 0    60   ~ 0
 SWO
 $Comp
-L Battery_Cell BT1
+L Device:Battery_Cell BT1
 U 1 1 5B07444B
 P 8050 2550
 F 0 "BT1" H 8150 2650 50  0000 L CNN
@@ -155,7 +121,7 @@ NRST
 Text Label 2050 4900 0    60   ~ 0
 NRST
 $Comp
-L SW_Push SW4
+L switches:SW_Push SW4
 U 1 1 5B07874F
 P 8650 6000
 F 0 "SW4" H 8700 6100 50  0000 L CNN
@@ -170,7 +136,7 @@ USB_DM
 Text Label 5350 6100 0    60   ~ 0
 USB_DP
 $Comp
-L Conn_02x03_Odd_Even J7
+L conn:Conn_02x03_Odd_Even J7
 U 1 1 5B0794BA
 P 1650 5900
 F 0 "J7" H 1700 6100 50  0000 C CNN
@@ -181,7 +147,7 @@ F 3 "" H 1650 5900 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Conn_02x03_Odd_Even J4
+L conn:Conn_02x03_Odd_Even J4
 U 1 1 5B079514
 P 1650 5350
 F 0 "J4" H 1700 5550 50  0000 C CNN
@@ -206,7 +172,7 @@ TSC_2
 Text Label 5350 5400 0    60   ~ 0
 TSC_3
 $Comp
-L C_Small C28
+L Device:C_Small C28
 U 1 1 5B07ACF8
 P 10000 5100
 F 0 "C28" H 10010 5170 50  0000 L CNN
@@ -217,7 +183,7 @@ F 3 "" H 10000 5100 50  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L Conn_01x01 J5
+L conn:Conn_01x01 J5
 U 1 1 5B07B07C
 P 10350 5400
 F 0 "J5" H 10350 5500 50  0000 C CNN
@@ -228,7 +194,7 @@ F 3 "" H 10350 5400 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Conn_01x01 J6
+L conn:Conn_01x01 J6
 U 1 1 5B07B125
 P 10350 5700
 F 0 "J6" H 10350 5800 50  0000 C CNN
@@ -239,7 +205,7 @@ F 3 "" H 10350 5700 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Conn_01x01 J9
+L conn:Conn_01x01 J9
 U 1 1 5B07B186
 P 10350 6000
 F 0 "J9" H 10350 6100 50  0000 C CNN
@@ -256,7 +222,7 @@ TSC_2
 Text Label 9750 5400 2    60   ~ 0
 TSC_3
 $Comp
-L R R17
+L Device:R R17
 U 1 1 5B07B730
 P 10000 5400
 F 0 "R17" V 10080 5400 50  0000 C CNN
@@ -267,7 +233,7 @@ F 3 "" H 10000 5400 50  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L R R18
+L Device:R R18
 U 1 1 5B07B7AC
 P 10000 5700
 F 0 "R18" V 10080 5700 50  0000 C CNN
@@ -278,7 +244,7 @@ F 3 "" H 10000 5700 50  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L R R19
+L Device:R R19
 U 1 1 5B07B818
 P 10000 6000
 F 0 "R19" V 10080 6000 50  0000 C CNN
@@ -293,7 +259,7 @@ MCO
 Text Label 8500 4750 2    60   ~ 0
 MCO
 $Comp
-L Conn_01x01 J8
+L conn:Conn_01x01 J8
 U 1 1 5B07BCB9
 P 8800 4750
 F 0 "J8" H 8800 4850 50  0000 C CNN
@@ -334,7 +300,7 @@ SW_2
 Text Label 6000 6500 0    60   ~ 0
 SAI_SCK
 $Comp
-L SW_Push SW1
+L switches:SW_Push SW1
 U 1 1 5B07F81C
 P 8650 5100
 F 0 "SW1" H 8700 5200 50  0000 L CNN
@@ -349,7 +315,7 @@ SW_1
 Text Label 8350 5400 2    60   ~ 0
 SW_2
 $Comp
-L SW_Push SW2
+L switches:SW_Push SW2
 U 1 1 5B07F979
 P 8650 5400
 F 0 "SW2" H 8700 5500 50  0000 L CNN
@@ -360,7 +326,7 @@ F 3 "" H 8650 5600 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L SW_Push SW3
+L switches:SW_Push SW3
 U 1 1 5B07F9F1
 P 8650 5700
 F 0 "SW3" H 8700 5800 50  0000 L CNN
@@ -379,7 +345,7 @@ HV_EN
 Text Label 9750 5100 2    60   ~ 0
 TSC_4
 $Comp
-L R R16
+L Device:R R16
 U 1 1 5B08854F
 P 5850 5200
 F 0 "R16" V 5930 5200 50  0000 C CNN
@@ -427,23 +393,12 @@ Text Label 2050 1850 0    60   ~ 0
 USB_DM
 Text Label 2050 2050 0    60   ~ 0
 USB_DP
-$Comp
-L TUSB320-RESCUE-nixie_bottom_board U4
-U 1 1 5B095CC9
-P 9950 2100
-F 0 "U4" H 9950 2550 60  0000 C CNN
-F 1 "TUSB320" H 9950 2450 60  0000 C CNN
-F 2 "Custom Parts:X2QFN-12_1.6x1.6mm_Pitch0.4mm" H 10300 2100 60  0001 C CNN
-F 3 "" H 10300 2100 60  0001 C CNN
-	1    9950 2100
-	1    0    0    -1  
-$EndComp
 Text Label 9400 1850 2    60   ~ 0
 CC1_E
 Text Label 9400 1950 2    60   ~ 0
 CC2_E
 $Comp
-L R R9
+L Device:R R9
 U 1 1 5B096154
 P 9350 2150
 F 0 "R9" V 9430 2150 50  0000 C CNN
@@ -460,7 +415,7 @@ SCL
 Text Label 10400 2350 0    60   ~ 0
 SDA
 $Comp
-L R R14
+L Device:R R14
 U 1 1 5B0B7874
 P 10000 4500
 F 0 "R14" V 10080 4500 50  0000 C CNN
@@ -471,7 +426,7 @@ F 3 "" H 10000 4500 50  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L R R15
+L Device:R R15
 U 1 1 5B0B79AE
 P 10000 4800
 F 0 "R15" V 10080 4800 50  0000 C CNN
@@ -486,7 +441,7 @@ SCL
 Text Label 10150 4800 0    60   ~ 0
 SDA
 $Comp
-L C_Small C14
+L Device:C_Small C14
 U 1 1 5B0C425E
 P 2900 1850
 F 0 "C14" H 2910 1920 50  0000 L CNN
@@ -519,7 +474,7 @@ SCL
 Text Label 6150 1750 2    60   ~ 0
 SDA
 $Comp
-L C_Small C13
+L Device:C_Small C13
 U 1 1 5B0C2749
 P 7550 1650
 F 0 "C13" H 7560 1720 50  0000 L CNN
@@ -530,7 +485,7 @@ F 3 "" H 7550 1650 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_Small C12
+L Device:C_Small C12
 U 1 1 5B0C2BAC
 P 7800 1550
 F 0 "C12" H 7810 1620 50  0000 L CNN
@@ -541,7 +496,7 @@ F 3 "" H 7800 1550 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_Small C9
+L Device:C_Small C9
 U 1 1 5B0C33A4
 P 5850 1000
 F 0 "C9" H 5860 1070 50  0000 L CNN
@@ -552,7 +507,7 @@ F 3 "" H 5850 1000 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L LED D3
+L Device:LED D3
 U 1 1 5B0C55EE
 P 5400 1550
 F 0 "D3" H 5400 1650 50  0000 C CNN
@@ -563,7 +518,7 @@ F 3 "" H 5400 1550 50  0001 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L R R7
+L Device:R R7
 U 1 1 5B0C5697
 P 5700 1550
 F 0 "R7" V 5780 1550 50  0000 C CNN
@@ -576,7 +531,7 @@ $EndComp
 Text Label 5250 1550 2    60   ~ 0
 REGN
 $Comp
-L R R8
+L Device:R R8
 U 1 1 5B0C68E7
 P 5450 2150
 F 0 "R8" V 5530 2150 50  0000 C CNN
@@ -587,7 +542,7 @@ F 3 "" H 5450 2150 50  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L Thermistor TH1
+L Device:Thermistor TH1
 U 1 1 5B0C6F00
 P 5850 2750
 F 0 "TH1" V 5950 2800 50  0000 C CNN
@@ -600,7 +555,7 @@ $EndComp
 Text Label 7150 1450 0    60   ~ 0
 REGN
 $Comp
-L R R11
+L Device:R R11
 U 1 1 5B0C76F2
 P 5850 2450
 F 0 "R11" V 5930 2450 50  0000 C CNN
@@ -611,7 +566,7 @@ F 3 "" H 5850 2450 50  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L R R10
+L Device:R R10
 U 1 1 5B0C7966
 P 5450 2450
 F 0 "R10" V 5530 2450 50  0000 C CNN
@@ -624,7 +579,7 @@ $EndComp
 Text Label 5250 2450 2    60   ~ 0
 REGN
 $Comp
-L C_Small C11
+L Device:C_Small C11
 U 1 1 5B0CC3F6
 P 8050 1450
 F 0 "C11" H 8060 1520 50  0000 L CNN
@@ -638,7 +593,7 @@ NoConn ~ 9500 2050
 Text Notes 9700 2500 0    60   ~ 0
 ADDR: 0x60
 $Comp
-L C_Small C10
+L Device:C_Small C10
 U 1 1 5B0CEA4D
 P 8300 1350
 F 0 "C10" H 8310 1420 50  0000 L CNN
@@ -649,7 +604,7 @@ F 3 "" H 8300 1350 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L L_Small L1
+L Device:L_Small L1
 U 1 1 5B0DB40F
 P 7550 1950
 F 0 "L1" H 7580 1990 50  0000 L CNN
@@ -660,7 +615,7 @@ F 3 "" H 7550 1950 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_Small C15
+L Device:C_Small C15
 U 1 1 5B0DC42A
 P 7800 2000
 F 0 "C15" H 7810 2070 50  0000 L CNN
@@ -671,7 +626,7 @@ F 3 "" H 7800 2000 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_Small C16
+L Device:C_Small C16
 U 1 1 5B0DC519
 P 8050 2000
 F 0 "C16" H 8060 2070 50  0000 L CNN
@@ -682,7 +637,7 @@ F 3 "" H 8050 2000 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_Small C19
+L Device:C_Small C19
 U 1 1 5B0DFFED
 P 7250 2500
 F 0 "C19" H 7260 2570 50  0000 L CNN
@@ -694,7 +649,7 @@ F 3 "" H 7250 2500 50  0001 C CNN
 $EndComp
 NoConn ~ 6150 2350
 $Comp
-L D_Small D2
+L Device:D_Small D2
 U 1 1 5B0E1AC7
 P 5650 1250
 F 0 "D2" H 5600 1330 50  0000 L CNN
@@ -737,7 +692,7 @@ VDD
 Text Label 9150 3350 2    60   ~ 0
 VLOAD
 $Comp
-L C_Small C20
+L Device:C_Small C20
 U 1 1 5B1737BD
 P 4600 3500
 F 0 "C20" H 4610 3570 50  0000 L CNN
@@ -748,7 +703,7 @@ F 3 "" H 4600 3500 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_Small C24
+L Device:C_Small C24
 U 1 1 5B1732A3
 P 4350 3600
 F 0 "C24" H 4360 3670 50  0000 L CNN
@@ -763,7 +718,7 @@ VDD
 Text Label 3200 4050 2    60   ~ 0
 VSYS
 $Comp
-L L_Small L2
+L Device:L_Small L2
 U 1 1 5B16755A
 P 2800 3450
 F 0 "L2" H 2830 3490 50  0000 L CNN
@@ -774,7 +729,7 @@ F 3 "" H 2800 3450 50  0001 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L TPS63025X U5
+L Custom_Parts:TPS63025X U5
 U 1 1 5B1672A1
 P 3750 3500
 F 0 "U5" H 3750 3900 60  0000 C CNN
@@ -785,7 +740,7 @@ F 3 "" H 3750 3500 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_Small C17
+L Device:C_Small C17
 U 1 1 5B15DD3E
 P 8300 2000
 F 0 "C17" H 8310 2070 50  0000 L CNN
@@ -798,7 +753,7 @@ $EndComp
 Text Label 5450 3650 2    60   ~ 0
 VSYS
 $Comp
-L L_Small L3
+L Device:L_Small L3
 U 1 1 5B15730D
 P 5700 3550
 F 0 "L3" H 5730 3590 50  0000 L CNN
@@ -809,7 +764,7 @@ F 3 "" H 5700 3550 50  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L TPS61235 U6
+L Custom_Parts:TPS61235 U6
 U 1 1 5B154033
 P 6350 3650
 F 0 "U6" H 6350 4050 60  0000 C CNN
@@ -826,7 +781,7 @@ USB_CE
 Text Notes 5500 4200 0    60   ~ 0
 Optional (can use VBUS from OTG instead)
 $Comp
-L Jumper_NC_Small JP2
+L Device:Jumper_NC_Small JP2
 U 1 1 5B0D8B1E
 P 7700 3950
 F 0 "JP2" H 7700 4030 50  0000 C CNN
@@ -837,7 +792,7 @@ F 3 "" H 7700 3950 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L D_Small D4
+L Device:D_Small D4
 U 1 1 5B0E37FA
 P 8700 3350
 F 0 "D4" H 8650 3430 50  0000 L CNN
@@ -850,7 +805,7 @@ $EndComp
 Text Label 8600 3350 2    60   ~ 0
 VBUS
 $Comp
-L TEST_2P J2
+L conn:TEST_2P J2
 U 1 1 5B0E5826
 P 7700 2350
 F 0 "J2" H 7700 2410 50  0000 C CNN
@@ -861,7 +816,7 @@ F 3 "" H 7700 2350 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Conn_02x03_Odd_Even J10
+L conn:Conn_02x03_Odd_Even J10
 U 1 1 5B0EA735
 P 1650 6600
 F 0 "J10" H 1700 6800 50  0000 C CNN
@@ -886,7 +841,7 @@ SDA
 Text Label 2050 6000 0    60   ~ 0
 GND
 $Comp
-L Jumper_NC_Small JP1
+L Device:Jumper_NC_Small JP1
 U 1 1 5B0F1B1A
 P 7700 2650
 F 0 "JP1" H 7700 2730 50  0000 C CNN
@@ -899,7 +854,7 @@ $EndComp
 Text Label 7550 3350 0    60   ~ 0
 VLOAD
 $Comp
-L GNDREF #PWR01
+L power:GNDREF #PWR01
 U 1 1 5B0F40EF
 P 7350 1850
 F 0 "#PWR01" H 7350 1600 50  0001 C CNN
@@ -910,7 +865,7 @@ F 3 "" H 7350 1850 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDREF #PWR02
+L power:GNDREF #PWR02
 U 1 1 5B0F4F3F
 P 8400 1800
 F 0 "#PWR02" H 8400 1550 50  0001 C CNN
@@ -921,7 +876,7 @@ F 3 "" H 8400 1800 50  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GNDREF #PWR03
+L power:GNDREF #PWR03
 U 1 1 5B0F5B5A
 P 5850 900
 F 0 "#PWR03" H 5850 650 50  0001 C CNN
@@ -932,7 +887,7 @@ F 3 "" H 5850 900 50  0001 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L GNDREF #PWR04
+L power:GNDREF #PWR04
 U 1 1 5B0F5D11
 P 5550 1250
 F 0 "#PWR04" H 5550 1000 50  0001 C CNN
@@ -943,7 +898,7 @@ F 3 "" H 5550 1250 50  0001 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GNDREF #PWR05
+L power:GNDREF #PWR05
 U 1 1 5B0F610A
 P 5300 2150
 F 0 "#PWR05" H 5300 1900 50  0001 C CNN
@@ -954,7 +909,7 @@ F 3 "" H 5300 2150 50  0001 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GNDREF #PWR06
+L power:GNDREF #PWR06
 U 1 1 5B0F6B8D
 P 6050 2750
 F 0 "#PWR06" H 6050 2500 50  0001 C CNN
@@ -965,7 +920,7 @@ F 3 "" H 6050 2750 50  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GNDREF #PWR07
+L power:GNDREF #PWR07
 U 1 1 5B0F743C
 P 7250 2600
 F 0 "#PWR07" H 7250 2350 50  0001 C CNN
@@ -976,7 +931,7 @@ F 3 "" H 7250 2600 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDREF #PWR08
+L power:GNDREF #PWR08
 U 1 1 5B0F751C
 P 8050 2650
 F 0 "#PWR08" H 8050 2400 50  0001 C CNN
@@ -987,7 +942,7 @@ F 3 "" H 8050 2650 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDREF #PWR09
+L power:GNDREF #PWR09
 U 1 1 5B0F7D8E
 P 2050 4050
 F 0 "#PWR09" H 2050 3800 50  0001 C CNN
@@ -998,7 +953,7 @@ F 3 "" H 2050 4050 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDREF #PWR010
+L power:GNDREF #PWR010
 U 1 1 5B0F887D
 P 9050 3550
 F 0 "#PWR010" H 9050 3300 50  0001 C CNN
@@ -1009,7 +964,7 @@ F 3 "" H 9050 3550 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDREF #PWR011
+L power:GNDREF #PWR011
 U 1 1 5B0F899A
 P 10100 3450
 F 0 "#PWR011" H 10100 3200 50  0001 C CNN
@@ -1020,7 +975,7 @@ F 3 "" H 10100 3450 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDREF #PWR012
+L power:GNDREF #PWR012
 U 1 1 5B0F9A68
 P 4600 3800
 F 0 "#PWR012" H 4600 3550 50  0001 C CNN
@@ -1031,7 +986,7 @@ F 3 "" H 4600 3800 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDREF #PWR013
+L power:GNDREF #PWR013
 U 1 1 5B0FA54E
 P 3000 3400
 F 0 "#PWR013" H 3000 3150 50  0001 C CNN
@@ -1042,7 +997,7 @@ F 3 "" H 3000 3400 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L BQ25890 U2
+L Custom_Parts:BQ25890 U2
 U 1 1 5B0BF1F9
 P 6650 1800
 F 0 "U2" H 6650 2550 60  0000 C CNN
@@ -1053,7 +1008,7 @@ F 3 "" H 6650 1950 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDREF #PWR014
+L power:GNDREF #PWR014
 U 1 1 5B102799
 P 4550 1800
 F 0 "#PWR014" H 4550 1550 50  0001 C CNN
@@ -1064,7 +1019,7 @@ F 3 "" H 4550 1800 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDREF #PWR015
+L power:GNDREF #PWR015
 U 1 1 5B102F6D
 P 3250 1400
 F 0 "#PWR015" H 3250 1150 50  0001 C CNN
@@ -1075,7 +1030,7 @@ F 3 "" H 3250 1400 50  0001 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L GNDREF #PWR016
+L power:GNDREF #PWR016
 U 1 1 5B1036C7
 P 2900 2100
 F 0 "#PWR016" H 2900 1850 50  0001 C CNN
@@ -1086,7 +1041,7 @@ F 3 "" H 2900 2100 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDREF #PWR017
+L power:GNDREF #PWR017
 U 1 1 5B1041C9
 P 3250 2550
 F 0 "#PWR017" H 3250 2300 50  0001 C CNN
@@ -1097,7 +1052,7 @@ F 3 "" H 3250 2550 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_Small C18
+L Device:C_Small C18
 U 1 1 5B0C9515
 P 3250 2450
 F 0 "C18" H 3260 2520 50  0000 L CNN
@@ -1108,7 +1063,7 @@ F 3 "" H 3250 2450 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDREF #PWR018
+L power:GNDREF #PWR018
 U 1 1 5B109387
 P 9500 2350
 F 0 "#PWR018" H 9500 2100 50  0001 C CNN
@@ -1119,7 +1074,7 @@ F 3 "" H 9500 2350 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDREF #PWR019
+L power:GNDREF #PWR019
 U 1 1 5B1097EC
 P 10600 1950
 F 0 "#PWR019" H 10600 1700 50  0001 C CNN
@@ -1130,7 +1085,7 @@ F 3 "" H 10600 1950 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDREF #PWR020
+L power:GNDREF #PWR020
 U 1 1 5B10C0F3
 P 7650 3650
 F 0 "#PWR020" H 7650 3400 50  0001 C CNN
@@ -1141,7 +1096,7 @@ F 3 "" H 7650 3650 50  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GNDREF #PWR021
+L power:GNDREF #PWR021
 U 1 1 5B11069C
 P 5900 3850
 F 0 "#PWR021" H 5900 3600 50  0001 C CNN
@@ -1152,7 +1107,7 @@ F 3 "" H 5900 3850 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDREF #PWR022
+L power:GNDREF #PWR022
 U 1 1 5B111393
 P 5900 3450
 F 0 "#PWR022" H 5900 3200 50  0001 C CNN
@@ -1163,7 +1118,7 @@ F 3 "" H 5900 3450 50  0001 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L R R12
+L Device:R R12
 U 1 1 5B0D9940
 P 7350 3800
 F 0 "R12" V 7430 3800 50  0000 C CNN
@@ -1178,7 +1133,7 @@ HV_EN
 Text Label 6800 3850 0    60   ~ 0
 VLOAD
 $Comp
-L GNDREF #PWR023
+L power:GNDREF #PWR023
 U 1 1 5B11A43E
 P 5400 5100
 F 0 "#PWR023" H 5400 4850 50  0001 C CNN
@@ -1189,7 +1144,7 @@ F 3 "" H 5400 5100 50  0001 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L GNDREF #PWR024
+L power:GNDREF #PWR024
 U 1 1 5B11AD2A
 P 3900 6600
 F 0 "#PWR024" H 3900 6350 50  0001 C CNN
@@ -1200,7 +1155,7 @@ F 3 "" H 3900 6600 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDREF #PWR025
+L power:GNDREF #PWR025
 U 1 1 5B11DE34
 P 4050 4700
 F 0 "#PWR025" H 4050 4450 50  0001 C CNN
@@ -1211,7 +1166,7 @@ F 3 "" H 4050 4700 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_Small C21
+L Device:C_Small C21
 U 1 1 5B134F37
 P 6950 3500
 F 0 "C21" H 6960 3570 50  0000 L CNN
@@ -1222,7 +1177,7 @@ F 3 "" H 6950 3500 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_Small C22
+L Device:C_Small C22
 U 1 1 5B1350D4
 P 7200 3500
 F 0 "C22" H 7210 3570 50  0000 L CNN
@@ -1233,7 +1188,7 @@ F 3 "" H 7200 3500 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_Small C23
+L Device:C_Small C23
 U 1 1 5B141DBB
 P 7450 3500
 F 0 "C23" H 7460 3570 50  0000 L CNN
@@ -1244,7 +1199,7 @@ F 3 "" H 7450 3500 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_Small C27
+L Device:C_Small C27
 U 1 1 5B143B7A
 P 3700 4850
 F 0 "C27" H 3710 4920 50  0000 L CNN
@@ -1255,7 +1210,7 @@ F 3 "" H 3700 4850 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R13
+L Device:R R13
 U 1 1 5B1468ED
 P 10000 4200
 F 0 "R13" V 10080 4200 50  0000 C CNN
@@ -1272,7 +1227,7 @@ USB_INT
 Text Label 7150 4700 2    60   ~ 0
 VDD
 $Comp
-L GNDREF #PWR026
+L power:GNDREF #PWR026
 U 1 1 5B2B81FD
 P 7150 5300
 F 0 "#PWR026" H 7150 5050 50  0001 C CNN
@@ -1313,22 +1268,16 @@ Wire Wire Line
 Wire Wire Line
 	4600 3800 4600 3600
 Wire Wire Line
-	6800 3550 6800 3550
-Wire Wire Line
-	5450 3650 5900 3650
+	5450 3650 5550 3650
 Wire Wire Line
 	5900 3550 5800 3550
 Wire Wire Line
 	4200 3700 4200 3800
 Wire Wire Line
-	4200 3300 4600 3300
+	4200 3300 4350 3300
 Wire Wire Line
-	4200 3400 4200 3400
-Wire Wire Line
-	4200 3300 4200 3600
+	4200 3300 4200 3400
 Connection ~ 4200 3300
-Wire Wire Line
-	4200 3500 4200 3500
 Connection ~ 4200 3400
 Wire Wire Line
 	4350 3300 4350 3500
@@ -1341,19 +1290,19 @@ Connection ~ 4200 3800
 Connection ~ 4350 3800
 Connection ~ 4200 3500
 Wire Wire Line
-	7150 2350 7500 2350
+	7150 2350 7250 2350
 Connection ~ 8050 2150
 Connection ~ 2050 5350
 Wire Wire Line
-	2050 5250 2050 5450
+	2050 5250 2050 5350
 Connection ~ 1350 5350
 Wire Wire Line
-	1350 5250 1350 5450
+	1350 5250 1350 5350
 Connection ~ 2050 1050
 Connection ~ 2050 1150
 Connection ~ 2050 1250
 Wire Wire Line
-	2050 1050 2050 1350
+	2050 1050 2050 1150
 Connection ~ 2050 3650
 Connection ~ 2050 3550
 Connection ~ 2050 3350
@@ -1364,32 +1313,29 @@ Connection ~ 2050 2750
 Connection ~ 2050 2650
 Connection ~ 2050 2450
 Wire Wire Line
-	2050 4050 2050 2350
+	2050 4050 2050 3650
 Connection ~ 4350 2000
 Connection ~ 4350 1900
 Connection ~ 4350 1700
 Connection ~ 4350 1800
 Wire Wire Line
-	4350 1600 4350 2100
+	4350 1600 4350 1700
 Connection ~ 3250 2100
 Wire Wire Line
 	3250 2100 3250 2200
-Connection ~ 10400 2050
-Wire Wire Line
-	10400 1950 10400 2150
 Wire Wire Line
 	7150 1850 7150 1950
 Connection ~ 5850 1250
 Wire Wire Line
-	5750 1250 6150 1250
+	5750 1250 5850 1250
 Wire Wire Line
-	8300 1450 8300 1900
+	8300 1450 8300 1800
 Connection ~ 8050 1800
 Connection ~ 7800 1800
 Wire Wire Line
-	8050 1550 8050 1900
+	8050 1550 8050 1800
 Wire Wire Line
-	7800 1650 7800 1900
+	7800 1650 7800 1800
 Connection ~ 7800 2150
 Wire Wire Line
 	7800 2150 7800 2100
@@ -1403,7 +1349,7 @@ Wire Wire Line
 	7150 1450 7800 1450
 Connection ~ 7550 2150
 Wire Wire Line
-	7150 2150 8450 2150
+	7150 2150 7550 2150
 Connection ~ 7150 2150
 Wire Wire Line
 	7150 2050 7150 2150
@@ -1426,27 +1372,13 @@ Connection ~ 5650 2450
 Wire Wire Line
 	5650 2250 6150 2250
 Wire Wire Line
-	5650 2250 5650 2750
+	5650 2250 5650 2450
 Wire Wire Line
 	5250 2450 5300 2450
 Wire Wire Line
-	5600 2450 5700 2450
+	5600 2450 5650 2450
 Wire Wire Line
 	5850 1550 6150 1550
-Wire Wire Line
-	6150 2050 6150 2050
-Wire Wire Line
-	6150 1950 6150 1950
-Wire Wire Line
-	6150 1850 6150 1850
-Wire Wire Line
-	6150 1750 6150 1750
-Wire Wire Line
-	6150 1650 6150 1650
-Wire Wire Line
-	6150 1450 6150 1450
-Wire Wire Line
-	6150 1350 6150 1350
 Wire Wire Line
 	7150 1550 7550 1550
 Wire Wire Line
@@ -1469,24 +1401,8 @@ Wire Wire Line
 	1950 2450 2050 2450
 Wire Wire Line
 	2050 2350 1950 2350
-Wire Wire Line
-	9500 2350 9500 2350
-Wire Wire Line
-	4350 2300 4350 2300
-Wire Wire Line
-	4350 2200 4350 2200
-Wire Wire Line
-	4350 1500 4350 1500
-Wire Wire Line
-	4350 1400 4350 1400
-Wire Wire Line
-	4350 2000 4350 2000
-Wire Wire Line
-	4350 1900 4350 1900
 Wire Wire Line
 	4350 1800 4550 1800
-Wire Wire Line
-	4350 1700 4350 1700
 Wire Wire Line
 	2900 2100 3250 2100
 Wire Wire Line
@@ -1514,23 +1430,13 @@ Connection ~ 1450 4050
 Wire Wire Line
 	1350 4050 1350 3950
 Wire Wire Line
-	1050 4050 2050 4050
+	1050 4050 1150 4050
 Wire Wire Line
 	1450 4050 1450 3950
-Wire Wire Line
-	10400 2350 10400 2350
-Wire Wire Line
-	10400 2250 10400 2250
-Wire Wire Line
-	10400 1850 10400 1850
-Wire Wire Line
-	9500 2250 9500 2250
 Wire Wire Line
 	9500 1950 9400 1950
 Wire Wire Line
 	9400 1850 9500 1850
-Wire Wire Line
-	9500 2150 9500 2150
 Wire Wire Line
 	1950 1850 1950 1950
 Wire Wire Line
@@ -1550,13 +1456,13 @@ Wire Wire Line
 Wire Wire Line
 	2050 1150 1950 1150
 Wire Wire Line
-	1950 1050 2150 1050
+	1950 1050 2050 1050
 Wire Wire Line
 	5350 5100 5400 5100
 Wire Wire Line
 	2050 5450 1950 5450
 Wire Wire Line
-	1950 5350 2150 5350
+	1950 5350 2050 5350
 Wire Wire Line
 	1950 5250 2050 5250
 Wire Wire Line
@@ -1585,8 +1491,6 @@ Wire Wire Line
 	10000 3350 9900 3350
 Wire Wire Line
 	8800 3350 9250 3350
-Wire Wire Line
-	5350 5300 5350 5300
 Wire Wire Line
 	9900 5100 9750 5100
 Wire Wire Line
@@ -1599,8 +1503,6 @@ Wire Wire Line
 	1950 4800 2050 4800
 Wire Wire Line
 	3700 5100 3950 5100
-Wire Wire Line
-	5350 6600 5350 6600
 Wire Wire Line
 	5350 5900 6000 5900
 Wire Wire Line
@@ -1611,16 +1513,6 @@ Wire Wire Line
 	1950 4900 2050 4900
 Wire Wire Line
 	5350 5200 5700 5200
-Wire Wire Line
-	5350 6100 5350 6100
-Wire Wire Line
-	5350 6200 5350 6200
-Wire Wire Line
-	5350 5400 5350 5400
-Wire Wire Line
-	3950 6000 3950 6000
-Wire Wire Line
-	3950 5500 3950 5500
 Wire Wire Line
 	2050 5900 1950 5900
 Wire Wire Line
@@ -1630,15 +1522,9 @@ Wire Wire Line
 Wire Wire Line
 	1350 5250 1450 5250
 Wire Wire Line
-	1250 5350 1450 5350
+	1250 5350 1350 5350
 Wire Wire Line
 	1350 5450 1450 5450
-Wire Wire Line
-	5350 6300 5350 6300
-Wire Wire Line
-	5350 6400 5350 6400
-Wire Wire Line
-	5350 5500 5350 5500
 Wire Wire Line
 	5350 5600 6000 5600
 Wire Wire Line
@@ -1651,10 +1537,6 @@ Wire Wire Line
 	5350 6500 6000 6500
 Wire Wire Line
 	8500 4750 8600 4750
-Wire Wire Line
-	3950 6100 3950 6100
-Wire Wire Line
-	3950 5600 3950 5600
 Wire Wire Line
 	3600 5800 3950 5800
 Wire Wire Line
@@ -1669,10 +1551,6 @@ Wire Wire Line
 	3600 6500 3950 6500
 Wire Wire Line
 	5350 6000 6000 6000
-Wire Wire Line
-	3950 5700 3950 5700
-Wire Wire Line
-	5350 5800 5350 5800
 Wire Wire Line
 	5350 5700 5650 5700
 Wire Wire Line
@@ -1691,19 +1569,17 @@ Wire Wire Line
 	8350 6000 8450 6000
 Wire Wire Line
 	8850 6000 8950 6000
-Wire Wire Line
-	3950 5400 3950 5400
 Connection ~ 7150 1850
 Wire Wire Line
-	7800 1800 8400 1800
+	7800 1800 8050 1800
 Wire Wire Line
 	10100 3450 9900 3450
 Wire Wire Line
 	9250 3550 9050 3550
 Wire Wire Line
-	4200 3800 4600 3800
+	4200 3800 4350 3800
 Wire Wire Line
-	3300 3600 3300 4050
+	3300 3600 3300 3700
 Connection ~ 3300 3700
 Connection ~ 3300 3800
 Wire Wire Line
@@ -1723,7 +1599,7 @@ Wire Wire Line
 Wire Wire Line
 	4200 4050 4200 3900
 Wire Wire Line
-	3200 4050 4200 4050
+	3200 4050 3300 4050
 Connection ~ 3300 3900
 Wire Wire Line
 	7250 2350 7250 2400
@@ -1734,30 +1610,26 @@ Wire Wire Line
 	7150 2250 7150 2350
 Wire Wire Line
 	3250 1400 3250 1500
-Wire Wire Line
-	3250 2300 3250 2300
 Wire Wire Line
 	3250 1800 3250 1900
 Wire Wire Line
 	3250 2300 3250 2350
-Wire Wire Line
-	9500 2250 9500 2350
 Wire Wire Line
 	10400 1950 10600 1950
 Wire Wire Line
-	6800 3650 7650 3650
+	6800 3650 6950 3650
 Wire Wire Line
 	6800 3550 6800 3350
 Wire Wire Line
-	6800 3350 7550 3350
+	6800 3350 6950 3350
 Wire Wire Line
 	9150 3450 9250 3450
 Wire Wire Line
 	3900 6600 3950 6600
 Wire Wire Line
-	2900 4950 2900 5300
+	2900 4950 2900 5050
 Wire Wire Line
-	3450 4950 3450 5200
+	3450 4950 3450 5050
 Wire Wire Line
 	2900 5300 3950 5300
 Connection ~ 2900 5050
@@ -1790,7 +1662,7 @@ Connection ~ 7200 3650
 Wire Wire Line
 	6800 3750 7150 3750
 Wire Wire Line
-	7150 3750 7150 3950
+	7150 3750 7150 3800
 Wire Wire Line
 	7150 3800 7200 3800
 Wire Wire Line
@@ -1809,7 +1681,7 @@ Connection ~ 3300 4050
 Wire Wire Line
 	3700 4950 3700 5100
 Wire Wire Line
-	2900 4700 4050 4700
+	2900 4700 3450 4700
 Wire Wire Line
 	3700 4700 3700 4750
 Wire Wire Line
@@ -1825,7 +1697,7 @@ Wire Wire Line
 Wire Wire Line
 	6900 5100 6950 5100
 $Comp
-L LMV321 U8
+L linear:LMV321 U8
 U 1 1 5B2CC27E
 P 7250 5000
 F 0 "U8" H 7250 5200 50  0000 L CNN
@@ -1836,7 +1708,7 @@ F 3 "" H 7250 5000 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L TPD8S300 U3
+L Custom_Parts:TPD8S300 U3
 U 1 1 5B394534
 P 3800 1850
 F 0 "U3" H 3800 2500 60  0000 C CNN
@@ -1852,4 +1724,134 @@ Wire Wire Line
 	7550 3800 7550 3650
 Connection ~ 7550 3650
 Connection ~ 7150 3800
+Wire Wire Line
+	4200 3400 4200 3500
+Wire Wire Line
+	4350 3300 4600 3300
+Wire Wire Line
+	4350 3800 4600 3800
+Wire Wire Line
+	4200 3500 4200 3600
+Wire Wire Line
+	8050 2150 8300 2150
+Wire Wire Line
+	2050 5350 2050 5450
+Wire Wire Line
+	2050 5350 2150 5350
+Wire Wire Line
+	1350 5350 1350 5450
+Wire Wire Line
+	1350 5350 1450 5350
+Wire Wire Line
+	2050 1050 2150 1050
+Wire Wire Line
+	2050 1150 2050 1250
+Wire Wire Line
+	2050 1250 2050 1350
+Wire Wire Line
+	2050 3650 2050 3550
+Wire Wire Line
+	2050 3550 2050 3350
+Wire Wire Line
+	2050 3350 2050 3250
+Wire Wire Line
+	2050 3250 2050 3050
+Wire Wire Line
+	2050 3050 2050 2950
+Wire Wire Line
+	2050 2950 2050 2750
+Wire Wire Line
+	2050 2750 2050 2650
+Wire Wire Line
+	2050 2650 2050 2450
+Wire Wire Line
+	2050 2450 2050 2350
+Wire Wire Line
+	4350 2000 4350 2100
+Wire Wire Line
+	4350 1900 4350 2000
+Wire Wire Line
+	4350 1700 4350 1800
+Wire Wire Line
+	4350 1800 4350 1900
+Wire Wire Line
+	5850 1250 6150 1250
+Wire Wire Line
+	8050 1800 8050 1900
+Wire Wire Line
+	8050 1800 8300 1800
+Wire Wire Line
+	7800 1800 7800 1900
+Wire Wire Line
+	7800 2150 8050 2150
+Wire Wire Line
+	7550 2150 7800 2150
+Wire Wire Line
+	5650 2450 5650 2750
+Wire Wire Line
+	5650 2450 5700 2450
+Wire Wire Line
+	1150 4050 1250 4050
+Wire Wire Line
+	1250 4050 1350 4050
+Wire Wire Line
+	1350 4050 1450 4050
+Wire Wire Line
+	1450 4050 2050 4050
+Wire Wire Line
+	3300 3700 3300 3800
+Wire Wire Line
+	3300 3800 3300 3900
+Wire Wire Line
+	3300 3900 3300 4050
+Wire Wire Line
+	7250 2350 7500 2350
+Wire Wire Line
+	2900 5050 2900 5300
+Wire Wire Line
+	3450 5050 3450 5200
+Wire Wire Line
+	8300 1800 8300 1900
+Wire Wire Line
+	8300 1800 8400 1800
+Wire Wire Line
+	8300 2150 8450 2150
+Wire Wire Line
+	5550 3650 5900 3650
+Wire Wire Line
+	6950 3350 7200 3350
+Wire Wire Line
+	7200 3350 7450 3350
+Wire Wire Line
+	6950 3650 7200 3650
+Wire Wire Line
+	7200 3650 7450 3650
+Wire Wire Line
+	7450 3350 7550 3350
+Wire Wire Line
+	7450 3650 7550 3650
+Wire Wire Line
+	3300 4050 4200 4050
+Wire Wire Line
+	3700 4700 4050 4700
+Wire Wire Line
+	3450 4700 3700 4700
+Wire Wire Line
+	7550 3650 7650 3650
+Wire Wire Line
+	7150 3800 7150 3950
+Wire Wire Line
+	10400 1950 10400 2050
+$Comp
+L Custom_Parts:TUSB320 U4
+U 1 1 5B5B1CD3
+P 9950 2100
+F 0 "U4" H 9950 2597 60  0000 C CNN
+F 1 "TUSB320" H 9950 2491 60  0000 C CNN
+F 2 "" H 10300 2100 60  0001 C CNN
+F 3 "" H 10300 2100 60  0001 C CNN
+	1    9950 2100
+	1    0    0    -1  
+$EndComp
+Connection ~ 10400 1950
 $EndSCHEMATC

+ 2 - 0
Nixie_Bottom_Board/sym-lib-table

@@ -0,0 +1,2 @@
+(sym_lib_table
+)

+ 113 - 122
Nixie_PSU_Breakout/nixie_psu_breakout-cache.lib

@@ -1,56 +1,117 @@
-EESchema-LIBRARY Version 2.3
+EESchema-LIBRARY Version 2.4
 #encoding utf-8
 #
-# C
+# Connector:Conn_01x01_Male
 #
-DEF C C 0 10 N Y 1 F N
-F0 "C" 25 100 50 H V L CNN
-F1 "C" 25 -100 50 H V L CNN
-F2 "" 38 -150 50 H I C CNN
+DEF Connector:Conn_01x01_Male J 0 40 Y N 1 F N
+F0 "J" 0 100 50 H V C CNN
+F1 "Connector:Conn_01x01_Male" 0 -100 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
- C_*
+ Connector*:*
 $ENDFPLIST
 DRAW
-P 2 0 1 20 -80 -30 80 -30 N
-P 2 0 1 20 -80 30 80 30 N
-X ~ 1 0 150 110 D 50 50 1 1 P
-X ~ 2 0 -150 110 U 50 50 1 1 P
+S 34 5 0 -5 1 1 6 F
+P 2 1 1 6 50 0 34 0 N
+X Pin_1 1 200 0 150 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Conn_01x01
+# Custom_Parts:LTC3759
 #
-DEF Conn_01x01 J 0 40 Y N 1 F N
-F0 "J" 0 100 50 H V C CNN
-F1 "Conn_01x01" 0 -100 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
+DEF Custom_Parts:LTC3759 U 0 40 Y Y 1 F N
+F0 "U" 0 0 60 H V C CNN
+F1 "Custom_Parts:LTC3759" 0 -100 60 H V C CNN
+F2 "" 0 100 60 H I C CNN
+F3 "" 0 100 60 H I C CNN
+DRAW
+S -450 550 450 -550 0 1 0 N
+X VC 1 -750 0 300 R 50 50 1 1 I
+X DRIVE 10 100 850 300 D 50 50 1 1 I
+X VIN 11 -50 850 300 D 50 50 1 1 I
+X EN 12 -750 150 300 R 50 50 1 1 I
+X GND 13 -750 -450 300 R 50 50 1 1 O
+X FBX 2 750 -300 300 L 50 50 1 1 I
+X SS 3 -750 -300 300 R 50 50 1 1 I
+X RT 4 -750 -150 300 R 50 50 1 1 I
+X SYNC 5 -750 300 300 R 50 50 1 1 I
+X PGOOD 6 -750 450 300 R 50 50 1 1 I I
+X SENSE 7 750 0 300 L 50 50 1 1 I
+X GATE 8 750 250 300 L 50 50 1 1 O
+X INTVCC 9 750 -450 300 L 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# Custom_Parts:Wurth_Transformer_10.16x13.36mm
+#
+DEF Custom_Parts:Wurth_Transformer_10.16x13.36mm T 0 40 Y Y 1 F N
+F0 "T" 0 325 60 H V C CNN
+F1 "Custom_Parts:Wurth_Transformer_10.16x13.36mm" 0 425 60 H V C CNN
+F2 "" 0 425 60 H I C CNN
+F3 "" 0 425 60 H I C CNN
+DRAW
+A -100 -175 25 -899 899 0 1 0 N -100 -200 -100 -150
+A -100 -125 25 -899 899 0 1 0 N -100 -150 -100 -100
+A -100 -75 25 -899 899 0 1 0 N -100 -100 -100 -50
+A -100 -25 25 -899 899 0 1 0 N -100 -50 -100 0
+A -100 25 25 -899 899 0 1 0 N -100 0 -100 50
+A -100 75 25 -899 899 0 1 0 N -100 50 -100 100
+A -100 125 25 -899 899 0 1 0 N -100 100 -100 150
+A -100 175 25 -899 899 0 1 0 N -100 150 -100 200
+A 25 -175 25 901 -901 0 1 0 N 25 -150 25 -200
+A 25 -125 25 901 -901 0 1 0 N 25 -100 25 -150
+A 25 -75 25 901 -901 0 1 0 N 25 -50 25 -100
+A 25 -25 25 901 -901 0 1 0 N 25 0 25 -50
+A 25 25 25 901 -901 0 1 0 N 25 50 25 0
+A 25 75 25 901 -901 0 1 0 N 25 100 25 50
+A 25 125 25 901 -901 0 1 0 N 25 150 25 100
+A 25 175 25 901 -901 0 1 0 N 25 200 25 150
+C -125 -30 14 0 0 0 F
+C -125 170 14 0 0 0 F
+C 50 170 14 0 0 0 F
+T 0 -150 -100 60 0 0 0 3 Italic 0 C C
+T 0 -150 100 60 0 0 0 3 Italic 0 C C
+P 2 0 0 0 -50 200 -50 -200 N
+P 2 0 0 0 -25 200 -25 -200 N
+P 2 0 0 0 25 -200 100 -200 N
+P 2 0 0 0 25 200 75 200 N
+P 2 0 0 0 75 200 100 200 N
+X ~ 1 -400 200 300 R 50 50 1 1 I
+X ~ 2 -400 0 300 R 50 50 1 1 I
+X ~ 3 -400 -200 300 R 50 50 1 1 I
+X ~ 4 400 -200 300 L 50 50 1 1 I
+X ~ 6 400 200 300 L 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# Device:C
+#
+DEF Device:C C 0 10 N Y 1 F N
+F0 "C" 25 100 50 H V L CNN
+F1 "Device:C" 25 -100 50 H V L CNN
+F2 "" 38 -150 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
- Connector*:*_??x*mm*
- Connector*:*1x??x*mm*
- Pin?Header?Straight?1X*
- Pin?Header?Angled?1X*
- Socket?Strip?Straight?1X*
- Socket?Strip?Angled?1X*
+ C_*
 $ENDFPLIST
 DRAW
-S -50 5 0 -5 1 1 6 N
-S -50 50 50 -50 1 1 10 f
-X Pin_1 1 -200 0 150 R 50 50 1 1 P
+P 2 0 1 20 -80 -30 80 -30 N
+P 2 0 1 20 -80 30 80 30 N
+X ~ 1 0 150 110 D 50 50 1 1 P
+X ~ 2 0 -150 110 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# D
+# Device:D
 #
-DEF D D 0 40 N N 1 F N
+DEF Device:D D 0 40 N N 1 F N
 F0 "D" 0 100 50 H V C CNN
-F1 "D" 0 -100 50 H V C CNN
+F1 "Device:D" 0 -100 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
  TO-???*
- *SingleDiode
  *_Diode_*
  *SingleDiode*
  D_*
@@ -64,16 +125,15 @@ X A 2 150 0 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# D_Schottky
+# Device:D_Schottky
 #
-DEF D_Schottky D 0 40 N N 1 F N
+DEF Device:D_Schottky D 0 40 N N 1 F N
 F0 "D" 0 100 50 H V C CNN
-F1 "D_Schottky" 0 -100 50 H V C CNN
+F1 "Device:D_Schottky" 0 -100 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
  TO-???*
- *SingleDiode
  *_Diode_*
  *SingleDiode*
  D_*
@@ -87,16 +147,15 @@ X A 2 150 0 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# D_Zener
+# Device:D_Zener
 #
-DEF D_Zener D 0 40 N N 1 F N
+DEF Device:D_Zener D 0 40 N N 1 F N
 F0 "D" 0 100 50 H V C CNN
-F1 "D_Zener" 0 -100 50 H V C CNN
+F1 "Device:D_Zener" 0 -100 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
  TO-???*
- *SingleDiode
  *_Diode_*
  *SingleDiode*
  D_*
@@ -110,52 +169,11 @@ X A 2 150 0 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# GNDREF
+# Device:Q_NMOS_DGS
 #
-DEF GNDREF #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 -250 50 H I C CNN
-F1 "GNDREF" 0 -150 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-DRAW
-P 2 0 1 0 -25 -75 25 -75 N
-P 2 0 1 0 -5 -100 5 -100 N
-P 2 0 1 0 0 -50 0 0 N
-P 2 0 1 0 50 -50 -50 -50 N
-X GNDREF 1 0 0 0 D 50 50 1 1 W N
-ENDDRAW
-ENDDEF
-#
-# LTC3759
-#
-DEF LTC3759 U 0 40 Y Y 1 F N
-F0 "U" 0 0 60 H V C CNN
-F1 "LTC3759" 0 -100 60 H V C CNN
-F2 "" 0 100 60 H I C CNN
-F3 "" 0 100 60 H I C CNN
-DRAW
-S -450 550 450 -550 0 1 0 N
-X VC 1 -750 0 300 R 50 50 1 1 I
-X FBX 2 750 -300 300 L 50 50 1 1 I
-X SS 3 -750 -300 300 R 50 50 1 1 I
-X RT 4 -750 -150 300 R 50 50 1 1 I
-X SYNC 5 -750 300 300 R 50 50 1 1 I
-X PGOOD 6 -750 450 300 R 50 50 1 1 I I
-X SENSE 7 750 0 300 L 50 50 1 1 I
-X GATE 8 750 250 300 L 50 50 1 1 O
-X INTVCC 9 750 -450 300 L 50 50 1 1 I
-X DRIVE 10 100 850 300 D 50 50 1 1 I
-X VIN 11 -50 850 300 D 50 50 1 1 I
-X EN 12 -750 150 300 R 50 50 1 1 I
-X GND 13 -750 -450 300 R 50 50 1 1 O
-ENDDRAW
-ENDDEF
-#
-# Q_NMOS_DGS
-#
-DEF Q_NMOS_DGS Q 0 0 Y N 1 F N
+DEF Device:Q_NMOS_DGS Q 0 0 Y N 1 F N
 F0 "Q" 200 50 50 H V L CNN
-F1 "Q_NMOS_DGS" 200 -50 50 H V L CNN
+F1 "Device:Q_NMOS_DGS" 200 -50 50 H V L CNN
 F2 "" 200 100 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 DRAW
@@ -183,16 +201,15 @@ X S 3 100 -200 100 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# R
+# Device:R
 #
-DEF R R 0 0 N Y 1 F N
+DEF Device:R R 0 0 N Y 1 F N
 F0 "R" 80 0 50 V V C CNN
-F1 "R" 0 0 50 V V C CNN
+F1 "Device:R" 0 0 50 V V C CNN
 F2 "" -70 0 50 V I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
  R_*
- R_*
 $ENDFPLIST
 DRAW
 S -40 -100 40 100 0 1 10 N
@@ -201,45 +218,19 @@ X ~ 2 0 -150 50 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Wurth_Transformer_10.16x13.36mm
+# power:GNDREF
 #
-DEF Wurth_Transformer_10.16x13.36mm T 0 40 Y Y 1 F N
-F0 "T" 0 325 60 H V C CNN
-F1 "Wurth_Transformer_10.16x13.36mm" 0 425 60 H V C CNN
-F2 "" 0 425 60 H I C CNN
-F3 "" 0 425 60 H I C CNN
+DEF power:GNDREF #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -250 50 H I C CNN
+F1 "power:GNDREF" 0 -150 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
 DRAW
-C -125 -30 14 0 0 0 F
-C -125 170 14 0 0 0 F
-C 50 170 14 0 0 0 F
-T 0 -150 -100 60 0 0 0 3 Italic 0 C C
-T 0 -150 100 60 0 0 0 3 Italic 0 C C
-P 2 0 0 0 -50 200 -50 -200 N
-P 2 0 0 0 -25 200 -25 -200 N
-P 2 0 0 0 25 -200 100 -200 N
-P 2 0 0 0 25 200 75 200 N
-P 2 0 0 0 75 200 100 200 N
-A -100 -175 25 -899 899 0 1 0 N -100 -200 -100 -150
-A -100 -125 25 -899 899 0 1 0 N -100 -150 -100 -100
-A -100 -75 25 -899 899 0 1 0 N -100 -100 -100 -50
-A -100 -25 25 -899 899 0 1 0 N -100 -50 -100 0
-A -100 25 25 -899 899 0 1 0 N -100 0 -100 50
-A -100 75 25 -899 899 0 1 0 N -100 50 -100 100
-A -100 125 25 -899 899 0 1 0 N -100 100 -100 150
-A -100 175 25 -899 899 0 1 0 N -100 150 -100 200
-A 25 -175 25 901 -901 0 1 0 N 25 -150 25 -200
-A 25 -125 25 901 -901 0 1 0 N 25 -100 25 -150
-A 25 -75 25 901 -901 0 1 0 N 25 -50 25 -100
-A 25 -25 25 901 -901 0 1 0 N 25 0 25 -50
-A 25 25 25 901 -901 0 1 0 N 25 50 25 0
-A 25 75 25 901 -901 0 1 0 N 25 100 25 50
-A 25 125 25 901 -901 0 1 0 N 25 150 25 100
-A 25 175 25 901 -901 0 1 0 N 25 200 25 150
-X ~ 1 -400 200 300 R 50 50 1 1 I
-X ~ 2 -400 0 300 R 50 50 1 1 I
-X ~ 3 -400 -200 300 R 50 50 1 1 I
-X ~ 4 400 -200 300 L 50 50 1 1 I
-X ~ 6 400 200 300 L 50 50 1 1 I
+P 2 0 1 0 -25 -75 25 -75 N
+P 2 0 1 0 -5 -100 5 -100 N
+P 2 0 1 0 0 -50 0 0 N
+P 2 0 1 0 50 -50 -50 -50 N
+X GNDREF 1 0 0 0 D 50 50 1 1 W N
 ENDDRAW
 ENDDEF
 #

+ 0 - 1
Nixie_PSU_Breakout/nixie_psu_breakout.bak

@@ -475,7 +475,6 @@ Wire Wire Line
 	8350 2800 8600 2800
 Wire Wire Line
 	6700 3200 6700 3400
-Connection ~ 6350 4300
 Wire Wire Line
 	6100 2850 6100 2800
 Connection ~ 6100 2800

+ 201 - 291
Nixie_PSU_Breakout/nixie_psu_breakout.kicad_pcb

@@ -1,9 +1,6 @@
-(kicad_pcb (version 4) (host pcbnew 4.0.7)
+(kicad_pcb (version 20171130) (host pcbnew "(5.0.0)")
 
   (general
-    (links 50)
-    (no_connects 1)
-    (area 125.649999 80.049999 147.750001 97.150001)
     (thickness 1.6)
     (drawings 11)
     (tracks 87)
@@ -62,6 +59,9 @@
     (pcbplotparams
       (layerselection 0x010fc_80000001)
       (usegerberextensions false)
+      (usegerberattributes false)
+      (usegerberadvancedattributes false)
+      (creategerberjobfile false)
       (excludeedgelayer true)
       (linewidth 0.100000)
       (plotframeref false)
@@ -70,8 +70,7 @@
       (useauxorigin false)
       (hpglpennumber 1)
       (hpglpenspeed 20)
-      (hpglpendiameter 15)
-      (hpglpenoverlay 2)
+      (hpglpendiameter 15.000000)
       (psnegative false)
       (psa4output false)
       (plotreference false)
@@ -83,7 +82,7 @@
       (mirror false)
       (drillshape 0)
       (scaleselection 1)
-      (outputdirectory Gerbers/))
+      (outputdirectory "Gerbers/"))
   )
 
   (net 0 "")
@@ -894,7 +893,7 @@
   (gr_text VOUT (at 145.5 81.35) (layer B.SilkS)
     (effects (font (size 1.2 1.2) (thickness 0.2)) (justify left mirror))
   )
-  (gr_text GND (at 145.5 95.95 360) (layer B.SilkS)
+  (gr_text GND (at 145.5 95.95) (layer B.SilkS)
     (effects (font (size 1.2 1.2) (thickness 0.2)) (justify left mirror))
   )
   (gr_text EN (at 127.9 83.35) (layer B.SilkS)
@@ -1010,32 +1009,29 @@
     )
     (filled_polygon
       (pts
-        (xy 145.247581 82.05) (xy 145.25393 82.129623) (xy 145.295753 82.264672) (xy 145.373543 82.382724) (xy 145.481142 82.474429)
-        (xy 145.610029 82.532528) (xy 145.75 82.552419) (xy 147.15 82.552419) (xy 147.15 94.542) (xy 146.806 94.542)
-        (xy 146.654 94.694) (xy 146.654 95.746) (xy 146.674 95.746) (xy 146.674 96.054) (xy 146.654 96.054)
-        (xy 146.654 96.074) (xy 146.346 96.074) (xy 146.346 96.054) (xy 145.294 96.054) (xy 145.142 96.206)
-        (xy 145.142 96.55) (xy 144.6 96.55) (xy 144.6 95.090117) (xy 145.142 95.090117) (xy 145.142 95.594)
-        (xy 145.294 95.746) (xy 146.346 95.746) (xy 146.346 94.694) (xy 146.194 94.542) (xy 145.690117 94.542)
-        (xy 145.572653 94.565365) (xy 145.462004 94.611197) (xy 145.362422 94.677736) (xy 145.277735 94.762423) (xy 145.211197 94.862004)
-        (xy 145.165365 94.972653) (xy 145.142 95.090117) (xy 144.6 95.090117) (xy 144.6 86.3) (xy 144.593161 86.263654)
-        (xy 144.571681 86.230273) (xy 144.538906 86.207879) (xy 144.5 86.2) (xy 135.5 86.2) (xy 135.463654 86.206839)
-        (xy 135.430273 86.228319) (xy 135.407879 86.261094) (xy 135.4 86.3) (xy 135.4 96.55) (xy 128.258 96.55)
-        (xy 128.258 96.206) (xy 128.106 96.054) (xy 127.054 96.054) (xy 127.054 96.074) (xy 126.746 96.074)
-        (xy 126.746 96.054) (xy 126.726 96.054) (xy 126.726 95.746) (xy 126.746 95.746) (xy 126.746 94.694)
-        (xy 127.054 94.694) (xy 127.054 95.746) (xy 128.106 95.746) (xy 128.258 95.594) (xy 128.258 95.090117)
-        (xy 128.234635 94.972653) (xy 128.188803 94.862004) (xy 128.122265 94.762423) (xy 128.037578 94.677736) (xy 127.937996 94.611197)
-        (xy 127.827347 94.565365) (xy 127.709883 94.542) (xy 127.206 94.542) (xy 127.054 94.694) (xy 126.746 94.694)
-        (xy 126.594 94.542) (xy 126.25 94.542) (xy 126.25 84.790592) (xy 126.271702 84.908836) (xy 126.326135 85.046319)
-        (xy 126.406236 85.170611) (xy 126.508953 85.276978) (xy 126.630374 85.361368) (xy 126.765874 85.420566) (xy 126.910291 85.452318)
-        (xy 127.058126 85.455415) (xy 127.203747 85.429738) (xy 127.341606 85.376266) (xy 127.382995 85.35) (xy 127.9 85.35)
-        (xy 127.959778 85.344139) (xy 128.019568 85.338908) (xy 128.02285 85.337955) (xy 128.026252 85.337621) (xy 128.083735 85.320266)
-        (xy 128.141389 85.303516) (xy 128.144424 85.301943) (xy 128.147696 85.300955) (xy 128.200731 85.272756) (xy 128.254015 85.245136)
-        (xy 128.256684 85.243005) (xy 128.259705 85.241399) (xy 128.306232 85.203452) (xy 128.353158 85.165992) (xy 128.357913 85.161302)
-        (xy 128.358012 85.161221) (xy 128.358088 85.161129) (xy 128.359619 85.159619) (xy 128.759619 84.75962) (xy 128.797721 84.713234)
-        (xy 128.836324 84.667229) (xy 128.837972 84.664231) (xy 128.840139 84.661593) (xy 128.868504 84.608694) (xy 128.897438 84.556062)
-        (xy 128.898471 84.552806) (xy 128.900087 84.549792) (xy 128.91764 84.492378) (xy 128.935796 84.435143) (xy 128.936177 84.431744)
-        (xy 128.937176 84.428477) (xy 128.94324 84.368779) (xy 128.949937 84.309075) (xy 128.949983 84.302393) (xy 128.949996 84.302269)
-        (xy 128.949985 84.302153) (xy 128.95 84.3) (xy 128.95 81.369238) (xy 128.969239 81.35) (xy 145.247581 81.35)
+        (xy 145.247581 82.05) (xy 145.257235 82.148017) (xy 145.285825 82.242267) (xy 145.332254 82.329129) (xy 145.394736 82.405264)
+        (xy 145.470871 82.467746) (xy 145.557733 82.514175) (xy 145.651983 82.542765) (xy 145.75 82.552419) (xy 147.150001 82.552419)
+        (xy 147.15 94.542) (xy 146.806 94.542) (xy 146.654 94.694) (xy 146.654 95.746) (xy 146.674 95.746)
+        (xy 146.674 96.054) (xy 146.654 96.054) (xy 146.654 96.074) (xy 146.346 96.074) (xy 146.346 96.054)
+        (xy 145.294 96.054) (xy 145.142 96.206) (xy 145.142 96.55) (xy 144.6 96.55) (xy 144.6 95.090117)
+        (xy 145.142 95.090117) (xy 145.142 95.594) (xy 145.294 95.746) (xy 146.346 95.746) (xy 146.346 94.694)
+        (xy 146.194 94.542) (xy 145.690117 94.542) (xy 145.572653 94.565365) (xy 145.462004 94.611197) (xy 145.362422 94.677736)
+        (xy 145.277735 94.762423) (xy 145.211197 94.862004) (xy 145.165365 94.972653) (xy 145.142 95.090117) (xy 144.6 95.090117)
+        (xy 144.6 86.3) (xy 144.592388 86.261732) (xy 144.570711 86.229289) (xy 144.538268 86.207612) (xy 144.5 86.2)
+        (xy 135.5 86.2) (xy 135.461732 86.207612) (xy 135.429289 86.229289) (xy 135.407612 86.261732) (xy 135.4 86.3)
+        (xy 135.4 96.55) (xy 128.258 96.55) (xy 128.258 96.206) (xy 128.106 96.054) (xy 127.054 96.054)
+        (xy 127.054 96.074) (xy 126.746 96.074) (xy 126.746 96.054) (xy 126.726 96.054) (xy 126.726 95.746)
+        (xy 126.746 95.746) (xy 126.746 94.694) (xy 127.054 94.694) (xy 127.054 95.746) (xy 128.106 95.746)
+        (xy 128.258 95.594) (xy 128.258 95.090117) (xy 128.234635 94.972653) (xy 128.188803 94.862004) (xy 128.122265 94.762423)
+        (xy 128.037578 94.677736) (xy 127.937996 94.611197) (xy 127.827347 94.565365) (xy 127.709883 94.542) (xy 127.206 94.542)
+        (xy 127.054 94.694) (xy 126.746 94.694) (xy 126.594 94.542) (xy 126.25 94.542) (xy 126.25 84.794371)
+        (xy 126.274976 84.919934) (xy 126.331814 85.057153) (xy 126.41433 85.180647) (xy 126.519353 85.28567) (xy 126.642847 85.368186)
+        (xy 126.780066 85.425024) (xy 126.925738 85.454) (xy 127.074262 85.454) (xy 127.219934 85.425024) (xy 127.357153 85.368186)
+        (xy 127.38437 85.35) (xy 127.868079 85.35) (xy 127.9 85.353144) (xy 127.931921 85.35) (xy 127.931932 85.35)
+        (xy 128.027422 85.340595) (xy 128.149948 85.303427) (xy 128.262868 85.24307) (xy 128.361843 85.161843) (xy 128.3822 85.137038)
+        (xy 128.737038 84.7822) (xy 128.761843 84.761843) (xy 128.84307 84.662868) (xy 128.903427 84.549948) (xy 128.940595 84.427422)
+        (xy 128.95 84.331932) (xy 128.95 84.331922) (xy 128.953144 84.300001) (xy 128.95 84.26808) (xy 128.95 81.369238)
+        (xy 128.969238 81.35) (xy 145.247581 81.35)
       )
     )
   )
@@ -1066,29 +1062,25 @@
     )
     (filled_polygon
       (pts
-        (xy 132.598549 83.05) (xy 132.602359 83.097774) (xy 132.627452 83.178803) (xy 132.674126 83.249634) (xy 132.738685 83.304657)
-        (xy 132.816018 83.339516) (xy 132.9 83.351451) (xy 133.9 83.351451) (xy 133.918194 83.35) (xy 134.098549 83.35)
-        (xy 134.098549 85.6) (xy 134.102359 85.647774) (xy 134.127452 85.728803) (xy 134.174126 85.799634) (xy 134.238685 85.854657)
-        (xy 134.316018 85.889516) (xy 134.4 85.901451) (xy 135.4 85.901451) (xy 135.4 89.675) (xy 135.36021 89.675)
-        (xy 135.35 89.673549) (xy 134.55 89.673549) (xy 134.531806 89.675) (xy 133.86021 89.675) (xy 133.85 89.673549)
-        (xy 133.05 89.673549) (xy 133.002226 89.677359) (xy 132.921197 89.702452) (xy 132.850366 89.749126) (xy 132.795343 89.813685)
-        (xy 132.760484 89.891018) (xy 132.748549 89.975) (xy 132.748549 90.4) (xy 132 90.4) (xy 132 89.5)
-        (xy 132.75 89.5) (xy 132.779398 89.498556) (xy 132.798907 89.496635) (xy 132.850178 89.486437) (xy 132.897774 89.482641)
-        (xy 132.978803 89.457548) (xy 133.049634 89.410874) (xy 133.104657 89.346315) (xy 133.139516 89.268982) (xy 133.151451 89.185)
-        (xy 133.151451 88.765) (xy 133.147641 88.717226) (xy 133.122548 88.636197) (xy 133.075874 88.565366) (xy 133.011315 88.510343)
-        (xy 132.933982 88.475484) (xy 132.850374 88.463602) (xy 132.8 88.453582) (xy 132.8 86.5) (xy 132.798556 86.470602)
-        (xy 132.796635 86.451093) (xy 132.785159 86.393398) (xy 132.779468 86.374639) (xy 132.756965 86.320315) (xy 132.747724 86.303026)
-        (xy 132.715054 86.25413) (xy 132.702618 86.238976) (xy 132.661024 86.197382) (xy 132.64587 86.184946) (xy 132.596974 86.152276)
-        (xy 132.579685 86.143035) (xy 132.525361 86.120532) (xy 132.506602 86.114841) (xy 132.448907 86.103365) (xy 132.429398 86.101444)
-        (xy 132.4 86.1) (xy 131.65 86.1) (xy 131.65 83.375) (xy 131.648556 83.345602) (xy 131.646635 83.326093)
-        (xy 131.635159 83.268398) (xy 131.629468 83.249639) (xy 131.606965 83.195315) (xy 131.597724 83.178026) (xy 131.565054 83.12913)
-        (xy 131.552618 83.113976) (xy 131.511024 83.072382) (xy 131.49587 83.059946) (xy 131.446974 83.027276) (xy 131.429685 83.018035)
-        (xy 131.375361 82.995532) (xy 131.356602 82.989841) (xy 131.298907 82.978365) (xy 131.279398 82.976444) (xy 131.25 82.975)
-        (xy 128.2 82.975) (xy 128.2 82.11) (xy 128.199518 82.100197) (xy 128.198365 82.088492) (xy 128.194542 82.06927)
-        (xy 128.191128 82.058014) (xy 128.183623 82.039896) (xy 128.178078 82.029523) (xy 128.167187 82.013225) (xy 128.159725 82.004133)
-        (xy 128.145867 81.990275) (xy 128.136775 81.982813) (xy 128.120477 81.971922) (xy 128.110104 81.966377) (xy 128.091986 81.958872)
-        (xy 128.08073 81.955458) (xy 128.061508 81.951635) (xy 128.049803 81.950482) (xy 128.04 81.95) (xy 126.25 81.95)
-        (xy 126.25 80.65) (xy 132.598549 80.65)
+        (xy 132.598549 83.05) (xy 132.604341 83.10881) (xy 132.621496 83.16536) (xy 132.649353 83.217477) (xy 132.686842 83.263158)
+        (xy 132.732523 83.300647) (xy 132.78464 83.328504) (xy 132.84119 83.345659) (xy 132.9 83.351451) (xy 133.9 83.351451)
+        (xy 133.914733 83.35) (xy 134.098549 83.35) (xy 134.098549 85.6) (xy 134.104341 85.65881) (xy 134.121496 85.71536)
+        (xy 134.149353 85.767477) (xy 134.186842 85.813158) (xy 134.232523 85.850647) (xy 134.28464 85.878504) (xy 134.34119 85.895659)
+        (xy 134.4 85.901451) (xy 135.4 85.901451) (xy 135.4 89.675) (xy 135.364733 89.675) (xy 135.35 89.673549)
+        (xy 134.55 89.673549) (xy 134.535267 89.675) (xy 133.864733 89.675) (xy 133.85 89.673549) (xy 133.05 89.673549)
+        (xy 132.99119 89.679341) (xy 132.93464 89.696496) (xy 132.882523 89.724353) (xy 132.836842 89.761842) (xy 132.799353 89.807523)
+        (xy 132.771496 89.85964) (xy 132.754341 89.91619) (xy 132.748549 89.975) (xy 132.748549 90.4) (xy 132 90.4)
+        (xy 132 89.5) (xy 132.75 89.5) (xy 132.818115 89.486451) (xy 132.85 89.486451) (xy 132.90881 89.480659)
+        (xy 132.96536 89.463504) (xy 133.017477 89.435647) (xy 133.063158 89.398158) (xy 133.100647 89.352477) (xy 133.128504 89.30036)
+        (xy 133.145659 89.24381) (xy 133.151451 89.185) (xy 133.151451 88.765) (xy 133.145659 88.70619) (xy 133.128504 88.64964)
+        (xy 133.100647 88.597523) (xy 133.063158 88.551842) (xy 133.017477 88.514353) (xy 132.96536 88.486496) (xy 132.90881 88.469341)
+        (xy 132.85 88.463549) (xy 132.818114 88.463549) (xy 132.8 88.459946) (xy 132.8 86.5) (xy 132.777164 86.385196)
+        (xy 132.747875 86.314485) (xy 132.682842 86.217156) (xy 132.585515 86.152125) (xy 132.514804 86.122836) (xy 132.4 86.1)
+        (xy 131.65 86.1) (xy 131.65 83.375) (xy 131.627164 83.260196) (xy 131.597875 83.189485) (xy 131.532842 83.092156)
+        (xy 131.435515 83.027125) (xy 131.364804 82.997836) (xy 131.25 82.975) (xy 128.2 82.975) (xy 128.2 82.11)
+        (xy 128.198079 82.090491) (xy 128.192388 82.071731) (xy 128.174814 82.029305) (xy 128.165572 82.012016) (xy 128.153136 81.996863)
+        (xy 128.137982 81.984426) (xy 128.120695 81.975186) (xy 128.078269 81.957612) (xy 128.05951 81.951922) (xy 128.04 81.95)
+        (xy 126.25 81.95) (xy 126.25 80.65) (xy 132.598549 80.65)
       )
     )
   )
@@ -1107,38 +1099,25 @@
     )
     (filled_polygon
       (pts
-        (xy 139.5 85.54) (xy 139.502408 85.589015) (xy 139.503561 85.60072) (xy 139.522677 85.696829) (xy 139.526091 85.708085)
-        (xy 139.563615 85.798676) (xy 139.56916 85.809049) (xy 139.623615 85.890541) (xy 139.631077 85.899633) (xy 139.700367 85.968923)
-        (xy 139.709459 85.976385) (xy 139.790951 86.03084) (xy 139.801324 86.036385) (xy 139.891915 86.073909) (xy 139.903171 86.077323)
-        (xy 139.99928 86.096439) (xy 140.010985 86.097592) (xy 140.06 86.1) (xy 140.94 86.1) (xy 140.989015 86.097592)
-        (xy 141.00072 86.096439) (xy 141.096829 86.077323) (xy 141.108085 86.073909) (xy 141.198676 86.036385) (xy 141.209049 86.03084)
-        (xy 141.290541 85.976385) (xy 141.299633 85.968923) (xy 141.368923 85.899633) (xy 141.376385 85.890541) (xy 141.43084 85.809049)
-        (xy 141.436385 85.798676) (xy 141.473909 85.708085) (xy 141.477323 85.696829) (xy 141.496439 85.60072) (xy 141.497592 85.589015)
-        (xy 141.5 85.54) (xy 141.5 83.2) (xy 144.6 83.2) (xy 144.6 88.24) (xy 144.600482 88.249803)
-        (xy 144.601635 88.261508) (xy 144.605458 88.28073) (xy 144.608872 88.291986) (xy 144.616377 88.310104) (xy 144.621922 88.320477)
-        (xy 144.632813 88.336775) (xy 144.640275 88.345867) (xy 144.654133 88.359725) (xy 144.663225 88.367187) (xy 144.679523 88.378078)
-        (xy 144.689896 88.383623) (xy 144.708014 88.391128) (xy 144.71927 88.394542) (xy 144.738492 88.398365) (xy 144.750197 88.399518)
-        (xy 144.76 88.4) (xy 146.8 88.4) (xy 146.8 89.6) (xy 144.56 89.6) (xy 144.550197 89.600482)
-        (xy 144.538492 89.601635) (xy 144.51927 89.605458) (xy 144.508014 89.608872) (xy 144.489896 89.616377) (xy 144.479523 89.621922)
-        (xy 144.463225 89.632813) (xy 144.454133 89.640275) (xy 144.440275 89.654133) (xy 144.432813 89.663225) (xy 144.421922 89.679523)
-        (xy 144.416377 89.689896) (xy 144.408872 89.708014) (xy 144.405458 89.71927) (xy 144.401635 89.738492) (xy 144.400482 89.750197)
-        (xy 144.4 89.76) (xy 144.4 95.09) (xy 144.400482 95.099803) (xy 144.401635 95.111508) (xy 144.405458 95.13073)
-        (xy 144.408872 95.141986) (xy 144.416377 95.160104) (xy 144.421922 95.170477) (xy 144.432813 95.186775) (xy 144.440275 95.195867)
-        (xy 144.454133 95.209725) (xy 144.463225 95.217187) (xy 144.479523 95.228078) (xy 144.489896 95.233623) (xy 144.508014 95.241128)
-        (xy 144.51927 95.244542) (xy 144.538492 95.248365) (xy 144.550197 95.249518) (xy 144.56 95.25) (xy 147.15 95.25)
-        (xy 147.15 96.55) (xy 144.3 96.55) (xy 144.3 86.36) (xy 144.299518 86.350197) (xy 144.298365 86.338492)
-        (xy 144.294542 86.31927) (xy 144.291128 86.308014) (xy 144.283623 86.289896) (xy 144.278078 86.279523) (xy 144.267187 86.263225)
-        (xy 144.259725 86.254133) (xy 144.245867 86.240275) (xy 144.236775 86.232813) (xy 144.220477 86.221922) (xy 144.210104 86.216377)
-        (xy 144.191986 86.208872) (xy 144.18073 86.205458) (xy 144.161508 86.201635) (xy 144.149803 86.200482) (xy 144.14 86.2)
-        (xy 135.8 86.2) (xy 135.8 85.66) (xy 135.799518 85.650197) (xy 135.798365 85.638492) (xy 135.794542 85.61927)
-        (xy 135.791128 85.608014) (xy 135.783623 85.589896) (xy 135.778078 85.579523) (xy 135.767187 85.563225) (xy 135.759725 85.554133)
-        (xy 135.745867 85.540275) (xy 135.736775 85.532813) (xy 135.720477 85.521922) (xy 135.710104 85.516377) (xy 135.691986 85.508872)
-        (xy 135.68073 85.505458) (xy 135.661508 85.501635) (xy 135.649803 85.500482) (xy 135.64 85.5) (xy 134.5 85.5)
-        (xy 134.5 83.11) (xy 134.499518 83.100197) (xy 134.498365 83.088492) (xy 134.494542 83.06927) (xy 134.491128 83.058014)
-        (xy 134.483623 83.039896) (xy 134.478078 83.029523) (xy 134.467187 83.013225) (xy 134.459725 83.004133) (xy 134.445867 82.990275)
-        (xy 134.436775 82.982813) (xy 134.420477 82.971922) (xy 134.410104 82.966377) (xy 134.391986 82.958872) (xy 134.38073 82.955458)
-        (xy 134.361508 82.951635) (xy 134.349803 82.950482) (xy 134.34 82.95) (xy 133 82.95) (xy 133 80.65)
-        (xy 139.5 80.65)
+        (xy 139.5 85.54) (xy 139.538062 85.731347) (xy 139.555636 85.773773) (xy 139.664017 85.935975) (xy 139.826227 86.044364)
+        (xy 139.868653 86.061938) (xy 140.06 86.1) (xy 140.94 86.1) (xy 141.131347 86.061938) (xy 141.173773 86.044364)
+        (xy 141.335975 85.935983) (xy 141.444364 85.773773) (xy 141.461938 85.731347) (xy 141.5 85.54) (xy 141.5 83.2)
+        (xy 144.6 83.2) (xy 144.6 88.24) (xy 144.601921 88.259509) (xy 144.607612 88.278269) (xy 144.625186 88.320695)
+        (xy 144.634428 88.337984) (xy 144.646864 88.353137) (xy 144.662018 88.365574) (xy 144.679305 88.374814) (xy 144.721731 88.392388)
+        (xy 144.74049 88.398078) (xy 144.76 88.4) (xy 146.8 88.4) (xy 146.8 89.6) (xy 144.56 89.6)
+        (xy 144.540491 89.601921) (xy 144.521731 89.607612) (xy 144.479305 89.625186) (xy 144.462016 89.634428) (xy 144.446863 89.646864)
+        (xy 144.434426 89.662018) (xy 144.425186 89.679305) (xy 144.407612 89.721731) (xy 144.401922 89.74049) (xy 144.4 89.76)
+        (xy 144.4 95.09) (xy 144.401921 95.109509) (xy 144.407612 95.128269) (xy 144.425186 95.170695) (xy 144.434428 95.187984)
+        (xy 144.446864 95.203137) (xy 144.462018 95.215574) (xy 144.479305 95.224814) (xy 144.521731 95.242388) (xy 144.54049 95.248078)
+        (xy 144.56 95.25) (xy 147.15 95.25) (xy 147.15 96.55) (xy 144.3 96.55) (xy 144.3 86.36)
+        (xy 144.298079 86.340491) (xy 144.292388 86.321731) (xy 144.274814 86.279305) (xy 144.265572 86.262016) (xy 144.253136 86.246863)
+        (xy 144.237982 86.234426) (xy 144.220695 86.225186) (xy 144.178269 86.207612) (xy 144.15951 86.201922) (xy 144.14 86.2)
+        (xy 135.8 86.2) (xy 135.8 85.66) (xy 135.798079 85.640491) (xy 135.792388 85.621731) (xy 135.774814 85.579305)
+        (xy 135.765572 85.562016) (xy 135.753136 85.546863) (xy 135.737982 85.534426) (xy 135.720695 85.525186) (xy 135.678269 85.507612)
+        (xy 135.65951 85.501922) (xy 135.64 85.5) (xy 134.5 85.5) (xy 134.5 83.11) (xy 134.498079 83.090491)
+        (xy 134.492388 83.071731) (xy 134.474814 83.029305) (xy 134.465572 83.012016) (xy 134.453136 82.996863) (xy 134.437982 82.984426)
+        (xy 134.420695 82.975186) (xy 134.378269 82.957612) (xy 134.35951 82.951922) (xy 134.34 82.95) (xy 133 82.95)
+        (xy 133 80.65) (xy 139.5 80.65)
       )
     )
   )
@@ -1156,15 +1135,12 @@
     )
     (filled_polygon
       (pts
-        (xy 147.15 84.6) (xy 145.2 84.6) (xy 145.2 82.76) (xy 145.199518 82.750197) (xy 145.198365 82.738492)
-        (xy 145.194542 82.71927) (xy 145.191128 82.708014) (xy 145.183623 82.689896) (xy 145.178078 82.679523) (xy 145.167187 82.663225)
-        (xy 145.159725 82.654133) (xy 145.145867 82.640275) (xy 145.136775 82.632813) (xy 145.120477 82.621922) (xy 145.110104 82.616377)
-        (xy 145.091986 82.608872) (xy 145.08073 82.605458) (xy 145.061508 82.601635) (xy 145.049803 82.600482) (xy 145.04 82.6)
-        (xy 141.06 82.6) (xy 141.050197 82.600482) (xy 141.038492 82.601635) (xy 141.01927 82.605458) (xy 141.008014 82.608872)
-        (xy 140.989896 82.616377) (xy 140.979523 82.621922) (xy 140.963225 82.632813) (xy 140.954133 82.640275) (xy 140.940275 82.654133)
-        (xy 140.932813 82.663225) (xy 140.921922 82.679523) (xy 140.916377 82.689896) (xy 140.908872 82.708014) (xy 140.905458 82.71927)
-        (xy 140.901635 82.738492) (xy 140.900482 82.750197) (xy 140.9 82.76) (xy 140.9 85.5) (xy 140.1 85.5)
-        (xy 140.1 80.65) (xy 147.15 80.65)
+        (xy 147.15 84.6) (xy 145.2 84.6) (xy 145.2 82.76) (xy 145.198079 82.740491) (xy 145.192388 82.721731)
+        (xy 145.174814 82.679305) (xy 145.165572 82.662016) (xy 145.153136 82.646863) (xy 145.137982 82.634426) (xy 145.120695 82.625186)
+        (xy 145.078269 82.607612) (xy 145.05951 82.601922) (xy 145.04 82.6) (xy 141.06 82.6) (xy 141.040491 82.601921)
+        (xy 141.021731 82.607612) (xy 140.979305 82.625186) (xy 140.962016 82.634428) (xy 140.946863 82.646864) (xy 140.934426 82.662018)
+        (xy 140.925186 82.679305) (xy 140.907612 82.721731) (xy 140.901922 82.74049) (xy 140.9 82.76) (xy 140.9 85.5)
+        (xy 140.1 85.5) (xy 140.1 80.65) (xy 147.15 80.65)
       )
     )
   )
@@ -1186,42 +1162,29 @@
     )
     (filled_polygon
       (pts
-        (xy 130.85 86.5) (xy 130.851444 86.529398) (xy 130.853365 86.548907) (xy 130.864841 86.606602) (xy 130.870532 86.625361)
-        (xy 130.893035 86.679685) (xy 130.902276 86.696974) (xy 130.934946 86.74587) (xy 130.947382 86.761024) (xy 130.988976 86.802618)
-        (xy 131.00413 86.815054) (xy 131.053026 86.847724) (xy 131.070315 86.856965) (xy 131.124639 86.879468) (xy 131.143398 86.885159)
-        (xy 131.201093 86.896635) (xy 131.220602 86.898556) (xy 131.25 86.9) (xy 132 86.9) (xy 132 88.45)
-        (xy 131.76 88.45) (xy 131.750197 88.450482) (xy 131.738492 88.451635) (xy 131.71927 88.455458) (xy 131.708014 88.458872)
-        (xy 131.689896 88.466377) (xy 131.679523 88.471922) (xy 131.663225 88.482813) (xy 131.654133 88.490275) (xy 131.640275 88.504133)
-        (xy 131.632813 88.513225) (xy 131.621922 88.529523) (xy 131.616377 88.539896) (xy 131.608872 88.558014) (xy 131.605458 88.56927)
-        (xy 131.601635 88.588492) (xy 131.600482 88.600197) (xy 131.6 88.61) (xy 131.6 91.706355) (xy 131.561221 91.714068)
-        (xy 131.549965 91.717482) (xy 131.49561 91.739996) (xy 131.485237 91.745541) (xy 131.436342 91.778214) (xy 131.42725 91.785676)
-        (xy 131.385676 91.82725) (xy 131.378214 91.836342) (xy 131.345541 91.885237) (xy 131.339996 91.89561) (xy 131.317482 91.949965)
-        (xy 131.314068 91.961221) (xy 131.302598 92.018886) (xy 131.301445 92.030591) (xy 131.3 92.06) (xy 131.3 92.1)
-        (xy 129.86 92.1) (xy 129.830591 92.101445) (xy 129.818886 92.102598) (xy 129.761221 92.114068) (xy 129.749965 92.117482)
-        (xy 129.69561 92.139996) (xy 129.685237 92.145541) (xy 129.636342 92.178214) (xy 129.62725 92.185676) (xy 129.585676 92.22725)
-        (xy 129.578214 92.236342) (xy 129.545541 92.285237) (xy 129.539996 92.29561) (xy 129.517482 92.349965) (xy 129.514068 92.361221)
-        (xy 129.502598 92.418886) (xy 129.501445 92.430591) (xy 129.5 92.46) (xy 129.5 93.13979) (xy 129.498549 93.15)
-        (xy 129.498549 94.45) (xy 129.5 94.468194) (xy 129.5 96.44) (xy 129.501445 96.469409) (xy 129.502598 96.481114)
-        (xy 129.514068 96.538779) (xy 129.517471 96.55) (xy 126.25 96.55) (xy 126.25 93.35) (xy 127.59 93.35)
-        (xy 127.599803 93.349518) (xy 127.611508 93.348365) (xy 127.63073 93.344542) (xy 127.641986 93.341128) (xy 127.660104 93.333623)
-        (xy 127.670477 93.328078) (xy 127.686775 93.317187) (xy 127.695867 93.309725) (xy 127.709725 93.295867) (xy 127.717187 93.286775)
-        (xy 127.728078 93.270477) (xy 127.733623 93.260104) (xy 127.741128 93.241986) (xy 127.744542 93.23073) (xy 127.748365 93.211508)
-        (xy 127.749518 93.199803) (xy 127.75 93.19) (xy 127.75 92.96021) (xy 127.751451 92.95) (xy 127.751451 92.45)
-        (xy 127.75 92.431806) (xy 127.75 92.21) (xy 127.749518 92.200197) (xy 127.748365 92.188492) (xy 127.744542 92.16927)
-        (xy 127.741128 92.158014) (xy 127.733623 92.139896) (xy 127.728078 92.129523) (xy 127.717187 92.113225) (xy 127.709725 92.104133)
-        (xy 127.695867 92.090275) (xy 127.686775 92.082813) (xy 127.670477 92.071922) (xy 127.660104 92.066377) (xy 127.641986 92.058872)
-        (xy 127.63073 92.055458) (xy 127.611508 92.051635) (xy 127.599803 92.050482) (xy 127.59 92.05) (xy 126.65 92.05)
-        (xy 126.65 91.45) (xy 128.84 91.45) (xy 128.849803 91.449518) (xy 128.861508 91.448365) (xy 128.88073 91.444542)
-        (xy 128.891986 91.441128) (xy 128.910104 91.433623) (xy 128.920477 91.428078) (xy 128.936775 91.417187) (xy 128.945867 91.409725)
-        (xy 128.959725 91.395867) (xy 128.967187 91.386775) (xy 128.978078 91.370477) (xy 128.983623 91.360104) (xy 128.991128 91.341986)
-        (xy 128.994542 91.33073) (xy 128.998365 91.311508) (xy 128.999518 91.299803) (xy 129 91.29) (xy 129 88.35)
-        (xy 129.48979 88.35) (xy 129.5 88.351451) (xy 130 88.351451) (xy 130.047774 88.347641) (xy 130.128803 88.322548)
-        (xy 130.199634 88.275874) (xy 130.254657 88.211315) (xy 130.289516 88.133982) (xy 130.301451 88.05) (xy 130.301451 87.15)
-        (xy 130.297641 87.102226) (xy 130.272548 87.021197) (xy 130.225874 86.950366) (xy 130.161315 86.895343) (xy 130.083982 86.860484)
-        (xy 130 86.848549) (xy 129.8 86.848549) (xy 129.8 85.76) (xy 129.799518 85.750197) (xy 129.798365 85.738492)
-        (xy 129.794542 85.71927) (xy 129.791128 85.708014) (xy 129.783623 85.689896) (xy 129.778078 85.679523) (xy 129.767187 85.663225)
-        (xy 129.759725 85.654133) (xy 129.745867 85.640275) (xy 129.736775 85.632813) (xy 129.720477 85.621922) (xy 129.710104 85.616377)
-        (xy 129.691986 85.608872) (xy 129.68073 85.605458) (xy 129.661508 85.601635) (xy 129.649803 85.600482) (xy 129.64 85.6)
+        (xy 130.85 86.5) (xy 130.872836 86.614804) (xy 130.902125 86.685515) (xy 130.967158 86.782844) (xy 131.064485 86.847875)
+        (xy 131.135196 86.877164) (xy 131.25 86.9) (xy 132 86.9) (xy 132 88.45) (xy 131.76 88.45)
+        (xy 131.740491 88.451921) (xy 131.721731 88.457612) (xy 131.679305 88.475186) (xy 131.662016 88.484428) (xy 131.646863 88.496864)
+        (xy 131.634426 88.512018) (xy 131.625186 88.529305) (xy 131.607612 88.571731) (xy 131.601922 88.59049) (xy 131.6 88.61)
+        (xy 131.6 91.711935) (xy 131.545192 91.722837) (xy 131.502766 91.740411) (xy 131.405444 91.80544) (xy 131.340411 91.902766)
+        (xy 131.322837 91.945192) (xy 131.3 92.06) (xy 131.3 92.1) (xy 129.86 92.1) (xy 129.745192 92.122837)
+        (xy 129.702766 92.140411) (xy 129.605444 92.20544) (xy 129.540411 92.302766) (xy 129.522837 92.345192) (xy 129.5 92.46)
+        (xy 129.5 93.135267) (xy 129.498549 93.15) (xy 129.498549 94.45) (xy 129.5 94.464733) (xy 129.5 96.44)
+        (xy 129.521881 96.55) (xy 126.25 96.55) (xy 126.25 93.35) (xy 127.59 93.35) (xy 127.609509 93.348079)
+        (xy 127.628269 93.342388) (xy 127.670695 93.324814) (xy 127.687984 93.315572) (xy 127.703137 93.303136) (xy 127.715574 93.287982)
+        (xy 127.724814 93.270695) (xy 127.742388 93.228269) (xy 127.748078 93.20951) (xy 127.75 93.19) (xy 127.75 92.964733)
+        (xy 127.751451 92.95) (xy 127.751451 92.45) (xy 127.75 92.435267) (xy 127.75 92.21) (xy 127.748079 92.190491)
+        (xy 127.742388 92.171731) (xy 127.724814 92.129305) (xy 127.715572 92.112016) (xy 127.703136 92.096863) (xy 127.687982 92.084426)
+        (xy 127.670695 92.075186) (xy 127.628269 92.057612) (xy 127.60951 92.051922) (xy 127.59 92.05) (xy 126.65 92.05)
+        (xy 126.65 91.45) (xy 128.84 91.45) (xy 128.859509 91.448079) (xy 128.878269 91.442388) (xy 128.920695 91.424814)
+        (xy 128.937984 91.415572) (xy 128.953137 91.403136) (xy 128.965574 91.387982) (xy 128.974814 91.370695) (xy 128.992388 91.328269)
+        (xy 128.998078 91.30951) (xy 129 91.29) (xy 129 88.35) (xy 129.485267 88.35) (xy 129.5 88.351451)
+        (xy 130 88.351451) (xy 130.05881 88.345659) (xy 130.11536 88.328504) (xy 130.167477 88.300647) (xy 130.213158 88.263158)
+        (xy 130.250647 88.217477) (xy 130.278504 88.16536) (xy 130.295659 88.10881) (xy 130.301451 88.05) (xy 130.301451 87.15)
+        (xy 130.295659 87.09119) (xy 130.278504 87.03464) (xy 130.250647 86.982523) (xy 130.213158 86.936842) (xy 130.167477 86.899353)
+        (xy 130.11536 86.871496) (xy 130.05881 86.854341) (xy 130 86.848549) (xy 129.8 86.848549) (xy 129.8 85.76)
+        (xy 129.798079 85.740491) (xy 129.792388 85.721731) (xy 129.774814 85.679305) (xy 129.765572 85.662016) (xy 129.753136 85.646863)
+        (xy 129.737982 85.634426) (xy 129.720695 85.625186) (xy 129.678269 85.607612) (xy 129.65951 85.601922) (xy 129.64 85.6)
         (xy 128.2 85.6) (xy 128.2 83.775) (xy 130.85 83.775)
       )
     )
@@ -1241,32 +1204,25 @@
     )
     (filled_polygon
       (pts
-        (xy 132.8 92.35) (xy 132.06 92.35) (xy 132.050197 92.350482) (xy 132.038492 92.351635) (xy 132.01927 92.355458)
-        (xy 132.008014 92.358872) (xy 131.989896 92.366377) (xy 131.979523 92.371922) (xy 131.963225 92.382813) (xy 131.954133 92.390275)
-        (xy 131.940275 92.404133) (xy 131.932813 92.413225) (xy 131.921922 92.429523) (xy 131.916377 92.439896) (xy 131.908872 92.458014)
-        (xy 131.905458 92.46927) (xy 131.901635 92.488492) (xy 131.900482 92.500197) (xy 131.9 92.51) (xy 131.9 92.8)
-        (xy 130.56 92.8) (xy 130.550197 92.800482) (xy 130.538492 92.801635) (xy 130.51927 92.805458) (xy 130.508014 92.808872)
-        (xy 130.489896 92.816377) (xy 130.479523 92.821922) (xy 130.463225 92.832813) (xy 130.454133 92.840275) (xy 130.440275 92.854133)
-        (xy 130.432813 92.863225) (xy 130.421922 92.879523) (xy 130.416377 92.889896) (xy 130.408872 92.908014) (xy 130.405458 92.91927)
-        (xy 130.401635 92.938492) (xy 130.400482 92.950197) (xy 130.4 92.96) (xy 130.4 94.64) (xy 130.400482 94.649803)
-        (xy 130.401635 94.661508) (xy 130.405458 94.68073) (xy 130.408872 94.691986) (xy 130.416377 94.710104) (xy 130.421922 94.720477)
-        (xy 130.432813 94.736775) (xy 130.440275 94.745867) (xy 130.454133 94.759725) (xy 130.463225 94.767187) (xy 130.479523 94.778078)
-        (xy 130.489896 94.783623) (xy 130.508014 94.791128) (xy 130.51927 94.794542) (xy 130.538492 94.798365) (xy 130.550197 94.799518)
-        (xy 130.56 94.8) (xy 131.6 94.8) (xy 131.6 94.81) (xy 131.204253 94.81) (xy 131.128502 94.817427)
-        (xy 131.055636 94.839427) (xy 130.98843 94.875161) (xy 130.929446 94.923267) (xy 130.880928 94.981915) (xy 130.844726 95.048869)
-        (xy 130.822219 95.12158) (xy 130.814263 95.197277) (xy 130.821161 95.273079) (xy 130.842651 95.346097) (xy 130.877915 95.41355)
-        (xy 130.925609 95.472869) (xy 130.983916 95.521794) (xy 131.050616 95.558463) (xy 131.123167 95.581478) (xy 131.198808 95.589962)
-        (xy 131.204253 95.59) (xy 131.705291 95.59) (xy 131.708014 95.591128) (xy 131.71927 95.594542) (xy 131.738492 95.598365)
-        (xy 131.750197 95.599518) (xy 131.76 95.6) (xy 132.4 95.6) (xy 132.4 95.61003) (xy 132.395747 95.61)
-        (xy 131.204253 95.61) (xy 131.128502 95.617427) (xy 131.055636 95.639427) (xy 130.98843 95.675161) (xy 130.929446 95.723267)
-        (xy 130.880928 95.781915) (xy 130.844726 95.848869) (xy 130.822219 95.92158) (xy 130.814263 95.997277) (xy 130.821161 96.073079)
-        (xy 130.842651 96.146097) (xy 130.877915 96.21355) (xy 130.925609 96.272869) (xy 130.983916 96.321794) (xy 131.050616 96.358463)
-        (xy 131.123167 96.381478) (xy 131.198808 96.389962) (xy 131.204253 96.39) (xy 132.395747 96.39) (xy 132.4 96.389583)
-        (xy 132.4 96.4) (xy 129.9 96.4) (xy 129.9 92.5) (xy 131.54 92.5) (xy 131.549803 92.499518)
-        (xy 131.561508 92.498365) (xy 131.58073 92.494542) (xy 131.591986 92.491128) (xy 131.610104 92.483623) (xy 131.620477 92.478078)
-        (xy 131.636775 92.467187) (xy 131.645867 92.459725) (xy 131.659725 92.445867) (xy 131.667187 92.436775) (xy 131.678078 92.420477)
-        (xy 131.683623 92.410104) (xy 131.691128 92.391986) (xy 131.694542 92.38073) (xy 131.698365 92.361508) (xy 131.699518 92.349803)
-        (xy 131.7 92.34) (xy 131.7 92.1) (xy 132.8 92.1)
+        (xy 132.8 92.35) (xy 132.06 92.35) (xy 132.040491 92.351921) (xy 132.021731 92.357612) (xy 131.979305 92.375186)
+        (xy 131.962016 92.384428) (xy 131.946863 92.396864) (xy 131.934426 92.412018) (xy 131.925186 92.429305) (xy 131.907612 92.471731)
+        (xy 131.901922 92.49049) (xy 131.9 92.51) (xy 131.9 92.8) (xy 130.56 92.8) (xy 130.540491 92.801921)
+        (xy 130.521731 92.807612) (xy 130.479305 92.825186) (xy 130.462016 92.834428) (xy 130.446863 92.846864) (xy 130.434426 92.862018)
+        (xy 130.425186 92.879305) (xy 130.407612 92.921731) (xy 130.401922 92.94049) (xy 130.4 92.96) (xy 130.4 94.64)
+        (xy 130.401921 94.659509) (xy 130.407612 94.678269) (xy 130.425186 94.720695) (xy 130.434428 94.737984) (xy 130.446864 94.753137)
+        (xy 130.462018 94.765574) (xy 130.479305 94.774814) (xy 130.521731 94.792388) (xy 130.54049 94.798078) (xy 130.56 94.8)
+        (xy 131.6 94.8) (xy 131.6 94.81) (xy 131.189841 94.81) (xy 131.132547 94.815643) (xy 131.059031 94.837944)
+        (xy 130.991279 94.874158) (xy 130.931894 94.922894) (xy 130.883158 94.982279) (xy 130.846944 95.050031) (xy 130.824643 95.123547)
+        (xy 130.817113 95.2) (xy 130.824643 95.276453) (xy 130.846944 95.349969) (xy 130.883158 95.417721) (xy 130.931894 95.477106)
+        (xy 130.991279 95.525842) (xy 131.059031 95.562056) (xy 131.132547 95.584357) (xy 131.189841 95.59) (xy 131.715966 95.59)
+        (xy 131.721731 95.592388) (xy 131.74049 95.598078) (xy 131.76 95.6) (xy 132.4 95.6) (xy 132.4 95.61)
+        (xy 131.189841 95.61) (xy 131.132547 95.615643) (xy 131.059031 95.637944) (xy 130.991279 95.674158) (xy 130.931894 95.722894)
+        (xy 130.883158 95.782279) (xy 130.846944 95.850031) (xy 130.824643 95.923547) (xy 130.817113 96) (xy 130.824643 96.076453)
+        (xy 130.846944 96.149969) (xy 130.883158 96.217721) (xy 130.931894 96.277106) (xy 130.991279 96.325842) (xy 131.059031 96.362056)
+        (xy 131.132547 96.384357) (xy 131.189841 96.39) (xy 132.4 96.39) (xy 132.4 96.4) (xy 129.9 96.4)
+        (xy 129.9 92.5) (xy 131.54 92.5) (xy 131.559509 92.498079) (xy 131.578269 92.492388) (xy 131.620695 92.474814)
+        (xy 131.637984 92.465572) (xy 131.653137 92.453136) (xy 131.665574 92.437982) (xy 131.674814 92.420695) (xy 131.692388 92.378269)
+        (xy 131.698078 92.35951) (xy 131.7 92.34) (xy 131.7 92.1) (xy 132.8 92.1)
       )
     )
   )
@@ -1281,15 +1237,10 @@
     )
     (filled_polygon
       (pts
-        (xy 131.9 94.09) (xy 131.901445 94.119409) (xy 131.902598 94.131114) (xy 131.914068 94.188779) (xy 131.917482 94.200035)
-        (xy 131.939996 94.25439) (xy 131.945541 94.264763) (xy 131.978214 94.313658) (xy 131.985676 94.32275) (xy 132.02725 94.364324)
-        (xy 132.036342 94.371786) (xy 132.085237 94.404459) (xy 132.09561 94.410004) (xy 132.149965 94.432518) (xy 132.161221 94.435932)
-        (xy 132.218886 94.447402) (xy 132.230591 94.448555) (xy 132.26 94.45) (xy 132.4 94.45) (xy 132.4 94.8)
-        (xy 132 94.8) (xy 132 94.76) (xy 131.998555 94.730591) (xy 131.997402 94.718886) (xy 131.985932 94.661221)
-        (xy 131.982518 94.649965) (xy 131.960004 94.59561) (xy 131.954459 94.585237) (xy 131.921786 94.536342) (xy 131.914324 94.52725)
-        (xy 131.87275 94.485676) (xy 131.863658 94.478214) (xy 131.814763 94.445541) (xy 131.80439 94.439996) (xy 131.750035 94.417482)
-        (xy 131.738779 94.414068) (xy 131.681114 94.402598) (xy 131.669409 94.401445) (xy 131.64 94.4) (xy 130.9 94.4)
-        (xy 130.9 93.25) (xy 131.9 93.25)
+        (xy 131.9 94.09) (xy 131.922837 94.204808) (xy 131.940411 94.247234) (xy 132.00544 94.344556) (xy 132.102766 94.409589)
+        (xy 132.145192 94.427163) (xy 132.26 94.45) (xy 132.4 94.45) (xy 132.4 94.8) (xy 132 94.8)
+        (xy 132 94.76) (xy 131.977163 94.645192) (xy 131.959589 94.602766) (xy 131.89456 94.505444) (xy 131.797234 94.440411)
+        (xy 131.754808 94.422837) (xy 131.64 94.4) (xy 130.9 94.4) (xy 130.9 93.25) (xy 131.9 93.25)
       )
     )
   )
@@ -1306,19 +1257,13 @@
     )
     (filled_polygon
       (pts
-        (xy 133.3 93.05) (xy 132.96 93.05) (xy 132.950197 93.050482) (xy 132.938492 93.051635) (xy 132.91927 93.055458)
-        (xy 132.908014 93.058872) (xy 132.889896 93.066377) (xy 132.879523 93.071922) (xy 132.863225 93.082813) (xy 132.854133 93.090275)
-        (xy 132.840275 93.104133) (xy 132.832813 93.113225) (xy 132.821922 93.129523) (xy 132.816377 93.139896) (xy 132.808872 93.158014)
-        (xy 132.805458 93.16927) (xy 132.801635 93.188492) (xy 132.800482 93.200197) (xy 132.8 93.21) (xy 132.8 94.05)
-        (xy 132.3 94.05) (xy 132.3 92.75) (xy 132.84 92.75) (xy 132.869409 92.748555) (xy 132.881114 92.747402)
-        (xy 132.938779 92.735932) (xy 132.950035 92.732518) (xy 133.00439 92.710004) (xy 133.014763 92.704459) (xy 133.063658 92.671786)
-        (xy 133.07275 92.664324) (xy 133.114324 92.62275) (xy 133.121786 92.613658) (xy 133.154459 92.564763) (xy 133.160004 92.55439)
-        (xy 133.182518 92.500035) (xy 133.185932 92.488779) (xy 133.197402 92.431114) (xy 133.198555 92.419409) (xy 133.2 92.39)
-        (xy 133.2 92.06) (xy 133.198555 92.030591) (xy 133.197402 92.018886) (xy 133.185932 91.961221) (xy 133.182518 91.949965)
-        (xy 133.160004 91.89561) (xy 133.154459 91.885237) (xy 133.121786 91.836342) (xy 133.114324 91.82725) (xy 133.07275 91.785676)
-        (xy 133.063658 91.778214) (xy 133.014763 91.745541) (xy 133.00439 91.739996) (xy 132.950035 91.717482) (xy 132.938779 91.714068)
-        (xy 132.881114 91.702598) (xy 132.869409 91.701445) (xy 132.84 91.7) (xy 132 91.7) (xy 132 91.45)
-        (xy 133.3 91.45)
+        (xy 133.3 93.05) (xy 132.96 93.05) (xy 132.940491 93.051921) (xy 132.921731 93.057612) (xy 132.879305 93.075186)
+        (xy 132.862016 93.084428) (xy 132.846863 93.096864) (xy 132.834426 93.112018) (xy 132.825186 93.129305) (xy 132.807612 93.171731)
+        (xy 132.801922 93.19049) (xy 132.8 93.21) (xy 132.8 94.05) (xy 132.3 94.05) (xy 132.3 92.75)
+        (xy 132.84 92.75) (xy 132.954808 92.727163) (xy 132.997234 92.709589) (xy 133.094556 92.64456) (xy 133.159589 92.547234)
+        (xy 133.177163 92.504808) (xy 133.2 92.39) (xy 133.2 92.06) (xy 133.177163 91.945192) (xy 133.159589 91.902766)
+        (xy 133.09456 91.805444) (xy 132.997234 91.740411) (xy 132.954808 91.722837) (xy 132.84 91.7) (xy 132 91.7)
+        (xy 132 91.45) (xy 133.3 91.45)
       )
     )
   )
@@ -1334,10 +1279,11 @@
     )
     (filled_polygon
       (pts
-        (xy 133.8 90.798549) (xy 133.62 90.798549) (xy 133.572226 90.802359) (xy 133.491197 90.827452) (xy 133.420366 90.874126)
-        (xy 133.365343 90.938685) (xy 133.330484 91.016018) (xy 133.325655 91.05) (xy 132 91.05) (xy 132 90.786451)
-        (xy 132.85 90.786451) (xy 132.897774 90.782641) (xy 132.978803 90.757548) (xy 133.049634 90.710874) (xy 133.104657 90.646315)
-        (xy 133.139516 90.568982) (xy 133.151451 90.485) (xy 133.151451 90.065) (xy 133.150255 90.05) (xy 133.8 90.05)
+        (xy 133.8 90.798549) (xy 133.62 90.798549) (xy 133.56119 90.804341) (xy 133.50464 90.821496) (xy 133.452523 90.849353)
+        (xy 133.406842 90.886842) (xy 133.369353 90.932523) (xy 133.341496 90.98464) (xy 133.324341 91.04119) (xy 133.323473 91.05)
+        (xy 132 91.05) (xy 132 90.786451) (xy 132.85 90.786451) (xy 132.90881 90.780659) (xy 132.96536 90.763504)
+        (xy 133.017477 90.735647) (xy 133.063158 90.698158) (xy 133.100647 90.652477) (xy 133.128504 90.60036) (xy 133.145659 90.54381)
+        (xy 133.151451 90.485) (xy 133.151451 90.065) (xy 133.149974 90.05) (xy 133.8 90.05)
       )
     )
   )
@@ -1354,10 +1300,11 @@
     )
     (filled_polygon
       (pts
-        (xy 135.425 92.6) (xy 133.8 92.6) (xy 133.8 92.201451) (xy 134.72 92.201451) (xy 134.767774 92.197641)
-        (xy 134.848803 92.172548) (xy 134.919634 92.125874) (xy 134.974657 92.061315) (xy 135.009516 91.983982) (xy 135.021451 91.9)
-        (xy 135.021451 91.1) (xy 135.017641 91.052226) (xy 134.992548 90.971197) (xy 134.945874 90.900366) (xy 134.881315 90.845343)
-        (xy 134.803982 90.810484) (xy 134.72 90.798549) (xy 134.6 90.798549) (xy 134.6 90.05) (xy 135.425 90.05)
+        (xy 135.425 92.6) (xy 133.8 92.6) (xy 133.8 92.201451) (xy 134.72 92.201451) (xy 134.77881 92.195659)
+        (xy 134.83536 92.178504) (xy 134.887477 92.150647) (xy 134.933158 92.113158) (xy 134.970647 92.067477) (xy 134.998504 92.01536)
+        (xy 135.015659 91.95881) (xy 135.021451 91.9) (xy 135.021451 91.1) (xy 135.015659 91.04119) (xy 134.998504 90.98464)
+        (xy 134.970647 90.932523) (xy 134.933158 90.886842) (xy 134.887477 90.849353) (xy 134.83536 90.821496) (xy 134.77881 90.804341)
+        (xy 134.72 90.798549) (xy 134.6 90.798549) (xy 134.6 90.05) (xy 135.425 90.05)
       )
     )
   )
@@ -1374,15 +1321,12 @@
     )
     (filled_polygon
       (pts
-        (xy 147.35 94.5) (xy 144.9 94.5) (xy 144.9 93.2) (xy 147.04 93.2) (xy 147.049803 93.199518)
-        (xy 147.061508 93.198365) (xy 147.08073 93.194542) (xy 147.091986 93.191128) (xy 147.110104 93.183623) (xy 147.120477 93.178078)
-        (xy 147.136775 93.167187) (xy 147.145867 93.159725) (xy 147.159725 93.145867) (xy 147.167187 93.136775) (xy 147.178078 93.120477)
-        (xy 147.183623 93.110104) (xy 147.191128 93.091986) (xy 147.194542 93.08073) (xy 147.198365 93.061508) (xy 147.199518 93.049803)
-        (xy 147.2 93.04) (xy 147.2 87.76) (xy 147.199518 87.750197) (xy 147.198365 87.738492) (xy 147.194542 87.71927)
-        (xy 147.191128 87.708014) (xy 147.183623 87.689896) (xy 147.178078 87.679523) (xy 147.167187 87.663225) (xy 147.159725 87.654133)
-        (xy 147.145867 87.640275) (xy 147.136775 87.632813) (xy 147.120477 87.621922) (xy 147.110104 87.616377) (xy 147.091986 87.608872)
-        (xy 147.08073 87.605458) (xy 147.061508 87.601635) (xy 147.049803 87.600482) (xy 147.04 87.6) (xy 145.3 87.6)
-        (xy 145.3 86.3) (xy 147.35 86.3)
+        (xy 147.35 94.5) (xy 144.9 94.5) (xy 144.9 93.2) (xy 147.04 93.2) (xy 147.059509 93.198079)
+        (xy 147.078269 93.192388) (xy 147.120695 93.174814) (xy 147.137984 93.165572) (xy 147.153137 93.153136) (xy 147.165574 93.137982)
+        (xy 147.174814 93.120695) (xy 147.192388 93.078269) (xy 147.198078 93.05951) (xy 147.2 93.04) (xy 147.2 87.76)
+        (xy 147.198079 87.740491) (xy 147.192388 87.721731) (xy 147.174814 87.679305) (xy 147.165572 87.662016) (xy 147.153136 87.646863)
+        (xy 147.137982 87.634426) (xy 147.120695 87.625186) (xy 147.078269 87.607612) (xy 147.05951 87.601922) (xy 147.04 87.6)
+        (xy 145.3 87.6) (xy 145.3 86.3) (xy 147.350001 86.3)
       )
     )
   )
@@ -1399,22 +1343,17 @@
     )
     (filled_polygon
       (pts
-        (xy 127.35 87.15) (xy 126.41 87.15) (xy 126.400197 87.150482) (xy 126.388492 87.151635) (xy 126.36927 87.155458)
-        (xy 126.358014 87.158872) (xy 126.339896 87.166377) (xy 126.329523 87.171922) (xy 126.313225 87.182813) (xy 126.304133 87.190275)
-        (xy 126.290275 87.204133) (xy 126.282813 87.213225) (xy 126.271922 87.229523) (xy 126.266377 87.239896) (xy 126.258872 87.258014)
-        (xy 126.255458 87.26927) (xy 126.251635 87.288492) (xy 126.250482 87.300197) (xy 126.25 87.31) (xy 126.25 87.53979)
-        (xy 126.248549 87.55) (xy 126.248549 88.05) (xy 126.25 88.068194) (xy 126.25 88.99) (xy 126.250482 88.999803)
-        (xy 126.251635 89.011508) (xy 126.255458 89.03073) (xy 126.258872 89.041986) (xy 126.266377 89.060104) (xy 126.271922 89.070477)
-        (xy 126.282813 89.086775) (xy 126.290275 89.095867) (xy 126.304133 89.109725) (xy 126.313225 89.117187) (xy 126.329523 89.128078)
-        (xy 126.339896 89.133623) (xy 126.358014 89.141128) (xy 126.36927 89.144542) (xy 126.388492 89.148365) (xy 126.400197 89.149518)
-        (xy 126.41 89.15) (xy 127.448549 89.15) (xy 127.448549 89.185) (xy 127.452359 89.232774) (xy 127.477452 89.313803)
-        (xy 127.524126 89.384634) (xy 127.588685 89.439657) (xy 127.666018 89.474516) (xy 127.688286 89.477681) (xy 127.699965 89.482518)
-        (xy 127.711221 89.485932) (xy 127.768886 89.497402) (xy 127.780591 89.498555) (xy 127.81 89.5) (xy 128.6 89.5)
-        (xy 128.6 89.75) (xy 127.711822 89.75) (xy 127.710004 89.74561) (xy 127.704459 89.735237) (xy 127.671786 89.686342)
-        (xy 127.664324 89.67725) (xy 127.62275 89.635676) (xy 127.613658 89.628214) (xy 127.564763 89.595541) (xy 127.55439 89.589996)
-        (xy 127.500035 89.567482) (xy 127.488779 89.564068) (xy 127.431114 89.552598) (xy 127.419409 89.551445) (xy 127.39 89.55)
-        (xy 127.38521 89.55) (xy 127.375 89.548549) (xy 126.625 89.548549) (xy 126.606807 89.55) (xy 126.05 89.55)
-        (xy 126.05 86.85) (xy 127.35 86.85)
+        (xy 127.35 87.15) (xy 126.41 87.15) (xy 126.390491 87.151921) (xy 126.371731 87.157612) (xy 126.329305 87.175186)
+        (xy 126.312016 87.184428) (xy 126.296863 87.196864) (xy 126.284426 87.212018) (xy 126.275186 87.229305) (xy 126.257612 87.271731)
+        (xy 126.251922 87.29049) (xy 126.25 87.31) (xy 126.25 87.535267) (xy 126.248549 87.55) (xy 126.248549 88.05)
+        (xy 126.25 88.064733) (xy 126.25 88.99) (xy 126.251921 89.009509) (xy 126.257612 89.028269) (xy 126.275186 89.070695)
+        (xy 126.284428 89.087984) (xy 126.296864 89.103137) (xy 126.312018 89.115574) (xy 126.329305 89.124814) (xy 126.371731 89.142388)
+        (xy 126.39049 89.148078) (xy 126.41 89.15) (xy 127.448549 89.15) (xy 127.448549 89.185) (xy 127.454341 89.24381)
+        (xy 127.471496 89.30036) (xy 127.499353 89.352477) (xy 127.536842 89.398158) (xy 127.582523 89.435647) (xy 127.63464 89.463504)
+        (xy 127.69119 89.480659) (xy 127.733928 89.484868) (xy 127.81 89.5) (xy 128.6 89.5) (xy 128.6 89.75)
+        (xy 127.707741 89.75) (xy 127.64456 89.655444) (xy 127.547234 89.590411) (xy 127.504808 89.572837) (xy 127.475683 89.567044)
+        (xy 127.43381 89.554341) (xy 127.390262 89.550052) (xy 127.39 89.55) (xy 127.389733 89.55) (xy 127.375 89.548549)
+        (xy 126.625 89.548549) (xy 126.610267 89.55) (xy 126.05 89.55) (xy 126.05 86.85) (xy 127.35 86.85)
       )
     )
   )
@@ -1431,14 +1370,11 @@
     )
     (filled_polygon
       (pts
-        (xy 129.4 87.09) (xy 129.400482 87.099803) (xy 129.401635 87.111508) (xy 129.405458 87.13073) (xy 129.408872 87.141986)
-        (xy 129.416377 87.160104) (xy 129.421922 87.170477) (xy 129.432813 87.186775) (xy 129.440275 87.195867) (xy 129.454133 87.209725)
-        (xy 129.463225 87.217187) (xy 129.479523 87.228078) (xy 129.489896 87.233623) (xy 129.508014 87.241128) (xy 129.51927 87.244542)
-        (xy 129.538492 87.248365) (xy 129.550197 87.249518) (xy 129.56 87.25) (xy 129.9 87.25) (xy 129.9 87.95)
-        (xy 129 87.95) (xy 129 87.21) (xy 128.998555 87.180591) (xy 128.997402 87.168886) (xy 128.985932 87.111221)
-        (xy 128.982518 87.099965) (xy 128.960004 87.04561) (xy 128.954459 87.035237) (xy 128.921786 86.986342) (xy 128.914324 86.97725)
-        (xy 128.87275 86.935676) (xy 128.863658 86.928214) (xy 128.814763 86.895541) (xy 128.80439 86.889996) (xy 128.8 86.888178)
-        (xy 128.8 86) (xy 129.4 86)
+        (xy 129.4 87.09) (xy 129.401921 87.109509) (xy 129.407612 87.128269) (xy 129.425186 87.170695) (xy 129.434428 87.187984)
+        (xy 129.446864 87.203137) (xy 129.462018 87.215574) (xy 129.479305 87.224814) (xy 129.521731 87.242388) (xy 129.54049 87.248078)
+        (xy 129.56 87.25) (xy 129.9 87.25) (xy 129.9 87.95) (xy 129 87.95) (xy 129 87.21)
+        (xy 128.977163 87.095192) (xy 128.959589 87.052766) (xy 128.89456 86.955444) (xy 128.8 86.892259) (xy 128.8 86)
+        (xy 129.4 86)
       )
     )
   )
@@ -1487,14 +1423,12 @@
     )
     (filled_polygon
       (pts
-        (xy 127.35 89.99) (xy 127.350482 89.999803) (xy 127.351635 90.011508) (xy 127.355458 90.03073) (xy 127.358872 90.041986)
-        (xy 127.366377 90.060104) (xy 127.371922 90.070477) (xy 127.382813 90.086775) (xy 127.390275 90.095867) (xy 127.404133 90.109725)
-        (xy 127.413225 90.117187) (xy 127.429523 90.128078) (xy 127.439896 90.133623) (xy 127.458014 90.141128) (xy 127.46927 90.144542)
-        (xy 127.488492 90.148365) (xy 127.500197 90.149518) (xy 127.51 90.15) (xy 128.6 90.15) (xy 128.6 90.4)
-        (xy 127.51 90.4) (xy 127.500197 90.400482) (xy 127.488492 90.401635) (xy 127.46927 90.405458) (xy 127.458014 90.408872)
-        (xy 127.439896 90.416377) (xy 127.429523 90.421922) (xy 127.413225 90.432813) (xy 127.404133 90.440275) (xy 127.390275 90.454133)
-        (xy 127.382813 90.463225) (xy 127.371922 90.479523) (xy 127.366377 90.489896) (xy 127.358872 90.508014) (xy 127.355458 90.51927)
-        (xy 127.351635 90.538492) (xy 127.350501 90.55) (xy 126.65 90.55) (xy 126.65 89.95) (xy 127.35 89.95)
+        (xy 127.35 89.99) (xy 127.351921 90.009509) (xy 127.357612 90.028269) (xy 127.375186 90.070695) (xy 127.384428 90.087984)
+        (xy 127.396864 90.103137) (xy 127.412018 90.115574) (xy 127.429305 90.124814) (xy 127.471731 90.142388) (xy 127.49049 90.148078)
+        (xy 127.51 90.15) (xy 128.6 90.15) (xy 128.6 90.4) (xy 127.51 90.4) (xy 127.490491 90.401921)
+        (xy 127.471731 90.407612) (xy 127.429305 90.425186) (xy 127.412016 90.434428) (xy 127.396863 90.446864) (xy 127.384426 90.462018)
+        (xy 127.375186 90.479305) (xy 127.357612 90.521731) (xy 127.351922 90.54049) (xy 127.350985 90.55) (xy 126.65 90.55)
+        (xy 126.65 89.95) (xy 127.35 89.95)
       )
     )
   )
@@ -1512,20 +1446,16 @@
     )
     (filled_polygon
       (pts
-        (xy 128.6 91.05) (xy 127.38521 91.05) (xy 127.375 91.048549) (xy 126.625 91.048549) (xy 126.606806 91.05)
-        (xy 126.41 91.05) (xy 126.400197 91.050482) (xy 126.388492 91.051635) (xy 126.36927 91.055458) (xy 126.358014 91.058872)
-        (xy 126.339896 91.066377) (xy 126.329523 91.071922) (xy 126.313225 91.082813) (xy 126.304133 91.090275) (xy 126.290275 91.104133)
-        (xy 126.282813 91.113225) (xy 126.271922 91.129523) (xy 126.266377 91.139896) (xy 126.258872 91.158014) (xy 126.255458 91.16927)
-        (xy 126.251635 91.188492) (xy 126.250482 91.200197) (xy 126.25 91.21) (xy 126.25 92.39) (xy 126.250482 92.399803)
-        (xy 126.251635 92.411508) (xy 126.255458 92.43073) (xy 126.258872 92.441986) (xy 126.266377 92.460104) (xy 126.271922 92.470477)
-        (xy 126.282813 92.486775) (xy 126.290275 92.495867) (xy 126.304133 92.509725) (xy 126.313225 92.517187) (xy 126.329523 92.528078)
-        (xy 126.339896 92.533623) (xy 126.358014 92.541128) (xy 126.36927 92.544542) (xy 126.388492 92.548365) (xy 126.400197 92.549518)
-        (xy 126.41 92.55) (xy 127.35 92.55) (xy 127.35 92.85) (xy 126.05 92.85) (xy 126.05 90.95)
-        (xy 126.61479 90.95) (xy 126.625 90.951451) (xy 127.375 90.951451) (xy 127.393193 90.95) (xy 127.54 90.95)
-        (xy 127.549803 90.949518) (xy 127.561508 90.948365) (xy 127.58073 90.944542) (xy 127.591986 90.941128) (xy 127.610104 90.933623)
-        (xy 127.620477 90.928078) (xy 127.636775 90.917187) (xy 127.645867 90.909725) (xy 127.659725 90.895867) (xy 127.667187 90.886775)
-        (xy 127.678078 90.870477) (xy 127.683623 90.860104) (xy 127.691128 90.841986) (xy 127.694542 90.83073) (xy 127.698365 90.811508)
-        (xy 127.699499 90.8) (xy 128.6 90.8)
+        (xy 128.6 91.05) (xy 127.389733 91.05) (xy 127.375 91.048549) (xy 126.625 91.048549) (xy 126.610267 91.05)
+        (xy 126.41 91.05) (xy 126.390491 91.051921) (xy 126.371731 91.057612) (xy 126.329305 91.075186) (xy 126.312016 91.084428)
+        (xy 126.296863 91.096864) (xy 126.284426 91.112018) (xy 126.275186 91.129305) (xy 126.257612 91.171731) (xy 126.251922 91.19049)
+        (xy 126.25 91.21) (xy 126.25 92.39) (xy 126.251921 92.409509) (xy 126.257612 92.428269) (xy 126.275186 92.470695)
+        (xy 126.284428 92.487984) (xy 126.296864 92.503137) (xy 126.312018 92.515574) (xy 126.329305 92.524814) (xy 126.371731 92.542388)
+        (xy 126.39049 92.548078) (xy 126.41 92.55) (xy 127.35 92.55) (xy 127.35 92.85) (xy 126.05 92.85)
+        (xy 126.05 90.95) (xy 126.610267 90.95) (xy 126.625 90.951451) (xy 127.375 90.951451) (xy 127.389733 90.95)
+        (xy 127.54 90.95) (xy 127.559509 90.948079) (xy 127.578269 90.942388) (xy 127.620695 90.924814) (xy 127.637984 90.915572)
+        (xy 127.653137 90.903136) (xy 127.665574 90.887982) (xy 127.674814 90.870695) (xy 127.692388 90.828269) (xy 127.698078 90.80951)
+        (xy 127.699015 90.8) (xy 128.6 90.8)
       )
     )
   )
@@ -1558,18 +1488,15 @@
     )
     (filled_polygon
       (pts
-        (xy 135.15 96.4) (xy 132.785489 96.4) (xy 132.778839 96.326921) (xy 132.757349 96.253903) (xy 132.722085 96.18645)
-        (xy 132.674391 96.127131) (xy 132.616084 96.078206) (xy 132.549384 96.041537) (xy 132.476833 96.018522) (xy 132.401192 96.010038)
-        (xy 132.395747 96.01) (xy 131.204253 96.01) (xy 131.2 96.010417) (xy 131.2 95.98997) (xy 131.204253 95.99)
-        (xy 132.395747 95.99) (xy 132.471498 95.982573) (xy 132.544364 95.960573) (xy 132.61157 95.924839) (xy 132.670554 95.876733)
-        (xy 132.719072 95.818085) (xy 132.755274 95.751131) (xy 132.777781 95.67842) (xy 132.785737 95.602723) (xy 132.778839 95.526921)
-        (xy 132.757349 95.453903) (xy 132.722085 95.38645) (xy 132.674391 95.327131) (xy 132.616084 95.278206) (xy 132.549384 95.241537)
-        (xy 132.476833 95.218522) (xy 132.401192 95.210038) (xy 132.395747 95.21) (xy 131.204253 95.21) (xy 131.2 95.210417)
-        (xy 131.2 95.2) (xy 133.04 95.2) (xy 133.049803 95.199518) (xy 133.061508 95.198365) (xy 133.08073 95.194542)
-        (xy 133.091986 95.191128) (xy 133.110104 95.183623) (xy 133.120477 95.178078) (xy 133.136775 95.167187) (xy 133.145867 95.159725)
-        (xy 133.159725 95.145867) (xy 133.167187 95.136775) (xy 133.178078 95.120477) (xy 133.183623 95.110104) (xy 133.191128 95.091986)
-        (xy 133.194542 95.08073) (xy 133.198365 95.061508) (xy 133.199518 95.049803) (xy 133.2 95.04) (xy 133.2 93.5)
-        (xy 135.15 93.5)
+        (xy 135.15 96.4) (xy 132.782887 96.4) (xy 132.775357 96.323547) (xy 132.753056 96.250031) (xy 132.716842 96.182279)
+        (xy 132.668106 96.122894) (xy 132.608721 96.074158) (xy 132.540969 96.037944) (xy 132.467453 96.015643) (xy 132.410159 96.01)
+        (xy 131.2 96.01) (xy 131.2 95.99) (xy 132.410159 95.99) (xy 132.467453 95.984357) (xy 132.540969 95.962056)
+        (xy 132.608721 95.925842) (xy 132.668106 95.877106) (xy 132.716842 95.817721) (xy 132.753056 95.749969) (xy 132.775357 95.676453)
+        (xy 132.782887 95.6) (xy 132.775357 95.523547) (xy 132.753056 95.450031) (xy 132.716842 95.382279) (xy 132.668106 95.322894)
+        (xy 132.608721 95.274158) (xy 132.540969 95.237944) (xy 132.467453 95.215643) (xy 132.410159 95.21) (xy 131.2 95.21)
+        (xy 131.2 95.2) (xy 133.04 95.2) (xy 133.059509 95.198079) (xy 133.078269 95.192388) (xy 133.120695 95.174814)
+        (xy 133.137984 95.165572) (xy 133.153137 95.153136) (xy 133.165574 95.137982) (xy 133.174814 95.120695) (xy 133.192388 95.078269)
+        (xy 133.198078 95.05951) (xy 133.2 95.04) (xy 133.2 93.5) (xy 135.15 93.5)
       )
     )
   )
@@ -1587,40 +1514,23 @@
     )
     (filled_polygon
       (pts
-        (xy 131.259705 83.326197) (xy 131.269042 83.32903) (xy 131.277645 83.333628) (xy 131.285185 83.339815) (xy 131.291372 83.347355)
-        (xy 131.29597 83.355958) (xy 131.298803 83.365295) (xy 131.3 83.377452) (xy 131.3 86.3) (xy 131.300241 86.3049)
-        (xy 131.302162 86.324409) (xy 131.304074 86.334024) (xy 131.309765 86.352783) (xy 131.313516 86.361838) (xy 131.322757 86.379127)
-        (xy 131.328202 86.387276) (xy 131.340638 86.40243) (xy 131.34757 86.409362) (xy 131.362724 86.421798) (xy 131.370873 86.427243)
-        (xy 131.388162 86.436484) (xy 131.397217 86.440235) (xy 131.415976 86.445926) (xy 131.425591 86.447838) (xy 131.4451 86.449759)
-        (xy 131.45 86.45) (xy 132.397548 86.45) (xy 132.409705 86.451197) (xy 132.419042 86.45403) (xy 132.427645 86.458628)
-        (xy 132.435185 86.464815) (xy 132.441372 86.472355) (xy 132.44597 86.480958) (xy 132.448803 86.490295) (xy 132.45 86.502452)
-        (xy 132.45 88.65) (xy 132.450241 88.6549) (xy 132.452162 88.674409) (xy 132.454074 88.684024) (xy 132.459765 88.702783)
-        (xy 132.463516 88.711838) (xy 132.472757 88.729127) (xy 132.478202 88.737276) (xy 132.490638 88.75243) (xy 132.49757 88.759362)
-        (xy 132.512724 88.771798) (xy 132.520873 88.777243) (xy 132.538162 88.786484) (xy 132.547217 88.790235) (xy 132.565976 88.795926)
-        (xy 132.575591 88.797838) (xy 132.5951 88.799759) (xy 132.6 88.8) (xy 132.747548 88.8) (xy 132.759705 88.801197)
-        (xy 132.769042 88.80403) (xy 132.777645 88.808628) (xy 132.785185 88.814815) (xy 132.791372 88.822355) (xy 132.79597 88.830958)
-        (xy 132.798803 88.840295) (xy 132.8 88.852452) (xy 132.8 89.097548) (xy 132.798803 89.109705) (xy 132.79597 89.119042)
-        (xy 132.791372 89.127645) (xy 132.785185 89.135185) (xy 132.777645 89.141372) (xy 132.769042 89.14597) (xy 132.759705 89.148803)
-        (xy 132.747548 89.15) (xy 132.002452 89.15) (xy 131.990295 89.148803) (xy 131.980958 89.14597) (xy 131.972355 89.141372)
-        (xy 131.964815 89.135185) (xy 131.958628 89.127645) (xy 131.95403 89.119042) (xy 131.951197 89.109705) (xy 131.95 89.097548)
-        (xy 131.95 88.852452) (xy 131.951197 88.840295) (xy 131.95403 88.830958) (xy 131.958628 88.822355) (xy 131.964815 88.814815)
-        (xy 131.972355 88.808628) (xy 131.980958 88.80403) (xy 131.990295 88.801197) (xy 132.002452 88.8) (xy 132.2 88.8)
-        (xy 132.2049 88.799759) (xy 132.224409 88.797838) (xy 132.234024 88.795926) (xy 132.252783 88.790235) (xy 132.261838 88.786484)
-        (xy 132.279127 88.777243) (xy 132.287276 88.771798) (xy 132.30243 88.759362) (xy 132.309362 88.75243) (xy 132.321798 88.737276)
-        (xy 132.327243 88.729127) (xy 132.336484 88.711838) (xy 132.340235 88.702783) (xy 132.345926 88.684024) (xy 132.347838 88.674409)
-        (xy 132.349759 88.6549) (xy 132.35 88.65) (xy 132.35 86.7) (xy 132.349759 86.6951) (xy 132.347838 86.675591)
-        (xy 132.345926 86.665976) (xy 132.340235 86.647217) (xy 132.336484 86.638162) (xy 132.327243 86.620873) (xy 132.321798 86.612724)
-        (xy 132.309362 86.59757) (xy 132.30243 86.590638) (xy 132.287276 86.578202) (xy 132.279127 86.572757) (xy 132.261838 86.563516)
-        (xy 132.252783 86.559765) (xy 132.234024 86.554074) (xy 132.224409 86.552162) (xy 132.2049 86.550241) (xy 132.2 86.55)
-        (xy 131.252452 86.55) (xy 131.240295 86.548803) (xy 131.230958 86.54597) (xy 131.222355 86.541372) (xy 131.214815 86.535185)
-        (xy 131.208628 86.527645) (xy 131.20403 86.519042) (xy 131.201197 86.509705) (xy 131.2 86.497548) (xy 131.2 83.575)
-        (xy 131.199759 83.5701) (xy 131.197838 83.550591) (xy 131.195926 83.540976) (xy 131.190235 83.522217) (xy 131.186484 83.513162)
-        (xy 131.177243 83.495873) (xy 131.171798 83.487724) (xy 131.159362 83.47257) (xy 131.15243 83.465638) (xy 131.137276 83.453202)
-        (xy 131.129127 83.447757) (xy 131.111838 83.438516) (xy 131.102783 83.434765) (xy 131.084024 83.429074) (xy 131.074409 83.427162)
-        (xy 131.0549 83.425241) (xy 131.05 83.425) (xy 127.602452 83.425) (xy 127.590295 83.423803) (xy 127.580958 83.42097)
-        (xy 127.572355 83.416372) (xy 127.564815 83.410185) (xy 127.558628 83.402645) (xy 127.55403 83.394042) (xy 127.551197 83.384705)
-        (xy 127.550241 83.375) (xy 127.551197 83.365295) (xy 127.55403 83.355958) (xy 127.558628 83.347355) (xy 127.564815 83.339815)
-        (xy 127.572355 83.333628) (xy 127.580958 83.32903) (xy 127.590295 83.326197) (xy 127.602452 83.325) (xy 131.247548 83.325)
+        (xy 131.282443 83.342557) (xy 131.3 83.384945) (xy 131.3 86.3) (xy 131.300961 86.309755) (xy 131.303806 86.319134)
+        (xy 131.333095 86.389845) (xy 131.337715 86.398489) (xy 131.343933 86.406066) (xy 131.35151 86.412284) (xy 131.360155 86.416905)
+        (xy 131.430866 86.446194) (xy 131.440246 86.449039) (xy 131.45 86.45) (xy 132.390055 86.45) (xy 132.432443 86.467557)
+        (xy 132.45 86.509945) (xy 132.45 88.65) (xy 132.450961 88.659755) (xy 132.453806 88.669134) (xy 132.483095 88.739845)
+        (xy 132.487715 88.748489) (xy 132.493933 88.756066) (xy 132.50151 88.762284) (xy 132.510155 88.766905) (xy 132.580866 88.796194)
+        (xy 132.590246 88.799039) (xy 132.6 88.8) (xy 132.740055 88.8) (xy 132.782443 88.817557) (xy 132.8 88.859945)
+        (xy 132.8 89.090055) (xy 132.782443 89.132443) (xy 132.740055 89.15) (xy 132.009945 89.15) (xy 131.967557 89.132443)
+        (xy 131.95 89.090055) (xy 131.95 88.859945) (xy 131.967557 88.817557) (xy 132.009945 88.8) (xy 132.2 88.8)
+        (xy 132.209755 88.799039) (xy 132.219134 88.796194) (xy 132.289845 88.766905) (xy 132.298489 88.762285) (xy 132.306066 88.756067)
+        (xy 132.312284 88.74849) (xy 132.316905 88.739845) (xy 132.346194 88.669134) (xy 132.349039 88.659754) (xy 132.35 88.65)
+        (xy 132.35 86.7) (xy 132.349039 86.690245) (xy 132.346194 86.680866) (xy 132.316905 86.610155) (xy 132.312285 86.601511)
+        (xy 132.306067 86.593934) (xy 132.29849 86.587716) (xy 132.289845 86.583095) (xy 132.219134 86.553806) (xy 132.209754 86.550961)
+        (xy 132.2 86.55) (xy 131.259945 86.55) (xy 131.217557 86.532443) (xy 131.2 86.490055) (xy 131.2 83.575)
+        (xy 131.199039 83.565245) (xy 131.196194 83.555866) (xy 131.166905 83.485155) (xy 131.162285 83.476511) (xy 131.156067 83.468934)
+        (xy 131.14849 83.462716) (xy 131.139845 83.458095) (xy 131.069134 83.428806) (xy 131.059754 83.425961) (xy 131.05 83.425)
+        (xy 127.609945 83.425) (xy 127.567557 83.407443) (xy 127.554119 83.375) (xy 127.567557 83.342557) (xy 127.609945 83.325)
+        (xy 131.240055 83.325)
       )
     )
   )

+ 6 - 6
Nixie_PSU_Breakout/nixie_psu_breakout.kicad_pcb-bak

@@ -3,7 +3,7 @@
   (general
     (links 50)
     (no_connects 1)
-    (area 124.525 78.325 153.509525 99.395238)
+    (area 125.649999 80.049999 147.750001 97.150001)
     (thickness 1.6)
     (drawings 11)
     (tracks 87)
@@ -991,12 +991,12 @@
   (segment (start 145.83 94) (end 146.285 94) (width 0.2) (layer F.Cu) (net 12) (status 30))
   (segment (start 146.7 81.1) (end 146.3 80.7) (width 0.3) (layer B.Cu) (net 14) (status 30))
   (segment (start 146.3 80.7) (end 128.7 80.7) (width 0.3) (layer B.Cu) (net 14) (status 10))
-  (segment (start 128.7 80.7) (end 128.3 81.1) (width 0.3) (layer B.Cu) (net 14))
-  (segment (start 128.3 81.1) (end 128.3 84.3) (width 0.3) (layer B.Cu) (net 14))
-  (segment (start 128.3 84.3) (end 127.9 84.7) (width 0.3) (layer B.Cu) (net 14))
-  (segment (start 127.9 84.7) (end 127 84.7) (width 0.3) (layer B.Cu) (net 14))
-  (segment (start 127 84.7) (end 127 85.45) (width 0.3) (layer F.Cu) (net 14) (status 20))
   (via (at 127 84.7) (size 0.508) (drill 0.254) (layers F.Cu B.Cu) (net 14))
+  (segment (start 127 84.7) (end 127 85.45) (width 0.3) (layer F.Cu) (net 14) (status 20))
+  (segment (start 127.9 84.7) (end 127 84.7) (width 0.3) (layer B.Cu) (net 14))
+  (segment (start 128.3 84.3) (end 127.9 84.7) (width 0.3) (layer B.Cu) (net 14))
+  (segment (start 128.3 81.1) (end 128.3 84.3) (width 0.3) (layer B.Cu) (net 14))
+  (segment (start 128.7 80.7) (end 128.3 81.1) (width 0.3) (layer B.Cu) (net 14))
   (segment (start 133.45 90.45) (end 133.45 90.35) (width 0.3) (layer F.Cu) (net 15) (status 30))
 
   (zone (net 1) (net_name GNDREF) (layer B.Cu) (tstamp 0) (hatch edge 0.508)

+ 203 - 163
Nixie_PSU_Breakout/nixie_psu_breakout.net

@@ -1,8 +1,8 @@
 (export (version D)
   (design
-    (source C:/Users/Kevin/Documents/Projects/NixieTubeClock/Nixie_PSU_Breakout/nixie_psu_breakout.sch)
-    (date "2/24/2018 12:05:40 AM")
-    (tool "Eeschema 4.0.7")
+    (source C:\Users\Kevin\Documents\Projects\NixieTubeClock\Nixie_PSU_Breakout\nixie_psu_breakout.sch)
+    (date "7/22/2018 6:05:50 PM")
+    (tool "Eeschema (5.0.0)")
     (sheet (number 1) (name /) (tstamps /)
       (title_block
         (title)
@@ -18,144 +18,193 @@
     (comp (ref T1)
       (value Wurth_Transformer_10.16x13.36mm)
       (footprint "Custom Parts:Wurth_WE-FB_10.18x13.36mm")
-      (libsource (lib Custom_Parts) (part Wurth_Transformer_10.16x13.36mm))
+      (libsource (lib Custom_Parts) (part Wurth_Transformer_10.16x13.36mm) (description ""))
       (sheetpath (names /) (tstamps /))
       (tstamp 5A6B88EA))
     (comp (ref R2)
       (value R_VC)
       (footprint Resistors_SMD:R_0603)
-      (libsource (lib device) (part R))
+      (libsource (lib Device) (part R) (description Resistor))
       (sheetpath (names /) (tstamps /))
       (tstamp 5A6B8978))
     (comp (ref C3)
       (value C_VC)
       (footprint Capacitors_SMD:C_0603)
-      (libsource (lib device) (part C))
+      (libsource (lib Device) (part C) (description "Unpolarized capacitor"))
       (sheetpath (names /) (tstamps /))
       (tstamp 5A6B89DB))
     (comp (ref Q1)
       (value Q_SWITCH)
       (footprint "Custom Parts:EPC2016C")
-      (libsource (lib device) (part Q_NMOS_DGS))
+      (libsource (lib Device) (part Q_NMOS_DGS) (description "Transistor N-MOSFET (general)"))
       (sheetpath (names /) (tstamps /))
       (tstamp 5A6B8B05))
     (comp (ref R4)
       (value R_SENSE)
       (footprint Resistors_SMD:R_0805)
-      (libsource (lib device) (part R))
+      (libsource (lib Device) (part R) (description Resistor))
       (sheetpath (names /) (tstamps /))
       (tstamp 5A6B8B69))
     (comp (ref D1)
       (value D_RECT)
       (footprint "Custom Parts:SOD-123W")
-      (libsource (lib device) (part D))
+      (libsource (lib Device) (part D) (description Diode))
       (sheetpath (names /) (tstamps /))
       (tstamp 5A6B91C6))
     (comp (ref C5)
       (value C_OUT)
       (footprint Capacitors_SMD:C_2220)
-      (libsource (lib device) (part C))
+      (libsource (lib Device) (part C) (description "Unpolarized capacitor"))
       (sheetpath (names /) (tstamps /))
       (tstamp 5A6B92D0))
     (comp (ref C6)
       (value C_OUT)
       (footprint Capacitors_SMD:C_1812)
-      (libsource (lib device) (part C))
+      (libsource (lib Device) (part C) (description "Unpolarized capacitor"))
       (sheetpath (names /) (tstamps /))
       (tstamp 5A6B93C6))
     (comp (ref R5)
       (value R_FB)
       (footprint Resistors_SMD:R_0603)
-      (libsource (lib device) (part R))
+      (libsource (lib Device) (part R) (description Resistor))
       (sheetpath (names /) (tstamps /))
       (tstamp 5A6B9F37))
     (comp (ref R3)
       (value R_BIAS)
       (footprint Resistors_SMD:R_0603)
-      (libsource (lib device) (part R))
+      (libsource (lib Device) (part R) (description Resistor))
       (sheetpath (names /) (tstamps /))
       (tstamp 5A6B9FBA))
     (comp (ref C7)
       (value C_BP)
       (footprint Capacitors_SMD:C_0603)
-      (libsource (lib device) (part C))
+      (libsource (lib Device) (part C) (description "Unpolarized capacitor"))
       (sheetpath (names /) (tstamps /))
       (tstamp 5A6BA4CA))
     (comp (ref R1)
       (value R_FREQ)
       (footprint Resistors_SMD:R_0603)
-      (libsource (lib device) (part R))
+      (libsource (lib Device) (part R) (description Resistor))
       (sheetpath (names /) (tstamps /))
       (tstamp 5A6BAAF4))
     (comp (ref C2)
-      (value C)
+      (value C_IN)
       (footprint Capacitors_SMD:C_0805)
-      (libsource (lib device) (part C))
+      (libsource (lib Device) (part C) (description "Unpolarized capacitor"))
       (sheetpath (names /) (tstamps /))
       (tstamp 5A6C0FBE))
     (comp (ref C1)
-      (value C)
+      (value C_IN)
       (footprint Capacitors_SMD:C_1210)
-      (libsource (lib device) (part C))
+      (libsource (lib Device) (part C) (description "Unpolarized capacitor"))
       (sheetpath (names /) (tstamps /))
       (tstamp 5A6C10DF))
-    (comp (ref J1)
-      (value VIN)
-      (footprint Measurement_Points:Measurement_Point_Square-SMD-Pad_Small)
-      (libsource (lib conn) (part Conn_01x01))
-      (sheetpath (names /) (tstamps /))
-      (tstamp 5A6C1261))
-    (comp (ref J4)
-      (value GND)
-      (footprint Measurement_Points:Measurement_Point_Square-SMD-Pad_Small)
-      (libsource (lib conn) (part Conn_01x01))
-      (sheetpath (names /) (tstamps /))
-      (tstamp 5A6C4E27))
-    (comp (ref J5)
-      (value VOUT)
-      (footprint Measurement_Points:Measurement_Point_Square-SMD-Pad_Small)
-      (libsource (lib conn) (part Conn_01x01))
-      (sheetpath (names /) (tstamps /))
-      (tstamp 5A6C51D4))
     (comp (ref C4)
       (value C_SS)
       (footprint Capacitors_SMD:C_0603)
-      (libsource (lib device) (part C))
+      (libsource (lib Device) (part C) (description "Unpolarized capacitor"))
       (sheetpath (names /) (tstamps /))
       (tstamp 5A6C6769))
-    (comp (ref J3)
-      (value GND)
-      (footprint Measurement_Points:Measurement_Point_Square-SMD-Pad_Small)
-      (libsource (lib conn) (part Conn_01x01))
-      (sheetpath (names /) (tstamps /))
-      (tstamp 5A6D14D6))
-    (comp (ref J2)
-      (value EN)
-      (footprint Measurement_Points:Measurement_Point_Square-SMD-Pad_Small)
-      (libsource (lib conn) (part Conn_01x01))
-      (sheetpath (names /) (tstamps /))
-      (tstamp 5A6D210E))
     (comp (ref R6)
       (value R_GATE)
       (footprint Resistors_SMD:R_0603)
-      (libsource (lib device) (part R))
+      (libsource (lib Device) (part R) (description Resistor))
       (sheetpath (names /) (tstamps /))
       (tstamp 5A8E442D))
     (comp (ref U1)
       (value LTC3759)
       (footprint Housings_SSOP:MSOP-12-1EP_3x4mm_Pitch0.65mm)
-      (libsource (lib Custom_Parts) (part LTC3759))
+      (libsource (lib Custom_Parts) (part LTC3759) (description ""))
       (sheetpath (names /) (tstamps /))
       (tstamp 5A6BF1D9))
     (comp (ref C8)
-      (value C)
+      (value C_IN)
       (footprint Capacitors_SMD:C_1210)
-      (libsource (lib device) (part C))
+      (libsource (lib Device) (part C) (description "Unpolarized capacitor"))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 5A911DC8))
+    (comp (ref D3)
+      (value D_SN)
+      (libsource (lib Device) (part D_Schottky) (description "Schottky diode"))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 5A8EA5DC))
+    (comp (ref D2)
+      (value D_ZSN)
+      (libsource (lib Device) (part D_Zener) (description "Zener Diode"))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 5A8EA63F))
+    (comp (ref J1)
+      (value VIN)
+      (datasheet ~)
+      (libsource (lib Connector) (part Conn_01x01_Male) (description "Generic connector, single row, 01x01, script generated (kicad-library-utils/schlib/autogen/connector/)"))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 5B653003))
+    (comp (ref J2)
+      (value EN)
+      (datasheet ~)
+      (libsource (lib Connector) (part Conn_01x01_Male) (description "Generic connector, single row, 01x01, script generated (kicad-library-utils/schlib/autogen/connector/)"))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 5B653653))
+    (comp (ref J3)
+      (value GND)
+      (datasheet ~)
+      (libsource (lib Connector) (part Conn_01x01_Male) (description "Generic connector, single row, 01x01, script generated (kicad-library-utils/schlib/autogen/connector/)"))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 5B6538E7))
+    (comp (ref J4)
+      (value GND)
+      (datasheet ~)
+      (libsource (lib Connector) (part Conn_01x01_Male) (description "Generic connector, single row, 01x01, script generated (kicad-library-utils/schlib/autogen/connector/)"))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 5B653BE4))
+    (comp (ref J5)
+      (value VOUT)
+      (datasheet ~)
+      (libsource (lib Connector) (part Conn_01x01_Male) (description "Generic connector, single row, 01x01, script generated (kicad-library-utils/schlib/autogen/connector/)"))
       (sheetpath (names /) (tstamps /))
-      (tstamp 5A911DC8)))
+      (tstamp 5B653D92)))
   (libparts
-    (libpart (lib device) (part C)
+    (libpart (lib Connector) (part Conn_01x01_Male)
+      (description "Generic connector, single row, 01x01, script generated (kicad-library-utils/schlib/autogen/connector/)")
+      (docs ~)
+      (footprints
+        (fp Connector*:*))
+      (fields
+        (field (name Reference) J)
+        (field (name Value) Conn_01x01_Male))
+      (pins
+        (pin (num 1) (name Pin_1) (type passive))))
+    (libpart (lib Custom_Parts) (part LTC3759)
+      (fields
+        (field (name Reference) U)
+        (field (name Value) LTC3759))
+      (pins
+        (pin (num 1) (name VC) (type input))
+        (pin (num 2) (name FBX) (type input))
+        (pin (num 3) (name SS) (type input))
+        (pin (num 4) (name RT) (type input))
+        (pin (num 5) (name SYNC) (type input))
+        (pin (num 6) (name PGOOD) (type input))
+        (pin (num 7) (name SENSE) (type input))
+        (pin (num 8) (name GATE) (type output))
+        (pin (num 9) (name INTVCC) (type input))
+        (pin (num 10) (name DRIVE) (type input))
+        (pin (num 11) (name VIN) (type input))
+        (pin (num 12) (name EN) (type input))
+        (pin (num 13) (name GND) (type output))))
+    (libpart (lib Custom_Parts) (part Wurth_Transformer_10.16x13.36mm)
+      (fields
+        (field (name Reference) T)
+        (field (name Value) Wurth_Transformer_10.16x13.36mm))
+      (pins
+        (pin (num 1) (name ~) (type input))
+        (pin (num 2) (name ~) (type input))
+        (pin (num 3) (name ~) (type input))
+        (pin (num 4) (name ~) (type input))
+        (pin (num 6) (name ~) (type input))))
+    (libpart (lib Device) (part C)
       (description "Unpolarized capacitor")
+      (docs ~)
       (footprints
         (fp C_*))
       (fields
@@ -164,55 +213,51 @@
       (pins
         (pin (num 1) (name ~) (type passive))
         (pin (num 2) (name ~) (type passive))))
-    (libpart (lib conn) (part Conn_01x01)
-      (description "Generic connector, single row, 01x01")
+    (libpart (lib Device) (part D)
+      (description Diode)
       (docs ~)
       (footprints
-        (fp Connector*:*_??x*mm*)
-        (fp Connector*:*1x??x*mm*)
-        (fp Pin?Header?Straight?1X*)
-        (fp Pin?Header?Angled?1X*)
-        (fp Socket?Strip?Straight?1X*)
-        (fp Socket?Strip?Angled?1X*))
+        (fp TO-???*)
+        (fp *_Diode_*)
+        (fp *SingleDiode*)
+        (fp D_*))
       (fields
-        (field (name Reference) J)
-        (field (name Value) Conn_01x01))
+        (field (name Reference) D)
+        (field (name Value) D))
       (pins
-        (pin (num 1) (name Pin_1) (type passive))))
-    (libpart (lib device) (part D)
-      (description Diode)
+        (pin (num 1) (name K) (type passive))
+        (pin (num 2) (name A) (type passive))))
+    (libpart (lib Device) (part D_Schottky)
+      (description "Schottky diode")
+      (docs ~)
       (footprints
         (fp TO-???*)
-        (fp *SingleDiode)
         (fp *_Diode_*)
         (fp *SingleDiode*)
         (fp D_*))
       (fields
         (field (name Reference) D)
-        (field (name Value) D))
+        (field (name Value) D_Schottky))
       (pins
         (pin (num 1) (name K) (type passive))
         (pin (num 2) (name A) (type passive))))
-    (libpart (lib Custom_Parts) (part LTC3759)
+    (libpart (lib Device) (part D_Zener)
+      (description "Zener Diode")
+      (docs ~)
+      (footprints
+        (fp TO-???*)
+        (fp *_Diode_*)
+        (fp *SingleDiode*)
+        (fp D_*))
       (fields
-        (field (name Reference) U)
-        (field (name Value) LTC3759))
+        (field (name Reference) D)
+        (field (name Value) D_Zener))
       (pins
-        (pin (num 1) (name VC) (type input))
-        (pin (num 2) (name FBX) (type input))
-        (pin (num 3) (name SS) (type input))
-        (pin (num 4) (name RT) (type input))
-        (pin (num 5) (name SYNC) (type input))
-        (pin (num 6) (name PGOOD) (type input))
-        (pin (num 7) (name SENSE) (type input))
-        (pin (num 8) (name GATE) (type output))
-        (pin (num 9) (name INTVCC) (type input))
-        (pin (num 10) (name DRIVE) (type input))
-        (pin (num 11) (name VIN) (type input))
-        (pin (num 12) (name EN) (type input))
-        (pin (num 13) (name GND) (type output))))
-    (libpart (lib device) (part Q_NMOS_DGS)
+        (pin (num 1) (name K) (type passive))
+        (pin (num 2) (name A) (type passive))))
+    (libpart (lib Device) (part Q_NMOS_DGS)
       (description "Transistor N-MOSFET (general)")
+      (docs ~)
       (fields
         (field (name Reference) Q)
         (field (name Value) Q_NMOS_DGS))
@@ -220,104 +265,99 @@
         (pin (num 1) (name D) (type passive))
         (pin (num 2) (name G) (type input))
         (pin (num 3) (name S) (type passive))))
-    (libpart (lib device) (part R)
+    (libpart (lib Device) (part R)
       (description Resistor)
+      (docs ~)
       (footprints
-        (fp R_*)
         (fp R_*))
       (fields
         (field (name Reference) R)
         (field (name Value) R))
       (pins
         (pin (num 1) (name ~) (type passive))
-        (pin (num 2) (name ~) (type passive))))
-    (libpart (lib Custom_Parts) (part Wurth_Transformer_10.16x13.36mm)
-      (fields
-        (field (name Reference) T)
-        (field (name Value) Wurth_Transformer_10.16x13.36mm))
-      (pins
-        (pin (num 1) (name ~) (type input))
-        (pin (num 2) (name ~) (type input))
-        (pin (num 3) (name ~) (type input))
-        (pin (num 4) (name ~) (type input))
-        (pin (num 6) (name ~) (type input)))))
+        (pin (num 2) (name ~) (type passive)))))
   (libraries
-    (library (logical conn)
-      (uri "C:\\Program Files\\KiCad\\share\\kicad\\library\\conn.lib"))
-    (library (logical device)
-      (uri "C:\\Program Files\\KiCad\\share\\kicad\\library\\device.lib"))
+    (library (logical Connector)
+      (uri "C:\\Program Files\\KiCad\\share\\kicad\\library/Connector.lib"))
     (library (logical Custom_Parts)
-      (uri C:\Users\Kevin\Documents\Projects\KiCadLib\EESCHEMA\Custom_Parts.lib)))
+      (uri C:/Users/Kevin/Documents/Projects/KiCadLib/EESCHEMA/Custom_Parts.lib))
+    (library (logical Device)
+      (uri "C:\\Program Files\\KiCad\\share\\kicad\\library/Device.lib")))
   (nets
     (net (code 1) (name "Net-(Q1-Pad3)")
+      (node (ref U1) (pin 7))
       (node (ref Q1) (pin 3))
-      (node (ref R4) (pin 2))
-      (node (ref U1) (pin 7)))
+      (node (ref R4) (pin 2)))
     (net (code 2) (name "Net-(C5-Pad2)")
       (node (ref J5) (pin 1))
-      (node (ref C5) (pin 2))
       (node (ref R5) (pin 1))
+      (node (ref D1) (pin 1))
       (node (ref C6) (pin 2))
-      (node (ref D1) (pin 1)))
-    (net (code 3) (name "Net-(R1-Pad2)")
-      (node (ref U1) (pin 4))
-      (node (ref R1) (pin 2)))
-    (net (code 4) (name GNDREF)
-      (node (ref R4) (pin 1))
-      (node (ref C5) (pin 1))
-      (node (ref C3) (pin 2))
-      (node (ref J4) (pin 1))
-      (node (ref C1) (pin 1))
-      (node (ref C2) (pin 1))
-      (node (ref C7) (pin 2))
-      (node (ref R3) (pin 1))
-      (node (ref C6) (pin 1))
-      (node (ref R1) (pin 1))
-      (node (ref J3) (pin 1))
-      (node (ref T1) (pin 1))
-      (node (ref C4) (pin 2))
-      (node (ref U1) (pin 6))
-      (node (ref U1) (pin 13))
-      (node (ref U1) (pin 5))
-      (node (ref C8) (pin 1)))
-    (net (code 5) (name "Net-(C4-Pad1)")
-      (node (ref C4) (pin 1))
-      (node (ref U1) (pin 3)))
-    (net (code 7) (name "Net-(R6-Pad2)")
-      (node (ref R6) (pin 2))
-      (node (ref U1) (pin 8)))
-    (net (code 8) (name "Net-(C7-Pad1)")
-      (node (ref U1) (pin 9))
-      (node (ref C7) (pin 1)))
-    (net (code 9) (name "Net-(J2-Pad1)")
-      (node (ref J2) (pin 1))
-      (node (ref U1) (pin 12)))
-    (net (code 10) (name "Net-(C1-Pad2)")
-      (node (ref C8) (pin 2))
+      (node (ref C5) (pin 2)))
+    (net (code 3) (name "Net-(D1-Pad2)")
+      (node (ref T1) (pin 3))
+      (node (ref D1) (pin 2)))
+    (net (code 4) (name "Net-(R6-Pad2)")
+      (node (ref U1) (pin 8))
+      (node (ref R6) (pin 2)))
+    (net (code 5) (name "Net-(C7-Pad1)")
+      (node (ref C7) (pin 1))
+      (node (ref U1) (pin 9)))
+    (net (code 6) (name "Net-(D2-Pad1)")
+      (node (ref D3) (pin 1))
+      (node (ref D2) (pin 1)))
+    (net (code 7) (name "Net-(C1-Pad2)")
+      (node (ref J1) (pin 1))
+      (node (ref D2) (pin 2))
       (node (ref U1) (pin 10))
+      (node (ref C8) (pin 2))
       (node (ref U1) (pin 11))
-      (node (ref C2) (pin 2))
       (node (ref C1) (pin 2))
-      (node (ref T1) (pin 6))
-      (node (ref J1) (pin 1)))
-    (net (code 11) (name "Net-(D1-Pad2)")
-      (node (ref T1) (pin 3))
-      (node (ref D1) (pin 2)))
-    (net (code 12) (name "Net-(Q1-Pad1)")
+      (node (ref C2) (pin 2))
+      (node (ref T1) (pin 6)))
+    (net (code 8) (name "Net-(D3-Pad2)")
       (node (ref Q1) (pin 1))
-      (node (ref T1) (pin 4)))
-    (net (code 13) (name "Net-(R2-Pad1)")
-      (node (ref R2) (pin 1))
-      (node (ref U1) (pin 1)))
-    (net (code 14) (name "Net-(T1-Pad2)")
+      (node (ref T1) (pin 4))
+      (node (ref D3) (pin 2)))
+    (net (code 9) (name "Net-(J2-Pad1)")
+      (node (ref U1) (pin 12))
+      (node (ref J2) (pin 1)))
+    (net (code 10) (name "Net-(R1-Pad2)")
+      (node (ref R1) (pin 2))
+      (node (ref U1) (pin 4)))
+    (net (code 11) (name "Net-(T1-Pad2)")
       (node (ref T1) (pin 2)))
-    (net (code 15) (name "Net-(C3-Pad1)")
-      (node (ref R2) (pin 2))
-      (node (ref C3) (pin 1)))
-    (net (code 16) (name "Net-(Q1-Pad2)")
+    (net (code 12) (name "Net-(C4-Pad1)")
+      (node (ref C4) (pin 1))
+      (node (ref U1) (pin 3)))
+    (net (code 13) (name GNDREF)
+      (node (ref C5) (pin 1))
+      (node (ref C6) (pin 1))
+      (node (ref R4) (pin 1))
+      (node (ref T1) (pin 1))
+      (node (ref C7) (pin 2))
+      (node (ref C3) (pin 2))
+      (node (ref U1) (pin 5))
+      (node (ref U1) (pin 13))
+      (node (ref R3) (pin 1))
+      (node (ref J4) (pin 1))
+      (node (ref J3) (pin 1))
+      (node (ref U1) (pin 6))
+      (node (ref C8) (pin 1))
+      (node (ref C4) (pin 2))
+      (node (ref C1) (pin 1))
+      (node (ref R1) (pin 1))
+      (node (ref C2) (pin 1)))
+    (net (code 14) (name "Net-(Q1-Pad2)")
       (node (ref R6) (pin 1))
       (node (ref Q1) (pin 2)))
+    (net (code 15) (name "Net-(R2-Pad1)")
+      (node (ref R2) (pin 1))
+      (node (ref U1) (pin 1)))
+    (net (code 16) (name "Net-(C3-Pad1)")
+      (node (ref C3) (pin 1))
+      (node (ref R2) (pin 2)))
     (net (code 17) (name "Net-(R3-Pad2)")
+      (node (ref U1) (pin 2))
       (node (ref R5) (pin 2))
-      (node (ref R3) (pin 2))
-      (node (ref U1) (pin 2)))))
+      (node (ref R3) (pin 2)))))

+ 1 - 35
Nixie_PSU_Breakout/nixie_psu_breakout.pro

@@ -1,4 +1,4 @@
-update=1/26/2018 11:26:59 AM
+update=7/22/2018 6:04:01 PM
 version=1
 last_client=kicad
 [general]
@@ -30,37 +30,3 @@ NetIExt=net
 [eeschema]
 version=1
 LibDir=
-[eeschema/libraries]
-LibName1=power
-LibName2=device
-LibName3=switches
-LibName4=relays
-LibName5=motors
-LibName6=transistors
-LibName7=conn
-LibName8=linear
-LibName9=regul
-LibName10=74xx
-LibName11=cmos4000
-LibName12=adc-dac
-LibName13=memory
-LibName14=xilinx
-LibName15=microcontrollers
-LibName16=dsp
-LibName17=microchip
-LibName18=analog_switches
-LibName19=motorola
-LibName20=texas
-LibName21=intel
-LibName22=audio
-LibName23=interface
-LibName24=digital-audio
-LibName25=philips
-LibName26=display
-LibName27=cypress
-LibName28=siliconi
-LibName29=opto
-LibName30=atmel
-LibName31=contrib
-LibName32=valves
-LibName33=C:/Users/Kevin/Documents/Projects/KiCadLib/EESCHEMA/Custom_Parts

+ 81 - 114
Nixie_PSU_Breakout/nixie_psu_breakout.sch

@@ -1,39 +1,6 @@
-EESchema Schematic File Version 2
-LIBS:power
-LIBS:device
-LIBS:switches
-LIBS:relays
-LIBS:motors
-LIBS:transistors
-LIBS:conn
-LIBS:linear
-LIBS:regul
-LIBS:74xx
-LIBS:cmos4000
-LIBS:adc-dac
-LIBS:memory
-LIBS:xilinx
-LIBS:microcontrollers
-LIBS:dsp
-LIBS:microchip
-LIBS:analog_switches
-LIBS:motorola
-LIBS:texas
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:digital-audio
-LIBS:philips
-LIBS:display
-LIBS:cypress
-LIBS:siliconi
-LIBS:opto
-LIBS:atmel
-LIBS:contrib
-LIBS:valves
-LIBS:Custom_Parts
+EESchema Schematic File Version 4
 LIBS:nixie_psu_breakout-cache
-EELAYER 25 0
+EELAYER 26 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
@@ -48,7 +15,7 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L Wurth_Transformer_10.16x13.36mm T1
+L Custom_Parts:Wurth_Transformer_10.16x13.36mm T1
 U 1 1 5A6B88EA
 P 7100 3000
 F 0 "T1" H 7100 3325 60  0000 C CNN
@@ -59,7 +26,7 @@ F 3 "" H 7100 3425 60  0001 C CNN
 	-1   0    0    -1  
 $EndComp
 $Comp
-L R R2
+L Device:R R2
 U 1 1 5A6B8978
 P 4300 3850
 F 0 "R2" V 4380 3850 50  0000 C CNN
@@ -70,7 +37,7 @@ F 3 "" H 4300 3850 50  0001 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L C C3
+L Device:C C3
 U 1 1 5A6B89DB
 P 3750 4150
 F 0 "C3" H 3775 4250 50  0000 L CNN
@@ -81,7 +48,7 @@ F 3 "" H 3750 4150 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Q_NMOS_DGS Q1
+L Device:Q_NMOS_DGS Q1
 U 1 1 5A6B8B05
 P 6600 3600
 F 0 "Q1" H 6800 3650 50  0000 L CNN
@@ -92,7 +59,7 @@ F 3 "" H 6600 3600 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R4
+L Device:R R4
 U 1 1 5A6B8B69
 P 7450 3850
 F 0 "R4" V 7530 3850 50  0000 C CNN
@@ -103,7 +70,7 @@ F 3 "" H 7450 3850 50  0001 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L D D1
+L Device:D D1
 U 1 1 5A6B91C6
 P 7750 3200
 F 0 "D1" H 7750 3300 50  0000 C CNN
@@ -114,7 +81,7 @@ F 3 "" H 7750 3200 50  0001 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L C C5
+L Device:C C5
 U 1 1 5A6B92D0
 P 8050 3000
 F 0 "C5" H 8075 3100 50  0000 L CNN
@@ -125,7 +92,7 @@ F 3 "" H 8050 3000 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C6
+L Device:C C6
 U 1 1 5A6B93C6
 P 8350 3000
 F 0 "C6" H 8375 3100 50  0000 L CNN
@@ -136,7 +103,7 @@ F 3 "" H 8350 3000 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R5
+L Device:R R5
 U 1 1 5A6B9F37
 P 7150 4150
 F 0 "R5" V 7230 4150 50  0000 C CNN
@@ -147,7 +114,7 @@ F 3 "" H 7150 4150 50  0001 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L R R3
+L Device:R R3
 U 1 1 5A6B9FBA
 P 6800 4550
 F 0 "R3" V 6880 4550 50  0000 C CNN
@@ -158,7 +125,7 @@ F 3 "" H 6800 4550 50  0001 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L C C7
+L Device:C C7
 U 1 1 5A6BA4CA
 P 6350 4550
 F 0 "C7" H 6375 4650 50  0000 L CNN
@@ -169,7 +136,7 @@ F 3 "" H 6350 4550 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R1
+L Device:R R1
 U 1 1 5A6BAAF4
 P 4100 4350
 F 0 "R1" V 4180 4350 50  0000 C CNN
@@ -180,7 +147,7 @@ F 3 "" H 4100 4350 50  0001 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L C C2
+L Device:C C2
 U 1 1 5A6C0FBE
 P 4500 3000
 F 0 "C2" H 4525 3100 50  0000 L CNN
@@ -191,7 +158,7 @@ F 3 "" H 4500 3000 50  0001 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L C C1
+L Device:C C1
 U 1 1 5A6C10DF
 P 4150 3000
 F 0 "C1" H 4175 3100 50  0000 L CNN
@@ -201,42 +168,9 @@ F 3 "" H 4150 3000 50  0001 C CNN
 	1    4150 3000
 	-1   0    0    1   
 $EndComp
-$Comp
-L Conn_01x01 J1
-U 1 1 5A6C1261
-P 3500 2800
-F 0 "J1" H 3500 2900 50  0000 C CNN
-F 1 "VIN" H 3500 2700 50  0000 C CNN
-F 2 "Measurement_Points:Measurement_Point_Square-SMD-Pad_Small" H 3500 2800 50  0001 C CNN
-F 3 "" H 3500 2800 50  0001 C CNN
-	1    3500 2800
-	-1   0    0    1   
-$EndComp
-$Comp
-L Conn_01x01 J4
-U 1 1 5A6C4E27
-P 8800 2800
-F 0 "J4" H 8800 2900 50  0000 C CNN
-F 1 "GND" H 8800 2700 50  0000 C CNN
-F 2 "Measurement_Points:Measurement_Point_Square-SMD-Pad_Small" H 8800 2800 50  0001 C CNN
-F 3 "" H 8800 2800 50  0001 C CNN
-	1    8800 2800
-	1    0    0    -1  
-$EndComp
-$Comp
-L Conn_01x01 J5
-U 1 1 5A6C51D4
-P 8800 3200
-F 0 "J5" H 8800 3300 50  0000 C CNN
-F 1 "VOUT" H 8800 3100 50  0000 C CNN
-F 2 "Measurement_Points:Measurement_Point_Square-SMD-Pad_Small" H 8800 3200 50  0001 C CNN
-F 3 "" H 8800 3200 50  0001 C CNN
-	1    8800 3200
-	1    0    0    -1  
-$EndComp
 NoConn ~ 7500 3000
 $Comp
-L C C4
+L Device:C C4
 U 1 1 5A6C6769
 P 4350 4550
 F 0 "C4" H 4375 4650 50  0000 L CNN
@@ -247,7 +181,7 @@ F 3 "" H 4350 4550 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDREF #PWR01
+L power:GNDREF #PWR01
 U 1 1 5A6CD5AE
 P 3950 3250
 F 0 "#PWR01" H 3950 3000 50  0001 C CNN
@@ -258,7 +192,7 @@ F 3 "" H 3950 3250 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDREF #PWR02
+L power:GNDREF #PWR02
 U 1 1 5A6CD8C1
 P 7750 2850
 F 0 "#PWR02" H 7750 2600 50  0001 C CNN
@@ -269,7 +203,7 @@ F 3 "" H 7750 2850 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDREF #PWR03
+L power:GNDREF #PWR03
 U 1 1 5A6D0882
 P 6350 4850
 F 0 "#PWR03" H 6350 4600 50  0001 C CNN
@@ -280,29 +214,7 @@ F 3 "" H 6350 4850 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Conn_01x01 J3
-U 1 1 5A6D14D6
-P 3500 4800
-F 0 "J3" H 3500 4900 50  0000 C CNN
-F 1 "GND" H 3500 4700 50  0000 C CNN
-F 2 "Measurement_Points:Measurement_Point_Square-SMD-Pad_Small" H 3500 4800 50  0001 C CNN
-F 3 "" H 3500 4800 50  0001 C CNN
-	1    3500 4800
-	-1   0    0    1   
-$EndComp
-$Comp
-L Conn_01x01 J2
-U 1 1 5A6D210E
-P 3500 3700
-F 0 "J2" H 3500 3800 50  0000 C CNN
-F 1 "EN" H 3500 3600 50  0000 C CNN
-F 2 "Measurement_Points:Measurement_Point_Square-SMD-Pad_Small" H 3500 3700 50  0001 C CNN
-F 3 "" H 3500 3700 50  0001 C CNN
-	1    3500 3700
-	-1   0    0    1   
-$EndComp
-$Comp
-L GNDREF #PWR04
+L power:GNDREF #PWR04
 U 1 1 5A6D3815
 P 7800 3900
 F 0 "#PWR04" H 7800 3650 50  0001 C CNN
@@ -313,7 +225,7 @@ F 3 "" H 7800 3900 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R6
+L Device:R R6
 U 1 1 5A8E442D
 P 6250 3600
 F 0 "R6" V 6330 3600 50  0000 C CNN
@@ -503,7 +415,7 @@ Rev. B
 Wire Wire Line
 	6350 4300 6100 4300
 $Comp
-L LTC3759 U1
+L Custom_Parts:LTC3759 U1
 U 1 1 5A6BF1D9
 P 5350 3850
 F 0 "U1" H 5350 3850 60  0000 C CNN
@@ -518,7 +430,7 @@ Wire Wire Line
 Wire Wire Line
 	6100 3200 6300 3200
 $Comp
-L C C8
+L Device:C C8
 U 1 1 5A911DC8
 P 4850 3000
 F 0 "C8" H 4875 3100 50  0000 L CNN
@@ -535,7 +447,7 @@ Wire Wire Line
 	4850 3200 4850 3150
 Connection ~ 4500 3200
 $Comp
-L D_Schottky D3
+L Device:D_Schottky D3
 U 1 1 5A8EA5DC
 P 6450 3200
 F 0 "D3" H 6450 3300 50  0000 C CNN
@@ -546,7 +458,7 @@ F 3 "" H 6450 3200 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L D_Zener D2
+L Device:D_Zener D2
 U 1 1 5A8EA63F
 P 6100 3000
 F 0 "D2" H 6100 3100 50  0000 C CNN
@@ -566,4 +478,59 @@ Wire Notes Line
 	4650 2850 4650 3150
 Text Notes 4900 3250 0    60   ~ 0
 Rev. B
+$Comp
+L Connector:Conn_01x01_Male J1
+U 1 1 5B653003
+P 3500 2800
+F 0 "J1" H 3606 2978 50  0000 C CNN
+F 1 "VIN" H 3606 2887 50  0000 C CNN
+F 2 "" H 3500 2800 50  0001 C CNN
+F 3 "~" H 3500 2800 50  0001 C CNN
+	1    3500 2800
+	1    0    0    -1  
+$EndComp
+$Comp
+L Connector:Conn_01x01_Male J2
+U 1 1 5B653653
+P 3500 3700
+F 0 "J2" H 3606 3878 50  0000 C CNN
+F 1 "EN" H 3606 3787 50  0000 C CNN
+F 2 "" H 3500 3700 50  0001 C CNN
+F 3 "~" H 3500 3700 50  0001 C CNN
+	1    3500 3700
+	1    0    0    -1  
+$EndComp
+$Comp
+L Connector:Conn_01x01_Male J3
+U 1 1 5B6538E7
+P 3500 4800
+F 0 "J3" H 3606 4978 50  0000 C CNN
+F 1 "GND" H 3606 4887 50  0000 C CNN
+F 2 "" H 3500 4800 50  0001 C CNN
+F 3 "~" H 3500 4800 50  0001 C CNN
+	1    3500 4800
+	1    0    0    -1  
+$EndComp
+$Comp
+L Connector:Conn_01x01_Male J4
+U 1 1 5B653BE4
+P 8800 2800
+F 0 "J4" H 8906 2978 50  0000 C CNN
+F 1 "GND" H 8906 2887 50  0000 C CNN
+F 2 "" H 8800 2800 50  0001 C CNN
+F 3 "~" H 8800 2800 50  0001 C CNN
+	1    8800 2800
+	-1   0    0    1   
+$EndComp
+$Comp
+L Connector:Conn_01x01_Male J5
+U 1 1 5B653D92
+P 8800 3200
+F 0 "J5" H 8906 3378 50  0000 C CNN
+F 1 "VOUT" H 8906 3287 50  0000 C CNN
+F 2 "" H 8800 3200 50  0001 C CNN
+F 3 "~" H 8800 3200 50  0001 C CNN
+	1    8800 3200
+	-1   0    0    1   
+$EndComp
 $EndSCHEMATC

+ 2 - 0
Nixie_PSU_Breakout/sym-lib-table

@@ -0,0 +1,2 @@
+(sym_lib_table
+)

+ 57 - 63
Nixie_Top_Board/nixie_top_board-cache.lib

@@ -1,38 +1,15 @@
-EESchema-LIBRARY Version 2.3
+EESchema-LIBRARY Version 2.4
 #encoding utf-8
 #
-# C_Small
+# Connector_Generic:Conn_02x03_Odd_Even
 #
-DEF C_Small C 0 10 N N 1 F N
-F0 "C" 10 70 50 H V L CNN
-F1 "C_Small" 10 -80 50 H V L CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- C_*
-$ENDFPLIST
-DRAW
-P 2 0 1 13 -60 -20 60 -20 N
-P 2 0 1 12 -60 20 60 20 N
-X ~ 1 0 100 80 D 50 50 1 1 P
-X ~ 2 0 -100 80 U 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# Conn_02x03_Odd_Even
-#
-DEF Conn_02x03_Odd_Even J 0 40 Y N 1 F N
+DEF Connector_Generic:Conn_02x03_Odd_Even J 0 40 Y N 1 F N
 F0 "J" 50 200 50 H V C CNN
-F1 "Conn_02x03_Odd_Even" 50 -200 50 H V C CNN
+F1 "Connector_Generic:Conn_02x03_Odd_Even" 50 -200 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
- Connector*:*2x??x*mm*
- Connector*:*2x???Pitch*
- Pin_Header_Straight_2X*
- Pin_Header_Angled_2X*
- Socket_Strip_Straight_2X*
- Socket_Strip_Angled_2X*
+ Connector*:*_2x??_*
 $ENDFPLIST
 DRAW
 S -50 -95 0 -105 1 1 6 N
@@ -51,11 +28,11 @@ X Pin_6 6 300 -100 150 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# IN-3
+# Custom_Parts:IN-3
 #
-DEF IN-3 T 0 40 Y Y 1 F N
+DEF Custom_Parts:IN-3 T 0 40 Y Y 1 F N
 F0 "T" 0 100 60 H V C CNN
-F1 "IN-3" 0 0 60 H V C CNN
+F1 "Custom_Parts:IN-3" 0 0 60 H V C CNN
 F2 "" 0 -250 60 H I C CNN
 F3 "" 0 -250 60 H I C CNN
 DRAW
@@ -68,11 +45,11 @@ X C 2 50 -350 200 U 50 50 1 1 I
 ENDDRAW
 ENDDEF
 #
-# IN-8
+# Custom_Parts:IN-8
 #
-DEF IN-8 T 0 40 Y Y 1 F N
+DEF Custom_Parts:IN-8 T 0 40 Y Y 1 F N
 F0 "T" 150 50 60 H V C CNN
-F1 "IN-8" -200 50 60 H V C CNN
+F1 "Custom_Parts:IN-8" -200 50 60 H V C CNN
 F2 "" 0 -50 60 H I C CNN
 F3 "" 0 -50 60 H I C CNN
 DRAW
@@ -81,6 +58,8 @@ A 550 0 200 -899 899 0 1 0 N 550 -200 550 200
 P 2 0 1 0 -550 -200 550 -200 N
 P 2 0 1 0 -550 200 550 200 N
 X 1 1 500 -400 200 U 50 50 1 1 I
+X 0 10 -400 -400 200 U 50 50 1 1 I
+X A 11 -500 -400 200 U 50 50 1 1 I
 X 2 2 400 -400 200 U 50 50 1 1 I
 X 3 3 300 -400 200 U 50 50 1 1 I
 X 4 4 200 -400 200 U 50 50 1 1 I
@@ -89,57 +68,73 @@ X 6 6 0 -400 200 U 50 50 1 1 I
 X 7 7 -100 -400 200 U 50 50 1 1 I
 X 8 8 -200 -400 200 U 50 50 1 1 I
 X 9 9 -300 -400 200 U 50 50 1 1 I
-X 0 10 -400 -400 200 U 50 50 1 1 I
-X A 11 -500 -400 200 U 50 50 1 1 I
 ENDDRAW
 ENDDEF
 #
-# PCA9685
+# Custom_Parts:PCA9685
 #
-DEF PCA9685 U 0 40 Y Y 1 F N
+DEF Custom_Parts:PCA9685 U 0 40 Y Y 1 F N
 F0 "U" 0 -50 60 H V C CNN
-F1 "PCA9685" 0 50 60 H V C CNN
+F1 "Custom_Parts:PCA9685" 0 50 60 H V C CNN
 F2 "" 0 0 60 H I C CNN
 F3 "" 0 0 60 H I C CNN
 DRAW
 S -600 850 600 -850 0 1 0 N
 X ADDR_3 1 800 -100 200 L 50 50 1 1 I
-X ADDR_4 2 800 -200 200 L 50 50 1 1 I
-X LED_0 3 -800 750 200 R 50 50 1 1 T
-X LED_1 4 -800 650 200 R 50 50 1 1 T
-X LED_2 5 -800 550 200 R 50 50 1 1 T
-X LED_3 6 -800 450 200 R 50 50 1 1 T
-X LED_4 7 -800 350 200 R 50 50 1 1 T
-X LED_5 8 -800 250 200 R 50 50 1 1 T
-X LED_6 9 -800 150 200 R 50 50 1 1 T
 X LED_7 10 -800 50 200 R 50 50 1 1 T
-X OE 20 800 650 200 L 50 50 1 1 I I
 X V_SS 11 800 -600 200 L 50 50 1 1 I
-X ADDR_5 21 800 -300 200 L 50 50 1 1 I
 X LED_8 12 -800 -50 200 R 50 50 1 1 T
-X EXT_CLK 22 800 550 200 L 50 50 1 1 I
 X LED_9 13 -800 -150 200 R 50 50 1 1 T
-X SCL 23 800 450 200 L 50 50 1 1 I
 X LED_10 14 -800 -250 200 R 50 50 1 1 T
-X SDA 24 800 350 200 L 50 50 1 1 I
 X LED_11 15 -800 -350 200 R 50 50 1 1 T
-X V_DD 25 800 -500 200 L 50 50 1 1 I
 X LED_12 16 -800 -450 200 R 50 50 1 1 T
-X ADDR_0 26 800 200 200 L 50 50 1 1 I
 X LED_13 17 -800 -550 200 R 50 50 1 1 T
-X ADDR_1 27 800 100 200 L 50 50 1 1 I
 X LED_14 18 -800 -650 200 R 50 50 1 1 T
-X ADDR_2 28 800 0 200 L 50 50 1 1 I
 X LED_15 19 -800 -750 200 R 50 50 1 1 T
+X ADDR_4 2 800 -200 200 L 50 50 1 1 I
+X OE 20 800 650 200 L 50 50 1 1 I I
+X ADDR_5 21 800 -300 200 L 50 50 1 1 I
+X EXT_CLK 22 800 550 200 L 50 50 1 1 I
+X SCL 23 800 450 200 L 50 50 1 1 I
+X SDA 24 800 350 200 L 50 50 1 1 I
+X V_DD 25 800 -500 200 L 50 50 1 1 I
+X ADDR_0 26 800 200 200 L 50 50 1 1 I
+X ADDR_1 27 800 100 200 L 50 50 1 1 I
+X ADDR_2 28 800 0 200 L 50 50 1 1 I
 X PAD 29 800 -700 200 L 50 50 1 1 I
+X LED_0 3 -800 750 200 R 50 50 1 1 T
+X LED_1 4 -800 650 200 R 50 50 1 1 T
+X LED_2 5 -800 550 200 R 50 50 1 1 T
+X LED_3 6 -800 450 200 R 50 50 1 1 T
+X LED_4 7 -800 350 200 R 50 50 1 1 T
+X LED_5 8 -800 250 200 R 50 50 1 1 T
+X LED_6 9 -800 150 200 R 50 50 1 1 T
 ENDDRAW
 ENDDEF
 #
-# Q_NPN_BEC
+# Device:C_Small
 #
-DEF Q_NPN_BEC Q 0 0 Y N 1 F N
+DEF Device:C_Small C 0 10 N N 1 F N
+F0 "C" 10 70 50 H V L CNN
+F1 "Device:C_Small" 10 -80 50 H V L CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ C_*
+$ENDFPLIST
+DRAW
+P 2 0 1 13 -60 -20 60 -20 N
+P 2 0 1 12 -60 20 60 20 N
+X ~ 1 0 100 80 D 50 50 1 1 P
+X ~ 2 0 -100 80 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Device:Q_NPN_BEC
+#
+DEF Device:Q_NPN_BEC Q 0 0 Y N 1 F N
 F0 "Q" 200 50 50 H V L CNN
-F1 "Q_NPN_BEC" 200 -50 50 H V L CNN
+F1 "Device:Q_NPN_BEC" 200 -50 50 H V L CNN
 F2 "" 200 100 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 DRAW
@@ -154,16 +149,15 @@ X C 3 100 200 100 D 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# R
+# Device:R
 #
-DEF R R 0 0 N Y 1 F N
+DEF Device:R R 0 0 N Y 1 F N
 F0 "R" 80 0 50 V V C CNN
-F1 "R" 0 0 50 V V C CNN
+F1 "Device:R" 0 0 50 V V C CNN
 F2 "" -70 0 50 V I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
  R_*
- R_*
 $ENDFPLIST
 DRAW
 S -40 -100 40 100 0 1 10 N

+ 2 - 2
Nixie_Top_Board/nixie_top_board.bak

@@ -546,11 +546,11 @@ Text Label 8500 1000 0    60   ~ 0
 T1_G_7
 Text Label 8500 2200 0    60   ~ 0
 T1_G_8
-Text Label 8500 1600 0    60   ~ 0
+Text Label 8500 1700 0    60   ~ 0
 T1_G_9
 Text Label 8500 1500 0    60   ~ 0
 T2_G_0
-Text Label 8500 1700 0    60   ~ 0
+Text Label 8500 1600 0    60   ~ 0
 T2_G_1
 Text Label 8500 1100 0    60   ~ 0
 T2_G_2

+ 550 - 551
Nixie_Top_Board/nixie_top_board.net

@@ -1,8 +1,8 @@
 (export (version D)
   (design
     (source C:\Users\Kevin\Documents\Projects\NixieTubeClock\Nixie_Top_Board\nixie_top_board.sch)
-    (date "2/4/2018 6:27:51 PM")
-    (tool "Eeschema 4.0.7")
+    (date "7/22/2018 6:02:49 PM")
+    (tool "Eeschema (5.0.0)")
     (sheet (number 1) (name /) (tstamps /)
       (title_block
         (title "Top Board")
@@ -18,592 +18,579 @@
     (comp (ref T3)
       (value IN-8)
       (footprint "Custom Parts:IN-8")
-      (libsource (lib Custom_Parts) (part IN-8))
+      (libsource (lib Custom_Parts) (part IN-8) (description ""))
       (sheetpath (names /) (tstamps /))
       (tstamp 5938FA0F))
     (comp (ref T2)
       (value IN-8)
       (footprint "Custom Parts:IN-8")
-      (libsource (lib Custom_Parts) (part IN-8))
+      (libsource (lib Custom_Parts) (part IN-8) (description ""))
       (sheetpath (names /) (tstamps /))
       (tstamp 5938FA7E))
     (comp (ref T1)
       (value IN-8)
       (footprint "Custom Parts:IN-8")
-      (libsource (lib Custom_Parts) (part IN-8))
+      (libsource (lib Custom_Parts) (part IN-8) (description ""))
       (sheetpath (names /) (tstamps /))
       (tstamp 5938FAE9))
     (comp (ref T4)
       (value IN-8)
       (footprint "Custom Parts:IN-8")
-      (libsource (lib Custom_Parts) (part IN-8))
+      (libsource (lib Custom_Parts) (part IN-8) (description ""))
       (sheetpath (names /) (tstamps /))
       (tstamp 5938FB49))
     (comp (ref Q31)
       (value Q_NPN_BEC)
       (footprint TO_SOT_Packages_SMD:SOT-323_SC-70)
-      (libsource (lib device) (part Q_NPN_BEC))
+      (libsource (lib Device) (part Q_NPN_BEC) (description "Transistor NPN (general)"))
       (sheetpath (names /) (tstamps /))
       (tstamp 5938FCEB))
     (comp (ref Q32)
       (value Q_NPN_BEC)
       (footprint TO_SOT_Packages_SMD:SOT-323_SC-70)
-      (libsource (lib device) (part Q_NPN_BEC))
+      (libsource (lib Device) (part Q_NPN_BEC) (description "Transistor NPN (general)"))
       (sheetpath (names /) (tstamps /))
       (tstamp 5938FF4E))
     (comp (ref Q33)
       (value Q_NPN_BEC)
       (footprint TO_SOT_Packages_SMD:SOT-323_SC-70)
-      (libsource (lib device) (part Q_NPN_BEC))
+      (libsource (lib Device) (part Q_NPN_BEC) (description "Transistor NPN (general)"))
       (sheetpath (names /) (tstamps /))
       (tstamp 5938FF9A))
     (comp (ref Q34)
       (value Q_NPN_BEC)
       (footprint TO_SOT_Packages_SMD:SOT-323_SC-70)
-      (libsource (lib device) (part Q_NPN_BEC))
+      (libsource (lib Device) (part Q_NPN_BEC) (description "Transistor NPN (general)"))
       (sheetpath (names /) (tstamps /))
       (tstamp 5939000A))
     (comp (ref Q35)
       (value Q_NPN_BEC)
       (footprint TO_SOT_Packages_SMD:SOT-323_SC-70)
-      (libsource (lib device) (part Q_NPN_BEC))
+      (libsource (lib Device) (part Q_NPN_BEC) (description "Transistor NPN (general)"))
       (sheetpath (names /) (tstamps /))
       (tstamp 59390080))
     (comp (ref Q36)
       (value Q_NPN_BEC)
       (footprint TO_SOT_Packages_SMD:SOT-323_SC-70)
-      (libsource (lib device) (part Q_NPN_BEC))
+      (libsource (lib Device) (part Q_NPN_BEC) (description "Transistor NPN (general)"))
       (sheetpath (names /) (tstamps /))
       (tstamp 593905DE))
     (comp (ref Q37)
       (value Q_NPN_BEC)
       (footprint TO_SOT_Packages_SMD:SOT-323_SC-70)
-      (libsource (lib device) (part Q_NPN_BEC))
+      (libsource (lib Device) (part Q_NPN_BEC) (description "Transistor NPN (general)"))
       (sheetpath (names /) (tstamps /))
       (tstamp 593905E4))
     (comp (ref Q38)
       (value Q_NPN_BEC)
       (footprint TO_SOT_Packages_SMD:SOT-323_SC-70)
-      (libsource (lib device) (part Q_NPN_BEC))
+      (libsource (lib Device) (part Q_NPN_BEC) (description "Transistor NPN (general)"))
       (sheetpath (names /) (tstamps /))
       (tstamp 593905EA))
     (comp (ref Q39)
       (value Q_NPN_BEC)
       (footprint TO_SOT_Packages_SMD:SOT-323_SC-70)
-      (libsource (lib device) (part Q_NPN_BEC))
+      (libsource (lib Device) (part Q_NPN_BEC) (description "Transistor NPN (general)"))
       (sheetpath (names /) (tstamps /))
       (tstamp 593905F0))
     (comp (ref Q40)
       (value Q_NPN_BEC)
       (footprint TO_SOT_Packages_SMD:SOT-323_SC-70)
-      (libsource (lib device) (part Q_NPN_BEC))
+      (libsource (lib Device) (part Q_NPN_BEC) (description "Transistor NPN (general)"))
       (sheetpath (names /) (tstamps /))
       (tstamp 593905F6))
     (comp (ref Q21)
       (value Q_NPN_BEC)
       (footprint TO_SOT_Packages_SMD:SOT-323_SC-70)
-      (libsource (lib device) (part Q_NPN_BEC))
+      (libsource (lib Device) (part Q_NPN_BEC) (description "Transistor NPN (general)"))
       (sheetpath (names /) (tstamps /))
       (tstamp 5939343C))
     (comp (ref Q22)
       (value Q_NPN_BEC)
       (footprint TO_SOT_Packages_SMD:SOT-323_SC-70)
-      (libsource (lib device) (part Q_NPN_BEC))
+      (libsource (lib Device) (part Q_NPN_BEC) (description "Transistor NPN (general)"))
       (sheetpath (names /) (tstamps /))
       (tstamp 59393442))
     (comp (ref Q23)
       (value Q_NPN_BEC)
       (footprint TO_SOT_Packages_SMD:SOT-323_SC-70)
-      (libsource (lib device) (part Q_NPN_BEC))
+      (libsource (lib Device) (part Q_NPN_BEC) (description "Transistor NPN (general)"))
       (sheetpath (names /) (tstamps /))
       (tstamp 59393448))
     (comp (ref Q24)
       (value Q_NPN_BEC)
       (footprint TO_SOT_Packages_SMD:SOT-323_SC-70)
-      (libsource (lib device) (part Q_NPN_BEC))
+      (libsource (lib Device) (part Q_NPN_BEC) (description "Transistor NPN (general)"))
       (sheetpath (names /) (tstamps /))
       (tstamp 5939344E))
     (comp (ref Q25)
       (value Q_NPN_BEC)
       (footprint TO_SOT_Packages_SMD:SOT-323_SC-70)
-      (libsource (lib device) (part Q_NPN_BEC))
+      (libsource (lib Device) (part Q_NPN_BEC) (description "Transistor NPN (general)"))
       (sheetpath (names /) (tstamps /))
       (tstamp 59393454))
     (comp (ref Q26)
       (value Q_NPN_BEC)
       (footprint TO_SOT_Packages_SMD:SOT-323_SC-70)
-      (libsource (lib device) (part Q_NPN_BEC))
+      (libsource (lib Device) (part Q_NPN_BEC) (description "Transistor NPN (general)"))
       (sheetpath (names /) (tstamps /))
       (tstamp 5939345A))
     (comp (ref Q27)
       (value Q_NPN_BEC)
       (footprint TO_SOT_Packages_SMD:SOT-323_SC-70)
-      (libsource (lib device) (part Q_NPN_BEC))
+      (libsource (lib Device) (part Q_NPN_BEC) (description "Transistor NPN (general)"))
       (sheetpath (names /) (tstamps /))
       (tstamp 59393460))
     (comp (ref Q28)
       (value Q_NPN_BEC)
       (footprint TO_SOT_Packages_SMD:SOT-323_SC-70)
-      (libsource (lib device) (part Q_NPN_BEC))
+      (libsource (lib Device) (part Q_NPN_BEC) (description "Transistor NPN (general)"))
       (sheetpath (names /) (tstamps /))
       (tstamp 59393466))
     (comp (ref Q29)
       (value Q_NPN_BEC)
       (footprint TO_SOT_Packages_SMD:SOT-323_SC-70)
-      (libsource (lib device) (part Q_NPN_BEC))
+      (libsource (lib Device) (part Q_NPN_BEC) (description "Transistor NPN (general)"))
       (sheetpath (names /) (tstamps /))
       (tstamp 5939346C))
     (comp (ref Q30)
       (value Q_NPN_BEC)
       (footprint TO_SOT_Packages_SMD:SOT-323_SC-70)
-      (libsource (lib device) (part Q_NPN_BEC))
+      (libsource (lib Device) (part Q_NPN_BEC) (description "Transistor NPN (general)"))
       (sheetpath (names /) (tstamps /))
       (tstamp 59393472))
     (comp (ref Q11)
       (value Q_NPN_BEC)
       (footprint TO_SOT_Packages_SMD:SOT-323_SC-70)
-      (libsource (lib device) (part Q_NPN_BEC))
+      (libsource (lib Device) (part Q_NPN_BEC) (description "Transistor NPN (general)"))
       (sheetpath (names /) (tstamps /))
       (tstamp 593936AA))
     (comp (ref Q12)
       (value Q_NPN_BEC)
       (footprint TO_SOT_Packages_SMD:SOT-323_SC-70)
-      (libsource (lib device) (part Q_NPN_BEC))
+      (libsource (lib Device) (part Q_NPN_BEC) (description "Transistor NPN (general)"))
       (sheetpath (names /) (tstamps /))
       (tstamp 593936B0))
     (comp (ref Q13)
       (value Q_NPN_BEC)
       (footprint TO_SOT_Packages_SMD:SOT-323_SC-70)
-      (libsource (lib device) (part Q_NPN_BEC))
+      (libsource (lib Device) (part Q_NPN_BEC) (description "Transistor NPN (general)"))
       (sheetpath (names /) (tstamps /))
       (tstamp 593936B6))
     (comp (ref Q14)
       (value Q_NPN_BEC)
       (footprint TO_SOT_Packages_SMD:SOT-323_SC-70)
-      (libsource (lib device) (part Q_NPN_BEC))
+      (libsource (lib Device) (part Q_NPN_BEC) (description "Transistor NPN (general)"))
       (sheetpath (names /) (tstamps /))
       (tstamp 593936BC))
     (comp (ref Q15)
       (value Q_NPN_BEC)
       (footprint TO_SOT_Packages_SMD:SOT-323_SC-70)
-      (libsource (lib device) (part Q_NPN_BEC))
+      (libsource (lib Device) (part Q_NPN_BEC) (description "Transistor NPN (general)"))
       (sheetpath (names /) (tstamps /))
       (tstamp 593936C2))
     (comp (ref Q16)
       (value Q_NPN_BEC)
       (footprint TO_SOT_Packages_SMD:SOT-323_SC-70)
-      (libsource (lib device) (part Q_NPN_BEC))
+      (libsource (lib Device) (part Q_NPN_BEC) (description "Transistor NPN (general)"))
       (sheetpath (names /) (tstamps /))
       (tstamp 593936C8))
     (comp (ref Q17)
       (value Q_NPN_BEC)
       (footprint TO_SOT_Packages_SMD:SOT-323_SC-70)
-      (libsource (lib device) (part Q_NPN_BEC))
+      (libsource (lib Device) (part Q_NPN_BEC) (description "Transistor NPN (general)"))
       (sheetpath (names /) (tstamps /))
       (tstamp 593936CE))
     (comp (ref Q18)
       (value Q_NPN_BEC)
       (footprint TO_SOT_Packages_SMD:SOT-323_SC-70)
-      (libsource (lib device) (part Q_NPN_BEC))
+      (libsource (lib Device) (part Q_NPN_BEC) (description "Transistor NPN (general)"))
       (sheetpath (names /) (tstamps /))
       (tstamp 593936D4))
     (comp (ref Q19)
       (value Q_NPN_BEC)
       (footprint TO_SOT_Packages_SMD:SOT-323_SC-70)
-      (libsource (lib device) (part Q_NPN_BEC))
+      (libsource (lib Device) (part Q_NPN_BEC) (description "Transistor NPN (general)"))
       (sheetpath (names /) (tstamps /))
       (tstamp 593936DA))
     (comp (ref Q20)
       (value Q_NPN_BEC)
       (footprint TO_SOT_Packages_SMD:SOT-323_SC-70)
-      (libsource (lib device) (part Q_NPN_BEC))
+      (libsource (lib Device) (part Q_NPN_BEC) (description "Transistor NPN (general)"))
       (sheetpath (names /) (tstamps /))
       (tstamp 593936E0))
     (comp (ref Q1)
       (value Q_NPN_BEC)
       (footprint TO_SOT_Packages_SMD:SOT-323_SC-70)
-      (libsource (lib device) (part Q_NPN_BEC))
+      (libsource (lib Device) (part Q_NPN_BEC) (description "Transistor NPN (general)"))
       (sheetpath (names /) (tstamps /))
       (tstamp 593936E6))
     (comp (ref Q2)
       (value Q_NPN_BEC)
       (footprint TO_SOT_Packages_SMD:SOT-323_SC-70)
-      (libsource (lib device) (part Q_NPN_BEC))
+      (libsource (lib Device) (part Q_NPN_BEC) (description "Transistor NPN (general)"))
       (sheetpath (names /) (tstamps /))
       (tstamp 593936EC))
     (comp (ref Q3)
       (value Q_NPN_BEC)
       (footprint TO_SOT_Packages_SMD:SOT-323_SC-70)
-      (libsource (lib device) (part Q_NPN_BEC))
+      (libsource (lib Device) (part Q_NPN_BEC) (description "Transistor NPN (general)"))
       (sheetpath (names /) (tstamps /))
       (tstamp 593936F2))
     (comp (ref Q4)
       (value Q_NPN_BEC)
       (footprint TO_SOT_Packages_SMD:SOT-323_SC-70)
-      (libsource (lib device) (part Q_NPN_BEC))
+      (libsource (lib Device) (part Q_NPN_BEC) (description "Transistor NPN (general)"))
       (sheetpath (names /) (tstamps /))
       (tstamp 593936F8))
     (comp (ref Q5)
       (value Q_NPN_BEC)
       (footprint TO_SOT_Packages_SMD:SOT-323_SC-70)
-      (libsource (lib device) (part Q_NPN_BEC))
+      (libsource (lib Device) (part Q_NPN_BEC) (description "Transistor NPN (general)"))
       (sheetpath (names /) (tstamps /))
       (tstamp 593936FE))
     (comp (ref Q6)
       (value Q_NPN_BEC)
       (footprint TO_SOT_Packages_SMD:SOT-323_SC-70)
-      (libsource (lib device) (part Q_NPN_BEC))
+      (libsource (lib Device) (part Q_NPN_BEC) (description "Transistor NPN (general)"))
       (sheetpath (names /) (tstamps /))
       (tstamp 59393704))
     (comp (ref Q7)
       (value Q_NPN_BEC)
       (footprint TO_SOT_Packages_SMD:SOT-323_SC-70)
-      (libsource (lib device) (part Q_NPN_BEC))
+      (libsource (lib Device) (part Q_NPN_BEC) (description "Transistor NPN (general)"))
       (sheetpath (names /) (tstamps /))
       (tstamp 5939370A))
     (comp (ref Q8)
       (value Q_NPN_BEC)
       (footprint TO_SOT_Packages_SMD:SOT-323_SC-70)
-      (libsource (lib device) (part Q_NPN_BEC))
+      (libsource (lib Device) (part Q_NPN_BEC) (description "Transistor NPN (general)"))
       (sheetpath (names /) (tstamps /))
       (tstamp 59393710))
     (comp (ref Q9)
       (value Q_NPN_BEC)
       (footprint TO_SOT_Packages_SMD:SOT-323_SC-70)
-      (libsource (lib device) (part Q_NPN_BEC))
+      (libsource (lib Device) (part Q_NPN_BEC) (description "Transistor NPN (general)"))
       (sheetpath (names /) (tstamps /))
       (tstamp 59393716))
     (comp (ref Q10)
       (value Q_NPN_BEC)
       (footprint TO_SOT_Packages_SMD:SOT-323_SC-70)
-      (libsource (lib device) (part Q_NPN_BEC))
+      (libsource (lib Device) (part Q_NPN_BEC) (description "Transistor NPN (general)"))
       (sheetpath (names /) (tstamps /))
       (tstamp 5939371C))
     (comp (ref U1)
       (value PCA9685)
       (footprint Housings_DFN_QFN:QFN-28-1EP_6x6mm_Pitch0.65mm)
-      (libsource (lib Custom_Parts) (part PCA9685))
+      (libsource (lib Custom_Parts) (part PCA9685) (description ""))
       (sheetpath (names /) (tstamps /))
       (tstamp 593A4DD3))
     (comp (ref U2)
       (value PCA9685)
       (footprint Housings_DFN_QFN:QFN-28-1EP_6x6mm_Pitch0.65mm)
-      (libsource (lib Custom_Parts) (part PCA9685))
+      (libsource (lib Custom_Parts) (part PCA9685) (description ""))
       (sheetpath (names /) (tstamps /))
       (tstamp 593A4ED6))
     (comp (ref U3)
       (value PCA9685)
       (footprint Housings_DFN_QFN:QFN-28-1EP_6x6mm_Pitch0.65mm)
-      (libsource (lib Custom_Parts) (part PCA9685))
+      (libsource (lib Custom_Parts) (part PCA9685) (description ""))
       (sheetpath (names /) (tstamps /))
       (tstamp 593A4FC1))
     (comp (ref Q41)
       (value Q_NPN_BEC)
       (footprint TO_SOT_Packages_SMD:SOT-323_SC-70)
-      (libsource (lib device) (part Q_NPN_BEC))
+      (libsource (lib Device) (part Q_NPN_BEC) (description "Transistor NPN (general)"))
       (sheetpath (names /) (tstamps /))
       (tstamp 593B48A7))
     (comp (ref T5)
       (value IN-3)
       (footprint "Custom Parts:Phoenix_1770953")
-      (libsource (lib Custom_Parts) (part IN-3))
+      (libsource (lib Custom_Parts) (part IN-3) (description ""))
       (sheetpath (names /) (tstamps /))
       (tstamp 593B460C))
     (comp (ref R1)
       (value R)
       (footprint Resistors_SMD:R_0603)
-      (libsource (lib device) (part R))
+      (libsource (lib Device) (part R) (description Resistor))
       (sheetpath (names /) (tstamps /))
       (tstamp 593D252E))
     (comp (ref R2)
       (value R)
       (footprint Resistors_SMD:R_0603)
-      (libsource (lib device) (part R))
+      (libsource (lib Device) (part R) (description Resistor))
       (sheetpath (names /) (tstamps /))
       (tstamp 593D296E))
     (comp (ref R3)
       (value R)
       (footprint Resistors_SMD:R_0603)
-      (libsource (lib device) (part R))
+      (libsource (lib Device) (part R) (description Resistor))
       (sheetpath (names /) (tstamps /))
       (tstamp 593D2A32))
     (comp (ref R4)
       (value R)
       (footprint Resistors_SMD:R_0603)
-      (libsource (lib device) (part R))
+      (libsource (lib Device) (part R) (description Resistor))
       (sheetpath (names /) (tstamps /))
       (tstamp 593D2AF9))
     (comp (ref R5)
       (value R)
       (footprint Resistors_SMD:R_0603)
-      (libsource (lib device) (part R))
+      (libsource (lib Device) (part R) (description Resistor))
       (sheetpath (names /) (tstamps /))
       (tstamp 593D2BC7))
     (comp (ref R6)
       (value R)
       (footprint Resistors_SMD:R_0603)
-      (libsource (lib device) (part R))
+      (libsource (lib Device) (part R) (description Resistor))
       (sheetpath (names /) (tstamps /))
       (tstamp 593D2CD3))
     (comp (ref R7)
       (value R)
       (footprint Resistors_SMD:R_0603)
-      (libsource (lib device) (part R))
+      (libsource (lib Device) (part R) (description Resistor))
       (sheetpath (names /) (tstamps /))
       (tstamp 593D2DA3))
     (comp (ref R8)
       (value R)
       (footprint Resistors_SMD:R_0603)
-      (libsource (lib device) (part R))
+      (libsource (lib Device) (part R) (description Resistor))
       (sheetpath (names /) (tstamps /))
       (tstamp 593D2E76))
     (comp (ref R9)
       (value R)
       (footprint Resistors_SMD:R_0603)
-      (libsource (lib device) (part R))
+      (libsource (lib Device) (part R) (description Resistor))
       (sheetpath (names /) (tstamps /))
       (tstamp 593D2F4C))
     (comp (ref R10)
       (value R)
       (footprint Resistors_SMD:R_0603)
-      (libsource (lib device) (part R))
+      (libsource (lib Device) (part R) (description Resistor))
       (sheetpath (names /) (tstamps /))
       (tstamp 593D3025))
     (comp (ref R11)
       (value R)
       (footprint Resistors_SMD:R_0603)
-      (libsource (lib device) (part R))
+      (libsource (lib Device) (part R) (description Resistor))
       (sheetpath (names /) (tstamps /))
       (tstamp 593D3315))
     (comp (ref R12)
       (value R)
       (footprint Resistors_SMD:R_0603)
-      (libsource (lib device) (part R))
+      (libsource (lib Device) (part R) (description Resistor))
       (sheetpath (names /) (tstamps /))
       (tstamp 593D331B))
     (comp (ref R13)
       (value R)
       (footprint Resistors_SMD:R_0603)
-      (libsource (lib device) (part R))
+      (libsource (lib Device) (part R) (description Resistor))
       (sheetpath (names /) (tstamps /))
       (tstamp 593D3321))
     (comp (ref R14)
       (value R)
       (footprint Resistors_SMD:R_0603)
-      (libsource (lib device) (part R))
+      (libsource (lib Device) (part R) (description Resistor))
       (sheetpath (names /) (tstamps /))
       (tstamp 593D3327))
     (comp (ref R15)
       (value R)
       (footprint Resistors_SMD:R_0603)
-      (libsource (lib device) (part R))
+      (libsource (lib Device) (part R) (description Resistor))
       (sheetpath (names /) (tstamps /))
       (tstamp 593D332D))
     (comp (ref R16)
       (value R)
       (footprint Resistors_SMD:R_0603)
-      (libsource (lib device) (part R))
+      (libsource (lib Device) (part R) (description Resistor))
       (sheetpath (names /) (tstamps /))
       (tstamp 593D3333))
     (comp (ref R17)
       (value R)
       (footprint Resistors_SMD:R_0603)
-      (libsource (lib device) (part R))
+      (libsource (lib Device) (part R) (description Resistor))
       (sheetpath (names /) (tstamps /))
       (tstamp 593D3339))
     (comp (ref R18)
       (value R)
       (footprint Resistors_SMD:R_0603)
-      (libsource (lib device) (part R))
+      (libsource (lib Device) (part R) (description Resistor))
       (sheetpath (names /) (tstamps /))
       (tstamp 593D333F))
     (comp (ref R19)
       (value R)
       (footprint Resistors_SMD:R_0603)
-      (libsource (lib device) (part R))
+      (libsource (lib Device) (part R) (description Resistor))
       (sheetpath (names /) (tstamps /))
       (tstamp 593D3345))
     (comp (ref R20)
       (value R)
       (footprint Resistors_SMD:R_0603)
-      (libsource (lib device) (part R))
+      (libsource (lib Device) (part R) (description Resistor))
       (sheetpath (names /) (tstamps /))
       (tstamp 593D334B))
     (comp (ref R21)
       (value R)
       (footprint Resistors_SMD:R_0603)
-      (libsource (lib device) (part R))
+      (libsource (lib Device) (part R) (description Resistor))
       (sheetpath (names /) (tstamps /))
       (tstamp 593D3543))
     (comp (ref R22)
       (value R)
       (footprint Resistors_SMD:R_0603)
-      (libsource (lib device) (part R))
+      (libsource (lib Device) (part R) (description Resistor))
       (sheetpath (names /) (tstamps /))
       (tstamp 593D3549))
     (comp (ref R23)
       (value R)
       (footprint Resistors_SMD:R_0603)
-      (libsource (lib device) (part R))
+      (libsource (lib Device) (part R) (description Resistor))
       (sheetpath (names /) (tstamps /))
       (tstamp 593D354F))
     (comp (ref R24)
       (value R)
       (footprint Resistors_SMD:R_0603)
-      (libsource (lib device) (part R))
+      (libsource (lib Device) (part R) (description Resistor))
       (sheetpath (names /) (tstamps /))
       (tstamp 593D3555))
     (comp (ref R25)
       (value R)
       (footprint Resistors_SMD:R_0603)
-      (libsource (lib device) (part R))
+      (libsource (lib Device) (part R) (description Resistor))
       (sheetpath (names /) (tstamps /))
       (tstamp 593D355B))
     (comp (ref R26)
       (value R)
       (footprint Resistors_SMD:R_0603)
-      (libsource (lib device) (part R))
+      (libsource (lib Device) (part R) (description Resistor))
       (sheetpath (names /) (tstamps /))
       (tstamp 593D3561))
     (comp (ref R27)
       (value R)
       (footprint Resistors_SMD:R_0603)
-      (libsource (lib device) (part R))
+      (libsource (lib Device) (part R) (description Resistor))
       (sheetpath (names /) (tstamps /))
       (tstamp 593D3567))
     (comp (ref R28)
       (value R)
       (footprint Resistors_SMD:R_0603)
-      (libsource (lib device) (part R))
+      (libsource (lib Device) (part R) (description Resistor))
       (sheetpath (names /) (tstamps /))
       (tstamp 593D356D))
     (comp (ref R29)
       (value R)
       (footprint Resistors_SMD:R_0603)
-      (libsource (lib device) (part R))
+      (libsource (lib Device) (part R) (description Resistor))
       (sheetpath (names /) (tstamps /))
       (tstamp 593D3573))
     (comp (ref R30)
       (value R)
       (footprint Resistors_SMD:R_0603)
-      (libsource (lib device) (part R))
+      (libsource (lib Device) (part R) (description Resistor))
       (sheetpath (names /) (tstamps /))
       (tstamp 593D3579))
     (comp (ref R31)
       (value R)
       (footprint Resistors_SMD:R_0603)
-      (libsource (lib device) (part R))
+      (libsource (lib Device) (part R) (description Resistor))
       (sheetpath (names /) (tstamps /))
       (tstamp 593D3771))
     (comp (ref R32)
       (value R)
       (footprint Resistors_SMD:R_0603)
-      (libsource (lib device) (part R))
+      (libsource (lib Device) (part R) (description Resistor))
       (sheetpath (names /) (tstamps /))
       (tstamp 593D3777))
     (comp (ref R33)
       (value R)
       (footprint Resistors_SMD:R_0603)
-      (libsource (lib device) (part R))
+      (libsource (lib Device) (part R) (description Resistor))
       (sheetpath (names /) (tstamps /))
       (tstamp 593D377D))
     (comp (ref R34)
       (value R)
       (footprint Resistors_SMD:R_0603)
-      (libsource (lib device) (part R))
+      (libsource (lib Device) (part R) (description Resistor))
       (sheetpath (names /) (tstamps /))
       (tstamp 593D3783))
     (comp (ref R35)
       (value R)
       (footprint Resistors_SMD:R_0603)
-      (libsource (lib device) (part R))
+      (libsource (lib Device) (part R) (description Resistor))
       (sheetpath (names /) (tstamps /))
       (tstamp 593D3789))
     (comp (ref R36)
       (value R)
       (footprint Resistors_SMD:R_0603)
-      (libsource (lib device) (part R))
+      (libsource (lib Device) (part R) (description Resistor))
       (sheetpath (names /) (tstamps /))
       (tstamp 593D378F))
     (comp (ref R37)
       (value R)
       (footprint Resistors_SMD:R_0603)
-      (libsource (lib device) (part R))
+      (libsource (lib Device) (part R) (description Resistor))
       (sheetpath (names /) (tstamps /))
       (tstamp 593D3795))
     (comp (ref R38)
       (value R)
       (footprint Resistors_SMD:R_0603)
-      (libsource (lib device) (part R))
+      (libsource (lib Device) (part R) (description Resistor))
       (sheetpath (names /) (tstamps /))
       (tstamp 593D379B))
     (comp (ref R39)
       (value R)
       (footprint Resistors_SMD:R_0603)
-      (libsource (lib device) (part R))
+      (libsource (lib Device) (part R) (description Resistor))
       (sheetpath (names /) (tstamps /))
       (tstamp 593D37A1))
     (comp (ref R40)
       (value R)
       (footprint Resistors_SMD:R_0603)
-      (libsource (lib device) (part R))
+      (libsource (lib Device) (part R) (description Resistor))
       (sheetpath (names /) (tstamps /))
       (tstamp 593D37A7))
     (comp (ref C1)
       (value Bypass)
       (footprint Capacitors_SMD:C_0603)
-      (libsource (lib device) (part C_Small))
+      (libsource (lib Device) (part C_Small) (description "Unpolarized capacitor"))
       (sheetpath (names /) (tstamps /))
       (tstamp 5948AC88))
     (comp (ref C2)
       (value Bypass)
       (footprint Capacitors_SMD:C_0603)
-      (libsource (lib device) (part C_Small))
+      (libsource (lib Device) (part C_Small) (description "Unpolarized capacitor"))
       (sheetpath (names /) (tstamps /))
       (tstamp 5948AFF9))
     (comp (ref C3)
       (value Bypass)
       (footprint Capacitors_SMD:C_0603)
-      (libsource (lib device) (part C_Small))
+      (libsource (lib Device) (part C_Small) (description "Unpolarized capacitor"))
       (sheetpath (names /) (tstamps /))
       (tstamp 5948B9CD))
     (comp (ref R41)
       (value R)
       (footprint Resistors_SMD:R_0603)
-      (libsource (lib device) (part R))
+      (libsource (lib Device) (part R) (description Resistor))
       (sheetpath (names /) (tstamps /))
       (tstamp 593DC6D8))
     (comp (ref J1)
       (value Conn_02x03_Odd_Even)
-      (libsource (lib conn) (part Conn_02x03_Odd_Even))
+      (datasheet ~)
+      (libsource (lib Connector_Generic) (part Conn_02x03_Odd_Even) (description "Generic connector, double row, 02x03, odd/even pin numbering scheme (row 1 odd numbers, row 2 even numbers), script generated (kicad-library-utils/schlib/autogen/connector/)"))
       (sheetpath (names /) (tstamps /))
-      (tstamp 5A76F6E9))
+      (tstamp 5B59228D))
     (comp (ref J2)
       (value Conn_02x03_Odd_Even)
-      (libsource (lib conn) (part Conn_02x03_Odd_Even))
+      (datasheet ~)
+      (libsource (lib Connector_Generic) (part Conn_02x03_Odd_Even) (description "Generic connector, double row, 02x03, odd/even pin numbering scheme (row 1 odd numbers, row 2 even numbers), script generated (kicad-library-utils/schlib/autogen/connector/)"))
       (sheetpath (names /) (tstamps /))
-      (tstamp 5A772FBC)))
+      (tstamp 5B592538)))
   (libparts
-    (libpart (lib device) (part C_Small)
-      (description "Unpolarized capacitor")
-      (footprints
-        (fp C_*))
-      (fields
-        (field (name Reference) C)
-        (field (name Value) C_Small))
-      (pins
-        (pin (num 1) (name ~) (type passive))
-        (pin (num 2) (name ~) (type passive))))
-    (libpart (lib conn) (part Conn_02x03_Odd_Even)
-      (description "Generic connector, double row, 02x03, odd/even pin numbering scheme (row 1 odd numbers, row 2 even numbers)")
+    (libpart (lib Connector_Generic) (part Conn_02x03_Odd_Even)
+      (description "Generic connector, double row, 02x03, odd/even pin numbering scheme (row 1 odd numbers, row 2 even numbers), script generated (kicad-library-utils/schlib/autogen/connector/)")
       (docs ~)
       (footprints
-        (fp Connector*:*2x??x*mm*)
-        (fp Connector*:*2x???Pitch*)
-        (fp Pin_Header_Straight_2X*)
-        (fp Pin_Header_Angled_2X*)
-        (fp Socket_Strip_Straight_2X*)
-        (fp Socket_Strip_Angled_2X*))
+        (fp Connector*:*_2x??_*))
       (fields
         (field (name Reference) J)
         (field (name Value) Conn_02x03_Odd_Even))
@@ -671,8 +658,20 @@
         (pin (num 27) (name ADDR_1) (type input))
         (pin (num 28) (name ADDR_2) (type input))
         (pin (num 29) (name PAD) (type input))))
-    (libpart (lib device) (part Q_NPN_BEC)
+    (libpart (lib Device) (part C_Small)
+      (description "Unpolarized capacitor")
+      (docs ~)
+      (footprints
+        (fp C_*))
+      (fields
+        (field (name Reference) C)
+        (field (name Value) C_Small))
+      (pins
+        (pin (num 1) (name ~) (type passive))
+        (pin (num 2) (name ~) (type passive))))
+    (libpart (lib Device) (part Q_NPN_BEC)
       (description "Transistor NPN (general)")
+      (docs ~)
       (fields
         (field (name Reference) Q)
         (field (name Value) Q_NPN_BEC))
@@ -680,10 +679,10 @@
         (pin (num 1) (name B) (type input))
         (pin (num 2) (name E) (type passive))
         (pin (num 3) (name C) (type passive))))
-    (libpart (lib device) (part R)
+    (libpart (lib Device) (part R)
       (description Resistor)
+      (docs ~)
       (footprints
-        (fp R_*)
         (fp R_*))
       (fields
         (field (name Reference) R)
@@ -692,502 +691,502 @@
         (pin (num 1) (name ~) (type passive))
         (pin (num 2) (name ~) (type passive)))))
   (libraries
+    (library (logical Connector_Generic)
+      (uri "C:\\Program Files\\KiCad\\share\\kicad\\library/Connector_Generic.lib"))
     (library (logical Custom_Parts)
-      (uri C:\Users\Kevin\Documents\Projects\KiCadLib\EESCHEMA\Custom_Parts.lib))
-    (library (logical device)
-      (uri "C:\\Program Files\\KiCad\\share\\kicad\\library\\device.lib"))
-    (library (logical conn)
-      (uri "C:\\Program Files\\KiCad\\share\\kicad\\library\\conn.lib")))
+      (uri C:/Users/Kevin/Documents/Projects/KiCadLib/EESCHEMA/Custom_Parts.lib))
+    (library (logical Device)
+      (uri "C:\\Program Files\\KiCad\\share\\kicad\\library/Device.lib")))
   (nets
-    (net (code 1) (name "Net-(Q41-Pad3)")
+    (net (code 1) (name /T3_C_1)
+      (node (ref Q22) (pin 3))
+      (node (ref T3) (pin 2)))
+    (net (code 2) (name /T4_C_2)
+      (node (ref T4) (pin 3))
+      (node (ref Q33) (pin 3)))
+    (net (code 3) (name /T4_C_3)
+      (node (ref T4) (pin 4))
+      (node (ref Q34) (pin 3)))
+    (net (code 4) (name /T4_C_4)
+      (node (ref T4) (pin 5))
+      (node (ref Q35) (pin 3)))
+    (net (code 5) (name /T4_C_5)
+      (node (ref Q36) (pin 3))
+      (node (ref T4) (pin 6)))
+    (net (code 6) (name /T4_C_6)
+      (node (ref T4) (pin 7))
+      (node (ref Q37) (pin 3)))
+    (net (code 7) (name /T4_C_7)
+      (node (ref Q38) (pin 3))
+      (node (ref T4) (pin 8)))
+    (net (code 8) (name /T4_C_8)
+      (node (ref Q39) (pin 3))
+      (node (ref T4) (pin 9)))
+    (net (code 9) (name /T4_C_9)
+      (node (ref Q40) (pin 3))
+      (node (ref T4) (pin 10)))
+    (net (code 10) (name /T3_C_0)
+      (node (ref Q21) (pin 3))
+      (node (ref T3) (pin 1)))
+    (net (code 11) (name /T4_C_1)
+      (node (ref T4) (pin 2))
+      (node (ref Q32) (pin 3)))
+    (net (code 12) (name /T3_C_2)
+      (node (ref Q23) (pin 3))
+      (node (ref T3) (pin 3)))
+    (net (code 13) (name /T3_C_3)
+      (node (ref Q24) (pin 3))
+      (node (ref T3) (pin 4)))
+    (net (code 14) (name /T3_C_4)
+      (node (ref Q25) (pin 3))
+      (node (ref T3) (pin 5)))
+    (net (code 15) (name /T3_C_5)
+      (node (ref T3) (pin 6))
+      (node (ref Q26) (pin 3)))
+    (net (code 16) (name /T3_C_6)
+      (node (ref T3) (pin 7))
+      (node (ref Q27) (pin 3)))
+    (net (code 17) (name /T3_C_7)
+      (node (ref Q28) (pin 3))
+      (node (ref T3) (pin 8)))
+    (net (code 18) (name /T3_C_8)
+      (node (ref Q29) (pin 3))
+      (node (ref T3) (pin 9)))
+    (net (code 19) (name /T3_C_9)
+      (node (ref Q30) (pin 3))
+      (node (ref T3) (pin 10)))
+    (net (code 20) (name /T2_C_0)
+      (node (ref T2) (pin 1))
+      (node (ref Q11) (pin 3)))
+    (net (code 21) (name /T1_C_8)
+      (node (ref T1) (pin 9))
+      (node (ref Q9) (pin 3)))
+    (net (code 22) (name /T1_C_9)
+      (node (ref T1) (pin 10))
+      (node (ref Q10) (pin 3)))
+    (net (code 23) (name /T4_C_0)
+      (node (ref T4) (pin 1))
+      (node (ref Q31) (pin 3)))
+    (net (code 24) (name /T1_C_4)
+      (node (ref Q5) (pin 3))
+      (node (ref T1) (pin 5)))
+    (net (code 25) (name /T1_C_5)
+      (node (ref T1) (pin 6))
+      (node (ref Q6) (pin 3)))
+    (net (code 26) (name /T1_C_6)
+      (node (ref Q7) (pin 3))
+      (node (ref T1) (pin 7)))
+    (net (code 27) (name /T1_C_7)
+      (node (ref T1) (pin 8))
+      (node (ref Q8) (pin 3)))
+    (net (code 28) (name /T1_C_3)
+      (node (ref Q4) (pin 3))
+      (node (ref T1) (pin 4)))
+    (net (code 29) (name /T2_C_9)
+      (node (ref Q20) (pin 3))
+      (node (ref T2) (pin 10)))
+    (net (code 30) (name /T2_C_1)
+      (node (ref T2) (pin 2))
+      (node (ref Q12) (pin 3)))
+    (net (code 31) (name /T2_C_2)
+      (node (ref T2) (pin 3))
+      (node (ref Q13) (pin 3)))
+    (net (code 32) (name /T2_C_3)
+      (node (ref Q14) (pin 3))
+      (node (ref T2) (pin 4)))
+    (net (code 33) (name /T2_C_4)
+      (node (ref T2) (pin 5))
+      (node (ref Q15) (pin 3)))
+    (net (code 34) (name /T2_C_5)
+      (node (ref T2) (pin 6))
+      (node (ref Q16) (pin 3)))
+    (net (code 35) (name /T2_C_6)
+      (node (ref Q17) (pin 3))
+      (node (ref T2) (pin 7)))
+    (net (code 36) (name /T2_C_7)
+      (node (ref T2) (pin 8))
+      (node (ref Q18) (pin 3)))
+    (net (code 37) (name /T2_C_8)
+      (node (ref T2) (pin 9))
+      (node (ref Q19) (pin 3)))
+    (net (code 38) (name /T1_C_0)
+      (node (ref Q1) (pin 3))
+      (node (ref T1) (pin 1)))
+    (net (code 39) (name /T1_C_1)
+      (node (ref T1) (pin 2))
+      (node (ref Q2) (pin 3)))
+    (net (code 40) (name /T1_C_2)
+      (node (ref Q3) (pin 3))
+      (node (ref T1) (pin 3)))
+    (net (code 41) (name "Net-(U2-Pad3)")
+      (node (ref U2) (pin 3)))
+    (net (code 42) (name "Net-(Q41-Pad2)")
+      (node (ref Q41) (pin 2))
+      (node (ref R41) (pin 1)))
+    (net (code 43) (name "Net-(U2-Pad13)")
+      (node (ref U2) (pin 13)))
+    (net (code 44) (name "Net-(Q41-Pad1)")
+      (node (ref U2) (pin 19))
+      (node (ref Q41) (pin 1)))
+    (net (code 45) (name "Net-(U2-Pad14)")
+      (node (ref U2) (pin 14)))
+    (net (code 46) (name "Net-(U2-Pad12)")
+      (node (ref U2) (pin 12)))
+    (net (code 47) (name "Net-(U2-Pad10)")
+      (node (ref U2) (pin 10)))
+    (net (code 48) (name "Net-(U2-Pad9)")
+      (node (ref U2) (pin 9)))
+    (net (code 49) (name "Net-(U2-Pad8)")
+      (node (ref U2) (pin 8)))
+    (net (code 50) (name "Net-(Q41-Pad3)")
       (node (ref Q41) (pin 3))
       (node (ref T5) (pin 2)))
-    (net (code 2) (name "Net-(U2-Pad3)")
-      (node (ref U2) (pin 3)))
-    (net (code 3) (name /T4_E_9)
-      (node (ref R40) (pin 1))
-      (node (ref Q40) (pin 2)))
-    (net (code 4) (name /T4_E_8)
-      (node (ref Q39) (pin 2))
-      (node (ref R39) (pin 1)))
-    (net (code 5) (name /T4_E_7)
-      (node (ref R38) (pin 1))
-      (node (ref Q38) (pin 2)))
-    (net (code 6) (name /T4_E_6)
-      (node (ref R37) (pin 1))
-      (node (ref Q37) (pin 2)))
-    (net (code 7) (name /ANODE)
-      (node (ref T5) (pin 1))
+    (net (code 51) (name /SCL)
+      (node (ref U2) (pin 23))
+      (node (ref J1) (pin 4))
+      (node (ref U1) (pin 23))
+      (node (ref U3) (pin 23)))
+    (net (code 52) (name /ANODE)
+      (node (ref T1) (pin 11))
+      (node (ref J2) (pin 1))
+      (node (ref J2) (pin 3))
       (node (ref J2) (pin 5))
       (node (ref T4) (pin 11))
       (node (ref T3) (pin 11))
-      (node (ref T1) (pin 11))
-      (node (ref T2) (pin 11))
-      (node (ref J2) (pin 3))
-      (node (ref J2) (pin 1)))
-    (net (code 8) (name /SDA)
-      (node (ref J1) (pin 6))
-      (node (ref U2) (pin 24))
+      (node (ref T5) (pin 1))
+      (node (ref T2) (pin 11)))
+    (net (code 53) (name /SDA)
       (node (ref U1) (pin 24))
-      (node (ref U3) (pin 24)))
-    (net (code 9) (name /nOE)
-      (node (ref U2) (pin 20))
+      (node (ref J1) (pin 6))
+      (node (ref U3) (pin 24))
+      (node (ref U2) (pin 24)))
+    (net (code 54) (name /nOE)
+      (node (ref J1) (pin 5))
       (node (ref U1) (pin 20))
       (node (ref U3) (pin 20))
-      (node (ref J1) (pin 5)))
-    (net (code 10) (name /SCL)
-      (node (ref J1) (pin 4))
-      (node (ref U1) (pin 23))
-      (node (ref U2) (pin 23))
-      (node (ref U3) (pin 23)))
-    (net (code 11) (name /GND)
-      (node (ref R12) (pin 2))
+      (node (ref U2) (pin 20)))
+    (net (code 55) (name /GND)
+      (node (ref U2) (pin 22))
       (node (ref R16) (pin 2))
-      (node (ref R15) (pin 2))
-      (node (ref R2) (pin 2))
-      (node (ref R14) (pin 2))
+      (node (ref U2) (pin 11))
       (node (ref R13) (pin 2))
+      (node (ref U2) (pin 21))
       (node (ref R17) (pin 2))
-      (node (ref R11) (pin 2))
-      (node (ref U3) (pin 28))
-      (node (ref U3) (pin 21))
       (node (ref R18) (pin 2))
-      (node (ref R3) (pin 2))
+      (node (ref R19) (pin 2))
+      (node (ref R20) (pin 2))
       (node (ref R4) (pin 2))
       (node (ref R5) (pin 2))
-      (node (ref R7) (pin 2))
-      (node (ref R8) (pin 2))
-      (node (ref R9) (pin 2))
-      (node (ref R10) (pin 2))
       (node (ref R6) (pin 2))
-      (node (ref J2) (pin 6))
-      (node (ref U1) (pin 1))
+      (node (ref U1) (pin 21))
+      (node (ref U3) (pin 21))
+      (node (ref U3) (pin 2))
+      (node (ref R2) (pin 2))
       (node (ref R1) (pin 2))
-      (node (ref U3) (pin 11))
+      (node (ref U1) (pin 1))
+      (node (ref U1) (pin 11))
+      (node (ref R15) (pin 2))
+      (node (ref U1) (pin 2))
       (node (ref U3) (pin 22))
-      (node (ref U2) (pin 21))
-      (node (ref U2) (pin 26))
-      (node (ref U2) (pin 22))
-      (node (ref U2) (pin 11))
-      (node (ref R19) (pin 2))
-      (node (ref U2) (pin 1))
-      (node (ref U1) (pin 27))
-      (node (ref U1) (pin 28))
-      (node (ref U1) (pin 29))
-      (node (ref U3) (pin 29))
       (node (ref U2) (pin 2))
-      (node (ref U1) (pin 2))
-      (node (ref U1) (pin 11))
-      (node (ref U1) (pin 21))
-      (node (ref U1) (pin 22))
-      (node (ref U2) (pin 28))
+      (node (ref U2) (pin 26))
+      (node (ref U3) (pin 28))
+      (node (ref R14) (pin 2))
+      (node (ref R21) (pin 2))
       (node (ref U2) (pin 29))
-      (node (ref U3) (pin 1))
-      (node (ref U3) (pin 2))
-      (node (ref R33) (pin 2))
-      (node (ref R38) (pin 2))
-      (node (ref R32) (pin 2))
-      (node (ref R31) (pin 2))
-      (node (ref R39) (pin 2))
       (node (ref R30) (pin 2))
       (node (ref R29) (pin 2))
-      (node (ref R37) (pin 2))
       (node (ref R28) (pin 2))
-      (node (ref C1) (pin 2))
-      (node (ref C2) (pin 2))
-      (node (ref R20) (pin 2))
+      (node (ref R27) (pin 2))
       (node (ref R26) (pin 2))
       (node (ref R25) (pin 2))
-      (node (ref R27) (pin 2))
       (node (ref R24) (pin 2))
       (node (ref R23) (pin 2))
-      (node (ref J1) (pin 2))
       (node (ref R22) (pin 2))
-      (node (ref J1) (pin 3))
-      (node (ref R21) (pin 2))
-      (node (ref R36) (pin 2))
-      (node (ref J2) (pin 2))
-      (node (ref J2) (pin 4))
       (node (ref R35) (pin 2))
+      (node (ref R39) (pin 2))
+      (node (ref R38) (pin 2))
+      (node (ref R37) (pin 2))
+      (node (ref R36) (pin 2))
+      (node (ref R7) (pin 2))
       (node (ref R34) (pin 2))
+      (node (ref R33) (pin 2))
+      (node (ref R32) (pin 2))
+      (node (ref U3) (pin 11))
+      (node (ref R31) (pin 2))
+      (node (ref U3) (pin 1))
+      (node (ref R11) (pin 2))
+      (node (ref R10) (pin 2))
+      (node (ref R9) (pin 2))
+      (node (ref U2) (pin 28))
+      (node (ref U3) (pin 29))
+      (node (ref R3) (pin 2))
+      (node (ref R8) (pin 2))
+      (node (ref R12) (pin 2))
+      (node (ref C1) (pin 2))
+      (node (ref R40) (pin 2))
+      (node (ref C2) (pin 2))
       (node (ref C3) (pin 2))
       (node (ref R41) (pin 2))
-      (node (ref R40) (pin 2)))
-    (net (code 12) (name /VDD)
-      (node (ref J1) (pin 1))
-      (node (ref C2) (pin 1))
-      (node (ref C1) (pin 1))
-      (node (ref U2) (pin 27))
+      (node (ref U1) (pin 27))
+      (node (ref J1) (pin 2))
+      (node (ref U1) (pin 28))
+      (node (ref U1) (pin 22))
+      (node (ref J2) (pin 4))
+      (node (ref J2) (pin 6))
+      (node (ref J2) (pin 2))
+      (node (ref J1) (pin 3))
+      (node (ref U2) (pin 1))
+      (node (ref U1) (pin 29)))
+    (net (code 56) (name /VDD)
       (node (ref C3) (pin 1))
-      (node (ref U2) (pin 25))
-      (node (ref U3) (pin 27))
+      (node (ref C2) (pin 1))
+      (node (ref J1) (pin 1))
       (node (ref U3) (pin 26))
       (node (ref U1) (pin 25))
+      (node (ref U1) (pin 26))
+      (node (ref U2) (pin 27))
+      (node (ref U2) (pin 25))
       (node (ref U3) (pin 25))
-      (node (ref U1) (pin 26)))
-    (net (code 13) (name /T3_E_6)
-      (node (ref Q27) (pin 2))
-      (node (ref R27) (pin 1)))
-    (net (code 14) (name /T3_E_5)
-      (node (ref Q26) (pin 2))
-      (node (ref R26) (pin 1)))
-    (net (code 15) (name /T3_E_4)
-      (node (ref R25) (pin 1))
-      (node (ref Q25) (pin 2)))
-    (net (code 16) (name /T3_E_3)
-      (node (ref Q24) (pin 2))
-      (node (ref R24) (pin 1)))
-    (net (code 17) (name /T3_E_7)
-      (node (ref R28) (pin 1))
-      (node (ref Q28) (pin 2)))
-    (net (code 18) (name /T3_E_2)
-      (node (ref R23) (pin 1))
-      (node (ref Q23) (pin 2)))
-    (net (code 19) (name /T3_E_1)
-      (node (ref Q22) (pin 2))
-      (node (ref R22) (pin 1)))
-    (net (code 20) (name /T3_E_0)
-      (node (ref R21) (pin 1))
-      (node (ref Q21) (pin 2)))
-    (net (code 21) (name /T2_E_9)
-      (node (ref R20) (pin 1))
-      (node (ref Q20) (pin 2)))
-    (net (code 22) (name /T4_E_1)
-      (node (ref Q32) (pin 2))
-      (node (ref R32) (pin 1)))
-    (net (code 23) (name /T4_E_5)
+      (node (ref C1) (pin 1))
+      (node (ref U3) (pin 27)))
+    (net (code 57) (name /T4_E_7)
+      (node (ref R38) (pin 1))
+      (node (ref Q38) (pin 2)))
+    (net (code 58) (name /T4_E_9)
+      (node (ref Q40) (pin 2))
+      (node (ref R40) (pin 1)))
+    (net (code 59) (name /T4_E_8)
+      (node (ref Q39) (pin 2))
+      (node (ref R39) (pin 1)))
+    (net (code 60) (name /T4_E_6)
+      (node (ref Q37) (pin 2))
+      (node (ref R37) (pin 1)))
+    (net (code 61) (name /T4_E_5)
       (node (ref Q36) (pin 2))
       (node (ref R36) (pin 1)))
-    (net (code 24) (name /T4_E_4)
+    (net (code 62) (name /T4_E_4)
       (node (ref Q35) (pin 2))
       (node (ref R35) (pin 1)))
-    (net (code 25) (name /T4_E_3)
+    (net (code 63) (name /T4_E_3)
       (node (ref Q34) (pin 2))
       (node (ref R34) (pin 1)))
-    (net (code 26) (name /T4_E_2)
-      (node (ref Q33) (pin 2))
-      (node (ref R33) (pin 1)))
-    (net (code 27) (name /T4_E_0)
+    (net (code 64) (name /T4_E_2)
+      (node (ref R33) (pin 1))
+      (node (ref Q33) (pin 2)))
+    (net (code 65) (name /T4_E_1)
+      (node (ref Q32) (pin 2))
+      (node (ref R32) (pin 1)))
+    (net (code 66) (name /T4_E_0)
       (node (ref Q31) (pin 2))
       (node (ref R31) (pin 1)))
-    (net (code 28) (name /T3_E_9)
-      (node (ref Q30) (pin 2))
-      (node (ref R30) (pin 1)))
-    (net (code 29) (name /T3_E_8)
-      (node (ref R29) (pin 1))
-      (node (ref Q29) (pin 2)))
-    (net (code 30) (name "Net-(U2-Pad8)")
-      (node (ref U2) (pin 8)))
-    (net (code 31) (name "Net-(Q41-Pad1)")
-      (node (ref U2) (pin 19))
-      (node (ref Q41) (pin 1)))
-    (net (code 32) (name "Net-(U2-Pad14)")
-      (node (ref U2) (pin 14)))
-    (net (code 33) (name "Net-(U2-Pad13)")
-      (node (ref U2) (pin 13)))
-    (net (code 34) (name "Net-(U2-Pad12)")
-      (node (ref U2) (pin 12)))
-    (net (code 35) (name "Net-(U2-Pad10)")
-      (node (ref U2) (pin 10)))
-    (net (code 36) (name "Net-(U2-Pad9)")
-      (node (ref U2) (pin 9)))
-    (net (code 37) (name /T2_E_0)
-      (node (ref R11) (pin 1))
-      (node (ref Q11) (pin 2)))
-    (net (code 38) (name /T2_E_8)
-      (node (ref Q19) (pin 2))
-      (node (ref R19) (pin 1)))
-    (net (code 39) (name /T2_E_7)
-      (node (ref R18) (pin 1))
-      (node (ref Q18) (pin 2)))
-    (net (code 40) (name /T2_E_6)
-      (node (ref R17) (pin 1))
-      (node (ref Q17) (pin 2)))
-    (net (code 41) (name /T2_E_5)
-      (node (ref Q16) (pin 2))
-      (node (ref R16) (pin 1)))
-    (net (code 42) (name /T2_E_4)
-      (node (ref Q15) (pin 2))
-      (node (ref R15) (pin 1)))
-    (net (code 43) (name /T2_E_3)
-      (node (ref R14) (pin 1))
-      (node (ref Q14) (pin 2)))
-    (net (code 44) (name /T2_E_2)
-      (node (ref Q13) (pin 2))
-      (node (ref R13) (pin 1)))
-    (net (code 45) (name /T2_E_1)
-      (node (ref R12) (pin 1))
-      (node (ref Q12) (pin 2)))
-    (net (code 46) (name "Net-(Q41-Pad2)")
-      (node (ref R41) (pin 1))
-      (node (ref Q41) (pin 2)))
-    (net (code 47) (name /T2_C_3)
-      (node (ref Q14) (pin 3))
-      (node (ref T2) (pin 4)))
-    (net (code 48) (name /T3_C_5)
-      (node (ref Q26) (pin 3))
-      (node (ref T3) (pin 6)))
-    (net (code 49) (name /T3_C_6)
-      (node (ref T3) (pin 7))
-      (node (ref Q27) (pin 3)))
-    (net (code 50) (name /T3_C_7)
-      (node (ref Q28) (pin 3))
-      (node (ref T3) (pin 8)))
-    (net (code 51) (name /T3_C_8)
-      (node (ref T3) (pin 9))
-      (node (ref Q29) (pin 3)))
-    (net (code 52) (name /T3_C_9)
-      (node (ref Q30) (pin 3))
-      (node (ref T3) (pin 10)))
-    (net (code 53) (name /T2_C_0)
-      (node (ref T2) (pin 1))
-      (node (ref Q11) (pin 3)))
-    (net (code 54) (name /T2_C_1)
-      (node (ref Q12) (pin 3))
-      (node (ref T2) (pin 2)))
-    (net (code 55) (name /T2_C_2)
-      (node (ref Q13) (pin 3))
-      (node (ref T2) (pin 3)))
-    (net (code 56) (name /T3_C_4)
-      (node (ref T3) (pin 5))
-      (node (ref Q25) (pin 3)))
-    (net (code 57) (name /T2_C_4)
-      (node (ref T2) (pin 5))
-      (node (ref Q15) (pin 3)))
-    (net (code 58) (name /T2_C_5)
-      (node (ref Q16) (pin 3))
-      (node (ref T2) (pin 6)))
-    (net (code 59) (name /T2_C_6)
-      (node (ref T2) (pin 7))
-      (node (ref Q17) (pin 3)))
-    (net (code 60) (name /T2_C_7)
-      (node (ref Q18) (pin 3))
-      (node (ref T2) (pin 8)))
-    (net (code 61) (name /T2_C_8)
-      (node (ref T2) (pin 9))
-      (node (ref Q19) (pin 3)))
-    (net (code 62) (name /T2_C_9)
-      (node (ref T2) (pin 10))
-      (node (ref Q20) (pin 3)))
-    (net (code 63) (name /T4_C_6)
-      (node (ref Q37) (pin 3))
-      (node (ref T4) (pin 7)))
-    (net (code 64) (name /T1_C_8)
-      (node (ref Q9) (pin 3))
-      (node (ref T1) (pin 9)))
-    (net (code 65) (name /T1_C_9)
-      (node (ref Q10) (pin 3))
-      (node (ref T1) (pin 10)))
-    (net (code 66) (name /T4_C_0)
-      (node (ref Q31) (pin 3))
-      (node (ref T4) (pin 1)))
-    (net (code 67) (name /T4_C_1)
-      (node (ref Q32) (pin 3))
-      (node (ref T4) (pin 2)))
-    (net (code 68) (name /T4_C_2)
-      (node (ref T4) (pin 3))
-      (node (ref Q33) (pin 3)))
-    (net (code 69) (name /T4_C_3)
-      (node (ref T4) (pin 4))
-      (node (ref Q34) (pin 3)))
-    (net (code 70) (name /T4_C_4)
-      (node (ref Q35) (pin 3))
-      (node (ref T4) (pin 5)))
-    (net (code 71) (name /T4_C_5)
-      (node (ref Q36) (pin 3))
-      (node (ref T4) (pin 6)))
-    (net (code 72) (name /T4_C_7)
-      (node (ref Q38) (pin 3))
-      (node (ref T4) (pin 8)))
-    (net (code 73) (name /T4_C_8)
-      (node (ref Q39) (pin 3))
-      (node (ref T4) (pin 9)))
-    (net (code 74) (name /T4_C_9)
-      (node (ref T4) (pin 10))
-      (node (ref Q40) (pin 3)))
-    (net (code 75) (name /T3_C_0)
-      (node (ref T3) (pin 1))
-      (node (ref Q21) (pin 3)))
-    (net (code 76) (name /T3_C_1)
-      (node (ref Q22) (pin 3))
-      (node (ref T3) (pin 2)))
-    (net (code 77) (name /T3_C_2)
-      (node (ref Q23) (pin 3))
-      (node (ref T3) (pin 3)))
-    (net (code 78) (name /T3_C_3)
-      (node (ref T3) (pin 4))
-      (node (ref Q24) (pin 3)))
-    (net (code 79) (name /T1_E_0)
-      (node (ref Q1) (pin 2))
-      (node (ref R1) (pin 1)))
-    (net (code 80) (name /T1_E_1)
-      (node (ref R2) (pin 1))
-      (node (ref Q2) (pin 2)))
-    (net (code 81) (name /T1_E_2)
-      (node (ref R3) (pin 1))
-      (node (ref Q3) (pin 2)))
-    (net (code 82) (name /T1_E_3)
-      (node (ref Q4) (pin 2))
-      (node (ref R4) (pin 1)))
-    (net (code 83) (name /T1_E_4)
-      (node (ref R5) (pin 1))
-      (node (ref Q5) (pin 2)))
-    (net (code 84) (name /T1_C_7)
-      (node (ref T1) (pin 8))
-      (node (ref Q8) (pin 3)))
-    (net (code 85) (name /T1_C_0)
-      (node (ref Q1) (pin 3))
-      (node (ref T1) (pin 1)))
-    (net (code 86) (name /T1_C_1)
-      (node (ref Q2) (pin 3))
-      (node (ref T1) (pin 2)))
-    (net (code 87) (name /T1_C_2)
-      (node (ref T1) (pin 3))
-      (node (ref Q3) (pin 3)))
-    (net (code 88) (name /T1_C_3)
-      (node (ref Q4) (pin 3))
-      (node (ref T1) (pin 4)))
-    (net (code 89) (name /T1_C_4)
-      (node (ref Q5) (pin 3))
-      (node (ref T1) (pin 5)))
-    (net (code 90) (name /T1_C_5)
-      (node (ref Q6) (pin 3))
-      (node (ref T1) (pin 6)))
-    (net (code 91) (name /T1_C_6)
-      (node (ref T1) (pin 7))
-      (node (ref Q7) (pin 3)))
-    (net (code 92) (name /T2_G_3)
-      (node (ref U2) (pin 7))
-      (node (ref Q14) (pin 1)))
-    (net (code 93) (name /T3_G_1)
-      (node (ref U3) (pin 14))
-      (node (ref Q22) (pin 1)))
-    (net (code 94) (name /T3_G_0)
+    (net (code 67) (name /T3_G_7)
+      (node (ref Q28) (pin 1))
+      (node (ref U2) (pin 15)))
+    (net (code 68) (name /T4_G_6)
+      (node (ref U3) (pin 4))
+      (node (ref Q37) (pin 1)))
+    (net (code 69) (name /T4_G_5)
+      (node (ref Q36) (pin 1))
+      (node (ref U3) (pin 7)))
+    (net (code 70) (name /T4_G_4)
+      (node (ref Q35) (pin 1))
+      (node (ref U3) (pin 19)))
+    (net (code 71) (name /T4_G_3)
+      (node (ref U3) (pin 18))
+      (node (ref Q34) (pin 1)))
+    (net (code 72) (name /T4_G_2)
+      (node (ref Q33) (pin 1))
+      (node (ref U3) (pin 5)))
+    (net (code 73) (name /T4_G_1)
+      (node (ref Q32) (pin 1))
+      (node (ref U3) (pin 10)))
+    (net (code 74) (name /T4_G_0)
+      (node (ref Q31) (pin 1))
+      (node (ref U3) (pin 9)))
+    (net (code 75) (name /T3_G_9)
+      (node (ref Q30) (pin 1))
+      (node (ref U3) (pin 12)))
+    (net (code 76) (name /T3_G_8)
+      (node (ref Q29) (pin 1))
+      (node (ref U3) (pin 17)))
+    (net (code 77) (name /T4_G_7)
+      (node (ref U3) (pin 3))
+      (node (ref Q38) (pin 1)))
+    (net (code 78) (name /T3_G_6)
+      (node (ref U2) (pin 18))
+      (node (ref Q27) (pin 1)))
+    (net (code 79) (name /T3_G_5)
+      (node (ref U3) (pin 15))
+      (node (ref Q26) (pin 1)))
+    (net (code 80) (name /T3_G_4)
+      (node (ref Q25) (pin 1))
+      (node (ref U2) (pin 17)))
+    (net (code 81) (name /T3_G_3)
+      (node (ref Q24) (pin 1))
+      (node (ref U2) (pin 16)))
+    (net (code 82) (name /T3_G_2)
+      (node (ref Q23) (pin 1))
+      (node (ref U3) (pin 16)))
+    (net (code 83) (name /T3_G_1)
+      (node (ref Q22) (pin 1))
+      (node (ref U3) (pin 14)))
+    (net (code 84) (name /T3_G_0)
       (node (ref U3) (pin 13))
       (node (ref Q21) (pin 1)))
-    (net (code 95) (name /T2_G_9)
+    (net (code 85) (name /T2_G_9)
       (node (ref Q20) (pin 1))
       (node (ref U1) (pin 8)))
-    (net (code 96) (name /T2_G_8)
-      (node (ref Q19) (pin 1))
-      (node (ref U1) (pin 6)))
-    (net (code 97) (name /T2_G_7)
-      (node (ref U2) (pin 6))
-      (node (ref Q18) (pin 1)))
-    (net (code 98) (name /T2_G_6)
-      (node (ref Q17) (pin 1))
-      (node (ref U2) (pin 5)))
-    (net (code 99) (name /T2_G_5)
-      (node (ref Q16) (pin 1))
-      (node (ref U1) (pin 7)))
-    (net (code 100) (name /T2_G_4)
-      (node (ref Q15) (pin 1))
-      (node (ref U2) (pin 4)))
-    (net (code 101) (name /T3_G_2)
-      (node (ref Q23) (pin 1))
-      (node (ref U3) (pin 16)))
-    (net (code 102) (name /T2_G_2)
+    (net (code 86) (name /T1_G_6)
+      (node (ref U1) (pin 3))
+      (node (ref Q7) (pin 1)))
+    (net (code 87) (name /T2_G_4)
+      (node (ref U2) (pin 4))
+      (node (ref Q15) (pin 1)))
+    (net (code 88) (name /T2_G_3)
+      (node (ref Q14) (pin 1))
+      (node (ref U2) (pin 7)))
+    (net (code 89) (name /T2_G_2)
       (node (ref Q13) (pin 1))
       (node (ref U1) (pin 5)))
-    (net (code 103) (name /T2_G_1)
-      (node (ref U1) (pin 10))
-      (node (ref Q12) (pin 1)))
-    (net (code 104) (name /T2_G_0)
+    (net (code 90) (name /T2_G_1)
+      (node (ref Q12) (pin 1))
+      (node (ref U1) (pin 10)))
+    (net (code 91) (name /T2_G_0)
       (node (ref U1) (pin 9))
       (node (ref Q11) (pin 1)))
-    (net (code 105) (name /T1_G_9)
+    (net (code 92) (name /T1_G_9)
       (node (ref U1) (pin 12))
       (node (ref Q10) (pin 1)))
-    (net (code 106) (name /T1_G_8)
+    (net (code 93) (name /T1_G_8)
       (node (ref Q9) (pin 1))
       (node (ref U1) (pin 17)))
-    (net (code 107) (name /T1_G_7)
+    (net (code 94) (name /T1_G_7)
       (node (ref U1) (pin 4))
       (node (ref Q8) (pin 1)))
-    (net (code 108) (name /T1_G_6)
-      (node (ref Q7) (pin 1))
-      (node (ref U1) (pin 3)))
-    (net (code 109) (name /T4_G_0)
-      (node (ref Q31) (pin 1))
-      (node (ref U3) (pin 9)))
-    (net (code 110) (name /T4_G_8)
-      (node (ref U3) (pin 6))
-      (node (ref Q39) (pin 1)))
-    (net (code 111) (name /T4_G_7)
-      (node (ref U3) (pin 3))
-      (node (ref Q38) (pin 1)))
-    (net (code 112) (name /T4_G_6)
-      (node (ref U3) (pin 4))
-      (node (ref Q37) (pin 1)))
-    (net (code 113) (name /T4_G_5)
-      (node (ref U3) (pin 7))
-      (node (ref Q36) (pin 1)))
-    (net (code 114) (name /T4_G_4)
-      (node (ref U3) (pin 19))
-      (node (ref Q35) (pin 1)))
-    (net (code 115) (name /T4_G_3)
-      (node (ref Q34) (pin 1))
-      (node (ref U3) (pin 18)))
-    (net (code 116) (name /T4_G_2)
-      (node (ref U3) (pin 5))
-      (node (ref Q33) (pin 1)))
-    (net (code 117) (name /T4_G_1)
-      (node (ref Q32) (pin 1))
-      (node (ref U3) (pin 10)))
-    (net (code 118) (name /T1_G_5)
+    (net (code 95) (name /T2_G_8)
+      (node (ref U1) (pin 6))
+      (node (ref Q19) (pin 1)))
+    (net (code 96) (name /T1_G_5)
       (node (ref U1) (pin 15))
       (node (ref Q6) (pin 1)))
-    (net (code 119) (name /T3_G_9)
-      (node (ref U3) (pin 12))
-      (node (ref Q30) (pin 1)))
-    (net (code 120) (name /T3_G_8)
-      (node (ref U3) (pin 17))
-      (node (ref Q29) (pin 1)))
-    (net (code 121) (name /T3_G_7)
-      (node (ref U2) (pin 15))
-      (node (ref Q28) (pin 1)))
-    (net (code 122) (name /T3_G_6)
-      (node (ref Q27) (pin 1))
-      (node (ref U2) (pin 18)))
-    (net (code 123) (name /T3_G_5)
-      (node (ref Q26) (pin 1))
-      (node (ref U3) (pin 15)))
-    (net (code 124) (name /T3_G_4)
-      (node (ref Q25) (pin 1))
-      (node (ref U2) (pin 17)))
-    (net (code 125) (name /T3_G_3)
-      (node (ref Q24) (pin 1))
-      (node (ref U2) (pin 16)))
-    (net (code 126) (name /T1_G_4)
-      (node (ref Q5) (pin 1))
-      (node (ref U1) (pin 18)))
-    (net (code 127) (name /T1_G_3)
-      (node (ref Q4) (pin 1))
-      (node (ref U1) (pin 19)))
-    (net (code 128) (name /T1_G_2)
-      (node (ref Q3) (pin 1))
-      (node (ref U1) (pin 16)))
-    (net (code 129) (name /T1_G_1)
-      (node (ref Q2) (pin 1))
-      (node (ref U1) (pin 14)))
-    (net (code 130) (name /T1_G_0)
+    (net (code 97) (name /T1_G_4)
+      (node (ref U1) (pin 18))
+      (node (ref Q5) (pin 1)))
+    (net (code 98) (name /T1_G_3)
+      (node (ref U1) (pin 19))
+      (node (ref Q4) (pin 1)))
+    (net (code 99) (name /T1_G_2)
+      (node (ref U1) (pin 16))
+      (node (ref Q3) (pin 1)))
+    (net (code 100) (name /T1_G_1)
+      (node (ref U1) (pin 14))
+      (node (ref Q2) (pin 1)))
+    (net (code 101) (name /T1_G_0)
       (node (ref Q1) (pin 1))
       (node (ref U1) (pin 13)))
-    (net (code 131) (name /T4_G_9)
-      (node (ref U3) (pin 8))
-      (node (ref Q40) (pin 1)))
-    (net (code 132) (name /T1_E_5)
+    (net (code 102) (name /T4_G_9)
+      (node (ref Q40) (pin 1))
+      (node (ref U3) (pin 8)))
+    (net (code 103) (name /T4_G_8)
+      (node (ref Q39) (pin 1))
+      (node (ref U3) (pin 6)))
+    (net (code 104) (name /T2_G_7)
+      (node (ref U2) (pin 6))
+      (node (ref Q18) (pin 1)))
+    (net (code 105) (name /T2_G_6)
+      (node (ref Q17) (pin 1))
+      (node (ref U2) (pin 5)))
+    (net (code 106) (name /T2_G_5)
+      (node (ref U1) (pin 7))
+      (node (ref Q16) (pin 1)))
+    (net (code 107) (name /T1_E_6)
+      (node (ref R7) (pin 1))
+      (node (ref Q7) (pin 2)))
+    (net (code 108) (name /T2_E_7)
+      (node (ref Q18) (pin 2))
+      (node (ref R18) (pin 1)))
+    (net (code 109) (name /T2_E_8)
+      (node (ref Q19) (pin 2))
+      (node (ref R19) (pin 1)))
+    (net (code 110) (name /T2_E_9)
+      (node (ref Q20) (pin 2))
+      (node (ref R20) (pin 1)))
+    (net (code 111) (name /T1_E_0)
+      (node (ref Q1) (pin 2))
+      (node (ref R1) (pin 1)))
+    (net (code 112) (name /T1_E_1)
+      (node (ref Q2) (pin 2))
+      (node (ref R2) (pin 1)))
+    (net (code 113) (name /T1_E_2)
+      (node (ref Q3) (pin 2))
+      (node (ref R3) (pin 1)))
+    (net (code 114) (name /T1_E_3)
+      (node (ref Q4) (pin 2))
+      (node (ref R4) (pin 1)))
+    (net (code 115) (name /T1_E_4)
+      (node (ref Q5) (pin 2))
+      (node (ref R5) (pin 1)))
+    (net (code 116) (name /T1_E_5)
       (node (ref Q6) (pin 2))
       (node (ref R6) (pin 1)))
-    (net (code 133) (name /T1_E_6)
-      (node (ref Q7) (pin 2))
-      (node (ref R7) (pin 1)))
-    (net (code 134) (name /T1_E_7)
-      (node (ref Q8) (pin 2))
-      (node (ref R8) (pin 1)))
-    (net (code 135) (name /T1_E_8)
+    (net (code 117) (name /T2_E_6)
+      (node (ref R17) (pin 1))
+      (node (ref Q17) (pin 2)))
+    (net (code 118) (name /T1_E_7)
+      (node (ref R8) (pin 1))
+      (node (ref Q8) (pin 2)))
+    (net (code 119) (name /T1_E_8)
       (node (ref Q9) (pin 2))
       (node (ref R9) (pin 1)))
-    (net (code 136) (name /T1_E_9)
+    (net (code 120) (name /T1_E_9)
       (node (ref Q10) (pin 2))
-      (node (ref R10) (pin 1)))))
+      (node (ref R10) (pin 1)))
+    (net (code 121) (name /T3_E_7)
+      (node (ref Q28) (pin 2))
+      (node (ref R28) (pin 1)))
+    (net (code 122) (name /T3_E_0)
+      (node (ref Q21) (pin 2))
+      (node (ref R21) (pin 1)))
+    (net (code 123) (name /T3_E_1)
+      (node (ref Q22) (pin 2))
+      (node (ref R22) (pin 1)))
+    (net (code 124) (name /T3_E_2)
+      (node (ref Q23) (pin 2))
+      (node (ref R23) (pin 1)))
+    (net (code 125) (name /T3_E_3)
+      (node (ref Q24) (pin 2))
+      (node (ref R24) (pin 1)))
+    (net (code 126) (name /T3_E_4)
+      (node (ref R25) (pin 1))
+      (node (ref Q25) (pin 2)))
+    (net (code 127) (name /T3_E_5)
+      (node (ref R26) (pin 1))
+      (node (ref Q26) (pin 2)))
+    (net (code 128) (name /T3_E_6)
+      (node (ref Q27) (pin 2))
+      (node (ref R27) (pin 1)))
+    (net (code 129) (name /T3_E_8)
+      (node (ref R29) (pin 1))
+      (node (ref Q29) (pin 2)))
+    (net (code 130) (name /T3_E_9)
+      (node (ref Q30) (pin 2))
+      (node (ref R30) (pin 1)))
+    (net (code 131) (name /T2_E_0)
+      (node (ref R11) (pin 1))
+      (node (ref Q11) (pin 2)))
+    (net (code 132) (name /T2_E_1)
+      (node (ref R12) (pin 1))
+      (node (ref Q12) (pin 2)))
+    (net (code 133) (name /T2_E_2)
+      (node (ref R13) (pin 1))
+      (node (ref Q13) (pin 2)))
+    (net (code 134) (name /T2_E_3)
+      (node (ref R14) (pin 1))
+      (node (ref Q14) (pin 2)))
+    (net (code 135) (name /T2_E_4)
+      (node (ref Q15) (pin 2))
+      (node (ref R15) (pin 1)))
+    (net (code 136) (name /T2_E_5)
+      (node (ref Q16) (pin 2))
+      (node (ref R16) (pin 1)))))

+ 4 - 35
Nixie_Top_Board/nixie_top_board.pro

@@ -1,4 +1,4 @@
-update=6/23/2017 10:35:40 PM
+update=7/22/2018 6:01:43 PM
 version=1
 last_client=kicad
 [pcbnew]
@@ -25,40 +25,6 @@ version=1
 NetIExt=net
 [general]
 version=1
-[eeschema]
-version=1
-LibDir=
-[eeschema/libraries]
-LibName1=power
-LibName2=device
-LibName3=transistors
-LibName4=conn
-LibName5=linear
-LibName6=regul
-LibName7=74xx
-LibName8=cmos4000
-LibName9=adc-dac
-LibName10=memory
-LibName11=xilinx
-LibName12=microcontrollers
-LibName13=dsp
-LibName14=microchip
-LibName15=analog_switches
-LibName16=motorola
-LibName17=texas
-LibName18=intel
-LibName19=audio
-LibName20=interface
-LibName21=digital-audio
-LibName22=philips
-LibName23=display
-LibName24=cypress
-LibName25=siliconi
-LibName26=opto
-LibName27=atmel
-LibName28=contrib
-LibName29=valves
-LibName30=C:/Users/Kevin/Documents/Projects/KiCadLib/EESCHEMA/Custom_Parts
 [schematic_editor]
 version=1
 PageLayoutDescrFile=
@@ -69,3 +35,6 @@ NetFmtName=
 SpiceForceRefPrefix=0
 SpiceUseNetNumbers=0
 LabSize=60
+[eeschema]
+version=1
+LibDir=

+ 337 - 203
Nixie_Top_Board/nixie_top_board.sch

@@ -1,36 +1,6 @@
-EESchema Schematic File Version 2
-LIBS:power
-LIBS:device
-LIBS:transistors
-LIBS:conn
-LIBS:linear
-LIBS:regul
-LIBS:74xx
-LIBS:cmos4000
-LIBS:adc-dac
-LIBS:memory
-LIBS:xilinx
-LIBS:microcontrollers
-LIBS:dsp
-LIBS:microchip
-LIBS:analog_switches
-LIBS:motorola
-LIBS:texas
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:digital-audio
-LIBS:philips
-LIBS:display
-LIBS:cypress
-LIBS:siliconi
-LIBS:opto
-LIBS:atmel
-LIBS:contrib
-LIBS:valves
-LIBS:Custom_Parts
+EESchema Schematic File Version 4
 LIBS:nixie_top_board-cache
-EELAYER 25 0
+EELAYER 26 0
 EELAYER END
 $Descr USLegal 14000 8500
 encoding utf-8
@@ -45,7 +15,7 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L IN-8 T3
+L Custom_Parts:IN-8 T3
 U 1 1 5938FA0F
 P 1500 4500
 F 0 "T3" H 1650 4550 60  0000 C CNN
@@ -56,7 +26,7 @@ F 3 "" H 1500 4450 60  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L IN-8 T2
+L Custom_Parts:IN-8 T2
 U 1 1 5938FA7E
 P 1500 2950
 F 0 "T2" H 1650 3000 60  0000 C CNN
@@ -67,7 +37,7 @@ F 3 "" H 1500 2900 60  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L IN-8 T1
+L Custom_Parts:IN-8 T1
 U 1 1 5938FAE9
 P 1500 1400
 F 0 "T1" H 1650 1450 60  0000 C CNN
@@ -78,7 +48,7 @@ F 3 "" H 1500 1350 60  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L IN-8 T4
+L Custom_Parts:IN-8 T4
 U 1 1 5938FB49
 P 1500 6050
 F 0 "T4" H 1650 6100 60  0000 C CNN
@@ -89,7 +59,7 @@ F 3 "" H 1500 6000 60  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L Q_NPN_BEC Q31
+L Device:Q_NPN_BEC Q31
 U 1 1 5938FCEB
 P 7450 1350
 F 0 "Q31" H 7650 1400 50  0000 L CNN
@@ -100,7 +70,7 @@ F 3 "" H 7450 1350 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Q_NPN_BEC Q32
+L Device:Q_NPN_BEC Q32
 U 1 1 5938FF4E
 P 7450 1900
 F 0 "Q32" H 7650 1950 50  0000 L CNN
@@ -111,7 +81,7 @@ F 3 "" H 7450 1900 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Q_NPN_BEC Q33
+L Device:Q_NPN_BEC Q33
 U 1 1 5938FF9A
 P 7450 2450
 F 0 "Q33" H 7650 2500 50  0000 L CNN
@@ -122,7 +92,7 @@ F 3 "" H 7450 2450 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Q_NPN_BEC Q34
+L Device:Q_NPN_BEC Q34
 U 1 1 5939000A
 P 7450 3000
 F 0 "Q34" H 7650 3050 50  0000 L CNN
@@ -133,7 +103,7 @@ F 3 "" H 7450 3000 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Q_NPN_BEC Q35
+L Device:Q_NPN_BEC Q35
 U 1 1 59390080
 P 7450 3550
 F 0 "Q35" H 7650 3600 50  0000 L CNN
@@ -144,7 +114,7 @@ F 3 "" H 7450 3550 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Q_NPN_BEC Q36
+L Device:Q_NPN_BEC Q36
 U 1 1 593905DE
 P 7450 4100
 F 0 "Q36" H 7650 4150 50  0000 L CNN
@@ -155,7 +125,7 @@ F 3 "" H 7450 4100 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Q_NPN_BEC Q37
+L Device:Q_NPN_BEC Q37
 U 1 1 593905E4
 P 7450 4650
 F 0 "Q37" H 7650 4700 50  0000 L CNN
@@ -166,7 +136,7 @@ F 3 "" H 7450 4650 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Q_NPN_BEC Q38
+L Device:Q_NPN_BEC Q38
 U 1 1 593905EA
 P 7450 5200
 F 0 "Q38" H 7650 5250 50  0000 L CNN
@@ -177,7 +147,7 @@ F 3 "" H 7450 5200 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Q_NPN_BEC Q39
+L Device:Q_NPN_BEC Q39
 U 1 1 593905F0
 P 7450 5750
 F 0 "Q39" H 7650 5800 50  0000 L CNN
@@ -188,7 +158,7 @@ F 3 "" H 7450 5750 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Q_NPN_BEC Q40
+L Device:Q_NPN_BEC Q40
 U 1 1 593905F6
 P 7450 6300
 F 0 "Q40" H 7650 6350 50  0000 L CNN
@@ -199,7 +169,7 @@ F 3 "" H 7450 6300 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Q_NPN_BEC Q21
+L Device:Q_NPN_BEC Q21
 U 1 1 5939343C
 P 6100 1350
 F 0 "Q21" H 6300 1400 50  0000 L CNN
@@ -210,7 +180,7 @@ F 3 "" H 6100 1350 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Q_NPN_BEC Q22
+L Device:Q_NPN_BEC Q22
 U 1 1 59393442
 P 6100 1900
 F 0 "Q22" H 6300 1950 50  0000 L CNN
@@ -221,7 +191,7 @@ F 3 "" H 6100 1900 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Q_NPN_BEC Q23
+L Device:Q_NPN_BEC Q23
 U 1 1 59393448
 P 6100 2450
 F 0 "Q23" H 6300 2500 50  0000 L CNN
@@ -232,7 +202,7 @@ F 3 "" H 6100 2450 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Q_NPN_BEC Q24
+L Device:Q_NPN_BEC Q24
 U 1 1 5939344E
 P 6100 3000
 F 0 "Q24" H 6300 3050 50  0000 L CNN
@@ -243,7 +213,7 @@ F 3 "" H 6100 3000 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Q_NPN_BEC Q25
+L Device:Q_NPN_BEC Q25
 U 1 1 59393454
 P 6100 3550
 F 0 "Q25" H 6300 3600 50  0000 L CNN
@@ -254,7 +224,7 @@ F 3 "" H 6100 3550 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Q_NPN_BEC Q26
+L Device:Q_NPN_BEC Q26
 U 1 1 5939345A
 P 6100 4100
 F 0 "Q26" H 6300 4150 50  0000 L CNN
@@ -265,7 +235,7 @@ F 3 "" H 6100 4100 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Q_NPN_BEC Q27
+L Device:Q_NPN_BEC Q27
 U 1 1 59393460
 P 6100 4650
 F 0 "Q27" H 6300 4700 50  0000 L CNN
@@ -276,7 +246,7 @@ F 3 "" H 6100 4650 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Q_NPN_BEC Q28
+L Device:Q_NPN_BEC Q28
 U 1 1 59393466
 P 6100 5200
 F 0 "Q28" H 6300 5250 50  0000 L CNN
@@ -287,7 +257,7 @@ F 3 "" H 6100 5200 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Q_NPN_BEC Q29
+L Device:Q_NPN_BEC Q29
 U 1 1 5939346C
 P 6100 5750
 F 0 "Q29" H 6300 5800 50  0000 L CNN
@@ -298,7 +268,7 @@ F 3 "" H 6100 5750 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Q_NPN_BEC Q30
+L Device:Q_NPN_BEC Q30
 U 1 1 59393472
 P 6100 6300
 F 0 "Q30" H 6300 6350 50  0000 L CNN
@@ -309,7 +279,7 @@ F 3 "" H 6100 6300 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Q_NPN_BEC Q11
+L Device:Q_NPN_BEC Q11
 U 1 1 593936AA
 P 4750 1350
 F 0 "Q11" H 4950 1400 50  0000 L CNN
@@ -320,7 +290,7 @@ F 3 "" H 4750 1350 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Q_NPN_BEC Q12
+L Device:Q_NPN_BEC Q12
 U 1 1 593936B0
 P 4750 1900
 F 0 "Q12" H 4950 1950 50  0000 L CNN
@@ -331,7 +301,7 @@ F 3 "" H 4750 1900 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Q_NPN_BEC Q13
+L Device:Q_NPN_BEC Q13
 U 1 1 593936B6
 P 4750 2450
 F 0 "Q13" H 4950 2500 50  0000 L CNN
@@ -342,7 +312,7 @@ F 3 "" H 4750 2450 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Q_NPN_BEC Q14
+L Device:Q_NPN_BEC Q14
 U 1 1 593936BC
 P 4750 3000
 F 0 "Q14" H 4950 3050 50  0000 L CNN
@@ -353,7 +323,7 @@ F 3 "" H 4750 3000 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Q_NPN_BEC Q15
+L Device:Q_NPN_BEC Q15
 U 1 1 593936C2
 P 4750 3550
 F 0 "Q15" H 4950 3600 50  0000 L CNN
@@ -364,7 +334,7 @@ F 3 "" H 4750 3550 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Q_NPN_BEC Q16
+L Device:Q_NPN_BEC Q16
 U 1 1 593936C8
 P 4750 4100
 F 0 "Q16" H 4950 4150 50  0000 L CNN
@@ -375,7 +345,7 @@ F 3 "" H 4750 4100 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Q_NPN_BEC Q17
+L Device:Q_NPN_BEC Q17
 U 1 1 593936CE
 P 4750 4650
 F 0 "Q17" H 4950 4700 50  0000 L CNN
@@ -386,7 +356,7 @@ F 3 "" H 4750 4650 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Q_NPN_BEC Q18
+L Device:Q_NPN_BEC Q18
 U 1 1 593936D4
 P 4750 5200
 F 0 "Q18" H 4950 5250 50  0000 L CNN
@@ -397,7 +367,7 @@ F 3 "" H 4750 5200 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Q_NPN_BEC Q19
+L Device:Q_NPN_BEC Q19
 U 1 1 593936DA
 P 4750 5750
 F 0 "Q19" H 4950 5800 50  0000 L CNN
@@ -408,7 +378,7 @@ F 3 "" H 4750 5750 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Q_NPN_BEC Q20
+L Device:Q_NPN_BEC Q20
 U 1 1 593936E0
 P 4750 6300
 F 0 "Q20" H 4950 6350 50  0000 L CNN
@@ -419,7 +389,7 @@ F 3 "" H 4750 6300 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Q_NPN_BEC Q1
+L Device:Q_NPN_BEC Q1
 U 1 1 593936E6
 P 3400 1350
 F 0 "Q1" H 3600 1400 50  0000 L CNN
@@ -430,7 +400,7 @@ F 3 "" H 3400 1350 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Q_NPN_BEC Q2
+L Device:Q_NPN_BEC Q2
 U 1 1 593936EC
 P 3400 1900
 F 0 "Q2" H 3600 1950 50  0000 L CNN
@@ -441,7 +411,7 @@ F 3 "" H 3400 1900 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Q_NPN_BEC Q3
+L Device:Q_NPN_BEC Q3
 U 1 1 593936F2
 P 3400 2450
 F 0 "Q3" H 3600 2500 50  0000 L CNN
@@ -452,7 +422,7 @@ F 3 "" H 3400 2450 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Q_NPN_BEC Q4
+L Device:Q_NPN_BEC Q4
 U 1 1 593936F8
 P 3400 3000
 F 0 "Q4" H 3600 3050 50  0000 L CNN
@@ -463,7 +433,7 @@ F 3 "" H 3400 3000 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Q_NPN_BEC Q5
+L Device:Q_NPN_BEC Q5
 U 1 1 593936FE
 P 3400 3550
 F 0 "Q5" H 3600 3600 50  0000 L CNN
@@ -474,7 +444,7 @@ F 3 "" H 3400 3550 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Q_NPN_BEC Q6
+L Device:Q_NPN_BEC Q6
 U 1 1 59393704
 P 3400 4100
 F 0 "Q6" H 3600 4150 50  0000 L CNN
@@ -485,7 +455,7 @@ F 3 "" H 3400 4100 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Q_NPN_BEC Q7
+L Device:Q_NPN_BEC Q7
 U 1 1 5939370A
 P 3400 4650
 F 0 "Q7" H 3600 4700 50  0000 L CNN
@@ -496,7 +466,7 @@ F 3 "" H 3400 4650 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Q_NPN_BEC Q8
+L Device:Q_NPN_BEC Q8
 U 1 1 59393710
 P 3400 5200
 F 0 "Q8" H 3600 5250 50  0000 L CNN
@@ -507,7 +477,7 @@ F 3 "" H 3400 5200 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Q_NPN_BEC Q9
+L Device:Q_NPN_BEC Q9
 U 1 1 59393716
 P 3400 5750
 F 0 "Q9" H 3600 5800 50  0000 L CNN
@@ -518,7 +488,7 @@ F 3 "" H 3400 5750 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Q_NPN_BEC Q10
+L Device:Q_NPN_BEC Q10
 U 1 1 5939371C
 P 3400 6300
 F 0 "Q10" H 3600 6350 50  0000 L CNN
@@ -1433,7 +1403,7 @@ GND
 Text Label 2150 7400 2    60   ~ 0
 ANODE
 $Comp
-L PCA9685 U1
+L Custom_Parts:PCA9685 U1
 U 1 1 593A4DD3
 P 9850 1650
 F 0 "U1" H 9850 1600 60  0000 C CNN
@@ -1444,7 +1414,7 @@ F 3 "" H 9850 1650 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L PCA9685 U2
+L Custom_Parts:PCA9685 U2
 U 1 1 593A4ED6
 P 9850 3450
 F 0 "U2" H 9850 3400 60  0000 C CNN
@@ -1455,7 +1425,7 @@ F 3 "" H 9850 3450 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L PCA9685 U3
+L Custom_Parts:PCA9685 U3
 U 1 1 593A4FC1
 P 9850 5250
 F 0 "U3" H 9850 5200 60  0000 C CNN
@@ -1476,7 +1446,7 @@ VDD
 Text Label 11550 1100 0    60   ~ 0
 GND
 $Comp
-L Q_NPN_BEC Q41
+L Device:Q_NPN_BEC Q41
 U 1 1 593B48A7
 P 12100 4350
 F 0 "Q41" H 12300 4400 50  0000 L CNN
@@ -1491,7 +1461,7 @@ ANODE
 Text Label 12600 4050 0    60   ~ 0
 GND
 $Comp
-L IN-3 T5
+L Custom_Parts:IN-3 T5
 U 1 1 593B460C
 P 12250 3500
 F 0 "T5" H 12250 3600 60  0000 C CNN
@@ -1526,7 +1496,7 @@ Entry Wire Line
 Entry Wire Line
 	4900 6750 5000 6650
 $Comp
-L R R1
+L Device:R R1
 U 1 1 593D252E
 P 2950 7250
 F 0 "R1" V 2950 7250 50  0000 C CNN
@@ -1537,7 +1507,7 @@ F 3 "" H 2950 7250 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R2
+L Device:R R2
 U 1 1 593D296E
 P 3050 7250
 F 0 "R2" V 3050 7250 50  0000 C CNN
@@ -1548,7 +1518,7 @@ F 3 "" H 3050 7250 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R3
+L Device:R R3
 U 1 1 593D2A32
 P 3150 7250
 F 0 "R3" V 3150 7250 50  0000 C CNN
@@ -1559,7 +1529,7 @@ F 3 "" H 3150 7250 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R4
+L Device:R R4
 U 1 1 593D2AF9
 P 3250 7250
 F 0 "R4" V 3250 7250 50  0000 C CNN
@@ -1570,7 +1540,7 @@ F 3 "" H 3250 7250 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R5
+L Device:R R5
 U 1 1 593D2BC7
 P 3350 7250
 F 0 "R5" V 3350 7250 50  0000 C CNN
@@ -1581,7 +1551,7 @@ F 3 "" H 3350 7250 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R6
+L Device:R R6
 U 1 1 593D2CD3
 P 3450 7250
 F 0 "R6" V 3450 7250 50  0000 C CNN
@@ -1592,7 +1562,7 @@ F 3 "" H 3450 7250 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R7
+L Device:R R7
 U 1 1 593D2DA3
 P 3550 7250
 F 0 "R7" V 3550 7250 50  0000 C CNN
@@ -1603,7 +1573,7 @@ F 3 "" H 3550 7250 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R8
+L Device:R R8
 U 1 1 593D2E76
 P 3650 7250
 F 0 "R8" V 3650 7250 50  0000 C CNN
@@ -1614,7 +1584,7 @@ F 3 "" H 3650 7250 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R9
+L Device:R R9
 U 1 1 593D2F4C
 P 3750 7250
 F 0 "R9" V 3750 7250 50  0000 C CNN
@@ -1625,7 +1595,7 @@ F 3 "" H 3750 7250 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R10
+L Device:R R10
 U 1 1 593D3025
 P 3850 7250
 F 0 "R10" V 3850 7250 50  0000 C CNN
@@ -1636,7 +1606,7 @@ F 3 "" H 3850 7250 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R11
+L Device:R R11
 U 1 1 593D3315
 P 4300 7250
 F 0 "R11" V 4300 7250 50  0000 C CNN
@@ -1647,7 +1617,7 @@ F 3 "" H 4300 7250 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R12
+L Device:R R12
 U 1 1 593D331B
 P 4400 7250
 F 0 "R12" V 4400 7250 50  0000 C CNN
@@ -1658,7 +1628,7 @@ F 3 "" H 4400 7250 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R13
+L Device:R R13
 U 1 1 593D3321
 P 4500 7250
 F 0 "R13" V 4500 7250 50  0000 C CNN
@@ -1669,7 +1639,7 @@ F 3 "" H 4500 7250 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R14
+L Device:R R14
 U 1 1 593D3327
 P 4600 7250
 F 0 "R14" V 4600 7250 50  0000 C CNN
@@ -1680,7 +1650,7 @@ F 3 "" H 4600 7250 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R15
+L Device:R R15
 U 1 1 593D332D
 P 4700 7250
 F 0 "R15" V 4700 7250 50  0000 C CNN
@@ -1691,7 +1661,7 @@ F 3 "" H 4700 7250 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R16
+L Device:R R16
 U 1 1 593D3333
 P 4800 7250
 F 0 "R16" V 4800 7250 50  0000 C CNN
@@ -1702,7 +1672,7 @@ F 3 "" H 4800 7250 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R17
+L Device:R R17
 U 1 1 593D3339
 P 4900 7250
 F 0 "R17" V 4900 7250 50  0000 C CNN
@@ -1713,7 +1683,7 @@ F 3 "" H 4900 7250 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R18
+L Device:R R18
 U 1 1 593D333F
 P 5000 7250
 F 0 "R18" V 5000 7250 50  0000 C CNN
@@ -1724,7 +1694,7 @@ F 3 "" H 5000 7250 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R19
+L Device:R R19
 U 1 1 593D3345
 P 5100 7250
 F 0 "R19" V 5100 7250 50  0000 C CNN
@@ -1735,7 +1705,7 @@ F 3 "" H 5100 7250 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R20
+L Device:R R20
 U 1 1 593D334B
 P 5200 7250
 F 0 "R20" V 5200 7250 50  0000 C CNN
@@ -1746,7 +1716,7 @@ F 3 "" H 5200 7250 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R21
+L Device:R R21
 U 1 1 593D3543
 P 5650 7250
 F 0 "R21" V 5650 7250 50  0000 C CNN
@@ -1757,7 +1727,7 @@ F 3 "" H 5650 7250 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R22
+L Device:R R22
 U 1 1 593D3549
 P 5750 7250
 F 0 "R22" V 5750 7250 50  0000 C CNN
@@ -1768,7 +1738,7 @@ F 3 "" H 5750 7250 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R23
+L Device:R R23
 U 1 1 593D354F
 P 5850 7250
 F 0 "R23" V 5850 7250 50  0000 C CNN
@@ -1779,7 +1749,7 @@ F 3 "" H 5850 7250 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R24
+L Device:R R24
 U 1 1 593D3555
 P 5950 7250
 F 0 "R24" V 5950 7250 50  0000 C CNN
@@ -1790,7 +1760,7 @@ F 3 "" H 5950 7250 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R25
+L Device:R R25
 U 1 1 593D355B
 P 6050 7250
 F 0 "R25" V 6050 7250 50  0000 C CNN
@@ -1801,7 +1771,7 @@ F 3 "" H 6050 7250 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R26
+L Device:R R26
 U 1 1 593D3561
 P 6150 7250
 F 0 "R26" V 6150 7250 50  0000 C CNN
@@ -1812,7 +1782,7 @@ F 3 "" H 6150 7250 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R27
+L Device:R R27
 U 1 1 593D3567
 P 6250 7250
 F 0 "R27" V 6250 7250 50  0000 C CNN
@@ -1823,7 +1793,7 @@ F 3 "" H 6250 7250 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R28
+L Device:R R28
 U 1 1 593D356D
 P 6350 7250
 F 0 "R28" V 6350 7250 50  0000 C CNN
@@ -1834,7 +1804,7 @@ F 3 "" H 6350 7250 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R29
+L Device:R R29
 U 1 1 593D3573
 P 6450 7250
 F 0 "R29" V 6450 7250 50  0000 C CNN
@@ -1845,7 +1815,7 @@ F 3 "" H 6450 7250 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R30
+L Device:R R30
 U 1 1 593D3579
 P 6550 7250
 F 0 "R30" V 6550 7250 50  0000 C CNN
@@ -1856,7 +1826,7 @@ F 3 "" H 6550 7250 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R31
+L Device:R R31
 U 1 1 593D3771
 P 7000 7250
 F 0 "R31" V 7000 7250 50  0000 C CNN
@@ -1867,7 +1837,7 @@ F 3 "" H 7000 7250 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R32
+L Device:R R32
 U 1 1 593D3777
 P 7100 7250
 F 0 "R32" V 7100 7250 50  0000 C CNN
@@ -1878,7 +1848,7 @@ F 3 "" H 7100 7250 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R33
+L Device:R R33
 U 1 1 593D377D
 P 7200 7250
 F 0 "R33" V 7200 7250 50  0000 C CNN
@@ -1889,7 +1859,7 @@ F 3 "" H 7200 7250 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R34
+L Device:R R34
 U 1 1 593D3783
 P 7300 7250
 F 0 "R34" V 7300 7250 50  0000 C CNN
@@ -1900,7 +1870,7 @@ F 3 "" H 7300 7250 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R35
+L Device:R R35
 U 1 1 593D3789
 P 7400 7250
 F 0 "R35" V 7400 7250 50  0000 C CNN
@@ -1911,7 +1881,7 @@ F 3 "" H 7400 7250 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R36
+L Device:R R36
 U 1 1 593D378F
 P 7500 7250
 F 0 "R36" V 7500 7250 50  0000 C CNN
@@ -1922,7 +1892,7 @@ F 3 "" H 7500 7250 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R37
+L Device:R R37
 U 1 1 593D3795
 P 7600 7250
 F 0 "R37" V 7600 7250 50  0000 C CNN
@@ -1933,7 +1903,7 @@ F 3 "" H 7600 7250 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R38
+L Device:R R38
 U 1 1 593D379B
 P 7700 7250
 F 0 "R38" V 7700 7250 50  0000 C CNN
@@ -1944,7 +1914,7 @@ F 3 "" H 7700 7250 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R39
+L Device:R R39
 U 1 1 593D37A1
 P 7800 7250
 F 0 "R39" V 7800 7250 50  0000 C CNN
@@ -1955,7 +1925,7 @@ F 3 "" H 7800 7250 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R40
+L Device:R R40
 U 1 1 593D37A7
 P 7900 7250
 F 0 "R40" V 7900 7250 50  0000 C CNN
@@ -1976,7 +1946,7 @@ Entry Wire Line
 Entry Wire Line
 	8250 5000 8350 5100
 $Comp
-L C_Small C1
+L Device:C_Small C1
 U 1 1 5948AC88
 P 11400 2250
 F 0 "C1" H 11410 2320 50  0000 L CNN
@@ -1987,7 +1957,7 @@ F 3 "" H 11400 2250 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_Small C2
+L Device:C_Small C2
 U 1 1 5948AFF9
 P 11400 4050
 F 0 "C2" H 11410 4120 50  0000 L CNN
@@ -1998,7 +1968,7 @@ F 3 "" H 11400 4050 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_Small C3
+L Device:C_Small C3
 U 1 1 5948B9CD
 P 11400 5850
 F 0 "C3" H 11410 5920 50  0000 L CNN
@@ -2009,7 +1979,7 @@ F 3 "" H 11400 5850 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R41
+L Device:R R41
 U 1 1 593DC6D8
 P 12600 4350
 F 0 "R41" V 12600 4350 50  0000 C CNN
@@ -2020,17 +1990,6 @@ F 3 "" H 12600 4350 50  0001 C CNN
 	-1   0    0    1   
 $EndComp
 NoConn ~ 9050 2700
-$Comp
-L Conn_02x03_Odd_Even J1
-U 1 1 5A76F6E9
-P 12400 1400
-F 0 "J1" H 12450 1600 50  0000 C CNN
-F 1 "Conn_02x03_Odd_Even" H 12450 1200 50  0000 C CNN
-F 2 "" H 12400 1400 50  0001 C CNN
-F 3 "" H 12400 1400 50  0001 C CNN
-	1    12400 1400
-	1    0    0    -1  
-$EndComp
 Text Label 12700 1400 0    60   ~ 0
 SCL
 Text Label 12700 1500 0    60   ~ 0
@@ -2043,17 +2002,6 @@ Text Label 12700 1300 0    60   ~ 0
 GND
 Text Label 12200 1400 2    60   ~ 0
 GND
-$Comp
-L Conn_02x03_Odd_Even J2
-U 1 1 5A772FBC
-P 12400 1950
-F 0 "J2" H 12450 2150 50  0000 C CNN
-F 1 "Conn_02x03_Odd_Even" H 12450 1750 50  0000 C CNN
-F 2 "" H 12400 1950 50  0001 C CNN
-F 3 "" H 12400 1950 50  0001 C CNN
-	1    12400 1950
-	1    0    0    -1  
-$EndComp
 Text Label 12200 2050 2    60   ~ 0
 ANODE
 Text Label 12700 2050 0    60   ~ 0
@@ -2092,13 +2040,13 @@ Wire Wire Line
 	8350 1900 9050 1900
 Connection ~ 11250 5850
 Wire Wire Line
-	10650 5950 11400 5950
+	10650 5950 11250 5950
 Connection ~ 11250 4150
 Wire Wire Line
-	10650 4150 11400 4150
+	10650 4150 11250 4150
 Connection ~ 11250 2350
 Wire Wire Line
-	10650 2350 11400 2350
+	10650 2350 11250 2350
 Connection ~ 11250 4700
 Wire Wire Line
 	11250 4700 10650 4700
@@ -2220,17 +2168,11 @@ Wire Wire Line
 Connection ~ 3050 7500
 Wire Wire Line
 	3150 7500 3150 7400
-Wire Bus Line
-	6800 1250 6800 7800
-Wire Bus Line
-	5450 1250 5450 7700
-Wire Bus Line
-	4100 1250 4100 7600
 Wire Wire Line
 	12200 3850 12200 4150
 Connection ~ 11250 1550
 Wire Wire Line
-	10650 1100 11550 1100
+	10650 1100 11250 1100
 Connection ~ 11150 1450
 Wire Wire Line
 	11150 1000 11550 1000
@@ -2303,25 +2245,25 @@ Wire Wire Line
 Wire Wire Line
 	11250 4050 10650 4050
 Wire Wire Line
-	11250 1100 11250 5950
+	11250 1100 11250 1550
 Wire Wire Line
 	11250 5850 10650 5850
 Connection ~ 11150 3950
 Wire Wire Line
-	10650 5750 11400 5750
+	10650 5750 11150 5750
 Wire Wire Line
-	10650 3950 11400 3950
+	10650 3950 11150 3950
 Wire Wire Line
-	11150 1000 11150 5750
+	11150 1000 11150 1450
 Wire Wire Line
-	10650 2150 11400 2150
+	10650 2150 11150 2150
 Connection ~ 11050 3100
 Wire Wire Line
 	11050 4900 10650 4900
 Wire Wire Line
 	11050 3100 10650 3100
 Wire Wire Line
-	11050 900  11050 4900
+	11050 900  11050 1300
 Wire Wire Line
 	10650 1300 11050 1300
 Connection ~ 10950 3000
@@ -2330,7 +2272,7 @@ Wire Wire Line
 Wire Wire Line
 	10950 3000 10650 3000
 Wire Wire Line
-	10950 800  10950 4800
+	10950 800  10950 1200
 Wire Wire Line
 	10950 4800 10650 4800
 Connection ~ 10850 2800
@@ -2339,11 +2281,9 @@ Wire Wire Line
 Wire Wire Line
 	10850 1000 10650 1000
 Wire Wire Line
-	10850 700  10850 4600
+	10850 700  10850 1000
 Wire Wire Line
 	10850 4600 10650 4600
-Wire Bus Line
-	8250 650  8250 5900
 Wire Bus Line
 	2850 650  8250 650 
 Connection ~ 2750 6650
@@ -2438,7 +2378,7 @@ Wire Wire Line
 Wire Wire Line
 	3500 1150 4000 1150
 Wire Wire Line
-	2750 2000 2750 7400
+	2750 2000 2750 3550
 Wire Bus Line
 	8150 7900 2350 7900
 Wire Bus Line
@@ -2447,14 +2387,6 @@ Wire Bus Line
 	5450 7700 2550 7700
 Wire Bus Line
 	4100 7600 2650 7600
-Wire Bus Line
-	2350 7900 2350 5650
-Wire Bus Line
-	2450 7800 2450 4100
-Wire Bus Line
-	2550 7700 2550 2550
-Wire Bus Line
-	2650 7600 2650 1000
 Wire Wire Line
 	1900 3350 2450 3350
 Wire Wire Line
@@ -2535,14 +2467,6 @@ Wire Wire Line
 	1900 1000 2550 1000
 Wire Wire Line
 	1900 900  2550 900 
-Wire Bus Line
-	2850 650  2850 6200
-Wire Bus Line
-	4200 750  4200 6200
-Wire Bus Line
-	5550 850  5550 6200
-Wire Bus Line
-	6900 950  6900 6200
 Wire Wire Line
 	7250 1350 7000 1350
 Wire Wire Line
@@ -2665,10 +2589,6 @@ Wire Wire Line
 	8350 1000 9050 1000
 Wire Wire Line
 	8350 900  9050 900 
-Wire Bus Line
-	3950 6650 3950 1650
-Wire Bus Line
-	3050 6650 3950 6650
 Wire Wire Line
 	4300 7100 4300 6750
 Wire Wire Line
@@ -2769,8 +2689,6 @@ Wire Wire Line
 	4850 5950 5200 5950
 Wire Wire Line
 	4850 6500 5200 6500
-Wire Bus Line
-	5300 6650 5300 1650
 Wire Wire Line
 	6200 1150 6700 1150
 Wire Wire Line
@@ -2811,10 +2729,6 @@ Wire Wire Line
 	6200 5950 6550 5950
 Wire Wire Line
 	6200 6500 6550 6500
-Wire Bus Line
-	6650 6650 6650 1650
-Wire Bus Line
-	8150 1250 8150 7900
 Wire Wire Line
 	7550 1150 8050 1150
 Wire Wire Line
@@ -2855,14 +2769,6 @@ Wire Wire Line
 	7550 5950 7900 5950
 Wire Wire Line
 	7550 6500 7900 6500
-Wire Bus Line
-	8000 6650 8000 1650
-Wire Bus Line
-	4400 6650 5300 6650
-Wire Bus Line
-	5750 6650 6650 6650
-Wire Bus Line
-	7100 6650 8000 6650
 Wire Bus Line
 	8250 950  6900 950 
 Wire Bus Line
@@ -2870,7 +2776,7 @@ Wire Bus Line
 Wire Bus Line
 	8250 750  4200 750 
 Wire Wire Line
-	2150 7500 7900 7500
+	2150 7500 2950 7500
 Wire Wire Line
 	2950 7500 2950 7400
 Wire Wire Line
@@ -2940,4 +2846,232 @@ Wire Wire Line
 	9000 4350 11900 4350
 Wire Wire Line
 	9000 4200 9000 4350
+Wire Wire Line
+	11250 5850 11250 5950
+Wire Wire Line
+	11250 4150 11400 4150
+Wire Wire Line
+	11250 4150 11250 4700
+Wire Wire Line
+	11250 2350 11400 2350
+Wire Wire Line
+	11250 2350 11250 2900
+Wire Wire Line
+	11250 4700 11250 5250
+Wire Wire Line
+	11250 2900 11250 3250
+Wire Wire Line
+	11250 1100 11550 1100
+Wire Wire Line
+	4300 7500 4400 7500
+Wire Wire Line
+	4400 7500 4500 7500
+Wire Wire Line
+	4500 7500 4600 7500
+Wire Wire Line
+	4600 7500 4700 7500
+Wire Wire Line
+	4700 7500 4800 7500
+Wire Wire Line
+	4800 7500 4900 7500
+Wire Wire Line
+	4900 7500 5000 7500
+Wire Wire Line
+	5000 7500 5100 7500
+Wire Wire Line
+	5100 7500 5200 7500
+Wire Wire Line
+	5200 7500 5650 7500
+Wire Wire Line
+	5650 7500 5750 7500
+Wire Wire Line
+	5750 7500 5850 7500
+Wire Wire Line
+	5850 7500 5950 7500
+Wire Wire Line
+	5950 7500 6050 7500
+Wire Wire Line
+	6050 7500 6150 7500
+Wire Wire Line
+	6150 7500 6250 7500
+Wire Wire Line
+	6250 7500 6350 7500
+Wire Wire Line
+	6350 7500 6450 7500
+Wire Wire Line
+	6450 7500 6550 7500
+Wire Wire Line
+	6550 7500 7000 7500
+Wire Wire Line
+	7000 7500 7100 7500
+Wire Wire Line
+	7100 7500 7200 7500
+Wire Wire Line
+	7200 7500 7300 7500
+Wire Wire Line
+	7300 7500 7400 7500
+Wire Wire Line
+	7400 7500 7500 7500
+Wire Wire Line
+	7500 7500 7600 7500
+Wire Wire Line
+	7600 7500 7700 7500
+Wire Wire Line
+	7700 7500 7800 7500
+Wire Wire Line
+	7800 7500 7900 7500
+Wire Wire Line
+	3850 7500 4300 7500
+Wire Wire Line
+	3750 7500 3850 7500
+Wire Wire Line
+	3650 7500 3750 7500
+Wire Wire Line
+	3550 7500 3650 7500
+Wire Wire Line
+	3450 7500 3550 7500
+Wire Wire Line
+	3350 7500 3450 7500
+Wire Wire Line
+	3250 7500 3350 7500
+Wire Wire Line
+	3150 7500 3250 7500
+Wire Wire Line
+	3050 7500 3150 7500
+Wire Wire Line
+	11250 1550 11250 1650
+Wire Wire Line
+	11150 1450 11150 2150
+Wire Wire Line
+	11050 1300 11050 3100
+Wire Wire Line
+	10950 1200 10950 3000
+Wire Wire Line
+	10850 1000 10850 2800
+Wire Wire Line
+	11150 5050 11150 5150
+Wire Wire Line
+	11150 5150 11150 5750
+Wire Wire Line
+	11250 5250 11250 5350
+Wire Wire Line
+	11250 5350 11250 5450
+Wire Wire Line
+	11250 5450 11250 5550
+Wire Wire Line
+	11250 5550 11250 5850
+Wire Wire Line
+	11250 3250 11250 3450
+Wire Wire Line
+	11150 3350 11150 3950
+Wire Wire Line
+	11250 3450 11250 3550
+Wire Wire Line
+	11250 3550 11250 3650
+Wire Wire Line
+	11250 3650 11250 3750
+Wire Wire Line
+	11250 3750 11250 4050
+Wire Wire Line
+	11150 2150 11400 2150
+Wire Wire Line
+	11150 2150 11150 3350
+Wire Wire Line
+	11250 1650 11250 1750
+Wire Wire Line
+	11250 1750 11250 1850
+Wire Wire Line
+	11250 1850 11250 1950
+Wire Wire Line
+	11250 1950 11250 2250
+Wire Wire Line
+	11250 2250 11250 2350
+Wire Wire Line
+	11250 4050 11250 4150
+Wire Wire Line
+	11150 3950 11400 3950
+Wire Wire Line
+	11150 3950 11150 5050
+Wire Wire Line
+	11050 3100 11050 4900
+Wire Wire Line
+	10950 3000 10950 4800
+Wire Wire Line
+	10850 2800 10850 4600
+Wire Wire Line
+	2750 6650 2750 7400
+Wire Wire Line
+	2750 3550 2750 5100
+Wire Wire Line
+	2750 5100 2750 6650
+Wire Wire Line
+	2950 7500 3050 7500
+Wire Wire Line
+	11150 5750 11400 5750
+Wire Wire Line
+	11250 5950 11400 5950
+Wire Bus Line
+	6800 1250 6800 7800
+Wire Bus Line
+	5450 1250 5450 7700
+Wire Bus Line
+	4100 1250 4100 7600
+Wire Bus Line
+	2850 650  2850 6200
+Wire Bus Line
+	4200 750  4200 6200
+Wire Bus Line
+	5550 850  5550 6200
+Wire Bus Line
+	6900 950  6900 6200
+Wire Bus Line
+	3950 1650 3950 6650
+Wire Bus Line
+	3050 6650 3950 6650
+Wire Bus Line
+	5300 1650 5300 6650
+Wire Bus Line
+	6650 1650 6650 6650
+Wire Bus Line
+	8150 1250 8150 7900
+Wire Bus Line
+	8000 1650 8000 6650
+Wire Bus Line
+	4400 6650 5300 6650
+Wire Bus Line
+	5750 6650 6650 6650
+Wire Bus Line
+	7100 6650 8000 6650
+Wire Bus Line
+	2350 5650 2350 7900
+Wire Bus Line
+	2450 4100 2450 7800
+Wire Bus Line
+	2550 2550 2550 7700
+Wire Bus Line
+	2650 1000 2650 7600
+Wire Bus Line
+	8250 650  8250 5900
+$Comp
+L Connector_Generic:Conn_02x03_Odd_Even J1
+U 1 1 5B59228D
+P 12400 1400
+F 0 "J1" H 12450 1717 50  0000 C CNN
+F 1 "Conn_02x03_Odd_Even" H 12450 1626 50  0000 C CNN
+F 2 "" H 12400 1400 50  0001 C CNN
+F 3 "~" H 12400 1400 50  0001 C CNN
+	1    12400 1400
+	1    0    0    -1  
+$EndComp
+$Comp
+L Connector_Generic:Conn_02x03_Odd_Even J2
+U 1 1 5B592538
+P 12400 1950
+F 0 "J2" H 12450 2267 50  0000 C CNN
+F 1 "Conn_02x03_Odd_Even" H 12450 2176 50  0000 C CNN
+F 2 "" H 12400 1950 50  0001 C CNN
+F 3 "~" H 12400 1950 50  0001 C CNN
+	1    12400 1950
+	1    0    0    -1  
+$EndComp
 $EndSCHEMATC

+ 2 - 0
Nixie_Top_Board/sym-lib-table

@@ -0,0 +1,2 @@
+(sym_lib_table
+)