diff --git a/BusVoodoo.sch b/BusVoodoo.sch
index 5c6c958..6df2a59 100644
--- a/BusVoodoo.sch
+++ b/BusVoodoo.sch
@@ -397,7 +397,7 @@ value=SDIO_D3/UART_RX
 T 58500 36400 5 10 0 0 0 0 1
 device=none
 T 59200 36000 5 10 0 0 0 0 1
-net=IO12:1
+net=SDIO_D3/UART_RX:1
 }
 C 58300 36100 1 0 0 io-1.sym
 {
@@ -406,7 +406,7 @@ value=SDIO_D2/UART_TX
 T 58500 36700 5 10 0 0 0 0 1
 device=none
 T 59200 36300 5 10 0 0 0 0 1
-net=IO13:1
+net=SDIO_D2/UART_TX:1
 }
 C 58300 36400 1 0 0 io-1.sym
 {
@@ -415,7 +415,7 @@ value=SDIO_D1
 T 58500 37000 5 10 0 0 0 0 1
 device=none
 T 59200 36600 5 10 0 0 0 0 1
-net=IO9:1
+net=SDIO_D1:1
 }
 C 58300 35500 1 0 0 io-1.sym
 {
@@ -424,7 +424,7 @@ value=SDIO_CK/USART_CK
 T 58500 36100 5 10 0 0 0 0 1
 device=none
 T 59200 35700 5 10 0 0 0 0 1
-net=IO1:1
+net=SDIO_CK/USART_CK:1
 }
 C 58300 33600 1 0 0 io-1.sym
 {
@@ -433,7 +433,7 @@ value=SDIO_CMD
 T 58500 34200 5 10 0 0 0 0 1
 device=none
 T 59200 33800 5 10 0 0 0 0 1
-net=IO4:1
+net=SDIO_CMD:1
 }
 C 58300 36700 1 0 0 io-1.sym
 {
@@ -442,7 +442,7 @@ value=SDIO_D0
 T 58500 37300 5 10 0 0 0 0 1
 device=none
 T 59200 36900 5 10 0 0 0 0 1
-net=IO10:1
+net=SDIO_D0:1
 }
 C 58300 37300 1 0 0 io-1.sym
 {
@@ -451,7 +451,7 @@ value=I2S_MCK
 T 58500 37900 5 10 0 0 0 0 1
 device=none
 T 59200 37500 5 10 0 0 0 0 1
-net=IO7:1
+net=I2S_MCK:1
 }
 C 47700 43400 1 180 0 io-1.sym
 {
@@ -514,7 +514,7 @@ value=I2C_SCL/USART_TX
 T 47500 34700 5 10 0 0 180 0 1
 device=none
 T 46800 35100 5 10 0 0 180 0 1
-net=IO8:1
+net=I2C_SCL/USART_TX:1
 }
 C 47700 35000 1 180 0 io-1.sym
 {
@@ -523,7 +523,7 @@ value=I2C_SDA/USART_RX
 T 47500 34400 5 10 0 0 180 0 1
 device=none
 T 46800 34800 5 10 0 0 180 0 1
-net=IO11:1
+net=I2C_SDA/USART_RX:1
 }
 C 47700 34700 1 180 0 io-1.sym
 {
@@ -532,7 +532,7 @@ value=I2C_SMBA/SPI_NSS/I2S_WS
 T 47500 34100 5 10 0 0 180 0 1
 device=none
 T 46800 34500 5 10 0 0 180 0 1
-net=IO3:1
+net=I2C_SMBA/SPI_NSS/I2S_WS:1
 }
 C 47700 34400 1 180 0 io-1.sym
 {
@@ -541,7 +541,7 @@ value=USART_CTS/SPI_SCK/I2S_CK
 T 47500 33800 5 10 0 0 180 0 1
 device=none
 T 46800 34200 5 10 0 0 180 0 1
-net=IO13:1
+net=USART_CTS/SPI_SCK/I2S_CK:1
 }
 C 47700 34100 1 180 0 io-1.sym
 {
@@ -550,7 +550,7 @@ value=USART_RTS/SPI_MISO
 T 47500 33500 5 10 0 0 180 0 1
 device=none
 T 46800 33900 5 10 0 0 180 0 1
-net=IO6:1
+net=USART_RTS/SPI_MISO:1
 }
 C 47700 33800 1 180 0 io-1.sym
 {
@@ -559,7 +559,7 @@ value=SPI_MOSI/I2S_SD
 T 47500 33200 5 10 0 0 180 0 1
 device=none
 T 46800 33600 5 10 0 0 180 0 1
-net=IO2:1
+net=SPI_MOSI/I2S_SD:1
 }
 C 78200 47100 1 90 1 transistor_pmos_on_DMP2200UDW.sym
 {
@@ -1406,7 +1406,7 @@ device=none
 T 80800 45000 5 10 1 1 0 1 1
 value=SDIO_D2/UART_TX
 T 80800 45100 5 10 0 0 0 0 1
-net=IO5:1
+net=SDIO_D2/UART_TX:1
 }
 C 79900 45200 1 0 0 io-1.sym
 {
@@ -1415,7 +1415,7 @@ device=none
 T 80800 45300 5 10 1 1 0 1 1
 value=USART_RTS/SPI_MISO
 T 80800 45400 5 10 0 0 0 0 1
-net=IO6:1
+net=USART_RTS/SPI_MISO:1
 }
 C 79900 45500 1 0 0 io-1.sym
 {
@@ -1424,14 +1424,14 @@ device=none
 T 80800 45600 5 10 1 1 0 1 1
 value=I2S_MCK
 T 80800 45700 5 10 0 0 0 0 1
-net=IO7:1
+net=I2S_MCK:1
 }
 C 73200 46500 1 0 1 io-1.sym
 {
 T 73000 47100 5 10 0 0 180 7 1
 device=none
 T 72300 46700 5 10 0 0 0 6 1
-net=IO4:1
+net=SDIO_CMD:1
 T 72300 46600 5 10 1 1 0 7 1
 value=SDIO_CMD
 }
