diff --git a/hardware/pcb/tomu-fpga.sch b/hardware/pcb/tomu-fpga.sch
index 53d76f3..e293932 100644
--- a/hardware/pcb/tomu-fpga.sch
+++ b/hardware/pcb/tomu-fpga.sch
@@ -114,23 +114,23 @@ $EndComp
 $Comp
 L power:+3V3 #PWR016
 U 1 1 5BD6FEE3
-P 2350 2000
-F 0 "#PWR016" H 2350 1850 50  0001 C CNN
-F 1 "+3V3" H 2365 2173 50  0000 C CNN
-F 2 "" H 2350 2000 50  0001 C CNN
-F 3 "" H 2350 2000 50  0001 C CNN
-	1    2350 2000
+P 2250 2000
+F 0 "#PWR016" H 2250 1850 50  0001 C CNN
+F 1 "+3V3" H 2265 2173 50  0000 C CNN
+F 2 "" H 2250 2000 50  0001 C CNN
+F 3 "" H 2250 2000 50  0001 C CNN
+	1    2250 2000
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:+1V2 #PWR015
 U 1 1 5BD6FF3E
-P 2350 900
-F 0 "#PWR015" H 2350 750 50  0001 C CNN
-F 1 "+1V2" H 2365 1073 50  0000 C CNN
-F 2 "" H 2350 900 50  0001 C CNN
-F 3 "" H 2350 900 50  0001 C CNN
-	1    2350 900 
+P 2250 900
+F 0 "#PWR015" H 2250 750 50  0001 C CNN
+F 1 "+1V2" H 2265 1073 50  0000 C CNN
+F 2 "" H 2250 900 50  0001 C CNN
+F 3 "" H 2250 900 50  0001 C CNN
+	1    2250 900 
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -153,10 +153,10 @@ $EndComp
 Wire Wire Line
 	2500 1000 2500 1050
 Wire Wire Line
-	2350 900  2350 1000
-Connection ~ 2350 1000
+	2250 900  2250 1000
+Connection ~ 2250 1000
 Wire Wire Line
-	2350 1000 2500 1000
+	2250 1000 2500 1000
 Wire Wire Line
 	2500 1400 2500 1250
 Wire Wire Line
@@ -166,10 +166,10 @@ Wire Wire Line
 Wire Wire Line
 	2500 2100 2500 2150
 Wire Wire Line
-	2350 2000 2350 2100
-Connection ~ 2350 2100
+	2250 2000 2250 2100
+Connection ~ 2250 2100
 Wire Wire Line
-	2350 2100 2500 2100
+	2250 2100 2500 2100
 Wire Wire Line
 	1300 3450 1350 3450
 Wire Wire Line
@@ -501,20 +501,20 @@ Wire Wire Line
 $Comp
 L power:+3V3 #PWR027
 U 1 1 5BE34C74
-P 6750 850
-F 0 "#PWR027" H 6750 700 50  0001 C CNN
-F 1 "+3V3" H 6765 1023 50  0000 C CNN
-F 2 "" H 6750 850 50  0001 C CNN
-F 3 "" H 6750 850 50  0001 C CNN
-	1    6750 850 
+P 6450 950
+F 0 "#PWR027" H 6450 800 50  0001 C CNN
+F 1 "+3V3" H 6465 1123 50  0000 C CNN
+F 2 "" H 6450 950 50  0001 C CNN
+F 3 "" H 6450 950 50  0001 C CNN
+	1    6450 950 
 	1    0    0    -1  
 $EndComp
 $Comp
 L tomu-fpga:PADS SW2
 U 1 1 5BE44C19
 P 5300 1200
-F 0 "SW2" H 5350 1650 50  0000 C CNN
-F 1 "Captouch Pads" H 5150 1750 50  0000 C CNN
+F 0 "SW2" V 5550 1500 50  0000 C CNN
+F 1 "Captouch Pads" V 5450 1300 50  0000 C CNN
 F 2 "tomu-fpga:captouch-edge" H 5350 1200 50  0001 C CNN
 F 3 "" H 5350 1200 50  0001 C CNN
 F 4 "DNP" H 5300 1200 50  0001 C CNN "MPN"
