Annotated and initial footprint selection

Nixie_Bottom_Board/hv_power_supply.bak

@@ -215,10 +215,10 @@ F 3 "" H 4350 4550 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDREF #PWR01
+L GNDREF #PWR27
 U 1 1 5A6CD5AE
 P 3950 3250
-F 0 "#PWR01" H 3950 3000 50  0001 C CNN
+F 0 "#PWR27" H 3950 3000 50  0001 C CNN
 F 1 "GNDREF" H 3950 3100 50  0000 C CNN
 F 2 "" H 3950 3250 50  0001 C CNN
 F 3 "" H 3950 3250 50  0001 C CNN
@@ -226,10 +226,10 @@ F 3 "" H 3950 3250 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDREF #PWR02
+L GNDREF #PWR26
 U 1 1 5A6CD8C1
 P 7750 2850
-F 0 "#PWR02" H 7750 2600 50  0001 C CNN
+F 0 "#PWR26" H 7750 2600 50  0001 C CNN
 F 1 "GNDREF" H 7750 2700 50  0000 C CNN
 F 2 "" H 7750 2850 50  0001 C CNN
 F 3 "" H 7750 2850 50  0001 C CNN
@@ -237,10 +237,10 @@ F 3 "" H 7750 2850 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDREF #PWR03
+L GNDREF #PWR29
 U 1 1 5A6D0882
 P 6350 4850
-F 0 "#PWR03" H 6350 4600 50  0001 C CNN
+F 0 "#PWR29" H 6350 4600 50  0001 C CNN
 F 1 "GNDREF" H 6350 4700 50  0000 C CNN
 F 2 "" H 6350 4850 50  0001 C CNN
 F 3 "" H 6350 4850 50  0001 C CNN
@@ -248,10 +248,10 @@ F 3 "" H 6350 4850 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDREF #PWR04
+L GNDREF #PWR28
 U 1 1 5A6D3815
 P 7800 3900
-F 0 "#PWR04" H 7800 3650 50  0001 C CNN
+F 0 "#PWR28" H 7800 3650 50  0001 C CNN
 F 1 "GNDREF" H 7800 3750 50  0000 C CNN
 F 2 "" H 7800 3900 50  0001 C CNN
 F 3 "" H 7800 3900 50  0001 C CNN

Nixie_Bottom_Board/hv_power_supply.sch

@@ -215,10 +215,10 @@ F 3 "" H 4350 4550 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDREF #PWR01
+L GNDREF #PWR026
 U 1 1 5A6CD5AE
 P 3950 3250
-F 0 "#PWR01" H 3950 3000 50  0001 C CNN
+F 0 "#PWR026" H 3950 3000 50  0001 C CNN
 F 1 "GNDREF" H 3950 3100 50  0000 C CNN
 F 2 "" H 3950 3250 50  0001 C CNN
 F 3 "" H 3950 3250 50  0001 C CNN
@@ -226,10 +226,10 @@ F 3 "" H 3950 3250 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDREF #PWR02
+L GNDREF #PWR027
 U 1 1 5A6CD8C1
 P 7750 2850
-F 0 "#PWR02" H 7750 2600 50  0001 C CNN
+F 0 "#PWR027" H 7750 2600 50  0001 C CNN
 F 1 "GNDREF" H 7750 2700 50  0000 C CNN
 F 2 "" H 7750 2850 50  0001 C CNN
 F 3 "" H 7750 2850 50  0001 C CNN
@@ -237,10 +237,10 @@ F 3 "" H 7750 2850 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDREF #PWR03
+L GNDREF #PWR028
 U 1 1 5A6D0882
 P 6350 4850
-F 0 "#PWR03" H 6350 4600 50  0001 C CNN
+F 0 "#PWR028" H 6350 4600 50  0001 C CNN
 F 1 "GNDREF" H 6350 4700 50  0000 C CNN
 F 2 "" H 6350 4850 50  0001 C CNN
 F 3 "" H 6350 4850 50  0001 C CNN
@@ -248,10 +248,10 @@ F 3 "" H 6350 4850 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDREF #PWR04
+L GNDREF #PWR029
 U 1 1 5A6D3815
 P 7800 3900
-F 0 "#PWR04" H 7800 3650 50  0001 C CNN
+F 0 "#PWR029" H 7800 3650 50  0001 C CNN
 F 1 "GNDREF" H 7800 3750 50  0000 C CNN
 F 2 "" H 7800 3900 50  0001 C CNN
 F 3 "" H 7800 3900 50  0001 C CNN

Nixie_Bottom_Board/nixie_bottom_board.bak

@@ -60,10 +60,10 @@ F5 "VOUT" I R 9900 3350 60
 F6 "GND" I R 9900 3450 60 
 $EndSheet
 $Comp
-L STM32L432K U?
+L STM32L432K U7
 U 1 1 5B073574
 P 4650 5850
-F 0 "U?" H 4650 6850 60  0000 C CNN
+F 0 "U7" H 4650 6850 60  0000 C CNN
 F 1 "STM32L432K" H 4650 6750 60  0000 C CNN
 F 2 "" H 4650 6300 60  0001 C CNN
 F 3 "" H 4650 6300 60  0001 C CNN
@@ -71,10 +71,10 @@ F 3 "" H 4650 6300 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L USB_C_Receptacle J?
+L USB_C_Receptacle J1
 U 1 1 5B07361E
 P 1350 2350
-F 0 "J?" H 950 3800 50  0000 L CNN
+F 0 "J1" H 950 3800 50  0000 L CNN
 F 1 "USB_C_Receptacle" H 1750 3800 50  0000 R CNN
 F 2 "" H 1500 2350 50  0001 C CNN
 F 3 "" H 1500 2350 50  0001 C CNN
@@ -82,10 +82,10 @@ F 3 "" H 1500 2350 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Crystal Y?
+L Crystal Y1
 U 1 1 5B073DBF
 P 3200 5050
-F 0 "Y?" H 3200 5200 50  0000 C CNN
+F 0 "Y1" H 3200 5200 50  0000 C CNN
 F 1 "32.78k" H 3200 4900 50  0000 C CNN
 F 2 "" H 3200 5050 50  0001 C CNN
 F 3 "" H 3200 5050 50  0001 C CNN
@@ -93,10 +93,10 @@ F 3 "" H 3200 5050 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_Small C?
+L C_Small C26
 U 1 1 5B073E81
 P 3450 4850
-F 0 "C?" H 3460 4920 50  0000 L CNN
+F 0 "C26" H 3460 4920 50  0000 L CNN
 F 1 "10pF" H 3460 4770 50  0000 L CNN
 F 2 "" H 3450 4850 50  0001 C CNN
 F 3 "" H 3450 4850 50  0001 C CNN
@@ -104,10 +104,10 @@ F 3 "" H 3450 4850 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_Small C?
+L C_Small C25
 U 1 1 5B073EE2
 P 2900 4850
-F 0 "C?" H 2910 4920 50  0000 L CNN
+F 0 "C25" H 2910 4920 50  0000 L CNN
 F 1 "10pF" H 2910 4770 50  0000 L CNN
 F 2 "" H 2900 4850 50  0001 C CNN
 F 3 "" H 2900 4850 50  0001 C CNN
@@ -115,10 +115,10 @@ F 3 "" H 2900 4850 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Conn_02x03_Odd_Even J?
+L Conn_02x03_Odd_Even J3
 U 1 1 5B0740EF
 P 1650 4800
-F 0 "J?" H 1700 5000 50  0000 C CNN
+F 0 "J3" H 1700 5000 50  0000 C CNN
 F 1 "Tag Connect" H 1700 4600 50  0000 C CNN
 F 2 "" H 1650 4800 50  0001 C CNN
 F 3 "" H 1650 4800 50  0001 C CNN
@@ -134,10 +134,10 @@ SWCLK
 Text Label 5350 5700 0    60   ~ 0
 SWO
 $Comp
-L Battery_Cell BT?
+L Battery_Cell BT1
 U 1 1 5B07444B
 P 8050 2550
-F 0 "BT?" H 8150 2650 50  0000 L CNN
+F 0 "BT1" H 8150 2650 50  0000 L CNN
 F 1 "BAT" H 8150 2550 50  0000 L CNN
 F 2 "" V 8050 2610 50  0001 C CNN
 F 3 "" V 8050 2610 50  0001 C CNN
@@ -155,10 +155,10 @@ NRST
 Text Label 2050 4900 0    60   ~ 0
 NRST
 $Comp
-L SW_Push SW?
+L SW_Push SW4
 U 1 1 5B07874F
 P 7750 5700
-F 0 "SW?" H 7800 5800 50  0000 L CNN
+F 0 "SW4" H 7800 5800 50  0000 L CNN
 F 1 "SW_Push" H 7750 5640 50  0000 C CNN
 F 2 "" H 7750 5900 50  0001 C CNN
 F 3 "" H 7750 5900 50  0001 C CNN
@@ -170,10 +170,10 @@ USB_DM
 Text Label 5350 6100 0    60   ~ 0
 USB_DP
 $Comp
-L Conn_02x03_Odd_Even J?
+L Conn_02x03_Odd_Even J7
 U 1 1 5B0794BA
 P 1650 5900
-F 0 "J?" H 1700 6100 50  0000 C CNN
+F 0 "J7" H 1700 6100 50  0000 C CNN
 F 1 "Nixie_CTRL" H 1700 5700 50  0000 C CNN
 F 2 "" H 1650 5900 50  0001 C CNN
 F 3 "" H 1650 5900 50  0001 C CNN
@@ -181,10 +181,10 @@ F 3 "" H 1650 5900 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Conn_02x03_Odd_Even J?
+L Conn_02x03_Odd_Even J4
 U 1 1 5B079514
 P 1650 5350
-F 0 "J?" H 1700 5550 50  0000 C CNN
+F 0 "J4" H 1700 5550 50  0000 C CNN
 F 1 "Nixie_HV" H 1700 5150 50  0000 C CNN
 F 2 "" H 1650 5350 50  0001 C CNN
 F 3 "" H 1650 5350 50  0001 C CNN
@@ -206,10 +206,10 @@ TSC_2
 Text Label 5350 5400 0    60   ~ 0
 TSC_3
 $Comp
-L C_Small C?
+L C_Small C28
 U 1 1 5B07ACF8
 P 9500 5100
-F 0 "C?" H 9510 5170 50  0000 L CNN
+F 0 "C28" H 9510 5170 50  0000 L CNN
 F 1 "C" H 9510 5020 50  0000 L CNN
 F 2 "" H 9500 5100 50  0001 C CNN
 F 3 "" H 9500 5100 50  0001 C CNN
@@ -217,10 +217,10 @@ F 3 "" H 9500 5100 50  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L Conn_01x01 J?
+L Conn_01x01 J5
 U 1 1 5B07B07C
 P 9850 5400
-F 0 "J?" H 9850 5500 50  0000 C CNN
+F 0 "J5" H 9850 5500 50  0000 C CNN
 F 1 "Conn_01x01" H 9850 5300 50  0000 C CNN
 F 2 "" H 9850 5400 50  0001 C CNN
 F 3 "" H 9850 5400 50  0001 C CNN
@@ -228,10 +228,10 @@ F 3 "" H 9850 5400 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Conn_01x01 J?
+L Conn_01x01 J6
 U 1 1 5B07B125
 P 9850 5700
-F 0 "J?" H 9850 5800 50  0000 C CNN
+F 0 "J6" H 9850 5800 50  0000 C CNN
 F 1 "Conn_01x01" H 9850 5600 50  0000 C CNN
 F 2 "" H 9850 5700 50  0001 C CNN
 F 3 "" H 9850 5700 50  0001 C CNN
@@ -239,10 +239,10 @@ F 3 "" H 9850 5700 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Conn_01x01 J?
+L Conn_01x01 J9
 U 1 1 5B07B186
 P 9850 6000
-F 0 "J?" H 9850 6100 50  0000 C CNN
+F 0 "J9" H 9850 6100 50  0000 C CNN
 F 1 "Conn_01x01" H 9850 5900 50  0000 C CNN
 F 2 "" H 9850 6000 50  0001 C CNN
 F 3 "" H 9850 6000 50  0001 C CNN
@@ -256,10 +256,10 @@ TSC_2
 Text Label 9250 5400 2    60   ~ 0
 TSC_3
 $Comp
-L R R?
+L R R17
 U 1 1 5B07B730
 P 9500 5400
-F 0 "R?" V 9580 5400 50  0000 C CNN
+F 0 "R17" V 9580 5400 50  0000 C CNN
 F 1 "1k" V 9400 5400 50  0000 C CNN
 F 2 "" V 9430 5400 50  0001 C CNN
 F 3 "" H 9500 5400 50  0001 C CNN
@@ -267,10 +267,10 @@ F 3 "" H 9500 5400 50  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L R R?
+L R R18
 U 1 1 5B07B7AC
 P 9500 5700
-F 0 "R?" V 9580 5700 50  0000 C CNN
+F 0 "R18" V 9580 5700 50  0000 C CNN
 F 1 "1k" V 9400 5700 50  0000 C CNN
 F 2 "" V 9430 5700 50  0001 C CNN
 F 3 "" H 9500 5700 50  0001 C CNN
@@ -278,10 +278,10 @@ F 3 "" H 9500 5700 50  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L R R?
+L R R19
 U 1 1 5B07B818
 P 9500 6000
-F 0 "R?" V 9580 6000 50  0000 C CNN
+F 0 "R19" V 9580 6000 50  0000 C CNN
 F 1 "1k" V 9400 6000 50  0000 C CNN
 F 2 "" V 9430 6000 50  0001 C CNN
 F 3 "" H 9500 6000 50  0001 C CNN
@@ -293,10 +293,10 @@ MCO
 Text Label 7600 6000 2    60   ~ 0
 MCO
 $Comp
-L Conn_01x01 J?
+L Conn_01x01 J8
 U 1 1 5B07BCB9
 P 7900 6000
-F 0 "J?" H 7900 6100 50  0000 C CNN
+F 0 "J8" H 7900 6100 50  0000 C CNN
 F 1 "Conn_01x01" H 7900 5900 50  0000 C CNN
 F 2 "" H 7900 6000 50  0001 C CNN
 F 3 "" H 7900 6000 50  0001 C CNN
@@ -334,10 +334,10 @@ SW_2
 Text Label 6000 6500 0    60   ~ 0
 SAI_SCK
 $Comp
-L SW_Push SW?
+L SW_Push SW1
 U 1 1 5B07F81C
 P 7750 4800
-F 0 "SW?" H 7800 4900 50  0000 L CNN
+F 0 "SW1" H 7800 4900 50  0000 L CNN
 F 1 "SW_Push" H 7750 4740 50  0000 C CNN
 F 2 "" H 7750 5000 50  0001 C CNN
 F 3 "" H 7750 5000 50  0001 C CNN
@@ -349,10 +349,10 @@ SW_1
 Text Label 7450 5100 2    60   ~ 0
 SW_2
 $Comp
-L SW_Push SW?
+L SW_Push SW2
 U 1 1 5B07F979
 P 7750 5100
-F 0 "SW?" H 7800 5200 50  0000 L CNN
+F 0 "SW2" H 7800 5200 50  0000 L CNN
 F 1 "SW_Push" H 7750 5040 50  0000 C CNN
 F 2 "" H 7750 5300 50  0001 C CNN
 F 3 "" H 7750 5300 50  0001 C CNN
@@ -360,10 +360,10 @@ F 3 "" H 7750 5300 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L SW_Push SW?
+L SW_Push SW3
 U 1 1 5B07F9F1
 P 7750 5400
