Multiple changes in schematic & projects:

-Added net classes for controlled impedance traces -Added power hierarchical sheet -Initial USB subsystem schematic -Added multiple bus definitions (usb, pcie, i2c etc.) -Fixed busses use -Added LDO for audio analog rails Signed-off-by: Dominik Sliwa <dominik@sliwa.io>
2025-10-27 12:04:18 -07:00 · 2021-01-16 19:23:31 +01:00
parent c769e32923
commit ad4cc7b761
10 changed files with 6202 additions and 1094 deletions
--- a/Audio.kicad_sch
+++ b/Audio.kicad_sch
--- a/CM4.kicad_sch
+++ b/CM4.kicad_sch
--- a/Ethernet.kicad_sch
+++ b/Ethernet.kicad_sch
@@ -3,6 +3,55 @@
  (paper "A4")
  (lib_symbols
    (symbol "Device:C_Small" (pin_numbers hide) (pin_names (offset 0.254) hide) (in_bom yes) (on_board yes)
      (property "Reference" "C" (id 0) (at 0.254 1.778 0)
        (effects (font (size 1.27 1.27)) (justify left))
      )
      (property "Value" "C_Small" (id 1) (at 0.254 -2.032 0)
        (effects (font (size 1.27 1.27)) (justify left))
      )
      (property "Footprint" "" (id 2) (at 0 0 0)
        (effects (font (size 1.27 1.27)) hide)
      )
      (property "Datasheet" "~" (id 3) (at 0 0 0)
        (effects (font (size 1.27 1.27)) hide)
      )
      (property "ki_keywords" "capacitor cap" (id 4) (at 0 0 0)
        (effects (font (size 1.27 1.27)) hide)
      )
      (property "ki_description" "Unpolarized capacitor, small symbol" (id 5) (at 0 0 0)
        (effects (font (size 1.27 1.27)) hide)
      )
      (property "ki_fp_filters" "C_*" (id 6) (at 0 0 0)
        (effects (font (size 1.27 1.27)) hide)
      )
      (symbol "C_Small_0_1"
        (polyline
          (pts
            (xy -1.524 -0.508)
            (xy 1.524 -0.508)
          )
          (stroke (width 0.3302)) (fill (type none))
        )
        (polyline
          (pts
            (xy -1.524 0.508)
            (xy 1.524 0.508)
          )
          (stroke (width 0.3048)) (fill (type none))
        )
      )
      (symbol "C_Small_1_1"
        (pin passive line (at 0 2.54 270) (length 2.032)
          (name "~" (effects (font (size 1.27 1.27))))
          (number "1" (effects (font (size 1.27 1.27))))
        )
        (pin passive line (at 0 -2.54 90) (length 2.032)
          (name "~" (effects (font (size 1.27 1.27))))
          (number "2" (effects (font (size 1.27 1.27))))
        )
      )
    )
    (symbol "Device:R_Small" (pin_numbers hide) (pin_names (offset 0.254) hide) (in_bom yes) (on_board yes)
      (property "Reference" "R" (id 0) (at 0.762 0.508 0)
        (effects (font (size 1.27 1.27)) (justify left))
@@ -2058,6 +2107,55 @@
        )
      )
    )
    (symbol "power:+3V3" (power) (pin_names (offset 0)) (in_bom yes) (on_board yes)
      (property "Reference" "#PWR" (id 0) (at 0 -3.81 0)
        (effects (font (size 1.27 1.27)) hide)
      )
      (property "Value" "+3V3" (id 1) (at 0 3.556 0)
        (effects (font (size 1.27 1.27)))
      )
      (property "Footprint" "" (id 2) (at 0 0 0)
        (effects (font (size 1.27 1.27)) hide)
      )
      (property "Datasheet" "" (id 3) (at 0 0 0)
        (effects (font (size 1.27 1.27)) hide)
      )
      (property "ki_keywords" "power-flag" (id 4) (at 0 0 0)
        (effects (font (size 1.27 1.27)) hide)
      )
      (property "ki_description" "Power symbol creates a global label with name \"+3V3\"" (id 5) (at 0 0 0)
        (effects (font (size 1.27 1.27)) hide)
      )
      (symbol "+3V3_0_1"
        (polyline
          (pts
            (xy -0.762 1.27)
            (xy 0 2.54)
          )
          (stroke (width 0)) (fill (type none))
        )
        (polyline
          (pts
            (xy 0 0)
            (xy 0 2.54)
          )
          (stroke (width 0)) (fill (type none))
        )
        (polyline
          (pts
            (xy 0 2.54)
            (xy 0.762 1.27)
          )
          (stroke (width 0)) (fill (type none))
        )
      )
      (symbol "+3V3_1_1"
        (pin power_in line (at 0 0 90) (length 0) hide
          (name "+3V3" (effects (font (size 1.27 1.27))))
          (number "1" (effects (font (size 1.27 1.27))))
        )
      )
    )
    (symbol "power:GND" (power) (pin_names (offset 0)) (in_bom yes) (on_board yes)
      (property "Reference" "#PWR" (id 0) (at 0 -6.35 0)
        (effects (font (size 1.27 1.27)) hide)
@@ -2099,428 +2197,507 @@
    )
  )
  (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))