@@ -542,12 +542,12 @@ Wire Wire Line
 $Comp
 L power:+1V2 #PWR032
 U 1 1 5BE5ABB7
-P 8700 5000
-F 0 "#PWR032" H 8700 4850 50  0001 C CNN
-F 1 "+1V2" H 8715 5173 50  0000 C CNN
-F 2 "" H 8700 5000 50  0001 C CNN
-F 3 "" H 8700 5000 50  0001 C CNN
-	1    8700 5000
+P 8750 5050
+F 0 "#PWR032" H 8750 4900 50  0001 C CNN
+F 1 "+1V2" H 8765 5223 50  0000 C CNN
+F 2 "" H 8750 5050 50  0001 C CNN
+F 3 "" H 8750 5050 50  0001 C CNN
+	1    8750 5050
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -562,7 +562,7 @@ F 3 "" H 9300 5450 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	8700 5200 8700 5000
+	8750 5200 8750 5050
 Wire Wire Line
 	8850 1100 8850 1300
 Wire Notes Line
@@ -676,11 +676,11 @@ Wire Wire Line
 Wire Wire Line
 	2050 2500 2300 2500
 Wire Wire Line
-	2000 2100 2350 2100
+	2000 2100 2250 2100
 Wire Wire Line
 	2050 1400 2300 1400
 Wire Wire Line
-	2000 1000 2350 1000
+	2000 1000 2250 1000
 $Comp
 L power:+3V3 #PWR018
 U 1 1 5C488914
@@ -766,32 +766,30 @@ F 3 "" H 9500 6150 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	8700 5200 8850 5200
+	8750 5200 8850 5200
 $Comp
 L Device:C_Small C17
 U 1 1 5C64A110
-P 7950 5200
-F 0 "C17" H 8050 5200 50  0000 L CNN
-F 1 "0201, 1uF, 10V, X5R, 20%" H 7350 5100 50  0000 L CNN
-F 2 "tomu-fpga:C_0201_0603Metric" H 7950 5200 50  0001 C CNN
-F 3 "" H 7950 5200 50  0001 C CNN
-F 4 "ANY" H 150 100 50  0001 C CNN "MPN"
-F 5 "ANY" H 150 100 50  0001 C CNN "MYPN"
-F 6 "ANY" H 150 100 50  0001 C CNN "Manufacturer"
-F 7 "1u" H 0   0   50  0001 C CNN "Spice_Model"
-F 8 "Y" H 0   0   50  0001 C CNN "Spice_Netlist_Enabled"
-F 9 "C" H 0   0   50  0001 C CNN "Spice_Primitive"
-	1    7950 5200
+P 7950 5300
+F 0 "C17" H 8050 5300 50  0000 L CNN
+F 1 "0201, 1uF, 10V, X5R, 20%" H 7350 5200 50  0000 L CNN
+F 2 "tomu-fpga:C_0201_0603Metric" H 7950 5300 50  0001 C CNN
+F 3 "" H 7950 5300 50  0001 C CNN
+F 4 "ANY" H 150 200 50  0001 C CNN "MPN"
+F 5 "ANY" H 150 200 50  0001 C CNN "MYPN"
+F 6 "ANY" H 150 200 50  0001 C CNN "Manufacturer"
+F 7 "1u" H 0   100 50  0001 C CNN "Spice_Model"
+F 8 "Y" H 0   100 50  0001 C CNN "Spice_Netlist_Enabled"
+F 9 "C" H 0   100 50  0001 C CNN "Spice_Primitive"
+	1    7950 5300
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
 	8850 5300 8850 5200
 Connection ~ 8850 5200
-Connection ~ 8700 5200
+Connection ~ 8750 5200
 Wire Wire Line
 	8350 5200 8350 5100
-Wire Wire Line
-	8350 5100 7950 5100
 Wire Wire Line
 	8850 5500 8850 5600
 Wire Wire Line