-F 0 "SW?" H 7800 5500 50  0000 L CNN
+F 0 "SW3" H 7800 5500 50  0000 L CNN
 F 1 "SW_Push" H 7750 5340 50  0000 C CNN
 F 2 "" H 7750 5600 50  0001 C CNN
 F 3 "" H 7750 5600 50  0001 C CNN
@@ -379,10 +379,10 @@ HV_EN
 Text Label 9250 5100 2    60   ~ 0
 TSC_4
 $Comp
-L R R?
+L R R16
 U 1 1 5B08854F
 P 5850 5200
-F 0 "R?" V 5930 5200 50  0000 C CNN
+F 0 "R16" V 5930 5200 50  0000 C CNN
 F 1 "1M" V 5750 5200 50  0000 C CNN
 F 2 "" V 5780 5200 50  0001 C CNN
 F 3 "" H 5850 5200 50  0001 C CNN
@@ -428,10 +428,10 @@ USB_DM
 Text Label 2050 2050 0    60   ~ 0
 USB_DP
 $Comp
-L TUSB320-RESCUE-nixie_bottom_board U?
+L TUSB320-RESCUE-nixie_bottom_board U4
 U 1 1 5B095CC9
 P 9950 2100
-F 0 "U?" H 9950 2550 60  0000 C CNN
+F 0 "U4" H 9950 2550 60  0000 C CNN
 F 1 "TUSB320" H 9950 2450 60  0000 C CNN
 F 2 "" H 10300 2100 60  0001 C CNN
 F 3 "" H 10300 2100 60  0001 C CNN
@@ -443,10 +443,10 @@ CC1_E
 Text Label 9400 1950 2    60   ~ 0
 CC2_E
 $Comp
-L R R?
+L R R9
 U 1 1 5B096154
 P 9350 2150
-F 0 "R?" V 9430 2150 50  0000 C CNN
+F 0 "R9" V 9430 2150 50  0000 C CNN
 F 1 "900k" V 9250 2150 50  0000 C CNN
 F 2 "" V 9280 2150 50  0001 C CNN
 F 3 "" H 9350 2150 50  0001 C CNN
@@ -460,10 +460,10 @@ SCL
 Text Label 10400 2350 0    60   ~ 0
 SDA
 $Comp
-L R R?
+L R R14
 U 1 1 5B0B7874
 P 9500 4500
-F 0 "R?" V 9580 4500 50  0000 C CNN
+F 0 "R14" V 9580 4500 50  0000 C CNN
 F 1 "10k" V 9400 4500 50  0000 C CNN
 F 2 "" V 9430 4500 50  0001 C CNN
 F 3 "" H 9500 4500 50  0001 C CNN
@@ -471,10 +471,10 @@ F 3 "" H 9500 4500 50  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L R R?
+L R R15
 U 1 1 5B0B79AE
 P 9500 4800
-F 0 "R?" V 9580 4800 50  0000 C CNN
+F 0 "R15" V 9580 4800 50  0000 C CNN
 F 1 "10k" V 9400 4800 50  0000 C CNN
 F 2 "" V 9430 4800 50  0001 C CNN
 F 3 "" H 9500 4800 50  0001 C CNN
@@ -486,10 +486,10 @@ SCL
 Text Label 9650 4800 0    60   ~ 0
 SDA
 $Comp
-L TPD8S300 U?
+L TPD8S300 U3
 U 1 1 5B0C3260
 P 3800 1850
-F 0 "U?" H 3800 2500 60  0000 C CNN
+F 0 "U3" H 3800 2500 60  0000 C CNN
 F 1 "TPD8S300" H 3800 2400 60  0000 C CNN
 F 2 "" H 3800 1850 60  0001 C CNN
 F 3 "" H 3800 1850 60  0001 C CNN
@@ -497,10 +497,10 @@ F 3 "" H 3800 1850 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_Small C?
+L C_Small C14
 U 1 1 5B0C425E
 P 2900 1850
-F 0 "C?" H 2910 1920 50  0000 L CNN
+F 0 "C14" H 2910 1920 50  0000 L CNN
 F 1 "100nF" H 2910 1770 50  0000 L CNN
 F 2 "" H 2900 1850 50  0001 C CNN
 F 3 "" H 2900 1850 50  0001 C CNN
@@ -530,10 +530,10 @@ SCL
 Text Label 6150 1750 2    60   ~ 0
 SDA
 $Comp
-L C_Small C?
+L C_Small C13
 U 1 1 5B0C2749
 P 7550 1650
-F 0 "C?" H 7560 1720 50  0000 L CNN
+F 0 "C13" H 7560 1720 50  0000 L CNN
 F 1 "47nF" H 7560 1570 50  0000 L CNN
 F 2 "" H 7550 1650 50  0001 C CNN
 F 3 "" H 7550 1650 50  0001 C CNN
@@ -541,10 +541,10 @@ F 3 "" H 7550 1650 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_Small C?
+L C_Small C12
 U 1 1 5B0C2BAC
 P 7800 1550
-F 0 "C?" H 7810 1620 50  0000 L CNN
+F 0 "C12" H 7810 1620 50  0000 L CNN
 F 1 "4.7uF" H 7810 1470 50  0000 L CNN
 F 2 "" H 7800 1550 50  0001 C CNN
 F 3 "" H 7800 1550 50  0001 C CNN
@@ -552,10 +552,10 @@ F 3 "" H 7800 1550 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_Small C?
+L C_Small C9
 U 1 1 5B0C33A4
 P 5850 1000
-F 0 "C?" H 5860 1070 50  0000 L CNN
+F 0 "C9" H 5860 1070 50  0000 L CNN
 F 1 "1uF" H 5860 920 50  0000 L CNN
 F 2 "" H 5850 1000 50  0001 C CNN
 F 3 "" H 5850 1000 50  0001 C CNN
@@ -563,10 +563,10 @@ F 3 "" H 5850 1000 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L LED D?
+L LED D3
 U 1 1 5B0C55EE
 P 5400 1550
-F 0 "D?" H 5400 1650 50  0000 C CNN
+F 0 "D3" H 5400 1650 50  0000 C CNN
 F 1 "LED" H 5400 1450 50  0000 C CNN
 F 2 "" H 5400 1550 50  0001 C CNN
 F 3 "" H 5400 1550 50  0001 C CNN
@@ -574,10 +574,10 @@ F 3 "" H 5400 1550 50  0001 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L R R?
+L R R7
 U 1 1 5B0C5697
 P 5700 1550
-F 0 "R?" V 5780 1550 50  0000 C CNN
+F 0 "R7" V 5780 1550 50  0000 C CNN
 F 1 "2.2k" V 5600 1550 50  0000 C CNN
 F 2 "" V 5630 1550 50  0001 C CNN
 F 3 "" H 5700 1550 50  0001 C CNN
@@ -587,10 +587,10 @@ $EndComp
 Text Label 5250 1550 2    60   ~ 0
 REGN
 $Comp
-L R R?
+L R R8
 U 1 1 5B0C68E7
 P 5450 2150
-F 0 "R?" V 5530 2150 50  0000 C CNN
+F 0 "R8" V 5530 2150 50  0000 C CNN
 F 1 "260" V 5350 2150 50  0000 C CNN
 F 2 "" V 5380 2150 50  0001 C CNN
 F 3 "" H 5450 2150 50  0001 C CNN
@@ -598,10 +598,10 @@ F 3 "" H 5450 2150 50  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L Thermistor TH?
+L Thermistor TH1
 U 1 1 5B0C6F00
 P 5850 2750
-F 0 "TH?" V 5950 2800 50  0000 C CNN
+F 0 "TH1" V 5950 2800 50  0000 C CNN
 F 1 "103AT" V 5750 2750 50  0000 C BNN
 F 2 "" H 5850 2750 50  0001 C CNN
 F 3 "" H 5850 2750 50  0001 C CNN
@@ -611,10 +611,10 @@ $EndComp
 Text Label 7150 1450 0    60   ~ 0
 REGN
 $Comp
-L R R?
+L R R11
 U 1 1 5B0C76F2
 P 5850 2450
-F 0 "R?" V 5930 2450 50  0000 C CNN
+F 0 "R11" V 5930 2450 50  0000 C CNN
 F 1 "30.31k" V 5750 2450 50  0000 C CNN
 F 2 "" V 5780 2450 50  0001 C CNN
 F 3 "" H 5850 2450 50  0001 C CNN
@@ -622,10 +622,10 @@ F 3 "" H 5850 2450 50  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L R R?
+L R R10
 U 1 1 5B0C7966
 P 5450 2450
-F 0 "R?" V 5530 2450 50  0000 C CNN
+F 0 "R10" V 5530 2450 50  0000 C CNN
 F 1 "5.24k" V 5350 2450 50  0000 C CNN
 F 2 "" V 5380 2450 50  0001 C CNN
 F 3 "" H 5450 2450 50  0001 C CNN
@@ -635,10 +635,10 @@ $EndComp
 Text Label 5250 2450 2    60   ~ 0
 REGN
 $Comp
-L C_Small C?
+L C_Small C11
 U 1 1 5B0CC3F6
 P 8050 1450
-F 0 "C?" H 8060 1520 50  0000 L CNN
+F 0 "C11" H 8060 1520 50  0000 L CNN
 F 1 "10uF" H 8060 1370 50  0000 L CNN
 F 2 "" H 8050 1450 50  0001 C CNN
 F 3 "" H 8050 1450 50  0001 C CNN
@@ -649,10 +649,10 @@ NoConn ~ 9500 2050
 Text Notes 9700 2500 0    60   ~ 0
 ADDR: 0x60
 $Comp
-L C_Small C?
+L C_Small C10
 U 1 1 5B0CEA4D
 P 8300 1350
-F 0 "C?" H 8310 1420 50  0000 L CNN
+F 0 "C10" H 8310 1420 50  0000 L CNN
 F 1 "47nF" H 8310 1270 50  0000 L CNN
 F 2 "" H 8300 1350 50  0001 C CNN
 F 3 "" H 8300 1350 50  0001 C CNN
@@ -660,10 +660,10 @@ F 3 "" H 8300 1350 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L L_Small L?
+L L_Small L1
 U 1 1 5B0DB40F
 P 7550 1950
-F 0 "L?" H 7580 1990 50  0000 L CNN
+F 0 "L1" H 7580 1990 50  0000 L CNN
 F 1 "1uH" H 7580 1910 50  0000 L CNN
 F 2 "" H 7550 1950 50  0001 C CNN
 F 3 "" H 7550 1950 50  0001 C CNN
@@ -671,10 +671,10 @@ F 3 "" H 7550 1950 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_Small C?
+L C_Small C15
 U 1 1 5B0DC42A
 P 7800 2000
-F 0 "C?" H 7810 2070 50  0000 L CNN
+F 0 "C15" H 7810 2070 50  0000 L CNN
 F 1 "10uF" H 7810 1920 50  0000 L CNN
 F 2 "" H 7800 2000 50  0001 C CNN
 F 3 "" H 7800 2000 50  0001 C CNN
@@ -682,10 +682,10 @@ F 3 "" H 7800 2000 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_Small C?
+L C_Small C16
 U 1 1 5B0DC519
 P 8050 2000
-F 0 "C?" H 8060 2070 50  0000 L CNN
+F 0 "C16" H 8060 2070 50  0000 L CNN
 F 1 "10uF" H 8060 1920 50  0000 L CNN
 F 2 "" H 8050 2000 50  0001 C CNN
 F 3 "" H 8050 2000 50  0001 C CNN
@@ -693,10 +693,10 @@ F 3 "" H 8050 2000 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_Small C?
+L C_Small C19
 U 1 1 5B0DFFED
 P 7250 2500
-F 0 "C?" H 7260 2570 50  0000 L CNN
+F 0 "C19" H 7260 2570 50  0000 L CNN
 F 1 "10uF" H 7260 2420 50  0000 L CNN
 F 2 "" H 7250 2500 50  0001 C CNN
 F 3 "" H 7250 2500 50  0001 C CNN
@@ -705,10 +705,10 @@ F 3 "" H 7250 2500 50  0001 C CNN
 $EndComp
 NoConn ~ 6150 2350
 $Comp
-L D_Small D?
+L D_Small D2
 U 1 1 5B0E1AC7
 P 5650 1250
-F 0 "D?" H 5600 1330 50  0000 L CNN
+F 0 "D2" H 5600 1330 50  0000 L CNN
 F 1 "ESD" H 5500 1170 50  0000 L CNN
 F 2 "" V 5650 1250 50  0001 C CNN
 F 3 "" V 5650 1250 50  0001 C CNN
@@ -748,10 +748,10 @@ VDD
 Text Label 9150 3350 2    60   ~ 0
 VLOAD
 $Comp
-L C_Small C?
+L C_Small C20
 U 1 1 5B1737BD
 P 4600 3500
-F 0 "C?" H 4610 3570 50  0000 L CNN
+F 0 "C20" H 4610 3570 50  0000 L CNN
 F 1 "10uF" H 4610 3420 50  0000 L CNN
 F 2 "" H 4600 3500 50  0001 C CNN
 F 3 "" H 4600 3500 50  0001 C CNN
@@ -759,10 +759,10 @@ F 3 "" H 4600 3500 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_Small C?
+L C_Small C24
 U 1 1 5B1732A3
 P 4350 3600
-F 0 "C?" H 4360 3670 50  0000 L CNN
+F 0 "C24" H 4360 3670 50  0000 L CNN
 F 1 "10uF" H 4360 3520 50  0000 L CNN
 F 2 "" H 4350 3600 50  0001 C CNN
 F 3 "" H 4350 3600 50  0001 C CNN
@@ -774,10 +774,10 @@ VDD
 Text Label 3200 4050 2    60   ~ 0
 VSYS
 $Comp
-L L_Small L?
+L L_Small L2
 U 1 1 5B16755A
 P 2800 3450
-F 0 "L?" H 2830 3490 50  0000 L CNN
+F 0 "L2" H 2830 3490 50  0000 L CNN
 F 1 "1uH" H 2830 3410 50  0000 L CNN
 F 2 "" H 2800 3450 50  0001 C CNN
 F 3 "" H 2800 3450 50  0001 C CNN
@@ -785,10 +785,10 @@ F 3 "" H 2800 3450 50  0001 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L TPS63025X U?
+L TPS63025X U5
 U 1 1 5B1672A1
 P 3750 3500
-F 0 "U?" H 3750 3900 60  0000 C CNN
+F 0 "U5" H 3750 3900 60  0000 C CNN
 F 1 "TPS63025X" H 3750 3800 60  0000 C CNN
 F 2 "" H 3750 3500 60  0001 C CNN
 F 3 "" H 3750 3500 60  0001 C CNN
@@ -796,10 +796,10 @@ F 3 "" H 3750 3500 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_Small C?
+L C_Small C17
 U 1 1 5B15DD3E
 P 8300 2000
-F 0 "C?" H 8310 2070 50  0000 L CNN
+F 0 "C17" H 8310 2070 50  0000 L CNN
 F 1 "1uF" H 8310 1920 50  0000 L CNN
 F 2 "" H 8300 2000 50  0001 C CNN
 F 3 "" H 8300 2000 50  0001 C CNN
@@ -809,10 +809,10 @@ $EndComp
 Text Label 5450 3650 2    60   ~ 0
 VSYS
 $Comp
-L L_Small L?
+L L_Small L3
 U 1 1 5B15730D
 P 5700 3550
