diff --git a/hardware/pcb/tomu-fpga-cache.lib b/hardware/pcb/tomu-fpga-cache.lib
index 480c69f..b838520 100644
--- a/hardware/pcb/tomu-fpga-cache.lib
+++ b/hardware/pcb/tomu-fpga-cache.lib
@@ -1,102 +1,6 @@
 EESchema-LIBRARY Version 2.4
 #encoding utf-8
 #
-# Connector:Raspberry_Pi_2_3
-#
-DEF Connector:Raspberry_Pi_2_3 J 0 40 Y Y 1 F N
-F0 "J" -700 1250 50 H V L BNN
-F1 "Connector:Raspberry_Pi_2_3" 400 -1250 50 H V L TNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- PinHeader*2x20*P2.54mm*Vertical*
- PinSocket*2x20*P2.54mm*Vertical*
-$ENDFPLIST
-DRAW
-S -700 1200 700 -1200 0 1 10 f
-S -665 -690 -700 -710 1 1 0 N
-S -665 -590 -700 -610 1 1 0 N
-S -665 -490 -700 -510 1 1 0 N
-S -665 -390 -700 -410 1 1 0 N
-S -665 -290 -700 -310 1 1 0 N
-S -665 -190 -700 -210 1 1 0 N
-S -665 10 -700 -10 1 1 0 N
-S -665 110 -700 90 1 1 0 N
-S -665 210 -700 190 1 1 0 N
-S -665 410 -700 390 1 1 0 N
-S -665 510 -700 490 1 1 0 N
-S -665 610 -700 590 1 1 0 N
-S -665 810 -700 790 1 1 0 N
-S -665 910 -700 890 1 1 0 N
-S -410 -1165 -390 -1200 1 1 0 N
-S -310 -1165 -290 -1200 1 1 0 N
-S -210 -1165 -190 -1200 1 1 0 N
-S -210 1200 -190 1165 1 1 0 N
-S -110 -1165 -90 -1200 1 1 0 N
-S -110 1200 -90 1165 1 1 0 N
-S -10 -1165 10 -1200 1 1 0 N
-S 90 -1165 110 -1200 1 1 0 N
-S 90 1200 110 1165 1 1 0 N
-S 190 -1165 210 -1200 1 1 0 N
-S 190 1200 210 1165 1 1 0 N
-S 290 -1165 310 -1200 1 1 0 N
-S 700 -790 665 -810 1 1 0 N
-S 700 -690 665 -710 1 1 0 N
-S 700 -490 665 -510 1 1 0 N
-S 700 -390 665 -410 1 1 0 N
-S 700 -290 665 -310 1 1 0 N
-S 700 -190 665 -210 1 1 0 N
-S 700 -90 665 -110 1 1 0 N
-S 700 110 665 90 1 1 0 N
-S 700 210 665 190 1 1 0 N
-S 700 310 665 290 1 1 0 N
-S 700 510 665 490 1 1 0 N
-S 700 610 665 590 1 1 0 N
-S 700 810 665 790 1 1 0 N
-S 700 910 665 890 1 1 0 N
-X 3V3 1 100 1300 100 D 50 50 1 1 W
-X GPIO15/RXD 10 -800 800 100 R 50 50 1 1 B
-X GPIO17 11 -800 500 100 R 50 50 1 1 B
-X GPIO18/PWM0 12 -800 400 100 R 50 50 1 1 B
-X GPIO27 13 -800 -700 100 R 50 50 1 1 B
-X GND 14 -200 -1300 100 U 50 50 1 1 W
-X GPIO22 15 -800 -200 100 R 50 50 1 1 B
-X GPIO23 16 -800 -300 100 R 50 50 1 1 B
-X 3V3 17 200 1300 100 D 50 50 1 1 W
-X GPIO24 18 -800 -400 100 R 50 50 1 1 B
-X MOSI0/GPIO10 19 800 -400 100 L 50 50 1 1 B
-X 5V 2 -200 1300 100 D 50 50 1 1 W
-X GND 20 -100 -1300 100 U 50 50 1 1 W
-X MISO0/GPIO9 21 800 -300 100 L 50 50 1 1 B
-X GPIO25 22 -800 -500 100 R 50 50 1 1 B
-X SCLK0/GPIO11 23 800 -500 100 L 50 50 1 1 B
-X ~CE0~/GPIO8 24 800 -200 100 L 50 50 1 1 B
-X GND 25 0 -1300 100 U 50 50 1 1 W
-X ~CE1~/GPIO7 26 800 -100 100 L 50 50 1 1 B
-X ID_SD/GPIO0 27 800 900 100 L 50 50 1 1 B
-X ID_SC/GPIO1 28 800 800 100 L 50 50 1 1 B
-X GCLK1/GPIO5 29 800 200 100 L 50 50 1 1 B
-X SDA/GPIO2 3 800 600 100 L 50 50 1 1 B
-X GND 30 100 -1300 100 U 50 50 1 1 W
-X GCLK2/GPIO6 31 800 100 100 L 50 50 1 1 B
-X PWM0/GPIO12 32 800 -700 100 L 50 50 1 1 B
-X PWM1/GPIO13 33 800 -800 100 L 50 50 1 1 B
-X GND 34 200 -1300 100 U 50 50 1 1 W
-X GPIO19/MISO1 35 -800 200 100 R 50 50 1 1 B
-X GPIO16 36 -800 600 100 R 50 50 1 1 B
-X GPIO26 37 -800 -600 100 R 50 50 1 1 B
-X GPIO20/MOSI1 38 -800 100 100 R 50 50 1 1 B
-X GND 39 300 -1300 100 U 50 50 1 1 W
-X 5V 4 -100 1300 100 D 50 50 1 1 W
-X GPIO21/SCLK1 40 -800 0 100 R 50 50 1 1 B
-X SCL/GPIO3 5 800 500 100 L 50 50 1 1 B
-X GND 6 -400 -1300 100 U 50 50 1 1 W
-X GCLK0/GPIO4 7 800 300 100 L 50 50 1 1 B
-X GPIO14/TXD 8 -800 900 100 R 50 50 1 1 B
-X GND 9 -300 -1300 100 U 50 50 1 1 W
-ENDDRAW
-ENDDEF
-#
 # Device:C_Small
 #
 DEF Device:C_Small C 0 10 N N 1 F N
@@ -115,29 +19,6 @@ X ~ 2 0 -100 80 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Device:LED
-#
-DEF Device:LED D 0 40 N N 1 F N
-F0 "D" 0 100 50 H V C CNN
-F1 "Device:LED" 0 -100 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- LED*
- LED_SMD:*
- LED_THT:*
-$ENDFPLIST
-DRAW
-P 2 0 1 8 -50 -50 -50 50 N
-P 2 0 1 0 -50 0 50 0 N
-P 4 0 1 8 50 -50 50 50 -50 0 50 -50 N
-P 5 0 1 0 -120 -30 -180 -90 -150 -90 -180 -90 -180 -60 N
-P 5 0 1 0 -70 -30 -130 -90 -100 -90 -130 -90 -130 -60 N
-X K 1 -150 0 100 R 50 50 1 1 P
-X A 2 150 0 100 L 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
 # Device:R_Small
 #
 DEF Device:R_Small R 0 10 N N 1 F N
@@ -155,6 +36,36 @@ X ~ 2 0 -100 30 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
+# Tomu_FPGA:LDO-X2SON
+#
+DEF Tomu_FPGA:LDO-X2SON U 0 40 Y Y 1 F N
+F0 "U" 0 -50 50 H V C CNN
+F1 "Tomu_FPGA:LDO-X2SON" 0 -150 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+DRAW
+S -200 350 200 0 0 1 0 f
+X OUT 1 300 300 100 L 50 50 1 1 w
+X GND 2 300 50 100 L 50 50 1 1 W
+X EN 3 -300 50 100 R 50 50 1 1 I
+X IN 4 -300 300 100 R 50 50 1 1 W
+X Thermal 5 300 150 100 L 50 50 1 1 W
+ENDDRAW
+ENDDEF
+#
+# Tomu_FPGA:Testpoint
+#
+DEF Tomu_FPGA:Testpoint TP 0 40 Y Y 1 F N
+F0 "TP" 0 -50 50 H V C CNN
+F1 "Tomu_FPGA:Testpoint" 0 -100 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+DRAW
+S -50 100 0 0 0 1 0 f
+X ~ 1 -150 50 100 R 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
 # power:+1V2
 #
 DEF power:+1V2 #PWR 0 0 Y Y 1 F P
@@ -229,39 +140,6 @@ X GND 1 0 0 0 D 50 50 1 1 W N
 ENDDRAW
 ENDDEF
 #
-# tomu-fpga:Conn_01x06_Female
-#
-DEF tomu-fpga:Conn_01x06_Female J 0 40 Y N 1 F N
-F0 "J" 0 300 50 H V C CNN
-F1 "tomu-fpga:Conn_01x06_Female" 0 -400 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- Connector*:*_1x??_*
-$ENDFPLIST
-DRAW
-A 0 -300 20 901 -901 1 1 6 N 0 -280 0 -320
-A 0 -200 20 901 -901 1 1 6 N 0 -180 0 -220
-A 0 -100 20 901 -901 1 1 6 N 0 -80 0 -120
-A 0 0 20 901 -901 1 1 6 N 0 20 0 -20
-A 0 100 20 901 -901 1 1 6 N 0 120 0 80
-A 0 200 20 901 -901 1 1 6 N 0 220 0 180
-S -50 250 50 -350 0 1 0 f
-P 2 1 1 6 -50 -300 -20 -300 N
-P 2 1 1 6 -50 -200 -20 -200 N
-P 2 1 1 6 -50 -100 -20 -100 N
-P 2 1 1 6 -50 0 -20 0 N
-P 2 1 1 6 -50 100 -20 100 N
-P 2 1 1 6 -50 200 -20 200 N
-X Pin_1 1 -200 200 150 R 50 50 1 1 P
-X Pin_2 2 -200 100 150 R 50 50 1 1 P
-X Pin_3 3 -200 0 150 R 50 50 1 1 P
-X Pin_4 4 -200 -100 150 R 50 50 1 1 P
-X Pin_5 5 -200 -200 150 R 50 50 1 1 P
-X Pin_6 6 -200 -300 150 R 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
 # tomu-fpga:ICE40UP5K-SG48ITR
 #
 DEF tomu-fpga:ICE40UP5K-SG48ITR U 0 20 Y Y 4 L N
@@ -329,23 +207,6 @@ X VCC 5 100 400 100 D 50 50 4 1 W
 ENDDRAW
 ENDDEF
 #
-# tomu-fpga:LDO-SOT23
-#
-DEF tomu-fpga:LDO-SOT23 U 0 40 Y Y 1 F N
-F0 "U" 0 -50 50 H V C CNN
-F1 "tomu-fpga:LDO-SOT23" 0 -150 50 H V C CNN
-F2 "" 50 0 50 H I C CNN
-F3 "" 50 0 50 H I C CNN
-DRAW
-S 200 300 -200 0 0 1 0 f
-X IN 1 -300 250 100 R 50 50 1 1 I
-X GND 2 300 50 100 L 50 50 1 1 W
-X EN 3 -300 150 100 R 50 50 1 1 I
-X NC 4 -300 50 100 R 50 50 1 1 N
-X OUT 5 300 250 100 L 50 50 1 1 w
-ENDDRAW
-ENDDEF
-#
 # tomu-fpga:Oscillator
 #
 DEF tomu-fpga:Oscillator U 0 40 Y Y 1 F N