@@ -800,70 +798,66 @@ Connection ~ 8600 5600
 Wire Wire Line
 	8600 5600 8600 5700
 Wire Wire Line
-	7950 5600 7950 5300
-Wire Wire Line
-	6750 1200 6450 1200
-Wire Wire Line
-	6750 850  6750 1200
+	7950 5600 7950 5400
 $Comp
 L power:+3V3 #PWR040
 U 1 1 5C7EE938
-P 10850 750
-F 0 "#PWR040" H 10850 600 50  0001 C CNN
-F 1 "+3V3" H 10700 800 50  0000 C CNN
-F 2 "" H 10850 750 50  0001 C CNN
-F 3 "" H 10850 750 50  0001 C CNN
-	1    10850 750 
+P 10450 950
+F 0 "#PWR040" H 10450 800 50  0001 C CNN
+F 1 "+3V3" H 10300 1000 50  0000 C CNN
+F 2 "" H 10450 950 50  0001 C CNN
+F 3 "" H 10450 950 50  0001 C CNN
+	1    10450 950 
 	1    0    0    -1  
 $EndComp
 $Comp
 L Device:C_Small C24
 U 1 1 5C7EE93E
-P 9450 950
-F 0 "C24" H 9300 850 50  0000 L CNN
-F 1 "0201, 1uF, 10V, X5R, 20%" H 8600 1050 50  0000 L CNN
-F 2 "tomu-fpga:C_0201_0603Metric" H 9450 950 50  0001 C CNN
-F 3 "" H 9450 950 50  0001 C CNN
-F 4 "ANY" H 200 100 50  0001 C CNN "MPN"
-F 5 "ANY" H 200 100 50  0001 C CNN "MYPN"
-F 6 "ANY" H 200 100 50  0001 C CNN "Manufacturer"
-F 7 "1u" H -450 0   50  0001 C CNN "Spice_Model"
-F 8 "Y" H -450 0   50  0001 C CNN "Spice_Netlist_Enabled"
-F 9 "C" H -450 0   50  0001 C CNN "Spice_Primitive"
-	1    9450 950 
+P 10200 1300
+F 0 "C24" H 9950 1300 50  0000 L CNN
+F 1 "0201, 1uF, 10V, X5R, 20%" H 9350 1400 50  0000 L CNN
+F 2 "tomu-fpga:C_0201_0603Metric" H 10200 1300 50  0001 C CNN
+F 3 "" H 10200 1300 50  0001 C CNN
+F 4 "ANY" H 950 450 50  0001 C CNN "MPN"
+F 5 "ANY" H 950 450 50  0001 C CNN "MYPN"
+F 6 "ANY" H 950 450 50  0001 C CNN "Manufacturer"
+F 7 "1u" H 300 350 50  0001 C CNN "Spice_Model"
+F 8 "Y" H 300 350 50  0001 C CNN "Spice_Netlist_Enabled"
+F 9 "C" H 300 350 50  0001 C CNN "Spice_Primitive"
+	1    10200 1300
 	1    0    0    -1  
 $EndComp
 $Comp
 L Device:C_Small C28
 U 1 1 5C7EE94A
