Browse Source

Preliminary parts layout

Kevin Lee 4 weeks ago
parent
commit
b609b07eb7

+ 28 - 67
Nixie_Bottom_Board/hv_power_supply.bak

@@ -125,10 +125,10 @@ F 3 "" H 6800 4550 50  0001 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L Device:C C9
+L Device:C C7
 U 1 1 5A6BA4CA
 P 6350 4550
-F 0 "C9" H 6375 4650 50  0000 L CNN
+F 0 "C7" H 6375 4650 50  0000 L CNN
 F 1 "C_BP" H 6375 4450 50  0000 L CNN
 F 2 "Capacitors_SMD:C_0603" H 6388 4400 50  0001 C CNN
 F 3 "" H 6350 4550 50  0001 C CNN
@@ -147,33 +147,22 @@ F 3 "" H 4100 4350 50  0001 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L Device:C C7
+L Device:C C6
 U 1 1 5A6C0FBE
-P 4500 3000
-F 0 "C7" H 4525 3100 50  0000 L CNN
-F 1 "C_IN" H 4525 2900 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0805" H 4538 2850 50  0001 C CNN
-F 3 "" H 4500 3000 50  0001 C CNN
-	1    4500 3000
-	-1   0    0    1   
-$EndComp
-$Comp
-L Device:C C5
-U 1 1 5A6C10DF
-P 4150 3000
-F 0 "C5" H 4175 3100 50  0000 L CNN
-F 1 "C_IN" H 4175 2900 50  0000 L CNN
-F 2 "Capacitors_SMD:C_1210" H 4188 2850 50  0001 C CNN
-F 3 "" H 4150 3000 50  0001 C CNN
-	1    4150 3000
+P 4650 3000
+F 0 "C6" H 4675 3100 50  0000 L CNN
+F 1 "C_IN" H 4675 2900 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0805" H 4688 2850 50  0001 C CNN
+F 3 "" H 4650 3000 50  0001 C CNN
+	1    4650 3000
 	-1   0    0    1   
 $EndComp
 NoConn ~ 7500 3000
 $Comp
-L Device:C C6
+L Device:C C5
 U 1 1 5A6C6769
 P 4350 4550
-F 0 "C6" H 4375 4650 50  0000 L CNN
+F 0 "C5" H 4375 4650 50  0000 L CNN
 F 1 "C_SS" H 4375 4450 50  0000 L CNN
 F 2 "Capacitors_SMD:C_0603" H 4388 4400 50  0001 C CNN
 F 3 "" H 4350 4550 50  0001 C CNN
@@ -213,14 +202,11 @@ Wire Wire Line
 	6100 4150 6800 4150
 Wire Wire Line
 	6800 4800 6800 4700
+Connection ~ 4500 3400
 Wire Wire Line
-	4500 3200 4500 3150
-Connection ~ 4150 3400
+	4500 3400 4600 3400
 Wire Wire Line
-	4150 3400 4600 3400
-Connection ~ 4150 3200
-Wire Wire Line
-	4150 3550 4600 3550
+	4500 3550 4600 3550
 Wire Wire Line
 	4600 3700 3700 3700
 Connection ~ 3750 4800
@@ -258,24 +244,12 @@ Wire Wire Line
 	6350 4300 6350 4400
 Wire Wire Line
 	8050 4150 7300 4150
-Wire Wire Line
-	3950 3200 4150 3200
-Wire Wire Line
-	4150 3150 4150 3200
-Connection ~ 4150 2800
-Connection ~ 4500 2800
-Wire Wire Line
-	4150 2800 4150 2850
 Connection ~ 5300 2800
-Wire Wire Line
-	4500 2800 4500 2850
 Connection ~ 5450 2800
 Wire Wire Line
 	5300 2800 5300 3000
 Wire Wire Line
 	5450 2800 5450 3000
-Wire Wire Line
-	3700 2800 4150 2800
 Connection ~ 6700 3850
 Wire Wire Line
 	6100 3850 6700 3850
@@ -312,23 +286,11 @@ F 3 "" H 5350 3950 60  0001 C CNN
 	1    5350 3850
 	1    0    0    -1  
 $EndComp
-$Comp
-L Device:C C8
-U 1 1 5A911DC8
-P 4850 3000
-F 0 "C8" H 4875 3100 50  0000 L CNN
-F 1 "C_IN" H 4875 2900 50  0000 L CNN
-F 2 "Capacitors_SMD:C_1210" H 4888 2850 50  0001 C CNN
-F 3 "" H 4850 3000 50  0001 C CNN
-	1    4850 3000
-	-1   0    0    1   
-$EndComp
 Wire Wire Line
-	4850 2850 4850 2800
-Connection ~ 4850 2800
+	4650 2850 4650 2800
+Connection ~ 4650 2800
 Wire Wire Line
-	4850 3200 4850 3150
-Connection ~ 4500 3200
+	4650 3200 4650 3150
 Text HLabel 3700 2800 0    60   Input ~ 0
 VIN
 Text HLabel 3700 3700 0    60   Input ~ 0
@@ -342,11 +304,9 @@ VOUT
 Wire Wire Line
 	6800 4150 7000 4150
 Wire Wire Line
-	4150 3400 4150 3550
-Wire Wire Line
-	4150 3200 4500 3200
+	4500 3400 4500 3550
 Wire Wire Line
-	4150 3200 4150 3400
+	4500 3200 4500 3400
 Wire Wire Line
 	3750 4800 4100 4800
 Wire Wire Line
@@ -358,10 +318,6 @@ Wire Wire Line
 Wire Wire Line
 	6350 4800 6800 4800
 Wire Wire Line
-	4150 2800 4500 2800
-Wire Wire Line
-	4500 2800 4850 2800
-Wire Wire Line
 	5300 2800 5450 2800
 Wire Wire Line
 	5450 2800 6700 2800
@@ -378,9 +334,7 @@ Wire Wire Line
 Wire Wire Line
 	8350 2800 8650 2800
 Wire Wire Line
-	4850 2800 5300 2800
-Wire Wire Line
-	4500 3200 4850 3200
+	4650 2800 5300 2800
 $Comp
 L Device:C C12
 U 1 1 5B6DF384
@@ -402,7 +356,7 @@ Wire Wire Line
 Connection ~ 8650 3200
 Wire Wire Line
 	8650 3200 8850 3200
-Text Label 3950 3200 2    60   ~ 0
+Text Label 4400 3200 2    60   ~ 0
 GND
 Text Label 6300 4800 2    60   ~ 0
 GND
@@ -410,4 +364,11 @@ Wire Wire Line
 	7500 2800 8050 2800
 Text Label 8100 2800 0    60   ~ 0
 GND
+Wire Wire Line
+	3700 2800 4650 2800
+Wire Wire Line
+	4500 3200 4650 3200
+Connection ~ 4500 3200
+Wire Wire Line
+	4400 3200 4500 3200
 $EndSCHEMATC

+ 28 - 67
Nixie_Bottom_Board/hv_power_supply.sch

@@ -125,10 +125,10 @@ F 3 "" H 6800 4550 50  0001 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L Device:C C9
+L Device:C C7
 U 1 1 5A6BA4CA
 P 6350 4550
-F 0 "C9" H 6375 4650 50  0000 L CNN
+F 0 "C7" H 6375 4650 50  0000 L CNN
 F 1 "C_BP" H 6375 4450 50  0000 L CNN
 F 2 "Capacitors_SMD:C_0603" H 6388 4400 50  0001 C CNN
 F 3 "" H 6350 4550 50  0001 C CNN
@@ -147,33 +147,22 @@ F 3 "" H 4100 4350 50  0001 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L Device:C C7
+L Device:C C6
 U 1 1 5A6C0FBE
-P 4500 3000
-F 0 "C7" H 4525 3100 50  0000 L CNN
-F 1 "C_IN" H 4525 2900 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0805" H 4538 2850 50  0001 C CNN
-F 3 "" H 4500 3000 50  0001 C CNN
-	1    4500 3000
-	-1   0    0    1   
-$EndComp
-$Comp
-L Device:C C5
-U 1 1 5A6C10DF
-P 4150 3000
-F 0 "C5" H 4175 3100 50  0000 L CNN
-F 1 "C_IN" H 4175 2900 50  0000 L CNN
-F 2 "Capacitors_SMD:C_1210" H 4188 2850 50  0001 C CNN
-F 3 "" H 4150 3000 50  0001 C CNN
-	1    4150 3000
+P 4650 3000
+F 0 "C6" H 4675 3100 50  0000 L CNN
+F 1 "C_IN" H 4675 2900 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0805" H 4688 2850 50  0001 C CNN
+F 3 "" H 4650 3000 50  0001 C CNN
+	1    4650 3000
 	-1   0    0    1   
 $EndComp
 NoConn ~ 7500 3000
 $Comp
-L Device:C C6
+L Device:C C5
 U 1 1 5A6C6769
 P 4350 4550
-F 0 "C6" H 4375 4650 50  0000 L CNN
+F 0 "C5" H 4375 4650 50  0000 L CNN
 F 1 "C_SS" H 4375 4450 50  0000 L CNN
 F 2 "Capacitors_SMD:C_0603" H 4388 4400 50  0001 C CNN
 F 3 "" H 4350 4550 50  0001 C CNN
@@ -213,14 +202,11 @@ Wire Wire Line
 	6100 4150 6800 4150
 Wire Wire Line
 	6800 4800 6800 4700
+Connection ~ 4500 3400
 Wire Wire Line
-	4500 3200 4500 3150
-Connection ~ 4150 3400
+	4500 3400 4600 3400
 Wire Wire Line
-	4150 3400 4600 3400
-Connection ~ 4150 3200
-Wire Wire Line
-	4150 3550 4600 3550
+	4500 3550 4600 3550
 Wire Wire Line
 	4600 3700 3700 3700
 Connection ~ 3750 4800
@@ -258,24 +244,12 @@ Wire Wire Line
 	6350 4300 6350 4400
 Wire Wire Line
 	8050 4150 7300 4150
-Wire Wire Line
-	3950 3200 4150 3200
-Wire Wire Line
-	4150 3150 4150 3200
-Connection ~ 4150 2800
-Connection ~ 4500 2800
-Wire Wire Line
-	4150 2800 4150 2850
 Connection ~ 5300 2800
-Wire Wire Line
-	4500 2800 4500 2850
 Connection ~ 5450 2800
 Wire Wire Line
 	5300 2800 5300 3000
 Wire Wire Line
 	5450 2800 5450 3000
-Wire Wire Line
-	3700 2800 4150 2800
 Connection ~ 6700 3850
 Wire Wire Line
 	6100 3850 6700 3850
@@ -312,23 +286,11 @@ F 3 "" H 5350 3950 60  0001 C CNN
 	1    5350 3850
 	1    0    0    -1  
 $EndComp
-$Comp
-L Device:C C8
-U 1 1 5A911DC8
-P 4850 3000
-F 0 "C8" H 4875 3100 50  0000 L CNN
-F 1 "C_IN" H 4875 2900 50  0000 L CNN
-F 2 "Capacitors_SMD:C_1210" H 4888 2850 50  0001 C CNN
-F 3 "" H 4850 3000 50  0001 C CNN
-	1    4850 3000
-	-1   0    0    1   
-$EndComp
 Wire Wire Line
-	4850 2850 4850 2800
-Connection ~ 4850 2800
+	4650 2850 4650 2800
+Connection ~ 4650 2800
 Wire Wire Line
-	4850 3200 4850 3150
-Connection ~ 4500 3200
+	4650 3200 4650 3150
 Text HLabel 3700 2800 0    60   Input ~ 0
 VIN
 Text HLabel 3700 3700 0    60   Input ~ 0
@@ -342,11 +304,9 @@ VOUT
 Wire Wire Line
 	6800 4150 7000 4150
 Wire Wire Line
-	4150 3400 4150 3550
-Wire Wire Line
-	4150 3200 4500 3200
+	4500 3400 4500 3550
 Wire Wire Line
-	4150 3200 4150 3400
+	4500 3200 4500 3400
 Wire Wire Line
 	3750 4800 4100 4800
 Wire Wire Line
@@ -358,10 +318,6 @@ Wire Wire Line
 Wire Wire Line
 	6350 4800 6800 4800
 Wire Wire Line
-	4150 2800 4500 2800
-Wire Wire Line
-	4500 2800 4850 2800
-Wire Wire Line
 	5300 2800 5450 2800
 Wire Wire Line
 	5450 2800 6700 2800
@@ -378,9 +334,7 @@ Wire Wire Line
 Wire Wire Line
 	8350 2800 8650 2800
 Wire Wire Line
-	4850 2800 5300 2800
-Wire Wire Line
-	4500 3200 4850 3200
+	4650 2800 5300 2800
 $Comp
 L Device:C C12
 U 1 1 5B6DF384
@@ -402,7 +356,7 @@ Wire Wire Line
 Connection ~ 8650 3200
 Wire Wire Line
 	8650 3200 8850 3200
-Text Label 3950 3200 2    60   ~ 0
+Text Label 4400 3200 2    60   ~ 0
 GND
 Text Label 6300 4800 2    60   ~ 0
 GND
@@ -410,4 +364,11 @@ Wire Wire Line
 	7500 2800 8050 2800
 Text Label 8100 2800 0    60   ~ 0
 GND
+Wire Wire Line
+	3700 2800 4650 2800
+Wire Wire Line
+	4500 3200 4650 3200
+Connection ~ 4500 3200
+Wire Wire Line
+	4400 3200 4500 3200
 $EndSCHEMATC

+ 16 - 0
Nixie_Bottom_Board/nixie_bottom_board-cache.lib

@@ -513,6 +513,22 @@ X ~ 2 0 -150 50 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
+# Mechanical:MountingHole_Pad
+#
+DEF Mechanical:MountingHole_Pad MH 0 40 N N 1 F N
+F0 "MH" 0 250 50 H V C CNN
+F1 "Mechanical:MountingHole_Pad" 0 175 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ MountingHole*Pad*
+$ENDFPLIST
+DRAW
+C 0 50 50 0 1 50 N
+X 1 1 0 -100 100 U 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
 # Switch:SW_Push
 #
 DEF Switch:SW_Push SW 0 40 N N 1 F N

+ 491 - 396
Nixie_Bottom_Board/nixie_bottom_board.bak

@@ -15,725 +15,820 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Sheet
-S 7650 1700 650  400 
+S 8300 1450 650  400 
 U 5B07197A
 F0 "HV Power Supply" 60
 F1 "hv_power_supply.sch" 60
-F2 "VIN" I L 7650 1800 60 
-F3 "EN" I L 7650 1900 60 
-F4 "GND" I L 7650 2000 60 
-F5 "VOUT" I R 8300 1800 60 
-F6 "GND" I R 8300 1900 60 
+F2 "VIN" I L 8300 1550 60 
+F3 "EN" I L 8300 1650 60 
+F4 "GND" I L 8300 1750 60 
+F5 "VOUT" I R 8950 1550 60 
+F6 "GND" I R 8950 1650 60 
 $EndSheet
-Text Label 8750 5400 0    60   ~ 0
+Text Label 9400 5450 0    60   ~ 0
 VDD
-Text Label 8750 4800 0    60   ~ 0
+Text Label 9400 4850 0    60   ~ 0
 SWDIO
-Text Label 8750 4700 0    60   ~ 0
+Text Label 9400 4750 0    60   ~ 0
 SWCLK
-Text Label 8750 4500 0    60   ~ 0
+Text Label 9400 4550 0    60   ~ 0
 SWO
-Text Label 2750 4400 0    60   ~ 0
+Text Label 3800 4300 0    60   ~ 0
 SWO
-Text Label 2750 4500 0    60   ~ 0
+Text Label 3800 4400 0    60   ~ 0
 SWCLK
-Text Label 2250 4500 2    60   ~ 0
+Text Label 3300 4400 2    60   ~ 0
 SWDIO
-Text Label 2750 4600 0    60   ~ 0
+Text Label 3800 4500 0    60   ~ 0
 NRST
-Text Label 8750 5000 0    60   ~ 0
+Text Label 9400 5050 0    60   ~ 0
 USB_N
-Text Label 8750 4900 0    60   ~ 0
+Text Label 9400 4950 0    60   ~ 0
 USB_P
-Text Label 2250 5800 2    60   ~ 0
+Text Label 3300 5700 2    60   ~ 0
 SCL
-Text Label 2250 5900 2    60   ~ 0
+Text Label 3300 5800 2    60   ~ 0
 SDA
-Text Label 2750 5050 0    60   ~ 0
+Text Label 3800 4950 0    60   ~ 0
 HV_OUT