-F 0 "L?" H 5730 3590 50  0000 L CNN
+F 0 "L3" H 5730 3590 50  0000 L CNN
 F 1 "1uH" H 5730 3510 50  0000 L CNN
 F 2 "" H 5700 3550 50  0001 C CNN
 F 3 "" H 5700 3550 50  0001 C CNN
@@ -820,10 +820,10 @@ F 3 "" H 5700 3550 50  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L TPS61235 U?
+L TPS61235 U6
 U 1 1 5B154033
 P 6350 3650
-F 0 "U?" H 6350 4050 60  0000 C CNN
+F 0 "U6" H 6350 4050 60  0000 C CNN
 F 1 "TPS61235" H 6350 3950 60  0000 C CNN
 F 2 "" H 6350 3650 60  0001 C CNN
 F 3 "" H 6350 3650 60  0001 C CNN
@@ -831,16 +831,16 @@ F 3 "" H 6350 3650 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 Text Label 6150 2050 2    60   ~ 0
-USB_nCE
+USB_CE
 Text Label 5350 5800 0    60   ~ 0
-USB_nCE
+USB_CE
 Text Notes 5500 4200 0    60   ~ 0
 Optional (can use VBUS from OTG instead)
 $Comp
-L Jumper_NC_Small JP?
+L Jumper_NC_Small JP2
 U 1 1 5B0D8B1E
 P 7700 3950
-F 0 "JP?" H 7700 4030 50  0000 C CNN
+F 0 "JP2" H 7700 4030 50  0000 C CNN
 F 1 "Jumper_5V" H 7710 3890 50  0000 C CNN
 F 2 "" H 7700 3950 50  0001 C CNN
 F 3 "" H 7700 3950 50  0001 C CNN
@@ -848,10 +848,10 @@ F 3 "" H 7700 3950 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L D_Small D?
+L D_Small D4
 U 1 1 5B0E37FA
 P 8700 3350
-F 0 "D?" H 8650 3430 50  0000 L CNN
+F 0 "D4" H 8650 3430 50  0000 L CNN
 F 1 "LOAD" H 8550 3270 50  0000 L CNN
 F 2 "" V 8700 3350 50  0001 C CNN
 F 3 "" V 8700 3350 50  0001 C CNN
@@ -861,10 +861,10 @@ $EndComp
 Text Label 8600 3350 2    60   ~ 0
 VBUS
 $Comp
-L TEST_2P J?
+L TEST_2P J2
 U 1 1 5B0E5826
 P 7700 2350
-F 0 "J?" H 7700 2410 50  0000 C CNN
+F 0 "J2" H 7700 2410 50  0000 C CNN
 F 1 "TEST_2P" H 7700 2280 50  0000 C CNN
 F 2 "" H 7700 2350 50  0001 C CNN
 F 3 "" H 7700 2350 50  0001 C CNN
@@ -872,10 +872,10 @@ F 3 "" H 7700 2350 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Conn_02x03_Odd_Even J?
+L Conn_02x03_Odd_Even J10
 U 1 1 5B0EA735
 P 1650 6600
-F 0 "J?" H 1700 6800 50  0000 C CNN
+F 0 "J10" H 1700 6800 50  0000 C CNN
 F 1 "Backlight" H 1700 6400 50  0000 C CNN
 F 2 "" H 1650 6600 50  0001 C CNN
 F 3 "" H 1650 6600 50  0001 C CNN
@@ -897,10 +897,10 @@ SDA
 Text Label 1350 6000 2    60   ~ 0
 GND
 $Comp
-L Jumper_NC_Small JP?
+L Jumper_NC_Small JP1
 U 1 1 5B0F1B1A
 P 7700 2650
-F 0 "JP?" H 7700 2730 50  0000 C CNN
+F 0 "JP1" H 7700 2730 50  0000 C CNN
 F 1 "Jumper_5V" H 7710 2590 50  0000 C CNN
 F 2 "" H 7700 2650 50  0001 C CNN
 F 3 "" H 7700 2650 50  0001 C CNN
@@ -910,10 +910,10 @@ $EndComp
 Text Label 7550 3350 0    60   ~ 0
 VLOAD
 $Comp
-L GNDREF #PWR?
+L GNDREF #PWR6
 U 1 1 5B0F40EF
 P 7350 1850
-F 0 "#PWR?" H 7350 1600 50  0001 C CNN
+F 0 "#PWR6" H 7350 1600 50  0001 C CNN
 F 1 "GNDREF" H 7350 1700 50  0000 C CNN
 F 2 "" H 7350 1850 50  0001 C CNN
 F 3 "" H 7350 1850 50  0001 C CNN
@@ -921,10 +921,10 @@ F 3 "" H 7350 1850 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDREF #PWR?
+L GNDREF #PWR5
 U 1 1 5B0F4F3F
 P 8400 1800
-F 0 "#PWR?" H 8400 1550 50  0001 C CNN
+F 0 "#PWR5" H 8400 1550 50  0001 C CNN
 F 1 "GNDREF" H 8400 1650 50  0000 C CNN
 F 2 "" H 8400 1800 50  0001 C CNN
 F 3 "" H 8400 1800 50  0001 C CNN
@@ -932,10 +932,10 @@ F 3 "" H 8400 1800 50  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GNDREF #PWR?
+L GNDREF #PWR1
 U 1 1 5B0F5B5A
 P 5850 900
-F 0 "#PWR?" H 5850 650 50  0001 C CNN
+F 0 "#PWR1" H 5850 650 50  0001 C CNN
 F 1 "GNDREF" H 5850 750 50  0000 C CNN
 F 2 "" H 5850 900 50  0001 C CNN
 F 3 "" H 5850 900 50  0001 C CNN
@@ -943,10 +943,10 @@ F 3 "" H 5850 900 50  0001 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L GNDREF #PWR?
+L GNDREF #PWR2
 U 1 1 5B0F5D11
 P 5550 1250
-F 0 "#PWR?" H 5550 1000 50  0001 C CNN
+F 0 "#PWR2" H 5550 1000 50  0001 C CNN
 F 1 "GNDREF" H 5550 1100 50  0000 C CNN
 F 2 "" H 5550 1250 50  0001 C CNN
 F 3 "" H 5550 1250 50  0001 C CNN
@@ -954,10 +954,10 @@ F 3 "" H 5550 1250 50  0001 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GNDREF #PWR?
+L GNDREF #PWR9
 U 1 1 5B0F610A
 P 5300 2150
-F 0 "#PWR?" H 5300 1900 50  0001 C CNN
+F 0 "#PWR9" H 5300 1900 50  0001 C CNN
 F 1 "GNDREF" H 5300 2000 50  0000 C CNN
 F 2 "" H 5300 2150 50  0001 C CNN
 F 3 "" H 5300 2150 50  0001 C CNN
@@ -965,10 +965,10 @@ F 3 "" H 5300 2150 50  0001 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GNDREF #PWR?
+L GNDREF #PWR14
 U 1 1 5B0F6B8D
 P 6050 2750
-F 0 "#PWR?" H 6050 2500 50  0001 C CNN
+F 0 "#PWR14" H 6050 2500 50  0001 C CNN
 F 1 "GNDREF" H 6050 2600 50  0000 C CNN
 F 2 "" H 6050 2750 50  0001 C CNN
 F 3 "" H 6050 2750 50  0001 C CNN
@@ -976,10 +976,10 @@ F 3 "" H 6050 2750 50  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GNDREF #PWR?
+L GNDREF #PWR12
 U 1 1 5B0F743C
 P 7250 2600
-F 0 "#PWR?" H 7250 2350 50  0001 C CNN
+F 0 "#PWR12" H 7250 2350 50  0001 C CNN
 F 1 "GNDREF" H 7250 2450 50  0000 C CNN
 F 2 "" H 7250 2600 50  0001 C CNN
 F 3 "" H 7250 2600 50  0001 C CNN
@@ -987,10 +987,10 @@ F 3 "" H 7250 2600 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDREF #PWR?
+L GNDREF #PWR13
 U 1 1 5B0F751C
 P 8050 2650
-F 0 "#PWR?" H 8050 2400 50  0001 C CNN
+F 0 "#PWR13" H 8050 2400 50  0001 C CNN
 F 1 "GNDREF" H 8050 2500 50  0000 C CNN
 F 2 "" H 8050 2650 50  0001 C CNN
 F 3 "" H 8050 2650 50  0001 C CNN
@@ -998,10 +998,10 @@ F 3 "" H 8050 2650 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDREF #PWR?
+L GNDREF #PWR22
 U 1 1 5B0F7D8E
 P 2050 4050
-F 0 "#PWR?" H 2050 3800 50  0001 C CNN
+F 0 "#PWR22" H 2050 3800 50  0001 C CNN
 F 1 "GNDREF" H 2050 3900 50  0000 C CNN
 F 2 "" H 2050 4050 50  0001 C CNN
 F 3 "" H 2050 4050 50  0001 C CNN
@@ -1009,10 +1009,10 @@ F 3 "" H 2050 4050 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDREF #PWR?
+L GNDREF #PWR18
 U 1 1 5B0F887D
 P 9050 3550
-F 0 "#PWR?" H 9050 3300 50  0001 C CNN
+F 0 "#PWR18" H 9050 3300 50  0001 C CNN
 F 1 "GNDREF" H 9050 3400 50  0000 C CNN
 F 2 "" H 9050 3550 50  0001 C CNN
 F 3 "" H 9050 3550 50  0001 C CNN
@@ -1020,10 +1020,10 @@ F 3 "" H 9050 3550 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDREF #PWR?
+L GNDREF #PWR17
 U 1 1 5B0F899A
 P 10100 3450
-F 0 "#PWR?" H 10100 3200 50  0001 C CNN
+F 0 "#PWR17" H 10100 3200 50  0001 C CNN
 F 1 "GNDREF" H 10100 3300 50  0000 C CNN
 F 2 "" H 10100 3450 50  0001 C CNN
 F 3 "" H 10100 3450 50  0001 C CNN
@@ -1031,10 +1031,10 @@ F 3 "" H 10100 3450 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDREF #PWR?
+L GNDREF #PWR20
 U 1 1 5B0F9A68
 P 4600 3800
-F 0 "#PWR?" H 4600 3550 50  0001 C CNN
+F 0 "#PWR20" H 4600 3550 50  0001 C CNN
 F 1 "GNDREF" H 4600 3650 50  0000 C CNN
 F 2 "" H 4600 3800 50  0001 C CNN
 F 3 "" H 4600 3800 50  0001 C CNN
@@ -1042,10 +1042,10 @@ F 3 "" H 4600 3800 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDREF #PWR?
+L GNDREF #PWR15
 U 1 1 5B0FA54E
 P 3000 3400
-F 0 "#PWR?" H 3000 3150 50  0001 C CNN
+F 0 "#PWR15" H 3000 3150 50  0001 C CNN
 F 1 "GNDREF" H 3000 3250 50  0000 C CNN
 F 2 "" H 3000 3400 50  0001 C CNN
 F 3 "" H 3000 3400 50  0001 C CNN
@@ -1053,10 +1053,10 @@ F 3 "" H 3000 3400 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L BQ25890 U?
+L BQ25890 U2
 U 1 1 5B0BF1F9
 P 6650 1800
-F 0 "U?" H 6650 2550 60  0000 C CNN
+F 0 "U2" H 6650 2550 60  0000 C CNN
 F 1 "BQ25890" H 6650 2450 60  0000 C CNN
 F 2 "" H 6650 1950 60  0001 C CNN
 F 3 "" H 6650 1950 60  0001 C CNN
@@ -1064,10 +1064,10 @@ F 3 "" H 6650 1950 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDREF #PWR?
+L GNDREF #PWR4
 U 1 1 5B102799
 P 4550 1800
-F 0 "#PWR?" H 4550 1550 50  0001 C CNN
+F 0 "#PWR4" H 4550 1550 50  0001 C CNN
 F 1 "GNDREF" H 4550 1650 50  0000 C CNN
 F 2 "" H 4550 1800 50  0001 C CNN
 F 3 "" H 4550 1800 50  0001 C CNN
@@ -1075,10 +1075,10 @@ F 3 "" H 4550 1800 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDREF #PWR?
+L GNDREF #PWR3
 U 1 1 5B102F6D
 P 3250 1400
-F 0 "#PWR?" H 3250 1150 50  0001 C CNN
+F 0 "#PWR3" H 3250 1150 50  0001 C CNN
 F 1 "GNDREF" H 3250 1250 50  0000 C CNN
 F 2 "" H 3250 1400 50  0001 C CNN
 F 3 "" H 3250 1400 50  0001 C CNN
@@ -1086,10 +1086,10 @@ F 3 "" H 3250 1400 50  0001 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L GNDREF #PWR?
+L GNDREF #PWR8
 U 1 1 5B1036C7
 P 2900 2100
-F 0 "#PWR?" H 2900 1850 50  0001 C CNN
+F 0 "#PWR8" H 2900 1850 50  0001 C CNN
 F 1 "GNDREF" H 2900 1950 50  0000 C CNN
 F 2 "" H 2900 2100 50  0001 C CNN
 F 3 "" H 2900 2100 50  0001 C CNN
@@ -1097,10 +1097,10 @@ F 3 "" H 2900 2100 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDREF #PWR?
+L GNDREF #PWR11
 U 1 1 5B1041C9
 P 3250 2550
-F 0 "#PWR?" H 3250 2300 50  0001 C CNN
+F 0 "#PWR11" H 3250 2300 50  0001 C CNN
 F 1 "GNDREF" H 3250 2400 50  0000 C CNN
 F 2 "" H 3250 2550 50  0001 C CNN
 F 3 "" H 3250 2550 50  0001 C CNN
@@ -1108,10 +1108,10 @@ F 3 "" H 3250 2550 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_Small C?
+L C_Small C18
 U 1 1 5B0C9515
 P 3250 2450
-F 0 "C?" H 3260 2520 50  0000 L CNN
+F 0 "C18" H 3260 2520 50  0000 L CNN
 F 1 "1uF" H 3260 2370 50  0000 L CNN
 F 2 "" H 3250 2450 50  0001 C CNN
 F 3 "" H 3250 2450 50  0001 C CNN
@@ -1119,10 +1119,10 @@ F 3 "" H 3250 2450 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDREF #PWR?
+L GNDREF #PWR10
 U 1 1 5B109387
 P 9500 2350
-F 0 "#PWR?" H 9500 2100 50  0001 C CNN
+F 0 "#PWR10" H 9500 2100 50  0001 C CNN
 F 1 "GNDREF" H 9500 2200 50  0000 C CNN
 F 2 "" H 9500 2350 50  0001 C CNN
 F 3 "" H 9500 2350 50  0001 C CNN
@@ -1130,10 +1130,10 @@ F 3 "" H 9500 2350 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDREF #PWR?
+L GNDREF #PWR7
 U 1 1 5B1097EC
 P 10600 1950
-F 0 "#PWR?" H 10600 1700 50  0001 C CNN
+F 0 "#PWR7" H 10600 1700 50  0001 C CNN
 F 1 "GNDREF" H 10600 1800 50  0000 C CNN
 F 2 "" H 10600 1950 50  0001 C CNN
 F 3 "" H 10600 1950 50  0001 C CNN
@@ -1141,10 +1141,10 @@ F 3 "" H 10600 1950 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDREF #PWR?
+L GNDREF #PWR19
 U 1 1 5B10C0F3
 P 7650 3650