-P 9900 950
-F 0 "C28" H 9750 1000 50  0000 L CNN
-F 1 "0201, 100nF, 10V, X5R, 20%" H 9700 850 50  0000 L CNN
-F 2 "tomu-fpga:C_0201_0603Metric" H 9900 950 50  0001 C CNN
-F 3 "" H 9900 950 50  0001 C CNN
-F 4 "ANY" H -50 100 50  0001 C CNN "MPN"
-F 5 "ANY" H -50 100 50  0001 C CNN "MYPN"
-F 6 "ANY" H -50 100 50  0001 C CNN "Manufacturer"
-F 7 "100n" H -700 0   50  0001 C CNN "Spice_Model"
-F 8 "Y" H -700 0   50  0001 C CNN "Spice_Netlist_Enabled"
-F 9 "C" H -700 0   50  0001 C CNN "Spice_Primitive"
-	1    9900 950 
+P 10650 1300
+F 0 "C28" H 10750 1300 50  0000 L CNN
+F 1 "0201, 100nF, 10V, X5R, 20%" H 9950 1200 50  0000 L CNN
+F 2 "tomu-fpga:C_0201_0603Metric" H 10650 1300 50  0001 C CNN
+F 3 "" H 10650 1300 50  0001 C CNN
+F 4 "ANY" H 700 450 50  0001 C CNN "MPN"
+F 5 "ANY" H 700 450 50  0001 C CNN "MYPN"
+F 6 "ANY" H 700 450 50  0001 C CNN "Manufacturer"
+F 7 "100n" H 50  350 50  0001 C CNN "Spice_Model"
+F 8 "Y" H 50  350 50  0001 C CNN "Spice_Netlist_Enabled"
+F 9 "C" H 50  350 50  0001 C CNN "Spice_Primitive"
+	1    10650 1300
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:GND #PWR039
 U 1 1 5C881269
-P 9600 1150
-F 0 "#PWR039" H 9600 900 50  0001 C CNN
-F 1 "GND" H 9605 977 50  0000 C CNN
-F 2 "" H 9600 1150 50  0001 C CNN
-F 3 "" H 9600 1150 50  0001 C CNN
-	1    9600 1150
+P 10250 1500
+F 0 "#PWR039" H 10250 1250 50  0001 C CNN
+F 1 "GND" H 10255 1327 50  0000 C CNN
+F 2 "" H 10250 1500 50  0001 C CNN
+F 3 "" H 10250 1500 50  0001 C CNN
+	1    10250 1500
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	9600 1150 9600 1100
-Connection ~ 9600 1100
+	10250 1500 10250 1450
+Connection ~ 10250 1450
 $Comp
 L power:+3V3 #PWR010
 U 1 1 5C8902A4
@@ -923,18 +917,18 @@ $EndComp
 $Comp
 L Device:C_Small C19
 U 1 1 5BDC7C63
-P 8550 4600
-F 0 "C19" H 8650 4650 50  0000 L CNN
-F 1 "0201, 1uF, 10V, X5R, 20%" H 8000 4800 50  0000 L CNN
-F 2 "tomu-fpga:C_0201_0603Metric" H 8550 4600 50  0001 C CNN
-F 3 "" H 8550 4600 50  0001 C CNN
-F 4 "ANY" H 6050 2050 50  0001 C CNN "MPN"
-F 5 "ANY" H 6050 2050 50  0001 C CNN "MYPN"
-F 6 "ANY" H 6050 2050 50  0001 C CNN "Manufacturer"
-F 7 "1u" H 0   0   50  0001 C CNN "Spice_Model"
-F 8 "Y" H 0   0   50  0001 C CNN "Spice_Netlist_Enabled"
-F 9 "C" H 0   0   50  0001 C CNN "Spice_Primitive"
-	1    8550 4600
+P 8600 4700
+F 0 "C19" H 8700 4750 50  0000 L CNN
+F 1 "0201, 1uF, 10V, X5R, 20%" H 8700 4850 50  0000 L CNN
+F 2 "tomu-fpga:C_0201_0603Metric" H 8600 4700 50  0001 C CNN
+F 3 "" H 8600 4700 50  0001 C CNN
+F 4 "ANY" H 6100 2150 50  0001 C CNN "MPN"
+F 5 "ANY" H 6100 2150 50  0001 C CNN "MYPN"
+F 6 "ANY" H 6100 2150 50  0001 C CNN "Manufacturer"
+F 7 "1u" H 50  100 50  0001 C CNN "Spice_Model"
+F 8 "Y" H 50  100 50  0001 C CNN "Spice_Netlist_Enabled"
+F 9 "C" H 50  100 50  0001 C CNN "Spice_Primitive"
+	1    8600 4700
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -968,12 +962,12 @@ $EndComp
 $Comp
 L power:GND #PWR029
 U 1 1 5BDC8269
