diff --git a/gpio.bak b/gpio.bak
index f0fab45..e74bc93 100644
--- a/gpio.bak
+++ b/gpio.bak
@@ -868,7 +868,7 @@ U 1 1 58D50D04
 P 1850 4700
 F 0 "J2" H 1850 5050 50  0000 C CNN
 F 1 "CONN_02X06" H 1850 4350 50  0000 C CNN
-F 2 "" H 1850 3500 50  0000 C CNN
+F 2 "Socket_Strips:Socket_Strip_Angled_2x06" H 1850 3500 50  0001 C CNN
 F 3 "" H 1850 3500 50  0000 C CNN
 	1    1850 4700
 	1    0    0    -1  
diff --git a/gpio.sch b/gpio.sch
index e74bc93..1c6d057 100644
--- a/gpio.sch
+++ b/gpio.sch
@@ -109,10 +109,10 @@ P27
 Text Label 5200 1950 0    60   ~ 0
 P28
 $Comp
-L VCC #PWR08
+L VCC #PWR016
 U 1 1 56AC481F
 P 2150 3950
-F 0 "#PWR08" H 2150 3800 50  0001 C CNN
+F 0 "#PWR016" H 2150 3800 50  0001 C CNN
 F 1 "VCC" H 2150 4100 50  0000 C CNN
 F 2 "" H 2150 3950 60  0000 C CNN
 F 3 "" H 2150 3950 60  0000 C CNN
@@ -120,10 +120,10 @@ F 3 "" H 2150 3950 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR09
+L GND #PWR017
 U 1 1 56AC4825
 P 1450 950
-F 0 "#PWR09" H 1450 700 50  0001 C CNN
+F 0 "#PWR017" 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
@@ -131,10 +131,10 @@ F 3 "" H 1450 950 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR010
+L GND #PWR018
 U 1 1 56AC482D
 P 2250 950
-F 0 "#PWR010" H 2250 700 50  0001 C CNN
+F 0 "#PWR018" 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
@@ -142,10 +142,10 @@ F 3 "" H 2250 950 60  0000 C CNN
 	0    -1   1    0   
 $EndComp
 $Comp
-L VCC #PWR011
+L VCC #PWR019
 U 1 1 56AC4834
 P 1550 3950
-F 0 "#PWR011" H 1550 3800 50  0001 C CNN
+F 0 "#PWR019" H 1550 3800 50  0001 C CNN
 F 1 "VCC" H 1550 4100 50  0000 C CNN
 F 2 "" H 1550 3950 60  0000 C CNN
 F 3 "" H 1550 3950 60  0000 C CNN
@@ -181,10 +181,10 @@ OUT5V
 Text Label 850  850  0    60   ~ 0
 +5V
 $Comp
-L +5V #PWR012
+L +5V #PWR020
 U 1 1 56AC484F
 P 850 850
-F 0 "#PWR012" H 850 700 50  0001 C CNN
+F 0 "#PWR020" 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
@@ -533,10 +533,10 @@ MP3
 Text Label 1400 6200 0    60   ~ 0
 MP5
 $Comp
-L GND #PWR013
+L GND #PWR021
 U 1 1 58D3C3A8
 P 1150 6400
-F 0 "#PWR013" H 1150 6150 50  0001 C CNN
+F 0 "#PWR021" 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
@@ -544,10 +544,10 @@ F 3 "" H 1150 6400 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR014
+L GND #PWR022
 U 1 1 58D3C3C8
 P 2550 6400
-F 0 "#PWR014" H 2550 6150 50  0001 C CNN
+F 0 "#PWR022" 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
@@ -555,10 +555,10 @@ F 3 "" H 2550 6400 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR015
+L GND #PWR023
 U 1 1 58D3C400
 P 2550 5500
-F 0 "#PWR015" H 2550 5250 50  0001 C CNN
+F 0 "#PWR023" 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
@@ -566,10 +566,10 @@ F 3 "" H 2550 5500 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR016
+L GND #PWR024
 U 1 1 58D3C426
 P 1150 5500
-F 0 "#PWR016" H 1150 5250 50  0001 C CNN
+F 0 "#PWR024" 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
@@ -577,10 +577,10 @@ F 3 "" H 1150 5500 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L VCC #PWR017
+L VCC #PWR025
 U 1 1 58D3C470
 P 1300 5400
-F 0 "#PWR017" H 1300 5250 50  0001 C CNN
+F 0 "#PWR025" H 1300 5250 50  0001 C CNN
 F 1 "VCC" H 1300 5550 50  0000 C CNN
 F 2 "" H 1300 5400 50  0000 C CNN
 F 3 "" H 1300 5400 50  0000 C CNN
@@ -588,10 +588,10 @@ F 3 "" H 1300 5400 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L VCC #PWR018
+L VCC #PWR026
 U 1 1 58D3C504
 P 2400 5400
-F 0 "#PWR018" H 2400 5250 50  0001 C CNN
+F 0 "#PWR026" H 2400 5250 50  0001 C CNN
 F 1 "VCC" H 2400 5550 50  0000 C CNN
 F 2 "" H 2400 5400 50  0000 C CNN
 F 3 "" H 2400 5400 50  0000 C CNN
@@ -599,10 +599,10 @@ F 3 "" H 2400 5400 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L VCC #PWR019
+L VCC #PWR027
 U 1 1 58D3C5DE
 P 1300 6300
-F 0 "#PWR019" H 1300 6150 50  0001 C CNN
+F 0 "#PWR027" H 1300 6150 50  0001 C CNN
 F 1 "VCC" H 1300 6450 50  0000 C CNN
 F 2 "" H 1300 6300 50  0000 C CNN
 F 3 "" H 1300 6300 50  0000 C CNN
@@ -610,10 +610,10 @@ F 3 "" H 1300 6300 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L VCC #PWR020
+L VCC #PWR028
 U 1 1 58D3C60A
 P 2400 6300
-F 0 "#PWR020" H 2400 6150 50  0001 C CNN
+F 0 "#PWR028" H 2400 6150 50  0001 C CNN
 F 1 "VCC" H 2400 6450 50  0000 C CNN
 F 2 "" H 2400 6300 50  0000 C CNN
 F 3 "" H 2400 6300 50  0000 C CNN
@@ -621,10 +621,10 @@ F 3 "" H 2400 6300 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR021
+L GND #PWR029
 U 1 1 58D565FC
 P 1400 3850
-F 0 "#PWR021" H 1400 3600 50  0001 C CNN
+F 0 "#PWR029" 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
@@ -634,10 +634,10 @@ $EndComp
 Wire Wire Line
 	1400 3850 1600 3850
 $Comp
-L GND #PWR022
+L GND #PWR030
 U 1 1 58D56721
 P 2300 3850
-F 0 "#PWR022" H 2300 3600 50  0001 C CNN
+F 0 "#PWR030" 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
@@ -894,10 +894,10 @@ PMODA5
 Text Label 1200 4950 0    60   ~ 0
 PMODA7
 $Comp
-L GND #PWR023
+L GND #PWR031
 U 1 1 58D51066
 P 1150 4550
-F 0 "#PWR023" H 1150 4300 50  0001 C CNN
+F 0 "#PWR031" 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
@@ -905,10 +905,10 @@ F 3 "" H 1150 4550 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L VCC #PWR024
+L VCC #PWR032
 U 1 1 58D5106C
 P 1300 4450
-F 0 "#PWR024" H 1300 4300 50  0001 C CNN
+F 0 "#PWR032" H 1300 4300 50  0001 C CNN
 F 1 "VCC" H 1300 4600 50  0000 C CNN
 F 2 "" H 1300 4450 50  0000 C CNN
 F 3 "" H 1300 4450 50  0000 C CNN
@@ -936,10 +936,10 @@ PMODA6
 Text Label 2150 4950 0    60   ~ 0
 PMODA8
 $Comp
-L GND #PWR025
+L GND #PWR033
 U 1 1 58D510F5
 P 2550 4550
-F 0 "#PWR025" H 2550 4300 50  0001 C CNN
+F 0 "#PWR033" 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
@@ -947,10 +947,10 @@ F 3 "" H 2550 4550 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L VCC #PWR026
+L VCC #PWR034
 U 1 1 58D510FB
 P 2400 4450
-F 0 "#PWR026" H 2400 4300 50  0001 C CNN
+F 0 "#PWR034" H 2400 4300 50  0001 C CNN
 F 1 "VCC" H 2400 4600 50  0000 C CNN
 F 2 "" H 2400 4450 50  0000 C CNN
 F 3 "" H 2400 4450 50  0000 C CNN
diff --git a/ulx3s-cache.lib b/ulx3s-cache.lib
index 5d11537..3d520cb 100644
--- a/ulx3s-cache.lib
+++ b/ulx3s-cache.lib
@@ -16,6 +16,38 @@ X +5V 1 0 0 0 U 50 50 1 1 W N
 ENDDRAW
 ENDDEF
 #
+# CONN_01X07
+#
+DEF CONN_01X07 P 0 40 Y N 1 F N
+F0 "P" 0 400 50 H V C CNN
+F1 "CONN_01X07" 100 0 50 V V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+$FPLIST
+ Pin_Header_Straight_1X07
+ Pin_Header_Angled_1X07
+ Socket_Strip_Straight_1X07
+ Socket_Strip_Angled_1X07
+$ENDFPLIST
+DRAW
+S -50 -350 50 350 0 1 0 N
+S -50 -295 10 -305 0 1 0 N
+S -50 -195 10 -205 0 1 0 N
+S -50 -95 10 -105 0 1 0 N
+S -50 5 10 -5 0 1 0 N
+S -50 105 10 95 0 1 0 N
+S -50 205 10 195 0 1 0 N
+S -50 305 10 295 0 1 0 N
+X P1 1 -200 300 150 R 50 50 1 1 P
+X P2 2 -200 200 150 R 50 50 1 1 P
+X P3 3 -200 100 150 R 50 50 1 1 P
+X P4 4 -200 0 150 R 50 50 1 1 P
+X P5 5 -200 -100 150 R 50 50 1 1 P
+X P6 6 -200 -200 150 R 50 50 1 1 P
+X P7 7 -200 -300 150 R 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
 # CONN_02X06
 #
 DEF CONN_02X06 P 0 1 Y N 1 F N
diff --git a/ulx3s.bak b/ulx3s.bak
index 657c718..96331e6 100644
--- a/ulx3s.bak
+++ b/ulx3s.bak
@@ -83,7 +83,201 @@ $EndComp
 Wire Wire Line
 	900  2450 900  2550
 Wire Wire Line