-Text Label 2750 5700 0    60   ~ 0
+Text Label 3800 5600 0    60   ~ 0
 VNIXIE
-Text Label 7350 4900 2    60   ~ 0
+Text Label 8000 4950 2    60   ~ 0
 DAC
-Text Label 8750 5200 0    60   ~ 0
+Text Label 9400 5250 0    60   ~ 0
 SCL
-Text Label 8750 5100 0    60   ~ 0
+Text Label 9400 5150 0    60   ~ 0
 SDA
-Text Label 7550 1900 2    60   ~ 0
+Text Label 8200 1650 2    60   ~ 0
 HV_EN
 $Comp
 L Device:R R2
 U 1 1 5B08854F
-P 9000 4000
-F 0 "R2" V 9080 4000 50  0000 C CNN
-F 1 "1M" V 8900 4000 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603" V 8930 4000 50  0001 C CNN
-F 3 "" H 9000 4000 50  0001 C CNN
-	1    9000 4000
+P 9650 4050
+F 0 "R2" V 9730 4050 50  0000 C CNN
+F 1 "1M" V 9550 4050 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603" V 9580 4050 50  0001 C CNN
+F 3 "" H 9650 4050 50  0001 C CNN
+	1    9650 4050
 	0    -1   -1   0   
 $EndComp
-Text Label 8400 1800 0    60   ~ 0
+Text Label 9050 1550 0    60   ~ 0
 HV_OUT
-Text Label 7350 4800 2    60   ~ 0
+Text Label 8000 4850 2    60   ~ 0
 HV_EN
-Text Label 1950 1550 0    60   ~ 0
+Text Label 2600 1800 0    60   ~ 0
 CC1
-Text Label 1950 1650 0    60   ~ 0
+Text Label 2600 1900 0    60   ~ 0
 CC2
-Text Label 1950 1850 0    60   ~ 0
+Text Label 2600 2100 0    60   ~ 0
 USB_N
-Text Label 1950 2150 0    60   ~ 0
+Text Label 2600 2400 0    60   ~ 0
 USB_P
 $Comp
 L Device:R R1
 U 1 1 5B096154
-P 2850 3200
-F 0 "R1" V 2930 3200 50  0000 C CNN
-F 1 "900k" V 2750 3200 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603" V 2780 3200 50  0001 C CNN
-F 3 "" H 2850 3200 50  0001 C CNN
-	1    2850 3200
+P 3500 3150
+F 0 "R1" V 3580 3150 50  0000 C CNN
+F 1 "900k" V 3400 3150 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603" V 3430 3150 50  0001 C CNN
+F 3 "" H 3500 3150 50  0001 C CNN
+	1    3500 3150
 	0    -1   -1   0   
 $EndComp
-Text Label 2700 3200 2    60   ~ 0
+Text Label 3350 3150 2    60   ~ 0
 VBUS
-Text Label 4050 3300 0    60   ~ 0
+Text Label 4700 3250 0    60   ~ 0
 SCL
-Text Label 4050 3400 0    60   ~ 0
+Text Label 4700 3350 0    60   ~ 0
 SDA
 $Comp
 L Device:R R4
 U 1 1 5B0B7874
-P 5900 4850
-F 0 "R4" V 5980 4850 50  0000 C CNN
-F 1 "10k" V 5800 4850 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603" V 5830 4850 50  0001 C CNN
-F 3 "" H 5900 4850 50  0001 C CNN
-	1    5900 4850
+P 5000 5750
+F 0 "R4" V 5080 5750 50  0000 C CNN
+F 1 "10k" V 4900 5750 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603" V 4930 5750 50  0001 C CNN
+F 3 "" H 5000 5750 50  0001 C CNN
+	1    5000 5750
 	0    -1   -1   0   
 $EndComp
 $Comp
 L Device:R R5
 U 1 1 5B0B79AE
-P 5900 5150
-F 0 "R5" V 5980 5150 50  0000 C CNN
-F 1 "10k" V 5800 5150 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603" V 5830 5150 50  0001 C CNN
-F 3 "" H 5900 5150 50  0001 C CNN
-	1    5900 5150
+P 5000 6050
+F 0 "R5" V 5080 6050 50  0000 C CNN
+F 1 "10k" V 4900 6050 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603" V 4930 6050 50  0001 C CNN
+F 3 "" H 5000 6050 50  0001 C CNN
+	1    5000 6050
 	0    -1   -1   0   
 $EndComp
-Text Label 6050 4850 0    60   ~ 0
+Text Label 5150 5750 0    60   ~ 0
 SCL
-Text Label 6050 5150 0    60   ~ 0
+Text Label 5150 6050 0    60   ~ 0
 SDA
-NoConn ~ 3150 3100
-Text Notes 3350 3550 0    60   ~ 0
+NoConn ~ 3800 3050
+Text Notes 4000 3500 0    60   ~ 0
 ADDR: 0x60
-Text Label 1950 1050 0    60   ~ 0
+Text Label 2600 1300 0    60   ~ 0
 VBUS
-Text Notes 2100 6200 0    60   ~ 0
+Text Notes 3150 6100 0    60   ~ 0
 ADDR: 0x70-0x73
-Text Label 7350 3900 2    60   ~ 0
+Text Label 8000 3950 2    60   ~ 0
 VDD
-Text Label 7350 4300 2    60   ~ 0
+Text Label 8000 4350 2    60   ~ 0
 VDD
-Text Label 4050 2900 0    60   ~ 0
+Text Label 4700 2850 0    60   ~ 0
 VDD
-Text Label 5750 4850 2    60   ~ 0
+Text Label 4850 5750 2    60   ~ 0
 VDD
-Text Label 5750 5150 2    60   ~ 0
+Text Label 4850 6050 2    60   ~ 0
 VDD
-Text Label 2250 4400 2    60   ~ 0
+Text Label 3300 4300 2    60   ~ 0
 VDD
-Text Label 6100 2600 0    60   ~ 0
+Text Label 6750 2550 0    60   ~ 0
 VDD
 $Comp
 L Device:L_Small L1
 U 1 1 5B16755A
-P 4950 2700
-F 0 "L1" H 4980 2740 50  0000 L CNN
-F 1 "1uH" H 4980 2660 50  0000 L CNN
-F 2 "Inductors_SMD:L_Taiyo-Yuden_NR-40xx" H 4950 2700 50  0001 C CNN
-F 3 "" H 4950 2700 50  0001 C CNN
-	1    4950 2700
+P 5600 2650
+F 0 "L1" H 5630 2690 50  0000 L CNN
+F 1 "1uH" H 5630 2610 50  0000 L CNN
+F 2 "Inductors_SMD:L_Taiyo-Yuden_NR-40xx" H 5600 2650 50  0001 C CNN
+F 3 "" H 5600 2650 50  0001 C CNN
+	1    5600 2650
 	-1   0    0    1   
 $EndComp
-Text Label 4700 4700 0    60   ~ 0
+Text Label 6950 5900 0    60   ~ 0
 VDD
-Text Label 3900 4900 2    60   ~ 0
+Text Label 6150 6100 2    60   ~ 0
 DAC
-Text Label 3900 4700 2    60   ~ 0
+Text Label 6150 5900 2    60   ~ 0
 VNIXIE
-Text Label 4700 4900 0    60   ~ 0
+Text Label 6950 6100 0    60   ~ 0
 VNIXIE
 Wire Wire Line
-	3150 3000 3050 3000
+	3800 2950 3700 2950
 Wire Wire Line
-	3050 2900 3150 2900
+	3700 2850 3800 2850
 Wire Wire Line
-	8400 1800 8300 1800
+	9050 1550 8950 1550
 Wire Wire Line
-	8750 4000 8850 4000
+	9400 4050 9500 4050
 Wire Wire Line
-	8400 1900 8300 1900
+	9050 1650 8950 1650
 Wire Wire Line
-	7650 2000 7550 2000
+	8300 1750 8200 1750
 Wire Wire Line
-	5200 2600 4950 2600
+	5850 2550 5600 2550
 Wire Wire Line
-	7550 1900 7650 1900
+	8200 1650 8300 1650
 $Comp
 L Custom_Parts:TUSB320 U1
 U 1 1 5B5B1CD3
-P 3600 3150
-F 0 "U1" H 3600 3647 60  0000 C CNN
-F 1 "TUSB320" H 3600 3541 60  0000 C CNN
-F 2 "Custom Parts:X2QFN-12_1.6x1.6mm_Pitch0.4mm" H 3950 3150 60  0001 C CNN
-F 3 "" H 3950 3150 60  0001 C CNN
-	1    3600 3150
+P 4250 3100
+F 0 "U1" H 4250 3597 60  0000 C CNN
+F 1 "TUSB320" H 4250 3491 60  0000 C CNN
+F 2 "Custom Parts:X2QFN-12_1.6x1.6mm_Pitch0.4mm" H 4600 3100 60  0001 C CNN
+F 3 "" H 4600 3100 60  0001 C CNN
+	1    4250 3100
 	1    0    0    -1  
 $EndComp
 $Comp
 L Custom_Parts:STM32L432K U2
 U 1 1 5B622DF7
-P 8050 4650
-F 0 "U2" H 8050 5647 60  0000 C CNN
-F 1 "STM32L432K" H 8050 5541 60  0000 C CNN
-F 2 "Housings_DFN_QFN:QFN-32-1EP_5x5mm_Pitch0.5mm" H 8050 5100 60  0001 C CNN
-F 3 "" H 8050 5100 60  0001 C CNN
-	1    8050 4650
+P 8700 4700
+F 0 "U2" H 8700 5697 60  0000 C CNN
+F 1 "STM32L432K" H 8700 5591 60  0000 C CNN
+F 2 "Housings_DFN_QFN:QFN-32-1EP_5x5mm_Pitch0.5mm" H 8700 5150 60  0001 C CNN
+F 3 "" H 8700 5150 60  0001 C CNN
+	1    8700 4700
 	1    0    0    -1  
 $EndComp
 $Comp
 L Connector:Conn_01x01_Female J5
 U 1 1 5B649686
-P 9150 5300
-F 0 "J5" H 9177 5326 50  0000 L CNN
-F 1 "MCO" H 9177 5235 50  0000 L CNN
-F 2 "Pin_Headers:Pin_Header_Straight_1x01_Pitch2.54mm" H 9150 5300 50  0001 C CNN
-F 3 "~" H 9150 5300 50  0001 C CNN
-	1    9150 5300
+P 9800 5350
+F 0 "J5" H 9827 5376 50  0000 L CNN
+F 1 "MCO" H 9827 5285 50  0000 L CNN
+F 2 "Pin_Headers:Pin_Header_Straight_1x01_Pitch2.54mm" H 9800 5350 50  0001 C CNN
+F 3 "~" H 9800 5350 50  0001 C CNN
+	1    9800 5350
 	1    0    0    -1  
 $EndComp
 $Comp
 L Switch:SW_Push SW1
 U 1 1 5B64A44F
-P 6950 4200
-F 0 "SW1" H 6950 4485 50  0000 C CNN
-F 1 "SW_Push" H 6950 4394 50  0000 C CNN
-F 2 "Buttons_Switches_SMD:SW_SPST_EVQP7A" H 6950 4400 50  0001 C CNN
-F 3 "" H 6950 4400 50  0001 C CNN
-	1    6950 4200
+P 7600 4250
+F 0 "SW1" H 7600 4535 50  0000 C CNN
+F 1 "SW_Push" H 7600 4444 50  0000 C CNN
+F 2 "Buttons_Switches_SMD:SW_SPST_EVQP7A" H 7600 4450 50  0001 C CNN
+F 3 "" H 7600 4450 50  0001 C CNN
+	1    7600 4250
 	1    0    0    -1  
 $EndComp
 $Comp
 L Connector_Generic:Conn_02x03_Odd_Even J2
 U 1 1 5B693D84
-P 2450 4500
-F 0 "J2" H 2500 4817 50  0000 C CNN
-F 1 "Tag Connect" H 2500 4726 50  0000 C CNN
-F 2 "Tag Connect:TC2030-MCP-NL" H 2450 4500 50  0001 C CNN
-F 3 "~" H 2450 4500 50  0001 C CNN
-	1    2450 4500
+P 3500 4400
+F 0 "J2" H 3550 4717 50  0000 C CNN
+F 1 "Tag Connect" H 3550 4626 50  0000 C CNN
+F 2 "Tag Connect:TC2030-MCP-NL" H 3500 4400 50  0001 C CNN
+F 3 "~" H 3500 4400 50  0001 C CNN
+	1    3500 4400
 	1    0    0    -1  
 $EndComp
 $Comp
 L Connector_Generic:Conn_02x03_Odd_Even J3
 U 1 1 5B6941D3
-P 2450 5150
-F 0 "J3" H 2500 5467 50  0000 C CNN
-F 1 "Nixie_HV" H 2500 5376 50  0000 C CNN
-F 2 "Custom Parts:Pin_Header_Harwin_2x03_Pitch2.00mm" H 2450 5150 50  0001 C CNN
-F 3 "~" H 2450 5150 50  0001 C CNN
-	1    2450 5150
+P 3500 5050
+F 0 "J3" H 3550 5367 50  0000 C CNN
+F 1 "Nixie_HV" H 3550 5276 50  0000 C CNN
+F 2 "Custom Parts:Pin_Header_Harwin_2x03_Pitch2.00mm" H 3500 5050 50  0001 C CNN
+F 3 "~" H 3500 5050 50  0001 C CNN
+	1    3500 5050
 	1    0    0    -1  
 $EndComp
 $Comp
 L Connector_Generic:Conn_02x03_Odd_Even J4
 U 1 1 5B694500
-P 2450 5800
-F 0 "J4" H 2500 6117 50  0000 C CNN
-F 1 "Nixie_CTRL" H 2500 6026 50  0000 C CNN
-F 2 "Custom Parts:Pin_Header_Harwin_2x03_Pitch2.00mm" H 2450 5800 50  0001 C CNN
-F 3 "~" H 2450 5800 50  0001 C CNN
-	1    2450 5800
+P 3500 5700
+F 0 "J4" H 3550 6017 50  0000 C CNN
+F 1 "Nixie_CTRL" H 3550 5926 50  0000 C CNN
+F 2 "Custom Parts:Pin_Header_Harwin_2x03_Pitch2.00mm" H 3500 5700 50  0001 C CNN
+F 3 "~" H 3500 5700 50  0001 C CNN
+	1    3500 5700
 	1    0    0    -1  
 $EndComp
 $Comp
 L Custom_Parts:ESD122 D2
 U 1 1 5B916041
-P 3600 1600
-F 0 "D2" H 3600 1965 50  0000 C CNN
-F 1 "ESD122" H 3600 1874 50  0000 C CNN
-F 2 "Custom Parts:DMX0003A" H 3600 1600 50  0001 C CNN
-F 3 "" H 3600 1600 50  0001 C CNN
-	1    3600 1600
+P 4250 1550
+F 0 "D2" H 4250 1915 50  0000 C CNN
+F 1 "ESD122" H 4250 1824 50  0000 C CNN
+F 2 "Custom Parts:DMX0003A" H 4250 1550 50  0001 C CNN
+F 3 "" H 4250 1550 50  0001 C CNN
+	1    4250 1550
 	1    0    0    -1  
 $EndComp
-Text Label 3050 3000 2    60   ~ 0
+Text Label 3700 2950 2    60   ~ 0
 CC1
-Text Label 3050 2900 2    60   ~ 0
+Text Label 3700 2850 2    60   ~ 0
 CC2
-Text Label 3250 1700 2    60   ~ 0
+Text Label 3900 1650 2    60   ~ 0
 CC2
-Text Label 3250 1500 2    60   ~ 0
+Text Label 3900 1450 2    60   ~ 0
 CC1
 Wire Wire Line
-	7550 1800 7650 1800
+	8200 1550 8300 1550
 $Comp
 L Custom_Parts:ESD122 D3
 U 1 1 5BA1CDBE
-P 3600 2300
-F 0 "D3" H 3600 2665 50  0000 C CNN
-F 1 "ESD122" H 3600 2574 50  0000 C CNN
-F 2 "Custom Parts:DMX0003A" H 3600 2300 50  0001 C CNN
-F 3 "" H 3600 2300 50  0001 C CNN
-	1    3600 2300
+P 4250 2250
+F 0 "D3" H 4250 2615 50  0000 C CNN
+F 1 "ESD122" H 4250 2524 50  0000 C CNN
+F 2 "Custom Parts:DMX0003A" H 4250 2250 50  0001 C CNN
+F 3 "" H 4250 2250 50  0001 C CNN
+	1    4250 2250
 	1    0    0    -1  
 $EndComp
