Turns out multi-part components were not fully converted and were not

recognized properly during forward annotation. Had to do a couple of
experiments to figure out how KiCAD handles this and then write some quick and
dirty scripts to repair the multi-part symbols (STM32, Artix-7 and the 74_244
logic buffer were affected).

1 files changed, 131 insertions, 113 deletions

diff --git a/KiCAD/rev02_01.sch-bak b/KiCAD/rev02_01.sch-bak
index bec5b78..cc37f92 100644
--- a/KiCAD/rev02_01.sch-bak
+++ b/KiCAD/rev02_01.sch-bak
@@ -1,5 +1,5 @@
 EESchema Schematic File Version 4
-EELAYER 26 0
+EELAYER 30 0
 EELAYER END
 $Descr B 17000 11000
 encoding utf-8
@@ -13,23 +13,23 @@ Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
-Text Notes 9900 2050 0    84   ~ 12
+Text Notes 9900 2050 0    84   ~ 17
 15V LDO powered from external 18V\nand supplying stable 15V to noise source
-Text Notes 1300 2600 0    126   ~ 12
+Text Notes 1300 2600 0    126  ~ 25
 Main power input\n18V DC
 Text Notes 4850 2900 0    60   ~ 12
 To mitigate component ageing in the avalanche noise circuit,\nthis jumper can be used to decide if FPGA/ARM/None should\nbe allowed to turn off the entropy source\n(default On through pull-up)
 Text Notes 12600 3700 0    60   ~ 12
 Max 3 ohm ESR
-Text Notes 6100 5900 0    84   ~ 12
+Text Notes 6100 5900 0    84   ~ 17
 *) Intermediate Regulator: 18V -> 5V
 Text Notes 9400 9100 0    60   ~ 12
 *) VCC_5V0 = 0.8V x (1 + 6.3/1.21) = 4.965V\n*) Current sharing not used\n*) SYNC is not used
-Text Notes 4900 1900 0    126   ~ 12
+Text Notes 4900 1900 0    126  ~ 25
 Entropy source power
 Text Notes 1400 4200 0    60   ~ 12
 XXX verify symbol
-Text Notes 13700 10200 0    84   ~ 12
+Text Notes 13700 10200 0    84   ~ 17
 Input power
 Text Notes 8900 2650 2    60   ~ 12
 R7
@@ -70,10 +70,10 @@ JP2
 Text Notes 8350 2930 2    60   ~ 12
 JP1Q
 $Comp
-L power:GND GND
+L power:GND #GND0101
 U 1 1 580240DD
 P 2500 3700
-F 0 "GND" H 2500 3700 20  0000 C CNN
+F 0 "#GND0101" H 2500 3700 20  0000 C CNN
 F 1 "+GND" H 2500 3630 30  0000 C CNN
 F 2 "" H 2500 3700 70  0000 C CNN
 F 3 "" H 2500 3700 70  0000 C CNN
@@ -81,10 +81,10 @@ F 3 "" H 2500 3700 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_2
+L power:GND #GND_02
 U 1 1 580240DC
 P 10600 3800
-F 0 "GND_2" H 10600 3800 20  0000 C CNN
+F 0 "#GND_02" H 10600 3800 20  0000 C CNN
 F 1 "+GND" H 10600 3730 30  0000 C CNN
 F 2 "" H 10600 3800 70  0000 C CNN
 F 3 "" H 10600 3800 70  0000 C CNN
@@ -92,10 +92,10 @@ F 3 "" H 10600 3800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_3
+L power:GND #GND_03
 U 1 1 580240DB
 P 12000 3800
-F 0 "GND_3" H 12000 3800 20  0000 C CNN
+F 0 "#GND_03" H 12000 3800 20  0000 C CNN
 F 1 "+GND" H 12000 3730 30  0000 C CNN
 F 2 "" H 12000 3800 70  0000 C CNN
 F 3 "" H 12000 3800 70  0000 C CNN
@@ -103,10 +103,10 @@ F 3 "" H 12000 3800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_4
+L power:GND #GND_04
 U 1 1 580240DA
 P 12500 3800