@@ -417,27 +278,6 @@ X VCC 8 -600 550 100 R 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
-# tomu-fpga:SW_Push
-#
-DEF tomu-fpga:SW_Push SW? 0 40 Y Y 1 F N
-F0 "SW?" -300 -200 50 H V C CNN
-F1 "tomu-fpga:SW_Push" 50 -200 50 H V C CNN
-F2 "" 0 -100 50 H I C CNN
-F3 "" 0 -100 50 H I C CNN
-DRAW
-C -400 -250 0 0 1 0 N
-P 2 0 1 0 -100 100 100 100 N
-P 2 0 1 0 0 50 50 -50 N
-P 2 0 1 0 0 100 0 50 N
-P 2 0 1 0 100 -100 -150 -100 N
-P 2 1 1 0 0 -100 0 -50 N
-X ~ 1 -200 100 100 R 50 50 1 1 P
-X ~ 2 200 100 100 L 50 50 1 1 P
-X ~ 3 -200 -100 100 R 50 50 1 1 P
-X ~ 4 200 -100 100 L 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
 # tomu-fpga:USB-B
 #
 DEF tomu-fpga:USB-B U 0 40 Y Y 1 F N
diff --git a/hardware/pcb/tomu-fpga.lib b/hardware/pcb/tomu-fpga.lib
index ac0c9b5..a6dd69a 100644
--- a/hardware/pcb/tomu-fpga.lib
+++ b/hardware/pcb/tomu-fpga.lib
@@ -236,7 +236,7 @@ F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 DRAW
 S -50 100 0 0 0 1 0 f
-X ~ 1 -150 50 100 R 50 50 1 1 B
+X ~ 1 -150 50 100 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
diff --git a/hardware/pcb/tomu-fpga.sch b/hardware/pcb/tomu-fpga.sch
index 156f22a..76db740 100644
--- a/hardware/pcb/tomu-fpga.sch
+++ b/hardware/pcb/tomu-fpga.sch
@@ -14,59 +14,8 @@ Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
-$Comp
-L tomu-fpga:LDO-SOT23 U2
-U 1 1 5BD6EE82
-P 1650 2350
-F 0 "U2" H 1650 2825 50  0000 C CNN
-F 1 "LDO-SOT23-3.3V" H 1650 2734 50  0000 C CNN
-F 2 "tomu-fpga:SOT-23-5_HandSoldering" H 1700 2350 50  0001 C CNN
-F 3 "http://www.ti.com/lit/ds/symlink/lp5907.pdf" H 1700 2350 50  0001 C CNN
-F 4 "LP5907MFX-3.3/NOPB" H 1650 2350 50  0001 C CNN "MPN"
-F 5 "TI" H 1650 2350 50  0001 C CNN "Manufacturer"
-F 6 "MIC5504-3.3YMT" H 1650 2350 50  0001 C CNN "AMPN"
-F 7 "Microchip" H 1650 2350 50  0001 C CNN "AManufacturer"
-F 8 "296-38557-1-ND" H 1650 2350 50  0001 C CNN "DPN"
-F 9 " IC REG LINEAR 3.3V 250MA SOT23-5" H 0   0   50  0001 C CNN "Description"
-	1    1650 2350
-	1    0    0    -1  
-$EndComp
-$Comp
-L tomu-fpga:LDO-SOT23 U3
-U 1 1 5BD6EEEA
-P 1650 3450
-F 0 "U3" H 1650 3925 50  0000 C CNN
-F 1 "LDO-SOT23-2.5V" H 1650 3834 50  0000 C CNN
-F 2 "tomu-fpga:SOT-23-5_HandSoldering" H 1700 3450 50  0001 C CNN
-F 3 "http://www.ti.com/lit/ds/symlink/lp5907.pdf" H 1700 3450 50  0001 C CNN
-F 4 "LP5907MFX-2.5/NOPB" H 1650 3450 50  0001 C CNN "MPN"
-F 5 "TI" H 1650 3450 50  0001 C CNN "Manufacturer"
-F 6 "MIC5504-2.5YMT" H 1650 3450 50  0001 C CNN "AMPN"
-F 7 "Microchip" H 1650 3450 50  0001 C CNN "AManufacturer"
-F 8 "296-40356-1-ND" H 1650 3450 50  0001 C CNN "DPN"
-F 9 "IC REG LINEAR 2.5V 250MA SOT23-5" H 0   0   50  0001 C CNN "Description"
-	1    1650 3450
-	1    0    0    -1  
-$EndComp
-$Comp
-L tomu-fpga:LDO-SOT23 U1
-U 1 1 5BD6EF0E
-P 1650 1250
-F 0 "U1" H 1500 1700 50  0000 C CNN
-F 1 "LDO-SOT23-1.2V" H 1650 1600 50  0000 C CNN
-F 2 "tomu-fpga:SOT-23-5_HandSoldering" H 1700 1250 50  0001 C CNN
-F 3 "http://www.ti.com/lit/ds/symlink/lp5907.pdf" H 1700 1250 50  0001 C CNN
-F 4 "LP5907MFX-1.2/NOPB" H 1650 1250 50  0001 C CNN "MPN"
-F 5 "TI" H 1650 1250 50  0001 C CNN "Manufacturer"
-F 6 "MIC5504-1.2YMT" H 1650 1250 50  0001 C CNN "AMPN"
-F 7 "Microchip" H 1650 1250 50  0001 C CNN "AManufacturer"
-F 8 "296-39062-1-ND" H 1650 1250 50  0001 C CNN "DPN"
-F 9 "IC REG LINEAR 1.2V 250MA SOT23-5" H 0   0   50  0001 C CNN "Description"
-	1    1650 1250
-	1    0    0    -1  
-$EndComp
 Wire Wire Line
-	1950 3400 2050 3400
+	1950 3350 2050 3350
 $Comp
 L power:GND #PWR014
 U 1 1 5BD6F362
@@ -79,9 +28,9 @@ F 3 "" H 2300 3650 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	1950 2300 2050 2300
+	1950 2250 2050 2250
 Wire Wire Line
-	2050 2300 2050 2500
+	2050 2250 2050 2350
 $Comp
 L power:GND #PWR013
 U 1 1 5BD6F3CD
@@ -93,10 +42,6 @@ F 3 "" H 2300 2550 50  0001 C CNN
 	1    2300 2550
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	1950 1200 2050 1200
-Wire Wire Line
-	2050 1200 2050 1400
 $Comp
 L power:GND #PWR012
 U 1 1 5BD6F47F
@@ -127,7 +72,7 @@ U 1 1 5BD6F643
 P 2500 3350
 F 0 "C10" H 2250 3350 50  0000 L CNN
 F 1 "0805, 1uF, 10V, X5R, 20%" H 2250 3250 50  0000 L CNN
-F 2 "tomu-fpga:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 2500 3350 50  0001 C CNN
+F 2 "tomu-fpga:C_0201_0603Metric" H 2500 3350 50  0001 C CNN
 F 3 "" H 2500 3350 50  0001 C CNN
 F 4 "ANY" H 0   -300 50  0001 C CNN "MPN"
 F 5 "ANY" H 0   -300 50  0001 C CNN "MYPN"
@@ -145,14 +90,14 @@ Wire Wire Line
 Wire Wire Line
 	2500 3600 2300 3600
 Wire Wire Line
-	2050 3400 2050 3600
+	2050 3350 2050 3450
 $Comp
 L Device:C_Small C9
 U 1 1 5BD6FE8F
 P 2500 2250
 F 0 "C9" H 2600 2300 50  0000 L CNN
 F 1 "0805, 1uF, 10V, X5R, 20%" H 2600 2200 50  0000 L CNN
-F 2 "tomu-fpga:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 2500 2250 50  0001 C CNN
+F 2 "tomu-fpga:C_0201_0603Metric" H 2500 2250 50  0001 C CNN
 F 3 "" H 2500 2250 50  0001 C CNN
 F 4 "ANY" H 0   -300 50  0001 C CNN "MPN"
 F 5 "ANY" H 0   -300 50  0001 C CNN "MYPN"
@@ -188,7 +133,7 @@ U 1 1 5BD700C8
 P 2500 1150
 F 0 "C8" H 2600 1200 50  0000 L CNN
 F 1 "0805, 1uF, 10V, X5R, 20%" H 2600 1100 50  0000 L CNN
-F 2 "tomu-fpga:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 2500 1150 50  0001 C CNN
+F 2 "tomu-fpga:C_0201_0603Metric" H 2500 1150 50  0001 C CNN
 F 3 "" H 2500 1150 50  0001 C CNN
 F 4 "ANY" H 0   -300 50  0001 C CNN "MPN"
 F 5 "ANY" H 0   -300 50  0001 C CNN "MYPN"
@@ -217,13 +162,13 @@ Connection ~ 2350 2100
 Wire Wire Line
 	2350 2100 2500 2100
 Wire Wire Line
-	1300 3300 1350 3300
+	1300 3450 1350 3450
 Wire Wire Line
 	1350 1000 1300 1000
 Wire Wire Line
-	1300 1000 1300 1100
+	1300 1000 1300 1250
 Wire Wire Line
-	1300 1100 1350 1100
+	1300 1250 1350 1250
 Wire Wire Line
 	1100 3200 1100 3100
 Wire Wire Line
@@ -260,7 +205,7 @@ U 1 1 5BD7909F
 P 900 3400
 F 0 "C3" H 950 3300 50  0000 L CNN
 F 1 "0805, 1uF, 10V, X5R, 20%" H 950 3200 50  0000 L CNN
-F 2 "tomu-fpga:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 900 3400 50  0001 C CNN
+F 2 "tomu-fpga:C_0201_0603Metric" H 900 3400 50  0001 C CNN
 F 3 "" H 900 3400 50  0001 C CNN
 F 4 "ANY" H 900 3400 50  0001 C CNN "MPN"
 F 5 "ANY" H 900 3400 50  0001 C CNN "Manufacturer"
@@ -288,7 +233,7 @@ U 1 1 5BD80E21
 P 900 1200
 F 0 "C1" H 950 1100 50  0000 L CNN
 F 1 "0805, 1uF, 10V, X5R, 20%" H 950 1000 50  0000 L CNN
-F 2 "tomu-fpga:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 900 1200 50  0001 C CNN
+F 2 "tomu-fpga:C_0201_0603Metric" H 900 1200 50  0001 C CNN
 F 3 "" H 900 1200 50  0001 C CNN
 F 4 "ANY" H 900 1200 50  0001 C CNN "MPN"
 F 5 "ANY" H 900 1200 50  0001 C CNN "Manufacturer"
@@ -347,7 +292,7 @@ U 1 1 5BD861AF
 P 900 2300
 F 0 "C2" H 950 2200 50  0000 L CNN
 F 1 "0805, 1uF, 10V, X5R, 20%" H 950 2100 50  0000 L CNN
-F 2 "tomu-fpga:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 900 2300 50  0001 C CNN
+F 2 "tomu-fpga:C_0201_0603Metric" H 900 2300 50  0001 C CNN
 F 3 "" H 900 2300 50  0001 C CNN
 F 4 "ANY" H 900 2300 50  0001 C CNN "MPN"
 F 5 "ANY" H 900 2300 50  0001 C CNN "Manufacturer"
@@ -404,32 +349,32 @@ $EndComp
 $Comp
 L tomu-fpga:RGB-LED U10
 U 1 1 5BD90F18
