diff --git a/ulx3s-cache.lib b/ulx3s-cache.lib
index 33d75f7..f6d6b86 100644
--- a/ulx3s-cache.lib
+++ b/ulx3s-cache.lib
@@ -85,37 +85,6 @@ X Pin_6 6 300 -100 150 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Connector_Generic:Conn_02x04_Counter_Clockwise
-#
-DEF Connector_Generic:Conn_02x04_Counter_Clockwise J 0 40 Y N 1 F N
-F0 "J" 50 200 50 H V C CNN
-F1 "Connector_Generic:Conn_02x04_Counter_Clockwise" 50 -300 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- Connector*:*_2x??_*
-$ENDFPLIST
-DRAW
-S -50 -195 0 -205 1 1 6 N
-S -50 -95 0 -105 1 1 6 N
-S -50 5 0 -5 1 1 6 N
-S -50 105 0 95 1 1 6 N
-S -50 150 150 -250 1 1 10 f
-S 150 -195 100 -205 1 1 6 N
-S 150 -95 100 -105 1 1 6 N
-S 150 5 100 -5 1 1 6 N
-S 150 105 100 95 1 1 6 N
-X Pin_1 1 -200 100 150 R 50 50 1 1 P
-X Pin_2 2 -200 0 150 R 50 50 1 1 P
-X Pin_3 3 -200 -100 150 R 50 50 1 1 P
-X Pin_4 4 -200 -200 150 R 50 50 1 1 P
-X Pin_5 5 300 -200 150 L 50 50 1 1 P
-X Pin_6 6 300 -100 150 L 50 50 1 1 P
-X Pin_7 7 300 0 150 L 50 50 1 1 P
-X Pin_8 8 300 100 150 L 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
 # Connector_Generic:Conn_02x20_Odd_Even
 #
 DEF Connector_Generic:Conn_02x20_Odd_Even J 0 40 Y N 1 F N
@@ -551,58 +520,6 @@ X ~ 2 0 -150 50 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# ESP32:ESP-32S
-#
-DEF ESP32:ESP-32S U 0 40 Y Y 1 F N
-F0 "U" -700 1250 60 H V C CNN
-F1 "ESP32:ESP-32S" 500 1250 60 H V C CNN
-F2 "ESP32-footprints-Lib:ESP-32S" 350 1350 60 H I C CNN
-F3 "" -450 450 60 H I C CNN
-DRAW
-S -750 1200 700 -850 0 1 0 f
-P 12 0 1 35 -500 650 -500 1100 -300 1100 -300 850 -100 850 -100 1100 100 1100 100 850 300 850 300 1100 500 1100 500 850 N
-X GND 1 -950 700 200 R 50 50 1 1 w
-X IO25 10 -950 -200 200 R 50 50 1 1 B
-X IO26 11 -950 -300 200 R 50 50 1 1 B
-X IO27 12 -950 -400 200 R 50 50 1 1 B
-X IO14 13 -950 -500 200 R 50 50 1 1 B
-X IO12 14 -950 -600 200 R 50 50 1 1 B
-X GND 15 -450 -1050 200 U 50 50 1 1 W
-X IO13 16 -350 -1050 200 U 50 50 1 1 B
-X SD2 17 -250 -1050 200 U 50 50 1 1 B
-X SD3 18 -150 -1050 200 U 50 50 1 1 B
-X CMD 19 -50 -1050 200 U 50 50 1 1 B
-X 3V3 2 -950 600 200 R 50 50 1 1 W
-X CLK 20 50 -1050 200 U 50 50 1 1 I
-X SDO 21 150 -1050 200 U 50 50 1 1 B
-X SD1 22 250 -1050 200 U 50 50 1 1 B
-X IO15 23 350 -1050 200 U 50 50 1 1 B
-X IO2 24 450 -1050 200 U 50 50 1 1 B
-X IO0 25 900 -650 200 L 50 50 1 1 B
-X IO4 26 900 -550 200 L 50 50 1 1 I
-X IO16 27 900 -450 200 L 50 50 1 1 B
-X IO17 28 900 -350 200 L 50 50 1 1 B
-X IO5 29 900 -250 200 L 50 50 1 1 B
-X EN 3 -950 500 200 R 50 50 1 1 I
-X IO18 30 900 -150 200 L 50 50 1 1 I
-X IO19 31 900 -50 200 L 50 50 1 1 B
-X NC 32 900 50 200 L 50 50 1 1 N
-X IO21 33 900 150 200 L 50 50 1 1 B
-X RXD0 34 900 250 200 L 50 50 1 1 B
-X TXD0 35 900 350 200 L 50 50 1 1 B
-X IO22 36 900 450 200 L 50 50 1 1 B
-X IO23 37 900 550 200 L 50 50 1 1 B
-X GND 38 900 650 200 L 50 50 1 1 W
-X GND-PAD 39 900 750 200 L 50 50 1 1 W
-X SENSOR_VP 4 -950 400 200 R 50 50 1 1 I
-X SENSOR_VN 5 -950 300 200 R 50 50 1 1 I
-X IO34 6 -950 200 200 R 50 50 1 1 B
-X IO35 7 -950 100 200 R 50 50 1 1 B
-X IO32 8 -950 0 200 R 50 50 1 1 B
-X IO33 9 -950 -100 200 R 50 50 1 1 B
-ENDDRAW
-ENDDEF
-#
 # Memory_EEPROM:25LCxxx
 #
 DEF Memory_EEPROM:25LCxxx U 0 20 Y Y 1 F N