@@ -1440,7 +1440,7 @@ C 73200 46800 1 0 1 io-1.sym
 T 73000 47400 5 10 0 0 180 7 1
 device=none
 T 72300 47000 5 10 0 0 0 6 1
-net=IO3:1
+net=I2C_SMBA/SPI_NSS/I2S_WS:1
 T 72300 46900 5 10 1 1 0 7 1
 value=I2C_SMBA/SPI_NSS/I2S_WS
 }
@@ -1598,7 +1598,7 @@ value=SDIO_CK/USART_CK
 T 80100 46400 5 10 0 0 0 2 1
 device=none
 T 80800 46800 5 10 0 0 180 6 1
-net=IO1:1
+net=SDIO_CK/USART_CK:1
 }
 C 79900 47300 1 180 1 io-1.sym
 {
@@ -1607,7 +1607,7 @@ value=SPI_MOSI/I2S_SD
 T 80100 46700 5 10 0 0 0 2 1
 device=none
 T 80800 47100 5 10 0 0 180 6 1
-net=IO2:1
+net=SPI_MOSI/I2S_SD:1
 }
 C 73200 45900 1 180 0 io-1.sym
 {
@@ -1616,7 +1616,7 @@ value=SDIO_D3/UART_RX
 T 73000 45300 5 10 0 0 180 0 1
 device=none
 T 72300 45700 5 10 0 0 180 0 1
-net=IO12:1
+net=SDIO_D3/UART_RX:1
 }
 C 73200 46200 1 180 0 io-1.sym
 {
@@ -1625,14 +1625,14 @@ value=USART_CTS/SPI_SCK/I2S_CK
 T 73000 45600 5 10 0 0 180 0 1
 device=none
 T 72300 46000 5 10 0 0 180 0 1
-net=IO13:1
+net=USART_CTS/SPI_SCK/I2S_CK:1
 }
 C 79900 46000 1 0 0 io-1.sym
 {
 T 80100 46600 5 10 0 0 0 0 1
 device=none
 T 80800 46200 5 10 0 0 0 0 1
-net=IO9:1
+net=SDIO_D1:1
 T 80800 46100 5 10 1 1 0 1 1
 value=SDIO_D1
 }
@@ -1641,7 +1641,7 @@ C 79900 46300 1 0 0 io-1.sym
 T 80100 46900 5 10 0 0 0 0 1
 device=none
 T 80800 46500 5 10 0 0 0 0 1