-P 7550 5000
-F 0 "#PWR029" H 7550 4750 50  0001 C CNN
-F 1 "GND" H 7555 4827 50  0000 C CNN
-F 2 "" H 7550 5000 50  0001 C CNN
-F 3 "" H 7550 5000 50  0001 C CNN
-	1    7550 5000
+P 7550 5150
+F 0 "#PWR029" H 7550 4900 50  0001 C CNN
+F 1 "GND" H 7555 4977 50  0000 C CNN
+F 2 "" H 7550 5150 50  0001 C CNN
+F 3 "" H 7550 5150 50  0001 C CNN
+	1    7550 5150
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
@@ -981,19 +975,17 @@ Wire Wire Line
 Wire Wire Line
 	7550 4850 7550 5000
 Wire Wire Line
-	8450 4500 8550 4500
-Connection ~ 8550 4500
+	8400 4500 8600 4500
+Connection ~ 8600 4500
 Wire Wire Line
-	8550 4500 9000 4500
+	8600 4500 9000 4500
 Wire Wire Line
-	7850 4500 7550 4500
+	7800 4500 7750 4500
 Connection ~ 7550 4500
 Wire Wire Line
 	7550 4500 7550 4650
 Wire Wire Line
-	8550 4700 8550 5000
-Wire Wire Line
-	8550 5000 8450 5000
+	8600 5000 8450 5000
 Connection ~ 7550 5000
 Connection ~ 8450 5000
 Wire Wire Line
@@ -1058,16 +1050,16 @@ $EndComp
 $Comp
 L power:+3V3 #PWR020
 U 1 1 5C122FDC
-P 800 5500
-F 0 "#PWR020" H 800 5350 50  0001 C CNN
-F 1 "+3V3" H 815 5673 50  0000 C CNN
-F 2 "" H 800 5500 50  0001 C CNN
-F 3 "" H 800 5500 50  0001 C CNN
-	1    800  5500
+P 750 5500
+F 0 "#PWR020" H 750 5350 50  0001 C CNN
+F 1 "+3V3" H 765 5673 50  0000 C CNN
+F 2 "" H 750 5500 50  0001 C CNN
+F 3 "" H 750 5500 50  0001 C CNN
+	1    750  5500
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	800  5850 950  5850
+	750  5850 950  5850
 Wire Wire Line
 	1050 5650 950  5650
 $Comp
@@ -1163,10 +1155,12 @@ F 0 "U4" H 1675 7815 50  0000 C CNN
 F 1 "SPI Flash" H 1675 7724 50  0000 C CNN
 F 2 "tomu-fpga:SON50P300X200X60-9N" H 1450 7000 50  0001 C CNN
 F 3 "http://www.winbond.com/resource-files/w25q128jv_dtr%20revc%2003272018%20plus.pdf" H 1450 7000 50  0001 C CNN
-F 4 "W25Q128JVSIMCT-ND" H -450 -1450 50  0001 C CNN "DPN"
-F 5 "W25Q128JVSIM" H -450 -1450 50  0001 C CNN "MPN"
-F 6 "Winbond Electronics" H -450 -1450 50  0001 C CNN "Manufacturer"
+F 4 "1970-1011-6-ND" H -450 -1450 50  0001 C CNN "DPN"
+F 5 "GD25Q16CEIGR" H -450 -1450 50  0001 C CNN "MPN"
+F 6 "GigaDevice Semiconductor (HK) Limited" H -450 -1450 50  0001 C CNN "Manufacturer"
 F 7 "IC FLASH 128M SPI 133MHZ 8SOIC" H 0   0   50  0001 C CNN "Description"
+F 8 "MX25R1635FZUIH0" H 1650 7000 50  0001 C CNN "APN"
+F 9 " Macronix" H 1650 7000 50  0001 C CNN "AManufacturer"
 	1    1650 7000
 	1    0    0    -1  
 $EndComp
@@ -1290,8 +1284,8 @@ $Comp
 L tomu-fpga:LDO-X2SON U1
 U 1 1 5BF1A34B
 P 1650 1300