-	900  2550 10850 2550
+	900  2550 1000 2550
+Wire Wire Line
+	1000 2550 1100 2550
+Wire Wire Line
+	1100 2550 1200 2550
+Wire Wire Line
+	1200 2550 1300 2550
+Wire Wire Line
+	1300 2550 1400 2550
+Wire Wire Line
+	1400 2550 1500 2550
+Wire Wire Line
+	1500 2550 1600 2550
+Wire Wire Line
+	1600 2550 1700 2550
+Wire Wire Line
+	1700 2550 1800 2550
+Wire Wire Line
+	1800 2550 2050 2550
+Wire Wire Line
+	2050 2550 2150 2550
+Wire Wire Line
+	2150 2550 2250 2550
+Wire Wire Line
+	2250 2550 2350 2550
+Wire Wire Line
+	2350 2550 2450 2550
+Wire Wire Line
+	2450 2550 2550 2550
+Wire Wire Line
+	2550 2550 2650 2550
+Wire Wire Line
+	2650 2550 2750 2550
+Wire Wire Line
+	2750 2550 2850 2550
+Wire Wire Line
+	2850 2550 2950 2550
+Wire Wire Line
+	2950 2550 3050 2550
+Wire Wire Line
+	3050 2550 3150 2550
+Wire Wire Line
+	3150 2550 3250 2550
+Wire Wire Line
+	3250 2550 3350 2550
+Wire Wire Line
+	3350 2550 3450 2550
+Wire Wire Line
+	3450 2550 3550 2550
+Wire Wire Line
+	3550 2550 3650 2550
+Wire Wire Line
+	3650 2550 3750 2550
+Wire Wire Line
+	3750 2550 3850 2550
+Wire Wire Line
+	3850 2550 3950 2550
+Wire Wire Line
+	3950 2550 4050 2550
+Wire Wire Line
+	4050 2550 4150 2550
+Wire Wire Line
+	4150 2550 4250 2550
+Wire Wire Line
+	4250 2550 4350 2550
+Wire Wire Line
+	4350 2550 4450 2550
+Wire Wire Line
+	4450 2550 4550 2550
+Wire Wire Line
+	4550 2550 4650 2550
+Wire Wire Line
+	4650 2550 4750 2550
+Wire Wire Line
+	4750 2550 4850 2550
+Wire Wire Line
+	4850 2550 4950 2550
+Wire Wire Line
+	4950 2550 5050 2550
+Wire Wire Line
+	5050 2550 5150 2550
+Wire Wire Line
+	5150 2550 5250 2550
+Wire Wire Line
+	5250 2550 5350 2550
+Wire Wire Line
+	5350 2550 5450 2550
+Wire Wire Line
+	5450 2550 5550 2550
+Wire Wire Line
+	5550 2550 5650 2550
+Wire Wire Line
+	5650 2550 5750 2550
+Wire Wire Line
+	5750 2550 5850 2550
+Wire Wire Line
+	5850 2550 5950 2550
+Wire Wire Line
+	5950 2550 6050 2550
+Wire Wire Line
+	6050 2550 6150 2550
+Wire Wire Line
+	6150 2550 6250 2550
+Wire Wire Line
+	6250 2550 6350 2550
+Wire Wire Line
+	6350 2550 6450 2550
+Wire Wire Line
+	6450 2550 6550 2550
+Wire Wire Line
+	6550 2550 6650 2550
+Wire Wire Line
+	6650 2550 6750 2550
+Wire Wire Line
+	6750 2550 6850 2550
+Wire Wire Line
+	6850 2550 6950 2550
+Wire Wire Line
+	6950 2550 7050 2550
+Wire Wire Line
+	7050 2550 7150 2550
+Wire Wire Line
+	7150 2550 7250 2550
+Wire Wire Line
+	7250 2550 7350 2550
+Wire Wire Line
+	7350 2550 7450 2550
+Wire Wire Line
+	7450 2550 7550 2550
+Wire Wire Line
+	7550 2550 7650 2550
+Wire Wire Line
+	7650 2550 7750 2550
+Wire Wire Line
+	7750 2550 7850 2550
+Wire Wire Line
+	7850 2550 7950 2550
+Wire Wire Line
+	7950 2550 8050 2550
+Wire Wire Line
+	8050 2550 8150 2550
+Wire Wire Line
+	8150 2550 8250 2550
+Wire Wire Line
+	8250 2550 8350 2550
+Wire Wire Line
+	8350 2550 8450 2550
+Wire Wire Line
+	8450 2550 8550 2550
+Wire Wire Line
+	8550 2550 8650 2550
+Wire Wire Line
+	8650 2550 8750 2550
+Wire Wire Line
+	8750 2550 8850 2550
+Wire Wire Line
+	8850 2550 8950 2550
+Wire Wire Line
+	8950 2550 9050 2550
+Wire Wire Line
+	9050 2550 9150 2550
+Wire Wire Line
+	9150 2550 9250 2550
+Wire Wire Line
+	9250 2550 9350 2550
+Wire Wire Line
+	9350 2550 9450 2550
+Wire Wire Line
+	9450 2550 9550 2550
+Wire Wire Line
+	9550 2550 9650 2550
+Wire Wire Line
+	9650 2550 9750 2550
+Wire Wire Line
+	9750 2550 9850 2550
+Wire Wire Line
+	9850 2550 9950 2550
+Wire Wire Line
+	9950 2550 10050 2550
+Wire Wire Line
+	10050 2550 10150 2550
+Wire Wire Line
+	10150 2550 10250 2550
+Wire Wire Line
+	10250 2550 10350 2550
+Wire Wire Line
+	10350 2550 10450 2550
+Wire Wire Line
+	10450 2550 10550 2550
+Wire Wire Line
+	10550 2550 10650 2550
+Wire Wire Line
+	10650 2550 10750 2550
+Wire Wire Line
+	10750 2550 10850 2550
 Wire Wire Line
 	1400 2550 1400 2450
 Wire Wire Line
@@ -93,7 +287,9 @@ Wire Wire Line
 	1200 2450 1200 2550
 Connection ~ 1200 2550
 Wire Wire Line
-	1100 2450 1100 2650
+	1100 2450 1100 2550
+Wire Wire Line
+	1100 2550 1100 2650
 Connection ~ 1100 2550
 Wire Wire Line
 	1000 2450 1000 2550
@@ -101,14 +297,96 @@ Connection ~ 1000 2550
 Wire Wire Line
 	2050 1000 2050 1100
 Wire Wire Line
-	2050 1000 7150 1000
+	2050 1000 2150 1000
+Wire Wire Line
+	2150 1000 2250 1000
+Wire Wire Line
+	2250 1000 2350 1000
+Wire Wire Line
+	2350 1000 2450 1000
+Wire Wire Line
+	2450 1000 2550 1000
+Wire Wire Line
+	2550 1000 2650 1000
+Wire Wire Line
+	2650 1000 2750 1000
+Wire Wire Line
+	2750 1000 2850 1000
+Wire Wire Line
+	2850 1000 2950 1000
+Wire Wire Line
+	2950 1000 3050 1000
+Wire Wire Line
+	3050 1000 3150 1000
+Wire Wire Line
+	3150 1000 3250 1000
+Wire Wire Line
+	3250 1000 3350 1000
+Wire Wire Line
+	3350 1000 3450 1000
+Wire Wire Line
+	3450 1000 3550 1000
+Wire Wire Line
+	3550 1000 3650 1000
+Wire Wire Line
+	3650 1000 3750 1000
+Wire Wire Line
+	3750 1000 3850 1000
+Wire Wire Line
+	3850 1000 3950 1000
+Wire Wire Line
+	3950 1000 4150 1000
+Wire Wire Line
+	4150 1000 4250 1000
+Wire Wire Line
+	4250 1000 4350 1000
+Wire Wire Line
+	4350 1000 4450 1000
+Wire Wire Line
+	4450 1000 4650 1000
+Wire Wire Line
+	4650 1000 4750 1000
+Wire Wire Line
+	4750 1000 4950 1000
+Wire Wire Line
+	4950 1000 5050 1000
+Wire Wire Line
+	5050 1000 5250 1000
+Wire Wire Line
+	5250 1000 5350 1000
+Wire Wire Line
+	5350 1000 5450 1000
+Wire Wire Line
+	5450 1000 5650 1000
+Wire Wire Line
+	5650 1000 5750 1000
+Wire Wire Line
+	5750 1000 5850 1000
+Wire Wire Line
+	5850 1000 6250 1000
+Wire Wire Line
+	6250 1000 6350 1000
+Wire Wire Line
+	6350 1000 6550 1000
+Wire Wire Line
+	6550 1000 6650 1000
+Wire Wire Line
+	6650 1000 6750 1000
+Wire Wire Line
+	6750 1000 6950 1000
+Wire Wire Line
+	6950 1000 7050 1000
+Wire Wire Line
+	7050 1000 7150 1000
 Wire Wire Line
 	2550 1000 2550 1100
 Wire Wire Line
 	2150 1000 2150 1100
 Connection ~ 2150 1000
 Wire Wire Line
-	2250 950  2250 1100
+	2250 950  2250 1000
+Wire Wire Line
+	2250 1000 2250 1100
 Connection ~ 2250 1000
 Wire Wire Line
 	2350 1000 2350 1100
@@ -546,12 +824,12 @@ $EndComp
 $Comp
 L MICRO-HDMI-D GPDI1
 U 1 1 56ACD5D4
-P 6150 4650
-F 0 "GPDI1" H 6150 5700 50  0000 C CNN
-F 1 "MICRO-GPDI-D" V 6250 4650 50  0000 C CNN
-F 2 "micro-hdmi-d:MICRO-HDMI-D" H 6150 4650 60  0001 C CNN
-F 3 "" H 6150 4650 60  0000 C CNN
-	1    6150 4650
+P 5800 4600
+F 0 "GPDI1" H 5800 5650 50  0000 C CNN
+F 1 "MICRO-GPDI-D" V 5900 4600 50  0000 C CNN
+F 2 "micro-hdmi-d:MICRO-HDMI-D" H 5800 4600 60  0001 C CNN
+F 3 "" H 5800 4600 60  0000 C CNN
+	1    5800 4600
 	-1   0    0    -1  
 $EndComp
 $Comp
@@ -690,7 +968,7 @@ Wire Wire Line
 Text Label 1100 7000 0    60   ~ 0
 MTDI
 $Sheet
-S 6800 4650 800  600 
+S 7350 4650 800  600 
 U 56AC389C
 F0 "gpio" 60
 F1 "gpio.sch" 60
@@ -743,4 +1021,195 @@ F 3 "" H 5600 7500 50  0000 C CNN
 	1    5600 7500
 	0    -1   -1   0   
 $EndComp
+$Comp
+L CONN_01X07 OLED1
+U 1 1 58D50BB9
+P 7400 3950
+F 0 "OLED1" H 7400 4350 50  0000 C CNN
+F 1 "CONN_01X07" V 7500 3950 50  0000 C CNN
+F 2 "" H 7400 3950 50  0000 C CNN
+F 3 "" H 7400 3950 50  0000 C CNN
+	1    7400 3950
+	-1   0    0    -1  
+$EndComp
+Wire Wire Line
+	7600 3650 7900 3650
+Wire Wire Line
+	7600 3750 8200 3750
+Wire Wire Line
+	7600 3850 8200 3850
+Wire Wire Line
+	7600 3950 8200 3950
+Wire Wire Line
+	7600 4050 8200 4050
+Wire Wire Line
+	7600 4150 8200 4150
+Wire Wire Line
+	7600 4250 8200 4250
+Text Label 7650 3850 0    60   ~ 0
+OLED_CLK
+Text Label 7650 3950 0    60   ~ 0
+OLED_MOSI
+Text Label 7650 4050 0    60   ~ 0
+OLED_RES
+Text Label 7650 4150 0    60   ~ 0
+OLED_DC
+Text Label 7650 4250 0    60   ~ 0
+OLED_CS
+$Comp
+L GND #PWR?
+U 1 1 58D52027
+P 7900 3650
+F 0 "#PWR?" H 7900 3400 50  0001 C CNN
+F 1 "GND" H 7900 3500 50  0000 C CNN
+F 2 "" H 7900 3650 60  0000 C CNN
+F 3 "" H 7900 3650 60  0000 C CNN
+	1    7900 3650
+	0    -1   -1   0   
+$EndComp
+$Comp
+L VCC #PWR?
+U 1 1 58D522D3
+P 8200 3750
+F 0 "#PWR?" H 8200 3600 50  0001 C CNN
+F 1 "VCC" H 8200 3900 50  0000 C CNN
+F 2 "" H 8200 3750 50  0000 C CNN
+F 3 "" H 8200 3750 50  0000 C CNN
+	1    8200 3750
+	0    1    1    0   
+$EndComp
+Wire Wire Line
+	6000 3650 6700 3650
+Text Label 6050 3650 0    60   ~ 0
+GPDI_ETH_N
+Wire Wire Line
+	6000 3750 6700 3750
+Wire Wire Line
+	6000 3850 6700 3850
+Text Label 6050 3750 0    60   ~ 0
+GPDI_ETH_P
+Wire Wire Line
+	6000 5150 6700 5150
+Wire Wire Line
+	6000 3950 6700 3950
+Wire Wire Line
+	6000 4050 6700 4050
+Text Label 6050 3850 0    60   ~ 0
+GPDI_D2_P
+Text Label 6050 4050 0    60   ~ 0
+GPDI_D2_N
+Wire Wire Line
+	6000 4150 6700 4150
+Wire Wire Line
+	6000 4250 6700 4250
+Wire Wire Line
+	6000 4350 6700 4350
+Text Label 6050 4150 0    60   ~ 0
+GPDI_D1_P
+Text Label 6050 4350 0    60   ~ 0
+GPDI_D1_N
+Wire Wire Line
+	6000 4450 6700 4450
+Wire Wire Line
+	6000 4550 6700 4550
+Wire Wire Line
+	6000 4650 6700 4650
+Text Label 6050 4450 0    60   ~ 0
+GPDI_D0_P
+Text Label 6050 4650 0    60   ~ 0
+GPDI_D0_N
+Wire Wire Line
+	6000 4750 6700 4750
+Wire Wire Line
+	6000 4850 6700 4850
+Wire Wire Line
+	6000 4950 6700 4950
+Text Label 6050 4750 0    60   ~ 0
+GPDI_CLK_P
+Text Label 6050 4950 0    60   ~ 0
+GPDI_CLK_N
+Wire Wire Line
+	6000 5050 6700 5050
+Text Label 6050 5050 0    60   ~ 0
+GPDI_CEC
+Wire Wire Line
+	6000 5250 6700 5250
+Text Label 6050 5250 0    60   ~ 0
+GPDI_SCL
+Text Label 6050 5450 0    60   ~ 0
+GPDI_5V
+Wire Wire Line
+	6000 5450 6700 5450
+Wire Wire Line
+	6000 5350 6700 5350
+Text Label 6050 5350 0    60   ~ 0
+GPDI_SDA
+Wire Wire Line
+	6000 5550 6700 5550
+$Comp
+L GND #PWR?
+U 1 1 58D544FB
+P 6700 5550
+F 0 "#PWR?" H 6700 5300 50  0001 C CNN
+F 1 "GND" H 6700 5400 50  0000 C CNN
+F 2 "" H 6700 5550 60  0000 C CNN
+F 3 "" H 6700 5550 60  0000 C CNN
+	1    6700 5550
+	0    -1   -1   0   
+$EndComp
+$Comp
+L GND #PWR?
+U 1 1 58D5464C
+P 6700 5150
+F 0 "#PWR?" H 6700 4900 50  0001 C CNN
+F 1 "GND" H 6700 5000 50  0000 C CNN
+F 2 "" H 6700 5150 60  0000 C CNN
+F 3 "" H 6700 5150 60  0000 C CNN
+	1    6700 5150
+	0    -1   -1   0   
+$EndComp
+$Comp
+L GND #PWR?
+U 1 1 58D54683
+P 6700 4850
+F 0 "#PWR?" H 6700 4600 50  0001 C CNN
+F 1 "GND" H 6700 4700 50  0000 C CNN
+F 2 "" H 6700 4850 60  0000 C CNN
+F 3 "" H 6700 4850 60  0000 C CNN
+	1    6700 4850
+	0    -1   -1   0   
+$EndComp
+$Comp
+L GND #PWR?
+U 1 1 58D54712
+P 6700 4550
+F 0 "#PWR?" H 6700 4300 50  0001 C CNN
+F 1 "GND" H 6700 4400 50  0000 C CNN
+F 2 "" H 6700 4550 60  0000 C CNN
+F 3 "" H 6700 4550 60  0000 C CNN
+	1    6700 4550
+	0    -1   -1   0   
+$EndComp
+$Comp
+L GND #PWR?
+U 1 1 58D54749
+P 6700 4250
+F 0 "#PWR?" H 6700 4000 50  0001 C CNN
+F 1 "GND" H 6700 4100 50  0000 C CNN
+F 2 "" H 6700 4250 60  0000 C CNN
+F 3 "" H 6700 4250 60  0000 C CNN
+	1    6700 4250
+	0    -1   -1   0   
+$EndComp
+$Comp
+L GND #PWR?
+U 1 1 58D547C2
+P 6700 3950
+F 0 "#PWR?" H 6700 3700 50  0001 C CNN
+F 1 "GND" H 6700 3800 50  0000 C CNN
+F 2 "" H 6700 3950 60  0000 C CNN
+F 3 "" H 6700 3950 60  0000 C CNN
+	1    6700 3950
+	0    -1   -1   0   
+$EndComp
 $EndSCHEMATC