@@ -629,6 +546,41 @@ X VCC 8 0 300 100 D 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
+# Switch:SW_DIP_x04
+#
+DEF Switch:SW_DIP_x04 SW 0 0 Y N 1 F N
+F0 "SW" 0 350 50 H V C CNN
+F1 "Switch:SW_DIP_x04" 0 -250 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ SW?DIP?x4*
+$ENDFPLIST
+DRAW
+C -80 -100 20 0 0 0 N
+C -80 0 20 0 0 0 N
+C -80 100 20 0 0 0 N
+C -80 200 20 0 0 0 N
+C 80 -100 20 0 0 0 N
+C 80 0 20 0 0 0 N
+C 80 100 20 0 0 0 N
+C 80 200 20 0 0 0 N
+S -150 300 150 -200 0 1 10 f
+P 2 0 0 0 -60 -94 93 -53 N
+P 2 0 0 0 -60 5 93 46 N
+P 2 0 0 0 -60 105 93 146 N
+P 2 0 0 0 -60 205 93 246 N
+X ~ 1 -300 200 200 R 50 50 1 1 P
+X ~ 2 -300 100 200 R 50 50 1 1 P
+X ~ 3 -300 0 200 R 50 50 1 1 P
+X ~ 4 -300 -100 200 R 50 50 1 1 P
+X ~ 5 300 -100 200 L 50 50 1 1 P
+X ~ 6 300 0 200 L 50 50 1 1 P
+X ~ 7 300 100 200 L 50 50 1 1 P
+X ~ 8 300 200 200 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
 # Switch:SW_Push
 #
 DEF Switch:SW_Push SW 0 40 N N 1 F N
@@ -689,6 +641,58 @@ X FB 5 600 -100 200 L 50 50 1 1 I
 ENDDRAW
 ENDDEF
 #
