diff --git a/Audio.kicad_sch b/Audio.kicad_sch
index d26d47d..3032755 100644
--- a/Audio.kicad_sch
+++ b/Audio.kicad_sch
@@ -1,4 +1,6 @@
-(kicad_sch (version 20210126) (generator eeschema)
+(kicad_sch (version 20210406) (generator eeschema)
+
+  (uuid 85563a97-e861-4c7a-89d2-5e961d5501be)
 
   (paper "A4")
 
@@ -1050,26 +1052,14 @@
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 1d6b3e50-22ee-4fae-a423-22a48acec3fc)
   )
-  (bus (pts (xy 82.55 78.105) (xy 82.55 80.645))
-    (stroke (width 0) (type solid) (color 0 0 0 0))
-    (uuid 0bbed022-8c76-4855-8fc6-b6d325e90852)
-  )
-  (bus (pts (xy 82.55 80.645) (xy 82.55 83.185))
-    (stroke (width 0) (type solid) (color 0 0 0 0))
-    (uuid 5ca3a73f-058e-4153-8efe-c08ab8f7e378)
-  )
-  (bus (pts (xy 82.55 83.185) (xy 82.55 85.725))
+  (bus (pts (xy 82.55 78.105) (xy 82.55 85.725))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 19e07165-86dd-4044-a532-028b87879a55)
   )
-  (bus (pts (xy 85.09 95.885) (xy 85.09 98.425))
+  (bus (pts (xy 85.09 95.885) (xy 85.09 100.965))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid f86ac73d-ad4a-4fdb-a09f-c8dc9db71226)
   )
-  (bus (pts (xy 85.09 98.425) (xy 85.09 100.965))
-    (stroke (width 0) (type solid) (color 0 0 0 0))
-    (uuid 2bb44a4d-f337-4b8e-878d-3a7d6b8b1173)
-  )
 
   (text "I2C address 0x4c" (at 64.77 93.345 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
diff --git a/CM4.kicad_sch b/CM4.kicad_sch
index bee67d6..5bfa3ff 100644
--- a/CM4.kicad_sch
+++ b/CM4.kicad_sch
@@ -2360,10 +2360,10 @@
     )
   )
 
-  (bus_alias "PCIe" (members "~RST" "~CLKREQ" "CLK+" "CLK-" "TX+" "TX-" "RX+" "RX-"))
-  (bus_alias "SD" (members "D[0..3]" "CMD" "CLK" "PWR" "DET"))
-  (bus_alias "HDMI" (members "D0+" "D0-" "D1+" "D1-" "D2+" "D2-" "CLK+" "CLK-" "CEC" "HPD" "SDA" "SCL"))
   (bus_alias "UART" (members "TXD" "RXD" "CTS" "RTS"))
+  (bus_alias "HDMI" (members "D0+" "D0-" "D1+" "D1-" "D2+" "D2-" "CLK+" "CLK-" "CEC" "HPD" "SDA" "SCL"))
+  (bus_alias "SD" (members "D[0..3]" "CMD" "CLK" "PWR" "DET"))
+  (bus_alias "PCIe" (members "~RST" "~CLKREQ" "CLK+" "CLK-" "TX+" "TX-" "RX+" "RX-"))
   (junction (at 59.055 173.99) (diameter 0.9144) (color 0 0 0 0))
   (junction (at 121.92 171.45) (diameter 0.9144) (color 0 0 0 0))
   (junction (at 260.35 90.17) (diameter 1.016) (color 0 0 0 0))
@@ -4037,9 +4037,9 @@
   (symbol (lib_id "Device:R_Small") (at 116.205 171.45 90) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 8d97beb3-8be8-49e5-b2aa-8b3cd309e7e0)
-    (property "Reference" "R?" (id 0) (at 116.205 167.005 90))
+    (property "Reference" "R22" (id 0) (at 116.205 167.005 90))
     (property "Value" "220R" (id 1) (at 116.205 168.91 90))