-F 0 "#PWR?" H 7650 3400 50  0001 C CNN
+F 0 "#PWR19" H 7650 3400 50  0001 C CNN
 F 1 "GNDREF" H 7650 3500 50  0000 C CNN
 F 2 "" H 7650 3650 50  0001 C CNN
 F 3 "" H 7650 3650 50  0001 C CNN
@@ -1152,10 +1152,10 @@ F 3 "" H 7650 3650 50  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GNDREF #PWR?
+L GNDREF #PWR21
 U 1 1 5B11069C
 P 5900 3850
-F 0 "#PWR?" H 5900 3600 50  0001 C CNN
+F 0 "#PWR21" H 5900 3600 50  0001 C CNN
 F 1 "GNDREF" H 5900 3700 50  0000 C CNN
 F 2 "" H 5900 3850 50  0001 C CNN
 F 3 "" H 5900 3850 50  0001 C CNN
@@ -1163,10 +1163,10 @@ F 3 "" H 5900 3850 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDREF #PWR?
+L GNDREF #PWR16
 U 1 1 5B111393
 P 5900 3450
-F 0 "#PWR?" H 5900 3200 50  0001 C CNN
+F 0 "#PWR16" H 5900 3200 50  0001 C CNN
 F 1 "GNDREF" H 5900 3300 50  0000 C CNN
 F 2 "" H 5900 3450 50  0001 C CNN
 F 3 "" H 5900 3450 50  0001 C CNN
@@ -1174,10 +1174,10 @@ F 3 "" H 5900 3450 50  0001 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L R R?
+L R R12
 U 1 1 5B0D9940
 P 7350 3850
-F 0 "R?" V 7430 3850 50  0000 C CNN
+F 0 "R12" V 7430 3850 50  0000 C CNN
 F 1 "1M" V 7250 3850 50  0000 C CNN
 F 2 "" V 7280 3850 50  0001 C CNN
 F 3 "" H 7350 3850 50  0001 C CNN
@@ -1189,10 +1189,10 @@ HV_EN
 Text Label 6800 3850 0    60   ~ 0
 VLOAD
 $Comp
-L GNDREF #PWR?
+L GNDREF #PWR24
 U 1 1 5B11A43E
 P 5400 5100
-F 0 "#PWR?" H 5400 4850 50  0001 C CNN
+F 0 "#PWR24" H 5400 4850 50  0001 C CNN
 F 1 "GNDREF" H 5400 4950 50  0000 C CNN
 F 2 "" H 5400 5100 50  0001 C CNN
 F 3 "" H 5400 5100 50  0001 C CNN
@@ -1200,10 +1200,10 @@ F 3 "" H 5400 5100 50  0001 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L GNDREF #PWR?
+L GNDREF #PWR25
 U 1 1 5B11AD2A
 P 3900 6600
-F 0 "#PWR?" H 3900 6350 50  0001 C CNN
+F 0 "#PWR25" H 3900 6350 50  0001 C CNN
 F 1 "GNDREF" H 3900 6450 50  0000 C CNN
 F 2 "" H 3900 6600 50  0001 C CNN
 F 3 "" H 3900 6600 50  0001 C CNN
@@ -1211,10 +1211,10 @@ F 3 "" H 3900 6600 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDREF #PWR?
+L GNDREF #PWR23
 U 1 1 5B11DE34
 P 4050 4700
-F 0 "#PWR?" H 4050 4450 50  0001 C CNN
+F 0 "#PWR23" H 4050 4450 50  0001 C CNN
 F 1 "GNDREF" H 4050 4550 50  0000 C CNN
 F 2 "" H 4050 4700 50  0001 C CNN
 F 3 "" H 4050 4700 50  0001 C CNN
@@ -1222,10 +1222,10 @@ F 3 "" H 4050 4700 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_Small C?
+L C_Small C21
 U 1 1 5B134F37
 P 6950 3500
-F 0 "C?" H 6960 3570 50  0000 L CNN
+F 0 "C21" H 6960 3570 50  0000 L CNN
 F 1 "10uF" H 6960 3420 50  0000 L CNN
 F 2 "" H 6950 3500 50  0001 C CNN
 F 3 "" H 6950 3500 50  0001 C CNN
@@ -1233,10 +1233,10 @@ F 3 "" H 6950 3500 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_Small C?
+L C_Small C22
 U 1 1 5B1350D4
 P 7200 3500
-F 0 "C?" H 7210 3570 50  0000 L CNN
+F 0 "C22" H 7210 3570 50  0000 L CNN
 F 1 "10uF" H 7210 3420 50  0000 L CNN
 F 2 "" H 7200 3500 50  0001 C CNN
 F 3 "" H 7200 3500 50  0001 C CNN
@@ -1244,10 +1244,10 @@ F 3 "" H 7200 3500 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_Small C?
+L C_Small C23
 U 1 1 5B141DBB
 P 7450 3500
-F 0 "C?" H 7460 3570 50  0000 L CNN
+F 0 "C23" H 7460 3570 50  0000 L CNN
 F 1 "10uF" H 7460 3420 50  0000 L CNN
 F 2 "" H 7450 3500 50  0001 C CNN
 F 3 "" H 7450 3500 50  0001 C CNN
@@ -1255,10 +1255,10 @@ F 3 "" H 7450 3500 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_Small C?
+L C_Small C27
 U 1 1 5B143B7A
 P 3700 4850
-F 0 "C?" H 3710 4920 50  0000 L CNN
+F 0 "C27" H 3710 4920 50  0000 L CNN
 F 1 "1uF" H 3710 4770 50  0000 L CNN
 F 2 "" H 3700 4850 50  0001 C CNN
 F 3 "" H 3700 4850 50  0001 C CNN
@@ -1266,10 +1266,10 @@ F 3 "" H 3700 4850 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R?
+L R R13
 U 1 1 5B1468ED
 P 9500 4200
-F 0 "R?" V 9580 4200 50  0000 C CNN
+F 0 "R13" V 9580 4200 50  0000 C CNN
 F 1 "10k" V 9400 4200 50  0000 C CNN
 F 2 "" V 9430 4200 50  0001 C CNN
 F 3 "" H 9500 4200 50  0001 C CNN
@@ -1307,25 +1307,17 @@ Wire Wire Line
 Wire Wire Line
 	6800 3550 6800 3550
 Wire Wire Line
-	5450 3650 5550 3650
-Wire Wire Line
-	5550 3650 5900 3650
+	5450 3650 5900 3650
 Wire Wire Line
 	5900 3550 5800 3550
 Wire Wire Line
 	4200 3700 4200 3800
 Wire Wire Line
-	4200 3300 4350 3300
-Wire Wire Line
-	4350 3300 4600 3300
+	4200 3300 4600 3300
 Wire Wire Line
 	4200 3400 4200 3400
 Wire Wire Line
-	4200 3300 4200 3400
-Wire Wire Line
-	4200 3400 4200 3500
-Wire Wire Line
-	4200 3500 4200 3600
+	4200 3300 4200 3600
 Connection ~ 4200 3300
 Wire Wire Line
 	4200 3500 4200 3500
@@ -1341,29 +1333,19 @@ Connection ~ 4200 3800
 Connection ~ 4350 3800
 Connection ~ 4200 3500
 Wire Wire Line
-	7150 2350 7250 2350
-Wire Wire Line
-	7250 2350 7500 2350
+	7150 2350 7500 2350
 Connection ~ 8050 2150
 Connection ~ 2050 5350
 Wire Wire Line
-	2050 5250 2050 5350
-Wire Wire Line
-	2050 5350 2050 5450
+	2050 5250 2050 5450
 Connection ~ 1350 5350
 Wire Wire Line
-	1350 5250 1350 5350
-Wire Wire Line
-	1350 5350 1350 5450
+	1350 5250 1350 5450
 Connection ~ 2050 1050
 Connection ~ 2050 1150
 Connection ~ 2050 1250
 Wire Wire Line
-	2050 1050 2050 1150
-Wire Wire Line
-	2050 1150 2050 1250
-Wire Wire Line
-	2050 1250 2050 1350
+	2050 1050 2050 1350
 Connection ~ 2050 3650
 Connection ~ 2050 3550
 Connection ~ 2050 3350
@@ -1374,68 +1356,32 @@ Connection ~ 2050 2750
 Connection ~ 2050 2650
 Connection ~ 2050 2450
 Wire Wire Line
-	2050 4050 2050 3650
-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
+	2050 4050 2050 2350
 Connection ~ 4350 2000
 Connection ~ 4350 1900
 Connection ~ 4350 1700
 Connection ~ 4350 1800
 Wire Wire Line
-	4350 1600 4350 1700
-Wire Wire Line
-	4350 1700 4350 1800
-Wire Wire Line
-	4350 1800 4350 1900
-Wire Wire Line
-	4350 1900 4350 2000
-Wire Wire Line
-	4350 2000 4350 2100
+	4350 1600 4350 2100
 Connection ~ 3250 2100
 Wire Wire Line
 	3250 2100 3250 2200
 Connection ~ 10400 2050
 Wire Wire Line
-	10400 1950 10400 2050
-Wire Wire Line
-	10400 2050 10400 2150
+	10400 1950 10400 2150
 Wire Wire Line
 	7150 1850 7150 1950
 Connection ~ 5850 1250
 Wire Wire Line
-	5750 1250 5850 1250
+	5750 1250 6150 1250
 Wire Wire Line
-	5850 1250 6150 1250
-Wire Wire Line
-	8300 1450 8300 1800
-Wire Wire Line
-	8300 1800 8300 1900
+	8300 1450 8300 1900
 Connection ~ 8050 1800
 Connection ~ 7800 1800
 Wire Wire Line
-	8050 1550 8050 1800
-Wire Wire Line
-	8050 1800 8050 1900
-Wire Wire Line
-	7800 1650 7800 1800
+	8050 1550 8050 1900
 Wire Wire Line
-	7800 1800 7800 1900
+	7800 1650 7800 1900
 Connection ~ 7800 2150
 Wire Wire Line
 	7800 2150 7800 2100
@@ -1449,15 +1395,7 @@ Wire Wire Line
 	7150 1450 7800 1450
 Connection ~ 7550 2150
 Wire Wire Line
-	7150 2150 7550 2150
-Wire Wire Line
-	7550 2150 7800 2150
-Wire Wire Line
-	7800 2150 8050 2150
-Wire Wire Line
-	8050 2150 8300 2150
-Wire Wire Line
-	8300 2150 8450 2150
+	7150 2150 8450 2150
 Connection ~ 7150 2150
 Wire Wire Line
 	7150 2050 7150 2150
@@ -1480,15 +1418,11 @@ Connection ~ 5650 2450
 Wire Wire Line
 	5650 2250 6150 2250
 Wire Wire Line
-	5650 2250 5650 2450
-Wire Wire Line
-	5650 2450 5650 2750
+	5650 2250 5650 2750
 Wire Wire Line
 	5250 2450 5300 2450
 Wire Wire Line
-	5600 2450 5650 2450
-Wire Wire Line
-	5650 2450 5700 2450
+	5600 2450 5700 2450
 Wire Wire Line
 	5850 1550 6150 1550
 Wire Wire Line
@@ -1572,15 +1506,7 @@ Connection ~ 1450 4050
 Wire Wire Line
 	1350 4050 1350 3950
 Wire Wire Line
-	1050 4050 1150 4050
-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
+	1050 4050 2050 4050
 Wire Wire Line
 	1450 4050 1450 3950
 Wire Wire Line
@@ -1616,17 +1542,13 @@ Wire Wire Line
 Wire Wire Line
 	2050 1150 1950 1150
 Wire Wire Line
-	1950 1050 2050 1050
-Wire Wire Line
-	2050 1050 2150 1050
+	1950 1050 2150 1050
 Wire Wire Line
 	5350 5100 5400 5100
 Wire Wire Line
 	2050 5450 1950 5450
 Wire Wire Line
-	1950 5350 2050 5350
-Wire Wire Line
-	2050 5350 2150 5350
+	1950 5350 2150 5350
 Wire Wire Line
 	1950 5250 2050 5250
 Wire Wire Line
@@ -1700,9 +1622,7 @@ Wire Wire Line
 Wire Wire Line
 	1350 5250 1450 5250
 Wire Wire Line
-	1250 5350 1350 5350
-Wire Wire Line
-	1350 5350 1450 5350
+	1250 5350 1450 5350
 Wire Wire Line
 	1350 5450 1450 5450
 Wire Wire Line
@@ -1767,27 +1687,15 @@ Wire Wire Line
 	3950 5400 3950 5400
 Connection ~ 7150 1850
 Wire Wire Line
-	7800 1800 8050 1800
-Wire Wire Line
-	8050 1800 8300 1800
-Wire Wire Line
-	8300 1800 8400 1800
+	7800 1800 8400 1800
 Wire Wire Line
 	10100 3450 9900 3450
 Wire Wire Line
 	9250 3550 9050 3550
 Wire Wire Line
-	4200 3800 4350 3800
-Wire Wire Line
-	4350 3800 4600 3800
-Wire Wire Line
-	3300 3600 3300 3700
-Wire Wire Line
-	3300 3700 3300 3800
+	4200 3800 4600 3800
 Wire Wire Line
-	3300 3800 3300 3900
-Wire Wire Line
-	3300 3900 3300 4050
+	3300 3600 3300 4050
 Connection ~ 3300 3700
 Connection ~ 3300 3800
 Wire Wire Line
@@ -1807,9 +1715,7 @@ Wire Wire Line
 Wire Wire Line
 	4200 4050 4200 3900
 Wire Wire Line
-	3200 4050 3300 4050
-Wire Wire Line
-	3300 4050 4200 4050
+	3200 4050 4200 4050
 Connection ~ 3300 3900
 Wire Wire Line
 	7250 2350 7250 2400
@@ -1831,37 +1737,19 @@ Wire Wire Line
 Wire Wire Line
 	10400 1950 10600 1950
 Wire Wire Line
-	6800 3650 6950 3650
-Wire Wire Line
-	6950 3650 7200 3650
-Wire Wire Line
-	7200 3650 7450 3650
-Wire Wire Line
-	7450 3650 7550 3650
-Wire Wire Line
-	7550 3650 7650 3650
+	6800 3650 7650 3650
 Wire Wire Line
 	6800 3550 6800 3350
 Wire Wire Line
-	6800 3350 6950 3350
-Wire Wire Line
-	6950 3350 7200 3350
-Wire Wire Line
-	7200 3350 7450 3350
-Wire Wire Line
-	7450 3350 7550 3350
+	6800 3350 7550 3350
 Wire Wire Line
 	9150 3450 9250 3450
 Wire Wire Line
 	3900 6600 3950 6600
 Wire Wire Line
-	2900 4950 2900 5050
-Wire Wire Line
-	2900 5050 2900 5300
-Wire Wire Line
-	3450 4950 3450 5050
+	2900 4950 2900 5300
 Wire Wire Line
-	3450 5050 3450 5200
+	3450 4950 3450 5200
 Wire Wire Line
 	2900 5300 3950 5300
 Connection ~ 2900 5050
@@ -1900,9 +1788,7 @@ Wire Wire Line
 Wire Wire Line
 	7500 3850 7550 3850
 Wire Wire Line
-	7550 3650 7550 3850
-Wire Wire Line
-	7550 3850 7550 3950
+	7550 3650 7550 3950
 Wire Wire Line
 	7550 3950 7600 3950
 Connection ~ 7550 3850
@@ -1921,11 +1807,7 @@ Connection ~ 3300 4050
 Wire Wire Line
 	3700 4950 3700 5100
 Wire Wire Line