-Text Label 3250 2400 2    60   ~ 0
+Text Label 3900 2350 2    60   ~ 0
 USB_N
-Text Label 3250 2200 2    60   ~ 0
+Text Label 3900 2150 2    60   ~ 0
 USB_P
 $Comp
 L Device:D D1
 U 1 1 5B902F50
-P 5900 4000
-F 0 "D1" H 5900 4216 50  0000 C CNN
-F 1 "D" H 5900 4125 50  0000 C CNN
-F 2 "Custom Parts:X1SON" H 5900 4000 50  0001 C CNN
-F 3 "~" H 5900 4000 50  0001 C CNN
-	1    5900 4000
+P 5000 4900
+F 0 "D1" H 5000 5116 50  0000 C CNN
+F 1 "D_VBUS" H 5000 5025 50  0000 C CNN
+F 2 "Custom Parts:X1SON" H 5000 4900 50  0001 C CNN
+F 3 "~" H 5000 4900 50  0001 C CNN
+	1    5000 4900
 	1    0    0    -1  
 $EndComp
-Text Label 5750 4000 2    60   ~ 0
+Text Label 4850 4900 2    60   ~ 0
 VBUS
 $Comp
 L Device:Battery_Cell BT1
 U 1 1 5BA7F4A1
-P 4350 4200
-F 0 "BT1" H 4468 4296 50  0000 L CNN
-F 1 "CR1620" H 4468 4205 50  0000 L CNN
-F 2 "Custom Parts:CR1220_Holder" V 4350 4260 50  0001 C CNN
-F 3 "~" V 4350 4260 50  0001 C CNN
-	1    4350 4200
+P 5050 4100
+F 0 "BT1" H 5168 4196 50  0000 L CNN
+F 1 "CR1620" H 5168 4105 50  0000 L CNN
+F 2 "Custom Parts:CR1220_Holder" V 5050 4160 50  0001 C CNN
+F 3 "~" V 5050 4160 50  0001 C CNN
+	1    5050 4100
 	0    -1   -1   0   
 $EndComp
 $Comp
 L Custom_Parts:DS3231 U4
 U 1 1 5BAADC28
-P 8000 2950
-F 0 "U4" H 8000 3525 50  0000 C CNN
-F 1 "DS3231" H 8000 3434 50  0000 C CNN
-F 2 "SMD_Packages:SO-16-L" H 8000 2950 50  0001 C CNN
-F 3 "" H 8000 2950 50  0001 C CNN
-	1    8000 2950
+P 8650 2700
+F 0 "U4" H 8650 3275 50  0000 C CNN
+F 1 "DS3231" H 8650 3184 50  0000 C CNN
+F 2 "SMD_Packages:SO-16-L" H 8650 2700 50  0001 C CNN
+F 3 "" H 8650 2700 50  0001 C CNN
+	1    8650 2700
 	1    0    0    -1  
 $EndComp
-Text Label 8450 2700 0    60   ~ 0
+Text Label 9100 2450 0    60   ~ 0
 SDA
-Text Label 8450 2600 0    60   ~ 0
+Text Label 9100 2350 0    60   ~ 0
 SCL
-Text Label 7550 2700 2    60   ~ 0
+Text Label 8200 2450 2    60   ~ 0
 VDD
-Text Label 6100 3200 0    60   ~ 0
+Text Label 6750 3150 0    60   ~ 0
 VBUS
-Text Label 7550 1800 2    60   ~ 0
+Text Label 8200 1550 2    60   ~ 0
 HV_IN
 $Comp
 L Custom_Parts:TPS2595x0 U7
 U 1 1 5BA21006
-P 5650 2000
-F 0 "U7" H 5650 2375 50  0000 C CNN
-F 1 "TPS2595x0" H 5650 2284 50  0000 C CNN
-F 2 "Housings_SON:WSON-8_1EP_2x2mm_Pitch0.5mm" H 5650 2000 50  0001 C CNN
-F 3 "" H 5650 2000 50  0001 C CNN
-	1    5650 2000
+P 6300 1950
+F 0 "U7" H 6300 2325 50  0000 C CNN
+F 1 "TPS2595x0" H 6300 2234 50  0000 C CNN
+F 2 "Housings_SON:WSON-8_1EP_2x2mm_Pitch0.5mm" H 6300 1950 50  0001 C CNN
+F 3 "" H 6300 1950 50  0001 C CNN
+	1    6300 1950
 	1    0    0    -1  
 $EndComp
-NoConn ~ 3150 3300
-NoConn ~ 4050 3200
-Text Label 6100 2150 0    60   ~ 0
+NoConn ~ 3800 3250
+NoConn ~ 4700 3150
+Text Label 6750 2100 0    60   ~ 0
 HV_IN
 $Comp
 L Device:R R14
 U 1 1 5BA6BB6E
-P 6550 1950
-F 0 "R14" V 6630 1950 50  0000 C CNN
-F 1 "680" V 6450 1950 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603" V 6480 1950 50  0001 C CNN
-F 3 "" H 6550 1950 50  0001 C CNN
-	1    6550 1950
+P 7200 1900
+F 0 "R14" V 7280 1900 50  0000 C CNN
+F 1 "680" V 7100 1900 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603" V 7130 1900 50  0001 C CNN
+F 3 "" H 7200 1900 50  0001 C CNN
+	1    7200 1900
 	0    -1   -1   0   
 $EndComp
 Wire Wire Line
-	6400 1950 6100 1950
-Text Label 6100 2050 0    60   ~ 0
+	7050 1900 6750 1900
+Text Label 6750 2000 0    60   ~ 0
 FAULT
-Text Label 7350 4600 2    60   ~ 0
+Text Label 8000 4650 2    60   ~ 0
 FAULT
-Text Label 7550 2800 2    60   ~ 0
+Text Label 8200 2550 2    60   ~ 0
 RTC
-Text Label 7350 4700 2    60   ~ 0
+Text Label 8000 4750 2    60   ~ 0
 RTC
 $Comp
 L Device:R R13
 U 1 1 5BA75FF1
-P 4800 2100
-F 0 "R13" V 4880 2100 50  0000 C CNN
-F 1 "2M" V 4700 2100 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603" V 4730 2100 50  0001 C CNN
-F 3 "" H 4800 2100 50  0001 C CNN
-	1    4800 2100
+P 5450 2050
+F 0 "R13" V 5530 2050 50  0000 C CNN
+F 1 "2M" V 5350 2050 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603" V 5380 2050 50  0001 C CNN
+F 3 "" H 5450 2050 50  0001 C CNN
+	1    5450 2050
 	-1   0    0    1   
 $EndComp
 $Comp
 L Device:R R12
 U 1 1 5BA760F4
-P 4800 1800
-F 0 "R12" V 4880 1800 50  0000 C CNN
-F 1 "500k" V 4700 1800 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603" V 4730 1800 50  0001 C CNN
-F 3 "" H 4800 1800 50  0001 C CNN
-	1    4800 1800
+P 5450 1750
+F 0 "R12" V 5530 1750 50  0000 C CNN
+F 1 "500k" V 5350 1750 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603" V 5380 1750 50  0001 C CNN
+F 3 "" H 5450 1750 50  0001 C CNN
+	1    5450 1750
 	-1   0    0    1   
 $EndComp
-Text Label 7550 2600 2    60   ~ 0
+Text Label 8200 2350 2    60   ~ 0
 32kHz
-Text Label 7350 4000 2    60   ~ 0
+Text Label 8000 4050 2    60   ~ 0
 32kHz
-Text Label 3150 3400 2    60   ~ 0
+Text Label 3800 3350 2    60   ~ 0
 USB
 Wire Wire Line
-	9150 4000 9200 4000
+	9800 4050 9850 4050
 Wire Wire Line
-	8950 5300 8750 5300
-Text Label 7350 4200 2    60   ~ 0
+	9600 5350 9400 5350
+Text Label 8000 4250 2    60   ~ 0
 NRST
 Wire Wire Line
-	7150 4200 7350 4200
-Text Label 1950 2350 0    60   ~ 0
+	7800 4250 8000 4250
+Text Label 2600 2600 0    60   ~ 0
 GND
-Text Label 3950 1600 0    60   ~ 0
+Text Label 4600 1550 0    60   ~ 0
 GND
-Text Label 3950 2300 0    60   ~ 0
+Text Label 4600 2250 0    60   ~ 0
 GND
-Text Label 6050 4000 0    60   ~ 0
+Text Label 5150 4900 0    60   ~ 0
 GND
-Text Label 4050 3000 0    60   ~ 0
+Text Label 4700 2950 0    60   ~ 0
 GND
-Text Label 4050 3100 0    60   ~ 0
+Text Label 4700 3050 0    60   ~ 0
 GND
-Text Label 4850 2300 0    60   ~ 0
+Text Label 5500 2250 0    60   ~ 0
 GND
-Text Label 6100 1850 0    60   ~ 0
+Text Label 6750 1800 0    60   ~ 0
 GND
-Text Label 6700 1950 0    60   ~ 0
+Text Label 7350 1900 0    60   ~ 0
 GND
-Text Label 7550 2000 2    60   ~ 0
+Text Label 8200 1750 2    60   ~ 0
 GND
-Text Label 8400 1900 0    60   ~ 0
+Text Label 9050 1650 0    60   ~ 0
 GND
-Text Label 3900 4800 2    60   ~ 0
+Text Label 6150 6000 2    60   ~ 0
 GND
-Text Label 6100 3000 0    60   ~ 0
+Text Label 6750 2950 0    60   ~ 0
 GND
-Text Label 5200 2700 2    60   ~ 0
+Text Label 5850 2650 2    60   ~ 0
 GND
 Wire Wire Line
-	4950 2800 5200 2800
-Text Label 8750 3900 0    60   ~ 0
+	5600 2750 5850 2750
+Text Label 9400 3950 0    60   ~ 0
 GND
-Text Label 9200 4000 0    60   ~ 0
+Text Label 9850 4050 0    60   ~ 0
 GND
-Text Label 7350 5400 2    60   ~ 0
+Text Label 8000 5450 2    60   ~ 0
 GND
-Text Label 2250 4600 2    60   ~ 0
+Text Label 3300 4500 2    60   ~ 0
 GND
-Text Label 2750 5150 0    60   ~ 0
+Text Label 3800 5050 0    60   ~ 0
 HV_OUT
-Text Label 2750 5250 0    60   ~ 0
+Text Label 3800 5150 0    60   ~ 0
 HV_OUT
-Text Label 2250 5050 2    60   ~ 0
+Text Label 3300 4950 2    60   ~ 0
 GND
-Text Label 2250 5150 2    60   ~ 0
+Text Label 3300 5050 2    60   ~ 0
 GND
-Text Label 2250 5250 2    60   ~ 0
+Text Label 3300 5150 2    60   ~ 0
 GND
-Text Label 2250 5700 2    60   ~ 0
+Text Label 3300 5600 2    60   ~ 0
 GND
-Text Label 2750 5800 0    60   ~ 0
+Text Label 3800 5700 0    60   ~ 0
 GND
-Text Label 2750 5900 0    60   ~ 0
+Text Label 3800 5800 0    60   ~ 0
 GND
-Text Label 1950 2450 0    60   ~ 0
+Text Label 2600 2700 0    60   ~ 0
 GND
-Text Label 1950 2650 0    60   ~ 0
+Text Label 2600 2900 0    60   ~ 0
 GND
-Text Label 1950 2750 0    60   ~ 0
+Text Label 2600 3000 0    60   ~ 0
 GND
-Text Label 1950 2950 0    60   ~ 0
+Text Label 2600 3200 0    60   ~ 0
 GND
-Text Label 1950 3050 0    60   ~ 0
+Text Label 2600 3300 0    60   ~ 0
 GND
-Text Label 1950 3250 0    60   ~ 0
+Text Label 2600 3500 0    60   ~ 0
 GND
-Text Label 1950 3350 0    60   ~ 0
+Text Label 2600 3600 0    60   ~ 0
 GND
-Text Label 1950 3550 0    60   ~ 0
+Text Label 2600 3800 0    60   ~ 0
 GND
-Text Label 1950 3650 0    60   ~ 0
+Text Label 2600 3900 0    60   ~ 0
 GND
-Text Label 1450 3950 3    60   ~ 0
+Text Label 2100 4200 3    60   ~ 0
 GND
-Text Label 1350 3950 3    60   ~ 0
+Text Label 2000 4200 3    60   ~ 0
 GND
-Text Label 1250 3950 3    60   ~ 0
+Text Label 1900 4200 3    60   ~ 0
 GND
-Text Label 1150 3950 3    60   ~ 0
+Text Label 1800 4200 3    60   ~ 0
 GND
-Text Label 1050 3950 3    60   ~ 0
+Text Label 1700 4200 3    60   ~ 0
 GND
-Text Label 1950 1950 0    60   ~ 0
+Text Label 2600 2200 0    60   ~ 0
 USB_N
-Text Label 1950 2050 0    60   ~ 0
+Text Label 2600 2300 0    60   ~ 0
 USB_P
 $Comp
 L Connector:USB_C_Receptacle J1
 U 1 1 5B6238BC
-P 1350 2350
-F 0 "J1" H 1455 3917 50  0000 C CNN
-F 1 "USB_C_Receptacle" H 1455 3826 50  0000 C CNN
-F 2 "Custom Parts:USB_C_Receptacle" H 1500 2350 50  0001 C CNN
-F 3 "http://www.usb.org/developers/docs/usb_31_033017.zip" H 1500 2350 50  0001 C CNN
-	1    1350 2350
+P 2000 2600
+F 0 "J1" H 2105 4167 50  0000 C CNN
+F 1 "USB_C_Receptacle" H 2105 4076 50  0000 C CNN
+F 2 "Custom Parts:USB_C_Receptacle" H 2150 2600 50  0001 C CNN
+F 3 "http://www.usb.org/developers/docs/usb_31_033017.zip" H 2150 2600 50  0001 C CNN
+	1    2000 2600
 	1    0    0    -1  
 $EndComp
-Text Label 1950 1150 0    60   ~ 0
+Text Label 2600 1400 0    60   ~ 0
 VBUS
-Text Label 1950 1250 0    60   ~ 0
+Text Label 2600 1500 0    60   ~ 0
 VBUS
-Text Label 1950 1350 0    60   ~ 0
+Text Label 2600 1600 0    60   ~ 0
 VBUS
-Text Label 5200 3200 2    60   ~ 0
+Text Label 5850 3150 2    60   ~ 0
 VBUS
-Text Label 5200 3100 2    60   ~ 0
+Text Label 5850 3050 2    60   ~ 0
 VBUS
-Text Label 5200 3000 2    60   ~ 0
+Text Label 5850 2950 2    60   ~ 0
 VBUS
-Text Label 5200 2900 2    60   ~ 0
+Text Label 5850 2850 2    60   ~ 0
 VBUS
 $Comp
 L Custom_Parts:TPS63025X U3
 U 1 1 5B1672A1
-P 5650 2800
-F 0 "U3" H 5650 3200 60  0000 C CNN
-F 1 "TPS63025X" H 5650 3100 60  0000 C CNN
-F 2 "Custom Parts:VQFN-14_2.5x3mm_Pitch0.5mm" H 5650 2800 60  0001 C CNN
-F 3 "" H 5650 2800 60  0001 C CNN
-	1    5650 2800
+P 6300 2750
+F 0 "U3" H 6300 3150 60  0000 C CNN
+F 1 "TPS63025X" H 6300 3050 60  0000 C CNN
+F 2 "Custom Parts:VQFN-14_2.5x3mm_Pitch0.5mm" H 6300 2750 60  0001 C CNN
+F 3 "" H 6300 2750 60  0001 C CNN
+	1    6300 2750
 	1    0    0    -1  
 $EndComp
-Text Label 6100 2700 0    60   ~ 0
+Text Label 6750 2650 0    60   ~ 0
 VDD
-Text Label 6100 2800 0    60   ~ 0
+Text Label 6750 2750 0    60   ~ 0
 VDD
-Text Label 6100 2900 0    60   ~ 0
+Text Label 6750 2850 0    60   ~ 0
 VDD
-Text Label 6100 3100 0    60   ~ 0
+Text Label 6750 3050 0    60   ~ 0
 GND
-Text Label 5200 2050 2    60   ~ 0
+Text Label 5850 2000 2    60   ~ 0
 VBUS
-Text Label 5200 2150 2    60   ~ 0
+Text Label 5850 2100 2    60   ~ 0
 VBUS