-    (property "Footprint" "" (id 2) (at 116.205 171.45 0)
+    (property "Footprint" "Resistor_SMD:R_0402_1005Metric" (id 2) (at 116.205 171.45 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 116.205 171.45 0)
@@ -4074,13 +4074,13 @@
   (symbol (lib_id "Connector_Generic:Conn_01x02") (at 133.985 157.48 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid e968abf9-4624-4f9a-a426-43f6f969f7bc)
-    (property "Reference" "J?" (id 0) (at 137.16 155.5749 0)
+    (property "Reference" "J13" (id 0) (at 137.16 155.5749 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "Conn_01x02" (id 1) (at 137.16 158.1149 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 133.985 157.48 0)
+    (property "Footprint" "Connector_PinHeader_2.54mm:PinHeader_1x02_P2.54mm_Vertical" (id 2) (at 133.985 157.48 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 133.985 157.48 0)
@@ -4093,13 +4093,13 @@
   (symbol (lib_id "Connector_Generic:Conn_01x02") (at 133.985 171.45 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 65722b3e-bd11-4d53-9b38-148a204070a3)
-    (property "Reference" "J?" (id 0) (at 137.16 169.5449 0)
+    (property "Reference" "J14" (id 0) (at 137.16 169.5449 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "Conn_01x02" (id 1) (at 137.16 172.0849 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 133.985 171.45 0)
+    (property "Footprint" "Connector_PinHeader_2.54mm:PinHeader_1x02_P2.54mm_Vertical" (id 2) (at 133.985 171.45 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 133.985 171.45 0)
@@ -4113,13 +4113,13 @@
   (symbol (lib_id "Connector_Generic:Conn_01x02") (at 133.985 182.88 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 7bfd1035-1969-40a2-b79e-5a744cd6676d)
-    (property "Reference" "J?" (id 0) (at 137.16 181.6099 0)
+    (property "Reference" "J15" (id 0) (at 137.16 181.6099 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "Conn_01x02" (id 1) (at 137.16 184.1499 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 133.985 182.88 0)
+    (property "Footprint" "Connector_PinHeader_2.54mm:PinHeader_1x02_P2.54mm_Vertical" (id 2) (at 133.985 182.88 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 133.985 182.88 0)
diff --git a/ControlRTC.kicad_sch b/ControlRTC.kicad_sch
index fce1b46..9422039 100644
--- a/ControlRTC.kicad_sch
+++ b/ControlRTC.kicad_sch
@@ -2435,7 +2435,7 @@
   (symbol (lib_id "Device:R_Small") (at 50.165 40.005 180) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid af62978b-97d7-43bc-a5b3-c7284a15d33a)
-    (property "Reference" "R?" (id 0) (at 48.895 38.735 0)
+    (property "Reference" "R32" (id 0) (at 48.895 38.735 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "10k" (id 1) (at 48.895 40.64 0)
@@ -2831,9 +2831,9 @@
   (symbol (lib_id "74xGxx:74LVC1G07") (at 56.515 154.305 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 96d60aa0-05d2-45af-a78f-a4fdc3a8a4a1)
-    (property "Reference" "U?" (id 0) (at 59.69 156.845 0))
+    (property "Reference" "U16" (id 0) (at 59.69 156.845 0))
     (property "Value" "74LVC1G07" (id 1) (at 63.5 159.385 0))
-    (property "Footprint" "" (id 2) (at 56.515 154.305 0)
+    (property "Footprint" "Package_TO_SOT_SMD:SOT-353_SC-70-5" (id 2) (at 56.515 154.305 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf" (id 3) (at 56.515 154.305 0)
@@ -2855,9 +2855,9 @@
   (symbol (lib_id "74xGxx:74LVC1G07") (at 59.69 99.695 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 261e7c7e-5064-453e-8af7-7583d100a768)
-    (property "Reference" "U?" (id 0) (at 62.865 102.235 0))
+    (property "Reference" "U24" (id 0) (at 62.865 102.235 0))
     (property "Value" "74LVC1G07" (id 1) (at 66.675 104.775 0))
-    (property "Footprint" "" (id 2) (at 59.69 99.695 0)
+    (property "Footprint" "Package_TO_SOT_SMD:SOT-353_SC-70-5" (id 2) (at 59.69 99.695 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf" (id 3) (at 59.69 99.695 0)
diff --git a/Ethernet.kicad_sch b/Ethernet.kicad_sch
index 40935f3..7d97376 100644
--- a/Ethernet.kicad_sch
+++ b/Ethernet.kicad_sch
@@ -1,4 +1,6 @@
-(kicad_sch (version 20210126) (generator eeschema)
+(kicad_sch (version 20210406) (generator eeschema)
+
+  (uuid 7e5ed504-339d-4299-b167-faac5bf1f64d)
 
   (paper "A4")
 
@@ -131,6 +133,9 @@
         (rectangle (start 7.366 -28.194) (end 7.874 -29.718)
           (stroke (width 0.0006)) (fill (type none))
         )
+        (rectangle (start 8.636 32.258) (end 18.034 24.638)
+          (stroke (width 0.0006)) (fill (type none))
+        )
         (rectangle (start 9.906 -28.194) (end 10.414 -29.718)
           (stroke (width 0.0006)) (fill (type none))
         )
@@ -149,7 +154,11 @@
         (rectangle (start 12.446 26.67) (end 14.224 25.908)
           (stroke (width 0.0006)) (fill (type outline))
         )
-        (rectangle (start 8.636 32.258) (end 18.034 24.638)
+        (polyline
+          (pts
+            (xy 7.62 -31.242)
+            (xy 15.24 -31.242)
+          )
           (stroke (width 0.0006)) (fill (type none))
         )
         (polyline
@@ -161,15 +170,8 @@
         )
         (polyline
           (pts
-            (xy 7.62 -31.242)
-            (xy 15.24 -31.242)
-          )
-          (stroke (width 0.0006)) (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 11.43 -32.512)
-            (xy 11.43 -31.242)
+            (xy 7.62 -26.67)
+            (xy 7.62 -28.194)
           )
           (stroke (width 0.0006)) (fill (type none))
         )
@@ -180,6 +182,27 @@
           )
           (stroke (width 0.0006)) (fill (type none))
         )
+        (polyline
+          (pts
+            (xy 10.16 -26.67)
+            (xy 10.16 -28.194)
+          )
+          (stroke (width 0.0006)) (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy 11.43 -34.29)
+            (xy 11.43 -32.766)
+          )
+          (stroke (width 0.0006)) (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy 11.43 -32.512)
+            (xy 11.43 -31.242)
+          )
+          (stroke (width 0.0006)) (fill (type none))
+        )
         (polyline
           (pts
             (xy 12.7 -29.718)
@@ -187,6 +210,13 @@
           )
           (stroke (width 0.0006)) (fill (type none))
         )
+        (polyline
+          (pts
+            (xy 12.7 -26.67)
+            (xy 12.7 -28.194)
+          )
+          (stroke (width 0.0006)) (fill (type none))
+        )
         (polyline
           (pts
             (xy 15.24 -29.718)
@@ -201,34 +231,6 @@
           )
           (stroke (width 0.0006)) (fill (type none))
         )
-        (polyline
-          (pts
-            (xy 10.16 -26.67)
-            (xy 10.16 -28.194)
-          )
-          (stroke (width 0.0006)) (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 12.7 -26.67)
-            (xy 12.7 -28.194)
-          )
-          (stroke (width 0.0006)) (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 7.62 -26.67)
-            (xy 7.62 -28.194)
-          )
-          (stroke (width 0.0006)) (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 11.43 -34.29)
-            (xy 11.43 -32.766)
-          )
-          (stroke (width 0.0006)) (fill (type none))
-        )
       )
       (symbol "RJ45_LINK-PP_LPJG0926HENL_Horizontal_0_1"
         (arc (start -8.89 -12.065) (end -8.89 -11.43) (radius (at -8.89 -11.7602) (length 0.3048) (angles -89.9 89.9))
@@ -495,6 +497,18 @@
         (arc (start 1.27 24.765) (end 1.27 24.13) (radius (at 1.27 24.4348) (length 0.3048) (angles 90.1 -90.1))
           (stroke (width 0)) (fill (type none))
         )
+        (circle (center 6.096 -12.7) (radius 0.508) (stroke (width 0)) (fill (type none)))
+        (circle (center 6.096 -7.62) (radius 0.508) (stroke (width 0)) (fill (type none)))
+        (circle (center 6.096 -3.81) (radius 0.508) (stroke (width 0)) (fill (type none)))
+        (circle (center 6.096 1.27) (radius 0.508) (stroke (width 0)) (fill (type none)))
+        (circle (center 6.096 11.43) (radius 0.508) (stroke (width 0)) (fill (type none)))
+        (circle (center 6.096 16.51) (radius 0.508) (stroke (width 0)) (fill (type none)))
+        (circle (center 6.096 20.32) (radius 0.508) (stroke (width 0)) (fill (type none)))
+        (circle (center 6.096 25.4) (radius 0.508) (stroke (width 0)) (fill (type none)))
+        (circle (center -11.43 -1.27) (radius 0.254) (stroke (width 0)) (fill (type outline)))
+        (circle (center -11.43 5.08) (radius 0.254) (stroke (width 0)) (fill (type outline)))
+        (circle (center -11.43 7.62) (radius 0.254) (stroke (width 0)) (fill (type outline)))
+        (circle (center -11.43 13.97) (radius 0.254) (stroke (width 0)) (fill (type outline)))
         (circle (center -9.144 -11.049) (radius 0.127) (stroke (width 0)) (fill (type outline)))
         (circle (center -9.144 -8.509) (radius 0.127) (stroke (width 0)) (fill (type outline)))
         (circle (center -9.144 -2.159) (radius 0.127) (stroke (width 0)) (fill (type outline)))
@@ -539,36 +553,45 @@
         (circle (center 1.524 15.621) (radius 0.127) (stroke (width 0)) (fill (type outline)))
         (circle (center 1.524 21.971) (radius 0.127) (stroke (width 0)) (fill (type outline)))
         (circle (center 1.524 24.511) (radius 0.127) (stroke (width 0)) (fill (type outline)))
-        (circle (center 6.096 -12.7) (radius 0.508) (stroke (width 0)) (fill (type none)))
-        (circle (center 6.096 -7.62) (radius 0.508) (stroke (width 0)) (fill (type none)))
-        (circle (center 6.096 -3.81) (radius 0.508) (stroke (width 0)) (fill (type none)))
-        (circle (center 6.096 1.27) (radius 0.508) (stroke (width 0)) (fill (type none)))
-        (circle (center 6.096 11.43) (radius 0.508) (stroke (width 0)) (fill (type none)))
-        (circle (center 6.096 16.51) (radius 0.508) (stroke (width 0)) (fill (type none)))
-        (circle (center 6.096 20.32) (radius 0.508) (stroke (width 0)) (fill (type none)))
-        (circle (center 6.096 25.4) (radius 0.508) (stroke (width 0)) (fill (type none)))
         (circle (center 7.62 -25.4) (radius 0.254) (stroke (width 0)) (fill (type outline)))
         (circle (center 10.16 -22.86) (radius 0.254) (stroke (width 0)) (fill (type outline)))
         (circle (center 12.7 -20.32) (radius 0.254) (stroke (width 0)) (fill (type outline)))
         (circle (center 15.24 -17.78) (radius 0.254) (stroke (width 0)) (fill (type outline)))
-        (circle (center -11.43 -1.27) (radius 0.254) (stroke (width 0)) (fill (type outline)))
-        (circle (center -11.43 13.97) (radius 0.254) (stroke (width 0)) (fill (type outline)))
-        (circle (center -11.43 7.62) (radius 0.254) (stroke (width 0)) (fill (type outline)))
-        (circle (center -11.43 5.08) (radius 0.254) (stroke (width 0)) (fill (type outline)))
         (rectangle (start -20.32 36.83) (end 20.32 -36.83)
           (stroke (width 0.254)) (fill (type background))
         )
         (polyline
           (pts
-            (xy -12.7 -12.7)
-            (xy -8.89 -12.7)
+            (xy -15.24 -25.4)
+            (xy 7.62 -25.4)
           )
           (stroke (width 0)) (fill (type none))
         )
         (polyline
           (pts
-            (xy -12.7 5.08)
-            (xy -11.43 5.08)
+            (xy -15.24 -22.86)
+            (xy 10.16 -22.86)
+          )
+          (stroke (width 0)) (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy -15.24 -20.32)
+            (xy 12.7 -20.32)
+          )
+          (stroke (width 0)) (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy -15.24 -17.78)
+            (xy 15.24 -17.78)
+          )
+          (stroke (width 0)) (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy -12.7 -12.7)
+            (xy -8.89 -12.7)
           )
           (stroke (width 0)) (fill (type none))
         )
@@ -588,15 +611,22 @@
         )
         (polyline
           (pts
-            (xy -12.7 7.62)
-            (xy -11.43 7.62)
+            (xy -12.7 1.27)
+            (xy -8.89 1.27)
           )
           (stroke (width 0)) (fill (type none))
         )
         (polyline
           (pts
-            (xy -12.7 1.27)
-            (xy -8.89 1.27)
+            (xy -12.7 5.08)
+            (xy -11.43 5.08)
+          )
+          (stroke (width 0)) (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy -12.7 7.62)
+            (xy -11.43 7.62)
           )
           (stroke (width 0)) (fill (type none))
         )
@@ -628,6 +658,13 @@
           )
           (stroke (width 0)) (fill (type none))
         )
+        (polyline
+          (pts
+            (xy -11.43 -10.16)
+            (xy -11.43 22.86)
+          )
+          (stroke (width 0)) (fill (type none))
+        )
         (polyline
           (pts
             (xy -11.43 -10.16)
@@ -1020,13 +1057,6 @@
           )
           (stroke (width 0)) (fill (type none))
         )
-        (polyline
-          (pts
-            (xy 8.382 -26.416)
-            (xy 6.858 -26.416)
-          )
-          (stroke (width 0)) (fill (type none))
-        )
         (polyline
           (pts
             (xy 2.54 -12.7)
@@ -1048,6 +1078,13 @@
           )
           (stroke (width 0)) (fill (type none))
         )
+        (polyline
+          (pts
+            (xy 2.54 -10.16)
+            (xy 7.62 -10.16)
+          )
+          (stroke (width 0)) (fill (type none))
+        )
         (polyline
           (pts
             (xy 2.54 -7.62)
@@ -1083,6 +1120,13 @@
           )
           (stroke (width 0)) (fill (type none))
         )
+        (polyline
+          (pts
+            (xy 2.54 -1.27)
+            (xy 10.16 -1.27)
+          )
+          (stroke (width 0)) (fill (type none))
+        )
         (polyline
           (pts
             (xy 2.54 1.27)
@@ -1118,6 +1162,13 @@
           )
           (stroke (width 0)) (fill (type none))
         )
+        (polyline
+          (pts
+            (xy 2.54 13.97)
+            (xy 12.7 13.97)
+          )
+          (stroke (width 0)) (fill (type none))
+        )
         (polyline
           (pts
             (xy 2.54 16.51)
@@ -1167,27 +1218,6 @@
           )
           (stroke (width 0)) (fill (type none))
         )
-        (polyline
-          (pts
-            (xy 2.54 -10.16)
-            (xy 7.62 -10.16)
-          )
-          (stroke (width 0)) (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 2.54 -1.27)
-            (xy 10.16 -1.27)
-          )
-          (stroke (width 0)) (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 2.54 13.97)
-            (xy 12.7 13.97)
-          )
-          (stroke (width 0)) (fill (type none))
-        )
         (polyline
           (pts
             (xy 7.62 -26.416)
@@ -1195,6 +1225,83 @@
           )
           (stroke (width 0)) (fill (type none))
         )
+        (polyline
+          (pts
+            (xy 8.382 -26.67)
+            (xy 6.858 -26.67)
+          )
+          (stroke (width 0)) (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy 8.382 -26.416)
+            (xy 6.858 -26.416)
+          )
+          (stroke (width 0)) (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy 10.16 -26.416)
+            (xy 10.16 -1.27)
+          )
+          (stroke (width 0)) (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy 10.922 -26.67)
+            (xy 9.398 -26.67)
+          )
+          (stroke (width 0)) (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy 10.922 -26.416)
+            (xy 9.398 -26.416)
+          )
+          (stroke (width 0)) (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy 12.192 -32.766)
+            (xy 10.668 -32.766)
+          )
+          (stroke (width 0)) (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy 12.192 -32.512)
+            (xy 10.668 -32.512)
+          )
+          (stroke (width 0)) (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy 12.7 -26.416)
+            (xy 12.7 13.97)
+          )
+          (stroke (width 0)) (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy 13.462 -26.67)
+            (xy 11.938 -26.67)
+          )
+          (stroke (width 0)) (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy 13.462 -26.416)
+            (xy 11.938 -26.416)
+          )
+          (stroke (width 0)) (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy 15.24 -26.416)
+            (xy 15.24 22.86)
+          )
+          (stroke (width 0)) (fill (type none))
+        )
         (polyline
           (pts
             (xy 15.24 22.86)
@@ -1202,6 +1309,20 @@
           )
           (stroke (width 0)) (fill (type none))
         )
+        (polyline
+          (pts
+            (xy 16.002 -26.67)
+            (xy 14.478 -26.67)
+          )
+          (stroke (width 0)) (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy 16.002 -26.416)
+            (xy 14.478 -26.416)
+          )
+          (stroke (width 0)) (fill (type none))
+        )
         (polyline
           (pts
             (xy -6.985 -12.065)
@@ -1470,125 +1591,6 @@
           )
           (stroke (width 0)) (fill (type none))
         )
-        (polyline
-          (pts
-            (xy 8.382 -26.67)
-            (xy 6.858 -26.67)
-          )
-          (stroke (width 0)) (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 10.16 -26.416)
-            (xy 10.16 -1.27)
-          )
-          (stroke (width 0)) (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 12.7 -26.416)
-            (xy 12.7 13.97)
-          )
-          (stroke (width 0)) (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 15.24 -26.416)
-            (xy 15.24 22.86)
-          )
-          (stroke (width 0)) (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 10.922 -26.416)
-            (xy 9.398 -26.416)
-          )
-          (stroke (width 0)) (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 10.922 -26.67)
-            (xy 9.398 -26.67)
-          )
-          (stroke (width 0)) (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 13.462 -26.416)
-            (xy 11.938 -26.416)
-          )
-          (stroke (width 0)) (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 13.462 -26.67)
-            (xy 11.938 -26.67)
-          )
-          (stroke (width 0)) (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 16.002 -26.416)
-            (xy 14.478 -26.416)
-          )
-          (stroke (width 0)) (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 16.002 -26.67)
-            (xy 14.478 -26.67)
-          )
-          (stroke (width 0)) (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy -15.24 -17.78)
-            (xy 15.24 -17.78)
-          )
-          (stroke (width 0)) (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy -15.24 -20.32)
-            (xy 12.7 -20.32)
-          )
-          (stroke (width 0)) (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy -15.24 -22.86)
-            (xy 10.16 -22.86)
-          )
-          (stroke (width 0)) (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy -15.24 -25.4)
-            (xy 7.62 -25.4)
-          )
-          (stroke (width 0)) (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 12.192 -32.766)
-            (xy 10.668 -32.766)
-          )
-          (stroke (width 0)) (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 12.192 -32.512)
-            (xy 10.668 -32.512)
-          )
-          (stroke (width 0)) (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy -11.43 -10.16)
-            (xy -11.43 22.86)
-          )
-          (stroke (width 0)) (fill (type none))
-        )
       )
       (symbol "RJ45_LINK-PP_LPJG0926HENL_Horizontal_1_1"
         (polyline
@@ -1739,66 +1741,14 @@
           )
           (stroke (width 0)) (fill (type none))
         )
-        (pin passive line (at -22.86 7.62 0) (length 2.54)
-          (name "CT1" (effects (font (size 1.27 1.27))))
-          (number "4" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at -22.86 20.32 0) (length 2.54)
-          (name "TD1-" (effects (font (size 1.27 1.27))))
-          (number "2" (effects (font (size 1.27 1.27))))
-        )
         (pin passive line (at -22.86 25.4 0) (length 2.54)
           (name "TD1+" (effects (font (size 1.27 1.27))))
           (number "1" (effects (font (size 1.27 1.27))))
         )
-        (pin passive line (at -22.86 -33.02 0) (length 2.54)
-          (name "LED2-" (effects (font (size 1.27 1.27))))
-          (number "18" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at -22.86 -30.48 0) (length 2.54)
-          (name "LED2+" (effects (font (size 1.27 1.27))))
-          (number "17" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at -22.86 30.48 0) (length 2.54)
-          (name "LED1-" (effects (font (size 1.27 1.27))))
-          (number "16" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at -22.86 33.02 0) (length 2.54)
-          (name "LED1+" (effects (font (size 1.27 1.27))))
-          (number "15" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at -22.86 -3.81 0) (length 2.54)
-          (name "TD3-" (effects (font (size 1.27 1.27))))
-          (number "8" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at -22.86 1.27 0) (length 2.54)
-          (name "TD3+" (effects (font (size 1.27 1.27))))
-          (number "7" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at -22.86 16.51 0) (length 2.54)
-          (name "TD2+" (effects (font (size 1.27 1.27))))
-          (number "3" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at -22.86 11.43 0) (length 2.54)
-          (name "TD2-" (effects (font (size 1.27 1.27))))
-          (number "6" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at -22.86 5.08 0) (length 2.54)
-          (name "CT2" (effects (font (size 1.27 1.27))))
-          (number "5" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at -22.86 -7.62 0) (length 2.54)
-          (name "TD4+" (effects (font (size 1.27 1.27))))
-          (number "9" (effects (font (size 1.27 1.27))))
-        )
         (pin passive line (at -22.86 -12.7 0) (length 2.54)
           (name "TD4-" (effects (font (size 1.27 1.27))))
           (number "10" (effects (font (size 1.27 1.27))))
         )
-        (pin passive line (at 0 -39.37 90) (length 2.54)
-          (name "~" (effects (font (size 1.27 1.27))))
-          (number "SH" (effects (font (size 1.27 1.27))))
-        )
         (pin passive line (at -22.86 -17.78 0) (length 2.54)
           (name "VC1" (effects (font (size 1.27 1.27))))
           (number "11" (effects (font (size 1.27 1.27))))
@@ -1815,6 +1765,58 @@
           (name "VC4" (effects (font (size 1.27 1.27))))
           (number "14" (effects (font (size 1.27 1.27))))
         )