-net=IO8:1
+net=I2C_SCL/USART_TX:1
 T 80800 46400 5 10 1 1 0 1 1
 value=I2C_SCL/USART_TX
 }
@@ -1650,7 +1650,7 @@ C 73200 45400 1 180 0 io-1.sym
 T 73000 44800 5 10 0 0 180 0 1
 device=none
 T 72300 45200 5 10 0 0 180 0 1
-net=IO11:1
+net=I2C_SDA/USART_RX:1
 T 72300 45300 5 10 1 1 180 1 1
 value=I2C_SDA/USART_RX
 }
@@ -1659,7 +1659,7 @@ C 73200 45100 1 180 0 io-1.sym
 T 73000 44500 5 10 0 0 180 1 1
 device=none
 T 72300 44900 5 10 0 0 180 0 1
-net=IO10:1
+net=SDIO_D0:1
 T 72300 45000 5 10 1 1 180 1 1
 value=SDIO_D0
 }
@@ -2584,99 +2584,99 @@ N 66300 35800 66100 35800 4
 T 62600 35100 8 20 1 0 0 0 1
 ACCESSORIES
 B 62500 33000 7000 2500 8 0 1 0 -1 -1 0 -1 -1 -1 -1 -1
-C 69200 33400 1 0 1 connector4-1.sym
+C 69200 30800 1 0 1 connector4-1.sym
 {
-T 67400 34300 5 10 0 0 0 6 1
+T 67400 31700 5 10 0 0 0 6 1
 device=CONNECTOR_4
-T 69200 34200 5 10 0 1 0 0 1
+T 69200 31600 5 10 0 1 0 0 1
 footprint=JUMPER4
-T 69200 33400 5 10 0 0 0 0 1
+T 69200 30800 5 10 0 0 0 0 1
 category=connector
-T 69200 33400 5 10 0 0 0 0 1
+T 69200 30800 5 10 0 0 0 0 1
 aliexpress-id=32821638049
-T 69200 33400 5 10 0 0 0 0 1
+T 69200 30800 5 10 0 0 0 0 1
 description=1x4 pins header, female, 2.54 mm
-T 69200 33400 5 10 0 0 0 0 1
+T 69200 30800 5 10 0 0 0 0 1
 alternatives=see description
-T 69200 33400 5 10 0 0 0 0 1
+T 69200 30800 5 10 0 0 0 0 1
 note=do not populate for light version
-T 69200 34800 5 10 1 1 0 6 1
+T 69200 32200 5 10 1 1 0 6 1
 refdes=P5
-T 68700 33200 5 10 1 1 0 0 1
+T 68700 30600 5 10 1 1 0 0 1
 value=OLED
 }
-C 67000 34100 1 90 0 resistor-1.sym
+C 67000 31500 1 90 0 resistor-1.sym
 {
-T 66600 34400 5 10 0 0 90 0 1
+T 66600 31800 5 10 0 0 90 0 1
 device=RESISTOR
-T 66900 34600 5 10 0 0 90 0 1
+T 66900 32000 5 10 0 0 90 0 1
 note=I2C pull-up resistor
-T 67000 34100 5 10 0 1 0 0 1
+T 67000 31500 5 10 0 1 0 0 1
 footprint=RESC1608N
-T 67000 34100 5 10 0 1 0 0 1
+T 67000 31500 5 10 0 1 0 0 1
 category=passive
-T 67000 34100 5 10 0 1 0 0 1
+T 67000 31500 5 10 0 1 0 0 1
 digikey-id=311-10.0KHRCT-ND
-T 67000 34100 5 10 0 1 0 0 1
+T 67000 31500 5 10 0 1 0 0 1
 mouser-id=603-RC0603FR-0710KL
-T 67000 34100 5 10 0 1 0 0 1
+T 67000 31500 5 10 0 1 0 0 1
 alternatives==SMD 1608,=10k,>=0.1W,<=1%
-T 67000 34100 5 10 0 1 0 0 1
+T 67000 31500 5 10 0 1 0 0 1
 description=resistor
-T 67100 34900 5 10 1 1 0 0 1
+T 67100 32300 5 10 1 1 0 0 1
 refdes=R31
-T 67100 34700 5 10 1 1 0 0 1
+T 67100 32100 5 10 1 1 0 0 1
 value=10k
 }