-NoConn ~ 7550 3000
-NoConn ~ 7550 3100
-NoConn ~ 7550 3200
-NoConn ~ 7550 3300
-NoConn ~ 8450 3300
-NoConn ~ 8450 3200
-NoConn ~ 8450 3100
-NoConn ~ 8450 3000
-NoConn ~ 5200 1850
+NoConn ~ 8200 2750
+NoConn ~ 8200 2850
+NoConn ~ 8200 2950
+NoConn ~ 8200 3050
+NoConn ~ 9100 3050
+NoConn ~ 9100 2950
+NoConn ~ 9100 2850
+NoConn ~ 9100 2750
+NoConn ~ 5850 1800
 $Comp
 L Device:R R15
 U 1 1 5BB93CD7
-P 5900 4550
-F 0 "R15" V 5980 4550 50  0000 C CNN
-F 1 "10k" V 5800 4550 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603" V 5830 4550 50  0001 C CNN
-F 3 "" H 5900 4550 50  0001 C CNN
-	1    5900 4550
+P 5000 5450
+F 0 "R15" V 5080 5450 50  0000 C CNN
+F 1 "10k" V 4900 5450 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603" V 4930 5450 50  0001 C CNN
+F 3 "" H 5000 5450 50  0001 C CNN
+	1    5000 5450
 	0    -1   -1   0   
 $EndComp
-Text Label 6050 4550 0    60   ~ 0
+Text Label 5150 5450 0    60   ~ 0
 FAULT
-Text Label 5750 4550 2    60   ~ 0
+Text Label 4850 5450 2    60   ~ 0
 VDD
-Text Label 6100 1950 0    60   ~ 0
+Text Label 6750 1900 0    60   ~ 0
 ILM
-Text Label 7350 4500 2    60   ~ 0
+Text Label 8000 4550 2    60   ~ 0
 ILM
-Text Label 4800 1650 0    60   ~ 0
+Text Label 5450 1600 0    60   ~ 0
 VBUS
 Wire Wire Line
-	5200 1950 4800 1950
-Connection ~ 4800 1950
+	5850 1900 5450 1900
+Connection ~ 5450 1900
 Wire Wire Line
-	4850 2300 4800 2300
+	5500 2250 5450 2250
 Wire Wire Line
-	4800 2300 4800 2250
-Text Label 7350 4400 2    60   ~ 0
+	5450 2250 5450 2200
+Text Label 8000 4450 2    60   ~ 0
 USB
 $Comp
 L Device:R R3
 U 1 1 5BB9C8D3
-P 5900 4250
-F 0 "R3" V 5980 4250 50  0000 C CNN
-F 1 "10k" V 5800 4250 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603" V 5830 4250 50  0001 C CNN
-F 3 "" H 5900 4250 50  0001 C CNN
-	1    5900 4250
+P 5000 5150
+F 0 "R3" V 5080 5150 50  0000 C CNN
+F 1 "10k" V 4900 5150 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603" V 4930 5150 50  0001 C CNN
+F 3 "" H 5000 5150 50  0001 C CNN
+	1    5000 5150
 	0    -1   -1   0   
 $EndComp
-Text Label 6050 4250 0    60   ~ 0
+Text Label 5150 5150 0    60   ~ 0
 USB
-Text Label 5750 4250 2    60   ~ 0
+Text Label 4850 5150 2    60   ~ 0
 VDD
-Text Label 6750 4200 2    60   ~ 0
+Text Label 7400 4250 2    60   ~ 0
 GND
 Wire Wire Line
-	3000 3200 3150 3200
+	3650 3150 3800 3150
 $Comp
-L Device:C C14
+L Device:C C8
 U 1 1 5BB9F4F9
-P 5400 5850
-F 0 "C14" H 5285 5804 50  0000 R CNN
-F 1 "0.1uF" H 5285 5895 50  0000 R CNN
-F 2 "Capacitors_SMD:C_0603" H 5438 5700 50  0001 C CNN
-F 3 "~" H 5400 5850 50  0001 C CNN
-	1    5400 5850
+P 6300 4950
+F 0 "C8" H 6185 4904 50  0000 R CNN
+F 1 "0.1uF" H 6185 4995 50  0000 R CNN
+F 2 "Capacitors_SMD:C_0603" H 6338 4800 50  0001 C CNN
+F 3 "~" H 6300 4950 50  0001 C CNN
+	1    6300 4950
 	-1   0    0    1   
 $EndComp
-Text Label 5450 5700 0    60   ~ 0
+Text Label 5950 4650 0    60   ~ 0
 VBUS
-Text Label 5450 6150 0    60   ~ 0
+Text Label 5950 5250 0    60   ~ 0
 GND
 $Comp
-L Device:C C15
+L Device:C C9
 U 1 1 5BBA0E2E
-P 5800 6000
-F 0 "C15" H 5685 5954 50  0000 R CNN
-F 1 "0.1uF" H 5685 6045 50  0000 R CNN
-F 2 "Capacitors_SMD:C_0603" H 5838 5850 50  0001 C CNN
-F 3 "~" H 5800 6000 50  0001 C CNN
-	1    5800 6000
+P 6700 5100
+F 0 "C9" H 6585 5054 50  0000 R CNN
+F 1 "0.1uF" H 6585 5145 50  0000 R CNN
+F 2 "Capacitors_SMD:C_0603" H 6738 4950 50  0001 C CNN
+F 3 "~" H 6700 5100 50  0001 C CNN
+	1    6700 5100
 	-1   0    0    1   
 $EndComp
-Text Label 3850 5400 0    60   ~ 0
+Text Label 5950 3750 0    60   ~ 0
 VDD
-Text Label 3850 6150 0    60   ~ 0
+Text Label 5950 4350 0    60   ~ 0
 GND
-Text Label 8450 2800 0    60   ~ 0
+Text Label 9100 2550 0    60   ~ 0
 VBAT
-Text Label 8450 2900 0    60   ~ 0
+Text Label 9100 2650 0    60   ~ 0
 GND
-Text Label 4150 4200 2    60   ~ 0
+Text Label 4850 4100 2    60   ~ 0
 VBAT
-Text Label 4450 4200 0    60   ~ 0
+Text Label 5150 4100 0    60   ~ 0
 GND
 $Comp
-L Device:C C1
-U 1 1 5BBA4F5D
-P 3800 5550
-F 0 "C1" H 3685 5504 50  0000 R CNN
-F 1 "10uF" H 3685 5595 50  0000 R CNN
-F 2 "Capacitors_SMD:C_0805" H 3838 5400 50  0001 C CNN
-F 3 "~" H 3800 5550 50  0001 C CNN
-	1    3800 5550
-	-1   0    0    1   
-$EndComp
-$Comp
 L Device:C C2
 U 1 1 5BBA5067
-P 4150 5700
-F 0 "C2" H 4035 5654 50  0000 R CNN
-F 1 "10uF" H 4035 5745 50  0000 R CNN
-F 2 "Capacitors_SMD:C_0805" H 4188 5550 50  0001 C CNN
-F 3 "~" H 4150 5700 50  0001 C CNN
-	1    4150 5700
+P 5900 3900
+F 0 "C2" H 5785 3854 50  0000 R CNN
+F 1 "330uF" H 5785 3945 50  0000 R CNN
+F 2 "Capacitors_SMD:CP_Elec_6.3x4.5" H 5938 3750 50  0001 C CNN
+F 3 "~" H 5900 3900 50  0001 C CNN
+	1    5900 3900
 	-1   0    0    1   
 $EndComp
 $Comp
 L Device:C C3
 U 1 1 5BBA50C7
-P 4500 5850
-F 0 "C3" H 4385 5804 50  0000 R CNN
-F 1 "1uF" H 4385 5895 50  0000 R CNN
-F 2 "Capacitors_SMD:C_0603" H 4538 5700 50  0001 C CNN
-F 3 "~" H 4500 5850 50  0001 C CNN
-	1    4500 5850
+P 6300 4050
+F 0 "C3" H 6185 4004 50  0000 R CNN
+F 1 "1uF" H 6185 4095 50  0000 R CNN
+F 2 "Capacitors_SMD:C_0603" H 6338 3900 50  0001 C CNN
+F 3 "~" H 6300 4050 50  0001 C CNN
+	1    6300 4050
 	-1   0    0    1   
 $EndComp
 $Comp
 L Device:C C13
 U 1 1 5BBA51A2
-P 4850 6000
-F 0 "C13" H 4735 5954 50  0000 R CNN
-F 1 "0.1uF" H 4735 6045 50  0000 R CNN
-F 2 "Capacitors_SMD:C_0603" H 4888 5850 50  0001 C CNN
-F 3 "~" H 4850 6000 50  0001 C CNN
-	1    4850 6000
+P 6700 4200
+F 0 "C13" H 6585 4154 50  0000 R CNN
+F 1 "0.1uF" H 6585 4245 50  0000 R CNN
+F 2 "Capacitors_SMD:C_0603" H 6738 4050 50  0001 C CNN
+F 3 "~" H 6700 4200 50  0001 C CNN
+	1    6700 4200
 	-1   0    0    1   
 $EndComp
 Wire Wire Line
-	3800 5400 4150 5400
+	5900 3750 6300 3750
 Wire Wire Line
-	4150 5400 4150 5550
+	6300 3750 6300 3900
 Wire Wire Line
-	4150 5400 4500 5400
+	6300 3750 6700 3750
 Wire Wire Line
-	4500 5400 4500 5700
-Connection ~ 4150 5400
+	6700 3750 6700 4050
+Connection ~ 6300 3750
 Wire Wire Line
-	4500 5400 4850 5400
+	6700 4350 6300 4350
 Wire Wire Line
-	4850 5400 4850 5850
-Connection ~ 4500 5400
+	6300 4350 6300 4200
 Wire Wire Line
-	4850 6150 4500 6150
+	6300 4350 5900 4350
 Wire Wire Line
-	4500 6150 4500 6000
+	5900 4350 5900 4050
+Connection ~ 6300 4350
 Wire Wire Line
-	4500 6150 4150 6150
+	6700 5250 6300 5250
 Wire Wire Line
-	4150 6150 4150 5850
-Connection ~ 4500 6150
+	6300 5250 6300 5100
+$Comp
+L Custom_Parts:AD8591 U5
+U 1 1 5BBE6227
+P 6550 6000
+F 0 "U5" H 6550 6325 50  0000 C CNN
+F 1 "AD8591" H 6550 6234 50  0000 C CNN
+F 2 "TO_SOT_Packages_SMD:SOT-23-6" H 6550 6000 50  0001 C CNN
+F 3 "" H 6550 6000 50  0001 C CNN
+	1    6550 6000
+	1    0    0    -1  
+$EndComp
+Text Label 6950 6000 0    60   ~ 0
+EN_NIXIE
+$Comp
+L Device:C C1
+U 1 1 5BA4D5A1
+P 5900 4800
+F 0 "C1" H 5785 4754 50  0000 R CNN
+F 1 "330uF" H 5785 4845 50  0000 R CNN
+F 2 "Capacitors_SMD:CP_Elec_6.3x4.5" H 5938 4650 50  0001 C CNN
+F 3 "~" H 5900 4800 50  0001 C CNN
+	1    5900 4800
+	-1   0    0    1   
+$EndComp
 Wire Wire Line
-	3800 5700 3800 6150
+	6300 4650 6700 4650
 Wire Wire Line
-	3800 6150 4150 6150
-Connection ~ 4150 6150
+	6700 4650 6700 4950
 Wire Wire Line
-	5400 5700 5800 5700
+	5900 4950 5900 5250
 Wire Wire Line
-	5800 5700 5800 5850
+	5900 5250 6300 5250
+Connection ~ 6300 5250
 Wire Wire Line
-	5800 6150 5400 6150
+	5900 4650 6300 4650
+Connection ~ 6300 4650
 Wire Wire Line
-	5400 6150 5400 6000
+	6300 4650 6300 4800
 $Comp
-L Custom_Parts:AD8591 U5
-U 1 1 5BBE6227
-P 4300 4800
-F 0 "U5" H 4300 5125 50  0000 C CNN
-F 1 "AD8591" H 4300 5034 50  0000 C CNN
-F 2 "TO_SOT_Packages_SMD:SOT-23-6" H 4300 4800 50  0001 C CNN
-F 3 "" H 4300 4800 50  0001 C CNN
-	1    4300 4800
+L Mechanical:MountingHole_Pad MH1
+U 1 1 5BA440F1
+P 1900 5000
+F 0 "MH1" V 1854 5150 50  0000 L CNN
+F 1 "MountingHole_Pad" V 1945 5150 50  0000 L CNN
+F 2 "Custom Parts:MountingHole_2.5mm_Pad_Via" H 1900 5000 50  0001 C CNN
+F 3 "~" H 1900 5000 50  0001 C CNN
+	1    1900 5000
+	0    1    1    0   
+$EndComp
+$Comp
+L Mechanical:MountingHole_Pad MH2
+U 1 1 5BA441AA
+P 1900 5200
+F 0 "MH2" V 1854 5350 50  0000 L CNN
+F 1 "MountingHole_Pad" V 1945 5350 50  0000 L CNN
+F 2 "Custom Parts:MountingHole_2.5mm_Pad_Via" H 1900 5200 50  0001 C CNN
+F 3 "~" H 1900 5200 50  0001 C CNN
+	1    1900 5200
+	0    1    1    0   
+$EndComp
+$Comp
+L Mechanical:MountingHole_Pad MH3
+U 1 1 5BA44208
+P 1900 5400
+F 0 "MH3" V 1854 5550 50  0000 L CNN
+F 1 "MountingHole_Pad" V 1945 5550 50  0000 L CNN
+F 2 "Custom Parts:MountingHole_2.5mm_Pad_Via" H 1900 5400 50  0001 C CNN
+F 3 "~" H 1900 5400 50  0001 C CNN
+	1    1900 5400
+	0    1    1    0   
+$EndComp
+$Comp
+L Mechanical:MountingHole_Pad MH4
+U 1 1 5BA44262
+P 1900 5600
+F 0 "MH4" V 1854 5750 50  0000 L CNN
+F 1 "MountingHole_Pad" V 1945 5750 50  0000 L CNN
+F 2 "Custom Parts:MountingHole_2.5mm_Pad_Via" H 1900 5600 50  0001 C CNN
+F 3 "~" H 1900 5600 50  0001 C CNN
+	1    1900 5600
+	0    1    1    0   
+$EndComp
+$Comp
+L Mechanical:MountingHole_Pad MH5
+U 1 1 5BA442D8
+P 1900 5800
+F 0 "MH5" V 1854 5950 50  0000 L CNN
+F 1 "MountingHole_Pad" V 1945 5950 50  0000 L CNN
+F 2 "Mounting_Holes:MountingHole_2.5mm_Pad_Via" H 1900 5800 50  0001 C CNN
+F 3 "~" H 1900 5800 50  0001 C CNN
+	1    1900 5800
+	0    1    1    0   
+$EndComp
+$Comp
+L Mechanical:MountingHole_Pad MH6
+U 1 1 5BA44348
+P 1900 6000
+F 0 "MH6" V 1854 6150 50  0000 L CNN
+F 1 "MountingHole_Pad" V 1945 6150 50  0000 L CNN
+F 2 "Mounting_Holes:MountingHole_2.5mm_Pad_Via" H 1900 6000 50  0001 C CNN
+F 3 "~" H 1900 6000 50  0001 C CNN
+	1    1900 6000
+	0    1    1    0   
+$EndComp
+Text Label 1800 5000 2    60   ~ 0
+GND
+Text Label 1800 5200 2    60   ~ 0
+GND
+Text Label 1800 5400 2    60   ~ 0
+GND
+Text Label 1800 5600 2    60   ~ 0
+GND
+Text Label 1800 5800 2    60   ~ 0
+GND
+Text Label 1800 6000 2    60   ~ 0
+GND
+$Comp
+L Device:D D5
+U 1 1 5BA928AB
+P 5000 4550
+F 0 "D5" H 5000 4766 50  0000 C CNN
+F 1 "D_LED" H 5000 4675 50  0000 C CNN
+F 2 "" H 5000 4550 50  0001 C CNN
+F 3 "~" H 5000 4550 50  0001 C CNN
+	1    5000 4550
 	1    0    0    -1  
 $EndComp
-Text Label 4700 4800 0    60   ~ 0
-EN_NIXIE
+Text Label 4850 4550 2    60   ~ 0
+GND
+Text Label 5150 4550 0    60   ~ 0
+LED
+Text Label 8000 5050 2    60   ~ 0
+LED
 $EndSCHEMATC