-F 0 "GND_4" H 12500 3800 20  0000 C CNN
+F 0 "#GND_04" H 12500 3800 20  0000 C CNN
 F 1 "+GND" H 12500 3730 30  0000 C CNN
 F 2 "" H 12500 3800 70  0000 C CNN
 F 3 "" H 12500 3800 70  0000 C CNN
@@ -114,10 +114,10 @@ F 3 "" H 12500 3800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:PWR_18V PWR_18V
+L Cryptech_Alpha:PWR_18V #PWR_18V0101
 U 1 1 580240D9
 P 2500 3000
-F 0 "PWR_18V" H 2500 3000 20  0000 C CNN
+F 0 "#PWR_18V0101" H 2500 3000 20  0000 C CNN
 F 1 "+PWR_18V" H 2500 2930 30  0000 C CNN
 F 2 "" H 2500 3000 70  0000 C CNN
 F 3 "" H 2500 3000 70  0000 C CNN
@@ -125,10 +125,10 @@ F 3 "" H 2500 3000 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:PWR_18V PWR_18V_2
+L Cryptech_Alpha:PWR_18V #PWR_18V_02
 U 1 1 580240D8
 P 10100 2500
-F 0 "PWR_18V_2" H 10100 2500 20  0000 C CNN
+F 0 "#PWR_18V_02" H 10100 2500 20  0000 C CNN
 F 1 "+PWR_18V" H 10100 2430 30  0000 C CNN
 F 2 "" H 10100 2500 70  0000 C CNN
 F 3 "" H 10100 2500 70  0000 C CNN
@@ -136,10 +136,10 @@ F 3 "" H 10100 2500 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:15V_STABLE 15V_STABLE
+L Cryptech_Alpha:15V_STABLE #15V_STABLE0101
 U 1 1 580240D7
 P 12800 2500
-F 0 "15V_STABLE" H 12800 2500 20  0000 C CNN
+F 0 "#15V_STABLE0101" H 12800 2500 20  0000 C CNN
 F 1 "+15V_STABLE" H 12800 2430 30  0000 C CNN
 F 2 "" H 12800 2500 70  0000 C CNN
 F 3 "" H 12800 2500 70  0000 C CNN
@@ -147,10 +147,10 @@ F 3 "" H 12800 2500 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_5
+L power:GND #GND_05
 U 1 1 580240D6
 P 7700 8800
-F 0 "GND_5" H 7700 8800 20  0000 C CNN
+F 0 "#GND_05" H 7700 8800 20  0000 C CNN
 F 1 "+GND" H 7700 8730 30  0000 C CNN
 F 2 "" H 7700 8800 70  0000 C CNN
 F 3 "" H 7700 8800 70  0000 C CNN
@@ -158,10 +158,10 @@ F 3 "" H 7700 8800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_6
+L power:GND #GND_06
 U 1 1 580240D5
 P 7900 8800
-F 0 "GND_6" H 7900 8800 20  0000 C CNN
+F 0 "#GND_06" H 7900 8800 20  0000 C CNN
 F 1 "+GND" H 7900 8730 30  0000 C CNN
 F 2 "" H 7900 8800 70  0000 C CNN
 F 3 "" H 7900 8800 70  0000 C CNN
@@ -169,10 +169,10 @@ F 3 "" H 7900 8800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_7
+L power:GND #GND_07
 U 1 1 580240D4
 P 6700 8800
-F 0 "GND_7" H 6700 8800 20  0000 C CNN
+F 0 "#GND_07" H 6700 8800 20  0000 C CNN
 F 1 "+GND" H 6700 8730 30  0000 C CNN
 F 2 "" H 6700 8800 70  0000 C CNN
 F 3 "" H 6700 8800 70  0000 C CNN
@@ -180,10 +180,10 @@ F 3 "" H 6700 8800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_8
+L power:GND #GND_08
 U 1 1 580240D3
 P 5600 7800
-F 0 "GND_8" H 5600 7800 20  0000 C CNN
+F 0 "#GND_08" H 5600 7800 20  0000 C CNN
 F 1 "+GND" H 5600 7730 30  0000 C CNN
 F 2 "" H 5600 7800 70  0000 C CNN
 F 3 "" H 5600 7800 70  0000 C CNN
