diff --git a/analog.bak b/analog.bak
index 6db408a..ab15efb 100644
--- a/analog.bak
+++ b/analog.bak
@@ -72,10 +72,10 @@ F 7 "490-SJ-43516-SMT-TR " H 2550 2350 60  0001 C CNN "Distributor1_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR133
+L GND #PWR0130
 U 1 1 58D9043A
 P 2950 2150
-F 0 "#PWR133" H 2950 1900 50  0001 C CNN
+F 0 "#PWR0130" H 2950 1900 50  0001 C CNN
 F 1 "GND" H 2950 2000 50  0000 C CNN
 F 2 "" H 2950 2150 50  0000 C CNN
 F 3 "" H 2950 2150 50  0000 C CNN
@@ -219,10 +219,10 @@ AUDIO_L
 Text Label 3050 2550 0    60   ~ 0
 AUDIO_R
 $Comp
-L GND #PWR131
+L GND #PWR0131
 U 1 1 595A57AD
 P 2800 5800
-F 0 "#PWR131" H 2800 5550 50  0001 C CNN
+F 0 "#PWR0131" H 2800 5550 50  0001 C CNN
 F 1 "GND" H 2800 5650 50  0000 C CNN
 F 2 "" H 2800 5800 50  0000 C CNN
 F 3 "" H 2800 5800 50  0000 C CNN
@@ -248,10 +248,10 @@ Wire Wire Line
 	3700 4700 3800 4700
 Connection ~ 3800 4700
 $Comp
-L GND #PWR137
+L GND #PWR0132
 U 1 1 595A622F
 P 3950 4800
-F 0 "#PWR137" H 3950 4550 50  0001 C CNN
+F 0 "#PWR0132" H 3950 4550 50  0001 C CNN
 F 1 "GND" H 3950 4650 50  0000 C CNN
 F 2 "" H 3950 4800 50  0000 C CNN
 F 3 "" H 3950 4800 50  0000 C CNN
@@ -302,10 +302,10 @@ GN17
 Text GLabel 2900 5200 0    60   Input ~ 0
 GP17
 $Comp
-L +3V3 #PWR130
+L +3V3 #PWR0133
 U 1 1 595BB15C
 P 2800 4250
-F 0 "#PWR130" H 2800 4100 50  0001 C CNN
+F 0 "#PWR0133" H 2800 4100 50  0001 C CNN
 F 1 "+3V3" H 2800 4390 50  0000 C CNN
 F 2 "" H 2800 4250 50  0000 C CNN
 F 3 "" H 2800 4250 50  0000 C CNN
@@ -320,10 +320,10 @@ Wire Wire Line
 	2850 4350 2900 4350
 Connection ~ 2850 4250
 $Comp
-L +3V3 #PWR136
+L +3V3 #PWR0134
 U 1 1 595BB1ED
 P 3850 4250
-F 0 "#PWR136" H 3850 4100 50  0001 C CNN
+F 0 "#PWR0134" H 3850 4100 50  0001 C CNN
 F 1 "+3V3" H 3850 4390 50  0000 C CNN
 F 2 "" H 3850 4250 50  0000 C CNN
 F 3 "" H 3850 4250 50  0000 C CNN
@@ -333,10 +333,10 @@ $EndComp
 Wire Wire Line
 	3700 4250 3850 4250
 $Comp
-L GND #PWR134
+L GND #PWR0135
 U 1 1 595BB251
 P 3700 4350
-F 0 "#PWR134" H 3700 4100 50  0001 C CNN
+F 0 "#PWR0135" H 3700 4100 50  0001 C CNN
 F 1 "GND" H 3700 4200 50  0000 C CNN
 F 2 "" H 3700 4350 50  0000 C CNN
 F 3 "" H 3700 4350 50  0000 C CNN
@@ -344,10 +344,10 @@ F 3 "" H 3700 4350 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +3V3 #PWR132
+L +3V3 #PWR0136
 U 1 1 595BC3C0
 P 2900 5450
-F 0 "#PWR132" H 2900 5300 50  0001 C CNN
+F 0 "#PWR0136" H 2900 5300 50  0001 C CNN
 F 1 "+3V3" H 2900 5590 50  0000 C CNN
 F 2 "" H 2900 5450 50  0000 C CNN
 F 3 "" H 2900 5450 50  0000 C CNN
@@ -355,10 +355,10 @@ F 3 "" H 2900 5450 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR135
+L GND #PWR0137
 U 1 1 595BC42E
 P 3700 5200
-F 0 "#PWR135" H 3700 4950 50  0001 C CNN
+F 0 "#PWR0137" H 3700 4950 50  0001 C CNN
 F 1 "GND" H 3700 5050 50  0000 C CNN
 F 2 "" H 3700 5200 50  0000 C CNN
 F 3 "" H 3700 5200 50  0000 C CNN
diff --git a/blinkey.bak b/blinkey.bak
index 395758f..fe9d4ba 100644
--- a/blinkey.bak
+++ b/blinkey.bak
@@ -71,10 +71,10 @@ Wire Wire Line
 Wire Wire Line
 	4750 1850 4850 1850
 $Comp
-L GND #PWR82
+L GND #PWR077
 U 1 1 58D66047
 P 4850 1250
-F 0 "#PWR82" H 4850 1000 50  0001 C CNN
+F 0 "#PWR077" H 4850 1000 50  0001 C CNN
 F 1 "GND" H 4850 1100 50  0000 C CNN
 F 2 "" H 4850 1250 60  0000 C CNN
 F 3 "" H 4850 1250 60  0000 C CNN
@@ -82,10 +82,10 @@ F 3 "" H 4850 1250 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +3V3 #PWR83
+L +3V3 #PWR078
 U 1 1 58D66055
 P 5350 1350
-F 0 "#PWR83" H 5350 1200 50  0001 C CNN
+F 0 "#PWR078" H 5350 1200 50  0001 C CNN
 F 1 "+3V3" H 5350 1490 50  0000 C CNN
 F 2 "" H 5350 1350 50  0000 C CNN
 F 3 "" H 5350 1350 50  0000 C CNN
@@ -131,10 +131,10 @@ Wire Wire Line
 Wire Wire Line
 	2750 3150 2850 3150
 $Comp
-L +3V3 #PWR77
+L +3V3 #PWR079
 U 1 1 58D6605C
 P 1750 2750
-F 0 "#PWR77" H 1750 2600 50  0001 C CNN
+F 0 "#PWR079" H 1750 2600 50  0001 C CNN
 F 1 "+3V3" H 1750 2890 50  0000 C CNN
 F 2 "" H 1750 2750 50  0000 C CNN
 F 3 "" H 1750 2750 50  0000 C CNN
@@ -203,10 +203,10 @@ Wire Wire Line
 	4400 2750 4250 2750
 Connection ~ 4250 2750
 $Comp
-L GND #PWR79
+L GND #PWR080
 U 1 1 58D681C3
 P 4250 4100
-F 0 "#PWR79" H 4250 3850 50  0001 C CNN
+F 0 "#PWR080" H 4250 3850 50  0001 C CNN
 F 1 "GND" H 4250 3950 50  0000 C CNN
 F 2 "" H 4250 4100 50  0000 C CNN
 F 3 "" H 4250 4100 50  0000 C CNN
@@ -300,10 +300,10 @@ Wire Wire Line
 Wire Wire Line
 	4250 4600 4250 4950
 $Comp
-L GND #PWR80
+L GND #PWR081
 U 1 1 590B5B6D
 P 4250 4950
-F 0 "#PWR80" H 4250 4700 50  0001 C CNN
+F 0 "#PWR081" H 4250 4700 50  0001 C CNN
 F 1 "GND" H 4250 4800 50  0000 C CNN
 F 2 "" H 4250 4950 50  0000 C CNN
 F 3 "" H 4250 4950 50  0000 C CNN
@@ -351,10 +351,10 @@ Wire Wire Line
 Wire Wire Line
 	2750 2750 2750 3150
 $Comp
-L +3V3 #PWR78
+L +3V3 #PWR082
 U 1 1 591B548D
 P 1750 4150
-F 0 "#PWR78" H 1750 4000 50  0001 C CNN
+F 0 "#PWR082" H 1750 4000 50  0001 C CNN
 F 1 "+3V3" H 1750 4290 50  0000 C CNN
 F 2 "" H 1750 4150 50  0000 C CNN
 F 3 "" H 1750 4150 50  0000 C CNN
@@ -515,10 +515,10 @@ F 3 "" H 7250 3400 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +3V3 #PWR84
+L +3V3 #PWR083
 U 1 1 595BA1C1
 P 7100 3400
-F 0 "#PWR84" H 7100 3250 50  0001 C CNN
+F 0 "#PWR083" H 7100 3250 50  0001 C CNN
 F 1 "+3V3" H 7100 3540 50  0000 C CNN
 F 2 "" H 7100 3400 50  0000 C CNN
 F 3 "" H 7100 3400 50  0000 C CNN
@@ -587,10 +587,10 @@ Wire Wire Line
 Wire Wire Line
 	4250 5850 4250 6200
 $Comp
-L GND #PWR81
+L GND #PWR084
 U 1 1 5A07AFE2
 P 4250 6200
-F 0 "#PWR81" H 4250 5950 50  0001 C CNN
+F 0 "#PWR084" H 4250 5950 50  0001 C CNN
 F 1 "GND" H 4250 6050 50  0000 C CNN
 F 2 "" H 4250 6200 50  0000 C CNN
 F 3 "" H 4250 6200 50  0000 C CNN
diff --git a/flash.bak b/flash.bak
index 0326787..cb0af03 100644
--- a/flash.bak
+++ b/flash.bak
@@ -72,10 +72,10 @@ F 7 "870-IS25LP032DJNLETR" H 3650 4350 60  0001 C CNN "Distributor1_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR147
+L +3V3 #PWR0143
 U 1 1 58D9149E
 P 3650 4050
-F 0 "#PWR147" H 3650 3900 50  0001 C CNN
+F 0 "#PWR0143" H 3650 3900 50  0001 C CNN
 F 1 "+3V3" H 3650 4190 50  0000 C CNN
 F 2 "" H 3650 4050 50  0000 C CNN
 F 3 "" H 3650 4050 50  0000 C CNN
@@ -83,10 +83,10 @@ F 3 "" H 3650 4050 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR148
+L GND #PWR0144
 U 1 1 58D914B4
 P 3650 4650
-F 0 "#PWR148" H 3650 4400 50  0001 C CNN
+F 0 "#PWR0144" H 3650 4400 50  0001 C CNN
 F 1 "GND" H 3650 4500 50  0000 C CNN
 F 2 "" H 3650 4650 50  0000 C CNN
 F 3 "" H 3650 4650 50  0000 C CNN
@@ -145,10 +145,10 @@ Wire Wire Line
 Text Label 3450 3150 1    60   ~ 0
 FLASH_MOSI
 $Comp
-L +3V3 #PWR145
+L +3V3 #PWR0145
 U 1 1 58EC0F61
 P 3450 2200
-F 0 "#PWR145" H 3450 2050 50  0001 C CNN
+F 0 "#PWR0145" H 3450 2050 50  0001 C CNN
 F 1 "+3V3" H 3450 2340 50  0000 C CNN
 F 2 "" H 3450 2200 50  0000 C CNN
 F 3 "" H 3450 2200 50  0000 C CNN
@@ -171,10 +171,10 @@ Wire Wire Line
 Text Label 3650 3150 1    60   ~ 0
 FLASH_MISO
 $Comp
-L +3V3 #PWR146
+L +3V3 #PWR0146
 U 1 1 58EC0F96
 P 3650 2200
-F 0 "#PWR146" H 3650 2050 50  0001 C CNN
+F 0 "#PWR0146" H 3650 2050 50  0001 C CNN
 F 1 "+3V3" H 3650 2340 50  0000 C CNN
 F 2 "" H 3650 2200 50  0000 C CNN
 F 3 "" H 3650 2200 50  0000 C CNN
@@ -197,10 +197,10 @@ Wire Wire Line
 Text Label 3850 3150 1    60   ~ 0
 FLASH_SCK
 $Comp
-L +3V3 #PWR149
+L +3V3 #PWR0147
 U 1 1 58EC15E9
 P 3850 2200
-F 0 "#PWR149" H 3850 2050 50  0001 C CNN
+F 0 "#PWR0147" H 3850 2050 50  0001 C CNN
 F 1 "+3V3" H 3850 2340 50  0000 C CNN
 F 2 "" H 3850 2200 50  0000 C CNN
 F 3 "" H 3850 2200 50  0000 C CNN
@@ -227,10 +227,10 @@ Wire Wire Line
 Text Label 4050 3150 1    60   ~ 0
 FLASH_nCS
 $Comp