-	2900 4700 3450 4700
-Wire Wire Line
-	3450 4700 3700 4700
-Wire Wire Line
-	3700 4700 4050 4700
+	2900 4700 4050 4700
 Wire Wire Line
 	3700 4700 3700 4750
 Wire Wire Line

Nixie_Bottom_Board/nixie_bottom_board.sch

@@ -60,10 +60,10 @@ F5 "VOUT" I R 9900 3350 60
 F6 "GND" I R 9900 3450 60 
 $EndSheet
 $Comp
-L STM32L432K U?
+L STM32L432K U7
 U 1 1 5B073574
 P 4650 5850
-F 0 "U?" H 4650 6850 60  0000 C CNN
+F 0 "U7" H 4650 6850 60  0000 C CNN
 F 1 "STM32L432K" H 4650 6750 60  0000 C CNN
 F 2 "" H 4650 6300 60  0001 C CNN
 F 3 "" H 4650 6300 60  0001 C CNN
@@ -71,21 +71,21 @@ F 3 "" H 4650 6300 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L USB_C_Receptacle J?
+L USB_C_Receptacle J1
 U 1 1 5B07361E
 P 1350 2350
-F 0 "J?" H 950 3800 50  0000 L CNN
+F 0 "J1" H 950 3800 50  0000 L CNN
 F 1 "USB_C_Receptacle" H 1750 3800 50  0000 R CNN
-F 2 "" H 1500 2350 50  0001 C CNN
+F 2 "Connectors_USB:USB_C_Receptacle_Amphenol_12401548E4-2A" H 1500 2350 50  0001 C CNN
 F 3 "" H 1500 2350 50  0001 C CNN
 	1    1350 2350
 	1    0    0    -1  
 $EndComp
 $Comp
-L Crystal Y?
+L Crystal Y1
 U 1 1 5B073DBF
 P 3200 5050
-F 0 "Y?" H 3200 5200 50  0000 C CNN
+F 0 "Y1" H 3200 5200 50  0000 C CNN
 F 1 "32.78k" H 3200 4900 50  0000 C CNN
 F 2 "" H 3200 5050 50  0001 C CNN
 F 3 "" H 3200 5050 50  0001 C CNN
@@ -93,34 +93,34 @@ F 3 "" H 3200 5050 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_Small C?
+L C_Small C26
 U 1 1 5B073E81
 P 3450 4850
-F 0 "C?" H 3460 4920 50  0000 L CNN
+F 0 "C26" H 3460 4920 50  0000 L CNN
 F 1 "10pF" H 3460 4770 50  0000 L CNN
-F 2 "" H 3450 4850 50  0001 C CNN
+F 2 "Capacitors_SMD:C_0603" H 3450 4850 50  0001 C CNN
 F 3 "" H 3450 4850 50  0001 C CNN
 	1    3450 4850
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_Small C?
+L C_Small C25
 U 1 1 5B073EE2
 P 2900 4850
-F 0 "C?" H 2910 4920 50  0000 L CNN
+F 0 "C25" H 2910 4920 50  0000 L CNN
 F 1 "10pF" H 2910 4770 50  0000 L CNN
-F 2 "" H 2900 4850 50  0001 C CNN
+F 2 "Capacitors_SMD:C_0603" H 2900 4850 50  0001 C CNN
 F 3 "" H 2900 4850 50  0001 C CNN
 	1    2900 4850
 	1    0    0    -1  
 $EndComp
 $Comp
-L Conn_02x03_Odd_Even J?
+L Conn_02x03_Odd_Even J3
 U 1 1 5B0740EF
 P 1650 4800
-F 0 "J?" H 1700 5000 50  0000 C CNN
+F 0 "J3" H 1700 5000 50  0000 C CNN
 F 1 "Tag Connect" H 1700 4600 50  0000 C CNN
-F 2 "" H 1650 4800 50  0001 C CNN
+F 2 "Tag Connect:TC2030-MCP-NL" H 1650 4800 50  0001 C CNN
 F 3 "" H 1650 4800 50  0001 C CNN
 	1    1650 4800
 	1    0    0    -1  
@@ -134,12 +134,12 @@ SWCLK
 Text Label 5350 5700 0    60   ~ 0
 SWO
 $Comp
-L Battery_Cell BT?
+L Battery_Cell BT1
 U 1 1 5B07444B
 P 8050 2550
-F 0 "BT?" H 8150 2650 50  0000 L CNN
+F 0 "BT1" H 8150 2650 50  0000 L CNN
 F 1 "BAT" H 8150 2550 50  0000 L CNN
-F 2 "" V 8050 2610 50  0001 C CNN
+F 2 "Connectors_JST:JST_PH_S2B-PH-SM4-TB_02x2.00mm_Angled" V 8050 2610 50  0001 C CNN
 F 3 "" V 8050 2610 50  0001 C CNN
 	1    8050 2550
 	1    0    0    -1  
@@ -155,10 +155,10 @@ NRST
 Text Label 2050 4900 0    60   ~ 0
 NRST
 $Comp
-L SW_Push SW?
+L SW_Push SW4
 U 1 1 5B07874F
 P 7750 5700
-F 0 "SW?" H 7800 5800 50  0000 L CNN
+F 0 "SW4" H 7800 5800 50  0000 L CNN
 F 1 "SW_Push" H 7750 5640 50  0000 C CNN
 F 2 "" H 7750 5900 50  0001 C CNN
 F 3 "" H 7750 5900 50  0001 C CNN
@@ -170,23 +170,23 @@ USB_DM
 Text Label 5350 6100 0    60   ~ 0
 USB_DP
 $Comp
-L Conn_02x03_Odd_Even J?
+L Conn_02x03_Odd_Even J7
 U 1 1 5B0794BA
 P 1650 5900
-F 0 "J?" H 1700 6100 50  0000 C CNN
+F 0 "J7" H 1700 6100 50  0000 C CNN
 F 1 "Nixie_CTRL" H 1700 5700 50  0000 C CNN
-F 2 "" H 1650 5900 50  0001 C CNN
+F 2 "Custom Parts:Pin_Header_Straight_2x03_Pitch2.00mm" H 1650 5900 50  0001 C CNN
 F 3 "" H 1650 5900 50  0001 C CNN
 	1    1650 5900
 	1    0    0    -1  
 $EndComp
 $Comp
-L Conn_02x03_Odd_Even J?
+L Conn_02x03_Odd_Even J4
 U 1 1 5B079514
 P 1650 5350
-F 0 "J?" H 1700 5550 50  0000 C CNN
+F 0 "J4" H 1700 5550 50  0000 C CNN
 F 1 "Nixie_HV" H 1700 5150 50  0000 C CNN
-F 2 "" H 1650 5350 50  0001 C CNN
+F 2 "Custom Parts:Pin_Header_Straight_2x03_Pitch2.00mm" H 1650 5350 50  0001 C CNN
 F 3 "" H 1650 5350 50  0001 C CNN
 	1    1650 5350
 	1    0    0    -1  
@@ -206,21 +206,21 @@ TSC_2
 Text Label 5350 5400 0    60   ~ 0
 TSC_3
 $Comp
-L C_Small C?
+L C_Small C28
 U 1 1 5B07ACF8
 P 9500 5100
-F 0 "C?" H 9510 5170 50  0000 L CNN
+F 0 "C28" H 9510 5170 50  0000 L CNN
 F 1 "C" H 9510 5020 50  0000 L CNN
-F 2 "" H 9500 5100 50  0001 C CNN
+F 2 "Capacitors_SMD:C_0603" H 9500 5100 50  0001 C CNN
 F 3 "" H 9500 5100 50  0001 C CNN
 	1    9500 5100
 	0    -1   -1   0   
 $EndComp
 $Comp
-L Conn_01x01 J?
+L Conn_01x01 J5
 U 1 1 5B07B07C
 P 9850 5400
-F 0 "J?" H 9850 5500 50  0000 C CNN
+F 0 "J5" H 9850 5500 50  0000 C CNN
 F 1 "Conn_01x01" H 9850 5300 50  0000 C CNN
 F 2 "" H 9850 5400 50  0001 C CNN
 F 3 "" H 9850 5400 50  0001 C CNN
@@ -228,10 +228,10 @@ F 3 "" H 9850 5400 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Conn_01x01 J?
+L Conn_01x01 J6
 U 1 1 5B07B125
 P 9850 5700
-F 0 "J?" H 9850 5800 50  0000 C CNN
+F 0 "J6" H 9850 5800 50  0000 C CNN
 F 1 "Conn_01x01" H 9850 5600 50  0000 C CNN
 F 2 "" H 9850 5700 50  0001 C CNN
 F 3 "" H 9850 5700 50  0001 C CNN
@@ -239,10 +239,10 @@ F 3 "" H 9850 5700 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Conn_01x01 J?
+L Conn_01x01 J9
 U 1 1 5B07B186
 P 9850 6000
-F 0 "J?" H 9850 6100 50  0000 C CNN
+F 0 "J9" H 9850 6100 50  0000 C CNN
 F 1 "Conn_01x01" H 9850 5900 50  0000 C CNN
 F 2 "" H 9850 6000 50  0001 C CNN
 F 3 "" H 9850 6000 50  0001 C CNN
@@ -256,34 +256,34 @@ TSC_2
 Text Label 9250 5400 2    60   ~ 0
 TSC_3
 $Comp
-L R R?
+L R R17
 U 1 1 5B07B730
 P 9500 5400
-F 0 "R?" V 9580 5400 50  0000 C CNN
+F 0 "R17" V 9580 5400 50  0000 C CNN
 F 1 "1k" V 9400 5400 50  0000 C CNN
-F 2 "" V 9430 5400 50  0001 C CNN
+F 2 "Resistors_SMD:R_0603" V 9430 5400 50  0001 C CNN
 F 3 "" H 9500 5400 50  0001 C CNN
 	1    9500 5400
 	0    -1   -1   0   
 $EndComp
 $Comp
-L R R?
+L R R18
 U 1 1 5B07B7AC
 P 9500 5700
-F 0 "R?" V 9580 5700 50  0000 C CNN
+F 0 "R18" V 9580 5700 50  0000 C CNN
 F 1 "1k" V 9400 5700 50  0000 C CNN
-F 2 "" V 9430 5700 50  0001 C CNN
+F 2 "Resistors_SMD:R_0603" V 9430 5700 50  0001 C CNN
 F 3 "" H 9500 5700 50  0001 C CNN
 	1    9500 5700
 	0    -1   -1   0   
 $EndComp
 $Comp
-L R R?
+L R R19
 U 1 1 5B07B818
 P 9500 6000
-F 0 "R?" V 9580 6000 50  0000 C CNN
+F 0 "R19" V 9580 6000 50  0000 C CNN
 F 1 "1k" V 9400 6000 50  0000 C CNN
-F 2 "" V 9430 6000 50  0001 C CNN
+F 2 "Resistors_SMD:R_0603" V 9430 6000 50  0001 C CNN
 F 3 "" H 9500 6000 50  0001 C CNN
 	1    9500 6000
 	0    -1   -1   0   
@@ -293,10 +293,10 @@ MCO
 Text Label 7600 6000 2    60   ~ 0
 MCO
 $Comp
-L Conn_01x01 J?
+L Conn_01x01 J8
 U 1 1 5B07BCB9
 P 7900 6000
-F 0 "J?" H 7900 6100 50  0000 C CNN
+F 0 "J8" H 7900 6100 50  0000 C CNN
 F 1 "Conn_01x01" H 7900 5900 50  0000 C CNN
 F 2 "" H 7900 6000 50  0001 C CNN
 F 3 "" H 7900 6000 50  0001 C CNN
@@ -334,10 +334,10 @@ SW_2
 Text Label 6000 6500 0    60   ~ 0
 SAI_SCK
 $Comp
-L SW_Push SW?
+L SW_Push SW1
 U 1 1 5B07F81C
 P 7750 4800
-F 0 "SW?" H 7800 4900 50  0000 L CNN
+F 0 "SW1" H 7800 4900 50  0000 L CNN
 F 1 "SW_Push" H 7750 4740 50  0000 C CNN
 F 2 "" H 7750 5000 50  0001 C CNN
 F 3 "" H 7750 5000 50  0001 C CNN
@@ -349,10 +349,10 @@ SW_1
 Text Label 7450 5100 2    60   ~ 0
 SW_2
 $Comp
-L SW_Push SW?
+L SW_Push SW2
 U 1 1 5B07F979
 P 7750 5100
-F 0 "SW?" H 7800 5200 50  0000 L CNN
+F 0 "SW2" H 7800 5200 50  0000 L CNN
 F 1 "SW_Push" H 7750 5040 50  0000 C CNN
 F 2 "" H 7750 5300 50  0001 C CNN
 F 3 "" H 7750 5300 50  0001 C CNN
@@ -360,10 +360,10 @@ F 3 "" H 7750 5300 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L SW_Push SW?
+L SW_Push SW3
 U 1 1 5B07F9F1
 P 7750 5400
-F 0 "SW?" H 7800 5500 50  0000 L CNN
+F 0 "SW3" H 7800 5500 50  0000 L CNN
 F 1 "SW_Push" H 7750 5340 50  0000 C CNN
 F 2 "" H 7750 5600 50  0001 C CNN
 F 3 "" H 7750 5600 50  0001 C CNN
@@ -379,12 +379,12 @@ HV_EN
 Text Label 9250 5100 2    60   ~ 0
 TSC_4
 $Comp
-L R R?
+L R R16
 U 1 1 5B08854F
 P 5850 5200
-F 0 "R?" V 5930 5200 50  0000 C CNN
+F 0 "R16" V 5930 5200 50  0000 C CNN
 F 1 "1M" V 5750 5200 50  0000 C CNN
-F 2 "" V 5780 5200 50  0001 C CNN
+F 2 "Resistors_SMD:R_0603" V 5780 5200 50  0001 C CNN
 F 3 "" H 5850 5200 50  0001 C CNN
 	1    5850 5200
 	0    -1   -1   0   
@@ -428,10 +428,10 @@ USB_DM
 Text Label 2050 2050 0    60   ~ 0
 USB_DP
 $Comp
-L TUSB320-RESCUE-nixie_bottom_board U?
+L TUSB320-RESCUE-nixie_bottom_board U4
 U 1 1 5B095CC9
 P 9950 2100
-F 0 "U?" H 9950 2550 60  0000 C CNN
+F 0 "U4" H 9950 2550 60  0000 C CNN
 F 1 "TUSB320" H 9950 2450 60  0000 C CNN
 F 2 "" H 10300 2100 60  0001 C CNN
 F 3 "" H 10300 2100 60  0001 C CNN
@@ -443,12 +443,12 @@ CC1_E
 Text Label 9400 1950 2    60   ~ 0
 CC2_E
 $Comp
-L R R?
+L R R9
 U 1 1 5B096154
 P 9350 2150
-F 0 "R?" V 9430 2150 50  0000 C CNN
+F 0 "R9" V 9430 2150 50  0000 C CNN
 F 1 "900k" V 9250 2150 50  0000 C CNN
-F 2 "" V 9280 2150 50  0001 C CNN
+F 2 "Resistors_SMD:R_0603" V 9280 2150 50  0001 C CNN
 F 3 "" H 9350 2150 50  0001 C CNN
 	1    9350 2150
 	0    -1   -1   0   
@@ -460,23 +460,23 @@ SCL
 Text Label 10400 2350 0    60   ~ 0
 SDA
 $Comp
-L R R?
+L R R14
 U 1 1 5B0B7874
 P 9500 4500