@@ -191,10 +191,10 @@ F 3 "" H 5600 7800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_9
+L power:GND #GND_09
 U 1 1 580240D2
 P 5000 7800
-F 0 "GND_9" H 5000 7800 20  0000 C CNN
+F 0 "#GND_09" H 5000 7800 20  0000 C CNN
 F 1 "+GND" H 5000 7730 30  0000 C CNN
 F 2 "" H 5000 7800 70  0000 C CNN
 F 3 "" H 5000 7800 70  0000 C CNN
@@ -202,10 +202,10 @@ F 3 "" H 5000 7800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_10
+L power:GND #GND_010
 U 1 1 580240D1
 P 4400 7800
-F 0 "GND_10" H 4400 7800 20  0000 C CNN
+F 0 "#GND_010" H 4400 7800 20  0000 C CNN
 F 1 "+GND" H 4400 7730 30  0000 C CNN
 F 2 "" H 4400 7800 70  0000 C CNN
 F 3 "" H 4400 7800 70  0000 C CNN
@@ -213,10 +213,10 @@ F 3 "" H 4400 7800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_11
+L power:GND #GND_011
 U 1 1 580240D0
 P 4000 7800
-F 0 "GND_11" H 4000 7800 20  0000 C CNN
+F 0 "#GND_011" H 4000 7800 20  0000 C CNN
 F 1 "+GND" H 4000 7730 30  0000 C CNN
 F 2 "" H 4000 7800 70  0000 C CNN
 F 3 "" H 4000 7800 70  0000 C CNN
@@ -224,10 +224,10 @@ F 3 "" H 4000 7800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_12
+L power:GND #GND_012
 U 1 1 580240CF
 P 3600 7800
-F 0 "GND_12" H 3600 7800 20  0000 C CNN
+F 0 "#GND_012" H 3600 7800 20  0000 C CNN
 F 1 "+GND" H 3600 7730 30  0000 C CNN
 F 2 "" H 3600 7800 70  0000 C CNN
 F 3 "" H 3600 7800 70  0000 C CNN
@@ -235,10 +235,10 @@ F 3 "" H 3600 7800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_13
+L power:GND #GND_013
 U 1 1 580240CE
 P 9200 8000
-F 0 "GND_13" H 9200 8000 20  0000 C CNN
+F 0 "#GND_013" H 9200 8000 20  0000 C CNN
 F 1 "+GND" H 9200 7930 30  0000 C CNN
 F 2 "" H 9200 8000 70  0000 C CNN
 F 3 "" H 9200 8000 70  0000 C CNN
@@ -246,10 +246,10 @@ F 3 "" H 9200 8000 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_14
+L power:GND #GND_014
 U 1 1 580240CD
 P 9600 7300
-F 0 "GND_14" H 9600 7300 20  0000 C CNN
+F 0 "#GND_014" H 9600 7300 20  0000 C CNN
 F 1 "+GND" H 9600 7230 30  0000 C CNN
 F 2 "" H 9600 7300 70  0000 C CNN
 F 3 "" H 9600 7300 70  0000 C CNN
@@ -257,10 +257,10 @@ F 3 "" H 9600 7300 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_15
+L power:GND #GND_015
 U 1 1 580240CC
 P 10200 7300
-F 0 "GND_15" H 10200 7300 20  0000 C CNN
+F 0 "#GND_015" H 10200 7300 20  0000 C CNN
 F 1 "+GND" H 10200 7230 30  0000 C CNN
 F 2 "" H 10200 7300 70  0000 C CNN
 F 3 "" H 10200 7300 70  0000 C CNN
@@ -268,10 +268,10 @@ F 3 "" H 10200 7300 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_16
+L power:GND #GND_016
 U 1 1 580240CB
 P 10800 7300