+# esp-wroom32:ESP-WROOM32
+#
+DEF esp-wroom32:ESP-WROOM32 U 0 40 Y Y 1 F N
+F0 "U" -700 1250 60 H V C CNN
+F1 "esp-wroom32:ESP-WROOM32" 350 1250 60 H V C CNN
+F2 "ESP32-footprints-Lib:ESP-32S" 350 1350 60 H I C CNN
+F3 "" -450 450 60 H I C CNN
+DRAW
+S -750 1200 700 -850 0 1 0 f
+P 12 0 1 35 -500 650 -500 1100 -300 1100 -300 850 -100 850 -100 1100 100 1100 100 850 300 850 300 1100 500 1100 500 850 N
+X GND 1 -950 700 200 R 50 50 1 1 w
+X IO25 10 -950 -200 200 R 50 50 1 1 B
+X IO26 11 -950 -300 200 R 50 50 1 1 B
+X IO27 12 -950 -400 200 R 50 50 1 1 B
+X IO14 13 -950 -500 200 R 50 50 1 1 B
+X IO12 14 -950 -600 200 R 50 50 1 1 B
+X GND 15 -450 -1050 200 U 50 50 1 1 W
+X IO13 16 -350 -1050 200 U 50 50 1 1 B
+X SD2 17 -250 -1050 200 U 50 50 1 1 B
+X SD3 18 -150 -1050 200 U 50 50 1 1 B
+X CMD 19 -50 -1050 200 U 50 50 1 1 B
+X 3V3 2 -950 600 200 R 50 50 1 1 W
+X CLK 20 50 -1050 200 U 50 50 1 1 I
+X SDO 21 150 -1050 200 U 50 50 1 1 B
+X SD1 22 250 -1050 200 U 50 50 1 1 B
+X IO15 23 350 -1050 200 U 50 50 1 1 B
+X IO2 24 450 -1050 200 U 50 50 1 1 B
+X IO0 25 900 -650 200 L 50 50 1 1 B
+X IO4 26 900 -550 200 L 50 50 1 1 I
+X IO16 27 900 -450 200 L 50 50 1 1 B
+X IO17 28 900 -350 200 L 50 50 1 1 B
+X IO5 29 900 -250 200 L 50 50 1 1 B
+X EN 3 -950 500 200 R 50 50 1 1 I
+X IO18 30 900 -150 200 L 50 50 1 1 I
+X IO19 31 900 -50 200 L 50 50 1 1 B
+X NC 32 900 50 200 L 50 50 1 1 N
+X IO21 33 900 150 200 L 50 50 1 1 B
+X RXD0 34 900 250 200 L 50 50 1 1 B
+X TXD0 35 900 350 200 L 50 50 1 1 B
+X IO22 36 900 450 200 L 50 50 1 1 B
+X IO23 37 900 550 200 L 50 50 1 1 B
+X GND 38 900 650 200 L 50 50 1 1 W
+X GND-PAD 39 900 750 200 L 50 50 1 1 W
+X SENSOR_VP 4 -950 400 200 R 50 50 1 1 I
+X SENSOR_VN 5 -950 300 200 R 50 50 1 1 I
+X IO34 6 -950 200 200 R 50 50 1 1 B
+X IO35 7 -950 100 200 R 50 50 1 1 B
+X IO32 8 -950 0 200 R 50 50 1 1 B
+X IO33 9 -950 -100 200 R 50 50 1 1 B
+ENDDRAW
+ENDDEF
+#
 # ftdi:FT231XS
 #
 DEF ftdi:FT231XS U 0 40 Y Y 1 F N
@@ -1516,11 +1520,11 @@ X CS 7 300 0 150 D 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# usb_otg:USB_OTG1
+# usb_otg:USB_OTG
 #
-DEF usb_otg:USB_OTG1 P 0 40 Y Y 1 F N
+DEF usb_otg:USB_OTG P 0 40 Y Y 1 F N
 F0 "P" 325 -125 50 H V C CNN
-F1 "usb_otg:USB_OTG1" 0 200 50 H V C CNN
+F1 "usb_otg:USB_OTG" 0 200 50 H V C CNN
 F2 "" -50 -100 50 V V C CNN
 F3 "" -50 -100 50 V V C CNN
 $FPLIST