-F 0 "R?" V 9580 4500 50  0000 C CNN
+F 0 "R14" V 9580 4500 50  0000 C CNN
 F 1 "10k" V 9400 4500 50  0000 C CNN
-F 2 "" V 9430 4500 50  0001 C CNN
+F 2 "Resistors_SMD:R_0603" V 9430 4500 50  0001 C CNN
 F 3 "" H 9500 4500 50  0001 C CNN
 	1    9500 4500
 	0    -1   -1   0   
 $EndComp
 $Comp
-L R R?
+L R R15
 U 1 1 5B0B79AE
 P 9500 4800
-F 0 "R?" V 9580 4800 50  0000 C CNN
+F 0 "R15" V 9580 4800 50  0000 C CNN
 F 1 "10k" V 9400 4800 50  0000 C CNN
-F 2 "" V 9430 4800 50  0001 C CNN
+F 2 "Resistors_SMD:R_0603" V 9430 4800 50  0001 C CNN
 F 3 "" H 9500 4800 50  0001 C CNN
 	1    9500 4800
 	0    -1   -1   0   
@@ -486,10 +486,10 @@ SCL
 Text Label 9650 4800 0    60   ~ 0
 SDA
 $Comp
-L TPD8S300 U?
+L TPD8S300 U3
 U 1 1 5B0C3260
 P 3800 1850
-F 0 "U?" H 3800 2500 60  0000 C CNN
+F 0 "U3" H 3800 2500 60  0000 C CNN
 F 1 "TPD8S300" H 3800 2400 60  0000 C CNN
 F 2 "" H 3800 1850 60  0001 C CNN
 F 3 "" H 3800 1850 60  0001 C CNN
@@ -497,12 +497,12 @@ F 3 "" H 3800 1850 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_Small C?
+L C_Small C14
 U 1 1 5B0C425E
 P 2900 1850
-F 0 "C?" H 2910 1920 50  0000 L CNN
+F 0 "C14" H 2910 1920 50  0000 L CNN
 F 1 "100nF" H 2910 1770 50  0000 L CNN
-F 2 "" H 2900 1850 50  0001 C CNN
+F 2 "Capacitors_SMD:C_0603" H 2900 1850 50  0001 C CNN
 F 3 "" H 2900 1850 50  0001 C CNN
 	1    2900 1850
 	-1   0    0    1   
@@ -530,43 +530,43 @@ SCL
 Text Label 6150 1750 2    60   ~ 0
 SDA
 $Comp
-L C_Small C?
+L C_Small C13
 U 1 1 5B0C2749
 P 7550 1650
-F 0 "C?" H 7560 1720 50  0000 L CNN
+F 0 "C13" H 7560 1720 50  0000 L CNN
 F 1 "47nF" H 7560 1570 50  0000 L CNN
-F 2 "" H 7550 1650 50  0001 C CNN
+F 2 "Capacitors_SMD:C_0603" H 7550 1650 50  0001 C CNN
 F 3 "" H 7550 1650 50  0001 C CNN
 	1    7550 1650
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_Small C?
+L C_Small C12
 U 1 1 5B0C2BAC
 P 7800 1550
-F 0 "C?" H 7810 1620 50  0000 L CNN
+F 0 "C12" H 7810 1620 50  0000 L CNN
 F 1 "4.7uF" H 7810 1470 50  0000 L CNN
-F 2 "" H 7800 1550 50  0001 C CNN
+F 2 "Capacitors_SMD:C_0603" H 7800 1550 50  0001 C CNN
 F 3 "" H 7800 1550 50  0001 C CNN
 	1    7800 1550
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_Small C?
+L C_Small C9
 U 1 1 5B0C33A4
 P 5850 1000
-F 0 "C?" H 5860 1070 50  0000 L CNN
+F 0 "C9" H 5860 1070 50  0000 L CNN
 F 1 "1uF" H 5860 920 50  0000 L CNN
-F 2 "" H 5850 1000 50  0001 C CNN
+F 2 "Capacitors_SMD:C_0603" H 5850 1000 50  0001 C CNN
 F 3 "" H 5850 1000 50  0001 C CNN
 	1    5850 1000
 	1    0    0    -1  
 $EndComp
 $Comp
-L LED D?
+L LED D3
 U 1 1 5B0C55EE
 P 5400 1550
-F 0 "D?" H 5400 1650 50  0000 C CNN
+F 0 "D3" H 5400 1650 50  0000 C CNN
 F 1 "LED" H 5400 1450 50  0000 C CNN
 F 2 "" H 5400 1550 50  0001 C CNN
 F 3 "" H 5400 1550 50  0001 C CNN
@@ -574,12 +574,12 @@ F 3 "" H 5400 1550 50  0001 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L R R?
+L R R7
 U 1 1 5B0C5697
 P 5700 1550
-F 0 "R?" V 5780 1550 50  0000 C CNN
+F 0 "R7" V 5780 1550 50  0000 C CNN
 F 1 "2.2k" V 5600 1550 50  0000 C CNN
-F 2 "" V 5630 1550 50  0001 C CNN
+F 2 "Resistors_SMD:R_0603" V 5630 1550 50  0001 C CNN
 F 3 "" H 5700 1550 50  0001 C CNN
 	1    5700 1550
 	0    -1   -1   0   
@@ -587,21 +587,21 @@ $EndComp
 Text Label 5250 1550 2    60   ~ 0
 REGN
 $Comp
-L R R?
+L R R8
 U 1 1 5B0C68E7
 P 5450 2150
-F 0 "R?" V 5530 2150 50  0000 C CNN
+F 0 "R8" V 5530 2150 50  0000 C CNN
 F 1 "260" V 5350 2150 50  0000 C CNN
-F 2 "" V 5380 2150 50  0001 C CNN
+F 2 "Resistors_SMD:R_0603" V 5380 2150 50  0001 C CNN
 F 3 "" H 5450 2150 50  0001 C CNN
 	1    5450 2150
 	0    -1   -1   0   
 $EndComp
 $Comp
-L Thermistor TH?
+L Thermistor TH1
 U 1 1 5B0C6F00
 P 5850 2750
-F 0 "TH?" V 5950 2800 50  0000 C CNN
+F 0 "TH1" V 5950 2800 50  0000 C CNN
 F 1 "103AT" V 5750 2750 50  0000 C BNN
 F 2 "" H 5850 2750 50  0001 C CNN
 F 3 "" H 5850 2750 50  0001 C CNN
@@ -611,23 +611,23 @@ $EndComp
 Text Label 7150 1450 0    60   ~ 0
 REGN
 $Comp
-L R R?
+L R R11
 U 1 1 5B0C76F2
 P 5850 2450
-F 0 "R?" V 5930 2450 50  0000 C CNN
+F 0 "R11" V 5930 2450 50  0000 C CNN
 F 1 "30.31k" V 5750 2450 50  0000 C CNN
-F 2 "" V 5780 2450 50  0001 C CNN
+F 2 "Resistors_SMD:R_0603" V 5780 2450 50  0001 C CNN
 F 3 "" H 5850 2450 50  0001 C CNN
 	1    5850 2450
 	0    -1   -1   0   
 $EndComp
 $Comp
-L R R?
+L R R10
 U 1 1 5B0C7966
 P 5450 2450
-F 0 "R?" V 5530 2450 50  0000 C CNN
+F 0 "R10" V 5530 2450 50  0000 C CNN
 F 1 "5.24k" V 5350 2450 50  0000 C CNN
-F 2 "" V 5380 2450 50  0001 C CNN
+F 2 "Resistors_SMD:R_0603" V 5380 2450 50  0001 C CNN
 F 3 "" H 5450 2450 50  0001 C CNN
 	1    5450 2450
 	0    -1   -1   0   
@@ -635,12 +635,12 @@ $EndComp
 Text Label 5250 2450 2    60   ~ 0
 REGN
 $Comp
-L C_Small C?
+L C_Small C11
 U 1 1 5B0CC3F6
 P 8050 1450
-F 0 "C?" H 8060 1520 50  0000 L CNN
+F 0 "C11" H 8060 1520 50  0000 L CNN
 F 1 "10uF" H 8060 1370 50  0000 L CNN
-F 2 "" H 8050 1450 50  0001 C CNN
+F 2 "Capacitors_SMD:C_0805" H 8050 1450 50  0001 C CNN
 F 3 "" H 8050 1450 50  0001 C CNN
 	1    8050 1450
 	1    0    0    -1  
@@ -649,21 +649,21 @@ NoConn ~ 9500 2050
 Text Notes 9700 2500 0    60   ~ 0
 ADDR: 0x60
 $Comp
-L C_Small C?
+L C_Small C10
 U 1 1 5B0CEA4D
 P 8300 1350
-F 0 "C?" H 8310 1420 50  0000 L CNN
+F 0 "C10" H 8310 1420 50  0000 L CNN
 F 1 "47nF" H 8310 1270 50  0000 L CNN
-F 2 "" H 8300 1350 50  0001 C CNN
+F 2 "Capacitors_SMD:C_0603" H 8300 1350 50  0001 C CNN
 F 3 "" H 8300 1350 50  0001 C CNN
 	1    8300 1350
 	1    0    0    -1  
 $EndComp
 $Comp
-L L_Small L?
+L L_Small L1
 U 1 1 5B0DB40F
 P 7550 1950
-F 0 "L?" H 7580 1990 50  0000 L CNN
+F 0 "L1" H 7580 1990 50  0000 L CNN
 F 1 "1uH" H 7580 1910 50  0000 L CNN
 F 2 "" H 7550 1950 50  0001 C CNN
 F 3 "" H 7550 1950 50  0001 C CNN
@@ -671,44 +671,44 @@ F 3 "" H 7550 1950 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_Small C?
+L C_Small C15
 U 1 1 5B0DC42A
 P 7800 2000
-F 0 "C?" H 7810 2070 50  0000 L CNN
+F 0 "C15" H 7810 2070 50  0000 L CNN
 F 1 "10uF" H 7810 1920 50  0000 L CNN
-F 2 "" H 7800 2000 50  0001 C CNN
+F 2 "Capacitors_SMD:C_0805" H 7800 2000 50  0001 C CNN
 F 3 "" H 7800 2000 50  0001 C CNN
 	1    7800 2000
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_Small C?
+L C_Small C16
 U 1 1 5B0DC519
 P 8050 2000
-F 0 "C?" H 8060 2070 50  0000 L CNN
+F 0 "C16" H 8060 2070 50  0000 L CNN
 F 1 "10uF" H 8060 1920 50  0000 L CNN
-F 2 "" H 8050 2000 50  0001 C CNN
+F 2 "Capacitors_SMD:C_0805" H 8050 2000 50  0001 C CNN
 F 3 "" H 8050 2000 50  0001 C CNN
 	1    8050 2000
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_Small C?
+L C_Small C19
 U 1 1 5B0DFFED
 P 7250 2500
-F 0 "C?" H 7260 2570 50  0000 L CNN
+F 0 "C19" H 7260 2570 50  0000 L CNN
 F 1 "10uF" H 7260 2420 50  0000 L CNN
-F 2 "" H 7250 2500 50  0001 C CNN
+F 2 "Capacitors_SMD:C_0805" H 7250 2500 50  0001 C CNN
 F 3 "" H 7250 2500 50  0001 C CNN
 	1    7250 2500
 	1    0    0    -1  
 $EndComp
 NoConn ~ 6150 2350
 $Comp
-L D_Small D?
+L D_Small D2
 U 1 1 5B0E1AC7
 P 5650 1250
-F 0 "D?" H 5600 1330 50  0000 L CNN
+F 0 "D2" H 5600 1330 50  0000 L CNN
 F 1 "ESD" H 5500 1170 50  0000 L CNN
 F 2 "" V 5650 1250 50  0001 C CNN
 F 3 "" V 5650 1250 50  0001 C CNN
@@ -748,23 +748,23 @@ VDD
 Text Label 9150 3350 2    60   ~ 0
 VLOAD
 $Comp
-L C_Small C?
+L C_Small C20
 U 1 1 5B1737BD
 P 4600 3500
-F 0 "C?" H 4610 3570 50  0000 L CNN
+F 0 "C20" H 4610 3570 50  0000 L CNN
 F 1 "10uF" H 4610 3420 50  0000 L CNN
-F 2 "" H 4600 3500 50  0001 C CNN
+F 2 "Capacitors_SMD:C_0805" H 4600 3500 50  0001 C CNN
 F 3 "" H 4600 3500 50  0001 C CNN
 	1    4600 3500
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_Small C?
+L C_Small C24
 U 1 1 5B1732A3
 P 4350 3600
-F 0 "C?" H 4360 3670 50  0000 L CNN
+F 0 "C24" H 4360 3670 50  0000 L CNN
 F 1 "10uF" H 4360 3520 50  0000 L CNN
-F 2 "" H 4350 3600 50  0001 C CNN
+F 2 "Capacitors_SMD:C_0805" H 4350 3600 50  0001 C CNN
 F 3 "" H 4350 3600 50  0001 C CNN
 	1    4350 3600
 	1    0    0    -1  
@@ -774,10 +774,10 @@ VDD
 Text Label 3200 4050 2    60   ~ 0
 VSYS
 $Comp
-L L_Small L?
+L L_Small L2
 U 1 1 5B16755A
 P 2800 3450
-F 0 "L?" H 2830 3490 50  0000 L CNN
+F 0 "L2" H 2830 3490 50  0000 L CNN
 F 1 "1uH" H 2830 3410 50  0000 L CNN
 F 2 "" H 2800 3450 50  0001 C CNN
 F 3 "" H 2800 3450 50  0001 C CNN
@@ -785,10 +785,10 @@ F 3 "" H 2800 3450 50  0001 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L TPS63025X U?
+L TPS63025X U5
 U 1 1 5B1672A1
 P 3750 3500
-F 0 "U?" H 3750 3900 60  0000 C CNN
+F 0 "U5" H 3750 3900 60  0000 C CNN
 F 1 "TPS63025X" H 3750 3800 60  0000 C CNN
 F 2 "" H 3750 3500 60  0001 C CNN
 F 3 "" H 3750 3500 60  0001 C CNN
@@ -796,12 +796,12 @@ F 3 "" H 3750 3500 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_Small C?
+L C_Small C17
 U 1 1 5B15DD3E
 P 8300 2000
-F 0 "C?" H 8310 2070 50  0000 L CNN
+F 0 "C17" H 8310 2070 50  0000 L CNN
 F 1 "1uF" H 8310 1920 50  0000 L CNN
-F 2 "" H 8300 2000 50  0001 C CNN
+F 2 "Capacitors_SMD:C_0603" H 8300 2000 50  0001 C CNN
 F 3 "" H 8300 2000 50  0001 C CNN
 	1    8300 2000
 	1    0    0    -1  
@@ -809,10 +809,10 @@ $EndComp
 Text Label 5450 3650 2    60   ~ 0
 VSYS
 $Comp
-L L_Small L?
+L L_Small L3
 U 1 1 5B15730D
 P 5700 3550
-F 0 "L?" H 5730 3590 50  0000 L CNN
+F 0 "L3" H 5730 3590 50  0000 L CNN
 F 1 "1uH" H 5730 3510 50  0000 L CNN
 F 2 "" H 5700 3550 50  0001 C CNN
 F 3 "" H 5700 3550 50  0001 C CNN
@@ -820,10 +820,10 @@ F 3 "" H 5700 3550 50  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L TPS61235 U?
+L TPS61235 U6
 U 1 1 5B154033
 P 6350 3650