-  (bus_entry (at 55.88 34.29) (size 2.54 2.54)
+  (bus_entry (at 128.27 53.34) (size 2.54 2.54)
    (stroke (width 0.1524) (type solid) (color 0 0 0 0))
  )
-  (bus_entry (at 55.88 37.465) (size 2.54 2.54)
+  (bus_entry (at 128.27 58.42) (size 2.54 2.54)
    (stroke (width 0.1524) (type solid) (color 0 0 0 0))
  )
-  (bus_entry (at 55.88 40.64) (size 2.54 2.54)
+  (bus_entry (at 128.27 63.5) (size 2.54 2.54)
    (stroke (width 0.1524) (type solid) (color 0 0 0 0))
  )
-  (bus_entry (at 55.88 43.815) (size 2.54 2.54)
+  (bus_entry (at 128.27 67.31) (size 2.54 2.54)
    (stroke (width 0.1524) (type solid) (color 0 0 0 0))
  )
-  (bus_entry (at 55.88 46.99) (size 2.54 2.54)
+  (bus_entry (at 128.27 72.39) (size 2.54 2.54)
    (stroke (width 0.1524) (type solid) (color 0 0 0 0))
  )
-  (bus_entry (at 55.88 50.165) (size 2.54 2.54)
+  (bus_entry (at 128.27 82.55) (size 2.54 2.54)
    (stroke (width 0.1524) (type solid) (color 0 0 0 0))
  )
-  (bus_entry (at 55.88 53.34) (size 2.54 2.54)
+  (bus_entry (at 128.27 87.63) (size 2.54 2.54)
    (stroke (width 0.1524) (type solid) (color 0 0 0 0))
  )
-  (bus_entry (at 55.88 56.515) (size 2.54 2.54)
+  (bus_entry (at 128.27 91.44) (size 2.54 2.54)
    (stroke (width 0.1524) (type solid) (color 0 0 0 0))
  )
-  (bus_entry (at 55.88 59.69) (size 2.54 2.54)
+  (bus_entry (at 128.27 96.52) (size 2.54 2.54)
    (stroke (width 0.1524) (type solid) (color 0 0 0 0))
  )
-  (bus_entry (at 55.88 62.865) (size 2.54 2.54)
+  (bus_entry (at 128.27 116.84) (size 2.54 2.54)
    (stroke (width 0.1524) (type solid) (color 0 0 0 0))
  )
-  (bus_entry (at 55.88 80.01) (size 2.54 2.54)
+  (bus_entry (at 149.86 104.14) (size -2.54 -2.54)
    (stroke (width 0.1524) (type solid) (color 0 0 0 0))
  )
-  (bus_entry (at 55.88 82.55) (size 2.54 2.54)
+  (bus_entry (at 149.86 106.68) (size -2.54 -2.54)
    (stroke (width 0.1524) (type solid) (color 0 0 0 0))
  )
-  (bus_entry (at 55.88 85.09) (size 2.54 2.54)
+  (bus_entry (at 149.86 109.22) (size -2.54 -2.54)
    (stroke (width 0.1524) (type solid) (color 0 0 0 0))
  )
-  (bus_entry (at 55.88 87.63) (size 2.54 2.54)
+  (bus_entry (at 149.86 111.76) (size -2.54 -2.54)
    (stroke (width 0.1524) (type solid) (color 0 0 0 0))
  )
-  (wire (pts (xy 58.42 36.83) (xy 63.5 36.83))
+  (wire (pts (xy 62.23 59.69) (xy 72.39 59.69))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (wire (pts (xy 58.42 40.005) (xy 63.5 40.005))
+  (wire (pts (xy 62.23 64.77) (xy 72.39 64.77))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (wire (pts (xy 58.42 43.18) (xy 63.5 43.18))
+  (wire (pts (xy 62.23 92.71) (xy 72.39 92.71))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (wire (pts (xy 58.42 46.355) (xy 63.5 46.355))
+  (wire (pts (xy 62.23 97.79) (xy 72.39 97.79))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (wire (pts (xy 58.42 49.53) (xy 63.5 49.53))
+  (wire (pts (xy 85.09 74.93) (xy 85.09 77.47))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (wire (pts (xy 58.42 52.705) (xy 63.5 52.705))
+  (wire (pts (xy 85.09 77.47) (xy 82.55 77.47))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (wire (pts (xy 58.42 55.88) (xy 63.5 55.88))
+  (wire (pts (xy 85.09 107.95) (xy 85.09 110.49))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (wire (pts (xy 58.42 59.055) (xy 63.5 59.055))
+  (wire (pts (xy 85.09 110.49) (xy 82.55 110.49))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (wire (pts (xy 58.42 62.23) (xy 69.85 62.23))
+  (wire (pts (xy 97.79 59.69) (xy 107.95 59.69))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (wire (pts (xy 58.42 65.405) (xy 69.85 65.405))
+  (wire (pts (xy 97.79 64.77) (xy 107.95 64.77))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (wire (pts (xy 58.42 82.55) (xy 63.5 82.55))
+  (wire (pts (xy 97.79 92.71) (xy 107.95 92.71))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (wire (pts (xy 58.42 85.09) (xy 63.5 85.09))
+  (wire (pts (xy 97.79 97.79) (xy 107.95 97.79))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (wire (pts (xy 58.42 87.63) (xy 63.5 87.63))
+  (wire (pts (xy 130.81 55.88) (xy 146.05 55.88))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (wire (pts (xy 58.42 90.17) (xy 63.5 90.17))
+  (wire (pts (xy 130.81 60.96) (xy 154.94 60.96))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (wire (pts (xy 86.36 46.99) (xy 91.44 46.99))
+  (wire (pts (xy 130.81 66.04) (xy 154.94 66.04))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (wire (pts (xy 86.36 52.07) (xy 91.44 52.07))
+  (wire (pts (xy 130.81 69.85) (xy 154.94 69.85))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (wire (pts (xy 86.36 80.01) (xy 91.44 80.01))
+  (wire (pts (xy 130.81 74.93) (xy 154.94 74.93))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (wire (pts (xy 86.36 85.09) (xy 91.44 85.09))
+  (wire (pts (xy 130.81 85.09) (xy 154.94 85.09))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (wire (pts (xy 116.84 46.99) (xy 121.92 46.99))
+  (wire (pts (xy 130.81 90.17) (xy 154.94 90.17))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (wire (pts (xy 116.84 52.07) (xy 121.92 52.07))
+  (wire (pts (xy 130.81 93.98) (xy 154.94 93.98))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (wire (pts (xy 116.84 80.01) (xy 121.92 80.01))
+  (wire (pts (xy 130.81 99.06) (xy 154.94 99.06))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (wire (pts (xy 116.84 85.09) (xy 121.92 85.09))
+  (wire (pts (xy 130.81 119.38) (xy 146.05 119.38))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (wire (pts (xy 142.24 38.1) (xy 154.94 38.1))
+  (wire (pts (xy 142.24 80.01) (xy 144.78 80.01))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (wire (pts (xy 142.24 101.6) (xy 154.94 101.6))
+  (wire (pts (xy 149.86 80.01) (xy 153.67 80.01))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (wire (pts (xy 160.02 38.1) (xy 167.64 38.1))
+  (wire (pts (xy 149.86 104.14) (xy 154.94 104.14))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (wire (pts (xy 160.02 101.6) (xy 167.64 101.6))
+  (wire (pts (xy 149.86 106.68) (xy 154.94 106.68))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (wire (pts (xy 161.29 35.56) (xy 167.64 35.56))
+  (wire (pts (xy 149.86 109.22) (xy 154.94 109.22))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (wire (pts (xy 161.29 99.06) (xy 167.64 99.06))
+  (wire (pts (xy 149.86 111.76) (xy 154.94 111.76))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (wire (pts (xy 162.56 43.18) (xy 167.64 43.18))
+  (wire (pts (xy 151.13 55.88) (xy 154.94 55.88))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (wire (pts (xy 162.56 48.26) (xy 167.64 48.26))
+  (wire (pts (xy 151.13 119.38) (xy 154.94 119.38))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (wire (pts (xy 162.56 52.07) (xy 167.64 52.07))
+  (wire (pts (xy 152.4 116.84) (xy 154.94 116.84))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (wire (pts (xy 162.56 57.15) (xy 167.64 57.15))
+  (wire (pts (xy 153.67 53.34) (xy 153.67 49.53))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (wire (pts (xy 162.56 67.31) (xy 167.64 67.31))
+  (wire (pts (xy 153.67 78.74) (xy 153.67 80.01))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (wire (pts (xy 162.56 72.39) (xy 167.64 72.39))
+  (wire (pts (xy 153.67 80.01) (xy 153.67 81.28))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (wire (pts (xy 162.56 76.2) (xy 167.64 76.2))
+  (wire (pts (xy 153.67 81.28) (xy 154.94 81.28))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (wire (pts (xy 162.56 81.28) (xy 167.64 81.28))
+  (wire (pts (xy 154.94 53.34) (xy 153.67 53.34))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (wire (pts (xy 162.56 86.36) (xy 167.64 86.36))
+  (wire (pts (xy 154.94 78.74) (xy 153.67 78.74))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (wire (pts (xy 162.56 88.9) (xy 167.64 88.9))
+  (wire (pts (xy 172.72 130.81) (xy 172.72 133.35))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (wire (pts (xy 162.56 91.44) (xy 167.64 91.44))
+  (wire (pts (xy 172.72 138.43) (xy 172.72 139.7))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (wire (pts (xy 162.56 93.98) (xy 167.64 93.98))
+  (wire (pts (xy 172.72 139.7) (xy 179.07 139.7))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (wire (pts (xy 190.5 107.95) (xy 190.5 110.49))
+  (wire (pts (xy 177.8 125.73) (xy 177.8 130.81))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (bus (pts (xy 49.53 76.835) (xy 55.88 76.835))
+  (wire (pts (xy 177.8 130.81) (xy 172.72 130.81))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (bus (pts (xy 50.8 29.21) (xy 55.88 29.21))
+  (wire (pts (xy 179.07 139.7) (xy 179.07 140.97))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (bus (pts (xy 55.88 29.21) (xy 55.88 34.29))
+  (wire (pts (xy 179.07 139.7) (xy 184.15 139.7))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (bus (pts (xy 55.88 34.29) (xy 55.88 37.465))
+  (wire (pts (xy 184.15 130.81) (xy 177.8 130.81))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (bus (pts (xy 55.88 37.465) (xy 55.88 40.64))
+  (wire (pts (xy 184.15 133.35) (xy 184.15 130.81))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (bus (pts (xy 55.88 40.64) (xy 55.88 43.815))
+  (wire (pts (xy 184.15 139.7) (xy 184.15 138.43))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (bus (pts (xy 55.88 43.815) (xy 55.88 46.99))
+  (bus (pts (xy 124.46 53.34) (xy 128.27 53.34))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (bus (pts (xy 55.88 46.99) (xy 55.88 50.165))
+  (bus (pts (xy 128.27 53.34) (xy 128.27 58.42))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (bus (pts (xy 55.88 50.165) (xy 55.88 53.34))
+  (bus (pts (xy 128.27 58.42) (xy 128.27 63.5))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (bus (pts (xy 55.88 53.34) (xy 55.88 56.515))
+  (bus (pts (xy 128.27 63.5) (xy 128.27 67.31))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (bus (pts (xy 55.88 56.515) (xy 55.88 59.69))
+  (bus (pts (xy 128.27 67.31) (xy 128.27 72.39))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (bus (pts (xy 55.88 59.69) (xy 55.88 62.865))
+  (bus (pts (xy 128.27 72.39) (xy 128.27 82.55))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (bus (pts (xy 55.88 62.865) (xy 55.88 65.405))
+  (bus (pts (xy 128.27 82.55) (xy 128.27 87.63))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (bus (pts (xy 55.88 76.835) (xy 55.88 80.01))
+  (bus (pts (xy 128.27 87.63) (xy 128.27 91.44))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (bus (pts (xy 55.88 80.01) (xy 55.88 82.55))
+  (bus (pts (xy 128.27 91.44) (xy 128.27 96.52))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (bus (pts (xy 55.88 82.55) (xy 55.88 85.09))
+  (bus (pts (xy 128.27 96.52) (xy 128.27 116.84))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (bus (pts (xy 55.88 85.09) (xy 55.88 87.63))
+  (bus (pts (xy 143.51 101.6) (xy 147.32 101.6))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (bus (pts (xy 55.88 87.63) (xy 55.88 90.17))
+  (bus (pts (xy 147.32 101.6) (xy 147.32 104.14))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
  (bus (pts (xy 147.32 104.14) (xy 147.32 106.68))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
  (bus (pts (xy 147.32 106.68) (xy 147.32 109.22))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (label "TD1+" (at 63.5 36.83 180)
+  (label "ETH.TD1+" (at 62.23 59.69 0)
    (effects (font (size 1.27 1.27)) (justify left bottom))
  )
  (label "ETH.TD1-" (at 62.23 64.77 0)
    (effects (font (size 1.27 1.27)) (justify left bottom))
  )
  (label "ETH.TD3+" (at 62.23 92.71 0)
    (effects (font (size 1.27 1.27)) (justify left bottom))
  )
  (label "ETH.TD3-" (at 62.23 97.79 0)
    (effects (font (size 1.27 1.27)) (justify left bottom))
  )
  (label "ETH.TD2+" (at 107.95 59.69 180)
    (effects (font (size 1.27 1.27)) (justify right bottom))
  )
-  (label "TD1-" (at 63.5 40.005 180)
+  (label "ETH.TD2-" (at 107.95 64.77 180)
    (effects (font (size 1.27 1.27)) (justify right bottom))
  )
-  (label "TD2+" (at 63.5 43.18 180)
+  (label "ETH.TD4+" (at 107.95 92.71 180)
    (effects (font (size 1.27 1.27)) (justify right bottom))
  )
-  (label "TD2-" (at 63.5 46.355 180)
+  (label "ETH.TD4-" (at 107.95 97.79 180)
    (effects (font (size 1.27 1.27)) (justify right bottom))
  )
-  (label "TD3+" (at 63.5 49.53 180)
+  (label "ETH.LED_GREEN" (at 130.81 55.88 0)
    (effects (font (size 1.27 1.27)) (justify right bottom))
  )
  (label "TD3-" (at 63.5 52.705 180)
    (effects (font (size 1.27 1.27)) (justify right bottom))
  )
  (label "TD4+" (at 63.5 55.88 180)
    (effects (font (size 1.27 1.27)) (justify right bottom))
  )
  (label "TD4-" (at 63.5 59.055 180)
    (effects (font (size 1.27 1.27)) (justify right bottom))
  )
  (label "VC1" (at 63.5 82.55 180)
    (effects (font (size 1.27 1.27)) (justify right bottom))
  )
  (label "VC2" (at 63.5 85.09 180)
    (effects (font (size 1.27 1.27)) (justify right bottom))
  )
  (label "VC3" (at 63.5 87.63 180)
    (effects (font (size 1.27 1.27)) (justify right bottom))
  )
  (label "VC4" (at 63.5 90.17 180)
    (effects (font (size 1.27 1.27)) (justify right bottom))
  )
  (label "LED_YELLOW" (at 69.85 62.23 180)
    (effects (font (size 1.27 1.27)) (justify right bottom))
  )
  (label "LED_GREEN" (at 69.85 65.405 180)
    (effects (font (size 1.27 1.27)) (justify right bottom))
  )
  (label "TD1+" (at 86.36 46.99 0)
    (effects (font (size 1.27 1.27)) (justify left bottom))
  )
-  (label "TD1-" (at 86.36 52.07 0)
+  (label "ETH.LED_YELLOW" (at 130.81 119.38 0)
    (effects (font (size 1.27 1.27)) (justify left bottom))
  )
-  (label "TD3+" (at 86.36 80.01 0)
+  (label "ETH.TD1+" (at 139.7 60.96 0)
    (effects (font (size 1.27 1.27)) (justify left bottom))
  )
-  (label "TD3-" (at 86.36 85.09 0)
+  (label "ETH.TD1-" (at 139.7 66.04 0)
    (effects (font (size 1.27 1.27)) (justify left bottom))
  )
-  (label "TD2+" (at 121.92 46.99 180)
+  (label "ETH.TD2+" (at 139.7 69.85 0)
    (effects (font (size 1.27 1.27)) (justify right bottom))
  )
  (label "TD2-" (at 121.92 52.07 180)
    (effects (font (size 1.27 1.27)) (justify right bottom))
  )
  (label "TD4+" (at 121.92 80.01 180)
    (effects (font (size 1.27 1.27)) (justify right bottom))
  )
  (label "TD4-" (at 121.92 85.09 180)
    (effects (font (size 1.27 1.27)) (justify right bottom))
  )
  (label "LED_GREEN" (at 142.24 38.1 0)
    (effects (font (size 1.27 1.27)) (justify left bottom))
  )
-  (label "LED_YELLOW" (at 142.24 101.6 0)
+  (label "ETH.TD2-" (at 139.7 74.93 0)
    (effects (font (size 1.27 1.27)) (justify left bottom))
  )
-  (label "+3.3V" (at 161.29 35.56 0)
+  (label "ETH.TD3+" (at 139.7 85.09 0)
    (effects (font (size 1.27 1.27)) (justify left bottom))
  )
-  (label "+3.3V" (at 161.29 99.06 0)
+  (label "ETH.TD3-" (at 139.7 90.17 0)
    (effects (font (size 1.27 1.27)) (justify left bottom))
  )
-  (label "TD1+" (at 162.56 43.18 0)
+  (label "ETH.TD4+" (at 139.7 93.98 0)
    (effects (font (size 1.27 1.27)) (justify left bottom))
  )
-  (label "TD1-" (at 162.56 48.26 0)
+  (label "ETH.TD4-" (at 139.7 99.06 0)
    (effects (font (size 1.27 1.27)) (justify left bottom))
  )
-  (label "TD2+" (at 162.56 52.07 0)
+  (label "VC1" (at 149.86 104.14 0)
    (effects (font (size 1.27 1.27)) (justify left bottom))
  )
-  (label "TD2-" (at 162.56 57.15 0)
+  (label "VC2" (at 149.86 106.68 0)
    (effects (font (size 1.27 1.27)) (justify left bottom))
  )
-  (label "TD3+" (at 162.56 67.31 0)
+  (label "VC3" (at 149.86 109.22 0)
    (effects (font (size 1.27 1.27)) (justify left bottom))
  )
-  (label "TD3-" (at 162.56 72.39 0)
+  (label "VC4" (at 149.86 111.76 0)
    (effects (font (size 1.27 1.27)) (justify left bottom))
  )
  (label "TD4+" (at 162.56 76.2 0)
    (effects (font (size 1.27 1.27)) (justify left bottom))
  )
  (label "TD4-" (at 162.56 81.28 0)
    (effects (font (size 1.27 1.27)) (justify left bottom))
  )
  (label "VC1" (at 162.56 86.36 0)
    (effects (font (size 1.27 1.27)) (justify left bottom))
  )
  (label "VC2" (at 162.56 88.9 0)
    (effects (font (size 1.27 1.27)) (justify left bottom))
  )
  (label "VC3" (at 162.56 91.44 0)
    (effects (font (size 1.27 1.27)) (justify left bottom))
  )
  (label "VC4" (at 162.56 93.98 0)
    (effects (font (size 1.27 1.27)) (justify left bottom))
  )
-  (hierarchical_label "PoE" (shape bidirectional) (at 49.53 76.835 180)
+  (hierarchical_label "ETH{ETH}" (shape bidirectional) (at 124.46 53.34 180)
    (effects (font (size 1.27 1.27)) (justify right))
  )
-  (hierarchical_label "Ethernet" (shape bidirectional) (at 50.8 29.21 180)
+  (hierarchical_label "{PoE}" (shape output) (at 143.51 101.6 180)
    (effects (font (size 1.27 1.27)) (justify right))
  )
-  (symbol (lib_id "power:GND") (at 190.5 110.49 0) (unit 1)
+  (symbol (lib_id "power:+3V3") (at 152.4 116.84 90) (unit 1)
    (in_bom yes) (on_board yes)
-    (uuid "63a243b8-0f7c-4234-af2f-e0f272a077aa")
+    (uuid "01e5070a-f04c-4a8e-958c-cb10ff063fb6")
-    (property "Reference" "#PWR?" (id 0) (at 190.5 116.84 0)
+    (property "Reference" "#PWR?" (id 0) (at 156.21 116.84 0)
      (effects (font (size 1.27 1.27)) hide)
    )
-    (property "Value" "GND" (id 1) (at 191.77 115.57 0))
+    (property "Value" "+3V3" (id 1) (at 149.2249 116.4717 90)
    (property "Footprint" "" (id 2) (at 190.5 110.49 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (property "Datasheet" "" (id 3) (at 190.5 110.49 0)
      (effects (font (size 1.27 1.27)) hide)
    )
  )
  (symbol (lib_id "Device:R_Small") (at 157.48 38.1 90) (unit 1)
    (in_bom yes) (on_board yes)
    (uuid "6cf869b7-4906-4269-be48-72d89d3fa069")
    (property "Reference" "R?" (id 0) (at 157.48 33.02 90))
    (property "Value" "470Ω" (id 1) (at 157.48 35.56 90))
    (property "Footprint" "" (id 2) (at 157.48 38.1 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (property "Datasheet" "~" (id 3) (at 157.48 38.1 0)
      (effects (font (size 1.27 1.27)) hide)
    )
  )
  (symbol (lib_id "Device:R_Small") (at 157.48 101.6 90) (unit 1)
    (in_bom yes) (on_board yes)
    (uuid "021dd781-c0a2-4e06-a8a9-18b3d36b8b01")
    (property "Reference" "R?" (id 0) (at 157.48 96.52 90))
    (property "Value" "470Ω" (id 1) (at 157.48 99.06 90))
    (property "Footprint" "" (id 2) (at 157.48 101.6 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (property "Datasheet" "~" (id 3) (at 157.48 101.6 0)
      (effects (font (size 1.27 1.27)) hide)
    )
  )
  (symbol (lib_id "Power_Protection:TPD4EUSB30") (at 104.14 49.53 0) (unit 1)
    (in_bom yes) (on_board yes)
    (uuid "cab21cf5-02d1-4415-8f47-c31f2794f0af")
    (property "Reference" "U?" (id 0) (at 104.14 36.83 0))
    (property "Value" "TPD4EUSB30" (id 1) (at 104.14 39.37 0))
    (property "Footprint" "Package_SON:USON-10_2.5x1.0mm_P0.5mm" (id 2) (at 80.01 59.69 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (property "Datasheet" "http://www.ti.com/lit/ds/symlink/tpd2eusb30a.pdf" (id 3) (at 104.14 49.53 0)
      (effects (font (size 1.27 1.27)) hide)
    )
  )
  (symbol (lib_id "Power_Protection:TPD4EUSB30") (at 104.14 82.55 0) (unit 1)
    (in_bom yes) (on_board yes)
    (uuid "5a8b766d-1b68-496b-9d3a-df1d0e3cffd8")
    (property "Reference" "U?" (id 0) (at 104.14 69.85 0))
    (property "Value" "TPD4EUSB30" (id 1) (at 104.14 72.39 0))
    (property "Footprint" "Package_SON:USON-10_2.5x1.0mm_P0.5mm" (id 2) (at 80.01 92.71 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (property "Datasheet" "http://www.ti.com/lit/ds/symlink/tpd2eusb30a.pdf" (id 3) (at 104.14 82.55 0)
      (effects (font (size 1.27 1.27)) hide)
    )
  )
  (symbol (lib_id "LightBlue:RJ45_LINK-PP_LPJG0926HENL_Horizontal") (at 190.5 68.58 0) (unit 1)
    (in_bom yes) (on_board yes)
    (uuid "6dd5e861-e5d4-4759-b127-4958e3f04beb")
    (property "Reference" "J" (id 0) (at 170.18 30.48 0)
      (effects (font (size 1.27 1.27)) (justify left))
    )
-    (property "Value" "RJ45_LINK-PP_LPJG0926HENL_Horizontal" (id 1) (at 195.58 30.48 0))
+    (property "Footprint" "" (id 2) (at 152.4 116.84 0)
    (property "Footprint" "LightBlue:RJ45_LINK-PP_LPJG0926HENL_Horizontal" (id 2) (at 190.5 114.3 0)
      (effects (font (size 1.27 1.27)) hide)
    )
-    (property "Datasheet" "http://www.link-pp.com/upload/file/20180411/20180411182938293829.pdf" (id 3) (at 190.5 114.3 0)
+    (property "Datasheet" "" (id 3) (at 152.4 116.84 0)
      (effects (font (size 1.27 1.27)) hide)
    )
  )
  (symbol (lib_id "power:+3V3") (at 153.67 49.53 0) (unit 1)
    (in_bom yes) (on_board yes)
    (uuid "d5fe9d10-09f9-476d-9b5f-5095635c3fd4")
    (property "Reference" "#PWR?" (id 0) (at 153.67 53.34 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (property "Value" "+3V3" (id 1) (at 154.0383 45.2056 0))
    (property "Footprint" "" (id 2) (at 153.67 49.53 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (property "Datasheet" "" (id 3) (at 153.67 49.53 0)
      (effects (font (size 1.27 1.27)) hide)
    )
  )
  (symbol (lib_id "power:GND") (at 82.55 77.47 270) (unit 1)
    (in_bom yes) (on_board yes)
    (uuid "4f6e6d93-8198-4777-ab6f-4edc3d246858")
    (property "Reference" "#PWR?" (id 0) (at 76.2 77.47 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (property "Value" "GND" (id 1) (at 78.2256 77.5843 0))
    (property "Footprint" "" (id 2) (at 82.55 77.47 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (property "Datasheet" "" (id 3) (at 82.55 77.47 0)
      (effects (font (size 1.27 1.27)) hide)
    )
  )
  (symbol (lib_id "power:GND") (at 82.55 110.49 270) (unit 1)
    (in_bom yes) (on_board yes)
    (uuid "bfd59301-5bb8-40fa-83c6-cb0f92dc2c65")
    (property "Reference" "#PWR?" (id 0) (at 76.2 110.49 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (property "Value" "GND" (id 1) (at 78.2256 110.6043 0))
    (property "Footprint" "" (id 2) (at 82.55 110.49 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (property "Datasheet" "" (id 3) (at 82.55 110.49 0)
      (effects (font (size 1.27 1.27)) hide)
    )
  )
  (symbol (lib_id "power:GND") (at 142.24 80.01 270) (unit 1)
    (in_bom yes) (on_board yes)
    (uuid "e599e2dc-829e-4ed0-aeb0-6c49465b27ed")
    (property "Reference" "#PWR?" (id 0) (at 135.89 80.01 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (property "Value" "GND" (id 1) (at 137.9156 80.1243 0))
    (property "Footprint" "" (id 2) (at 142.24 80.01 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (property "Datasheet" "" (id 3) (at 142.24 80.01 0)
      (effects (font (size 1.27 1.27)) hide)
    )
  )
  (symbol (lib_id "power:GND") (at 179.07 140.97 0) (unit 1)
    (in_bom yes) (on_board yes)
    (uuid "71c2db37-41ef-47f1-982f-5d8843ab5007")
    (property "Reference" "#PWR?" (id 0) (at 179.07 147.32 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (property "Value" "GND" (id 1) (at 179.1843 145.2944 0))
    (property "Footprint" "" (id 2) (at 179.07 140.97 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (property "Datasheet" "" (id 3) (at 179.07 140.97 0)
      (effects (font (size 1.27 1.27)) hide)
    )
  )
  (symbol (lib_id "Device:R_Small") (at 148.59 55.88 90) (unit 1)
    (in_bom yes) (on_board yes)
    (uuid "6cf869b7-4906-4269-be48-72d89d3fa069")
    (property "Reference" "R?" (id 0) (at 148.59 50.8 90))
    (property "Value" "470Ω" (id 1) (at 148.59 53.34 90))
    (property "Footprint" "" (id 2) (at 148.59 55.88 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (property "Datasheet" "~" (id 3) (at 148.59 55.88 0)
      (effects (font (size 1.27 1.27)) hide)
    )
  )
  (symbol (lib_id "Device:R_Small") (at 148.59 119.38 90) (unit 1)
    (in_bom yes) (on_board yes)
    (uuid "021dd781-c0a2-4e06-a8a9-18b3d36b8b01")
    (property "Reference" "R?" (id 0) (at 146.05 121.92 90))
    (property "Value" "470Ω" (id 1) (at 151.13 121.92 90))
    (property "Footprint" "" (id 2) (at 148.59 119.38 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (property "Datasheet" "~" (id 3) (at 148.59 119.38 0)
      (effects (font (size 1.27 1.27)) hide)
    )
  )
  (symbol (lib_id "Device:R_Small") (at 184.15 135.89 180) (unit 1)
    (in_bom yes) (on_board yes)
    (uuid "402630fe-21db-4aab-bf2b-692ed43189bc")
    (property "Reference" "R?" (id 0) (at 181.7432 133.35 0))
    (property "Value" "0R/1206" (id 1) (at 178.962 135.89 0))
    (property "Footprint" "" (id 2) (at 184.15 135.89 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (property "Datasheet" "~" (id 3) (at 184.15 135.89 0)
      (effects (font (size 1.27 1.27)) hide)
    )
  )
  (symbol (lib_id "Device:C_Small") (at 147.32 80.01 90) (unit 1)
    (in_bom yes) (on_board yes)
    (uuid "b2be482e-a06b-452c-b548-81523fcaa898")
    (property "Reference" "C?" (id 0) (at 144.78 78.0477 90))
    (property "Value" "100n" (id 1) (at 151.13 77.806 90))
    (property "Footprint" "" (id 2) (at 147.32 80.01 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (property "Datasheet" "~" (id 3) (at 147.32 80.01 0)
      (effects (font (size 1.27 1.27)) hide)
    )
  )
  (symbol (lib_id "Device:C_Small") (at 172.72 135.89 0) (unit 1)
    (in_bom yes) (on_board yes)
    (uuid "48dd30f4-6cc1-4a3c-9daf-1a3567fd9b4f")
    (property "Reference" "C?" (id 0) (at 169.4877 133.35 0))
    (property "Value" "100n/1kV/DNI" (id 1) (at 164.166 135.89 0))
    (property "Footprint" "" (id 2) (at 172.72 135.89 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (property "Datasheet" "~" (id 3) (at 172.72 135.89 0)
      (effects (font (size 1.27 1.27)) hide)
    )
  )
  (symbol (lib_id "Power_Protection:TPD4EUSB30") (at 85.09 62.23 0) (unit 1)
    (in_bom yes) (on_board yes)
    (uuid "cab21cf5-02d1-4415-8f47-c31f2794f0af")
    (property "Reference" "U?" (id 0) (at 85.09 49.53 0))
    (property "Value" "TPD4EUSB30" (id 1) (at 85.09 52.07 0))
    (property "Footprint" "Package_SON:USON-10_2.5x1.0mm_P0.5mm" (id 2) (at 60.96 72.39 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (property "Datasheet" "http://www.ti.com/lit/ds/symlink/tpd2eusb30a.pdf" (id 3) (at 85.09 62.23 0)
      (effects (font (size 1.27 1.27)) hide)
    )
  )
  (symbol (lib_id "Power_Protection:TPD4EUSB30") (at 85.09 95.25 0) (unit 1)
    (in_bom yes) (on_board yes)
    (uuid "5a8b766d-1b68-496b-9d3a-df1d0e3cffd8")
    (property "Reference" "U?" (id 0) (at 85.09 82.55 0))
    (property "Value" "TPD4EUSB30" (id 1) (at 85.09 85.09 0))
    (property "Footprint" "Package_SON:USON-10_2.5x1.0mm_P0.5mm" (id 2) (at 60.96 105.41 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (property "Datasheet" "http://www.ti.com/lit/ds/symlink/tpd2eusb30a.pdf" (id 3) (at 85.09 95.25 0)
      (effects (font (size 1.27 1.27)) hide)
    )
  )
  (symbol (lib_id "LightBlue:RJ45_LINK-PP_LPJG0926HENL_Horizontal") (at 177.8 86.36 0) (unit 1)
    (in_bom yes) (on_board yes)
    (uuid "6dd5e861-e5d4-4759-b127-4958e3f04beb")
    (property "Reference" "J?" (id 0) (at 157.48 48.26 0)
      (effects (font (size 1.27 1.27)) (justify left))
    )
    (property "Value" "RJ45_LINK-PP_LPJG0926HENL_Horizontal" (id 1) (at 182.88 48.26 0))
    (property "Footprint" "LightBlue:RJ45_LINK-PP_LPJG0926HENL_Horizontal" (id 2) (at 177.8 132.08 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (property "Datasheet" "http://www.link-pp.com/upload/file/20180411/20180411182938293829.pdf" (id 3) (at 177.8 132.08 0)
      (effects (font (size 1.27 1.27)) hide)
    )
  )
--- a/FrontRTC.kicad_sch
+++ b/FrontRTC.kicad_sch
@@ -867,54 +867,6 @@
        )
      )
    )
    (symbol "Switch:SW_SPDT" (pin_names (offset 0) hide) (in_bom yes) (on_board yes)
      (property "Reference" "SW" (id 0) (at 0 4.318 0)
        (effects (font (size 1.27 1.27)))
      )
      (property "Value" "SW_SPDT" (id 1) (at 0 -5.08 0)
        (effects (font (size 1.27 1.27)))
      )
      (property "Footprint" "" (id 2) (at 0 0 0)
        (effects (font (size 1.27 1.27)) hide)
      )
      (property "Datasheet" "~" (id 3) (at 0 0 0)
        (effects (font (size 1.27 1.27)) hide)
      )
      (property "ki_keywords" "switch single-pole double-throw spdt ON-ON" (id 4) (at 0 0 0)
        (effects (font (size 1.27 1.27)) hide)
      )
      (property "ki_description" "Switch, single pole double throw" (id 5) (at 0 0 0)
        (effects (font (size 1.27 1.27)) hide)
      )
      (symbol "SW_SPDT_0_0"
        (circle (center -2.032 0) (radius 0.508) (stroke (width 0)) (fill (type none)))
        (circle (center 2.032 -2.54) (radius 0.508) (stroke (width 0)) (fill (type none)))
      )
      (symbol "SW_SPDT_0_1"
        (circle (center 2.032 2.54) (radius 0.508) (stroke (width 0)) (fill (type none)))
        (polyline
          (pts
            (xy -1.524 0.254)
            (xy 1.651 2.286)
          )
          (stroke (width 0)) (fill (type none))
        )
      )
      (symbol "SW_SPDT_1_1"
        (pin passive line (at 5.08 2.54 180) (length 2.54)
          (name "A" (effects (font (size 1.27 1.27))))
          (number "1" (effects (font (size 1.27 1.27))))
        )
        (pin passive line (at -5.08 0 0) (length 2.54)
          (name "B" (effects (font (size 1.27 1.27))))
          (number "2" (effects (font (size 1.27 1.27))))
        )
        (pin passive line (at 5.08 -2.54 180) (length 2.54)
          (name "C" (effects (font (size 1.27 1.27))))
          (number "3" (effects (font (size 1.27 1.27))))
        )
      )
    )
    (symbol "Timer_RTC:PCF8563T" (in_bom yes) (on_board yes)
      (property "Reference" "U" (id 0) (at -7.62 8.89 0)
        (effects (font (size 1.27 1.27)) (justify left))
@@ -1018,113 +970,124 @@
    )
  )
-  (junction (at 71.755 137.16) (diameter 1.016) (color 0 0 0 0))
+  (junction (at 49.53 33.02) (diameter 0.9144) (color 0 0 0 0))
  (junction (at 49.53 46.99) (diameter 0.9144) (color 0 0 0 0))
  (junction (at 72.39 137.16) (diameter 1.016) (color 0 0 0 0))
  (junction (at 185.42 133.35) (diameter 1.016) (color 0 0 0 0))
-  (bus_entry (at 100.33 170.18) (size 2.54 -2.54)
+  (bus_entry (at 102.87 167.64) (size -2.54 2.54)
    (stroke (width 0.1524) (type solid) (color 0 0 0 0))
  )
-  (bus_entry (at 100.33 172.72) (size 2.54 -2.54)
+  (bus_entry (at 102.87 170.18) (size -2.54 2.54)
    (stroke (width 0.1524) (type solid) (color 0 0 0 0))
  )
-  (bus_entry (at 184.15 115.57) (size -2.54 -2.54)
+  (bus_entry (at 181.61 113.03) (size 2.54 2.54)
    (stroke (width 0.1524) (type solid) (color 0 0 0 0))
  )
-  (bus_entry (at 184.15 118.11) (size -2.54 -2.54)
+  (bus_entry (at 181.61 115.57) (size 2.54 2.54)
    (stroke (width 0.1524) (type solid) (color 0 0 0 0))
  )
-  (wire (pts (xy 31.115 26.67) (xy 41.91 26.67))
+  (wire (pts (xy 31.75 26.67) (xy 41.91 26.67))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (wire (pts (xy 34.29 55.245) (xy 41.91 55.245))
+  (wire (pts (xy 34.29 55.88) (xy 41.91 55.88))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (wire (pts (xy 38.735 125.095) (xy 46.99 125.095))
+  (wire (pts (xy 39.37 125.73) (xy 46.99 125.73))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
  (wire (pts (xy 44.45 17.78) (xy 49.53 17.78))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (wire (pts (xy 44.45 46.355) (xy 49.53 46.355))
+  (wire (pts (xy 44.45 46.99) (xy 49.53 46.99))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (wire (pts (xy 46.99 129.54) (xy 46.99 125.095))
+  (wire (pts (xy 46.99 129.54) (xy 46.99 125.73))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
  (wire (pts (xy 46.99 144.78) (xy 46.99 146.05))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (wire (pts (xy 46.99 153.67) (xy 46.99 154.94))
+  (wire (pts (xy 46.99 151.13) (xy 46.99 152.4))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
  (wire (pts (xy 46.99 160.02) (xy 46.99 161.29))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
  (wire (pts (xy 49.53 17.78) (xy 49.53 24.13))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (wire (pts (xy 49.53 29.21) (xy 49.53 32.385))
+  (wire (pts (xy 49.53 29.21) (xy 49.53 33.02))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (wire (pts (xy 49.53 46.355) (xy 49.53 52.705))
+  (wire (pts (xy 49.53 33.02) (xy 49.53 34.29))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (wire (pts (xy 49.53 57.785) (xy 49.53 60.96))
+  (wire (pts (xy 49.53 45.72) (xy 49.53 46.99))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (wire (pts (xy 52.07 137.16) (xy 71.755 137.16))
+  (wire (pts (xy 49.53 46.99) (xy 49.53 53.34))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (wire (pts (xy 55.88 26.67) (xy 62.865 26.67))
+  (wire (pts (xy 49.53 58.42) (xy 49.53 60.96))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (wire (pts (xy 55.88 55.245) (xy 66.675 55.245))
+  (wire (pts (xy 52.07 137.16) (xy 72.39 137.16))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (wire (pts (xy 60.96 80.645) (xy 67.31 80.645))
+  (wire (pts (xy 55.88 26.67) (xy 63.5 26.67))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (wire (pts (xy 60.96 102.235) (xy 66.675 102.235))
+  (wire (pts (xy 55.88 55.88) (xy 67.31 55.88))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (wire (pts (xy 61.595 162.56) (xy 61.595 165.1))
+  (wire (pts (xy 60.96 81.28) (xy 67.31 81.28))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (wire (pts (xy 61.595 170.18) (xy 61.595 172.72))
+  (wire (pts (xy 60.96 102.87) (xy 67.31 102.87))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (wire (pts (xy 61.595 172.72) (xy 76.2 172.72))
+  (wire (pts (xy 62.23 162.56) (xy 62.23 165.1))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (wire (pts (xy 71.755 137.16) (xy 71.755 139.065))
+  (wire (pts (xy 62.23 170.18) (xy 62.23 172.72))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (wire (pts (xy 71.755 137.16) (xy 86.36 137.16))
+  (wire (pts (xy 62.23 172.72) (xy 76.2 172.72))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (wire (pts (xy 71.755 144.145) (xy 71.755 146.05))
+  (wire (pts (xy 72.39 137.16) (xy 72.39 139.7))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (wire (pts (xy 76.2 162.56) (xy 61.595 162.56))
+  (wire (pts (xy 72.39 137.16) (xy 86.36 137.16))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (wire (pts (xy 76.835 55.245) (xy 94.615 55.245))
+  (wire (pts (xy 72.39 144.78) (xy 72.39 146.05))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (wire (pts (xy 76.835 102.235) (xy 79.375 102.235))
+  (wire (pts (xy 76.2 162.56) (xy 62.23 162.56))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (wire (pts (xy 79.375 80.645) (xy 77.47 80.645))
+  (wire (pts (xy 77.47 55.88) (xy 95.25 55.88))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (wire (pts (xy 79.375 82.55) (xy 79.375 80.645))
+  (wire (pts (xy 77.47 102.87) (xy 80.01 102.87))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (wire (pts (xy 79.375 102.235) (xy 79.375 104.775))
+  (wire (pts (xy 80.01 81.28) (xy 77.47 81.28))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
  (wire (pts (xy 80.01 82.55) (xy 80.01 81.28))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
  (wire (pts (xy 80.01 102.87) (xy 80.01 105.41))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
  (wire (pts (xy 86.36 137.16) (xy 86.36 157.48))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (wire (pts (xy 86.36 177.8) (xy 86.36 179.705))
+  (wire (pts (xy 86.36 177.8) (xy 86.36 180.34))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
  (wire (pts (xy 96.52 165.1) (xy 100.33 165.1))
@@ -1235,63 +1198,60 @@
  (wire (pts (xy 238.76 123.19) (xy 243.84 123.19))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (bus (pts (xy 102.87 164.465) (xy 102.87 167.64))
+  (bus (pts (xy 102.87 166.37) (xy 102.87 167.64))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (bus (pts (xy 102.87 164.465) (xy 107.315 164.465))
+  (bus (pts (xy 102.87 166.37) (xy 113.03 166.37))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
  (bus (pts (xy 102.87 167.64) (xy 102.87 170.18))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (bus (pts (xy 102.87 170.18) (xy 102.87 172.72))
+  (bus (pts (xy 175.26 111.76) (xy 181.61 111.76))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (bus (pts (xy 181.61 109.855) (xy 177.165 109.855))
+  (bus (pts (xy 181.61 111.76) (xy 181.61 113.03))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
  (bus (pts (xy 181.61 109.855) (xy 181.61 113.03))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
  (bus (pts (xy 181.61 113.03) (xy 181.61 115.57))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
  (bus (pts (xy 181.61 115.57) (xy 181.61 118.11))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (label "SW_POWER" (at 31.115 26.67 0)
+  (label "SW_POWER" (at 31.75 26.67 0)
    (effects (font (size 1.27 1.27)) (justify left bottom))
  )
-  (label "3.3V" (at 38.735 125.095 0)
+  (label "3.3V" (at 39.37 125.73 0)
    (effects (font (size 1.27 1.27)) (justify left bottom))
  )
  (label "+3.3V" (at 44.45 17.78 0)
    (effects (font (size 1.27 1.27)) (justify left bottom))
  )
-  (label "+5.0V" (at 44.45 46.355 0)
+  (label "+5.0V" (at 44.45 46.99 0)
    (effects (font (size 1.27 1.27)) (justify left bottom))
  )
-  (label "SW_POWER" (at 56.515 55.245 0)
+  (label "SW_POWER" (at 57.15 55.88 0)
    (effects (font (size 1.27 1.27)) (justify left bottom))
  )
  (label "SDA" (at 96.52 170.18 0)
    (effects (font (size 1.27 1.27)) (justify left bottom))
  )
  (label "SCL" (at 96.52 172.72 0)
    (effects (font (size 1.27 1.27)) (justify left bottom))
  )
  (label "CLK32K" (at 100.33 156.21 270)
    (effects (font (size 1.27 1.27)) (justify right bottom))
  )
-  (label "SDA" (at 100.33 170.18 180)
+  (label "{I2C}" (at 175.26 111.76 0)
-    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (effects (font (size 1.27 1.27)) (justify left bottom))
  )
  (label "SCL" (at 100.33 172.72 180)
    (effects (font (size 1.27 1.27)) (justify right bottom))
  )
  (label "CLK32K" (at 177.8 124.46 0)
    (effects (font (size 1.27 1.27)) (justify left bottom))
  )
-  (label "SDA" (at 184.15 115.57 0)
+  (label "SDA" (at 187.96 115.57 180)
-    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (effects (font (size 1.27 1.27)) (justify right bottom))
  )
-  (label "SCL" (at 184.15 118.11 0)
+  (label "SCL" (at 187.96 118.11 180)
-    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (effects (font (size 1.27 1.27)) (justify right bottom))
  )
  (label "+3.3V" (at 196.85 102.87 0)
    (effects (font (size 1.27 1.27)) (justify left bottom))
@@ -1309,27 +1269,24 @@
    (effects (font (size 1.27 1.27)) (justify right bottom))
  )
-  (hierarchical_label "RUN_PG" (shape bidirectional) (at 34.29 55.245 180)
+  (hierarchical_label "RUN_PG" (shape bidirectional) (at 34.29 55.88 180)
    (effects (font (size 1.27 1.27)) (justify right))
  )
-  (hierarchical_label "RUN_PG" (shape bidirectional) (at 60.96 80.645 180)
+  (hierarchical_label "RUN_PG" (shape bidirectional) (at 60.96 81.28 180)
    (effects (font (size 1.27 1.27)) (justify right))
  )
-  (hierarchical_label "nRPI_BOOT" (shape output) (at 60.96 102.235 180)
+  (hierarchical_label "nRPI_BOOT" (shape output) (at 60.96 102.87 180)
    (effects (font (size 1.27 1.27)) (justify right))
  )
-  (hierarchical_label "POWER_BTN" (shape output) (at 62.865 26.67 0)
+  (hierarchical_label "POWER_BTN" (shape output) (at 63.5 26.67 0)
    (effects (font (size 1.27 1.27)) (justify left))
  )
-  (hierarchical_label "GLOBAL_EN" (shape output) (at 94.615 55.245 0)
+  (hierarchical_label "GLOBAL_EN" (shape output) (at 95.25 55.88 0)
    (effects (font (size 1.27 1.27)) (justify left))
  )
-  (hierarchical_label "I2C" (shape bidirectional) (at 107.315 164.465 0)
+  (hierarchical_label "{I2C}" (shape bidirectional) (at 113.03 166.37 0)
    (effects (font (size 1.27 1.27)) (justify left))
  )
  (hierarchical_label "I2C" (shape bidirectional) (at 177.165 109.855 180)
    (effects (font (size 1.27 1.27)) (justify right))
  )
  (hierarchical_label "LED_nACT" (shape input) (at 196.85 78.74 180)
    (effects (font (size 1.27 1.27)) (justify right))
  )
@@ -1337,32 +1294,32 @@
    (effects (font (size 1.27 1.27)) (justify right))
  )
-  (symbol (lib_id "power:GND") (at 46.99 154.94 0) (unit 1)
+  (symbol (lib_id "power:GND") (at 46.99 161.29 0) (unit 1)
    (in_bom yes) (on_board yes)
    (uuid "f78a067b-6a22-41d9-a449-da324bb25ff6")
-    (property "Reference" "#PWR?" (id 0) (at 46.99 161.29 0)
+    (property "Reference" "#PWR?" (id 0) (at 46.99 167.64 0)
      (effects (font (size 1.27 1.27)) hide)
    )
-    (property "Value" "GND" (id 1) (at 47.625 159.385 0))
+    (property "Value" "GND" (id 1) (at 47.625 165.735 0))
-    (property "Footprint" "" (id 2) (at 46.99 154.94 0)
+    (property "Footprint" "" (id 2) (at 46.99 161.29 0)
      (effects (font (size 1.27 1.27)) hide)
    )
-    (property "Datasheet" "" (id 3) (at 46.99 154.94 0)
+    (property "Datasheet" "" (id 3) (at 46.99 161.29 0)
      (effects (font (size 1.27 1.27)) hide)
    )
  )
-  (symbol (lib_id "power:GND") (at 49.53 32.385 0) (unit 1)
+  (symbol (lib_id "power:GND") (at 49.53 33.02 0) (unit 1)
    (in_bom yes) (on_board yes)
    (uuid "7e0f6450-9af6-4845-b0ca-dc8a53703ddb")
-    (property "Reference" "#PWR?" (id 0) (at 49.53 38.735 0)
+    (property "Reference" "#PWR?" (id 0) (at 49.53 39.37 0)
      (effects (font (size 1.27 1.27)) hide)
    )
-    (property "Value" "GND" (id 1) (at 50.165 37.465 0))
+    (property "Value" "GND" (id 1) (at 50.165 38.1 0))
-    (property "Footprint" "" (id 2) (at 49.53 32.385 0)
+    (property "Footprint" "" (id 2) (at 49.53 33.02 0)
      (effects (font (size 1.27 1.27)) hide)
    )
-    (property "Datasheet" "" (id 3) (at 49.53 32.385 0)
+    (property "Datasheet" "" (id 3) (at 49.53 33.02 0)
      (effects (font (size 1.27 1.27)) hide)
    )
  )
@@ -1382,62 +1339,62 @@
    )
  )
-  (symbol (lib_id "power:GND") (at 71.755 146.05 0) (unit 1)
+  (symbol (lib_id "power:GND") (at 72.39 146.05 0) (unit 1)
    (in_bom yes) (on_board yes)
    (uuid "cfdce7ee-046d-4696-aa01-ca4d0d759f0a")
-    (property "Reference" "#PWR?" (id 0) (at 71.755 152.4 0)
+    (property "Reference" "#PWR?" (id 0) (at 72.39 152.4 0)
      (effects (font (size 1.27 1.27)) hide)
    )
-    (property "Value" "GND" (id 1) (at 72.39 150.495 0))
+    (property "Value" "GND" (id 1) (at 73.025 150.495 0))
-    (property "Footprint" "" (id 2) (at 71.755 146.05 0)
+    (property "Footprint" "" (id 2) (at 72.39 146.05 0)
      (effects (font (size 1.27 1.27)) hide)
    )
-    (property "Datasheet" "" (id 3) (at 71.755 146.05 0)
+    (property "Datasheet" "" (id 3) (at 72.39 146.05 0)
      (effects (font (size 1.27 1.27)) hide)
    )
  )
-  (symbol (lib_id "power:GND") (at 79.375 82.55 0) (unit 1)
+  (symbol (lib_id "power:GND") (at 80.01 82.55 0) (unit 1)
    (in_bom yes) (on_board yes)
    (uuid "8c8d64a7-8b26-43ec-bca7-1c34f886919b")
-    (property "Reference" "#PWR?" (id 0) (at 79.375 88.9 0)
+    (property "Reference" "#PWR?" (id 0) (at 80.01 88.9 0)
      (effects (font (size 1.27 1.27)) hide)
    )
-    (property "Value" "GND" (id 1) (at 80.01 87.63 0))
+    (property "Value" "GND" (id 1) (at 80.645 87.63 0))
-    (property "Footprint" "" (id 2) (at 79.375 82.55 0)
+    (property "Footprint" "" (id 2) (at 80.01 82.55 0)
      (effects (font (size 1.27 1.27)) hide)
    )
-    (property "Datasheet" "" (id 3) (at 79.375 82.55 0)
+    (property "Datasheet" "" (id 3) (at 80.01 82.55 0)
      (effects (font (size 1.27 1.27)) hide)
    )
  )
-  (symbol (lib_id "power:GND") (at 79.375 104.775 0) (unit 1)
+  (symbol (lib_id "power:GND") (at 80.01 105.41 0) (unit 1)
    (in_bom yes) (on_board yes)
    (uuid "14e2e689-97bc-4d28-94d0-79465efd1689")
-    (property "Reference" "#PWR?" (id 0) (at 79.375 111.125 0)
+    (property "Reference" "#PWR?" (id 0) (at 80.01 111.76 0)
      (effects (font (size 1.27 1.27)) hide)
    )
-    (property "Value" "GND" (id 1) (at 80.645 109.855 0))
+    (property "Value" "GND" (id 1) (at 81.28 110.49 0))
-    (property "Footprint" "" (id 2) (at 79.375 104.775 0)
+    (property "Footprint" "" (id 2) (at 80.01 105.41 0)
      (effects (font (size 1.27 1.27)) hide)
    )
-    (property "Datasheet" "" (id 3) (at 79.375 104.775 0)
+    (property "Datasheet" "" (id 3) (at 80.01 105.41 0)
      (effects (font (size 1.27 1.27)) hide)
    )
  )
-  (symbol (lib_id "power:GND") (at 86.36 179.705 0) (unit 1)
+  (symbol (lib_id "power:GND") (at 86.36 180.34 0) (unit 1)
    (in_bom yes) (on_board yes)
    (uuid "e8420e5b-a13c-4af0-bb0d-a0f3d598d48f")
-    (property "Reference" "#PWR?" (id 0) (at 86.36 186.055 0)
+    (property "Reference" "#PWR?" (id 0) (at 86.36 186.69 0)
      (effects (font (size 1.27 1.27)) hide)
    )
-    (property "Value" "GND" (id 1) (at 86.995 184.15 0))
+    (property "Value" "GND" (id 1) (at 86.995 184.785 0))
-    (property "Footprint" "" (id 2) (at 86.36 179.705 0)
+    (property "Footprint" "" (id 2) (at 86.36 180.34 0)
      (effects (font (size 1.27 1.27)) hide)
    )
-    (property "Datasheet" "" (id 3) (at 86.36 179.705 0)
+    (property "Datasheet" "" (id 3) (at 86.36 180.34 0)
      (effects (font (size 1.27 1.27)) hide)
    )
  )
@@ -1487,13 +1444,30 @@
    )
  )
  (symbol (lib_id "Device:R_Small") (at 46.99 148.59 0) (unit 1)
    (in_bom yes) (on_board yes)
    (uuid "52998f42-14c1-4bf6-8622-9496e3e54c53")
    (property "Reference" "R?" (id 0) (at 49.53 147.32 0)
      (effects (font (size 1.27 1.27)) (justify left))
    )
    (property "Value" "100R" (id 1) (at 49.53 149.86 0)
      (effects (font (size 1.27 1.27)) (justify left))
    )
    (property "Footprint" "" (id 2) (at 46.99 148.59 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (property "Datasheet" "~" (id 3) (at 46.99 148.59 0)
      (effects (font (size 1.27 1.27)) hide)
    )
  )
  (symbol (lib_id "Device:R_Small") (at 220.98 36.83 0) (unit 1)
    (in_bom yes) (on_board yes)
    (uuid "5a0029e4-bf92-47ff-8351-56443847ec9d")
    (property "Reference" "R?" (id 0) (at 223.52 35.56 0)
      (effects (font (size 1.27 1.27)) (justify left))
    )
-    (property "Value" "1kΩ" (id 1) (at 223.52 38.1 0)
+    (property "Value" "1k" (id 1) (at 223.52 38.1 0)
      (effects (font (size 1.27 1.27)) (justify left))
    )
    (property "Footprint" "" (id 2) (at 220.98 36.83 0)
@@ -1510,7 +1484,7 @@
    (property "Reference" "R?" (id 0) (at 223.52 69.85 0)
      (effects (font (size 1.27 1.27)) (justify left))
    )
-    (property "Value" "1kΩ" (id 1) (at 223.52 72.39 0)
+    (property "Value" "1k" (id 1) (at 223.52 72.39 0)
      (effects (font (size 1.27 1.27)) (justify left))
    )
    (property "Footprint" "" (id 2) (at 220.98 71.12 0)
@@ -1555,105 +1529,92 @@
    )
  )
-  (symbol (lib_id "Device:Crystal_Small") (at 61.595 167.64 90) (unit 1)
+  (symbol (lib_id "Device:Crystal_Small") (at 62.23 167.64 90) (unit 1)
    (in_bom yes) (on_board yes)
    (uuid "df3c69bc-5fed-486a-8538-f634d169db1f")
-    (property "Reference" "Y?" (id 0) (at 64.77 166.37 90)
+    (property "Reference" "Y?" (id 0) (at 65.405 166.37 90)
      (effects (font (size 1.27 1.27)) (justify right))
    )
-    (property "Value" "X32K768S301" (id 1) (at 64.77 168.91 90)
+    (property "Value" "X32K768S301" (id 1) (at 65.405 168.91 90)
      (effects (font (size 1.27 1.27)) (justify right))
    )
-    (property "Footprint" "" (id 2) (at 61.595 167.64 0)
+    (property "Footprint" "" (id 2) (at 62.23 167.64 0)
      (effects (font (size 1.27 1.27)) hide)
    )
-    (property "Datasheet" "~" (id 3) (at 61.595 167.64 0)
+    (property "Datasheet" "~" (id 3) (at 62.23 167.64 0)
      (effects (font (size 1.27 1.27)) hide)
    )
  )
-  (symbol (lib_id "Device:C_Small") (at 71.755 141.605 0) (unit 1)
+  (symbol (lib_id "Device:C_Small") (at 72.39 142.24 0) (unit 1)
    (in_bom yes) (on_board yes)
    (uuid "411885b9-6f81-4986-906f-cdf1c13e455a")
-    (property "Reference" "C?" (id 0) (at 74.295 140.97 0)
+    (property "Reference" "C?" (id 0) (at 74.93 141.605 0)
      (effects (font (size 1.27 1.27)) (justify left))
    )
-    (property "Value" "C_Small" (id 1) (at 74.295 143.51 0)
+    (property "Value" "C_Small" (id 1) (at 74.93 144.145 0)
      (effects (font (size 1.27 1.27)) (justify left))
    )
-    (property "Footprint" "" (id 2) (at 71.755 141.605 0)
+    (property "Footprint" "" (id 2) (at 72.39 142.24 0)
      (effects (font (size 1.27 1.27)) hide)
    )
-    (property "Datasheet" "~" (id 3) (at 71.755 141.605 0)
+    (property "Datasheet" "~" (id 3) (at 72.39 142.24 0)
      (effects (font (size 1.27 1.27)) hide)
    )
  )
-  (symbol (lib_id "Device:Battery_Cell") (at 46.99 151.13 0) (unit 1)
+  (symbol (lib_id "Device:Battery_Cell") (at 46.99 157.48 0) (unit 1)
    (in_bom yes) (on_board yes)
    (uuid "8315a3b5-025a-4501-86bf-a0c1f08f1755")
-    (property "Reference" "BT?" (id 0) (at 50.165 149.225 0)
+    (property "Reference" "BT?" (id 0) (at 50.165 155.575 0)
      (effects (font (size 1.27 1.27)) (justify left))
    )
-    (property "Value" "Battery_Cell" (id 1) (at 50.165 151.765 0)
+    (property "Value" "Battery_Cell" (id 1) (at 50.165 158.115 0)
      (effects (font (size 1.27 1.27)) (justify left))
    )
-    (property "Footprint" "" (id 2) (at 46.99 149.606 90)
+    (property "Footprint" "" (id 2) (at 46.99 155.956 90)
      (effects (font (size 1.27 1.27)) hide)
    )
-    (property "Datasheet" "~" (id 3) (at 46.99 149.606 90)
+    (property "Datasheet" "~" (id 3) (at 46.99 155.956 90)
      (effects (font (size 1.27 1.27)) hide)
    )
  )
-  (symbol (lib_id "Switch:SW_Push") (at 71.755 55.245 0) (unit 1)
+  (symbol (lib_id "Switch:SW_Push") (at 72.39 55.88 0) (unit 1)
    (in_bom yes) (on_board yes)
    (uuid "a373cb77-347a-47c0-b211-d116f87bcf25")
-    (property "Reference" "SW?" (id 0) (at 72.39 48.26 0))
+    (property "Reference" "SW?" (id 0) (at 73.025 48.895 0))
-    (property "Value" "SW_POWER" (id 1) (at 72.39 50.8 0))
+    (property "Value" "SW_POWER" (id 1) (at 73.025 51.435 0))
-    (property "Footprint" "Button_Switch_THT:SW_Tactile_SPST_Angled_PTS645Vx39-2LFS" (id 2) (at 71.755 55.245 0)
+    (property "Footprint" "Button_Switch_THT:SW_Tactile_SPST_Angled_PTS645Vx39-2LFS" (id 2) (at 72.39 55.88 0)
      (effects (font (size 1.27 1.27)) hide)
    )
-    (property "Datasheet" "~" (id 3) (at 71.755 55.245 0)
+    (property "Datasheet" "~" (id 3) (at 72.39 55.88 0)
      (effects (font (size 1.27 1.27)) hide)
    )
  )
-  (symbol (lib_id "Switch:SW_Push") (at 71.755 102.235 0) (unit 1)
+  (symbol (lib_id "Switch:SW_Push") (at 72.39 81.28 0) (unit 1)
    (in_bom yes) (on_board yes)
    (uuid "955f6f4b-9ebf-41c3-8a36-26da150f4b3b")
    (property "Reference" "SW?" (id 0) (at 72.39 95.25 0))
    (property "Value" "SW_RECOVERY" (id 1) (at 72.39 97.79 0))
    (property "Footprint" "Button_Switch_SMD:SW_SPST_EVQP7C" (id 2) (at 71.755 102.235 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (property "Datasheet" "~" (id 3) (at 71.755 102.235 0)
      (effects (font (size 1.27 1.27)) hide)
    )
  )
  (symbol (lib_id "Switch:SW_Push") (at 72.39 80.645 0) (unit 1)
    (in_bom yes) (on_board yes)
    (uuid "4d7ecf13-cc26-44b5-8623-a13ee46df5cd")
-    (property "Reference" "SW?" (id 0) (at 73.025 73.66 0))
+    (property "Reference" "SW?" (id 0) (at 73.025 74.295 0))
-    (property "Value" "SW_RESET" (id 1) (at 73.025 76.2 0))
+    (property "Value" "SW_RESET" (id 1) (at 73.025 76.835 0))
-    (property "Footprint" "Button_Switch_THT:SW_Tactile_SPST_Angled_PTS645Vx39-2LFS" (id 2) (at 72.39 80.645 0)
+    (property "Footprint" "Button_Switch_THT:SW_Tactile_SPST_Angled_PTS645Vx39-2LFS" (id 2) (at 72.39 81.28 0)
      (effects (font (size 1.27 1.27)) hide)
    )
-    (property "Datasheet" "~" (id 3) (at 72.39 80.645 0)
+    (property "Datasheet" "~" (id 3) (at 72.39 81.28 0)
      (effects (font (size 1.27 1.27)) hide)
    )
  )
-  (symbol (lib_id "Switch:SW_SPDT") (at 137.16 36.83 0) (unit 1)
+  (symbol (lib_id "Switch:SW_Push") (at 72.39 102.87 0) (unit 1)
    (in_bom yes) (on_board yes)
-    (uuid "ef573ea6-7e1c-432d-a149-d435c467601a")
+    (uuid "955f6f4b-9ebf-41c3-8a36-26da150f4b3b")
-    (property "Reference" "SW?" (id 0) (at 137.795 29.21 0))
+    (property "Reference" "SW?" (id 0) (at 73.025 95.885 0))
-    (property "Value" "SW_DEBUG_MODE" (id 1) (at 137.795 31.75 0))
+    (property "Value" "SW_RECOVERY" (id 1) (at 73.025 98.425 0))
-    (property "Footprint" "Button_Switch_SMD:SW_SPDT_PCM12" (id 2) (at 137.16 36.83 0)
+    (property "Footprint" "Button_Switch_SMD:SW_SPST_EVQP7C" (id 2) (at 72.39 102.87 0)
      (effects (font (size 1.27 1.27)) hide)
    )
-    (property "Datasheet" "~" (id 3) (at 137.16 36.83 0)
+    (property "Datasheet" "~" (id 3) (at 72.39 102.87 0)
      (effects (font (size 1.27 1.27)) hide)
    )
  )
@@ -1671,15 +1632,15 @@
    )
  )
-  (symbol (lib_id "74xGxx:74LVC1G07") (at 49.53 55.245 0) (unit 1)
+  (symbol (lib_id "74xGxx:74LVC1G07") (at 49.53 55.88 0) (unit 1)
    (in_bom yes) (on_board yes)
    (uuid "62c6523c-a188-468b-9b1c-f9b3d4eedb39")
-    (property "Reference" "U?" (id 0) (at 45.085 50.8 0))
+    (property "Reference" "U?" (id 0) (at 45.085 51.435 0))
-    (property "Value" "74LVC1G07SE-7" (id 1) (at 58.42 59.055 0))
+    (property "Value" "74LVC1G07SE-7" (id 1) (at 58.42 59.69 0))
-    (property "Footprint" "" (id 2) (at 49.53 55.245 0)
+    (property "Footprint" "" (id 2) (at 49.53 55.88 0)
      (effects (font (size 1.27 1.27)) hide)
    )
-    (property "Datasheet" "http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf" (id 3) (at 49.53 55.245 0)
+    (property "Datasheet" "http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf" (id 3) (at 49.53 55.88 0)
      (effects (font (size 1.27 1.27)) hide)
    )
  )
--- a/LightBlue.kicad_pro
+++ b/LightBlue.kicad_pro
@@ -290,7 +290,7 @@
      "no_connect_dangling": "warning",
      "pin_not_connected": "error",
      "pin_not_driven": "error",
-      "pin_to_pin": "warning",
+      "pin_to_pin": "error",
      "power_pin_not_driven": "error",
      "similar_labels": "warning",
      "unresolved_variable": "error",
@@ -322,7 +322,112 @@
        "track_width": 0.25,
        "via_diameter": 0.8,
        "via_drill": 0.4,
-        "wire_width": 6.0
+        "wire_width": 5.0
      },
      {
        "bus_width": 12.0,
        "clearance": 0.2,
        "diff_pair_gap": 0.25,
        "diff_pair_via_gap": 0.25,
        "diff_pair_width": 0.2,
        "line_style": 0,
        "microvia_diameter": 0.3,
        "microvia_drill": 0.1,
        "name": "diff_100",
        "nets": [
          "/CM4/HDMI.CLK+",
          "/CM4/HDMI.CLK-",
          "/CM4/HDMI.D0+",
          "/CM4/HDMI.D0-",
          "/CM4/HDMI.D1+",
          "/CM4/HDMI.D1-",
          "/CM4/HDMI.D2+",
          "/CM4/HDMI.D2-",
          "/ETH.TD1+",
          "/ETH.TD1-",
          "/ETH.TD2+",
          "/ETH.TD2-",
          "/ETH.TD3+",
          "/ETH.TD3-",
          "/ETH.TD4+",
          "/ETH.TD4-"
        ],
        "pcb_color": "rgba(0, 0, 0, 0.000)",
        "schematic_color": "rgba(0, 0, 0, 0.000)",
        "track_width": 0.25,
        "via_diameter": 0.8,
        "via_drill": 0.4,
        "wire_width": 5.0
      },
      {
        "bus_width": 12.0,
        "clearance": 0.2,
        "diff_pair_gap": 0.25,
        "diff_pair_via_gap": 0.25,
        "diff_pair_width": 0.2,
        "line_style": 0,
        "microvia_diameter": 0.3,
        "microvia_drill": 0.1,
        "name": "diff_85",
        "nets": [
          "/CM4/PCIe.CLK+",
          "/CM4/PCIe.CLK-",
          "/CM4/PCIe.RX+",
          "/CM4/PCIe.RX-",
          "/CM4/PCIe.TX+",
          "/CM4/PCIe.TX-",
          "/PCIe.CLK+",
          "/PCIe.CLK-",
          "/PCIe.RX+",
          "/PCIe.RX-",
          "/PCIe.TX+",
          "/PCIe.TX-"
        ],
        "pcb_color": "rgba(0, 0, 0, 0.000)",
        "schematic_color": "rgba(0, 0, 0, 0.000)",
        "track_width": 0.25,
        "via_diameter": 0.8,
        "via_drill": 0.4,
        "wire_width": 5.0
      },
      {
        "bus_width": 12.0,
        "clearance": 0.2,
        "diff_pair_gap": 0.25,
        "diff_pair_via_gap": 0.25,
        "diff_pair_width": 0.2,
        "line_style": 0,
        "microvia_diameter": 0.3,
        "microvia_drill": 0.1,
        "name": "diff_90",
        "nets": [
          "/USB/USB-C_D+",
          "/USB/USB-C_D-"
        ],
        "pcb_color": "rgba(0, 0, 0, 0.000)",
        "schematic_color": "rgba(0, 0, 0, 0.000)",
        "track_width": 0.25,
        "via_diameter": 0.8,
        "via_drill": 0.4,
        "wire_width": 5.0
      },
      {
        "bus_width": 12.0,
        "clearance": 0.2,
        "diff_pair_gap": 0.25,
        "diff_pair_via_gap": 0.25,
        "diff_pair_width": 0.2,
        "line_style": 0,
        "microvia_diameter": 0.3,
        "microvia_drill": 0.1,
        "name": "sing_50",
        "nets": [],
        "pcb_color": "rgba(0, 0, 0, 0.000)",
        "schematic_color": "rgba(0, 0, 0, 0.000)",
        "track_width": 0.25,
        "via_diameter": 0.8,
        "via_drill": 0.4,
        "wire_width": 5.0
      }
    ],
    "meta": {
@@ -344,7 +449,7 @@
  "schematic": {
    "drawing": {
      "default_bus_thickness": 12.0,
-      "default_junction_size": 40.0,
+      "default_junction_size": 36.0,
      "default_line_thickness": 6.0,
      "default_text_size": 50.0,
      "default_wire_thickness": 6.0,
@@ -372,7 +477,7 @@
  },
  "sheets": [
    [
-      "7c248bd3-8232-4777-a40c-eab53460cf85",
+      "e5ea1277-8b33-4e4b-aca4-ba371bf7a3cf",
      ""
    ],
    [
@@ -399,6 +504,10 @@
      "a1a835e0-c072-4609-9cb4-4b95bf746f54",
      "PCIe"
    ],
    [
      "c7bf4e1f-6bd1-4be7-9e56-1bd438bf5d42",
      "Power"
    ],
    [
      "441a9908-1e74-440b-b462-bdf6815583fe",
      "Front/RTC"
--- a/LightBlue.kicad_sch
+++ b/LightBlue.kicad_sch
@@ -11,19 +11,374 @@
  )
  (lib_symbols
    (symbol "Mechanical:Fiducial" (in_bom yes) (on_board yes)
      (property "Reference" "FID" (id 0) (at 0 5.08 0)
        (effects (font (size 1.27 1.27)))
      )
      (property "Value" "Fiducial" (id 1) (at 0 3.175 0)
        (effects (font (size 1.27 1.27)))
      )
      (property "Footprint" "" (id 2) (at 0 0 0)
        (effects (font (size 1.27 1.27)) hide)
      )
      (property "Datasheet" "~" (id 3) (at 0 0 0)
        (effects (font (size 1.27 1.27)) hide)
      )
      (property "ki_keywords" "fiducial marker" (id 4) (at 0 0 0)
        (effects (font (size 1.27 1.27)) hide)
      )
      (property "ki_description" "Fiducial Marker" (id 5) (at 0 0 0)
        (effects (font (size 1.27 1.27)) hide)
      )
      (property "ki_fp_filters" "Fiducial*" (id 6) (at 0 0 0)
        (effects (font (size 1.27 1.27)) hide)
      )
      (symbol "Fiducial_0_1"
        (circle (center 0 0) (radius 1.27) (stroke (width 0.508)) (fill (type background)))
      )
    )
    (symbol "Mechanical:Heatsink" (pin_names (offset 1.016)) (in_bom yes) (on_board yes)
      (property "Reference" "HS" (id 0) (at 0 5.08 0)
        (effects (font (size 1.27 1.27)))
      )
      (property "Value" "Heatsink" (id 1) (at 0 -1.27 0)
        (effects (font (size 1.27 1.27)))
      )
      (property "Footprint" "" (id 2) (at 0.3048 0 0)
        (effects (font (size 1.27 1.27)) hide)
      )
      (property "Datasheet" "~" (id 3) (at 0.3048 0 0)
        (effects (font (size 1.27 1.27)) hide)
      )
      (property "ki_keywords" "thermal heat temperature" (id 4) (at 0 0 0)
        (effects (font (size 1.27 1.27)) hide)
      )
      (property "ki_description" "Heatsink" (id 5) (at 0 0 0)
        (effects (font (size 1.27 1.27)) hide)
      )
      (property "ki_fp_filters" "Heatsink_*" (id 6) (at 0 0 0)
        (effects (font (size 1.27 1.27)) hide)
      )
      (symbol "Heatsink_0_1"
        (polyline
          (pts
            (xy -0.3302 1.27)
            (xy -0.9652 1.27)
            (xy -0.9652 3.81)
            (xy -1.6002 3.81)
            (xy -1.6002 1.27)
            (xy -2.2352 1.27)
            (xy -2.2352 3.81)
            (xy -2.8702 3.81)
            (xy -2.8702 0)
            (xy -0.9652 0)
          )
          (stroke (width 0.254)) (fill (type background))
        )
        (polyline
          (pts
            (xy -0.3302 1.27)
            (xy -0.3302 3.81)
            (xy 0.3048 3.81)
            (xy 0.3048 1.27)
            (xy 0.9398 1.27)
            (xy 0.9398 3.81)
            (xy 1.5748 3.81)
            (xy 1.5748 1.27)
            (xy 2.2098 1.27)
            (xy 2.2098 3.81)
            (xy 2.8448 3.81)
            (xy 2.8448 0)
            (xy -0.9652 0)
          )
          (stroke (width 0.254)) (fill (type background))
        )
      )
    )
    (symbol "Mechanical:MountingHole" (pin_names (offset 1.016)) (in_bom yes) (on_board yes)
      (property "Reference" "H" (id 0) (at 0 5.08 0)
        (effects (font (size 1.27 1.27)))
      )
      (property "Value" "MountingHole" (id 1) (at 0 3.175 0)
        (effects (font (size 1.27 1.27)))
      )
      (property "Footprint" "" (id 2) (at 0 0 0)
        (effects (font (size 1.27 1.27)) hide)
      )
      (property "Datasheet" "~" (id 3) (at 0 0 0)
        (effects (font (size 1.27 1.27)) hide)
      )
      (property "ki_keywords" "mounting hole" (id 4) (at 0 0 0)
        (effects (font (size 1.27 1.27)) hide)
      )
      (property "ki_description" "Mounting Hole without connection" (id 5) (at 0 0 0)
        (effects (font (size 1.27 1.27)) hide)
      )
      (property "ki_fp_filters" "MountingHole*" (id 6) (at 0 0 0)
        (effects (font (size 1.27 1.27)) hide)
      )
      (symbol "MountingHole_0_1"
        (circle (center 0 0) (radius 1.27) (stroke (width 1.27)) (fill (type none)))
      )
    )
  )
-  (bus (pts (xy 104.775 74.93) (xy 109.855 74.93))
+  (bus (pts (xy 59.69 64.77) (xy 88.9 64.77))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (bus (pts (xy 156.845 95.885) (xy 190.5 95.885))
+  (bus (pts (xy 88.9 64.77) (xy 88.9 93.98))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
  (bus (pts (xy 88.9 93.98) (xy 109.855 93.98))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
  (bus (pts (xy 97.79 36.83) (xy 59.69 36.83))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
  (bus (pts (xy 97.79 87.63) (xy 97.79 36.83))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
  (bus (pts (xy 101.6 83.82) (xy 109.855 83.82))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
  (bus (pts (xy 101.6 123.19) (xy 110.49 123.19))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
  (bus (pts (xy 109.855 87.63) (xy 97.79 87.63))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
  (bus (pts (xy 157.48 97.79) (xy 170.18 97.79))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (label "I2C" (at 104.775 74.93 0)
+  (label "{I2C}" (at 101.6 83.82 0)
    (effects (font (size 1.27 1.27)) (justify left bottom))
  )
  (label "{I2C}" (at 101.6 123.19 0)
    (effects (font (size 1.27 1.27)) (justify left bottom))
  )
  (symbol (lib_id "Mechanical:Fiducial") (at 29.21 185.42 0) (unit 1)
    (in_bom yes) (on_board yes)
    (uuid "d6694e6a-eae0-4147-bc94-8d2c65eec42f")
    (property "Reference" "FID?" (id 0) (at 31.3691 184.2706 0)
      (effects (font (size 1.27 1.27)) (justify left))
    )
    (property "Value" "Fiducial" (id 1) (at 31.3691 186.5693 0)
      (effects (font (size 1.27 1.27)) (justify left))
    )
    (property "Footprint" "" (id 2) (at 29.21 185.42 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (property "Datasheet" "~" (id 3) (at 29.21 185.42 0)
      (effects (font (size 1.27 1.27)) hide)
    )
  )
  (symbol (lib_id "Mechanical:Fiducial") (at 29.21 193.04 0) (unit 1)
    (in_bom yes) (on_board yes)
    (uuid "cb680c0b-5011-49fe-ab2c-b8e25dd08527")
    (property "Reference" "FID?" (id 0) (at 31.3691 191.8906 0)
      (effects (font (size 1.27 1.27)) (justify left))
    )
    (property "Value" "Fiducial" (id 1) (at 31.3691 194.1893 0)
      (effects (font (size 1.27 1.27)) (justify left))
    )
    (property "Footprint" "" (id 2) (at 29.21 193.04 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (property "Datasheet" "~" (id 3) (at 29.21 193.04 0)
      (effects (font (size 1.27 1.27)) hide)
    )
  )
  (symbol (lib_id "Mechanical:Fiducial") (at 41.91 185.42 0) (unit 1)
    (in_bom yes) (on_board yes)
    (uuid "a3f36d21-b692-4657-b96e-b6fe5eae0384")
    (property "Reference" "FID?" (id 0) (at 44.0691 184.2706 0)
      (effects (font (size 1.27 1.27)) (justify left))
    )
    (property "Value" "Fiducial" (id 1) (at 44.0691 186.5693 0)
      (effects (font (size 1.27 1.27)) (justify left))
    )
    (property "Footprint" "" (id 2) (at 41.91 185.42 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (property "Datasheet" "~" (id 3) (at 41.91 185.42 0)
      (effects (font (size 1.27 1.27)) hide)
    )
  )
  (symbol (lib_id "Mechanical:Fiducial") (at 41.91 193.04 0) (unit 1)
    (in_bom yes) (on_board yes)
    (uuid "6e1877e9-cf72-4c13-a5dc-d95b870bb6c9")
    (property "Reference" "FID?" (id 0) (at 44.0691 191.8906 0)
      (effects (font (size 1.27 1.27)) (justify left))
    )
    (property "Value" "Fiducial" (id 1) (at 44.0691 194.1893 0)
      (effects (font (size 1.27 1.27)) (justify left))
    )
    (property "Footprint" "" (id 2) (at 41.91 193.04 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (property "Datasheet" "~" (id 3) (at 41.91 193.04 0)
      (effects (font (size 1.27 1.27)) hide)
    )
  )
  (symbol (lib_id "Mechanical:Fiducial") (at 54.61 185.42 0) (unit 1)
    (in_bom yes) (on_board yes)
    (uuid "397a81dd-bc3b-4d75-ac01-0741f48b79fe")
    (property "Reference" "FID?" (id 0) (at 56.7691 184.2706 0)
      (effects (font (size 1.27 1.27)) (justify left))
    )
    (property "Value" "Fiducial" (id 1) (at 56.7691 186.5693 0)
      (effects (font (size 1.27 1.27)) (justify left))
    )
    (property "Footprint" "" (id 2) (at 54.61 185.42 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (property "Datasheet" "~" (id 3) (at 54.61 185.42 0)
      (effects (font (size 1.27 1.27)) hide)
    )
  )
  (symbol (lib_id "Mechanical:Fiducial") (at 54.61 193.04 0) (unit 1)
    (in_bom yes) (on_board yes)
    (uuid "be733b35-4e5a-4d02-bba2-5bd334942370")
    (property "Reference" "FID?" (id 0) (at 56.7691 191.8906 0)
      (effects (font (size 1.27 1.27)) (justify left))
    )
    (property "Value" "Fiducial" (id 1) (at 56.7691 194.1893 0)
      (effects (font (size 1.27 1.27)) (justify left))
    )
    (property "Footprint" "" (id 2) (at 54.61 193.04 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (property "Datasheet" "~" (id 3) (at 54.61 193.04 0)
      (effects (font (size 1.27 1.27)) hide)
    )
  )
  (symbol (lib_id "Mechanical:Fiducial") (at 67.31 185.42 0) (unit 1)
    (in_bom yes) (on_board yes)
    (uuid "d7909674-1922-4ddb-8b1b-9c714bef3b92")
    (property "Reference" "FID?" (id 0) (at 69.4691 184.2706 0)
      (effects (font (size 1.27 1.27)) (justify left))
    )
    (property "Value" "Fiducial" (id 1) (at 69.4691 186.5693 0)
      (effects (font (size 1.27 1.27)) (justify left))
    )
    (property "Footprint" "" (id 2) (at 67.31 185.42 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (property "Datasheet" "~" (id 3) (at 67.31 185.42 0)
      (effects (font (size 1.27 1.27)) hide)
    )
  )
  (symbol (lib_id "Mechanical:Fiducial") (at 67.31 193.04 0) (unit 1)
    (in_bom yes) (on_board yes)
    (uuid "902787ce-17d4-4a85-914c-caf2c76e7348")
    (property "Reference" "FID?" (id 0) (at 69.4691 191.8906 0)
      (effects (font (size 1.27 1.27)) (justify left))
    )
    (property "Value" "Fiducial" (id 1) (at 69.4691 194.1893 0)
      (effects (font (size 1.27 1.27)) (justify left))
    )
    (property "Footprint" "" (id 2) (at 67.31 193.04 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (property "Datasheet" "~" (id 3) (at 67.31 193.04 0)
      (effects (font (size 1.27 1.27)) hide)
    )
  )
  (symbol (lib_id "Mechanical:MountingHole") (at 87.63 185.42 0) (unit 1)
    (in_bom yes) (on_board yes)
    (uuid "13673698-1ae8-48ac-89ad-67bec4817dbe")
    (property "Reference" "H?" (id 0) (at 90.1701 184.2706 0)
      (effects (font (size 1.27 1.27)) (justify left))
    )
    (property "Value" "MountingHole" (id 1) (at 90.1701 186.5693 0)
      (effects (font (size 1.27 1.27)) (justify left))
    )
    (property "Footprint" "" (id 2) (at 87.63 185.42 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (property "Datasheet" "~" (id 3) (at 87.63 185.42 0)
      (effects (font (size 1.27 1.27)) hide)
    )
  )
  (symbol (lib_id "Mechanical:MountingHole") (at 87.63 193.04 0) (unit 1)
    (in_bom yes) (on_board yes)
    (uuid "f42b7aad-88a1-4721-b564-f8f879d7e253")
    (property "Reference" "H?" (id 0) (at 90.1701 191.8906 0)
      (effects (font (size 1.27 1.27)) (justify left))
    )
    (property "Value" "MountingHole" (id 1) (at 90.1701 194.1893 0)
      (effects (font (size 1.27 1.27)) (justify left))
    )
    (property "Footprint" "" (id 2) (at 87.63 193.04 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (property "Datasheet" "~" (id 3) (at 87.63 193.04 0)
      (effects (font (size 1.27 1.27)) hide)
    )
  )
  (symbol (lib_id "Mechanical:MountingHole") (at 105.41 185.42 0) (unit 1)
    (in_bom yes) (on_board yes)
    (uuid "27427d47-315e-474e-8985-0b3c80fdd220")
    (property "Reference" "H?" (id 0) (at 107.9501 184.2706 0)
      (effects (font (size 1.27 1.27)) (justify left))
    )
    (property "Value" "MountingHole" (id 1) (at 107.9501 186.5693 0)
      (effects (font (size 1.27 1.27)) (justify left))
    )
    (property "Footprint" "" (id 2) (at 105.41 185.42 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (property "Datasheet" "~" (id 3) (at 105.41 185.42 0)
      (effects (font (size 1.27 1.27)) hide)
    )
  )
  (symbol (lib_id "Mechanical:MountingHole") (at 105.41 193.04 0) (unit 1)
    (in_bom yes) (on_board yes)
    (uuid "1719aa9c-b7b4-4351-ae6a-b606de4554d5")
    (property "Reference" "H?" (id 0) (at 107.9501 191.8906 0)
      (effects (font (size 1.27 1.27)) (justify left))
    )
    (property "Value" "MountingHole" (id 1) (at 107.9501 194.1893 0)
      (effects (font (size 1.27 1.27)) (justify left))
    )
    (property "Footprint" "" (id 2) (at 105.41 193.04 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (property "Datasheet" "~" (id 3) (at 105.41 193.04 0)
      (effects (font (size 1.27 1.27)) hide)
    )
  )
  (symbol (lib_id "Mechanical:Heatsink") (at 129.54 186.69 0) (unit 1)
    (in_bom yes) (on_board yes)
    (uuid "cd73f910-31d6-4226-a110-18f09eef8514")
    (property "Reference" "HS?" (id 0) (at 133.1469 183.6356 0)
      (effects (font (size 1.27 1.27)) (justify left))
    )
    (property "Value" "Heatsink" (id 1) (at 133.1469 185.9343 0)
      (effects (font (size 1.27 1.27)) (justify left))
    )
    (property "Footprint" "" (id 2) (at 129.8448 186.69 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (property "Datasheet" "~" (id 3) (at 129.8448 186.69 0)
      (effects (font (size 1.27 1.27)) hide)
    )
  )
  (sheet (at 190.5 24.13) (size 40.64 36.83)
    (stroke (width 0.001) (type solid) (color 132 0 132 1))
@@ -37,16 +392,22 @@
    )
  )
-  (sheet (at 22.86 123.19) (size 40.64 49.53)
+  (sheet (at 110.49 120.65) (size 36.83 20.32)
    (stroke (width 0.001) (type solid) (color 132 0 132 1))
    (fill (color 255 255 255 0.0000))
    (uuid a9e0a5b9-8f0f-46f3-b2b0-a429c678afed)
-    (property "Sheet name" "Audio" (id 0) (at 22.86 122.5541 0)
+    (property "Sheet name" "Audio" (id 0) (at 110.49 120.0141 0)
      (effects (font (size 1.27 1.27)) (justify left bottom))
    )
-    (property "Sheet file" "Audio.kicad_sch" (id 1) (at 22.86 173.2289 0)
+    (property "Sheet file" "Audio.kicad_sch" (id 1) (at 110.49 141.4789 0)
      (effects (font (size 1.27 1.27)) (justify left top))
    )
    (pin "{I2C}" bidirectional (at 110.49 123.19 180)
      (effects (font (size 1.27 1.27)) (justify left))
    )
    (pin "I2S{I2S}" input (at 110.49 125.73 180)
      (effects (font (size 1.27 1.27)) (justify left))
    )
  )
  (sheet (at 109.855 67.31) (size 47.625 41.275)
@@ -59,37 +420,34 @@
    (property "Sheet file" "CM4.kicad_sch" (id 1) (at 109.855 109.0939 0)
      (effects (font (size 1.27 1.27)) (justify left top))
    )
-    (pin "PCIe" bidirectional (at 157.48 95.885 0)
+    (pin "ETH{ETH}" bidirectional (at 109.855 93.98 180)
      (effects (font (size 1.27 1.27)) (justify left))
    )
    (pin "{CM4_USB}" bidirectional (at 109.855 87.63 180)
      (effects (font (size 1.27 1.27)) (justify left))
    )
    (pin "PCIe{PCIe}" bidirectional (at 157.48 97.79 0)
      (effects (font (size 1.27 1.27)) (justify right))
    )
-    (pin "USB" input (at 109.855 85.725 180)
+    (pin "{I2C}" bidirectional (at 109.855 83.82 180)
      (effects (font (size 1.27 1.27)) (justify left))
    )
    (pin "Ethernet" bidirectional (at 109.855 102.235 180)
      (effects (font (size 1.27 1.27)) (justify left))
    )
    (pin "HDMI_5V" bidirectional (at 138.43 108.585 270)
      (effects (font (size 1.27 1.27)) (justify left))
    )
    (pin "I2C" bidirectional (at 109.855 74.93 180)
      (effects (font (size 1.27 1.27)) (justify left))
    )
  )
-  (sheet (at 90.17 123.19) (size 39.37 48.26)
+  (sheet (at 24.13 62.23) (size 35.56 20.32)
    (stroke (width 0.001) (type solid) (color 132 0 132 1))
    (fill (color 255 255 255 0.0000))
    (uuid 18c18357-12fa-4472-a108-e954e5bd7840)
-    (property "Sheet name" "Ethernet" (id 0) (at 90.17 122.5541 0)
+    (property "Sheet name" "Ethernet" (id 0) (at 24.13 61.5941 0)
      (effects (font (size 1.27 1.27)) (justify left bottom))
    )
-    (property "Sheet file" "Ethernet.kicad_sch" (id 1) (at 90.17 171.9589 0)
+    (property "Sheet file" "Ethernet.kicad_sch" (id 1) (at 24.13 83.0589 0)
      (effects (font (size 1.27 1.27)) (justify left top))
    )
-    (pin "Ethernet" bidirectional (at 108.585 123.19 90)
+    (pin "ETH{ETH}" bidirectional (at 59.69 64.77 0)
      (effects (font (size 1.27 1.27)) (justify right))
    )
-    (pin "PoE" bidirectional (at 129.54 136.525 0)
+    (pin "{PoE}" output (at 59.69 67.31 0)
      (effects (font (size 1.27 1.27)) (justify right))
    )
  )
@@ -106,34 +464,52 @@
    )
  )
-  (sheet (at 190.5 88.265) (size 40.64 41.91)
+  (sheet (at 170.18 95.885) (size 35.56 14.605)
    (stroke (width 0.001) (type solid) (color 132 0 132 1))
    (fill (color 255 255 255 0.0000))
    (uuid a1a835e0-c072-4609-9cb4-4b95bf746f54)
-    (property "Sheet name" "PCIe" (id 0) (at 190.5 87.6291 0)
+    (property "Sheet name" "PCIe" (id 0) (at 170.18 95.2491 0)
      (effects (font (size 1.27 1.27)) (justify left bottom))
    )
-    (property "Sheet file" "PCIe.kicad_sch" (id 1) (at 190.5 130.6839 0)
+    (property "Sheet file" "PCIe.kicad_sch" (id 1) (at 170.18 110.9989 0)
      (effects (font (size 1.27 1.27)) (justify left top))
    )
-    (pin "PCIe" bidirectional (at 190.5 95.885 180)
+    (pin "PCIe{PCIe}" bidirectional (at 170.18 97.79 180)
      (effects (font (size 1.27 1.27)) (justify left))
    )
    (pin "+3.3V" input (at 210.82 88.265 90)
      (effects (font (size 1.27 1.27)) (justify right))
    )
  )
-  (sheet (at 22.86 34.29) (size 40.64 57.785)
+  (sheet (at 24.13 91.44) (size 33.02 20.32)
    (stroke (width 0.001) (type solid) (color 132 0 132 1))
    (fill (color 255 255 255 0.0000))
    (uuid c7bf4e1f-6bd1-4be7-9e56-1bd438bf5d42)
    (property "Sheet name" "Power" (id 0) (at 24.13 90.8041 0)
      (effects (font (size 1.27 1.27)) (justify left bottom))
    )
    (property "Sheet file" "Power.kicad_sch" (id 1) (at 24.13 112.2689 0)
      (effects (font (size 1.27 1.27)) (justify left top))
    )
  )
  (sheet (at 24.13 30.48) (size 35.56 22.86)
    (stroke (width 0.001) (type solid) (color 132 0 132 1))
    (fill (color 255 255 255 0.0000))
    (uuid aa1d8d83-5167-420c-9ee7-3e4dcc942bfc)
-    (property "Sheet name" "USB" (id 0) (at 22.86 33.6541 0)
+    (property "Sheet name" "USB" (id 0) (at 24.13 29.8441 0)
      (effects (font (size 1.27 1.27)) (justify left bottom))
    )
-    (property "Sheet file" "USB.kicad_sch" (id 1) (at 22.86 92.5839 0)
+    (property "Sheet file" "USB.kicad_sch" (id 1) (at 24.13 53.8489 0)
      (effects (font (size 1.27 1.27)) (justify left top))
    )
    (pin "EXTRST" input (at 59.69 34.29 0)
      (effects (font (size 1.27 1.27)) (justify right))
    )
    (pin "{CM4_USB}" bidirectional (at 59.69 36.83 0)
      (effects (font (size 1.27 1.27)) (justify right))
    )
    (pin "CM4_DBG{TX RX}" bidirectional (at 59.69 39.37 0)
      (effects (font (size 1.27 1.27)) (justify right))
    )
  )
  (sheet_instances
@@ -144,10 +520,50 @@
    (path "/a9e0a5b9-8f0f-46f3-b2b0-a429c678afed/" (page "5"))
    (path "/18c18357-12fa-4472-a108-e954e5bd7840/" (page "6"))
    (path "/a1a835e0-c072-4609-9cb4-4b95bf746f54/" (page "7"))
    (path "/c7bf4e1f-6bd1-4be7-9e56-1bd438bf5d42/" (page "9"))
    (path "/441a9908-1e74-440b-b462-bdf6815583fe/" (page "9"))
  )
  (symbol_instances
    (path "/397a81dd-bc3b-4d75-ac01-0741f48b79fe"
      (reference "FID?") (unit 1) (value "Fiducial") (footprint "")
    )
    (path "/6e1877e9-cf72-4c13-a5dc-d95b870bb6c9"
      (reference "FID?") (unit 1) (value "Fiducial") (footprint "")
    )
    (path "/902787ce-17d4-4a85-914c-caf2c76e7348"
      (reference "FID?") (unit 1) (value "Fiducial") (footprint "")
    )
    (path "/a3f36d21-b692-4657-b96e-b6fe5eae0384"
      (reference "FID?") (unit 1) (value "Fiducial") (footprint "")
    )
    (path "/be733b35-4e5a-4d02-bba2-5bd334942370"
      (reference "FID?") (unit 1) (value "Fiducial") (footprint "")
    )
    (path "/cb680c0b-5011-49fe-ab2c-b8e25dd08527"
      (reference "FID?") (unit 1) (value "Fiducial") (footprint "")
    )
    (path "/d6694e6a-eae0-4147-bc94-8d2c65eec42f"
      (reference "FID?") (unit 1) (value "Fiducial") (footprint "")
    )
    (path "/d7909674-1922-4ddb-8b1b-9c714bef3b92"
      (reference "FID?") (unit 1) (value "Fiducial") (footprint "")
    )
    (path "/13673698-1ae8-48ac-89ad-67bec4817dbe"
      (reference "H?") (unit 1) (value "MountingHole") (footprint "")
    )
    (path "/1719aa9c-b7b4-4351-ae6a-b606de4554d5"
      (reference "H?") (unit 1) (value "MountingHole") (footprint "")
    )
    (path "/27427d47-315e-474e-8985-0b3c80fdd220"
      (reference "H?") (unit 1) (value "MountingHole") (footprint "")
    )
    (path "/f42b7aad-88a1-4721-b564-f8f879d7e253"
      (reference "H?") (unit 1) (value "MountingHole") (footprint "")
    )
    (path "/cd73f910-31d6-4226-a110-18f09eef8514"
      (reference "HS?") (unit 1) (value "Heatsink") (footprint "")
    )
    (path "/7c248bd3-8232-4777-a40c-eab53460cf85/1aa5f27b-6240-4920-a583-40b98af403dc"
      (reference "#PWR?") (unit 1) (value "GND") (footprint "")
    )
@@ -161,25 +577,232 @@
      (reference "J?") (unit 1) (value "HDMI_A_2.0") (footprint "LightBlue:HDMI_A_Molex_2086588131_Horizontal")
    )
    (path "/7c248bd3-8232-4777-a40c-eab53460cf85/b131b144-fc54-40cc-8411-449b069a57ca"
-      (reference "U1") (unit 1) (value "RaspberryPi-CM4Lite") (footprint "Module:RaspberryPi-CM4")
+      (reference "U?") (unit 1) (value "RaspberryPi-CM4Lite") (footprint "Module:RaspberryPi-CM4")
    )
    (path "/7c248bd3-8232-4777-a40c-eab53460cf85/e774090e-475c-4e3f-aa6e-6c912d7ab3b3"
-      (reference "U1") (unit 2) (value "RaspberryPi-CM4Lite") (footprint "Module:RaspberryPi-CM4")
+      (reference "U?") (unit 2) (value "RaspberryPi-CM4Lite") (footprint "Module:RaspberryPi-CM4")
    )
-    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/e0469852-771a-434b-963a-8ecb4c38b617"
+    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/0a44d687-164c-40aa-b53b-9a9ebe02a71d"
-      (reference "J1") (unit 1) (value "USB_C_Receptacle_USB2.0") (footprint "Connector_USB:USB_C_Receptacle_HRO_TYPE-C-31-M-12")
+      (reference "#PWR?") (unit 1) (value "+3V3") (footprint "")
    )
    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/0d681312-bb01-42cc-9923-d4853ea925f5"
      (reference "#PWR?") (unit 1) (value "GND") (footprint "")
    )
    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/11283c61-9877-4e71-8727-24cd49c6f363"
      (reference "#PWR?") (unit 1) (value "+3V3") (footprint "")
    )
    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/1168c514-ebad-4e5f-b53c-021afc363818"
      (reference "#PWR?") (unit 1) (value "GND") (footprint "")
    )
    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/1b6cc417-6d92-4593-b3ee-334b39d2e585"
      (reference "#PWR?") (unit 1) (value "GND") (footprint "")
    )
    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/28623787-bc8b-4e5d-9b78-3dcfd75b896b"
      (reference "#PWR?") (unit 1) (value "GND") (footprint "")
    )
    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/3cd2edbb-4f6f-4c2b-b029-08c0a758103a"
      (reference "#PWR?") (unit 1) (value "GND") (footprint "")
    )
    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/40b6ea6b-ccc4-42d4-9e40-90c6fe549057"
      (reference "#PWR?") (unit 1) (value "GND") (footprint "")
    )
    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/44061290-74ee-4d8a-b8ed-dd53608f539e"
      (reference "#PWR?") (unit 1) (value "GND") (footprint "")
    )
    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/4f8a6fbe-cafb-4dd1-9a49-9d6e7ce8c247"
      (reference "#PWR?") (unit 1) (value "GND") (footprint "")
    )
    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/52f785dc-d7e9-4b51-8bbb-c315a03c2c17"
      (reference "#PWR?") (unit 1) (value "GND") (footprint "")
    )
    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/55e7eada-ee5c-4622-a159-817bd9f93247"
      (reference "#PWR?") (unit 1) (value "+3V3") (footprint "")
    )
    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/625bc028-1860-4e0f-b6d9-d5907da68c57"
      (reference "#PWR?") (unit 1) (value "GND") (footprint "")
    )
    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/626732e8-6fe6-44e3-9fb7-4dd6b6287f8b"
      (reference "#PWR?") (unit 1) (value "GND") (footprint "")
    )
    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/729b4fcc-9c8f-4e2f-8c74-19934a367fba"
      (reference "#PWR?") (unit 1) (value "+3V3") (footprint "")
    )
    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/81d6b1f0-63c6-4b0e-809e-60098213cd88"
      (reference "#PWR?") (unit 1) (value "GND") (footprint "")
    )
    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/847c9625-cba5-46cf-a986-b84047bf9f09"
      (reference "#PWR?") (unit 1) (value "GND") (footprint "")
    )
    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/88baf548-bbac-49d7-a518-d41bd557c932"
      (reference "#PWR?") (unit 1) (value "GND") (footprint "")
    )
    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/89c79878-0d2f-40e8-90c7-e102c91d7694"
      (reference "#PWR?") (unit 1) (value "GND") (footprint "")
    )
    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/8d36f876-a01b-45a1-abb8-2e0407ecd634"
      (reference "#PWR?") (unit 1) (value "GND") (footprint "")
    )
    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/98c93680-7e87-4b1c-85a0-1d07cd2fb871"
      (reference "#PWR?") (unit 1) (value "+3V3") (footprint "")
    )
    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/9dd0306e-d205-49fc-81b4-cfe3d70c8931"
      (reference "#PWR?") (unit 1) (value "GND") (footprint "")
    )
    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/a3ee2910-dc70-4187-a48a-90ad28fa75f0"
      (reference "#PWR?") (unit 1) (value "+3V3") (footprint "")
    )
    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/aa2e6c73-1afc-42a2-8568-7a8b6920240b"
      (reference "#PWR?") (unit 1) (value "GND") (footprint "")
    )
    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/c21f5032-5db5-46ae-ba9a-01557fcc88d3"
      (reference "#PWR?") (unit 1) (value "GND") (footprint "")
    )
    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/c89f5384-4e03-4593-b260-146068a98c19"
      (reference "#PWR?") (unit 1) (value "GND") (footprint "")
    )
    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/ca107bb5-e296-405a-8854-4394ac236b03"
      (reference "#PWR?") (unit 1) (value "GND") (footprint "")
    )
    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/d3745f07-cf7a-4fa1-bd26-01cca708c6a8"
      (reference "#PWR?") (unit 1) (value "+3V3") (footprint "")
    )
    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/ed6244a3-4997-4717-ae48-c12b6249f603"
      (reference "#PWR?") (unit 1) (value "GND") (footprint "")
    )
    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/f3454f14-b0aa-45ab-9b8d-07b51e4c246f"
      (reference "#PWR?") (unit 1) (value "+5V") (footprint "")
    )
    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/f9412c10-2ba6-4378-b110-8cfd88e2baa1"
      (reference "#PWR?") (unit 1) (value "GND") (footprint "")
    )
    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/fa73bddf-284f-43d3-b206-bd3c73855bac"
      (reference "#PWR?") (unit 1) (value "GND") (footprint "")
    )
    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/fca57d11-9984-43ce-9eaa-b87197f490cd"
      (reference "#PWR?") (unit 1) (value "GND") (footprint "")
    )
    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/1947c32b-7814-403d-b24a-30caca574f1d"
      (reference "C?") (unit 1) (value "100n") (footprint "")
    )
    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/24604b30-3cea-46f1-9cd3-e92a0ade5b63"
      (reference "C?") (unit 1) (value "4u7") (footprint "")
    )
    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/28c3a820-3c81-4c70-865d-f4372a81689d"
      (reference "C?") (unit 1) (value "100n") (footprint "")
    )
    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/2908586b-6a96-4d70-8370-084620a069c5"
      (reference "C?") (unit 1) (value "100u") (footprint "")
    )
    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/3cc4fc9f-b1de-46df-b0be-be5c9688539c"
      (reference "C?") (unit 1) (value "100n") (footprint "")
    )
    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/3d20f8cb-c9f4-4aa7-bfe0-523bab53d162"
      (reference "C?") (unit 1) (value "100n") (footprint "")
    )
    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/53f5d659-c4b0-428a-be33-96c4bdb1d518"
      (reference "C?") (unit 1) (value "100n") (footprint "")
    )
    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/75f1f3ac-dd03-44ee-9c8c-35f88a32c56b"
      (reference "C?") (unit 1) (value "100n/1kV/DNI") (footprint "")
    )
    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/8fa745b1-0828-40b3-b99d-72112517205b"
      (reference "C?") (unit 1) (value "10u") (footprint "")
    )
    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/af712809-54ce-4407-bbb5-b063be5c0474"
      (reference "C?") (unit 1) (value "100n") (footprint "")
    )
    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/b5629e54-28ac-40d1-84cb-0d54af7dc737"
      (reference "C?") (unit 1) (value "1u") (footprint "")
    )
    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/c6449e4b-be6a-4608-b72f-cc564d0175c4"
      (reference "C?") (unit 1) (value "18p") (footprint "")
    )
    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/d146055c-8aa8-48a7-afc9-ad76e69a2a0a"
      (reference "C?") (unit 1) (value "1u") (footprint "")
    )
    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/dd27d905-ff0f-4fee-bf4c-dcb8f1a8e27a"
      (reference "C?") (unit 1) (value "10u") (footprint "")
    )
    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/e227d82b-00e8-4593-9018-bdc7ec1ff3b0"
      (reference "C?") (unit 1) (value "18p") (footprint "")
    )
    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/eda2f89f-15a5-465c-9dd7-9cc644b43933"
      (reference "C?") (unit 1) (value "100n") (footprint "")
    )
    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/f2f7686b-8c9d-4b7b-911a-fff2498ec145"
      (reference "C?") (unit 1) (value "10u") (footprint "")
    )
    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/f5cb4366-e253-4171-a84c-b3c6c0d90de0"
      (reference "C?") (unit 1) (value "100n/1kV/DNI") (footprint "")
    )
    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/f6844e82-d36d-4f7b-89e8-6b9d63b80c11"
      (reference "C?") (unit 1) (value "100n") (footprint "")
    )
    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/66323853-f1bb-4a57-9741-65f7b746b19e"
      (reference "J?") (unit 1) (value "USB_A_Stacked") (footprint "")
    )
    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/e0469852-771a-434b-963a-8ecb4c38b617"
      (reference "J?") (unit 1) (value "USB_C_Receptacle_USB2.0") (footprint "Connector_USB:USB_C_Receptacle_HRO_TYPE-C-31-M-12")
    )
    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/775321c9-14c9-4076-965a-fb87a5647947"
      (reference "J?") (unit 2) (value "USB_A_Stacked") (footprint "")
    )
    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/0030dcc7-5562-4360-a9fb-9a70e6e7552d"
      (reference "R?") (unit 1) (value "5k1") (footprint "")
    )
    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/18a0b6cb-a436-4de6-a094-601e443d816a"
      (reference "R?") (unit 1) (value "2k2") (footprint "")
    )
    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/21a90da4-b879-40a1-93d5-77924e2c768b"
      (reference "R?") (unit 1) (value "2k2") (footprint "")
    )
    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/3abf70b8-dad2-41d4-ba92-0bc6b13f15b5"
      (reference "R?") (unit 1) (value "2k2") (footprint "")
    )
    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/3c6869e1-5028-4a26-8bf9-436fb6da2ff7"
      (reference "R?") (unit 1) (value "10k") (footprint "")
    )
    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/7411f25f-eb24-413a-a864-95370af2502a"
      (reference "R?") (unit 1) (value "10k") (footprint "")
    )
    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/763f60ac-c71a-4d00-9c29-b6bd7073ba45"
      (reference "R?") (unit 1) (value "12k/1%") (footprint "")
    )
    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/7e060db4-6613-4224-9a38-318892d30ccd"
      (reference "R?") (unit 1) (value "5k1") (footprint "")
    )
    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/84977bd6-376f-446b-ab56-242a4e1ac118"
      (reference "R?") (unit 1) (value "10k") (footprint "")
    )
    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/96b9bdb0-9841-4b72-98a6-5dd39edba4ad"
      (reference "R?") (unit 1) (value "10k") (footprint "")
    )
    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/990ff764-9e70-4c87-a1ad-228304493696"
      (reference "R?") (unit 1) (value "0R/1206") (footprint "")
    )
    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/e9cda99e-0a72-4fde-873e-43346c290cbb"
      (reference "R?") (unit 1) (value "0R/1206") (footprint "")
    )
    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/fd5f542c-8d5d-4304-b9a0-6107f9202c07"
      (reference "R?") (unit 1) (value "2k2") (footprint "")
    )
    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/0743dd55-f270-473d-a22d-74cd9742ee43"
      (reference "SW?") (unit 1) (value "SW_DEBUG_MODE") (footprint "Button_Switch_SMD:SW_SPDT_PCM12")
    )
    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/15a1c1c3-ed5e-4bb3-a60a-04e93ff6b7c2"
-      (reference "U2") (unit 1) (value "CP2102N-Axx-xQFN24") (footprint "Package_DFN_QFN:QFN-24-1EP_4x4mm_P0.5mm_EP2.6x2.6mm")
+      (reference "U?") (unit 1) (value "CP2102N-Axx-xQFN24") (footprint "Package_DFN_QFN:QFN-24-1EP_4x4mm_P0.5mm_EP2.6x2.6mm")
    )
    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/40680c49-ba5e-4c10-83e9-9cb72f8c5d4f"
-      (reference "U3") (unit 1) (value "FSUSB42MUX") (footprint "Package_SO:MSOP-10_3x3mm_P0.5mm")
+      (reference "U?") (unit 1) (value "FSUSB42MUX") (footprint "Package_SO:MSOP-10_3x3mm_P0.5mm")
    )
    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/5105cc08-b4dc-4ba3-8cf4-e45aefde5143"
      (reference "U?") (unit 1) (value "FSUSB42MUX") (footprint "Package_SO:MSOP-10_3x3mm_P0.5mm")
    )
    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/9967d169-bbf5-4d6d-ac18-9f3d0b52a88c"
      (reference "U?") (unit 1) (value "AP2171W") (footprint "Package_TO_SOT_SMD:SOT-23-5")
    )
    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/a106a099-ad6c-4144-9011-84433b2f39df"
      (reference "U?") (unit 1) (value "TPD4EUSB30") (footprint "Package_SON:USON-10_2.5x1.0mm_P0.5mm")
    )
    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/b2eef2d1-938c-4ca7-9ebd-9ff12ca3b444"
      (reference "U?") (unit 1) (value "USB2422") (footprint "LightBlue:QFN-24-1EP_4x4mm_P0.5mm_EP2.6x2.6mm")
@@ -187,27 +810,156 @@
    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/fcc2a1ef-0aed-4c75-96a9-e9e99c2a43c7"
      (reference "U?") (unit 1) (value "TPD4EUSB30") (footprint "Package_SON:USON-10_2.5x1.0mm_P0.5mm")
    )
    (path "/aa1d8d83-5167-420c-9ee7-3e4dcc942bfc/fbf0dbc2-bf7a-418f-bca2-8248332c89a0"
      (reference "Y?") (unit 1) (value "24MHz") (footprint "")
    )
    (path "/12f6ca59-5dee-4aea-b4bb-e4b9cab2885b/c09c8cca-c855-4542-a876-1781079d5d54"
      (reference "J?") (unit 1) (value "Conn_Coaxial") (footprint "Connector_Coaxial:U.FL_Hirose_U.FL-R-SMT-1_Vertical")
    )
    (path "/12f6ca59-5dee-4aea-b4bb-e4b9cab2885b/c09bd077-0d29-41a3-91d8-7b26a3246dec"
      (reference "U?") (unit 1) (value "SiliconLabs-MGM210P") (footprint "LightBlue:SiliconLabs_MGM210P")
    )
-    (path "/a9e0a5b9-8f0f-46f3-b2b0-a429c678afed/e9d6ae84-3d14-46c3-a089-d1bbc0b51db0"
+    (path "/a9e0a5b9-8f0f-46f3-b2b0-a429c678afed/1947831b-3778-494b-9b3b-33898a2c53a8"
-      (reference "J?") (unit 1) (value "AudioPlug3") (footprint "")
+      (reference "#PWR?") (unit 1) (value "GNDA") (footprint "")
    )
    (path "/a9e0a5b9-8f0f-46f3-b2b0-a429c678afed/1e24b193-0f65-423c-86de-a26d762bd7fb"
      (reference "#PWR?") (unit 1) (value "+5V") (footprint "")
    )
    (path "/a9e0a5b9-8f0f-46f3-b2b0-a429c678afed/2477bae0-157e-4641-abef-f9c36986bbd7"
      (reference "#PWR?") (unit 1) (value "GNDA") (footprint "")
    )
    (path "/a9e0a5b9-8f0f-46f3-b2b0-a429c678afed/3ee777d0-23cb-468e-b231-58a045727f86"
      (reference "#PWR?") (unit 1) (value "+3.3VA") (footprint "")
    )
    (path "/a9e0a5b9-8f0f-46f3-b2b0-a429c678afed/4958ec5f-12a3-4fa2-b546-d196e180b0c4"
      (reference "#PWR?") (unit 1) (value "+3.3VA") (footprint "")
    )
    (path "/a9e0a5b9-8f0f-46f3-b2b0-a429c678afed/5b555b3d-b387-4182-810f-242d23bc8cdc"
      (reference "#PWR?") (unit 1) (value "GND") (footprint "")
    )
    (path "/a9e0a5b9-8f0f-46f3-b2b0-a429c678afed/828e8392-4133-49ac-b872-2923e59a7e8f"
      (reference "#PWR?") (unit 1) (value "+3.3V") (footprint "")
    )
    (path "/a9e0a5b9-8f0f-46f3-b2b0-a429c678afed/861e2b14-3cd1-4a46-967d-de7184fb739e"
      (reference "#PWR?") (unit 1) (value "GND") (footprint "")
    )
    (path "/a9e0a5b9-8f0f-46f3-b2b0-a429c678afed/911a7ae0-62ac-4d94-8eba-d89c49e41027"
      (reference "#PWR?") (unit 1) (value "GNDA") (footprint "")
    )
    (path "/a9e0a5b9-8f0f-46f3-b2b0-a429c678afed/954680f7-f5c9-496e-a3f8-4bd9e290ee20"
      (reference "#PWR?") (unit 1) (value "GND") (footprint "")
    )
    (path "/a9e0a5b9-8f0f-46f3-b2b0-a429c678afed/9f839c69-4f60-4273-ab64-9a01541656f2"
      (reference "#PWR?") (unit 1) (value "GNDA") (footprint "")
    )
    (path "/a9e0a5b9-8f0f-46f3-b2b0-a429c678afed/a15d9c02-adf7-4a3f-8d6e-a04d6ab63f1e"
      (reference "#PWR?") (unit 1) (value "+5V") (footprint "")
    )
    (path "/a9e0a5b9-8f0f-46f3-b2b0-a429c678afed/c1ea99dd-45e3-4972-b985-a3a82d67da41"
      (reference "#PWR?") (unit 1) (value "GNDA") (footprint "")
    )
    (path "/a9e0a5b9-8f0f-46f3-b2b0-a429c678afed/cb371792-4f3d-44a6-b555-b5cddd2b1d3a"
      (reference "#PWR?") (unit 1) (value "+3.3V") (footprint "")
    )
    (path "/a9e0a5b9-8f0f-46f3-b2b0-a429c678afed/cce9e67e-cc79-4291-99b3-67e5c4903a0d"
      (reference "#PWR?") (unit 1) (value "GNDA") (footprint "")
    )
    (path "/a9e0a5b9-8f0f-46f3-b2b0-a429c678afed/ccfb661f-5ac2-4e98-aa87-67b1755c6e96"
      (reference "#PWR?") (unit 1) (value "+3.3VA") (footprint "")
    )
    (path "/a9e0a5b9-8f0f-46f3-b2b0-a429c678afed/ceba4b73-df06-4c51-991e-fda67dc92141"
      (reference "#PWR?") (unit 1) (value "+3.3VA") (footprint "")
    )
    (path "/a9e0a5b9-8f0f-46f3-b2b0-a429c678afed/d0d9e58f-694f-4f0a-9087-17f2daa0a3e4"
      (reference "#PWR?") (unit 1) (value "+3.3VA") (footprint "")
    )
    (path "/a9e0a5b9-8f0f-46f3-b2b0-a429c678afed/d8dd86e8-493f-4851-afa1-03377725c2b6"
      (reference "#PWR?") (unit 1) (value "GND") (footprint "")
    )
    (path "/a9e0a5b9-8f0f-46f3-b2b0-a429c678afed/f3b7aca5-8a56-4a51-97ff-4ecfe4bcb580"
      (reference "#PWR?") (unit 1) (value "+3.3V") (footprint "")
    )
    (path "/a9e0a5b9-8f0f-46f3-b2b0-a429c678afed/f3e3bc18-7fda-41e7-9b65-369b491ab3ba"
      (reference "#PWR?") (unit 1) (value "GNDA") (footprint "")
    )
    (path "/a9e0a5b9-8f0f-46f3-b2b0-a429c678afed/00e37bd4-dba1-4b3a-9686-51ca713b02e9"
      (reference "C?") (unit 1) (value "100n") (footprint "")
    )
    (path "/a9e0a5b9-8f0f-46f3-b2b0-a429c678afed/0203afd5-2f08-47a2-b223-ca317b9aa444"
      (reference "C?") (unit 1) (value "100n") (footprint "")
    )
    (path "/a9e0a5b9-8f0f-46f3-b2b0-a429c678afed/071a22b0-1931-4d7f-931e-d1c073ceba7a"
      (reference "C?") (unit 1) (value "100n") (footprint "")
    )
    (path "/a9e0a5b9-8f0f-46f3-b2b0-a429c678afed/80a04448-782e-4e50-9998-02533f869da0"
      (reference "C?") (unit 1) (value "10u") (footprint "")
    )
    (path "/a9e0a5b9-8f0f-46f3-b2b0-a429c678afed/80c5822f-0565-41ef-bbf8-6c06e0273568"
      (reference "C?") (unit 1) (value "10u") (footprint "")
    )
    (path "/a9e0a5b9-8f0f-46f3-b2b0-a429c678afed/96635341-37f1-42b7-8344-a99931bf0cd0"
      (reference "C?") (unit 1) (value "100n") (footprint "")
    )
    (path "/a9e0a5b9-8f0f-46f3-b2b0-a429c678afed/bcfc9fb8-d68a-4b5a-a838-958a4e9530f2"
      (reference "C?") (unit 1) (value "2u2/25V") (footprint "")
    )
    (path "/a9e0a5b9-8f0f-46f3-b2b0-a429c678afed/beaed7d3-12d5-493b-8d0e-eeedf69e253d"
      (reference "C?") (unit 1) (value "100n") (footprint "")
    )
    (path "/a9e0a5b9-8f0f-46f3-b2b0-a429c678afed/ecfd1bd0-2329-48d0-ab3f-fbd470576dad"
      (reference "C?") (unit 1) (value "2u2/25V") (footprint "")
    )
    (path "/a9e0a5b9-8f0f-46f3-b2b0-a429c678afed/45c3bea5-38ff-4276-ad09-4c18c95d656c"
      (reference "J?") (unit 1) (value "AudioJack3") (footprint "")
    )
    (path "/a9e0a5b9-8f0f-46f3-b2b0-a429c678afed/1fd385c6-6920-4023-9ccd-0f8194c2240e"
      (reference "R?") (unit 1) (value "470R") (footprint "")
    )
    (path "/a9e0a5b9-8f0f-46f3-b2b0-a429c678afed/30b27367-128e-4e9c-a77a-a4ce0c7c99c9"
      (reference "R?") (unit 1) (value "0R/1206") (footprint "")
    )
    (path "/a9e0a5b9-8f0f-46f3-b2b0-a429c678afed/5ac8fd79-d03e-4d49-9bdf-ae45755e94a9"
      (reference "R?") (unit 1) (value "470R") (footprint "")
    )
    (path "/a9e0a5b9-8f0f-46f3-b2b0-a429c678afed/1e9ebda2-59cb-4701-873a-d55dee03ba02"
      (reference "U?") (unit 1) (value "PCM5121PW") (footprint "Package_SO:TSSOP-28_4.4x9.7mm_P0.65mm")
    )
-    (path "/18c18357-12fa-4472-a108-e954e5bd7840/63a243b8-0f7c-4234-af2f-e0f272a077aa"
+    (path "/a9e0a5b9-8f0f-46f3-b2b0-a429c678afed/90b4c53f-e96a-4362-bbc0-4600bdfa5e3e"
      (reference "U?") (unit 1) (value "NCP114MX") (footprint "")
    )
    (path "/18c18357-12fa-4472-a108-e954e5bd7840/01e5070a-f04c-4a8e-958c-cb10ff063fb6"
      (reference "#PWR?") (unit 1) (value "+3V3") (footprint "")
    )
    (path "/18c18357-12fa-4472-a108-e954e5bd7840/4f6e6d93-8198-4777-ab6f-4edc3d246858"
      (reference "#PWR?") (unit 1) (value "GND") (footprint "")
    )
    (path "/18c18357-12fa-4472-a108-e954e5bd7840/71c2db37-41ef-47f1-982f-5d8843ab5007"
      (reference "#PWR?") (unit 1) (value "GND") (footprint "")
    )
    (path "/18c18357-12fa-4472-a108-e954e5bd7840/bfd59301-5bb8-40fa-83c6-cb0f92dc2c65"
      (reference "#PWR?") (unit 1) (value "GND") (footprint "")
    )
    (path "/18c18357-12fa-4472-a108-e954e5bd7840/d5fe9d10-09f9-476d-9b5f-5095635c3fd4"
      (reference "#PWR?") (unit 1) (value "+3V3") (footprint "")
    )
    (path "/18c18357-12fa-4472-a108-e954e5bd7840/e599e2dc-829e-4ed0-aeb0-6c49465b27ed"
      (reference "#PWR?") (unit 1) (value "GND") (footprint "")
    )
    (path "/18c18357-12fa-4472-a108-e954e5bd7840/48dd30f4-6cc1-4a3c-9daf-1a3567fd9b4f"
      (reference "C?") (unit 1) (value "100n/1kV/DNI") (footprint "")
    )
    (path "/18c18357-12fa-4472-a108-e954e5bd7840/b2be482e-a06b-452c-b548-81523fcaa898"
      (reference "C?") (unit 1) (value "100n") (footprint "")
    )
    (path "/18c18357-12fa-4472-a108-e954e5bd7840/6dd5e861-e5d4-4759-b127-4958e3f04beb"
-      (reference "J") (unit 1) (value "RJ45_LINK-PP_LPJG0926HENL_Horizontal") (footprint "LightBlue:RJ45_LINK-PP_LPJG0926HENL_Horizontal")
+      (reference "J?") (unit 1) (value "RJ45_LINK-PP_LPJG0926HENL_Horizontal") (footprint "LightBlue:RJ45_LINK-PP_LPJG0926HENL_Horizontal")
    )
    (path "/18c18357-12fa-4472-a108-e954e5bd7840/021dd781-c0a2-4e06-a8a9-18b3d36b8b01"
      (reference "R?") (unit 1) (value "470Ω") (footprint "")
    )
    (path "/18c18357-12fa-4472-a108-e954e5bd7840/402630fe-21db-4aab-bf2b-692ed43189bc"
      (reference "R?") (unit 1) (value "0R/1206") (footprint "")
    )
    (path "/18c18357-12fa-4472-a108-e954e5bd7840/6cf869b7-4906-4269-be48-72d89d3fa069"
      (reference "R?") (unit 1) (value "470Ω") (footprint "")
    )
@@ -217,6 +969,12 @@
    (path "/18c18357-12fa-4472-a108-e954e5bd7840/cab21cf5-02d1-4415-8f47-c31f2794f0af"
      (reference "U?") (unit 1) (value "TPD4EUSB30") (footprint "Package_SON:USON-10_2.5x1.0mm_P0.5mm")
    )
    (path "/a1a835e0-c072-4609-9cb4-4b95bf746f54/ee71ebbb-0a12-4716-9738-45c8b8a4c792"
      (reference "#PWR?") (unit 1) (value "+3.3VP") (footprint "")
    )
    (path "/a1a835e0-c072-4609-9cb4-4b95bf746f54/f870ed1b-c629-4635-9613-c09ff67c8d20"
      (reference "#PWR?") (unit 1) (value "+3.3VP") (footprint "")
    )
    (path "/a1a835e0-c072-4609-9cb4-4b95bf746f54/fdf8bb7f-7888-44c2-aeb0-0bd1b640c3bf"
      (reference "#PWR?") (unit 1) (value "GND") (footprint "")
    )
@@ -277,11 +1035,14 @@
    (path "/441a9908-1e74-440b-b462-bdf6815583fe/aa1ff662-6bf4-4a65-b043-33ace0519667"
      (reference "D?") (unit 1) (value "LED Green") (footprint "")
    )
    (path "/441a9908-1e74-440b-b462-bdf6815583fe/52998f42-14c1-4bf6-8622-9496e3e54c53"
      (reference "R?") (unit 1) (value "100R") (footprint "")
    )
    (path "/441a9908-1e74-440b-b462-bdf6815583fe/5a0029e4-bf92-47ff-8351-56443847ec9d"
-      (reference "R?") (unit 1) (value "1kΩ") (footprint "")
+      (reference "R?") (unit 1) (value "1k") (footprint "")
    )
    (path "/441a9908-1e74-440b-b462-bdf6815583fe/d3cdfa6c-a784-4d4a-b93e-48f2bae1fccc"
-      (reference "R?") (unit 1) (value "1kΩ") (footprint "")
+      (reference "R?") (unit 1) (value "1k") (footprint "")
    )
    (path "/441a9908-1e74-440b-b462-bdf6815583fe/4d7ecf13-cc26-44b5-8623-a13ee46df5cd"
      (reference "SW?") (unit 1) (value "SW_RESET") (footprint "Button_Switch_THT:SW_Tactile_SPST_Angled_PTS645Vx39-2LFS")
@@ -292,9 +1053,6 @@
    (path "/441a9908-1e74-440b-b462-bdf6815583fe/a373cb77-347a-47c0-b211-d116f87bcf25"
      (reference "SW?") (unit 1) (value "SW_POWER") (footprint "Button_Switch_THT:SW_Tactile_SPST_Angled_PTS645Vx39-2LFS")
    )
    (path "/441a9908-1e74-440b-b462-bdf6815583fe/ef573ea6-7e1c-432d-a149-d435c467601a"
      (reference "SW?") (unit 1) (value "SW_DEBUG_MODE") (footprint "Button_Switch_SMD:SW_SPDT_PCM12")
    )
    (path "/441a9908-1e74-440b-b462-bdf6815583fe/27e10743-a290-46e9-b888-58fa0d14552b"
      (reference "U?") (unit 1) (value "PCF8563T") (footprint "Package_SO:SOIC-8_3.9x4.9mm_P1.27mm")
    )
--- a/LightBlue.kicad_sym
+++ b/LightBlue.kicad_sym
@@ -2754,7 +2754,7 @@
        (name "GND" (effects (font (size 1.27 1.27))))
        (number "33" (effects (font (size 1.27 1.27))))
      )
-      (pin bidirectional line (at 25.4 2.54 180) (length 3.81)
+      (pin bidirectional line (at 25.4 5.08 180) (length 3.81)
        (name "GPIO5" (effects (font (size 1.27 1.27))))
        (number "34" (effects (font (size 1.27 1.27))))
      )
@@ -2842,7 +2842,7 @@
        (name "GND" (effects (font (size 1.27 1.27))))
        (number "53" (effects (font (size 1.27 1.27))))
      )
-      (pin bidirectional line (at 25.4 5.08 180) (length 3.81)
+      (pin bidirectional line (at 25.4 2.54 180) (length 3.81)
        (name "GPIO4" (effects (font (size 1.27 1.27))))
        (number "54" (effects (font (size 1.27 1.27))))
      )
@@ -3368,7 +3368,7 @@
        (name "DSI1_D1_N" (effects (font (size 1.27 1.27))))
        (number "181" (effects (font (size 1.27 1.27))))
      )
-      (pin output line (at 25.4 2.54 180) (length 3.81)
+      (pin output line (at 25.4 5.08 180) (length 3.81)
        (name "HDMI0_TX0_P" (effects (font (size 1.27 1.27))))
        (number "182" (effects (font (size 1.27 1.27))))
      )
@@ -3376,7 +3376,7 @@
        (name "DSI1_D1_P" (effects (font (size 1.27 1.27))))
        (number "183" (effects (font (size 1.27 1.27))))
      )
-      (pin output line (at 25.4 5.08 180) (length 3.81)
+      (pin output line (at 25.4 2.54 180) (length 3.81)
        (name "HDMI0_TX0_N" (effects (font (size 1.27 1.27))))
        (number "184" (effects (font (size 1.27 1.27))))
      )
--- a/PCIe.kicad_sch
+++ b/PCIe.kicad_sch
@@ -417,6 +417,55 @@
        )
      )
    )
    (symbol "power:+3.3VP" (power) (pin_names (offset 0)) (in_bom yes) (on_board yes)
      (property "Reference" "#PWR" (id 0) (at 3.81 -1.27 0)
        (effects (font (size 1.27 1.27)) hide)
      )
      (property "Value" "+3.3VP" (id 1) (at 0 2.54 0)
        (effects (font (size 1.27 1.27)))
      )
      (property "Footprint" "" (id 2) (at 0 0 0)
        (effects (font (size 1.27 1.27)) hide)
      )
      (property "Datasheet" "" (id 3) (at 0 0 0)
        (effects (font (size 1.27 1.27)) hide)
      )
      (property "ki_keywords" "power-flag" (id 4) (at 0 0 0)
        (effects (font (size 1.27 1.27)) hide)
      )
      (property "ki_description" "Power symbol creates a global label with name \"+3.3VP\"" (id 5) (at 0 0 0)
        (effects (font (size 1.27 1.27)) hide)
      )
      (symbol "+3.3VP_0_0"
        (pin power_in line (at 0 0 90) (length 0) hide
          (name "+3.3VP" (effects (font (size 1.27 1.27))))
          (number "1" (effects (font (size 1.27 1.27))))
        )
      )
      (symbol "+3.3VP_0_1"
        (polyline
          (pts
            (xy -0.762 1.27)
            (xy 0 2.54)
          )
          (stroke (width 0)) (fill (type none))
        )
        (polyline
          (pts
            (xy 0 0)
            (xy 0 2.54)
          )
          (stroke (width 0)) (fill (type none))
        )
        (polyline
          (pts
            (xy 0 2.54)
            (xy 0.762 1.27)
          )
          (stroke (width 0)) (fill (type none))
        )
      )
    )
    (symbol "power:GND" (power) (pin_names (offset 0)) (in_bom yes) (on_board yes)
      (property "Reference" "#PWR" (id 0) (at 0 -6.35 0)
        (effects (font (size 1.27 1.27)) hide)
@@ -459,24 +508,23 @@
  )
  (no_connect (at 88.9 53.34))
  (no_connect (at 88.9 68.58))
  (no_connect (at 88.9 71.12))
  (no_connect (at 88.9 73.66))
  (no_connect (at 88.9 76.2))
  (no_connect (at 88.9 78.74))
  (no_connect (at 88.9 81.28))
  (no_connect (at 88.9 83.82))
  (no_connect (at 88.9 86.36))
  (no_connect (at 88.9 88.9))
  (no_connect (at 88.9 91.44))
  (no_connect (at 88.9 93.98))
  (no_connect (at 88.9 96.52))
  (no_connect (at 88.9 114.3))
  (no_connect (at 105.41 135.89))
  (no_connect (at 139.7 111.76))
-  (no_connect (at 139.7 119.38))
+  (no_connect (at 88.9 71.12))
  (no_connect (at 88.9 91.44))
  (no_connect (at 88.9 88.9))
  (no_connect (at 88.9 76.2))
  (no_connect (at 88.9 53.34))
  (no_connect (at 88.9 78.74))
  (no_connect (at 267.97 86.36))
  (no_connect (at 139.7 119.38))
  (no_connect (at 88.9 93.98))
  (no_connect (at 88.9 114.3))
  (no_connect (at 88.9 73.66))
  (no_connect (at 88.9 81.28))
  (no_connect (at 88.9 86.36))
  (no_connect (at 88.9 83.82))
  (no_connect (at 88.9 68.58))
  (no_connect (at 88.9 96.52))
  (bus_entry (at 68.58 45.72) (size 2.54 2.54)
    (stroke (width 0.1524) (type solid) (color 0 0 0 0))
@@ -572,43 +620,64 @@
  (bus (pts (xy 68.58 124.46) (xy 68.58 127))
    (stroke (width 0) (type solid) (color 0 0 0 0))
  )
-  (bus (pts (xy 68.58 127) (xy 68.58 134.62))
+
-    (stroke (width 0) (type solid) (color 0 0 0 0))
+  (label "PCIe.~RST" (at 74.93 48.26 0)
    (effects (font (size 1.27 1.27)) (justify left bottom))
  )
  (label "PCIe.~CLKREQ" (at 74.93 50.8 0)
    (effects (font (size 1.27 1.27)) (justify left bottom))
  )
  (label "PCIe.TX+" (at 74.93 58.42 0)
    (effects (font (size 1.27 1.27)) (justify left bottom))
  )
  (label "PCIe.TX-" (at 74.93 60.96 0)
    (effects (font (size 1.27 1.27)) (justify left bottom))
  )
  (label "PCIe.RX+" (at 74.93 63.5 0)
    (effects (font (size 1.27 1.27)) (justify left bottom))
  )
  (label "PCIe.RX-" (at 74.93 66.04 0)
    (effects (font (size 1.27 1.27)) (justify left bottom))
  )
  (label "PCIe.CLK+" (at 76.2 127 0)
    (effects (font (size 1.27 1.27)) (justify left bottom))
  )
  (label "PCIe.CLK-" (at 76.2 129.54 0)
    (effects (font (size 1.27 1.27)) (justify left bottom))
  )
-  (label "PCIe_nRST" (at 87.63 48.26 180)
+  (hierarchical_label "PCIe{PCIe}" (shape bidirectional) (at 63.5 43.18 180)
-    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (effects (font (size 1.27 1.27)) (justify right))
  )
  (label "PCIe_CLK_nREQ" (at 87.63 50.8 180)
    (effects (font (size 1.27 1.27)) (justify right bottom))
  )
  (label "PCIe_TX_P" (at 87.63 58.42 180)
    (effects (font (size 1.27 1.27)) (justify right bottom))
  )
  (label "PCIe_TX_N" (at 87.63 60.96 180)
    (effects (font (size 1.27 1.27)) (justify right bottom))
  )
  (label "PCIe_RX_P" (at 87.63 63.5 180)
    (effects (font (size 1.27 1.27)) (justify right bottom))
  )
  (label "PCIe_RX_N" (at 87.63 66.04 180)
    (effects (font (size 1.27 1.27)) (justify right bottom))
  )
  (label "PCIe_CLK_P" (at 87.63 127 180)
    (effects (font (size 1.27 1.27)) (justify right bottom))
  )
  (label "PCIe_CLK_N" (at 87.63 129.54 180)
    (effects (font (size 1.27 1.27)) (justify right bottom))
  )
-  (hierarchical_label "PCIe" (shape bidirectional) (at 63.5 43.18 180)
+  (symbol (lib_id "power:+3.3VP") (at 114.3 40.64 0) (unit 1)
-    (effects (font (size 1.27 1.27)) (justify right))
+    (in_bom yes) (on_board yes)
    (uuid "ee71ebbb-0a12-4716-9738-45c8b8a4c792")
    (property "Reference" "#PWR?" (id 0) (at 118.11 41.91 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (property "Value" "+3.3VP" (id 1) (at 114.6683 36.3156 0))
    (property "Footprint" "" (id 2) (at 114.3 40.64 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (property "Datasheet" "" (id 3) (at 114.3 40.64 0)
      (effects (font (size 1.27 1.27)) hide)
    )
  )
-  (hierarchical_label "+3.3V" (shape input) (at 114.3 40.64 180)
+
-    (effects (font (size 1.27 1.27)) (justify right))
+  (symbol (lib_id "power:+3.3VP") (at 144.78 76.2 0) (unit 1)
-  )
+    (in_bom yes) (on_board yes)
-  (hierarchical_label "+3.3V" (shape input) (at 144.78 76.2 180)
+    (uuid "f870ed1b-c629-4635-9613-c09ff67c8d20")
-    (effects (font (size 1.27 1.27)) (justify right))
+    (property "Reference" "#PWR?" (id 0) (at 148.59 77.47 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (property "Value" "+3.3VP" (id 1) (at 145.1483 71.8756 0))
    (property "Footprint" "" (id 2) (at 144.78 76.2 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (property "Datasheet" "" (id 3) (at 144.78 76.2 0)
      (effects (font (size 1.27 1.27)) hide)
    )
  )
  (symbol (lib_id "power:GND") (at 114.3 142.24 0) (unit 1)
--- a/Power.kicad_sch
+++ b/Power.kicad_sch
@@ -0,0 +1,8 @@
 (kicad_sch (version 20201015) (generator eeschema)
  (paper "A4")
  (lib_symbols
  )
 )
--- a/USB.kicad_sch
+++ b/USB.kicad_sch