diff --git a/ulx3s.kicad_pcb b/ulx3s.kicad_pcb
index b677e24..ba23505 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 238)
-    (no_connects 237)
-    (area 88.589999 55.859999 183.480001 109.830001)
+    (links 244)
+    (no_connects 243)
+    (area 93.949999 61.269999 178.070001 109.830001)
     (thickness 1.6)
     (drawings 16)
     (tracks 6)
     (zones 0)
     (modules 13)
-    (nets 76)
+    (nets 75)
   )
 
   (page A4)
@@ -134,41 +134,40 @@
   (net 38 /MTDI)
   (net 39 /gpio/P9)
   (net 40 /gpio/P10)
-  (net 41 "Net-(GPDI1-PadSHD)")
-  (net 42 "Net-(US1-Pad6)")
-  (net 43 "Net-(US2-Pad6)")
-  (net 44 /gpio/P15)
-  (net 45 /gpio/P16)
-  (net 46 /gpio/P31)
-  (net 47 /gpio/P32)
-  (net 48 /gpio/P33)
-  (net 49 /gpio/P34)
-  (net 50 /gpio/P35)
-  (net 51 /gpio/P36)
-  (net 52 /gpio/P37)
-  (net 53 /gpio/P38)
-  (net 54 /gpio/P39)
-  (net 55 /gpio/P40)
-  (net 56 /gpio/P41)
-  (net 57 /gpio/P42)
-  (net 58 /gpio/P43)
-  (net 59 /gpio/P44)
-  (net 60 /gpio/P45)
-  (net 61 /gpio/P46)
-  (net 62 /gpio/P47)
-  (net 63 /gpio/P48)
-  (net 64 /gpio/P49)
-  (net 65 /gpio/P50)
-  (net 66 /gpio/P51)
-  (net 67 /gpio/P52)
-  (net 68 /gpio/P53)
-  (net 69 /gpio/P54)
-  (net 70 /gpio/P55)
-  (net 71 /gpio/P56)
-  (net 72 /gpio/P57)
-  (net 73 /gpio/P58)
-  (net 74 /gpio/P59)
-  (net 75 /gpio/P60)
+  (net 41 "Net-(US1-Pad6)")
+  (net 42 "Net-(US2-Pad6)")
+  (net 43 /gpio/P15)
+  (net 44 /gpio/P16)
+  (net 45 /gpio/P31)
+  (net 46 /gpio/P32)
+  (net 47 /gpio/P33)
+  (net 48 /gpio/P34)
+  (net 49 /gpio/P35)
+  (net 50 /gpio/P36)
+  (net 51 /gpio/P37)
+  (net 52 /gpio/P38)
+  (net 53 /gpio/P39)
+  (net 54 /gpio/P40)
+  (net 55 /gpio/P41)
+  (net 56 /gpio/P42)
+  (net 57 /gpio/P43)
+  (net 58 /gpio/P44)
+  (net 59 /gpio/P45)
+  (net 60 /gpio/P46)
+  (net 61 /gpio/P47)
+  (net 62 /gpio/P48)
+  (net 63 /gpio/P49)
+  (net 64 /gpio/P50)
+  (net 65 /gpio/P51)
+  (net 66 /gpio/P52)
+  (net 67 /gpio/P53)
+  (net 68 /gpio/P54)
+  (net 69 /gpio/P55)
+  (net 70 /gpio/P56)
+  (net 71 /gpio/P57)
+  (net 72 /gpio/P58)
+  (net 73 /gpio/P59)
+  (net 74 /gpio/P60)
 
   (net_class Default "This is the default net class."
     (clearance 0.2)
@@ -247,7 +246,6 @@
     (add_net /gpio/P8)
     (add_net /gpio/P9)
     (add_net "Net-(D4-Pad1)")
-    (add_net "Net-(GPDI1-PadSHD)")
     (add_net "Net-(US1-Pad6)")
     (add_net "Net-(US2-Pad6)")
     (add_net VCC)
@@ -344,9 +342,9 @@
     (pad A6 smd circle (at -3.6 -7.6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
       (net 31 /gpio/P28))
     (pad A7 smd circle (at -2.8 -7.6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 45 /gpio/P16))
+      (net 44 /gpio/P16))
     (pad A8 smd circle (at -2 -7.6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 44 /gpio/P15))
+      (net 43 /gpio/P15))
     (pad A9 smd circle (at -1.2 -7.6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
       (net 40 /gpio/P10))
     (pad A10 smd circle (at -0.4 -7.6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
@@ -354,18 +352,18 @@
     (pad A11 smd circle (at 0.4 -7.6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
       (net 15 /gpio/P8))
     (pad A12 smd circle (at 1.2 -7.6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 69 /gpio/P54))
+      (net 68 /gpio/P54))
     (pad A13 smd circle (at 2 -7.6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 68 /gpio/P53))
+      (net 67 /gpio/P53))
     (pad A14 smd circle (at 2.8 -7.6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 63 /gpio/P48))
+      (net 62 /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 55 /gpio/P40))
+      (net 54 /gpio/P40))
     (pad A17 smd circle (at 5.2 -7.6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 49 /gpio/P34))
+      (net 48 /gpio/P34))
     (pad A18 smd circle (at 6 -7.6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 47 /gpio/P32))
+      (net 46 /gpio/P32))
     (pad A19 smd circle (at 6.8 -7.6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
       (net 33 /gpio/P30))
     (pad B1 smd circle (at -7.6 -6.8) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask))
@@ -386,21 +384,21 @@
     (pad B11 smd circle (at 0.4 -6.8) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
       (net 12 /gpio/P5))
     (pad B12 smd circle (at 1.2 -6.8) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 73 /gpio/P58))
+      (net 72 /gpio/P58))
     (pad B13 smd circle (at 2 -6.8) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 67 /gpio/P52))
+      (net 66 /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 59 /gpio/P44))
+      (net 58 /gpio/P44))
     (pad B16 smd circle (at 4.4 -6.8) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 54 /gpio/P39))
+      (net 53 /gpio/P39))
     (pad B17 smd circle (at 5.2 -6.8) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 51 /gpio/P36))
+      (net 50 /gpio/P36))
     (pad B18 smd circle (at 6 -6.8) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 48 /gpio/P33))
+      (net 47 /gpio/P33))
     (pad B19 smd circle (at 6.8 -6.8) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 46 /gpio/P31))
+      (net 45 /gpio/P31))
     (pad B20 smd circle (at 7.6 -6.8) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
       (net 32 /gpio/P29))
     (pad C1 smd circle (at -7.6 -6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask))
@@ -420,17 +418,17 @@
     (pad C11 smd circle (at 0.4 -6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
       (net 13 /gpio/P6))
     (pad C12 smd circle (at 1.2 -6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 72 /gpio/P57))
+      (net 71 /gpio/P57))
     (pad C13 smd circle (at 2 -6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 66 /gpio/P51))
+      (net 65 /gpio/P51))
     (pad C14 smd circle (at 2.8 -6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 62 /gpio/P47))
+      (net 61 /gpio/P47))
     (pad C15 smd circle (at 3.6 -6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 58 /gpio/P43))
+      (net 57 /gpio/P43))
     (pad C16 smd circle (at 4.4 -6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 53 /gpio/P38))
+      (net 52 /gpio/P38))
     (pad C17 smd circle (at 5.2 -6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 50 /gpio/P35))
+      (net 49 /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))
@@ -451,17 +449,17 @@
       (net 19 /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 75 /gpio/P60))
+      (net 74 /gpio/P60))
     (pad D12 smd circle (at 1.2 -5.2) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 71 /gpio/P56))
+      (net 70 /gpio/P56))
     (pad D13 smd circle (at 2 -5.2) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 65 /gpio/P50))
+      (net 64 /gpio/P50))
     (pad D14 smd circle (at 2.8 -5.2) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 61 /gpio/P46))
+      (net 60 /gpio/P46))
     (pad D15 smd circle (at 3.6 -5.2) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 57 /gpio/P42))
+      (net 56 /gpio/P42))
     (pad D16 smd circle (at 4.4 -5.2) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 52 /gpio/P37))
+      (net 51 /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))
@@ -481,15 +479,15 @@
       (net 18 /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 74 /gpio/P59))
+      (net 73 /gpio/P59))
     (pad E12 smd circle (at 1.2 -4.4) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 70 /gpio/P55))
+      (net 69 /gpio/P55))
     (pad E13 smd circle (at 2 -4.4) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 64 /gpio/P49))
+      (net 63 /gpio/P49))
     (pad E14 smd circle (at 2.8 -4.4) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 60 /gpio/P45))
+      (net 59 /gpio/P45))
     (pad E15 smd circle (at 3.6 -4.4) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 56 /gpio/P41))
+      (net 55 /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))
@@ -1036,26 +1034,31 @@
     (pad 1 smd rect (at 1.8 -6.475 180) (size 0.23 0.85) (layers F.Cu F.Paste F.Mask))
     (pad 3 smd rect (at 1.4 -6.475 180) (size 0.23 0.85) (layers F.Cu F.Paste F.Mask))
     (pad 5 smd rect (at 1 -6.475 180) (size 0.23 0.85) (layers F.Cu F.Paste F.Mask))
-    (pad 7 smd rect (at 0.6 -6.475 180) (size 0.23 0.85) (layers F.Cu F.Paste F.Mask))
+    (pad 7 smd rect (at 0.6 -6.475 180) (size 0.23 0.85) (layers F.Cu F.Paste F.Mask)
+      (net 1 GND))
     (pad 9 smd rect (at 0.2 -6.475 180) (size 0.23 0.85) (layers F.Cu F.Paste F.Mask))
     (pad 11 smd rect (at -0.2 -6.475 180) (size 0.23 0.85) (layers F.Cu F.Paste F.Mask))
-    (pad 13 smd rect (at -0.6 -6.475 180) (size 0.23 0.85) (layers F.Cu F.Paste F.Mask))
+    (pad 13 smd rect (at -0.6 -6.475 180) (size 0.23 0.85) (layers F.Cu F.Paste F.Mask)
+      (net 1 GND))
     (pad 15 smd rect (at -1 -6.475 180) (size 0.23 0.85) (layers F.Cu F.Paste F.Mask))
     (pad 17 smd rect (at -1.4 -6.475 180) (size 0.23 0.85) (layers F.Cu F.Paste F.Mask))
     (pad 19 smd rect (at -1.8 -6.475 180) (size 0.23 0.85) (layers F.Cu F.Paste F.Mask))
     (pad 2 smd rect (at 1.6 -5.25 180) (size 0.23 1) (layers F.Cu F.Paste F.Mask))