-L +3V3 #PWR150
+L +3V3 #PWR0148
 U 1 1 58EC1C8C
 P 4050 2200
-F 0 "#PWR150" H 4050 2050 50  0001 C CNN
+F 0 "#PWR0148" H 4050 2050 50  0001 C CNN
 F 1 "+3V3" H 4050 2340 50  0000 C CNN
 F 2 "" H 4050 2200 50  0000 C CNN
 F 3 "" H 4050 2200 50  0000 C CNN
@@ -255,10 +255,10 @@ Wire Wire Line
 Text Label 3050 3150 1    60   ~ 0
 FLASH_nWP
 $Comp
-L +3V3 #PWR143
+L +3V3 #PWR0149
 U 1 1 58EC4E7F
 P 3050 2200
-F 0 "#PWR143" H 3050 2050 50  0001 C CNN
+F 0 "#PWR0149" H 3050 2050 50  0001 C CNN
 F 1 "+3V3" H 3050 2340 50  0000 C CNN
 F 2 "" H 3050 2200 50  0000 C CNN
 F 3 "" H 3050 2200 50  0000 C CNN
@@ -281,10 +281,10 @@ Wire Wire Line
 Text Label 3250 3150 1    60   ~ 0
 FLASH_nHOLD
 $Comp
-L +3V3 #PWR144
+L +3V3 #PWR0150
 U 1 1 58EC4E8D
 P 3250 2200
-F 0 "#PWR144" H 3250 2050 50  0001 C CNN
+F 0 "#PWR0150" H 3250 2050 50  0001 C CNN
 F 1 "+3V3" H 3250 2340 50  0000 C CNN
 F 2 "" H 3250 2200 50  0000 C CNN
 F 3 "" H 3250 2200 50  0000 C CNN
@@ -292,10 +292,10 @@ F 3 "" H 3250 2200 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR154
+L +3V3 #PWR0151
 U 1 1 58EC58A7
 P 6300 5000
-F 0 "#PWR154" H 6300 4850 50  0001 C CNN
+F 0 "#PWR0151" H 6300 4850 50  0001 C CNN
 F 1 "+3V3" H 6300 5140 50  0000 C CNN
 F 2 "" H 6300 5000 50  0000 C CNN
 F 3 "" H 6300 5000 50  0000 C CNN
@@ -303,10 +303,10 @@ F 3 "" H 6300 5000 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR158
+L GND #PWR0152
 U 1 1 58EC58CB
 P 6500 5100
-F 0 "#PWR158" H 6500 4850 50  0001 C CNN
+F 0 "#PWR0152" H 6500 4850 50  0001 C CNN
 F 1 "GND" H 6500 4950 50  0000 C CNN
 F 2 "" H 6500 5100 50  0000 C CNN
 F 3 "" H 6500 5100 50  0000 C CNN
@@ -314,10 +314,10 @@ F 3 "" H 6500 5100 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR157
+L GND #PWR0153
 U 1 1 58EC58EF
 P 6500 4900
-F 0 "#PWR157" H 6500 4650 50  0001 C CNN
+F 0 "#PWR0153" H 6500 4650 50  0001 C CNN
 F 1 "GND" H 6500 4750 50  0000 C CNN
 F 2 "" H 6500 4900 50  0000 C CNN
 F 3 "" H 6500 4900 50  0000 C CNN
@@ -352,10 +352,10 @@ Wire Wire Line
 Text Label 5200 3300 1    60   ~ 0
 FPGA_PROGRAMN
 $Comp
-L +3V3 #PWR151
+L +3V3 #PWR0154
 U 1 1 58EC68E4
 P 5200 2200
-F 0 "#PWR151" H 5200 2050 50  0001 C CNN
+F 0 "#PWR0154" H 5200 2050 50  0001 C CNN
 F 1 "+3V3" H 5200 2340 50  0000 C CNN
 F 2 "" H 5200 2200 50  0000 C CNN
 F 3 "" H 5200 2200 50  0000 C CNN
@@ -378,10 +378,10 @@ Wire Wire Line
 Text Label 5400 3300 1    60   ~ 0
 FPGA_DONE
 $Comp
-L +3V3 #PWR152
+L +3V3 #PWR0155
 U 1 1 58EC68F2
 P 5400 2200
-F 0 "#PWR152" H 5400 2050 50  0001 C CNN
+F 0 "#PWR0155" H 5400 2050 50  0001 C CNN
 F 1 "+3V3" H 5400 2340 50  0000 C CNN
 F 2 "" H 5400 2200 50  0000 C CNN
 F 3 "" H 5400 2200 50  0000 C CNN
@@ -408,10 +408,10 @@ Wire Wire Line
 Text Label 5600 3300 1    60   ~ 0
 FPGA_INITN
 $Comp
-L +3V3 #PWR153
+L +3V3 #PWR0156
 U 1 1 58EC7305
 P 5600 2200
-F 0 "#PWR153" H 5600 2050 50  0001 C CNN
+F 0 "#PWR0156" H 5600 2050 50  0001 C CNN
 F 1 "+3V3" H 5600 2340 50  0000 C CNN
 F 2 "" H 5600 2200 50  0000 C CNN
 F 3 "" H 5600 2200 50  0000 C CNN
@@ -419,10 +419,10 @@ F 3 "" H 5600 2200 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR156
+L +3V3 #PWR0157
 U 1 1 58EC879F
 P 6500 4600
-F 0 "#PWR156" H 6500 4450 50  0001 C CNN
+F 0 "#PWR0157" H 6500 4450 50  0001 C CNN
 F 1 "+3V3" H 6500 4740 50  0000 C CNN
 F 2 "" H 6500 4600 50  0000 C CNN
 F 3 "" H 6500 4600 50  0000 C CNN
@@ -430,10 +430,10 @@ F 3 "" H 6500 4600 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +3V3 #PWR155
+L +3V3 #PWR0158
 U 1 1 58EC8800
 P 6500 4200
-F 0 "#PWR155" H 6500 4050 50  0001 C CNN
+F 0 "#PWR0158" H 6500 4050 50  0001 C CNN
 F 1 "+3V3" H 6500 4340 50  0000 C CNN
 F 2 "" H 6500 4200 50  0000 C CNN
 F 3 "" H 6500 4200 50  0000 C CNN
@@ -441,10 +441,10 @@ F 3 "" H 6500 4200 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +3V3 #PWR159
+L +3V3 #PWR0159
 U 1 1 58EC882A
 P 8000 4200
-F 0 "#PWR159" H 8000 4050 50  0001 C CNN
+F 0 "#PWR0159" H 8000 4050 50  0001 C CNN
 F 1 "+3V3" H 8000 4340 50  0000 C CNN
 F 2 "" H 8000 4200 50  0000 C CNN
 F 3 "" H 8000 4200 50  0000 C CNN
diff --git a/gpdi.bak b/gpdi.bak
index be9be14..a193cb8 100644
--- a/gpdi.bak
+++ b/gpdi.bak
@@ -72,10 +72,10 @@ F 7 "649-10029449-111RLF" H 1250 2850 60  0001 C CNN "Distributor1_PN"
 	-1   0    0    -1  
 $EndComp
 $Comp
-L GND #PWR85
+L GND #PWR085
 U 1 1 58D69073
 P 1500 1900
-F 0 "#PWR85" H 1500 1650 50  0001 C CNN
+F 0 "#PWR085" H 1500 1650 50  0001 C CNN
 F 1 "GND" H 1500 1750 50  0000 C CNN
 F 2 "" H 1500 1900 60  0000 C CNN
 F 3 "" H 1500 1900 60  0000 C CNN
@@ -83,10 +83,10 @@ F 3 "" H 1500 1900 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR90
+L GND #PWR086
 U 1 1 58D69074
 P 1500 3600
-F 0 "#PWR90" H 1500 3350 50  0001 C CNN
+F 0 "#PWR086" H 1500 3350 50  0001 C CNN
 F 1 "GND" H 1500 3450 50  0000 C CNN
 F 2 "" H 1500 3600 60  0000 C CNN
 F 3 "" H 1500 3600 60  0000 C CNN
@@ -94,10 +94,10 @@ F 3 "" H 1500 3600 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR89
+L GND #PWR087
 U 1 1 58D69075
 P 1500 3000
-F 0 "#PWR89" H 1500 2750 50  0001 C CNN
+F 0 "#PWR087" H 1500 2750 50  0001 C CNN
 F 1 "GND" H 1500 2850 50  0000 C CNN
 F 2 "" H 1500 3000 60  0000 C CNN
 F 3 "" H 1500 3000 60  0000 C CNN
@@ -105,10 +105,10 @@ F 3 "" H 1500 3000 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR88
+L GND #PWR088
 U 1 1 58D69076
 P 1500 2700
-F 0 "#PWR88" H 1500 2450 50  0001 C CNN
+F 0 "#PWR088" H 1500 2450 50  0001 C CNN
 F 1 "GND" H 1500 2550 50  0000 C CNN
 F 2 "" H 1500 2700 60  0000 C CNN
 F 3 "" H 1500 2700 60  0000 C CNN
@@ -116,10 +116,10 @@ F 3 "" H 1500 2700 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR87
+L GND #PWR089
 U 1 1 58D69077
 P 1500 2400
-F 0 "#PWR87" H 1500 2150 50  0001 C CNN
+F 0 "#PWR089" H 1500 2150 50  0001 C CNN
 F 1 "GND" H 1500 2250 50  0000 C CNN
 F 2 "" H 1500 2400 60  0000 C CNN
 F 3 "" H 1500 2400 60  0000 C CNN
@@ -127,10 +127,10 @@ F 3 "" H 1500 2400 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR86
+L GND #PWR090
 U 1 1 58D69078
 P 1500 2100
-F 0 "#PWR86" H 1500 1850 50  0001 C CNN
+F 0 "#PWR090" H 1500 1850 50  0001 C CNN
 F 1 "GND" H 1500 1950 50  0000 C CNN
 F 2 "" H 1500 2100 60  0000 C CNN
 F 3 "" H 1500 2100 60  0000 C CNN
@@ -138,10 +138,10 @@ F 3 "" H 1500 2100 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +5V #PWR93
+L +5V #PWR091
 U 1 1 58D6907F
 P 2300 3700
-F 0 "#PWR93" H 2300 3550 50  0001 C CNN
+F 0 "#PWR091" H 2300 3550 50  0001 C CNN
 F 1 "+5V" H 2300 3840 50  0000 C CNN
 F 2 "" H 2300 3700 50  0000 C CNN
 F 3 "" H 2300 3700 50  0000 C CNN
@@ -231,10 +231,10 @@ F 3 "" H 3800 4800 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +5V #PWR95
+L +5V #PWR092
 U 1 1 58D92625
 P 3600 4400
-F 0 "#PWR95" H 3600 4250 50  0001 C CNN
+F 0 "#PWR092" H 3600 4250 50  0001 C CNN
 F 1 "+5V" H 3600 4540 50  0000 C CNN
 F 2 "" H 3600 4400 50  0000 C CNN
 F 3 "" H 3600 4400 50  0000 C CNN
@@ -253,10 +253,10 @@ F 3 "" H 3400 5600 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR94
+L GND #PWR093
 U 1 1 58D92889
 P 3400 5800
-F 0 "#PWR94" H 3400 5550 50  0001 C CNN
+F 0 "#PWR093" H 3400 5550 50  0001 C CNN
 F 1 "GND" H 3400 5650 50  0000 C CNN
 F 2 "" H 3400 5800 50  0000 C CNN
 F 3 "" H 3400 5800 50  0000 C CNN
@@ -264,10 +264,10 @@ F 3 "" H 3400 5800 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR91
+L +3V3 #PWR094
 U 1 1 58D92A40
 P 2000 4700
-F 0 "#PWR91" H 2000 4550 50  0001 C CNN
+F 0 "#PWR094" H 2000 4550 50  0001 C CNN
 F 1 "+3V3" H 2000 4840 50  0000 C CNN
 F 2 "" H 2000 4700 50  0000 C CNN
 F 3 "" H 2000 4700 50  0000 C CNN
@@ -275,10 +275,10 @@ F 3 "" H 2000 4700 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR92
+L GND #PWR095
 U 1 1 58D92B02
 P 2250 5050
-F 0 "#PWR92" H 2250 4800 50  0001 C CNN
+F 0 "#PWR095" H 2250 4800 50  0001 C CNN
 F 1 "GND" H 2250 4900 50  0000 C CNN
 F 2 "" H 2250 5050 50  0000 C CNN
 F 3 "" H 2250 5050 50  0000 C CNN