-P 9250 3450
-F 0 "U10" H 9050 3400 50  0000 C CNN
-F 1 "RGB-LED" H 9150 3300 50  0000 C CNN
-F 2 "tomu-fpga:LED-RGB-5DS-UHD1110-FKA" H 9250 3450 50  0001 C CNN
-F 3 "https://www.cree.com/led-components/media/documents/ds-UHD1110-FKA.pdf" H 9250 3450 50  0001 C CNN
-F 4 "UHD1110-FKA" H 9250 3450 50  0001 C CNN "MPN"
-F 5 "Cree" H 9250 3450 50  0001 C CNN "Manufacturer"
-F 6 "N/A" H 0   0   50  0001 C CNN "DPN"
-F 7 "CL-505S-X-SD-T" H 9250 3450 50  0001 C CNN "APN"
-F 8 "Citizen" H 9250 3450 50  0001 C CNN "AManufacturer"
-	1    9250 3450
+P 8700 3450
+F 0 "U10" H 8500 3400 50  0000 C CNN
+F 1 "RGB-LED" H 8600 3300 50  0000 C CNN
+F 2 "tomu-fpga:LED-RGB-5DS-UHD1110-FKA" H 8700 3450 50  0001 C CNN
+F 3 "https://www.cree.com/led-components/media/documents/ds-UHD1110-FKA.pdf" H 8700 3450 50  0001 C CNN
+F 4 "UHD1110-FKA" H 8700 3450 50  0001 C CNN "MPN"
+F 5 "Cree" H 8700 3450 50  0001 C CNN "Manufacturer"
+F 6 "N/A" H -550 0   50  0001 C CNN "DPN"
+F 7 "CL-505S-X-SD-T" H 8700 3450 50  0001 C CNN "APN"
+F 8 "Citizen" H 8700 3450 50  0001 C CNN "AManufacturer"
+	1    8700 3450
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	8900 3200 8800 3200
+	8350 3200 8100 3200
 Wire Wire Line
-	8800 3200 8800 3100
+	8100 3200 8100 3100
 $Comp
 L power:+3V3 #PWR033
 U 1 1 5BD9277B
-P 8800 3100
-F 0 "#PWR033" H 8800 2950 50  0001 C CNN
-F 1 "+3V3" H 8815 3273 50  0000 C CNN
-F 2 "" H 8800 3100 50  0001 C CNN
-F 3 "" H 8800 3100 50  0001 C CNN
-	1    8800 3100
+P 8100 3100
+F 0 "#PWR033" H 8100 2950 50  0001 C CNN
+F 1 "+3V3" H 8115 3273 50  0000 C CNN
+F 2 "" H 8100 3100 50  0001 C CNN
+F 3 "" H 8100 3100 50  0001 C CNN
+	1    8100 3100
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -438,7 +383,7 @@ U 1 1 5BDB00B1
 P 9400 1900
 F 0 "R12" V 9400 1900 50  0000 C CNN
 F 1 "0805, 22ohm, 1/16W, 1%" V 9500 1900 50  0000 C CNN
-F 2 "tomu-fpga:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 9400 1900 50  0001 C CNN
+F 2 "tomu-fpga:R_0201_0603Metric" H 9400 1900 50  0001 C CNN
 F 3 "" H 9400 1900 50  0001 C CNN
 F 4 "ANY" H 650 100 50  0001 C CNN "MPN"
 F 5 "ANY" H 650 100 50  0001 C CNN "MYPN"
@@ -452,7 +397,7 @@ U 1 1 5BDB01D9
 P 9400 1800
 F 0 "R11" V 9400 1800 50  0000 C CNN
 F 1 "0805, 22ohm, 1/16W, 1%" V 9300 1800 50  0000 C CNN
-F 2 "tomu-fpga:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 9400 1800 50  0001 C CNN
+F 2 "tomu-fpga:R_0201_0603Metric" H 9400 1800 50  0001 C CNN
 F 3 "" H 9400 1800 50  0001 C CNN
 F 4 "ANY" H 650 100 50  0001 C CNN "MPN"
 F 5 "ANY" H 650 100 50  0001 C CNN "MYPN"
@@ -472,7 +417,7 @@ U 1 1 5BDC6632
 P 9150 2400
 F 0 "R9" V 9150 2400 50  0000 C CNN
 F 1 "0805, 1.5k, 1/16W, 1%" V 9050 2300 50  0000 C CNN
-F 2 "tomu-fpga:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 9150 2400 50  0001 C CNN
+F 2 "tomu-fpga:R_0201_0603Metric" H 9150 2400 50  0001 C CNN
 F 3 "" H 9150 2400 50  0001 C CNN
 F 4 "ANY" H 650 200 50  0001 C CNN "MPN"
 F 5 "ANY" H 650 200 50  0001 C CNN "MYPN"
@@ -482,21 +427,6 @@ F 6 "ANY" H 650 200 50  0001 C CNN "Manufacturer"
 $EndComp
 Text Label 9950 2700 2    50   ~ 0
 PU_CTRL_USBP
-$Comp
-L tomu-fpga:Oscillator U6
-U 1 1 5BDD6B36
-P 4750 1600
-F 0 "U6" H 5050 1550 50  0000 C CNN
-F 1 "MEMS Oscillator (DNP)" H 4650 1550 50  0000 C CNN
-F 2 "tomu-fpga:MEMS-20005625B" H 4750 1600 50  0001 C CNN
-F 3 "http://ww1.microchip.com/downloads/en/DeviceDoc/20005625B.pdf" H 4750 1600 50  0001 C CNN
-F 4 "DSC6001HI2A-048.0000T" H 4750 1600 50  0001 C CNN "MPN"
-F 5 "Microchip" H 4750 1600 50  0001 C CNN "Manufacturer"
-F 6 "DSC6001HI2A-048.0000T-ND" H 4750 1600 50  0001 C CNN "DPN"
-F 7 "MEMS OSC XO 48.0000MHZ CMOS SMD" H 50  -50 50  0001 C CNN "Description"
-	1    4750 1600
-	-1   0    0    1   
-$EndComp
 Text Label 5550 2050 0    50   ~ 0
 OSC_IN
 Wire Wire Line
@@ -531,7 +461,7 @@ U 1 1 5BE02A6F
 P 950 6800
 F 0 "C4" H 1000 6900 50  0000 L CNN
 F 1 "0805, 100nF, 10V, X5R, 20%" V 800 6200 50  0000 L CNN
-F 2 "tomu-fpga:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 950 6800 50  0001 C CNN
+F 2 "tomu-fpga:C_0201_0603Metric" H 950 6800 50  0001 C CNN
 F 3 "" H 950 6800 50  0001 C CNN
 F 4 "ANY" H -550 0   50  0001 C CNN "MPN"
 F 5 "ANY" H -550 0   50  0001 C CNN "MYPN"
@@ -564,21 +494,21 @@ Wire Wire Line
 $Comp
 L tomu-fpga:PADS SW2
 U 1 1 5BE44C19
-P 5800 1200
-F 0 "SW2" H 5850 1650 50  0000 C CNN
-F 1 "Captouch Pads" H 5650 1750 50  0000 C CNN
-F 2 "tomu-fpga:Touchpads" H 5850 1200 50  0001 C CNN
-F 3 "" H 5850 1200 50  0001 C CNN
-F 4 "DNP" H 5800 1200 50  0001 C CNN "MPN"
-F 5 "DNP" H 5800 1200 50  0001 C CNN "Manufacturer"
-F 6 "DNP" H 5800 1200 50  0001 C CNN "MYPN"
-F 7 "" H 5800 1200 50  0001 C CNN "DPN"
-F 8 "PCB-etched captouch pads" H 300 -1000 50  0001 C CNN "Description"
-	1    5800 1200
+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 2 "tomu-fpga:Touchpads" 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"
+F 5 "DNP" H 5300 1200 50  0001 C CNN "Manufacturer"
+F 6 "DNP" H 5300 1200 50  0001 C CNN "MYPN"
+F 7 "" H 5300 1200 50  0001 C CNN "DPN"
+F 8 "PCB-etched captouch pads" H -200 -1000 50  0001 C CNN "Description"
+	1    5300 1200
 	0    -1   -1   0   
 $EndComp
 Wire Wire Line
-	5850 2250 5750 2250
+	5850 2250 5400 2250
 $Comp
 L power:GND #PWR041
 U 1 1 5BE564F6
@@ -590,30 +520,17 @@ F 3 "" H 10850 5400 50  0001 C CNN
 	1    10850 5400
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	10400 5200 10650 5200
 Wire Wire Line
 	10850 5200 10850 5400
 $Comp
-L power:+1V2 #PWR036
-U 1 1 5BE5AB61
-P 9150 4350
-F 0 "#PWR036" H 9150 4200 50  0001 C CNN
-F 1 "+1V2" H 9165 4523 50  0000 C CNN
-F 2 "" H 9150 4350 50  0001 C CNN
-F 3 "" H 9150 4350 50  0001 C CNN
-	1    9150 4350
-	1    0    0    -1  
-$EndComp
-$Comp
 L power:+1V2 #PWR032
 U 1 1 5BE5ABB7
-P 8700 5100
-F 0 "#PWR032" H 8700 4950 50  0001 C CNN
-F 1 "+1V2" H 8715 5273 50  0000 C CNN
-F 2 "" H 8700 5100 50  0001 C CNN
-F 3 "" H 8700 5100 50  0001 C CNN
-	1    8700 5100
+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
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -627,84 +544,10 @@ F 3 "" H 9300 5450 50  0001 C CNN
 	1    9300 5450
 	1    0    0    -1  
 $EndComp
-$Comp
-L Device:C_Small C23
-U 1 1 5BE5ACB9
-P 9700 4850
-F 0 "C23" V 9650 4900 50  0000 L CNN
-F 1 "0805, 100nF, 10V, X5R, 20% (DNP)" V 9650 3450 50  0000 L CNN
-F 2 "tomu-fpga:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 9700 4850 50  0001 C CNN
-F 3 "" H 9700 4850 50  0001 C CNN
-F 4 "DNP" H 350 100 50  0001 C CNN "MPN"
-F 5 "DNP" H 350 100 50  0001 C CNN "MYPN"
-F 6 "DNP" H 350 100 50  0001 C CNN "Manufacturer"
-	1    9700 4850
-	0    -1   -1   0   
-$EndComp
-$Comp
-L Device:C_Small C22
-U 1 1 5BE5AF99
-P 9700 4650
-F 0 "C22" V 9650 4450 50  0000 L CNN
-F 1 "0805, 10uF, 10V, X5R, 20% (DNP)" V 9650 4700 50  0000 L CNN
-F 2 "tomu-fpga:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 9700 4650 50  0001 C CNN
-F 3 "" H 9700 4650 50  0001 C CNN
-F 4 "DNP" H 350 100 50  0001 C CNN "MPN"
-F 5 "DNP" H 350 100 50  0001 C CNN "MYPN"
-F 6 "DNP" H 350 100 50  0001 C CNN "Manufacturer"
-	1    9700 4650
-	0    1    1    0   
-$EndComp
 Wire Wire Line
-	8700 5200 8700 5100
+	8700 5200 8700 5000
 Wire Wire Line
 	8850 1550 8850 1700