+ 4091 - 2733
Nixie_Bottom_Board/nixie_bottom_board.kicad_pcb

@@ -3,10 +3,10 @@
   (general
     (thickness 1.6)
     (drawings 12)
-    (tracks 84)
+    (tracks 54)
     (zones 0)
-    (modules 48)
-    (nets 41)
+    (modules 56)
+    (nets 68)
   )
 
   (page A4)
@@ -34,7 +34,7 @@
     (user_trace_width 0.8)
     (user_trace_width 1)
     (trace_clearance 0.127)
-    (zone_clearance 0.2)
+    (zone_clearance 0.15)
     (zone_45_only no)
     (trace_min 0.1)
     (segment_width 0.2)
@@ -53,8 +53,8 @@
     (mod_edge_width 0.15)
     (mod_text_size 1 1)
     (mod_text_width 0.15)
-    (pad_size 5 5)
-    (pad_drill 2.5)
+    (pad_size 2.5 2.5)
+    (pad_drill 0)
     (pad_to_mask_clearance 0)
     (aux_axis_origin 0 0)
     (visible_elements 7FF9FFFF)
@@ -89,45 +89,72 @@
 
   (net 0 "")
   (net 1 GNDREF)
-  (net 2 "Net-(C1-Pad2)")
-  (net 3 "Net-(C4-Pad1)")
-  (net 4 "Net-(J2-Pad1)")
-  (net 5 "Net-(Q1-Pad3)")
-  (net 6 "Net-(Q1-Pad2)")
-  (net 7 "Net-(R1-Pad2)")
-  (net 8 "Net-(R2-Pad1)")
-  (net 9 "Net-(R3-Pad2)")
-  (net 10 "Net-(R6-Pad2)")
-  (net 11 "Net-(Q1-Pad1)")
-  (net 12 "Net-(C5-Pad2)")
-  (net 13 "Net-(C7-Pad1)")
-  (net 14 "Net-(BT1-Pad1)")
-  (net 15 /HV_OUT)
-  (net 16 /VBUS)
-  (net 17 /VDD)
-  (net 18 /VNIXIE)
-  (net 19 /SCL)
-  (net 20 /SDA)
-  (net 21 /MCO)
-  (net 22 /HV_EN)
-  (net 23 "Net-(R8-Pad2)")
-  (net 24 "Net-(R10-Pad2)")
-  (net 25 /USB_INT)
-  (net 26 /SWO)
-  (net 27 /NRST)
-  (net 28 /CC1)
-  (net 29 /CC2)
-  (net 30 /DAC)
-  (net 31 /USB_N)
-  (net 32 /USB_P)
-  (net 33 "Net-(C6-Pad1)")
-  (net 34 "Net-(C9-Pad1)")
-  (net 35 "Net-(D4-Pad2)")
-  (net 36 /SWDIO)
-  (net 37 /SWCLK)
-  (net 38 "Net-(L1-Pad1)")
-  (net 39 "Net-(L1-Pad2)")
-  (net 40 "Net-(R7-Pad1)")
+  (net 2 "Net-(C4-Pad1)")
+  (net 3 "Net-(Q1-Pad3)")
+  (net 4 "Net-(Q1-Pad2)")
+  (net 5 "Net-(R1-Pad2)")
+  (net 6 "Net-(R2-Pad1)")
+  (net 7 "Net-(R6-Pad2)")
+  (net 8 "Net-(Q1-Pad1)")
+  (net 9 "Net-(C7-Pad1)")
+  (net 10 /HV_OUT)
+  (net 11 /VBUS)
+  (net 12 /VDD)
+  (net 13 /VNIXIE)
+  (net 14 /SCL)
+  (net 15 /SDA)
+  (net 16 /HV_EN)
+  (net 17 "Net-(R8-Pad2)")
+  (net 18 "Net-(R10-Pad2)")
+  (net 19 /SWO)
+  (net 20 /NRST)
+  (net 21 /CC1)
+  (net 22 /CC2)
+  (net 23 /DAC)
+  (net 24 /USB_N)
+  (net 25 /USB_P)
+  (net 26 "Net-(D4-Pad2)")
+  (net 27 /SWDIO)
+  (net 28 /SWCLK)
+  (net 29 "Net-(L1-Pad1)")
+  (net 30 "Net-(L1-Pad2)")
+  (net 31 "Net-(R7-Pad1)")
+  (net 32 /GND)
+  (net 33 /VBAT)
+  (net 34 /HV_IN)
+  (net 35 "Net-(J5-Pad1)")
+  (net 36 /USB)
+  (net 37 "Net-(R12-Pad1)")
+  (net 38 /ILM)
+  (net 39 /FAULT)
+  (net 40 "Net-(T1-Pad2)")
+  (net 41 "Net-(U1-Pad3)")
+  (net 42 "Net-(U1-Pad5)")
+  (net 43 "Net-(U1-Pad9)")
+  (net 44 "Net-(U2-Pad30)")
+  (net 45 "Net-(U2-Pad29)")
+  (net 46 "Net-(U2-Pad28)")
+  (net 47 "Net-(U2-Pad27)")
+  (net 48 "Net-(U2-Pad25)")
+  (net 49 "Net-(U2-Pad15)")
+  (net 50 "Net-(U2-Pad14)")
+  (net 51 "Net-(U2-Pad13)")
+  (net 52 /RTC)
+  (net 53 "Net-(U2-Pad3)")
+  (net 54 /32kHz)
+  (net 55 "Net-(U4-Pad12)")
+  (net 56 "Net-(U4-Pad11)")
+  (net 57 "Net-(U4-Pad10)")
+  (net 58 "Net-(U4-Pad9)")
+  (net 59 "Net-(U4-Pad8)")
+  (net 60 "Net-(U4-Pad7)")
+  (net 61 "Net-(U4-Pad6)")
+  (net 62 "Net-(U4-Pad5)")
+  (net 63 "Net-(U4-Pad4)")
+  (net 64 /EN_NIXIE)
+  (net 65 "Net-(U7-Pad1)")
+  (net 66 "Net-(C5-Pad1)")
+  (net 67 /LED)
 
   (net_class Default "This is the default net class."
     (clearance 0.127)
@@ -138,30 +165,38 @@
     (uvia_drill 0.1)
     (diff_pair_gap 0.127)
     (diff_pair_width 0.2)
+    (add_net /32kHz)
     (add_net /CC1)
     (add_net /CC2)
     (add_net /DAC)
+    (add_net /EN_NIXIE)
+    (add_net /FAULT)
+    (add_net /GND)
     (add_net /HV_EN)
+    (add_net /HV_IN)
     (add_net /HV_OUT)
-    (add_net /MCO)
+    (add_net /ILM)
+    (add_net /LED)
     (add_net /NRST)
+    (add_net /RTC)
     (add_net /SCL)
     (add_net /SDA)
     (add_net /SWCLK)
     (add_net /SWDIO)
     (add_net /SWO)
-    (add_net /USB_INT)
+    (add_net /USB)
     (add_net /USB_N)
     (add_net /USB_P)
+    (add_net /VBAT)
     (add_net /VBUS)
     (add_net /VDD)
     (add_net /VNIXIE)
     (add_net GNDREF)
-    (add_net "Net-(BT1-Pad1)")
     (add_net "Net-(C4-Pad1)")
-    (add_net "Net-(C6-Pad1)")
-    (add_net "Net-(C9-Pad1)")
+    (add_net "Net-(C5-Pad1)")
+    (add_net "Net-(C7-Pad1)")
     (add_net "Net-(D4-Pad2)")
+    (add_net "Net-(J5-Pad1)")
     (add_net "Net-(L1-Pad1)")
     (add_net "Net-(L1-Pad2)")
     (add_net "Net-(Q1-Pad1)")
@@ -169,265 +204,185 @@
     (add_net "Net-(Q1-Pad3)")
     (add_net "Net-(R1-Pad2)")
     (add_net "Net-(R10-Pad2)")
-    (add_net "Net-(R3-Pad2)")
+    (add_net "Net-(R12-Pad1)")
+    (add_net "Net-(R2-Pad1)")
     (add_net "Net-(R6-Pad2)")
     (add_net "Net-(R7-Pad1)")
     (add_net "Net-(R8-Pad2)")
+    (add_net "Net-(T1-Pad2)")
+    (add_net "Net-(U1-Pad3)")
+    (add_net "Net-(U1-Pad5)")
+    (add_net "Net-(U1-Pad9)")
+    (add_net "Net-(U2-Pad13)")
+    (add_net "Net-(U2-Pad14)")
+    (add_net "Net-(U2-Pad15)")
+    (add_net "Net-(U2-Pad25)")
+    (add_net "Net-(U2-Pad27)")
+    (add_net "Net-(U2-Pad28)")
+    (add_net "Net-(U2-Pad29)")
+    (add_net "Net-(U2-Pad3)")
+    (add_net "Net-(U2-Pad30)")
+    (add_net "Net-(U4-Pad10)")
+    (add_net "Net-(U4-Pad11)")
+    (add_net "Net-(U4-Pad12)")
+    (add_net "Net-(U4-Pad4)")
+    (add_net "Net-(U4-Pad5)")
+    (add_net "Net-(U4-Pad6)")
+    (add_net "Net-(U4-Pad7)")
+    (add_net "Net-(U4-Pad8)")
+    (add_net "Net-(U4-Pad9)")
+    (add_net "Net-(U7-Pad1)")
   )
 
-  (module Inductors_SMD:L_Taiyo-Yuden_NR-40xx (layer F.Cu) (tedit 5990349D) (tstamp 5B98157A)
-    (at 148.4 115.7 270)
-    (descr "Inductor, Taiyo Yuden, NR series, Taiyo-Yuden_NR-40xx, 4.0mmx4.0mm")
-    (tags "inductor taiyo-yuden nr smd")
-    (path /5B16755A)
+  (module LEDs:LED_0603 (layer F.Cu) (tedit 57FE93A5) (tstamp 5BA54904)
+    (at 150 102.1 180)
+    (descr "LED 0603 smd package")
+    (tags "LED led 0603 SMD smd SMT smt smdled SMDLED smtled SMTLED")
+    (path /5BA928AB)
     (attr smd)
-    (fp_text reference L1 (at 0 -3 270) (layer F.SilkS)
+    (fp_text reference D5 (at 0 -1.25 180) (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 D_LED (at 0 1.35 180) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text user %R (at 0 0 270) (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))
-    (fp_line (start -2 -1.25) (end -1.25 -2) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.25 -2) (end 0 -2) (layer F.Fab) (width 0.1))
-    (fp_line (start 2 0) (end 2 -1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start 2 -1.25) (end 1.25 -2) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.25 -2) (end 0 -2) (layer F.Fab) (width 0.1))
-    (fp_line (start 2 0) (end 2 1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start 2 1.25) (end 1.25 2) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.25 2) (end 0 2) (layer F.Fab) (width 0.1))
-    (fp_line (start -2 0) (end -2 1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start -2 1.25) (end -1.25 2) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.25 2) (end 0 2) (layer F.Fab) (width 0.1))
-    (fp_line (start -2 -2.1) (end 2 -2.1) (layer F.SilkS) (width 0.12))
-    (fp_line (start -2 2.1) (end 2 2.1) (layer F.SilkS) (width 0.12))
-    (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))
-    (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)
-      (net 38 "Net-(L1-Pad1)"))
-    (pad 2 smd rect (at 1.4 0 270) (size 1.2 3.9) (layers F.Cu F.Paste F.Mask)
-      (net 39 "Net-(L1-Pad2)"))
-    (model ${KISYS3DMOD}/Inductors_SMD.3dshapes/L_Taiyo-Yuden_NR-40xx.wrl
+    (fp_line (start -1.45 -0.65) (end 1.45 -0.65) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.45 0.65) (end -1.45 -0.65) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.45 0.65) (end -1.45 0.65) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.45 -0.65) (end 1.45 0.65) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.3 -0.5) (end 0.8 -0.5) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.3 0.5) (end 0.8 0.5) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.8 -0.4) (end 0.8 0.4) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.8 0.4) (end -0.8 0.4) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.15 -0.2) (end 0.15 0.2) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.15 0.2) (end -0.15 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.15 0) (end 0.15 -0.2) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.2 -0.2) (end -0.2 0.2) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.3 -0.5) (end -1.3 0.5) (layer F.SilkS) (width 0.12))
+    (pad 1 smd rect (at -0.8 0) (size 0.8 0.8) (layers F.Cu F.Paste F.Mask)
+      (net 32 /GND))
+    (pad 2 smd rect (at 0.8 0) (size 0.8 0.8) (layers F.Cu F.Paste F.Mask)
+      (net 67 /LED))
+    (model ${KISYS3DMOD}/LEDs.3dshapes/LED_0603.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
+      (rotate (xyz 0 0 180))
     )
   )
 