-C 67200 34600 1 270 0 gnd-1.sym
-C 66600 34100 1 90 0 resistor-1.sym
+C 67200 32000 1 270 0 gnd-1.sym
+C 66600 31500 1 90 0 resistor-1.sym
 {
-T 66200 34400 5 10 0 0 90 0 1
+T 66200 31800 5 10 0 0 90 0 1
 device=RESISTOR
-T 66500 34600 5 10 0 0 90 0 1
+T 66500 32000 5 10 0 0 90 0 1
 note=I2C pull-up resistor
-T 66600 34100 5 10 0 1 0 0 1
+T 66600 31500 5 10 0 1 0 0 1
 footprint=RESC1608N
-T 66600 34100 5 10 0 1 0 0 1
+T 66600 31500 5 10 0 1 0 0 1
 category=passive
-T 66600 34100 5 10 0 1 0 0 1
+T 66600 31500 5 10 0 1 0 0 1
 digikey-id=311-10.0KHRCT-ND
-T 66600 34100 5 10 0 1 0 0 1
+T 66600 31500 5 10 0 1 0 0 1
 mouser-id=603-RC0603FR-0710KL
-T 66600 34100 5 10 0 1 0 0 1
+T 66600 31500 5 10 0 1 0 0 1
 alternatives==SMD 1608,=10k,>=0.1W,<=1%
-T 66600 34100 5 10 0 1 0 0 1
+T 66600 31500 5 10 0 1 0 0 1
 description=resistor
-T 66000 34900 5 10 1 1 0 0 1
+T 66000 32300 5 10 1 1 0 0 1
 refdes=R30
-T 66000 34700 5 10 1 1 0 0 1
+T 66000 32100 5 10 1 1 0 0 1
 value=10k
 }
-N 66500 33900 67500 33900 4
-N 66500 33600 67500 33600 4
-N 66900 34100 66900 33600 4
-C 66700 35000 1 0 0 3.3V-plus-1.sym
-C 66300 35000 1 0 0 3.3V-plus-1.sym
-C 67500 34000 1 90 0 3.3V-plus-1.sym
-C 66500 33700 1 180 0 io-1.sym
+N 66500 31300 67500 31300 4
+N 66500 31000 67500 31000 4
+N 66900 31500 66900 31000 4
+C 66700 32400 1 0 0 3.3V-plus-1.sym
+C 66300 32400 1 0 0 3.3V-plus-1.sym
+C 67500 31400 1 90 0 3.3V-plus-1.sym
+C 66500 31100 1 180 0 io-1.sym
 {
-T 66300 33100 5 10 0 0 180 0 1
+T 66300 30500 5 10 0 0 180 0 1
 device=none
-T 65600 33500 5 10 0 0 180 0 1
+T 65600 30900 5 10 0 0 180 0 1
 net=OLED_SDA:1
-T 65600 33600 5 10 1 1 0 7 1
+T 65600 31000 5 10 1 1 0 7 1
 value=OLED_SDA
 }
-C 65100 33800 1 0 0 input-2.sym
+C 65100 31200 1 0 0 input-2.sym
 {
-T 65700 34500 5 10 0 0 0 0 1
+T 65700 31900 5 10 0 0 0 0 1
 device=none
-T 65100 34000 5 10 0 0 0 0 1
+T 65100 31400 5 10 0 0 0 0 1
 net=OLED_SCL:1
-T 65600 33900 5 10 1 1 0 7 1
+T 65600 31300 5 10 1 1 0 7 1
 value=OLED_SCL
 }
-N 66500 34100 66500 33900 4
+N 66500 31500 66500 31300 4
 C 64000 34500 1 0 0 include-1.sym
 {
 T 64100 34600 5 10 1 1 0 0 1
@@ -3472,3 +3472,6 @@ alternatives==SMD 1608,=100k,>=0.1W,<=1%
 T 73300 42500 5 10 0 1 180 0 1
 description=resistor
 }
+B 62500 30500 7000 2500 8 0 1 0 -1 -1 0 -1 -1 -1 -1 -1
+T 62600 32600 8 20 1 0 0 0 1
+DISPLAY