-F 0 "U?" H 6350 4050 60  0000 C CNN
+F 0 "U6" H 6350 4050 60  0000 C CNN
 F 1 "TPS61235" H 6350 3950 60  0000 C CNN
 F 2 "" H 6350 3650 60  0001 C CNN
 F 3 "" H 6350 3650 60  0001 C CNN
@@ -837,10 +837,10 @@ USB_CE
 Text Notes 5500 4200 0    60   ~ 0
 Optional (can use VBUS from OTG instead)
 $Comp
-L Jumper_NC_Small JP?
+L Jumper_NC_Small JP2
 U 1 1 5B0D8B1E
 P 7700 3950
-F 0 "JP?" H 7700 4030 50  0000 C CNN
+F 0 "JP2" H 7700 4030 50  0000 C CNN
 F 1 "Jumper_5V" H 7710 3890 50  0000 C CNN
 F 2 "" H 7700 3950 50  0001 C CNN
 F 3 "" H 7700 3950 50  0001 C CNN
@@ -848,10 +848,10 @@ F 3 "" H 7700 3950 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L D_Small D?
+L D_Small D4
 U 1 1 5B0E37FA
 P 8700 3350
-F 0 "D?" H 8650 3430 50  0000 L CNN
+F 0 "D4" H 8650 3430 50  0000 L CNN
 F 1 "LOAD" H 8550 3270 50  0000 L CNN
 F 2 "" V 8700 3350 50  0001 C CNN
 F 3 "" V 8700 3350 50  0001 C CNN
@@ -861,10 +861,10 @@ $EndComp
 Text Label 8600 3350 2    60   ~ 0
 VBUS
 $Comp
-L TEST_2P J?
+L TEST_2P J2
 U 1 1 5B0E5826
 P 7700 2350
-F 0 "J?" H 7700 2410 50  0000 C CNN
+F 0 "J2" H 7700 2410 50  0000 C CNN
 F 1 "TEST_2P" H 7700 2280 50  0000 C CNN
 F 2 "" H 7700 2350 50  0001 C CNN
 F 3 "" H 7700 2350 50  0001 C CNN
@@ -872,12 +872,12 @@ F 3 "" H 7700 2350 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Conn_02x03_Odd_Even J?
+L Conn_02x03_Odd_Even J10
 U 1 1 5B0EA735
 P 1650 6600
-F 0 "J?" H 1700 6800 50  0000 C CNN
+F 0 "J10" H 1700 6800 50  0000 C CNN
 F 1 "Backlight" H 1700 6400 50  0000 C CNN
-F 2 "" H 1650 6600 50  0001 C CNN
+F 2 "Custom Parts:Pin_Header_Straight_2x03_Pitch2.00mm" H 1650 6600 50  0001 C CNN
 F 3 "" H 1650 6600 50  0001 C CNN
 	1    1650 6600
 	1    0    0    -1  
@@ -897,10 +897,10 @@ SDA
 Text Label 1350 6000 2    60   ~ 0
 GND
 $Comp
-L Jumper_NC_Small JP?
+L Jumper_NC_Small JP1
 U 1 1 5B0F1B1A
 P 7700 2650
-F 0 "JP?" H 7700 2730 50  0000 C CNN
+F 0 "JP1" H 7700 2730 50  0000 C CNN
 F 1 "Jumper_5V" H 7710 2590 50  0000 C CNN
 F 2 "" H 7700 2650 50  0001 C CNN
 F 3 "" H 7700 2650 50  0001 C CNN
@@ -910,10 +910,10 @@ $EndComp
 Text Label 7550 3350 0    60   ~ 0
 VLOAD
 $Comp
-L GNDREF #PWR?
+L GNDREF #PWR01
 U 1 1 5B0F40EF
 P 7350 1850
-F 0 "#PWR?" H 7350 1600 50  0001 C CNN
+F 0 "#PWR01" H 7350 1600 50  0001 C CNN
 F 1 "GNDREF" H 7350 1700 50  0000 C CNN
 F 2 "" H 7350 1850 50  0001 C CNN
 F 3 "" H 7350 1850 50  0001 C CNN
@@ -921,10 +921,10 @@ F 3 "" H 7350 1850 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDREF #PWR?
+L GNDREF #PWR02
 U 1 1 5B0F4F3F
 P 8400 1800
-F 0 "#PWR?" H 8400 1550 50  0001 C CNN
+F 0 "#PWR02" H 8400 1550 50  0001 C CNN
 F 1 "GNDREF" H 8400 1650 50  0000 C CNN
 F 2 "" H 8400 1800 50  0001 C CNN
 F 3 "" H 8400 1800 50  0001 C CNN
@@ -932,10 +932,10 @@ F 3 "" H 8400 1800 50  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GNDREF #PWR?
+L GNDREF #PWR03
 U 1 1 5B0F5B5A
 P 5850 900
-F 0 "#PWR?" H 5850 650 50  0001 C CNN
+F 0 "#PWR03" H 5850 650 50  0001 C CNN
 F 1 "GNDREF" H 5850 750 50  0000 C CNN
 F 2 "" H 5850 900 50  0001 C CNN
 F 3 "" H 5850 900 50  0001 C CNN
@@ -943,10 +943,10 @@ F 3 "" H 5850 900 50  0001 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L GNDREF #PWR?
+L GNDREF #PWR04
 U 1 1 5B0F5D11
 P 5550 1250
-F 0 "#PWR?" H 5550 1000 50  0001 C CNN
+F 0 "#PWR04" H 5550 1000 50  0001 C CNN
 F 1 "GNDREF" H 5550 1100 50  0000 C CNN
 F 2 "" H 5550 1250 50  0001 C CNN
 F 3 "" H 5550 1250 50  0001 C CNN
@@ -954,10 +954,10 @@ F 3 "" H 5550 1250 50  0001 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GNDREF #PWR?
+L GNDREF #PWR05
 U 1 1 5B0F610A
 P 5300 2150
-F 0 "#PWR?" H 5300 1900 50  0001 C CNN
+F 0 "#PWR05" H 5300 1900 50  0001 C CNN
 F 1 "GNDREF" H 5300 2000 50  0000 C CNN
 F 2 "" H 5300 2150 50  0001 C CNN
 F 3 "" H 5300 2150 50  0001 C CNN
@@ -965,10 +965,10 @@ F 3 "" H 5300 2150 50  0001 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GNDREF #PWR?
+L GNDREF #PWR06
 U 1 1 5B0F6B8D
 P 6050 2750
-F 0 "#PWR?" H 6050 2500 50  0001 C CNN
+F 0 "#PWR06" H 6050 2500 50  0001 C CNN
 F 1 "GNDREF" H 6050 2600 50  0000 C CNN
 F 2 "" H 6050 2750 50  0001 C CNN
 F 3 "" H 6050 2750 50  0001 C CNN
@@ -976,10 +976,10 @@ F 3 "" H 6050 2750 50  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GNDREF #PWR?
+L GNDREF #PWR07
 U 1 1 5B0F743C
 P 7250 2600
-F 0 "#PWR?" H 7250 2350 50  0001 C CNN
+F 0 "#PWR07" H 7250 2350 50  0001 C CNN
 F 1 "GNDREF" H 7250 2450 50  0000 C CNN
 F 2 "" H 7250 2600 50  0001 C CNN
 F 3 "" H 7250 2600 50  0001 C CNN
@@ -987,10 +987,10 @@ F 3 "" H 7250 2600 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDREF #PWR?
+L GNDREF #PWR08
 U 1 1 5B0F751C
 P 8050 2650
-F 0 "#PWR?" H 8050 2400 50  0001 C CNN
+F 0 "#PWR08" H 8050 2400 50  0001 C CNN
 F 1 "GNDREF" H 8050 2500 50  0000 C CNN
 F 2 "" H 8050 2650 50  0001 C CNN
 F 3 "" H 8050 2650 50  0001 C CNN
@@ -998,10 +998,10 @@ F 3 "" H 8050 2650 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDREF #PWR?
+L GNDREF #PWR09
 U 1 1 5B0F7D8E
 P 2050 4050
-F 0 "#PWR?" H 2050 3800 50  0001 C CNN
+F 0 "#PWR09" H 2050 3800 50  0001 C CNN
 F 1 "GNDREF" H 2050 3900 50  0000 C CNN
 F 2 "" H 2050 4050 50  0001 C CNN
 F 3 "" H 2050 4050 50  0001 C CNN
@@ -1009,10 +1009,10 @@ F 3 "" H 2050 4050 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDREF #PWR?
+L GNDREF #PWR010
 U 1 1 5B0F887D
 P 9050 3550
-F 0 "#PWR?" H 9050 3300 50  0001 C CNN
+F 0 "#PWR010" H 9050 3300 50  0001 C CNN
 F 1 "GNDREF" H 9050 3400 50  0000 C CNN
 F 2 "" H 9050 3550 50  0001 C CNN
 F 3 "" H 9050 3550 50  0001 C CNN
@@ -1020,10 +1020,10 @@ F 3 "" H 9050 3550 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDREF #PWR?
+L GNDREF #PWR011
 U 1 1 5B0F899A
 P 10100 3450
-F 0 "#PWR?" H 10100 3200 50  0001 C CNN
+F 0 "#PWR011" H 10100 3200 50  0001 C CNN
 F 1 "GNDREF" H 10100 3300 50  0000 C CNN
 F 2 "" H 10100 3450 50  0001 C CNN
 F 3 "" H 10100 3450 50  0001 C CNN
@@ -1031,10 +1031,10 @@ F 3 "" H 10100 3450 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDREF #PWR?
+L GNDREF #PWR012
 U 1 1 5B0F9A68
 P 4600 3800
-F 0 "#PWR?" H 4600 3550 50  0001 C CNN
+F 0 "#PWR012" H 4600 3550 50  0001 C CNN
 F 1 "GNDREF" H 4600 3650 50  0000 C CNN
 F 2 "" H 4600 3800 50  0001 C CNN
 F 3 "" H 4600 3800 50  0001 C CNN
@@ -1042,10 +1042,10 @@ F 3 "" H 4600 3800 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDREF #PWR?
+L GNDREF #PWR013
 U 1 1 5B0FA54E
 P 3000 3400
-F 0 "#PWR?" H 3000 3150 50  0001 C CNN
+F 0 "#PWR013" H 3000 3150 50  0001 C CNN
 F 1 "GNDREF" H 3000 3250 50  0000 C CNN
 F 2 "" H 3000 3400 50  0001 C CNN
 F 3 "" H 3000 3400 50  0001 C CNN
@@ -1053,10 +1053,10 @@ F 3 "" H 3000 3400 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L BQ25890 U?
+L BQ25890 U2
 U 1 1 5B0BF1F9
 P 6650 1800
-F 0 "U?" H 6650 2550 60  0000 C CNN
+F 0 "U2" H 6650 2550 60  0000 C CNN
 F 1 "BQ25890" H 6650 2450 60  0000 C CNN
 F 2 "" H 6650 1950 60  0001 C CNN
 F 3 "" H 6650 1950 60  0001 C CNN
@@ -1064,10 +1064,10 @@ F 3 "" H 6650 1950 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDREF #PWR?
+L GNDREF #PWR014
 U 1 1 5B102799
 P 4550 1800
-F 0 "#PWR?" H 4550 1550 50  0001 C CNN
+F 0 "#PWR014" H 4550 1550 50  0001 C CNN
 F 1 "GNDREF" H 4550 1650 50  0000 C CNN
 F 2 "" H 4550 1800 50  0001 C CNN
 F 3 "" H 4550 1800 50  0001 C CNN
@@ -1075,10 +1075,10 @@ F 3 "" H 4550 1800 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDREF #PWR?
+L GNDREF #PWR015
 U 1 1 5B102F6D
 P 3250 1400
-F 0 "#PWR?" H 3250 1150 50  0001 C CNN
+F 0 "#PWR015" H 3250 1150 50  0001 C CNN
 F 1 "GNDREF" H 3250 1250 50  0000 C CNN
 F 2 "" H 3250 1400 50  0001 C CNN
 F 3 "" H 3250 1400 50  0001 C CNN
@@ -1086,10 +1086,10 @@ F 3 "" H 3250 1400 50  0001 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L GNDREF #PWR?
+L GNDREF #PWR016
 U 1 1 5B1036C7
 P 2900 2100
-F 0 "#PWR?" H 2900 1850 50  0001 C CNN
+F 0 "#PWR016" H 2900 1850 50  0001 C CNN
 F 1 "GNDREF" H 2900 1950 50  0000 C CNN
 F 2 "" H 2900 2100 50  0001 C CNN
 F 3 "" H 2900 2100 50  0001 C CNN
@@ -1097,10 +1097,10 @@ F 3 "" H 2900 2100 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDREF #PWR?
+L GNDREF #PWR017
 U 1 1 5B1041C9
 P 3250 2550
-F 0 "#PWR?" H 3250 2300 50  0001 C CNN
+F 0 "#PWR017" H 3250 2300 50  0001 C CNN
 F 1 "GNDREF" H 3250 2400 50  0000 C CNN
 F 2 "" H 3250 2550 50  0001 C CNN
 F 3 "" H 3250 2550 50  0001 C CNN
@@ -1108,21 +1108,21 @@ F 3 "" H 3250 2550 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_Small C?
+L C_Small C18
 U 1 1 5B0C9515
 P 3250 2450
-F 0 "C?" H 3260 2520 50  0000 L CNN
+F 0 "C18" H 3260 2520 50  0000 L CNN
 F 1 "1uF" H 3260 2370 50  0000 L CNN
-F 2 "" H 3250 2450 50  0001 C CNN
+F 2 "Capacitors_SMD:C_0603" H 3250 2450 50  0001 C CNN
 F 3 "" H 3250 2450 50  0001 C CNN
 	1    3250 2450
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDREF #PWR?
+L GNDREF #PWR018
 U 1 1 5B109387
 P 9500 2350
-F 0 "#PWR?" H 9500 2100 50  0001 C CNN
+F 0 "#PWR018" H 9500 2100 50  0001 C CNN
 F 1 "GNDREF" H 9500 2200 50  0000 C CNN
 F 2 "" H 9500 2350 50  0001 C CNN
 F 3 "" H 9500 2350 50  0001 C CNN
@@ -1130,10 +1130,10 @@ F 3 "" H 9500 2350 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDREF #PWR?
+L GNDREF #PWR019
 U 1 1 5B1097EC
 P 10600 1950
-F 0 "#PWR?" H 10600 1700 50  0001 C CNN
+F 0 "#PWR019" H 10600 1700 50  0001 C CNN
 F 1 "GNDREF" H 10600 1800 50  0000 C CNN
 F 2 "" H 10600 1950 50  0001 C CNN
 F 3 "" H 10600 1950 50  0001 C CNN
@@ -1141,10 +1141,10 @@ F 3 "" H 10600 1950 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDREF #PWR?
+L GNDREF #PWR020
 U 1 1 5B10C0F3
 P 7650 3650
-F 0 "#PWR?" H 7650 3400 50  0001 C CNN
+F 0 "#PWR020" H 7650 3400 50  0001 C CNN
 F 1 "GNDREF" H 7650 3500 50  0000 C CNN
 F 2 "" H 7650 3650 50  0001 C CNN
 F 3 "" H 7650 3650 50  0001 C CNN
@@ -1152,10 +1152,10 @@ F 3 "" H 7650 3650 50  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GNDREF #PWR?
+L GNDREF #PWR021
 U 1 1 5B11069C
 P 5900 3850