+        (pin passive line (at -22.86 33.02 0) (length 2.54)
+          (name "LED1+" (effects (font (size 1.27 1.27))))
+          (number "15" (effects (font (size 1.27 1.27))))
+        )
+        (pin passive line (at -22.86 30.48 0) (length 2.54)
+          (name "LED1-" (effects (font (size 1.27 1.27))))
+          (number "16" (effects (font (size 1.27 1.27))))
+        )
+        (pin passive line (at -22.86 -30.48 0) (length 2.54)
+          (name "LED2+" (effects (font (size 1.27 1.27))))
+          (number "17" (effects (font (size 1.27 1.27))))
+        )
+        (pin passive line (at -22.86 -33.02 0) (length 2.54)
+          (name "LED2-" (effects (font (size 1.27 1.27))))
+          (number "18" (effects (font (size 1.27 1.27))))
+        )
+        (pin passive line (at -22.86 20.32 0) (length 2.54)
+          (name "TD1-" (effects (font (size 1.27 1.27))))
+          (number "2" (effects (font (size 1.27 1.27))))
+        )
+        (pin passive line (at -22.86 16.51 0) (length 2.54)
+          (name "TD2+" (effects (font (size 1.27 1.27))))
+          (number "3" (effects (font (size 1.27 1.27))))
+        )
+        (pin passive line (at -22.86 7.62 0) (length 2.54)
+          (name "CT1" (effects (font (size 1.27 1.27))))
+          (number "4" (effects (font (size 1.27 1.27))))
+        )
+        (pin passive line (at -22.86 5.08 0) (length 2.54)
+          (name "CT2" (effects (font (size 1.27 1.27))))
+          (number "5" (effects (font (size 1.27 1.27))))
+        )
+        (pin passive line (at -22.86 11.43 0) (length 2.54)
+          (name "TD2-" (effects (font (size 1.27 1.27))))
+          (number "6" (effects (font (size 1.27 1.27))))
+        )
+        (pin passive line (at -22.86 1.27 0) (length 2.54)
+          (name "TD3+" (effects (font (size 1.27 1.27))))
+          (number "7" (effects (font (size 1.27 1.27))))
+        )
+        (pin passive line (at -22.86 -3.81 0) (length 2.54)
+          (name "TD3-" (effects (font (size 1.27 1.27))))
+          (number "8" (effects (font (size 1.27 1.27))))
+        )
+        (pin passive line (at -22.86 -7.62 0) (length 2.54)
+          (name "TD4+" (effects (font (size 1.27 1.27))))
+          (number "9" (effects (font (size 1.27 1.27))))
+        )
+        (pin passive line (at 0 -39.37 90) (length 2.54)
+          (name "~" (effects (font (size 1.27 1.27))))
+          (number "SH" (effects (font (size 1.27 1.27))))
+        )
       )
     )
     (symbol "LightBlue:TPD4EUSB30" (pin_names (offset 0)) (in_bom yes) (on_board yes)
@@ -2078,6 +2080,10 @@
           (name "D1+" (effects (font (size 1.27 1.27))))
           (number "1" (effects (font (size 1.27 1.27))))
         )
+        (pin passive line (at -12.7 2.54 0) (length 5.08) hide
+          (name "D1+" (effects (font (size 1.27 1.27))))
+          (number "10" (effects (font (size 1.27 1.27))))
+        )
         (pin passive line (at -12.7 -2.54 0) (length 5.08)
           (name "D1-" (effects (font (size 1.27 1.27))))
           (number "2" (effects (font (size 1.27 1.27))))
@@ -2094,21 +2100,17 @@
           (name "D2-" (effects (font (size 1.27 1.27))))
           (number "5" (effects (font (size 1.27 1.27))))
         )
-        (pin passive line (at 0 -12.7 90) (length 5.08) hide
-          (name "GND" (effects (font (size 1.27 1.27))))
-          (number "8" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at -12.7 2.54 0) (length 5.08) hide
-          (name "D1+" (effects (font (size 1.27 1.27))))
-          (number "10" (effects (font (size 1.27 1.27))))
+        (pin passive line (at 12.7 -2.54 180) (length 5.08) hide
+          (name "D2-" (effects (font (size 1.27 1.27))))
+          (number "6" (effects (font (size 1.27 1.27))))
         )
         (pin passive line (at 12.7 2.54 180) (length 5.08) hide
           (name "D2+" (effects (font (size 1.27 1.27))))
           (number "7" (effects (font (size 1.27 1.27))))
         )
-        (pin passive line (at 12.7 -2.54 180) (length 5.08) hide
-          (name "D2-" (effects (font (size 1.27 1.27))))
-          (number "6" (effects (font (size 1.27 1.27))))
+        (pin passive line (at 0 -12.7 90) (length 5.08) hide
+          (name "GND" (effects (font (size 1.27 1.27))))
+          (number "8" (effects (font (size 1.27 1.27))))
         )
         (pin passive line (at -12.7 -2.54 0) (length 5.08) hide
           (name "D1-" (effects (font (size 1.27 1.27))))
@@ -2377,6 +2379,10 @@
           (name "D1+" (effects (font (size 1.27 1.27))))
           (number "1" (effects (font (size 1.27 1.27))))
         )
+        (pin passive line (at -12.7 2.54 0) (length 5.08) hide
+          (name "D1+" (effects (font (size 1.27 1.27))))
+          (number "10" (effects (font (size 1.27 1.27))))
+        )
         (pin passive line (at -12.7 -2.54 0) (length 5.08)
           (name "D1-" (effects (font (size 1.27 1.27))))
           (number "2" (effects (font (size 1.27 1.27))))
@@ -2393,21 +2399,17 @@
           (name "D2-" (effects (font (size 1.27 1.27))))
           (number "5" (effects (font (size 1.27 1.27))))
         )
-        (pin passive line (at 0 -12.7 90) (length 5.08) hide
-          (name "GND" (effects (font (size 1.27 1.27))))
-          (number "8" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at -12.7 2.54 0) (length 5.08) hide
-          (name "D1+" (effects (font (size 1.27 1.27))))
-          (number "10" (effects (font (size 1.27 1.27))))
+        (pin passive line (at 12.7 -2.54 180) (length 5.08) hide
+          (name "D2-" (effects (font (size 1.27 1.27))))
+          (number "6" (effects (font (size 1.27 1.27))))
         )
         (pin passive line (at 12.7 2.54 180) (length 5.08) hide
           (name "D2+" (effects (font (size 1.27 1.27))))
           (number "7" (effects (font (size 1.27 1.27))))
         )
-        (pin passive line (at 12.7 -2.54 180) (length 5.08) hide
-          (name "D2-" (effects (font (size 1.27 1.27))))
-          (number "6" (effects (font (size 1.27 1.27))))
+        (pin passive line (at 0 -12.7 90) (length 5.08) hide
+          (name "GND" (effects (font (size 1.27 1.27))))
+          (number "8" (effects (font (size 1.27 1.27))))
         )
         (pin passive line (at -12.7 -2.54 0) (length 5.08) hide
           (name "D1-" (effects (font (size 1.27 1.27))))
@@ -2505,8 +2507,8 @@
     )
   )
 
-  (bus_alias "ETH" (members "TD1+" "TD1-" "TD2+" "TD2-" "TD3+" "TD3-" "TD4+" "TD4-" "LED_YELLOW" "LED_GREEN"))
   (bus_alias "PoE" (members "VC1" "VC2" "VC3" "VC4"))
+  (bus_alias "ETH" (members "TD1+" "TD1-" "TD2+" "TD2-" "TD3+" "TD3-" "TD4+" "TD4-" "LED_YELLOW" "LED_GREEN"))
   (junction (at 153.67 80.01) (diameter 0.9144) (color 0 0 0 0))
   (junction (at 177.8 130.81) (diameter 0.9144) (color 0 0 0 0))
   (junction (at 179.07 139.7) (diameter 0.9144) (color 0 0 0 0))
@@ -2760,58 +2762,18 @@
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid c6bddc02-9de7-471b-8ad9-fd5de9453fc6)
   )
-  (bus (pts (xy 128.27 53.34) (xy 128.27 58.42))
-    (stroke (width 0) (type solid) (color 0 0 0 0))
-    (uuid 20880bea-2f60-4bd4-8a9e-ac48147d6247)
-  )
-  (bus (pts (xy 128.27 58.42) (xy 128.27 63.5))
-    (stroke (width 0) (type solid) (color 0 0 0 0))
-    (uuid 217767b9-7778-4482-95de-8250cbffe1e3)
-  )
-  (bus (pts (xy 128.27 63.5) (xy 128.27 67.31))
+  (bus (pts (xy 128.27 53.34) (xy 128.27 116.84))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 39caa16a-c922-478c-aa58-1600a232f7f8)
   )
-  (bus (pts (xy 128.27 67.31) (xy 128.27 72.39))
-    (stroke (width 0) (type solid) (color 0 0 0 0))
-    (uuid 0511eed3-7d24-4031-809b-38ad3ea29e5f)
-  )
-  (bus (pts (xy 128.27 72.39) (xy 128.27 82.55))
-    (stroke (width 0) (type solid) (color 0 0 0 0))
-    (uuid 79798c37-ba5a-482d-afdc-ad295606a4ca)
-  )
-  (bus (pts (xy 128.27 82.55) (xy 128.27 87.63))
-    (stroke (width 0) (type solid) (color 0 0 0 0))
-    (uuid a91b7d70-da04-4bd9-a693-c4308f40a001)
-  )
-  (bus (pts (xy 128.27 87.63) (xy 128.27 91.44))
-    (stroke (width 0) (type solid) (color 0 0 0 0))
-    (uuid 837a2ad9-5009-4fe7-8161-02e9527bd5c5)
-  )
-  (bus (pts (xy 128.27 91.44) (xy 128.27 96.52))
-    (stroke (width 0) (type solid) (color 0 0 0 0))
-    (uuid 7d15a696-70e7-479c-9e78-dbb644e2fd20)
-  )
-  (bus (pts (xy 128.27 96.52) (xy 128.27 116.84))
-    (stroke (width 0) (type solid) (color 0 0 0 0))
-    (uuid 4d786476-38a6-4a36-b113-4c569589c7c6)
-  )
   (bus (pts (xy 143.51 101.6) (xy 147.32 101.6))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 9c957906-8d88-4614-810d-a08a87d562a6)
   )
-  (bus (pts (xy 147.32 101.6) (xy 147.32 104.14))
+  (bus (pts (xy 147.32 101.6) (xy 147.32 109.22))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 010953c4-1916-40eb-b516-78fcf8e6c6ea)
   )
-  (bus (pts (xy 147.32 104.14) (xy 147.32 106.68))
-    (stroke (width 0) (type solid) (color 0 0 0 0))
-    (uuid e1159ec5-93eb-4378-91e5-724c40508ada)
-  )
-  (bus (pts (xy 147.32 106.68) (xy 147.32 109.22))
-    (stroke (width 0) (type solid) (color 0 0 0 0))
-    (uuid 08866d72-9c40-4724-9fbe-7b9dfe7893dd)
-  )
 
   (polyline (pts (xy 133.35 100.33) (xy 133.35 113.03))
     (stroke (width 0) (type dash) (color 0 0 0 0))
@@ -3141,14 +3103,14 @@
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid b56229bf-e757-48f3-94d1-df9b1cc795d2))
+    (pin "10" (uuid ea52b197-3861-4480-924c-2c984465c701))
     (pin "2" (uuid f73f8262-43f7-4d70-b1c9-013af38830d6))
     (pin "3" (uuid 58ad4ea0-e202-42fe-a9b8-f4b05482e05b))
     (pin "4" (uuid 459f53dc-9881-4edb-aa09-06aea8599604))
     (pin "5" (uuid 4fa6c201-3c2d-4c73-a97a-f6c8810cb0e5))
-    (pin "8" (uuid e020ada1-b7b4-4d56-9807-514a533bb038))
-    (pin "10" (uuid ea52b197-3861-4480-924c-2c984465c701))
-    (pin "7" (uuid 003b9056-2efd-4ecd-aa39-59a529cab836))
     (pin "6" (uuid cc39c3eb-bd34-4820-8c26-8416fe4eb355))
+    (pin "7" (uuid 003b9056-2efd-4ecd-aa39-59a529cab836))
+    (pin "8" (uuid e020ada1-b7b4-4d56-9807-514a533bb038))
     (pin "9" (uuid 29d0cccc-46d2-47d1-ba46-96a2c65be461))
   )
 
@@ -3170,14 +3132,14 @@
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 976e2bcd-49bd-4d4f-9265-66de4b2150fd))
+    (pin "10" (uuid 503927b3-e39c-4cf3-a541-2cf3c3d7db59))
     (pin "2" (uuid a8b5db91-952b-43f9-a5f3-b17cb1986b62))
     (pin "3" (uuid c3657e45-4f60-4945-b7f6-6cac0b1bfdb1))
     (pin "4" (uuid 9f955173-3bb4-48bf-afab-e5ebedd31890))
     (pin "5" (uuid f23edae0-1174-4455-a3e6-0cb430c1e87d))
-    (pin "8" (uuid b1ca6235-9c4f-4c60-95d5-a0696948d794))
-    (pin "10" (uuid 503927b3-e39c-4cf3-a541-2cf3c3d7db59))
-    (pin "7" (uuid fb7311ac-05ae-41b5-9bbc-3ad556c8a64d))
     (pin "6" (uuid e2955026-79b7-4660-95ab-4af3238c977f))
+    (pin "7" (uuid fb7311ac-05ae-41b5-9bbc-3ad556c8a64d))
+    (pin "8" (uuid b1ca6235-9c4f-4c60-95d5-a0696948d794))
     (pin "9" (uuid d1596405-fb77-446f-b9a0-5f38efd49ac7))
   )
 