-F 0 "GND_16" H 10800 7300 20  0000 C CNN
+F 0 "#GND_016" H 10800 7300 20  0000 C CNN
 F 1 "+GND" H 10800 7230 30  0000 C CNN
 F 2 "" H 10800 7300 70  0000 C CNN
 F 3 "" H 10800 7300 70  0000 C CNN
@@ -279,10 +279,10 @@ F 3 "" H 10800 7300 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_17
+L power:GND #GND_017
 U 1 1 580240CA
 P 11400 7300
-F 0 "GND_17" H 11400 7300 20  0000 C CNN
+F 0 "#GND_017" H 11400 7300 20  0000 C CNN
 F 1 "+GND" H 11400 7230 30  0000 C CNN
 F 2 "" H 11400 7300 70  0000 C CNN
 F 3 "" H 11400 7300 70  0000 C CNN
@@ -290,10 +290,10 @@ F 3 "" H 11400 7300 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:PWR_18V PWR_18V_3
+L Cryptech_Alpha:PWR_18V #PWR_18V_03
 U 1 1 580240C9
 P 3400 6300
-F 0 "PWR_18V_3" H 3400 6300 20  0000 C CNN
+F 0 "#PWR_18V_03" H 3400 6300 20  0000 C CNN
 F 1 "+PWR_18V" H 3400 6230 30  0000 C CNN
 F 2 "" H 3400 6300 70  0000 C CNN
 F 3 "" H 3400 6300 70  0000 C CNN
@@ -301,10 +301,10 @@ F 3 "" H 3400 6300 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:PWR_18V PWR_18V_4
+L Cryptech_Alpha:PWR_18V #PWR_18V_04
 U 1 1 580240C8
 P 8700 2500
-F 0 "PWR_18V_4" H 8700 2500 20  0000 C CNN
+F 0 "#PWR_18V_04" H 8700 2500 20  0000 C CNN
 F 1 "+PWR_18V" H 8700 2430 30  0000 C CNN
 F 2 "" H 8700 2500 70  0000 C CNN
 F 3 "" H 8700 2500 70  0000 C CNN
@@ -312,10 +312,10 @@ F 3 "" H 8700 2500 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_18
+L power:GND #GND_018
 U 1 1 580240C7
 P 6900 4350
-F 0 "GND_18" H 6900 4350 20  0000 C CNN
+F 0 "#GND_018" H 6900 4350 20  0000 C CNN
 F 1 "+GND" H 6900 4280 30  0000 C CNN
 F 2 "" H 6900 4350 70  0000 C CNN
 F 3 "" H 6900 4350 70  0000 C CNN
@@ -323,10 +323,10 @@ F 3 "" H 6900 4350 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_19
+L power:GND #GND_019
 U 1 1 580240C6
 P 7700 4350
-F 0 "GND_19" H 7700 4350 20  0000 C CNN
+F 0 "#GND_019" H 7700 4350 20  0000 C CNN
 F 1 "+GND" H 7700 4280 30  0000 C CNN
 F 2 "" H 7700 4350 70  0000 C CNN
 F 3 "" H 7700 4350 70  0000 C CNN
@@ -334,10 +334,10 @@ F 3 "" H 7700 4350 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND GND_20
+L power:GND #GND_020
 U 1 1 580240C5
 P 10100 3800
-F 0 "GND_20" H 10100 3800 20  0000 C CNN
+F 0 "#GND_020" H 10100 3800 20  0000 C CNN
 F 1 "+GND" H 10100 3730 30  0000 C CNN
 F 2 "" H 10100 3800 70  0000 C CNN
 F 3 "" H 10100 3800 70  0000 C CNN
@@ -345,7 +345,7 @@ F 3 "" H 10100 3800 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	2500 3500 1800 3500
+	2500 3500 2200 3500
 Wire Wire Line
 	2500 3500 2500 3700
 Wire Wire Line
@@ -395,7 +395,7 @@ Wire Wire Line
 Wire Wire Line
 	10100 3700 10100 3800
 Wire Wire Line
-	2500 3300 1800 3300
+	2500 3300 2200 3300
 Wire Wire Line
 	2500 3000 2500 3300
 Wire Wire Line