-F 0 "#PWR?" H 5900 3600 50  0001 C CNN
+F 0 "#PWR021" H 5900 3600 50  0001 C CNN
 F 1 "GNDREF" H 5900 3700 50  0000 C CNN
 F 2 "" H 5900 3850 50  0001 C CNN
 F 3 "" H 5900 3850 50  0001 C CNN
@@ -1163,10 +1163,10 @@ F 3 "" H 5900 3850 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDREF #PWR?
+L GNDREF #PWR022
 U 1 1 5B111393
 P 5900 3450
-F 0 "#PWR?" H 5900 3200 50  0001 C CNN
+F 0 "#PWR022" H 5900 3200 50  0001 C CNN
 F 1 "GNDREF" H 5900 3300 50  0000 C CNN
 F 2 "" H 5900 3450 50  0001 C CNN
 F 3 "" H 5900 3450 50  0001 C CNN
@@ -1174,12 +1174,12 @@ F 3 "" H 5900 3450 50  0001 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L R R?
+L R R12
 U 1 1 5B0D9940
 P 7350 3850
-F 0 "R?" V 7430 3850 50  0000 C CNN
+F 0 "R12" V 7430 3850 50  0000 C CNN
 F 1 "1M" V 7250 3850 50  0000 C CNN
-F 2 "" V 7280 3850 50  0001 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
 	0    -1   -1   0   
@@ -1189,10 +1189,10 @@ HV_EN
 Text Label 6800 3850 0    60   ~ 0
 VLOAD
 $Comp
-L GNDREF #PWR?
+L GNDREF #PWR023
 U 1 1 5B11A43E
 P 5400 5100
-F 0 "#PWR?" H 5400 4850 50  0001 C CNN
+F 0 "#PWR023" H 5400 4850 50  0001 C CNN
 F 1 "GNDREF" H 5400 4950 50  0000 C CNN
 F 2 "" H 5400 5100 50  0001 C CNN
 F 3 "" H 5400 5100 50  0001 C CNN
@@ -1200,10 +1200,10 @@ F 3 "" H 5400 5100 50  0001 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L GNDREF #PWR?
+L GNDREF #PWR024
 U 1 1 5B11AD2A
 P 3900 6600
-F 0 "#PWR?" H 3900 6350 50  0001 C CNN
+F 0 "#PWR024" H 3900 6350 50  0001 C CNN
 F 1 "GNDREF" H 3900 6450 50  0000 C CNN
 F 2 "" H 3900 6600 50  0001 C CNN
 F 3 "" H 3900 6600 50  0001 C CNN
@@ -1211,10 +1211,10 @@ F 3 "" H 3900 6600 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDREF #PWR?
+L GNDREF #PWR025
 U 1 1 5B11DE34
 P 4050 4700
-F 0 "#PWR?" H 4050 4450 50  0001 C CNN
+F 0 "#PWR025" H 4050 4450 50  0001 C CNN
 F 1 "GNDREF" H 4050 4550 50  0000 C CNN
 F 2 "" H 4050 4700 50  0001 C CNN
 F 3 "" H 4050 4700 50  0001 C CNN
@@ -1222,56 +1222,56 @@ F 3 "" H 4050 4700 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_Small C?
+L C_Small C21
 U 1 1 5B134F37
 P 6950 3500
-F 0 "C?" H 6960 3570 50  0000 L CNN
+F 0 "C21" H 6960 3570 50  0000 L CNN
 F 1 "10uF" H 6960 3420 50  0000 L CNN
-F 2 "" H 6950 3500 50  0001 C CNN
+F 2 "Capacitors_SMD:C_0805" H 6950 3500 50  0001 C CNN
 F 3 "" H 6950 3500 50  0001 C CNN
 	1    6950 3500
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_Small C?
+L C_Small C22
 U 1 1 5B1350D4
 P 7200 3500
-F 0 "C?" H 7210 3570 50  0000 L CNN
+F 0 "C22" H 7210 3570 50  0000 L CNN
 F 1 "10uF" H 7210 3420 50  0000 L CNN
-F 2 "" H 7200 3500 50  0001 C CNN
+F 2 "Capacitors_SMD:C_0805" H 7200 3500 50  0001 C CNN
 F 3 "" H 7200 3500 50  0001 C CNN
 	1    7200 3500
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_Small C?
+L C_Small C23
 U 1 1 5B141DBB
 P 7450 3500
-F 0 "C?" H 7460 3570 50  0000 L CNN
+F 0 "C23" H 7460 3570 50  0000 L CNN
 F 1 "10uF" H 7460 3420 50  0000 L CNN
-F 2 "" H 7450 3500 50  0001 C CNN
+F 2 "Capacitors_SMD:C_0805" H 7450 3500 50  0001 C CNN
 F 3 "" H 7450 3500 50  0001 C CNN
 	1    7450 3500
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_Small C?
+L C_Small C27
 U 1 1 5B143B7A
 P 3700 4850
-F 0 "C?" H 3710 4920 50  0000 L CNN
+F 0 "C27" H 3710 4920 50  0000 L CNN
 F 1 "1uF" H 3710 4770 50  0000 L CNN
-F 2 "" H 3700 4850 50  0001 C CNN
+F 2 "Capacitors_SMD:C_0603" H 3700 4850 50  0001 C CNN
 F 3 "" H 3700 4850 50  0001 C CNN
 	1    3700 4850
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R?
+L R R13
 U 1 1 5B1468ED
 P 9500 4200
-F 0 "R?" V 9580 4200 50  0000 C CNN
+F 0 "R13" V 9580 4200 50  0000 C CNN
 F 1 "10k" V 9400 4200 50  0000 C CNN
-F 2 "" V 9430 4200 50  0001 C CNN
+F 2 "Resistors_SMD:R_0603" V 9430 4200 50  0001 C CNN
 F 3 "" H 9500 4200 50  0001 C CNN
 	1    9500 4200
 	0    -1   -1   0   
@@ -1307,25 +1307,17 @@ Wire Wire Line
 Wire Wire Line
 	6800 3550 6800 3550
 Wire Wire Line
-	5450 3650 5550 3650
-Wire Wire Line
-	5550 3650 5900 3650
+	5450 3650 5900 3650
 Wire Wire Line
 	5900 3550 5800 3550
 Wire Wire Line
 	4200 3700 4200 3800
 Wire Wire Line
-	4200 3300 4350 3300
-Wire Wire Line
-	4350 3300 4600 3300
+	4200 3300 4600 3300
 Wire Wire Line
 	4200 3400 4200 3400
 Wire Wire Line
-	4200 3300 4200 3400
-Wire Wire Line
-	4200 3400 4200 3500
-Wire Wire Line
-	4200 3500 4200 3600
+	4200 3300 4200 3600
 Connection ~ 4200 3300
 Wire Wire Line
 	4200 3500 4200 3500
@@ -1341,29 +1333,19 @@ Connection ~ 4200 3800
 Connection ~ 4350 3800
 Connection ~ 4200 3500
 Wire Wire Line
-	7150 2350 7250 2350
-Wire Wire Line
-	7250 2350 7500 2350
+	7150 2350 7500 2350
 Connection ~ 8050 2150
 Connection ~ 2050 5350
 Wire Wire Line
-	2050 5250 2050 5350
-Wire Wire Line
-	2050 5350 2050 5450
+	2050 5250 2050 5450
 Connection ~ 1350 5350
 Wire Wire Line
-	1350 5250 1350 5350
-Wire Wire Line
-	1350 5350 1350 5450
+	1350 5250 1350 5450
 Connection ~ 2050 1050
 Connection ~ 2050 1150
 Connection ~ 2050 1250
 Wire Wire Line
-	2050 1050 2050 1150
-Wire Wire Line
-	2050 1150 2050 1250
-Wire Wire Line
-	2050 1250 2050 1350
+	2050 1050 2050 1350
 Connection ~ 2050 3650
 Connection ~ 2050 3550
 Connection ~ 2050 3350
@@ -1374,68 +1356,32 @@ Connection ~ 2050 2750
 Connection ~ 2050 2650
 Connection ~ 2050 2450
 Wire Wire Line
-	2050 4050 2050 3650
-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
+	2050 4050 2050 2350
 Connection ~ 4350 2000
 Connection ~ 4350 1900
 Connection ~ 4350 1700
 Connection ~ 4350 1800
 Wire Wire Line
-	4350 1600 4350 1700
-Wire Wire Line
-	4350 1700 4350 1800
-Wire Wire Line
-	4350 1800 4350 1900
-Wire Wire Line
-	4350 1900 4350 2000
-Wire Wire Line
-	4350 2000 4350 2100
+	4350 1600 4350 2100
 Connection ~ 3250 2100
 Wire Wire Line
 	3250 2100 3250 2200
 Connection ~ 10400 2050
 Wire Wire Line
-	10400 1950 10400 2050
-Wire Wire Line
-	10400 2050 10400 2150
+	10400 1950 10400 2150
 Wire Wire Line
 	7150 1850 7150 1950
 Connection ~ 5850 1250
 Wire Wire Line
-	5750 1250 5850 1250
+	5750 1250 6150 1250
 Wire Wire Line
-	5850 1250 6150 1250
-Wire Wire Line
-	8300 1450 8300 1800
-Wire Wire Line
-	8300 1800 8300 1900
+	8300 1450 8300 1900
 Connection ~ 8050 1800
 Connection ~ 7800 1800
 Wire Wire Line
-	8050 1550 8050 1800
-Wire Wire Line
-	8050 1800 8050 1900
-Wire Wire Line
-	7800 1650 7800 1800
+	8050 1550 8050 1900
 Wire Wire Line
-	7800 1800 7800 1900
+	7800 1650 7800 1900
 Connection ~ 7800 2150
 Wire Wire Line
 	7800 2150 7800 2100
@@ -1449,15 +1395,7 @@ Wire Wire Line
 	7150 1450 7800 1450
 Connection ~ 7550 2150
 Wire Wire Line
-	7150 2150 7550 2150
-Wire Wire Line
-	7550 2150 7800 2150
-Wire Wire Line
-	7800 2150 8050 2150
-Wire Wire Line
-	8050 2150 8300 2150
-Wire Wire Line
-	8300 2150 8450 2150
+	7150 2150 8450 2150
 Connection ~ 7150 2150
 Wire Wire Line
 	7150 2050 7150 2150
@@ -1480,15 +1418,11 @@ Connection ~ 5650 2450
 Wire Wire Line
 	5650 2250 6150 2250
 Wire Wire Line
-	5650 2250 5650 2450
-Wire Wire Line
-	5650 2450 5650 2750
+	5650 2250 5650 2750
 Wire Wire Line
 	5250 2450 5300 2450
 Wire Wire Line
-	5600 2450 5650 2450
-Wire Wire Line
-	5650 2450 5700 2450
+	5600 2450 5700 2450
 Wire Wire Line
 	5850 1550 6150 1550
 Wire Wire Line
@@ -1572,15 +1506,7 @@ Connection ~ 1450 4050
 Wire Wire Line
 	1350 4050 1350 3950
 Wire Wire Line
-	1050 4050 1150 4050
-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
+	1050 4050 2050 4050
 Wire Wire Line
 	1450 4050 1450 3950
 Wire Wire Line
@@ -1616,17 +1542,13 @@ Wire Wire Line
 Wire Wire Line
 	2050 1150 1950 1150
 Wire Wire Line
-	1950 1050 2050 1050
-Wire Wire Line
-	2050 1050 2150 1050
+	1950 1050 2150 1050
 Wire Wire Line
 	5350 5100 5400 5100
 Wire Wire Line
 	2050 5450 1950 5450
 Wire Wire Line
-	1950 5350 2050 5350
-Wire Wire Line
-	2050 5350 2150 5350
+	1950 5350 2150 5350
 Wire Wire Line
 	1950 5250 2050 5250
 Wire Wire Line
@@ -1700,9 +1622,7 @@ Wire Wire Line
 Wire Wire Line
 	1350 5250 1450 5250
 Wire Wire Line
-	1250 5350 1350 5350
-Wire Wire Line
-	1350 5350 1450 5350
+	1250 5350 1450 5350
 Wire Wire Line
 	1350 5450 1450 5450
 Wire Wire Line
@@ -1767,27 +1687,15 @@ Wire Wire Line
 	3950 5400 3950 5400
 Connection ~ 7150 1850
 Wire Wire Line
-	7800 1800 8050 1800
-Wire Wire Line
-	8050 1800 8300 1800
-Wire Wire Line
-	8300 1800 8400 1800
+	7800 1800 8400 1800
 Wire Wire Line
 	10100 3450 9900 3450
 Wire Wire Line
 	9250 3550 9050 3550
 Wire Wire Line
-	4200 3800 4350 3800
-Wire Wire Line
-	4350 3800 4600 3800
-Wire Wire Line
-	3300 3600 3300 3700
-Wire Wire Line
-	3300 3700 3300 3800
+	4200 3800 4600 3800
 Wire Wire Line
-	3300 3800 3300 3900
-Wire Wire Line
-	3300 3900 3300 4050
+	3300 3600 3300 4050
 Connection ~ 3300 3700
 Connection ~ 3300 3800
 Wire Wire Line
@@ -1807,9 +1715,7 @@ Wire Wire Line
 Wire Wire Line
 	4200 4050 4200 3900
 Wire Wire Line
-	3200 4050 3300 4050
-Wire Wire Line
-	3300 4050 4200 4050
+	3200 4050 4200 4050
 Connection ~ 3300 3900
 Wire Wire Line
 	7250 2350 7250 2400
@@ -1831,37 +1737,19 @@ Wire Wire Line
 Wire Wire Line
 	10400 1950 10600 1950
 Wire Wire Line
-	6800 3650 6950 3650
-Wire Wire Line
-	6950 3650 7200 3650
-Wire Wire Line
-	7200 3650 7450 3650
-Wire Wire Line
-	7450 3650 7550 3650
-Wire Wire Line
-	7550 3650 7650 3650
+	6800 3650 7650 3650
 Wire Wire Line
 	6800 3550 6800 3350
 Wire Wire Line
-	6800 3350 6950 3350
-Wire Wire Line
-	6950 3350 7200 3350
-Wire Wire Line
-	7200 3350 7450 3350
-Wire Wire Line
-	7450 3350 7550 3350
+	6800 3350 7550 3350
 Wire Wire Line
 	9150 3450 9250 3450
 Wire Wire Line
 	3900 6600 3950 6600
 Wire Wire Line
-	2900 4950 2900 5050
-Wire Wire Line
-	2900 5050 2900 5300
-Wire Wire Line
-	3450 4950 3450 5050
+	2900 4950 2900 5300
 Wire Wire Line
-	3450 5050 3450 5200
+	3450 4950 3450 5200
 Wire Wire Line
 	2900 5300 3950 5300
 Connection ~ 2900 5050
@@ -1900,9 +1788,7 @@ Wire Wire Line
 Wire Wire Line
 	7500 3850 7550 3850
 Wire Wire Line
-	7550 3650 7550 3850
-Wire Wire Line
-	7550 3850 7550 3950
+	7550 3650 7550 3950
 Wire Wire Line
 	7550 3950 7600 3950
 Connection ~ 7550 3850
@@ -1921,11 +1807,7 @@ Connection ~ 3300 4050
 Wire Wire Line
 	3700 4950 3700 5100
 Wire Wire Line
-	2900 4700 3450 4700
-Wire Wire Line
-	3450 4700 3700 4700
-Wire Wire Line
-	3700 4700 4050 4700
+	2900 4700 4050 4700
 Wire Wire Line
 	3700 4700 3700 4750
 Wire Wire Line