-$Comp
-L Device:R_Small R10
-U 1 1 5BF5243E
-P 9150 4500
-F 0 "R10" H 9050 4400 50  0000 C CNN
-F 1 "0805, 100ohm, 1/16W, 1% (DNP)" H 8450 4500 50  0000 C CNN
-F 2 "tomu-fpga:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 9150 4500 50  0001 C CNN
-F 3 "" H 9150 4500 50  0001 C CNN
-F 4 "DNP" H 350 100 50  0001 C CNN "MPN"
-F 5 "DNP" H 350 100 50  0001 C CNN "MYPN"
-F 6 "DNP" H 350 100 50  0001 C CNN "Manufacturer"
-	1    9150 4500
-	-1   0    0    1   
-$EndComp
-Wire Wire Line
-	9150 4400 9150 4350
-Wire Wire Line
-	9150 4600 9150 4650
-Wire Wire Line
-	9150 4650 9350 4650
-Connection ~ 9150 4650
-Wire Wire Line
-	9150 4650 9150 4900
-Connection ~ 9350 4650
-Wire Wire Line
-	9350 4650 9600 4650
-Wire Wire Line
-	9800 4650 10050 4650
-Wire Wire Line
-	9350 4650 9350 4850
-Wire Wire Line
-	9350 4850 9600 4850
-Wire Wire Line
-	9800 4850 10050 4850
-Wire Wire Line
-	10050 4650 10050 4750
-Connection ~ 10050 4750
-Wire Wire Line
-	10050 4750 10050 4850
-Wire Wire Line
-	10650 4750 10650 5200
-Wire Wire Line
-	10050 4750 10650 4750
-Connection ~ 10650 5200
-Wire Wire Line
-	10650 5200 10850 5200
 Wire Notes Line
 	7300 4000 11100 4000
 Wire Notes Line
@@ -755,7 +598,7 @@ U 1 1 5C0F3302
 P 2550 5000
 F 0 "R1" V 2550 5000 50  0000 C CNN
 F 1 "0805, 10k, 1/16W" H 2700 4900 50  0000 C CNN
-F 2 "tomu-fpga:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 2550 5000 50  0001 C CNN
+F 2 "tomu-fpga:R_0201_0603Metric" H 2550 5000 50  0001 C CNN
 F 3 "" H 2550 5000 50  0001 C CNN
 F 4 "ANY" H 2550 5000 50  0001 C CNN "MPN"
 F 5 "ANY" H 2550 5000 50  0001 C CNN "Manufacturer"
@@ -765,66 +608,10 @@ F 6 "ANY" H -1000 0   50  0001 C CNN "MYPN"
 $EndComp
 Wire Wire Line
 	2550 5100 2550 5350
-Connection ~ 2550 5350
 Wire Wire Line
 	2550 5350 2650 5350
 Wire Wire Line
 	2550 4850 2550 4900
-$Comp
-L tomu-fpga:SW_Push SW3
-U 1 1 5C1DD9BA
-P 8300 2450
-F 0 "SW3" H 8300 2735 50  0000 C CNN
-F 1 "USER1" H 8300 2644 50  0000 C CNN
-F 2 "tomu-fpga:SPST-NO-Button" H 8300 2650 50  0001 C CNN
-F 3 "http://www.ckswitches.com/media/1467/pts525.pdf" H 8300 2650 50  0001 C CNN
-F 4 "PTS525SM15SMTR2 LFS" H 650 50  50  0001 C CNN "MPN"
-F 5 "SW-PB-5X5-1.6" H 650 50  50  0001 C CNN "MYPN"
-F 6 "C&K" H 650 50  50  0001 C CNN "Manufacturer"
-F 7 "CKN9104CT-ND" H 0   -50 50  0001 C CNN "DPN"
-F 8 "SWITCH TACTILE SPST-NO 0.02A 15V" H 0   -50 50  0001 C CNN "Description"
-	1    8300 2450
-	0    1    1    0   
-$EndComp
-$Comp
-L tomu-fpga:SW_Push SW4
-U 1 1 5C1DDAF6
-P 8300 3000
-F 0 "SW4" H 8300 3285 50  0000 C CNN
-F 1 "USER2" H 8300 3194 50  0000 C CNN
-F 2 "tomu-fpga:SPST-NO-Button" H 8300 3200 50  0001 C CNN
-F 3 "http://www.ckswitches.com/media/1467/pts525.pdf" H 8300 3200 50  0001 C CNN
-F 4 "PTS525SM15SMTR2 LFS" H 650 250 50  0001 C CNN "MPN"
-F 5 "SW-PB-5X5-1.6" H 650 250 50  0001 C CNN "MYPN"
-F 6 "C&K" H 650 250 50  0001 C CNN "Manufacturer"
-F 7 "CKN9104CT-ND" H 8300 3000 50  0001 C CNN "DPN"
-F 8 "SWITCH TACTILE SPST-NO 0.02A 15V" H 0   150 50  0001 C CNN "Description"
-	1    8300 3000
-	0    1    1    0   
-$EndComp
-Wire Wire Line
-	8650 2800 9200 2800
-Wire Wire Line
-	9200 2800 9200 3100
-Wire Wire Line
-	9200 3100 10000 3100
-Wire Wire Line
-	10000 3000 9300 3000
-Wire Wire Line
-	9300 3000 9300 2650
-Wire Wire Line
-	9300 2650 8650 2650
-$Comp
-L power:GND #PWR030
-U 1 1 5C20065F
-P 8050 3300
-F 0 "#PWR030" H 8050 3050 50  0001 C CNN
-F 1 "GND" H 8055 3127 50  0000 C CNN
-F 2 "" H 8050 3300 50  0001 C CNN
-F 3 "" H 8050 3300 50  0001 C CNN
-	1    8050 3300
-	1    0    0    -1  
-$EndComp
 Wire Notes Line
 	600  4250 600  7450
 Wire Notes Line
@@ -835,20 +622,16 @@ Text Notes 650  4400 0    50   ~ 0
 Boot and Reset
 Wire Wire Line
 	1150 2100 1350 2100
-Wire Wire Line
-	1300 2200 1350 2200
 Wire Wire Line
 	1100 3200 1350 3200
 Wire Wire Line
-	1300 3300 1300 2900
+	1300 3450 1300 2900
 Text Notes 2500 1950 0    50   ~ 0
 Power sequencing:\n1) 1.2V (VCC/VCCPLL)\n2) 3.3V (SPI_VCCIO1)\n3) 2.5V (VPP_2V5)\nSubsequent rails activate\nafter previous rail goes >0.5V
 Wire Wire Line
 	2000 1000 2000 1800
 Wire Wire Line
 	2000 1800 1300 1800
-Wire Wire Line
-	1300 1800 1300 2200
 Connection ~ 2000 1000
 Wire Wire Line
 	2000 2100 2000 2900
@@ -876,7 +659,7 @@ U 1 1 5C39F47B
 P 9300 1250
 F 0 "R8" V 9300 1250 50  0000 C CNN
 F 1 "0805, 1.5k, 1/16W, 1%" V 9400 1350 50  0000 C CNN
-F 2 "tomu-fpga:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 9300 1250 50  0001 C CNN
+F 2 "tomu-fpga:R_0201_0603Metric" H 9300 1250 50  0001 C CNN
 F 3 "" H 9300 1250 50  0001 C CNN
 F 4 "ANY" H 800 100 50  0001 C CNN "MPN"
 F 5 "ANY" H 800 100 50  0001 C CNN "MYPN"
@@ -910,20 +693,6 @@ F 3 "" H 4050 7200 50  0001 C CNN
 $EndComp
 Wire Wire Line
 	2400 7250 2400 6950
-$Comp
-L Device:R_Small R4
-U 1 1 5C41A61D
-P 3800 5000
-F 0 "R4" V 3800 5000 50  0000 C CNN
-F 1 "0805, 10k, 1/16W (DNP)" H 3750 5150 50  0000 C CNN
-F 2 "tomu-fpga:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 3800 5000 50  0001 C CNN
-F 3 "" H 3800 5000 50  0001 C CNN
-F 4 "DNP" H 3800 5000 50  0001 C CNN "MPN"
-F 5 "DNP" H 3800 5000 50  0001 C CNN "Manufacturer"
-F 6 "DNP" H -1350 -50 50  0001 C CNN "MYPN"
-	1    3800 5000
-	1    0    0    -1  
-$EndComp
 Wire Wire Line
 	2050 3600 2300 3600
 Wire Wire Line
@@ -953,7 +722,7 @@ U 1 1 5C493DB2
 P 3600 7250
 F 0 "R5" V 3600 7250 50  0000 C CNN
 F 1 "0805, 10k, 1/16W" V 3500 7350 50  0000 C CNN
-F 2 "tomu-fpga:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 3600 7250 50  0001 C CNN
+F 2 "tomu-fpga:R_0201_0603Metric" H 3600 7250 50  0001 C CNN
 F 3 "" H 3600 7250 50  0001 C CNN
 F 4 "ANY" H -1400 400 50  0001 C CNN "MPN"
 F 5 "ANY" H -1400 400 50  0001 C CNN "MYPN"
@@ -967,7 +736,7 @@ U 1 1 5C52D560
 P 9500 5700
 F 0 "C21" H 9250 5700 50  0000 L CNN
 F 1 "0805, 100nF, 10V, X5R, 20%" H 8800 5600 50  0000 L CNN
-F 2 "tomu-fpga:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 9500 5700 50  0001 C CNN
+F 2 "tomu-fpga:C_0201_0603Metric" H 9500 5700 50  0001 C CNN
 F 3 "" H 9500 5700 50  0001 C CNN
 F 4 "ANY" H 350 250 50  0001 C CNN "MPN"
 F 5 "ANY" H 350 250 50  0001 C CNN "MYPN"
@@ -992,7 +761,7 @@ U 1 1 5C5E5A07
 P 8850 5400
 F 0 "C20" H 8950 5400 50  0000 L CNN
 F 1 "0805, 100nF, 10V, X5R, 20%" H 7950 5300 50  0000 L CNN
-F 2 "tomu-fpga:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 8850 5400 50  0001 C CNN
+F 2 "tomu-fpga:C_0201_0603Metric" H 8850 5400 50  0001 C CNN
 F 3 "" H 8850 5400 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"
@@ -1021,7 +790,7 @@ U 1 1 5C64A04D
 P 8450 5300
 F 0 "C18" H 8550 5300 50  0000 L CNN
 F 1 "0805, 10nF, 10V, X5R, 20%" H 7700 5200 50  0000 L CNN
-F 2 "tomu-fpga:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 8450 5300 50  0001 C CNN
+F 2 "tomu-fpga:C_0201_0603Metric" H 8450 5300 50  0001 C CNN
 F 3 "" H 8450 5300 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"
@@ -1035,7 +804,7 @@ U 1 1 5C64A110
 P 7950 5200
 F 0 "C17" H 8050 5200 50  0000 L CNN
 F 1 "0805, 1uF, 10V, X5R, 20%" H 7350 5100 50  0000 L CNN
-F 2 "tomu-fpga:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 7950 5200 50  0001 C 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"
@@ -1077,7 +846,7 @@ U 1 1 5C71BA4C
 P 5800 950
 F 0 "C13" H 5650 1000 50  0000 L CNN
 F 1 "0805, 1uF, 10V, X5R, 20%" H 4950 900 50  0000 L CNN
-F 2 "tomu-fpga:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 5800 950 50  0001 C CNN
+F 2 "tomu-fpga:C_0201_0603Metric" H 5800 950 50  0001 C CNN
 F 3 "" H 5800 950 50  0001 C CNN
 F 4 "ANY" H 200 -600 50  0001 C CNN "MPN"
 F 5 "ANY" H 200 -600 50  0001 C CNN "MYPN"
@@ -1091,7 +860,7 @@ U 1 1 5C71BAD4
 P 6150 950
 F 0 "C14" H 6000 1000 50  0000 L CNN
 F 1 "0805, 10nF, 10V, X5R, 20%" H 5400 1100 50  0000 L CNN
-F 2 "tomu-fpga:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 6150 950 50  0001 C CNN
+F 2 "tomu-fpga:C_0201_0603Metric" H 6150 950 50  0001 C CNN
 F 3 "" H 6150 950 50  0001 C CNN
 F 4 "ANY" H 200 -600 50  0001 C CNN "MPN"
 F 5 "ANY" H 200 -600 50  0001 C CNN "MYPN"