-    (pad 4 smd rect (at 1.2 -5.25 180) (size 0.23 1) (layers F.Cu F.Paste F.Mask))
+    (pad 4 smd rect (at 1.2 -5.25 180) (size 0.23 1) (layers F.Cu F.Paste F.Mask)
+      (net 1 GND))
     (pad 6 smd rect (at 0.8 -5.25 180) (size 0.23 1) (layers F.Cu F.Paste F.Mask))
     (pad 8 smd rect (at 0.4 -5.25 180) (size 0.23 1) (layers F.Cu F.Paste F.Mask))
-    (pad 10 smd rect (at 0 -5.25 180) (size 0.23 1) (layers F.Cu F.Paste F.Mask))
+    (pad 10 smd rect (at 0 -5.25 180) (size 0.23 1) (layers F.Cu F.Paste F.Mask)
+      (net 1 GND))
     (pad 12 smd rect (at -0.4 -5.25 180) (size 0.23 1) (layers F.Cu F.Paste F.Mask))
     (pad 14 smd rect (at -0.8 -5.25 180) (size 0.23 1) (layers F.Cu F.Paste F.Mask))
-    (pad 16 smd rect (at -1.2 -5.25 180) (size 0.23 1) (layers F.Cu F.Paste F.Mask))
+    (pad 16 smd rect (at -1.2 -5.25 180) (size 0.23 1) (layers F.Cu F.Paste F.Mask)
+      (net 1 GND))
     (pad 18 smd rect (at -1.6 -5.25 180) (size 0.23 1) (layers F.Cu F.Paste F.Mask))
     (pad SHD smd rect (at 3.45 -5.06 180) (size 2.4 1.38) (layers F.Cu F.Paste F.Mask)
-      (net 41 "Net-(GPDI1-PadSHD)"))
+      (net 1 GND))
     (pad SHD smd rect (at -3.45 -5.06 180) (size 2.4 1.38) (layers F.Cu F.Paste F.Mask)
-      (net 41 "Net-(GPDI1-PadSHD)"))
+      (net 1 GND))
     (pad "" thru_hole oval (at -3.1 -1.7 180) (size 1.5 2.55) (drill oval 0.65 1.7) (layers *.Cu *.Mask F.SilkS))
     (pad "" thru_hole oval (at 3.1 -1.7 180) (size 1.5 2.55) (drill oval 0.65 1.7) (layers *.Cu *.Mask F.SilkS))
   )
@@ -1152,13 +1155,13 @@
     (pad 5 smd rect (at 1.3 -1.35 270) (size 1.35 0.4) (layers F.Cu F.Paste F.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 42 "Net-(US1-Pad6)"))
+      (net 41 "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 42 "Net-(US1-Pad6)"))
+      (net 41 "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 42 "Net-(US1-Pad6)"))
+      (net 41 "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 42 "Net-(US1-Pad6)"))
+      (net 41 "Net-(US1-Pad6)"))
   )
 
   (module usb_otg:USB_Micro-B (layer F.Cu) (tedit 5543E447) (tstamp 58D43122)
@@ -1190,13 +1193,13 @@
     (pad 5 smd rect (at 1.3 -1.35 270) (size 1.35 0.4) (layers F.Cu F.Paste F.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 43 "Net-(US2-Pad6)"))
+      (net 42 "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 43 "Net-(US2-Pad6)"))
+      (net 42 "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 43 "Net-(US2-Pad6)"))
+      (net 42 "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 43 "Net-(US2-Pad6)"))
+      (net 42 "Net-(US2-Pad6)"))
   )
 
   (module Socket_Strips:Socket_Strip_Angled_2x32 (layer F.Cu) (tedit 0) (tstamp 58D4E99D)
@@ -1374,9 +1377,9 @@
     (pad 14 thru_hole oval (at 15.24 2.54) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
       (net 19 /gpio/P14))
     (pad 15 thru_hole oval (at 17.78 0) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 44 /gpio/P15))
+      (net 43 /gpio/P15))
     (pad 16 thru_hole oval (at 17.78 2.54) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 45 /gpio/P16))
+      (net 44 /gpio/P16))
     (pad 17 thru_hole oval (at 20.32 0) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
       (net 20 /gpio/P17))
     (pad 18 thru_hole oval (at 20.32 2.54) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
@@ -1406,65 +1409,65 @@
     (pad 30 thru_hole oval (at 35.56 2.54) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
       (net 33 /gpio/P30))
     (pad 31 thru_hole oval (at 38.1 0) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 46 /gpio/P31))
+      (net 45 /gpio/P31))
     (pad 32 thru_hole oval (at 38.1 2.54) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 47 /gpio/P32))
+      (net 46 /gpio/P32))
     (pad 33 thru_hole oval (at 40.64 0) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 48 /gpio/P33))
+      (net 47 /gpio/P33))
     (pad 34 thru_hole oval (at 40.64 2.54) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 49 /gpio/P34))
+      (net 48 /gpio/P34))
     (pad 35 thru_hole oval (at 43.18 0) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 50 /gpio/P35))
+      (net 49 /gpio/P35))
     (pad 36 thru_hole oval (at 43.18 2.54) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 51 /gpio/P36))
+      (net 50 /gpio/P36))
     (pad 37 thru_hole oval (at 45.72 0) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 52 /gpio/P37))
+      (net 51 /gpio/P37))
     (pad 38 thru_hole oval (at 45.72 2.54) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 53 /gpio/P38))
+      (net 52 /gpio/P38))
     (pad 39 thru_hole oval (at 48.26 0) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 54 /gpio/P39))
+      (net 53 /gpio/P39))
     (pad 40 thru_hole oval (at 48.26 2.54) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 55 /gpio/P40))
+      (net 54 /gpio/P40))
     (pad 41 thru_hole oval (at 50.8 0) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 56 /gpio/P41))
+      (net 55 /gpio/P41))
     (pad 42 thru_hole oval (at 50.8 2.54) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 57 /gpio/P42))
+      (net 56 /gpio/P42))
     (pad 43 thru_hole oval (at 53.34 0) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 58 /gpio/P43))
+      (net 57 /gpio/P43))
     (pad 44 thru_hole oval (at 53.34 2.54) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 59 /gpio/P44))
+      (net 58 /gpio/P44))
     (pad 45 thru_hole oval (at 55.88 0) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 60 /gpio/P45))
+      (net 59 /gpio/P45))
     (pad 46 thru_hole oval (at 55.88 2.54) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 61 /gpio/P46))
+      (net 60 /gpio/P46))
     (pad 47 thru_hole oval (at 58.42 0) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 62 /gpio/P47))
+      (net 61 /gpio/P47))
     (pad 48 thru_hole oval (at 58.42 2.54) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 63 /gpio/P48))
+      (net 62 /gpio/P48))
     (pad 49 thru_hole oval (at 60.96 0) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 64 /gpio/P49))
+      (net 63 /gpio/P49))
     (pad 50 thru_hole oval (at 60.96 2.54) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 65 /gpio/P50))
+      (net 64 /gpio/P50))
     (pad 51 thru_hole oval (at 63.5 0) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 66 /gpio/P51))
+      (net 65 /gpio/P51))
     (pad 52 thru_hole oval (at 63.5 2.54) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 67 /gpio/P52))
+      (net 66 /gpio/P52))
     (pad 53 thru_hole oval (at 66.04 0) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 68 /gpio/P53))
+      (net 67 /gpio/P53))
     (pad 54 thru_hole oval (at 66.04 2.54) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 69 /gpio/P54))
+      (net 68 /gpio/P54))
     (pad 55 thru_hole oval (at 68.58 0) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 70 /gpio/P55))
+      (net 69 /gpio/P55))
     (pad 56 thru_hole oval (at 68.58 2.54) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 71 /gpio/P56))
+      (net 70 /gpio/P56))
     (pad 57 thru_hole oval (at 71.12 0) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 72 /gpio/P57))
+      (net 71 /gpio/P57))
     (pad 58 thru_hole oval (at 71.12 2.54) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 73 /gpio/P58))
+      (net 72 /gpio/P58))
     (pad 59 thru_hole oval (at 73.66 0) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 74 /gpio/P59))
+      (net 73 /gpio/P59))
     (pad 60 thru_hole oval (at 73.66 2.54) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask)
-      (net 75 /gpio/P60))
+      (net 74 /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)
diff --git a/ulx3s.kicad_pcb-bak b/ulx3s.kicad_pcb-bak
index 1808951..b677e24 100644
--- a/ulx3s.kicad_pcb-bak
+++ b/ulx3s.kicad_pcb-bak
@@ -3,9 +3,9 @@
   (general
     (links 238)
     (no_connects 237)
-    (area 86.329999 53.649999 185.690001 109.830001)
+    (area 88.589999 55.859999 183.480001 109.830001)
     (thickness 1.6)
-    (drawings 20)
+    (drawings 16)
     (tracks 6)
     (zones 0)
     (modules 13)
@@ -1668,6 +1668,8 @@
     )
   )
 