-F 0 "U1" H 1650 1825 50  0000 C CNN
-F 1 "LDO-X2SON-1.2V" H 1650 1734 50  0000 C CNN
+F 0 "U1" H 1650 1850 50  0000 C CNN
+F 1 "LDO-X2SON-1.2V" H 1650 1750 50  0000 C CNN
 F 2 "tomu-fpga:Texas_X2SON-4_1x1mm_P0.65mm" H 1650 1300 50  0001 C CNN
 F 3 "http://www.ti.com/lit/ds/symlink/lp5907.pdf" H 1650 1300 50  0001 C CNN
 F 4 "MIC5504-1.2YMT" H 0   0   50  0001 C CNN "AMPN"
@@ -1362,27 +1356,19 @@ Wire Wire Line
 $Comp
 L tomu-fpga:LDO-X2SON U6
 U 1 1 5BFF652A
-P 8150 4800
-F 0 "U6" H 8000 4750 50  0000 C CNN
-F 1 "LDO-X2SON-1.2V" H 8100 4650 50  0000 C CNN
-F 2 "tomu-fpga:Texas_X2SON-4_1x1mm_P0.65mm" H 8150 4800 50  0001 C CNN
-F 3 "http://www.ti.com/lit/ds/symlink/lp5907.pdf" H 8150 4800 50  0001 C CNN
-F 4 "MIC5504-1.2YMT" H 6500 3500 50  0001 C CNN "AMPN"
-F 5 "Microchip" H 6500 3500 50  0001 C CNN "AManufacturer"
-F 6 "576-4305-1-ND" H 6500 3500 50  0001 C CNN "APN"
-F 7 "LP5907SNX-1.2/NOPB" H 6500 3500 50  0001 C CNN "MPN"
-F 8 "TI" H 6500 3500 50  0001 C CNN "Manufacturer"
-	1    8150 4800
+P 8100 4800
+F 0 "U6" H 7950 4750 50  0000 C CNN
+F 1 "LDO-X2SON-1.2V" H 8050 4650 50  0000 C CNN
+F 2 "tomu-fpga:Texas_X2SON-4_1x1mm_P0.65mm" H 8100 4800 50  0001 C CNN
+F 3 "http://www.ti.com/lit/ds/symlink/lp5907.pdf" H 8100 4800 50  0001 C CNN
+F 4 "MIC5504-1.2YMT" H 6450 3500 50  0001 C CNN "AMPN"
+F 5 "Microchip" H 6450 3500 50  0001 C CNN "AManufacturer"
+F 6 "576-4305-1-ND" H 6450 3500 50  0001 C CNN "APN"
+F 7 "LP5907SNX-1.2/NOPB" H 6450 3500 50  0001 C CNN "MPN"
+F 8 "TI" H 6450 3500 50  0001 C CNN "Manufacturer"
+	1    8100 4800
 	1    0    0    -1  
 $EndComp
-Connection ~ 8450 4750
-Wire Wire Line
-	8450 4750 8450 5000
-Connection ~ 7850 4500
-Wire Wire Line
-	8450 4650 8450 4750
-Wire Wire Line
-	7850 4500 7850 4750
 $Comp
 L tomu-fpga:Testpoint TP2
 U 1 1 5C03018F
@@ -1560,18 +1546,18 @@ Wire Wire Line
 Wire Wire Line
 	5400 5900 5850 5900
 Wire Wire Line
-	6050 4400 6050 4250
+	6000 4400 6000 4250
 Wire Wire Line
-	5400 4400 6050 4400
+	5400 4400 6000 4400
 $Comp
 L power:+5V #PWR0101
 U 1 1 5C17A30E
-P 6050 4250
-F 0 "#PWR0101" H 6050 4100 50  0001 C CNN
-F 1 "+5V" H 6065 4423 50  0000 C CNN
-F 2 "" H 6050 4250 50  0001 C CNN
-F 3 "" H 6050 4250 50  0001 C CNN
-	1    6050 4250
+P 6000 4250
+F 0 "#PWR0101" H 6000 4100 50  0001 C CNN
+F 1 "+5V" H 6015 4423 50  0000 C CNN
+F 2 "" H 6000 4250 50  0001 C CNN
+F 3 "" H 6000 4250 50  0001 C CNN
+	1    6000 4250
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
@@ -1623,10 +1609,6 @@ Wire Wire Line
 	2550 4850 3400 4850
 Wire Wire Line
 	10800 5200 10850 5200