@@ -1105,7 +874,7 @@ U 1 1 5C71BB44
 P 6500 950
 F 0 "C15" H 6350 1000 50  0000 L CNN
 F 1 "0805, 100nF, 10V, X5R, 20%" H 6000 750 50  0000 L CNN
-F 2 "tomu-fpga:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 6500 950 50  0001 C CNN
+F 2 "tomu-fpga:C_0201_0603Metric" H 6500 950 50  0001 C CNN
 F 3 "" H 6500 950 50  0001 C CNN
 F 4 "ANY" H 200 -600 50  0001 C CNN "MPN"
 F 5 "ANY" H 200 -600 50  0001 C CNN "MYPN"
@@ -1164,7 +933,7 @@ U 1 1 5C7EE93E
 P 9900 950
 F 0 "C24" H 9750 1000 50  0000 L CNN
 F 1 "0805, 1uF, 10V, X5R, 20%" H 9050 900 50  0000 L CNN
-F 2 "tomu-fpga:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 9900 950 50  0001 C 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 650 100 50  0001 C CNN "MPN"
 F 5 "ANY" H 650 100 50  0001 C CNN "MYPN"
@@ -1178,7 +947,7 @@ U 1 1 5C7EE944
 P 10250 950
 F 0 "C26" H 10100 1000 50  0000 L CNN
 F 1 "0805, 10nF, 10V, X5R, 20%" H 9500 1100 50  0000 L CNN
-F 2 "tomu-fpga:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 10250 950 50  0001 C CNN
+F 2 "tomu-fpga:C_0201_0603Metric" H 10250 950 50  0001 C CNN
 F 3 "" H 10250 950 50  0001 C CNN
 F 4 "ANY" H 650 100 50  0001 C CNN "MPN"
 F 5 "ANY" H 650 100 50  0001 C CNN "MYPN"
@@ -1192,7 +961,7 @@ U 1 1 5C7EE94A
 P 10600 950
 F 0 "C28" H 10450 1000 50  0000 L CNN
 F 1 "0805, 100nF, 10V, X5R, 20%" H 10100 750 50  0000 L CNN
-F 2 "tomu-fpga:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 10600 950 50  0001 C CNN
+F 2 "tomu-fpga:C_0201_0603Metric" H 10600 950 50  0001 C CNN
 F 3 "" H 10600 950 50  0001 C CNN
 F 4 "ANY" H 650 100 50  0001 C CNN "MPN"
 F 5 "ANY" H 650 100 50  0001 C CNN "MYPN"
@@ -1251,7 +1020,7 @@ U 1 1 5C8902AA
 P 1100 4750
 F 0 "C5" H 900 4750 50  0000 L CNN
 F 1 "0805, 1uF, 10V, X5R, 20%" H 650 4650 50  0000 L CNN
-F 2 "tomu-fpga:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 1100 4750 50  0001 C CNN
+F 2 "tomu-fpga:C_0201_0603Metric" H 1100 4750 50  0001 C CNN
 F 3 "" H 1100 4750 50  0001 C CNN
 F 4 "ANY" H -3600 300 50  0001 C CNN "MPN"
 F 5 "ANY" H -3600 300 50  0001 C CNN "MYPN"
@@ -1265,7 +1034,7 @@ U 1 1 5C8902B0
 P 1500 4950
 F 0 "C6" H 1250 4950 50  0000 L CNN
 F 1 "0805, 10nF, 10V, X5R, 20%" H 1050 4850 50  0000 L CNN
-F 2 "tomu-fpga:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 1500 4950 50  0001 C CNN
+F 2 "tomu-fpga:C_0201_0603Metric" H 1500 4950 50  0001 C CNN
 F 3 "" H 1500 4950 50  0001 C CNN
 F 4 "ANY" H -3550 500 50  0001 C CNN "MPN"
 F 5 "ANY" H -3550 500 50  0001 C CNN "MYPN"
@@ -1279,7 +1048,7 @@ U 1 1 5C8902B6
 P 1900 5150
 F 0 "C7" H 1650 5150 50  0000 L CNN
 F 1 "0805, 100nF, 10V, X5R, 20%" H 1200 5050 50  0000 L CNN
-F 2 "tomu-fpga:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 1900 5150 50  0001 C CNN
+F 2 "tomu-fpga:C_0201_0603Metric" H 1900 5150 50  0001 C CNN
 F 3 "" H 1900 5150 50  0001 C CNN
 F 4 "ANY" H -3500 700 50  0001 C CNN "MPN"
 F 5 "ANY" H -3500 700 50  0001 C CNN "MYPN"
@@ -1298,32 +1067,13 @@ F 3 "" H 1500 5400 50  0001 C CNN
 	1    1500 5400
 	1    0    0    -1  
 $EndComp
-Text Notes 9450 4800 0    50   ~ 0
-VCCPLL Filter
-$Comp
-L tomu-fpga:LDO-SOT23 U8
-U 1 1 5BDB73B2
-P 8150 4750
-F 0 "U8" H 8400 4950 50  0000 C CNN
-F 1 "LDO-SOT23-1.2V" H 8050 4700 50  0000 C CNN
-F 2 "tomu-fpga:SOT-23-5_HandSoldering" H 8200 4750 50  0001 C CNN
-F 3 "http://www.ti.com/lit/ds/symlink/lp5907.pdf" H 8200 4750 50  0001 C CNN
-F 4 "LP5907MFX-1.2/NOPB" H 8150 4750 50  0001 C CNN "MPN"
-F 5 "TI" H 8150 4750 50  0001 C CNN "Manufacturer"
-F 6 "MIC5504-1.2YMT" H 8150 4750 50  0001 C CNN "AMPN"
-F 7 "Microchip" H 8150 4750 50  0001 C CNN "AManufacturer"
-F 8 "296-39062-1-ND" H 8150 4750 50  0001 C CNN "DPN"
-F 9 "IC REG LINEAR 1.2V 250MA SOT23-5" H 0   0   50  0001 C CNN "Description"
-	1    8150 4750
-	1    0    0    -1  
-$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 "0805, 1uF, 10V, X5R, 20%" H 8000 4800 50  0000 L CNN
-F 2 "tomu-fpga:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 8550 4600 50  0001 C 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"
@@ -1337,7 +1087,7 @@ U 1 1 5BDC7CFF
 P 7550 4750
 F 0 "C16" H 7600 4850 50  0000 L CNN
 F 1 "0805, 1uF, 10V, X5R, 20%" V 7400 4350 50  0000 L CNN
-F 2 "tomu-fpga:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 7550 4750 50  0001 C CNN
+F 2 "tomu-fpga:C_0201_0603Metric" H 7550 4750 50  0001 C CNN
 F 3 "" H 7550 4750 50  0001 C CNN
 F 4 "ANY" H 7550 4750 50  0001 C CNN "MPN"
 F 5 "ANY" H 7550 4750 50  0001 C CNN "Manufacturer"
@@ -1371,23 +1121,13 @@ Wire Wire Line
 	7550 4350 7550 4500
 Wire Wire Line
 	7550 4850 7550 5000
-Wire Wire Line
-	9000 4500 9000 4900
-Wire Wire Line
-	9000 4900 9150 4900
 Wire Wire Line
 	8450 4500 8550 4500
 Connection ~ 8550 4500
 Wire Wire Line
 	8550 4500 9000 4500
-Connection ~ 9150 4900
-Wire Wire Line
-	9150 4900 9150 5000
-Wire Wire Line
-	7850 4500 7850 4600
 Wire Wire Line
 	7850 4500 7550 4500
-Connection ~ 7850 4500
 Connection ~ 7550 4500
 Wire Wire Line
 	7550 4500 7550 4650
@@ -1396,20 +1136,16 @@ Wire Wire Line
 Wire Wire Line
 	8550 5000 8450 5000
 Connection ~ 7550 5000
-Wire Wire Line
-	8450 4700 8450 5000
 Connection ~ 8450 5000
 Wire Wire Line
 	8450 5000 7550 5000
-Text Notes 9300 4250 0    50   ~ 0
-Note: Only populate regulator or filter circuit\nDo not populate both!
 $Comp
 L Device:C_Small C27
 U 1 1 5BECECF0
 P 10500 5900
 F 0 "C27" H 10600 5900 50  0000 L CNN
 F 1 "0805, 10nF, 10V, X5R, 20%" H 9800 5800 50  0000 L CNN
-F 2 "tomu-fpga:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 10500 5900 50  0001 C CNN
+F 2 "tomu-fpga:C_0201_0603Metric" H 10500 5900 50  0001 C CNN
 F 3 "" H 10500 5900 50  0001 C CNN
 F 4 "ANY" H 2250 700 50  0001 C CNN "MPN"
 F 5 "ANY" H 2250 700 50  0001 C CNN "MYPN"
@@ -1423,7 +1159,7 @@ U 1 1 5BECED7C
 P 10000 5800
 F 0 "C25" H 10100 5800 50  0000 L CNN
 F 1 "0805, 1uF, 10V, X5R, 20%" H 9300 5700 50  0000 L CNN
-F 2 "tomu-fpga:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 10000 5800 50  0001 C CNN
+F 2 "tomu-fpga:C_0201_0603Metric" H 10000 5800 50  0001 C CNN
 F 3 "" H 10000 5800 50  0001 C CNN
 F 4 "ANY" H 2200 700 50  0001 C CNN "MPN"
 F 5 "ANY" H 2200 700 50  0001 C CNN "MYPN"
@@ -1468,8 +1204,6 @@ Wire Wire Line
 Connection ~ 10000 6100
 Wire Wire Line
 	10000 6100 9500 6100
-Text Notes 7750 4900 0    50   ~ 0
-VCCPLL Regulator
 $Comp
 L tomu-fpga:Oscillator U7
 U 1 1 5C0E8D0F
@@ -1496,8 +1230,6 @@ F 3 "" H 4200 1600 50  0001 C CNN
 	1    4200 1600
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	4200 1600 4200 2150
 Wire Wire Line
 	4200 2600 4350 2600
 Wire Wire Line
@@ -1522,49 +1254,17 @@ Wire Wire Line
 Wire Wire Line
 	4450 2750 4450 2600
 Connection ~ 4450 2600
-$Comp
-L Device:R_Small R7
-U 1 1 5C1737EA
-P 5250 2250
-F 0 "R7" V 5250 2250 50  0000 C CNN
-F 1 "0201, 0ohm (DNP)" V 5150 2500 50  0000 C CNN
-F 2 "tomu-fpga:R_0201_0603Metric" H 5250 2250 50  0001 C CNN
-F 3 "" H 5250 2250 50  0001 C CNN
-F 4 "DNP" H 5250 2250 50  0001 C CNN "MPN"
-F 5 "DNP" H 5250 2250 50  0001 C CNN "Manufacturer"
-F 6 "DNP" H 1700 -2750 50  0001 C CNN "MYPN"
-	1    5250 2250
-	-1   0    0    1   
-$EndComp
 Wire Wire Line
 	5150 2400 5250 2400
-Wire Wire Line
-	5250 2400 5250 2350
-Wire Wire Line
-	5250 2150 5250 2050
 Wire Wire Line
 	5250 2050 5850 2050
 $Comp
-L Device:R_Small R6
-U 1 1 5C1B1B9B
-P 5250 1850
-F 0 "R6" V 5250 1850 50  0000 C CNN
-F 1 "0201, 0ohm (DNP)" V 5350 2050 50  0000 C CNN
-F 2 "tomu-fpga:R_0201_0603Metric" H 5250 1850 50  0001 C CNN
-F 3 "" H 5250 1850 50  0001 C CNN
-F 4 "DNP" H 5250 1850 50  0001 C CNN "MPN"
-F 5 "DNP" H 5250 1850 50  0001 C CNN "Manufacturer"
-F 6 "DNP" H 1700 -3150 50  0001 C CNN "MYPN"
-	1    5250 1850
-	1    0    0    -1  
-$EndComp
-$Comp
 L Device:C_Small C11
 U 1 1 5C1F1DFB
 P 4350 2500
 F 0 "C11" H 4400 2550 50  0000 L CNN
 F 1 "0805, 100nF, 10V, X5R, 20%" H 4200 2300 50  0000 L CNN