-  (module "Custom Parts:CR1220_Holder" (layer F.Cu) (tedit 5BA0A345) (tstamp 5BA0C870)
-    (at 116.35 100.2)
-    (path /5BA7F4A1)
-    (fp_text reference BT1 (at 0 -6) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value Battery_Cell (at 0 6) (layer F.Fab)
+  (module Capacitors_SMD:CP_Elec_6.3x4.5 (layer F.Cu) (tedit 58AA8B18) (tstamp 5BA46DF1)
+    (at 159.7 94)
+    (descr "SMT capacitor, aluminium electrolytic, 6.3x4.5")
+    (path /5BA4D5A1)
+    (attr smd)
+    (fp_text reference C1 (at 0 4.56) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_circle (center 0 0) (end 7 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start -6 5) (end -7 4) (layer F.SilkS) (width 0.15))
-    (fp_line (start -4 5) (end -6 5) (layer F.SilkS) (width 0.15))
-    (fp_line (start 6 5) (end 7 4) (layer F.SilkS) (width 0.15))
-    (fp_line (start 5 5) (end 6 5) (layer F.SilkS) (width 0.15))
-    (fp_line (start 4 5) (end 5 5) (layer F.SilkS) (width 0.15))
-    (fp_arc (start 0.000001 9.999999) (end 4 5) (angle -77.31961651) (layer F.SilkS) (width 0.15))
-    (fp_line (start 6 -5) (end 7 -4) (layer F.SilkS) (width 0.15))
-    (fp_line (start -6 -5) (end 6 -5) (layer F.SilkS) (width 0.15))
-    (fp_line (start -7 -4) (end -6 -5) (layer F.SilkS) (width 0.15))
-    (fp_line (start 7 4) (end 7 -4) (layer F.SilkS) (width 0.15))
-    (fp_line (start -7 4) (end -7 -4) (layer F.SilkS) (width 0.15))
-    (pad 2 smd rect (at 7.65 -1.55) (size 2.5 2.5) (layers F.Cu B.Adhes F.Paste F.Mask)
-      (net 1 GNDREF))
-    (pad 2 smd rect (at 7.65 1.55) (size 2.5 2.5) (layers F.Cu F.Paste F.Mask)
-      (net 1 GNDREF))
-    (pad 2 smd rect (at -7.65 -1.55) (size 2.5 2.5) (layers F.Cu F.Paste F.Mask)
-      (net 1 GNDREF))
-    (pad 2 smd rect (at -7.65 1.55) (size 2.5 2.5) (layers F.Cu F.Paste F.Mask)
-      (net 1 GNDREF))
-    (pad 1 smd circle (at 0 0) (size 10.2 10.2) (layers F.Cu F.Paste F.Mask)
-      (net 14 "Net-(BT1-Pad1)"))
-  )
-
-  (module "Custom Parts:X2QFN-12_1.6x1.6mm_Pitch0.4mm" (layer F.Cu) (tedit 5B39317F) (tstamp 5BA0C970)
-    (at 152.6 100.8 270)
-    (path /5B5B1CD3)
-    (fp_text reference U1 (at 0 -1.7 270) (layer F.SilkS)
+    (fp_text value 330uF (at 0 -4.56) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value TUSB320 (at 0 1.9 270) (layer F.Fab)
+    (fp_circle (center 0 0) (end 0.9 2.9) (layer F.Fab) (width 0.1))
+    (fp_text user + (at -1.73 -0.08) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start -0.8 -0.8) (end -0.8 0.8) (layer F.SilkS) (width 0.15))
-    (fp_line (start -0.8 0.8) (end 0.8 0.8) (layer F.SilkS) (width 0.15))
-    (fp_line (start 0.8 0.8) (end 0.8 -0.8) (layer F.SilkS) (width 0.15))
-    (fp_line (start 0.8 -0.8) (end -0.8 -0.8) (layer F.SilkS) (width 0.15))
-    (pad 1 smd rect (at -0.65 -0.2 270) (size 0.7 0.2) (layers F.Cu F.Paste F.Mask)
-      (net 29 /CC2))
-    (pad 2 smd rect (at -0.65 0.2 270) (size 0.7 0.2) (layers F.Cu F.Paste F.Mask)
-      (net 28 /CC1))
-    (pad 3 smd rect (at -0.6 0.75 270) (size 0.2 0.5) (layers F.Cu F.Paste F.Mask))
-    (pad 4 smd rect (at -0.2 0.75 270) (size 0.2 0.5) (layers F.Cu F.Paste F.Mask)
-      (net 7 "Net-(R1-Pad2)"))
-    (pad 5 smd rect (at 0.2 0.75 270) (size 0.2 0.5) (layers F.Cu F.Paste F.Mask))
-    (pad 6 smd rect (at 0.6 0.75 270) (size 0.2 0.5) (layers F.Cu F.Paste F.Mask)
-      (net 25 /USB_INT))
-    (pad 7 smd rect (at 0.65 0.2 270) (size 0.7 0.2) (layers F.Cu F.Paste F.Mask)
-      (net 20 /SDA))
-    (pad 8 smd rect (at 0.65 -0.2 270) (size 0.7 0.2) (layers F.Cu F.Paste F.Mask)
-      (net 19 /SCL))
-    (pad 9 smd rect (at 0.6 -0.75 270) (size 0.2 0.5) (layers F.Cu F.Paste F.Mask))
-    (pad 10 smd rect (at 0.2 -0.75 270) (size 0.2 0.5) (layers F.Cu F.Paste F.Mask)
-      (net 1 GNDREF))
-    (pad 11 smd rect (at -0.2 -0.75 270) (size 0.2 0.5) (layers F.Cu F.Paste F.Mask)
-      (net 1 GNDREF))
-    (pad 12 smd rect (at -0.6 -0.75 270) (size 0.2 0.5) (layers F.Cu F.Paste F.Mask)
-      (net 17 /VDD))
-  )
-
-  (module Resistors_SMD:R_0603 (layer F.Cu) (tedit 58E0A804) (tstamp 5B978366)
-    (at 147.4 102 180)
-    (descr "Resistor SMD 0603, reflow soldering, Vishay (see dcrcw.pdf)")
-    (tags "resistor 0603")
-    (path /5B07197A/5A6B8978)
-    (attr smd)
-    (fp_text reference R7 (at 0 -1.45 180) (layer F.SilkS)
+    (fp_text user + (at -4.28 2.96) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value R_VC (at 0 1.5 180) (layer F.Fab)
+    (fp_text user %R (at 0 4.56) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text user %R (at 0 0 180) (layer F.Fab)
-      (effects (font (size 0.4 0.4) (thickness 0.075)))
-    )
-    (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.8 0.4) (end -0.8 0.4) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.8 -0.4) (end 0.8 0.4) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.5 0.68) (end -0.5 0.68) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.5 -0.68) (end 0.5 -0.68) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.25 -0.7) (end 1.25 -0.7) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.25 -0.7) (end -1.25 0.7) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.25 0.7) (end 1.25 -0.7) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.25 0.7) (end -1.25 0.7) (layer F.CrtYd) (width 0.05))
-    (pad 1 smd rect (at -0.75 0 180) (size 0.5 0.9) (layers F.Cu F.Paste F.Mask)
-      (net 40 "Net-(R7-Pad1)"))
-    (pad 2 smd rect (at 0.75 0 180) (size 0.5 0.9) (layers F.Cu F.Paste F.Mask)
-      (net 3 "Net-(C4-Pad1)"))
-    (model ${KISYS3DMOD}/Resistors_SMD.3dshapes/R_0603.wrl
+    (fp_line (start 3.15 3.15) (end 3.15 -3.15) (layer F.Fab) (width 0.1))
+    (fp_line (start -2.48 3.15) (end 3.15 3.15) (layer F.Fab) (width 0.1))
+    (fp_line (start -3.15 2.48) (end -2.48 3.15) (layer F.Fab) (width 0.1))
+    (fp_line (start -3.15 -2.48) (end -3.15 2.48) (layer F.Fab) (width 0.1))
+    (fp_line (start -2.48 -3.15) (end -3.15 -2.48) (layer F.Fab) (width 0.1))
+    (fp_line (start 3.15 -3.15) (end -2.48 -3.15) (layer F.Fab) (width 0.1))
+    (fp_line (start 3.3 3.3) (end 3.3 1.12) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.3 -3.3) (end 3.3 -1.12) (layer F.SilkS) (width 0.12))
+    (fp_line (start -3.3 2.54) (end -3.3 1.12) (layer F.SilkS) (width 0.12))
+    (fp_line (start -3.3 -2.54) (end -3.3 -1.12) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.3 3.3) (end -2.54 3.3) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2.54 3.3) (end -3.3 2.54) (layer F.SilkS) (width 0.12))
+    (fp_line (start -3.3 -2.54) (end -2.54 -3.3) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2.54 -3.3) (end 3.3 -3.3) (layer F.SilkS) (width 0.12))
+    (fp_line (start -4.7 -3.4) (end 4.7 -3.4) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -4.7 -3.4) (end -4.7 3.4) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 4.7 3.4) (end 4.7 -3.4) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 4.7 3.4) (end -4.7 3.4) (layer F.CrtYd) (width 0.05))
+    (pad 1 smd rect (at -2.7 0 180) (size 3.5 1.6) (layers F.Cu F.Paste F.Mask)
+      (net 32 /GND))
+    (pad 2 smd rect (at 2.7 0 180) (size 3.5 1.6) (layers F.Cu F.Paste F.Mask)
+      (net 11 /VBUS))
+    (model Capacitors_SMD.3dshapes/CP_Elec_6.3x4.5.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
+      (rotate (xyz 0 0 180))
     )
   )
 
-  (module "Custom Parts:USB_C_Receptacle" (layer F.Cu) (tedit 5B90AE84) (tstamp 5B6004D8)
-    (at 150 92.4 180)
-    (descr "USB TYPE C, RA RCPT PCB, Hybrid, https://www.amphenolcanada.com/StockAvailabilityPrice.aspx?From=&PartNum=12401548E4%7e2A")
-    (tags "USB C Type-C Receptacle Hybrid")
-    (path /5B6238BC)
+  (module Capacitors_SMD:CP_Elec_6.3x4.5 (layer F.Cu) (tedit 58AA8B18) (tstamp 5BA4949C)
+    (at 154.9 106)
+    (descr "SMT capacitor, aluminium electrolytic, 6.3x4.5")
+    (path /5BBA5067)
     (attr smd)
-    (fp_text reference J1 (at 0 -6.36 180) (layer F.SilkS)
+    (fp_text reference C2 (at 0 4.56) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value USB_C_Receptacle (at 0 4 180) (layer F.Fab)
+    (fp_text value 330uF (at 0 -4.56) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start -4.6 2.39) (end 4.6 2.39) (layer F.SilkS) (width 0.12))
-    (fp_line (start -4.6 3.09) (end 4.6 3.09) (layer F.SilkS) (width 0.12))
-    (fp_line (start -4.6 3.09) (end -4.6 -5.9) (layer F.Fab) (width 0.1))
-    (fp_line (start -4.6 -5.9) (end 4.6 -5.9) (layer F.Fab) (width 0.1))
-    (fp_line (start -4.6 -5.9) (end -3 -5.9) (layer F.SilkS) (width 0.12))
-    (fp_line (start -4.6 -5.9) (end -4.6 3.09) (layer F.SilkS) (width 0.12))
-    (fp_line (start 4.6 -5.9) (end 4.6 3.09) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3 -5.9) (end 4.6 -5.9) (layer F.SilkS) (width 0.12))
-    (fp_line (start -4.6 3.09) (end 4.6 3.09) (layer F.Fab) (width 0.1))
-    (fp_line (start 4.6 3.09) (end 4.6 -5.9) (layer F.Fab) (width 0.1))
-    (fp_text user %R (at 0 0 180) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.1)))
+    (fp_line (start 4.7 3.4) (end -4.7 3.4) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 4.7 3.4) (end 4.7 -3.4) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -4.7 -3.4) (end -4.7 3.4) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -4.7 -3.4) (end 4.7 -3.4) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2.54 -3.3) (end 3.3 -3.3) (layer F.SilkS) (width 0.12))
+    (fp_line (start -3.3 -2.54) (end -2.54 -3.3) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2.54 3.3) (end -3.3 2.54) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.3 3.3) (end -2.54 3.3) (layer F.SilkS) (width 0.12))
+    (fp_line (start -3.3 -2.54) (end -3.3 -1.12) (layer F.SilkS) (width 0.12))
+    (fp_line (start -3.3 2.54) (end -3.3 1.12) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.3 -3.3) (end 3.3 -1.12) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.3 3.3) (end 3.3 1.12) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.15 -3.15) (end -2.48 -3.15) (layer F.Fab) (width 0.1))
+    (fp_line (start -2.48 -3.15) (end -3.15 -2.48) (layer F.Fab) (width 0.1))
+    (fp_line (start -3.15 -2.48) (end -3.15 2.48) (layer F.Fab) (width 0.1))
+    (fp_line (start -3.15 2.48) (end -2.48 3.15) (layer F.Fab) (width 0.1))
+    (fp_line (start -2.48 3.15) (end 3.15 3.15) (layer F.Fab) (width 0.1))
+    (fp_line (start 3.15 3.15) (end 3.15 -3.15) (layer F.Fab) (width 0.1))
+    (fp_text user %R (at 0 4.56) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
     )
-    (pad S1 thru_hole oval (at 3.845 -5.91 180) (size 1.2 0.8) (drill oval 0.75 0.4) (layers *.Cu *.Mask)
-      (net 1 GNDREF))
-    (pad S1 thru_hole oval (at -3.845 -5.91 180) (size 1.2 0.8) (drill oval 0.75 0.4) (layers *.Cu *.Mask)
-      (net 1 GNDREF))
-    (pad B11 thru_hole circle (at -2.4 -3.01 180) (size 0.65 0.65) (drill 0.4) (layers *.Cu *.Mask)
-      (net 1 GNDREF))
-    (pad B10 thru_hole circle (at -1.6 -3.01 180) (size 0.65 0.65) (drill 0.4) (layers *.Cu *.Mask)
-      (net 1 GNDREF))
-    (pad B8 thru_hole circle (at -0.8 -3.01 180) (size 0.65 0.65) (drill 0.4) (layers *.Cu *.Mask)
-      (net 1 GNDREF))
-    (pad B5 thru_hole circle (at 0.8 -3.01 180) (size 0.65 0.65) (drill 0.4) (layers *.Cu *.Mask)
-      (net 29 /CC2))
-    (pad B3 thru_hole circle (at 1.6 -3.01 180) (size 0.65 0.65) (drill 0.4) (layers *.Cu *.Mask)
-      (net 1 GNDREF))
-    (pad B2 thru_hole circle (at 2.4 -3.01 180) (size 0.65 0.65) (drill 0.4) (layers *.Cu *.Mask)
-      (net 1 GNDREF))
-    (pad B12 thru_hole circle (at -2.8 -3.71 180) (size 0.65 0.65) (drill 0.4) (layers *.Cu *.Mask)
-      (net 1 GNDREF))
-    (pad B9 thru_hole circle (at -1.2 -3.71 180) (size 0.65 0.65) (drill 0.4) (layers *.Cu *.Mask)
-      (net 16 /VBUS))
-    (pad B7 thru_hole circle (at -0.4 -3.71 180) (size 0.65 0.65) (drill 0.4) (layers *.Cu *.Mask)
-      (net 31 /USB_N))
-    (pad B6 thru_hole circle (at 0.4 -3.71 180) (size 0.65 0.65) (drill 0.4) (layers *.Cu *.Mask)
-      (net 32 /USB_P))
-    (pad B4 thru_hole circle (at 1.2 -3.71 180) (size 0.65 0.65) (drill 0.4) (layers *.Cu *.Mask)
-      (net 16 /VBUS))
-    (pad B1 thru_hole circle (at 2.8 -3.71 180) (size 0.65 0.65) (drill 0.4) (layers *.Cu *.Mask)
-      (net 1 GNDREF))
-    (pad "" np_thru_hole circle (at -3.6 -4.36 180) (size 0.65 0.65) (drill 0.65) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole oval (at 3.6 -4.36 180) (size 0.95 0.65) (drill oval 0.95 0.65) (layers *.Cu *.Mask))
-    (pad S1 thru_hole oval (at -4.22 -0.595 180) (size 1 2) (drill oval 0.5 1.5) (layers *.Cu *.Mask)
-      (net 1 GNDREF))
-    (pad S1 thru_hole oval (at 4.22 -0.595 180) (size 1 2) (drill oval 0.5 1.5) (layers *.Cu *.Mask)
-      (net 1 GNDREF))
-    (pad S1 thru_hole oval (at 4.13 -3.11 180) (size 1 1.6) (drill oval 0.6 1.2) (layers *.Cu *.Mask)
-      (net 1 GNDREF))
-    (pad A11 smd rect (at 2.25 -4.93 180) (size 0.3 0.9) (layers F.Cu F.Paste F.Mask)
-      (net 1 GNDREF))
-    (pad A8 smd rect (at 0.75 -4.93 180) (size 0.3 0.9) (layers F.Cu F.Paste F.Mask)
-      (net 1 GNDREF))
-    (pad A9 smd rect (at 1.25 -4.93 180) (size 0.3 0.9) (layers F.Cu F.Paste F.Mask)
-      (net 16 /VBUS))
-    (pad A10 smd rect (at 1.75 -4.93 180) (size 0.3 0.9) (layers F.Cu F.Paste F.Mask)
-      (net 1 GNDREF))
-    (pad A12 smd rect (at 2.75 -4.93 180) (size 0.3 0.9) (layers F.Cu F.Paste F.Mask)
-      (net 1 GNDREF))
-    (pad A7 smd rect (at 0.25 -4.93 180) (size 0.3 0.9) (layers F.Cu F.Paste F.Mask)
-      (net 31 /USB_N))
-    (pad A6 smd rect (at -0.25 -4.93 180) (size 0.3 0.9) (layers F.Cu F.Paste F.Mask)
-      (net 32 /USB_P))
-    (pad A5 smd rect (at -0.75 -4.93 180) (size 0.3 0.9) (layers F.Cu F.Paste F.Mask)
-      (net 28 /CC1))
-    (pad A4 smd rect (at -1.25 -4.93 180) (size 0.3 0.9) (layers F.Cu F.Paste F.Mask)
-      (net 16 /VBUS))
-    (pad A3 smd rect (at -1.75 -4.93 180) (size 0.3 0.9) (layers F.Cu F.Paste F.Mask)
-      (net 1 GNDREF))
-    (pad A2 smd rect (at -2.25 -4.93 180) (size 0.3 0.9) (layers F.Cu F.Paste F.Mask)
-      (net 1 GNDREF))
-    (pad A1 smd rect (at -2.75 -4.93 180) (size 0.3 0.9) (layers F.Cu F.Paste F.Mask)
-      (net 1 GNDREF))
-    (pad S1 thru_hole oval (at -4.13 -3.11 180) (size 1 1.6) (drill oval 0.6 1.2) (layers *.Cu *.Mask)
-      (net 1 GNDREF))
-    (model ${KISYS3DMOD}/Connectors_USB.3dshapes/USB_C_Receptacle_Amphenol_12401548E4-2A.wrl
+    (fp_text user + (at -4.28 2.96) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user + (at -1.73 -0.08) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_circle (center 0 0) (end 0.9 2.9) (layer F.Fab) (width 0.1))
+    (pad 2 smd rect (at 2.7 0 180) (size 3.5 1.6) (layers F.Cu F.Paste F.Mask)
+      (net 12 /VDD))
+    (pad 1 smd rect (at -2.7 0 180) (size 3.5 1.6) (layers F.Cu F.Paste F.Mask)
+      (net 32 /GND))
+    (model Capacitors_SMD.3dshapes/CP_Elec_6.3x4.5.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
+      (rotate (xyz 0 0 180))
     )
   )
 