-Wire Wire Line
-	8850 5100 8850 5200
-Wire Wire Line
-	8850 5100 9600 5100
 Wire Wire Line
 	9500 5200 9500 5450
 Wire Wire Line
@@ -1648,12 +1630,6 @@ Wire Wire Line
 	8100 2400 8100 2600
 Wire Wire Line
 	8100 2600 8200 2600
-Wire Wire Line
-	6450 1250 6450 1200
-Wire Wire Line
-	10450 1600 10450 1200
-Wire Wire Line
-	10450 1200 10850 1200
 Text Label 5250 1800 1    50   ~ 0
 TOUCH_4
 Text Label 5150 1800 1    50   ~ 0
@@ -1764,35 +1740,27 @@ USB_P
 Text Label 8800 1800 0    50   ~ 0
 USB_N
 Wire Wire Line
-	9600 1100 9900 1100
+	10250 1450 10450 1450
 Wire Wire Line
-	8350 5200 8700 5200
+	8350 5200 8750 5200
 Wire Wire Line
 	7950 5600 8600 5600
 Wire Wire Line
 	1200 4600 1700 4600
 Wire Wire Line
-	9450 1050 9450 1100
+	10200 1400 10200 1450
 Wire Wire Line
-	9450 1100 9600 1100
+	10200 1450 10250 1450
 Wire Wire Line
-	9900 1100 9900 1050
+	10650 1450 10650 1400
 Wire Wire Line
-	9450 850  9450 800 
+	10200 1200 10200 1150
 Wire Wire Line
-	10850 750  10850 800 
+	10200 1150 10450 1150
 Wire Wire Line
-	9450 800  9900 800 
-Connection ~ 10850 800 
+	10650 1200 10650 1150
 Wire Wire Line
-	10850 800  10850 1200
-Wire Wire Line
-	9900 850  9900 800 
-Connection ~ 9900 800 
-Wire Wire Line
-	9900 800  10850 800 
-Wire Wire Line
-	800  5500 800  5850
+	750  5500 750  5850
 Wire Wire Line
 	2100 6050 2100 5650
 Connection ~ 1050 5850
@@ -1976,4 +1944,48 @@ Wire Wire Line
 Wire Wire Line
 	9100 1300 9150 1300
 Connection ~ 9150 1300
+Wire Wire Line
+	8400 4650 8450 4650
+Wire Wire Line
+	8450 4650 8450 4750
+Wire Wire Line
+	8400 4750 8450 4750
+Connection ~ 8450 4750
+Wire Wire Line
+	8450 4750 8450 5000
+Wire Wire Line
+	7800 4750 7750 4750
+Wire Wire Line
+	7750 4750 7750 4500
+Connection ~ 7750 4500
+Wire Wire Line
+	7750 4500 7550 4500
+Wire Wire Line
+	8600 4800 8600 5000
+Wire Wire Line
+	8600 4600 8600 4500
+Wire Wire Line
+	8350 5100 7950 5100
+Wire Wire Line
+	7950 5100 7950 5200
+Wire Wire Line
+	7550 5150 7550 5000
+Wire Wire Line
+	8850 5200 9000 5200
+Wire Wire Line
+	9000 5200 9000 5100
+Wire Wire Line
+	9000 5100 9600 5100
+Wire Wire Line
+	6450 950  6450 1250
+Wire Wire Line
+	10450 1600 10450 1450
+Connection ~ 10450 1450
+Wire Wire Line
+	10450 1450 10650 1450
+Wire Wire Line
+	10450 950  10450 1150
+Connection ~ 10450 1150
+Wire Wire Line
+	10450 1150 10650 1150
 $EndSCHEMATC