-F 2 "tomu-fpga:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 4350 2500 50  0001 C CNN
+F 2 "tomu-fpga:C_0201_0603Metric" H 4350 2500 50  0001 C CNN
 F 3 "" H 4350 2500 50  0001 C CNN
 F 4 "ANY" H -700 400 50  0001 C CNN "MPN"
 F 5 "ANY" H -700 400 50  0001 C CNN "MYPN"
@@ -1590,7 +1290,7 @@ Text Label 2300 6550 0    50   ~ 0
 SPI_IO2
 Text Label 2300 6450 0    50   ~ 0
 SPI_IO3
-Text Label 3800 5350 1    50   ~ 0
+Text Label 3800 5300 1    50   ~ 0
 CDONE
 $Comp
 L tomu-fpga:ICE40UP5K-SG48ITR U5
@@ -1678,7 +1378,6 @@ Wire Wire Line
 	950  6450 950  6700
 Wire Wire Line
 	3150 4850 2550 4850
-Connection ~ 3150 4850
 Wire Notes Line
 	600  4250 4300 4250
 Wire Wire Line
@@ -1707,189 +1406,13 @@ Wire Wire Line
 	1500 4600 1500 4850
 Connection ~ 1500 4600
 Connection ~ 2550 4850
-Wire Wire Line
-	3150 4850 3800 4850
-Wire Wire Line
-	5200 6700 5200 6800
-Wire Wire Line
-	5200 6800 5300 6800
-Wire Wire Line
-	5900 6800 5900 6700
-Wire Wire Line
-	5800 6700 5800 6800
-Connection ~ 5800 6800
-Wire Wire Line
-	5800 6800 5900 6800
-Wire Wire Line
-	5700 6700 5700 6800
-Connection ~ 5700 6800
-Wire Wire Line
-	5700 6800 5800 6800
-Wire Wire Line
-	5600 6700 5600 6800
-Connection ~ 5600 6800
-Wire Wire Line
-	5600 6800 5700 6800
-Wire Wire Line
-	5500 6700 5500 6800
-Connection ~ 5500 6800
-Wire Wire Line
-	5500 6800 5550 6800
-Wire Wire Line
-	5400 6700 5400 6800
-Connection ~ 5400 6800
-Wire Wire Line
-	5400 6800 5500 6800
-Wire Wire Line
-	5300 6700 5300 6800
-Connection ~ 5300 6800
-Wire Wire Line
-	5300 6800 5400 6800
-Wire Wire Line
-	5550 6800 5550 6900
-Connection ~ 5550 6800
-Wire Wire Line
-	5550 6800 5600 6800
-$Comp
-L power:GND #PWR025
-U 1 1 5C88DA23
-P 5550 6900
-F 0 "#PWR025" H 5550 6650 50  0001 C CNN
-F 1 "GND" H 5555 6727 50  0000 C CNN
-F 2 "" H 5550 6900 50  0001 C CNN
-F 3 "" H 5550 6900 50  0001 C CNN
-	1    5550 6900
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	5400 4100 5400 3950
-Wire Wire Line
-	5400 3950 5450 3950
-Wire Wire Line
-	5500 3950 5500 4100
-NoConn ~ 5700 4100
-NoConn ~ 5800 4100
-$Comp
-L power:+5V #PWR024
-U 1 1 5C8CE0D0
-P 5450 3900
-F 0 "#PWR024" H 5450 3750 50  0001 C CNN
-F 1 "+5V" H 5465 4073 50  0000 C CNN
-F 2 "" H 5450 3900 50  0001 C CNN
-F 3 "" H 5450 3900 50  0001 C CNN
-	1    5450 3900
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	5450 3900 5450 3950
-Connection ~ 5450 3950
-Wire Wire Line
-	5450 3950 5500 3950
-Wire Wire Line
-	6400 5700 6750 5700
-Wire Wire Line
-	6400 5800 6750 5800
-Wire Wire Line
-	6400 5900 6750 5900
-Text Label 6450 5600 0    50   ~ 0
-SPI_CS
-Text Label 6450 5900 0    50   ~ 0
-SPI_CLK
-Text Label 6450 5700 0    50   ~ 0
-SPI_MISO
-Text Label 6450 5800 0    50   ~ 0
-SPI_MOSI
-Wire Wire Line
-	6400 5600 6750 5600
-Wire Wire Line
-	4800 4500 4450 4500
-Wire Wire Line
-	4450 4600 4800 4600
-Text Label 4450 4500 0    50   ~ 0
-UART_TX
-Text Label 4450 4600 0    50   ~ 0
-UART_RX
-Text Label 2300 6250 0    50   ~ 0
-UART_RX
-Wire Wire Line
-	2650 6250 2300 6250
-Text Label 2300 6150 0    50   ~ 0
-UART_TX
-Wire Wire Line
-	2300 6150 2650 6150
-Text Label 4450 6100 0    50   ~ 0
-CRESET
-Text Label 4450 4900 0    50   ~ 0
-CDONE
-Wire Wire Line
-	4450 4900 4800 4900
-Wire Wire Line
-	4450 6100 4800 6100
-Wire Wire Line
-	4800 5900 4450 5900
-Text Label 4450 5900 0    50   ~ 0
-SPI_IO3
-Wire Wire Line
-	4800 5800 4450 5800
-Text Label 4450 5800 0    50   ~ 0
-SPI_IO2
-Text Notes 4900 7400 0    50   ~ 0
-To program SPI flash, put FPGA in RESET\nTo program FPGA, keep SPI_IO3 LOW
 Connection ~ 8450 5200
 Wire Wire Line
 	8450 5200 8700 5200
-Wire Wire Line
-	3800 5100 3800 5350
 Wire Wire Line
 	1700 4600 1900 4600
 Wire Wire Line
-	4800 5600 4450 5600
-Text Label 4450 5600 0    50   ~ 0
-DBG_1
-Wire Wire Line
-	6400 5100 6750 5100
-Wire Wire Line
-	4800 5000 4450 5000
-Text Label 4450 5000 0    50   ~ 0
-DBG_4
-Wire Wire Line
-	6400 4900 6750 4900
-Wire Wire Line
-	6400 4800 6750 4800
-Wire Wire Line
-	5850 1850 5650 1850
-Text Label 9900 1650 1    50   ~ 0
-DBG_4
-Text Label 2300 5850 0    50   ~ 0
-DBG_1
-Wire Wire Line
-	2300 5750 2650 5750
-Wire Notes Line
-	4400 7450 6850 7450
-Wire Notes Line
-	6850 3550 4400 3550
-Wire Notes Line
-	4400 3550 4400 7450
-Wire Notes Line
-	6850 3550 6850 7450
-Text Notes 6800 3750 2    50   ~ 0
-Raspberry Pi "Hat"\nUsed for firmware development
-$Comp
-L tomu-fpga:SW_Push SW1
-U 1 1 5D126443
-P 1950 5800
-F 0 "SW1" H 1950 6085 50  0000 C CNN
-F 1 "RESET" H 1950 5994 50  0000 C CNN
-F 2 "tomu-fpga:SPST-NO-Button" H 1950 6000 50  0001 C CNN
-F 3 "http://www.ckswitches.com/media/1467/pts525.pdf" H 1950 6000 50  0001 C CNN
-F 4 "PTS525SM15SMTR2 LFS" H -5700 3050 50  0001 C CNN "MPN"
-F 5 "SW-PB-5X5-1.6" H -5700 3050 50  0001 C CNN "MYPN"
-F 6 "C&K" H -5700 3050 50  0001 C CNN "Manufacturer"
-F 7 "CKN9104CT-ND" H 1950 5800 50  0001 C CNN "DPN"
-F 8 "SWITCH TACTILE SPST-NO 0.02A 15V" H 0   150 50  0001 C CNN "Description"
-	1    1950 5800
-	0    1    1    0   
-$EndComp
+	5850 1850 5150 1850
 Wire Wire Line
 	1700 4500 1700 4600
 Wire Wire Line
@@ -1897,98 +1420,6 @@ Wire Wire Line
 Connection ~ 1900 4850
 Wire Wire Line
 	1900 4850 1900 5050
-Wire Wire Line
-	2150 5350 2150 5600
-$Comp
-L power:GND #PWR011
-U 1 1 5D1AAF27
-P 1700 6000
-F 0 "#PWR011" H 1700 5750 50  0001 C CNN
-F 1 "GND" H 1800 5900 50  0000 C CNN
-F 2 "" H 1700 6000 50  0001 C CNN
-F 3 "" H 1700 6000 50  0001 C CNN
-	1    1700 6000
-	1    0    0    -1  
-$EndComp
-$Comp
-L Device:LED D1
-U 1 1 5D1C64EF
-P 2750 3200
-F 0 "D1" H 2742 2945 50  0000 C CNN
-F 1 "Power LED" H 2742 3036 50  0000 C CNN
-F 2 "tomu-fpga:LED_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 2750 3200 50  0001 C CNN
-F 3 "http://optoelectronics.liteon.com/upload/download/DS-22-99-0150/LTST-C170KRKT.pdf" H 2750 3200 50  0001 C CNN
-F 4 "160-1415-1-ND" H 2750 3200 50  0001 C CNN "DPN"
-F 5 "LTST-C170KRKT" H 2750 3200 50  0001 C CNN "MPN"
-F 6 "Lite-On Inc." H 2750 3200 50  0001 C CNN "Manufacturer"
-F 7 "LED RED CLEAR SMD" H 2750 3200 50  0001 C CNN "Description"
-	1    2750 3200
-	-1   0    0    1   
-$EndComp
-$Comp
-L Device:R_Small R2
-U 1 1 5D1C6F06
-P 3150 3200
-F 0 "R2" V 3050 3200 50  0000 C CNN
-F 1 "0805, 1.5k, 1/16W, 1%" V 3300 3150 50  0000 C CNN
-F 2 "tomu-fpga:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 3150 3200 50  0001 C CNN
-F 3 "" H 3150 3200 50  0001 C CNN
-F 4 "ANY" H -5350 1000 50  0001 C CNN "MPN"
-F 5 "ANY" H -5350 1000 50  0001 C CNN "MYPN"
-F 6 "ANY" H -5350 1000 50  0001 C CNN "Manufacturer"
-	1    3150 3200
-	0    1    1    0   
-$EndComp
-Wire Wire Line
-	2600 3200 2500 3200
-Connection ~ 2500 3200
-Wire Wire Line
-	2900 3200 3050 3200
-Wire Wire Line
-	3250 3200 3400 3200
-Wire Wire Line
-	3400 3200 3400 3600
-Wire Wire Line
-	3400 3600 2500 3600
-Connection ~ 2500 3600
-Text Label 6450 4800 0    50   ~ 0
-DBG_7
-Text Label 6450 4900 0    50   ~ 0
-DBG_8
-Text Label 6450 5100 0    50   ~ 0
-DBG_9
-Text Label 6450 5500 0    50   ~ 0
-DBG_10
-Wire Wire Line
-	6400 5500 6750 5500
-$Comp
-L Connector:Raspberry_Pi_2_3 J1
-U 1 1 5C14D2BF
-P 5600 5400
-F 0 "J1" H 4950 6650 50  0000 C CNN
-F 1 "Raspberry_Pi_2_3" H 6150 6650 50  0000 C CNN
-F 2 "tomu-fpga:PinHeader_2x20_P2.54mm_Vertical" H 5600 5400 50  0001 C CNN
-F 3 "https://www.raspberrypi.org/documentation/hardware/raspberrypi/schematics/rpi_SCH_3bplus_1p0_reduced.pdf" H 5600 5400 50  0001 C CNN
-F 4 "Connector for development" H 0   0   50  0001 C CNN "Description"
-	1    5600 5400
-	1    0    0    -1  
-$EndComp
-Text Label 2300 6350 0    50   ~ 0
-DBG_7
-Text Label 2300 6050 0    50   ~ 0
-DBG_8
-Text Label 2300 5950 0    50   ~ 0
-DBG_9
-Text Label 2300 5750 0    50   ~ 0
-DBG_10
-Wire Wire Line
-	2300 5850 2650 5850
-Wire Wire Line
-	2650 5950 2300 5950
-Wire Wire Line
-	2300 6050 2650 6050
-Wire Wire Line
-	2650 6350 2300 6350
 Text Label 7100 4500 0    50   ~ 0
 DBG_18
 Wire Wire Line