+  (gr_circle (center 90.29 57.61) (end 91.89 57.61) (layer Eco2.User) (width 0.2) (tstamp 58D43D22))
+  (gr_circle (center 181.73 57.61) (end 183.33 57.61) (layer Eco2.User) (width 0.3) (tstamp 58D43B08))
   (dimension 48.26 (width 0.3) (layer Eco2.User)
     (gr_text "48,260 mm" (at 77.51 85.55 90) (layer Eco2.User)
       (effects (font (size 1.5 1.5) (thickness 0.3)))
@@ -1692,18 +1694,12 @@
     (arrow2a (pts (xy 177.92 46.18) (xy 176.793496 45.593579)))
     (arrow2b (pts (xy 177.92 46.18) (xy 176.793496 46.766421)))
   )
-  (gr_circle (center 90.29 57.61) (end 91.89 57.61) (layer Edge.Cuts) (width 0.2) (tstamp 58D43D22))
-  (gr_arc (start 90.29 57.61) (end 86.48 57.61) (angle 90) (layer Edge.Cuts) (width 0.3))
   (gr_circle (center 90.29 57.61) (end 87.29 57.61) (layer Dwgs.User) (width 0.2) (tstamp 58D43D12))
-  (gr_arc (start 181.73 57.61) (end 181.73 53.8) (angle 90) (layer Edge.Cuts) (width 0.3))
   (gr_circle (center 181.73 57.61) (end 178.73 57.61) (layer Dwgs.User) (width 0.2) (tstamp 58D43B0E))
-  (gr_circle (center 181.73 57.61) (end 183.33 57.61) (layer Edge.Cuts) (width 0.3) (tstamp 58D43B08))
-  (gr_arc (start 181.73 105.87) (end 185.54 105.87) (angle 90) (layer Edge.Cuts) (width 0.3))
-  (gr_arc (start 90.29 105.87) (end 90.29 109.68) (angle 90) (layer Edge.Cuts) (width 0.3))
-  (gr_circle (center 181.73 105.87) (end 183.33 105.87) (layer Edge.Cuts) (width 0.3))
+  (gr_circle (center 181.73 105.87) (end 183.33 105.87) (layer Eco2.User) (width 0.3))
   (gr_circle (center 181.73 105.87) (end 178.73 105.87) (layer Dwgs.User) (width 0.2))
   (gr_circle (center 90.29 105.87) (end 87.29 105.87) (layer Dwgs.User) (width 0.2))
-  (gr_circle (center 90.29 105.87) (end 91.89 105.87) (layer Edge.Cuts) (width 0.2))
+  (gr_circle (center 90.29 105.87) (end 91.89 105.87) (layer Eco2.User) (width 0.2))
   (dimension 91.44 (width 0.3) (layer Eco2.User)
     (gr_text "91,440 mm" (at 136.01 34.67) (layer Eco2.User) (tstamp 58D43A2D)
       (effects (font (size 1.5 1.5) (thickness 0.3)))
diff --git a/ulx3s.net b/ulx3s.net
index 9b9f6bd..7b1f73a 100644
--- a/ulx3s.net
+++ b/ulx3s.net
@@ -1,7 +1,7 @@
 (export (version D)
   (design
     (source /home/davor/src/circuits/fpga/ulx3s/ulx3s.sch)
-    (date "Pet 24 Ožu 2017 11:34:22")
+    (date "Pet 24 Ožu 2017 12:38:36")
     (tool "Eeschema 4.0.5+dfsg1-4")
     (sheet (number 1) (name /) (tstamps /)
       (title_block
@@ -79,6 +79,11 @@
       (libsource (lib conn) (part USB_OTG))
       (sheetpath (names /) (tstamps /))
       (tstamp 58D4378B))
+    (comp (ref OLED1)
+      (value CONN_01X07)
+      (libsource (lib conn) (part CONN_01X07))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 58D50BB9))
     (comp (ref D1)
       (value 2A)
       (footprint SMD_Packages:SMD-1206_Pol)
@@ -110,6 +115,24 @@
       (sheetpath (names /gpio/) (tstamps /56AC389C/))
       (tstamp 58D50D04)))
   (libparts
+    (libpart (lib conn) (part CONN_01X07)
+      (description "Connector, single row, 01x07")
+      (footprints
+        (fp Pin_Header_Straight_1X07)
+        (fp Pin_Header_Angled_1X07)
+        (fp Socket_Strip_Straight_1X07)
+        (fp Socket_Strip_Angled_1X07))
+      (fields
+        (field (name Reference) P)
+        (field (name Value) CONN_01X07))
+      (pins
+        (pin (num 1) (name P1) (type passive))
+        (pin (num 2) (name P2) (type passive))
+        (pin (num 3) (name P3) (type passive))
+        (pin (num 4) (name P4) (type passive))
+        (pin (num 5) (name P5) (type passive))
+        (pin (num 6) (name P6) (type passive))
+        (pin (num 7) (name P7) (type passive))))
     (libpart (lib conn) (part CONN_02X06)
       (description "Connector, double row, 02x06")
       (footprints
@@ -587,271 +610,279 @@
       (uri footprints/micro-hdmi-d/micro-hdmi-d.lib))
     (library (logical lfe5bg381)
       (uri footprints/lattice/lfe5bg381.lib))
-    (library (logical device)
-      (uri /usr/share/kicad/library/device.lib))
     (library (logical ESP8266)
-      (uri footprints/esp8266/ESP8266.lib)))
+      (uri footprints/esp8266/ESP8266.lib))
+    (library (logical device)
+      (uri /usr/share/kicad/library/device.lib)))
   (nets
-    (net (code 1) (name "Net-(D4-Pad1)")
-      (node (ref US2) (pin 1))
-      (node (ref D4) (pin 1)))
-    (net (code 2) (name +5V)
-      (node (ref D4) (pin 2))
-      (node (ref D3) (pin 1))
-      (node (ref D1) (pin 1)))
-    (net (code 3) (name "Net-(GPDI1-Pad19)")
-      (node (ref GPDI1) (pin 19)))
-    (net (code 4) (name "Net-(GPDI1-PadSHD)")
-      (node (ref GPDI1) (pin SHD)))
-    (net (code 5) (name "Net-(AUDIO1-Pad1)")
+    (net (code 1) (name "Net-(AUDIO1-Pad1)")
       (node (ref AUDIO1) (pin 1)))
-    (net (code 6) (name "Net-(AUDIO1-Pad2)")
-      (node (ref AUDIO1) (pin 2)))
-    (net (code 7) (name "Net-(AUDIO1-Pad3)")
-      (node (ref AUDIO1) (pin 3)))
-    (net (code 8) (name "Net-(AUDIO1-Pad4)")
-      (node (ref AUDIO1) (pin 4)))
-    (net (code 9) (name "Net-(AUDIO1-Pad5)")
-      (node (ref AUDIO1) (pin 5)))
-    (net (code 10) (name "Net-(AUDIO1-Pad6)")
-      (node (ref AUDIO1) (pin 6)))
-    (net (code 11) (name /USB5V)
-      (node (ref D3) (pin 2))
-      (node (ref US1) (pin 1)))
-    (net (code 12) (name "Net-(GPDI1-Pad18)")
-      (node (ref GPDI1) (pin 18)))
-    (net (code 13) (name /TDO)
-      (node (ref U2) (pin 5))
-      (node (ref U1) (pin V4)))
-    (net (code 14) (name /TDI)
-      (node (ref U1) (pin R5))
-      (node (ref U2) (pin 4)))
-    (net (code 15) (name /TCK)
-      (node (ref U1) (pin T5))
-      (node (ref U2) (pin 6)))
-    (net (code 16) (name /TMS)
-      (node (ref U2) (pin 7))
-      (node (ref U1) (pin U5)))
-    (net (code 17) (name "Net-(GPDI1-Pad10)")
-      (node (ref GPDI1) (pin 10)))
-    (net (code 18) (name "Net-(GPDI1-Pad2)")
-      (node (ref GPDI1) (pin 2)))
-    (net (code 19) (name "Net-(GPDI1-Pad3)")
-      (node (ref GPDI1) (pin 3)))
-    (net (code 20) (name "Net-(GPDI1-Pad4)")
-      (node (ref GPDI1) (pin 4)))
-    (net (code 21) (name "Net-(GPDI1-Pad5)")
-      (node (ref GPDI1) (pin 5)))
-    (net (code 22) (name "Net-(GPDI1-Pad6)")
-      (node (ref GPDI1) (pin 6)))
-    (net (code 23) (name "Net-(GPDI1-Pad7)")
-      (node (ref GPDI1) (pin 7)))
-    (net (code 24) (name "Net-(GPDI1-Pad8)")
-      (node (ref GPDI1) (pin 8)))
-    (net (code 25) (name "Net-(GPDI1-Pad9)")
-      (node (ref GPDI1) (pin 9)))
-    (net (code 26) (name "Net-(GPDI1-Pad1)")
-      (node (ref GPDI1) (pin 1)))
-    (net (code 27) (name "Net-(GPDI1-Pad11)")
-      (node (ref GPDI1) (pin 11)))
-    (net (code 28) (name "Net-(GPDI1-Pad12)")
-      (node (ref GPDI1) (pin 12)))
-    (net (code 29) (name "Net-(GPDI1-Pad13)")
-      (node (ref GPDI1) (pin 13)))
-    (net (code 30) (name "Net-(GPDI1-Pad14)")
-      (node (ref GPDI1) (pin 14)))
-    (net (code 31) (name "Net-(GPDI1-Pad15)")
-      (node (ref GPDI1) (pin 15)))
-    (net (code 32) (name "Net-(GPDI1-Pad16)")
-      (node (ref GPDI1) (pin 16)))
-    (net (code 33) (name "Net-(GPDI1-Pad17)")
-      (node (ref GPDI1) (pin 17)))
-    (net (code 34) (name "Net-(SD1-Pad6)")
+    (net (code 2) (name "Net-(SD1-Pad6)")
       (node (ref SD1) (pin 6)))
-    (net (code 35) (name GND)
-      (node (ref U2) (pin 15))
-      (node (ref J1) (pin 3))
-      (node (ref J1) (pin 4))
-      (node (ref J1) (pin 61))
-      (node (ref J1) (pin 62))
-      (node (ref J3) (pin 3))
-      (node (ref J3) (pin 4))
-      (node (ref J3) (pin 21))
-      (node (ref J3) (pin 22))
-      (node (ref J2) (pin 4))
-      (node (ref J2) (pin 3))
-      (node (ref U1) (pin V5))
-      (node (ref U1) (pin K11))
-      (node (ref U1) (pin M10))
+    (net (code 3) (name GND)
+      (node (ref U1) (pin W19))
+      (node (ref U1) (pin U14))
+      (node (ref U1) (pin F14))
+      (node (ref U1) (pin R19))
+      (node (ref U1) (pin H19))
+      (node (ref U1) (pin C19))
+      (node (ref U1) (pin G17))
+      (node (ref U1) (pin W16))
+      (node (ref U1) (pin V16))
+      (node (ref U1) (pin M16))
       (node (ref U1) (pin W15))
       (node (ref U1) (pin V15))
-      (node (ref U1) (pin T10))
-      (node (ref U1) (pin U10))
-      (node (ref U1) (pin V10))
-      (node (ref U1) (pin V20))
-      (node (ref U1) (pin T7))
       (node (ref U1) (pin N15))
-      (node (ref U1) (pin L10))
-      (node (ref U1) (pin G8))
+      (node (ref U1) (pin K15))
+      (node (ref U1) (pin G15))
+      (node (ref U1) (pin V14))
+      (node (ref US1) (pin 5))
+      (node (ref U1) (pin P14))
+      (node (ref U1) (pin N14))
+      (node (ref U1) (pin M14))
+      (node (ref U1) (pin K14))
+      (node (ref U1) (pin J14))
+      (node (ref U1) (pin G14))
+      (node (ref U1) (pin V19))
+      (node (ref U1) (pin B14))
+      (node (ref U1) (pin V13))
+      (node (ref U1) (pin U13))
+      (node (ref U1) (pin P13))
+      (node (ref U1) (pin J9))
+      (node (ref U2) (pin 15))
+      (node (ref U1) (pin V20))
+      (node (ref GPDI1) (pin 10))
+      (node (ref GPDI1) (pin 7))
+      (node (ref GPDI1) (pin 4))
+      (node (ref U1) (pin M11))
+      (node (ref U1) (pin L11))
+      (node (ref U1) (pin K11))
       (node (ref U1) (pin J11))
       (node (ref U1) (pin G11))
-      (node (ref U1) (pin F8))
-      (node (ref U1) (pin Y7))
-      (node (ref U1) (pin W7))
-      (node (ref U1) (pin V7))
-      (node (ref U1) (pin L11))
-      (node (ref U1) (pin M11))
-      (node (ref U1) (pin P11))
-      (node (ref U1) (pin U11))
-      (node (ref U1) (pin T9))
-      (node (ref U1) (pin G9))
-      (node (ref U1) (pin U7))
-      (node (ref U1) (pin J9))
-      (node (ref U1) (pin K9))
-      (node (ref U1) (pin L9))
+      (node (ref GPDI1) (pin 13))
       (node (ref U1) (pin F7))
-      (node (ref U1) (pin W6))
+      (node (ref U1) (pin U10))
+      (node (ref U1) (pin T10))
+      (node (ref J3) (pin 22))
+      (node (ref J3) (pin 21))
+      (node (ref U1) (pin M10))
+      (node (ref U1) (pin L10))
+      (node (ref U1) (pin K10))
+      (node (ref U1) (pin J10))
+      (node (ref U1) (pin V10))
+      (node (ref U1) (pin G13))
+      (node (ref U1) (pin D4))
       (node (ref U1) (pin V6))
       (node (ref U1) (pin U6))
       (node (ref U1) (pin T6))
+      (node (ref U1) (pin N6))
+      (node (ref J2) (pin 3))
+      (node (ref U1) (pin M2))
+      (node (ref U1) (pin K6))
+      (node (ref J2) (pin 4))
+      (node (ref U1) (pin G6))
+      (node (ref U1) (pin Y5))
+      (node (ref U1) (pin V5))
+      (node (ref U1) (pin G4))
+      (node (ref U1) (pin F13))
+      (node (ref GPDI1) (pin SHD))
+      (node (ref GPDI1) (pin 16))
+      (node (ref U1) (pin T9))
+      (node (ref U1) (pin P7))
+      (node (ref U1) (pin N7))
+      (node (ref U1) (pin M7))
+      (node (ref U1) (pin K7))
+      (node (ref U1) (pin J7))
+      (node (ref J1) (pin 62))
       (node (ref U1) (pin G7))
-      (node (ref U1) (pin Y6))
+      (node (ref U1) (pin U7))
+      (node (ref J1) (pin 61))
+      (node (ref U1) (pin V9))
+      (node (ref U1) (pin U9))
+      (node (ref U1) (pin T7))
+      (node (ref J1) (pin 4))
+      (node (ref J1) (pin 3))
+      (node (ref U1) (pin M9))
+      (node (ref U1) (pin L9))
+      (node (ref U1) (pin K9))
+      (node (ref U1) (pin G9))
       (node (ref U1) (pin Y8))
-      (node (ref U1) (pin B7))
       (node (ref U1) (pin V8))
-      (node (ref U1) (pin N6))
       (node (ref U1) (pin U8))
       (node (ref U1) (pin T8))
-      (node (ref U1) (pin J7))
-      (node (ref U1) (pin K7))
-      (node (ref US2) (pin 5))
-      (node (ref U1) (pin N14))
       (node (ref U1) (pin P8))
-      (node (ref U1) (pin M7))
-      (node (ref U1) (pin N7))
-      (node (ref U1) (pin P7))
-      (node (ref US1) (pin 5))
-      (node (ref U1) (pin V16))
-      (node (ref U1) (pin M16))
-      (node (ref U1) (pin W16))
+      (node (ref U1) (pin Y11))
+      (node (ref U1) (pin Y12))
+      (node (ref U1) (pin W12))
+      (node (ref U1) (pin V12))
       (node (ref U1) (pin U12))
       (node (ref U1) (pin P12))
       (node (ref U1) (pin M12))
-      (node (ref U1) (pin L12))
+      (node (ref J3) (pin 4))
       (node (ref U1) (pin K12))
       (node (ref U1) (pin J12))
+      (node (ref J3) (pin 3))
       (node (ref U1) (pin G12))
-      (node (ref U1) (pin V12))
-      (node (ref U1) (pin Y11))
-      (node (ref U1) (pin J2))
-      (node (ref U1) (pin M14))
-      (node (ref U1) (pin M2))
-      (node (ref U1) (pin K14))
-      (node (ref U1) (pin J14))
-      (node (ref U1) (pin D4))
-      (node (ref U1) (pin G17))
-      (node (ref U1) (pin G14))
-      (node (ref U1) (pin G13))
-      (node (ref U1) (pin F13))
-      (node (ref U1) (pin Y12))
-      (node (ref U1) (pin W12))
-      (node (ref U1) (pin G10))
-      (node (ref U1) (pin C19))
-      (node (ref U1) (pin K6))
-      (node (ref U1) (pin H19))
-      (node (ref U1) (pin K15))
-      (node (ref U1) (pin M9))
-      (node (ref U1) (pin R19))
-      (node (ref U1) (pin V19))
       (node (ref U1) (pin V11))
-      (node (ref U1) (pin U9))
-      (node (ref U1) (pin V9))
-      (node (ref U1) (pin G15))
-      (node (ref U1) (pin F14))
-      (node (ref U1) (pin W19))
-      (node (ref U1) (pin J10))
-      (node (ref U1) (pin P14))
-      (node (ref U1) (pin G4))
-      (node (ref U1) (pin V13))
-      (node (ref U1) (pin U13))
-      (node (ref U1) (pin P13))
-      (node (ref U1) (pin Y5))
-      (node (ref U1) (pin U14))
-      (node (ref U1) (pin G6))
-      (node (ref U1) (pin V14))
-      (node (ref U1) (pin B14))
-      (node (ref U1) (pin K10)))
-    (net (code 36) (name "Net-(SD1-Pad3)")
+      (node (ref U1) (pin U11))
+      (node (ref U1) (pin P11))
+      (node (ref U1) (pin L12))
+      (node (ref U1) (pin G8))
+      (node (ref U1) (pin F8))
+      (node (ref U1) (pin Y7))
+      (node (ref U1) (pin W7))
+      (node (ref U1) (pin V7))
+      (node (ref U1) (pin G10))
+      (node (ref U1) (pin W6))
+      (node (ref OLED1) (pin 1))
+      (node (ref US2) (pin 5))
+      (node (ref U1) (pin Y6))
+      (node (ref U1) (pin J2))
+      (node (ref U1) (pin B7)))
+    (net (code 4) (name "Net-(SD1-Pad3)")
       (node (ref SD1) (pin 3)))
-    (net (code 37) (name "Net-(SD1-Pad4)")
+    (net (code 5) (name "Net-(SD1-Pad4)")
       (node (ref SD1) (pin 4)))
-    (net (code 38) (name "Net-(SD1-Pad10)")
+    (net (code 6) (name "Net-(AUDIO1-Pad2)")
+      (node (ref AUDIO1) (pin 2)))
+    (net (code 7) (name "Net-(SD1-Pad10)")
       (node (ref SD1) (pin 10)))
-    (net (code 39) (name "Net-(SD1-Pad11)")
+    (net (code 8) (name "Net-(SD1-Pad11)")
       (node (ref SD1) (pin 11)))
-    (net (code 40) (name "Net-(SD1-Pad12)")
+    (net (code 9) (name "Net-(SD1-Pad12)")
       (node (ref SD1) (pin 12)))
-    (net (code 41) (name "Net-(SD1-Pad13)")
+    (net (code 10) (name "Net-(SD1-Pad13)")
       (node (ref SD1) (pin 13)))
-    (net (code 42) (name /MTDO)
-      (node (ref SD1) (pin 7))
-      (node (ref U2) (pin 9)))
-    (net (code 43) (name VCC)
-      (node (ref U1) (pin F9))
-      (node (ref U1) (pin H8))
-      (node (ref U1) (pin J8))
-      (node (ref U1) (pin J6))
-      (node (ref J1) (pin 63))
-      (node (ref J1) (pin 64))
-      (node (ref U1) (pin F6))
-      (node (ref J3) (pin 1))
-      (node (ref J3) (pin 2))
-      (node (ref U1) (pin H6))
-      (node (ref J3) (pin 20))
-      (node (ref J3) (pin 19))
-      (node (ref U1) (pin L6))
-      (node (ref U1) (pin M6))
-      (node (ref U1) (pin K8))
+    (net (code 11) (name "Net-(AUDIO1-Pad3)")
+      (node (ref AUDIO1) (pin 3)))
+    (net (code 12) (name "Net-(AUDIO1-Pad4)")
+      (node (ref AUDIO1) (pin 4)))
+    (net (code 13) (name "Net-(AUDIO1-Pad5)")
+      (node (ref AUDIO1) (pin 5)))
+    (net (code 14) (name "Net-(AUDIO1-Pad6)")
+      (node (ref AUDIO1) (pin 6)))
+    (net (code 15) (name +5V)
+      (node (ref D3) (pin 1))
+      (node (ref D1) (pin 1))
+      (node (ref D4) (pin 2)))
+    (net (code 16) (name /USB5V)
+      (node (ref D3) (pin 2))
+      (node (ref US1) (pin 1)))
+    (net (code 17) (name "Net-(D4-Pad1)")
+      (node (ref US2) (pin 1))
+      (node (ref D4) (pin 1)))
+    (net (code 18) (name /OLED_MOSI)
+      (node (ref OLED1) (pin 4)))
+    (net (code 19) (name /OLED_RES)
+      (node (ref OLED1) (pin 5)))
+    (net (code 20) (name /OLED_DC)
+      (node (ref OLED1) (pin 6)))
+    (net (code 21) (name /OLED_CS)
+      (node (ref OLED1) (pin 7)))
+    (net (code 22) (name /GPDI_ETH_N)
+      (node (ref GPDI1) (pin 1)))
+    (net (code 23) (name /GPDI_ETH_P)
+      (node (ref GPDI1) (pin 2)))
+    (net (code 24) (name VCC)
       (node (ref U1) (pin N8))
       (node (ref J2) (pin 2))
-      (node (ref U1) (pin L7))
+      (node (ref J3) (pin 2))
+      (node (ref J3) (pin 19))
+      (node (ref J3) (pin 20))
+      (node (ref J3) (pin 1))
       (node (ref J2) (pin 1))
-      (node (ref U1) (pin H7))
-      (node (ref U1) (pin P6))
-      (node (ref U1) (pin L8))
+      (node (ref J1) (pin 64))
+      (node (ref J1) (pin 63))
+      (node (ref U1) (pin L15))
+      (node (ref U1) (pin F10))
+      (node (ref U1) (pin P9))
+      (node (ref U1) (pin N9))
       (node (ref U1) (pin M8))
-      (node (ref U1) (pin P10))
-      (node (ref U1) (pin K13))
+      (node (ref U1) (pin H9))
+      (node (ref U1) (pin F9))
+      (node (ref U1) (pin P15))
+      (node (ref U1) (pin F15))
+      (node (ref U1) (pin H15))
+      (node (ref U1) (pin J15))
+      (node (ref U1) (pin H7))
+      (node (ref U1) (pin M15))
       (node (ref U1) (pin J13))
-      (node (ref U1) (pin N10))
+      (node (ref U1) (pin K13))
       (node (ref U1) (pin L13))
-      (node (ref U1) (pin F11))
+      (node (ref U1) (pin M13))
+      (node (ref U1) (pin N13))
+      (node (ref U1) (pin H14))
+      (node (ref U1) (pin L14))
+      (node (ref U1) (pin H6))
       (node (ref U1) (pin H11))
+      (node (ref U1) (pin F11))
+      (node (ref U1) (pin P10))
+      (node (ref U1) (pin N10))
       (node (ref U1) (pin H10))
-      (node (ref U1) (pin F10))
-      (node (ref U1) (pin P15))
-      (node (ref U1) (pin L14))
+      (node (ref U1) (pin N12))
+      (node (ref U1) (pin N11))
       (node (ref U1) (pin H12))
       (node (ref U1) (pin F12))
-      (node (ref U1) (pin N12))
-      (node (ref U1) (pin H14))
+      (node (ref U1) (pin L8))
+      (node (ref U1) (pin L6))
+      (node (ref U1) (pin F6))
+      (node (ref U1) (pin K8))
+      (node (ref U1) (pin J8))
+      (node (ref U1) (pin J6))
+      (node (ref U1) (pin M6))
+      (node (ref U1) (pin P6))
       (node (ref U1) (pin H13))
-      (node (ref U1) (pin N13))
-      (node (ref U1) (pin M13))
-      (node (ref U1) (pin P9))
-      (node (ref U1) (pin M15))
-      (node (ref U1) (pin N9))
-      (node (ref U1) (pin H9))
-      (node (ref U1) (pin N11))
-      (node (ref U1) (pin H15))
-      (node (ref U1) (pin L15))
-      (node (ref U1) (pin F15))
-      (node (ref U1) (pin J15)))
-    (net (code 44) (name /MTDI)
-      (node (ref U2) (pin 10))
-      (node (ref SD1) (pin 8)))
-    (net (code 45) (name "Net-(US2-Pad4)")
+      (node (ref U1) (pin H8))
+      (node (ref OLED1) (pin 2))
+      (node (ref U1) (pin L7)))
+    (net (code 25) (name "Net-(US2-Pad6)")
+      (node (ref US2) (pin 6)))
+    (net (code 26) (name /OLED_CLK)
+      (node (ref OLED1) (pin 3)))
+    (net (code 27) (name /GPDI_SCL)
+      (node (ref GPDI1) (pin 17)))
+    (net (code 28) (name /GPDI_5V)
+      (node (ref GPDI1) (pin 19)))
+    (net (code 29) (name /GPDI_SDA)
+      (node (ref GPDI1) (pin 18)))
+    (net (code 30) (name /GPDI_CEC)
+      (node (ref GPDI1) (pin 15)))
+    (net (code 31) (name /GPDI_D2_P)
+      (node (ref GPDI1) (pin 3)))
+    (net (code 32) (name /GPDI_D2_N)
+      (node (ref GPDI1) (pin 5)))
+    (net (code 33) (name /GPDI_D1_P)
+      (node (ref GPDI1) (pin 6)))
+    (net (code 34) (name /GPDI_D1_N)
+      (node (ref GPDI1) (pin 8)))
+    (net (code 35) (name "Net-(US2-Pad4)")
       (node (ref US2) (pin 4)))
+    (net (code 36) (name /GPDI_D0_P)
+      (node (ref GPDI1) (pin 9)))
+    (net (code 37) (name /GPDI_D0_N)
+      (node (ref GPDI1) (pin 11)))
+    (net (code 38) (name /GPDI_CLK_P)
+      (node (ref GPDI1) (pin 12)))
+    (net (code 39) (name /GPDI_CLK_N)
+      (node (ref GPDI1) (pin 14)))
+    (net (code 40) (name /MTDI)
+      (node (ref SD1) (pin 8))
+      (node (ref U2) (pin 10)))
+    (net (code 41) (name /SD_3)
+      (node (ref SD1) (pin 1))
+      (node (ref U2) (pin 11)))
+    (net (code 42) (name /MTMS)
+      (node (ref SD1) (pin 2))
+      (node (ref U2) (pin 12)))
+    (net (code 43) (name /MTCK)
+      (node (ref U2) (pin 13))
+      (node (ref SD1) (pin 5)))
+    (net (code 44) (name /MTDO)
+      (node (ref SD1) (pin 7))
+      (node (ref U2) (pin 9)))
+    (net (code 45) (name /SD_2)
+      (node (ref U2) (pin 14))
+      (node (ref SD1) (pin 9)))
     (net (code 46) (name "Net-(US1-Pad2)")
       (node (ref US1) (pin 2)))
     (net (code 47) (name "Net-(US1-Pad3)")
@@ -864,275 +895,273 @@
       (node (ref US2) (pin 2)))
     (net (code 51) (name "Net-(US2-Pad3)")
       (node (ref US2) (pin 3)))
-    (net (code 52) (name "Net-(US2-Pad6)")
-      (node (ref US2) (pin 6)))
-    (net (code 53) (name /SD_3)
-      (node (ref U2) (pin 11))
-      (node (ref SD1) (pin 1)))
-    (net (code 54) (name /MTMS)
-      (node (ref U2) (pin 12))
-      (node (ref SD1) (pin 2)))
-    (net (code 55) (name /MTCK)
-      (node (ref SD1) (pin 5))
-      (node (ref U2) (pin 13)))
-    (net (code 56) (name /SD_2)
-      (node (ref SD1) (pin 9))
-      (node (ref U2) (pin 14)))
-    (net (code 57) (name "Net-(U2-Pad19)")
-      (node (ref U2) (pin 19)))
-    (net (code 58) (name "Net-(U2-Pad22)")
-      (node (ref U2) (pin 22)))
-    (net (code 59) (name "Net-(U2-Pad16)")
+    (net (code 52) (name /TMS)
+      (node (ref U1) (pin U5))
+      (node (ref U2) (pin 7)))
+    (net (code 53) (name "Net-(U2-Pad16)")
       (node (ref U2) (pin 16)))
-    (net (code 60) (name "Net-(U2-Pad17)")
+    (net (code 54) (name "Net-(U2-Pad17)")
       (node (ref U2) (pin 17)))
-    (net (code 61) (name "Net-(U2-Pad18)")
+    (net (code 55) (name "Net-(U2-Pad18)")
       (node (ref U2) (pin 18)))
-    (net (code 62) (name "Net-(U2-Pad21)")
-      (node (ref U2) (pin 21)))
-    (net (code 63) (name "Net-(U2-Pad1)")
+    (net (code 56) (name "Net-(U2-Pad19)")
+      (node (ref U2) (pin 19)))
+    (net (code 57) (name "Net-(U2-Pad22)")
+      (node (ref U2) (pin 22)))
+    (net (code 58) (name "Net-(U2-Pad1)")
       (node (ref U2) (pin 1)))
-    (net (code 64) (name "Net-(U2-Pad2)")
+    (net (code 59) (name "Net-(U2-Pad2)")
       (node (ref U2) (pin 2)))
-    (net (code 65) (name "Net-(U2-Pad3)")
+    (net (code 60) (name "Net-(U2-Pad3)")
       (node (ref U2) (pin 3)))
-    (net (code 66) (name "Net-(U2-Pad8)")
+    (net (code 61) (name "Net-(U2-Pad8)")
       (node (ref U2) (pin 8)))
-    (net (code 67) (name "Net-(U2-Pad20)")
+    (net (code 62) (name "Net-(U2-Pad20)")
       (node (ref U2) (pin 20)))
-    (net (code 68) (name /gpio/PMODB7)
+    (net (code 63) (name "Net-(U2-Pad21)")
+      (node (ref U2) (pin 21)))
+    (net (code 64) (name /TCK)
+      (node (ref U2) (pin 6))
+      (node (ref U1) (pin T5)))
+    (net (code 65) (name /TDO)
+      (node (ref U2) (pin 5))
+      (node (ref U1) (pin V4)))
+    (net (code 66) (name /TDI)
+      (node (ref U2) (pin 4))
+      (node (ref U1) (pin R5)))
+    (net (code 67) (name /gpio/PMODB7)
       (node (ref J3) (pin 11)))
-    (net (code 69) (name /gpio/MP1)
+    (net (code 68) (name /gpio/MP1)
       (node (ref J3) (pin 13)))
-    (net (code 70) (name /gpio/MP3)
+    (net (code 69) (name /gpio/MP3)
       (node (ref J3) (pin 15)))
-    (net (code 71) (name /gpio/MP5)
+    (net (code 70) (name /gpio/MP5)
       (node (ref J3) (pin 17)))
-    (net (code 72) (name /gpio/PMODB5)
+    (net (code 71) (name /gpio/PMODB5)
       (node (ref J3) (pin 9)))
-    (net (code 73) (name /gpio/PMODB3)
+    (net (code 72) (name /gpio/PMODB3)
       (node (ref J3) (pin 7)))
-    (net (code 74) (name /gpio/PMODB1)
+    (net (code 73) (name /gpio/PMODB1)
       (node (ref J3) (pin 5)))
-    (net (code 75) (name /gpio/PMODB8)
+    (net (code 74) (name /gpio/PMODB8)
       (node (ref J3) (pin 12)))
-    (net (code 76) (name /gpio/PMODB6)
+    (net (code 75) (name /gpio/PMODB6)
       (node (ref J3) (pin 10)))
-    (net (code 77) (name /gpio/PMODB4)
+    (net (code 76) (name /gpio/PMODB4)
       (node (ref J3) (pin 8)))
-    (net (code 78) (name /gpio/PMODB2)
+    (net (code 77) (name /gpio/PMODB2)
       (node (ref J3) (pin 6)))
-    (net (code 79) (name /gpio/MP6)
+    (net (code 78) (name /gpio/MP6)
       (node (ref J3) (pin 18)))
-    (net (code 80) (name /gpio/MP4)
+    (net (code 79) (name /gpio/MP4)
       (node (ref J3) (pin 16)))
-    (net (code 81) (name /gpio/MP2)
+    (net (code 80) (name /gpio/MP2)
       (node (ref J3) (pin 14)))
-    (net (code 82) (name /gpio/PMODC7)
+    (net (code 81) (name /gpio/PMODC7)
       (node (ref J3) (pin 29)))
-    (net (code 83) (name /gpio/PMODC5)
+    (net (code 82) (name /gpio/PMODC5)
       (node (ref J3) (pin 27)))
-    (net (code 84) (name /gpio/PMODC3)
+    (net (code 83) (name /gpio/PMODC3)
       (node (ref J3) (pin 25)))
-    (net (code 85) (name /gpio/P45)
+    (net (code 84) (name /gpio/P45)
       (node (ref J1) (pin 45))
       (node (ref U1) (pin E14)))
-    (net (code 86) (name /gpio/P59)
+    (net (code 85) (name /gpio/P59)
       (node (ref J1) (pin 59))
       (node (ref U1) (pin E11)))
-    (net (code 87) (name /gpio/P57)
-      (node (ref J1) (pin 57))
-      (node (ref U1) (pin C12)))
-    (net (code 88) (name /gpio/P55)
-      (node (ref J1) (pin 55))
-      (node (ref U1) (pin E12)))
-    (net (code 89) (name /gpio/P53)
-      (node (ref J1) (pin 53))
-      (node (ref U1) (pin A13)))
-    (net (code 90) (name /gpio/P51)
+    (net (code 86) (name /gpio/P57)
+      (node (ref U1) (pin C12))
+      (node (ref J1) (pin 57)))
+    (net (code 87) (name /gpio/P55)
+      (node (ref U1) (pin E12))
+      (node (ref J1) (pin 55)))
+    (net (code 88) (name /gpio/P53)
+      (node (ref U1) (pin A13))
+      (node (ref J1) (pin 53)))
+    (net (code 89) (name /gpio/P51)
       (node (ref U1) (pin C13))
       (node (ref J1) (pin 51)))
-    (net (code 91) (name /gpio/P49)
+    (net (code 90) (name /gpio/P49)
       (node (ref U1) (pin E13))
       (node (ref J1) (pin 49)))
-    (net (code 92) (name /gpio/P47)
-      (node (ref J1) (pin 47))
-      (node (ref U1) (pin C14)))
-    (net (code 93) (name /gpio/P43)
+    (net (code 91) (name /gpio/P47)
+      (node (ref U1) (pin C14))
+      (node (ref J1) (pin 47)))
+    (net (code 92) (name /gpio/P43)
       (node (ref U1) (pin C15))
       (node (ref J1) (pin 43)))
-    (net (code 94) (name /gpio/P41)
+    (net (code 93) (name /gpio/P41)
       (node (ref J1) (pin 41))
       (node (ref U1) (pin E15)))
-    (net (code 95) (name /gpio/P39)
+    (net (code 94) (name /gpio/P39)
       (node (ref J1) (pin 39))
       (node (ref U1) (pin B16)))
-    (net (code 96) (name /gpio/PMODC6)
+    (net (code 95) (name /gpio/PMODC6)
       (node (ref J3) (pin 28)))
-    (net (code 97) (name /gpio/PMODC4)
+    (net (code 96) (name /gpio/PMODC4)
       (node (ref J3) (pin 26)))
-    (net (code 98) (name /gpio/PMODC2)
+    (net (code 97) (name /gpio/PMODC2)
       (node (ref J3) (pin 24)))
-    (net (code 99) (name /gpio/PMODC1)
+    (net (code 98) (name /gpio/PMODC1)
       (node (ref J3) (pin 23)))
-    (net (code 100) (name /gpio/PMODC8)
+    (net (code 99) (name /gpio/PMODC8)
       (node (ref J3) (pin 30)))
-    (net (code 101) (name /gpio/P60)
-      (node (ref U1) (pin D11))
-      (node (ref J1) (pin 60)))
-    (net (code 102) (name /gpio/P58)
+    (net (code 100) (name /gpio/P60)
+      (node (ref J1) (pin 60))
+      (node (ref U1) (pin D11)))
+    (net (code 101) (name /gpio/P58)
       (node (ref J1) (pin 58))
       (node (ref U1) (pin B12)))
-    (net (code 103) (name /gpio/P56)
+    (net (code 102) (name /gpio/P56)
       (node (ref U1) (pin D12))
       (node (ref J1) (pin 56)))
-    (net (code 104) (name /gpio/P54)
-      (node (ref U1) (pin A12))
-      (node (ref J1) (pin 54)))
-    (net (code 105) (name /gpio/P52)
-      (node (ref U1) (pin B13))
-      (node (ref J1) (pin 52)))
-    (net (code 106) (name /gpio/P50)
-      (node (ref U1) (pin D13))
-      (node (ref J1) (pin 50)))
-    (net (code 107) (name /gpio/P48)
+    (net (code 103) (name /gpio/P54)
+      (node (ref J1) (pin 54))
+      (node (ref U1) (pin A12)))
+    (net (code 104) (name /gpio/P52)
+      (node (ref J1) (pin 52))
+      (node (ref U1) (pin B13)))
+    (net (code 105) (name /gpio/P50)
+      (node (ref J1) (pin 50))
+      (node (ref U1) (pin D13)))
+    (net (code 106) (name /gpio/P48)
       (node (ref J1) (pin 48))
       (node (ref U1) (pin A14)))
-    (net (code 108) (name /gpio/P46)
+    (net (code 107) (name /gpio/P46)
       (node (ref U1) (pin D14))
       (node (ref J1) (pin 46)))
-    (net (code 109) (name /gpio/P44)
-      (node (ref U1) (pin B15))
-      (node (ref J1) (pin 44)))
-    (net (code 110) (name /gpio/P42)
-      (node (ref U1) (pin D15))
-      (node (ref J1) (pin 42)))
-    (net (code 111) (name /gpio/P40)
-      (node (ref U1) (pin A16))
-      (node (ref J1) (pin 40)))
-    (net (code 112) (name /gpio/PMODA8)
+    (net (code 108) (name /gpio/P44)
+      (node (ref J1) (pin 44))
+      (node (ref U1) (pin B15)))
+    (net (code 109) (name /gpio/P42)
+      (node (ref J1) (pin 42))
+      (node (ref U1) (pin D15)))
+    (net (code 110) (name /gpio/P40)
+      (node (ref J1) (pin 40))
+      (node (ref U1) (pin A16)))
+    (net (code 111) (name /gpio/PMODA8)
       (node (ref J2) (pin 12)))
-    (net (code 113) (name /gpio/PMODA6)
+    (net (code 112) (name /gpio/PMODA6)
       (node (ref J2) (pin 10)))
-    (net (code 114) (name /gpio/PMODA4)
+    (net (code 113) (name /gpio/PMODA4)
       (node (ref J2) (pin 8)))
-    (net (code 115) (name /gpio/PMODA2)
+    (net (code 114) (name /gpio/PMODA2)
       (node (ref J2) (pin 6)))
-    (net (code 116) (name /gpio/PMODA7)
+    (net (code 115) (name /gpio/PMODA7)
       (node (ref J2) (pin 11)))
-    (net (code 117) (name /gpio/PMODA5)
+    (net (code 116) (name /gpio/PMODA5)
       (node (ref J2) (pin 9)))
-    (net (code 118) (name /gpio/PMODA3)
+    (net (code 117) (name /gpio/PMODA3)
       (node (ref J2) (pin 7)))
-    (net (code 119) (name /gpio/PMODA1)
+    (net (code 118) (name /gpio/PMODA1)
       (node (ref J2) (pin 5)))
-    (net (code 120) (name /gpio/P37)
+    (net (code 119) (name /gpio/P37)
       (node (ref J1) (pin 37))
       (node (ref U1) (pin D16)))
-    (net (code 121) (name /gpio/P35)
+    (net (code 120) (name /gpio/P35)
       (node (ref U1) (pin C17))
       (node (ref J1) (pin 35)))
-    (net (code 122) (name /gpio/P33)
+    (net (code 121) (name /gpio/P33)
       (node (ref U1) (pin B18))
       (node (ref J1) (pin 33)))
-    (net (code 123) (name /gpio/P31)
+    (net (code 122) (name /gpio/P31)
       (node (ref U1) (pin B19))
       (node (ref J1) (pin 31)))
-    (net (code 124) (name /gpio/P29)
+    (net (code 123) (name /gpio/P29)
       (node (ref U1) (pin B20))
       (node (ref J1) (pin 29)))
-    (net (code 125) (name /gpio/P38)
+    (net (code 124) (name /gpio/P38)
       (node (ref U1) (pin C16))
       (node (ref J1) (pin 38)))
-    (net (code 126) (name /gpio/P36)
+    (net (code 125) (name /gpio/P36)
       (node (ref J1) (pin 36))
       (node (ref U1) (pin B17)))
-    (net (code 127) (name /gpio/P34)
+    (net (code 126) (name /gpio/P34)
       (node (ref J1) (pin 34))
       (node (ref U1) (pin A17)))
-    (net (code 128) (name /gpio/P32)
+    (net (code 127) (name /gpio/P32)
       (node (ref U1) (pin A18))
       (node (ref J1) (pin 32)))
-    (net (code 129) (name /gpio/P30)
+    (net (code 128) (name /gpio/P30)
       (node (ref U1) (pin A19))
       (node (ref J1) (pin 30)))
-    (net (code 130) (name /gpio/P27)
+    (net (code 129) (name /gpio/P27)
       (node (ref J1) (pin 27))
       (node (ref U1) (pin B6)))
-    (net (code 131) (name /gpio/P19)
+    (net (code 130) (name /gpio/P19)
       (node (ref J1) (pin 19))
       (node (ref U1) (pin D8)))
-    (net (code 132) (name /gpio/P20)
+    (net (code 131) (name /gpio/P20)
       (node (ref U1) (pin E8))
       (node (ref J1) (pin 20)))
-    (net (code 133) (name /gpio/P21)
+    (net (code 132) (name /gpio/P21)
       (node (ref J1) (pin 21))
       (node (ref U1) (pin C7)))
-    (net (code 134) (name /gpio/P22)
+    (net (code 133) (name /gpio/P22)
       (node (ref U1) (pin C6))
       (node (ref J1) (pin 22)))
-    (net (code 135) (name /gpio/P23)
+    (net (code 134) (name /gpio/P23)
       (node (ref U1) (pin D7))
       (node (ref J1) (pin 23)))
-    (net (code 136) (name /gpio/P24)
+    (net (code 135) (name /gpio/P24)
       (node (ref J1) (pin 24))
       (node (ref U1) (pin E7)))
-    (net (code 137) (name /gpio/P25)
+    (net (code 136) (name /gpio/P25)
       (node (ref J1) (pin 25))
       (node (ref U1) (pin D6)))
-    (net (code 138) (name /gpio/P26)
+    (net (code 137) (name /gpio/P26)
       (node (ref J1) (pin 26))
       (node (ref U1) (pin E6)))
-    (net (code 139) (name /gpio/P18)
+    (net (code 138) (name /gpio/P18)
       (node (ref U1) (pin C8))
       (node (ref J1) (pin 18)))
-    (net (code 140) (name /gpio/P28)
+    (net (code 139) (name /gpio/P28)
       (node (ref U1) (pin A6))
       (node (ref J1) (pin 28)))
-    (net (code 141) (name /gpio/P17)
+    (net (code 140) (name /gpio/P17)
       (node (ref J1) (pin 17))
       (node (ref U1) (pin B8)))
-    (net (code 142) (name /gpio/P16)
+    (net (code 141) (name /gpio/P16)
       (node (ref J1) (pin 16))
       (node (ref U1) (pin A7)))
-    (net (code 143) (name /gpio/P15)
+    (net (code 142) (name /gpio/P15)
       (node (ref U1) (pin A8))
       (node (ref J1) (pin 15)))
-    (net (code 144) (name /gpio/P13)
+    (net (code 143) (name /gpio/P13)
       (node (ref U1) (pin E9))
       (node (ref J1) (pin 13)))
-    (net (code 145) (name /gpio/P14)
+    (net (code 144) (name /gpio/P14)
       (node (ref U1) (pin D9))
       (node (ref J1) (pin 14)))
-    (net (code 146) (name /gpio/P12)
+    (net (code 145) (name /gpio/P12)
       (node (ref U1) (pin B9))
       (node (ref J1) (pin 12)))
-    (net (code 147) (name /gpio/P11)
+    (net (code 146) (name /gpio/P11)
       (node (ref J1) (pin 11))
       (node (ref U1) (pin C10)))
-    (net (code 148) (name /gpio/P9)
+    (net (code 147) (name /gpio/P9)
       (node (ref J1) (pin 9))
       (node (ref U1) (pin B10)))
-    (net (code 149) (name /gpio/P10)
+    (net (code 148) (name /gpio/P10)
       (node (ref J1) (pin 10))
       (node (ref U1) (pin A9)))
-    (net (code 150) (name /gpio/P8)
+    (net (code 149) (name /gpio/P8)
       (node (ref J1) (pin 8))
       (node (ref U1) (pin A11)))
-    (net (code 151) (name /gpio/P7)
+    (net (code 150) (name /gpio/P7)
       (node (ref U1) (pin A10))
       (node (ref J1) (pin 7)))
-    (net (code 152) (name /gpio/P5)
+    (net (code 151) (name /gpio/P5)
       (node (ref J1) (pin 5))
       (node (ref U1) (pin B11)))
-    (net (code 153) (name /gpio/P6)
+    (net (code 152) (name /gpio/P6)
       (node (ref J1) (pin 6))
       (node (ref U1) (pin C11)))
-    (net (code 154) (name /gpio/USB5V)
+    (net (code 153) (name /gpio/USB5V)
       (node (ref D2) (pin 2)))
-    (net (code 155) (name /gpio/OUT5V)
+    (net (code 154) (name /gpio/OUT5V)
       (node (ref D2) (pin 1))
       (node (ref J1) (pin 2)))
-    (net (code 156) (name /gpio/IN5V)
+    (net (code 155) (name /gpio/IN5V)
       (node (ref D1) (pin 2))
       (node (ref J1) (pin 1)))))
\ No newline at end of file
diff --git a/ulx3s.sch b/ulx3s.sch
index 657c718..ce51937 100644
--- a/ulx3s.sch
+++ b/ulx3s.sch
@@ -546,12 +546,12 @@ $EndComp
 $Comp
 L MICRO-HDMI-D GPDI1
 U 1 1 56ACD5D4
-P 6150 4650
-F 0 "GPDI1" H 6150 5700 50  0000 C CNN
-F 1 "MICRO-GPDI-D" V 6250 4650 50  0000 C CNN
-F 2 "micro-hdmi-d:MICRO-HDMI-D" H 6150 4650 60  0001 C CNN
-F 3 "" H 6150 4650 60  0000 C CNN
-	1    6150 4650
+P 5800 4600
+F 0 "GPDI1" H 5800 5650 50  0000 C CNN
+F 1 "MICRO-GPDI-D" V 5900 4600 50  0000 C CNN
+F 2 "micro-hdmi-d:MICRO-HDMI-D" H 5800 4600 60  0001 C CNN
+F 3 "" H 5800 4600 60  0000 C CNN
+	1    5800 4600
 	-1   0    0    -1  
 $EndComp
 $Comp
@@ -690,7 +690,7 @@ Wire Wire Line
 Text Label 1100 7000 0    60   ~ 0
 MTDI
 $Sheet
-S 6800 4650 800  600 
+S 7350 4650 800  600 
 U 56AC389C
 F0 "gpio" 60
 F1 "gpio.sch" 60
@@ -743,4 +743,195 @@ F 3 "" H 5600 7500 50  0000 C CNN
 	1    5600 7500
 	0    -1   -1   0   
 $EndComp
+$Comp
+L CONN_01X07 OLED1
+U 1 1 58D50BB9
+P 7400 3950
+F 0 "OLED1" H 7400 4350 50  0000 C CNN
+F 1 "CONN_01X07" V 7500 3950 50  0000 C CNN
+F 2 "" H 7400 3950 50  0000 C CNN
+F 3 "" H 7400 3950 50  0000 C CNN
+	1    7400 3950
+	-1   0    0    -1  
+$EndComp
+Wire Wire Line
+	7600 3650 7900 3650
+Wire Wire Line
+	7600 3750 8200 3750
+Wire Wire Line
+	7600 3850 8200 3850
+Wire Wire Line
+	7600 3950 8200 3950
+Wire Wire Line
+	7600 4050 8200 4050
+Wire Wire Line
+	7600 4150 8200 4150
+Wire Wire Line
+	7600 4250 8200 4250
+Text Label 7650 3850 0    60   ~ 0
+OLED_CLK
+Text Label 7650 3950 0    60   ~ 0
+OLED_MOSI
+Text Label 7650 4050 0    60   ~ 0
+OLED_RES
+Text Label 7650 4150 0    60   ~ 0
+OLED_DC
+Text Label 7650 4250 0    60   ~ 0
+OLED_CS
+$Comp
+L GND #PWR08
+U 1 1 58D52027
+P 7900 3650
+F 0 "#PWR08" H 7900 3400 50  0001 C CNN
+F 1 "GND" H 7900 3500 50  0000 C CNN
+F 2 "" H 7900 3650 60  0000 C CNN
+F 3 "" H 7900 3650 60  0000 C CNN
+	1    7900 3650
+	0    -1   -1   0   
+$EndComp
+$Comp
+L VCC #PWR09
+U 1 1 58D522D3
+P 8200 3750
+F 0 "#PWR09" H 8200 3600 50  0001 C CNN
+F 1 "VCC" H 8200 3900 50  0000 C CNN
+F 2 "" H 8200 3750 50  0000 C CNN
+F 3 "" H 8200 3750 50  0000 C CNN
+	1    8200 3750
+	0    1    1    0   
+$EndComp
+Wire Wire Line
+	6000 3650 6700 3650
+Text Label 6050 3650 0    60   ~ 0
+GPDI_ETH_N
+Wire Wire Line
+	6000 3750 6700 3750
+Wire Wire Line
+	6000 3850 6700 3850
+Text Label 6050 3750 0    60   ~ 0
+GPDI_ETH_P
+Wire Wire Line
+	6000 5150 6700 5150
+Wire Wire Line
+	6000 3950 6700 3950
+Wire Wire Line
+	6000 4050 6700 4050
+Text Label 6050 3850 0    60   ~ 0
+GPDI_D2_P
+Text Label 6050 4050 0    60   ~ 0
+GPDI_D2_N
+Wire Wire Line
+	6000 4150 6700 4150
+Wire Wire Line
+	6000 4250 6700 4250
+Wire Wire Line
+	6000 4350 6700 4350
+Text Label 6050 4150 0    60   ~ 0
+GPDI_D1_P
+Text Label 6050 4350 0    60   ~ 0
+GPDI_D1_N
+Wire Wire Line
+	6000 4450 6700 4450
+Wire Wire Line
+	6000 4550 6700 4550
+Wire Wire Line
+	6000 4650 6700 4650
+Text Label 6050 4450 0    60   ~ 0
+GPDI_D0_P
+Text Label 6050 4650 0    60   ~ 0
+GPDI_D0_N
+Wire Wire Line
+	6000 4750 6700 4750
+Wire Wire Line
+	6000 4850 6700 4850
+Wire Wire Line
+	6000 4950 6700 4950
+Text Label 6050 4750 0    60   ~ 0
+GPDI_CLK_P
+Text Label 6050 4950 0    60   ~ 0
+GPDI_CLK_N
+Wire Wire Line
+	6000 5050 6700 5050
+Text Label 6050 5050 0    60   ~ 0
+GPDI_CEC
+Wire Wire Line
+	6000 5250 6700 5250
+Text Label 6050 5250 0    60   ~ 0
+GPDI_SCL
+Text Label 6050 5450 0    60   ~ 0
+GPDI_5V
+Wire Wire Line
+	6000 5450 6700 5450
+Wire Wire Line
+	6000 5350 6700 5350
+Text Label 6050 5350 0    60   ~ 0
+GPDI_SDA
+Wire Wire Line
+	6000 5550 6700 5550
+$Comp
+L GND #PWR010
+U 1 1 58D544FB
+P 6700 5550
+F 0 "#PWR010" H 6700 5300 50  0001 C CNN
+F 1 "GND" H 6700 5400 50  0000 C CNN
+F 2 "" H 6700 5550 60  0000 C CNN
+F 3 "" H 6700 5550 60  0000 C CNN
+	1    6700 5550
+	0    -1   -1   0   
+$EndComp
+$Comp
+L GND #PWR011
+U 1 1 58D5464C
+P 6700 5150
+F 0 "#PWR011" H 6700 4900 50  0001 C CNN
+F 1 "GND" H 6700 5000 50  0000 C CNN
+F 2 "" H 6700 5150 60  0000 C CNN
+F 3 "" H 6700 5150 60  0000 C CNN
+	1    6700 5150
+	0    -1   -1   0   
+$EndComp
+$Comp
+L GND #PWR012
+U 1 1 58D54683
+P 6700 4850
+F 0 "#PWR012" H 6700 4600 50  0001 C CNN
+F 1 "GND" H 6700 4700 50  0000 C CNN
+F 2 "" H 6700 4850 60  0000 C CNN
+F 3 "" H 6700 4850 60  0000 C CNN
+	1    6700 4850
+	0    -1   -1   0   
+$EndComp
+$Comp
+L GND #PWR013
+U 1 1 58D54712
+P 6700 4550
+F 0 "#PWR013" H 6700 4300 50  0001 C CNN
+F 1 "GND" H 6700 4400 50  0000 C CNN
+F 2 "" H 6700 4550 60  0000 C CNN
+F 3 "" H 6700 4550 60  0000 C CNN
+	1    6700 4550
+	0    -1   -1   0   
+$EndComp
+$Comp
+L GND #PWR014
+U 1 1 58D54749
+P 6700 4250
+F 0 "#PWR014" H 6700 4000 50  0001 C CNN
+F 1 "GND" H 6700 4100 50  0000 C CNN
+F 2 "" H 6700 4250 60  0000 C CNN
+F 3 "" H 6700 4250 60  0000 C CNN
+	1    6700 4250
+	0    -1   -1   0   
+$EndComp
+$Comp
+L GND #PWR015
+U 1 1 58D547C2
+P 6700 3950
+F 0 "#PWR015" H 6700 3700 50  0001 C CNN
+F 1 "GND" H 6700 3800 50  0000 C CNN
+F 2 "" H 6700 3950 60  0000 C CNN
+F 3 "" H 6700 3950 60  0000 C CNN
+	1    6700 3950
+	0    -1   -1   0   
+$EndComp
 $EndSCHEMATC