-  (module Mounting_Holes:MountingHole_2.5mm_Pad locked (layer F.Cu) (tedit 5B90A4BD) (tstamp 5B90FDF6)
-    (at 143 100)
+  (module "Custom Parts:MountingHole_2.5mm_Pad_Via" locked (layer F.Cu) (tedit 5BA42072) (tstamp 5BA46C25)
+    (at 103 93.1)
     (descr "Mounting Hole 2.5mm")
     (tags "mounting hole 2.5mm")
+    (path /5BA440F1)
     (zone_connect 2)
     (attr virtual)
-    (fp_text reference REF** (at 0 -3.5) (layer F.SilkS)
+    (fp_text reference MH1 (at 0 -3.5) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value MountingHole_2.5mm_Pad (at 0 3.5) (layer F.Fab)
+    (fp_text value MountingHole_Pad (at 0 3.5) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_circle (center 0 0) (end 2.75 0) (layer F.CrtYd) (width 0.05))
@@ -435,20 +390,37 @@
     (fp_text user %R (at 0.3 0) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (pad 1 thru_hole circle (at 0 0) (size 5 5) (drill 2.5) (layers *.Cu *.Mask)
-      (net 1 GNDREF) (zone_connect 2))
+    (pad 1 thru_hole circle (at 1.237437 -1.237437 315) (size 0.8 0.8) (drill 0.5) (layers *.Cu *.Mask)
+      (net 32 /GND) (zone_connect 2))
+    (pad 1 thru_hole circle (at 1.75 0 270) (size 0.8 0.8) (drill 0.5) (layers *.Cu *.Mask)
+      (net 32 /GND) (zone_connect 2))
+    (pad 1 thru_hole circle (at 1.237437 1.237437 225) (size 0.8 0.8) (drill 0.5) (layers *.Cu *.Mask)
+      (net 32 /GND) (zone_connect 2))
+    (pad 1 thru_hole circle (at 0 1.75 180) (size 0.8 0.8) (drill 0.5) (layers *.Cu *.Mask)
+      (net 32 /GND) (zone_connect 2))
+    (pad 1 thru_hole circle (at -1.237437 1.237437 135) (size 0.8 0.8) (drill 0.5) (layers *.Cu *.Mask)
+      (net 32 /GND) (zone_connect 2))
+    (pad 1 thru_hole circle (at -1.75 0 90) (size 0.8 0.8) (drill 0.5) (layers *.Cu *.Mask)
+      (net 32 /GND) (zone_connect 2))
+    (pad 1 thru_hole circle (at -1.237437 -1.237437 45) (size 0.8 0.8) (drill 0.5) (layers *.Cu *.Mask)
+      (net 32 /GND) (zone_connect 2))
+    (pad 1 thru_hole circle (at 0 -1.75) (size 0.8 0.8) (drill 0.5) (layers *.Cu *.Mask)
+      (net 32 /GND) (zone_connect 2))
+    (pad 1 thru_hole circle (at 0 0) (size 4.5 4.5) (drill 2.5) (layers *.Cu *.Mask)
+      (net 32 /GND) (zone_connect 2))
   )
 
-  (module Mounting_Holes:MountingHole_2.5mm_Pad locked (layer F.Cu) (tedit 5B394598) (tstamp 5B602634)
-    (at 157 100)
+  (module "Custom Parts:MountingHole_2.5mm_Pad_Via" locked (layer F.Cu) (tedit 5BA42072) (tstamp 5BA46C15)
+    (at 103 107)
     (descr "Mounting Hole 2.5mm")
     (tags "mounting hole 2.5mm")
+    (path /5BA441AA)
     (zone_connect 2)
     (attr virtual)
-    (fp_text reference REF** (at 0 -3.5) (layer F.SilkS)
+    (fp_text reference MH2 (at 0 -3.5) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value MountingHole_2.5mm_Pad (at 0 3.5) (layer F.Fab)
+    (fp_text value MountingHole_Pad (at 0 3.5) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text user %R (at 0.3 0) (layer F.Fab)
@@ -456,244 +428,279 @@
     )
     (fp_circle (center 0 0) (end 2.5 0) (layer Cmts.User) (width 0.15))
     (fp_circle (center 0 0) (end 2.75 0) (layer F.CrtYd) (width 0.05))
-    (pad 1 thru_hole circle (at 0 0) (size 5 5) (drill 2.5) (layers *.Cu *.Mask)
-      (net 1 GNDREF) (zone_connect 2))
+    (pad 1 thru_hole circle (at 0 0) (size 4.5 4.5) (drill 2.5) (layers *.Cu *.Mask)
+      (net 32 /GND) (zone_connect 2))
+    (pad 1 thru_hole circle (at 0 -1.75) (size 0.8 0.8) (drill 0.5) (layers *.Cu *.Mask)
+      (net 32 /GND) (zone_connect 2))
+    (pad 1 thru_hole circle (at -1.237437 -1.237437 45) (size 0.8 0.8) (drill 0.5) (layers *.Cu *.Mask)
+      (net 32 /GND) (zone_connect 2))
+    (pad 1 thru_hole circle (at -1.75 0 90) (size 0.8 0.8) (drill 0.5) (layers *.Cu *.Mask)
+      (net 32 /GND) (zone_connect 2))
+    (pad 1 thru_hole circle (at -1.237437 1.237437 135) (size 0.8 0.8) (drill 0.5) (layers *.Cu *.Mask)
+      (net 32 /GND) (zone_connect 2))
+    (pad 1 thru_hole circle (at 0 1.75 180) (size 0.8 0.8) (drill 0.5) (layers *.Cu *.Mask)
+      (net 32 /GND) (zone_connect 2))
+    (pad 1 thru_hole circle (at 1.237437 1.237437 225) (size 0.8 0.8) (drill 0.5) (layers *.Cu *.Mask)
+      (net 32 /GND) (zone_connect 2))
+    (pad 1 thru_hole circle (at 1.75 0 270) (size 0.8 0.8) (drill 0.5) (layers *.Cu *.Mask)
+      (net 32 /GND) (zone_connect 2))
+    (pad 1 thru_hole circle (at 1.237437 -1.237437 315) (size 0.8 0.8) (drill 0.5) (layers *.Cu *.Mask)
+      (net 32 /GND) (zone_connect 2))
   )
 
-  (module "Custom Parts:Wurth_WE-FB_10.18x13.36mm_Reverse" locked (layer F.Cu) (tedit 5A79257D) (tstamp 5B602740)
-    (at 178 100 180)
-    (path /5B07197A/5A6B88EA)
-    (fp_text reference T1 (at 0 0 180) (layer F.SilkS)
+  (module "Custom Parts:MountingHole_2.5mm_Pad_Via" locked (layer F.Cu) (tedit 5BA42072) (tstamp 5BA46C05)
+    (at 197 93)
+    (descr "Mounting Hole 2.5mm")
+    (tags "mounting hole 2.5mm")
+    (path /5BA44208)
+    (zone_connect 2)
+    (attr virtual)
+    (fp_text reference MH3 (at 0 -3.5) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value Wurth_Transformer_10.16x13.36mm (at 0 -7 180) (layer F.Fab)
+    (fp_text value MountingHole_Pad (at 0 3.5) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start -5.65 -6) (end 5.65 -6) (layer F.SilkS) (width 0.15))
-    (fp_line (start 5.65 -6) (end 5.65 6) (layer F.SilkS) (width 0.15))
-    (fp_line (start -5.65 6) (end 5.65 6) (layer F.SilkS) (width 0.15))
-    (fp_line (start -5.65 6) (end -5.65 -6) (layer F.SilkS) (width 0.15))
-    (pad 1 smd rect (at -6.4 2.5 180) (size 1.5 1.17) (layers B.Cu B.Mask)
-      (net 1 GNDREF))
-    (pad 2 smd rect (at -6.4 0 180) (size 1.5 1.17) (layers B.Cu B.Mask))
-    (pad 3 smd rect (at -6.4 -2.5 180) (size 1.5 1.17) (layers B.Cu B.Mask)
-      (net 35 "Net-(D4-Pad2)"))
-    (pad 4 smd rect (at 6.4 -2.5 180) (size 1.5 1.17) (layers B.Cu B.Mask)
-      (net 11 "Net-(Q1-Pad1)"))
-    (pad 6 smd rect (at 6.4 2.5 180) (size 1.5 1.17) (layers B.Cu B.Mask)
-      (net 16 /VBUS))
-    (pad 5 smd rect (at 6.4 0 180) (size 1.5 1.17) (layers B.Cu B.Mask))
+    (fp_circle (center 0 0) (end 2.75 0) (layer F.CrtYd) (width 0.05))
+    (fp_circle (center 0 0) (end 2.5 0) (layer Cmts.User) (width 0.15))
+    (fp_text user %R (at 0.3 0) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 1 thru_hole circle (at 1.237437 -1.237437 315) (size 0.8 0.8) (drill 0.5) (layers *.Cu *.Mask)
+      (net 32 /GND) (zone_connect 2))
+    (pad 1 thru_hole circle (at 1.75 0 270) (size 0.8 0.8) (drill 0.5) (layers *.Cu *.Mask)
+      (net 32 /GND) (zone_connect 2))
+    (pad 1 thru_hole circle (at 1.237437 1.237437 225) (size 0.8 0.8) (drill 0.5) (layers *.Cu *.Mask)
+      (net 32 /GND) (zone_connect 2))
+    (pad 1 thru_hole circle (at 0 1.75 180) (size 0.8 0.8) (drill 0.5) (layers *.Cu *.Mask)
+      (net 32 /GND) (zone_connect 2))
+    (pad 1 thru_hole circle (at -1.237437 1.237437 135) (size 0.8 0.8) (drill 0.5) (layers *.Cu *.Mask)
+      (net 32 /GND) (zone_connect 2))
+    (pad 1 thru_hole circle (at -1.75 0 90) (size 0.8 0.8) (drill 0.5) (layers *.Cu *.Mask)
+      (net 32 /GND) (zone_connect 2))
+    (pad 1 thru_hole circle (at -1.237437 -1.237437 45) (size 0.8 0.8) (drill 0.5) (layers *.Cu *.Mask)
+      (net 32 /GND) (zone_connect 2))
+    (pad 1 thru_hole circle (at 0 -1.75) (size 0.8 0.8) (drill 0.5) (layers *.Cu *.Mask)
+      (net 32 /GND) (zone_connect 2))
+    (pad 1 thru_hole circle (at 0 0) (size 4.5 4.5) (drill 2.5) (layers *.Cu *.Mask)
+      (net 32 /GND) (zone_connect 2))
   )
 
-  (module Resistors_SMD:R_0603 (layer F.Cu) (tedit 58E0A804) (tstamp 5A8E4162)
-    (at 169.3 101.2)
-    (descr "Resistor SMD 0603, reflow soldering, Vishay (see dcrcw.pdf)")
-    (tags "resistor 0603")
-    (path /5B07197A/5A6BAAF4)
-    (attr smd)
-    (fp_text reference R6 (at 0 -1.45) (layer F.SilkS)
+  (module "Custom Parts:MountingHole_2.5mm_Pad_Via" locked (layer F.Cu) (tedit 5BA42072) (tstamp 5BA46BF5)
+    (at 197 107.2)
+    (descr "Mounting Hole 2.5mm")
+    (tags "mounting hole 2.5mm")
+    (path /5BA44262)
+    (zone_connect 2)
+    (attr virtual)
+    (fp_text reference MH4 (at 0 -3.5) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value R_FREQ (at 0 1.5) (layer F.Fab)
+    (fp_text value MountingHole_Pad (at 0 3.5) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text user %R (at 0 0) (layer F.Fab)
-      (effects (font (size 0.4 0.4) (thickness 0.075)))
-    )
-    (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.8 0.4) (end -0.8 0.4) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.8 -0.4) (end 0.8 0.4) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.5 0.68) (end -0.5 0.68) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.5 -0.68) (end 0.5 -0.68) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.25 -0.7) (end 1.25 -0.7) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.25 -0.7) (end -1.25 0.7) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.25 0.7) (end 1.25 -0.7) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.25 0.7) (end -1.25 0.7) (layer F.CrtYd) (width 0.05))
-    (pad 1 smd rect (at -0.75 0) (size 0.5 0.9) (layers F.Cu F.Paste F.Mask)
-      (net 1 GNDREF))
-    (pad 2 smd rect (at 0.75 0) (size 0.5 0.9) (layers F.Cu F.Paste F.Mask)
-      (net 10 "Net-(R6-Pad2)"))
-    (model ${KISYS3DMOD}/Resistors_SMD.3dshapes/R_0603.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
+    (fp_text user %R (at 0.3 0) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
     )
+    (fp_circle (center 0 0) (end 2.5 0) (layer Cmts.User) (width 0.15))
+    (fp_circle (center 0 0) (end 2.75 0) (layer F.CrtYd) (width 0.05))
+    (pad 1 thru_hole circle (at 0 0) (size 4.5 4.5) (drill 2.5) (layers *.Cu *.Mask)
+      (net 32 /GND) (zone_connect 2))
+    (pad 1 thru_hole circle (at 0 -1.75) (size 0.8 0.8) (drill 0.5) (layers *.Cu *.Mask)
+      (net 32 /GND) (zone_connect 2))
+    (pad 1 thru_hole circle (at -1.237437 -1.237437 45) (size 0.8 0.8) (drill 0.5) (layers *.Cu *.Mask)
+      (net 32 /GND) (zone_connect 2))
+    (pad 1 thru_hole circle (at -1.75 0 90) (size 0.8 0.8) (drill 0.5) (layers *.Cu *.Mask)
+      (net 32 /GND) (zone_connect 2))
+    (pad 1 thru_hole circle (at -1.237437 1.237437 135) (size 0.8 0.8) (drill 0.5) (layers *.Cu *.Mask)
+      (net 32 /GND) (zone_connect 2))
+    (pad 1 thru_hole circle (at 0 1.75 180) (size 0.8 0.8) (drill 0.5) (layers *.Cu *.Mask)
+      (net 32 /GND) (zone_connect 2))
+    (pad 1 thru_hole circle (at 1.237437 1.237437 225) (size 0.8 0.8) (drill 0.5) (layers *.Cu *.Mask)
+      (net 32 /GND) (zone_connect 2))
+    (pad 1 thru_hole circle (at 1.75 0 270) (size 0.8 0.8) (drill 0.5) (layers *.Cu *.Mask)
+      (net 32 /GND) (zone_connect 2))
+    (pad 1 thru_hole circle (at 1.237437 -1.237437 315) (size 0.8 0.8) (drill 0.5) (layers *.Cu *.Mask)
+      (net 32 /GND) (zone_connect 2))
   )
 
-  (module Resistors_SMD:R_0603 (layer F.Cu) (tedit 58E0A804) (tstamp 5A6CF02A)
-    (at 164.5 93.85 270)
-    (descr "Resistor SMD 0603, reflow soldering, Vishay (see dcrcw.pdf)")
-    (tags "resistor 0603")
-    (path /5B0B79AE)
-    (attr smd)
-    (fp_text reference R5 (at 0 -1.45 270) (layer F.SilkS)
+  (module Mounting_Holes:MountingHole_2.5mm_Pad_Via locked (layer F.Cu) (tedit 56DDBAEA) (tstamp 5BA46933)
+    (at 157 100)
+    (descr "Mounting Hole 2.5mm")
+    (tags "mounting hole 2.5mm")
+    (path /5BA44348)
+    (zone_connect 2)
+    (attr virtual)
+    (fp_text reference MH6 (at 0 -3.5) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 10k (at 0 1.5 270) (layer F.Fab)
+    (fp_text value MountingHole_Pad (at 0 3.5) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text user %R (at 0 0 270) (layer F.Fab)
-      (effects (font (size 0.4 0.4) (thickness 0.075)))
-    )
-    (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.8 0.4) (end -0.8 0.4) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.8 -0.4) (end 0.8 0.4) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.5 0.68) (end -0.5 0.68) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.5 -0.68) (end 0.5 -0.68) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.25 -0.7) (end 1.25 -0.7) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.25 -0.7) (end -1.25 0.7) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.25 0.7) (end 1.25 -0.7) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.25 0.7) (end -1.25 0.7) (layer F.CrtYd) (width 0.05))
-    (pad 1 smd rect (at -0.75 0 270) (size 0.5 0.9) (layers F.Cu F.Paste F.Mask)
-      (net 17 /VDD))
-    (pad 2 smd rect (at 0.75 0 270) (size 0.5 0.9) (layers F.Cu F.Paste F.Mask)
-      (net 20 /SDA))
-    (model ${KISYS3DMOD}/Resistors_SMD.3dshapes/R_0603.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
+    (fp_text user %R (at 0.3 0) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
     )
+    (fp_circle (center 0 0) (end 2.5 0) (layer Cmts.User) (width 0.15))
+    (fp_circle (center 0 0) (end 2.75 0) (layer F.CrtYd) (width 0.05))
+    (pad 1 thru_hole circle (at 0 0) (size 5 5) (drill 2.5) (layers *.Cu *.Mask)
+      (net 32 /GND) (zone_connect 2))
+    (pad 1 thru_hole circle (at 1.875 0) (size 0.8 0.8) (drill 0.5) (layers *.Cu *.Mask)
+      (net 32 /GND) (zone_connect 2))
+    (pad 1 thru_hole circle (at 1.325825 1.325825) (size 0.8 0.8) (drill 0.5) (layers *.Cu *.Mask)
+      (net 32 /GND) (zone_connect 2))
+    (pad 1 thru_hole circle (at 0 1.875) (size 0.8 0.8) (drill 0.5) (layers *.Cu *.Mask)
+      (net 32 /GND) (zone_connect 2))
+    (pad 1 thru_hole circle (at -1.325825 1.325825) (size 0.8 0.8) (drill 0.5) (layers *.Cu *.Mask)
+      (net 32 /GND) (zone_connect 2))
+    (pad 1 thru_hole circle (at -1.875 0) (size 0.8 0.8) (drill 0.5) (layers *.Cu *.Mask)
+      (net 32 /GND) (zone_connect 2))
+    (pad 1 thru_hole circle (at -1.325825 -1.325825) (size 0.8 0.8) (drill 0.5) (layers *.Cu *.Mask)
+      (net 32 /GND) (zone_connect 2))
+    (pad 1 thru_hole circle (at 0 -1.875) (size 0.8 0.8) (drill 0.5) (layers *.Cu *.Mask)
+      (net 32 /GND) (zone_connect 2))
+    (pad 1 thru_hole circle (at 1.325825 -1.325825) (size 0.8 0.8) (drill 0.5) (layers *.Cu *.Mask)
+      (net 32 /GND) (zone_connect 2))
   )
 
-  (module Resistors_SMD:R_0603 (layer F.Cu) (tedit 58E0A804) (tstamp 5A6CF01E)
-    (at 164.5 96.15 270)
-    (descr "Resistor SMD 0603, reflow soldering, Vishay (see dcrcw.pdf)")
-    (tags "resistor 0603")
-    (path /5B1468ED)
-    (attr smd)
-    (fp_text reference R3 (at 0 -1.45 270) (layer F.SilkS)
+  (module Mounting_Holes:MountingHole_2.5mm_Pad_Via locked (layer F.Cu) (tedit 56DDBAEA) (tstamp 5BA46923)
+    (at 143 100)
+    (descr "Mounting Hole 2.5mm")
+    (tags "mounting hole 2.5mm")
+    (path /5BA442D8)
+    (zone_connect 2)
+    (attr virtual)
+    (fp_text reference MH5 (at 0 -3.5) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 10k (at 0 1.5 270) (layer F.Fab)
+    (fp_text value MountingHole_Pad (at 0 3.5) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text user %R (at 0 0 270) (layer F.Fab)
-      (effects (font (size 0.4 0.4) (thickness 0.075)))
-    )
-    (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.8 0.4) (end -0.8 0.4) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.8 -0.4) (end 0.8 0.4) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.5 0.68) (end -0.5 0.68) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.5 -0.68) (end 0.5 -0.68) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.25 -0.7) (end 1.25 -0.7) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.25 -0.7) (end -1.25 0.7) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.25 0.7) (end 1.25 -0.7) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.25 0.7) (end -1.25 0.7) (layer F.CrtYd) (width 0.05))
-    (pad 1 smd rect (at -0.75 0 270) (size 0.5 0.9) (layers F.Cu F.Paste F.Mask)
-      (net 17 /VDD))
-    (pad 2 smd rect (at 0.75 0 270) (size 0.5 0.9) (layers F.Cu F.Paste F.Mask)
-      (net 25 /USB_INT))
-    (model ${KISYS3DMOD}/Resistors_SMD.3dshapes/R_0603.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
+    (fp_circle (center 0 0) (end 2.75 0) (layer F.CrtYd) (width 0.05))
+    (fp_circle (center 0 0) (end 2.5 0) (layer Cmts.User) (width 0.15))
+    (fp_text user %R (at 0.3 0) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
     )
+    (pad 1 thru_hole circle (at 1.325825 -1.325825) (size 0.8 0.8) (drill 0.5) (layers *.Cu *.Mask)
+      (net 32 /GND) (zone_connect 2))
+    (pad 1 thru_hole circle (at 0 -1.875) (size 0.8 0.8) (drill 0.5) (layers *.Cu *.Mask)
+      (net 32 /GND) (zone_connect 2))
+    (pad 1 thru_hole circle (at -1.325825 -1.325825) (size 0.8 0.8) (drill 0.5) (layers *.Cu *.Mask)
+      (net 32 /GND) (zone_connect 2))
+    (pad 1 thru_hole circle (at -1.875 0) (size 0.8 0.8) (drill 0.5) (layers *.Cu *.Mask)
+      (net 32 /GND) (zone_connect 2))
+    (pad 1 thru_hole circle (at -1.325825 1.325825) (size 0.8 0.8) (drill 0.5) (layers *.Cu *.Mask)
+      (net 32 /GND) (zone_connect 2))
+    (pad 1 thru_hole circle (at 0 1.875) (size 0.8 0.8) (drill 0.5) (layers *.Cu *.Mask)
+      (net 32 /GND) (zone_connect 2))
+    (pad 1 thru_hole circle (at 1.325825 1.325825) (size 0.8 0.8) (drill 0.5) (layers *.Cu *.Mask)
+      (net 32 /GND) (zone_connect 2))
+    (pad 1 thru_hole circle (at 1.875 0) (size 0.8 0.8) (drill 0.5) (layers *.Cu *.Mask)
+      (net 32 /GND) (zone_connect 2))
+    (pad 1 thru_hole circle (at 0 0) (size 5 5) (drill 2.5) (layers *.Cu *.Mask)
+      (net 32 /GND) (zone_connect 2))
   )
 