diff --git a/gpio.bak b/gpio.bak
index fe37a25..fde065f 100644
--- a/gpio.bak
+++ b/gpio.bak
@@ -57,10 +57,10 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L GND #PWR22
+L GND #PWR05
 U 1 1 56AC4825
 P 7800 3550
-F 0 "#PWR22" H 7800 3300 50  0001 C CNN
+F 0 "#PWR05" H 7800 3300 50  0001 C CNN
 F 1 "GND" H 7800 3400 50  0000 C CNN
 F 2 "" H 7800 3550 60  0000 C CNN
 F 3 "" H 7800 3550 60  0000 C CNN
@@ -68,10 +68,10 @@ F 3 "" H 7800 3550 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR23
+L GND #PWR06
 U 1 1 56AC482D
 P 9000 3550
-F 0 "#PWR23" H 9000 3300 50  0001 C CNN
+F 0 "#PWR06" H 9000 3300 50  0001 C CNN
 F 1 "GND" H 9000 3400 50  0000 C CNN
 F 2 "" H 9000 3550 60  0000 C CNN
 F 3 "" H 9000 3550 60  0000 C CNN
@@ -111,10 +111,10 @@ $EndComp
 Text Label 8700 5350 0    60   ~ 0
 OUT5V
 $Comp
-L +5V #PWR17
+L +5V #PWR07
 U 1 1 56AC484F
 P 7350 5350
-F 0 "#PWR17" H 7350 5200 50  0001 C CNN
+F 0 "#PWR07" H 7350 5200 50  0001 C CNN
 F 1 "+5V" H 7350 5490 50  0000 C CNN
 F 2 "" H 7350 5350 60  0000 C CNN
 F 3 "" H 7350 5350 60  0000 C CNN
@@ -122,10 +122,10 @@ F 3 "" H 7350 5350 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +3V3 #PWR26
+L +3V3 #PWR08
 U 1 1 58D5FBBC
 P 9150 3450
-F 0 "#PWR26" H 9150 3300 50  0001 C CNN
+F 0 "#PWR08" H 9150 3300 50  0001 C CNN
 F 1 "+3V3" H 9150 3590 50  0000 C CNN
 F 2 "" H 9150 3450 50  0000 C CNN
 F 3 "" H 9150 3450 50  0000 C CNN
@@ -133,10 +133,10 @@ F 3 "" H 9150 3450 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR19
+L +3V3 #PWR09
 U 1 1 58D5FBF3
 P 7650 3450
-F 0 "#PWR19" H 7650 3300 50  0001 C CNN
+F 0 "#PWR09" H 7650 3300 50  0001 C CNN
 F 1 "+3V3" H 7650 3590 50  0000 C CNN
 F 2 "" H 7650 3450 50  0000 C CNN
 F 3 "" H 7650 3450 50  0000 C CNN
@@ -168,10 +168,10 @@ F 4 "Do not install" H 1850 4450 60  0001 C CNN "Note"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR20
+L GND #PWR010
 U 1 1 58E6D572
 P 7750 4450
-F 0 "#PWR20" H 7750 4200 50  0001 C CNN
+F 0 "#PWR010" H 7750 4200 50  0001 C CNN
 F 1 "GND" H 7750 4300 50  0000 C CNN
 F 2 "" H 7750 4450 60  0000 C CNN
 F 3 "" H 7750 4450 60  0000 C CNN
@@ -179,10 +179,10 @@ F 3 "" H 7750 4450 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR18
+L +3V3 #PWR011
 U 1 1 58E6D578
 P 7600 4350
-F 0 "#PWR18" H 7600 4200 50  0001 C CNN
+F 0 "#PWR011" H 7600 4200 50  0001 C CNN
 F 1 "+3V3" H 7600 4490 50  0000 C CNN
 F 2 "" H 7600 4350 50  0000 C CNN
 F 3 "" H 7600 4350 50  0000 C CNN
@@ -190,10 +190,10 @@ F 3 "" H 7600 4350 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR24
+L GND #PWR012
 U 1 1 58E6D59D
 P 9050 4450
-F 0 "#PWR24" H 9050 4200 50  0001 C CNN
+F 0 "#PWR012" H 9050 4200 50  0001 C CNN
 F 1 "GND" H 9050 4300 50  0000 C CNN
 F 2 "" H 9050 4450 60  0000 C CNN
 F 3 "" H 9050 4450 60  0000 C CNN
@@ -201,10 +201,10 @@ F 3 "" H 9050 4450 60  0000 C CNN
 	0    -1   1    0   
 $EndComp
 $Comp
-L +3V3 #PWR27
+L +3V3 #PWR013
 U 1 1 58E6D5A3
 P 9200 4350
-F 0 "#PWR27" H 9200 4200 50  0001 C CNN
+F 0 "#PWR013" H 9200 4200 50  0001 C CNN
 F 1 "+3V3" H 9200 4490 50  0000 C CNN
 F 2 "" H 9200 4350 50  0000 C CNN
 F 3 "" H 9200 4350 50  0000 C CNN
@@ -212,10 +212,10 @@ F 3 "" H 9200 4350 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR21
+L GND #PWR014
 U 1 1 58E6E4EC
 P 7750 5250
-F 0 "#PWR21" H 7750 5000 50  0001 C CNN
+F 0 "#PWR014" H 7750 5000 50  0001 C CNN
 F 1 "GND" H 7750 5100 50  0000 C CNN
 F 2 "" H 7750 5250 60  0000 C CNN
 F 3 "" H 7750 5250 60  0000 C CNN
@@ -223,10 +223,10 @@ F 3 "" H 7750 5250 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR7
+L +3V3 #PWR015
 U 1 1 58E6E4F2
 P 1050 5400
-F 0 "#PWR7" H 1050 5250 50  0001 C CNN
+F 0 "#PWR015" H 1050 5250 50  0001 C CNN
 F 1 "+3V3" H 1050 5540 50  0000 C CNN
 F 2 "" H 1050 5400 50  0000 C CNN
 F 3 "" H 1050 5400 50  0000 C CNN
@@ -234,10 +234,10 @@ F 3 "" H 1050 5400 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR25
+L GND #PWR016
 U 1 1 58E6E536
 P 9050 5250
-F 0 "#PWR25" H 9050 5000 50  0001 C CNN
+F 0 "#PWR016" H 9050 5000 50  0001 C CNN
 F 1 "GND" H 9050 5100 50  0000 C CNN
 F 2 "" H 9050 5250 60  0000 C CNN
 F 3 "" H 9050 5250 60  0000 C CNN
@@ -245,10 +245,10 @@ F 3 "" H 9050 5250 60  0000 C CNN
 	0    -1   1    0   
 $EndComp
 $Comp
-L +3V3 #PWR14
+L +3V3 #PWR017
 U 1 1 58E6E53C
 P 2600 5400
-F 0 "#PWR14" H 2600 5250 50  0001 C CNN
+F 0 "#PWR017" H 2600 5250 50  0001 C CNN
 F 1 "+3V3" H 2600 5540 50  0000 C CNN
 F 2 "" H 2600 5400 50  0000 C CNN
 F 3 "" H 2600 5400 50  0000 C CNN
@@ -284,10 +284,10 @@ Wire Wire Line
 Wire Wire Line
 	7750 5250 8150 5250
 $Comp
-L GND #PWR8
+L GND #PWR018
 U 1 1 58E710CC
 P 1200 3600
-F 0 "#PWR8" H 1200 3350 50  0001 C CNN
+F 0 "#PWR018" H 1200 3350 50  0001 C CNN
 F 1 "GND" H 1200 3450 50  0000 C CNN
 F 2 "" H 1200 3600 60  0000 C CNN
 F 3 "" H 1200 3600 60  0000 C CNN
@@ -295,10 +295,10 @@ F 3 "" H 1200 3600 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR5
+L +3V3 #PWR019
 U 1 1 58E710E0
 P 1050 3500
-F 0 "#PWR5" H 1050 3350 50  0001 C CNN
+F 0 "#PWR019" H 1050 3350 50  0001 C CNN
 F 1 "+3V3" H 1050 3640 50  0000 C CNN
 F 2 "" H 1050 3500 50  0000 C CNN
 F 3 "" H 1050 3500 50  0000 C CNN
@@ -306,10 +306,10 @@ F 3 "" H 1050 3500 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR9
+L GND #PWR020
 U 1 1 58E710E6
 P 1200 4500
-F 0 "#PWR9" H 1200 4250 50  0001 C CNN
+F 0 "#PWR020" H 1200 4250 50  0001 C CNN
 F 1 "GND" H 1200 4350 50  0000 C CNN
 F 2 "" H 1200 4500 60  0000 C CNN
 F 3 "" H 1200 4500 60  0000 C CNN
@@ -317,10 +317,10 @@ F 3 "" H 1200 4500 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR6
+L +3V3 #PWR021
 U 1 1 58E710EC
 P 1050 4400
-F 0 "#PWR6" H 1050 4250 50  0001 C CNN
+F 0 "#PWR021" H 1050 4250 50  0001 C CNN
 F 1 "+3V3" H 1050 4540 50  0000 C CNN
 F 2 "" H 1050 4400 50  0000 C CNN
 F 3 "" H 1050 4400 50  0000 C CNN
@@ -328,10 +328,10 @@ F 3 "" H 1050 4400 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR10
+L GND #PWR022
 U 1 1 58E710F2
 P 1200 5300
-F 0 "#PWR10" H 1200 5050 50  0001 C CNN
+F 0 "#PWR022" H 1200 5050 50  0001 C CNN
 F 1 "GND" H 1200 5150 50  0000 C CNN
 F 2 "" H 1200 5300 60  0000 C CNN
 F 3 "" H 1200 5300 60  0000 C CNN
@@ -349,10 +349,10 @@ Wire Wire Line
 Wire Wire Line
 	1200 5300 1600 5300
 $Comp
-L GND #PWR13
+L GND #PWR023
 U 1 1 58E7117D
 P 2550 3600
-F 0 "#PWR13" H 2550 3350 50  0001 C CNN
+F 0 "#PWR023" H 2550 3350 50  0001 C CNN
 F 1 "GND" H 2550 3450 50  0000 C CNN
 F 2 "" H 2550 3600 60  0000 C CNN
 F 3 "" H 2550 3600 60  0000 C CNN
@@ -360,10 +360,10 @@ F 3 "" H 2550 3600 60  0000 C CNN
 	0    -1   1    0   
 $EndComp
 $Comp
-L +3V3 #PWR16
+L +3V3 #PWR024
 U 1 1 58E71191
 P 2700 3500
-F 0 "#PWR16" H 2700 3350 50  0001 C CNN
+F 0 "#PWR024" H 2700 3350 50  0001 C CNN
 F 1 "+3V3" H 2700 3640 50  0000 C CNN
 F 2 "" H 2700 3500 50  0000 C CNN
 F 3 "" H 2700 3500 50  0000 C CNN
@@ -371,10 +371,10 @@ F 3 "" H 2700 3500 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR11
+L GND #PWR025
 U 1 1 58E71197
 P 2500 4500
-F 0 "#PWR11" H 2500 4250 50  0001 C CNN
+F 0 "#PWR025" H 2500 4250 50  0001 C CNN
 F 1 "GND" H 2500 4350 50  0000 C CNN
 F 2 "" H 2500 4500 60  0000 C CNN
 F 3 "" H 2500 4500 60  0000 C CNN
@@ -382,10 +382,10 @@ F 3 "" H 2500 4500 60  0000 C CNN
 	0    -1   1    0   
 $EndComp
 $Comp
-L +3V3 #PWR15
+L +3V3 #PWR026
 U 1 1 58E7119D
 P 2650 4400
-F 0 "#PWR15" H 2650 4250 50  0001 C CNN
+F 0 "#PWR026" H 2650 4250 50  0001 C CNN
 F 1 "+3V3" H 2650 4540 50  0000 C CNN
 F 2 "" H 2650 4400 50  0000 C CNN
 F 3 "" H 2650 4400 50  0000 C CNN
@@ -393,10 +393,10 @@ F 3 "" H 2650 4400 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR12
+L GND #PWR027
 U 1 1 58E711A3
 P 2500 5300
-F 0 "#PWR12" H 2500 5050 50  0001 C CNN
+F 0 "#PWR027" H 2500 5050 50  0001 C CNN
 F 1 "GND" H 2500 5150 50  0000 C CNN
 F 2 "" H 2500 5300 60  0000 C CNN
 F 3 "" H 2500 5300 60  0000 C CNN
@@ -414,10 +414,10 @@ Wire Wire Line
 Wire Wire Line
 	2100 5300 2500 5300
 $Comp
-L +5V #PWR28
+L +5V #PWR028
 U 1 1 58E75077
 P 9500 5350
-F 0 "#PWR28" H 9500 5200 50  0001 C CNN
+F 0 "#PWR028" H 9500 5200 50  0001 C CNN
 F 1 "+5V" H 9500 5490 50  0000 C CNN
 F 2 "" H 9500 5350 50  0000 C CNN
 F 3 "" H 9500 5350 50  0000 C CNN
diff --git a/power.bak b/power.bak
index 1bd06fe..600e45c 100644
--- a/power.bak
+++ b/power.bak
@@ -57,10 +57,10 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L GND #PWR43
+L GND #PWR029
 U 1 1 58D54769
 P 5000 2400
-F 0 "#PWR43" H 5000 2150 50  0001 C CNN
+F 0 "#PWR029" H 5000 2150 50  0001 C CNN
 F 1 "GND" H 5000 2250 50  0000 C CNN
 F 2 "" H 5000 2400 60  0000 C CNN
 F 3 "" H 5000 2400 60  0000 C CNN
@@ -68,10 +68,10 @@ F 3 "" H 5000 2400 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR68
+L GND #PWR030
 U 1 1 58D58A0B
 P 8100 3600
-F 0 "#PWR68" H 8100 3350 50  0001 C CNN
+F 0 "#PWR030" H 8100 3350 50  0001 C CNN
 F 1 "GND" H 8100 3450 50  0000 C CNN
 F 2 "" H 8100 3600 50  0000 C CNN
 F 3 "" H 8100 3600 50  0000 C CNN
@@ -79,10 +79,10 @@ F 3 "" H 8100 3600 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +5V #PWR62
+L +5V #PWR031
 U 1 1 58D58F93
 P 7450 2950
-F 0 "#PWR62" H 7450 2800 50  0001 C CNN
+F 0 "#PWR031" H 7450 2800 50  0001 C CNN
 F 1 "+5V" H 7450 3090 50  0000 C CNN
 F 2 "" H 7450 2950 50  0000 C CNN
 F 3 "" H 7450 2950 50  0000 C CNN
@@ -90,10 +90,10 @@ F 3 "" H 7450 2950 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR63
+L GND #PWR032
 U 1 1 58D5989A
 P 7450 3600
-F 0 "#PWR63" H 7450 3350 50  0001 C CNN
+F 0 "#PWR032" H 7450 3350 50  0001 C CNN
 F 1 "GND" H 7450 3450 50  0000 C CNN
 F 2 "" H 7450 3600 50  0000 C CNN
 F 3 "" H 7450 3600 50  0000 C CNN
@@ -112,21 +112,6 @@ F 3 "" H 7450 3400 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L L L1
-U 1 1 58D59D36
-P 8950 2800
-F 0 "L1" V 8900 2800 50  0000 C CNN
-F 1 "2.2uH" V 9025 2800 50  0000 C CNN
-F 2 "Resistors_SMD:R_1210_HandSoldering" H 8950 2800 50  0001 C CNN
-F 3 "http://psearch.en.murata.com/inductor/product/DFE322512F-2R2M%23.pdf" H 8950 2800 50  0001 C CNN
-F 4 "www.murata.com" H 8950 2800 60  0001 C CNN "MFG_URL"
-F 5 "DFE322512F-2R2M=P2" H 8950 2800 60  0001 C CNN "MFG_PN"
-F 6 "www.mouser.com" H 8950 2800 60  0001 C CNN "Distributor1_URL"
-F 7 "81-DFE322512F-2R2MP2" H 8950 2800 60  0001 C CNN "Distributor1_PN"
-	1    8950 2800
-	0    -1   -1   0   
-$EndComp
-$Comp
 L C C2
 U 1 1 58D5A146
 P 9150 3000
@@ -160,10 +145,10 @@ F 3 "" H 9650 3200 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR71
+L GND #PWR033
 U 1 1 58D5AE5E
 P 9850 3300
-F 0 "#PWR71" H 9850 3050 50  0001 C CNN
+F 0 "#PWR033" H 9850 3050 50  0001 C CNN
 F 1 "GND" H 9850 3150 50  0000 C CNN
 F 2 "" H 9850 3300 50  0000 C CNN
 F 3 "" H 9850 3300 50  0000 C CNN
@@ -193,10 +178,10 @@ F 3 "" H 10200 3000 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR40
+L +3V3 #PWR034
 U 1 1 58D5CFDD
 P 4750 650
-F 0 "#PWR40" H 4750 500 50  0001 C CNN
+F 0 "#PWR034" H 4750 500 50  0001 C CNN
 F 1 "+3V3" H 4750 790 50  0000 C CNN
 F 2 "" H 4750 650 50  0000 C CNN
 F 3 "" H 4750 650 50  0000 C CNN
@@ -204,10 +189,10 @@ F 3 "" H 4750 650 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR70
+L GND #PWR035
 U 1 1 58D6294C
 P 8100 6000
-F 0 "#PWR70" H 8100 5750 50  0001 C CNN
+F 0 "#PWR035" H 8100 5750 50  0001 C CNN
 F 1 "GND" H 8100 5850 50  0000 C CNN
 F 2 "" H 8100 6000 50  0000 C CNN
 F 3 "" H 8100 6000 50  0000 C CNN
@@ -215,10 +200,10 @@ F 3 "" H 8100 6000 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +5V #PWR66
+L +5V #PWR036
 U 1 1 58D62952
 P 7450 5350
-F 0 "#PWR66" H 7450 5200 50  0001 C CNN
+F 0 "#PWR036" H 7450 5200 50  0001 C CNN
 F 1 "+5V" H 7450 5490 50  0000 C CNN
 F 2 "" H 7450 5350 50  0000 C CNN
 F 3 "" H 7450 5350 50  0000 C CNN
@@ -226,10 +211,10 @@ F 3 "" H 7450 5350 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR67
+L GND #PWR037
 U 1 1 58D62958
 P 7450 6000
-F 0 "#PWR67" H 7450 5750 50  0001 C CNN
+F 0 "#PWR037" H 7450 5750 50  0001 C CNN
 F 1 "GND" H 7450 5850 50  0000 C CNN
 F 2 "" H 7450 6000 50  0000 C CNN
 F 3 "" H 7450 6000 50  0000 C CNN
@@ -248,21 +233,6 @@ F 3 "" H 7450 5800 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L L L3
-U 1 1 58D62964
-P 8950 5200
-F 0 "L3" V 8900 5200 50  0000 C CNN
-F 1 "2.2uH" V 9025 5200 50  0000 C CNN
-F 2 "Resistors_SMD:R_1210_HandSoldering" H 8950 5200 50  0001 C CNN
-F 3 "http://www.bourns.com/docs/Product-Datasheets/srp2512a.pdf" H 8950 5200 50  0001 C CNN
-F 4 "www.bourns.com" H 8950 5200 60  0001 C CNN "MFG_URL"
-F 5 "SRP2512A-2R2M" H 8950 5200 60  0001 C CNN "MFG_PN"
-F 6 "www.mouser.com" H 8950 5200 60  0001 C CNN "Distributor1_URL"
-F 7 "652-SRP2512A-2R2M" H 8950 5200 60  0001 C CNN "Distributor1_PN"
-	1    8950 5200
-	0    -1   -1   0   
-$EndComp
-$Comp
 L C C6
 U 1 1 58D6296A
 P 9150 5400
@@ -296,10 +266,10 @@ F 3 "" H 9650 5600 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR73
+L GND #PWR038
 U 1 1 58D62982
 P 9850 5700
-F 0 "#PWR73" H 9850 5450 50  0001 C CNN
+F 0 "#PWR038" H 9850 5450 50  0001 C CNN
 F 1 "GND" H 9850 5550 50  0000 C CNN
 F 2 "" H 9850 5700 50  0000 C CNN
 F 3 "" H 9850 5700 50  0000 C CNN
@@ -329,10 +299,10 @@ F 3 "" H 10200 5400 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR76
+L +3V3 #PWR039
 U 1 1 58D62CE2
 P 10900 5150
-F 0 "#PWR76" H 10900 5000 50  0001 C CNN
+F 0 "#PWR039" H 10900 5000 50  0001 C CNN
 F 1 "+3V3" H 10900 5290 50  0000 C CNN
 F 2 "" H 10900 5150 50  0000 C CNN
 F 3 "" H 10900 5150 50  0000 C CNN
@@ -357,10 +327,10 @@ F 7 "595-TLV62569DBVR" H 8100 5500 60  0001 C CNN "Distributor1_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR69
+L GND #PWR040
 U 1 1 58D67BC0
 P 8100 4800
-F 0 "#PWR69" H 8100 4550 50  0001 C CNN
+F 0 "#PWR040" H 8100 4550 50  0001 C CNN
 F 1 "GND" H 8100 4650 50  0000 C CNN
 F 2 "" H 8100 4800 50  0000 C CNN
 F 3 "" H 8100 4800 50  0000 C CNN
@@ -368,10 +338,10 @@ F 3 "" H 8100 4800 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +5V #PWR64
+L +5V #PWR041
 U 1 1 58D67BC6
 P 7450 4150
-F 0 "#PWR64" H 7450 4000 50  0001 C CNN
+F 0 "#PWR041" H 7450 4000 50  0001 C CNN
 F 1 "+5V" H 7450 4290 50  0000 C CNN
 F 2 "" H 7450 4150 50  0000 C CNN
 F 3 "" H 7450 4150 50  0000 C CNN
@@ -379,10 +349,10 @@ F 3 "" H 7450 4150 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR65
+L GND #PWR042
 U 1 1 58D67BCC
 P 7450 4800
-F 0 "#PWR65" H 7450 4550 50  0001 C CNN
+F 0 "#PWR042" H 7450 4550 50  0001 C CNN
 F 1 "GND" H 7450 4650 50  0000 C CNN
 F 2 "" H 7450 4800 50  0000 C CNN
 F 3 "" H 7450 4800 50  0000 C CNN
@@ -449,10 +419,10 @@ F 3 "" H 9650 4400 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR72
+L GND #PWR043
 U 1 1 58D67BF0
 P 9850 4500
-F 0 "#PWR72" H 9850 4250 50  0001 C CNN
+F 0 "#PWR043" H 9850 4250 50  0001 C CNN
 F 1 "GND" H 9850 4350 50  0000 C CNN
 F 2 "" H 9850 4500 50  0000 C CNN
 F 3 "" H 9850 4500 50  0000 C CNN
@@ -493,10 +463,10 @@ F 3 "" H 4350 4400 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +2V5 #PWR75
+L +2V5 #PWR044
 U 1 1 58D681D4
 P 10900 3950
-F 0 "#PWR75" H 10900 3800 50  0001 C CNN
+F 0 "#PWR044" H 10900 3800 50  0001 C CNN
 F 1 "+2V5" H 10900 4090 50  0000 C CNN
 F 2 "" H 10900 3950 50  0000 C CNN
 F 3 "" H 10900 3950 50  0000 C CNN
@@ -524,10 +494,10 @@ FB3
 Text Label 8850 4400 0    60   ~ 0
 FB2
 $Comp
-L +2V5 #PWR37
+L +2V5 #PWR045
 U 1 1 58D68750
 P 4250 650
-F 0 "#PWR37" H 4250 500 50  0001 C CNN
+F 0 "#PWR045" H 4250 500 50  0001 C CNN
 F 1 "+2V5" H 4250 790 50  0000 C CNN
 F 2 "" H 4250 650 50  0000 C CNN
 F 3 "" H 4250 650 50  0000 C CNN
@@ -535,10 +505,10 @@ F 3 "" H 4250 650 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR61
+L +3V3 #PWR046
 U 1 1 58D69259
 P 7000 650
-F 0 "#PWR61" H 7000 500 50  0001 C CNN
+F 0 "#PWR046" H 7000 500 50  0001 C CNN
 F 1 "+3V3" H 7000 790 50  0000 C CNN
 F 2 "" H 7000 650 50  0000 C CNN
 F 3 "" H 7000 650 50  0000 C CNN
@@ -561,10 +531,10 @@ F 7 "https://www.nxp.com/docs/en/packing/SOT96-1_118.pdf" H 2000 3350 60  0001 C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR31
+L GND #PWR047
 U 1 1 58D7085C
 P 2000 3850
-F 0 "#PWR31" H 2000 3600 50  0001 C CNN
+F 0 "#PWR047" H 2000 3600 50  0001 C CNN
 F 1 "GND" H 2000 3700 50  0000 C CNN
 F 2 "" H 2000 3850 50  0000 C CNN
 F 3 "" H 2000 3850 50  0000 C CNN
@@ -591,10 +561,10 @@ F 7 "534-3000TR" H 2700 3800 60  0001 C CNN "Distributor1_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR29
+L GND #PWR048
 U 1 1 58D72406
 P 1950 4300
-F 0 "#PWR29" H 1950 4050 50  0001 C CNN
+F 0 "#PWR048" H 1950 4050 50  0001 C CNN
 F 1 "GND" H 1950 4150 50  0000 C CNN
 F 2 "" H 1950 4300 50  0000 C CNN
 F 3 "" H 1950 4300 50  0000 C CNN
@@ -639,10 +609,10 @@ F 3 "" H 4350 5300 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR39
+L GND #PWR049
 U 1 1 58D7C223
 P 4350 5900
-F 0 "#PWR39" H 4350 5650 50  0001 C CNN
+F 0 "#PWR049" H 4350 5650 50  0001 C CNN
 F 1 "GND" H 4350 5750 50  0000 C CNN
 F 2 "" H 4350 5900 50  0000 C CNN
 F 3 "" H 4350 5900 50  0000 C CNN
@@ -823,10 +793,10 @@ F 3 "" H 4100 3950 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR36
+L GND #PWR050
 U 1 1 58DA2E46
 P 4100 4100
-F 0 "#PWR36" H 4100 3850 50  0001 C CNN
+F 0 "#PWR050" H 4100 3850 50  0001 C CNN
 F 1 "GND" H 4100 3950 50  0000 C CNN
 F 2 "" H 4100 4100 50  0000 C CNN
 F 3 "" H 4100 4100 50  0000 C CNN
@@ -834,10 +804,10 @@ F 3 "" H 4100 4100 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +5V #PWR38
+L +5V #PWR051
 U 1 1 58D67C25
 P 4350 3100
-F 0 "#PWR38" H 4350 2950 50  0001 C CNN
+F 0 "#PWR051" H 4350 2950 50  0001 C CNN
 F 1 "+5V" H 4350 3240 50  0000 C CNN
 F 2 "" H 4350 3100 50  0000 C CNN
 F 3 "" H 4350 3100 50  0000 C CNN
@@ -858,10 +828,10 @@ F 3 "" H 3450 5100 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR35
+L +3V3 #PWR052
 U 1 1 58DA569C
 P 3450 4950
-F 0 "#PWR35" H 3450 4800 50  0001 C CNN
+F 0 "#PWR052" H 3450 4800 50  0001 C CNN
 F 1 "+3V3" H 3450 5090 50  0000 C CNN
 F 2 "" H 3450 4950 50  0000 C CNN
 F 3 "" H 3450 4950 50  0000 C CNN
@@ -895,10 +865,10 @@ F 3 "" H 2950 3650 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +5V #PWR34
+L +5V #PWR053
 U 1 1 58E82A7E
 P 3350 4100
-F 0 "#PWR34" H 3350 3950 50  0001 C CNN
+F 0 "#PWR053" H 3350 3950 50  0001 C CNN
 F 1 "+5V" H 3350 4240 50  0000 C CNN
 F 2 "" H 3350 4100 50  0000 C CNN
 F 3 "" H 3350 4100 50  0000 C CNN
@@ -1528,10 +1498,10 @@ Wire Wire Line
 	7700 850  7700 750 
 Connection ~ 7700 750 
 $Comp
-L +3V3 #PWR30
+L +3V3 #PWR054
 U 1 1 591C4E6A
 P 2000 2850
-F 0 "#PWR30" H 2000 2700 50  0001 C CNN
+F 0 "#PWR054" H 2000 2700 50  0001 C CNN
 F 1 "+3V3" H 2000 2990 50  0000 C CNN
 F 2 "" H 2000 2850 50  0000 C CNN
 F 3 "" H 2000 2850 50  0000 C CNN
@@ -1609,10 +1579,10 @@ Wire Wire Line
 	2950 3450 2950 3500
 Connection ~ 2950 3450
 $Comp
-L GND #PWR33
+L GND #PWR055
 U 1 1 59D5B51B
 P 2700 3950
-F 0 "#PWR33" H 2700 3700 50  0001 C CNN
+F 0 "#PWR055" H 2700 3700 50  0001 C CNN
 F 1 "GND" H 2700 3800 50  0000 C CNN
 F 2 "" H 2700 3950 50  0000 C CNN
 F 3 "" H 2700 3950 50  0000 C CNN
@@ -1681,8 +1651,8 @@ L Jumper_NC_Small JP1
 U 1 1 59DFB08A
 P 10750 2800
 F 0 "JP1" H 10750 2880 50  0000 C CNN
-F 1 "1.2" H 10800 2750 50  0000 C CNN
-F 2 "jumper:SOLDER-JUMPER_1-WAY" H 10750 2800 50  0001 C CNN
+F 1 "1.1" H 10800 2750 50  0000 C CNN
+F 2 "jumper_connected:SOLDER-JUMPER_1-WAY_CONNECTED" H 10750 2800 50  0001 C CNN
 F 3 "" H 10750 2800 50  0001 C CNN
 F 4 "Do not install" H 10750 2800 60  0001 C CNN "Note"
 	1    10750 2800
@@ -1694,7 +1664,7 @@ U 1 1 59DFB617
 P 10750 4000
 F 0 "JP2" H 10750 4080 50  0000 C CNN
 F 1 "2.5" H 10800 3950 50  0000 C CNN
-F 2 "jumper:SOLDER-JUMPER_1-WAY" H 10750 4000 50  0001 C CNN
+F 2 "jumper_connected:SOLDER-JUMPER_1-WAY_CONNECTED" H 10750 4000 50  0001 C CNN
 F 3 "" H 10750 4000 50  0001 C CNN
 F 4 "Do not install" H 10750 4000 60  0001 C CNN "Note"
 	1    10750 4000
@@ -1706,7 +1676,7 @@ U 1 1 59DFBF34
 P 10750 5200
 F 0 "JP3" H 10750 5280 50  0000 C CNN
 F 1 "3.3" H 10800 5150 50  0000 C CNN
-F 2 "jumper:SOLDER-JUMPER_1-WAY" H 10750 5200 50  0001 C CNN
+F 2 "jumper_connected:SOLDER-JUMPER_1-WAY_CONNECTED" H 10750 5200 50  0001 C CNN
 F 3 "" H 10750 5200 50  0001 C CNN
 F 4 "Do not install" H 10750 5200 60  0001 C CNN "Note"
 	1    10750 5200
@@ -1836,10 +1806,10 @@ Wire Wire Line
 	6600 7350 6700 7350
 Connection ~ 6700 7350
 $Comp
-L GND #PWR41
+L GND #PWR056
 U 1 1 59EF897E
 P 4800 7450
-F 0 "#PWR41" H 4800 7200 50  0001 C CNN
+F 0 "#PWR056" H 4800 7200 50  0001 C CNN
 F 1 "GND" H 4800 7300 50  0000 C CNN
 F 2 "" H 4800 7450 50  0001 C CNN
 F 3 "" H 4800 7450 50  0001 C CNN
@@ -1847,10 +1817,10 @@ F 3 "" H 4800 7450 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR60
+L GND #PWR057
 U 1 1 59EF8A0A
 P 6700 7450
-F 0 "#PWR60" H 6700 7200 50  0001 C CNN
+F 0 "#PWR057" H 6700 7200 50  0001 C CNN
 F 1 "GND" H 6700 7300 50  0000 C CNN
 F 2 "" H 6700 7450 50  0001 C CNN
 F 3 "" H 6700 7450 50  0001 C CNN
@@ -1897,10 +1867,10 @@ F 7 "842-LFE5U45F6BG381C" H 6250 1500 60  0001 C CNN "Distributor1_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L +1V1 #PWR32
+L +1V1 #PWR058
 U 1 1 5A0B33B0
 P 2150 650
-F 0 "#PWR32" H 2150 500 50  0001 C CNN
+F 0 "#PWR058" H 2150 500 50  0001 C CNN
 F 1 "+1V1" H 2150 790 50  0000 C CNN
 F 2 "" H 2150 650 50  0001 C CNN
 F 3 "" H 2150 650 50  0001 C CNN
@@ -1908,10 +1878,10 @@ F 3 "" H 2150 650 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +1V1 #PWR74
+L +1V1 #PWR059
 U 1 1 5A0B387F
 P 10900 2750
-F 0 "#PWR74" H 10900 2600 50  0001 C CNN
+F 0 "#PWR059" H 10900 2600 50  0001 C CNN
 F 1 "+1V1" H 10900 2890 50  0000 C CNN
 F 2 "" H 10900 2750 50  0001 C CNN
 F 3 "" H 10900 2750 50  0001 C CNN
@@ -1925,10 +1895,10 @@ SHUTDOWN connected to\nBANK2 on "ram" sheet
 Text Notes 2800 6050 0    60   ~ 0
 Works without R5
 $Comp
-L +3V3 #PWR42
+L +3V3 #PWR060
 U 1 1 5A404030
 P 4900 3750
-F 0 "#PWR42" H 4900 3600 50  0001 C CNN
+F 0 "#PWR060" H 4900 3600 50  0001 C CNN
 F 1 "+3V3" H 4900 3890 50  0000 C CNN
 F 2 "" H 4900 3750 50  0000 C CNN
 F 3 "" H 4900 3750 50  0000 C CNN
@@ -1979,10 +1949,10 @@ F 3 "" H 5550 4450 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR51
+L GND #PWR061
 U 1 1 5A5F72AC
 P 5550 4600
-F 0 "#PWR51" H 5550 4350 50  0001 C CNN
+F 0 "#PWR061" H 5550 4350 50  0001 C CNN
 F 1 "GND" H 5550 4450 50  0000 C CNN
 F 2 "" H 5550 4600 50  0000 C CNN
 F 3 "" H 5550 4600 50  0000 C CNN
@@ -1990,10 +1960,10 @@ F 3 "" H 5550 4600 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR50
+L +3V3 #PWR062
 U 1 1 5A5F7519
 P 5550 4300
-F 0 "#PWR50" H 5550 4150 50  0001 C CNN
+F 0 "#PWR062" H 5550 4150 50  0001 C CNN
 F 1 "+3V3" H 5550 4440 50  0000 C CNN
 F 2 "" H 5550 4300 50  0000 C CNN
 F 3 "" H 5550 4300 50  0000 C CNN
@@ -2012,10 +1982,10 @@ F 3 "" H 5500 2950 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR47
+L GND #PWR063
 U 1 1 5A5FA77E
 P 5500 3100
-F 0 "#PWR47" H 5500 2850 50  0001 C CNN
+F 0 "#PWR063" H 5500 2850 50  0001 C CNN
 F 1 "GND" H 5500 2950 50  0000 C CNN
 F 2 "" H 5500 3100 50  0000 C CNN
 F 3 "" H 5500 3100 50  0000 C CNN
@@ -2034,10 +2004,10 @@ F 3 "" H 5800 2950 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR53
+L GND #PWR064
 U 1 1 5A5FA790
 P 5800 3100
-F 0 "#PWR53" H 5800 2850 50  0001 C CNN
+F 0 "#PWR064" H 5800 2850 50  0001 C CNN
 F 1 "GND" H 5800 2950 50  0000 C CNN
 F 2 "" H 5800 3100 50  0000 C CNN
 F 3 "" H 5800 3100 50  0000 C CNN
@@ -2045,10 +2015,10 @@ F 3 "" H 5800 3100 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +1V1 #PWR46
+L +1V1 #PWR065
 U 1 1 5A5FAAE2
 P 5500 2800
-F 0 "#PWR46" H 5500 2650 50  0001 C CNN
+F 0 "#PWR065" H 5500 2650 50  0001 C CNN
 F 1 "+1V1" H 5500 2940 50  0000 C CNN
 F 2 "" H 5500 2800 50  0001 C CNN
 F 3 "" H 5500 2800 50  0001 C CNN
@@ -2056,10 +2026,10 @@ F 3 "" H 5500 2800 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +1V1 #PWR52
+L +1V1 #PWR066
 U 1 1 5A5FAE2D
 P 5800 2800
-F 0 "#PWR52" H 5800 2650 50  0001 C CNN
+F 0 "#PWR066" H 5800 2650 50  0001 C CNN
 F 1 "+1V1" H 5800 2940 50  0000 C CNN
 F 2 "" H 5800 2800 50  0001 C CNN
 F 3 "" H 5800 2800 50  0001 C CNN
@@ -2078,10 +2048,10 @@ F 3 "" H 5500 3700 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR49
+L GND #PWR067
 U 1 1 5A5FC3FC
 P 5500 3850
-F 0 "#PWR49" H 5500 3600 50  0001 C CNN
+F 0 "#PWR067" H 5500 3600 50  0001 C CNN
 F 1 "GND" H 5500 3700 50  0000 C CNN
 F 2 "" H 5500 3850 50  0000 C CNN
 F 3 "" H 5500 3850 50  0000 C CNN
@@ -2100,10 +2070,10 @@ F 3 "" H 5800 3700 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR55
+L GND #PWR068
 U 1 1 5A5FC408
 P 5800 3850
-F 0 "#PWR55" H 5800 3600 50  0001 C CNN
+F 0 "#PWR068" H 5800 3600 50  0001 C CNN
 F 1 "GND" H 5800 3700 50  0000 C CNN
 F 2 "" H 5800 3850 50  0000 C CNN
 F 3 "" H 5800 3850 50  0000 C CNN
@@ -2111,10 +2081,10 @@ F 3 "" H 5800 3850 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +2V5 #PWR48
+L +2V5 #PWR069
 U 1 1 5A5FCA42
 P 5500 3550
-F 0 "#PWR48" H 5500 3400 50  0001 C CNN
+F 0 "#PWR069" H 5500 3400 50  0001 C CNN
 F 1 "+2V5" H 5500 3690 50  0000 C CNN
 F 2 "" H 5500 3550 50  0000 C CNN
 F 3 "" H 5500 3550 50  0000 C CNN
@@ -2122,10 +2092,10 @@ F 3 "" H 5500 3550 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +2V5 #PWR54
+L +2V5 #PWR070
 U 1 1 5A5FCEF1
 P 5800 3550
-F 0 "#PWR54" H 5800 3400 50  0001 C CNN
+F 0 "#PWR070" H 5800 3400 50  0001 C CNN
 F 1 "+2V5" H 5800 3690 50  0000 C CNN
 F 2 "" H 5800 3550 50  0000 C CNN
 F 3 "" H 5800 3550 50  0000 C CNN
@@ -2133,10 +2103,10 @@ F 3 "" H 5800 3550 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR56
+L +3V3 #PWR071
 U 1 1 5A5F920A
 P 5800 4300
-F 0 "#PWR56" H 5800 4150 50  0001 C CNN
+F 0 "#PWR071" H 5800 4150 50  0001 C CNN
 F 1 "+3V3" H 5800 4440 50  0000 C CNN
 F 2 "" H 5800 4300 50  0000 C CNN
 F 3 "" H 5800 4300 50  0000 C CNN
@@ -2144,10 +2114,10 @@ F 3 "" H 5800 4300 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR57
+L GND #PWR072
 U 1 1 5A5F9204
 P 5800 4600
-F 0 "#PWR57" H 5800 4350 50  0001 C CNN
+F 0 "#PWR072" H 5800 4350 50  0001 C CNN
 F 1 "GND" H 5800 4450 50  0000 C CNN
 F 2 "" H 5800 4600 50  0000 C CNN
 F 3 "" H 5800 4600 50  0000 C CNN
@@ -2166,10 +2136,10 @@ F 3 "" H 5800 4450 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR58
+L +3V3 #PWR073
 U 1 1 5A5FEE9A
 P 6050 4300
-F 0 "#PWR58" H 6050 4150 50  0001 C CNN
+F 0 "#PWR073" H 6050 4150 50  0001 C CNN
 F 1 "+3V3" H 6050 4440 50  0000 C CNN
 F 2 "" H 6050 4300 50  0000 C CNN
 F 3 "" H 6050 4300 50  0000 C CNN
@@ -2177,10 +2147,10 @@ F 3 "" H 6050 4300 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR59
+L GND #PWR074
 U 1 1 5A5FEEA0
 P 6050 4600
-F 0 "#PWR59" H 6050 4350 50  0001 C CNN
+F 0 "#PWR074" H 6050 4350 50  0001 C CNN
 F 1 "GND" H 6050 4450 50  0000 C CNN
 F 2 "" H 6050 4600 50  0000 C CNN
 F 3 "" H 6050 4600 50  0000 C CNN
@@ -2210,10 +2180,10 @@ F 3 "" H 5300 4450 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR45
+L GND #PWR075
 U 1 1 5A6007F7
 P 5300 4600
-F 0 "#PWR45" H 5300 4350 50  0001 C CNN
+F 0 "#PWR075" H 5300 4350 50  0001 C CNN
 F 1 "GND" H 5300 4450 50  0000 C CNN
 F 2 "" H 5300 4600 50  0000 C CNN
 F 3 "" H 5300 4600 50  0000 C CNN
@@ -2221,14 +2191,44 @@ F 3 "" H 5300 4600 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR44
+L +3V3 #PWR076
 U 1 1 5A6007FD
 P 5300 4300
-F 0 "#PWR44" H 5300 4150 50  0001 C CNN
+F 0 "#PWR076" H 5300 4150 50  0001 C CNN
 F 1 "+3V3" H 5300 4440 50  0000 C CNN
 F 2 "" H 5300 4300 50  0000 C CNN
 F 3 "" H 5300 4300 50  0000 C CNN
 	1    5300 4300
 	1    0    0    -1  
 $EndComp
+$Comp
+L L L1
+U 1 1 5A73C9EB
+P 8950 2800
+F 0 "L1" V 8900 2800 50  0000 C CNN
+F 1 "2.2uH" V 9025 2800 50  0000 C CNN
+F 2 "Resistors_SMD:R_1210_HandSoldering" H 8950 2800 50  0001 C CNN
+F 3 "http://psearch.en.murata.com/inductor/product/DFE252012PD-2R2M%23.pdf" H 8950 2800 50  0001 C CNN
+F 4 "www.murata.com" H 8950 2800 60  0001 C CNN "MFG_URL"
+F 5 "DFE252012P-2R2M=P2" H 8950 2800 60  0001 C CNN "MFG_PN"
+F 6 "www.mouser.com" H 8950 2800 60  0001 C CNN "Distributor1_URL"
+F 7 "652-SRP2512A-2R2M" H 8950 2800 60  0001 C CNN "Distributor1_PN"
+	1    8950 2800
+	0    -1   -1   0   
+$EndComp
+$Comp
+L L L3
+U 1 1 5A73CDB3
+P 8950 5200
+F 0 "L3" V 8900 5200 50  0000 C CNN
+F 1 "2.2uH" V 9025 5200 50  0000 C CNN
+F 2 "Resistors_SMD:R_1210_HandSoldering" H 8950 5200 50  0001 C CNN
+F 3 "http://psearch.en.murata.com/inductor/product/DFE252012PD-2R2M%23.pdf" H 8950 5200 50  0001 C CNN
+F 4 "www.murata.com" H 8950 5200 60  0001 C CNN "MFG_URL"
+F 5 "DFE252012P-2R2M=P2" H 8950 5200 60  0001 C CNN "MFG_PN"
+F 6 "www.mouser.com" H 8950 5200 60  0001 C CNN "Distributor1_URL"
+F 7 "652-SRP2512A-2R2M" H 8950 5200 60  0001 C CNN "Distributor1_PN"
+	1    8950 5200
+	0    -1   -1   0   
+$EndComp
 $EndSCHEMATC
diff --git a/power.sch b/power.sch
index 4881f70..7c84992 100644
--- a/power.sch
+++ b/power.sch
@@ -112,21 +112,6 @@ F 3 "" H 7450 3400 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L L L1
-U 1 1 58D59D36
-P 8950 2800
-F 0 "L1" V 8900 2800 50  0000 C CNN
-F 1 "2.2uH" V 9025 2800 50  0000 C CNN
-F 2 "Resistors_SMD:R_1210_HandSoldering" H 8950 2800 50  0001 C CNN
-F 3 "http://psearch.en.murata.com/inductor/product/DFE322512F-2R2M%23.pdf" H 8950 2800 50  0001 C CNN
-F 4 "www.murata.com" H 8950 2800 60  0001 C CNN "MFG_URL"
-F 5 "DFE322512F-2R2M=P2" H 8950 2800 60  0001 C CNN "MFG_PN"
-F 6 "www.mouser.com" H 8950 2800 60  0001 C CNN "Distributor1_URL"
-F 7 "81-DFE322512F-2R2MP2" H 8950 2800 60  0001 C CNN "Distributor1_PN"
-	1    8950 2800
-	0    -1   -1   0   
-$EndComp
-$Comp
 L C C2
 U 1 1 58D5A146
 P 9150 3000
@@ -248,21 +233,6 @@ F 3 "" H 7450 5800 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L L L3
-U 1 1 58D62964
-P 8950 5200
-F 0 "L3" V 8900 5200 50  0000 C CNN
-F 1 "2.2uH" V 9025 5200 50  0000 C CNN
-F 2 "Resistors_SMD:R_1210_HandSoldering" H 8950 5200 50  0001 C CNN
-F 3 "http://www.bourns.com/docs/Product-Datasheets/srp2512a.pdf" H 8950 5200 50  0001 C CNN
-F 4 "www.bourns.com" H 8950 5200 60  0001 C CNN "MFG_URL"
-F 5 "SRP2512A-2R2M" H 8950 5200 60  0001 C CNN "MFG_PN"
-F 6 "www.mouser.com" H 8950 5200 60  0001 C CNN "Distributor1_URL"
-F 7 "652-SRP2512A-2R2M" H 8950 5200 60  0001 C CNN "Distributor1_PN"
-	1    8950 5200
-	0    -1   -1   0   
-$EndComp
-$Comp
 L C C6
 U 1 1 58D6296A
 P 9150 5400
@@ -1681,7 +1651,7 @@ L Jumper_NC_Small JP1
 U 1 1 59DFB08A
 P 10750 2800
 F 0 "JP1" H 10750 2880 50  0000 C CNN
-F 1 "1.2" H 10800 2750 50  0000 C CNN
+F 1 "1.1" H 10800 2750 50  0000 C CNN
 F 2 "jumper:SOLDER-JUMPER_1-WAY" H 10750 2800 50  0001 C CNN
 F 3 "" H 10750 2800 50  0001 C CNN
 F 4 "Do not install" H 10750 2800 60  0001 C CNN "Note"
@@ -2231,4 +2201,34 @@ F 3 "" H 5300 4300 50  0000 C CNN
 	1    5300 4300
 	1    0    0    -1  
 $EndComp
+$Comp
+L L L1
+U 1 1 5A73C9EB
+P 8950 2800
+F 0 "L1" V 8900 2800 50  0000 C CNN
+F 1 "2.2uH" V 9025 2800 50  0000 C CNN
+F 2 "Resistors_SMD:R_1210_HandSoldering" H 8950 2800 50  0001 C CNN
+F 3 "http://psearch.en.murata.com/inductor/product/DFE252012PD-2R2M%23.pdf" H 8950 2800 50  0001 C CNN
+F 4 "www.murata.com" H 8950 2800 60  0001 C CNN "MFG_URL"
+F 5 "DFE252012P-2R2M=P2" H 8950 2800 60  0001 C CNN "MFG_PN"
+F 6 "www.mouser.com" H 8950 2800 60  0001 C CNN "Distributor1_URL"
+F 7 "652-SRP2512A-2R2M" H 8950 2800 60  0001 C CNN "Distributor1_PN"
+	1    8950 2800
+	0    -1   -1   0   
+$EndComp
+$Comp
+L L L3
+U 1 1 5A73CDB3
+P 8950 5200
+F 0 "L3" V 8900 5200 50  0000 C CNN
+F 1 "2.2uH" V 9025 5200 50  0000 C CNN
+F 2 "Resistors_SMD:R_1210_HandSoldering" H 8950 5200 50  0001 C CNN
+F 3 "http://psearch.en.murata.com/inductor/product/DFE252012PD-2R2M%23.pdf" H 8950 5200 50  0001 C CNN
+F 4 "www.murata.com" H 8950 5200 60  0001 C CNN "MFG_URL"
+F 5 "DFE252012P-2R2M=P2" H 8950 5200 60  0001 C CNN "MFG_PN"
+F 6 "www.mouser.com" H 8950 5200 60  0001 C CNN "Distributor1_URL"
+F 7 "652-SRP2512A-2R2M" H 8950 5200 60  0001 C CNN "Distributor1_PN"
+	1    8950 5200
+	0    -1   -1   0   
+$EndComp
 $EndSCHEMATC
diff --git a/ram.bak b/ram.bak
index 84f95cf..67addbb 100644
--- a/ram.bak
+++ b/ram.bak
@@ -78,10 +78,10 @@ Wire Wire Line
 	5250 2000 5250 2200
 Connection ~ 5250 2100
 $Comp
-L +3V3 #PWR118
+L +3V3 #PWR0118
 U 1 1 58D928FF
 P 5250 2000
-F 0 "#PWR118" H 5250 1850 50  0001 C CNN
+F 0 "#PWR0118" H 5250 1850 50  0001 C CNN
 F 1 "+3V3" H 5250 2140 50  0000 C CNN
 F 2 "" H 5250 2000 50  0000 C CNN
 F 3 "" H 5250 2000 50  0000 C CNN
@@ -89,10 +89,10 @@ F 3 "" H 5250 2000 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR122
+L +3V3 #PWR0119
 U 1 1 58D92915
 P 5550 2000
-F 0 "#PWR122" H 5550 1850 50  0001 C CNN
+F 0 "#PWR0119" H 5550 1850 50  0001 C CNN
 F 1 "+3V3" H 5550 2140 50  0000 C CNN
 F 2 "" H 5550 2000 50  0000 C CNN
 F 3 "" H 5550 2000 50  0000 C CNN
@@ -121,10 +121,10 @@ Wire Wire Line
 	5650 4800 5650 4900
 Connection ~ 5650 4900
 $Comp
-L GND #PWR119
+L GND #PWR0120
 U 1 1 58D929C8
 P 5250 5000
-F 0 "#PWR119" H 5250 4750 50  0001 C CNN
+F 0 "#PWR0120" H 5250 4750 50  0001 C CNN
 F 1 "GND" H 5250 4850 50  0000 C CNN
 F 2 "" H 5250 5000 50  0000 C CNN
 F 3 "" H 5250 5000 50  0000 C CNN
@@ -132,10 +132,10 @@ F 3 "" H 5250 5000 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR123
+L GND #PWR0121
 U 1 1 58D929DE
 P 5550 5000
-F 0 "#PWR123" H 5550 4750 50  0001 C CNN
+F 0 "#PWR0121" H 5550 4750 50  0001 C CNN
 F 1 "GND" H 5550 4850 50  0000 C CNN
 F 2 "" H 5550 5000 50  0000 C CNN
 F 3 "" H 5550 5000 50  0000 C CNN
@@ -338,10 +338,10 @@ F 3 "" H 5350 5900 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR121
+L GND #PWR0122
 U 1 1 59131FCA
 P 5350 6050
-F 0 "#PWR121" H 5350 5800 50  0001 C CNN
+F 0 "#PWR0122" H 5350 5800 50  0001 C CNN
 F 1 "GND" H 5350 5900 50  0000 C CNN
 F 2 "" H 5350 6050 50  0000 C CNN
 F 3 "" H 5350 6050 50  0000 C CNN
@@ -349,10 +349,10 @@ F 3 "" H 5350 6050 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR120
+L +3V3 #PWR0123
 U 1 1 59132092
 P 5350 5750
-F 0 "#PWR120" H 5350 5600 50  0001 C CNN
+F 0 "#PWR0123" H 5350 5600 50  0001 C CNN
 F 1 "+3V3" H 5350 5890 50  0000 C CNN
 F 2 "" H 5350 5750 50  0000 C CNN
 F 3 "" H 5350 5750 50  0000 C CNN
@@ -442,10 +442,10 @@ F 3 "" H 5900 5900 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR125
+L GND #PWR0124
 U 1 1 5A5FD148
 P 5900 6050
-F 0 "#PWR125" H 5900 5800 50  0001 C CNN
+F 0 "#PWR0124" H 5900 5800 50  0001 C CNN
 F 1 "GND" H 5900 5900 50  0000 C CNN
 F 2 "" H 5900 6050 50  0000 C CNN
 F 3 "" H 5900 6050 50  0000 C CNN
@@ -453,10 +453,10 @@ F 3 "" H 5900 6050 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR124
+L +3V3 #PWR0125
 U 1 1 5A5FD14E
 P 5900 5750
-F 0 "#PWR124" H 5900 5600 50  0001 C CNN
+F 0 "#PWR0125" H 5900 5600 50  0001 C CNN
 F 1 "+3V3" H 5900 5890 50  0000 C CNN
 F 2 "" H 5900 5750 50  0000 C CNN
 F 3 "" H 5900 5750 50  0000 C CNN
@@ -475,10 +475,10 @@ F 3 "" H 6200 5900 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR127
+L GND #PWR0126
 U 1 1 5A5FD1C7
 P 6200 6050
-F 0 "#PWR127" H 6200 5800 50  0001 C CNN
+F 0 "#PWR0126" H 6200 5800 50  0001 C CNN
 F 1 "GND" H 6200 5900 50  0000 C CNN
 F 2 "" H 6200 6050 50  0000 C CNN
 F 3 "" H 6200 6050 50  0000 C CNN
@@ -486,10 +486,10 @@ F 3 "" H 6200 6050 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR126
+L +3V3 #PWR0127
 U 1 1 5A5FD1CD
 P 6200 5750
-F 0 "#PWR126" H 6200 5600 50  0001 C CNN
+F 0 "#PWR0127" H 6200 5600 50  0001 C CNN
 F 1 "+3V3" H 6200 5890 50  0000 C CNN
 F 2 "" H 6200 5750 50  0000 C CNN
 F 3 "" H 6200 5750 50  0000 C CNN
@@ -508,10 +508,10 @@ F 3 "" H 6500 5900 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR129
+L GND #PWR0128
 U 1 1 5A5FD275
 P 6500 6050
-F 0 "#PWR129" H 6500 5800 50  0001 C CNN
+F 0 "#PWR0128" H 6500 5800 50  0001 C CNN
 F 1 "GND" H 6500 5900 50  0000 C CNN
 F 2 "" H 6500 6050 50  0000 C CNN
 F 3 "" H 6500 6050 50  0000 C CNN
@@ -519,10 +519,10 @@ F 3 "" H 6500 6050 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR128
+L +3V3 #PWR0129
 U 1 1 5A5FD27B
 P 6500 5750
-F 0 "#PWR128" H 6500 5600 50  0001 C CNN
+F 0 "#PWR0129" H 6500 5600 50  0001 C CNN
 F 1 "+3V3" H 6500 5890 50  0000 C CNN
 F 2 "" H 6500 5750 50  0000 C CNN
 F 3 "" H 6500 5750 50  0000 C CNN
diff --git a/sdcard.bak b/sdcard.bak
index 298f556..b37fc91 100644
--- a/sdcard.bak
+++ b/sdcard.bak
@@ -57,10 +57,10 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L GND #PWR140
+L GND #PWR0138
 U 1 1 58DA7C6F
 P 3550 3650
-F 0 "#PWR140" H 3550 3400 50  0001 C CNN
+F 0 "#PWR0138" H 3550 3400 50  0001 C CNN
 F 1 "GND" H 3550 3500 50  0000 C CNN
 F 2 "" H 3550 3650 50  0000 C CNN
 F 3 "" H 3550 3650 50  0000 C CNN
@@ -68,10 +68,10 @@ F 3 "" H 3550 3650 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR142
+L GND #PWR0139
 U 1 1 58DA7C71
 P 5800 3950
-F 0 "#PWR142" H 5800 3700 50  0001 C CNN
+F 0 "#PWR0139" H 5800 3700 50  0001 C CNN
 F 1 "GND" H 5800 3800 50  0000 C CNN
 F 2 "" H 5800 3950 50  0000 C CNN
 F 3 "" H 5800 3950 50  0000 C CNN
@@ -79,10 +79,10 @@ F 3 "" H 5800 3950 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR138
+L +3V3 #PWR0140
 U 1 1 58DA7C72
 P 3150 2950
-F 0 "#PWR138" H 3150 2800 50  0001 C CNN
+F 0 "#PWR0140" H 3150 2800 50  0001 C CNN
 F 1 "+3V3" H 3150 3090 50  0000 C CNN
 F 2 "" H 3150 2950 50  0000 C CNN
 F 3 "" H 3150 2950 50  0000 C CNN
@@ -115,10 +115,10 @@ F 3 "" H 3150 3100 50  0000 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L GND #PWR139
+L GND #PWR0141
 U 1 1 590C5E90
 P 3150 3650
-F 0 "#PWR139" H 3150 3400 50  0001 C CNN
+F 0 "#PWR0141" H 3150 3400 50  0001 C CNN
 F 1 "GND" H 3150 3500 50  0000 C CNN
 F 2 "" H 3150 3650 50  0000 C CNN
 F 3 "" H 3150 3650 50  0000 C CNN
@@ -171,10 +171,10 @@ Wire Wire Line
 Text Notes 3050 4100 0    60   ~ 0
 SDcard connected to\nBANK6 on "usb" sheet
 $Comp
-L GND #PWR141
+L GND #PWR0142
 U 1 1 5A2A690D
 P 4900 4250
-F 0 "#PWR141" H 4900 4000 50  0001 C CNN
+F 0 "#PWR0142" H 4900 4000 50  0001 C CNN
 F 1 "GND" H 4900 4100 50  0000 C CNN
 F 2 "" H 4900 4250 50  0000 C CNN
 F 3 "" H 4900 4250 50  0000 C CNN
diff --git a/ulx3s.bak b/ulx3s.bak
index 443f66e..9f0049e 100644
--- a/ulx3s.bak
+++ b/ulx3s.bak
@@ -49,7 +49,7 @@ encoding utf-8
 Sheet 1 11
 Title "ULX3S"
 Date ""
-Rev "1.7.10"
+Rev "1.7.11"
 Comp "FER+RIZ+RADIONA"
 Comment1 "Root sheet"
 Comment2 ""
@@ -163,10 +163,10 @@ F 3 "" H 3150 5600 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR2
+L GND #PWR01
 U 1 1 58E6BC0E
 P 3150 6550
-F 0 "#PWR2" H 3150 6300 50  0001 C CNN
+F 0 "#PWR01" H 3150 6300 50  0001 C CNN
 F 1 "GND" H 3150 6400 50  0000 C CNN
 F 2 "" H 3150 6550 50  0000 C CNN
 F 3 "" H 3150 6550 50  0000 C CNN
@@ -174,10 +174,10 @@ F 3 "" H 3150 6550 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR4
+L GND #PWR02
 U 1 1 58E6BC2E
 P 4250 6550
-F 0 "#PWR4" H 4250 6300 50  0001 C CNN
+F 0 "#PWR02" H 4250 6300 50  0001 C CNN
 F 1 "GND" H 4250 6400 50  0000 C CNN
 F 2 "" H 4250 6550 50  0000 C CNN
 F 3 "" H 4250 6550 50  0000 C CNN
@@ -185,10 +185,10 @@ F 3 "" H 4250 6550 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR3
+L GND #PWR03
 U 1 1 58E6BC56
 P 4250 5850
-F 0 "#PWR3" H 4250 5600 50  0001 C CNN
+F 0 "#PWR03" H 4250 5600 50  0001 C CNN
 F 1 "GND" H 4250 5700 50  0000 C CNN
 F 2 "" H 4250 5850 50  0000 C CNN
 F 3 "" H 4250 5850 50  0000 C CNN
@@ -196,10 +196,10 @@ F 3 "" H 4250 5850 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR1
+L GND #PWR04
 U 1 1 58E6BC72
 P 3150 5800
-F 0 "#PWR1" H 3150 5550 50  0001 C CNN
+F 0 "#PWR04" H 3150 5550 50  0001 C CNN
 F 1 "GND" H 3150 5650 50  0000 C CNN
 F 2 "" H 3150 5800 50  0000 C CNN
 F 3 "" H 3150 5800 50  0000 C CNN
diff --git a/ulx3s.sch b/ulx3s.sch
index 668a254..9f0049e 100644
--- a/ulx3s.sch
+++ b/ulx3s.sch
@@ -49,7 +49,7 @@ encoding utf-8
 Sheet 1 11
 Title "ULX3S"
 Date ""
-Rev "1.7.10"
+Rev "1.7.11"
 Comp "FER+RIZ+RADIONA"
 Comment1 "Root sheet"
 Comment2 ""
diff --git a/usb.bak b/usb.bak
index 44dd094..a819df7 100644
--- a/usb.bak
+++ b/usb.bak
@@ -71,10 +71,10 @@ F 6 "511-STPS2L30AF " H 2300 1700 60  0001 C CNN "Distributor1_PN"
 	-1   0    0    1   
 $EndComp
 $Comp
-L +5V #PWR101
+L +5V #PWR096
 U 1 1 58D6C83B
 P 3050 1700
-F 0 "#PWR101" H 3050 1550 50  0001 C CNN
+F 0 "#PWR096" H 3050 1550 50  0001 C CNN
 F 1 "+5V" H 3050 1840 50  0000 C CNN
 F 2 "" H 3050 1700 60  0000 C CNN
 F 3 "" H 3050 1700 60  0000 C CNN
@@ -96,10 +96,10 @@ F 6 "511-STPS2L30AF " H 2600 2650 60  0001 C CNN "Distributor1_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L +5V #PWR102
+L +5V #PWR097
 U 1 1 58D6C83D
 P 3200 2650
-F 0 "#PWR102" H 3200 2500 50  0001 C CNN
+F 0 "#PWR097" H 3200 2500 50  0001 C CNN
 F 1 "+5V" H 3200 2790 50  0000 C CNN
 F 2 "" H 3200 2650 60  0000 C CNN
 F 3 "" H 3200 2650 60  0000 C CNN
@@ -139,10 +139,10 @@ F 6 "www.mouser.com" H 1500 2850 60  0001 C CNN "Distributor1_URL"
 	0    -1   1    0   
 $EndComp
 $Comp
-L GND #PWR98
+L GND #PWR098
 U 1 1 58D6C842
 P 1850 2100
-F 0 "#PWR98" H 1850 1850 50  0001 C CNN
+F 0 "#PWR098" H 1850 1850 50  0001 C CNN
 F 1 "GND" H 1850 1950 50  0000 C CNN
 F 2 "" H 1850 2100 50  0000 C CNN
 F 3 "" H 1850 2100 50  0000 C CNN
@@ -150,10 +150,10 @@ F 3 "" H 1850 2100 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR99
+L GND #PWR099
 U 1 1 58D6C843
 P 1850 3050
-F 0 "#PWR99" H 1850 2800 50  0001 C CNN
+F 0 "#PWR099" H 1850 2800 50  0001 C CNN
 F 1 "GND" H 1850 2900 50  0000 C CNN
 F 2 "" H 1850 3050 50  0000 C CNN
 F 3 "" H 1850 3050 50  0000 C CNN
@@ -171,10 +171,10 @@ USB_FPGA_D+
 NoConn ~ 1850 2950
 NoConn ~ 1850 2000
 $Comp
-L GND #PWR96
+L GND #PWR0100
 U 1 1 58D82518
 P 1400 2300
-F 0 "#PWR96" H 1400 2050 50  0001 C CNN
+F 0 "#PWR0100" H 1400 2050 50  0001 C CNN
 F 1 "GND" H 1400 2150 50  0000 C CNN
 F 2 "" H 1400 2300 50  0000 C CNN
 F 3 "" H 1400 2300 50  0000 C CNN
@@ -182,10 +182,10 @@ F 3 "" H 1400 2300 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR97
+L GND #PWR0101
 U 1 1 58D8254A
 P 1400 3250
-F 0 "#PWR97" H 1400 3000 50  0001 C CNN
+F 0 "#PWR0101" H 1400 3000 50  0001 C CNN
 F 1 "GND" H 1400 3100 50  0000 C CNN
 F 2 "" H 1400 3250 50  0000 C CNN
 F 3 "" H 1400 3250 50  0000 C CNN
@@ -193,10 +193,10 @@ F 3 "" H 1400 3250 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR105
+L GND #PWR0102
 U 1 1 58D8877C
 P 5600 4500
-F 0 "#PWR105" H 5600 4250 50  0001 C CNN
+F 0 "#PWR0102" H 5600 4250 50  0001 C CNN
 F 1 "GND" H 5600 4350 50  0000 C CNN
 F 2 "" H 5600 4500 50  0000 C CNN
 F 3 "" H 5600 4500 50  0000 C CNN
@@ -402,7 +402,7 @@ U 1 1 591C69FB
 P 2250 4850
 F 0 "R40" V 2330 4850 50  0000 C CNN
 F 1 "1.5k" V 2250 4850 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603_HandSoldering" V 2180 4850 50  0001 C CNN
+F 2 "Resistors_SMD:R_0603" V 2180 4850 50  0001 C CNN
 F 3 "" H 2250 4850 50  0000 C CNN
 	1    2250 4850
 	0    -1   -1   0   
@@ -432,10 +432,10 @@ JTAG_TCK
 Text GLabel 9150 5100 0    60   Input ~ 0
 JTAG_TMS
 $Comp
-L GND #PWR107
+L GND #PWR0103
 U 1 1 591E1000
 P 8700 4900
-F 0 "#PWR107" H 8700 4650 50  0001 C CNN
+F 0 "#PWR0103" H 8700 4650 50  0001 C CNN
 F 1 "GND" H 8700 4750 50  0000 C CNN
 F 2 "" H 8700 4900 50  0000 C CNN
 F 3 "" H 8700 4900 50  0000 C CNN
@@ -443,10 +443,10 @@ F 3 "" H 8700 4900 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR108
+L +3V3 #PWR0104
 U 1 1 591E1028
 P 10100 4900
-F 0 "#PWR108" H 10100 4750 50  0001 C CNN
+F 0 "#PWR0104" H 10100 4750 50  0001 C CNN
 F 1 "+3V3" H 10100 5040 50  0000 C CNN
 F 2 "" H 10100 4900 50  0000 C CNN
 F 3 "" H 10100 4900 50  0000 C CNN
@@ -548,10 +548,10 @@ Wire Wire Line
 Wire Wire Line
 	2300 3200 2300 3100
 $Comp
-L GND #PWR100
+L GND #PWR0105
 U 1 1 59C1372A
 P 2250 3250
-F 0 "#PWR100" H 2250 3000 50  0001 C CNN
+F 0 "#PWR0105" H 2250 3000 50  0001 C CNN
 F 1 "GND" H 2250 3100 50  0000 C CNN
 F 2 "" H 2250 3250 50  0001 C CNN
 F 3 "" H 2250 3250 50  0001 C CNN
@@ -589,7 +589,7 @@ U 1 1 59D562D0
 P 2250 5450
 F 0 "R54" V 2150 5450 50  0000 C CNN
 F 1 "1.5k" V 2250 5450 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603_HandSoldering" V 2180 5450 50  0001 C CNN
+F 2 "Resistors_SMD:R_0603" V 2180 5450 50  0001 C CNN
 F 3 "" H 2250 5450 50  0000 C CNN
 F 4 "Do not install" H 2250 5450 60  0001 C CNN "Note"
 	1    2250 5450
@@ -615,10 +615,10 @@ Wire Wire Line
 	6450 4100 6450 3700
 Connection ~ 6450 3700
 $Comp
-L GND #PWR106
+L GND #PWR0106
 U 1 1 59E000AB
 P 6450 4400
-F 0 "#PWR106" H 6450 4150 50  0001 C CNN
+F 0 "#PWR0106" H 6450 4150 50  0001 C CNN
 F 1 "GND" H 6450 4250 50  0000 C CNN
 F 2 "" H 6450 4400 50  0000 C CNN
 F 3 "" H 6450 4400 50  0000 C CNN
@@ -683,10 +683,10 @@ Wire Wire Line
 	5200 1200 5450 1200
 Connection ~ 5450 1200
 $Comp
-L GND #PWR104
+L GND #PWR0107
 U 1 1 5A07A1D3
 P 5450 1650
-F 0 "#PWR104" H 5450 1400 50  0001 C CNN
+F 0 "#PWR0107" H 5450 1400 50  0001 C CNN
 F 1 "GND" H 5450 1500 50  0000 C CNN
 F 2 "" H 5450 1650 50  0001 C CNN
 F 3 "" H 5450 1650 50  0001 C CNN
@@ -696,10 +696,10 @@ $EndComp
 Text GLabel 5600 1450 2    60   Input ~ 0
 CLK_25MHz
 $Comp
-L +3V3 #PWR103
+L +3V3 #PWR0108
 U 1 1 5A07A3D1
 P 5450 1150
-F 0 "#PWR103" H 5450 1000 50  0001 C CNN
+F 0 "#PWR0108" H 5450 1000 50  0001 C CNN
 F 1 "+3V3" H 5450 1290 50  0000 C CNN
 F 2 "" H 5450 1150 50  0001 C CNN
 F 3 "" H 5450 1150 50  0001 C CNN
diff --git a/wifi.bak b/wifi.bak
index 7c75353..6a8349a 100644
--- a/wifi.bak
+++ b/wifi.bak
@@ -98,10 +98,10 @@ F 7 "Do not install" H 6650 3450 60  0001 C CNN "Note"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR114
+L GND #PWR0109
 U 1 1 58E56E8D
 P 5300 2750
-F 0 "#PWR114" H 5300 2500 50  0001 C CNN
+F 0 "#PWR0109" H 5300 2500 50  0001 C CNN
 F 1 "GND" H 5300 2600 50  0000 C CNN
 F 2 "" H 5300 2750 50  0000 C CNN
 F 3 "" H 5300 2750 50  0000 C CNN
@@ -109,10 +109,10 @@ F 3 "" H 5300 2750 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR113
+L +3V3 #PWR0110
 U 1 1 58E56EA3
 P 5150 2850
-F 0 "#PWR113" H 5150 2700 50  0001 C CNN
+F 0 "#PWR0110" H 5150 2700 50  0001 C CNN
 F 1 "+3V3" H 5150 2990 50  0000 C CNN
 F 2 "" H 5150 2850 50  0000 C CNN
 F 3 "" H 5150 2850 50  0000 C CNN
@@ -124,10 +124,10 @@ Wire Wire Line
 Wire Wire Line
 	5150 2850 5700 2850
 $Comp
-L +3V3 #PWR111
+L +3V3 #PWR0111
 U 1 1 58ED6C57
 P 4550 2200
-F 0 "#PWR111" H 4550 2050 50  0001 C CNN
+F 0 "#PWR0111" H 4550 2050 50  0001 C CNN
 F 1 "+3V3" H 4550 2340 50  0000 C CNN
 F 2 "" H 4550 2200 50  0000 C CNN
 F 3 "" H 4550 2200 50  0000 C CNN
@@ -153,10 +153,10 @@ Wire Wire Line
 	4550 2550 4700 2550
 Connection ~ 4550 2550
 $Comp
-L GND #PWR112
+L GND #PWR0112
 U 1 1 58EE2982
 P 4550 3500
-F 0 "#PWR112" H 4550 3250 50  0001 C CNN
+F 0 "#PWR0112" H 4550 3250 50  0001 C CNN
 F 1 "GND" H 4550 3350 50  0000 C CNN
 F 2 "" H 4550 3500 50  0000 C CNN
 F 3 "" H 4550 3500 50  0000 C CNN
@@ -200,10 +200,10 @@ F 3 "" H 3650 3100 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR109
+L +3V3 #PWR0113
 U 1 1 5924A1EA
 P 3650 2950
-F 0 "#PWR109" H 3650 2800 50  0001 C CNN
+F 0 "#PWR0113" H 3650 2800 50  0001 C CNN
 F 1 "+3V3" H 3650 3090 50  0000 C CNN
 F 2 "" H 3650 2950 50  0000 C CNN
 F 3 "" H 3650 2950 50  0000 C CNN
@@ -211,10 +211,10 @@ F 3 "" H 3650 2950 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR110
+L GND #PWR0114
 U 1 1 5924A206
 P 3650 3250
-F 0 "#PWR110" H 3650 3000 50  0001 C CNN
+F 0 "#PWR0114" H 3650 3000 50  0001 C CNN
 F 1 "GND" H 3650 3100 50  0000 C CNN
 F 2 "" H 3650 3250 50  0000 C CNN
 F 3 "" H 3650 3250 50  0000 C CNN
@@ -250,10 +250,10 @@ GP10
 Text GLabel 7550 3900 2    60   Input ~ 0
 WIFI_GPIO16
 $Comp
-L GND #PWR117
+L GND #PWR0115
 U 1 1 59C1BF96
 P 7650 2800
-F 0 "#PWR117" H 7650 2550 50  0001 C CNN
+F 0 "#PWR0115" H 7650 2550 50  0001 C CNN
 F 1 "GND" H 7650 2650 50  0000 C CNN
 F 2 "" H 7650 2800 50  0001 C CNN
 F 3 "" H 7650 2800 50  0001 C CNN
@@ -263,10 +263,10 @@ $EndComp
 Wire Wire Line
 	7550 2800 7650 2800
 $Comp
-L GND #PWR116
+L GND #PWR0116
 U 1 1 59C1BFCC
 P 7650 2700
-F 0 "#PWR116" H 7650 2450 50  0001 C CNN
+F 0 "#PWR0116" H 7650 2450 50  0001 C CNN
 F 1 "GND" H 7650 2550 50  0000 C CNN
 F 2 "" H 7650 2700 50  0001 C CNN
 F 3 "" H 7650 2700 50  0001 C CNN
@@ -280,10 +280,10 @@ PROG_DONE
 Text Notes 8500 3050 0    60   ~ 0
 PROG_DONE on\n"flash" sheet
 $Comp
-L GND #PWR115
+L GND #PWR0117
 U 1 1 59DEDA17
 P 6200 4900
-F 0 "#PWR115" H 6200 4650 50  0001 C CNN
+F 0 "#PWR0117" H 6200 4650 50  0001 C CNN
 F 1 "GND" H 6200 4750 50  0000 C CNN
 F 2 "" H 6200 4900 50  0001 C CNN
 F 3 "" H 6200 4900 50  0001 C CNN