@@ -446,7 +446,7 @@ Wire Wire Line
 	8700 3000 8700 3100
 Wire Wire Line
 	8700 3100 8450 3100
-Text Label 9000 3100 0 48 ~
+Text Label 9000 3100 0    48   ~ 0
 15V_LDO_ENABLE
 Connection ~ 8700 3100
 Wire Wire Line
@@ -503,7 +503,7 @@ Wire Wire Line
 	12300 6600 11400 6600
 Wire Wire Line
 	9600 6600 9600 6800
-Text Label 12300 6600 2 48 ~ 0
+Text Label 12300 6600 2    48   ~ 0
 VCC_5V0
 Connection ~ 9200 6600
 Connection ~ 10200 6600
@@ -523,13 +523,9 @@ Wire Wire Line
 	7700 3100 7700 3350
 Wire Wire Line
 	7850 3100 7700 3100
-Wire Wire Line
-	6300 3550 6000 3550
-Text GLabel 5450 3550 0 48 Input ~ 0
+Text GLabel 5450 3550 0    48   Input ~ 0
 FPGA_ENTROPY_DISABLE
 Wire Wire Line
-	5450 3550 6000 3550
-Wire Wire Line
 	10600 3500 10700 3500
 Wire Wire Line
 	10600 3600 10700 3600
@@ -563,52 +559,62 @@ F 1 "0.01uF" H 11900 3100 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 11900 3100 60  0001 C CNN
 F 3 "" H 11900 3100 60  0000 C CNN
 	1    12000 3000
-	-1   0    0    1
+	-1   0    0    1   
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C6
 U 1 1 580240C3
 P 9600 6900
 F 0 "C6" H 9680 6710 60  0000 L BNN
-	1    9600 6900
-	1    0    0    -1
+F 1 "~" H 9600 6900 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 9680 6710 60  0001 C CNN
+F 3 "" H 9600 6900 50  0001 C CNN
+	1    9600 6900
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C4
 U 1 1 580240C2
 P 5000 7200
 F 0 "C4" H 5080 7010 60  0000 L BNN
-	1    5000 7200
-	1    0    0    -1
+F 1 "~" H 5000 7200 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 5080 7010 60  0001 C CNN
+F 3 "" H 5000 7200 50  0001 C CNN
+	1    5000 7200
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC1210 C2
 U 1 1 580240C1
 P 4000 7200
 F 0 "C2" H 4080 7010 60  0000 L BNN
-	1    4000 7200
-	1    0    0    -1
+F 1 "~" H 4000 7200 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_1210" H 4080 7010 60  0001 C CNN
+F 3 "" H 4000 7200 50  0001 C CNN
+	1    4000 7200
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC1210 C3
 U 1 1 580240C0
 P 4400 7200
 F 0 "C3" H 4480 7010 60  0000 L BNN
-	1    4400 7200
-	1    0    0    -1
+F 1 "~" H 4400 7200 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_1210" H 4480 7010 60  0001 C CNN
+F 3 "" H 4400 7200 50  0001 C CNN
+	1    4400 7200
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC1210 C8
 U 1 1 580240BF
 P 10200 6900
 F 0 "C8" H 10280 6710 60  0000 L BNN
-	1    10200 6900
-	1    0    0    -1
+F 1 "~" H 10200 6900 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_1210" H 10280 6710 60  0001 C CNN
+F 3 "" H 10200 6900 50  0001 C CNN
+	1    10200 6900
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:2N7002 Q1
@@ -619,7 +625,7 @@ F 1 "2N7002P,235" H 7100 3600 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:SOT-23" H 7100 3600 60  0001 C CNN
 F 3 "" H 7100 3600 60  0000 C CNN
 	1    7300 3450
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R6
@@ -630,7 +636,7 @@ F 1 "10k" H 6900 3890 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 6900 3890 60  0001 C CNN
 F 3 "" H 6900 3890 60  0000 C CNN
 	1    6900 3950