-  (module Resistors_SMD:R_0603 (layer F.Cu) (tedit 58E0A804) (tstamp 5A6CF018)
-    (at 166.5 95.2)
-    (descr "Resistor SMD 0603, reflow soldering, Vishay (see dcrcw.pdf)")
-    (tags "resistor 0603")
-    (path /5B08854F)
+  (module Capacitors_SMD:C_0603 (layer F.Cu) (tedit 59958EE7) (tstamp 5BA44A16)
+    (at 161.9 100.1)
+    (descr "Capacitor SMD 0603, reflow soldering, AVX (see smccp.pdf)")
+    (tags "capacitor 0603")
+    (path /5BB9F4F9)
     (attr smd)
-    (fp_text reference R2 (at 0 -1.45) (layer F.SilkS)
+    (fp_text reference C8 (at 0 -1.5) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 1M (at 0 1.5) (layer F.Fab)
+    (fp_text value 0.1uF (at 0 1.5) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
+    (fp_line (start 1.4 0.65) (end -1.4 0.65) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.4 0.65) (end 1.4 -0.65) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.4 -0.65) (end -1.4 0.65) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.4 -0.65) (end 1.4 -0.65) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 0.35 0.6) (end -0.35 0.6) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.35 -0.6) (end 0.35 -0.6) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.8 -0.4) (end 0.8 0.4) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.8 0.4) (end -0.8 0.4) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
     (fp_text user %R (at 0 0) (layer F.Fab)
-      (effects (font (size 0.4 0.4) (thickness 0.075)))
+      (effects (font (size 0.3 0.3) (thickness 0.075)))
     )
-    (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.8 0.4) (end -0.8 0.4) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.8 -0.4) (end 0.8 0.4) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.5 0.68) (end -0.5 0.68) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.5 -0.68) (end 0.5 -0.68) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.25 -0.7) (end 1.25 -0.7) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.25 -0.7) (end -1.25 0.7) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.25 0.7) (end 1.25 -0.7) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.25 0.7) (end -1.25 0.7) (layer F.CrtYd) (width 0.05))
-    (pad 1 smd rect (at -0.75 0) (size 0.5 0.9) (layers F.Cu F.Paste F.Mask)
-      (net 22 /HV_EN))
-    (pad 2 smd rect (at 0.75 0) (size 0.5 0.9) (layers F.Cu F.Paste F.Mask)
-      (net 1 GNDREF))
-    (model ${KISYS3DMOD}/Resistors_SMD.3dshapes/R_0603.wrl
+    (pad 2 smd rect (at 0.75 0) (size 0.8 0.75) (layers F.Cu F.Paste F.Mask)
+      (net 11 /VBUS))
+    (pad 1 smd rect (at -0.75 0) (size 0.8 0.75) (layers F.Cu F.Paste F.Mask)
+      (net 32 /GND))
+    (model Capacitors_SMD.3dshapes/C_0603.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
       (rotate (xyz 0 0 0))
     )
   )
 
-  (module Resistors_SMD:R_0603 (layer F.Cu) (tedit 58E0A804) (tstamp 5A6CF012)
-    (at 164.5 101.05 90)
-    (descr "Resistor SMD 0603, reflow soldering, Vishay (see dcrcw.pdf)")
-    (tags "resistor 0603")
-    (path /5B096154)
+  (module Capacitors_SMD:C_0603 (layer F.Cu) (tedit 59958EE7) (tstamp 5BA44A06)
+    (at 161.9 98.7)
+    (descr "Capacitor SMD 0603, reflow soldering, AVX (see smccp.pdf)")
+    (tags "capacitor 0603")
+    (path /5BBA0E2E)
     (attr smd)
-    (fp_text reference R1 (at 0 -1.45 90) (layer F.SilkS)
+    (fp_text reference C9 (at 0 -1.5) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 900k (at 0 1.5 90) (layer F.Fab)
+    (fp_text value 0.1uF (at 0 1.5) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text user %R (at 0 0 90) (layer F.Fab)
-      (effects (font (size 0.4 0.4) (thickness 0.075)))
+    (fp_text user %R (at 0 0) (layer F.Fab)
+      (effects (font (size 0.3 0.3) (thickness 0.075)))
     )
     (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
     (fp_line (start 0.8 0.4) (end -0.8 0.4) (layer F.Fab) (width 0.1))
     (fp_line (start 0.8 -0.4) (end 0.8 0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.5 0.68) (end -0.5 0.68) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.5 -0.68) (end 0.5 -0.68) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.25 -0.7) (end 1.25 -0.7) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.25 -0.7) (end -1.25 0.7) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.25 0.7) (end 1.25 -0.7) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.25 0.7) (end -1.25 0.7) (layer F.CrtYd) (width 0.05))
-    (pad 1 smd rect (at -0.75 0 90) (size 0.5 0.9) (layers F.Cu F.Paste F.Mask)
-      (net 16 /VBUS))
-    (pad 2 smd rect (at 0.75 0 90) (size 0.5 0.9) (layers F.Cu F.Paste F.Mask)
-      (net 7 "Net-(R1-Pad2)"))
-    (model ${KISYS3DMOD}/Resistors_SMD.3dshapes/R_0603.wrl
+    (fp_line (start -0.35 -0.6) (end 0.35 -0.6) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.35 0.6) (end -0.35 0.6) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.4 -0.65) (end 1.4 -0.65) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.4 -0.65) (end -1.4 0.65) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.4 0.65) (end 1.4 -0.65) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.4 0.65) (end -1.4 0.65) (layer F.CrtYd) (width 0.05))
+    (pad 1 smd rect (at -0.75 0) (size 0.8 0.75) (layers F.Cu F.Paste F.Mask)
+      (net 32 /GND))
+    (pad 2 smd rect (at 0.75 0) (size 0.8 0.75) (layers F.Cu F.Paste F.Mask)
+      (net 11 /VBUS))
+    (model Capacitors_SMD.3dshapes/C_0603.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
       (rotate (xyz 0 0 0))
     )
   )
 
-  (module Capacitors_SMD:C_0603 (layer F.Cu) (tedit 59958EE7) (tstamp 5A6CEFBF)
-    (at 166.6 93.2 90)
+  (module Capacitors_SMD:C_0603 (layer F.Cu) (tedit 59958EE7) (tstamp 5BA41D26)
+    (at 164.6 97.5 90)
     (descr "Capacitor SMD 0603, reflow soldering, AVX (see smccp.pdf)")
     (tags "capacitor 0603")
-    (path /5B1737BD)
+    (path /5B07197A/5A6C6769)
     (attr smd)
-    (fp_text reference C3 (at 0 -1.5 90) (layer F.SilkS)
+    (fp_text reference C5 (at 0 -1.5 90) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 10uF (at 0 1.5 90) (layer F.Fab)
+    (fp_text value C_SS (at 0 1.5 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start 1.4 0.65) (end -1.4 0.65) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.4 0.65) (end 1.4 -0.65) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.4 -0.65) (end -1.4 0.65) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.4 -0.65) (end 1.4 -0.65) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 0.35 0.6) (end -0.35 0.6) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.35 -0.6) (end 0.35 -0.6) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.8 -0.4) (end 0.8 0.4) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.8 0.4) (end -0.8 0.4) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
     (fp_text user %R (at 0 0 90) (layer F.Fab)
       (effects (font (size 0.3 0.3) (thickness 0.075)))
     )
-    (pad 2 smd rect (at 0.75 0 90) (size 0.8 0.75) (layers F.Cu F.Paste F.Mask)
-      (net 1 GNDREF))
+    (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.8 0.4) (end -0.8 0.4) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.8 -0.4) (end 0.8 0.4) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.35 -0.6) (end 0.35 -0.6) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.35 0.6) (end -0.35 0.6) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.4 -0.65) (end 1.4 -0.65) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.4 -0.65) (end -1.4 0.65) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.4 0.65) (end 1.4 -0.65) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.4 0.65) (end -1.4 0.65) (layer F.CrtYd) (width 0.05))
     (pad 1 smd rect (at -0.75 0 90) (size 0.8 0.75) (layers F.Cu F.Paste F.Mask)
-      (net 17 /VDD))
+      (net 66 "Net-(C5-Pad1)"))
+    (pad 2 smd rect (at 0.75 0 90) (size 0.8 0.75) (layers F.Cu F.Paste F.Mask)
+      (net 32 /GND))
     (model Capacitors_SMD.3dshapes/C_0603.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -701,16 +708,16 @@
     )
   )
 
-  (module Capacitors_SMD:C_0603 (layer F.Cu) (tedit 59958EE7) (tstamp 5A6CEFC5)
-    (at 164.5 98.6 270)
+  (module Capacitors_SMD:C_0603 (layer F.Cu) (tedit 59958EE7) (tstamp 5BA41C96)
+    (at 171.6 99.75 270)
     (descr "Capacitor SMD 0603, reflow soldering, AVX (see smccp.pdf)")
     (tags "capacitor 0603")
-    (path /5B07197A/5A6B89DB)
+    (path /5B07197A/5A6BA4CA)
     (attr smd)
-    (fp_text reference C4 (at 0 -1.5 270) (layer F.SilkS)
+    (fp_text reference C7 (at 0 -1.5 270) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value C_VC (at 0 1.5 270) (layer F.Fab)
+    (fp_text value C_BP (at 0 1.5 270) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_line (start 1.4 0.65) (end -1.4 0.65) (layer F.CrtYd) (width 0.05))
@@ -727,9 +734,9 @@
       (effects (font (size 0.3 0.3) (thickness 0.075)))
     )
     (pad 2 smd rect (at 0.75 0 270) (size 0.8 0.75) (layers F.Cu F.Paste F.Mask)
-      (net 1 GNDREF))
+      (net 32 /GND))
     (pad 1 smd rect (at -0.75 0 270) (size 0.8 0.75) (layers F.Cu F.Paste F.Mask)
-      (net 3 "Net-(C4-Pad1)"))
+      (net 9 "Net-(C7-Pad1)"))
     (model Capacitors_SMD.3dshapes/C_0603.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -737,88 +744,52 @@
     )
   )
 
-  (module Capacitors_SMD:C_1210 (layer F.Cu) (tedit 58AA84E2) (tstamp 5A912C53)
-    (at 161.5 92.4)
-    (descr "Capacitor SMD 1210, reflow soldering, AVX (see smccp.pdf)")
-    (tags "capacitor 1210")
-    (path /5B07197A/5A911DC8)
+  (module Capacitors_SMD:C_0805 (layer F.Cu) (tedit 58AA8463) (tstamp 5BA41D86)
+    (at 170.6 95.4)
+    (descr "Capacitor SMD 0805, reflow soldering, AVX (see smccp.pdf)")
+    (tags "capacitor 0805")
+    (path /5B07197A/5A6C0FBE)
     (attr smd)
-    (fp_text reference C8 (at 0 -2.25) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )