diff --git a/blinkey.bak b/blinkey.bak
index e61b160..882cc57 100644
--- a/blinkey.bak
+++ b/blinkey.bak
@@ -75,10 +75,10 @@ Wire Wire Line
 Wire Wire Line
 	4750 1850 4850 1850
 $Comp
-L GND #PWR047
+L GND #PWR048
 U 1 1 58D66047
 P 4850 1250
-F 0 "#PWR047" H 4850 1000 50  0001 C CNN
+F 0 "#PWR048" 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
@@ -86,10 +86,10 @@ F 3 "" H 4850 1250 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +3V3 #PWR048
+L +3V3 #PWR049
 U 1 1 58D66055
 P 5350 1350
-F 0 "#PWR048" H 5350 1200 50  0001 C CNN
+F 0 "#PWR049" 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
@@ -189,10 +189,10 @@ Wire Wire Line
 	2850 3150 2750 3150
 Connection ~ 2750 3150
 $Comp
-L +3V3 #PWR049
+L +3V3 #PWR050
 U 1 1 58D6605C
 P 2750 2500
-F 0 "#PWR049" H 2750 2350 50  0001 C CNN
+F 0 "#PWR050" H 2750 2350 50  0001 C CNN
 F 1 "+3V3" H 2750 2640 50  0000 C CNN
 F 2 "" H 2750 2500 50  0000 C CNN
 F 3 "" H 2750 2500 50  0000 C CNN
@@ -354,10 +354,10 @@ Wire Wire Line
 	4400 2750 4250 2750
 Connection ~ 4250 2750
 $Comp
-L GND #PWR050
+L GND #PWR051
 U 1 1 58D681C3
 P 4250 4100
-F 0 "#PWR050" H 4250 3850 50  0001 C CNN
+F 0 "#PWR051" 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
diff --git a/blinkey.sch b/blinkey.sch
index e61b160..882cc57 100644
--- a/blinkey.sch
+++ b/blinkey.sch
@@ -75,10 +75,10 @@ Wire Wire Line
 Wire Wire Line
 	4750 1850 4850 1850
 $Comp
-L GND #PWR047
+L GND #PWR048
 U 1 1 58D66047
 P 4850 1250
-F 0 "#PWR047" H 4850 1000 50  0001 C CNN
+F 0 "#PWR048" 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
@@ -86,10 +86,10 @@ F 3 "" H 4850 1250 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +3V3 #PWR048
+L +3V3 #PWR049
 U 1 1 58D66055
 P 5350 1350
-F 0 "#PWR048" H 5350 1200 50  0001 C CNN
+F 0 "#PWR049" 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
@@ -189,10 +189,10 @@ Wire Wire Line
 	2850 3150 2750 3150
 Connection ~ 2750 3150
 $Comp
-L +3V3 #PWR049
+L +3V3 #PWR050
 U 1 1 58D6605C
 P 2750 2500
-F 0 "#PWR049" H 2750 2350 50  0001 C CNN
+F 0 "#PWR050" H 2750 2350 50  0001 C CNN
 F 1 "+3V3" H 2750 2640 50  0000 C CNN
 F 2 "" H 2750 2500 50  0000 C CNN
 F 3 "" H 2750 2500 50  0000 C CNN
@@ -354,10 +354,10 @@ Wire Wire Line
 	4400 2750 4250 2750
 Connection ~ 4250 2750
 $Comp
-L GND #PWR050
+L GND #PWR051
 U 1 1 58D681C3
 P 4250 4100
-F 0 "#PWR050" H 4250 3850 50  0001 C CNN
+F 0 "#PWR051" 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
diff --git a/gpdi.bak b/gpdi.bak
index 4554dab..d02848d 100644
--- a/gpdi.bak
+++ b/gpdi.bak
@@ -101,10 +101,10 @@ Wire Wire Line
 Wire Wire Line
 	5400 5550 5450 5550
 $Comp
-L GND #PWR051
+L GND #PWR052
 U 1 1 58D69073
 P 5450 5550
-F 0 "#PWR051" H 5450 5300 50  0001 C CNN
+F 0 "#PWR052" H 5450 5300 50  0001 C CNN
 F 1 "GND" H 5450 5400 50  0000 C CNN
 F 2 "" H 5450 5550 60  0000 C CNN
 F 3 "" H 5450 5550 60  0000 C CNN
@@ -112,10 +112,10 @@ F 3 "" H 5450 5550 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR052
+L GND #PWR053
 U 1 1 58D69074
 P 5450 5150
-F 0 "#PWR052" H 5450 4900 50  0001 C CNN
+F 0 "#PWR053" H 5450 4900 50  0001 C CNN
 F 1 "GND" H 5450 5000 50  0000 C CNN
 F 2 "" H 5450 5150 60  0000 C CNN
 F 3 "" H 5450 5150 60  0000 C CNN
@@ -123,10 +123,10 @@ F 3 "" H 5450 5150 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR053
+L GND #PWR054
 U 1 1 58D69075
 P 5450 4850
-F 0 "#PWR053" H 5450 4600 50  0001 C CNN
+F 0 "#PWR054" H 5450 4600 50  0001 C CNN
 F 1 "GND" H 5450 4700 50  0000 C CNN
 F 2 "" H 5450 4850 60  0000 C CNN
 F 3 "" H 5450 4850 60  0000 C CNN
@@ -134,10 +134,10 @@ F 3 "" H 5450 4850 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR054
+L GND #PWR055
 U 1 1 58D69076
 P 5450 4550
-F 0 "#PWR054" H 5450 4300 50  0001 C CNN
+F 0 "#PWR055" H 5450 4300 50  0001 C CNN
 F 1 "GND" H 5450 4400 50  0000 C CNN
 F 2 "" H 5450 4550 60  0000 C CNN
 F 3 "" H 5450 4550 60  0000 C CNN
@@ -145,10 +145,10 @@ F 3 "" H 5450 4550 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR055
+L GND #PWR056
 U 1 1 58D69077
 P 5450 4250
-F 0 "#PWR055" H 5450 4000 50  0001 C CNN
+F 0 "#PWR056" H 5450 4000 50  0001 C CNN
 F 1 "GND" H 5450 4100 50  0000 C CNN
 F 2 "" H 5450 4250 60  0000 C CNN
 F 3 "" H 5450 4250 60  0000 C CNN
@@ -156,10 +156,10 @@ F 3 "" H 5450 4250 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR056
+L GND #PWR057
 U 1 1 58D69078
 P 5450 3950
-F 0 "#PWR056" H 5450 3700 50  0001 C CNN
+F 0 "#PWR057" H 5450 3700 50  0001 C CNN
 F 1 "GND" H 5450 3800 50  0000 C CNN
 F 2 "" H 5450 3950 60  0000 C CNN
 F 3 "" H 5450 3950 60  0000 C CNN
@@ -167,10 +167,10 @@ F 3 "" H 5450 3950 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +5V #PWR057
+L +5V #PWR058
 U 1 1 58D6907F
 P 6200 5450
-F 0 "#PWR057" H 6200 5300 50  0001 C CNN
+F 0 "#PWR058" H 6200 5300 50  0001 C CNN
 F 1 "+5V" H 6200 5590 50  0000 C CNN
 F 2 "" H 6200 5450 50  0000 C CNN
 F 3 "" H 6200 5450 50  0000 C CNN
diff --git a/gpdi.sch b/gpdi.sch
index 4554dab..d02848d 100644
--- a/gpdi.sch
+++ b/gpdi.sch
@@ -101,10 +101,10 @@ Wire Wire Line
 Wire Wire Line
 	5400 5550 5450 5550
 $Comp
-L GND #PWR051
+L GND #PWR052
 U 1 1 58D69073
 P 5450 5550
-F 0 "#PWR051" H 5450 5300 50  0001 C CNN
+F 0 "#PWR052" H 5450 5300 50  0001 C CNN
 F 1 "GND" H 5450 5400 50  0000 C CNN
 F 2 "" H 5450 5550 60  0000 C CNN
 F 3 "" H 5450 5550 60  0000 C CNN
@@ -112,10 +112,10 @@ F 3 "" H 5450 5550 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR052
+L GND #PWR053
 U 1 1 58D69074
 P 5450 5150
-F 0 "#PWR052" H 5450 4900 50  0001 C CNN
+F 0 "#PWR053" H 5450 4900 50  0001 C CNN
 F 1 "GND" H 5450 5000 50  0000 C CNN
 F 2 "" H 5450 5150 60  0000 C CNN
 F 3 "" H 5450 5150 60  0000 C CNN
@@ -123,10 +123,10 @@ F 3 "" H 5450 5150 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR053
+L GND #PWR054
 U 1 1 58D69075
 P 5450 4850
-F 0 "#PWR053" H 5450 4600 50  0001 C CNN
+F 0 "#PWR054" H 5450 4600 50  0001 C CNN
 F 1 "GND" H 5450 4700 50  0000 C CNN
 F 2 "" H 5450 4850 60  0000 C CNN
 F 3 "" H 5450 4850 60  0000 C CNN
@@ -134,10 +134,10 @@ F 3 "" H 5450 4850 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR054
+L GND #PWR055
 U 1 1 58D69076
 P 5450 4550
-F 0 "#PWR054" H 5450 4300 50  0001 C CNN
+F 0 "#PWR055" H 5450 4300 50  0001 C CNN
 F 1 "GND" H 5450 4400 50  0000 C CNN
 F 2 "" H 5450 4550 60  0000 C CNN
 F 3 "" H 5450 4550 60  0000 C CNN
@@ -145,10 +145,10 @@ F 3 "" H 5450 4550 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR055
+L GND #PWR056
 U 1 1 58D69077
 P 5450 4250
-F 0 "#PWR055" H 5450 4000 50  0001 C CNN
+F 0 "#PWR056" H 5450 4000 50  0001 C CNN
 F 1 "GND" H 5450 4100 50  0000 C CNN
 F 2 "" H 5450 4250 60  0000 C CNN
 F 3 "" H 5450 4250 60  0000 C CNN
@@ -156,10 +156,10 @@ F 3 "" H 5450 4250 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR056
+L GND #PWR057
 U 1 1 58D69078
 P 5450 3950
-F 0 "#PWR056" H 5450 3700 50  0001 C CNN
+F 0 "#PWR057" H 5450 3700 50  0001 C CNN
 F 1 "GND" H 5450 3800 50  0000 C CNN
 F 2 "" H 5450 3950 60  0000 C CNN
 F 3 "" H 5450 3950 60  0000 C CNN
@@ -167,10 +167,10 @@ F 3 "" H 5450 3950 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +5V #PWR057
+L +5V #PWR058
 U 1 1 58D6907F
 P 6200 5450
-F 0 "#PWR057" H 6200 5300 50  0001 C CNN
+F 0 "#PWR058" H 6200 5300 50  0001 C CNN
 F 1 "+5V" H 6200 5590 50  0000 C CNN
 F 2 "" H 6200 5450 50  0000 C CNN
 F 3 "" H 6200 5450 50  0000 C CNN
diff --git a/gpio.bak b/gpio.bak
index 6a477f5..2be84d6 100644
--- a/gpio.bak
+++ b/gpio.bak
@@ -111,10 +111,10 @@ P27
 Text Label 5200 1950 0    60   ~ 0
 P28
 $Comp
-L GND #PWR07
+L GND #PWR05
 U 1 1 56AC4825
 P 1450 950
-F 0 "#PWR07" H 1450 700 50  0001 C CNN
+F 0 "#PWR05" H 1450 700 50  0001 C CNN
 F 1 "GND" H 1450 800 50  0000 C CNN
 F 2 "" H 1450 950 60  0000 C CNN
 F 3 "" H 1450 950 60  0000 C CNN
@@ -122,10 +122,10 @@ F 3 "" H 1450 950 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR08
+L GND #PWR06
 U 1 1 56AC482D
 P 2250 950
-F 0 "#PWR08" H 2250 700 50  0001 C CNN
+F 0 "#PWR06" H 2250 700 50  0001 C CNN
 F 1 "GND" H 2250 800 50  0000 C CNN
 F 2 "" H 2250 950 60  0000 C CNN
 F 3 "" H 2250 950 60  0000 C CNN
@@ -161,10 +161,10 @@ OUT5V
 Text Label 850  850  0    60   ~ 0
 +5V
 $Comp
-L +5V #PWR09
+L +5V #PWR07
 U 1 1 56AC484F
 P 850 850
-F 0 "#PWR09" H 850 700 50  0001 C CNN
+F 0 "#PWR07" H 850 700 50  0001 C CNN
 F 1 "+5V" H 850 990 50  0000 C CNN
 F 2 "" H 850 850 60  0000 C CNN
 F 3 "" H 850 850 60  0000 C CNN
@@ -513,10 +513,10 @@ MP3
 Text Label 1400 6200 0    60   ~ 0
 MP5
 $Comp
-L GND #PWR010
+L GND #PWR08
 U 1 1 58D3C3A8
 P 1150 6400
-F 0 "#PWR010" H 1150 6150 50  0001 C CNN
+F 0 "#PWR08" H 1150 6150 50  0001 C CNN
 F 1 "GND" H 1150 6250 50  0000 C CNN
 F 2 "" H 1150 6400 50  0000 C CNN
 F 3 "" H 1150 6400 50  0000 C CNN
@@ -524,10 +524,10 @@ F 3 "" H 1150 6400 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR011
+L GND #PWR09
 U 1 1 58D3C3C8
 P 2550 6400
-F 0 "#PWR011" H 2550 6150 50  0001 C CNN
+F 0 "#PWR09" H 2550 6150 50  0001 C CNN
 F 1 "GND" H 2550 6250 50  0000 C CNN
 F 2 "" H 2550 6400 50  0000 C CNN
 F 3 "" H 2550 6400 50  0000 C CNN
@@ -535,10 +535,10 @@ F 3 "" H 2550 6400 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR012
+L GND #PWR010
 U 1 1 58D3C400
 P 2550 5500
-F 0 "#PWR012" H 2550 5250 50  0001 C CNN
+F 0 "#PWR010" H 2550 5250 50  0001 C CNN
 F 1 "GND" H 2550 5350 50  0000 C CNN
 F 2 "" H 2550 5500 50  0000 C CNN
 F 3 "" H 2550 5500 50  0000 C CNN
@@ -546,10 +546,10 @@ F 3 "" H 2550 5500 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR013
+L GND #PWR011
 U 1 1 58D3C426
 P 1150 5500
-F 0 "#PWR013" H 1150 5250 50  0001 C CNN
+F 0 "#PWR011" H 1150 5250 50  0001 C CNN
 F 1 "GND" H 1150 5350 50  0000 C CNN
 F 2 "" H 1150 5500 50  0000 C CNN
 F 3 "" H 1150 5500 50  0000 C CNN
@@ -557,10 +557,10 @@ F 3 "" H 1150 5500 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR014
+L GND #PWR012
 U 1 1 58D565FC
 P 1400 3850
-F 0 "#PWR014" H 1400 3600 50  0001 C CNN
+F 0 "#PWR012" H 1400 3600 50  0001 C CNN
 F 1 "GND" H 1400 3700 50  0000 C CNN
 F 2 "" H 1400 3850 60  0000 C CNN
 F 3 "" H 1400 3850 60  0000 C CNN
@@ -570,10 +570,10 @@ $EndComp
 Wire Wire Line
 	1400 3850 1600 3850
 $Comp
-L GND #PWR015
+L GND #PWR013
 U 1 1 58D56721
 P 2300 3850
-F 0 "#PWR015" H 2300 3600 50  0001 C CNN
+F 0 "#PWR013" H 2300 3600 50  0001 C CNN
 F 1 "GND" H 2300 3700 50  0000 C CNN
 F 2 "" H 2300 3850 60  0000 C CNN
 F 3 "" H 2300 3850 60  0000 C CNN
@@ -830,10 +830,10 @@ PMODA5
 Text Label 1200 4950 0    60   ~ 0
 PMODA7
 $Comp
-L GND #PWR016
+L GND #PWR014
 U 1 1 58D51066
 P 1150 4550
-F 0 "#PWR016" H 1150 4300 50  0001 C CNN
+F 0 "#PWR014" H 1150 4300 50  0001 C CNN
 F 1 "GND" H 1150 4400 50  0000 C CNN
 F 2 "" H 1150 4550 50  0000 C CNN
 F 3 "" H 1150 4550 50  0000 C CNN
@@ -861,10 +861,10 @@ PMODA6
 Text Label 2150 4950 0    60   ~ 0
 PMODA8
 $Comp
-L GND #PWR017
+L GND #PWR015
 U 1 1 58D510F5
 P 2550 4550
-F 0 "#PWR017" H 2550 4300 50  0001 C CNN
+F 0 "#PWR015" H 2550 4300 50  0001 C CNN
 F 1 "GND" H 2550 4400 50  0000 C CNN
 F 2 "" H 2550 4550 50  0000 C CNN
 F 3 "" H 2550 4550 50  0000 C CNN
@@ -872,10 +872,10 @@ F 3 "" H 2550 4550 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +3V3 #PWR018
+L +3V3 #PWR016
 U 1 1 58D5FBBC
 P 2150 3950
-F 0 "#PWR018" H 2150 3800 50  0001 C CNN
+F 0 "#PWR016" H 2150 3800 50  0001 C CNN
 F 1 "+3V3" H 2150 4090 50  0000 C CNN
 F 2 "" H 2150 3950 50  0000 C CNN
 F 3 "" H 2150 3950 50  0000 C CNN
@@ -883,10 +883,10 @@ F 3 "" H 2150 3950 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR019
+L +3V3 #PWR017
 U 1 1 58D5FBF3
 P 1550 3950
-F 0 "#PWR019" H 1550 3800 50  0001 C CNN
+F 0 "#PWR017" H 1550 3800 50  0001 C CNN
 F 1 "+3V3" H 1550 4090 50  0000 C CNN
 F 2 "" H 1550 3950 50  0000 C CNN
 F 3 "" H 1550 3950 50  0000 C CNN
@@ -894,10 +894,10 @@ F 3 "" H 1550 3950 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +3V3 #PWR020
+L +3V3 #PWR018
 U 1 1 58D5FC6D
 P 2400 4450
-F 0 "#PWR020" H 2400 4300 50  0001 C CNN
+F 0 "#PWR018" H 2400 4300 50  0001 C CNN
 F 1 "+3V3" H 2400 4590 50  0000 C CNN
 F 2 "" H 2400 4450 50  0000 C CNN
 F 3 "" H 2400 4450 50  0000 C CNN
@@ -905,10 +905,10 @@ F 3 "" H 2400 4450 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR021
+L +3V3 #PWR019
 U 1 1 58D5FC94
 P 1300 4450
-F 0 "#PWR021" H 1300 4300 50  0001 C CNN
+F 0 "#PWR019" H 1300 4300 50  0001 C CNN
 F 1 "+3V3" H 1300 4590 50  0000 C CNN
 F 2 "" H 1300 4450 50  0000 C CNN
 F 3 "" H 1300 4450 50  0000 C CNN
@@ -916,10 +916,10 @@ F 3 "" H 1300 4450 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +3V3 #PWR022
+L +3V3 #PWR020
 U 1 1 58D60015
 P 2400 5400
-F 0 "#PWR022" H 2400 5250 50  0001 C CNN
+F 0 "#PWR020" H 2400 5250 50  0001 C CNN
 F 1 "+3V3" H 2400 5540 50  0000 C CNN
 F 2 "" H 2400 5400 50  0000 C CNN
 F 3 "" H 2400 5400 50  0000 C CNN
@@ -927,10 +927,10 @@ F 3 "" H 2400 5400 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR023
+L +3V3 #PWR021
 U 1 1 58D60037
 P 2400 6300
-F 0 "#PWR023" H 2400 6150 50  0001 C CNN
+F 0 "#PWR021" H 2400 6150 50  0001 C CNN
 F 1 "+3V3" H 2400 6440 50  0000 C CNN
 F 2 "" H 2400 6300 50  0000 C CNN
 F 3 "" H 2400 6300 50  0000 C CNN
@@ -938,10 +938,10 @@ F 3 "" H 2400 6300 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR024
+L +3V3 #PWR022
 U 1 1 58D60059
 P 1300 5400
-F 0 "#PWR024" H 1300 5250 50  0001 C CNN
+F 0 "#PWR022" H 1300 5250 50  0001 C CNN
 F 1 "+3V3" H 1300 5540 50  0000 C CNN
 F 2 "" H 1300 5400 50  0000 C CNN
 F 3 "" H 1300 5400 50  0000 C CNN
@@ -949,10 +949,10 @@ F 3 "" H 1300 5400 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +3V3 #PWR025
+L +3V3 #PWR023
 U 1 1 58D60089
 P 1300 6300
-F 0 "#PWR025" H 1300 6150 50  0001 C CNN
+F 0 "#PWR023" H 1300 6150 50  0001 C CNN
 F 1 "+3V3" H 1300 6440 50  0000 C CNN
 F 2 "" H 1300 6300 50  0000 C CNN
 F 3 "" H 1300 6300 50  0000 C CNN
diff --git a/gpio.sch b/gpio.sch
index 6a477f5..2be84d6 100644
--- a/gpio.sch
+++ b/gpio.sch
@@ -111,10 +111,10 @@ P27
 Text Label 5200 1950 0    60   ~ 0
 P28
 $Comp
-L GND #PWR07
+L GND #PWR05
 U 1 1 56AC4825
 P 1450 950
-F 0 "#PWR07" H 1450 700 50  0001 C CNN
+F 0 "#PWR05" H 1450 700 50  0001 C CNN
 F 1 "GND" H 1450 800 50  0000 C CNN
 F 2 "" H 1450 950 60  0000 C CNN
 F 3 "" H 1450 950 60  0000 C CNN
@@ -122,10 +122,10 @@ F 3 "" H 1450 950 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR08
+L GND #PWR06
 U 1 1 56AC482D
 P 2250 950
-F 0 "#PWR08" H 2250 700 50  0001 C CNN
+F 0 "#PWR06" H 2250 700 50  0001 C CNN
 F 1 "GND" H 2250 800 50  0000 C CNN
 F 2 "" H 2250 950 60  0000 C CNN
 F 3 "" H 2250 950 60  0000 C CNN
@@ -161,10 +161,10 @@ OUT5V
 Text Label 850  850  0    60   ~ 0
 +5V
 $Comp
-L +5V #PWR09
+L +5V #PWR07
 U 1 1 56AC484F
 P 850 850
-F 0 "#PWR09" H 850 700 50  0001 C CNN
+F 0 "#PWR07" H 850 700 50  0001 C CNN
 F 1 "+5V" H 850 990 50  0000 C CNN
 F 2 "" H 850 850 60  0000 C CNN
 F 3 "" H 850 850 60  0000 C CNN
@@ -513,10 +513,10 @@ MP3
 Text Label 1400 6200 0    60   ~ 0
 MP5
 $Comp
-L GND #PWR010
+L GND #PWR08
 U 1 1 58D3C3A8
 P 1150 6400
-F 0 "#PWR010" H 1150 6150 50  0001 C CNN
+F 0 "#PWR08" H 1150 6150 50  0001 C CNN
 F 1 "GND" H 1150 6250 50  0000 C CNN
 F 2 "" H 1150 6400 50  0000 C CNN
 F 3 "" H 1150 6400 50  0000 C CNN
@@ -524,10 +524,10 @@ F 3 "" H 1150 6400 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR011
+L GND #PWR09
 U 1 1 58D3C3C8
 P 2550 6400
-F 0 "#PWR011" H 2550 6150 50  0001 C CNN
+F 0 "#PWR09" H 2550 6150 50  0001 C CNN
 F 1 "GND" H 2550 6250 50  0000 C CNN
 F 2 "" H 2550 6400 50  0000 C CNN
 F 3 "" H 2550 6400 50  0000 C CNN
@@ -535,10 +535,10 @@ F 3 "" H 2550 6400 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR012
+L GND #PWR010
 U 1 1 58D3C400
 P 2550 5500
-F 0 "#PWR012" H 2550 5250 50  0001 C CNN
+F 0 "#PWR010" H 2550 5250 50  0001 C CNN
 F 1 "GND" H 2550 5350 50  0000 C CNN
 F 2 "" H 2550 5500 50  0000 C CNN
 F 3 "" H 2550 5500 50  0000 C CNN
@@ -546,10 +546,10 @@ F 3 "" H 2550 5500 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR013
+L GND #PWR011
 U 1 1 58D3C426
 P 1150 5500
-F 0 "#PWR013" H 1150 5250 50  0001 C CNN
+F 0 "#PWR011" H 1150 5250 50  0001 C CNN
 F 1 "GND" H 1150 5350 50  0000 C CNN
 F 2 "" H 1150 5500 50  0000 C CNN
 F 3 "" H 1150 5500 50  0000 C CNN
@@ -557,10 +557,10 @@ F 3 "" H 1150 5500 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR014
+L GND #PWR012
 U 1 1 58D565FC
 P 1400 3850
-F 0 "#PWR014" H 1400 3600 50  0001 C CNN
+F 0 "#PWR012" H 1400 3600 50  0001 C CNN
 F 1 "GND" H 1400 3700 50  0000 C CNN
 F 2 "" H 1400 3850 60  0000 C CNN
 F 3 "" H 1400 3850 60  0000 C CNN
@@ -570,10 +570,10 @@ $EndComp
 Wire Wire Line
 	1400 3850 1600 3850
 $Comp
-L GND #PWR015
+L GND #PWR013
 U 1 1 58D56721
 P 2300 3850
-F 0 "#PWR015" H 2300 3600 50  0001 C CNN
+F 0 "#PWR013" H 2300 3600 50  0001 C CNN
 F 1 "GND" H 2300 3700 50  0000 C CNN
 F 2 "" H 2300 3850 60  0000 C CNN
 F 3 "" H 2300 3850 60  0000 C CNN
@@ -830,10 +830,10 @@ PMODA5
 Text Label 1200 4950 0    60   ~ 0
 PMODA7
 $Comp
-L GND #PWR016
+L GND #PWR014
 U 1 1 58D51066
 P 1150 4550
-F 0 "#PWR016" H 1150 4300 50  0001 C CNN
+F 0 "#PWR014" H 1150 4300 50  0001 C CNN
 F 1 "GND" H 1150 4400 50  0000 C CNN
 F 2 "" H 1150 4550 50  0000 C CNN
 F 3 "" H 1150 4550 50  0000 C CNN
@@ -861,10 +861,10 @@ PMODA6
 Text Label 2150 4950 0    60   ~ 0
 PMODA8
 $Comp
-L GND #PWR017
+L GND #PWR015
 U 1 1 58D510F5
 P 2550 4550
-F 0 "#PWR017" H 2550 4300 50  0001 C CNN
+F 0 "#PWR015" H 2550 4300 50  0001 C CNN
 F 1 "GND" H 2550 4400 50  0000 C CNN
 F 2 "" H 2550 4550 50  0000 C CNN
 F 3 "" H 2550 4550 50  0000 C CNN
@@ -872,10 +872,10 @@ F 3 "" H 2550 4550 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +3V3 #PWR018
+L +3V3 #PWR016
 U 1 1 58D5FBBC
 P 2150 3950
-F 0 "#PWR018" H 2150 3800 50  0001 C CNN
+F 0 "#PWR016" H 2150 3800 50  0001 C CNN
 F 1 "+3V3" H 2150 4090 50  0000 C CNN
 F 2 "" H 2150 3950 50  0000 C CNN
 F 3 "" H 2150 3950 50  0000 C CNN
@@ -883,10 +883,10 @@ F 3 "" H 2150 3950 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR019
+L +3V3 #PWR017
 U 1 1 58D5FBF3
 P 1550 3950
-F 0 "#PWR019" H 1550 3800 50  0001 C CNN
+F 0 "#PWR017" H 1550 3800 50  0001 C CNN
 F 1 "+3V3" H 1550 4090 50  0000 C CNN
 F 2 "" H 1550 3950 50  0000 C CNN
 F 3 "" H 1550 3950 50  0000 C CNN
@@ -894,10 +894,10 @@ F 3 "" H 1550 3950 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +3V3 #PWR020
+L +3V3 #PWR018
 U 1 1 58D5FC6D
 P 2400 4450
-F 0 "#PWR020" H 2400 4300 50  0001 C CNN
+F 0 "#PWR018" H 2400 4300 50  0001 C CNN
 F 1 "+3V3" H 2400 4590 50  0000 C CNN
 F 2 "" H 2400 4450 50  0000 C CNN
 F 3 "" H 2400 4450 50  0000 C CNN
@@ -905,10 +905,10 @@ F 3 "" H 2400 4450 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR021
+L +3V3 #PWR019
 U 1 1 58D5FC94
 P 1300 4450
-F 0 "#PWR021" H 1300 4300 50  0001 C CNN
+F 0 "#PWR019" H 1300 4300 50  0001 C CNN
 F 1 "+3V3" H 1300 4590 50  0000 C CNN
 F 2 "" H 1300 4450 50  0000 C CNN
 F 3 "" H 1300 4450 50  0000 C CNN
@@ -916,10 +916,10 @@ F 3 "" H 1300 4450 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +3V3 #PWR022
+L +3V3 #PWR020
 U 1 1 58D60015
 P 2400 5400
-F 0 "#PWR022" H 2400 5250 50  0001 C CNN
+F 0 "#PWR020" H 2400 5250 50  0001 C CNN
 F 1 "+3V3" H 2400 5540 50  0000 C CNN
 F 2 "" H 2400 5400 50  0000 C CNN
 F 3 "" H 2400 5400 50  0000 C CNN
@@ -927,10 +927,10 @@ F 3 "" H 2400 5400 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR023
+L +3V3 #PWR021
 U 1 1 58D60037
 P 2400 6300
-F 0 "#PWR023" H 2400 6150 50  0001 C CNN
+F 0 "#PWR021" H 2400 6150 50  0001 C CNN
 F 1 "+3V3" H 2400 6440 50  0000 C CNN
 F 2 "" H 2400 6300 50  0000 C CNN
 F 3 "" H 2400 6300 50  0000 C CNN
@@ -938,10 +938,10 @@ F 3 "" H 2400 6300 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR024
+L +3V3 #PWR022
 U 1 1 58D60059
 P 1300 5400
-F 0 "#PWR024" H 1300 5250 50  0001 C CNN
+F 0 "#PWR022" H 1300 5250 50  0001 C CNN
 F 1 "+3V3" H 1300 5540 50  0000 C CNN
 F 2 "" H 1300 5400 50  0000 C CNN
 F 3 "" H 1300 5400 50  0000 C CNN
@@ -949,10 +949,10 @@ F 3 "" H 1300 5400 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +3V3 #PWR025
+L +3V3 #PWR023
 U 1 1 58D60089
 P 1300 6300
-F 0 "#PWR025" H 1300 6150 50  0001 C CNN
+F 0 "#PWR023" H 1300 6150 50  0001 C CNN
 F 1 "+3V3" H 1300 6440 50  0000 C CNN
 F 2 "" H 1300 6300 50  0000 C CNN
 F 3 "" H 1300 6300 50  0000 C CNN
diff --git a/power.bak b/power.bak
index 12dab4d..783be77 100644
--- a/power.bak
+++ b/power.bak
@@ -50,10 +50,10 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L GND #PWR026
+L GND #PWR024
 U 1 1 58D54769
 P 1100 2650
-F 0 "#PWR026" H 1100 2400 50  0001 C CNN
+F 0 "#PWR024" H 1100 2400 50  0001 C CNN
 F 1 "GND" H 1100 2500 50  0000 C CNN
 F 2 "" H 1100 2650 60  0000 C CNN
 F 3 "" H 1100 2650 60  0000 C CNN
@@ -83,10 +83,10 @@ F 3 "" H 4150 3700 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR027
+L GND #PWR025
 U 1 1 58D58A0B
 P 4150 4200
-F 0 "#PWR027" H 4150 3950 50  0001 C CNN
+F 0 "#PWR025" H 4150 3950 50  0001 C CNN
 F 1 "GND" H 4150 4050 50  0000 C CNN
 F 2 "" H 4150 4200 50  0000 C CNN
 F 3 "" H 4150 4200 50  0000 C CNN
@@ -94,10 +94,10 @@ F 3 "" H 4150 4200 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +5V #PWR028
+L +5V #PWR026
 U 1 1 58D58F93
 P 3500 3550
-F 0 "#PWR028" H 3500 3400 50  0001 C CNN
+F 0 "#PWR026" H 3500 3400 50  0001 C CNN
 F 1 "+5V" H 3500 3690 50  0000 C CNN
 F 2 "" H 3500 3550 50  0000 C CNN
 F 3 "" H 3500 3550 50  0000 C CNN
@@ -105,10 +105,10 @@ F 3 "" H 3500 3550 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR029
+L GND #PWR027
 U 1 1 58D5989A
 P 3500 4200
-F 0 "#PWR029" H 3500 3950 50  0001 C CNN
+F 0 "#PWR027" H 3500 3950 50  0001 C CNN
 F 1 "GND" H 3500 4050 50  0000 C CNN
 F 2 "" H 3500 4200 50  0000 C CNN
 F 3 "" H 3500 4200 50  0000 C CNN
@@ -171,10 +171,10 @@ F 3 "" H 5700 3800 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR030
+L GND #PWR028
 U 1 1 58D5AE5E
 P 5900 3900
-F 0 "#PWR030" H 5900 3650 50  0001 C CNN
+F 0 "#PWR028" H 5900 3650 50  0001 C CNN
 F 1 "GND" H 5900 3750 50  0000 C CNN
 F 2 "" H 5900 3900 50  0000 C CNN
 F 3 "" H 5900 3900 50  0000 C CNN
@@ -204,10 +204,10 @@ F 3 "" H 6250 3600 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR031
+L +3V3 #PWR029
 U 1 1 58D5CFDD
 P 4750 900
-F 0 "#PWR031" H 4750 750 50  0001 C CNN
+F 0 "#PWR029" H 4750 750 50  0001 C CNN
 F 1 "+3V3" H 4750 1040 50  0000 C CNN
 F 2 "" H 4750 900 50  0000 C CNN
 F 3 "" H 4750 900 50  0000 C CNN
@@ -685,10 +685,10 @@ F 3 "" H 4150 6550 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR032
+L GND #PWR030
 U 1 1 58D6294C
 P 4150 7050
-F 0 "#PWR032" H 4150 6800 50  0001 C CNN
+F 0 "#PWR030" H 4150 6800 50  0001 C CNN
 F 1 "GND" H 4150 6900 50  0000 C CNN
 F 2 "" H 4150 7050 50  0000 C CNN
 F 3 "" H 4150 7050 50  0000 C CNN
@@ -696,10 +696,10 @@ F 3 "" H 4150 7050 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +5V #PWR033
+L +5V #PWR031
 U 1 1 58D62952
 P 3500 6400
-F 0 "#PWR033" H 3500 6250 50  0001 C CNN
+F 0 "#PWR031" H 3500 6250 50  0001 C CNN
 F 1 "+5V" H 3500 6540 50  0000 C CNN
 F 2 "" H 3500 6400 50  0000 C CNN
 F 3 "" H 3500 6400 50  0000 C CNN
@@ -707,10 +707,10 @@ F 3 "" H 3500 6400 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR034
+L GND #PWR032
 U 1 1 58D62958
 P 3500 7050
-F 0 "#PWR034" H 3500 6800 50  0001 C CNN
+F 0 "#PWR032" H 3500 6800 50  0001 C CNN
 F 1 "GND" H 3500 6900 50  0000 C CNN
 F 2 "" H 3500 7050 50  0000 C CNN
 F 3 "" H 3500 7050 50  0000 C CNN
@@ -773,10 +773,10 @@ F 3 "" H 5700 6650 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR035
+L GND #PWR033
 U 1 1 58D62982
 P 5900 6750
-F 0 "#PWR035" H 5900 6500 50  0001 C CNN
+F 0 "#PWR033" H 5900 6500 50  0001 C CNN
 F 1 "GND" H 5900 6600 50  0000 C CNN
 F 2 "" H 5900 6750 50  0000 C CNN
 F 3 "" H 5900 6750 50  0000 C CNN
@@ -852,10 +852,10 @@ Wire Wire Line
 Wire Wire Line
 	3550 6650 3050 6650
 $Comp
-L +3V3 #PWR036
+L +3V3 #PWR034
 U 1 1 58D62CE2
 P 6250 6200
-F 0 "#PWR036" H 6250 6050 50  0001 C CNN
+F 0 "#PWR034" H 6250 6050 50  0001 C CNN
 F 1 "+3V3" H 6250 6340 50  0000 C CNN
 F 2 "" H 6250 6200 50  0000 C CNN
 F 3 "" H 6250 6200 50  0000 C CNN
@@ -863,10 +863,10 @@ F 3 "" H 6250 6200 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +1V2 #PWR037
+L +1V2 #PWR035
 U 1 1 58D63C77
 P 6250 3350
-F 0 "#PWR037" H 6250 3200 50  0001 C CNN
+F 0 "#PWR035" H 6250 3200 50  0001 C CNN
 F 1 "+1V2" H 6250 3490 50  0000 C CNN
 F 2 "" H 6250 3350 50  0000 C CNN
 F 3 "" H 6250 3350 50  0000 C CNN
@@ -874,10 +874,10 @@ F 3 "" H 6250 3350 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +1V2 #PWR038
+L +1V2 #PWR036
 U 1 1 58D63D96
 P 2150 900
-F 0 "#PWR038" H 2150 750 50  0001 C CNN
+F 0 "#PWR036" H 2150 750 50  0001 C CNN
 F 1 "+1V2" H 2150 1040 50  0000 C CNN
 F 2 "" H 2150 900 50  0000 C CNN
 F 3 "" H 2150 900 50  0000 C CNN
@@ -900,10 +900,10 @@ F 3 "" H 4150 5150 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR039
+L GND #PWR037
 U 1 1 58D67BC0
 P 4150 5650
-F 0 "#PWR039" H 4150 5400 50  0001 C CNN
+F 0 "#PWR037" H 4150 5400 50  0001 C CNN
 F 1 "GND" H 4150 5500 50  0000 C CNN
 F 2 "" H 4150 5650 50  0000 C CNN
 F 3 "" H 4150 5650 50  0000 C CNN
@@ -911,10 +911,10 @@ F 3 "" H 4150 5650 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +5V #PWR040
+L +5V #PWR038
 U 1 1 58D67BC6
 P 3500 5000
-F 0 "#PWR040" H 3500 4850 50  0001 C CNN
+F 0 "#PWR038" H 3500 4850 50  0001 C CNN
 F 1 "+5V" H 3500 5140 50  0000 C CNN
 F 2 "" H 3500 5000 50  0000 C CNN
 F 3 "" H 3500 5000 50  0000 C CNN
@@ -922,10 +922,10 @@ F 3 "" H 3500 5000 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR041
+L GND #PWR039
 U 1 1 58D67BCC
 P 3500 5650
-F 0 "#PWR041" H 3500 5400 50  0001 C CNN
+F 0 "#PWR039" H 3500 5400 50  0001 C CNN
 F 1 "GND" H 3500 5500 50  0000 C CNN
 F 2 "" H 3500 5650 50  0000 C CNN
 F 3 "" H 3500 5650 50  0000 C CNN
@@ -988,10 +988,10 @@ F 3 "" H 5700 5250 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR042
+L GND #PWR040
 U 1 1 58D67BF0
 P 5900 5350
-F 0 "#PWR042" H 5900 5100 50  0001 C CNN
+F 0 "#PWR040" H 5900 5100 50  0001 C CNN
 F 1 "GND" H 5900 5200 50  0000 C CNN
 F 2 "" H 5900 5350 50  0000 C CNN
 F 3 "" H 5900 5350 50  0000 C CNN
@@ -1080,10 +1080,10 @@ $EndComp
 Wire Wire Line
 	1900 4850 1900 4800
 $Comp
-L +5V #PWR043
+L +5V #PWR041
 U 1 1 58D67C25
 P 1900 4800
-F 0 "#PWR043" H 1900 4650 50  0001 C CNN
+F 0 "#PWR041" H 1900 4650 50  0001 C CNN
 F 1 "+5V" H 1900 4940 50  0000 C CNN
 F 2 "" H 1900 4800 50  0000 C CNN
 F 3 "" H 1900 4800 50  0000 C CNN
@@ -1091,10 +1091,10 @@ F 3 "" H 1900 4800 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +2V5 #PWR044
+L +2V5 #PWR042
 U 1 1 58D681D4
 P 6250 4800
-F 0 "#PWR044" H 6250 4650 50  0001 C CNN
+F 0 "#PWR042" H 6250 4650 50  0001 C CNN
 F 1 "+2V5" H 6250 4940 50  0000 C CNN
 F 2 "" H 6250 4800 50  0000 C CNN
 F 3 "" H 6250 4800 50  0000 C CNN
@@ -1132,10 +1132,10 @@ Wire Wire Line
 Wire Wire Line
 	4650 1000 4650 1100
 $Comp
-L +2V5 #PWR045
+L +2V5 #PWR043
 U 1 1 58D68750
 P 4250 900
-F 0 "#PWR045" H 4250 750 50  0001 C CNN
+F 0 "#PWR043" H 4250 750 50  0001 C CNN
 F 1 "+2V5" H 4250 1040 50  0000 C CNN
 F 2 "" H 4250 900 50  0000 C CNN
 F 3 "" H 4250 900 50  0000 C CNN
@@ -1145,14 +1145,112 @@ $EndComp
 Wire Wire Line
 	6250 1000 7150 1000
 $Comp
-L +3V3 #PWR046
+L +3V3 #PWR044
 U 1 1 58D69259
 P 6350 900
-F 0 "#PWR046" H 6350 750 50  0001 C CNN
+F 0 "#PWR044" H 6350 750 50  0001 C CNN
 F 1 "+3V3" H 6350 1040 50  0000 C CNN
 F 2 "" H 6350 900 50  0000 C CNN
 F 3 "" H 6350 900 50  0000 C CNN
 	1    6350 900 
 	1    0    0    -1  
 $EndComp
+$Comp
+L PCF8563 U7
+U 1 1 58D70684
+P 8450 4050
+F 0 "U7" H 8150 4400 50  0000 L CNN
+F 1 "PCF8523" H 8550 4400 50  0000 L CNN
+F 2 "Power_Integrations:SO-8" H 8450 4050 50  0001 C CNN
+F 3 "" H 8450 4050 50  0000 C CNN
+	1    8450 4050
+	1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR045
+U 1 1 58D7085C
+P 8450 4550
+F 0 "#PWR045" H 8450 4300 50  0001 C CNN
+F 1 "GND" H 8450 4400 50  0000 C CNN
+F 2 "" H 8450 4550 50  0000 C CNN
+F 3 "" H 8450 4550 50  0000 C CNN
+	1    8450 4550
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	8450 4450 8450 4550
+Wire Wire Line
+	8850 3850 8950 3850
+Wire Wire Line
+	8850 3950 8950 3950
+Text GLabel 8950 3850 2    60   Input ~ 0
+BOARD_SCL
+Text GLabel 8950 3950 2    60   Input ~ 0
+BOARD_SDA
+$Comp
+L Crystal Y1
+U 1 1 58D70E83
+P 7950 4050
+F 0 "Y1" H 7950 4200 50  0000 C CNN
+F 1 "32768Hz" H 7950 3900 50  0000 C CNN
+F 2 "Crystals:Crystal_SMD_0603_2Pads_obsolete" H 7950 4050 50  0001 C CNN
+F 3 "" H 7950 4050 50  0000 C CNN
+	1    7950 4050
+	0    1    1    0   
+$EndComp
+Wire Wire Line
+	7950 4200 7950 4250
+Wire Wire Line
+	7950 3900 7950 3850
+$Comp
+L Battery_Cell BT1
+U 1 1 58D72202
+P 9150 4500
+F 0 "BT1" H 9250 4600 50  0000 L CNN
+F 1 "3V" H 9250 4500 50  0000 L CNN
+F 2 "Buzzers_Beepers:Buzzer_12x9.5RM7.6" V 9150 4560 50  0001 C CNN
+F 3 "" V 9150 4560 50  0000 C CNN
+	1    9150 4500
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	8850 4250 9150 4250
+Wire Wire Line
+	9150 4250 9150 4300
+$Comp
+L GND #PWR046
+U 1 1 58D72406
+P 9150 4650
+F 0 "#PWR046" H 9150 4400 50  0001 C CNN
+F 1 "GND" H 9150 4500 50  0000 C CNN
+F 2 "" H 9150 4650 50  0000 C CNN
+F 3 "" H 9150 4650 50  0000 C CNN
+	1    9150 4650
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	9150 4600 9150 4650
+Wire Wire Line
+	7950 3850 8050 3850
+Wire Wire Line
+	7950 4250 8050 4250
+Wire Wire Line
+	8450 3650 8450 3550
+Wire Wire Line
+	8850 4150 9350 4150
+Text Label 8900 4150 0    60   ~ 0
+WAKEUPn
+$Comp
+L +2V5 #PWR047
+U 1 1 58D73C82
+P 8450 3550
+F 0 "#PWR047" H 8450 3400 50  0001 C CNN
+F 1 "+2V5" H 8450 3690 50  0000 C CNN
+F 2 "" H 8450 3550 50  0000 C CNN
+F 3 "" H 8450 3550 50  0000 C CNN
+	1    8450 3550
+	1    0    0    -1  
+$EndComp
+Text Label 8900 4250 0    60   ~ 0
+VBAT
 $EndSCHEMATC
diff --git a/power.sch b/power.sch
index 12dab4d..783be77 100644
--- a/power.sch
+++ b/power.sch
@@ -50,10 +50,10 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L GND #PWR026
+L GND #PWR024
 U 1 1 58D54769
 P 1100 2650
-F 0 "#PWR026" H 1100 2400 50  0001 C CNN
+F 0 "#PWR024" H 1100 2400 50  0001 C CNN
 F 1 "GND" H 1100 2500 50  0000 C CNN
 F 2 "" H 1100 2650 60  0000 C CNN
 F 3 "" H 1100 2650 60  0000 C CNN
@@ -83,10 +83,10 @@ F 3 "" H 4150 3700 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR027
+L GND #PWR025
 U 1 1 58D58A0B
 P 4150 4200
-F 0 "#PWR027" H 4150 3950 50  0001 C CNN
+F 0 "#PWR025" H 4150 3950 50  0001 C CNN
 F 1 "GND" H 4150 4050 50  0000 C CNN
 F 2 "" H 4150 4200 50  0000 C CNN
 F 3 "" H 4150 4200 50  0000 C CNN
@@ -94,10 +94,10 @@ F 3 "" H 4150 4200 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +5V #PWR028
+L +5V #PWR026
 U 1 1 58D58F93
 P 3500 3550
-F 0 "#PWR028" H 3500 3400 50  0001 C CNN
+F 0 "#PWR026" H 3500 3400 50  0001 C CNN
 F 1 "+5V" H 3500 3690 50  0000 C CNN
 F 2 "" H 3500 3550 50  0000 C CNN
 F 3 "" H 3500 3550 50  0000 C CNN
@@ -105,10 +105,10 @@ F 3 "" H 3500 3550 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR029
+L GND #PWR027
 U 1 1 58D5989A
 P 3500 4200
-F 0 "#PWR029" H 3500 3950 50  0001 C CNN
+F 0 "#PWR027" H 3500 3950 50  0001 C CNN
 F 1 "GND" H 3500 4050 50  0000 C CNN
 F 2 "" H 3500 4200 50  0000 C CNN
 F 3 "" H 3500 4200 50  0000 C CNN
@@ -171,10 +171,10 @@ F 3 "" H 5700 3800 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR030
+L GND #PWR028
 U 1 1 58D5AE5E
 P 5900 3900
-F 0 "#PWR030" H 5900 3650 50  0001 C CNN
+F 0 "#PWR028" H 5900 3650 50  0001 C CNN
 F 1 "GND" H 5900 3750 50  0000 C CNN
 F 2 "" H 5900 3900 50  0000 C CNN
 F 3 "" H 5900 3900 50  0000 C CNN
@@ -204,10 +204,10 @@ F 3 "" H 6250 3600 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR031
+L +3V3 #PWR029
 U 1 1 58D5CFDD
 P 4750 900
-F 0 "#PWR031" H 4750 750 50  0001 C CNN
+F 0 "#PWR029" H 4750 750 50  0001 C CNN
 F 1 "+3V3" H 4750 1040 50  0000 C CNN
 F 2 "" H 4750 900 50  0000 C CNN
 F 3 "" H 4750 900 50  0000 C CNN
@@ -685,10 +685,10 @@ F 3 "" H 4150 6550 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR032
+L GND #PWR030
 U 1 1 58D6294C
 P 4150 7050
-F 0 "#PWR032" H 4150 6800 50  0001 C CNN
+F 0 "#PWR030" H 4150 6800 50  0001 C CNN
 F 1 "GND" H 4150 6900 50  0000 C CNN
 F 2 "" H 4150 7050 50  0000 C CNN
 F 3 "" H 4150 7050 50  0000 C CNN
@@ -696,10 +696,10 @@ F 3 "" H 4150 7050 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +5V #PWR033
+L +5V #PWR031
 U 1 1 58D62952
 P 3500 6400
-F 0 "#PWR033" H 3500 6250 50  0001 C CNN
+F 0 "#PWR031" H 3500 6250 50  0001 C CNN
 F 1 "+5V" H 3500 6540 50  0000 C CNN
 F 2 "" H 3500 6400 50  0000 C CNN
 F 3 "" H 3500 6400 50  0000 C CNN
@@ -707,10 +707,10 @@ F 3 "" H 3500 6400 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR034
+L GND #PWR032
 U 1 1 58D62958
 P 3500 7050
-F 0 "#PWR034" H 3500 6800 50  0001 C CNN
+F 0 "#PWR032" H 3500 6800 50  0001 C CNN
 F 1 "GND" H 3500 6900 50  0000 C CNN
 F 2 "" H 3500 7050 50  0000 C CNN
 F 3 "" H 3500 7050 50  0000 C CNN
@@ -773,10 +773,10 @@ F 3 "" H 5700 6650 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR035
+L GND #PWR033
 U 1 1 58D62982
 P 5900 6750
-F 0 "#PWR035" H 5900 6500 50  0001 C CNN
+F 0 "#PWR033" H 5900 6500 50  0001 C CNN
 F 1 "GND" H 5900 6600 50  0000 C CNN
 F 2 "" H 5900 6750 50  0000 C CNN
 F 3 "" H 5900 6750 50  0000 C CNN
@@ -852,10 +852,10 @@ Wire Wire Line
 Wire Wire Line
 	3550 6650 3050 6650
 $Comp
-L +3V3 #PWR036
+L +3V3 #PWR034
 U 1 1 58D62CE2
 P 6250 6200
-F 0 "#PWR036" H 6250 6050 50  0001 C CNN
+F 0 "#PWR034" H 6250 6050 50  0001 C CNN
 F 1 "+3V3" H 6250 6340 50  0000 C CNN
 F 2 "" H 6250 6200 50  0000 C CNN
 F 3 "" H 6250 6200 50  0000 C CNN
@@ -863,10 +863,10 @@ F 3 "" H 6250 6200 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +1V2 #PWR037
+L +1V2 #PWR035
 U 1 1 58D63C77
 P 6250 3350
-F 0 "#PWR037" H 6250 3200 50  0001 C CNN
+F 0 "#PWR035" H 6250 3200 50  0001 C CNN
 F 1 "+1V2" H 6250 3490 50  0000 C CNN
 F 2 "" H 6250 3350 50  0000 C CNN
 F 3 "" H 6250 3350 50  0000 C CNN
@@ -874,10 +874,10 @@ F 3 "" H 6250 3350 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +1V2 #PWR038
+L +1V2 #PWR036
 U 1 1 58D63D96
 P 2150 900
-F 0 "#PWR038" H 2150 750 50  0001 C CNN
+F 0 "#PWR036" H 2150 750 50  0001 C CNN
 F 1 "+1V2" H 2150 1040 50  0000 C CNN
 F 2 "" H 2150 900 50  0000 C CNN
 F 3 "" H 2150 900 50  0000 C CNN
@@ -900,10 +900,10 @@ F 3 "" H 4150 5150 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR039
+L GND #PWR037
 U 1 1 58D67BC0
 P 4150 5650
-F 0 "#PWR039" H 4150 5400 50  0001 C CNN
+F 0 "#PWR037" H 4150 5400 50  0001 C CNN
 F 1 "GND" H 4150 5500 50  0000 C CNN
 F 2 "" H 4150 5650 50  0000 C CNN
 F 3 "" H 4150 5650 50  0000 C CNN
@@ -911,10 +911,10 @@ F 3 "" H 4150 5650 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +5V #PWR040
+L +5V #PWR038
 U 1 1 58D67BC6
 P 3500 5000
-F 0 "#PWR040" H 3500 4850 50  0001 C CNN
+F 0 "#PWR038" H 3500 4850 50  0001 C CNN
 F 1 "+5V" H 3500 5140 50  0000 C CNN
 F 2 "" H 3500 5000 50  0000 C CNN
 F 3 "" H 3500 5000 50  0000 C CNN
@@ -922,10 +922,10 @@ F 3 "" H 3500 5000 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR041
+L GND #PWR039
 U 1 1 58D67BCC
 P 3500 5650
-F 0 "#PWR041" H 3500 5400 50  0001 C CNN
+F 0 "#PWR039" H 3500 5400 50  0001 C CNN
 F 1 "GND" H 3500 5500 50  0000 C CNN
 F 2 "" H 3500 5650 50  0000 C CNN
 F 3 "" H 3500 5650 50  0000 C CNN
@@ -988,10 +988,10 @@ F 3 "" H 5700 5250 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR042
+L GND #PWR040
 U 1 1 58D67BF0
 P 5900 5350
-F 0 "#PWR042" H 5900 5100 50  0001 C CNN
+F 0 "#PWR040" H 5900 5100 50  0001 C CNN
 F 1 "GND" H 5900 5200 50  0000 C CNN
 F 2 "" H 5900 5350 50  0000 C CNN
 F 3 "" H 5900 5350 50  0000 C CNN
@@ -1080,10 +1080,10 @@ $EndComp
 Wire Wire Line
 	1900 4850 1900 4800
 $Comp
-L +5V #PWR043
+L +5V #PWR041
 U 1 1 58D67C25
 P 1900 4800
-F 0 "#PWR043" H 1900 4650 50  0001 C CNN
+F 0 "#PWR041" H 1900 4650 50  0001 C CNN
 F 1 "+5V" H 1900 4940 50  0000 C CNN
 F 2 "" H 1900 4800 50  0000 C CNN
 F 3 "" H 1900 4800 50  0000 C CNN
@@ -1091,10 +1091,10 @@ F 3 "" H 1900 4800 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +2V5 #PWR044
+L +2V5 #PWR042
 U 1 1 58D681D4
 P 6250 4800
-F 0 "#PWR044" H 6250 4650 50  0001 C CNN
+F 0 "#PWR042" H 6250 4650 50  0001 C CNN
 F 1 "+2V5" H 6250 4940 50  0000 C CNN
 F 2 "" H 6250 4800 50  0000 C CNN
 F 3 "" H 6250 4800 50  0000 C CNN
@@ -1132,10 +1132,10 @@ Wire Wire Line
 Wire Wire Line
 	4650 1000 4650 1100
 $Comp
-L +2V5 #PWR045
+L +2V5 #PWR043
 U 1 1 58D68750
 P 4250 900
-F 0 "#PWR045" H 4250 750 50  0001 C CNN
+F 0 "#PWR043" H 4250 750 50  0001 C CNN
 F 1 "+2V5" H 4250 1040 50  0000 C CNN
 F 2 "" H 4250 900 50  0000 C CNN
 F 3 "" H 4250 900 50  0000 C CNN
@@ -1145,14 +1145,112 @@ $EndComp
 Wire Wire Line
 	6250 1000 7150 1000
 $Comp
-L +3V3 #PWR046
+L +3V3 #PWR044
 U 1 1 58D69259
 P 6350 900
-F 0 "#PWR046" H 6350 750 50  0001 C CNN
+F 0 "#PWR044" H 6350 750 50  0001 C CNN
 F 1 "+3V3" H 6350 1040 50  0000 C CNN
 F 2 "" H 6350 900 50  0000 C CNN
 F 3 "" H 6350 900 50  0000 C CNN
 	1    6350 900 
 	1    0    0    -1  
 $EndComp
+$Comp
+L PCF8563 U7
+U 1 1 58D70684
+P 8450 4050
+F 0 "U7" H 8150 4400 50  0000 L CNN
+F 1 "PCF8523" H 8550 4400 50  0000 L CNN
+F 2 "Power_Integrations:SO-8" H 8450 4050 50  0001 C CNN
+F 3 "" H 8450 4050 50  0000 C CNN
+	1    8450 4050
+	1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR045
+U 1 1 58D7085C
+P 8450 4550
+F 0 "#PWR045" H 8450 4300 50  0001 C CNN
+F 1 "GND" H 8450 4400 50  0000 C CNN
+F 2 "" H 8450 4550 50  0000 C CNN
+F 3 "" H 8450 4550 50  0000 C CNN
+	1    8450 4550
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	8450 4450 8450 4550
+Wire Wire Line
+	8850 3850 8950 3850
+Wire Wire Line
+	8850 3950 8950 3950
+Text GLabel 8950 3850 2    60   Input ~ 0
+BOARD_SCL
+Text GLabel 8950 3950 2    60   Input ~ 0
+BOARD_SDA
+$Comp
+L Crystal Y1
+U 1 1 58D70E83
+P 7950 4050
+F 0 "Y1" H 7950 4200 50  0000 C CNN
+F 1 "32768Hz" H 7950 3900 50  0000 C CNN
+F 2 "Crystals:Crystal_SMD_0603_2Pads_obsolete" H 7950 4050 50  0001 C CNN
+F 3 "" H 7950 4050 50  0000 C CNN
+	1    7950 4050
+	0    1    1    0   
+$EndComp
+Wire Wire Line
+	7950 4200 7950 4250
+Wire Wire Line
+	7950 3900 7950 3850
+$Comp
+L Battery_Cell BT1
+U 1 1 58D72202
+P 9150 4500
+F 0 "BT1" H 9250 4600 50  0000 L CNN
+F 1 "3V" H 9250 4500 50  0000 L CNN
+F 2 "Buzzers_Beepers:Buzzer_12x9.5RM7.6" V 9150 4560 50  0001 C CNN
+F 3 "" V 9150 4560 50  0000 C CNN
+	1    9150 4500
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	8850 4250 9150 4250
+Wire Wire Line
+	9150 4250 9150 4300
+$Comp
+L GND #PWR046
+U 1 1 58D72406
+P 9150 4650
+F 0 "#PWR046" H 9150 4400 50  0001 C CNN
+F 1 "GND" H 9150 4500 50  0000 C CNN
+F 2 "" H 9150 4650 50  0000 C CNN
+F 3 "" H 9150 4650 50  0000 C CNN
+	1    9150 4650
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	9150 4600 9150 4650
+Wire Wire Line
+	7950 3850 8050 3850
+Wire Wire Line
+	7950 4250 8050 4250
+Wire Wire Line
+	8450 3650 8450 3550
+Wire Wire Line
+	8850 4150 9350 4150
+Text Label 8900 4150 0    60   ~ 0
+WAKEUPn
+$Comp
+L +2V5 #PWR047
+U 1 1 58D73C82
+P 8450 3550
+F 0 "#PWR047" H 8450 3400 50  0001 C CNN
+F 1 "+2V5" H 8450 3690 50  0000 C CNN
+F 2 "" H 8450 3550 50  0000 C CNN
+F 3 "" H 8450 3550 50  0000 C CNN
+	1    8450 3550
+	1    0    0    -1  
+$EndComp
+Text Label 8900 4250 0    60   ~ 0
+VBAT
 $EndSCHEMATC
diff --git a/ram.sch b/ram.sch
index d94a913..fc661ee 100644
--- a/ram.sch
+++ b/ram.sch
@@ -44,7 +44,7 @@ Title "ULX3S"
 Date ""
 Rev "0.0.1"
 Comp "FER+RIZ+RADIONA"
-Comment1 "Root sheet"
+Comment1 "SDRAM memory"
 Comment2 ""
 Comment3 ""
 Comment4 ""
diff --git a/ulx3s-cache.lib b/ulx3s-cache.lib
index 02e8c2b..4362dbd 100644
--- a/ulx3s-cache.lib
+++ b/ulx3s-cache.lib
@@ -82,6 +82,25 @@ X FB 5 600 -100 200 L 50 50 1 1 I
 ENDDRAW
 ENDDEF
 #
+# Battery_Cell
+#
+DEF Battery_Cell BT 0 0 N N 1 F N
+F0 "BT" 100 100 50 H V L CNN
+F1 "Battery_Cell" 100 0 50 H V L CNN
+F2 "" 0 60 50 V V C CNN
+F3 "" 0 60 50 V V C CNN
+DRAW
+S -90 70 90 60 0 1 0 F
+S -62 47 58 27 0 1 0 F
+P 2 0 1 0 0 30 0 0 N
+P 2 0 1 0 0 70 0 100 N
+P 2 0 1 10 20 135 60 135 N
+P 2 0 1 10 40 155 40 115 N
+X + 1 0 200 100 D 50 50 1 1 P
+X - 2 0 -100 100 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
 # C
 #
 DEF C C 0 10 N Y 1 F N
@@ -453,6 +472,27 @@ X ~ 2 0 -150 110 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
+# Crystal
+#
+DEF Crystal Y 0 40 N N 1 F N
+F0 "Y" 0 150 50 H V C CNN
+F1 "Crystal" 0 -150 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+$FPLIST
+ Crystal*
+$ENDFPLIST
+DRAW
+S -45 100 45 -100 0 1 12 N
+P 2 0 1 0 -100 0 -75 0 N
+P 2 0 1 20 -75 -50 -75 50 N
+P 2 0 1 20 75 -50 75 50 N
+P 2 0 1 0 100 0 75 0 N
+X 1 1 -150 0 50 R 50 50 1 1 P
+X 2 2 150 0 50 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
 # D_Schottky_Small
 #
 DEF D_Schottky_Small D 0 10 N N 1 F N
@@ -1006,6 +1046,33 @@ X VDDQ 49 300 1300 150 D 40 40 1 1 W
 ENDDRAW
 ENDDEF
 #
+# PCF8563
+#
+DEF PCF8563 U 0 40 Y Y 1 F N
+F0 "U" -300 350 50 H V L CNN
+F1 "PCF8563" 100 350 50 H V L CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+$FPLIST
+ DIP*
+ PDIP*
+ SOIC*
+ SO*
+ TSSOP*
+$ENDFPLIST
+DRAW
+S -300 300 300 -300 0 1 10 f
+X OSCI 1 -400 200 100 R 50 50 1 1 I
+X OSCO 2 -400 -200 100 R 50 50 1 1 O
+X ~INT~ 3 400 -200 100 L 50 50 1 1 O
+X VSS 4 0 -400 100 U 50 50 1 1 W
+X SDA 5 400 100 100 L 50 50 1 1 B
+X SCL 6 400 200 100 L 50 50 1 1 I
+X CLKO 7 400 -100 100 L 50 50 1 1 O C
+X VDD 8 0 400 100 D 50 50 1 1 W
+ENDDRAW
+ENDDEF
+#
 # R
 #
 DEF R R 0 0 N Y 1 F N
diff --git a/ulx3s.bak b/ulx3s.bak
index 4c321be..d9976ce 100644
--- a/ulx3s.bak
+++ b/ulx3s.bak
@@ -49,55 +49,21 @@ Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
-$Comp
-L ESP-12E U2
-U 1 1 56AC980A
-P 3200 4550
-F 0 "U2" H 3200 4450 50  0000 C CNN
-F 1 "ESP-12E" H 3200 4650 50  0000 C CNN
-F 2 "ESP8266:ESP-12E" H 3200 4550 50  0001 C CNN
-F 3 "" H 3200 4550 50  0001 C CNN
-	1    3200 4550
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	2300 4650 1900 4650
-Text Label 1950 4650 0    60   ~ 0
-TDO
-Wire Wire Line
-	2300 4550 1900 4550
-Text Label 1950 4550 0    60   ~ 0
-TDI
 Wire Wire Line
-	1900 4750 2300 4750
-Text Label 1950 4750 0    60   ~ 0
-TCK
+	2000 4650 1900 4650
 Wire Wire Line
-	1900 4850 2300 4850
-Text Label 1950 4850 0    60   ~ 0
-TMS
+	2000 4550 1900 4550
 Wire Wire Line
-	4100 4950 4200 4950
-$Comp
-L GND #PWR01
-U 1 1 56ACA1D2
-P 4200 4950
-F 0 "#PWR01" H 4200 4700 50  0001 C CNN
-F 1 "GND" H 4200 4800 50  0000 C CNN
-F 2 "" H 4200 4950 60  0000 C CNN
-F 3 "" H 4200 4950 60  0000 C CNN
-	1    4200 4950
-	0    -1   -1   0   
-$EndComp
+	1900 4850 2000 4850
 $Comp
 L SD_Card SD1
 U 1 1 56ACBF19
-P 2300 6600
-F 0 "SD1" H 1650 7150 50  0000 C CNN
-F 1 "SD_Card" H 2900 6050 50  0000 C CNN
-F 2 "micro-sd:MicroSD_TF02D" H 2500 6950 50  0000 C CNN
-F 3 "" H 2300 6600 60  0000 C CNN
-	1    2300 6600
+P 3300 6250
+F 0 "SD1" H 2650 6800 50  0000 C CNN
+F 1 "SD_Card" H 3900 5700 50  0000 C CNN
+F 2 "micro-sd:MicroSD_TF02D" H 3500 6600 50  0000 C CNN
+F 3 "" H 3300 6250 60  0000 C CNN
+	1    3300 6250
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -123,53 +89,17 @@ F 3 "" H 150 5650 60  0000 C CNN
 	-1   0    0    -1  
 $EndComp
 Wire Wire Line
-	2950 5450 2950 5700
-Text Label 2950 5650 1    60   ~ 0
-MTDO
-Wire Wire Line
-	3050 5450 3050 5700
-Wire Wire Line
-	3150 5450 3150 5700
-Wire Wire Line
-	3250 5450 3250 5700
-Wire Wire Line
-	3350 5450 3350 5700
-Wire Wire Line
-	3450 5450 3450 5700
-Text Label 3050 5650 1    60   ~ 0
-MTDI
-Text Label 3150 5650 1    60   ~ 0
-SD_3
-Text Label 3250 5650 1    60   ~ 0
-MTMS
-Text Label 3350 5650 1    60   ~ 0
-MTCK
-Text Label 3450 5650 1    60   ~ 0
-SD_2
-Wire Wire Line
-	1400 6200 1050 6200
-Text Label 1100 6200 0    60   ~ 0
-SD_2
+	2400 5850 2300 5850
 Wire Wire Line
-	1050 6300 1400 6300
-Text Label 1100 6300 0    60   ~ 0
-SD_3
+	2300 5950 2400 5950
 Wire Wire Line
-	1050 6400 1400 6400
-Text Label 1100 6400 0    60   ~ 0
-MTMS
+	2300 6050 2400 6050
 Wire Wire Line
-	1400 6700 1050 6700
-Text Label 1100 6700 0    60   ~ 0
-MTCK
+	2400 6350 2300 6350
 Wire Wire Line
-	1050 6900 1400 6900
-Text Label 1100 6900 0    60   ~ 0
-MTDO
+	2300 6550 2400 6550
 Wire Wire Line
-	1050 7000 1400 7000
-Text Label 1100 7000 0    60   ~ 0
-MTDI
+	2300 6650 2400 6650
 $Sheet
 S 7000 5250 750  450 
 U 56AC389C
@@ -183,89 +113,68 @@ F0 "power" 60
 F1 "power.sch" 60
 $EndSheet
 Wire Wire Line
-	2250 4950 2300 4950
-Wire Wire Line
-	4100 4250 4600 4250
-Text Label 4150 4250 0    60   ~ 0
-WIFI_TXD
-Wire Wire Line
-	4100 4350 4600 4350
-Text Label 4150 4350 0    60   ~ 0
-WIFI_RXD
-Wire Wire Line
-	1050 6500 1400 6500
+	1850 6150 2400 6150
 Wire Wire Line
-	900  6600 1400 6600
+	1700 6250 2400 6250
 Wire Wire Line
-	1050 6800 1400 6800
+	1850 6450 2400 6450
 $Comp
-L GND #PWR02
+L GND #PWR01
 U 1 1 58D58197
-P 1050 6500
-F 0 "#PWR02" H 1050 6250 50  0001 C CNN
-F 1 "GND" H 1050 6350 50  0000 C CNN
-F 2 "" H 1050 6500 50  0000 C CNN
-F 3 "" H 1050 6500 50  0000 C CNN
-	1    1050 6500
+P 1850 6150
+F 0 "#PWR01" H 1850 5900 50  0001 C CNN
+F 1 "GND" H 1850 6000 50  0000 C CNN
+F 2 "" H 1850 6150 50  0000 C CNN
+F 3 "" H 1850 6150 50  0000 C CNN
+	1    1850 6150
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR03
+L GND #PWR02
 U 1 1 58D581BF
-P 1050 6800
-F 0 "#PWR03" H 1050 6550 50  0001 C CNN
-F 1 "GND" H 1050 6650 50  0000 C CNN
-F 2 "" H 1050 6800 50  0000 C CNN
-F 3 "" H 1050 6800 50  0000 C CNN
-	1    1050 6800
+P 1850 6450
+F 0 "#PWR02" H 1850 6200 50  0001 C CNN
+F 1 "GND" H 1850 6300 50  0000 C CNN
+F 2 "" H 1850 6450 50  0000 C CNN
+F 3 "" H 1850 6450 50  0000 C CNN
+	1    1850 6450
 	0    1    1    0   
 $EndComp
 Wire Wire Line
-	3200 6400 3600 6400
-Text Label 3250 6400 0    60   ~ 0
+	4200 6050 4600 6050
+Text Label 4250 6050 0    60   ~ 0
 SD_CD
 Wire Wire Line
-	3200 6500 3600 6500
-Text Label 3250 6500 0    60   ~ 0
+	4200 6150 4600 6150
+Text Label 4250 6150 0    60   ~ 0
 SD_WP
 $Comp
-L GND #PWR04
+L GND #PWR03
 U 1 1 58D58733
-P 3300 6900
-F 0 "#PWR04" H 3300 6650 50  0001 C CNN
-F 1 "GND" H 3300 6750 50  0000 C CNN
-F 2 "" H 3300 6900 50  0000 C CNN
-F 3 "" H 3300 6900 50  0000 C CNN
-	1    3300 6900
+P 4300 6550
+F 0 "#PWR03" H 4300 6300 50  0001 C CNN
+F 1 "GND" H 4300 6400 50  0000 C CNN
+F 2 "" H 4300 6550 50  0000 C CNN
+F 3 "" H 4300 6550 50  0000 C CNN
+	1    4300 6550
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	3200 6700 3300 6700
+	4200 6350 4300 6350
 Wire Wire Line
-	3300 6700 3300 6900
+	4300 6350 4300 6550
 Wire Wire Line
-	3200 6800 3300 6800
-Connection ~ 3300 6800
-$Comp
-L +3V3 #PWR05
-U 1 1 58D5F08C
-P 2250 4950
-F 0 "#PWR05" H 2250 4800 50  0001 C CNN
-F 1 "+3V3" H 2250 5090 50  0000 C CNN
-F 2 "" H 2250 4950 50  0000 C CNN
-F 3 "" H 2250 4950 50  0000 C CNN
-	1    2250 4950
-	0    -1   -1   0   
-$EndComp
+	4200 6450 4300 6450
+Connection ~ 4300 6450
 $Comp
-L +3V3 #PWR06
+L +3V3 #PWR04
 U 1 1 58D5F123
-P 900 6600
-F 0 "#PWR06" H 900 6450 50  0001 C CNN
-F 1 "+3V3" H 900 6740 50  0000 C CNN
-F 2 "" H 900 6600 50  0000 C CNN
-F 3 "" H 900 6600 50  0000 C CNN
-	1    900  6600
+P 1700 6250
+F 0 "#PWR04" H 1700 6100 50  0001 C CNN
+F 1 "+3V3" H 1700 6390 50  0000 C CNN
+F 2 "" H 1700 6250 50  0000 C CNN
+F 3 "" H 1700 6250 50  0000 C CNN
+	1    1700 6250
 	0    -1   -1   0   
 $EndComp
 $Sheet
@@ -300,4 +209,30 @@ U 58D6D507
 F0 "ram" 60
 F1 "ram.sch" 60
 $EndSheet
+Text GLabel 2000 4550 2    60   Input ~ 0
+JTAG_TDI
+Text GLabel 2000 4650 2    60   Input ~ 0
+JTAG_TDO
+Text GLabel 2000 4750 2    60   Input ~ 0
+JTAG_TCK
+Text GLabel 2000 4850 2    60   Input ~ 0
+JTAG_TMS
+Wire Wire Line
+	1900 4750 2000 4750
+Text GLabel 2300 5850 0    60   Input ~ 0
+SD_2
+Text GLabel 2300 5950 0    60   Input ~ 0
+SD_3
+Text GLabel 2300 6050 0    60   Input ~ 0
+SD_MTMS
+Text GLabel 2300 6350 0    60   Input ~ 0
+SD_MTCK
+Text GLabel 2300 6550 0    60   Input ~ 0
+SD_MTDO
+Text GLabel 2300 6650 0    60   Input ~ 0
+SD_MTDI
+Text GLabel 4600 6050 2    60   Input ~ 0
+SD_CD
+Text GLabel 4600 6150 2    60   Input ~ 0
+SD_WP
 $EndSCHEMATC
diff --git a/ulx3s.kicad_pcb b/ulx3s.kicad_pcb
index ed95d10..357da1a 100644
--- a/ulx3s.kicad_pcb
+++ b/ulx3s.kicad_pcb
@@ -1,15 +1,15 @@
 (kicad_pcb (version 4) (host pcbnew 4.0.5+dfsg1-4)
 
   (general
-    (links 343)
-    (no_connects 343)
+    (links 349)
+    (no_connects 349)
     (area 93.949999 61.269999 178.070001 109.830001)
     (thickness 1.6)
     (drawings 20)
     (tracks 1)
     (zones 0)
-    (modules 57)
-    (nets 92)
+    (modules 60)
+    (nets 95)
   )
 
   (page A4)
@@ -95,96 +95,99 @@
 
   (net 0 "")
   (net 1 GND)
-  (net 2 /TDI)
-  (net 3 /TCK)
-  (net 4 /TMS)
-  (net 5 /TDO)
-  (net 6 +5V)
-  (net 7 /gpio/IN5V)
-  (net 8 /gpio/OUT5V)
-  (net 9 /gpio/P5)
-  (net 10 /gpio/P6)
-  (net 11 /gpio/P7)
-  (net 12 /gpio/P8)
-  (net 13 /gpio/P11)
-  (net 14 /gpio/P12)
-  (net 15 /gpio/P13)
-  (net 16 /gpio/P14)
-  (net 17 /gpio/P17)
-  (net 18 /gpio/P18)
-  (net 19 /gpio/P19)
-  (net 20 /gpio/P20)
-  (net 21 /gpio/P21)
-  (net 22 /gpio/P22)
-  (net 23 /gpio/P23)
-  (net 24 /gpio/P24)
-  (net 25 /gpio/P25)
-  (net 26 /gpio/P26)
-  (net 27 /gpio/P27)
-  (net 28 /gpio/P28)
-  (net 29 /gpio/P29)
-  (net 30 /gpio/P30)
-  (net 31 /SD_3)
-  (net 32 /MTMS)
-  (net 33 /MTCK)
-  (net 34 /MTDO)
-  (net 35 /MTDI)
-  (net 36 /gpio/P9)
-  (net 37 /gpio/P10)
-  (net 38 "Net-(US1-Pad6)")
-  (net 39 "Net-(US2-Pad6)")
-  (net 40 /gpio/P15)
-  (net 41 /gpio/P16)
-  (net 42 /gpio/P31)
-  (net 43 /gpio/P32)
-  (net 44 /gpio/P33)
-  (net 45 /gpio/P34)
-  (net 46 /gpio/P35)
-  (net 47 /gpio/P36)
-  (net 48 /gpio/P37)
-  (net 49 /gpio/P38)
-  (net 50 /gpio/P39)
-  (net 51 /gpio/P40)
-  (net 52 /gpio/P41)
-  (net 53 /gpio/P42)
-  (net 54 /gpio/P43)
-  (net 55 /gpio/P44)
-  (net 56 /gpio/P45)
-  (net 57 /gpio/P46)
-  (net 58 /gpio/P47)
-  (net 59 /gpio/P48)
-  (net 60 /gpio/P49)
-  (net 61 /gpio/P50)
-  (net 62 /gpio/P51)
-  (net 63 /gpio/P52)
-  (net 64 /gpio/P53)
-  (net 65 /gpio/P54)
-  (net 66 /gpio/P55)
-  (net 67 /gpio/P56)
-  (net 68 /gpio/P57)
-  (net 69 /gpio/P58)
-  (net 70 /gpio/P59)
-  (net 71 /gpio/P60)
-  (net 72 +3V3)
-  (net 73 "Net-(L1-Pad1)")
-  (net 74 "Net-(L2-Pad1)")
-  (net 75 +1V2)
-  (net 76 BTN_D)
-  (net 77 BTN_F1)
-  (net 78 BTN_F2)
-  (net 79 BTN_L)
-  (net 80 BTN_R)
-  (net 81 BTN_U)
-  (net 82 "Net-(BTN1-Pad1)")
-  (net 83 /power/FB1)
-  (net 84 +2V5)
-  (net 85 "Net-(L3-Pad1)")
-  (net 86 /power/PWREN)
-  (net 87 /power/FB3)
-  (net 88 /power/FB2)
-  (net 89 /usb/USB5V)
-  (net 90 "Net-(D9-Pad1)")
-  (net 91 "Net-(U6-Pad57)")
+  (net 2 +5V)
+  (net 3 /gpio/IN5V)
+  (net 4 /gpio/OUT5V)
+  (net 5 /gpio/P5)
+  (net 6 /gpio/P6)
+  (net 7 /gpio/P7)
+  (net 8 /gpio/P8)
+  (net 9 /gpio/P11)
+  (net 10 /gpio/P12)
+  (net 11 /gpio/P13)
+  (net 12 /gpio/P14)
+  (net 13 /gpio/P17)
+  (net 14 /gpio/P18)
+  (net 15 /gpio/P19)
+  (net 16 /gpio/P20)
+  (net 17 /gpio/P21)
+  (net 18 /gpio/P22)
+  (net 19 /gpio/P23)
+  (net 20 /gpio/P24)
+  (net 21 /gpio/P25)
+  (net 22 /gpio/P26)
+  (net 23 /gpio/P27)
+  (net 24 /gpio/P28)
+  (net 25 /gpio/P29)
+  (net 26 /gpio/P30)
+  (net 27 /gpio/P9)
+  (net 28 /gpio/P10)
+  (net 29 "Net-(US1-Pad6)")
+  (net 30 "Net-(US2-Pad6)")
+  (net 31 /gpio/P15)
+  (net 32 /gpio/P16)
+  (net 33 /gpio/P31)
+  (net 34 /gpio/P32)
+  (net 35 /gpio/P33)
+  (net 36 /gpio/P34)
+  (net 37 /gpio/P35)
+  (net 38 /gpio/P36)
+  (net 39 /gpio/P37)
+  (net 40 /gpio/P38)
+  (net 41 /gpio/P39)
+  (net 42 /gpio/P40)
+  (net 43 /gpio/P41)
+  (net 44 /gpio/P42)
+  (net 45 /gpio/P43)
+  (net 46 /gpio/P44)
+  (net 47 /gpio/P45)
+  (net 48 /gpio/P46)
+  (net 49 /gpio/P47)
+  (net 50 /gpio/P48)
+  (net 51 /gpio/P49)
+  (net 52 /gpio/P50)
+  (net 53 /gpio/P51)
+  (net 54 /gpio/P52)
+  (net 55 /gpio/P53)
+  (net 56 /gpio/P54)
+  (net 57 /gpio/P55)
+  (net 58 /gpio/P56)
+  (net 59 /gpio/P57)
+  (net 60 /gpio/P58)
+  (net 61 /gpio/P59)
+  (net 62 /gpio/P60)
+  (net 63 +3V3)
+  (net 64 "Net-(L1-Pad1)")
+  (net 65 "Net-(L2-Pad1)")
+  (net 66 +1V2)
+  (net 67 BTN_D)
+  (net 68 BTN_F1)
+  (net 69 BTN_F2)
+  (net 70 BTN_L)
+  (net 71 BTN_R)
+  (net 72 BTN_U)
+  (net 73 "Net-(BTN1-Pad1)")
+  (net 74 /power/FB1)
+  (net 75 +2V5)
+  (net 76 "Net-(L3-Pad1)")
+  (net 77 /power/PWREN)
+  (net 78 /power/FB3)
+  (net 79 /power/FB2)
+  (net 80 /usb/USB5V)
+  (net 81 "Net-(D9-Pad1)")
+  (net 82 "Net-(U6-Pad57)")
+  (net 83 /power/VBAT)
+  (net 84 "Net-(U7-Pad1)")
+  (net 85 "Net-(U7-Pad2)")
+  (net 86 SD_3)
+  (net 87 SD_MTMS)
+  (net 88 SD_MTCK)
+  (net 89 SD_MTDO)
+  (net 90 SD_MTDI)
+  (net 91 JTAG_TDI)
+  (net 92 JTAG_TCK)
+  (net 93 JTAG_TMS)
+  (net 94 JTAG_TDO)
 
   (net_class Default "This is the default net class."
     (clearance 0.2)
@@ -197,15 +200,6 @@
     (add_net +2V5)
     (add_net +3V3)
     (add_net +5V)
-    (add_net /MTCK)
-    (add_net /MTDI)
-    (add_net /MTDO)
-    (add_net /MTMS)
-    (add_net /SD_3)
-    (add_net /TCK)
-    (add_net /TDI)
-    (add_net /TDO)
-    (add_net /TMS)
     (add_net /gpio/IN5V)
     (add_net /gpio/OUT5V)
     (add_net /gpio/P10)
@@ -268,6 +262,7 @@
     (add_net /power/FB2)
     (add_net /power/FB3)
     (add_net /power/PWREN)
+    (add_net /power/VBAT)
     (add_net /usb/USB5V)
     (add_net BTN_D)
     (add_net BTN_F1)
@@ -275,14 +270,25 @@
     (add_net BTN_L)
     (add_net BTN_R)
     (add_net BTN_U)
+    (add_net JTAG_TCK)
+    (add_net JTAG_TDI)
+    (add_net JTAG_TDO)
+    (add_net JTAG_TMS)
     (add_net "Net-(BTN1-Pad1)")
     (add_net "Net-(D9-Pad1)")
     (add_net "Net-(L1-Pad1)")
     (add_net "Net-(L2-Pad1)")
     (add_net "Net-(L3-Pad1)")
     (add_net "Net-(U6-Pad57)")
+    (add_net "Net-(U7-Pad1)")
+    (add_net "Net-(U7-Pad2)")
     (add_net "Net-(US1-Pad6)")
     (add_net "Net-(US2-Pad6)")
+    (add_net SD_3)
+    (add_net SD_MTCK)
+    (add_net SD_MTDI)
+    (add_net SD_MTDO)
+    (add_net SD_MTMS)
   )
 
   (net_class BGA ""
@@ -315,7 +321,7 @@
     (fp_line (start 2.54 -1.143) (end 0.889 -1.143) (layer B.SilkS) (width 0.15))
     (fp_line (start -0.889 1.143) (end -2.54 1.143) (layer B.SilkS) (width 0.15))
     (pad 1 smd rect (at -1.651 0) (size 1.524 2.032) (layers B.Cu B.Paste B.Mask)
-      (net 8 /gpio/OUT5V))
+      (net 4 /gpio/OUT5V))
     (pad 2 smd rect (at 1.651 0) (size 1.524 2.032) (layers B.Cu B.Paste B.Mask))
     (model SMD_Packages.3dshapes/SMD-1206_Pol.wrl
       (at (xyz 0 0 0))
@@ -344,9 +350,9 @@
     (fp_line (start 2.54 -1.143) (end 0.889 -1.143) (layer B.SilkS) (width 0.15))
     (fp_line (start -0.889 1.143) (end -2.54 1.143) (layer B.SilkS) (width 0.15))
     (pad 1 smd rect (at -1.651 0 180) (size 1.524 2.032) (layers B.Cu B.Paste B.Mask)
-      (net 6 +5V))
+      (net 2 +5V))
     (pad 2 smd rect (at 1.651 0 180) (size 1.524 2.032) (layers B.Cu B.Paste B.Mask)
-      (net 7 /gpio/IN5V))
+      (net 3 /gpio/IN5V))
     (model SMD_Packages.3dshapes/SMD-1206_Pol.wrl
       (at (xyz 0 0 0))
       (scale (xyz 0.17 0.16 0.16))
@@ -371,21 +377,21 @@
     (fp_line (start -7 15.2) (end -7 0) (layer F.SilkS) (width 0.01016))
     (fp_line (start -7 0) (end 7 0) (layer F.SilkS) (width 0.01016))
     (pad 1 smd rect (at 1.94 11 90) (size 0.7 1.8) (layers F.Cu F.Paste F.Mask)
-      (net 31 /SD_3))
+      (net 86 SD_3))
     (pad 2 smd rect (at 0.84 11 90) (size 0.7 1.8) (layers F.Cu F.Paste F.Mask)
-      (net 32 /MTMS))
+      (net 87 SD_MTMS))
     (pad 3 smd rect (at -0.26 11 90) (size 0.7 1.8) (layers F.Cu F.Paste F.Mask)
       (net 1 GND))
     (pad 4 smd rect (at -1.36 11 90) (size 0.7 1.8) (layers F.Cu F.Paste F.Mask)
-      (net 72 +3V3))
+      (net 63 +3V3))
     (pad 5 smd rect (at -2.46 11 90) (size 0.7 1.8) (layers F.Cu F.Paste F.Mask)
-      (net 33 /MTCK))
+      (net 88 SD_MTCK))
     (pad 6 smd rect (at -3.56 11 90) (size 0.7 1.8) (layers F.Cu F.Paste F.Mask)
       (net 1 GND))
     (pad 7 smd rect (at -4.66 11 90) (size 0.7 1.8) (layers F.Cu F.Paste F.Mask)
-      (net 34 /MTDO))
+      (net 89 SD_MTDO))
     (pad 8 smd rect (at -5.76 11 90) (size 0.7 1.8) (layers F.Cu F.Paste F.Mask)
-      (net 35 /MTDI))
+      (net 90 SD_MTDI))
     (pad S smd rect (at -5.05 0.4 90) (size 1.6 1.4) (layers F.Cu F.Paste F.Mask))
     (pad S smd rect (at 0.75 0.4 90) (size 1.8 1.4) (layers F.Cu F.Paste F.Mask))
     (pad G smd rect (at -7.45 13.55 90) (size 1.4 1.9) (layers F.Cu F.Paste F.Mask))
@@ -421,7 +427,7 @@
     (pad 15 smd rect (at -1 6.475) (size 0.23 0.85) (layers B.Cu B.Paste B.Mask))
     (pad 17 smd rect (at -1.4 6.475) (size 0.23 0.85) (layers B.Cu B.Paste B.Mask))
     (pad 19 smd rect (at -1.8 6.475) (size 0.23 0.85) (layers B.Cu B.Paste B.Mask)
-      (net 6 +5V))
+      (net 2 +5V))
     (pad 2 smd rect (at 1.6 5.25) (size 0.23 1) (layers B.Cu B.Paste B.Mask))
     (pad 4 smd rect (at 1.2 5.25) (size 0.23 1) (layers B.Cu B.Paste B.Mask)
       (net 1 GND))
@@ -442,70 +448,6 @@
     (pad "" thru_hole oval (at 3.1 1.7) (size 1.5 2.55) (drill oval 0.65 1.7) (layers *.Cu *.Mask B.SilkS))
   )
 
-  (module ESP8266:ESP-12E (layer B.Cu) (tedit 559F8D21) (tstamp 56A95491)
-    (at 96.64 83.01 270)
-    (descr "Module, ESP-8266, ESP-12, 16 pad, SMD")
-    (tags "Module ESP-8266 ESP8266")
-    (path /56AC980A)
-    (fp_text reference U2 (at -2 2 270) (layer B.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_text value ESP-12E (at 8 -1 270) (layer B.Fab)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_line (start 16 8.4) (end 0 2.6) (layer B.CrtYd) (width 0.1524))
-    (fp_line (start 0 8.4) (end 16 2.6) (layer B.CrtYd) (width 0.1524))
-    (fp_text user "No Copper" (at 7.9 5.4 270) (layer B.CrtYd)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_line (start 0 8.4) (end 0 2.6) (layer B.CrtYd) (width 0.1524))
-    (fp_line (start 0 2.6) (end 16 2.6) (layer B.CrtYd) (width 0.1524))
-    (fp_line (start 16 2.6) (end 16 8.4) (layer B.CrtYd) (width 0.1524))
-    (fp_line (start 16 8.4) (end 0 8.4) (layer B.CrtYd) (width 0.1524))
-    (fp_line (start 16 8.4) (end 16 -15.6) (layer B.Fab) (width 0.1524))
-    (fp_line (start 16 -15.6) (end 0 -15.6) (layer B.Fab) (width 0.1524))
-    (fp_line (start 0 -15.6) (end 0 8.4) (layer B.Fab) (width 0.1524))
-    (fp_line (start 0 8.4) (end 16 8.4) (layer B.Fab) (width 0.1524))
-    (pad 9 smd oval (at 2.99 -15.75 180) (size 2.4 1.1) (layers B.Cu B.Paste B.Mask)
-      (net 34 /MTDO))
-    (pad 10 smd oval (at 4.99 -15.75 180) (size 2.4 1.1) (layers B.Cu B.Paste B.Mask)
-      (net 35 /MTDI))
-    (pad 11 smd oval (at 6.99 -15.75 180) (size 2.4 1.1) (layers B.Cu B.Paste B.Mask)
-      (net 31 /SD_3))
-    (pad 12 smd oval (at 8.99 -15.75 180) (size 2.4 1.1) (layers B.Cu B.Paste B.Mask)
-      (net 32 /MTMS))
-    (pad 13 smd oval (at 10.99 -15.75 180) (size 2.4 1.1) (layers B.Cu B.Paste B.Mask)
-      (net 33 /MTCK))
-    (pad 14 smd oval (at 12.99 -15.75 180) (size 2.4 1.1) (layers B.Cu B.Paste B.Mask))
-    (pad 1 smd rect (at 0 0 270) (size 2.4 1.1) (layers B.Cu B.Paste B.Mask))
-    (pad 2 smd oval (at 0 -2 270) (size 2.4 1.1) (layers B.Cu B.Paste B.Mask))
-    (pad 3 smd oval (at 0 -4 270) (size 2.4 1.1) (layers B.Cu B.Paste B.Mask))
-    (pad 4 smd oval (at 0 -6 270) (size 2.4 1.1) (layers B.Cu B.Paste B.Mask)
-      (net 2 /TDI))
-    (pad 5 smd oval (at 0 -8 270) (size 2.4 1.1) (layers B.Cu B.Paste B.Mask)
-      (net 5 /TDO))
-    (pad 6 smd oval (at 0 -10 270) (size 2.4 1.1) (layers B.Cu B.Paste B.Mask)
-      (net 3 /TCK))
-    (pad 7 smd oval (at 0 -12 270) (size 2.4 1.1) (layers B.Cu B.Paste B.Mask)
-      (net 4 /TMS))
-    (pad 8 smd oval (at 0 -14 270) (size 2.4 1.1) (layers B.Cu B.Paste B.Mask)
-      (net 72 +3V3))
-    (pad 15 smd oval (at 16 -14 270) (size 2.4 1.1) (layers B.Cu B.Paste B.Mask)
-      (net 1 GND))
-    (pad 16 smd oval (at 16 -12 270) (size 2.4 1.1) (layers B.Cu B.Paste B.Mask))
-    (pad 17 smd oval (at 16 -10 270) (size 2.4 1.1) (layers B.Cu B.Paste B.Mask))
-    (pad 18 smd oval (at 16 -8 270) (size 2.4 1.1) (layers B.Cu B.Paste B.Mask))
-    (pad 19 smd oval (at 16 -6 270) (size 2.4 1.1) (layers B.Cu B.Paste B.Mask))
-    (pad 20 smd oval (at 16 -4 270) (size 2.4 1.1) (layers B.Cu B.Paste B.Mask))
-    (pad 21 smd oval (at 16 -2 270) (size 2.4 1.1) (layers B.Cu B.Paste B.Mask))
-    (pad 22 smd oval (at 16 0 270) (size 2.4 1.1) (layers B.Cu B.Paste B.Mask))
-    (model ${ESPLIB}/ESP8266.3dshapes/ESP-12.wrl
-      (at (xyz 0.04 0 0))
-      (scale (xyz 0.3937 0.3937 0.3937))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
   (module usb_otg:USB_Micro-B (layer B.Cu) (tedit 5543E447) (tstamp 58D43115)
     (at 147.44 65.23)
     (descr "Micro USB Type B Receptacle")
@@ -528,20 +470,20 @@
     (fp_line (start 4.35 -2.8) (end -4.35 -2.8) (layer B.SilkS) (width 0.12))
     (fp_line (start -4.35 -4.03) (end -4.35 2.38) (layer B.SilkS) (width 0.12))
     (pad 1 smd rect (at -1.3 1.35 270) (size 1.35 0.4) (layers B.Cu B.Paste B.Mask)
-      (net 89 /usb/USB5V))
+      (net 80 /usb/USB5V))
     (pad 2 smd rect (at -0.65 1.35 270) (size 1.35 0.4) (layers B.Cu B.Paste B.Mask))
     (pad 3 smd rect (at 0 1.35 270) (size 1.35 0.4) (layers B.Cu B.Paste B.Mask))
     (pad 4 smd rect (at 0.65 1.35 270) (size 1.35 0.4) (layers B.Cu B.Paste B.Mask))
     (pad 5 smd rect (at 1.3 1.35 270) (size 1.35 0.4) (layers B.Cu B.Paste B.Mask)
       (net 1 GND))
     (pad 6 thru_hole oval (at -2.5 1.35 270) (size 0.95 1.25) (drill oval 0.55 0.85) (layers *.Cu *.Mask)
-      (net 38 "Net-(US1-Pad6)"))
+      (net 29 "Net-(US1-Pad6)"))
     (pad 6 thru_hole oval (at 2.5 1.35 270) (size 0.95 1.25) (drill oval 0.55 0.85) (layers *.Cu *.Mask)
-      (net 38 "Net-(US1-Pad6)"))
+      (net 29 "Net-(US1-Pad6)"))
     (pad 6 thru_hole oval (at -3.5 -1.35 270) (size 1.55 1) (drill oval 1.15 0.5) (layers *.Cu *.Mask)
-      (net 38 "Net-(US1-Pad6)"))
+      (net 29 "Net-(US1-Pad6)"))
     (pad 6 thru_hole oval (at 3.5 -1.35 270) (size 1.55 1) (drill oval 1.15 0.5) (layers *.Cu *.Mask)
-      (net 38 "Net-(US1-Pad6)"))
+      (net 29 "Net-(US1-Pad6)"))
   )
 
   (module usb_otg:USB_Micro-B (layer B.Cu) (tedit 5543E447) (tstamp 58D43122)
@@ -566,20 +508,20 @@
     (fp_line (start 4.35 -2.8) (end -4.35 -2.8) (layer B.SilkS) (width 0.12))
     (fp_line (start -4.35 -4.03) (end -4.35 2.38) (layer B.SilkS) (width 0.12))
     (pad 1 smd rect (at -1.3 1.35 270) (size 1.35 0.4) (layers B.Cu B.Paste B.Mask)
-      (net 90 "Net-(D9-Pad1)"))
+      (net 81 "Net-(D9-Pad1)"))
     (pad 2 smd rect (at -0.65 1.35 270) (size 1.35 0.4) (layers B.Cu B.Paste B.Mask))
     (pad 3 smd rect (at 0 1.35 270) (size 1.35 0.4) (layers B.Cu B.Paste B.Mask))
     (pad 4 smd rect (at 0.65 1.35 270) (size 1.35 0.4) (layers B.Cu B.Paste B.Mask))
     (pad 5 smd rect (at 1.3 1.35 270) (size 1.35 0.4) (layers B.Cu B.Paste B.Mask)
       (net 1 GND))
     (pad 6 thru_hole oval (at -2.5 1.35 270) (size 0.95 1.25) (drill oval 0.55 0.85) (layers *.Cu *.Mask)
-      (net 39 "Net-(US2-Pad6)"))
+      (net 30 "Net-(US2-Pad6)"))
     (pad 6 thru_hole oval (at 2.5 1.35 270) (size 0.95 1.25) (drill oval 0.55 0.85) (layers *.Cu *.Mask)
-      (net 39 "Net-(US2-Pad6)"))
+      (net 30 "Net-(US2-Pad6)"))
     (pad 6 thru_hole oval (at -3.5 -1.35 270) (size 1.55 1) (drill oval 1.15 0.5) (layers *.Cu *.Mask)
-      (net 39 "Net-(US2-Pad6)"))
+      (net 30 "Net-(US2-Pad6)"))
     (pad 6 thru_hole oval (at 3.5 -1.35 270) (size 1.55 1) (drill oval 1.15 0.5) (layers *.Cu *.Mask)
-      (net 39 "Net-(US2-Pad6)"))
+      (net 30 "Net-(US2-Pad6)"))
   )
 
   (module Socket_Strips:Socket_Strip_Angled_2x32 (layer F.Cu) (tedit 0) (tstamp 58D4E99D)
@@ -729,133 +671,133 @@
     (fp_line (start -1.27 12.64) (end 1.27 12.64) (layer F.SilkS) (width 0.15))
     (fp_line (start 1.27 12.64) (end 1.27 3.81) (layer F.SilkS) (width 0.15))
     (pad 1 thru_hole rect (at 0 0) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 7 /gpio/IN5V))
+      (net 3 /gpio/IN5V))
     (pad 2 thru_hole oval (at 0 2.54) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 8 /gpio/OUT5V))
+      (net 4 /gpio/OUT5V))
     (pad 3 thru_hole oval (at 2.54 0) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
       (net 1 GND))
     (pad 4 thru_hole oval (at 2.54 2.54) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
       (net 1 GND))
     (pad 5 thru_hole oval (at 5.08 0) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 9 /gpio/P5))
+      (net 5 /gpio/P5))
     (pad 6 thru_hole oval (at 5.08 2.54) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 10 /gpio/P6))
+      (net 6 /gpio/P6))
     (pad 7 thru_hole oval (at 7.62 0) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 11 /gpio/P7))
+      (net 7 /gpio/P7))
     (pad 8 thru_hole oval (at 7.62 2.54) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 12 /gpio/P8))
+      (net 8 /gpio/P8))
     (pad 9 thru_hole oval (at 10.16 0) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 36 /gpio/P9))
+      (net 27 /gpio/P9))
     (pad 10 thru_hole oval (at 10.16 2.54) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 37 /gpio/P10))
+      (net 28 /gpio/P10))
     (pad 11 thru_hole oval (at 12.7 0) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 13 /gpio/P11))
+      (net 9 /gpio/P11))
     (pad 12 thru_hole oval (at 12.7 2.54) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 14 /gpio/P12))
+      (net 10 /gpio/P12))
     (pad 13 thru_hole oval (at 15.24 0) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 15 /gpio/P13))
+      (net 11 /gpio/P13))
     (pad 14 thru_hole oval (at 15.24 2.54) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 16 /gpio/P14))
+      (net 12 /gpio/P14))
     (pad 15 thru_hole oval (at 17.78 0) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 40 /gpio/P15))
+      (net 31 /gpio/P15))
     (pad 16 thru_hole oval (at 17.78 2.54) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 41 /gpio/P16))
+      (net 32 /gpio/P16))
     (pad 17 thru_hole oval (at 20.32 0) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 17 /gpio/P17))
+      (net 13 /gpio/P17))
     (pad 18 thru_hole oval (at 20.32 2.54) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 18 /gpio/P18))
+      (net 14 /gpio/P18))
     (pad 19 thru_hole oval (at 22.86 0) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 19 /gpio/P19))
+      (net 15 /gpio/P19))
     (pad 20 thru_hole oval (at 22.86 2.54) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 20 /gpio/P20))
+      (net 16 /gpio/P20))
     (pad 21 thru_hole oval (at 25.4 0) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 21 /gpio/P21))
+      (net 17 /gpio/P21))
     (pad 22 thru_hole oval (at 25.4 2.54) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 22 /gpio/P22))
+      (net 18 /gpio/P22))
     (pad 23 thru_hole oval (at 27.94 0) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 23 /gpio/P23))
+      (net 19 /gpio/P23))
     (pad 24 thru_hole oval (at 27.94 2.54) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 24 /gpio/P24))
+      (net 20 /gpio/P24))
     (pad 25 thru_hole oval (at 30.48 0) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 25 /gpio/P25))
+      (net 21 /gpio/P25))
     (pad 26 thru_hole oval (at 30.48 2.54) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 26 /gpio/P26))
+      (net 22 /gpio/P26))
     (pad 27 thru_hole oval (at 33.02 0) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 27 /gpio/P27))
+      (net 23 /gpio/P27))
     (pad 28 thru_hole oval (at 33.02 2.54) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 28 /gpio/P28))
+      (net 24 /gpio/P28))
     (pad 29 thru_hole oval (at 35.56 0) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 29 /gpio/P29))
+      (net 25 /gpio/P29))
     (pad 30 thru_hole oval (at 35.56 2.54) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 30 /gpio/P30))
+      (net 26 /gpio/P30))
     (pad 31 thru_hole oval (at 38.1 0) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 42 /gpio/P31))
+      (net 33 /gpio/P31))
     (pad 32 thru_hole oval (at 38.1 2.54) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 43 /gpio/P32))
+      (net 34 /gpio/P32))
     (pad 33 thru_hole oval (at 40.64 0) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 44 /gpio/P33))
+      (net 35 /gpio/P33))
     (pad 34 thru_hole oval (at 40.64 2.54) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 45 /gpio/P34))
+      (net 36 /gpio/P34))
     (pad 35 thru_hole oval (at 43.18 0) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 46 /gpio/P35))
+      (net 37 /gpio/P35))
     (pad 36 thru_hole oval (at 43.18 2.54) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 47 /gpio/P36))
+      (net 38 /gpio/P36))
     (pad 37 thru_hole oval (at 45.72 0) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 48 /gpio/P37))
+      (net 39 /gpio/P37))
     (pad 38 thru_hole oval (at 45.72 2.54) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 49 /gpio/P38))
+      (net 40 /gpio/P38))
     (pad 39 thru_hole oval (at 48.26 0) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 50 /gpio/P39))
+      (net 41 /gpio/P39))
     (pad 40 thru_hole oval (at 48.26 2.54) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 51 /gpio/P40))
+      (net 42 /gpio/P40))
     (pad 41 thru_hole oval (at 50.8 0) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 52 /gpio/P41))
+      (net 43 /gpio/P41))
     (pad 42 thru_hole oval (at 50.8 2.54) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 53 /gpio/P42))
+      (net 44 /gpio/P42))
     (pad 43 thru_hole oval (at 53.34 0) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 54 /gpio/P43))
+      (net 45 /gpio/P43))
     (pad 44 thru_hole oval (at 53.34 2.54) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 55 /gpio/P44))
+      (net 46 /gpio/P44))
     (pad 45 thru_hole oval (at 55.88 0) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 56 /gpio/P45))
+      (net 47 /gpio/P45))
     (pad 46 thru_hole oval (at 55.88 2.54) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 57 /gpio/P46))
+      (net 48 /gpio/P46))
     (pad 47 thru_hole oval (at 58.42 0) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 58 /gpio/P47))
+      (net 49 /gpio/P47))
     (pad 48 thru_hole oval (at 58.42 2.54) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 59 /gpio/P48))
+      (net 50 /gpio/P48))
     (pad 49 thru_hole oval (at 60.96 0) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 60 /gpio/P49))
+      (net 51 /gpio/P49))
     (pad 50 thru_hole oval (at 60.96 2.54) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 61 /gpio/P50))
+      (net 52 /gpio/P50))
     (pad 51 thru_hole oval (at 63.5 0) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 62 /gpio/P51))
+      (net 53 /gpio/P51))
     (pad 52 thru_hole oval (at 63.5 2.54) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 63 /gpio/P52))
+      (net 54 /gpio/P52))
     (pad 53 thru_hole oval (at 66.04 0) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 64 /gpio/P53))
+      (net 55 /gpio/P53))
     (pad 54 thru_hole oval (at 66.04 2.54) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 65 /gpio/P54))
+      (net 56 /gpio/P54))
     (pad 55 thru_hole oval (at 68.58 0) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 66 /gpio/P55))
+      (net 57 /gpio/P55))
     (pad 56 thru_hole oval (at 68.58 2.54) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 67 /gpio/P56))
+      (net 58 /gpio/P56))
     (pad 57 thru_hole oval (at 71.12 0) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 68 /gpio/P57))
+      (net 59 /gpio/P57))
     (pad 58 thru_hole oval (at 71.12 2.54) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 69 /gpio/P58))
+      (net 60 /gpio/P58))
     (pad 59 thru_hole oval (at 73.66 0) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 70 /gpio/P59))
+      (net 61 /gpio/P59))
     (pad 60 thru_hole oval (at 73.66 2.54) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 71 /gpio/P60))
+      (net 62 /gpio/P60))
     (pad 61 thru_hole oval (at 76.2 0) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
       (net 1 GND))
     (pad 62 thru_hole oval (at 76.2 2.54) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
       (net 1 GND))
     (pad 63 thru_hole oval (at 78.74 0) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 72 +3V3))
+      (net 63 +3V3))
     (pad 64 thru_hole oval (at 78.74 2.54) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 72 +3V3))
+      (net 63 +3V3))
     (model Socket_Strips.3dshapes/Socket_Strip_Angled_2x32.wrl
       (at (xyz 1.55 -0.05 0))
       (scale (xyz 1 1 1))
@@ -942,9 +884,9 @@
     (fp_line (start -1.27 12.64) (end 1.27 12.64) (layer F.SilkS) (width 0.15))
     (fp_line (start 1.27 12.64) (end 1.27 3.81) (layer F.SilkS) (width 0.15))
     (pad 1 thru_hole rect (at 0 0 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 72 +3V3))
+      (net 63 +3V3))
     (pad 2 thru_hole oval (at 0 2.54 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 72 +3V3))
+      (net 63 +3V3))
     (pad 3 thru_hole oval (at 2.54 0 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
       (net 1 GND))
     (pad 4 thru_hole oval (at 2.54 2.54 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
@@ -964,9 +906,9 @@
     (pad 17 thru_hole oval (at 20.32 0 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask))
     (pad 18 thru_hole oval (at 20.32 2.54 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask))
     (pad 19 thru_hole oval (at 22.86 0 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 72 +3V3))
+      (net 63 +3V3))
     (pad 20 thru_hole oval (at 22.86 2.54 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 72 +3V3))
+      (net 63 +3V3))
     (pad 21 thru_hole oval (at 25.4 0 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
       (net 1 GND))
     (pad 22 thru_hole oval (at 25.4 2.54 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
@@ -1029,9 +971,9 @@
     (fp_line (start -1.27 12.64) (end 1.27 12.64) (layer F.SilkS) (width 0.15))
     (fp_line (start 1.27 12.64) (end 1.27 3.81) (layer F.SilkS) (width 0.15))
     (pad 1 thru_hole rect (at 0 0 270) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 72 +3V3))
+      (net 63 +3V3))
     (pad 2 thru_hole oval (at 0 2.54 270) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 72 +3V3))
+      (net 63 +3V3))
     (pad 3 thru_hole oval (at 2.54 0 270) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
       (net 1 GND))
     (pad 4 thru_hole oval (at 2.54 2.54 270) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
@@ -1071,95 +1013,95 @@
     (pad A4 smd circle (at -5.2 -7.6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask))
     (pad A5 smd circle (at -4.4 -7.6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask))
     (pad A6 smd circle (at -3.6 -7.6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 28 /gpio/P28))
+      (net 24 /gpio/P28))
     (pad A7 smd circle (at -2.8 -7.6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 41 /gpio/P16))
+      (net 32 /gpio/P16))
     (pad A8 smd circle (at -2 -7.6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 40 /gpio/P15))
+      (net 31 /gpio/P15))
     (pad A9 smd circle (at -1.2 -7.6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 37 /gpio/P10))
+      (net 28 /gpio/P10))
     (pad A10 smd circle (at -0.4 -7.6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 11 /gpio/P7))