@@ -3200,24 +3162,24 @@
     (property "PartNumber" "LPJG0926HENL" (id 5) (at 177.8 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "4" (uuid d653cadd-e350-43ef-a586-0b680617f66d))
-    (pin "2" (uuid fe63e672-f114-44de-baf9-f3341984117a))
     (pin "1" (uuid d0ff9bc7-c808-41f1-9c40-40c0fae44557))
-    (pin "18" (uuid fc0765c5-cbc3-4304-a809-10b0009332c1))
-    (pin "17" (uuid 403a259d-c3be-4f56-a7b2-95ea16552039))
-    (pin "16" (uuid 8ce993b3-aa3b-44a1-ad56-8556bd56f382))
-    (pin "15" (uuid ffb59d9b-a092-4a84-b5d3-3c1ca8bd8a52))
-    (pin "8" (uuid 8b23dcee-b294-4a44-8fe9-c1e11d580c74))
-    (pin "7" (uuid ef8ea771-8f87-47c7-bac8-59efa0f49f75))
-    (pin "3" (uuid caa3a54a-0c48-4cfd-9c05-446f94c950ce))
-    (pin "6" (uuid b5729cff-cfab-463d-84c2-26edf75f85f3))
-    (pin "5" (uuid e1599ad5-65bc-4d65-9614-026dc7fee002))
-    (pin "9" (uuid b108a8c1-377e-4566-aaaf-6534021cfc72))
     (pin "10" (uuid 17ba8fda-3bab-4c92-850f-e74e90117cea))
-    (pin "SH" (uuid 9fdbab03-36ad-433f-9424-8dc0fc52c4aa))
     (pin "11" (uuid ffcc1f9e-3bcc-4854-93d5-04554b5b9c62))
     (pin "12" (uuid 5cfdd65a-af86-4815-8954-4eaf6f01148d))
     (pin "13" (uuid e96fca97-192a-4034-95df-b8cf7e4e822c))
     (pin "14" (uuid b615fa4b-433c-498e-8c33-3747087e6156))
+    (pin "15" (uuid ffb59d9b-a092-4a84-b5d3-3c1ca8bd8a52))
+    (pin "16" (uuid 8ce993b3-aa3b-44a1-ad56-8556bd56f382))
+    (pin "17" (uuid 403a259d-c3be-4f56-a7b2-95ea16552039))
+    (pin "18" (uuid fc0765c5-cbc3-4304-a809-10b0009332c1))
+    (pin "2" (uuid fe63e672-f114-44de-baf9-f3341984117a))
+    (pin "3" (uuid caa3a54a-0c48-4cfd-9c05-446f94c950ce))
+    (pin "4" (uuid d653cadd-e350-43ef-a586-0b680617f66d))
+    (pin "5" (uuid e1599ad5-65bc-4d65-9614-026dc7fee002))
+    (pin "6" (uuid b5729cff-cfab-463d-84c2-26edf75f85f3))
+    (pin "7" (uuid ef8ea771-8f87-47c7-bac8-59efa0f49f75))
+    (pin "8" (uuid 8b23dcee-b294-4a44-8fe9-c1e11d580c74))
+    (pin "9" (uuid b108a8c1-377e-4566-aaaf-6534021cfc72))
+    (pin "SH" (uuid 9fdbab03-36ad-433f-9424-8dc0fc52c4aa))
   )
 )
diff --git a/LightBlue.kicad_prl b/LightBlue.kicad_prl
index 29a5c7d..1331275 100644
--- a/LightBlue.kicad_prl
+++ b/LightBlue.kicad_prl
@@ -53,22 +53,22 @@
       24,
       25,
       26,
+      27,
+      28,
       29,
       30,
-      31,
       32,
       33,
       34,
       35,
-      39,
-      40
+      36
     ],
     "visible_layers": "00290aa_00000001",
     "zone_display_mode": 2
   },
   "meta": {
     "filename": "LightBlue.kicad_prl",
-    "version": 2
+    "version": 3
   },
   "project": {
     "files": []
diff --git a/LightBlue.kicad_pro b/LightBlue.kicad_pro
index 6ae3e49..d10ce74 100644
--- a/LightBlue.kicad_pro
+++ b/LightBlue.kicad_pro
@@ -62,7 +62,7 @@
       ],
       "drc_exclusions": [],
       "meta": {
-        "version": 1
+        "version": 2
       },
       "rule_severities": {
         "annular_width": "error",
@@ -116,11 +116,7 @@
         "min_through_hole_diameter": 0.19999999999999998,
         "min_track_width": 0.09999999999999999,
         "min_via_annular_width": 0.125,
-        "min_via_diameter": 0.44999999999999996,
-        "solder_mask_clearance": 0.0,
-        "solder_mask_min_width": 0.0,
-        "solder_paste_clearance": 0.0,
-        "solder_paste_margin_ratio": -0.0
+        "min_via_diameter": 0.44999999999999996
       },
       "track_widths": [
         0.0,
@@ -546,6 +542,7 @@
       "default_text_size": 50.0,
       "default_wire_thickness": 6.0,
       "field_names": [],
+      "intersheets_ref_own_page": false,
       "intersheets_ref_prefix": "",
       "intersheets_ref_short": false,
       "intersheets_ref_show": false,
@@ -560,6 +557,12 @@
       "version": 0
     },
     "net_format_name": "",
+    "ngspice": {
+      "meta": {
+        "version": 0
+      },
+      "model_mode": 0
+    },
     "page_layout_descr_file": "",
     "plot_directory": "output/",
     "spice_adjust_passive_values": false,
@@ -569,7 +572,7 @@
   },
   "sheets": [
     [
-      "7c248bd3-8232-4777-a40c-eab53460cf85",
+      "abc482bd-3f17-4d35-80db-1da3dcdb5c27",
       ""
     ],
     [
@@ -602,7 +605,7 @@
     ],
     [
       "441a9908-1e74-440b-b462-bdf6815583fe",
-      "Front/RTC"
+      "Control/RTC"
     ],
     [
       "67ada73c-6692-4fd8-8c20-5be89f2b8650",
diff --git a/LightBlue.kicad_sch b/LightBlue.kicad_sch
index 5854c88..dce2b88 100644
--- a/LightBlue.kicad_sch
+++ b/LightBlue.kicad_sch
@@ -973,25 +973,25 @@
       (reference "F1") (unit 1) (value "Polyfuse_Small") (footprint "Fuse:Fuse_1206_3216Metric")
     )
     (path "/7c248bd3-8232-4777-a40c-eab53460cf85/fe81f5fa-e1ac-4968-a654-7214906ce5ba"
-      (reference "J6") (unit 1) (value "HDMI_A_2.0") (footprint "LightBlue:HDMI_A_Molex_2086588131_Horizontal")
+      (reference "J6") (unit 1) (value "HDMI_A_2.0") (footprint "Connector_HDMI:HDMI_Micro-D_Molex_46765-1x01")
     )
     (path "/7c248bd3-8232-4777-a40c-eab53460cf85/2780d134-4b5f-45db-8d3c-ff5c1e9c4b1a"
       (reference "J11") (unit 1) (value "Conn_02x05_Odd_Even") (footprint "Connector_PinHeader_2.54mm:PinHeader_2x05_P2.54mm_Vertical")
     )
+    (path "/7c248bd3-8232-4777-a40c-eab53460cf85/e968abf9-4624-4f9a-a426-43f6f969f7bc"
+      (reference "J13") (unit 1) (value "Conn_01x02") (footprint "Connector_PinHeader_2.54mm:PinHeader_1x02_P2.54mm_Vertical")
+    )
     (path "/7c248bd3-8232-4777-a40c-eab53460cf85/65722b3e-bd11-4d53-9b38-148a204070a3"
-      (reference "J?") (unit 1) (value "Conn_01x02") (footprint "")
+      (reference "J14") (unit 1) (value "Conn_01x02") (footprint "Connector_PinHeader_2.54mm:PinHeader_1x02_P2.54mm_Vertical")
     )
     (path "/7c248bd3-8232-4777-a40c-eab53460cf85/7bfd1035-1969-40a2-b79e-5a744cd6676d"
-      (reference "J?") (unit 1) (value "Conn_01x02") (footprint "")
-    )
-    (path "/7c248bd3-8232-4777-a40c-eab53460cf85/e968abf9-4624-4f9a-a426-43f6f969f7bc"
-      (reference "J?") (unit 1) (value "Conn_01x02") (footprint "")
+      (reference "J15") (unit 1) (value "Conn_01x02") (footprint "Connector_PinHeader_2.54mm:PinHeader_1x02_P2.54mm_Vertical")
     )
     (path "/7c248bd3-8232-4777-a40c-eab53460cf85/f65f5283-bc09-4a32-875e-7aff6fe23fca"
       (reference "R1") (unit 1) (value "10k") (footprint "Resistor_SMD:R_0402_1005Metric")
     )
     (path "/7c248bd3-8232-4777-a40c-eab53460cf85/8d97beb3-8be8-49e5-b2aa-8b3cd309e7e0"
-      (reference "R?") (unit 1) (value "220R") (footprint "")
+      (reference "R22") (unit 1) (value "220R") (footprint "Resistor_SMD:R_0402_1005Metric")
     )
     (path "/7c248bd3-8232-4777-a40c-eab53460cf85/b131b144-fc54-40cc-8411-449b069a57ca"
       (reference "U1") (unit 1) (value "RaspberryPi-CM4Lite") (footprint "LightBlue:RaspberryPi-CM4")
@@ -1134,6 +1134,9 @@
     (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/b5629e54-28ac-40d1-84cb-0d54af7dc737"
       (reference "C6") (unit 1) (value "1u") (footprint "Capacitor_SMD:C_0402_1005Metric")
     )
+    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/1dfce5aa-c3ab-4d28-a924-b4d02317ef9d"
+      (reference "C7") (unit 1) (value "4u7") (footprint "Capacitor_SMD:C_0402_1005Metric")
+    )
     (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/24604b30-3cea-46f1-9cd3-e92a0ade5b63"
       (reference "C8") (unit 1) (value "4u7") (footprint "Capacitor_SMD:C_0402_1005Metric")
     )
@@ -1155,6 +1158,9 @@
     (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/75f1f3ac-dd03-44ee-9c8c-35f88a32c56b"
       (reference "C14") (unit 1) (value "100n/1kV") (footprint "Capacitor_SMD:C_1206_3216Metric")
     )
+    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/f4c0e25b-a2e3-4b87-b385-be98b50df69b"
+      (reference "C15") (unit 1) (value "100n") (footprint "Capacitor_SMD:C_0402_1005Metric")
+    )
     (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/8fa745b1-0828-40b3-b99d-72112517205b"
       (reference "C16") (unit 1) (value "10u") (footprint "Capacitor_SMD:C_0805_2012Metric")
     )
@@ -1165,16 +1171,10 @@
       (reference "C18") (unit 1) (value "100n") (footprint "Capacitor_SMD:C_0402_1005Metric")
     )
     (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/057b3f3e-71d6-4e24-8ee0-04feb37f7702"
-      (reference "C?") (unit 1) (value "1u") (footprint "Capacitor_SMD:C_0402_1005Metric")
-    )
-    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/1dfce5aa-c3ab-4d28-a924-b4d02317ef9d"
-      (reference "C?") (unit 1) (value "4u7") (footprint "Capacitor_SMD:C_0402_1005Metric")
+      (reference "C40") (unit 1) (value "1u") (footprint "Capacitor_SMD:C_0402_1005Metric")
     )
     (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/d14a449c-b67d-4418-9050-07e4987428c5"
-      (reference "C?") (unit 1) (value "100u") (footprint "Capacitor_SMD:C_0805_2012Metric")
-    )
-    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/f4c0e25b-a2e3-4b87-b385-be98b50df69b"
-      (reference "C?") (unit 1) (value "100n") (footprint "Capacitor_SMD:C_0402_1005Metric")
+      (reference "C41") (unit 1) (value "100u") (footprint "Capacitor_SMD:C_0805_2012Metric")
     )
     (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/e0469852-771a-434b-963a-8ecb4c38b617"
       (reference "J3") (unit 1) (value "USB_C_Receptacle_USB2.0") (footprint "Connector_USB:USB_C_Receptacle_HRO_TYPE-C-31-M-12")
@@ -1186,7 +1186,7 @@
       (reference "J4") (unit 2) (value "USB_A_Stacked") (footprint "Connector_USB:USB_A_Wuerth_61400826021_Horizontal_Stacked")
     )
     (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/21f085b4-1176-4778-97ba-f2d2acc22e65"
-      (reference "JP?") (unit 1) (value "JP_USB_DEVICE_SEL") (footprint "")
+      (reference "JP1") (unit 1) (value "JP_USB_DEVICE_SEL") (footprint "Connector_PinHeader_2.54mm:PinHeader_1x03_P2.54mm_Vertical")
     )
     (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/3c6869e1-5028-4a26-8bf9-436fb6da2ff7"
       (reference "R2") (unit 1) (value "1k") (footprint "Resistor_SMD:R_0402_1005Metric")
@@ -1284,14 +1284,14 @@
     (path "/12f6ca59-5dee-4aea-b4bb-e4b9cab2885b/7e85724a-4aa3-487a-9578-39b3371d9abd"
       (reference "J9") (unit 1) (value "Conn_02x04_Odd_Even") (footprint "Connector_PinHeader_1.27mm:PinHeader_2x05_P1.27mm_Vertical")
     )
+    (path "/12f6ca59-5dee-4aea-b4bb-e4b9cab2885b/4cc6d309-4f77-41d2-b317-a1c1631529ab"
+      (reference "R23") (unit 1) (value "1k") (footprint "Resistor_SMD:R_0402_1005Metric")
+    )
     (path "/12f6ca59-5dee-4aea-b4bb-e4b9cab2885b/2d75dfee-ac09-45c1-81e5-2a0d40c4d6bd"
-      (reference "R?") (unit 1) (value "10k") (footprint "")
+      (reference "R24") (unit 1) (value "10k") (footprint "Resistor_SMD:R_0402_1005Metric")
     )
     (path "/12f6ca59-5dee-4aea-b4bb-e4b9cab2885b/48f087d3-6913-48e0-9a81-b5a4d1062cb0"
-      (reference "R?") (unit 1) (value "10k") (footprint "")
-    )
-    (path "/12f6ca59-5dee-4aea-b4bb-e4b9cab2885b/4cc6d309-4f77-41d2-b317-a1c1631529ab"
-      (reference "R?") (unit 1) (value "1k") (footprint "")
+      (reference "R25") (unit 1) (value "10k") (footprint "Resistor_SMD:R_0402_1005Metric")
     )
     (path "/12f6ca59-5dee-4aea-b4bb-e4b9cab2885b/c09bd077-0d29-41a3-91d8-7b26a3246dec"
       (reference "U9") (unit 1) (value "SiliconLabs-MGM210P") (footprint "LightBlue:SiliconLabs_MGM210P")
@@ -1557,6 +1557,30 @@
     (path "/c7bf4e1f-6bd1-4be7-9e56-1bd438bf5d42/5c9668f4-d236-45e8-a780-3a57887c6d57"
       (reference "C42") (unit 1) (value "100n/35V") (footprint "Capacitor_SMD:C_0402_1005Metric")
     )
+    (path "/c7bf4e1f-6bd1-4be7-9e56-1bd438bf5d42/ca15f3f2-a0ee-4072-9632-e58549038e91"
+      (reference "C43") (unit 1) (value "10u/35V") (footprint "Capacitor_SMD:C_0805_2012Metric")
+    )
+    (path "/c7bf4e1f-6bd1-4be7-9e56-1bd438bf5d42/7c3c7370-6a40-46f6-b362-7fbcddbe7b20"
+      (reference "C44") (unit 1) (value "1u") (footprint "Capacitor_SMD:C_0402_1005Metric")
+    )
+    (path "/c7bf4e1f-6bd1-4be7-9e56-1bd438bf5d42/f01249a4-7ff8-438c-9f46-30f6b46b7da1"
+      (reference "C45") (unit 1) (value "1u") (footprint "Capacitor_SMD:C_0402_1005Metric")
+    )
+    (path "/c7bf4e1f-6bd1-4be7-9e56-1bd438bf5d42/f3fde790-4ca8-4f1c-b808-a7ba398f5098"
+      (reference "C46") (unit 1) (value "3n3") (footprint "Capacitor_SMD:C_0402_1005Metric")
+    )
+    (path "/c7bf4e1f-6bd1-4be7-9e56-1bd438bf5d42/f43faa4e-3242-4660-804d-a1a9816105f4"
+      (reference "C47") (unit 1) (value "3n3") (footprint "Capacitor_SMD:C_0402_1005Metric")
+    )
+    (path "/c7bf4e1f-6bd1-4be7-9e56-1bd438bf5d42/c597bbf2-e110-4260-b76a-d6c6e82e2793"
+      (reference "C48") (unit 1) (value "100n") (footprint "Capacitor_SMD:C_0402_1005Metric")
+    )
+    (path "/c7bf4e1f-6bd1-4be7-9e56-1bd438bf5d42/b5418350-4852-46f4-87fc-858374e9b444"
+      (reference "C49") (unit 1) (value "100n") (footprint "Capacitor_SMD:C_0402_1005Metric")
+    )
+    (path "/c7bf4e1f-6bd1-4be7-9e56-1bd438bf5d42/a610b527-be78-44fc-8d79-c01d67610fbd"
+      (reference "C50") (unit 1) (value "10p") (footprint "Capacitor_SMD:C_0402_1005Metric")
+    )
     (path "/c7bf4e1f-6bd1-4be7-9e56-1bd438bf5d42/05a768c6-753c-42c5-a5e3-3f97b21bf252"
       (reference "C51") (unit 1) (value "100n") (footprint "Capacitor_SMD:C_0402_1005Metric")
     )
@@ -1588,31 +1612,7 @@
       (reference "C60") (unit 1) (value "100u") (footprint "Capacitor_Tantalum_SMD:CP_EIA-7343-31_Kemet-D")
     )
     (path "/c7bf4e1f-6bd1-4be7-9e56-1bd438bf5d42/2bd2756a-e05b-4556-b8ea-a98c93b5efc2"
-      (reference "C?") (unit 1) (value "10p") (footprint "Capacitor_SMD:C_0402_1005Metric")
-    )
-    (path "/c7bf4e1f-6bd1-4be7-9e56-1bd438bf5d42/7c3c7370-6a40-46f6-b362-7fbcddbe7b20"
-      (reference "C?") (unit 1) (value "1u") (footprint "Capacitor_SMD:C_0402_1005Metric")
-    )
-    (path "/c7bf4e1f-6bd1-4be7-9e56-1bd438bf5d42/a610b527-be78-44fc-8d79-c01d67610fbd"
-      (reference "C?") (unit 1) (value "10p") (footprint "Capacitor_SMD:C_0402_1005Metric")
-    )
-    (path "/c7bf4e1f-6bd1-4be7-9e56-1bd438bf5d42/b5418350-4852-46f4-87fc-858374e9b444"
-      (reference "C?") (unit 1) (value "100n") (footprint "Capacitor_SMD:C_0402_1005Metric")
-    )
-    (path "/c7bf4e1f-6bd1-4be7-9e56-1bd438bf5d42/c597bbf2-e110-4260-b76a-d6c6e82e2793"
-      (reference "C?") (unit 1) (value "100n") (footprint "Capacitor_SMD:C_0402_1005Metric")
-    )
-    (path "/c7bf4e1f-6bd1-4be7-9e56-1bd438bf5d42/ca15f3f2-a0ee-4072-9632-e58549038e91"
-      (reference "C?") (unit 1) (value "10u/35V") (footprint "Capacitor_SMD:C_0805_2012Metric")
-    )
-    (path "/c7bf4e1f-6bd1-4be7-9e56-1bd438bf5d42/f01249a4-7ff8-438c-9f46-30f6b46b7da1"
-      (reference "C?") (unit 1) (value "1u") (footprint "Capacitor_SMD:C_0402_1005Metric")
-    )
-    (path "/c7bf4e1f-6bd1-4be7-9e56-1bd438bf5d42/f3fde790-4ca8-4f1c-b808-a7ba398f5098"
-      (reference "C?") (unit 1) (value "3n3") (footprint "Capacitor_SMD:C_0402_1005Metric")
-    )
-    (path "/c7bf4e1f-6bd1-4be7-9e56-1bd438bf5d42/f43faa4e-3242-4660-804d-a1a9816105f4"
-      (reference "C?") (unit 1) (value "3n3") (footprint "Capacitor_SMD:C_0402_1005Metric")
+      (reference "C61") (unit 1) (value "10p") (footprint "Capacitor_SMD:C_0402_1005Metric")
     )
     (path "/c7bf4e1f-6bd1-4be7-9e56-1bd438bf5d42/7a0a3281-9283-4334-8fe5-d2ef547e813a"
       (reference "D7") (unit 1) (value "B3100-13-F") (footprint "Diode_SMD:D_SMC")
@@ -1630,16 +1630,16 @@
       (reference "L2") (unit 1) (value "3u3") (footprint "Inductor_SMD:L_Taiyo-Yuden_NR-80xx")
     )
     (path "/c7bf4e1f-6bd1-4be7-9e56-1bd438bf5d42/01da54cd-a942-4e17-9a65-6be06409143d"
-      (reference "R?") (unit 1) (value "124k/1%") (footprint "Resistor_SMD:R_0402_1005Metric")
-    )
-    (path "/c7bf4e1f-6bd1-4be7-9e56-1bd438bf5d42/1f69024d-7c75-474d-a5bb-6a51a7752bd8"
-      (reference "R?") (unit 1) (value "75k/1%") (footprint "Resistor_SMD:R_0402_1005Metric")
+      (reference "R26") (unit 1) (value "124k/1%") (footprint "Resistor_SMD:R_0402_1005Metric")
     )
     (path "/c7bf4e1f-6bd1-4be7-9e56-1bd438bf5d42/9fb89dcd-e08a-4a2b-89f9-4f730475c2a4"
-      (reference "R?") (unit 1) (value "22k/1%") (footprint "Resistor_SMD:R_0402_1005Metric")
+      (reference "R27") (unit 1) (value "22k/1%") (footprint "Resistor_SMD:R_0402_1005Metric")
+    )
+    (path "/c7bf4e1f-6bd1-4be7-9e56-1bd438bf5d42/1f69024d-7c75-474d-a5bb-6a51a7752bd8"
+      (reference "R28") (unit 1) (value "75k/1%") (footprint "Resistor_SMD:R_0402_1005Metric")
     )
     (path "/c7bf4e1f-6bd1-4be7-9e56-1bd438bf5d42/ee9b63bf-a005-450b-85ad-54a93cb76e70"
-      (reference "R?") (unit 1) (value "22k/1%") (footprint "Resistor_SMD:R_0402_1005Metric")
+      (reference "R29") (unit 1) (value "22k/1%") (footprint "Resistor_SMD:R_0402_1005Metric")
     )
     (path "/c7bf4e1f-6bd1-4be7-9e56-1bd438bf5d42/75aef2d6-e5fc-4108-99b3-c7b178112cb3"
       (reference "U14") (unit 1) (value "BD9D321EFJ") (footprint "Package_SO:HTSOP-8-1EP_3.9x4.9mm_P1.27mm_EP2.4x3.2mm_ThermalVias")
@@ -1797,6 +1797,9 @@
     (path "/441a9908-1e74-440b-b462-bdf6815583fe/d3cdfa6c-a784-4d4a-b93e-48f2bae1fccc"
       (reference "R31") (unit 1) (value "1k") (footprint "Resistor_SMD:R_0402_1005Metric")
     )
+    (path "/441a9908-1e74-440b-b462-bdf6815583fe/af62978b-97d7-43bc-a5b3-c7284a15d33a"
+      (reference "R32") (unit 1) (value "10k") (footprint "Resistor_SMD:R_0402_1005Metric")
+    )
     (path "/441a9908-1e74-440b-b462-bdf6815583fe/a67c2427-d8ee-4b7f-90ef-85a68e288522"
       (reference "R33") (unit 1) (value "10k") (footprint "Resistor_SMD:R_0402_1005Metric")
     )
@@ -1806,15 +1809,15 @@
     (path "/441a9908-1e74-440b-b462-bdf6815583fe/52998f42-14c1-4bf6-8622-9496e3e54c53"
       (reference "R35") (unit 1) (value "100R") (footprint "Resistor_SMD:R_0402_1005Metric")
     )
-    (path "/441a9908-1e74-440b-b462-bdf6815583fe/af62978b-97d7-43bc-a5b3-c7284a15d33a"
-      (reference "R?") (unit 1) (value "10k") (footprint "Resistor_SMD:R_0402_1005Metric")
-    )
     (path "/441a9908-1e74-440b-b462-bdf6815583fe/0daa7ac8-4459-40fe-9d14-fce80fa5e00c"
       (reference "SW1") (unit 1) (value "SW_USER") (footprint "Button_Switch_THT:SW_Tactile_SPST_Angled_PTS645Vx58-2LFS")
     )
     (path "/441a9908-1e74-440b-b462-bdf6815583fe/5c037cc6-9595-4598-ae57-adb70045cfcd"
       (reference "SW2") (unit 1) (value "SW_WIPE") (footprint "Button_Switch_THT:SW_Tactile_SPST_Angled_PTS645Vx39-2LFS")
     )
+    (path "/441a9908-1e74-440b-b462-bdf6815583fe/96d60aa0-05d2-45af-a78f-a4fdc3a8a4a1"
+      (reference "U16") (unit 1) (value "74LVC1G07") (footprint "Package_TO_SOT_SMD:SOT-353_SC-70-5")
+    )
     (path "/441a9908-1e74-440b-b462-bdf6815583fe/ded4bbd4-a021-46fb-849a-2c1cc4f3c785"
       (reference "U17") (unit 1) (value "LP5569RTWR") (footprint "Package_DFN_QFN:WQFN-24-1EP_4x4mm_P0.5mm_EP2.45x2.45mm")
     )
@@ -1822,10 +1825,7 @@
       (reference "U18") (unit 1) (value "PCF85063AT") (footprint "Package_SO:SOIC-8_3.9x4.9mm_P1.27mm")
     )
     (path "/441a9908-1e74-440b-b462-bdf6815583fe/261e7c7e-5064-453e-8af7-7583d100a768"
-      (reference "U?") (unit 1) (value "74LVC1G07") (footprint "")
-    )
-    (path "/441a9908-1e74-440b-b462-bdf6815583fe/96d60aa0-05d2-45af-a78f-a4fdc3a8a4a1"
-      (reference "U?") (unit 1) (value "74LVC1G07") (footprint "")
+      (reference "U24") (unit 1) (value "74LVC1G07") (footprint "Package_TO_SOT_SMD:SOT-353_SC-70-5")
     )
     (path "/441a9908-1e74-440b-b462-bdf6815583fe/df3c69bc-5fed-486a-8538-f634d169db1f"
       (reference "Y2") (unit 1) (value "X32K768S301") (footprint "Crystal:Crystal_SMD_3215-2Pin_3.2x1.5mm")
@@ -1861,7 +1861,7 @@
       (reference "R36") (unit 1) (value "10k") (footprint "Resistor_SMD:R_0402_1005Metric")
     )
     (path "/67ada73c-6692-4fd8-8c20-5be89f2b8650/0cc85d72-d8a5-4c7a-9558-d741ba5bb7fd"
-      (reference "R?") (unit 1) (value "10k") (footprint "Resistor_SMD:R_0402_1005Metric")
+      (reference "R67") (unit 1) (value "10k") (footprint "Resistor_SMD:R_0402_1005Metric")
     )
     (path "/67ada73c-6692-4fd8-8c20-5be89f2b8650/231e698e-ef39-4cba-a7bd-26a17d9db0c5"
       (reference "U19") (unit 1) (value "RT9742GGJ5") (footprint "Package_TO_SOT_SMD:SOT-23-5")
diff --git a/PCIe.kicad_sch b/PCIe.kicad_sch
index 6897fc6..0245a3e 100644
--- a/PCIe.kicad_sch
+++ b/PCIe.kicad_sch
@@ -1,4 +1,6 @@
-(kicad_sch (version 20210126) (generator eeschema)
+(kicad_sch (version 20210406) (generator eeschema)
+
+  (uuid fb9177d9-5a2c-47b4-80e8-740c8259d0b6)
 
   (paper "A4")
 
@@ -735,38 +737,10 @@
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 677b351c-441e-4668-8993-d72fd51841bf)
   )
-  (bus (pts (xy 68.58 43.18) (xy 68.58 45.72))
-    (stroke (width 0) (type solid) (color 0 0 0 0))
-    (uuid 5d4dd00c-ce4d-4483-9956-c8f0f15d99fc)
-  )
-  (bus (pts (xy 68.58 45.72) (xy 68.58 48.26))
-    (stroke (width 0) (type solid) (color 0 0 0 0))
-    (uuid e3de039c-a394-4d5b-bdef-99396f565563)
-  )
-  (bus (pts (xy 68.58 48.26) (xy 68.58 55.88))
-    (stroke (width 0) (type solid) (color 0 0 0 0))
-    (uuid f0deac4e-bdbe-4765-afd5-3b9ae520db7b)
-  )
-  (bus (pts (xy 68.58 55.88) (xy 68.58 58.42))
-    (stroke (width 0) (type solid) (color 0 0 0 0))
-    (uuid 2251140f-1cfd-4804-9c3d-bd582b698418)
-  )
-  (bus (pts (xy 68.58 58.42) (xy 68.58 60.96))
-    (stroke (width 0) (type solid) (color 0 0 0 0))
-    (uuid fcf691e3-1387-4975-8cbe-b1e22ffbca78)
-  )
-  (bus (pts (xy 68.58 60.96) (xy 68.58 63.5))
-    (stroke (width 0) (type solid) (color 0 0 0 0))
-    (uuid 8da97ad6-cade-4fce-a6d6-91b17a23fc82)
-  )
-  (bus (pts (xy 68.58 63.5) (xy 68.58 124.46))
+  (bus (pts (xy 68.58 43.18) (xy 68.58 127))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid e4009c61-5ce0-40c1-8698-cf21c00fe274)
   )
-  (bus (pts (xy 68.58 124.46) (xy 68.58 127))
-    (stroke (width 0) (type solid) (color 0 0 0 0))
-    (uuid d18ff8a3-e3f3-4908-8ac6-0b6999a7bdda)
-  )
 
   (label "PCIe.~RST" (at 74.93 48.26 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
diff --git a/Power.kicad_sch b/Power.kicad_sch
index 04de7a2..b93acba 100644
--- a/Power.kicad_sch
+++ b/Power.kicad_sch
@@ -1372,7 +1372,7 @@
   (symbol (lib_id "power:+12V") (at 106.045 24.13 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 344c5bcc-9b6a-415f-94f8-3a84ced97e71)
-    (property "Reference" "#PWR?" (id 0) (at 106.045 27.94 0)
+    (property "Reference" "#PWR0201" (id 0) (at 106.045 27.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "+12V" (id 1) (at 106.4133 19.8056 0))
@@ -1534,7 +1534,7 @@
   (symbol (lib_id "power:GND") (at 161.29 51.435 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid ee91bb64-6fc6-49ab-b3e2-7ceff3756d55)
-    (property "Reference" "#PWR?" (id 0) (at 161.29 57.785 0)
+    (property "Reference" "#PWR0283" (id 0) (at 161.29 57.785 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 161.29 55.88 0))
@@ -1550,7 +1550,7 @@
   (symbol (lib_id "power:GND") (at 161.29 100.33 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid d1787c6b-531e-41bc-9599-156821dc48f1)
-    (property "Reference" "#PWR?" (id 0) (at 161.29 106.68 0)
+    (property "Reference" "#PWR0280" (id 0) (at 161.29 106.68 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 161.29 104.775 0))
@@ -1566,7 +1566,7 @@
   (symbol (lib_id "power:GND") (at 167.64 51.435 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid b1bbe5cd-9d93-4b8b-a4aa-f29c853d9738)
-    (property "Reference" "#PWR?" (id 0) (at 167.64 57.785 0)
+    (property "Reference" "#PWR0282" (id 0) (at 167.64 57.785 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 167.64 55.88 0))
@@ -1582,7 +1582,7 @@
   (symbol (lib_id "power:GND") (at 167.64 100.33 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid c493aa6c-b558-4155-bbbc-185c7bc6044a)
-    (property "Reference" "#PWR?" (id 0) (at 167.64 106.68 0)
+    (property "Reference" "#PWR0281" (id 0) (at 167.64 106.68 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 167.64 104.775 0))
@@ -1598,7 +1598,7 @@
   (symbol (lib_id "power:GND") (at 181.61 51.435 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 2e90de09-d90e-4ad9-880b-e07a7b196371)
-    (property "Reference" "#PWR?" (id 0) (at 181.61 57.785 0)
+    (property "Reference" "#PWR0254" (id 0) (at 181.61 57.785 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 181.61 55.88 0))
@@ -1614,7 +1614,7 @@
   (symbol (lib_id "power:GND") (at 181.61 100.33 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 29499366-76cd-4987-a160-a3074fb619fd)
-    (property "Reference" "#PWR?" (id 0) (at 181.61 106.68 0)
+    (property "Reference" "#PWR0216" (id 0) (at 181.61 106.68 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 181.61 104.775 0))
@@ -1630,7 +1630,7 @@
   (symbol (lib_id "power:GND") (at 210.185 51.435 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 4a5c6e93-3112-4daf-b9a2-119c274d0b00)
-    (property "Reference" "#PWR?" (id 0) (at 210.185 57.785 0)
+    (property "Reference" "#PWR0215" (id 0) (at 210.185 57.785 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 210.185 55.88 0))
@@ -1646,7 +1646,7 @@
   (symbol (lib_id "power:GND") (at 210.185 100.33 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 97d1906a-f23a-42ce-8029-51e4ddab5f6f)
-    (property "Reference" "#PWR?" (id 0) (at 210.185 106.68 0)
+    (property "Reference" "#PWR0218" (id 0) (at 210.185 106.68 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 210.185 104.775 0))
@@ -1698,7 +1698,7 @@
   (symbol (lib_id "Device:R_Small") (at 210.185 33.02 180) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 01da54cd-a942-4e17-9a65-6be06409143d)
-    (property "Reference" "R?" (id 0) (at 211.6837 31.8706 0)
+    (property "Reference" "R26" (id 0) (at 211.6837 31.8706 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
     (property "Value" "124k/1%" (id 1) (at 211.684 34.169 0)
@@ -1717,7 +1717,7 @@
   (symbol (lib_id "Device:R_Small") (at 210.185 45.72 180) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 9fb89dcd-e08a-4a2b-89f9-4f730475c2a4)
-    (property "Reference" "R?" (id 0) (at 211.6837 44.5706 0)
+    (property "Reference" "R27" (id 0) (at 211.6837 44.5706 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
     (property "Value" "22k/1%" (id 1) (at 211.684 46.869 0)
@@ -1736,7 +1736,7 @@
   (symbol (lib_id "Device:R_Small") (at 210.185 81.915 180) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 1f69024d-7c75-474d-a5bb-6a51a7752bd8)
-    (property "Reference" "R?" (id 0) (at 211.6837 80.7656 0)
+    (property "Reference" "R28" (id 0) (at 211.6837 80.7656 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
     (property "Value" "75k/1%" (id 1) (at 211.684 83.064 0)
@@ -1755,7 +1755,7 @@
   (symbol (lib_id "Device:R_Small") (at 210.185 94.615 180) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid ee9b63bf-a005-450b-85ad-54a93cb76e70)
-    (property "Reference" "R?" (id 0) (at 211.6837 93.4656 0)
+    (property "Reference" "R29" (id 0) (at 211.6837 93.4656 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
     (property "Value" "22k/1%" (id 1) (at 211.684 95.764 0)
@@ -1962,7 +1962,7 @@
   (symbol (lib_id "Device:C_Small") (at 144.145 29.845 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid ca15f3f2-a0ee-4072-9632-e58549038e91)
-    (property "Reference" "C?" (id 0) (at 146.4692 31.2356 0)
+    (property "Reference" "C43" (id 0) (at 146.4692 31.2356 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "10u/35V" (id 1) (at 140.119 35.439 0)
@@ -2019,7 +2019,7 @@
   (symbol (lib_id "Device:C_Small") (at 161.29 46.355 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 7c3c7370-6a40-46f6-b362-7fbcddbe7b20)
-    (property "Reference" "C?" (id 0) (at 155.3592 45.2056 0)
+    (property "Reference" "C44" (id 0) (at 155.3592 45.2056 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "1u" (id 1) (at 155.359 47.504 0)
@@ -2038,7 +2038,7 @@
   (symbol (lib_id "Device:C_Small") (at 161.29 95.25 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid f01249a4-7ff8-438c-9f46-30f6b46b7da1)
-    (property "Reference" "C?" (id 0) (at 155.3592 94.1006 0)
+    (property "Reference" "C45" (id 0) (at 155.3592 94.1006 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "1u" (id 1) (at 155.359 96.399 0)
@@ -2057,7 +2057,7 @@
   (symbol (lib_id "Device:C_Small") (at 167.64 46.355 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid f3fde790-4ca8-4f1c-b808-a7ba398f5098)
-    (property "Reference" "C?" (id 0) (at 170.5992 44.5706 0)
+    (property "Reference" "C46" (id 0) (at 170.5992 44.5706 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "3n3" (id 1) (at 170.599 47.504 0)
@@ -2076,7 +2076,7 @@
   (symbol (lib_id "Device:C_Small") (at 167.64 95.25 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid f43faa4e-3242-4660-804d-a1a9816105f4)
-    (property "Reference" "C?" (id 0) (at 170.5992 93.4656 0)
+    (property "Reference" "C47" (id 0) (at 170.5992 93.4656 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "3n3" (id 1) (at 170.599 96.399 0)
@@ -2095,7 +2095,7 @@
   (symbol (lib_id "Device:C_Small") (at 197.485 32.385 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid c597bbf2-e110-4260-b76a-d6c6e82e2793)
-    (property "Reference" "C?" (id 0) (at 200.4442 31.2356 0)
+    (property "Reference" "C48" (id 0) (at 200.4442 31.2356 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "100n" (id 1) (at 200.444 33.534 0)
@@ -2114,7 +2114,7 @@
   (symbol (lib_id "Device:C_Small") (at 197.485 81.28 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid b5418350-4852-46f4-87fc-858374e9b444)
-    (property "Reference" "C?" (id 0) (at 200.4442 80.1306 0)
+    (property "Reference" "C49" (id 0) (at 200.4442 80.1306 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "100n" (id 1) (at 200.444 82.429 0)
@@ -2133,7 +2133,7 @@
   (symbol (lib_id "Device:C_Small") (at 222.885 32.385 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid a610b527-be78-44fc-8d79-c01d67610fbd)
-    (property "Reference" "C?" (id 0) (at 225.2092 31.2356 0)
+    (property "Reference" "C50" (id 0) (at 225.2092 31.2356 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "10p" (id 1) (at 225.209 33.534 0)
@@ -2153,7 +2153,7 @@
   (symbol (lib_id "Device:C_Small") (at 222.885 81.28 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 2bd2756a-e05b-4556-b8ea-a98c93b5efc2)
-    (property "Reference" "C?" (id 0) (at 225.2092 80.1306 0)
+    (property "Reference" "C61" (id 0) (at 225.2092 80.1306 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "10p" (id 1) (at 225.209 82.429 0)
diff --git a/Radio.kicad_sch b/Radio.kicad_sch
index 1c95453..001be32 100644
--- a/Radio.kicad_sch
+++ b/Radio.kicad_sch
@@ -1,4 +1,6 @@
-(kicad_sch (version 20210126) (generator eeschema)
+(kicad_sch (version 20210406) (generator eeschema)
+
+  (uuid edcdf4aa-f209-403c-9c79-2c346aebc738)
 
   (paper "A4")
 
@@ -97,32 +99,32 @@
         (rectangle (start -1.27 -2.413) (end 0 -2.667)
           (stroke (width 0.1524)) (fill (type none))
         )
+        (rectangle (start -1.27 0.127) (end 0 -0.127)
+          (stroke (width 0.1524)) (fill (type none))
+        )
         (rectangle (start -1.27 2.667) (end 0 2.413)
           (stroke (width 0.1524)) (fill (type none))
         )
         (rectangle (start -1.27 5.207) (end 0 4.953)
           (stroke (width 0.1524)) (fill (type none))
         )
-        (rectangle (start -1.27 6.35) (end 3.81 -6.35)
-          (stroke (width 0.254)) (fill (type background))
-        )
-        (rectangle (start -1.27 0.127) (end 0 -0.127)
-          (stroke (width 0.1524)) (fill (type none))
-        )
         (rectangle (start 3.81 -4.953) (end 2.54 -5.207)
           (stroke (width 0.1524)) (fill (type none))
         )
         (rectangle (start 3.81 -2.413) (end 2.54 -2.667)
           (stroke (width 0.1524)) (fill (type none))
         )
+        (rectangle (start 3.81 0.127) (end 2.54 -0.127)
+          (stroke (width 0.1524)) (fill (type none))
+        )
         (rectangle (start 3.81 2.667) (end 2.54 2.413)
           (stroke (width 0.1524)) (fill (type none))
         )
         (rectangle (start 3.81 5.207) (end 2.54 4.953)
           (stroke (width 0.1524)) (fill (type none))
         )
-        (rectangle (start 3.81 0.127) (end 2.54 -0.127)
-          (stroke (width 0.1524)) (fill (type none))
+        (rectangle (start -1.27 6.35) (end 3.81 -6.35)
+          (stroke (width 0.254)) (fill (type background))
         )
         (pin passive line (at -5.08 5.08 0) (length 3.81)
           (name "Pin_1" (effects (font (size 1.27 1.27))))
@@ -227,26 +229,18 @@
           (name "GND" (effects (font (size 1.27 1.27))))
           (number "1" (effects (font (size 1.27 1.27))))
         )
+        (pin bidirectional line (at -17.78 1.27 0) (length 2.54)
+          (name "PA06" (effects (font (size 1.27 1.27))))
+          (number "10" (effects (font (size 1.27 1.27))))
+        )
+        (pin no_connect line (at -17.78 -2.54 0) (length 2.54)
+          (name "DECOUPLE" (effects (font (size 1.27 1.27))))
+          (number "11" (effects (font (size 1.27 1.27))))
+        )
         (pin power_in line (at -3.81 -25.4 90) (length 2.54)
           (name "GND" (effects (font (size 1.27 1.27))))
           (number "12" (effects (font (size 1.27 1.27))))
         )
-        (pin power_in line (at -1.27 -25.4 90) (length 2.54)
-          (name "GND" (effects (font (size 1.27 1.27))))
-          (number "20" (effects (font (size 1.27 1.27))))
-        )
-        (pin power_in line (at 1.27 -25.4 90) (length 2.54)
-          (name "GND" (effects (font (size 1.27 1.27))))
-          (number "28" (effects (font (size 1.27 1.27))))
-        )
-        (pin power_in line (at 3.81 -25.4 90) (length 2.54)
-          (name "GND" (effects (font (size 1.27 1.27))))
-          (number "30" (effects (font (size 1.27 1.27))))
-        )
-        (pin power_in line (at 6.35 -25.4 90) (length 2.54)
-          (name "GND" (effects (font (size 1.27 1.27))))
-          (number "31" (effects (font (size 1.27 1.27))))
-        )
         (pin power_in line (at -1.27 25.4 270) (length 2.54)
           (name "VDD" (effects (font (size 1.27 1.27))))
           (number "13" (effects (font (size 1.27 1.27))))
@@ -255,46 +249,34 @@
           (name "IOVDD" (effects (font (size 1.27 1.27))))
           (number "14" (effects (font (size 1.27 1.27))))
         )
-        (pin bidirectional line (at -17.78 16.51 0) (length 2.54)
-          (name "PA00" (effects (font (size 1.27 1.27))))
-          (number "4" (effects (font (size 1.27 1.27))))
+        (pin bidirectional line (at 17.78 -10.16 180) (length 2.54)
+          (name "PD04" (effects (font (size 1.27 1.27))))
+          (number "15" (effects (font (size 1.27 1.27))))
         )
-        (pin bidirectional line (at -17.78 13.97 0) (length 2.54)
-          (name "PA01" (effects (font (size 1.27 1.27))))
-          (number "5" (effects (font (size 1.27 1.27))))
+        (pin bidirectional line (at 17.78 -7.62 180) (length 2.54)
+          (name "PD03" (effects (font (size 1.27 1.27))))
+          (number "16" (effects (font (size 1.27 1.27))))
         )
-        (pin bidirectional line (at -17.78 11.43 0) (length 2.54)
-          (name "PA02" (effects (font (size 1.27 1.27))))
-          (number "6" (effects (font (size 1.27 1.27))))
+        (pin bidirectional line (at 17.78 -5.08 180) (length 2.54)
+          (name "PD02" (effects (font (size 1.27 1.27))))
+          (number "17" (effects (font (size 1.27 1.27))))
         )
-        (pin bidirectional line (at -17.78 8.89 0) (length 2.54)
-          (name "PA03" (effects (font (size 1.27 1.27))))
-          (number "7" (effects (font (size 1.27 1.27))))
+        (pin bidirectional line (at 17.78 -2.54 180) (length 2.54)
+          (name "PD01" (effects (font (size 1.27 1.27))))
+          (number "18" (effects (font (size 1.27 1.27))))
         )
-        (pin bidirectional line (at -17.78 6.35 0) (length 2.54)
-          (name "PA04" (effects (font (size 1.27 1.27))))
-          (number "8" (effects (font (size 1.27 1.27))))
-        )
-        (pin bidirectional line (at -17.78 3.81 0) (length 2.54)
-          (name "PA05" (effects (font (size 1.27 1.27))))
-          (number "9" (effects (font (size 1.27 1.27))))
-        )
-        (pin bidirectional line (at -17.78 1.27 0) (length 2.54)
-          (name "PA06" (effects (font (size 1.27 1.27))))
-          (number "10" (effects (font (size 1.27 1.27))))
-        )
-        (pin no_connect line (at -17.78 -2.54 0) (length 2.54)
-          (name "DECOUPLE" (effects (font (size 1.27 1.27))))
-          (number "11" (effects (font (size 1.27 1.27))))
-        )
-        (pin bidirectional line (at -17.78 -6.35 0) (length 2.54)
-          (name "PB00" (effects (font (size 1.27 1.27))))
-          (number "3" (effects (font (size 1.27 1.27))))
+        (pin bidirectional line (at 17.78 0 180) (length 2.54)
+          (name "PD00" (effects (font (size 1.27 1.27))))
+          (number "19" (effects (font (size 1.27 1.27))))
         )
         (pin bidirectional line (at -17.78 -8.89 0) (length 2.54)
           (name "PB01" (effects (font (size 1.27 1.27))))
           (number "2" (effects (font (size 1.27 1.27))))
         )
+        (pin power_in line (at -1.27 -25.4 90) (length 2.54)
+          (name "GND" (effects (font (size 1.27 1.27))))
+          (number "20" (effects (font (size 1.27 1.27))))
+        )
         (pin bidirectional line (at 17.78 16.51 180) (length 2.54)
           (name "PC00" (effects (font (size 1.27 1.27))))
           (number "21" (effects (font (size 1.27 1.27))))
@@ -323,29 +305,49 @@
           (name "RESETn" (effects (font (size 1.27 1.27))))
           (number "27" (effects (font (size 1.27 1.27))))
         )
+        (pin power_in line (at 1.27 -25.4 90) (length 2.54)
+          (name "GND" (effects (font (size 1.27 1.27))))
+          (number "28" (effects (font (size 1.27 1.27))))
+        )
         (pin input line (at -17.78 -12.7 0) (length 2.54)
           (name "RF2G4_IO2" (effects (font (size 1.27 1.27))))
           (number "29" (effects (font (size 1.27 1.27))))
         )
-        (pin bidirectional line (at 17.78 0 180) (length 2.54)
-          (name "PD00" (effects (font (size 1.27 1.27))))
-          (number "19" (effects (font (size 1.27 1.27))))
+        (pin bidirectional line (at -17.78 -6.35 0) (length 2.54)
+          (name "PB00" (effects (font (size 1.27 1.27))))
+          (number "3" (effects (font (size 1.27 1.27))))
         )
-        (pin bidirectional line (at 17.78 -2.54 180) (length 2.54)
-          (name "PD01" (effects (font (size 1.27 1.27))))
-          (number "18" (effects (font (size 1.27 1.27))))
+        (pin power_in line (at 3.81 -25.4 90) (length 2.54)
+          (name "GND" (effects (font (size 1.27 1.27))))
+          (number "30" (effects (font (size 1.27 1.27))))
         )
-        (pin bidirectional line (at 17.78 -5.08 180) (length 2.54)
-          (name "PD02" (effects (font (size 1.27 1.27))))
-          (number "17" (effects (font (size 1.27 1.27))))
+        (pin power_in line (at 6.35 -25.4 90) (length 2.54)
+          (name "GND" (effects (font (size 1.27 1.27))))
+          (number "31" (effects (font (size 1.27 1.27))))
         )
-        (pin bidirectional line (at 17.78 -7.62 180) (length 2.54)
-          (name "PD03" (effects (font (size 1.27 1.27))))
-          (number "16" (effects (font (size 1.27 1.27))))
+        (pin bidirectional line (at -17.78 16.51 0) (length 2.54)
+          (name "PA00" (effects (font (size 1.27 1.27))))
+          (number "4" (effects (font (size 1.27 1.27))))
         )
-        (pin bidirectional line (at 17.78 -10.16 180) (length 2.54)
-          (name "PD04" (effects (font (size 1.27 1.27))))
-          (number "15" (effects (font (size 1.27 1.27))))
+        (pin bidirectional line (at -17.78 13.97 0) (length 2.54)
+          (name "PA01" (effects (font (size 1.27 1.27))))
+          (number "5" (effects (font (size 1.27 1.27))))
+        )
+        (pin bidirectional line (at -17.78 11.43 0) (length 2.54)
+          (name "PA02" (effects (font (size 1.27 1.27))))
+          (number "6" (effects (font (size 1.27 1.27))))
+        )
+        (pin bidirectional line (at -17.78 8.89 0) (length 2.54)
+          (name "PA03" (effects (font (size 1.27 1.27))))
+          (number "7" (effects (font (size 1.27 1.27))))
+        )
+        (pin bidirectional line (at -17.78 6.35 0) (length 2.54)
+          (name "PA04" (effects (font (size 1.27 1.27))))
+          (number "8" (effects (font (size 1.27 1.27))))
+        )
+        (pin bidirectional line (at -17.78 3.81 0) (length 2.54)
+          (name "PA05" (effects (font (size 1.27 1.27))))
+          (number "9" (effects (font (size 1.27 1.27))))
         )
       )
     )
@@ -800,42 +802,10 @@
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 69ee76f7-de4a-43ee-a52f-bc838d7d7b9f)
   )
-  (bus (pts (xy 51.435 57.15) (xy 51.435 59.69))
-    (stroke (width 0) (type solid) (color 0 0 0 0))
-    (uuid b9a363a8-1667-4e4a-9edf-f557a160261c)
-  )
-  (bus (pts (xy 51.435 59.69) (xy 51.435 62.23))
-    (stroke (width 0) (type solid) (color 0 0 0 0))
-    (uuid f02180d5-ac09-445d-8fff-842b9ecc7b1a)
-  )
-  (bus (pts (xy 51.435 62.23) (xy 51.435 64.77))
-    (stroke (width 0) (type solid) (color 0 0 0 0))
-    (uuid c46de4a5-b471-451a-a47b-a9fe4ab1bb6b)
-  )
-  (bus (pts (xy 51.435 64.77) (xy 51.435 67.31))
-    (stroke (width 0) (type solid) (color 0 0 0 0))
-    (uuid f3ee0e5f-fc31-417d-a9ac-216c155c7bc9)
-  )
-  (bus (pts (xy 51.435 67.31) (xy 51.435 69.85))
+  (bus (pts (xy 51.435 57.15) (xy 51.435 80.01))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid d27cc688-5988-4a06-b97a-f56e1d17703b)
   )
-  (bus (pts (xy 51.435 69.85) (xy 51.435 72.39))
-    (stroke (width 0) (type solid) (color 0 0 0 0))
-    (uuid 1879de5e-3ef1-44c0-b5ef-6f85793f02de)
-  )
-  (bus (pts (xy 51.435 72.39) (xy 51.435 74.93))
-    (stroke (width 0) (type solid) (color 0 0 0 0))
-    (uuid 2118932e-e222-4c40-9106-85aa3cfce542)
-  )
-  (bus (pts (xy 51.435 74.93) (xy 51.435 77.47))
-    (stroke (width 0) (type solid) (color 0 0 0 0))
-    (uuid 65bf459b-1ec2-4dae-9157-d62faff95d25)
-  )
-  (bus (pts (xy 51.435 77.47) (xy 51.435 80.01))
-    (stroke (width 0) (type solid) (color 0 0 0 0))
-    (uuid ec5ae5f9-deec-4393-9327-a7a3eb2f648c)
-  )
 
   (text "50Ω trace, 2.6 mm length" (at 190.5 58.42 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
@@ -1043,7 +1013,7 @@
   (symbol (lib_id "power:+3V3") (at 98.425 80.01 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 03ebd447-e57d-4441-9d75-027b7fbfada0)
-    (property "Reference" "#PWR?" (id 0) (at 98.425 83.82 0)
+    (property "Reference" "#PWR0199" (id 0) (at 98.425 83.82 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "+3V3" (id 1) (at 99.06 74.295 0))
@@ -1091,7 +1061,7 @@
   (symbol (lib_id "power:+3V3") (at 175.26 87.63 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 6e5a5be6-cf85-47db-9594-c5ba782ec7ce)
-    (property "Reference" "#PWR?" (id 0) (at 175.26 91.44 0)
+    (property "Reference" "#PWR0200" (id 0) (at 175.26 91.44 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "+3V3" (id 1) (at 175.895 81.915 0))
@@ -1173,9 +1143,9 @@
   (symbol (lib_id "Device:R_Small") (at 89.535 90.17 90) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 4cc6d309-4f77-41d2-b317-a1c1631529ab)
-    (property "Reference" "R?" (id 0) (at 90.17 84.455 90))
+    (property "Reference" "R23" (id 0) (at 90.17 84.455 90))
     (property "Value" "1k" (id 1) (at 90.17 86.995 90))
-    (property "Footprint" "" (id 2) (at 89.535 90.17 0)
+    (property "Footprint" "Resistor_SMD:R_0402_1005Metric" (id 2) (at 89.535 90.17 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 89.535 90.17 0)
@@ -1188,13 +1158,13 @@
   (symbol (lib_id "Device:R_Small") (at 98.425 85.09 180) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 2d75dfee-ac09-45c1-81e5-2a0d40c4d6bd)
-    (property "Reference" "R?" (id 0) (at 100.965 83.82 0)
+    (property "Reference" "R24" (id 0) (at 100.965 83.82 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
     (property "Value" "10k" (id 1) (at 100.965 86.36 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "" (id 2) (at 98.425 85.09 0)
+    (property "Footprint" "Resistor_SMD:R_0402_1005Metric" (id 2) (at 98.425 85.09 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 98.425 85.09 0)
@@ -1207,13 +1177,13 @@
   (symbol (lib_id "Device:R_Small") (at 175.26 92.71 180) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 48f087d3-6913-48e0-9a81-b5a4d1062cb0)
-    (property "Reference" "R?" (id 0) (at 177.8 91.44 0)
+    (property "Reference" "R25" (id 0) (at 177.8 91.44 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
     (property "Value" "10k" (id 1) (at 177.8 93.98 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "" (id 2) (at 175.26 92.71 0)
+    (property "Footprint" "Resistor_SMD:R_0402_1005Metric" (id 2) (at 175.26 92.71 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 175.26 92.71 0)
@@ -1320,23 +1290,18 @@
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid bdeccfdb-9b7f-4c3d-a021-cb13485bd539))
-    (pin "12" (uuid 76f73e59-3920-4cff-a2d4-658a52dc8bf0))
-    (pin "20" (uuid 57057edc-594e-4af9-a32c-08277951d601))
-    (pin "28" (uuid e16274c9-bec8-4b55-a829-27ac5e143e1e))
-    (pin "30" (uuid 353fe99b-3271-4372-9f58-d6eb4b25f2b8))
-    (pin "31" (uuid 571e444c-3fc3-4812-a942-8444d48d28af))
-    (pin "13" (uuid 2da01323-e474-483e-8a96-46d46af25f8d))
-    (pin "14" (uuid fe269db1-2f18-433f-b47e-69e5b36b7a9b))
-    (pin "4" (uuid b60d7587-931f-4bd1-9628-3f18baed2e20))
-    (pin "5" (uuid be5551cf-2327-47b8-9274-0782eae0962f))
-    (pin "6" (uuid 46a546bc-9826-44fb-a66c-f1abf8023e07))
-    (pin "7" (uuid 13a5ee7c-3e11-4c64-aa03-0bc24912658a))
-    (pin "8" (uuid ab5519b9-f1b3-4221-b4bc-d0747c6621e6))
-    (pin "9" (uuid 872deb97-7e30-424a-8483-055285b8aece))
     (pin "10" (uuid 87ac2d33-ebdd-4e19-9991-1a5a02fa748c))
     (pin "11" (uuid 13bcda5d-7367-45bd-9af1-124e486a7941))
-    (pin "3" (uuid 2c5b3469-d900-4306-80ef-34c572f8687d))
+    (pin "12" (uuid 76f73e59-3920-4cff-a2d4-658a52dc8bf0))
+    (pin "13" (uuid 2da01323-e474-483e-8a96-46d46af25f8d))
+    (pin "14" (uuid fe269db1-2f18-433f-b47e-69e5b36b7a9b))
+    (pin "15" (uuid 4b5390cd-a499-4c84-bf8b-3e137b2e3151))
+    (pin "16" (uuid 18e46d78-9769-4a4c-8583-117d2186b471))
+    (pin "17" (uuid 4b55b726-cbb9-40fe-b133-8839db5424a7))
+    (pin "18" (uuid fc1cfe42-7d93-4e11-963f-575d386adc22))
+    (pin "19" (uuid 984edf3d-64bc-4560-97e1-6054f3feab5d))
     (pin "2" (uuid 2fa1f042-1b5c-4304-adb0-ce45a6c95fb0))
+    (pin "20" (uuid 57057edc-594e-4af9-a32c-08277951d601))
     (pin "21" (uuid c68b400f-3abb-4c97-a1f4-ee0c1b763a4a))
     (pin "22" (uuid 682afb98-6ab0-4497-9f2a-4ca5e30ed9a3))
     (pin "23" (uuid ecc90579-9af4-4d9d-9b90-d8bad6641235))
@@ -1344,11 +1309,16 @@
     (pin "25" (uuid 285d3059-cca1-4b68-aea4-35a32c954802))
     (pin "26" (uuid af998e0f-2f9e-4661-9324-8fe9bde0dbb3))
     (pin "27" (uuid 0d2459dd-98a3-4920-baaf-036e73da4456))
+    (pin "28" (uuid e16274c9-bec8-4b55-a829-27ac5e143e1e))
     (pin "29" (uuid 5aa1b7c1-667e-43d5-a13a-a9a8b5ab8641))
-    (pin "19" (uuid 984edf3d-64bc-4560-97e1-6054f3feab5d))
-    (pin "18" (uuid fc1cfe42-7d93-4e11-963f-575d386adc22))
-    (pin "17" (uuid 4b55b726-cbb9-40fe-b133-8839db5424a7))
-    (pin "16" (uuid 18e46d78-9769-4a4c-8583-117d2186b471))
-    (pin "15" (uuid 4b5390cd-a499-4c84-bf8b-3e137b2e3151))
+    (pin "3" (uuid 2c5b3469-d900-4306-80ef-34c572f8687d))
+    (pin "30" (uuid 353fe99b-3271-4372-9f58-d6eb4b25f2b8))
+    (pin "31" (uuid 571e444c-3fc3-4812-a942-8444d48d28af))
+    (pin "4" (uuid b60d7587-931f-4bd1-9628-3f18baed2e20))
+    (pin "5" (uuid be5551cf-2327-47b8-9274-0782eae0962f))
+    (pin "6" (uuid 46a546bc-9826-44fb-a66c-f1abf8023e07))
+    (pin "7" (uuid 13a5ee7c-3e11-4c64-aa03-0bc24912658a))
+    (pin "8" (uuid ab5519b9-f1b3-4221-b4bc-d0747c6621e6))
+    (pin "9" (uuid 872deb97-7e30-424a-8483-055285b8aece))
   )
 )
diff --git a/USB.kicad_sch b/USB.kicad_sch
index 2d51dd5..314f066 100644
--- a/USB.kicad_sch
+++ b/USB.kicad_sch
@@ -1888,9 +1888,9 @@
     )
   )
 
-  (bus_alias "I2C" (members "SDA" "SCL"))
-  (bus_alias "USB" (members "D+" "D-"))
   (bus_alias "CM4_USB" (members "CM4_USB_D+" "CM4_USB_D-" "CM4_USB_OTG_ID"))
+  (bus_alias "USB" (members "D+" "D-"))
+  (bus_alias "I2C" (members "SDA" "SCL"))
   (junction (at 22.86 80.01) (diameter 0.9144) (color 0 0 0 0))
   (junction (at 22.86 88.9) (diameter 0.9144) (color 0 0 0 0))
   (junction (at 24.765 187.325) (diameter 0.9144) (color 0 0 0 0))
@@ -4540,7 +4540,7 @@
   (symbol (lib_id "Device:C_Small") (at 88.9 158.115 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 1dfce5aa-c3ab-4d28-a924-b4d02317ef9d)
-    (property "Reference" "C?" (id 0) (at 91.2242 156.9656 0)
+    (property "Reference" "C7" (id 0) (at 91.2242 156.9656 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "4u7" (id 1) (at 91.224 159.264 0)
@@ -4578,7 +4578,7 @@
   (symbol (lib_id "Device:C_Small") (at 96.52 158.115 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid f4c0e25b-a2e3-4b87-b385-be98b50df69b)
-    (property "Reference" "C?" (id 0) (at 98.8442 156.9656 0)
+    (property "Reference" "C15" (id 0) (at 98.8442 156.9656 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "100n" (id 1) (at 98.844 159.264 0)
@@ -4597,7 +4597,7 @@
   (symbol (lib_id "Device:C_Small") (at 109.855 75.565 270) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 057b3f3e-71d6-4e24-8ee0-04feb37f7702)
-    (property "Reference" "C?" (id 0) (at 105.9244 77.8892 90)
+    (property "Reference" "C40" (id 0) (at 105.9244 77.8892 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "1u" (id 1) (at 111.246 77.889 90)
@@ -4670,7 +4670,7 @@
   (symbol (lib_id "Device:C_Small") (at 251.46 40.64 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid d14a449c-b67d-4418-9050-07e4987428c5)
-    (property "Reference" "C?" (id 0) (at 253.7842 39.4906 0)
+    (property "Reference" "C41" (id 0) (at 253.7842 39.4906 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "100u" (id 1) (at 253.784 41.789 0)
@@ -4746,13 +4746,13 @@
   (symbol (lib_id "Jumper:Jumper_3_Bridged12") (at 76.2 187.325 90) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 21f085b4-1176-4778-97ba-f2d2acc22e65)
-    (property "Reference" "JP?" (id 0) (at 82.55 180.3399 90)
+    (property "Reference" "JP1" (id 0) (at 82.55 180.3399 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "JP_USB_DEVICE_SEL" (id 1) (at 98.425 182.8799 90)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
-    (property "Footprint" "" (id 2) (at 76.2 187.325 0)
+    (property "Footprint" "Connector_PinHeader_2.54mm:PinHeader_1x03_P2.54mm_Vertical" (id 2) (at 76.2 187.325 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 76.2 187.325 0)
diff --git a/sdcard.kicad_sch b/sdcard.kicad_sch
index 334adbf..22fb6c9 100644
--- a/sdcard.kicad_sch
+++ b/sdcard.kicad_sch
@@ -1,4 +1,6 @@
-(kicad_sch (version 20210126) (generator eeschema)
+(kicad_sch (version 20210406) (generator eeschema)
+
+  (uuid 9f52fa22-0e20-42b5-9ee4-277d84cde590)
 
   (paper "A4")
 
@@ -486,35 +488,7 @@
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid f68525b0-ca3a-49ec-9781-c748c2a6992a)
   )
-  (bus (pts (xy 55.88 57.15) (xy 55.88 58.42))
-    (stroke (width 0) (type solid) (color 0 0 0 0))
-    (uuid d1d0531e-e9a5-4412-a414-84913f58dce6)
-  )
-  (bus (pts (xy 55.88 58.42) (xy 55.88 60.96))
-    (stroke (width 0) (type solid) (color 0 0 0 0))
-    (uuid 94af499e-c799-4fca-b0bc-881e7f7c99ff)
-  )
-  (bus (pts (xy 55.88 63.5) (xy 55.88 60.96))
-    (stroke (width 0) (type solid) (color 0 0 0 0))
-    (uuid 4fc8ec37-a85e-4283-ba9c-ef9721e3b680)
-  )
-  (bus (pts (xy 55.88 63.5) (xy 55.88 68.58))
-    (stroke (width 0) (type solid) (color 0 0 0 0))
-    (uuid 931b0fb2-5683-44ca-a00a-4597a36044d5)
-  )
-  (bus (pts (xy 55.88 68.58) (xy 55.88 73.66))
-    (stroke (width 0) (type solid) (color 0 0 0 0))
-    (uuid 6243f6b2-6991-4982-a6e2-5282f7e82006)
-  )
-  (bus (pts (xy 55.88 76.2) (xy 55.88 73.66))
-    (stroke (width 0) (type solid) (color 0 0 0 0))
-    (uuid 596693d6-a730-4009-bc16-c07473d2a2d2)
-  )
-  (bus (pts (xy 55.88 76.2) (xy 55.88 81.28))
-    (stroke (width 0) (type solid) (color 0 0 0 0))
-    (uuid 38d30908-6173-4916-afd7-5181f15cd9d0)
-  )
-  (bus (pts (xy 55.88 81.28) (xy 55.88 106.68))
+  (bus (pts (xy 55.88 57.15) (xy 55.88 106.68))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 081f2a84-8c08-4607-8a72-897bbd9af2f2)
   )
@@ -568,7 +542,7 @@
   (symbol (lib_id "power:+3V3") (at 72.39 99.06 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 6768938c-01e5-466e-aed5-9432d5d4e836)
-    (property "Reference" "#PWR?" (id 0) (at 72.39 102.87 0)
+    (property "Reference" "#PWR0288" (id 0) (at 72.39 102.87 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "+3V3" (id 1) (at 73.66 93.98 0))
@@ -700,7 +674,7 @@
   (symbol (lib_id "Device:R_Small") (at 72.39 102.87 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 0cc85d72-d8a5-4c7a-9558-d741ba5bb7fd)
-    (property "Reference" "R?" (id 0) (at 74.93 101.6 0))
+    (property "Reference" "R67" (id 0) (at 74.93 101.6 0))
     (property "Value" "10k" (id 1) (at 74.93 104.14 0))
     (property "Footprint" "Resistor_SMD:R_0402_1005Metric" (id 2) (at 72.39 102.87 0)
       (effects (font (size 1.27 1.27)) hide)