@@ -2002,35 +1433,6 @@ Wire Wire Line
 	9000 2400 9000 1900
 Wire Wire Line
 	9350 2400 9250 2400
-NoConn ~ 4800 4800
-Connection ~ 4200 2150
-Wire Wire Line
-	4200 2150 4200 2600
-Wire Wire Line
-	4400 1650 4250 1650
-Wire Wire Line
-	4250 1650 4250 2400
-Connection ~ 4250 2400
-Wire Wire Line
-	5250 1950 5250 2050
-Connection ~ 5250 2050
-Wire Wire Line
-	5250 1750 5250 1650
-Wire Wire Line
-	5250 1650 5100 1650
-Wire Wire Line
-	4350 2150 4350 1850
-Wire Wire Line
-	4350 1850 4400 1850
-Connection ~ 4350 2150
-Wire Wire Line
-	4350 2150 4200 2150
-Wire Wire Line
-	4350 2150 5150 2150
-Wire Wire Line
-	5150 2150 5150 1850
-Wire Wire Line
-	5150 1850 5100 1850
 Wire Wire Line
 	3500 7250 2400 7250
 Wire Wire Line
@@ -2076,8 +1478,6 @@ Wire Wire Line
 	4050 6950 4050 6900
 Text Label 9250 5000 0    50   ~ 0
 VCCPLL
-Wire Wire Line
-	9600 5000 9150 5000
 Wire Wire Line
 	9600 5100 9500 5100
 Wire Wire Line
@@ -2085,65 +1485,12 @@ Wire Wire Line
 Connection ~ 9500 5200
 Wire Wire Line
 	9500 5200 9600 5200
-Wire Wire Line
-	8400 2250 8650 2250
-Wire Wire Line
-	8200 2250 8050 2250
-Wire Wire Line
-	8050 2250 8050 2650
-Wire Wire Line
-	8650 2250 8650 2650
-Wire Wire Line
-	8400 2650 8650 2650
-Connection ~ 8650 2650
-Wire Wire Line
-	8200 2650 8050 2650
-Connection ~ 8050 2650
-Wire Wire Line
-	8050 2650 8050 2800
-Wire Wire Line
-	8650 2800 8400 2800
-Wire Wire Line
-	8650 2800 8650 3200
-Wire Wire Line
-	8650 3200 8400 3200
-Connection ~ 8650 2800
-Wire Wire Line
-	8200 2800 8050 2800
-Connection ~ 8050 2800
-Wire Wire Line
-	8200 3200 8050 3200
-Connection ~ 8050 3200
-Wire Wire Line
-	8050 3200 8050 3300
-Wire Wire Line
-	8050 2800 8050 3200
-Wire Wire Line
-	2150 5600 2100 5600
-Wire Wire Line
-	2100 5600 2100 6000
-Wire Wire Line
-	2100 6000 2050 6000
-Wire Wire Line
-	2050 5600 2100 5600
-Connection ~ 2100 5600
-Wire Wire Line
-	1850 6000 1700 6000
-Connection ~ 1700 6000
-Wire Wire Line
-	1850 5600 1700 5600
-Wire Wire Line
-	1700 5600 1700 6000
-Text Label 9650 3200 0    50   ~ 0
+Text Label 9200 3200 0    50   ~ 0
 LED_B
-Text Label 9650 3300 0    50   ~ 0
+Text Label 9200 3300 0    50   ~ 0
 LED_G
-Text Label 9650 3400 0    50   ~ 0
+Text Label 9200 3400 0    50   ~ 0
 LED_R
-Wire Wire Line
-	2150 5350 2550 5350
-Wire Wire Line
-	3800 4900 3800 4850
 Wire Wire Line
 	10000 3200 9950 3200
 Wire Wire Line
@@ -2151,7 +1498,7 @@ Wire Wire Line
 Wire Wire Line
 	9950 3500 9800 3500
 Wire Wire Line
-	9650 3200 9900 3200
+	9100 3200 9900 3200
 Wire Wire Line
 	10000 3300 9900 3300
 Wire Wire Line
@@ -2159,25 +1506,15 @@ Wire Wire Line
 Wire Wire Line
 	9850 3400 9850 3300
 Wire Wire Line
-	9850 3300 9650 3300
+	9850 3300 9100 3300
 Wire Wire Line
 	9850 3400 10000 3400
 Wire Wire Line
-	9650 3400 9800 3400
+	9100 3400 9800 3400
 Wire Wire Line
 	9800 3400 9800 3500
-NoConn ~ 4800 5200
-NoConn ~ 4800 5300
-NoConn ~ 6400 6200
-NoConn ~ 6400 6100
-NoConn ~ 6400 5300
-NoConn ~ 6400 5200
-NoConn ~ 6400 4500
-NoConn ~ 6400 4600
 NoConn ~ 10000 2900
 NoConn ~ 10000 2400
-NoConn ~ 4800 5400
-NoConn ~ 4800 6000
 NoConn ~ 10000 2300
 Text Label 9650 2500 1    50   ~ 0
 ICE_USBP
@@ -2188,94 +1525,15 @@ Wire Wire Line
 Wire Wire Line
 	9500 1900 9650 1900
 Wire Wire Line
-	5750 2250 5750 1400
+	5850 1950 5050 1950
 Wire Wire Line
-	5850 1950 5550 1950
+	5150 1850 5150 1400
 Wire Wire Line
-	5650 1850 5650 1400
+	5050 1950 5050 1400
 Wire Wire Line
-	5550 1950 5550 1400
+	4950 1400 4950 2150
 Wire Wire Line
-	5450 1400 5450 2150
-Wire Wire Line
-	5450 2150 5850 2150
-Wire Wire Line
-	10000 1900 9900 1900
-Wire Wire Line
-	9900 1900 9900 1400
-NoConn ~ 4800 5700
-$Comp
-L tomu-fpga:Conn_01x06_Female J3
-U 1 1 5EC9746F
-P 7950 1150
-F 0 "J3" H 7950 750 50  0000 C CNN
-F 1 "PMOD" H 7900 1450 50  0000 C CNN
-F 2 "tomu-fpga:Pin_Header_Straight_1x06_Pitch2.54mm" H 7950 1150 50  0001 C CNN
-F 3 "~" H 7950 1150 50  0001 C CNN
-F 4 "DNP" H 7950 1150 50  0001 C CNN "MPN"
-F 5 "DNP" H 7950 1150 50  0001 C CNN "Manufacturer"
-F 6 "DNP" H 7950 1150 50  0001 C CNN "DPN"
-	1    7950 1150
-	-1   0    0    1   
-$EndComp
-$Comp
-L power:+3V3 #PWR022
-U 1 1 5EC97A9C
-P 8250 800
-F 0 "#PWR022" H 8250 650 50  0001 C CNN
-F 1 "+3V3" H 8350 800 50  0000 C CNN
-F 2 "" H 8250 800 50  0001 C CNN
-F 3 "" H 8250 800 50  0001 C CNN
-	1    8250 800 
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	8250 800  8250 850 
-Wire Wire Line
-	8250 850  8150 850 
-$Comp
-L power:GND #PWR023
-U 1 1 5ECB779F
-P 8600 1250
-F 0 "#PWR023" H 8600 1000 50  0001 C CNN
-F 1 "GND" H 8605 1077 50  0000 C CNN
-F 2 "" H 8600 1250 50  0001 C CNN
-F 3 "" H 8600 1250 50  0001 C CNN
-	1    8600 1250
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	8600 950  8150 950 
-Text Label 8150 1050 0    50   ~ 0
-PMOD_4
-Text Label 8150 1150 0    50   ~ 0
-PMOD_3
-Text Label 8150 1250 0    50   ~ 0
-PMOD_2
-Text Label 8150 1350 0    50   ~ 0
-PMOD_1
-Wire Wire Line
-	8150 1350 8450 1350
-Wire Wire Line
-	8150 1250 8450 1250
-Wire Wire Line
-	8150 1150 8450 1150
-Wire Wire Line
-	8150 1050 8450 1050
-Text Label 10000 1800 1    50   ~ 0
-PMOD_1
-Text Label 9700 2200 0    50   ~ 0
-PMOD_4
-Text Label 9700 2000 0    50   ~ 0
-PMOD_3
-Text Label 9700 2100 0    50   ~ 0
-PMOD_2
-Wire Wire Line
-	9700 2200 10000 2200
-Wire Wire Line
-	10000 2100 9700 2100
-Wire Wire Line
-	9700 2000 10000 2000
+	4950 2150 5850 2150
 $Comp
 L tomu-fpga:ICE40UP5K-SG48ITR U5
 U 1 1 5C1225F9
@@ -2293,14 +1551,10 @@ F 7 "ICE40-ULTRAPLUS, 5280 LUTS, 1.2V" H 0   0   50  0001 C CNN "Description"
 $EndComp
 Wire Wire Line
 	9650 1900 9650 2500
-Wire Wire Line
-	10000 1800 10000 1400
 NoConn ~ 5850 2550
 NoConn ~ 5850 2450
 NoConn ~ 5850 2350
 NoConn ~ 2650 5650
-Wire Wire Line
-	8600 1250 8600 950 
 Wire Wire Line
 	10000 2500 9800 2500
 Wire Wire Line
@@ -2317,4 +1571,342 @@ Wire Wire Line
 	9550 2800 10000 2800
 Wire Wire Line
 	9350 2700 10000 2700