-	0    1    1    0
+	0    1    1    0   
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R5
@@ -641,16 +647,18 @@ F 1 "1k" H 6500 3600 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 6500 3600 60  0001 C CNN
 F 3 "" H 6500 3600 60  0000 C CNN
 	1    6500 3550
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:JP1Q JP2
 U 1 1 580240BB
 P 8150 3100
 F 0 "JP2" V 7945 3330 60  0000 R TNN
-	1    8150 3100
-	0    -1   -1   0
+F 1 "~" H 8150 3100 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:PLS-2" H 7945 3330 60  0001 C CNN
+F 3 "" H 8150 3100 50  0001 C CNN
+	1    8150 3100
+	0    -1   -1   0   
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0603 C7
@@ -661,7 +669,7 @@ F 1 "4.7uF" H 10200 3300 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0805" H 10200 3300 60  0001 C CNN
 F 3 "" H 10200 3300 60  0000 C CNN
 	1    10100 3500
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0603 C13
@@ -672,7 +680,7 @@ F 1 "4.7uF" H 12600 3100 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0805" H 12600 3100 60  0001 C CNN
 F 3 "" H 12600 3100 60  0000 C CNN
 	1    12500 3300
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:LT3060ITS8-15 U2
@@ -683,7 +691,7 @@ F 1 "LT3060ITS8-15#TRMPBF" H 10890 2390 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:TSOT-8-23" H 10890 2390 60  0001 C CNN
 F 3 "" H 10890 2390 60  0000 C CNN
 	1    11300 3100
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:LMZ13608 U1
@@ -694,16 +702,18 @@ F 1 "LMZ13608TZ*" H 7300 8200 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:NDY" H 7300 8200 60  0001 C CNN
 F 3 "" H 7300 8200 60  0000 C CNN
 	1    7800 7300
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C5
 U 1 1 580240B6
 P 6700 8400
 F 0 "C5" H 6800 8350 60  0000 L BNN
-	1    6700 8400
-	1    0    0    -1
+F 1 "~" H 6700 8400 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 6800 8350 60  0001 C CNN
+F 3 "" H 6700 8400 50  0001 C CNN
+	1    6700 8400
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC0402 C12
@@ -714,7 +724,7 @@ F 1 "0.01uF" H 11900 3700 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 11900 3700 60  0001 C CNN
 F 3 "" H 11900 3700 60  0000 C CNN
 	1    12000 3600
-	-1   0    0    1
+	-1   0    0    1   
 $EndComp
 $Comp
 L Cryptech_Alpha:POWER_JACKSMD JP1
@@ -725,7 +735,7 @@ F 1 "694106301002" H 1290 3570 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:694106301002" H 1290 3570 60  0001 C CNN
 F 3 "" H 1290 3570 60  0000 C CNN
 	1    1700 3600
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:CP_E-035X080 C9
@@ -736,7 +746,7 @@ F 1 "330uF" V 10710 6907 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:C_D" H 10710 6907 60  0001 C CNN
 F 3 "" H 10710 6907 60  0000 C CNN
 	1    10800 7000
-	0    -1   -1   0
+	0    -1   -1   0   
 $EndComp
 $Comp
 L Cryptech_Alpha:CP_E-035X080 C10
@@ -747,7 +757,7 @@ F 1 "330uF" V 11310 6907 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:C_D" H 11310 6907 60  0001 C CNN
 F 3 "" H 11310 6907 60  0000 C CNN
 	1    11400 7000
-	0    -1   -1   0
+	0    -1   -1   0   
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R7
@@ -758,7 +768,7 @@ F 1 "10k" V 8750 2900 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 8750 2900 60  0001 C CNN
 F 3 "" H 8750 2900 60  0000 C CNN
 	1    8700 2800
-	0    1    1    0
+	0    1    1    0   
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R3
@@ -769,7 +779,7 @@ F 1 "100" H 6100 7250 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 6100 7250 60  0001 C CNN
 F 3 "" H 6100 7250 60  0000 C CNN
 	1    6100 7200
-	1    0    0    -1
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R2
@@ -780,7 +790,7 @@ F 1 "4.64k" V 5600 7400 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 5600 7400 60  0001 C CNN
 F 3 "" H 5600 7400 60  0000 C CNN
 	1    5600 7500