+      (net 7 /gpio/P7))
     (pad A11 smd circle (at 0.4 -7.6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 12 /gpio/P8))
+      (net 8 /gpio/P8))
     (pad A12 smd circle (at 1.2 -7.6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 65 /gpio/P54))
+      (net 56 /gpio/P54))
     (pad A13 smd circle (at 2 -7.6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 64 /gpio/P53))
+      (net 55 /gpio/P53))
     (pad A14 smd circle (at 2.8 -7.6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 59 /gpio/P48))
+      (net 50 /gpio/P48))
     (pad A15 smd circle (at 3.6 -7.6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask))
     (pad A16 smd circle (at 4.4 -7.6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 51 /gpio/P40))
+      (net 42 /gpio/P40))
     (pad A17 smd circle (at 5.2 -7.6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 45 /gpio/P34))
+      (net 36 /gpio/P34))
     (pad A18 smd circle (at 6 -7.6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 43 /gpio/P32))
+      (net 34 /gpio/P32))
     (pad A19 smd circle (at 6.8 -7.6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 30 /gpio/P30))
+      (net 26 /gpio/P30))
     (pad B1 smd circle (at -7.6 -6.8) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask))
     (pad B2 smd circle (at -6.8 -6.8) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask))
     (pad B3 smd circle (at -6 -6.8) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask))
     (pad B4 smd circle (at -5.2 -6.8) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask))
     (pad B5 smd circle (at -4.4 -6.8) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask))
     (pad B6 smd circle (at -3.6 -6.8) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 27 /gpio/P27))
+      (net 23 /gpio/P27))
     (pad B7 smd circle (at -2.8 -6.8) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
       (net 1 GND))
     (pad B8 smd circle (at -2 -6.8) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 17 /gpio/P17))
+      (net 13 /gpio/P17))
     (pad B9 smd circle (at -1.2 -6.8) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 14 /gpio/P12))
+      (net 10 /gpio/P12))
     (pad B10 smd circle (at -0.4 -6.8) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 36 /gpio/P9))
+      (net 27 /gpio/P9))
     (pad B11 smd circle (at 0.4 -6.8) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 9 /gpio/P5))
+      (net 5 /gpio/P5))
     (pad B12 smd circle (at 1.2 -6.8) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 69 /gpio/P58))
+      (net 60 /gpio/P58))
     (pad B13 smd circle (at 2 -6.8) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 63 /gpio/P52))
+      (net 54 /gpio/P52))
     (pad B14 smd circle (at 2.8 -6.8) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
       (net 1 GND))
     (pad B15 smd circle (at 3.6 -6.8) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 55 /gpio/P44))
+      (net 46 /gpio/P44))
     (pad B16 smd circle (at 4.4 -6.8) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 50 /gpio/P39))
+      (net 41 /gpio/P39))
     (pad B17 smd circle (at 5.2 -6.8) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 47 /gpio/P36))
+      (net 38 /gpio/P36))
     (pad B18 smd circle (at 6 -6.8) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 44 /gpio/P33))
+      (net 35 /gpio/P33))
     (pad B19 smd circle (at 6.8 -6.8) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 42 /gpio/P31))
+      (net 33 /gpio/P31))
     (pad B20 smd circle (at 7.6 -6.8) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 29 /gpio/P29))
+      (net 25 /gpio/P29))
     (pad C1 smd circle (at -7.6 -6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask))
     (pad C2 smd circle (at -6.8 -6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask))
     (pad C3 smd circle (at -6 -6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask))
     (pad C4 smd circle (at -5.2 -6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask))
     (pad C5 smd circle (at -4.4 -6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask))
     (pad C6 smd circle (at -3.6 -6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 22 /gpio/P22))
+      (net 18 /gpio/P22))
     (pad C7 smd circle (at -2.8 -6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 21 /gpio/P21))
+      (net 17 /gpio/P21))
     (pad C8 smd circle (at -2 -6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 18 /gpio/P18))
+      (net 14 /gpio/P18))
     (pad C9 smd circle (at -1.2 -6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask))
     (pad C10 smd circle (at -0.4 -6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 13 /gpio/P11))
+      (net 9 /gpio/P11))
     (pad C11 smd circle (at 0.4 -6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 10 /gpio/P6))
+      (net 6 /gpio/P6))
     (pad C12 smd circle (at 1.2 -6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 68 /gpio/P57))
+      (net 59 /gpio/P57))
     (pad C13 smd circle (at 2 -6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 62 /gpio/P51))
+      (net 53 /gpio/P51))
     (pad C14 smd circle (at 2.8 -6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 58 /gpio/P47))
+      (net 49 /gpio/P47))
     (pad C15 smd circle (at 3.6 -6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 54 /gpio/P43))
+      (net 45 /gpio/P43))
     (pad C16 smd circle (at 4.4 -6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 49 /gpio/P38))
+      (net 40 /gpio/P38))
     (pad C17 smd circle (at 5.2 -6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 46 /gpio/P35))
+      (net 37 /gpio/P35))
     (pad C18 smd circle (at 6 -6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask))
     (pad C19 smd circle (at 6.8 -6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
       (net 1 GND))
@@ -1171,26 +1113,26 @@
       (net 1 GND))
     (pad D5 smd circle (at -4.4 -5.2) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask))
     (pad D6 smd circle (at -3.6 -5.2) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 25 /gpio/P25))
+      (net 21 /gpio/P25))
     (pad D7 smd circle (at -2.8 -5.2) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 23 /gpio/P23))
+      (net 19 /gpio/P23))
     (pad D8 smd circle (at -2 -5.2) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 19 /gpio/P19))
+      (net 15 /gpio/P19))
     (pad D9 smd circle (at -1.2 -5.2) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 16 /gpio/P14))
+      (net 12 /gpio/P14))
     (pad D10 smd circle (at -0.4 -5.2) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask))
     (pad D11 smd circle (at 0.4 -5.2) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 71 /gpio/P60))
+      (net 62 /gpio/P60))
     (pad D12 smd circle (at 1.2 -5.2) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 67 /gpio/P56))
+      (net 58 /gpio/P56))
     (pad D13 smd circle (at 2 -5.2) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 61 /gpio/P50))
+      (net 52 /gpio/P50))
     (pad D14 smd circle (at 2.8 -5.2) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 57 /gpio/P46))
+      (net 48 /gpio/P46))
     (pad D15 smd circle (at 3.6 -5.2) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 53 /gpio/P42))
+      (net 44 /gpio/P42))
     (pad D16 smd circle (at 4.4 -5.2) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 48 /gpio/P37))
+      (net 39 /gpio/P37))
     (pad D17 smd circle (at 5.2 -5.2) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask))
     (pad D18 smd circle (at 6 -5.2) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask))
     (pad D19 smd circle (at 6.8 -5.2) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask))
@@ -1201,24 +1143,24 @@
     (pad E4 smd circle (at -5.2 -4.4) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask))
     (pad E5 smd circle (at -4.4 -4.4) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask))
     (pad E6 smd circle (at -3.6 -4.4) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 26 /gpio/P26))
+      (net 22 /gpio/P26))
     (pad E7 smd circle (at -2.8 -4.4) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 24 /gpio/P24))
+      (net 20 /gpio/P24))
     (pad E8 smd circle (at -2 -4.4) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 20 /gpio/P20))
+      (net 16 /gpio/P20))
     (pad E9 smd circle (at -1.2 -4.4) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 15 /gpio/P13))
+      (net 11 /gpio/P13))
     (pad E10 smd circle (at -0.4 -4.4) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask))
     (pad E11 smd circle (at 0.4 -4.4) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 70 /gpio/P59))
+      (net 61 /gpio/P59))
     (pad E12 smd circle (at 1.2 -4.4) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 66 /gpio/P55))
+      (net 57 /gpio/P55))
     (pad E13 smd circle (at 2 -4.4) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 60 /gpio/P49))
+      (net 51 /gpio/P49))
     (pad E14 smd circle (at 2.8 -4.4) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 56 /gpio/P45))
+      (net 47 /gpio/P45))
     (pad E15 smd circle (at 3.6 -4.4) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 52 /gpio/P41))
+      (net 43 /gpio/P41))
     (pad E16 smd circle (at 4.4 -4.4) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask))
     (pad E17 smd circle (at 5.2 -4.4) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask))
     (pad E18 smd circle (at 6 -4.4) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask))
@@ -1230,25 +1172,25 @@
     (pad F4 smd circle (at -5.2 -3.6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask))
     (pad F5 smd circle (at -4.4 -3.6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask))
     (pad F6 smd circle (at -3.6 -3.6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 84 +2V5))
+      (net 75 +2V5))
     (pad F7 smd circle (at -2.8 -3.6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
       (net 1 GND))
     (pad F8 smd circle (at -2 -3.6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
       (net 1 GND))
     (pad F9 smd circle (at -1.2 -3.6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 72 +3V3))
+      (net 63 +3V3))
     (pad F10 smd circle (at -0.4 -3.6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 72 +3V3))
+      (net 63 +3V3))
     (pad F11 smd circle (at 0.4 -3.6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 72 +3V3))
+      (net 63 +3V3))
     (pad F12 smd circle (at 1.2 -3.6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 72 +3V3))
+      (net 63 +3V3))
     (pad F13 smd circle (at 2 -3.6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
       (net 1 GND))
     (pad F14 smd circle (at 2.8 -3.6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
       (net 1 GND))
     (pad F15 smd circle (at 3.6 -3.6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 84 +2V5))
+      (net 75 +2V5))
     (pad F16 smd circle (at 4.4 -3.6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask))
     (pad F17 smd circle (at 5.2 -3.6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask))
     (pad F18 smd circle (at 6 -3.6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask))
@@ -1292,25 +1234,25 @@
     (pad H4 smd circle (at -5.2 -2) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask))
     (pad H5 smd circle (at -4.4 -2) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask))
     (pad H6 smd circle (at -3.6 -2) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 72 +3V3))
+      (net 63 +3V3))
     (pad H7 smd circle (at -2.8 -2) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 72 +3V3))
+      (net 63 +3V3))
     (pad H8 smd circle (at -2 -2) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 75 +1V2))
+      (net 66 +1V2))
     (pad H9 smd circle (at -1.2 -2) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 75 +1V2))
+      (net 66 +1V2))
     (pad H10 smd circle (at -0.4 -2) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 75 +1V2))
+      (net 66 +1V2))
     (pad H11 smd circle (at 0.4 -2) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 75 +1V2))
+      (net 66 +1V2))
     (pad H12 smd circle (at 1.2 -2) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 75 +1V2))
+      (net 66 +1V2))
     (pad H13 smd circle (at 2 -2) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 75 +1V2))
+      (net 66 +1V2))
     (pad H14 smd circle (at 2.8 -2) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 72 +3V3))
+      (net 63 +3V3))
     (pad H15 smd circle (at 3.6 -2) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 72 +3V3))
+      (net 63 +3V3))
     (pad H16 smd circle (at 4.4 -2) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask))
     (pad H17 smd circle (at 5.2 -2) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask))
     (pad H18 smd circle (at 6 -2) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask))
@@ -1324,11 +1266,11 @@
     (pad J4 smd circle (at -5.2 -1.2) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask))
     (pad J5 smd circle (at -4.4 -1.2) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask))
     (pad J6 smd circle (at -3.6 -1.2) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 72 +3V3))
+      (net 63 +3V3))
     (pad J7 smd circle (at -2.8 -1.2) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
       (net 1 GND))
     (pad J8 smd circle (at -2 -1.2) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 75 +1V2))
+      (net 66 +1V2))
     (pad J9 smd circle (at -1.2 -1.2) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
       (net 1 GND))
     (pad J10 smd circle (at -0.4 -1.2) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
@@ -1338,11 +1280,11 @@
     (pad J12 smd circle (at 1.2 -1.2) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
       (net 1 GND))
     (pad J13 smd circle (at 2 -1.2) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 75 +1V2))
+      (net 66 +1V2))
     (pad J14 smd circle (at 2.8 -1.2) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
       (net 1 GND))
     (pad J15 smd circle (at 3.6 -1.2) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 72 +3V3))
+      (net 63 +3V3))
     (pad J16 smd circle (at 4.4 -1.2) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask))
     (pad J17 smd circle (at 5.2 -1.2) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask))
     (pad J18 smd circle (at 6 -1.2) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask))
@@ -1358,7 +1300,7 @@
     (pad K7 smd circle (at -2.8 -0.4) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
       (net 1 GND))
     (pad K8 smd circle (at -2 -0.4) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 75 +1V2))
+      (net 66 +1V2))
     (pad K9 smd circle (at -1.2 -0.4) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
       (net 1 GND))
     (pad K10 smd circle (at -0.4 -0.4) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
@@ -1368,7 +1310,7 @@
     (pad K12 smd circle (at 1.2 -0.4) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
       (net 1 GND))
     (pad K13 smd circle (at 2 -0.4) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 75 +1V2))
+      (net 66 +1V2))
     (pad K14 smd circle (at 2.8 -0.4) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
       (net 1 GND))
     (pad K15 smd circle (at 3.6 -0.4) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
@@ -1384,11 +1326,11 @@
     (pad L4 smd circle (at -5.2 0.4) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask))
     (pad L5 smd circle (at -4.4 0.4) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask))
     (pad L6 smd circle (at -3.6 0.4) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 72 +3V3))
+      (net 63 +3V3))
     (pad L7 smd circle (at -2.8 0.4) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 72 +3V3))
+      (net 63 +3V3))
     (pad L8 smd circle (at -2 0.4) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 75 +1V2))
+      (net 66 +1V2))
     (pad L9 smd circle (at -1.2 0.4) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
       (net 1 GND))
     (pad L10 smd circle (at -0.4 0.4) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
@@ -1398,11 +1340,11 @@
     (pad L12 smd circle (at 1.2 0.4) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
       (net 1 GND))
     (pad L13 smd circle (at 2 0.4) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 75 +1V2))
+      (net 66 +1V2))
     (pad L14 smd circle (at 2.8 0.4) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 72 +3V3))
+      (net 63 +3V3))
     (pad L15 smd circle (at 3.6 0.4) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 72 +3V3))
+      (net 63 +3V3))
     (pad L16 smd circle (at 4.4 0.4) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask))
     (pad L17 smd circle (at 5.2 0.4) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask))
     (pad L18 smd circle (at 6 0.4) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask))
@@ -1415,11 +1357,11 @@
     (pad M4 smd circle (at -5.2 1.2) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask))
     (pad M5 smd circle (at -4.4 1.2) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask))
     (pad M6 smd circle (at -3.6 1.2) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 72 +3V3))
+      (net 63 +3V3))
     (pad M7 smd circle (at -2.8 1.2) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
       (net 1 GND))
     (pad M8 smd circle (at -2 1.2) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 75 +1V2))
+      (net 66 +1V2))
     (pad M9 smd circle (at -1.2 1.2) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
       (net 1 GND))
     (pad M10 smd circle (at -0.4 1.2) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
@@ -1429,11 +1371,11 @@
     (pad M12 smd circle (at 1.2 1.2) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
       (net 1 GND))
     (pad M13 smd circle (at 2 1.2) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 75 +1V2))
+      (net 66 +1V2))
     (pad M14 smd circle (at 2.8 1.2) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
       (net 1 GND))
     (pad M15 smd circle (at 3.6 1.2) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 72 +3V3))
+      (net 63 +3V3))
     (pad M16 smd circle (at 4.4 1.2) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
       (net 1 GND))
     (pad M17 smd circle (at 5.2 1.2) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask))
@@ -1450,17 +1392,17 @@
     (pad N7 smd circle (at -2.8 2) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
       (net 1 GND))
     (pad N8 smd circle (at -2 2) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 75 +1V2))
+      (net 66 +1V2))
     (pad N9 smd circle (at -1.2 2) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 75 +1V2))
+      (net 66 +1V2))
     (pad N10 smd circle (at -0.4 2) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 75 +1V2))
+      (net 66 +1V2))
     (pad N11 smd circle (at 0.4 2) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 75 +1V2))
+      (net 66 +1V2))
     (pad N12 smd circle (at 1.2 2) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 75 +1V2))
+      (net 66 +1V2))
     (pad N13 smd circle (at 2 2) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 75 +1V2))
+      (net 66 +1V2))
     (pad N14 smd circle (at 2.8 2) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
       (net 1 GND))
     (pad N15 smd circle (at 3.6 2) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
@@ -1476,15 +1418,15 @@
     (pad P4 smd circle (at -5.2 2.8) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask))
     (pad P5 smd circle (at -4.4 2.8) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask))
     (pad P6 smd circle (at -3.6 2.8) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 84 +2V5))
+      (net 75 +2V5))
     (pad P7 smd circle (at -2.8 2.8) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
       (net 1 GND))
     (pad P8 smd circle (at -2 2.8) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
       (net 1 GND))
     (pad P9 smd circle (at -1.2 2.8) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 72 +3V3))
+      (net 63 +3V3))
     (pad P10 smd circle (at -0.4 2.8) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 72 +3V3))
+      (net 63 +3V3))
     (pad P11 smd circle (at 0.4 2.8) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
       (net 1 GND))
     (pad P12 smd circle (at 1.2 2.8) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
@@ -1494,7 +1436,7 @@
     (pad P14 smd circle (at 2.8 2.8) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
       (net 1 GND))
     (pad P15 smd circle (at 3.6 2.8) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 84 +2V5))
+      (net 75 +2V5))
     (pad P16 smd circle (at 4.4 2.8) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask))
     (pad P17 smd circle (at 5.2 2.8) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask))
     (pad P18 smd circle (at 6 2.8) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask))
@@ -1505,7 +1447,7 @@
     (pad R3 smd circle (at -6 3.6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask))
     (pad R4 smd circle (at -5.2 3.6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask))
     (pad R5 smd circle (at -4.4 3.6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 2 /TDI))
+      (net 91 JTAG_TDI))
     (pad R16 smd circle (at 4.4 3.6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask))
     (pad R17 smd circle (at 5.2 3.6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask))
     (pad R18 smd circle (at 6 3.6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask))
@@ -1517,7 +1459,7 @@
     (pad T3 smd circle (at -6 4.4) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask))
     (pad T4 smd circle (at -5.2 4.4) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask))
     (pad T5 smd circle (at -4.4 4.4) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 3 /TCK))
+      (net 92 JTAG_TCK))
     (pad T6 smd circle (at -3.6 4.4) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
       (net 1 GND))
     (pad T7 smd circle (at -2.8 4.4) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
@@ -1543,7 +1485,7 @@
     (pad U3 smd circle (at -6 5.2) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask))
     (pad U4 smd circle (at -5.2 5.2) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask))
     (pad U5 smd circle (at -4.4 5.2) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 4 /TMS))
+      (net 93 JTAG_TMS))
     (pad U6 smd circle (at -3.6 5.2) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
       (net 1 GND))
     (pad U7 smd circle (at -2.8 5.2) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
@@ -1572,7 +1514,7 @@
     (pad V2 smd circle (at -6.8 6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask))
     (pad V3 smd circle (at -6 6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask))
     (pad V4 smd circle (at -5.2 6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 5 /TDO))
+      (net 94 JTAG_TDO))
     (pad V5 smd circle (at -4.4 6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
       (net 1 GND))
     (pad V6 smd circle (at -3.6 6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
@@ -1742,9 +1684,9 @@
     (fp_line (start 0.5 0.85) (end -0.5 0.85) (layer B.SilkS) (width 0.15))
     (fp_line (start -0.5 -0.85) (end 0.5 -0.85) (layer B.SilkS) (width 0.15))
     (pad 1 smd rect (at -1.25 0 90) (size 1.5 1.25) (layers B.Cu B.Paste B.Mask)
-      (net 75 +1V2))
+      (net 66 +1V2))
     (pad 2 smd rect (at 1.25 0 90) (size 1.5 1.25) (layers B.Cu B.Paste B.Mask)
-      (net 83 /power/FB1))
+      (net 74 /power/FB1))
     (model Capacitors_SMD.3dshapes/C_0805_HandSoldering.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1775,9 +1717,9 @@
     (fp_line (start 1 -1.475) (end -1 -1.475) (layer B.SilkS) (width 0.15))
     (fp_line (start -1 1.475) (end 1 1.475) (layer B.SilkS) (width 0.15))
     (pad 1 smd rect (at -2 0 270) (size 2 2.5) (layers B.Cu B.Paste B.Mask)
-      (net 73 "Net-(L1-Pad1)"))
+      (net 64 "Net-(L1-Pad1)"))
     (pad 2 smd rect (at 2 0 270) (size 2 2.5) (layers B.Cu B.Paste B.Mask)
-      (net 75 +1V2))
+      (net 66 +1V2))
     (model Resistors_SMD.3dshapes/R_1210_HandSoldering.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1808,9 +1750,9 @@
     (fp_line (start 0.6 -0.875) (end -0.6 -0.875) (layer B.SilkS) (width 0.15))
     (fp_line (start -0.6 0.875) (end 0.6 0.875) (layer B.SilkS) (width 0.15))
     (pad 1 smd rect (at -1.35 0 90) (size 1.5 1.3) (layers B.Cu B.Paste B.Mask)
-      (net 75 +1V2))
+      (net 66 +1V2))
     (pad 2 smd rect (at 1.35 0 90) (size 1.5 1.3) (layers B.Cu B.Paste B.Mask)
-      (net 83 /power/FB1))
+      (net 74 /power/FB1))
     (model Resistors_SMD.3dshapes/R_0805_HandSoldering.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1843,7 +1785,7 @@
     (pad 1 smd rect (at -1.35 0) (size 1.5 1.3) (layers B.Cu B.Paste B.Mask)
       (net 1 GND))
     (pad 2 smd rect (at 1.35 0) (size 1.5 1.3) (layers B.Cu B.Paste B.Mask)
-      (net 83 /power/FB1))
+      (net 74 /power/FB1))
     (model Resistors_SMD.3dshapes/R_0805_HandSoldering.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1866,15 +1808,15 @@
     (fp_line (start 1.5 -0.9) (end -1.5 -0.9) (layer B.SilkS) (width 0.15))
     (fp_line (start -1.5 -0.9) (end -1.5 0.9) (layer B.SilkS) (width 0.15))
     (pad 1 smd rect (at -0.95 -1.3 90) (size 0.7 1.2) (layers B.Cu B.Paste B.Mask)
-      (net 86 /power/PWREN))
+      (net 77 /power/PWREN))
     (pad 2 smd rect (at 0 -1.3 90) (size 0.7 1.2) (layers B.Cu B.Paste B.Mask)
       (net 1 GND))
     (pad 3 smd rect (at 0.95 -1.3 90) (size 0.7 1.2) (layers B.Cu B.Paste B.Mask)
-      (net 73 "Net-(L1-Pad1)"))
+      (net 64 "Net-(L1-Pad1)"))
     (pad 4 smd rect (at 0.95 1.3 90) (size 0.7 1.2) (layers B.Cu B.Paste B.Mask)
-      (net 6 +5V))
+      (net 2 +5V))
     (pad 5 smd rect (at -0.95 1.3 90) (size 0.7 1.2) (layers B.Cu B.Paste B.Mask)
-      (net 83 /power/FB1))
+      (net 74 /power/FB1))
   )
 
   (module Capacitors_SMD:C_0805_HandSoldering (layer B.Cu) (tedit 541A9B8D) (tstamp 58D599A0)
@@ -1900,9 +1842,9 @@
     (fp_line (start 0.5 0.85) (end -0.5 0.85) (layer B.SilkS) (width 0.15))
     (fp_line (start -0.5 -0.85) (end 0.5 -0.85) (layer B.SilkS) (width 0.15))
     (pad 1 smd rect (at -1.25 0) (size 1.5 1.25) (layers B.Cu B.Paste B.Mask)
-      (net 72 +3V3))
+      (net 63 +3V3))
     (pad 2 smd rect (at 1.25 0) (size 1.5 1.25) (layers B.Cu B.Paste B.Mask)
-      (net 87 /power/FB3))
+      (net 78 /power/FB3))
     (model Capacitors_SMD.3dshapes/C_0805_HandSoldering.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1933,9 +1875,9 @@
     (fp_line (start 1 -1.475) (end -1 -1.475) (layer B.SilkS) (width 0.15))
     (fp_line (start -1 1.475) (end 1 1.475) (layer B.SilkS) (width 0.15))
     (pad 1 smd rect (at -2 0 180) (size 2 2.5) (layers B.Cu B.Paste B.Mask)
-      (net 74 "Net-(L2-Pad1)"))
+      (net 65 "Net-(L2-Pad1)"))
     (pad 2 smd rect (at 2 0 180) (size 2 2.5) (layers B.Cu B.Paste B.Mask)
-      (net 72 +3V3))
+      (net 63 +3V3))
     (model Resistors_SMD.3dshapes/R_1210_HandSoldering.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1966,9 +1908,9 @@
     (fp_line (start 0.6 -0.875) (end -0.6 -0.875) (layer B.SilkS) (width 0.15))
     (fp_line (start -0.6 0.875) (end 0.6 0.875) (layer B.SilkS) (width 0.15))
     (pad 1 smd rect (at -1.35 0) (size 1.5 1.3) (layers B.Cu B.Paste B.Mask)
-      (net 72 +3V3))
+      (net 63 +3V3))
     (pad 2 smd rect (at 1.35 0) (size 1.5 1.3) (layers B.Cu B.Paste B.Mask)
-      (net 87 /power/FB3))
+      (net 78 /power/FB3))
     (model Resistors_SMD.3dshapes/R_0805_HandSoldering.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2001,7 +1943,7 @@
     (pad 1 smd rect (at -1.35 0 270) (size 1.5 1.3) (layers B.Cu B.Paste B.Mask)
       (net 1 GND))
     (pad 2 smd rect (at 1.35 0 270) (size 1.5 1.3) (layers B.Cu B.Paste B.Mask)
-      (net 87 /power/FB3))
+      (net 78 /power/FB3))
     (model Resistors_SMD.3dshapes/R_0805_HandSoldering.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2024,15 +1966,15 @@
     (fp_line (start 1.5 -0.9) (end -1.5 -0.9) (layer B.SilkS) (width 0.15))
     (fp_line (start -1.5 -0.9) (end -1.5 0.9) (layer B.SilkS) (width 0.15))
     (pad 1 smd rect (at -0.95 -1.3) (size 0.7 1.2) (layers B.Cu B.Paste B.Mask)
-      (net 86 /power/PWREN))
+      (net 77 /power/PWREN))
     (pad 2 smd rect (at 0 -1.3) (size 0.7 1.2) (layers B.Cu B.Paste B.Mask)
       (net 1 GND))
     (pad 3 smd rect (at 0.95 -1.3) (size 0.7 1.2) (layers B.Cu B.Paste B.Mask)
-      (net 74 "Net-(L2-Pad1)"))
+      (net 65 "Net-(L2-Pad1)"))
     (pad 4 smd rect (at 0.95 1.3) (size 0.7 1.2) (layers B.Cu B.Paste B.Mask)
-      (net 6 +5V))
+      (net 2 +5V))
     (pad 5 smd rect (at -0.95 1.3) (size 0.7 1.2) (layers B.Cu B.Paste B.Mask)
-      (net 87 /power/FB3))
+      (net 78 /power/FB3))
   )
 
   (module TSOP54:TSOP54 (layer F.Cu) (tedit 55BAC4E8) (tstamp 58D65464)
@@ -2149,13 +2091,13 @@
     (fp_line (start 2.7 -1) (end 2.7 1) (layer F.SilkS) (width 0.15))
     (fp_line (start 1.45 -2.7) (end 1.9 -2.25) (layer F.SilkS) (width 0.15))
     (pad 1 smd rect (at -3.1 -1.85) (size 1.8 1.1) (layers F.Cu F.Paste F.Mask)
-      (net 82 "Net-(BTN1-Pad1)"))
+      (net 73 "Net-(BTN1-Pad1)"))
     (pad 1 smd rect (at 3.1 -1.85) (size 1.8 1.1) (layers F.Cu F.Paste F.Mask)
-      (net 82 "Net-(BTN1-Pad1)"))
+      (net 73 "Net-(BTN1-Pad1)"))
     (pad 2 smd rect (at -3.1 1.85) (size 1.8 1.1) (layers F.Cu F.Paste F.Mask)
-      (net 77 BTN_F1))
+      (net 68 BTN_F1))
     (pad 2 smd rect (at 3.1 1.85) (size 1.8 1.1) (layers F.Cu F.Paste F.Mask)
-      (net 77 BTN_F1))
+      (net 68 BTN_F1))
   )
 
   (module Buttons_Switches_SMD:SW_SPST_SKQG (layer F.Cu) (tedit 56EC5E16) (tstamp 58D65996)
@@ -2192,13 +2134,13 @@
     (fp_line (start 2.7 -1) (end 2.7 1) (layer F.SilkS) (width 0.15))
     (fp_line (start 1.45 -2.7) (end 1.9 -2.25) (layer F.SilkS) (width 0.15))
     (pad 1 smd rect (at -3.1 -1.85) (size 1.8 1.1) (layers F.Cu F.Paste F.Mask)
-      (net 82 "Net-(BTN1-Pad1)"))
+      (net 73 "Net-(BTN1-Pad1)"))
     (pad 1 smd rect (at 3.1 -1.85) (size 1.8 1.1) (layers F.Cu F.Paste F.Mask)
-      (net 82 "Net-(BTN1-Pad1)"))
+      (net 73 "Net-(BTN1-Pad1)"))
     (pad 2 smd rect (at -3.1 1.85) (size 1.8 1.1) (layers F.Cu F.Paste F.Mask)
-      (net 78 BTN_F2))
+      (net 69 BTN_F2))
     (pad 2 smd rect (at 3.1 1.85) (size 1.8 1.1) (layers F.Cu F.Paste F.Mask)
-      (net 78 BTN_F2))
+      (net 69 BTN_F2))
   )
 
   (module Buttons_Switches_SMD:SW_SPST_SKQG (layer F.Cu) (tedit 56EC5E16) (tstamp 58D6599E)
@@ -2235,13 +2177,13 @@
     (fp_line (start 2.7 -1) (end 2.7 1) (layer F.SilkS) (width 0.15))
     (fp_line (start 1.45 -2.7) (end 1.9 -2.25) (layer F.SilkS) (width 0.15))
     (pad 1 smd rect (at -3.1 -1.85) (size 1.8 1.1) (layers F.Cu F.Paste F.Mask)
-      (net 82 "Net-(BTN1-Pad1)"))
+      (net 73 "Net-(BTN1-Pad1)"))
     (pad 1 smd rect (at 3.1 -1.85) (size 1.8 1.1) (layers F.Cu F.Paste F.Mask)
-      (net 82 "Net-(BTN1-Pad1)"))
+      (net 73 "Net-(BTN1-Pad1)"))
     (pad 2 smd rect (at -3.1 1.85) (size 1.8 1.1) (layers F.Cu F.Paste F.Mask)
-      (net 81 BTN_U))
+      (net 72 BTN_U))
     (pad 2 smd rect (at 3.1 1.85) (size 1.8 1.1) (layers F.Cu F.Paste F.Mask)
-      (net 81 BTN_U))
+      (net 72 BTN_U))
   )
 
   (module Buttons_Switches_SMD:SW_SPST_SKQG (layer F.Cu) (tedit 56EC5E16) (tstamp 58D659A6)
@@ -2278,13 +2220,13 @@
     (fp_line (start 2.7 -1) (end 2.7 1) (layer F.SilkS) (width 0.15))
     (fp_line (start 1.45 -2.7) (end 1.9 -2.25) (layer F.SilkS) (width 0.15))
     (pad 1 smd rect (at -3.1 -1.85) (size 1.8 1.1) (layers F.Cu F.Paste F.Mask)
-      (net 82 "Net-(BTN1-Pad1)"))
+      (net 73 "Net-(BTN1-Pad1)"))
     (pad 1 smd rect (at 3.1 -1.85) (size 1.8 1.1) (layers F.Cu F.Paste F.Mask)
-      (net 82 "Net-(BTN1-Pad1)"))
+      (net 73 "Net-(BTN1-Pad1)"))
     (pad 2 smd rect (at -3.1 1.85) (size 1.8 1.1) (layers F.Cu F.Paste F.Mask)
-      (net 76 BTN_D))
+      (net 67 BTN_D))
     (pad 2 smd rect (at 3.1 1.85) (size 1.8 1.1) (layers F.Cu F.Paste F.Mask)
-      (net 76 BTN_D))
+      (net 67 BTN_D))
   )
 
   (module Buttons_Switches_SMD:SW_SPST_SKQG (layer F.Cu) (tedit 56EC5E16) (tstamp 58D659AE)
@@ -2321,13 +2263,13 @@
     (fp_line (start 2.7 -1) (end 2.7 1) (layer F.SilkS) (width 0.15))
     (fp_line (start 1.45 -2.7) (end 1.9 -2.25) (layer F.SilkS) (width 0.15))
     (pad 1 smd rect (at -3.1 -1.85) (size 1.8 1.1) (layers F.Cu F.Paste F.Mask)
-      (net 82 "Net-(BTN1-Pad1)"))
+      (net 73 "Net-(BTN1-Pad1)"))
     (pad 1 smd rect (at 3.1 -1.85) (size 1.8 1.1) (layers F.Cu F.Paste F.Mask)
-      (net 82 "Net-(BTN1-Pad1)"))
+      (net 73 "Net-(BTN1-Pad1)"))
     (pad 2 smd rect (at -3.1 1.85) (size 1.8 1.1) (layers F.Cu F.Paste F.Mask)
-      (net 79 BTN_L))
+      (net 70 BTN_L))
     (pad 2 smd rect (at 3.1 1.85) (size 1.8 1.1) (layers F.Cu F.Paste F.Mask)
-      (net 79 BTN_L))
+      (net 70 BTN_L))
   )
 
   (module Buttons_Switches_SMD:SW_SPST_SKQG (layer F.Cu) (tedit 56EC5E16) (tstamp 58D659B6)
@@ -2364,13 +2306,13 @@
     (fp_line (start 2.7 -1) (end 2.7 1) (layer F.SilkS) (width 0.15))
     (fp_line (start 1.45 -2.7) (end 1.9 -2.25) (layer F.SilkS) (width 0.15))
     (pad 1 smd rect (at -3.1 -1.85) (size 1.8 1.1) (layers F.Cu F.Paste F.Mask)
-      (net 82 "Net-(BTN1-Pad1)"))
+      (net 73 "Net-(BTN1-Pad1)"))
     (pad 1 smd rect (at 3.1 -1.85) (size 1.8 1.1) (layers F.Cu F.Paste F.Mask)
-      (net 82 "Net-(BTN1-Pad1)"))
+      (net 73 "Net-(BTN1-Pad1)"))
     (pad 2 smd rect (at -3.1 1.85) (size 1.8 1.1) (layers F.Cu F.Paste F.Mask)
-      (net 80 BTN_R))
+      (net 71 BTN_R))
     (pad 2 smd rect (at 3.1 1.85) (size 1.8 1.1) (layers F.Cu F.Paste F.Mask)
-      (net 80 BTN_R))
+      (net 71 BTN_R))
   )
 
   (module LEDs:LED_0805 (layer F.Cu) (tedit 55BDE1C2) (tstamp 58D659BC)
@@ -2742,7 +2684,7 @@
     (pad 1 thru_hole rect (at 0 0 270) (size 1.7272 2.032) (drill 1.016) (layers *.Cu *.Mask)
       (net 1 GND))
     (pad 2 thru_hole oval (at 2.54 0 270) (size 1.7272 2.032) (drill 1.016) (layers *.Cu *.Mask)
-      (net 72 +3V3))
+      (net 63 +3V3))
     (pad 3 thru_hole oval (at 5.08 0 270) (size 1.7272 2.032) (drill 1.016) (layers *.Cu *.Mask))
     (pad 4 thru_hole oval (at 7.62 0 270) (size 1.7272 2.032) (drill 1.016) (layers *.Cu *.Mask))
     (pad 5 thru_hole oval (at 10.16 0 270) (size 1.7272 2.032) (drill 1.016) (layers *.Cu *.Mask))
@@ -2778,9 +2720,9 @@
     (fp_line (start 0.6 -0.875) (end -0.6 -0.875) (layer B.SilkS) (width 0.15))
     (fp_line (start -0.6 0.875) (end 0.6 0.875) (layer B.SilkS) (width 0.15))
     (pad 1 smd rect (at -1.35 0 180) (size 1.5 1.3) (layers B.Cu B.Paste B.Mask)
-      (net 72 +3V3))
+      (net 63 +3V3))
     (pad 2 smd rect (at 1.35 0 180) (size 1.5 1.3) (layers B.Cu B.Paste B.Mask)
-      (net 82 "Net-(BTN1-Pad1)"))
+      (net 73 "Net-(BTN1-Pad1)"))
     (model Resistors_SMD.3dshapes/R_0805_HandSoldering.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2811,9 +2753,9 @@
     (fp_line (start 0.5 0.85) (end -0.5 0.85) (layer B.SilkS) (width 0.15))
     (fp_line (start -0.5 -0.85) (end 0.5 -0.85) (layer B.SilkS) (width 0.15))
     (pad 1 smd rect (at -1.25 0 180) (size 1.5 1.25) (layers B.Cu B.Paste B.Mask)
-      (net 84 +2V5))
+      (net 75 +2V5))
     (pad 2 smd rect (at 1.25 0 180) (size 1.5 1.25) (layers B.Cu B.Paste B.Mask)
-      (net 88 /power/FB2))
+      (net 79 /power/FB2))
     (model Capacitors_SMD.3dshapes/C_0805_HandSoldering.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2844,9 +2786,9 @@
     (fp_line (start 1 -1.475) (end -1 -1.475) (layer B.SilkS) (width 0.15))
     (fp_line (start -1 1.475) (end 1 1.475) (layer B.SilkS) (width 0.15))
     (pad 1 smd rect (at -2 0) (size 2 2.5) (layers B.Cu B.Paste B.Mask)
-      (net 85 "Net-(L3-Pad1)"))
+      (net 76 "Net-(L3-Pad1)"))
     (pad 2 smd rect (at 2 0) (size 2 2.5) (layers B.Cu B.Paste B.Mask)
-      (net 84 +2V5))
+      (net 75 +2V5))
     (model Resistors_SMD.3dshapes/R_1210_HandSoldering.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2877,9 +2819,9 @@
     (fp_line (start 0.6 -0.875) (end -0.6 -0.875) (layer B.SilkS) (width 0.15))
     (fp_line (start -0.6 0.875) (end 0.6 0.875) (layer B.SilkS) (width 0.15))
     (pad 1 smd rect (at -1.35 0 270) (size 1.5 1.3) (layers B.Cu B.Paste B.Mask)
-      (net 6 +5V))
+      (net 2 +5V))
     (pad 2 smd rect (at 1.35 0 270) (size 1.5 1.3) (layers B.Cu B.Paste B.Mask)
-      (net 86 /power/PWREN))
+      (net 77 /power/PWREN))
     (model Resistors_SMD.3dshapes/R_0805_HandSoldering.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2910,9 +2852,9 @@
     (fp_line (start 0.6 -0.875) (end -0.6 -0.875) (layer B.SilkS) (width 0.15))
     (fp_line (start -0.6 0.875) (end 0.6 0.875) (layer B.SilkS) (width 0.15))
     (pad 1 smd rect (at -1.35 0 180) (size 1.5 1.3) (layers B.Cu B.Paste B.Mask)
-      (net 84 +2V5))
+      (net 75 +2V5))
     (pad 2 smd rect (at 1.35 0 180) (size 1.5 1.3) (layers B.Cu B.Paste B.Mask)
-      (net 88 /power/FB2))
+      (net 79 /power/FB2))
     (model Resistors_SMD.3dshapes/R_0805_HandSoldering.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2945,7 +2887,7 @@
     (pad 1 smd rect (at -1.35 0 90) (size 1.5 1.3) (layers B.Cu B.Paste B.Mask)
       (net 1 GND))
     (pad 2 smd rect (at 1.35 0 90) (size 1.5 1.3) (layers B.Cu B.Paste B.Mask)
-      (net 88 /power/FB2))
+      (net 79 /power/FB2))
     (model Resistors_SMD.3dshapes/R_0805_HandSoldering.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2968,15 +2910,15 @@
     (fp_line (start 1.5 -0.9) (end -1.5 -0.9) (layer B.SilkS) (width 0.15))
     (fp_line (start -1.5 -0.9) (end -1.5 0.9) (layer B.SilkS) (width 0.15))
     (pad 1 smd rect (at -0.95 -1.3 180) (size 0.7 1.2) (layers B.Cu B.Paste B.Mask)
-      (net 86 /power/PWREN))
+      (net 77 /power/PWREN))
     (pad 2 smd rect (at 0 -1.3 180) (size 0.7 1.2) (layers B.Cu B.Paste B.Mask)
       (net 1 GND))
     (pad 3 smd rect (at 0.95 -1.3 180) (size 0.7 1.2) (layers B.Cu B.Paste B.Mask)
-      (net 85 "Net-(L3-Pad1)"))
+      (net 76 "Net-(L3-Pad1)"))
     (pad 4 smd rect (at 0.95 1.3 180) (size 0.7 1.2) (layers B.Cu B.Paste B.Mask)
-      (net 6 +5V))
+      (net 2 +5V))
     (pad 5 smd rect (at -0.95 1.3 180) (size 0.7 1.2) (layers B.Cu B.Paste B.Mask)
-      (net 88 /power/FB2))
+      (net 79 /power/FB2))
   )
 
   (module Capacitors_SMD:C_0805_HandSoldering (layer B.Cu) (tedit 541A9B8D) (tstamp 58D68B19)
@@ -3002,7 +2944,7 @@
     (fp_line (start 0.5 0.85) (end -0.5 0.85) (layer B.SilkS) (width 0.15))
     (fp_line (start -0.5 -0.85) (end 0.5 -0.85) (layer B.SilkS) (width 0.15))
     (pad 1 smd rect (at -1.25 0 270) (size 1.5 1.25) (layers B.Cu B.Paste B.Mask)
-      (net 6 +5V))
+      (net 2 +5V))
     (pad 2 smd rect (at 1.25 0 270) (size 1.5 1.25) (layers B.Cu B.Paste B.Mask)
       (net 1 GND))
     (model Capacitors_SMD.3dshapes/C_0805_HandSoldering.wrl
@@ -3035,7 +2977,7 @@
     (fp_line (start 0.5 0.85) (end -0.5 0.85) (layer B.SilkS) (width 0.15))
     (fp_line (start -0.5 -0.85) (end 0.5 -0.85) (layer B.SilkS) (width 0.15))
     (pad 1 smd rect (at -1.25 0 90) (size 1.5 1.25) (layers B.Cu B.Paste B.Mask)
-      (net 75 +1V2))
+      (net 66 +1V2))
     (pad 2 smd rect (at 1.25 0 90) (size 1.5 1.25) (layers B.Cu B.Paste B.Mask)
       (net 1 GND))
     (model Capacitors_SMD.3dshapes/C_0805_HandSoldering.wrl
@@ -3068,7 +3010,7 @@
     (fp_line (start 0.5 0.85) (end -0.5 0.85) (layer B.SilkS) (width 0.15))
     (fp_line (start -0.5 -0.85) (end 0.5 -0.85) (layer B.SilkS) (width 0.15))
     (pad 1 smd rect (at -1.25 0 90) (size 1.5 1.25) (layers B.Cu B.Paste B.Mask)
-      (net 75 +1V2))
+      (net 66 +1V2))
     (pad 2 smd rect (at 1.25 0 90) (size 1.5 1.25) (layers B.Cu B.Paste B.Mask)
       (net 1 GND))
     (model Capacitors_SMD.3dshapes/C_0805_HandSoldering.wrl
@@ -3101,7 +3043,7 @@
     (fp_line (start 0.5 0.85) (end -0.5 0.85) (layer B.SilkS) (width 0.15))
     (fp_line (start -0.5 -0.85) (end 0.5 -0.85) (layer B.SilkS) (width 0.15))
     (pad 1 smd rect (at -1.25 0 180) (size 1.5 1.25) (layers B.Cu B.Paste B.Mask)
-      (net 6 +5V))
+      (net 2 +5V))
     (pad 2 smd rect (at 1.25 0 180) (size 1.5 1.25) (layers B.Cu B.Paste B.Mask)
       (net 1 GND))
     (model Capacitors_SMD.3dshapes/C_0805_HandSoldering.wrl
@@ -3134,7 +3076,7 @@
     (fp_line (start 0.5 0.85) (end -0.5 0.85) (layer B.SilkS) (width 0.15))
     (fp_line (start -0.5 -0.85) (end 0.5 -0.85) (layer B.SilkS) (width 0.15))
     (pad 1 smd rect (at -1.25 0) (size 1.5 1.25) (layers B.Cu B.Paste B.Mask)
-      (net 72 +3V3))
+      (net 63 +3V3))
     (pad 2 smd rect (at 1.25 0) (size 1.5 1.25) (layers B.Cu B.Paste B.Mask)
       (net 1 GND))
     (model Capacitors_SMD.3dshapes/C_0805_HandSoldering.wrl
@@ -3167,7 +3109,7 @@
     (fp_line (start 0.5 0.85) (end -0.5 0.85) (layer B.SilkS) (width 0.15))
     (fp_line (start -0.5 -0.85) (end 0.5 -0.85) (layer B.SilkS) (width 0.15))
     (pad 1 smd rect (at -1.25 0) (size 1.5 1.25) (layers B.Cu B.Paste B.Mask)
-      (net 72 +3V3))
+      (net 63 +3V3))
     (pad 2 smd rect (at 1.25 0) (size 1.5 1.25) (layers B.Cu B.Paste B.Mask)
       (net 1 GND))
     (model Capacitors_SMD.3dshapes/C_0805_HandSoldering.wrl
@@ -3200,7 +3142,7 @@
     (fp_line (start 0.5 0.85) (end -0.5 0.85) (layer B.SilkS) (width 0.15))
     (fp_line (start -0.5 -0.85) (end 0.5 -0.85) (layer B.SilkS) (width 0.15))
     (pad 1 smd rect (at -1.25 0 90) (size 1.5 1.25) (layers B.Cu B.Paste B.Mask)
-      (net 6 +5V))
+      (net 2 +5V))
     (pad 2 smd rect (at 1.25 0 90) (size 1.5 1.25) (layers B.Cu B.Paste B.Mask)
       (net 1 GND))
     (model Capacitors_SMD.3dshapes/C_0805_HandSoldering.wrl
@@ -3233,7 +3175,7 @@
     (fp_line (start 0.5 0.85) (end -0.5 0.85) (layer B.SilkS) (width 0.15))
     (fp_line (start -0.5 -0.85) (end 0.5 -0.85) (layer B.SilkS) (width 0.15))
     (pad 1 smd rect (at -1.25 0 180) (size 1.5 1.25) (layers B.Cu B.Paste B.Mask)
-      (net 84 +2V5))
+      (net 75 +2V5))
     (pad 2 smd rect (at 1.25 0 180) (size 1.5 1.25) (layers B.Cu B.Paste B.Mask)
       (net 1 GND))
     (model Capacitors_SMD.3dshapes/C_0805_HandSoldering.wrl
@@ -3266,7 +3208,7 @@
     (fp_line (start 0.5 0.85) (end -0.5 0.85) (layer B.SilkS) (width 0.15))
     (fp_line (start -0.5 -0.85) (end 0.5 -0.85) (layer B.SilkS) (width 0.15))
     (pad 1 smd rect (at -1.25 0 180) (size 1.5 1.25) (layers B.Cu B.Paste B.Mask)
-      (net 84 +2V5))
+      (net 75 +2V5))
     (pad 2 smd rect (at 1.25 0 180) (size 1.5 1.25) (layers B.Cu B.Paste B.Mask)
       (net 1 GND))
     (model Capacitors_SMD.3dshapes/C_0805_HandSoldering.wrl
@@ -3296,9 +3238,9 @@
     (fp_line (start 2.54 -1.143) (end 0.889 -1.143) (layer B.SilkS) (width 0.15))
     (fp_line (start -0.889 1.143) (end -2.54 1.143) (layer B.SilkS) (width 0.15))
     (pad 1 smd rect (at -1.651 0) (size 1.524 2.032) (layers B.Cu B.Paste B.Mask)
-      (net 6 +5V))
+      (net 2 +5V))
     (pad 2 smd rect (at 1.651 0) (size 1.524 2.032) (layers B.Cu B.Paste B.Mask)
-      (net 89 /usb/USB5V))
+      (net 80 /usb/USB5V))
     (model SMD_Packages.3dshapes/SMD-1206_Pol.wrl
       (at (xyz 0 0 0))
       (scale (xyz 0.17 0.16 0.16))
@@ -3326,9 +3268,9 @@
     (fp_line (start 2.54 -1.143) (end 0.889 -1.143) (layer B.SilkS) (width 0.15))
     (fp_line (start -0.889 1.143) (end -2.54 1.143) (layer B.SilkS) (width 0.15))
     (pad 1 smd rect (at -1.651 0 180) (size 1.524 2.032) (layers B.Cu B.Paste B.Mask)
-      (net 90 "Net-(D9-Pad1)"))
+      (net 81 "Net-(D9-Pad1)"))
     (pad 2 smd rect (at 1.651 0 180) (size 1.524 2.032) (layers B.Cu B.Paste B.Mask)
-      (net 6 +5V))
+      (net 2 +5V))
     (model SMD_Packages.3dshapes/SMD-1206_Pol.wrl
       (at (xyz 0 0 0))
       (scale (xyz 0.17 0.16 0.16))
@@ -3387,7 +3329,7 @@
     (pad 23 smd rect (at 0.6 -3.5 270) (size 0.8 0.2) (layers B.Cu B.Paste B.Mask))
     (pad 24 smd rect (at 1 -3.5 270) (size 0.8 0.2) (layers B.Cu B.Paste B.Mask))
     (pad 57 smd rect (at -2.1 2.1) (size 1.4 1.4) (layers B.Cu B.Paste B.Mask)
-      (net 91 "Net-(U6-Pad57)") (solder_paste_margin_ratio -0.2))
+      (net 82 "Net-(U6-Pad57)") (solder_paste_margin_ratio -0.2))
     (pad 13 smd rect (at -3.5 -2.2) (size 0.8 0.2) (layers B.Cu B.Paste B.Mask))
     (pad 14 smd rect (at -3.5 -2.6) (size 0.8 0.2) (layers B.Cu B.Paste B.Mask))
     (pad 25 smd rect (at 1.4 -3.5 270) (size 0.8 0.2) (layers B.Cu B.Paste B.Mask))
@@ -3423,35 +3365,181 @@
     (pad 43 smd rect (at 2.6 3.5 270) (size 0.8 0.2) (layers B.Cu B.Paste B.Mask))
     (pad 48 smd rect (at 0.6 3.5 270) (size 0.8 0.2) (layers B.Cu B.Paste B.Mask))
     (pad 57 smd rect (at -0.7 2.1) (size 1.4 1.4) (layers B.Cu B.Paste B.Mask)
-      (net 91 "Net-(U6-Pad57)") (solder_paste_margin_ratio -0.2))
+      (net 82 "Net-(U6-Pad57)") (solder_paste_margin_ratio -0.2))
     (pad 57 smd rect (at 0.7 2.1) (size 1.4 1.4) (layers B.Cu B.Paste B.Mask)
-      (net 91 "Net-(U6-Pad57)") (solder_paste_margin_ratio -0.2))
+      (net 82 "Net-(U6-Pad57)") (solder_paste_margin_ratio -0.2))
     (pad 57 smd rect (at 2.1 2.1) (size 1.4 1.4) (layers B.Cu B.Paste B.Mask)
-      (net 91 "Net-(U6-Pad57)") (solder_paste_margin_ratio -0.2))
+      (net 82 "Net-(U6-Pad57)") (solder_paste_margin_ratio -0.2))
     (pad 57 smd rect (at 2.1 0.7) (size 1.4 1.4) (layers B.Cu B.Paste B.Mask)
-      (net 91 "Net-(U6-Pad57)") (solder_paste_margin_ratio -0.2))
+      (net 82 "Net-(U6-Pad57)") (solder_paste_margin_ratio -0.2))
     (pad 57 smd rect (at 0.7 0.7) (size 1.4 1.4) (layers B.Cu B.Paste B.Mask)
-      (net 91 "Net-(U6-Pad57)") (solder_paste_margin_ratio -0.2))
+      (net 82 "Net-(U6-Pad57)") (solder_paste_margin_ratio -0.2))
     (pad 57 smd rect (at -2.1 0.7) (size 1.4 1.4) (layers B.Cu B.Paste B.Mask)
-      (net 91 "Net-(U6-Pad57)") (solder_paste_margin_ratio -0.2))
+      (net 82 "Net-(U6-Pad57)") (solder_paste_margin_ratio -0.2))
     (pad 57 smd rect (at -0.7 0.7) (size 1.4 1.4) (layers B.Cu B.Paste B.Mask)
-      (net 91 "Net-(U6-Pad57)") (solder_paste_margin_ratio -0.2))
+      (net 82 "Net-(U6-Pad57)") (solder_paste_margin_ratio -0.2))
     (pad 57 smd rect (at 2.1 -0.7) (size 1.4 1.4) (layers B.Cu B.Paste B.Mask)
-      (net 91 "Net-(U6-Pad57)") (solder_paste_margin_ratio -0.2))
+      (net 82 "Net-(U6-Pad57)") (solder_paste_margin_ratio -0.2))
     (pad 57 smd rect (at 0.7 -0.7) (size 1.4 1.4) (layers B.Cu B.Paste B.Mask)
-      (net 91 "Net-(U6-Pad57)") (solder_paste_margin_ratio -0.2))
+      (net 82 "Net-(U6-Pad57)") (solder_paste_margin_ratio -0.2))
     (pad 57 smd rect (at -2.1 -0.7) (size 1.4 1.4) (layers B.Cu B.Paste B.Mask)
-      (net 91 "Net-(U6-Pad57)") (solder_paste_margin_ratio -0.2))
+      (net 82 "Net-(U6-Pad57)") (solder_paste_margin_ratio -0.2))
     (pad 57 smd rect (at -0.7 -0.7) (size 1.4 1.4) (layers B.Cu B.Paste B.Mask)
-      (net 91 "Net-(U6-Pad57)") (solder_paste_margin_ratio -0.2))
+      (net 82 "Net-(U6-Pad57)") (solder_paste_margin_ratio -0.2))
     (pad 57 smd rect (at 2.1 -2.1) (size 1.4 1.4) (layers B.Cu B.Paste B.Mask)
-      (net 91 "Net-(U6-Pad57)") (solder_paste_margin_ratio -0.2))
+      (net 82 "Net-(U6-Pad57)") (solder_paste_margin_ratio -0.2))
     (pad 57 smd rect (at 0.7 -2.1) (size 1.4 1.4) (layers B.Cu B.Paste B.Mask)
-      (net 91 "Net-(U6-Pad57)") (solder_paste_margin_ratio -0.2))
+      (net 82 "Net-(U6-Pad57)") (solder_paste_margin_ratio -0.2))
     (pad 57 smd rect (at -2.1 -2.1) (size 1.4 1.4) (layers B.Cu B.Paste B.Mask)
-      (net 91 "Net-(U6-Pad57)") (solder_paste_margin_ratio -0.2))
+      (net 82 "Net-(U6-Pad57)") (solder_paste_margin_ratio -0.2))
     (pad 57 smd rect (at -0.7 -2.1) (size 1.4 1.4) (layers B.Cu B.Paste B.Mask)
-      (net 91 "Net-(U6-Pad57)") (solder_paste_margin_ratio -0.2))
+      (net 82 "Net-(U6-Pad57)") (solder_paste_margin_ratio -0.2))
+  )
+
+  (module Buzzers_Beepers:Buzzer_12x9.5RM7.6 (layer B.Cu) (tedit 544E361A) (tstamp 58D709F9)
+    (at 161.39984 96.98)
+    (descr "Generic Buzzer, D12mm height 9.5mm with RM7.6mm")
+    (tags buzzer)
+    (path /58D51CAD/58D72202)
+    (fp_text reference BT1 (at 0 8.001) (layer B.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text value 3V (at -1.00076 -8.001) (layer B.Fab)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_circle (center 0 0) (end 1.00076 0) (layer B.SilkS) (width 0.15))
+    (fp_text user + (at -3.81 2.54) (layer B.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_circle (center 0 0) (end 6.20014 0) (layer B.SilkS) (width 0.15))
+    (pad 1 thru_hole circle (at -3.79984 0) (size 2 2) (drill 1.00076) (layers *.Cu *.Mask)
+      (net 83 /power/VBAT))
+    (pad 2 thru_hole circle (at 3.79984 0) (size 2 2) (drill 1.00076) (layers *.Cu *.Mask)
+      (net 1 GND))
+    (model Buzzers_Beepers.3dshapes/Buzzer_12x9.5RM7.6.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 4 4 4))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Power_Integrations:SO-8 (layer B.Cu) (tedit 0) (tstamp 58D70A05)
+    (at 151.885 97.615)
+    (descr "SO-8 Surface Mount Small Outline 150mil 8pin Package")
+    (tags "Power Integrations D Package")
+    (path /58D51CAD/58D70684)
+    (fp_text reference U7 (at 0 0) (layer B.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text value PCF8523 (at 0 0) (layer B.Fab)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_circle (center -1.905 -0.762) (end -1.778 -0.762) (layer B.SilkS) (width 0.15))
+    (fp_line (start -2.54 -1.397) (end 2.54 -1.397) (layer B.SilkS) (width 0.15))
+    (fp_line (start -2.54 1.905) (end 2.54 1.905) (layer B.SilkS) (width 0.15))
+    (fp_line (start -2.54 -1.905) (end 2.54 -1.905) (layer B.SilkS) (width 0.15))
+    (fp_line (start -2.54 -1.905) (end -2.54 1.905) (layer B.SilkS) (width 0.15))
+    (fp_line (start 2.54 -1.905) (end 2.54 1.905) (layer B.SilkS) (width 0.15))
+    (pad 1 smd oval (at -1.905 -2.794) (size 0.6096 1.4732) (layers B.Cu B.Paste B.Mask)
+      (net 84 "Net-(U7-Pad1)"))
+    (pad 2 smd oval (at -0.635 -2.794) (size 0.6096 1.4732) (layers B.Cu B.Paste B.Mask)
+      (net 85 "Net-(U7-Pad2)"))
+    (pad 3 smd oval (at 0.635 -2.794) (size 0.6096 1.4732) (layers B.Cu B.Paste B.Mask)
+      (net 83 /power/VBAT))
+    (pad 4 smd oval (at 1.905 -2.794) (size 0.6096 1.4732) (layers B.Cu B.Paste B.Mask)
+      (net 1 GND))
+    (pad 5 smd oval (at 1.905 2.794) (size 0.6096 1.4732) (layers B.Cu B.Paste B.Mask))
+    (pad 6 smd oval (at 0.635 2.794) (size 0.6096 1.4732) (layers B.Cu B.Paste B.Mask))
+    (pad 7 smd oval (at -0.635 2.794) (size 0.6096 1.4732) (layers B.Cu B.Paste B.Mask))
+    (pad 8 smd oval (at -1.905 2.794) (size 0.6096 1.4732) (layers B.Cu B.Paste B.Mask)
+      (net 75 +2V5))
+  )
+
+  (module Crystals:Crystal_SMD_0603_2Pads_obsolete (layer B.Cu) (tedit 0) (tstamp 58D70A0B)
+    (at 151.53956 91.9)
+    (descr "Crystal, Quarz, SMD, 0603, 2 Pads, Obsolete!, NOT for new designs!,")
+    (tags "Crystal Quarz SMD 0603 2 Pads")
+    (path /58D51CAD/58D70E83)
+    (attr smd)
+    (fp_text reference Y1 (at 0 3.81) (layer B.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text value 32768Hz (at 0 -3.81) (layer B.Fab)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_circle (center 0 0) (end 0.0508 0) (layer B.Adhes) (width 0.381))
+    (fp_circle (center 0 0) (end 0.55118 0) (layer B.Adhes) (width 0.381))
+    (fp_circle (center 0 0) (end 0.20066 0) (layer B.Adhes) (width 0.381))
+    (fp_line (start 3.0988 -1.84912) (end -3.0988 -1.84912) (layer B.SilkS) (width 0.15))
+    (fp_line (start -3.0988 1.84912) (end 3.0988 1.84912) (layer B.SilkS) (width 0.15))
+    (pad 1 smd rect (at -2.25044 0) (size 1.6002 2.4003) (layers B.Cu B.Paste B.Mask)
+      (net 84 "Net-(U7-Pad1)"))
+    (pad 2 smd rect (at 2.25044 0) (size 1.6002 2.4003) (layers B.Cu B.Paste B.Mask)
+      (net 85 "Net-(U7-Pad2)"))
+  )
+
+  (module ESP8266:ESP-12E (layer B.Cu) (tedit 559F8D21) (tstamp 58D71020)
+    (at 96.26 81.74 270)
+    (descr "Module, ESP-8266, ESP-12, 16 pad, SMD")
+    (tags "Module ESP-8266 ESP8266")
+    (path /58D6D447/58D75E1E)
+    (fp_text reference U2 (at -2 2 270) (layer B.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text value ESP-12E (at 8 -1 270) (layer B.Fab)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_line (start 16 8.4) (end 0 2.6) (layer B.CrtYd) (width 0.1524))
+    (fp_line (start 0 8.4) (end 16 2.6) (layer B.CrtYd) (width 0.1524))
+    (fp_text user "No Copper" (at 7.9 5.4 270) (layer B.CrtYd)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_line (start 0 8.4) (end 0 2.6) (layer B.CrtYd) (width 0.1524))
+    (fp_line (start 0 2.6) (end 16 2.6) (layer B.CrtYd) (width 0.1524))
+    (fp_line (start 16 2.6) (end 16 8.4) (layer B.CrtYd) (width 0.1524))
+    (fp_line (start 16 8.4) (end 0 8.4) (layer B.CrtYd) (width 0.1524))
+    (fp_line (start 16 8.4) (end 16 -15.6) (layer B.Fab) (width 0.1524))
+    (fp_line (start 16 -15.6) (end 0 -15.6) (layer B.Fab) (width 0.1524))
+    (fp_line (start 0 -15.6) (end 0 8.4) (layer B.Fab) (width 0.1524))
+    (fp_line (start 0 8.4) (end 16 8.4) (layer B.Fab) (width 0.1524))
+    (pad 9 smd oval (at 2.99 -15.75 180) (size 2.4 1.1) (layers B.Cu B.Paste B.Mask)
+      (net 89 SD_MTDO))
+    (pad 10 smd oval (at 4.99 -15.75 180) (size 2.4 1.1) (layers B.Cu B.Paste B.Mask)
+      (net 90 SD_MTDI))
+    (pad 11 smd oval (at 6.99 -15.75 180) (size 2.4 1.1) (layers B.Cu B.Paste B.Mask)
+      (net 86 SD_3))
+    (pad 12 smd oval (at 8.99 -15.75 180) (size 2.4 1.1) (layers B.Cu B.Paste B.Mask)
+      (net 87 SD_MTMS))
+    (pad 13 smd oval (at 10.99 -15.75 180) (size 2.4 1.1) (layers B.Cu B.Paste B.Mask)
+      (net 88 SD_MTCK))
+    (pad 14 smd oval (at 12.99 -15.75 180) (size 2.4 1.1) (layers B.Cu B.Paste B.Mask))
+    (pad 1 smd rect (at 0 0 270) (size 2.4 1.1) (layers B.Cu B.Paste B.Mask))
+    (pad 2 smd oval (at 0 -2 270) (size 2.4 1.1) (layers B.Cu B.Paste B.Mask))
+    (pad 3 smd oval (at 0 -4 270) (size 2.4 1.1) (layers B.Cu B.Paste B.Mask))
+    (pad 4 smd oval (at 0 -6 270) (size 2.4 1.1) (layers B.Cu B.Paste B.Mask)
+      (net 91 JTAG_TDI))
+    (pad 5 smd oval (at 0 -8 270) (size 2.4 1.1) (layers B.Cu B.Paste B.Mask)
+      (net 94 JTAG_TDO))
+    (pad 6 smd oval (at 0 -10 270) (size 2.4 1.1) (layers B.Cu B.Paste B.Mask)
+      (net 92 JTAG_TCK))
+    (pad 7 smd oval (at 0 -12 270) (size 2.4 1.1) (layers B.Cu B.Paste B.Mask)
+      (net 93 JTAG_TMS))
+    (pad 8 smd oval (at 0 -14 270) (size 2.4 1.1) (layers B.Cu B.Paste B.Mask)
+      (net 63 +3V3))
+    (pad 15 smd oval (at 16 -14 270) (size 2.4 1.1) (layers B.Cu B.Paste B.Mask)
+      (net 1 GND))
+    (pad 16 smd oval (at 16 -12 270) (size 2.4 1.1) (layers B.Cu B.Paste B.Mask))
+    (pad 17 smd oval (at 16 -10 270) (size 2.4 1.1) (layers B.Cu B.Paste B.Mask))
+    (pad 18 smd oval (at 16 -8 270) (size 2.4 1.1) (layers B.Cu B.Paste B.Mask))
+    (pad 19 smd oval (at 16 -6 270) (size 2.4 1.1) (layers B.Cu B.Paste B.Mask))
+    (pad 20 smd oval (at 16 -4 270) (size 2.4 1.1) (layers B.Cu B.Paste B.Mask))
+    (pad 21 smd oval (at 16 -2 270) (size 2.4 1.1) (layers B.Cu B.Paste B.Mask))
+    (pad 22 smd oval (at 16 0 270) (size 2.4 1.1) (layers B.Cu B.Paste B.Mask))
+    (model ${ESPLIB}/ESP8266.3dshapes/ESP-12.wrl
+      (at (xyz 0.04 0 0))
+      (scale (xyz 0.3937 0.3937 0.3937))
+      (rotate (xyz 0 0 0))
+    )
   )
 
   (gr_line (start 137.28 99.52) (end 137.28 63.96) (layer Eco2.User) (width 0.2))
diff --git a/ulx3s.kicad_pcb-bak b/ulx3s.kicad_pcb-bak
index 9e62c58..d85985b 100644
--- a/ulx3s.kicad_pcb-bak
+++ b/ulx3s.kicad_pcb-bak
@@ -1,15 +1,15 @@
 (kicad_pcb (version 4) (host pcbnew 4.0.5+dfsg1-4)
 
   (general
-    (links 343)
-    (no_connects 343)
+    (links 349)
+    (no_connects 349)
     (area 93.949999 61.269999 178.070001 109.830001)
     (thickness 1.6)
     (drawings 20)
     (tracks 1)
     (zones 0)
-    (modules 57)
-    (nets 92)
+    (modules 60)
+    (nets 95)
   )
 
   (page A4)
@@ -185,6 +185,9 @@
   (net 89 /usb/USB5V)
   (net 90 "Net-(D9-Pad1)")
   (net 91 "Net-(U6-Pad57)")
+  (net 92 /power/VBAT)
+  (net 93 "Net-(U7-Pad1)")
+  (net 94 "Net-(U7-Pad2)")
 
   (net_class Default "This is the default net class."
     (clearance 0.2)
@@ -268,6 +271,7 @@
     (add_net /power/FB2)
     (add_net /power/FB3)
     (add_net /power/PWREN)
+    (add_net /power/VBAT)
     (add_net /usb/USB5V)
     (add_net BTN_D)
     (add_net BTN_F1)
@@ -281,6 +285,8 @@
     (add_net "Net-(L2-Pad1)")
     (add_net "Net-(L3-Pad1)")
     (add_net "Net-(U6-Pad57)")
+    (add_net "Net-(U7-Pad1)")
+    (add_net "Net-(U7-Pad2)")
     (add_net "Net-(US1-Pad6)")
     (add_net "Net-(US2-Pad6)")
   )
@@ -2855,7 +2861,7 @@
   )
 
   (module Resistors_SMD:R_0805_HandSoldering (layer B.Cu) (tedit 58307B90) (tstamp 58D66E84)
-    (at 144.9 73.485 270)
+    (at 143.63 73.485 270)
     (descr "Resistor SMD 0805, hand soldering")
     (tags "resistor 0805")
     (path /58D51CAD/58D67C1D)
@@ -3276,28 +3282,28 @@
     )
   )
 
-  (module SMD_Packages:SMD-1206_Pol (layer F.Cu) (tedit 0) (tstamp 58D6C684)
-    (at 136.01 119.830001)
+  (module SMD_Packages:SMD-1206_Pol (layer B.Cu) (tedit 0) (tstamp 58D6C684)
+    (at 145.535 69.675)
     (path /58D6BF46/58D6C83A)
     (attr smd)
-    (fp_text reference D8 (at 0 0) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
+    (fp_text reference D8 (at 0 0) (layer B.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 2A (at 0 0) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
+    (fp_text value 2A (at 0 0) (layer B.Fab)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_line (start -2.54 -1.143) (end -2.794 -1.143) (layer F.SilkS) (width 0.15))
-    (fp_line (start -2.794 -1.143) (end -2.794 1.143) (layer F.SilkS) (width 0.15))
-    (fp_line (start -2.794 1.143) (end -2.54 1.143) (layer F.SilkS) (width 0.15))
-    (fp_line (start -2.54 -1.143) (end -2.54 1.143) (layer F.SilkS) (width 0.15))
-    (fp_line (start -2.54 1.143) (end -0.889 1.143) (layer F.SilkS) (width 0.15))
-    (fp_line (start 0.889 -1.143) (end 2.54 -1.143) (layer F.SilkS) (width 0.15))
-    (fp_line (start 2.54 -1.143) (end 2.54 1.143) (layer F.SilkS) (width 0.15))
-    (fp_line (start 2.54 1.143) (end 0.889 1.143) (layer F.SilkS) (width 0.15))
-    (fp_line (start -0.889 -1.143) (end -2.54 -1.143) (layer F.SilkS) (width 0.15))
-    (pad 1 smd rect (at -1.651 0) (size 1.524 2.032) (layers F.Cu F.Paste F.Mask)
+    (fp_line (start -2.54 1.143) (end -2.794 1.143) (layer B.SilkS) (width 0.15))
+    (fp_line (start -2.794 1.143) (end -2.794 -1.143) (layer B.SilkS) (width 0.15))
+    (fp_line (start -2.794 -1.143) (end -2.54 -1.143) (layer B.SilkS) (width 0.15))
+    (fp_line (start -2.54 1.143) (end -2.54 -1.143) (layer B.SilkS) (width 0.15))
+    (fp_line (start -2.54 -1.143) (end -0.889 -1.143) (layer B.SilkS) (width 0.15))
+    (fp_line (start 0.889 1.143) (end 2.54 1.143) (layer B.SilkS) (width 0.15))
+    (fp_line (start 2.54 1.143) (end 2.54 -1.143) (layer B.SilkS) (width 0.15))
+    (fp_line (start 2.54 -1.143) (end 0.889 -1.143) (layer B.SilkS) (width 0.15))
+    (fp_line (start -0.889 1.143) (end -2.54 1.143) (layer B.SilkS) (width 0.15))
+    (pad 1 smd rect (at -1.651 0) (size 1.524 2.032) (layers B.Cu B.Paste B.Mask)
       (net 6 +5V))
-    (pad 2 smd rect (at 1.651 0) (size 1.524 2.032) (layers F.Cu F.Paste F.Mask)
+    (pad 2 smd rect (at 1.651 0) (size 1.524 2.032) (layers B.Cu B.Paste B.Mask)
       (net 89 /usb/USB5V))
     (model SMD_Packages.3dshapes/SMD-1206_Pol.wrl
       (at (xyz 0 0 0))
@@ -3306,28 +3312,28 @@
     )
   )
 
-  (module SMD_Packages:SMD-1206_Pol (layer F.Cu) (tedit 0) (tstamp 58D6C68A)
-    (at 136.01 119.830001)
+  (module SMD_Packages:SMD-1206_Pol (layer B.Cu) (tedit 0) (tstamp 58D6C68A)
+    (at 151.631 69.675 180)
     (path /58D6BF46/58D6C83C)
     (attr smd)
-    (fp_text reference D9 (at 0 0) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
+    (fp_text reference D9 (at 0 0 180) (layer B.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 2A (at 0 0) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
+    (fp_text value 2A (at 0 0 180) (layer B.Fab)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_line (start -2.54 -1.143) (end -2.794 -1.143) (layer F.SilkS) (width 0.15))
-    (fp_line (start -2.794 -1.143) (end -2.794 1.143) (layer F.SilkS) (width 0.15))
-    (fp_line (start -2.794 1.143) (end -2.54 1.143) (layer F.SilkS) (width 0.15))
-    (fp_line (start -2.54 -1.143) (end -2.54 1.143) (layer F.SilkS) (width 0.15))
-    (fp_line (start -2.54 1.143) (end -0.889 1.143) (layer F.SilkS) (width 0.15))
-    (fp_line (start 0.889 -1.143) (end 2.54 -1.143) (layer F.SilkS) (width 0.15))
-    (fp_line (start 2.54 -1.143) (end 2.54 1.143) (layer F.SilkS) (width 0.15))
-    (fp_line (start 2.54 1.143) (end 0.889 1.143) (layer F.SilkS) (width 0.15))
-    (fp_line (start -0.889 -1.143) (end -2.54 -1.143) (layer F.SilkS) (width 0.15))
-    (pad 1 smd rect (at -1.651 0) (size 1.524 2.032) (layers F.Cu F.Paste F.Mask)
+    (fp_line (start -2.54 1.143) (end -2.794 1.143) (layer B.SilkS) (width 0.15))
+    (fp_line (start -2.794 1.143) (end -2.794 -1.143) (layer B.SilkS) (width 0.15))
+    (fp_line (start -2.794 -1.143) (end -2.54 -1.143) (layer B.SilkS) (width 0.15))
+    (fp_line (start -2.54 1.143) (end -2.54 -1.143) (layer B.SilkS) (width 0.15))
+    (fp_line (start -2.54 -1.143) (end -0.889 -1.143) (layer B.SilkS) (width 0.15))
+    (fp_line (start 0.889 1.143) (end 2.54 1.143) (layer B.SilkS) (width 0.15))
+    (fp_line (start 2.54 1.143) (end 2.54 -1.143) (layer B.SilkS) (width 0.15))
+    (fp_line (start 2.54 -1.143) (end 0.889 -1.143) (layer B.SilkS) (width 0.15))
+    (fp_line (start -0.889 1.143) (end -2.54 1.143) (layer B.SilkS) (width 0.15))
+    (pad 1 smd rect (at -1.651 0 180) (size 1.524 2.032) (layers B.Cu B.Paste B.Mask)
       (net 90 "Net-(D9-Pad1)"))
-    (pad 2 smd rect (at 1.651 0) (size 1.524 2.032) (layers F.Cu F.Paste F.Mask)
+    (pad 2 smd rect (at 1.651 0 180) (size 1.524 2.032) (layers B.Cu B.Paste B.Mask)
       (net 6 +5V))
     (model SMD_Packages.3dshapes/SMD-1206_Pol.wrl
       (at (xyz 0 0 0))
@@ -3454,6 +3460,88 @@
       (net 91 "Net-(U6-Pad57)") (solder_paste_margin_ratio -0.2))
   )
 
+  (module Buzzers_Beepers:Buzzer_12x9.5RM7.6 (layer B.Cu) (tedit 544E361A) (tstamp 58D709F9)
+    (at 161.39984 96.98)
+    (descr "Generic Buzzer, D12mm height 9.5mm with RM7.6mm")
+    (tags buzzer)
+    (path /58D51CAD/58D72202)
+    (fp_text reference BT1 (at 0 8.001) (layer B.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text value 3V (at -1.00076 -8.001) (layer B.Fab)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_circle (center 0 0) (end 1.00076 0) (layer B.SilkS) (width 0.15))
+    (fp_text user + (at -3.81 2.54) (layer B.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_circle (center 0 0) (end 6.20014 0) (layer B.SilkS) (width 0.15))
+    (pad 1 thru_hole circle (at -3.79984 0) (size 2 2) (drill 1.00076) (layers *.Cu *.Mask)
+      (net 92 /power/VBAT))
+    (pad 2 thru_hole circle (at 3.79984 0) (size 2 2) (drill 1.00076) (layers *.Cu *.Mask)
+      (net 1 GND))
+    (model Buzzers_Beepers.3dshapes/Buzzer_12x9.5RM7.6.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 4 4 4))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Power_Integrations:SO-8 (layer B.Cu) (tedit 0) (tstamp 58D70A05)
+    (at 151.885 97.615)
+    (descr "SO-8 Surface Mount Small Outline 150mil 8pin Package")
+    (tags "Power Integrations D Package")
+    (path /58D51CAD/58D70684)
+    (fp_text reference U7 (at 0 0) (layer B.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text value PCF8523 (at 0 0) (layer B.Fab)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_circle (center -1.905 -0.762) (end -1.778 -0.762) (layer B.SilkS) (width 0.15))
+    (fp_line (start -2.54 -1.397) (end 2.54 -1.397) (layer B.SilkS) (width 0.15))
+    (fp_line (start -2.54 1.905) (end 2.54 1.905) (layer B.SilkS) (width 0.15))
+    (fp_line (start -2.54 -1.905) (end 2.54 -1.905) (layer B.SilkS) (width 0.15))
+    (fp_line (start -2.54 -1.905) (end -2.54 1.905) (layer B.SilkS) (width 0.15))
+    (fp_line (start 2.54 -1.905) (end 2.54 1.905) (layer B.SilkS) (width 0.15))
+    (pad 1 smd oval (at -1.905 -2.794) (size 0.6096 1.4732) (layers B.Cu B.Paste B.Mask)
+      (net 93 "Net-(U7-Pad1)"))
+    (pad 2 smd oval (at -0.635 -2.794) (size 0.6096 1.4732) (layers B.Cu B.Paste B.Mask)
+      (net 94 "Net-(U7-Pad2)"))
+    (pad 3 smd oval (at 0.635 -2.794) (size 0.6096 1.4732) (layers B.Cu B.Paste B.Mask)
+      (net 92 /power/VBAT))
+    (pad 4 smd oval (at 1.905 -2.794) (size 0.6096 1.4732) (layers B.Cu B.Paste B.Mask)
+      (net 1 GND))
+    (pad 5 smd oval (at 1.905 2.794) (size 0.6096 1.4732) (layers B.Cu B.Paste B.Mask))
+    (pad 6 smd oval (at 0.635 2.794) (size 0.6096 1.4732) (layers B.Cu B.Paste B.Mask))
+    (pad 7 smd oval (at -0.635 2.794) (size 0.6096 1.4732) (layers B.Cu B.Paste B.Mask))
+    (pad 8 smd oval (at -1.905 2.794) (size 0.6096 1.4732) (layers B.Cu B.Paste B.Mask)
+      (net 84 +2V5))
+  )
+
+  (module Crystals:Crystal_SMD_0603_2Pads_obsolete (layer B.Cu) (tedit 0) (tstamp 58D70A0B)
+    (at 151.53956 91.9)
+    (descr "Crystal, Quarz, SMD, 0603, 2 Pads, Obsolete!, NOT for new designs!,")
+    (tags "Crystal Quarz SMD 0603 2 Pads")
+    (path /58D51CAD/58D70E83)
+    (attr smd)
+    (fp_text reference Y1 (at 0 3.81) (layer B.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text value 32768Hz (at 0 -3.81) (layer B.Fab)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_circle (center 0 0) (end 0.0508 0) (layer B.Adhes) (width 0.381))
+    (fp_circle (center 0 0) (end 0.55118 0) (layer B.Adhes) (width 0.381))
+    (fp_circle (center 0 0) (end 0.20066 0) (layer B.Adhes) (width 0.381))
+    (fp_line (start 3.0988 -1.84912) (end -3.0988 -1.84912) (layer B.SilkS) (width 0.15))
+    (fp_line (start -3.0988 1.84912) (end 3.0988 1.84912) (layer B.SilkS) (width 0.15))
+    (pad 1 smd rect (at -2.25044 0) (size 1.6002 2.4003) (layers B.Cu B.Paste B.Mask)
+      (net 93 "Net-(U7-Pad1)"))
+    (pad 2 smd rect (at 2.25044 0) (size 1.6002 2.4003) (layers B.Cu B.Paste B.Mask)
+      (net 94 "Net-(U7-Pad2)"))
+  )
+
   (gr_line (start 137.28 99.52) (end 137.28 63.96) (layer Eco2.User) (width 0.2))
   (gr_line (start 172.84 99.52) (end 137.28 99.52) (layer Eco2.User) (width 0.2))
   (gr_line (start 172.84 63.96) (end 172.84 99.52) (layer Eco2.User) (width 0.2))
diff --git a/ulx3s.net b/ulx3s.net
index ec05820..3872e8f 100644
--- a/ulx3s.net
+++ b/ulx3s.net
@@ -1,7 +1,7 @@
 (export (version D)
   (design
     (source /home/davor/tmp/ulx3s/ulx3s.sch)
-    (date "Sub 25 Ožu 2017 20:34:30")
+    (date "Ned 26 Ožu 2017 01:40:38")
     (tool "Eeschema 4.0.5+dfsg1-4")
     (sheet (number 1) (name /) (tstamps /)
       (title_block
@@ -71,12 +71,12 @@
         (comment (number 4) (value ""))))
     (sheet (number 7) (name /wifi/) (tstamps /58D6D447/)
       (title_block
-        (title)
-        (company)
-        (rev)
+        (title ULX3S)
+        (company FER+RIZ+RADIONA)
+        (rev 0.0.1)
         (date)
         (source wifi.sch)
-        (comment (number 1) (value ""))
+        (comment (number 1) (value "WIFI module ESP8266-12E"))
         (comment (number 2) (value ""))
         (comment (number 3) (value ""))
         (comment (number 4) (value ""))))
@@ -87,17 +87,11 @@
         (rev 0.0.1)
         (date)
         (source ram.sch)
-        (comment (number 1) (value "Root sheet"))
+        (comment (number 1) (value "SDRAM memory"))
         (comment (number 2) (value ""))
         (comment (number 3) (value ""))
         (comment (number 4) (value "")))))
   (components
-    (comp (ref U2)
-      (value ESP-12E)
-      (footprint ESP8266:ESP-12E)
-      (libsource (lib ESP8266) (part ESP-12E))
-      (sheetpath (names /) (tstamps /))
-      (tstamp 56AC980A))
     (comp (ref SD1)
       (value SD_Card)
       (footprint micro-sd:MicroSD_TF02D)
@@ -296,6 +290,24 @@
       (libsource (lib device) (part R))
       (sheetpath (names /power/) (tstamps /58D51CAD/))
       (tstamp 58D67C1D))
+    (comp (ref U7)
+      (value PCF8523)
+      (footprint Power_Integrations:SO-8)
+      (libsource (lib philips) (part PCF8563))
+      (sheetpath (names /power/) (tstamps /58D51CAD/))
+      (tstamp 58D70684))
+    (comp (ref Y1)
+      (value 32768Hz)
+      (footprint Crystals:Crystal_SMD_0603_2Pads_obsolete)
+      (libsource (lib device) (part Crystal))
+      (sheetpath (names /power/) (tstamps /58D51CAD/))
+      (tstamp 58D70E83))
+    (comp (ref BT1)
+      (value 3V)
+      (footprint Buzzers_Beepers:Buzzer_12x9.5RM7.6)
+      (libsource (lib device) (part Battery_Cell))
+      (sheetpath (names /power/) (tstamps /58D51CAD/))
+      (tstamp 58D72202))
     (comp (ref OLED1)
       (value CONN_01X07)
       (footprint Socket_Strips:Socket_Strip_Straight_1x07)
@@ -428,6 +440,12 @@
       (libsource (lib ft2232) (part FT2232H))
       (sheetpath (names /usb/) (tstamps /58D6BF46/))
       (tstamp 58D6FD91))
+    (comp (ref U2)
+      (value ESP-12E)
+      (footprint ESP8266:ESP-12E)
+      (libsource (lib ESP8266) (part ESP-12E))
+      (sheetpath (names /wifi/) (tstamps /58D6D447/))
+      (tstamp 58D75E1E))
     (comp (ref IC1)
       (value MT48LC16M4A2P)
       (footprint TSOP54:TSOP54)
@@ -448,6 +466,14 @@
         (pin (num 3) (name LX) (type input))
         (pin (num 4) (name VIN) (type input))
         (pin (num 5) (name FB) (type input))))
+    (libpart (lib device) (part Battery_Cell)
+      (description "single battery cell")
+      (fields
+        (field (name Reference) BT)
+        (field (name Value) Battery_Cell))
+      (pins
+        (pin (num 1) (name +) (type passive))
+        (pin (num 2) (name -) (type passive))))
     (libpart (lib device) (part C)
       (description "Unpolarized capacitor")
       (footprints
@@ -648,6 +674,16 @@
       (pins
         (pin (num 1) (name ~) (type passive))
         (pin (num 2) (name ~) (type passive))))
+    (libpart (lib device) (part Crystal)
+      (description "Two pin crystal")
+      (footprints
+        (fp Crystal*))
+      (fields
+        (field (name Reference) Y)
+        (field (name Value) Crystal))
+      (pins
+        (pin (num 1) (name 1) (type passive))
+        (pin (num 2) (name 2) (type passive))))
     (libpart (lib device) (part D_Schottky_Small)
       (description "Schottky diode, small symbol")
       (footprints
@@ -1081,6 +1117,27 @@
         (pin (num 50) (name DQ3) (type BiDi))
         (pin (num 52) (name VSSQ) (type power_in))
         (pin (num 54) (name VSS) (type power_in))))
+    (libpart (lib philips) (part PCF8563)
+      (description "Realtime Clock/Calendar I2C Interface, DIP/SOIC/TSSOP-8")
+      (docs http://www.nxp.com/documents/data_sheet/PCF8563.pdf)
+      (footprints
+        (fp DIP*)
+        (fp PDIP*)
+        (fp SOIC*)
+        (fp SO*)
+        (fp TSSOP*))
+      (fields
+        (field (name Reference) U)
+        (field (name Value) PCF8563))
+      (pins
+        (pin (num 1) (name OSCI) (type input))
+        (pin (num 2) (name OSCO) (type output))
+        (pin (num 3) (name ~INT~) (type output))
+        (pin (num 4) (name VSS) (type power_in))
+        (pin (num 5) (name SDA) (type BiDi))
+        (pin (num 6) (name SCL) (type input))
+        (pin (num 7) (name CLKO) (type output))
+        (pin (num 8) (name VDD) (type power_in))))
     (libpart (lib device) (part R)
       (description Resistor)
       (footprints
@@ -1130,882 +1187,902 @@
         (pin (num 5) (name GND) (type power_in))
         (pin (num 6) (name shield) (type passive)))))
   (libraries
-    (library (logical device)
-      (uri /usr/share/kicad/library/device.lib))
-    (library (logical conn)
-      (uri /usr/share/kicad/library/conn.lib))
     (library (logical memory)
       (uri /usr/share/kicad/library/memory.lib))
+    (library (logical philips)
+      (uri /usr/share/kicad/library/philips.lib))
+    (library (logical ft2232)
+      (uri footprints/usbserial/ft2232.lib))
     (library (logical ESP8266)
       (uri footprints/esp8266/ESP8266.lib))
+    (library (logical device)
+      (uri /usr/share/kicad/library/device.lib))
     (library (logical micro-hdmi-d)
       (uri footprints/micro-hdmi-d/micro-hdmi-d.lib))
     (library (logical lfe5bg381)
       (uri footprints/lattice/lfe5bg381.lib))
-    (library (logical ft2232)
-      (uri footprints/usbserial/ft2232.lib))
+    (library (logical conn)
+      (uri /usr/share/kicad/library/conn.lib))
     (library (logical ap3429a)
       (uri footprints/dcdc_converter/ap3429a.lib)))
   (nets
-    (net (code 1) (name /MTCK)
-      (node (ref SD1) (pin 5))
-      (node (ref U2) (pin 13)))
-    (net (code 2) (name /MTDI)
-      (node (ref SD1) (pin 8))
-      (node (ref U2) (pin 10)))
-    (net (code 3) (name /MTDO)
-      (node (ref SD1) (pin 7))
-      (node (ref U2) (pin 9)))
-    (net (code 4) (name /MTMS)
-      (node (ref SD1) (pin 2))
-      (node (ref U2) (pin 12)))
-    (net (code 5) (name /SD_3)
-      (node (ref SD1) (pin 1))
-      (node (ref U2) (pin 11)))
-    (net (code 6) (name /SD_2)
-      (node (ref U2) (pin 14))
-      (node (ref SD1) (pin 9)))
-    (net (code 7) (name /SD_CD)
+    (net (code 1) (name SD_CD)
       (node (ref SD1) (pin 10)))
-    (net (code 8) (name "Net-(U2-Pad1)")
-      (node (ref U2) (pin 1)))
-    (net (code 9) (name +3V3)
-      (node (ref U1) (pin J6))
-      (node (ref J3) (pin 2))
-      (node (ref U1) (pin L14))
-      (node (ref U1) (pin P10))
-      (node (ref U1) (pin F10))
-      (node (ref U1) (pin P9))
-      (node (ref J3) (pin 19))
-      (node (ref U1) (pin M6))
-      (node (ref U1) (pin L6))
-      (node (ref U1) (pin H14))
-      (node (ref J3) (pin 20))
-      (node (ref U1) (pin H6))
-      (node (ref C6) (pin 1))
-      (node (ref RA3) (pin 1))
-      (node (ref L2) (pin 2))
-      (node (ref C7) (pin 1))
-      (node (ref C8) (pin 1))
-      (node (ref U1) (pin F9))
-      (node (ref U1) (pin F12))
-      (node (ref J2) (pin 1))
-      (node (ref J2) (pin 2))
-      (node (ref U1) (pin F11))
-      (node (ref U1) (pin L7))
-      (node (ref OLED1) (pin 2))
-      (node (ref U2) (pin 8))
-      (node (ref U1) (pin H7))
-      (node (ref SD1) (pin 4))
-      (node (ref U1) (pin M15))
-      (node (ref J3) (pin 1))
-      (node (ref R7) (pin 1))
-      (node (ref J1) (pin 63))
-      (node (ref U1) (pin H15))
-      (node (ref J1) (pin 64))
-      (node (ref U1) (pin J15))
-      (node (ref U1) (pin L15)))
-    (net (code 10) (name GND)
+    (net (code 2) (name GND)
+      (node (ref U1) (pin V12))
+      (node (ref U1) (pin V19))
+      (node (ref U1) (pin U12))
+      (node (ref U1) (pin P12))
       (node (ref U1) (pin M12))
-      (node (ref U1) (pin G13))
-      (node (ref U1) (pin Y12))
-      (node (ref U1) (pin W6))
-      (node (ref J1) (pin 4))
-      (node (ref U1) (pin P13))
-      (node (ref U1) (pin U13))
-      (node (ref U1) (pin V13))
-      (node (ref U1) (pin Y6))
+      (node (ref U1) (pin L12))
+      (node (ref U1) (pin K12))
+      (node (ref U1) (pin J12))
+      (node (ref U1) (pin P14))
+      (node (ref U1) (pin G12))
+      (node (ref U1) (pin Y11))
       (node (ref U1) (pin V11))
-      (node (ref U1) (pin F13))
+      (node (ref U1) (pin U11))
       (node (ref U1) (pin W12))
-      (node (ref U1) (pin V12))
-      (node (ref U1) (pin P12))
-      (node (ref U1) (pin U12))
-      (node (ref U1) (pin V16))
-      (node (ref U1) (pin W16))
-      (node (ref U1) (pin G17))
-      (node (ref U1) (pin C19))
-      (node (ref U1) (pin H19))
-      (node (ref U1) (pin R19))
-      (node (ref U1) (pin V19))
-      (node (ref U1) (pin K15))
-      (node (ref U1) (pin V15))
+      (node (ref U1) (pin P11))
+      (node (ref U1) (pin W19))
       (node (ref U3) (pin 2))
-      (node (ref U1) (pin M16))
-      (node (ref U1) (pin G15))
-      (node (ref U1) (pin V20))
+      (node (ref U1) (pin R19))
+      (node (ref C1) (pin 2))
+      (node (ref U1) (pin N15))
+      (node (ref U1) (pin U14))
       (node (ref U1) (pin V14))
+      (node (ref U1) (pin G15))
+      (node (ref U1) (pin G13))
+      (node (ref C9) (pin 2))
+      (node (ref C11) (pin 2))
+      (node (ref C12) (pin 2))
+      (node (ref U5) (pin 2))
+      (node (ref U1) (pin V13))
+      (node (ref U1) (pin F13))
+      (node (ref U1) (pin V15))
+      (node (ref U1) (pin P13))
+      (node (ref U1) (pin U13))
+      (node (ref U1) (pin Y12))
+      (node (ref U1) (pin B14))
+      (node (ref U1) (pin F14))
+      (node (ref U1) (pin G14))
       (node (ref U1) (pin J14))
       (node (ref U1) (pin K14))
       (node (ref U1) (pin M14))
       (node (ref U1) (pin N14))
-      (node (ref U1) (pin P14))
-      (node (ref U1) (pin U14))
-      (node (ref U1) (pin G12))
-      (node (ref U1) (pin F14))
-      (node (ref U1) (pin U11))
-      (node (ref U1) (pin G11))
-      (node (ref U1) (pin J11))
-      (node (ref U1) (pin K11))
       (node (ref U1) (pin L11))
       (node (ref U1) (pin M11))
-      (node (ref U1) (pin P11))
-      (node (ref U1) (pin G14))
-      (node (ref U1) (pin Y11))
-      (node (ref U1) (pin B14))
+      (node (ref U1) (pin T6))
+      (node (ref U1) (pin G8))
+      (node (ref U1) (pin J2))
+      (node (ref U1) (pin M2))
+      (node (ref U1) (pin D4))
+      (node (ref U1) (pin G4))
+      (node (ref U1) (pin V5))
+      (node (ref U1) (pin Y5))
+      (node (ref U1) (pin G6))
+      (node (ref U1) (pin K6))
+      (node (ref U1) (pin N6))
+      (node (ref U1) (pin F8))
+      (node (ref U1) (pin U9))
+      (node (ref U1) (pin V9))
+      (node (ref U1) (pin G10))
+      (node (ref U1) (pin J10))
+      (node (ref U1) (pin K10))
+      (node (ref U1) (pin L10))
+      (node (ref U1) (pin M10))
+      (node (ref U1) (pin T9))
+      (node (ref U1) (pin T10))
+      (node (ref U1) (pin U10))
+      (node (ref U1) (pin V10))
+      (node (ref U1) (pin V20))
+      (node (ref U1) (pin G11))
+      (node (ref U1) (pin B7))
+      (node (ref U1) (pin K11))
+      (node (ref U1) (pin W15))
+      (node (ref U1) (pin M16))
+      (node (ref U1) (pin V16))
+      (node (ref U1) (pin W16))
+      (node (ref U1) (pin G17))
+      (node (ref U1) (pin C19))
+      (node (ref U1) (pin H19))
+      (node (ref U1) (pin M7))
       (node (ref U1) (pin V6))
-      (node (ref U1) (pin U6))
+      (node (ref U1) (pin W6))
+      (node (ref U1) (pin Y6))
+      (node (ref U1) (pin K15))
+      (node (ref U1) (pin F7))
+      (node (ref U1) (pin G7))
+      (node (ref U1) (pin J7))
       (node (ref U1) (pin K7))
-      (node (ref U1) (pin N15))
-      (node (ref U1) (pin J12))
-      (node (ref U1) (pin K12))
-      (node (ref U1) (pin L12))
-      (node (ref U1) (pin W19))
-      (node (ref U1) (pin W15))
+      (node (ref U1) (pin U6))
+      (node (ref U1) (pin N7))
+      (node (ref U1) (pin P7))
+      (node (ref U1) (pin T7))
+      (node (ref U1) (pin U7))
+      (node (ref U1) (pin V7))
+      (node (ref U1) (pin W7))
+      (node (ref U1) (pin Y7))
+      (node (ref J3) (pin 22))
+      (node (ref J3) (pin 21))
+      (node (ref J3) (pin 4))
+      (node (ref J3) (pin 3))
+      (node (ref J1) (pin 62))
+      (node (ref J1) (pin 61))
+      (node (ref J1) (pin 4))
       (node (ref J1) (pin 3))
-      (node (ref C12) (pin 2))
-      (node (ref C9) (pin 2))
-      (node (ref RB2) (pin 1))
-      (node (ref C11) (pin 2))
+      (node (ref U4) (pin 2))
       (node (ref C5) (pin 2))
+      (node (ref BT1) (pin 2))
+      (node (ref U7) (pin 4))
       (node (ref RB3) (pin 1))
       (node (ref C7) (pin 2))
       (node (ref C8) (pin 2))
-      (node (ref U4) (pin 2))
-      (node (ref U5) (pin 2))
+      (node (ref U1) (pin Y8))
+      (node (ref RB2) (pin 1))
+      (node (ref U2) (pin 15))
       (node (ref D5) (pin 1))
       (node (ref D6) (pin 1))
       (node (ref D7) (pin 1))
-      (node (ref RB1) (pin 1))
-      (node (ref C1) (pin 2))
-      (node (ref C3) (pin 2))
-      (node (ref C4) (pin 2))
-      (node (ref GPDI1) (pin 4))
       (node (ref GPDI1) (pin 7))
-      (node (ref GPDI1) (pin 13))
-      (node (ref GPDI1) (pin 10))
-      (node (ref GPDI1) (pin 16))
-      (node (ref GPDI1) (pin SHD))
-      (node (ref US2) (pin 5))
-      (node (ref US1) (pin 5))
+      (node (ref OLED1) (pin 1))
       (node (ref D4) (pin 1))
       (node (ref D3) (pin 1))
       (node (ref D2) (pin 1))
       (node (ref D1) (pin 1))
       (node (ref D0) (pin 1))
-      (node (ref OLED1) (pin 1))
-      (node (ref U1) (pin Y8))
-      (node (ref U1) (pin L9))
-      (node (ref U1) (pin K10))
-      (node (ref U1) (pin L10))
-      (node (ref U1) (pin M10))
-      (node (ref U1) (pin T10))
-      (node (ref U1) (pin U10))
-      (node (ref U1) (pin V10))
-      (node (ref U1) (pin T8))
-      (node (ref U1) (pin F8))
-      (node (ref U1) (pin G8))
+      (node (ref US1) (pin 5))
+      (node (ref US2) (pin 5))
+      (node (ref GPDI1) (pin SHD))
+      (node (ref GPDI1) (pin 4))
+      (node (ref GPDI1) (pin 16))
+      (node (ref GPDI1) (pin 10))
+      (node (ref GPDI1) (pin 13))
       (node (ref U1) (pin P8))
+      (node (ref U1) (pin T8))
       (node (ref U1) (pin U8))
       (node (ref U1) (pin V8))
-      (node (ref U1) (pin G10))
       (node (ref U1) (pin G9))
       (node (ref U1) (pin J9))
       (node (ref U1) (pin K9))
-      (node (ref U1) (pin J2))
-      (node (ref U1) (pin F7))
-      (node (ref U1) (pin G7))
-      (node (ref U1) (pin J7))
-      (node (ref U1) (pin T6))
-      (node (ref U1) (pin M7))
-      (node (ref U1) (pin N7))
-      (node (ref U1) (pin P7))
-      (node (ref U1) (pin T7))
-      (node (ref U1) (pin U7))
-      (node (ref U1) (pin V7))
-      (node (ref U1) (pin W7))
-      (node (ref U1) (pin M2))
-      (node (ref U1) (pin D4))
-      (node (ref U1) (pin G4))
-      (node (ref U1) (pin V5))
-      (node (ref U1) (pin Y5))
-      (node (ref U1) (pin Y7))
-      (node (ref U1) (pin G6))
-      (node (ref U1) (pin K6))
-      (node (ref U1) (pin N6))
-      (node (ref U1) (pin J10))
+      (node (ref U1) (pin L9))
       (node (ref U1) (pin M9))
-      (node (ref U1) (pin T9))
-      (node (ref U1) (pin U9))
-      (node (ref U1) (pin V9))
-      (node (ref U1) (pin B7))
-      (node (ref J1) (pin 61))
-      (node (ref J3) (pin 22))
-      (node (ref J3) (pin 21))
-      (node (ref J3) (pin 4))
-      (node (ref J3) (pin 3))
-      (node (ref J1) (pin 62))
-      (node (ref J2) (pin 4))
-      (node (ref J2) (pin 3))
+      (node (ref RB1) (pin 1))
+      (node (ref C3) (pin 2))
+      (node (ref C4) (pin 2))
+      (node (ref U1) (pin J11))
+      (node (ref SD1) (pin 3))
       (node (ref SD1) (pin 13))
       (node (ref SD1) (pin 12))
-      (node (ref U2) (pin 15))
-      (node (ref SD1) (pin 3))
-      (node (ref SD1) (pin 6)))
-    (net (code 11) (name /SD_WP)
+      (node (ref SD1) (pin 6))
+      (node (ref J2) (pin 4))
+      (node (ref J2) (pin 3)))
+    (net (code 3) (name SD_WP)
       (node (ref SD1) (pin 11)))
-    (net (code 12) (name "Net-(U2-Pad2)")
-      (node (ref U2) (pin 2)))
-    (net (code 13) (name /WIFI_RXD)
-      (node (ref U2) (pin 21)))
-    (net (code 14) (name /WIFI_TXD)
-      (node (ref U2) (pin 22)))
-    (net (code 15) (name /TDI)
+    (net (code 4) (name +3V3)
+      (node (ref U1) (pin L6))
+      (node (ref U1) (pin M6))
+      (node (ref OLED1) (pin 2))
+      (node (ref RA3) (pin 1))
+      (node (ref C6) (pin 1))
+      (node (ref L2) (pin 2))
+      (node (ref C7) (pin 1))
+      (node (ref C8) (pin 1))
+      (node (ref U1) (pin H6))
+      (node (ref U1) (pin J6))
+      (node (ref U1) (pin F9))
+      (node (ref J2) (pin 1))
+      (node (ref J2) (pin 2))
+      (node (ref U1) (pin P9))
+      (node (ref U1) (pin F10))
+      (node (ref U2) (pin 8))
+      (node (ref U1) (pin P10))
+      (node (ref U1) (pin F11))
+      (node (ref U1) (pin L15))
+      (node (ref J3) (pin 20))
+      (node (ref J3) (pin 2))
+      (node (ref J3) (pin 1))
+      (node (ref J1) (pin 63))
+      (node (ref U1) (pin H14))
+      (node (ref R7) (pin 1))
+      (node (ref SD1) (pin 4))
+      (node (ref U1) (pin L14))
+      (node (ref U1) (pin F12))
+      (node (ref U1) (pin M15))
+      (node (ref J1) (pin 64))
+      (node (ref U1) (pin H15))
+      (node (ref U1) (pin J15))
+      (node (ref U1) (pin H7))
+      (node (ref J3) (pin 19))
+      (node (ref U1) (pin L7)))
+    (net (code 5) (name JTAG_TDI)
       (node (ref U1) (pin R5))
       (node (ref U2) (pin 4)))
-    (net (code 16) (name /TDO)
-      (node (ref U1) (pin V4))
-      (node (ref U2) (pin 5)))
-    (net (code 17) (name "Net-(U2-Pad19)")
-      (node (ref U2) (pin 19)))
-    (net (code 18) (name "Net-(U2-Pad18)")
-      (node (ref U2) (pin 18)))
-    (net (code 19) (name "Net-(U2-Pad17)")
-      (node (ref U2) (pin 17)))
-    (net (code 20) (name "Net-(U2-Pad16)")
-      (node (ref U2) (pin 16)))
-    (net (code 21) (name "Net-(U2-Pad20)")
-      (node (ref U2) (pin 20)))
-    (net (code 22) (name "Net-(U2-Pad3)")
-      (node (ref U2) (pin 3)))
-    (net (code 23) (name /TCK)
+    (net (code 6) (name JTAG_TDO)
+      (node (ref U2) (pin 5))
+      (node (ref U1) (pin V4)))
+    (net (code 7) (name JTAG_TCK)
       (node (ref U2) (pin 6))
       (node (ref U1) (pin T5)))
-    (net (code 24) (name "Net-(AUDIO1-Pad6)")
+    (net (code 8) (name JTAG_TMS)
+      (node (ref U1) (pin U5))
+      (node (ref U2) (pin 7)))
+    (net (code 9) (name SD_MTDI)
+      (node (ref U2) (pin 10))
+      (node (ref SD1) (pin 8)))
+    (net (code 10) (name SD_3)
+      (node (ref U2) (pin 11))
+      (node (ref SD1) (pin 1)))
+    (net (code 11) (name SD_MTMS)
+      (node (ref SD1) (pin 2))
+      (node (ref U2) (pin 12)))
+    (net (code 12) (name SD_MTCK)
+      (node (ref SD1) (pin 5))
+      (node (ref U2) (pin 13)))
+    (net (code 13) (name SD_MTDO)
+      (node (ref SD1) (pin 7))
+      (node (ref U2) (pin 9)))
+    (net (code 14) (name SD_2)
+      (node (ref U2) (pin 14))
+      (node (ref SD1) (pin 9)))
+    (net (code 15) (name "Net-(AUDIO1-Pad2)")
+      (node (ref AUDIO1) (pin 2)))
+    (net (code 16) (name "Net-(AUDIO1-Pad1)")
+      (node (ref AUDIO1) (pin 1)))
+    (net (code 17) (name "Net-(AUDIO1-Pad6)")
       (node (ref AUDIO1) (pin 6)))
-    (net (code 25) (name "Net-(AUDIO1-Pad5)")
+    (net (code 18) (name "Net-(AUDIO1-Pad5)")
       (node (ref AUDIO1) (pin 5)))
-    (net (code 26) (name "Net-(AUDIO1-Pad4)")
+    (net (code 19) (name "Net-(AUDIO1-Pad4)")
       (node (ref AUDIO1) (pin 4)))
-    (net (code 27) (name "Net-(AUDIO1-Pad3)")
+    (net (code 20) (name "Net-(AUDIO1-Pad3)")
       (node (ref AUDIO1) (pin 3)))
-    (net (code 28) (name "Net-(AUDIO1-Pad2)")
-      (node (ref AUDIO1) (pin 2)))
-    (net (code 29) (name "Net-(AUDIO1-Pad1)")
-      (node (ref AUDIO1) (pin 1)))
-    (net (code 30) (name /TMS)
-      (node (ref U1) (pin U5))
-      (node (ref U2) (pin 7)))
-    (net (code 31) (name /gpio/MP3)
+    (net (code 21) (name /gpio/MP3)
       (node (ref J3) (pin 15)))
-    (net (code 32) (name /gpio/MP5)
+    (net (code 22) (name /gpio/MP5)
       (node (ref J3) (pin 17)))
-    (net (code 33) (name /gpio/MP1)
+    (net (code 23) (name /gpio/MP1)
       (node (ref J3) (pin 13)))
-    (net (code 34) (name /gpio/PMODB7)
+    (net (code 24) (name /gpio/PMODB7)
       (node (ref J3) (pin 11)))
-    (net (code 35) (name /gpio/PMODB5)
+    (net (code 25) (name /gpio/PMODB5)
       (node (ref J3) (pin 9)))
-    (net (code 36) (name /gpio/PMODB3)
+    (net (code 26) (name /gpio/PMODB3)
       (node (ref J3) (pin 7)))
-    (net (code 37) (name /gpio/PMODB1)
+    (net (code 27) (name /gpio/PMODB1)
       (node (ref J3) (pin 5)))
-    (net (code 38) (name /gpio/PMODB8)
+    (net (code 28) (name /gpio/PMODB8)
       (node (ref J3) (pin 12)))
-    (net (code 39) (name /gpio/PMODB6)
+    (net (code 29) (name /gpio/PMODB6)
       (node (ref J3) (pin 10)))
-    (net (code 40) (name /gpio/PMODB4)
+    (net (code 30) (name /gpio/PMODB4)
       (node (ref J3) (pin 8)))
-    (net (code 41) (name /gpio/PMODB2)
+    (net (code 31) (name /gpio/PMODB2)
       (node (ref J3) (pin 6)))
-    (net (code 42) (name /gpio/MP6)
+    (net (code 32) (name /gpio/MP6)
       (node (ref J3) (pin 18)))
-    (net (code 43) (name /gpio/MP4)
+    (net (code 33) (name /gpio/MP4)
       (node (ref J3) (pin 16)))
-    (net (code 44) (name /gpio/P46)
-      (node (ref U1) (pin D14))
-      (node (ref J1) (pin 46)))
-    (net (code 45) (name /gpio/P40)
+    (net (code 34) (name /gpio/P44)
+      (node (ref U1) (pin B15))
+      (node (ref J1) (pin 44)))
+    (net (code 35) (name /gpio/P40)
       (node (ref U1) (pin A16))
       (node (ref J1) (pin 40)))
-    (net (code 46) (name /gpio/P42)
-      (node (ref U1) (pin D15))
-      (node (ref J1) (pin 42)))
-    (net (code 47) (name /gpio/P44)
-      (node (ref J1) (pin 44))
-      (node (ref U1) (pin B15)))
-    (net (code 48) (name /gpio/P48)
-      (node (ref J1) (pin 48))
-      (node (ref U1) (pin A14)))
-    (net (code 49) (name /gpio/P50)
+    (net (code 36) (name /gpio/P42)
+      (node (ref J1) (pin 42))
+      (node (ref U1) (pin D15)))
+    (net (code 37) (name /gpio/P46)
+      (node (ref J1) (pin 46))
+      (node (ref U1) (pin D14)))
+    (net (code 38) (name /gpio/P48)
+      (node (ref U1) (pin A14))
+      (node (ref J1) (pin 48)))
+    (net (code 39) (name /gpio/P50)
       (node (ref U1) (pin D13))
       (node (ref J1) (pin 50)))
-    (net (code 50) (name /gpio/P52)
-      (node (ref J1) (pin 52))
-      (node (ref U1) (pin B13)))
-    (net (code 51) (name /gpio/P54)
-      (node (ref U1) (pin A12))
-      (node (ref J1) (pin 54)))
-    (net (code 52) (name /gpio/P56)
-      (node (ref U1) (pin D12))
-      (node (ref J1) (pin 56)))
-    (net (code 53) (name /gpio/P58)
-      (node (ref J1) (pin 58))
-      (node (ref U1) (pin B12)))
-    (net (code 54) (name /gpio/P59)
+    (net (code 40) (name /gpio/P52)
+      (node (ref U1) (pin B13))
+      (node (ref J1) (pin 52)))
+    (net (code 41) (name /gpio/P54)
+      (node (ref J1) (pin 54))
+      (node (ref U1) (pin A12)))
+    (net (code 42) (name /gpio/P56)
+      (node (ref J1) (pin 56))
+      (node (ref U1) (pin D12)))
+    (net (code 43) (name /gpio/P59)
       (node (ref J1) (pin 59))
       (node (ref U1) (pin E11)))
-    (net (code 55) (name /gpio/P57)
+    (net (code 44) (name /gpio/P57)
       (node (ref U1) (pin C12))
       (node (ref J1) (pin 57)))
-    (net (code 56) (name /gpio/P55)
-      (node (ref U1) (pin E12))
-      (node (ref J1) (pin 55)))
-    (net (code 57) (name /gpio/P53)
-      (node (ref J1) (pin 53))
-      (node (ref U1) (pin A13)))
-    (net (code 58) (name /gpio/P51)
+    (net (code 45) (name /gpio/P55)
+      (node (ref J1) (pin 55))
+      (node (ref U1) (pin E12)))
+    (net (code 46) (name /gpio/P53)
+      (node (ref U1) (pin A13))
+      (node (ref J1) (pin 53)))
+    (net (code 47) (name /gpio/P51)
       (node (ref U1) (pin C13))
       (node (ref J1) (pin 51)))
-    (net (code 59) (name /gpio/P49)
-      (node (ref U1) (pin E13))
-      (node (ref J1) (pin 49)))
-    (net (code 60) (name /gpio/P47)
+    (net (code 48) (name /gpio/P49)
+      (node (ref J1) (pin 49))
+      (node (ref U1) (pin E13)))
+    (net (code 49) (name /gpio/P47)
       (node (ref J1) (pin 47))
       (node (ref U1) (pin C14)))
-    (net (code 61) (name /gpio/P45)
+    (net (code 50) (name /gpio/P45)
       (node (ref U1) (pin E14))
       (node (ref J1) (pin 45)))
-    (net (code 62) (name /gpio/P41)
-      (node (ref U1) (pin E15))
-      (node (ref J1) (pin 41)))
-    (net (code 63) (name /gpio/P39)
-      (node (ref U1) (pin B16))
-      (node (ref J1) (pin 39)))
-    (net (code 64) (name /gpio/P43)
+    (net (code 51) (name /gpio/P43)
       (node (ref U1) (pin C15))
       (node (ref J1) (pin 43)))
-    (net (code 65) (name /gpio/PMODC7)
+    (net (code 52) (name /gpio/P41)
+      (node (ref J1) (pin 41))
+      (node (ref U1) (pin E15)))
+    (net (code 53) (name /gpio/P39)
+      (node (ref U1) (pin B16))
+      (node (ref J1) (pin 39)))
+    (net (code 54) (name /gpio/P60)
+      (node (ref J1) (pin 60))
+      (node (ref U1) (pin D11)))
+    (net (code 55) (name /gpio/PMODC7)
       (node (ref J3) (pin 29)))
-    (net (code 66) (name /gpio/PMODC5)
+    (net (code 56) (name /gpio/PMODC5)
       (node (ref J3) (pin 27)))
-    (net (code 67) (name /gpio/PMODC3)
+    (net (code 57) (name /gpio/PMODC3)
       (node (ref J3) (pin 25)))
-    (net (code 68) (name /gpio/PMODC8)
+    (net (code 58) (name /gpio/PMODC8)
       (node (ref J3) (pin 30)))
-    (net (code 69) (name /gpio/PMODC6)
+    (net (code 59) (name /gpio/PMODC6)
       (node (ref J3) (pin 28)))
-    (net (code 70) (name /gpio/PMODC4)
+    (net (code 60) (name /gpio/PMODC4)
       (node (ref J3) (pin 26)))
-    (net (code 71) (name /gpio/PMODC2)
+    (net (code 61) (name /gpio/PMODC2)
       (node (ref J3) (pin 24)))
-    (net (code 72) (name /gpio/PMODC1)
+    (net (code 62) (name /gpio/PMODC1)
       (node (ref J3) (pin 23)))
-    (net (code 73) (name /gpio/MP2)
+    (net (code 63) (name /gpio/MP2)
       (node (ref J3) (pin 14)))
-    (net (code 74) (name /gpio/PMODA3)
+    (net (code 64) (name /gpio/PMODA3)
       (node (ref J2) (pin 7)))
-    (net (code 75) (name /gpio/PMODA1)
+    (net (code 65) (name /gpio/PMODA1)
       (node (ref J2) (pin 5)))
-    (net (code 76) (name /gpio/PMODA5)
+    (net (code 66) (name /gpio/PMODA5)
       (node (ref J2) (pin 9)))
-    (net (code 77) (name /gpio/P60)
-      (node (ref J1) (pin 60))
-      (node (ref U1) (pin D11)))
-    (net (code 78) (name /gpio/PMODA8)
+    (net (code 67) (name /gpio/PMODA8)
       (node (ref J2) (pin 12)))
-    (net (code 79) (name /gpio/PMODA6)
+    (net (code 68) (name /gpio/PMODA6)
       (node (ref J2) (pin 10)))
-    (net (code 80) (name /gpio/PMODA4)
+    (net (code 69) (name /gpio/PMODA4)
       (node (ref J2) (pin 8)))
-    (net (code 81) (name /gpio/PMODA2)
+    (net (code 70) (name /gpio/PMODA2)
       (node (ref J2) (pin 6)))
-    (net (code 82) (name /gpio/PMODA7)
+    (net (code 71) (name /gpio/PMODA7)
       (node (ref J2) (pin 11)))
-    (net (code 83) (name /gpio/P37)
-      (node (ref U1) (pin D16))
-      (node (ref J1) (pin 37)))
-    (net (code 84) (name /gpio/P35)
-      (node (ref J1) (pin 35))
-      (node (ref U1) (pin C17)))
-    (net (code 85) (name /gpio/P33)
+    (net (code 72) (name /gpio/P37)
+      (node (ref J1) (pin 37))
+      (node (ref U1) (pin D16)))
+    (net (code 73) (name /gpio/P35)
+      (node (ref U1) (pin C17))
+      (node (ref J1) (pin 35)))
+    (net (code 74) (name /gpio/P33)
       (node (ref U1) (pin B18))
       (node (ref J1) (pin 33)))
-    (net (code 86) (name /gpio/P31)
-      (node (ref U1) (pin B19))
-      (node (ref J1) (pin 31)))
-    (net (code 87) (name /gpio/P29)
+    (net (code 75) (name /gpio/P31)
+      (node (ref J1) (pin 31))
+      (node (ref U1) (pin B19)))
+    (net (code 76) (name /gpio/P29)
       (node (ref U1) (pin B20))
       (node (ref J1) (pin 29)))
-    (net (code 88) (name /gpio/P38)
-      (node (ref J1) (pin 38))
-      (node (ref U1) (pin C16)))
-    (net (code 89) (name /gpio/P36)
-      (node (ref U1) (pin B17))
-      (node (ref J1) (pin 36)))
-    (net (code 90) (name /gpio/P34)
+    (net (code 77) (name /gpio/P38)
+      (node (ref U1) (pin C16))
+      (node (ref J1) (pin 38)))
+    (net (code 78) (name /gpio/P58)
+      (node (ref J1) (pin 58))
+      (node (ref U1) (pin B12)))
+    (net (code 79) (name /gpio/P36)
+      (node (ref J1) (pin 36))
+      (node (ref U1) (pin B17)))
+    (net (code 80) (name /gpio/P34)
       (node (ref J1) (pin 34))
       (node (ref U1) (pin A17)))
-    (net (code 91) (name /gpio/P32)
-      (node (ref J1) (pin 32))
-      (node (ref U1) (pin A18)))
-    (net (code 92) (name /gpio/P30)
-      (node (ref J1) (pin 30))
-      (node (ref U1) (pin A19)))
-    (net (code 93) (name /gpio/P23)
-      (node (ref U1) (pin D7))
-      (node (ref J1) (pin 23)))
-    (net (code 94) (name /gpio/P24)
+    (net (code 81) (name /gpio/P32)
+      (node (ref U1) (pin A18))
+      (node (ref J1) (pin 32)))
+    (net (code 82) (name /gpio/P30)
+      (node (ref U1) (pin A19))
+      (node (ref J1) (pin 30)))
+    (net (code 83) (name /gpio/P23)
+      (node (ref J1) (pin 23))
+      (node (ref U1) (pin D7)))
+    (net (code 84) (name /gpio/P24)
       (node (ref J1) (pin 24))
       (node (ref U1) (pin E7)))
-    (net (code 95) (name /gpio/P25)
-      (node (ref J1) (pin 25))
-      (node (ref U1) (pin D6)))
-    (net (code 96) (name /gpio/P26)
-      (node (ref U1) (pin E6))
-      (node (ref J1) (pin 26)))
-    (net (code 97) (name /gpio/P27)
-      (node (ref J1) (pin 27))
-      (node (ref U1) (pin B6)))
-    (net (code 98) (name /gpio/P28)
+    (net (code 85) (name /gpio/P25)
+      (node (ref U1) (pin D6))
+      (node (ref J1) (pin 25)))
+    (net (code 86) (name /gpio/P26)
+      (node (ref J1) (pin 26))
+      (node (ref U1) (pin E6)))
+    (net (code 87) (name /gpio/P27)
+      (node (ref U1) (pin B6))
+      (node (ref J1) (pin 27)))
+    (net (code 88) (name /gpio/P28)
       (node (ref J1) (pin 28))
       (node (ref U1) (pin A6)))
-    (net (code 99) (name /gpio/P22)
+    (net (code 89) (name /gpio/P22)
       (node (ref J1) (pin 22))
       (node (ref U1) (pin C6)))
-    (net (code 100) (name /gpio/P21)
-      (node (ref J1) (pin 21))
-      (node (ref U1) (pin C7)))
-    (net (code 101) (name /gpio/P20)
+    (net (code 90) (name /gpio/P21)
+      (node (ref U1) (pin C7))
+      (node (ref J1) (pin 21)))
+    (net (code 91) (name /gpio/P20)
       (node (ref J1) (pin 20))
       (node (ref U1) (pin E8)))
-    (net (code 102) (name /gpio/P19)
+    (net (code 92) (name /gpio/P19)
       (node (ref J1) (pin 19))
       (node (ref U1) (pin D8)))
-    (net (code 103) (name /gpio/P18)
+    (net (code 93) (name /gpio/P18)
       (node (ref J1) (pin 18))
       (node (ref U1) (pin C8)))
-    (net (code 104) (name /gpio/P17)
-      (node (ref J1) (pin 17))
-      (node (ref U1) (pin B8)))
-    (net (code 105) (name /gpio/P16)
+    (net (code 94) (name /gpio/P17)
+      (node (ref U1) (pin B8))
+      (node (ref J1) (pin 17)))
+    (net (code 95) (name /gpio/P16)
       (node (ref U1) (pin A7))
       (node (ref J1) (pin 16)))
-    (net (code 106) (name /gpio/P15)
+    (net (code 96) (name /gpio/P15)
       (node (ref J1) (pin 15))
       (node (ref U1) (pin A8)))
-    (net (code 107) (name /gpio/P13)
+    (net (code 97) (name /gpio/P13)
       (node (ref U1) (pin E9))
       (node (ref J1) (pin 13)))
-    (net (code 108) (name /gpio/P14)
-      (node (ref U1) (pin D9))
-      (node (ref J1) (pin 14)))
-    (net (code 109) (name /gpio/P12)
-      (node (ref J1) (pin 12))
-      (node (ref U1) (pin B9)))
-    (net (code 110) (name /gpio/P11)
+    (net (code 98) (name /gpio/P14)
+      (node (ref J1) (pin 14))
+      (node (ref U1) (pin D9)))
+    (net (code 99) (name /gpio/P12)
+      (node (ref U1) (pin B9))
+      (node (ref J1) (pin 12)))
+    (net (code 100) (name /gpio/P11)
       (node (ref J1) (pin 11))
       (node (ref U1) (pin C10)))
-    (net (code 111) (name /gpio/P9)
-      (node (ref U1) (pin B10))
-      (node (ref J1) (pin 9)))
-    (net (code 112) (name /gpio/P10)
+    (net (code 101) (name /gpio/P9)
+      (node (ref J1) (pin 9))
+      (node (ref U1) (pin B10)))
+    (net (code 102) (name /gpio/P10)
       (node (ref U1) (pin A9))
       (node (ref J1) (pin 10)))
-    (net (code 113) (name /gpio/P8)
-      (node (ref U1) (pin A11))
-      (node (ref J1) (pin 8)))
-    (net (code 114) (name /gpio/P7)
+    (net (code 103) (name /gpio/P8)
+      (node (ref J1) (pin 8))
+      (node (ref U1) (pin A11)))
+    (net (code 104) (name /gpio/P7)
       (node (ref U1) (pin A10))
       (node (ref J1) (pin 7)))
-    (net (code 115) (name /gpio/P5)
+    (net (code 105) (name /gpio/P5)
       (node (ref U1) (pin B11))
       (node (ref J1) (pin 5)))
-    (net (code 116) (name /gpio/P6)
+    (net (code 106) (name /gpio/P6)
       (node (ref U1) (pin C11))
       (node (ref J1) (pin 6)))
-    (net (code 117) (name /gpio/USB5V)
+    (net (code 107) (name /gpio/USB5V)
       (node (ref D52) (pin 2)))
-    (net (code 118) (name /gpio/OUT5V)
-      (node (ref J1) (pin 2))
-      (node (ref D52) (pin 1)))
-    (net (code 119) (name +5V)
-      (node (ref D51) (pin 1))
-      (node (ref D8) (pin 1))
+    (net (code 108) (name /gpio/OUT5V)
+      (node (ref D52) (pin 1))
+      (node (ref J1) (pin 2)))
+    (net (code 109) (name /gpio/IN5V)
+      (node (ref J1) (pin 1))
+      (node (ref D51) (pin 2)))
+    (net (code 110) (name +5V)
+      (node (ref C5) (pin 1))
+      (node (ref U5) (pin 4))
+      (node (ref U4) (pin 4))
       (node (ref C1) (pin 1))
       (node (ref U3) (pin 4))
-      (node (ref R1) (pin 1))
-      (node (ref GPDI1) (pin 19))
-      (node (ref D9) (pin 2))
       (node (ref C9) (pin 1))
-      (node (ref U5) (pin 4))
-      (node (ref U4) (pin 4))
-      (node (ref C5) (pin 1)))
-    (net (code 120) (name /gpio/IN5V)
-      (node (ref J1) (pin 1))
-      (node (ref D51) (pin 2)))
-    (net (code 121) (name +1V2)
+      (node (ref D9) (pin 2))
+      (node (ref R1) (pin 1))
+      (node (ref D51) (pin 1))
+      (node (ref D8) (pin 1))
+      (node (ref GPDI1) (pin 19)))
+    (net (code 111) (name "Net-(L2-Pad1)")
+      (node (ref U4) (pin 3))
+      (node (ref L2) (pin 1)))
+    (net (code 112) (name "Net-(L1-Pad1)")
+      (node (ref U3) (pin 3))
+      (node (ref L1) (pin 1)))
+    (net (code 113) (name +1V2)
+      (node (ref U1) (pin N9))
+      (node (ref U1) (pin N8))
+      (node (ref U1) (pin M8))
       (node (ref U1) (pin L8))
-      (node (ref C4) (pin 1))
-      (node (ref C3) (pin 1))
-      (node (ref RA1) (pin 1))
-      (node (ref L1) (pin 2))
-      (node (ref C2) (pin 1))
-      (node (ref U1) (pin H9))
       (node (ref U1) (pin K8))
-      (node (ref U1) (pin N9))
+      (node (ref U1) (pin J8))
+      (node (ref U1) (pin H11))
       (node (ref U1) (pin H10))
       (node (ref U1) (pin N10))
       (node (ref U1) (pin H8))
-      (node (ref U1) (pin J8))
+      (node (ref U1) (pin H9))
+      (node (ref U1) (pin H13))
+      (node (ref U1) (pin J13))
+      (node (ref U1) (pin K13))
+      (node (ref U1) (pin L13))
+      (node (ref U1) (pin M13))
+      (node (ref U1) (pin N13))
       (node (ref U1) (pin H12))
       (node (ref U1) (pin N11))
-      (node (ref U1) (pin H11))
-      (node (ref U1) (pin N13))
-      (node (ref U1) (pin M13))
-      (node (ref U1) (pin L13))
-      (node (ref U1) (pin K13))
-      (node (ref U1) (pin H13))
       (node (ref U1) (pin N12))
-      (node (ref U1) (pin J13))
-      (node (ref U1) (pin M8))
-      (node (ref U1) (pin N8)))
-    (net (code 122) (name "Net-(L1-Pad1)")
-      (node (ref U3) (pin 3))
-      (node (ref L1) (pin 1)))
-    (net (code 123) (name /power/FB1)
+      (node (ref C2) (pin 1))
+      (node (ref L1) (pin 2))
+      (node (ref C4) (pin 1))
+      (node (ref C3) (pin 1))
+      (node (ref RA1) (pin 1)))
+    (net (code 114) (name /power/PWREN)
+      (node (ref R1) (pin 2))
+      (node (ref U3) (pin 1))
+      (node (ref U4) (pin 1))
+      (node (ref U5) (pin 1)))
+    (net (code 115) (name /power/FB1)
+      (node (ref RB1) (pin 2))
       (node (ref U3) (pin 5))
       (node (ref C2) (pin 2))
-      (node (ref RA1) (pin 2))
-      (node (ref RB1) (pin 2)))
-    (net (code 124) (name +2V5)
-      (node (ref RA2) (pin 1))
-      (node (ref C10) (pin 1))
-      (node (ref L3) (pin 2))
+      (node (ref RA1) (pin 2)))
+    (net (code 116) (name /power/FB2)
+      (node (ref U5) (pin 5))
+      (node (ref RB2) (pin 2))
+      (node (ref RA2) (pin 2))
+      (node (ref C10) (pin 2)))
+    (net (code 117) (name +2V5)
       (node (ref U1) (pin P15))
       (node (ref U1) (pin F15))
-      (node (ref C12) (pin 1))
-      (node (ref C11) (pin 1))
+      (node (ref U7) (pin 8))
+      (node (ref L3) (pin 2))
+      (node (ref C10) (pin 1))
+      (node (ref U1) (pin P6))
+      (node (ref RA2) (pin 1))
       (node (ref U1) (pin F6))
-      (node (ref U1) (pin P6)))
-    (net (code 125) (name /power/FB2)
-      (node (ref RB2) (pin 2))
-      (node (ref RA2) (pin 2))
-      (node (ref C10) (pin 2))
-      (node (ref U5) (pin 5)))
-    (net (code 126) (name "Net-(L3-Pad1)")
-      (node (ref L3) (pin 1))
-      (node (ref U5) (pin 3)))
-    (net (code 127) (name /power/PWREN)
-      (node (ref U5) (pin 1))
-      (node (ref R1) (pin 2))
-      (node (ref U3) (pin 1))
-      (node (ref U4) (pin 1)))
-    (net (code 128) (name "Net-(L2-Pad1)")
-      (node (ref L2) (pin 1))
-      (node (ref U4) (pin 3)))
-    (net (code 129) (name /power/FB3)
+      (node (ref C11) (pin 1))
+      (node (ref C12) (pin 1)))
+    (net (code 118) (name "Net-(U7-Pad2)")
+      (node (ref U7) (pin 2))
+      (node (ref Y1) (pin 2)))
+    (net (code 119) (name "Net-(U7-Pad1)")
+      (node (ref U7) (pin 1))
+      (node (ref Y1) (pin 1)))
+    (net (code 120) (name /power/WAKEUPn)
+      (node (ref U7) (pin 7)))
+    (net (code 121) (name /power/VBAT)
+      (node (ref BT1) (pin 1))
+      (node (ref U7) (pin 3)))
+    (net (code 122) (name BOARD_SCL)
+      (node (ref U7) (pin 6)))
+    (net (code 123) (name BOARD_SDA)
+      (node (ref U7) (pin 5)))
+    (net (code 124) (name /power/FB3)
+      (node (ref RB3) (pin 2))
       (node (ref U4) (pin 5))
       (node (ref RA3) (pin 2))
-      (node (ref C6) (pin 2))
-      (node (ref RB3) (pin 2)))
-    (net (code 130) (name LED2)
-      (node (ref D2) (pin 2)))
-    (net (code 131) (name BTN_R)
+      (node (ref C6) (pin 2)))
+    (net (code 125) (name "Net-(L3-Pad1)")
+      (node (ref U5) (pin 3))
+      (node (ref L3) (pin 1)))
+    (net (code 126) (name LED1)
+      (node (ref D1) (pin 2)))
+    (net (code 127) (name BTN_R)
       (node (ref BTN6) (pin 2)))
-    (net (code 132) (name BTN_L)
+    (net (code 128) (name BTN_L)
       (node (ref BTN5) (pin 2)))
-    (net (code 133) (name LED7)
+    (net (code 129) (name LED7)
       (node (ref D7) (pin 2)))
-    (net (code 134) (name LED6)
+    (net (code 130) (name LED6)
       (node (ref D6) (pin 2)))
-    (net (code 135) (name LED5)
+    (net (code 131) (name LED5)
       (node (ref D5) (pin 2)))
-    (net (code 136) (name LED4)
+    (net (code 132) (name LED4)
       (node (ref D4) (pin 2)))
-    (net (code 137) (name LED3)
+    (net (code 133) (name LED3)
       (node (ref D3) (pin 2)))
-    (net (code 138) (name LED1)
-      (node (ref D1) (pin 2)))
-    (net (code 139) (name LED0)
+    (net (code 134) (name LED2)
+      (node (ref D2) (pin 2)))
+    (net (code 135) (name LED0)
       (node (ref D0) (pin 2)))
-    (net (code 140) (name OLED_RES)
-      (node (ref OLED1) (pin 5)))
-    (net (code 141) (name OLED_CS)
-      (node (ref OLED1) (pin 7)))
-    (net (code 142) (name "Net-(BTN1-Pad1)")
-      (node (ref BTN3) (pin 1))
-      (node (ref BTN1) (pin 1))
-      (node (ref BTN2) (pin 1))
-      (node (ref BTN4) (pin 1))
-      (node (ref R7) (pin 2))
-      (node (ref BTN6) (pin 1))
-      (node (ref BTN5) (pin 1)))
-    (net (code 143) (name OLED_DC)
+    (net (code 136) (name OLED_DC)
       (node (ref OLED1) (pin 6)))
-    (net (code 144) (name OLED_MOSI)
+    (net (code 137) (name OLED_CS)
+      (node (ref OLED1) (pin 7)))
+    (net (code 138) (name OLED_RES)
+      (node (ref OLED1) (pin 5)))
+    (net (code 139) (name OLED_MOSI)
       (node (ref OLED1) (pin 4)))
-    (net (code 145) (name OLED_CLK)
+    (net (code 140) (name OLED_CLK)
       (node (ref OLED1) (pin 3)))
-    (net (code 146) (name BTN_U)
+    (net (code 141) (name BTN_U)
       (node (ref BTN3) (pin 2)))
-    (net (code 147) (name BTN_D)
+    (net (code 142) (name BTN_D)
       (node (ref BTN4) (pin 2)))
-    (net (code 148) (name BTN_F2)
+    (net (code 143) (name "Net-(BTN1-Pad1)")
+      (node (ref R7) (pin 2))
+      (node (ref BTN1) (pin 1))
+      (node (ref BTN2) (pin 1))
+      (node (ref BTN5) (pin 1))
+      (node (ref BTN3) (pin 1))
+      (node (ref BTN6) (pin 1))
+      (node (ref BTN4) (pin 1)))
+    (net (code 144) (name BTN_F2)
       (node (ref BTN2) (pin 2)))
-    (net (code 149) (name BTN_F1)
+    (net (code 145) (name BTN_F1)
       (node (ref BTN1) (pin 2)))
-    (net (code 150) (name GPDI_SDA)
+    (net (code 146) (name GPDI_SDA)
       (node (ref GPDI1) (pin 18)))
-    (net (code 151) (name GPDI_SCL)
+    (net (code 147) (name GPDI_SCL)
       (node (ref GPDI1) (pin 17)))
-    (net (code 152) (name GPDI_CEC)
+    (net (code 148) (name GPDI_CEC)
       (node (ref GPDI1) (pin 15)))
-    (net (code 153) (name GPDI_CLK_N)
+    (net (code 149) (name GPDI_CLK_N)
       (node (ref GPDI1) (pin 14)))
-    (net (code 154) (name GPDI_CLK_P)
+    (net (code 150) (name GPDI_CLK_P)
       (node (ref GPDI1) (pin 12)))
-    (net (code 155) (name GPDI_D0_N)
+    (net (code 151) (name GPDI_D0_N)
       (node (ref GPDI1) (pin 11)))
-    (net (code 156) (name GPDI_D0_P)
+    (net (code 152) (name GPDI_D0_P)
       (node (ref GPDI1) (pin 9)))
-    (net (code 157) (name GPDI_D1_N)
+    (net (code 153) (name GPDI_D1_N)
       (node (ref GPDI1) (pin 8)))
-    (net (code 158) (name GPDI_D1_P)
+    (net (code 154) (name GPDI_D1_P)
       (node (ref GPDI1) (pin 6)))
-    (net (code 159) (name GPDI_D2_N)
+    (net (code 155) (name GPDI_D2_N)
       (node (ref GPDI1) (pin 5)))
-    (net (code 160) (name GPDI_D2_P)
+    (net (code 156) (name GPDI_D2_P)
       (node (ref GPDI1) (pin 3)))
-    (net (code 161) (name GPDI_ETH_P)
+    (net (code 157) (name GPDI_ETH_P)
       (node (ref GPDI1) (pin 2)))
-    (net (code 162) (name GPDI_ETH_N)
+    (net (code 158) (name GPDI_ETH_N)
       (node (ref GPDI1) (pin 1)))
-    (net (code 163) (name "Net-(U6-Pad42)")
+    (net (code 159) (name "Net-(U6-Pad42)")
       (node (ref U6) (pin 42)))
-    (net (code 164) (name "Net-(U6-Pad13)")
+    (net (code 160) (name "Net-(U6-Pad13)")
       (node (ref U6) (pin 13)))
-    (net (code 165) (name "Net-(U6-Pad23)")
+    (net (code 161) (name "Net-(U6-Pad23)")
       (node (ref U6) (pin 23)))
-    (net (code 166) (name "Net-(U6-Pad62)")
+    (net (code 162) (name "Net-(U6-Pad62)")
       (node (ref U6) (pin 62)))
-    (net (code 167) (name "Net-(U6-Pad52)")
+    (net (code 163) (name "Net-(U6-Pad52)")
       (node (ref U6) (pin 52)))
-    (net (code 168) (name "Net-(U6-Pad44)")
+    (net (code 164) (name "Net-(U6-Pad44)")
       (node (ref U6) (pin 44)))
-    (net (code 169) (name "Net-(U6-Pad33)")
+    (net (code 165) (name "Net-(U6-Pad33)")
       (node (ref U6) (pin 33)))
-    (net (code 170) (name "Net-(U6-Pad43)")
+    (net (code 166) (name "Net-(U6-Pad43)")
       (node (ref U6) (pin 43)))
-    (net (code 171) (name "Net-(U6-Pad53)")
+    (net (code 167) (name "Net-(U6-Pad53)")
       (node (ref U6) (pin 53)))
-    (net (code 172) (name "Net-(U6-Pad63)")
+    (net (code 168) (name "Net-(U6-Pad63)")
       (node (ref U6) (pin 63)))
-    (net (code 173) (name "Net-(U6-Pad14)")
+    (net (code 169) (name "Net-(U6-Pad14)")
       (node (ref U6) (pin 14)))
-    (net (code 174) (name "Net-(U6-Pad24)")
+    (net (code 170) (name "Net-(U6-Pad24)")
       (node (ref U6) (pin 24)))
-    (net (code 175) (name "Net-(U6-Pad34)")
+    (net (code 171) (name "Net-(U6-Pad34)")
       (node (ref U6) (pin 34)))
-    (net (code 176) (name "Net-(U6-Pad57)")
+    (net (code 172) (name "Net-(U6-Pad57)")
       (node (ref U6) (pin 57)))
-    (net (code 177) (name "Net-(U6-Pad32)")
+    (net (code 173) (name "Net-(U6-Pad32)")
       (node (ref U6) (pin 32)))
-    (net (code 178) (name "Net-(U6-Pad22)")
+    (net (code 174) (name "Net-(U6-Pad22)")
       (node (ref U6) (pin 22)))
-    (net (code 179) (name "Net-(U6-Pad12)")
+    (net (code 175) (name "Net-(U6-Pad12)")
       (node (ref U6) (pin 12)))
-    (net (code 180) (name "Net-(U6-Pad61)")
+    (net (code 176) (name "Net-(U6-Pad61)")
       (node (ref U6) (pin 61)))
-    (net (code 181) (name "Net-(U6-Pad51)")
+    (net (code 177) (name "Net-(U6-Pad51)")
       (node (ref U6) (pin 51)))
-    (net (code 182) (name "Net-(U6-Pad41)")
+    (net (code 178) (name "Net-(U6-Pad41)")
       (node (ref U6) (pin 41)))
-    (net (code 183) (name "Net-(U6-Pad31)")
+    (net (code 179) (name "Net-(U6-Pad31)")
       (node (ref U6) (pin 31)))
-    (net (code 184) (name "Net-(U6-Pad21)")
+    (net (code 180) (name "Net-(U6-Pad21)")
       (node (ref U6) (pin 21)))
-    (net (code 185) (name "Net-(U6-Pad11)")
+    (net (code 181) (name "Net-(U6-Pad11)")
       (node (ref U6) (pin 11)))
-    (net (code 186) (name "Net-(U6-Pad60)")
+    (net (code 182) (name "Net-(U6-Pad60)")
       (node (ref U6) (pin 60)))
-    (net (code 187) (name "Net-(U6-Pad50)")
+    (net (code 183) (name "Net-(U6-Pad50)")
       (node (ref U6) (pin 50)))
-    (net (code 188) (name "Net-(U6-Pad40)")
+    (net (code 184) (name "Net-(U6-Pad40)")
       (node (ref U6) (pin 40)))
-    (net (code 189) (name "Net-(U6-Pad30)")
+    (net (code 185) (name "Net-(U6-Pad30)")
       (node (ref U6) (pin 30)))
-    (net (code 190) (name "Net-(U6-Pad27)")
+    (net (code 186) (name "Net-(U6-Pad27)")
       (node (ref U6) (pin 27)))
-    (net (code 191) (name "Net-(U6-Pad59)")
+    (net (code 187) (name "Net-(U6-Pad59)")
       (node (ref U6) (pin 59)))
-    (net (code 192) (name "Net-(U6-Pad49)")
+    (net (code 188) (name "Net-(U6-Pad49)")
       (node (ref U6) (pin 49)))
-    (net (code 193) (name "Net-(U6-Pad39)")
+    (net (code 189) (name "Net-(U6-Pad39)")
       (node (ref U6) (pin 39)))
-    (net (code 194) (name "Net-(U6-Pad29)")
+    (net (code 190) (name "Net-(U6-Pad29)")
       (node (ref U6) (pin 29)))
-    (net (code 195) (name "Net-(U6-Pad19)")
+    (net (code 191) (name "Net-(U6-Pad19)")
       (node (ref U6) (pin 19)))
-    (net (code 196) (name "Net-(U6-Pad58)")
+    (net (code 192) (name "Net-(U6-Pad58)")
       (node (ref U6) (pin 58)))
-    (net (code 197) (name "Net-(U6-Pad48)")
+    (net (code 193) (name "Net-(U6-Pad48)")
       (node (ref U6) (pin 48)))
-    (net (code 198) (name "Net-(U6-Pad38)")
+    (net (code 194) (name "Net-(U6-Pad38)")
       (node (ref U6) (pin 38)))
-    (net (code 199) (name "Net-(U6-Pad28)")
+    (net (code 195) (name "Net-(U6-Pad28)")
       (node (ref U6) (pin 28)))
-    (net (code 200) (name "Net-(U6-Pad18)")
+    (net (code 196) (name "Net-(U6-Pad18)")
       (node (ref U6) (pin 18)))
-    (net (code 201) (name "Net-(U6-Pad47)")
+    (net (code 197) (name "Net-(U6-Pad47)")
       (node (ref U6) (pin 47)))
-    (net (code 202) (name "Net-(U6-Pad37)")
+    (net (code 198) (name "Net-(U6-Pad37)")
       (node (ref U6) (pin 37)))
-    (net (code 203) (name "Net-(U6-Pad54)")
+    (net (code 199) (name "Net-(U6-Pad54)")
       (node (ref U6) (pin 54)))
-    (net (code 204) (name "Net-(U6-Pad17)")
+    (net (code 200) (name "Net-(U6-Pad17)")
       (node (ref U6) (pin 17)))
-    (net (code 205) (name "Net-(U6-Pad56)")
+    (net (code 201) (name "Net-(U6-Pad56)")
       (node (ref U6) (pin 56)))
-    (net (code 206) (name "Net-(U6-Pad46)")
+    (net (code 202) (name "Net-(U6-Pad46)")
       (node (ref U6) (pin 46)))
-    (net (code 207) (name "Net-(U6-Pad36)")
+    (net (code 203) (name "Net-(U6-Pad36)")
       (node (ref U6) (pin 36)))
-    (net (code 208) (name "Net-(U6-Pad26)")
+    (net (code 204) (name "Net-(U6-Pad26)")
       (node (ref U6) (pin 26)))
-    (net (code 209) (name "Net-(U6-Pad16)")
+    (net (code 205) (name "Net-(U6-Pad16)")
       (node (ref U6) (pin 16)))
-    (net (code 210) (name "Net-(U6-Pad55)")
+    (net (code 206) (name "Net-(U6-Pad55)")
       (node (ref U6) (pin 55)))
-    (net (code 211) (name "Net-(U6-Pad45)")
+    (net (code 207) (name "Net-(U6-Pad45)")
       (node (ref U6) (pin 45)))
-    (net (code 212) (name "Net-(U6-Pad35)")
+    (net (code 208) (name "Net-(U6-Pad35)")
       (node (ref U6) (pin 35)))
-    (net (code 213) (name "Net-(U6-Pad25)")
+    (net (code 209) (name "Net-(U6-Pad25)")
       (node (ref U6) (pin 25)))
-    (net (code 214) (name "Net-(U6-Pad15)")
+    (net (code 210) (name "Net-(U6-Pad15)")
       (node (ref U6) (pin 15)))
-    (net (code 215) (name "Net-(U6-Pad64)")
+    (net (code 211) (name "Net-(U6-Pad64)")
       (node (ref U6) (pin 64)))
-    (net (code 216) (name "Net-(US2-Pad6)")
+    (net (code 212) (name "Net-(US2-Pad6)")
       (node (ref US2) (pin 6)))
-    (net (code 217) (name "Net-(US2-Pad4)")
-      (node (ref US2) (pin 4)))
-    (net (code 218) (name "Net-(D9-Pad1)")
-      (node (ref D9) (pin 1))
-      (node (ref US2) (pin 1)))
-    (net (code 219) (name "Net-(US1-Pad6)")
+    (net (code 213) (name USB_FPGA_DP)
+      (node (ref US2) (pin 3)))
+    (net (code 214) (name USB_FPGA_DN)
+      (node (ref US2) (pin 2)))
+    (net (code 215) (name "Net-(D9-Pad1)")
+      (node (ref US2) (pin 1))
+      (node (ref D9) (pin 1)))
+    (net (code 216) (name "Net-(US1-Pad6)")
       (node (ref US1) (pin 6)))
-    (net (code 220) (name "Net-(U6-Pad10)")
+    (net (code 217) (name "Net-(US1-Pad4)")
+      (node (ref US1) (pin 4)))
+    (net (code 218) (name "Net-(U6-Pad10)")
       (node (ref U6) (pin 10)))
-    (net (code 221) (name /usb/USB5V)
+    (net (code 219) (name /usb/USB5V)
       (node (ref US1) (pin 1))
       (node (ref D8) (pin 2)))
-    (net (code 222) (name "Net-(U6-Pad20)")
+    (net (code 220) (name "Net-(U6-Pad20)")
       (node (ref U6) (pin 20)))
-    (net (code 223) (name "Net-(U6-Pad9)")
+    (net (code 221) (name "Net-(U6-Pad9)")
       (node (ref U6) (pin 9)))
-    (net (code 224) (name "Net-(U6-Pad8)")
+    (net (code 222) (name "Net-(U6-Pad8)")
       (node (ref U6) (pin 8)))
-    (net (code 225) (name "Net-(U6-Pad7)")
+    (net (code 223) (name "Net-(U6-Pad7)")
       (node (ref U6) (pin 7)))
-    (net (code 226) (name "Net-(U6-Pad6)")
+    (net (code 224) (name "Net-(U6-Pad6)")
       (node (ref U6) (pin 6)))
-    (net (code 227) (name "Net-(U6-Pad5)")
+    (net (code 225) (name "Net-(U6-Pad5)")
       (node (ref U6) (pin 5)))
-    (net (code 228) (name "Net-(U6-Pad4)")
+    (net (code 226) (name "Net-(U6-Pad4)")
       (node (ref U6) (pin 4)))
-    (net (code 229) (name "Net-(U6-Pad3)")
+    (net (code 227) (name "Net-(U6-Pad3)")
       (node (ref U6) (pin 3)))
-    (net (code 230) (name "Net-(U6-Pad2)")
+    (net (code 228) (name "Net-(U6-Pad2)")
       (node (ref U6) (pin 2)))
-    (net (code 231) (name "Net-(U6-Pad1)")
+    (net (code 229) (name "Net-(U6-Pad1)")
       (node (ref U6) (pin 1)))
-    (net (code 232) (name "Net-(US1-Pad4)")
-      (node (ref US1) (pin 4)))
-    (net (code 233) (name USB_FTDI_DN)
+    (net (code 230) (name "Net-(US2-Pad4)")
+      (node (ref US2) (pin 4)))
+    (net (code 231) (name USB_FTDI_DN)
       (node (ref US1) (pin 2)))
-    (net (code 234) (name USB_FTDI_DP)
+    (net (code 232) (name USB_FTDI_DP)
       (node (ref US1) (pin 3)))
-    (net (code 235) (name USB_FPGA_DN)
-      (node (ref US2) (pin 2)))
-    (net (code 236) (name USB_FPGA_DP)
-      (node (ref US2) (pin 3)))
-    (net (code 237) (name "Net-(IC1-Pad24)")
+    (net (code 233) (name WIFI_RXD)
+      (node (ref U2) (pin 21)))
+    (net (code 234) (name WIFI_TXD)
+      (node (ref U2) (pin 22)))
+    (net (code 235) (name WIFI_GPIO0)
+      (node (ref U2) (pin 18)))
+    (net (code 236) (name WIFI_GPIO2)
+      (node (ref U2) (pin 17)))
+    (net (code 237) (name WIFI_GPIO15)
+      (node (ref U2) (pin 16)))
+    (net (code 238) (name WIFI_PD)
+      (node (ref U2) (pin 3)))
+    (net (code 239) (name WIFI_RESET)
+      (node (ref U2) (pin 1)))
+    (net (code 240) (name "Net-(U2-Pad2)")
+      (node (ref U2) (pin 2)))
+    (net (code 241) (name "Net-(U2-Pad20)")
+      (node (ref U2) (pin 20)))
+    (net (code 242) (name "Net-(U2-Pad19)")
+      (node (ref U2) (pin 19)))
+    (net (code 243) (name "Net-(IC1-Pad24)")
       (node (ref IC1) (pin 24)))
-    (net (code 238) (name "Net-(IC1-Pad34)")
+    (net (code 244) (name "Net-(IC1-Pad34)")
       (node (ref IC1) (pin 34)))
-    (net (code 239) (name "Net-(IC1-Pad44)")
+    (net (code 245) (name "Net-(IC1-Pad44)")
       (node (ref IC1) (pin 44)))
-    (net (code 240) (name "Net-(IC1-Pad54)")
+    (net (code 246) (name "Net-(IC1-Pad54)")
       (node (ref IC1) (pin 54)))
-    (net (code 241) (name "Net-(IC1-Pad25)")
+    (net (code 247) (name "Net-(IC1-Pad25)")
       (node (ref IC1) (pin 25)))
-    (net (code 242) (name "Net-(IC1-Pad35)")
+    (net (code 248) (name "Net-(IC1-Pad35)")
       (node (ref IC1) (pin 35)))
-    (net (code 243) (name "Net-(IC1-Pad16)")
+    (net (code 249) (name "Net-(IC1-Pad16)")
       (node (ref IC1) (pin 16)))
-    (net (code 244) (name "Net-(IC1-Pad26)")
+    (net (code 250) (name "Net-(IC1-Pad26)")
       (node (ref IC1) (pin 26)))
-    (net (code 245) (name "Net-(IC1-Pad46)")
+    (net (code 251) (name "Net-(IC1-Pad46)")
       (node (ref IC1) (pin 46)))
-    (net (code 246) (name "Net-(IC1-Pad17)")
+    (net (code 252) (name "Net-(IC1-Pad17)")
       (node (ref IC1) (pin 17)))
-    (net (code 247) (name "Net-(IC1-Pad27)")
+    (net (code 253) (name "Net-(IC1-Pad27)")
       (node (ref IC1) (pin 27)))
-    (net (code 248) (name "Net-(IC1-Pad37)")
+    (net (code 254) (name "Net-(IC1-Pad37)")
       (node (ref IC1) (pin 37)))
-    (net (code 249) (name "Net-(IC1-Pad18)")
+    (net (code 255) (name "Net-(IC1-Pad18)")
       (node (ref IC1) (pin 18)))
-    (net (code 250) (name "Net-(IC1-Pad28)")
+    (net (code 256) (name "Net-(IC1-Pad28)")
       (node (ref IC1) (pin 28)))
-    (net (code 251) (name "Net-(IC1-Pad38)")
+    (net (code 257) (name "Net-(IC1-Pad38)")
       (node (ref IC1) (pin 38)))
-    (net (code 252) (name "Net-(IC1-Pad19)")
+    (net (code 258) (name "Net-(IC1-Pad19)")
       (node (ref IC1) (pin 19)))
-    (net (code 253) (name "Net-(IC1-Pad29)")
+    (net (code 259) (name "Net-(IC1-Pad29)")
       (node (ref IC1) (pin 29)))
-    (net (code 254) (name "Net-(IC1-Pad39)")
+    (net (code 260) (name "Net-(IC1-Pad39)")
       (node (ref IC1) (pin 39)))
-    (net (code 255) (name "Net-(IC1-Pad49)")
+    (net (code 261) (name "Net-(IC1-Pad49)")
       (node (ref IC1) (pin 49)))
-    (net (code 256) (name "Net-(IC1-Pad21)")
+    (net (code 262) (name "Net-(IC1-Pad21)")
       (node (ref IC1) (pin 21)))
-    (net (code 257) (name "Net-(IC1-Pad1)")
+    (net (code 263) (name "Net-(IC1-Pad1)")
       (node (ref IC1) (pin 1)))
-    (net (code 258) (name "Net-(IC1-Pad3)")
+    (net (code 264) (name "Net-(IC1-Pad3)")
       (node (ref IC1) (pin 3)))
-    (net (code 259) (name "Net-(IC1-Pad5)")
+    (net (code 265) (name "Net-(IC1-Pad5)")
       (node (ref IC1) (pin 5)))
-    (net (code 260) (name "Net-(IC1-Pad6)")
+    (net (code 266) (name "Net-(IC1-Pad6)")
       (node (ref IC1) (pin 6)))
-    (net (code 261) (name "Net-(IC1-Pad9)")
+    (net (code 267) (name "Net-(IC1-Pad9)")
       (node (ref IC1) (pin 9)))
-    (net (code 262) (name "Net-(IC1-Pad20)")
+    (net (code 268) (name "Net-(IC1-Pad20)")
       (node (ref IC1) (pin 20)))
-    (net (code 263) (name "Net-(IC1-Pad30)")
+    (net (code 269) (name "Net-(IC1-Pad30)")
       (node (ref IC1) (pin 30)))
-    (net (code 264) (name "Net-(IC1-Pad50)")
+    (net (code 270) (name "Net-(IC1-Pad50)")
       (node (ref IC1) (pin 50)))
-    (net (code 265) (name "Net-(IC1-Pad11)")
+    (net (code 271) (name "Net-(IC1-Pad11)")
       (node (ref IC1) (pin 11)))
-    (net (code 266) (name "Net-(IC1-Pad14)")
+    (net (code 272) (name "Net-(IC1-Pad14)")
       (node (ref IC1) (pin 14)))
-    (net (code 267) (name "Net-(IC1-Pad31)")
+    (net (code 273) (name "Net-(IC1-Pad31)")
       (node (ref IC1) (pin 31)))
-    (net (code 268) (name "Net-(IC1-Pad41)")
+    (net (code 274) (name "Net-(IC1-Pad41)")
       (node (ref IC1) (pin 41)))
-    (net (code 269) (name "Net-(IC1-Pad12)")
+    (net (code 275) (name "Net-(IC1-Pad12)")
       (node (ref IC1) (pin 12)))
-    (net (code 270) (name "Net-(IC1-Pad22)")
+    (net (code 276) (name "Net-(IC1-Pad22)")
       (node (ref IC1) (pin 22)))
-    (net (code 271) (name "Net-(IC1-Pad32)")
+    (net (code 277) (name "Net-(IC1-Pad32)")
       (node (ref IC1) (pin 32)))
-    (net (code 272) (name "Net-(IC1-Pad52)")
+    (net (code 278) (name "Net-(IC1-Pad52)")
       (node (ref IC1) (pin 52)))
-    (net (code 273) (name "Net-(IC1-Pad23)")
+    (net (code 279) (name "Net-(IC1-Pad23)")
       (node (ref IC1) (pin 23)))
-    (net (code 274) (name "Net-(IC1-Pad33)")
+    (net (code 280) (name "Net-(IC1-Pad33)")
       (node (ref IC1) (pin 33)))
-    (net (code 275) (name "Net-(IC1-Pad43)")
+    (net (code 281) (name "Net-(IC1-Pad43)")
       (node (ref IC1) (pin 43)))))
\ No newline at end of file
diff --git a/ulx3s.sch b/ulx3s.sch
index 4c321be..d9976ce 100644
--- a/ulx3s.sch
+++ b/ulx3s.sch
@@ -49,55 +49,21 @@ Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
-$Comp
-L ESP-12E U2
-U 1 1 56AC980A
-P 3200 4550
-F 0 "U2" H 3200 4450 50  0000 C CNN
-F 1 "ESP-12E" H 3200 4650 50  0000 C CNN
-F 2 "ESP8266:ESP-12E" H 3200 4550 50  0001 C CNN
-F 3 "" H 3200 4550 50  0001 C CNN
-	1    3200 4550
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	2300 4650 1900 4650
-Text Label 1950 4650 0    60   ~ 0
-TDO
-Wire Wire Line
-	2300 4550 1900 4550
-Text Label 1950 4550 0    60   ~ 0
-TDI
 Wire Wire Line
-	1900 4750 2300 4750
-Text Label 1950 4750 0    60   ~ 0
-TCK
+	2000 4650 1900 4650
 Wire Wire Line
-	1900 4850 2300 4850
-Text Label 1950 4850 0    60   ~ 0
-TMS
+	2000 4550 1900 4550
 Wire Wire Line
-	4100 4950 4200 4950
-$Comp
-L GND #PWR01
-U 1 1 56ACA1D2
-P 4200 4950
-F 0 "#PWR01" H 4200 4700 50  0001 C CNN
-F 1 "GND" H 4200 4800 50  0000 C CNN
-F 2 "" H 4200 4950 60  0000 C CNN
-F 3 "" H 4200 4950 60  0000 C CNN
-	1    4200 4950
-	0    -1   -1   0   
-$EndComp
+	1900 4850 2000 4850
 $Comp
 L SD_Card SD1
 U 1 1 56ACBF19
-P 2300 6600
-F 0 "SD1" H 1650 7150 50  0000 C CNN
-F 1 "SD_Card" H 2900 6050 50  0000 C CNN
-F 2 "micro-sd:MicroSD_TF02D" H 2500 6950 50  0000 C CNN
-F 3 "" H 2300 6600 60  0000 C CNN
-	1    2300 6600
+P 3300 6250
+F 0 "SD1" H 2650 6800 50  0000 C CNN
+F 1 "SD_Card" H 3900 5700 50  0000 C CNN
+F 2 "micro-sd:MicroSD_TF02D" H 3500 6600 50  0000 C CNN
+F 3 "" H 3300 6250 60  0000 C CNN
+	1    3300 6250
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -123,53 +89,17 @@ F 3 "" H 150 5650 60  0000 C CNN
 	-1   0    0    -1  
 $EndComp
 Wire Wire Line
-	2950 5450 2950 5700
-Text Label 2950 5650 1    60   ~ 0
-MTDO
-Wire Wire Line
-	3050 5450 3050 5700
-Wire Wire Line
-	3150 5450 3150 5700
-Wire Wire Line
-	3250 5450 3250 5700
-Wire Wire Line
-	3350 5450 3350 5700
-Wire Wire Line
-	3450 5450 3450 5700
-Text Label 3050 5650 1    60   ~ 0
-MTDI
-Text Label 3150 5650 1    60   ~ 0
-SD_3
-Text Label 3250 5650 1    60   ~ 0
-MTMS
-Text Label 3350 5650 1    60   ~ 0
-MTCK
-Text Label 3450 5650 1    60   ~ 0
-SD_2
-Wire Wire Line
-	1400 6200 1050 6200
-Text Label 1100 6200 0    60   ~ 0
-SD_2
+	2400 5850 2300 5850
 Wire Wire Line
-	1050 6300 1400 6300
-Text Label 1100 6300 0    60   ~ 0
-SD_3
+	2300 5950 2400 5950
 Wire Wire Line
-	1050 6400 1400 6400
-Text Label 1100 6400 0    60   ~ 0
-MTMS
+	2300 6050 2400 6050
 Wire Wire Line
-	1400 6700 1050 6700
-Text Label 1100 6700 0    60   ~ 0
-MTCK
+	2400 6350 2300 6350
 Wire Wire Line
-	1050 6900 1400 6900
-Text Label 1100 6900 0    60   ~ 0
-MTDO
+	2300 6550 2400 6550
 Wire Wire Line
-	1050 7000 1400 7000
-Text Label 1100 7000 0    60   ~ 0
-MTDI
+	2300 6650 2400 6650
 $Sheet
 S 7000 5250 750  450 
 U 56AC389C
@@ -183,89 +113,68 @@ F0 "power" 60
 F1 "power.sch" 60
 $EndSheet
 Wire Wire Line
-	2250 4950 2300 4950
-Wire Wire Line
-	4100 4250 4600 4250
-Text Label 4150 4250 0    60   ~ 0
-WIFI_TXD
-Wire Wire Line
-	4100 4350 4600 4350
-Text Label 4150 4350 0    60   ~ 0
-WIFI_RXD
-Wire Wire Line
-	1050 6500 1400 6500
+	1850 6150 2400 6150
 Wire Wire Line
-	900  6600 1400 6600
+	1700 6250 2400 6250
 Wire Wire Line
-	1050 6800 1400 6800
+	1850 6450 2400 6450
 $Comp
-L GND #PWR02
+L GND #PWR01
 U 1 1 58D58197
-P 1050 6500
-F 0 "#PWR02" H 1050 6250 50  0001 C CNN
-F 1 "GND" H 1050 6350 50  0000 C CNN
-F 2 "" H 1050 6500 50  0000 C CNN
-F 3 "" H 1050 6500 50  0000 C CNN
-	1    1050 6500
+P 1850 6150
+F 0 "#PWR01" H 1850 5900 50  0001 C CNN
+F 1 "GND" H 1850 6000 50  0000 C CNN
+F 2 "" H 1850 6150 50  0000 C CNN
+F 3 "" H 1850 6150 50  0000 C CNN
+	1    1850 6150
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR03
+L GND #PWR02
 U 1 1 58D581BF
-P 1050 6800
-F 0 "#PWR03" H 1050 6550 50  0001 C CNN
-F 1 "GND" H 1050 6650 50  0000 C CNN
-F 2 "" H 1050 6800 50  0000 C CNN
-F 3 "" H 1050 6800 50  0000 C CNN
-	1    1050 6800
+P 1850 6450
+F 0 "#PWR02" H 1850 6200 50  0001 C CNN
+F 1 "GND" H 1850 6300 50  0000 C CNN
+F 2 "" H 1850 6450 50  0000 C CNN
+F 3 "" H 1850 6450 50  0000 C CNN
+	1    1850 6450
 	0    1    1    0   
 $EndComp
 Wire Wire Line
-	3200 6400 3600 6400
-Text Label 3250 6400 0    60   ~ 0
+	4200 6050 4600 6050
+Text Label 4250 6050 0    60   ~ 0
 SD_CD
 Wire Wire Line
-	3200 6500 3600 6500
-Text Label 3250 6500 0    60   ~ 0
+	4200 6150 4600 6150
+Text Label 4250 6150 0    60   ~ 0
 SD_WP
 $Comp
-L GND #PWR04
+L GND #PWR03
 U 1 1 58D58733
-P 3300 6900
-F 0 "#PWR04" H 3300 6650 50  0001 C CNN
-F 1 "GND" H 3300 6750 50  0000 C CNN
-F 2 "" H 3300 6900 50  0000 C CNN
-F 3 "" H 3300 6900 50  0000 C CNN
-	1    3300 6900
+P 4300 6550
+F 0 "#PWR03" H 4300 6300 50  0001 C CNN
+F 1 "GND" H 4300 6400 50  0000 C CNN
+F 2 "" H 4300 6550 50  0000 C CNN
+F 3 "" H 4300 6550 50  0000 C CNN
+	1    4300 6550
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	3200 6700 3300 6700
+	4200 6350 4300 6350
 Wire Wire Line
-	3300 6700 3300 6900
+	4300 6350 4300 6550
 Wire Wire Line
-	3200 6800 3300 6800
-Connection ~ 3300 6800
-$Comp
-L +3V3 #PWR05
-U 1 1 58D5F08C
-P 2250 4950
-F 0 "#PWR05" H 2250 4800 50  0001 C CNN
-F 1 "+3V3" H 2250 5090 50  0000 C CNN
-F 2 "" H 2250 4950 50  0000 C CNN
-F 3 "" H 2250 4950 50  0000 C CNN
-	1    2250 4950
-	0    -1   -1   0   
-$EndComp
+	4200 6450 4300 6450
+Connection ~ 4300 6450
 $Comp
-L +3V3 #PWR06
+L +3V3 #PWR04
 U 1 1 58D5F123
-P 900 6600
-F 0 "#PWR06" H 900 6450 50  0001 C CNN
-F 1 "+3V3" H 900 6740 50  0000 C CNN
-F 2 "" H 900 6600 50  0000 C CNN
-F 3 "" H 900 6600 50  0000 C CNN
-	1    900  6600
+P 1700 6250
+F 0 "#PWR04" H 1700 6100 50  0001 C CNN
+F 1 "+3V3" H 1700 6390 50  0000 C CNN
+F 2 "" H 1700 6250 50  0000 C CNN
+F 3 "" H 1700 6250 50  0000 C CNN
+	1    1700 6250
 	0    -1   -1   0   
 $EndComp
 $Sheet
@@ -300,4 +209,30 @@ U 58D6D507
 F0 "ram" 60
 F1 "ram.sch" 60
 $EndSheet
+Text GLabel 2000 4550 2    60   Input ~ 0
+JTAG_TDI
+Text GLabel 2000 4650 2    60   Input ~ 0
+JTAG_TDO
+Text GLabel 2000 4750 2    60   Input ~ 0
+JTAG_TCK
+Text GLabel 2000 4850 2    60   Input ~ 0
+JTAG_TMS
+Wire Wire Line
+	1900 4750 2000 4750
+Text GLabel 2300 5850 0    60   Input ~ 0
+SD_2
+Text GLabel 2300 5950 0    60   Input ~ 0
+SD_3
+Text GLabel 2300 6050 0    60   Input ~ 0
+SD_MTMS
+Text GLabel 2300 6350 0    60   Input ~ 0
+SD_MTCK
+Text GLabel 2300 6550 0    60   Input ~ 0
+SD_MTDO
+Text GLabel 2300 6650 0    60   Input ~ 0
+SD_MTDI
+Text GLabel 4600 6050 2    60   Input ~ 0
+SD_CD
+Text GLabel 4600 6150 2    60   Input ~ 0
+SD_WP
 $EndSCHEMATC
diff --git a/usb.bak b/usb.bak
index 347fc02..9cbec6e 100644
--- a/usb.bak
+++ b/usb.bak
@@ -65,10 +65,10 @@ Wire Wire Line
 Wire Wire Line
 	7600 1600 7650 1600
 $Comp
-L +5V #PWR058
+L +5V #PWR059
 U 1 1 58D6C83B
 P 7650 1600
-F 0 "#PWR058" H 7650 1450 50  0001 C CNN
+F 0 "#PWR059" H 7650 1450 50  0001 C CNN
 F 1 "+5V" H 7650 1740 50  0000 C CNN
 F 2 "" H 7650 1600 60  0000 C CNN
 F 3 "" H 7650 1600 60  0000 C CNN
@@ -93,10 +93,10 @@ $EndComp
 Wire Wire Line
 	6650 2450 7400 2450
 $Comp
-L +5V #PWR059
+L +5V #PWR060
 U 1 1 58D6C83D
 P 7700 2450
-F 0 "#PWR059" H 7700 2300 50  0001 C CNN
+F 0 "#PWR060" H 7700 2300 50  0001 C CNN
 F 1 "+5V" H 7700 2590 50  0000 C CNN
 F 2 "" H 7700 2450 60  0000 C CNN
 F 3 "" H 7700 2450 60  0000 C CNN
@@ -126,10 +126,10 @@ F 3 "" V 6300 2550 50  0000 C CNN
 	0    -1   1    0   
 $EndComp
 $Comp
-L GND #PWR060
+L GND #PWR061
 U 1 1 58D6C842
 P 6750 2000
-F 0 "#PWR060" H 6750 1750 50  0001 C CNN
+F 0 "#PWR061" H 6750 1750 50  0001 C CNN
 F 1 "GND" H 6750 1850 50  0000 C CNN
 F 2 "" H 6750 2000 50  0000 C CNN
 F 3 "" H 6750 2000 50  0000 C CNN
@@ -141,10 +141,10 @@ Wire Wire Line
 Wire Wire Line
 	6650 2850 6750 2850
 $Comp
-L GND #PWR061
+L GND #PWR062
 U 1 1 58D6C843
 P 6750 2850
-F 0 "#PWR061" H 6750 2600 50  0001 C CNN
+F 0 "#PWR062" H 6750 2600 50  0001 C CNN
 F 1 "GND" H 6750 2700 50  0000 C CNN
 F 2 "" H 6750 2850 50  0000 C CNN
 F 3 "" H 6750 2850 50  0000 C CNN
@@ -179,7 +179,7 @@ U 1 1 58D6FD91
 P 2950 3150
 F 0 "U6" H 2950 3200 60  0000 C CNN
 F 1 "FT2232H" H 2950 3100 60  0000 C CNN
-F 2 "Housings_DFN_QFN:QFN-64-1EP_9x9mm_Pitch0.5mm" H 2950 3150 60  0001 C CNN
+F 2 "Housings_DFN_QFN:QFN-56-1EP_7x7mm_Pitch0.4mm" H 2950 3150 60  0001 C CNN
 F 3 "" H 2950 3150 60  0001 C CNN
 	1    2950 3150
 	1    0    0    -1  
diff --git a/usb.sch b/usb.sch
index 7e84fcb..9cbec6e 100644
--- a/usb.sch
+++ b/usb.sch
@@ -65,10 +65,10 @@ Wire Wire Line
 Wire Wire Line
 	7600 1600 7650 1600
 $Comp
-L +5V #PWR058
+L +5V #PWR059
 U 1 1 58D6C83B
 P 7650 1600
-F 0 "#PWR058" H 7650 1450 50  0001 C CNN
+F 0 "#PWR059" H 7650 1450 50  0001 C CNN
 F 1 "+5V" H 7650 1740 50  0000 C CNN
 F 2 "" H 7650 1600 60  0000 C CNN
 F 3 "" H 7650 1600 60  0000 C CNN
@@ -93,10 +93,10 @@ $EndComp
 Wire Wire Line
 	6650 2450 7400 2450
 $Comp
-L +5V #PWR059
+L +5V #PWR060
 U 1 1 58D6C83D
 P 7700 2450
-F 0 "#PWR059" H 7700 2300 50  0001 C CNN
+F 0 "#PWR060" H 7700 2300 50  0001 C CNN
 F 1 "+5V" H 7700 2590 50  0000 C CNN
 F 2 "" H 7700 2450 60  0000 C CNN
 F 3 "" H 7700 2450 60  0000 C CNN
@@ -126,10 +126,10 @@ F 3 "" V 6300 2550 50  0000 C CNN
 	0    -1   1    0   
 $EndComp
 $Comp
-L GND #PWR060
+L GND #PWR061
 U 1 1 58D6C842
 P 6750 2000
-F 0 "#PWR060" H 6750 1750 50  0001 C CNN
+F 0 "#PWR061" H 6750 1750 50  0001 C CNN
 F 1 "GND" H 6750 1850 50  0000 C CNN
 F 2 "" H 6750 2000 50  0000 C CNN
 F 3 "" H 6750 2000 50  0000 C CNN
@@ -141,10 +141,10 @@ Wire Wire Line
 Wire Wire Line
 	6650 2850 6750 2850
 $Comp
-L GND #PWR061
+L GND #PWR062
 U 1 1 58D6C843
 P 6750 2850
-F 0 "#PWR061" H 6750 2600 50  0001 C CNN
+F 0 "#PWR062" H 6750 2600 50  0001 C CNN
 F 1 "GND" H 6750 2700 50  0000 C CNN
 F 2 "" H 6750 2850 50  0000 C CNN
 F 3 "" H 6750 2850 50  0000 C CNN
diff --git a/wifi.bak b/wifi.bak
index b237db1..2c2927d 100644
--- a/wifi.bak
+++ b/wifi.bak
@@ -39,14 +39,119 @@ EELAYER 25 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
-Sheet 1 8
-Title ""
+Sheet 7 8
+Title "ULX3S"
 Date ""
-Rev ""
-Comp ""
-Comment1 ""
+Rev "0.0.1"
+Comp "FER+RIZ+RADIONA"
+Comment1 "WIFI module ESP8266-12E"
 Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
+$Comp
+L ESP-12E U2
+U 1 1 58D75E1E
+P 3200 4550
+F 0 "U2" H 3200 4450 50  0000 C CNN
+F 1 "ESP-12E" H 3200 4650 50  0000 C CNN
+F 2 "ESP8266:ESP-12E" H 3200 4550 50  0001 C CNN
+F 3 "" H 3200 4550 50  0001 C CNN
+	1    3200 4550
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	2300 4650 2000 4650
+Wire Wire Line
+	2300 4550 2000 4550
+Wire Wire Line
+	2000 4750 2300 4750
+Wire Wire Line
+	2000 4850 2300 4850
+Wire Wire Line
+	4100 4950 4200 4950
+$Comp
+L GND #PWR063
+U 1 1 58D75E1F
+P 4200 4950
+F 0 "#PWR063" H 4200 4700 50  0001 C CNN
+F 1 "GND" H 4200 4800 50  0000 C CNN
+F 2 "" H 4200 4950 60  0000 C CNN
+F 3 "" H 4200 4950 60  0000 C CNN
+	1    4200 4950
+	0    -1   -1   0   
+$EndComp
+Wire Wire Line
+	2950 5450 2950 5700
+Wire Wire Line
+	3050 5450 3050 5700
+Wire Wire Line
+	3150 5450 3150 5700
+Wire Wire Line
+	3250 5450 3250 5700
+Wire Wire Line
+	3350 5450 3350 5700
+Wire Wire Line
+	3450 5450 3450 5700
+Wire Wire Line
+	2250 4950 2300 4950
+Wire Wire Line
+	4100 4250 4400 4250
+Wire Wire Line
+	4100 4350 4400 4350
+$Comp
+L +3V3 #PWR064
+U 1 1 58D75E28
+P 2250 4950
+F 0 "#PWR064" H 2250 4800 50  0001 C CNN
+F 1 "+3V3" H 2250 5090 50  0000 C CNN
+F 2 "" H 2250 4950 50  0000 C CNN
+F 3 "" H 2250 4950 50  0000 C CNN
+	1    2250 4950
+	0    -1   -1   0   
+$EndComp
+Text GLabel 2950 5700 3    60   Input ~ 0
+SD_MTDO
+Text GLabel 3050 5700 3    60   Input ~ 0
+SD_MTDI
+Text GLabel 3150 5700 3    60   Input ~ 0
+SD_3
+Text GLabel 3250 5700 3    60   Input ~ 0
+SD_MTMS
+Text GLabel 3350 5700 3    60   Input ~ 0
+SD_MTCK
+Text GLabel 3450 5700 3    60   Input ~ 0
+SD_2
+Text GLabel 4400 4350 2    60   Input ~ 0
+WIFI_RXD
+Text GLabel 4400 4250 2    60   Input ~ 0
+WIFI_TXD
+Text GLabel 4400 4650 2    60   Input ~ 0
+WIFI_GPIO0
+Text GLabel 4400 4750 2    60   Input ~ 0
+WIFI_GPIO2
+Text GLabel 4400 4850 2    60   Input ~ 0
+WIFI_GPIO15
+Wire Wire Line
+	4100 4650 4400 4650
+Wire Wire Line
+	4100 4750 4400 4750
+Wire Wire Line
+	4100 4850 4400 4850
+Text GLabel 2000 4550 0    60   Input ~ 0
+JTAG_TDI
+Text GLabel 2000 4650 0    60   Input ~ 0
+JTAG_TDO
+Text GLabel 2000 4750 0    60   Input ~ 0
+JTAG_TCK
+Text GLabel 2000 4850 0    60   Input ~ 0
+JTAG_TMS
+Text GLabel 2000 4450 0    60   Input ~ 0
+WIFI_PD
+Wire Wire Line
+	2000 4450 2300 4450
+Text GLabel 2000 4250 0    60   Input ~ 0
+WIFI_RESET
+Wire Wire Line
+	2000 4250 2300 4250
 $EndSCHEMATC
diff --git a/wifi.sch b/wifi.sch
index b237db1..2c2927d 100644
--- a/wifi.sch
+++ b/wifi.sch
@@ -39,14 +39,119 @@ EELAYER 25 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
-Sheet 1 8
-Title ""
+Sheet 7 8
+Title "ULX3S"
 Date ""
-Rev ""
-Comp ""
-Comment1 ""
+Rev "0.0.1"
+Comp "FER+RIZ+RADIONA"
+Comment1 "WIFI module ESP8266-12E"
 Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
+$Comp
+L ESP-12E U2
+U 1 1 58D75E1E
+P 3200 4550
+F 0 "U2" H 3200 4450 50  0000 C CNN
+F 1 "ESP-12E" H 3200 4650 50  0000 C CNN
+F 2 "ESP8266:ESP-12E" H 3200 4550 50  0001 C CNN
+F 3 "" H 3200 4550 50  0001 C CNN
+	1    3200 4550
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	2300 4650 2000 4650
+Wire Wire Line
+	2300 4550 2000 4550
+Wire Wire Line
+	2000 4750 2300 4750
+Wire Wire Line
+	2000 4850 2300 4850
+Wire Wire Line
+	4100 4950 4200 4950
+$Comp
+L GND #PWR063
+U 1 1 58D75E1F
+P 4200 4950
+F 0 "#PWR063" H 4200 4700 50  0001 C CNN
+F 1 "GND" H 4200 4800 50  0000 C CNN
+F 2 "" H 4200 4950 60  0000 C CNN
+F 3 "" H 4200 4950 60  0000 C CNN
+	1    4200 4950
+	0    -1   -1   0   
+$EndComp
+Wire Wire Line
+	2950 5450 2950 5700
+Wire Wire Line
+	3050 5450 3050 5700
+Wire Wire Line
+	3150 5450 3150 5700
+Wire Wire Line
+	3250 5450 3250 5700
+Wire Wire Line
+	3350 5450 3350 5700
+Wire Wire Line
+	3450 5450 3450 5700
+Wire Wire Line
+	2250 4950 2300 4950
+Wire Wire Line
+	4100 4250 4400 4250
+Wire Wire Line
+	4100 4350 4400 4350
+$Comp
+L +3V3 #PWR064
+U 1 1 58D75E28
+P 2250 4950
+F 0 "#PWR064" H 2250 4800 50  0001 C CNN
+F 1 "+3V3" H 2250 5090 50  0000 C CNN
+F 2 "" H 2250 4950 50  0000 C CNN
+F 3 "" H 2250 4950 50  0000 C CNN
+	1    2250 4950
+	0    -1   -1   0   
+$EndComp
+Text GLabel 2950 5700 3    60   Input ~ 0
+SD_MTDO
+Text GLabel 3050 5700 3    60   Input ~ 0
+SD_MTDI
+Text GLabel 3150 5700 3    60   Input ~ 0
+SD_3
+Text GLabel 3250 5700 3    60   Input ~ 0
+SD_MTMS
+Text GLabel 3350 5700 3    60   Input ~ 0
+SD_MTCK
+Text GLabel 3450 5700 3    60   Input ~ 0
+SD_2
+Text GLabel 4400 4350 2    60   Input ~ 0
+WIFI_RXD
+Text GLabel 4400 4250 2    60   Input ~ 0
+WIFI_TXD
+Text GLabel 4400 4650 2    60   Input ~ 0
+WIFI_GPIO0
+Text GLabel 4400 4750 2    60   Input ~ 0
+WIFI_GPIO2
+Text GLabel 4400 4850 2    60   Input ~ 0
+WIFI_GPIO15
+Wire Wire Line
+	4100 4650 4400 4650
+Wire Wire Line
+	4100 4750 4400 4750
+Wire Wire Line
+	4100 4850 4400 4850
+Text GLabel 2000 4550 0    60   Input ~ 0
+JTAG_TDI
+Text GLabel 2000 4650 0    60   Input ~ 0
+JTAG_TDO
+Text GLabel 2000 4750 0    60   Input ~ 0
+JTAG_TCK
+Text GLabel 2000 4850 0    60   Input ~ 0
+JTAG_TMS
+Text GLabel 2000 4450 0    60   Input ~ 0
+WIFI_PD
+Wire Wire Line
+	2000 4450 2300 4450
+Text GLabel 2000 4250 0    60   Input ~ 0
+WIFI_RESET
+Wire Wire Line
+	2000 4250 2300 4250
 $EndSCHEMATC