+Wire Wire Line
+	5250 2050 5250 2400
+Wire Wire Line
+	4200 1600 4200 2600
+Wire Wire Line
+	5400 2250 5400 1500
+Wire Wire Line
+	5400 1500 5250 1500
+Wire Wire Line
+	5250 1500 5250 1400
+Text Notes 1150 7400 0    50   ~ 0
+To program SPI flash, put FPGA in RESET\nTo program FPGA, keep SPI_IO3 LOW
+Wire Wire Line
+	9000 4500 9000 5000
+Wire Wire Line
+	9000 5000 9600 5000
+$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 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"
+F 5 "Microchip" H 0   0   50  0001 C CNN "AManufacturer"
+F 6 "576-4305-1-ND" H 0   0   50  0001 C CNN "APN"
+F 7 "LP5907SNX-1.2/NOPB" H 0   0   50  0001 C CNN "MPN"
+F 8 "TI" H 0   0   50  0001 C CNN "Manufacturer"
+	1    1650 1300
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	1950 1250 2050 1250
+Connection ~ 2050 1250
+Wire Wire Line
+	2050 1250 2050 1400
+Wire Wire Line
+	1950 1150 2050 1150
+Wire Wire Line
+	2050 1150 2050 1250
+$Comp
+L Tomu_FPGA:LDO-X2SON U2
+U 1 1 5BF61C95
+P 1650 2400
+F 0 "U2" H 1650 2925 50  0000 C CNN
+F 1 "LDO-X2SON-3.3V" H 1650 2834 50  0000 C CNN
+F 2 "tomu-fpga:Texas_X2SON-4_1x1mm_P0.65mm" H 1650 2400 50  0001 C CNN
+F 3 "http://www.ti.com/lit/ds/symlink/lp5907.pdf" H 1650 2400 50  0001 C CNN
+F 4 "MIC5504-3.3YMT" H 0   1100 50  0001 C CNN "AMPN"
+F 5 "Microchip" H 0   1100 50  0001 C CNN "AManufacturer"
+F 6 "576-4305-1-ND" H 0   1100 50  0001 C CNN "APN"
+F 7 "LP5907SNX-3.3/NOPB" H 0   1100 50  0001 C CNN "MPN"
+F 8 "TI" H 0   1100 50  0001 C CNN "Manufacturer"
+F 9 "296-39066-2-ND " H 1650 2400 50  0001 C CNN "DPN"
+	1    1650 2400
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	1950 2350 2050 2350
+Connection ~ 2050 2350
+Wire Wire Line
+	2050 2350 2050 2500
+Wire Wire Line
+	1350 2350 1300 2350
+Wire Wire Line
+	1300 1800 1300 2350
+$Comp
+L Tomu_FPGA:LDO-X2SON U3
+U 1 1 5BFAB7F1
+P 1650 3500
+F 0 "U3" H 1650 4025 50  0000 C CNN
+F 1 "LDO-X2SON-2.5V" H 1650 3934 50  0000 C CNN
+F 2 "tomu-fpga:Texas_X2SON-4_1x1mm_P0.65mm" H 1650 3500 50  0001 C CNN
+F 3 "http://www.ti.com/lit/ds/symlink/lp5907.pdf" H 1650 3500 50  0001 C CNN
+F 4 "MIC5504-2.5YMT" H 0   2200 50  0001 C CNN "AMPN"
+F 5 "Microchip" H 0   2200 50  0001 C CNN "AManufacturer"
+F 6 "576-4305-1-ND" H 0   2200 50  0001 C CNN "APN"
+F 7 "LP5907SNX-2.5/NOPB" H 0   2200 50  0001 C CNN "MPN"
+F 8 "TI" H 0   2200 50  0001 C CNN "Manufacturer"
+F 9 "296-40371-2-ND" H 1650 3500 50  0001 C CNN "DPN"
+	1    1650 3500
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	1950 3450 2050 3450
+Connection ~ 2050 3450
+Wire Wire Line
+	2050 3450 2050 3600
+$Comp
+L Tomu_FPGA:LDO-X2SON U6
+U 1 1 5BFF652A
+P 8150 4800
+F 0 "U6" H 8150 5325 50  0000 C CNN
+F 1 "LDO-X2SON-1.2V" H 8150 5234 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
+	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
+Wire Wire Line
+	10400 5200 10850 5200
+$Comp
+L Tomu_FPGA:Testpoint TP2
+U 1 1 5C03018F
+P 5350 4650
+F 0 "TP2" H 5500 4700 50  0000 C CNN
+F 1 "Testpoint" H 5800 4700 50  0000 C CNN
+F 2 "" H 5350 4650 50  0001 C CNN
+F 3 "" H 5350 4650 50  0001 C CNN
+	1    5350 4650
+	-1   0    0    1   
+$EndComp
+Wire Wire Line
+	5500 4700 5950 4700
+Text Label 5550 4700 0    50   ~ 0
+SPI_MOSI
+Text Label 5550 4850 0    50   ~ 0
+SPI_MISO
+$Comp
+L Tomu_FPGA:Testpoint TP3
+U 1 1 5C042DE8
+P 5350 4800
+F 0 "TP3" H 5500 4850 50  0000 C CNN
+F 1 "Testpoint" H 5800 4850 50  0000 C CNN
+F 2 "" H 5350 4800 50  0001 C CNN
+F 3 "" H 5350 4800 50  0001 C CNN
+	1    5350 4800
+	-1   0    0    1   
+$EndComp
+Wire Wire Line
+	5500 4850 5950 4850
+$Comp
+L Tomu_FPGA:Testpoint TP4
+U 1 1 5C068EF3
+P 5350 4950
+F 0 "TP4" H 5500 5000 50  0000 C CNN
+F 1 "Testpoint" H 5800 5000 50  0000 C CNN
+F 2 "" H 5350 4950 50  0001 C CNN
+F 3 "" H 5350 4950 50  0001 C CNN
+	1    5350 4950
+	-1   0    0    1   
+$EndComp
+Wire Wire Line
+	5500 5000 5950 5000
+$Comp
+L Tomu_FPGA:Testpoint TP5
+U 1 1 5C068EFC
+P 5350 5100
+F 0 "TP5" H 5500 5150 50  0000 C CNN
+F 1 "Testpoint" H 5800 5150 50  0000 C CNN
+F 2 "" H 5350 5100 50  0001 C CNN
+F 3 "" H 5350 5100 50  0001 C CNN
+	1    5350 5100
+	-1   0    0    1   
+$EndComp
+Wire Wire Line
+	5500 5150 5950 5150
+Text Label 5550 5000 0    50   ~ 0
+SPI_CS
+Text Label 5550 5150 0    50   ~ 0
+SPI_CLK
+Text Label 5550 5300 0    50   ~ 0
+SPI_IO2
+Text Label 5550 5450 0    50   ~ 0
+SPI_IO3
+$Comp
+L Tomu_FPGA:Testpoint TP6
+U 1 1 5C07C50C
+P 5350 5250
+F 0 "TP6" H 5500 5300 50  0000 C CNN
+F 1 "Testpoint" H 5800 5300 50  0000 C CNN
+F 2 "" H 5350 5250 50  0001 C CNN
+F 3 "" H 5350 5250 50  0001 C CNN
+	1    5350 5250
+	-1   0    0    1   
+$EndComp
+$Comp
+L Tomu_FPGA:Testpoint TP7
+U 1 1 5C07C63D
+P 5350 5400
+F 0 "TP7" H 5500 5450 50  0000 C CNN
+F 1 "Testpoint" H 5800 5450 50  0000 C CNN
+F 2 "" H 5350 5400 50  0001 C CNN
+F 3 "" H 5350 5400 50  0001 C CNN
+	1    5350 5400
+	-1   0    0    1   
+$EndComp
+Wire Wire Line
+	5500 5300 5950 5300
+Wire Wire Line
+	5500 5450 5950 5450
+Text Label 5550 5600 0    50   ~ 0
+CRESET
+$Comp
+L Tomu_FPGA:Testpoint TP8
+U 1 1 5C0A39C6
+P 5350 5550
+F 0 "TP8" H 5500 5600 50  0000 C CNN
+F 1 "Testpoint" H 5800 5600 50  0000 C CNN
+F 2 "" H 5350 5550 50  0001 C CNN
+F 3 "" H 5350 5550 50  0001 C CNN
+	1    5350 5550
+	-1   0    0    1   
+$EndComp
+Wire Wire Line
+	5500 5600 5950 5600
+Text Label 5550 5750 0    50   ~ 0
+CDONE
+$Comp
+L Tomu_FPGA:Testpoint TP9
+U 1 1 5C0B4DBE
+P 5350 5700
+F 0 "TP9" H 5500 5750 50  0000 C CNN
+F 1 "Testpoint" H 5800 5750 50  0000 C CNN
+F 2 "" H 5350 5700 50  0001 C CNN
+F 3 "" H 5350 5700 50  0001 C CNN
+	1    5350 5700
+	-1   0    0    1   
+$EndComp
+Wire Wire Line
+	5500 5750 5950 5750
+$Comp
+L Tomu_FPGA:Testpoint TP1
+U 1 1 5C0C6529
+P 5350 4500
+F 0 "TP1" H 5500 4550 50  0000 C CNN
+F 1 "Testpoint" H 5800 4550 50  0000 C CNN
+F 2 "" H 5350 4500 50  0001 C CNN
+F 3 "" H 5350 4500 50  0001 C CNN
+	1    5350 4500
+	-1   0    0    1   
+$EndComp
+$Comp
+L Tomu_FPGA:Testpoint TP12
+U 1 1 5C0C65AF
+P 5350 6150
+F 0 "TP12" H 5500 6200 50  0000 C CNN
+F 1 "Testpoint" H 5800 6200 50  0000 C CNN
+F 2 "" H 5350 6150 50  0001 C CNN
+F 3 "" H 5350 6150 50  0001 C CNN
+	1    5350 6150
+	-1   0    0    1   
+$EndComp
+Text Label 5550 4550 0    50   ~ 0
++5V
+Text Label 5550 6200 0    50   ~ 0
+GND
+Text Label 5550 6050 0    50   ~ 0
+ICE_USBP
+Text Label 5550 5900 0    50   ~ 0
+ICE_USBN
+$Comp
+L Tomu_FPGA:Testpoint TP10
+U 1 1 5C0EA6CF
+P 5350 5850
+F 0 "TP10" H 5500 5900 50  0000 C CNN
+F 1 "Testpoint" H 5800 5900 50  0000 C CNN
+F 2 "" H 5350 5850 50  0001 C CNN
+F 3 "" H 5350 5850 50  0001 C CNN
+	1    5350 5850
+	-1   0    0    1   
+$EndComp
+$Comp
+L Tomu_FPGA:Testpoint TP11
+U 1 1 5C0EA757
+P 5350 6000
+F 0 "TP11" H 5500 6050 50  0000 C CNN
+F 1 "Testpoint" H 5800 6050 50  0000 C CNN
+F 2 "" H 5350 6000 50  0001 C CNN
+F 3 "" H 5350 6000 50  0001 C CNN
+	1    5350 6000
+	-1   0    0    1   
+$EndComp
+Wire Wire Line
+	5500 5900 5950 5900
+Wire Wire Line
+	5500 6050 5950 6050
+Wire Wire Line
+	6150 4550 6150 4400
+Wire Wire Line
+	5500 4550 6150 4550
+$Comp
+L power:+5V #PWR0101
+U 1 1 5C17A30E
+P 6150 4400
+F 0 "#PWR0101" H 6150 4250 50  0001 C CNN
+F 1 "+5V" H 6165 4573 50  0000 C CNN
+F 2 "" H 6150 4400 50  0001 C CNN
+F 3 "" H 6150 4400 50  0001 C CNN
+	1    6150 4400
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	6100 6200 6100 6400
+Wire Wire Line
+	5500 6200 6100 6200
+$Comp
+L power:GND #PWR0102
+U 1 1 5C18C8A3
+P 6100 6400
+F 0 "#PWR0102" H 6100 6150 50  0001 C CNN
+F 1 "GND" H 6105 6227 50  0000 C CNN
+F 2 "" H 6100 6400 50  0001 C CNN
+F 3 "" H 6100 6400 50  0001 C CNN
+	1    6100 6400
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	3800 5350 3800 5050
+NoConn ~ 2650 5750
+NoConn ~ 2650 5850
+NoConn ~ 2650 5950
+NoConn ~ 2650 6050
+NoConn ~ 2650 6150
+NoConn ~ 2650 6250
+NoConn ~ 2650 6350
+NoConn ~ 10000 3100
+NoConn ~ 10000 3000
+NoConn ~ 10000 2200
+NoConn ~ 10000 2100
+NoConn ~ 10000 2000
+NoConn ~ 10000 1800
+NoConn ~ 10000 1900
+NoConn ~ 1450 1200
 $EndSCHEMATC