-	0    -1   -1   0
+	0    -1   -1   0   
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R1
@@ -791,16 +801,18 @@ F 1 "56k" V 5600 6800 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 5600 6800 60  0001 C CNN
 F 3 "" H 5600 6800 60  0000 C CNN
 	1    5600 6900
-	0    -1   -1   0
+	0    -1   -1   0   
 $EndComp
 $Comp
 L Cryptech_Alpha:C-EUC1210 C1
 U 1 1 580240AD
 P 3600 7200
 F 0 "C1" H 3680 7010 60  0000 L BNN
-	1    3600 7200
-	1    0    0    -1
+F 1 "~" H 3600 7200 50  0001 C CNN
 F 2 "Cryptech_Alpha_Footprints:C_1210" H 3680 7010 60  0001 C CNN
+F 3 "" H 3600 7200 50  0001 C CNN
+	1    3600 7200
+	1    0    0    -1  
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R8
@@ -811,7 +823,7 @@ F 1 "6.3k" H 9210 7070 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 9210 7070 60  0001 C CNN
 F 3 "" H 9210 7070 60  0000 C CNN
 	1    9200 7000
-	0    -1   -1   0
+	0    -1   -1   0   
 $EndComp
 $Comp
 L Cryptech_Alpha:R-EU_R0402 R9
@@ -822,44 +834,50 @@ F 1 "1.21k" H 9200 7770 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 9200 7770 60  0001 C CNN
 F 3 "" H 9200 7770 60  0000 C CNN
 	1    9200 7700
-	0    -1   -1   0
+	0    -1   -1   0   
 $EndComp
 NoConn ~ 8700 8000
 Wire Wire Line
-       12300 6600 12300 6450
+	12300 6600 12300 6450
 $Comp
-L Cryptech_Alpha:VCC_5V0 #PWR?
+L Cryptech_Alpha:VCC_5V0 #PWR0101
 U 1 1 5AF35ED8
 P 12300 6450
-F 0 "#PWR?" H 12300 6300 50  0001 C CNN
+F 0 "#PWR0101" H 12300 6300 50  0001 C CNN
 F 1 "VCC_5V0" H 12315 6623 50  0000 C CNN
 F 2 "" H 12300 6450 60  0000 C CNN
 F 3 "" H 12300 6450 60  0000 C CNN
-       1    12300 6450
-       1    0    0    -1  
+	1    12300 6450
+	1    0    0    -1  
 $EndComp
 $Comp
-L power:PWR_FLAG #FLG?
+L power:PWR_FLAG #FLG0101
 U 1 1 5AFB973B
 P 2200 3300
-F 0 "#FLG?" H 2200 3375 50  0001 C CNN
+F 0 "#FLG0101" H 2200 3375 50  0001 C CNN
 F 1 "PWR_FLAG" H 2200 3474 50  0000 C CNN
 F 2 "" H 2200 3300 50  0001 C CNN
 F 3 "~" H 2200 3300 50  0001 C CNN
-       1    2200 3300
-       1    0    0    -1  
+	1    2200 3300
+	1    0    0    -1  
 $EndComp
 Connection ~ 2200 3300
 $Comp
-L power:PWR_FLAG #FLG?
+L power:PWR_FLAG #FLG0102
 U 1 1 5AFB98AE
 P 2200 3500
-F 0 "#FLG?" H 2200 3575 50  0001 C CNN
+F 0 "#FLG0102" H 2200 3575 50  0001 C CNN
 F 1 "PWR_FLAG" H 2200 3673 50  0000 C CNN
 F 2 "" H 2200 3500 50  0001 C CNN
 F 3 "~" H 2200 3500 50  0001 C CNN
-       1    2200 3500
-       -1   0    0    1   
+	1    2200 3500
+	-1   0    0    1   
 $EndComp
 Connection ~ 2200 3500
-$EndSCHEMATC
\ No newline at end of file
+Wire Wire Line
+	2200 3300 1800 3300
+Wire Wire Line
+	2200 3500 1800 3500
+Wire Wire Line
+	5450 3550 6300 3550
+$EndSCHEMATC