From febd5d2ce0023648a01a7ab6162814a0d36c14b6 Mon Sep 17 00:00:00 2001
From: Pascal Eberhard <35179162+paeber@users.noreply.github.com>
Date: Tue, 7 Mar 2023 16:36:09 +0100
Subject: [PATCH] Add some components

---
 starfish/starfish.kicad_pcb | 551 ++++++++++++++------
 starfish/starfish.kicad_sch | 995 ++++++++++++++++++++++--------------
 2 files changed, 1026 insertions(+), 520 deletions(-)

diff --git a/starfish/starfish.kicad_pcb b/starfish/starfish.kicad_pcb
index b21d416..e0b0520 100644
--- a/starfish/starfish.kicad_pcb
+++ b/starfish/starfish.kicad_pcb
@@ -120,10 +120,10 @@
   (net 22 "Net-(Q56-G)")
   (net 23 "Net-(U20-EN)")
   (net 24 "Net-(SW60-A)")
-  (net 25 "unconnected-(U10-GPIO4{slash}TOUCH4{slash}ADC1_CH3-Pad4)")
-  (net 26 "unconnected-(U10-GPIO5{slash}TOUCH5{slash}ADC1_CH4-Pad5)")
-  (net 27 "unconnected-(U10-GPIO6{slash}TOUCH6{slash}ADC1_CH5-Pad6)")
-  (net 28 "unconnected-(U10-GPIO7{slash}TOUCH7{slash}ADC1_CH6-Pad7)")
+  (net 25 "/I2C_SCL")
+  (net 26 "/I2C_SDA")
+  (net 27 "/GPIO12")
+  (net 28 "/GPIO13")
   (net 29 "unconnected-(U10-GPIO15{slash}U0RTS{slash}ADC2_CH4{slash}XTAL_32K_P-Pad8)")
   (net 30 "unconnected-(U10-GPIO16{slash}U0CTS{slash}ADC2_CH5{slash}XTAL_32K_NH5-Pad9)")
   (net 31 "+5V")
@@ -145,7 +145,7 @@
   (net 47 "/Power/FB_5V")
   (net 48 "unconnected-(U10-GPIO47{slash}SPICLK_P{slash}SUBSPICLK_P_DIFF-Pad24)")
   (net 49 "unconnected-(U10-GPIO48{slash}SPICLK_N{slash}SUBSPICLK_N_DIFF-Pad25)")
-  (net 50 "unconnected-(U10-GPIO45-Pad26)")
+  (net 50 "/GPIO14")
   (net 51 "unconnected-(U10-SPIIO6{slash}GPIO35{slash}FSPID{slash}SUBSPID-Pad28)")
   (net 52 "/GPIO0")
   (net 53 "/CHIP_PU")
@@ -161,7 +161,7 @@
   (net 63 "unconnected-(U10-MTDI{slash}GPIO41{slash}CLK_OUT1-Pad34)")
   (net 64 "unconnected-(U10-MTMS{slash}GPIO42-Pad35)")
   (net 65 "unconnected-(U10-GPIO2{slash}TOUCH2{slash}ADC1_CH1-Pad38)")
-  (net 66 "unconnected-(U10-GPIO10{slash}TOUCH10{slash}ADC1_CH9{slash}FSPICS0{slash}FSPIIO4{slash}SUBSPICS0-Pad18)")
+  (net 66 "Net-(SW61-A)")
   (net 67 "Net-(J90-Pin_2)")
 
   (footprint "paeber:13019319" (layer "F.Cu")
@@ -618,6 +618,77 @@
       (net 6 "Net-(U10-GPIO1{slash}TOUCH1{slash}ADC1_CH0)") (pinfunction "1") (pintype "passive") (tstamp 02aa74fd-1ca8-4453-819c-023cf9697841))
   )
 
+  (footprint "paeber:13019319" (layer "F.Cu")
+    (tstamp 330c4f49-a62e-46b6-b7e2-b7643cf5e9ce)
+    (at 222.175 80.295)
+    (descr "LSH GULLWING")
+    (tags "Switch")
+    (property "Mouser" "693-1301.9315")
+    (property "Sheetfile" "starfish.kicad_sch")
+    (property "Sheetname" "")
+    (property "ki_description" "Sensorschalter SHORT TRAVEL SWITCH 6X6, 5.0MM")
+    (property "ki_keywords" "switch lever")
+    (path "/ead98668-14be-403f-98aa-d7d2e9a90fc8")
+    (attr smd)
+    (fp_text reference "SW61" (at 0.525 0) (layer "F.SilkS")
+        (effects (font (size 1.27 1.27) (thickness 0.254)))
+      (tstamp f40ac548-39c3-4876-ae27-b26c8cf8d8ab)
+    )
+    (fp_text value "1301.9315" (at 0.525 0) (layer "F.SilkS") hide
+        (effects (font (size 1.27 1.27) (thickness 0.254)))
+      (tstamp 221d2f52-1bdd-4ff9-a808-2c8dc9f5075c)
+    )
+    (fp_text user "${REFERENCE}" (at 0.525 0) (layer "F.Fab")
+        (effects (font (size 1.27 1.27) (thickness 0.254)))
+      (tstamp ee7e0099-a98b-4c86-9b12-f2f023575653)
+    )
+    (fp_line (start -5.75 -2.4) (end -5.75 -2.4)
+      (stroke (width 0.2) (type solid)) (layer "F.SilkS") (tstamp ed999ae5-cd7a-4fc3-921d-ea41f29f6a10))
+    (fp_line (start -5.75 -2.2) (end -5.75 -2.2)
+      (stroke (width 0.2) (type solid)) (layer "F.SilkS") (tstamp f4c5c655-f04e-409d-9d82-9caf1f3eb7e8))
+    (fp_line (start -2.15 -3) (end 3.85 -3)
+      (stroke (width 0.1) (type solid)) (layer "F.SilkS") (tstamp 0c5a9e58-2c10-4ea2-a176-8b6c4d40e1c8))
+    (fp_line (start -2.15 3) (end -2.15 -3)
+      (stroke (width 0.1) (type solid)) (layer "F.SilkS") (tstamp e8c990e2-a96f-447d-9560-0f95ae52577f))
+    (fp_line (start 3.85 -3) (end 3.85 3)
+      (stroke (width 0.1) (type solid)) (layer "F.SilkS") (tstamp 2d7b66e1-b4a3-4a3c-b01b-ddbe250bb9b7))
+    (fp_line (start 3.85 3) (end -2.15 3)
+      (stroke (width 0.1) (type solid)) (layer "F.SilkS") (tstamp 10ac7eae-da3b-4ccd-82e9-61c7135cd734))
+    (fp_arc (start -5.75 -2.4) (mid -5.65 -2.3) (end -5.75 -2.2)
+      (stroke (width 0.2) (type solid)) (layer "F.SilkS") (tstamp 8742f479-9f69-4b02-aed9-ff1ae2e182a9))
+    (fp_arc (start -5.75 -2.2) (mid -5.85 -2.3) (end -5.75 -2.4)
+      (stroke (width 0.2) (type solid)) (layer "F.SilkS") (tstamp 92f181f8-05fd-4008-9e3a-58329fee333d))
+    (fp_line (start -6.85 -4) (end 7.9 -4)
+      (stroke (width 0.1) (type solid)) (layer "F.CrtYd") (tstamp 6ad710fb-a64c-4f30-b560-d27e479ac767))
+    (fp_line (start -6.85 4) (end -6.85 -4)
+      (stroke (width 0.1) (type solid)) (layer "F.CrtYd") (tstamp 3d931256-a0aa-4d63-bc1c-ddc723290184))
+    (fp_line (start 7.9 -4) (end 7.9 4)
+      (stroke (width 0.1) (type solid)) (layer "F.CrtYd") (tstamp c7441430-e836-4caf-b49b-d40adfde3ffd))
+    (fp_line (start 7.9 4) (end -6.85 4)
+      (stroke (width 0.1) (type solid)) (layer "F.CrtYd") (tstamp a138cf87-8797-41f4-a5f4-dccb90348812))
+    (fp_line (start -2.15 -3) (end 3.85 -3)
+      (stroke (width 0.2) (type solid)) (layer "F.Fab") (tstamp 54edc4ac-9eba-4452-89b3-3e66187f50af))
+    (fp_line (start -2.15 3) (end -2.15 -3)
+      (stroke (width 0.2) (type solid)) (layer "F.Fab") (tstamp c419c2ec-c4fd-413b-ae38-38d482b19581))
+    (fp_line (start 3.85 -3) (end 3.85 3)
+      (stroke (width 0.2) (type solid)) (layer "F.Fab") (tstamp 24c11b94-39cc-4ddd-8251-b2faf3d166e7))
+    (fp_line (start 3.85 3) (end -2.15 3)
+      (stroke (width 0.2) (type solid)) (layer "F.Fab") (tstamp 9204847a-bb7c-4782-8be1-063c1b567de7))
+    (pad "1" smd rect (at -4.15 -2.25 90) (size 1.4 2.4) (layers "F.Cu" "F.Paste" "F.Mask")
+      (net 66 "Net-(SW61-A)") (pinfunction "A") (pintype "passive") (tstamp eb18c8cb-af9c-4a82-af0f-0e21f45116f5))
+    (pad "1" smd rect (at 5.7 -2.25 90) (size 1.4 2.4) (layers "F.Cu" "F.Paste" "F.Mask")
+      (net 66 "Net-(SW61-A)") (pinfunction "A") (pintype "passive") (tstamp 40e5b2ca-572c-4e6c-8f3b-94088df13cb6))
+    (pad "2" smd rect (at -4 2.25 90) (size 1.4 2.4) (layers "F.Cu" "F.Paste" "F.Mask")
+      (net 1 "GND") (pinfunction "B") (pintype "passive") (tstamp 65263b96-f0d7-4fcd-831d-a91955894545))
+    (pad "2" smd rect (at 5.7 2.25 90) (size 1.4 2.4) (layers "F.Cu" "F.Paste" "F.Mask")
+      (net 1 "GND") (pinfunction "B") (pintype "passive") (tstamp a00e6cef-0f1f-48d4-bcf4-ae8e73dc3641))
+    (model "${PAEBER_3D}/buttons/1301.9315.stp"
+      (offset (xyz 0.8 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz -90 0 0))
+    )
+  )
+
   (footprint "MountingHole:MountingHole_3.2mm_M3_DIN965_Pad_TopBottom" (layer "F.Cu")
     (tstamp 359a26f5-38b8-4726-9168-64c16a724bae)
     (at 175 105 -90)
@@ -1187,6 +1258,74 @@
     )
   )
 
+  (footprint "Connector_PinSocket_2.54mm:PinSocket_1x04_P2.54mm_Vertical" (layer "F.Cu")
+    (tstamp 5806affc-494c-42ae-bbad-6df0b787fa3b)
+    (at 218.625 90.8)
+    (descr "Through hole straight socket strip, 1x04, 2.54mm pitch, single row (from Kicad 4.0.7), script generated")
+    (tags "Through hole socket strip THT 1x04 2.54mm single row")
+    (property "Sheetfile" "starfish.kicad_sch")
+    (property "Sheetname" "")
+    (property "ki_description" "Generic connector, single row, 01x04, script generated (kicad-library-utils/schlib/autogen/connector/)")
+    (property "ki_keywords" "connector")
+    (path "/6bdd56c0-7c72-40d0-bdf1-fceba788e714")
+    (attr through_hole)
+    (fp_text reference "J6" (at 0 -2.77) (layer "F.SilkS")
+        (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 76e5daa5-258d-4344-90a1-ff7c2bc5a550)
+    )
+    (fp_text value "Conn_01x04" (at 0 10.39) (layer "F.Fab")
+        (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 49b06557-f21c-4afd-96fc-42ec8b872725)
+    )
+    (fp_text user "${REFERENCE}" (at 0 3.81 90) (layer "F.Fab")
+        (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 3ef7cabf-7458-4469-8f01-3781521f4b69)
+    )
+    (fp_line (start -1.33 1.27) (end -1.33 8.95)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 7def775b-3198-4797-85bf-a512b388c3fc))
+    (fp_line (start -1.33 1.27) (end 1.33 1.27)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 096aab82-a013-4a84-bff3-44dfe0b7d208))
+    (fp_line (start -1.33 8.95) (end 1.33 8.95)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 37b127d5-596a-42de-9f38-8e42f5d1c863))
+    (fp_line (start 0 -1.33) (end 1.33 -1.33)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 806e8564-11b8-4d2b-99a8-71008e6bd199))
+    (fp_line (start 1.33 -1.33) (end 1.33 0)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 542dff70-aa58-4503-9480-c2b582644601))
+    (fp_line (start 1.33 1.27) (end 1.33 8.95)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp ae34f748-d5c3-4986-bb57-f667867d4712))
+    (fp_line (start -1.8 -1.8) (end 1.75 -1.8)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 718d9095-8188-42e1-9531-7ddb06c93beb))
+    (fp_line (start -1.8 9.4) (end -1.8 -1.8)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp c9c698ef-9bad-4f8d-9cf3-6244569c8f18))
+    (fp_line (start 1.75 -1.8) (end 1.75 9.4)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 8cb1ae19-8bb8-4d5a-b0e6-7212eed141fa))
+    (fp_line (start 1.75 9.4) (end -1.8 9.4)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 9a38251f-6393-4cf6-bef3-3d55e0a6a5d3))
+    (fp_line (start -1.27 -1.27) (end 0.635 -1.27)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp c184db1d-6594-45b1-80c0-bb36f4e0b13b))
+    (fp_line (start -1.27 8.89) (end -1.27 -1.27)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp e9fdf19b-3a08-460e-ab15-1265b836987e))
+    (fp_line (start 0.635 -1.27) (end 1.27 -0.635)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 9a554d44-1875-4805-a77c-0b162372c405))
+    (fp_line (start 1.27 -0.635) (end 1.27 8.89)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 1e120108-1a65-4547-9132-33705e79cdf7))
+    (fp_line (start 1.27 8.89) (end -1.27 8.89)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp dbe3fc5b-61e6-40eb-93b6-40e9dfa7f94a))
+    (pad "1" thru_hole rect (at 0 0) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
+      (net 1 "GND") (pinfunction "Pin_1") (pintype "passive") (tstamp 6a501805-bbd8-4f5f-97c2-ea13f810dda8))
+    (pad "2" thru_hole oval (at 0 2.54) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
+      (net 11 "+3V3") (pinfunction "Pin_2") (pintype "passive") (tstamp 8f8c3b00-3f7f-499a-b81f-2533e18bc7a9))
+    (pad "3" thru_hole oval (at 0 5.08) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
+      (net 25 "/I2C_SCL") (pinfunction "Pin_3") (pintype "passive") (tstamp 6898fe1a-1966-48e8-997c-693fb1210847))
+    (pad "4" thru_hole oval (at 0 7.62) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
+      (net 26 "/I2C_SDA") (pinfunction "Pin_4") (pintype "passive") (tstamp 5fd3d44a-4d8b-4372-ab26-e7e273ce7a55))
+    (model "${KICAD6_3DMODEL_DIR}/Connector_PinSocket_2.54mm.3dshapes/PinSocket_1x04_P2.54mm_Vertical.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
   (footprint "MountingHole:MountingHole_3.2mm_M3_DIN965_Pad_TopBottom" (layer "F.Cu")
     (tstamp 5e20a3b1-7255-49b8-a1f3-4ad044696869)
     (at 175 65 -90)
@@ -1468,6 +1607,74 @@
       (net 43 "VCC") (pinfunction "1") (pintype "passive") (tstamp 7c8ddd8d-0374-43cf-ae00-644f47823406))
   )
 
+  (footprint "Connector_PinSocket_2.54mm:PinSocket_1x04_P2.54mm_Vertical" (layer "F.Cu")
+    (tstamp 6e12fa49-a7ed-42fa-9cd2-4cb17ea039e4)
+    (at 156.975 53.8 180)
+    (descr "Through hole straight socket strip, 1x04, 2.54mm pitch, single row (from Kicad 4.0.7), script generated")
+    (tags "Through hole socket strip THT 1x04 2.54mm single row")
+    (property "Sheetfile" "starfish.kicad_sch")
+    (property "Sheetname" "")
+    (property "ki_description" "Generic connector, single row, 01x04, script generated (kicad-library-utils/schlib/autogen/connector/)")
+    (property "ki_keywords" "connector")
+    (path "/3971f5a3-e1ae-4cb2-a4f5-2a2f7ebe8d94")
+    (attr through_hole)
+    (fp_text reference "J4" (at 0 -2.77) (layer "F.SilkS")
+        (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 22d18003-fccc-44a0-98c9-4cd72fbaf7d7)
+    )
+    (fp_text value "Conn_01x04" (at 0 10.39) (layer "F.Fab")
+        (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp fe3dac70-d561-49c6-a6c2-dde2fee87bee)
+    )
+    (fp_text user "${REFERENCE}" (at 0 3.81 90) (layer "F.Fab")
+        (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 570a707c-bfb3-489c-bc15-f958e6894736)
+    )
+    (fp_line (start -1.33 1.27) (end -1.33 8.95)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 1639cd31-28f9-4047-9c21-a9819186bf98))
+    (fp_line (start -1.33 1.27) (end 1.33 1.27)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 41ec2ff2-d33d-4e33-85be-fe764f5e636b))
+    (fp_line (start -1.33 8.95) (end 1.33 8.95)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 432281ac-1aff-40e0-a9ea-0284414f946a))
+    (fp_line (start 0 -1.33) (end 1.33 -1.33)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 95c0831a-4836-4555-898d-73dc93727abd))
+    (fp_line (start 1.33 -1.33) (end 1.33 0)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 024b6dca-5eee-4e32-8fe3-7ae9de277cf9))
+    (fp_line (start 1.33 1.27) (end 1.33 8.95)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 05b5aaa3-416d-40d7-9724-54925c252117))
+    (fp_line (start -1.8 -1.8) (end 1.75 -1.8)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp d19c86b9-af6f-41b0-a9db-3ab95ff1a0ea))
+    (fp_line (start -1.8 9.4) (end -1.8 -1.8)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 6b6a26b6-c285-4b6d-800b-e2ffdf95ec70))
+    (fp_line (start 1.75 -1.8) (end 1.75 9.4)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 155aae95-7e59-43ea-be06-033e405e09b2))
+    (fp_line (start 1.75 9.4) (end -1.8 9.4)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 29443003-1c7c-400f-b515-c35f85d7622f))
+    (fp_line (start -1.27 -1.27) (end 0.635 -1.27)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 9306a74f-74f4-4147-ba65-9b1ba2fd2472))
+    (fp_line (start -1.27 8.89) (end -1.27 -1.27)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 8c698dfc-5487-44eb-8db0-4f4da4a69c21))
+    (fp_line (start 0.635 -1.27) (end 1.27 -0.635)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp f3ad69d4-1a8e-4385-9529-8a46dd63cdb8))
+    (fp_line (start 1.27 -0.635) (end 1.27 8.89)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp f49fc045-b743-4486-a712-31414d130183))
+    (fp_line (start 1.27 8.89) (end -1.27 8.89)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 148f0a87-6484-47f7-a85a-5180abf11d51))
+    (pad "1" thru_hole rect (at 0 0 180) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
+      (net 43 "VCC") (pinfunction "Pin_1") (pintype "passive") (tstamp c1e5dcc6-330b-4f6a-9ae1-e1c03ab7732e))
+    (pad "2" thru_hole oval (at 0 2.54 180) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
+      (net 31 "+5V") (pinfunction "Pin_2") (pintype "passive") (tstamp 2925e11c-4688-4681-bbee-432ad67050b2))
+    (pad "3" thru_hole oval (at 0 5.08 180) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
+      (net 11 "+3V3") (pinfunction "Pin_3") (pintype "passive") (tstamp 0073af0e-35ac-475b-b1af-53bec91f2cb9))
+    (pad "4" thru_hole oval (at 0 7.62 180) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
+      (net 1 "GND") (pinfunction "Pin_4") (pintype "passive") (tstamp 05925c07-f97d-4d7f-8a7d-d69c4db2973e))
+    (model "${KICAD6_3DMODEL_DIR}/Connector_PinSocket_2.54mm.3dshapes/PinSocket_1x04_P2.54mm_Vertical.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
   (footprint "Resistor_SMD:R_0603_1608Metric_Pad0.98x0.95mm_HandSolder" (layer "F.Cu")
     (tstamp 7b88745f-7df0-4577-b301-892773fe28e9)
     (at 163.899997 81.100001 90)
@@ -1576,6 +1783,60 @@
     )
   )
 
+  (footprint "Resistor_SMD:R_0603_1608Metric_Pad0.98x0.95mm_HandSolder" (layer "F.Cu")
+    (tstamp 86250dc7-3420-4d80-a4ae-76ed18fb3aea)
+    (at 240 77)
+    (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 72, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
+    (tags "resistor handsolder")
+    (property "Sheetfile" "starfish.kicad_sch")
+    (property "Sheetname" "")
+    (property "ki_description" "Resistor")
+    (property "ki_keywords" "R res resistor")
+    (path "/73fda72c-ff0d-4d3c-987f-0c839b79f052")
+    (attr smd)
+    (fp_text reference "R3" (at 0 -1.43) (layer "F.SilkS")
+        (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 3f6df98a-1804-4d92-848a-e7c145cd47c7)
+    )
+    (fp_text value "10k" (at 0 1.43) (layer "F.Fab")
+        (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 1c4a3ae1-496a-40a5-92a8-791cfc3ac598)
+    )
+    (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+        (effects (font (size 0.4 0.4) (thickness 0.06)))
+      (tstamp a05d4821-0360-4991-afa0-576bf392fe7e)
+    )
+    (fp_line (start -0.254724 -0.5225) (end 0.254724 -0.5225)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 30ed3ce6-af5f-49d4-8a85-61c22715fb3b))
+    (fp_line (start -0.254724 0.5225) (end 0.254724 0.5225)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp acaeeb77-1c7c-4cbd-ac6e-e4a736af1397))
+    (fp_line (start -1.65 -0.73) (end 1.65 -0.73)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp b5b91ac4-b7b2-4ca0-9b8f-bc0ceb7c50e5))
+    (fp_line (start -1.65 0.73) (end -1.65 -0.73)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 141a130c-2831-4404-aae1-1cfac7284515))
+    (fp_line (start 1.65 -0.73) (end 1.65 0.73)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp ab590b18-f131-4eb4-a8be-2c552c6c7767))
+    (fp_line (start 1.65 0.73) (end -1.65 0.73)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp d6c7699a-4554-4c1d-bcba-7b2e1cc0cb22))
+    (fp_line (start -0.8 -0.4125) (end 0.8 -0.4125)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 7247d757-3c50-4545-bb77-aff989f19bd4))
+    (fp_line (start -0.8 0.4125) (end -0.8 -0.4125)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp f044f895-9ce5-4f2f-ad50-b5b3f8db2fa7))
+    (fp_line (start 0.8 -0.4125) (end 0.8 0.4125)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp cc061f58-82d6-4c59-890f-7c83c24166a4))
+    (fp_line (start 0.8 0.4125) (end -0.8 0.4125)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 6ac08518-f2e5-4a94-a491-f798aa8b0372))
+    (pad "1" smd roundrect (at -0.9125 0) (size 0.975 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
+      (net 66 "Net-(SW61-A)") (pintype "passive") (tstamp 6191d120-f0fa-48e7-81e8-87c32c840726))
+    (pad "2" smd roundrect (at 0.9125 0) (size 0.975 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
+      (net 11 "+3V3") (pintype "passive") (tstamp a06aed4e-a858-4a91-8f0c-64312efa0ebe))
+    (model "${KICAD6_3DMODEL_DIR}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
   (footprint "Resistor_SMD:R_0603_1608Metric_Pad0.98x0.95mm_HandSolder" (layer "F.Cu")
     (tstamp 8f4ce4e5-bace-49ab-8529-4f690e7139c3)
     (at 165.689997 85.770001 90)
@@ -1741,7 +2002,7 @@
 
   (footprint "Connector_BarrelJack:BarrelJack_Wuerth_6941xx301002" (layer "F.Cu")
     (tstamp 99d1ba27-65ee-4a2e-af39-7cc8840c2c8c)
-    (at 133.849997 73.400001 -90)
+    (at 133 73.4 -90)
     (descr "Wuerth electronics barrel jack connector (5.5mm outher diameter, inner diameter 2.05mm or 2.55mm depending on exact order number), See: http://katalog.we-online.de/em/datasheet/6941xx301002.pdf")
     (tags "connector barrel jack")
     (property "Mouser" "992-CON-SOCJ-2155")
@@ -1976,78 +2237,6 @@
       (net 10 "/Power/SW_5V") (pinfunction "1") (pintype "passive") (tstamp e5ee65d1-6bcf-41e5-b005-8d61108916fa))
   )
 
-  (footprint "Connector_PinHeader_2.54mm:PinHeader_2x02_P2.54mm_Vertical" (layer "F.Cu")
-    (tstamp aeae06ad-5dbb-448b-949a-d8d23a2de054)
-    (at 122.2 86.8 90)
-    (descr "Through hole straight pin header, 2x02, 2.54mm pitch, double rows")
-    (tags "Through hole pin header THT 2x02 2.54mm double row")
-    (property "Sheetfile" "starfish.kicad_sch")
-    (property "Sheetname" "")
-    (property "ki_description" "Generic connector, double row, 02x02, odd/even pin numbering scheme (row 1 odd numbers, row 2 even numbers), script generated (kicad-library-utils/schlib/autogen/connector/)")
-    (property "ki_keywords" "connector")
-    (path "/046fc5ce-032c-47f5-ad89-c2056ead3872")
-    (attr through_hole)
-    (fp_text reference "J5" (at 1.27 -2.33 90) (layer "F.SilkS")
-        (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 0a038369-8fb0-4296-86da-6d19d8f3ac84)
-    )
-    (fp_text value "Conn_02x02_Odd_Even" (at 1.27 4.87 90) (layer "F.Fab")
-        (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 3417cdae-7a88-4444-bcb4-f7f9665faa45)
-    )
-    (fp_text user "${REFERENCE}" (at 1.27 1.27) (layer "F.Fab")
-        (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp c9c26d29-328a-4bb9-bccc-116bbc8c2e05)
-    )
-    (fp_line (start -1.33 -1.33) (end 0 -1.33)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 0bd8b4e1-798b-4855-a947-7c386156119d))
-    (fp_line (start -1.33 0) (end -1.33 -1.33)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 4ee703d9-0e72-489c-8794-cdd9f1687990))
-    (fp_line (start -1.33 1.27) (end -1.33 3.87)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp a618567f-31ee-497d-a543-bd98c8159a6e))
-    (fp_line (start -1.33 1.27) (end 1.27 1.27)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 94bd7a2b-12ed-4658-ac69-585708aebb9c))
-    (fp_line (start -1.33 3.87) (end 3.87 3.87)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp d08af15c-5312-41e0-9958-a2e76d31e2d8))
-    (fp_line (start 1.27 -1.33) (end 3.87 -1.33)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp b2c777e0-de37-4c5f-bcf5-bbc5adaa4505))
-    (fp_line (start 1.27 1.27) (end 1.27 -1.33)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 085c927e-f010-439a-bde5-c0c78d4219d7))
-    (fp_line (start 3.87 -1.33) (end 3.87 3.87)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 1fd3a464-a70d-424d-9cda-8bbac17ea8d7))
-    (fp_line (start -1.8 -1.8) (end -1.8 4.35)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 4d45d8d6-cb74-46bd-8597-1c8c23838540))
-    (fp_line (start -1.8 4.35) (end 4.35 4.35)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 7472f4cb-d3c2-4ed6-a7f3-f7770fe445b3))
-    (fp_line (start 4.35 -1.8) (end -1.8 -1.8)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 47503b14-4d41-4a5d-8155-bed2d9ea246d))
-    (fp_line (start 4.35 4.35) (end 4.35 -1.8)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 78a15ef6-f413-44f8-89fe-3c920f3af99d))
-    (fp_line (start -1.27 0) (end 0 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp dc211dd9-7a38-4762-a5da-535a1d69eef6))
-    (fp_line (start -1.27 3.81) (end -1.27 0)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 221d3645-4c6e-4376-8349-9adf88dce81e))
-    (fp_line (start 0 -1.27) (end 3.81 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp b04b6f13-8100-426f-a454-3078bbf9e6c3))
-    (fp_line (start 3.81 -1.27) (end 3.81 3.81)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp e8018e80-d184-4c79-9027-c413fb665de3))
-    (fp_line (start 3.81 3.81) (end -1.27 3.81)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp dd641b83-8355-4cd4-be00-bab010022b48))
-    (pad "1" thru_hole rect (at 0 0 90) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 43 "VCC") (pinfunction "Pin_1") (pintype "passive") (tstamp f8264709-db09-46bb-ad00-727bb4b9682e))
-    (pad "2" thru_hole oval (at 2.54 0 90) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 43 "VCC") (pinfunction "Pin_2") (pintype "passive") (tstamp 77613b1c-dea7-45a7-ab2e-83ad58e94a41))
-    (pad "3" thru_hole oval (at 0 2.54 90) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 1 "GND") (pinfunction "Pin_3") (pintype "passive") (tstamp 22cc814e-d586-4009-bc48-08d5724d989a))
-    (pad "4" thru_hole oval (at 2.54 2.54 90) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 1 "GND") (pinfunction "Pin_4") (pintype "passive") (tstamp 74075e68-32ac-4161-966d-7d2804a7f959))
-    (model "${KICAD6_3DMODEL_DIR}/Connector_PinHeader_2.54mm.3dshapes/PinHeader_2x02_P2.54mm_Vertical.wrl"
-      (offset (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
   (footprint "Resistor_SMD:R_0603_1608Metric_Pad0.98x0.95mm_HandSolder" (layer "F.Cu")
     (tstamp b08a146a-6e43-46ac-8c31-9d5442623eb3)
     (at 146.739997 77.000001 90)
@@ -2156,6 +2345,74 @@
     )
   )
 
+  (footprint "Connector_PinSocket_2.54mm:PinSocket_1x04_P2.54mm_Vertical" (layer "F.Cu")
+    (tstamp bcebfb89-22bd-404c-a55b-20f8697dc1d6)
+    (at 212.425 50)
+    (descr "Through hole straight socket strip, 1x04, 2.54mm pitch, single row (from Kicad 4.0.7), script generated")
+    (tags "Through hole socket strip THT 1x04 2.54mm single row")
+    (property "Sheetfile" "starfish.kicad_sch")
+    (property "Sheetname" "")
+    (property "ki_description" "Generic connector, single row, 01x04, script generated (kicad-library-utils/schlib/autogen/connector/)")
+    (property "ki_keywords" "connector")
+    (path "/0c9b1369-1ac5-44e6-a0dd-5711bdee8557")
+    (attr through_hole)
+    (fp_text reference "J7" (at 0 -2.77) (layer "F.SilkS")
+        (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 362e6b5d-9912-4073-84fd-9028f54357b3)
+    )
+    (fp_text value "Conn_01x04" (at 0 10.39) (layer "F.Fab")
+        (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 8b6df798-7683-4ec6-810b-a08d40705bfd)
+    )
+    (fp_text user "${REFERENCE}" (at 0 3.81 90) (layer "F.Fab")
+        (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 6805453f-398f-48b9-8690-d00fda954234)
+    )
+    (fp_line (start -1.33 1.27) (end -1.33 8.95)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp d39e6908-3fce-450f-9231-a767b8ab309c))
+    (fp_line (start -1.33 1.27) (end 1.33 1.27)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 77a6a302-318c-44c5-bdb2-5d05008ed6b5))
+    (fp_line (start -1.33 8.95) (end 1.33 8.95)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp f255fab4-8115-4e94-92ac-787ebfa6f60e))
+    (fp_line (start 0 -1.33) (end 1.33 -1.33)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 02af5899-f619-4e66-bfc0-be14718c2c0d))
+    (fp_line (start 1.33 -1.33) (end 1.33 0)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp e99f249d-61e0-4fae-be75-83458f29e037))
+    (fp_line (start 1.33 1.27) (end 1.33 8.95)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 7cd5f53a-5e28-4ab6-b76b-3ecd2268469d))
+    (fp_line (start -1.8 -1.8) (end 1.75 -1.8)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 8b1f2773-7218-4d5e-b667-022e387bb319))
+    (fp_line (start -1.8 9.4) (end -1.8 -1.8)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 26b7048d-5efd-4683-b427-5da8abc47545))
+    (fp_line (start 1.75 -1.8) (end 1.75 9.4)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 99b8a94a-5e6c-4ce6-ae76-e4cbd992e7f5))
+    (fp_line (start 1.75 9.4) (end -1.8 9.4)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp ba658fc6-7196-4b00-9bf2-53391c595f6c))
+    (fp_line (start -1.27 -1.27) (end 0.635 -1.27)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp e4ac9eb4-d880-4215-ac23-239ea6d9ea31))
+    (fp_line (start -1.27 8.89) (end -1.27 -1.27)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp faa90eba-72ed-46fb-b2bf-24d2565036c3))
+    (fp_line (start 0.635 -1.27) (end 1.27 -0.635)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 3ae1015f-64a0-442a-8fe1-e3e91546c38d))
+    (fp_line (start 1.27 -0.635) (end 1.27 8.89)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp b59639b2-a968-4123-b0bf-75b5d403d82b))
+    (fp_line (start 1.27 8.89) (end -1.27 8.89)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 8806c2c3-1da7-4c4c-b9ec-cd1925f7bdc2))
+    (pad "1" thru_hole rect (at 0 0) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
+      (net 1 "GND") (pinfunction "Pin_1") (pintype "passive") (tstamp 6db463f1-e7b8-4dee-abee-d9c98bda5715))
+    (pad "2" thru_hole oval (at 0 2.54) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
+      (net 27 "/GPIO12") (pinfunction "Pin_2") (pintype "passive") (tstamp a7fa52a5-8fad-4cc6-b93e-a6ea9ffd2aea))
+    (pad "3" thru_hole oval (at 0 5.08) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
+      (net 28 "/GPIO13") (pinfunction "Pin_3") (pintype "passive") (tstamp 4ab56488-d440-406d-b5e1-07b4e3d9715b))
+    (pad "4" thru_hole oval (at 0 7.62) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
+      (net 50 "/GPIO14") (pinfunction "Pin_4") (pintype "passive") (tstamp 162aa1aa-6ad3-4984-be96-544d391377b7))
+    (model "${KICAD6_3DMODEL_DIR}/Connector_PinSocket_2.54mm.3dshapes/PinSocket_1x04_P2.54mm_Vertical.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
   (footprint "Jumper:SolderJumper-2_P1.3mm_Open_RoundedPad1.0x1.5mm" (layer "F.Cu")
     (tstamp c3592f1e-e7c7-48bb-96b5-2c2ce17b93a5)
     (at 140.4 52)
@@ -2371,72 +2628,68 @@
     (pad "1" connect circle (at 0 0 90) (size 5.6 5.6) (layers "B.Cu" "B.Mask") (tstamp 4b57460c-a2bd-41e4-b54c-eef0f4117baa))
   )
 
-  (footprint "Connector_PinHeader_2.54mm:PinHeader_2x02_P2.54mm_Vertical" (layer "F.Cu")
-    (tstamp e02785b0-36db-4795-9249-60348f1a3034)
-    (at 155.925 49.325)
-    (descr "Through hole straight pin header, 2x02, 2.54mm pitch, double rows")
-    (tags "Through hole pin header THT 2x02 2.54mm double row")
+  (footprint "Connector_PinSocket_2.54mm:PinSocket_1x04_P2.54mm_Vertical" (layer "F.Cu")
+    (tstamp dc408222-6926-46e5-a217-e28e02262f47)
+    (at 108 53.775 90)
+    (descr "Through hole straight socket strip, 1x04, 2.54mm pitch, single row (from Kicad 4.0.7), script generated")
+    (tags "Through hole socket strip THT 1x04 2.54mm single row")
     (property "Sheetfile" "starfish.kicad_sch")
     (property "Sheetname" "")
-    (property "ki_description" "Generic connector, double row, 02x02, odd/even pin numbering scheme (row 1 odd numbers, row 2 even numbers), script generated (kicad-library-utils/schlib/autogen/connector/)")
+    (property "ki_description" "Generic connector, single row, 01x04, script generated (kicad-library-utils/schlib/autogen/connector/)")
     (property "ki_keywords" "connector")
-    (path "/abfaba1f-3a07-4d8a-993f-b82f4aa61bb3")
+    (path "/eb8fe990-156c-4290-b535-71d6a4ee8fe4")
     (attr through_hole)
-    (fp_text reference "J4" (at 1.27 -2.33) (layer "F.SilkS")
+    (fp_text reference "J9" (at 0 -2.77 90) (layer "F.SilkS")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 58c69e69-4efd-4cc6-ba13-3744fd75dd5b)
+      (tstamp 932c9614-916b-4109-a8dc-4bb76e3036ac)
     )
-    (fp_text value "Conn_02x02_Odd_Even" (at 1.27 4.87) (layer "F.Fab")
+    (fp_text value "Conn_01x04" (at 0 10.39 90) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 4414f907-0b49-459e-8465-e84715039428)
+      (tstamp 69c4add5-f2e7-48ea-bfe8-de6955ebed29)
     )
-    (fp_text user "${REFERENCE}" (at 1.27 1.27 90) (layer "F.Fab")
+    (fp_text user "${REFERENCE}" (at 0 3.81) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 703c223c-87d4-46a9-a755-5fb6edd062db)
+      (tstamp 7dc724ab-b3ea-4574-af46-f58c6934e636)
     )
-    (fp_line (start -1.33 -1.33) (end 0 -1.33)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 57432b2b-75fa-4429-b447-f6129cf50d43))
-    (fp_line (start -1.33 0) (end -1.33 -1.33)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 70c57d25-3b2f-4df5-b3e7-66d2ba1a1792))
-    (fp_line (start -1.33 1.27) (end -1.33 3.87)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp cff73a6b-2d38-4f53-986c-e45b0f8376e7))
-    (fp_line (start -1.33 1.27) (end 1.27 1.27)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp faf1c7fd-cff2-4775-a564-169a05bbf717))
-    (fp_line (start -1.33 3.87) (end 3.87 3.87)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 4adc968d-b11f-4a21-ae65-45c1523f5e4c))
-    (fp_line (start 1.27 -1.33) (end 3.87 -1.33)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp c4d32de9-ce6a-4fbe-9a44-22e5eb452154))
-    (fp_line (start 1.27 1.27) (end 1.27 -1.33)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp a2884ada-e711-4168-bbbb-d3107a3796c6))
-    (fp_line (start 3.87 -1.33) (end 3.87 3.87)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp ff12f04c-b74f-40bf-9339-4e1ffc26fe16))
-    (fp_line (start -1.8 -1.8) (end -1.8 4.35)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp f2772e56-3f5a-4ab8-a1e4-26284ef0a446))
-    (fp_line (start -1.8 4.35) (end 4.35 4.35)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp a423810c-e1fa-43df-bc4f-6507641e2e95))
-    (fp_line (start 4.35 -1.8) (end -1.8 -1.8)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp b01817cf-5868-45ca-92dc-ab6f8ea5ad1e))
-    (fp_line (start 4.35 4.35) (end 4.35 -1.8)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp cdf2a9f3-4523-465a-95be-c267b4270ac5))
-    (fp_line (start -1.27 0) (end 0 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 060db781-350d-48e7-b518-85a458e7fd09))
-    (fp_line (start -1.27 3.81) (end -1.27 0)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp f7805577-502f-497b-b065-e2c48e3685e9))
-    (fp_line (start 0 -1.27) (end 3.81 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 4f56f908-50a2-425a-9974-c3e749ee4155))
-    (fp_line (start 3.81 -1.27) (end 3.81 3.81)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp afa9a6bc-51d7-4f1b-bb6a-8583752ec547))
-    (fp_line (start 3.81 3.81) (end -1.27 3.81)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp f57c6d4a-e47a-4476-a89a-1dc2d0ca668f))
-    (pad "1" thru_hole rect (at 0 0) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 31 "+5V") (pinfunction "Pin_1") (pintype "passive") (tstamp 38646194-a05f-4b72-97ee-6dfa4a450edc))
-    (pad "2" thru_hole oval (at 2.54 0) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 31 "+5V") (pinfunction "Pin_2") (pintype "passive") (tstamp 27bf1058-a44c-46c3-9182-a09f4ae40ed7))
-    (pad "3" thru_hole oval (at 0 2.54) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 1 "GND") (pinfunction "Pin_3") (pintype "passive") (tstamp 21505a44-39db-420d-9294-66b9b4a253d4))
-    (pad "4" thru_hole oval (at 2.54 2.54) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 1 "GND") (pinfunction "Pin_4") (pintype "passive") (tstamp 11f1dff5-6579-4e30-9f9a-46bd635b2b58))
-    (model "${KICAD6_3DMODEL_DIR}/Connector_PinHeader_2.54mm.3dshapes/PinHeader_2x02_P2.54mm_Vertical.wrl"
+    (fp_line (start -1.33 1.27) (end -1.33 8.95)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 638bf204-1325-43f2-8597-11f6bd2b05cb))
+    (fp_line (start -1.33 1.27) (end 1.33 1.27)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 3ad33fa5-a88e-45ea-b411-65a0e8a03a32))
+    (fp_line (start -1.33 8.95) (end 1.33 8.95)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp ad337365-5166-425d-a10c-f96203d437cc))
+    (fp_line (start 0 -1.33) (end 1.33 -1.33)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 1acf6ec2-c149-46d1-bd61-1fe0a969d171))
+    (fp_line (start 1.33 -1.33) (end 1.33 0)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp ca82406f-576c-4874-b073-5572a7213ba8))
+    (fp_line (start 1.33 1.27) (end 1.33 8.95)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 6118682b-6ccb-4f9e-9abe-5996456554ba))
+    (fp_line (start -1.8 -1.8) (end 1.75 -1.8)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 8f351574-aa3c-415f-bb58-86f3a9bca79d))
+    (fp_line (start -1.8 9.4) (end -1.8 -1.8)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp bfe6cff1-546a-4d8e-a71a-bdc9414539ab))
+    (fp_line (start 1.75 -1.8) (end 1.75 9.4)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 5d576970-0bb1-48f3-963c-4f29e398685b))
+    (fp_line (start 1.75 9.4) (end -1.8 9.4)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp dd4faa84-0794-450a-a417-5b42f902d87c))
+    (fp_line (start -1.27 -1.27) (end 0.635 -1.27)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp f50e27ea-26f6-4121-adb4-fc8d90208de7))
+    (fp_line (start -1.27 8.89) (end -1.27 -1.27)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 00eb0971-131c-44c3-8551-ac7c3b1de28e))
+    (fp_line (start 0.635 -1.27) (end 1.27 -0.635)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp bc01c4c5-28e3-4c7b-9f52-af0f54929359))
+    (fp_line (start 1.27 -0.635) (end 1.27 8.89)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp dca86c39-3968-4d66-82fa-a5656d6e0445))
+    (fp_line (start 1.27 8.89) (end -1.27 8.89)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 05e16740-9f2e-4424-9370-8ee50cece876))
+    (pad "1" thru_hole rect (at 0 0 90) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
+      (net 11 "+3V3") (pinfunction "Pin_1") (pintype "passive") (tstamp 2e7d9727-0bd4-43bd-877d-24089fc70bf4))
+    (pad "2" thru_hole oval (at 0 2.54 90) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
+      (net 31 "+5V") (pinfunction "Pin_2") (pintype "passive") (tstamp 6a7ea2d8-e3c6-4172-bc7c-67701f673881))
+    (pad "3" thru_hole oval (at 0 5.08 90) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
+      (net 1 "GND") (pinfunction "Pin_3") (pintype "passive") (tstamp e7651dd5-53bf-4d25-93ba-f7baddb97115))
+    (pad "4" thru_hole oval (at 0 7.62 90) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
+      (net 1 "GND") (pinfunction "Pin_4") (pintype "passive") (tstamp e5f216fe-dbda-41ce-877c-c93a9b23e0ba))
+    (model "${KICAD6_3DMODEL_DIR}/Connector_PinSocket_2.54mm.3dshapes/PinSocket_1x04_P2.54mm_Vertical.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
       (rotate (xyz 0 0 0))
@@ -5730,13 +5983,13 @@
     (pad "3" smd rect (at -8.75 5.72) (size 1.5 0.9) (layers "B.Cu" "B.Paste" "B.Mask")
       (net 53 "/CHIP_PU") (pinfunction "EN") (pintype "input") (tstamp 0578f6e7-2700-43e3-9812-4688d81d0b06))
     (pad "4" smd rect (at -8.75 4.45) (size 1.5 0.9) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 25 "unconnected-(U10-GPIO4{slash}TOUCH4{slash}ADC1_CH3-Pad4)") (pinfunction "GPIO4/TOUCH4/ADC1_CH3") (pintype "bidirectional") (tstamp 593c7a87-9a32-44d6-9641-ba95d699c998))
+      (net 42 "/CH4") (pinfunction "GPIO4/TOUCH4/ADC1_CH3") (pintype "bidirectional") (tstamp 593c7a87-9a32-44d6-9641-ba95d699c998))
     (pad "5" smd rect (at -8.75 3.18) (size 1.5 0.9) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 26 "unconnected-(U10-GPIO5{slash}TOUCH5{slash}ADC1_CH4-Pad5)") (pinfunction "GPIO5/TOUCH5/ADC1_CH4") (pintype "bidirectional") (tstamp e90c8d5a-11a1-4cfa-86fb-0a6cad763c8e))
+      (net 41 "/CH3") (pinfunction "GPIO5/TOUCH5/ADC1_CH4") (pintype "bidirectional") (tstamp e90c8d5a-11a1-4cfa-86fb-0a6cad763c8e))
     (pad "6" smd rect (at -8.75 1.91) (size 1.5 0.9) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 27 "unconnected-(U10-GPIO6{slash}TOUCH6{slash}ADC1_CH5-Pad6)") (pinfunction "GPIO6/TOUCH6/ADC1_CH5") (pintype "bidirectional") (tstamp a7241552-98ef-40f3-b86f-361d8f92ea17))
+      (net 40 "/CH2") (pinfunction "GPIO6/TOUCH6/ADC1_CH5") (pintype "bidirectional") (tstamp a7241552-98ef-40f3-b86f-361d8f92ea17))
     (pad "7" smd rect (at -8.75 0.64) (size 1.5 0.9) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 28 "unconnected-(U10-GPIO7{slash}TOUCH7{slash}ADC1_CH6-Pad7)") (pinfunction "GPIO7/TOUCH7/ADC1_CH6") (pintype "bidirectional") (tstamp 1496fe88-adcd-4016-aeb8-dc8ebe97dea4))
+      (net 12 "/CH1") (pinfunction "GPIO7/TOUCH7/ADC1_CH6") (pintype "bidirectional") (tstamp 1496fe88-adcd-4016-aeb8-dc8ebe97dea4))
     (pad "8" smd rect (at -8.75 -0.63) (size 1.5 0.9) (layers "B.Cu" "B.Paste" "B.Mask")
       (net 29 "unconnected-(U10-GPIO15{slash}U0RTS{slash}ADC2_CH4{slash}XTAL_32K_P-Pad8)") (pinfunction "GPIO15/U0RTS/ADC2_CH4/XTAL_32K_P") (pintype "bidirectional") (tstamp 60521d67-d12b-4429-86ca-234f3f7f3141))
     (pad "9" smd rect (at -8.75 -1.9) (size 1.5 0.9) (layers "B.Cu" "B.Paste" "B.Mask")
@@ -5758,15 +6011,15 @@
     (pad "17" smd rect (at -4.445 -9.5 270) (size 1.5 0.9) (layers "B.Cu" "B.Paste" "B.Mask")
       (net 45 "unconnected-(U10-GPIO9{slash}TOUCH9{slash}ADC1_CH8{slash}FSPIHD{slash}SUBSPIHD-Pad17)") (pinfunction "GPIO9/TOUCH9/ADC1_CH8/FSPIHD/SUBSPIHD") (pintype "bidirectional") (tstamp bf474eed-ef4d-4e4d-b487-5566e1f98589))
     (pad "18" smd rect (at -3.175 -9.5 270) (size 1.5 0.9) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 66 "unconnected-(U10-GPIO10{slash}TOUCH10{slash}ADC1_CH9{slash}FSPICS0{slash}FSPIIO4{slash}SUBSPICS0-Pad18)") (pinfunction "GPIO10/TOUCH10/ADC1_CH9/FSPICS0/FSPIIO4/SUBSPICS0") (pintype "bidirectional") (tstamp a8da0b49-dfef-4426-8a93-c858debb871d))
+      (net 25 "/I2C_SCL") (pinfunction "GPIO10/TOUCH10/ADC1_CH9/FSPICS0/FSPIIO4/SUBSPICS0") (pintype "bidirectional") (tstamp a8da0b49-dfef-4426-8a93-c858debb871d))
     (pad "19" smd rect (at -1.905 -9.5 270) (size 1.5 0.9) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 42 "/CH4") (pinfunction "GPIO11/TOUCH11/ADC2_CH0/FSPICS0/FSPIIO4/SUBSPICS0") (pintype "bidirectional") (tstamp e41fe321-6620-4aa0-a0f9-0af2ceabdad9))
+      (net 26 "/I2C_SDA") (pinfunction "GPIO11/TOUCH11/ADC2_CH0/FSPICS0/FSPIIO4/SUBSPICS0") (pintype "bidirectional") (tstamp e41fe321-6620-4aa0-a0f9-0af2ceabdad9))
     (pad "20" smd rect (at -0.635 -9.5 270) (size 1.5 0.9) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 41 "/CH3") (pinfunction "GPIO12/TOUCH11/ADC2_CH0/FSPICS0/FSPIIO4/SUBSPICS0") (pintype "bidirectional") (tstamp bedbb017-bfcd-42aa-8c9b-395c094af126))
+      (net 27 "/GPIO12") (pinfunction "GPIO12/TOUCH11/ADC2_CH0/FSPICS0/FSPIIO4/SUBSPICS0") (pintype "bidirectional") (tstamp bedbb017-bfcd-42aa-8c9b-395c094af126))
     (pad "21" smd rect (at 0.635 -9.5 270) (size 1.5 0.9) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 40 "/CH2") (pinfunction "GPIO13/TOUCH13/ADC2_CH2/FSPIQ/FSPIIO7/SUBSPIQ") (pintype "bidirectional") (tstamp a467596f-7502-4fc6-be93-e7fa777b05d7))
+      (net 28 "/GPIO13") (pinfunction "GPIO13/TOUCH13/ADC2_CH2/FSPIQ/FSPIIO7/SUBSPIQ") (pintype "bidirectional") (tstamp a467596f-7502-4fc6-be93-e7fa777b05d7))
     (pad "22" smd rect (at 1.905 -9.5 270) (size 1.5 0.9) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 12 "/CH1") (pinfunction "GPIO14/TOUCH14/ADC2_CH3/FSPIWP/FSPIDQS/SUBSPIWP") (pintype "bidirectional") (tstamp 59a3ee7b-fca5-4689-9f1c-410fb92b414b))
+      (net 50 "/GPIO14") (pinfunction "GPIO14/TOUCH14/ADC2_CH3/FSPIWP/FSPIDQS/SUBSPIWP") (pintype "bidirectional") (tstamp 59a3ee7b-fca5-4689-9f1c-410fb92b414b))
     (pad "23" smd rect (at 3.175 -9.5 270) (size 1.5 0.9) (layers "B.Cu" "B.Paste" "B.Mask")
       (net 24 "Net-(SW60-A)") (pinfunction "GPIO21") (pintype "bidirectional") (tstamp d835c5fe-c9dc-4358-be82-5fb187193062))
     (pad "24" smd rect (at 4.445 -9.5 270) (size 1.5 0.9) (layers "B.Cu" "B.Paste" "B.Mask")
@@ -5774,7 +6027,7 @@
     (pad "25" smd rect (at 5.715 -9.5 270) (size 1.5 0.9) (layers "B.Cu" "B.Paste" "B.Mask")
       (net 49 "unconnected-(U10-GPIO48{slash}SPICLK_N{slash}SUBSPICLK_N_DIFF-Pad25)") (pinfunction "GPIO48/SPICLK_N/SUBSPICLK_N_DIFF") (pintype "bidirectional") (tstamp ae26ff0d-43fc-4524-84e1-ffa81d668240))
     (pad "26" smd rect (at 6.985 -9.5 270) (size 1.5 0.9) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 50 "unconnected-(U10-GPIO45-Pad26)") (pinfunction "GPIO45") (pintype "bidirectional") (tstamp 002c5ac2-82b0-4a04-b4da-66b5f5f91462))
+      (net 66 "Net-(SW61-A)") (pinfunction "GPIO45") (pintype "bidirectional") (tstamp 002c5ac2-82b0-4a04-b4da-66b5f5f91462))
     (pad "27" smd rect (at 8.75 -8.25 180) (size 1.5 0.9) (layers "B.Cu" "B.Paste" "B.Mask")
       (net 52 "/GPIO0") (pinfunction "GPIO0/BOOT") (pintype "bidirectional") (tstamp 89548341-2b1d-46ee-8c2c-c6d01876559c))
     (pad "28" smd rect (at 8.75 -6.98 180) (size 1.5 0.9) (layers "B.Cu" "B.Paste" "B.Mask")
@@ -6346,6 +6599,10 @@
   (segment (start 148.699997 82.700001) (end 148.174997 83.225001) (width 0.4) (layer "B.Cu") (net 24) (tstamp 7428c906-402e-4168-bdc1-3c88740fa2be))
   (segment (start 148.174997 83.225001) (end 148.174997 84.250001) (width 0.4) (layer "B.Cu") (net 24) (tstamp c0f224dc-5ad4-40a2-9e7c-4f93ac33b061))
   (segment (start 153.199997 82.700001) (end 148.699997 82.700001) (width 0.4) (layer "B.Cu") (net 24) (tstamp cd694a58-42fb-47c8-8877-26ae15a7756e))
+  (via (at 155.400497 78.7) (size 0.8) (drill 0.4) (layers "F.Cu" "B.Cu") (net 25) (tstamp 493ffc88-05fd-4ef2-a87e-889e277bc4a2))
+  (segment (start 146.299998 78.7) (end 141.824997 83.175001) (width 0.4) (layer "B.Cu") (net 25) (tstamp 0d5f03cb-f0db-4046-8076-160700cbe411))
+  (segment (start 155.400497 78.7) (end 146.299998 78.7) (width 0.4) (layer "B.Cu") (net 25) (tstamp 2cbeee39-ac6c-4f66-95b6-6ac627b430f6))
+  (segment (start 141.824997 83.175001) (end 141.824997 84.250001) (width 0.4) (layer "B.Cu") (net 25) (tstamp db526cd6-efbd-4ff1-be0f-0a48e6dd23c8))
   (segment (start 132.399997 82.800001) (end 132.399997 81.300001) (width 1) (layer "F.Cu") (net 31) (tstamp 24d32e40-8ce4-4fe7-945a-d2ced0249241))
   (segment (start 130.199997 85.350001) (end 130.199997 83.400001) (width 1) (layer "F.Cu") (net 31) (tstamp 2a528d3f-cc25-4774-a7db-3da9b48a798e))
   (segment (start 132.399997 82.800001) (end 137.399997 82.800001) (width 1) (layer "F.Cu") (net 31) (tstamp 2befb1fe-3ee5-42e3-b35c-b620c1ba6c8e))
@@ -6499,10 +6756,6 @@
   (segment (start 170.437497 97.475001) (end 170.437497 93.450001) (width 0.4) (layer "B.Cu") (net 59) (tstamp 39954968-8f6d-4f30-a6bf-30427f2e3b5a))
   (segment (start 169.499997 98.412501) (end 169.499997 101.300001) (width 0.4) (layer "B.Cu") (net 59) (tstamp 639e7c8d-8dec-4b19-be8e-0087f0326aca))
   (segment (start 169.499997 101.300001) (end 169.699997 101.500001) (width 0.4) (layer "B.Cu") (net 59) (tstamp e3568622-989c-4979-a2c8-c625c32ff2cc))
-  (via (at 155.400497 78.7) (size 0.8) (drill 0.4) (layers "F.Cu" "B.Cu") (net 66) (tstamp 493ffc88-05fd-4ef2-a87e-889e277bc4a2))
-  (segment (start 146.299998 78.7) (end 141.824997 83.175001) (width 0.4) (layer "B.Cu") (net 66) (tstamp 0d5f03cb-f0db-4046-8076-160700cbe411))
-  (segment (start 155.400497 78.7) (end 146.299998 78.7) (width 0.4) (layer "B.Cu") (net 66) (tstamp 2cbeee39-ac6c-4f66-95b6-6ac627b430f6))
-  (segment (start 141.824997 83.175001) (end 141.824997 84.250001) (width 0.4) (layer "B.Cu") (net 66) (tstamp db526cd6-efbd-4ff1-be0f-0a48e6dd23c8))
 
   (zone (net 11) (net_name "+3V3") (layer "F.Cu") (tstamp 1b29bdbc-1e00-415b-87ad-3734bfca2bf8) (hatch edge 0.508)
     (priority 9)
diff --git a/starfish/starfish.kicad_sch b/starfish/starfish.kicad_sch
index 7075664..4f72d1f 100644
--- a/starfish/starfish.kicad_sch
+++ b/starfish/starfish.kicad_sch
@@ -65,6 +65,58 @@
         )
       )
     )
+    (symbol "+3V3_2" (power) (pin_names (offset 0)) (in_bom yes) (on_board yes)
+      (property "Reference" "#PWR" (at 0 -3.81 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Value" "+3V3_2" (at 0 3.556 0)
+        (effects (font (size 1.27 1.27)))
+      )
+      (property "Footprint" "" (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Datasheet" "" (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_keywords" "global power" (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_description" "Power symbol creates a global label with name \"+3V3\"" (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (symbol "+3V3_2_0_1"
+        (polyline
+          (pts
+            (xy -0.762 1.27)
+            (xy 0 2.54)
+          )
+          (stroke (width 0) (type default))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy 0 0)
+            (xy 0 2.54)
+          )
+          (stroke (width 0) (type default))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy 0 2.54)
+            (xy 0.762 1.27)
+          )
+          (stroke (width 0) (type default))
+          (fill (type none))
+        )
+      )
+      (symbol "+3V3_2_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 "+5V_1" (power) (pin_names (offset 0)) (in_bom yes) (on_board yes)
       (property "Reference" "#PWR" (at 0 -3.81 0)
         (effects (font (size 1.27 1.27)) hide)
@@ -117,58 +169,6 @@
         )
       )
     )
-    (symbol "+5V_2" (power) (pin_names (offset 0)) (in_bom yes) (on_board yes)
-      (property "Reference" "#PWR" (at 0 -3.81 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "Value" "+5V_2" (at 0 3.556 0)
-        (effects (font (size 1.27 1.27)))
-      )
-      (property "Footprint" "" (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "Datasheet" "" (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "ki_keywords" "global power" (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "ki_description" "Power symbol creates a global label with name \"+5V\"" (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (symbol "+5V_2_0_1"
-        (polyline
-          (pts
-            (xy -0.762 1.27)
-            (xy 0 2.54)
-          )
-          (stroke (width 0) (type default))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 0 0)
-            (xy 0 2.54)
-          )
-          (stroke (width 0) (type default))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 0 2.54)
-            (xy 0.762 1.27)
-          )
-          (stroke (width 0) (type default))
-          (fill (type none))
-        )
-      )
-      (symbol "+5V_2_1_1"
-        (pin power_in line (at 0 0 90) (length 0) hide
-          (name "+5V" (effects (font (size 1.27 1.27))))
-          (number "1" (effects (font (size 1.27 1.27))))
-        )
-      )
-    )
     (symbol "Connector:Barrel_Jack_Switch" (pin_names hide) (in_bom yes) (on_board yes)
       (property "Reference" "J" (at 0 5.334 0)
         (effects (font (size 1.27 1.27)))
@@ -547,6 +547,67 @@
         )
       )
     )
+    (symbol "Connector_Generic:Conn_01x04" (pin_names (offset 1.016) hide) (in_bom yes) (on_board yes)
+      (property "Reference" "J" (at 0 5.08 0)
+        (effects (font (size 1.27 1.27)))
+      )
+      (property "Value" "Conn_01x04" (at 0 -7.62 0)
+        (effects (font (size 1.27 1.27)))
+      )
+      (property "Footprint" "" (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Datasheet" "~" (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_keywords" "connector" (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_description" "Generic connector, single row, 01x04, script generated (kicad-library-utils/schlib/autogen/connector/)" (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_fp_filters" "Connector*:*_1x??_*" (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (symbol "Conn_01x04_1_1"
+        (rectangle (start -1.27 -4.953) (end 0 -5.207)
+          (stroke (width 0.1524) (type default))
+          (fill (type none))
+        )
+        (rectangle (start -1.27 -2.413) (end 0 -2.667)
+          (stroke (width 0.1524) (type default))
+          (fill (type none))
+        )
+        (rectangle (start -1.27 0.127) (end 0 -0.127)
+          (stroke (width 0.1524) (type default))
+          (fill (type none))
+        )
+        (rectangle (start -1.27 2.667) (end 0 2.413)
+          (stroke (width 0.1524) (type default))
+          (fill (type none))
+        )
+        (rectangle (start -1.27 3.81) (end 1.27 -6.35)
+          (stroke (width 0.254) (type default))
+          (fill (type background))
+        )
+        (pin passive line (at -5.08 2.54 0) (length 3.81)
+          (name "Pin_1" (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 3.81)
+          (name "Pin_2" (effects (font (size 1.27 1.27))))
+          (number "2" (effects (font (size 1.27 1.27))))
+        )
+        (pin passive line (at -5.08 -2.54 0) (length 3.81)
+          (name "Pin_3" (effects (font (size 1.27 1.27))))
+          (number "3" (effects (font (size 1.27 1.27))))
+        )
+        (pin passive line (at -5.08 -5.08 0) (length 3.81)
+          (name "Pin_4" (effects (font (size 1.27 1.27))))
+          (number "4" (effects (font (size 1.27 1.27))))
+        )
+      )
+    )
     (symbol "Connector_Generic:Conn_01x06" (pin_names (offset 1.016) hide) (in_bom yes) (on_board yes)
       (property "Reference" "J" (at 0 7.62 0)
         (effects (font (size 1.27 1.27)))
@@ -624,67 +685,6 @@
         )
       )
     )
-    (symbol "Connector_Generic:Conn_02x02_Odd_Even" (pin_names (offset 1.016) hide) (in_bom yes) (on_board yes)
-      (property "Reference" "J" (at 1.27 2.54 0)
-        (effects (font (size 1.27 1.27)))
-      )
-      (property "Value" "Conn_02x02_Odd_Even" (at 1.27 -5.08 0)
-        (effects (font (size 1.27 1.27)))
-      )
-      (property "Footprint" "" (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "Datasheet" "~" (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "ki_keywords" "connector" (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "ki_description" "Generic connector, double row, 02x02, odd/even pin numbering scheme (row 1 odd numbers, row 2 even numbers), script generated (kicad-library-utils/schlib/autogen/connector/)" (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "ki_fp_filters" "Connector*:*_2x??_*" (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (symbol "Conn_02x02_Odd_Even_1_1"
-        (rectangle (start -1.27 -2.413) (end 0 -2.667)
-          (stroke (width 0.1524) (type default))
-          (fill (type none))
-        )
-        (rectangle (start -1.27 0.127) (end 0 -0.127)
-          (stroke (width 0.1524) (type default))
-          (fill (type none))
-        )
-        (rectangle (start -1.27 1.27) (end 3.81 -3.81)
-          (stroke (width 0.254) (type default))
-          (fill (type background))
-        )
-        (rectangle (start 3.81 -2.413) (end 2.54 -2.667)
-          (stroke (width 0.1524) (type default))
-          (fill (type none))
-        )
-        (rectangle (start 3.81 0.127) (end 2.54 -0.127)
-          (stroke (width 0.1524) (type default))
-          (fill (type none))
-        )
-        (pin passive line (at -5.08 0 0) (length 3.81)
-          (name "Pin_1" (effects (font (size 1.27 1.27))))
-          (number "1" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at 7.62 0 180) (length 3.81)
-          (name "Pin_2" (effects (font (size 1.27 1.27))))
-          (number "2" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at -5.08 -2.54 0) (length 3.81)
-          (name "Pin_3" (effects (font (size 1.27 1.27))))
-          (number "3" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at 7.62 -2.54 180) (length 3.81)
-          (name "Pin_4" (effects (font (size 1.27 1.27))))
-          (number "4" (effects (font (size 1.27 1.27))))
-        )
-      )
-    )
     (symbol "Device:C" (pin_numbers hide) (pin_names (offset 0.254)) (in_bom yes) (on_board yes)
       (property "Reference" "C" (at 0.635 2.54 0)
         (effects (font (size 1.27 1.27)) (justify left))
@@ -1103,6 +1103,46 @@
         )
       )
     )
+    (symbol "GND_3" (power) (pin_names (offset 0)) (in_bom yes) (on_board yes)
+      (property "Reference" "#PWR" (at 0 -6.35 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Value" "GND_3" (at 0 -3.81 0)
+        (effects (font (size 1.27 1.27)))
+      )
+      (property "Footprint" "" (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Datasheet" "" (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_keywords" "global power" (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_description" "Power symbol creates a global label with name \"GND\" , ground" (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (symbol "GND_3_0_1"
+        (polyline
+          (pts
+            (xy 0 0)
+            (xy 0 -1.27)
+            (xy 1.27 -1.27)
+            (xy 0 -2.54)
+            (xy -1.27 -1.27)
+            (xy 0 -1.27)
+          )
+          (stroke (width 0) (type default))
+          (fill (type none))
+        )
+      )
+      (symbol "GND_3_1_1"
+        (pin power_in line (at 0 0 270) (length 0) hide
+          (name "GND" (effects (font (size 1.27 1.27))))
+          (number "1" (effects (font (size 1.27 1.27))))
+        )
+      )
+    )
     (symbol "Jumper:Jumper_3_Open" (pin_names (offset 0) hide) (in_bom yes) (on_board yes)
       (property "Reference" "JP" (at -2.54 -2.54 0)
         (effects (font (size 1.27 1.27)))
@@ -2048,6 +2088,9 @@
     )
   )
 
+  (junction (at 247.65 86.36) (diameter 0) (color 0 0 0 0)
+    (uuid 08851512-b96e-4890-91f4-b1aaa4c2f015)
+  )
   (junction (at 186.69 31.75) (diameter 0) (color 0 0 0 0)
     (uuid 16d19d9f-9989-4ec3-b78f-2414b383c391)
   )
@@ -2152,13 +2195,21 @@
     (stroke (width 0) (type default))
     (uuid 0b97e3c8-ec1d-4a27-9c66-8a1df91901c3)
   )
+  (wire (pts (xy 325.12 213.36) (xy 308.61 213.36))
+    (stroke (width 0) (type default))
+    (uuid 0c13438a-171c-4a43-84bf-1f2912c218fc)
+  )
+  (wire (pts (xy 213.36 86.36) (xy 215.9 86.36))
+    (stroke (width 0) (type default))
+    (uuid 0cd8235e-294c-4dd5-9378-16034e157856)
+  )
   (wire (pts (xy 283.21 170.18) (xy 283.21 171.45))
     (stroke (width 0) (type default))
     (uuid 0cf81f88-e7c4-41c5-8e03-1ee006e9a36b)
   )
-  (wire (pts (xy 179.07 90.17) (xy 179.07 85.09))
+  (wire (pts (xy 242.57 189.23) (xy 259.08 189.23))
     (stroke (width 0) (type default))
-    (uuid 0d3ebbff-414d-44e5-9ab5-617619958257)
+    (uuid 0df55cab-8c2a-4a0e-b083-532554e3ab9c)
   )
   (wire (pts (xy 335.28 66.04) (xy 350.52 66.04))
     (stroke (width 0) (type default))
@@ -2172,9 +2223,9 @@
     (stroke (width 0) (type default))
     (uuid 110987fe-4f33-4568-96f4-a15ba51a26fb)
   )
-  (wire (pts (xy 179.07 76.2) (xy 179.07 82.55))
+  (wire (pts (xy 350.52 181.61) (xy 334.01 181.61))
     (stroke (width 0) (type default))
-    (uuid 11374b51-96be-436d-b697-2181a7a73bd3)
+    (uuid 113cc178-ca99-40ad-af77-e1e1e25b344e)
   )
   (wire (pts (xy 19.05 190.5) (xy 25.4 190.5))
     (stroke (width 0) (type default))
@@ -2192,10 +2243,6 @@
     (stroke (width 0) (type default))
     (uuid 15d3af7f-f1bf-49ac-b111-4640366d5181)
   )
-  (wire (pts (xy 201.93 85.09) (xy 196.85 85.09))
-    (stroke (width 0) (type default))
-    (uuid 16ee23fd-d371-4a66-8412-8a4f92cdc591)
-  )
   (wire (pts (xy 124.46 212.09) (xy 119.38 212.09))
     (stroke (width 0) (type default))
     (uuid 1744e33a-58ed-4ff8-87e1-a8699d92d961)
@@ -2208,6 +2255,14 @@
     (stroke (width 0) (type default))
     (uuid 1dfe2559-1c07-499c-bbf4-71f563507f28)
   )
+  (wire (pts (xy 247.65 83.82) (xy 250.19 83.82))
+    (stroke (width 0) (type default))
+    (uuid 23406fb5-bb6b-477b-b300-9b7ba2e9861c)
+  )
+  (wire (pts (xy 215.9 81.28) (xy 208.28 81.28))
+    (stroke (width 0) (type default))
+    (uuid 246ab6bb-7d82-4b16-83a9-74ef7ca45de4)
+  )
   (wire (pts (xy 306.07 60.96) (xy 289.56 60.96))
     (stroke (width 0) (type default))
     (uuid 259859f8-6062-48f2-951b-b06ac74f5eff)
@@ -2216,22 +2271,14 @@
     (stroke (width 0) (type default))
     (uuid 26ea7911-1105-4c1e-af7a-527074cca4e1)
   )
-  (wire (pts (xy 162.56 76.2) (xy 162.56 82.55))
+  (wire (pts (xy 347.98 179.07) (xy 347.98 189.23))
     (stroke (width 0) (type default))
-    (uuid 282ea3cd-df94-412a-a3e1-d6027a73458d)
-  )
-  (wire (pts (xy 139.7 76.2) (xy 139.7 82.55))
-    (stroke (width 0) (type default))
-    (uuid 289470e5-65c9-4cd5-ae21-905b5cb2e825)
+    (uuid 27601b79-e56b-4009-840e-56288e121658)
   )
   (wire (pts (xy 30.48 72.39) (xy 30.48 76.2))
     (stroke (width 0) (type default))
     (uuid 28f255f6-e7cb-4ae4-897a-3fa02e5267ba)
   )
-  (wire (pts (xy 201.93 82.55) (xy 196.85 82.55))
-    (stroke (width 0) (type default))
-    (uuid 29c7fca7-01b0-4f18-879a-051b49f737b6)
-  )
   (wire (pts (xy 60.96 111.76) (xy 69.85 111.76))
     (stroke (width 0) (type default))
     (uuid 2b70044c-8308-465b-a2cd-378dca8bb936)
@@ -2248,6 +2295,10 @@
     (stroke (width 0) (type default))
     (uuid 30abfde3-8899-462f-9f7f-36d43682c0c4)
   )
+  (wire (pts (xy 250.19 78.74) (xy 247.65 78.74))
+    (stroke (width 0) (type default))
+    (uuid 32618a27-e1b8-490b-a450-234ccd29a515)
+  )
   (wire (pts (xy 124.46 152.4) (xy 107.95 152.4))
     (stroke (width 0) (type default))
     (uuid 32ffa73f-a777-4724-b8ef-1ba30c979ef3)
@@ -2272,10 +2323,14 @@
     (stroke (width 0) (type default))
     (uuid 390d23a8-2c91-43dc-b6a2-61a89a42b0d4)
   )
-  (wire (pts (xy 242.57 186.69) (xy 259.08 186.69))
+  (wire (pts (xy 242.57 168.91) (xy 259.08 168.91))
     (stroke (width 0) (type default))
     (uuid 3a025220-bc08-42df-95d4-cf8cbb72cf3d)
   )
+  (wire (pts (xy 247.65 86.36) (xy 247.65 83.82))
+    (stroke (width 0) (type default))
+    (uuid 3a4aef10-6e95-4447-8620-4ee1ce4bd1f0)
+  )
   (wire (pts (xy 36.83 160.02) (xy 34.29 160.02))
     (stroke (width 0) (type default))
     (uuid 3bef41c5-f1ad-4a87-820a-fd236476af1d)
@@ -2284,10 +2339,6 @@
     (stroke (width 0) (type default))
     (uuid 3c266e62-7c6c-443a-a1e4-22d3ddfd0919)
   )
-  (wire (pts (xy 162.56 85.09) (xy 157.48 85.09))
-    (stroke (width 0) (type default))
-    (uuid 3db52d56-43b5-42a2-abbe-8193f0180405)
-  )
   (wire (pts (xy 353.06 43.18) (xy 353.06 46.99))
     (stroke (width 0) (type default))
     (uuid 404e4556-8d97-4cc3-aa23-be46f0f19240)
@@ -2312,6 +2363,10 @@
     (stroke (width 0) (type default))
     (uuid 49aa6694-d7d7-4c76-9e1a-0c978e3d1c4b)
   )
+  (wire (pts (xy 323.85 215.9) (xy 323.85 205.74))
+    (stroke (width 0) (type default))
+    (uuid 4c1f0b86-d6ca-441a-875d-b8d5cb2ebcb3)
+  )
   (wire (pts (xy 119.38 217.17) (xy 119.38 226.06))
     (stroke (width 0) (type default))
     (uuid 4c210c07-9a41-484a-8118-2530f0a1048c)
@@ -2328,6 +2383,10 @@
     (stroke (width 0) (type default))
     (uuid 4f009ebe-f7ec-4408-8a76-88c5542ae69c)
   )
+  (wire (pts (xy 203.2 76.2) (xy 203.2 83.82))
+    (stroke (width 0) (type default))
+    (uuid 4f8297c6-c669-4163-9570-c7fa56219f49)
+  )
   (wire (pts (xy 58.42 52.07) (xy 53.34 52.07))
     (stroke (width 0) (type default))
     (uuid 4fa27199-e012-4b22-adc5-a6d315b3b739)
@@ -2356,10 +2415,6 @@
     (stroke (width 0) (type default))
     (uuid 54c03529-8896-411e-9ef0-1071caad5b8e)
   )
-  (wire (pts (xy 162.56 90.17) (xy 162.56 85.09))
-    (stroke (width 0) (type default))
-    (uuid 55ad46e8-784c-46f2-bf45-bd85a9c2ae83)
-  )
   (wire (pts (xy 58.42 46.99) (xy 58.42 49.53))
     (stroke (width 0) (type default))
     (uuid 5767f5e3-e367-4ddd-bf3a-f2c32c2b68b5)
@@ -2372,6 +2427,10 @@
     (stroke (width 0) (type default))
     (uuid 5898b849-f93b-4e91-8db7-bd3769027315)
   )
+  (wire (pts (xy 350.52 186.69) (xy 334.01 186.69))
+    (stroke (width 0) (type default))
+    (uuid 5bb397de-39ad-4e74-8810-6a2fe9dd90cc)
+  )
   (wire (pts (xy 44.45 172.72) (xy 34.29 172.72))
     (stroke (width 0) (type default))
     (uuid 5e4bcb54-6c58-48ef-9d8e-93cd3ac9bec0)
@@ -2380,10 +2439,6 @@
     (stroke (width 0) (type default))
     (uuid 5fe88b43-3e01-4a3f-94e3-aff489b52453)
   )
-  (wire (pts (xy 139.7 90.17) (xy 139.7 85.09))
-    (stroke (width 0) (type default))
-    (uuid 64875803-7e45-4eda-a4e2-6a5200eebabf)
-  )
   (wire (pts (xy 146.05 31.75) (xy 158.75 31.75))
     (stroke (width 0) (type default))
     (uuid 67f3da17-198c-4670-a503-9b501ce3a01a)
@@ -2396,6 +2451,10 @@
     (stroke (width 0) (type default))
     (uuid 690859d5-9797-48dd-b6ef-f164dc7bbab5)
   )
+  (wire (pts (xy 323.85 205.74) (xy 325.12 205.74))
+    (stroke (width 0) (type default))
+    (uuid 6c454ab4-e607-4ee7-8a86-ae36c03fbc80)
+  )
   (wire (pts (xy 259.08 223.52) (xy 259.08 226.06))
     (stroke (width 0) (type default))
     (uuid 6c9373b7-73f6-4bcf-b049-dc12d134f4f8)
@@ -2420,9 +2479,13 @@
     (stroke (width 0) (type default))
     (uuid 710a469d-ce4b-4186-94a0-4ad3ebe707f5)
   )
-  (wire (pts (xy 162.56 82.55) (xy 157.48 82.55))
+  (wire (pts (xy 203.2 83.82) (xy 215.9 83.82))
     (stroke (width 0) (type default))
-    (uuid 724282a6-c099-4c3d-ac9b-97afa9db90d4)
+    (uuid 7163594b-e9e4-4f42-b610-d3fb02447026)
+  )
+  (wire (pts (xy 213.36 76.2) (xy 213.36 78.74))
+    (stroke (width 0) (type default))
+    (uuid 728ec07b-b088-45c8-bd19-761a9623c5bf)
   )
   (wire (pts (xy 53.34 54.61) (xy 58.42 54.61))
     (stroke (width 0) (type default))
@@ -2432,6 +2495,14 @@
     (stroke (width 0) (type default))
     (uuid 747bcb99-b888-4ec7-a7af-d50cbb699233)
   )
+  (wire (pts (xy 350.52 184.15) (xy 334.01 184.15))
+    (stroke (width 0) (type default))
+    (uuid 77baa967-e7b1-405b-82b3-415bbe18e735)
+  )
+  (wire (pts (xy 347.98 179.07) (xy 350.52 179.07))
+    (stroke (width 0) (type default))
+    (uuid 7807a3c0-c757-4b0f-8160-ef08ffc85e22)
+  )
   (wire (pts (xy 26.67 208.28) (xy 29.21 208.28))
     (stroke (width 0) (type default))
     (uuid 79df73a5-49c1-46f8-959c-757ea5652d46)
@@ -2452,6 +2523,10 @@
     (stroke (width 0) (type default))
     (uuid 805016d5-3175-4dc0-820b-6a6442c9bde1)
   )
+  (wire (pts (xy 242.57 194.31) (xy 259.08 194.31))
+    (stroke (width 0) (type default))
+    (uuid 813bbb7b-6df0-4118-858f-87d36c4fabb8)
+  )
   (wire (pts (xy 88.9 170.18) (xy 88.9 175.26))
     (stroke (width 0) (type default))
     (uuid 819217fc-4510-4717-b527-e790d70f2b35)
@@ -2460,6 +2535,10 @@
     (stroke (width 0) (type default))
     (uuid 81fbda67-bc73-418c-850d-120965a668c0)
   )
+  (wire (pts (xy 242.57 191.77) (xy 259.08 191.77))
+    (stroke (width 0) (type default))
+    (uuid 8412826e-3332-46bf-94aa-c96b536f7d19)
+  )
   (wire (pts (xy 139.7 36.83) (xy 139.7 34.29))
     (stroke (width 0) (type default))
     (uuid 84996211-4fe9-44c0-acda-f76d96d07502)
@@ -2480,10 +2559,18 @@
     (stroke (width 0) (type default))
     (uuid 894ce4e5-fd31-456c-879b-70166b4c9f67)
   )
-  (wire (pts (xy 242.57 189.23) (xy 259.08 189.23))
+  (wire (pts (xy 242.57 171.45) (xy 259.08 171.45))
     (stroke (width 0) (type default))
     (uuid 8a4e1a7c-f9ae-4621-aa60-ee607e72544c)
   )
+  (wire (pts (xy 242.57 81.28) (xy 242.57 76.2))
+    (stroke (width 0) (type default))
+    (uuid 8add2f33-0801-4bc5-a056-f7d7c66793e4)
+  )
+  (wire (pts (xy 213.36 88.9) (xy 213.36 86.36))
+    (stroke (width 0) (type default))
+    (uuid 8ae4205a-03a2-432c-b4b9-4e75c91e7fbf)
+  )
   (wire (pts (xy 186.69 29.21) (xy 186.69 31.75))
     (stroke (width 0) (type default))
     (uuid 8bc125f3-4c2c-4067-8f99-2d436a2a6471)
@@ -2496,18 +2583,10 @@
     (stroke (width 0) (type default))
     (uuid 8d99624b-d0b7-44d9-abe3-b9c5d144be22)
   )
-  (wire (pts (xy 139.7 85.09) (xy 144.78 85.09))
-    (stroke (width 0) (type default))
-    (uuid 91499375-c854-4da4-944a-55cc0814a3f9)
-  )
-  (wire (pts (xy 242.57 194.31) (xy 259.08 194.31))
+  (wire (pts (xy 242.57 176.53) (xy 259.08 176.53))
     (stroke (width 0) (type default))
     (uuid 9374c79e-2ddc-4abc-befd-dfaf38fe0e02)
   )
-  (wire (pts (xy 179.07 85.09) (xy 184.15 85.09))
-    (stroke (width 0) (type default))
-    (uuid 94993fe8-8551-48ad-8cfe-7b48901e3e3d)
-  )
   (wire (pts (xy 186.69 34.29) (xy 186.69 31.75))
     (stroke (width 0) (type default))
     (uuid 95636fbd-7b20-4f07-b7fc-c23113b247f2)
@@ -2540,10 +2619,18 @@
     (stroke (width 0) (type default))
     (uuid a413e8e3-4472-44d8-8cf9-28893ec03c1c)
   )
+  (wire (pts (xy 325.12 210.82) (xy 308.61 210.82))
+    (stroke (width 0) (type default))
+    (uuid a4763174-4e19-4487-ba3c-ac38b1cd90a2)
+  )
   (wire (pts (xy 78.74 171.45) (xy 78.74 172.72))
     (stroke (width 0) (type default))
     (uuid a7160994-bbe3-4986-b78f-1729f406fe1f)
   )
+  (wire (pts (xy 247.65 78.74) (xy 247.65 76.2))
+    (stroke (width 0) (type default))
+    (uuid a8ba366d-ecc7-4c52-90b5-cda6d5d03aa7)
+  )
   (wire (pts (xy 91.44 99.06) (xy 97.79 99.06))
     (stroke (width 0) (type default))
     (uuid a96e29a3-09b2-4ef3-b68f-696079a926ae)
@@ -2588,10 +2675,6 @@
     (stroke (width 0) (type default))
     (uuid bd35d199-e8b6-43ce-896f-e8909eef6309)
   )
-  (wire (pts (xy 201.93 76.2) (xy 201.93 82.55))
-    (stroke (width 0) (type default))
-    (uuid be0d7f0c-e8da-451e-abf4-46b12c7dea18)
-  )
   (wire (pts (xy 44.45 170.18) (xy 34.29 170.18))
     (stroke (width 0) (type default))
     (uuid be10d364-2eb4-41a7-b4f6-1030f313f237)
@@ -2608,6 +2691,10 @@
     (stroke (width 0) (type default))
     (uuid c3876358-758d-4a6d-af65-79917423811b)
   )
+  (wire (pts (xy 325.12 208.28) (xy 321.31 208.28))
+    (stroke (width 0) (type default))
+    (uuid c48a2bac-be4c-412f-8270-1dc5a09c0d62)
+  )
   (wire (pts (xy 78.74 161.29) (xy 78.74 163.83))
     (stroke (width 0) (type default))
     (uuid c492ff34-b867-4565-b2ac-81334fa17f88)
@@ -2628,10 +2715,18 @@
     (stroke (width 0) (type default))
     (uuid c784a8f9-d46e-412a-9348-de9cffeca7e7)
   )
+  (wire (pts (xy 250.19 81.28) (xy 242.57 81.28))
+    (stroke (width 0) (type default))
+    (uuid c9449a3e-ea8c-4a4f-9614-9454bd15ff51)
+  )
   (wire (pts (xy 303.53 157.48) (xy 303.53 161.29))
     (stroke (width 0) (type default))
     (uuid c9a9e3e5-a97f-4e5c-825e-b53c171ec8f5)
   )
+  (wire (pts (xy 215.9 78.74) (xy 213.36 78.74))
+    (stroke (width 0) (type default))
+    (uuid cb127e6d-258f-4276-b2de-dc5a5a75f2a6)
+  )
   (wire (pts (xy 97.79 109.22) (xy 97.79 111.76))
     (stroke (width 0) (type default))
     (uuid cb74ee5d-0682-48ca-8b6b-7317238324a0)
@@ -2644,18 +2739,14 @@
     (stroke (width 0) (type default))
     (uuid cc922b9b-d6b4-455a-aea4-da436a1bb966)
   )
-  (wire (pts (xy 139.7 82.55) (xy 144.78 82.55))
+  (wire (pts (xy 247.65 88.9) (xy 247.65 86.36))
     (stroke (width 0) (type default))
-    (uuid cffd5ed8-b0bb-4fd0-bab9-1cd554ccb635)
+    (uuid ccc28d4f-987c-4c82-acd6-0e5539aedac4)
   )
   (wire (pts (xy 274.32 143.51) (xy 274.32 146.05))
     (stroke (width 0) (type default))
     (uuid d0802183-04a8-4aad-b16e-6be404ca6ade)
   )
-  (wire (pts (xy 201.93 90.17) (xy 201.93 85.09))
-    (stroke (width 0) (type default))
-    (uuid d0cf2387-18af-4b56-abf2-299d0e510a22)
-  )
   (wire (pts (xy 342.9 68.58) (xy 350.52 68.58))
     (stroke (width 0) (type default))
     (uuid d0edea7f-b4fc-468d-ad55-01a91154c593)
@@ -2668,6 +2759,10 @@
     (stroke (width 0) (type default))
     (uuid d4590ebb-0b80-4f20-8f8d-d0dd7225a841)
   )
+  (wire (pts (xy 321.31 208.28) (xy 321.31 203.2))
+    (stroke (width 0) (type default))
+    (uuid d54760e5-a2ed-4d60-8217-8acd93172f4d)
+  )
   (wire (pts (xy 196.85 29.21) (xy 198.12 29.21))
     (stroke (width 0) (type default))
     (uuid d5d2ee45-a543-4390-aa62-4ef4e8cc3fef)
@@ -2688,10 +2783,14 @@
     (stroke (width 0) (type default))
     (uuid d934b5ed-d867-472a-9365-5f80e92b03fc)
   )
-  (wire (pts (xy 242.57 191.77) (xy 259.08 191.77))
+  (wire (pts (xy 242.57 173.99) (xy 259.08 173.99))
     (stroke (width 0) (type default))
     (uuid da1b3e94-7a4d-4f72-a1ae-d20e9cb35180)
   )
+  (wire (pts (xy 242.57 184.15) (xy 259.08 184.15))
+    (stroke (width 0) (type default))
+    (uuid dbe7d62d-c137-4e63-af59-b578ee268309)
+  )
   (wire (pts (xy 306.07 63.5) (xy 289.56 63.5))
     (stroke (width 0) (type default))
     (uuid df533503-0117-4dc3-9bc7-e2acd9197ee6)
@@ -2704,6 +2803,10 @@
     (stroke (width 0) (type default))
     (uuid e3aba651-36e9-4aef-9076-a28e109ac4f3)
   )
+  (wire (pts (xy 208.28 81.28) (xy 208.28 76.2))
+    (stroke (width 0) (type default))
+    (uuid e4d17d34-b97c-453b-82e1-7e7afad714e5)
+  )
   (wire (pts (xy 189.23 34.29) (xy 186.69 34.29))
     (stroke (width 0) (type default))
     (uuid e55f5ad3-7b7c-4e07-8848-08250b6f5ea0)
@@ -2724,6 +2827,10 @@
     (stroke (width 0) (type default))
     (uuid ea82882e-e54d-42ad-b4d3-db7e1b1429a2)
   )
+  (wire (pts (xy 242.57 186.69) (xy 259.08 186.69))
+    (stroke (width 0) (type default))
+    (uuid eab58ba8-3171-4f90-8e38-4c6dddfb0a9b)
+  )
   (wire (pts (xy 189.23 29.21) (xy 186.69 29.21))
     (stroke (width 0) (type default))
     (uuid eb2adb3a-247e-4635-b898-1fcd58a8068f)
@@ -2732,10 +2839,6 @@
     (stroke (width 0) (type default))
     (uuid ed24e4a6-9e3c-4213-af83-9b329b434148)
   )
-  (wire (pts (xy 179.07 82.55) (xy 184.15 82.55))
-    (stroke (width 0) (type default))
-    (uuid eeb4842b-5f3a-4d7c-b5f5-24ccb81ebac4)
-  )
   (wire (pts (xy 242.57 161.29) (xy 250.19 161.29))
     (stroke (width 0) (type default))
     (uuid efcc8f75-89ba-4076-8da8-1d180c20e07f)
@@ -2760,6 +2863,10 @@
     (stroke (width 0) (type default))
     (uuid f8b50c8f-9047-473c-8bbf-ee5c104f56ae)
   )
+  (wire (pts (xy 247.65 86.36) (xy 250.19 86.36))
+    (stroke (width 0) (type default))
+    (uuid f9037db4-3b12-4569-b6de-6214b772452d)
+  )
   (wire (pts (xy 283.21 157.48) (xy 303.53 157.48))
     (stroke (width 0) (type default))
     (uuid fabcf215-9a6d-4284-bc33-147a023ddb8c)
@@ -2791,7 +2898,11 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 0c589d2c-5d53-4c81-b514-1a0235995c0a)
   )
-  (label "CH2" (at 259.08 191.77 180) (fields_autoplaced)
+  (label "GPIO12" (at 334.01 181.61 0) (fields_autoplaced)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid 0e12d761-40aa-4eb5-9fd9-37282807b5ec)
+  )
+  (label "CH2" (at 259.08 173.99 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 112c8c1d-396b-43f1-91b1-bb4f17490185)
   )
@@ -2807,6 +2918,10 @@
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 315b3a26-bb45-4f0c-bb77-695ffaa06241)
   )
+  (label "GPIO14" (at 259.08 194.31 180) (fields_autoplaced)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (uuid 3a8a60bd-6a6e-42e0-b8c2-4349f8c566ac)
+  )
   (label "USB_DM" (at 107.95 154.94 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 3b86d442-8c5d-4807-8aab-02327f630c9d)
@@ -2815,14 +2930,30 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 490817a9-8a3a-4dae-8218-68d4d944ab07)
   )
+  (label "I2C_SDA" (at 259.08 186.69 180) (fields_autoplaced)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (uuid 51b97073-1904-45bf-87b9-ff99f3081d48)
+  )
   (label "RXD" (at 44.45 167.64 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 59811369-676b-43e7-b8c3-81d491e17681)
   )
+  (label "I2C_SCL" (at 308.61 210.82 0) (fields_autoplaced)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid 60d6cafe-34e2-4a78-a28e-d552ce01ca9b)
+  )
+  (label "GPIO13" (at 259.08 191.77 180) (fields_autoplaced)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (uuid 65032511-25aa-4811-8e3c-3aed19aa2e7e)
+  )
   (label "CH2" (at 289.56 60.96 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 66d993e9-17d2-447a-8693-7532528e78e3)
   )
+  (label "I2C_SDA" (at 308.61 213.36 0) (fields_autoplaced)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid 67915dce-a280-43bc-a0c3-22925384d547)
+  )
   (label "CH1" (at 289.56 58.42 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 6d6ddfa1-069e-45fa-ae64-4c6ff6cc27a6)
@@ -2835,6 +2966,10 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 74f4318b-a32f-49f3-81b8-c826fcac9531)
   )
+  (label "I2C_SCL" (at 259.08 184.15 180) (fields_autoplaced)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (uuid 80173f10-bce3-409a-83b3-d506a38d76c6)
+  )
   (label "USB_DP" (at 107.95 152.4 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 8e01aaa1-ac82-4958-a118-f2ebc18eeeb3)
@@ -2843,7 +2978,15 @@
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 8fcf3daa-d1a0-4c3a-a9eb-224e04c0de0c)
   )
-  (label "CH4" (at 259.08 186.69 180) (fields_autoplaced)
+  (label "GPIO13" (at 334.01 184.15 0) (fields_autoplaced)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid 9ab294eb-b381-4974-b5cd-b3c6936d3671)
+  )
+  (label "GPIO14" (at 334.01 186.69 0) (fields_autoplaced)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid ab61af0b-dca8-414a-be82-dbbf39a163c6)
+  )
+  (label "CH4" (at 259.08 168.91 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid ae8743d5-5e6c-4ba2-b9de-8cedabcc5be2)
   )
@@ -2863,11 +3006,11 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid dcb9f71f-0f11-4e89-af3e-d3fc1f5062f8)
   )
-  (label "CH3" (at 259.08 189.23 180) (fields_autoplaced)
+  (label "CH3" (at 259.08 171.45 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid e06920ab-eb08-4138-8c49-5a2a4e683b18)
   )
-  (label "CH1" (at 259.08 194.31 180) (fields_autoplaced)
+  (label "CH1" (at 259.08 176.53 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid e1179daa-f9e9-4499-b8d1-5ec771ee0621)
   )
@@ -2883,6 +3026,10 @@
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid f8bb1dc1-5e13-4596-8302-357ff7e49e26)
   )
+  (label "GPIO12" (at 259.08 189.23 180) (fields_autoplaced)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (uuid fdf80d90-e8e9-4267-8d96-9f9027918765)
+  )
 
   (symbol (lib_id "power:VCC") (at 332.74 43.18 0) (mirror y) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
@@ -2934,34 +3081,6 @@
     )
   )
 
-  (symbol (lib_id "Connector_Generic:Conn_02x02_Odd_Even") (at 149.86 82.55 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid 046fc5ce-032c-47f5-ad89-c2056ead3872)
-    (property "Reference" "J5" (at 151.13 77.47 0)
-      (effects (font (size 1.27 1.27)))
-    )
-    (property "Value" "Conn_02x02_Odd_Even" (at 151.13 80.01 0)
-      (effects (font (size 1.27 1.27)))
-    )
-    (property "Footprint" "Connector_PinHeader_2.54mm:PinHeader_2x02_P2.54mm_Vertical" (at 149.86 82.55 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (at 149.86 82.55 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 54f8bed5-1c70-4f44-b486-f6b826b8efe4))
-    (pin "2" (uuid a7bf95ba-09c2-4315-a199-ca685cd137b6))
-    (pin "3" (uuid 2632654c-5bfa-402b-b988-c8a6d2a91ae3))
-    (pin "4" (uuid 624e53f3-ad19-442d-8506-d2b7099e2794))
-    (instances
-      (project "starfish"
-        (path "/e63e39d7-6ac0-4ffd-8aa3-1841a4541b55"
-          (reference "J5") (unit 1)
-        )
-      )
-    )
-  )
-
   (symbol (lib_id "power:+3V3") (at 88.9 158.75 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
     (uuid 059af548-69d7-492c-be89-fee044ca29df)
@@ -3036,6 +3155,34 @@
     )
   )
 
+  (symbol (lib_id "Connector_Generic:Conn_01x04") (at 355.6 181.61 0) (unit 1)
+    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
+    (uuid 0c9b1369-1ac5-44e6-a0dd-5711bdee8557)
+    (property "Reference" "J7" (at 358.14 182.245 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "Conn_01x04" (at 358.14 184.785 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Connector_PinSocket_2.54mm:PinSocket_1x04_P2.54mm_Vertical" (at 355.6 181.61 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (at 355.6 181.61 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 76791ea8-83b7-4ccb-9107-310477d4f7e9))
+    (pin "2" (uuid 5a7737ef-498e-43d2-b250-9bf7ca164e2a))
+    (pin "3" (uuid b5079939-d21e-4856-9693-79c880ca47a5))
+    (pin "4" (uuid 3447c13b-f103-44c7-b2fd-77425d2423d2))
+    (instances
+      (project "starfish"
+        (path "/e63e39d7-6ac0-4ffd-8aa3-1841a4541b55"
+          (reference "J7") (unit 1)
+        )
+      )
+    )
+  )
+
   (symbol (lib_id "Transistor_FET:BSS138") (at 44.45 190.5 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
     (uuid 0cc408e3-e939-445b-a350-0e76fbc99003)
@@ -3114,6 +3261,56 @@
     )
   )
 
+  (symbol (lib_name "VCC_1") (lib_id "power:VCC") (at 213.36 76.2 0) (unit 1)
+    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
+    (uuid 19357a47-bc12-4b04-9f1d-c145a5f60482)
+    (property "Reference" "#PWR07" (at 213.36 80.01 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "VCC" (at 213.36 72.39 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "" (at 213.36 76.2 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (at 213.36 76.2 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid df572a10-a5bc-4717-8695-f880b6012c46))
+    (instances
+      (project "starfish"
+        (path "/e63e39d7-6ac0-4ffd-8aa3-1841a4541b55"
+          (reference "#PWR07") (unit 1)
+        )
+      )
+    )
+  )
+
+  (symbol (lib_name "GND_3") (lib_id "power:GND") (at 323.85 215.9 0) (unit 1)
+    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
+    (uuid 1b49cac6-2b6f-4367-97ce-f26a5aed2a8f)
+    (property "Reference" "#PWR013" (at 323.85 222.25 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "GND" (at 323.85 220.98 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "" (at 323.85 215.9 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (at 323.85 215.9 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 92e418ff-989c-4b39-9148-f68b17ad0973))
+    (instances
+      (project "starfish"
+        (path "/e63e39d7-6ac0-4ffd-8aa3-1841a4541b55"
+          (reference "#PWR013") (unit 1)
+        )
+      )
+    )
+  )
+
   (symbol (lib_id "power:GND") (at 292.1 171.45 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
     (uuid 1cae1396-025b-4025-be6b-7bff8d90e930)
@@ -3362,26 +3559,29 @@
     )
   )
 
-  (symbol (lib_name "+5V_2") (lib_id "power:+5V") (at 201.93 76.2 0) (unit 1)
+  (symbol (lib_id "Connector_Generic:Conn_01x04") (at 220.98 81.28 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid 34c2fe6a-8205-42ec-b1cb-b3e9fb4ce1dc)
-    (property "Reference" "#PWR07" (at 201.93 80.01 0)
+    (uuid 3971f5a3-e1ae-4cb2-a4f5-2a2f7ebe8d94)
+    (property "Reference" "J4" (at 223.52 81.915 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "Conn_01x04" (at 223.52 84.455 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Connector_PinSocket_2.54mm:PinSocket_1x04_P2.54mm_Vertical" (at 220.98 81.28 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "+5V" (at 201.93 72.39 0)
-      (effects (font (size 1.27 1.27)))
-    )
-    (property "Footprint" "" (at 201.93 76.2 0)
+    (property "Datasheet" "~" (at 220.98 81.28 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (at 201.93 76.2 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 323676ac-5c14-4956-90c9-c06ec840af9a))
+    (pin "1" (uuid 473d542f-6c17-4dbf-b2a2-8c43ef913676))
+    (pin "2" (uuid e45efa7b-a2af-4d9f-9fbc-ccd8d69e5630))
+    (pin "3" (uuid e0b05c7c-e93a-434e-b3aa-728dcaac9e05))
+    (pin "4" (uuid 9b47a722-e077-4fd7-9e09-d43b702bdf08))
     (instances
       (project "starfish"
         (path "/e63e39d7-6ac0-4ffd-8aa3-1841a4541b55"
-          (reference "#PWR07") (unit 1)
+          (reference "J4") (unit 1)
         )
       )
     )
@@ -3540,6 +3740,31 @@
     )
   )
 
+  (symbol (lib_name "+5V_1") (lib_id "power:+5V") (at 208.28 76.2 0) (unit 1)
+    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
+    (uuid 49b5367f-860f-465c-a829-adac02bfe3b9)
+    (property "Reference" "#PWR04" (at 208.28 80.01 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "+5V" (at 208.28 72.39 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "" (at 208.28 76.2 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (at 208.28 76.2 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 203537b1-309c-4510-91d8-7d761c486ad6))
+    (instances
+      (project "starfish"
+        (path "/e63e39d7-6ac0-4ffd-8aa3-1841a4541b55"
+          (reference "#PWR04") (unit 1)
+        )
+      )
+    )
+  )
+
   (symbol (lib_id "paeber:1301.9315") (at 88.9 180.34 90) (mirror x) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 4b4353c2-56ab-4f40-9e45-f5904856d70c)
@@ -3674,26 +3899,29 @@
     )
   )
 
-  (symbol (lib_name "GND_2") (lib_id "power:GND") (at 162.56 90.17 0) (mirror y) (unit 1)
+  (symbol (lib_id "Connector_Generic:Conn_01x04") (at 330.2 208.28 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid 6dd696d5-aaab-4452-a5ee-cb1f75cd2510)
-    (property "Reference" "#PWR010" (at 162.56 96.52 0)
+    (uuid 6bdd56c0-7c72-40d0-bdf1-fceba788e714)
+    (property "Reference" "J6" (at 332.74 208.915 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "Conn_01x04" (at 332.74 211.455 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Connector_PinSocket_2.54mm:PinSocket_1x04_P2.54mm_Vertical" (at 330.2 208.28 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (at 162.56 95.25 0)
-      (effects (font (size 1.27 1.27)))
-    )
-    (property "Footprint" "" (at 162.56 90.17 0)
+    (property "Datasheet" "~" (at 330.2 208.28 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (at 162.56 90.17 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid dde9bdc1-584a-47da-a7b0-d15b851dc4a1))
+    (pin "1" (uuid a63520b9-ddb5-4668-bb07-df0a53792200))
+    (pin "2" (uuid 2a32e6a3-a2dd-4c08-877d-dcb68f7caf5a))
+    (pin "3" (uuid 3ac4f4a1-0174-46db-985f-6bda5518baf1))
+    (pin "4" (uuid 04a9d9c9-b6df-4df2-8682-1faaa6283dcb))
     (instances
       (project "starfish"
         (path "/e63e39d7-6ac0-4ffd-8aa3-1841a4541b55"
-          (reference "#PWR010") (unit 1)
+          (reference "J6") (unit 1)
         )
       )
     )
@@ -3883,6 +4111,31 @@
     )
   )
 
+  (symbol (lib_name "GND_3") (lib_id "power:GND") (at 347.98 189.23 0) (unit 1)
+    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
+    (uuid 794858d3-620f-4ef1-968f-63f76e696cee)
+    (property "Reference" "#PWR015" (at 347.98 195.58 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "GND" (at 347.98 194.31 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "" (at 347.98 189.23 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (at 347.98 189.23 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid d9fb8e19-6675-4983-9222-3bf9cf890623))
+    (instances
+      (project "starfish"
+        (path "/e63e39d7-6ac0-4ffd-8aa3-1841a4541b55"
+          (reference "#PWR015") (unit 1)
+        )
+      )
+    )
+  )
+
   (symbol (lib_id "Jumper:SolderJumper_2_Open") (at 193.04 29.21 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
     (uuid 79c481cb-4fb1-45f9-b999-786b26116167)
@@ -3909,31 +4162,6 @@
     )
   )
 
-  (symbol (lib_name "GND_2") (lib_id "power:GND") (at 139.7 90.17 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid 79f54adf-66f6-4fe8-8e8e-c7de3213aaf8)
-    (property "Reference" "#PWR03" (at 139.7 96.52 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Value" "GND" (at 139.7 95.25 0)
-      (effects (font (size 1.27 1.27)))
-    )
-    (property "Footprint" "" (at 139.7 90.17 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (at 139.7 90.17 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid f23883ab-debc-47a7-b345-f177ed232a4d))
-    (instances
-      (project "starfish"
-        (path "/e63e39d7-6ac0-4ffd-8aa3-1841a4541b55"
-          (reference "#PWR03") (unit 1)
-        )
-      )
-    )
-  )
-
   (symbol (lib_name "+3V3_1") (lib_id "power:+3V3") (at 198.12 34.29 270) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
     (uuid 7e02cce8-99be-4bb5-b93a-d220b1b8a277)
@@ -4009,31 +4237,6 @@
     )
   )
 
-  (symbol (lib_name "VCC_1") (lib_id "power:VCC") (at 139.7 76.2 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid 84d58ea0-503c-4fb3-aa25-c9274276ac49)
-    (property "Reference" "#PWR04" (at 139.7 80.01 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Value" "VCC" (at 139.7 72.39 0)
-      (effects (font (size 1.27 1.27)))
-    )
-    (property "Footprint" "" (at 139.7 76.2 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (at 139.7 76.2 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid aa2e451c-a03c-4bf6-82c0-006ab2db6ddf))
-    (instances
-      (project "starfish"
-        (path "/e63e39d7-6ac0-4ffd-8aa3-1841a4541b55"
-          (reference "#PWR04") (unit 1)
-        )
-      )
-    )
-  )
-
   (symbol (lib_id "Connector:Screw_Terminal_01x02") (at 124.46 52.07 0) (mirror y) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
     (uuid 8de68870-5d02-4792-905b-2e9e44982a07)
@@ -4114,26 +4317,26 @@
     )
   )
 
-  (symbol (lib_name "VCC_1") (lib_id "power:VCC") (at 162.56 76.2 0) (mirror y) (unit 1)
+  (symbol (lib_name "GND_2") (lib_id "power:GND") (at 247.65 88.9 0) (mirror y) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid 97de9adb-c7e0-4efe-915b-3ee507dccfcf)
-    (property "Reference" "#PWR09" (at 162.56 80.01 0)
+    (uuid 97c96473-4067-49a8-a79e-5537c5510538)
+    (property "Reference" "#PWR019" (at 247.65 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "VCC" (at 162.56 72.39 0)
+    (property "Value" "GND" (at 247.65 93.98 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "" (at 162.56 76.2 0)
+    (property "Footprint" "" (at 247.65 88.9 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (at 162.56 76.2 0)
+    (property "Datasheet" "" (at 247.65 88.9 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid ab6b6786-9e38-4b6e-80cb-02b76048340f))
+    (pin "1" (uuid 81e3ea9c-181b-488a-9b10-e4d0f9cf9fbb))
     (instances
       (project "starfish"
         (path "/e63e39d7-6ac0-4ffd-8aa3-1841a4541b55"
-          (reference "#PWR09") (unit 1)
+          (reference "#PWR019") (unit 1)
         )
       )
     )
@@ -4164,6 +4367,31 @@
     )
   )
 
+  (symbol (lib_name "GND_2") (lib_id "power:GND") (at 213.36 88.9 0) (mirror y) (unit 1)
+    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
+    (uuid 9c79e95d-e5e0-4769-9741-f7f761e18488)
+    (property "Reference" "#PWR06" (at 213.36 95.25 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "GND" (at 213.36 93.98 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "" (at 213.36 88.9 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (at 213.36 88.9 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 9e0b4829-b82b-43af-99ca-6b34bfbe830e))
+    (instances
+      (project "starfish"
+        (path "/e63e39d7-6ac0-4ffd-8aa3-1841a4541b55"
+          (reference "#PWR06") (unit 1)
+        )
+      )
+    )
+  )
+
   (symbol (lib_id "paeber:1301.9315") (at 283.21 165.1 90) (mirror x) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
     (uuid 9cf4f6c9-c95c-4e9b-b10e-0eb97a3b7619)
@@ -4217,26 +4445,51 @@
     )
   )
 
-  (symbol (lib_name "GND_2") (lib_id "power:GND") (at 179.07 90.17 0) (unit 1)
+  (symbol (lib_name "+5V_1") (lib_id "power:+5V") (at 242.57 76.2 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid a8ebd941-b277-4474-8ed8-3b1a3a74df84)
-    (property "Reference" "#PWR06" (at 179.07 96.52 0)
+    (uuid a2047030-9ca9-421d-84f2-8471dbdcc72c)
+    (property "Reference" "#PWR03" (at 242.57 80.01 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (at 179.07 95.25 0)
+    (property "Value" "+5V" (at 242.57 72.39 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "" (at 179.07 90.17 0)
+    (property "Footprint" "" (at 242.57 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (at 179.07 90.17 0)
+    (property "Datasheet" "" (at 242.57 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 2e849c1b-f678-4131-be28-2caa93aca80a))
+    (pin "1" (uuid c2ffd2aa-705b-4938-be45-7d07ccaa740e))
     (instances
       (project "starfish"
         (path "/e63e39d7-6ac0-4ffd-8aa3-1841a4541b55"
-          (reference "#PWR06") (unit 1)
+          (reference "#PWR03") (unit 1)
+        )
+      )
+    )
+  )
+
+  (symbol (lib_name "+3V3_2") (lib_id "power:+3V3") (at 321.31 203.2 0) (unit 1)
+    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
+    (uuid a63f896e-05c6-4a4b-86a5-34f410a22011)
+    (property "Reference" "#PWR014" (at 321.31 207.01 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "+3V3" (at 321.31 199.39 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "" (at 321.31 203.2 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (at 321.31 203.2 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid b6233551-b755-437b-8b5e-60ba41f27b4c))
+    (instances
+      (project "starfish"
+        (path "/e63e39d7-6ac0-4ffd-8aa3-1841a4541b55"
+          (reference "#PWR014") (unit 1)
         )
       )
     )
@@ -4268,34 +4521,6 @@
     )
   )
 
-  (symbol (lib_id "Connector_Generic:Conn_02x02_Odd_Even") (at 189.23 82.55 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid abfaba1f-3a07-4d8a-993f-b82f4aa61bb3)
-    (property "Reference" "J4" (at 190.5 77.47 0)
-      (effects (font (size 1.27 1.27)))
-    )
-    (property "Value" "Conn_02x02_Odd_Even" (at 190.5 80.01 0)
-      (effects (font (size 1.27 1.27)))
-    )
-    (property "Footprint" "Connector_PinHeader_2.54mm:PinHeader_2x02_P2.54mm_Vertical" (at 189.23 82.55 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (at 189.23 82.55 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 588dc19d-1341-42ab-81ae-c42239a0cd76))
-    (pin "2" (uuid 40e275c6-7db9-4fa3-9c71-22ea47d0b3f9))
-    (pin "3" (uuid 4cfc48d3-4e61-488b-9901-939c8ca08387))
-    (pin "4" (uuid ab31d581-4960-4a29-86c1-d894b844e414))
-    (instances
-      (project "starfish"
-        (path "/e63e39d7-6ac0-4ffd-8aa3-1841a4541b55"
-          (reference "J4") (unit 1)
-        )
-      )
-    )
-  )
-
   (symbol (lib_id "power:+5V") (at 60.96 96.52 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
     (uuid b06a8c55-1253-4403-96d0-fcc5e5c8f037)
@@ -4563,6 +4788,31 @@
     )
   )
 
+  (symbol (lib_name "+3V3_2") (lib_id "power:+3V3") (at 203.2 76.2 0) (unit 1)
+    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
+    (uuid cd65b26c-8722-4687-aaba-8c6225001ddf)
+    (property "Reference" "#PWR05" (at 203.2 80.01 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "+3V3" (at 203.2 72.39 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "" (at 203.2 76.2 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (at 203.2 76.2 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid b8cb6417-4043-48fb-af2a-2565fda87700))
+    (instances
+      (project "starfish"
+        (path "/e63e39d7-6ac0-4ffd-8aa3-1841a4541b55"
+          (reference "#PWR05") (unit 1)
+        )
+      )
+    )
+  )
+
   (symbol (lib_id "Device:R") (at 88.9 165.1 0) (mirror x) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid d0fc4778-f486-439e-a801-f2005e8c2d75)
@@ -4802,6 +5052,34 @@
     )
   )
 
+  (symbol (lib_id "Connector_Generic:Conn_01x04") (at 255.27 81.28 0) (unit 1)
+    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
+    (uuid eb8fe990-156c-4290-b535-71d6a4ee8fe4)
+    (property "Reference" "J9" (at 257.81 81.915 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "Conn_01x04" (at 257.81 84.455 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Connector_PinSocket_2.54mm:PinSocket_1x04_P2.54mm_Vertical" (at 255.27 81.28 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (at 255.27 81.28 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid b7b7b92d-9654-4529-be17-e7023887381e))
+    (pin "2" (uuid 893c2b8e-7e52-4ff2-87c2-22c1adf85f46))
+    (pin "3" (uuid 231e15f9-0717-419a-9d2b-e85b16a4d69d))
+    (pin "4" (uuid 19b9dda7-ed7c-4cb4-8a34-fcb3ad98c4a6))
+    (instances
+      (project "starfish"
+        (path "/e63e39d7-6ac0-4ffd-8aa3-1841a4541b55"
+          (reference "J9") (unit 1)
+        )
+      )
+    )
+  )
+
   (symbol (lib_id "Device:R") (at 283.21 149.86 0) (mirror x) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid ee99297c-5a23-4a1f-a538-d21f8abfcfce)
@@ -4854,6 +5132,31 @@
     )
   )
 
+  (symbol (lib_name "+3V3_2") (lib_id "power:+3V3") (at 247.65 76.2 0) (unit 1)
+    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
+    (uuid f1b90f1e-b8e2-4479-934f-dd16e879cb85)
+    (property "Reference" "#PWR016" (at 247.65 80.01 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "+3V3" (at 247.65 72.39 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "" (at 247.65 76.2 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (at 247.65 76.2 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 1917e123-088a-42fc-82f3-281cc8b0f042))
+    (instances
+      (project "starfish"
+        (path "/e63e39d7-6ac0-4ffd-8aa3-1841a4541b55"
+          (reference "#PWR016") (unit 1)
+        )
+      )
+    )
+  )
+
   (symbol (lib_id "Connector:Barrel_Jack_Switch") (at 128.27 34.29 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
     (uuid f4479527-2094-4184-af26-68ede0df9621)
@@ -4938,56 +5241,6 @@
     )
   )
 
-  (symbol (lib_name "GND_2") (lib_id "power:GND") (at 201.93 90.17 0) (mirror y) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid fe96e09a-78f4-48d3-be0d-93acd380f07a)
-    (property "Reference" "#PWR08" (at 201.93 96.52 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Value" "GND" (at 201.93 95.25 0)
-      (effects (font (size 1.27 1.27)))
-    )
-    (property "Footprint" "" (at 201.93 90.17 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (at 201.93 90.17 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 42c36a5a-6117-4adc-8c91-27a2de0c3c06))
-    (instances
-      (project "starfish"
-        (path "/e63e39d7-6ac0-4ffd-8aa3-1841a4541b55"
-          (reference "#PWR08") (unit 1)
-        )
-      )
-    )
-  )
-
-  (symbol (lib_name "+5V_1") (lib_id "power:+5V") (at 179.07 76.2 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid ff60e2fa-d1e0-4884-a4c1-fe0d17c7bbb0)
-    (property "Reference" "#PWR05" (at 179.07 80.01 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Value" "+5V" (at 179.07 72.39 0)
-      (effects (font (size 1.27 1.27)))
-    )
-    (property "Footprint" "" (at 179.07 76.2 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (at 179.07 76.2 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid eaa09ccc-971d-4e58-aec2-1236a38d93ef))
-    (instances
-      (project "starfish"
-        (path "/e63e39d7-6ac0-4ffd-8aa3-1841a4541b55"
-          (reference "#PWR05") (unit 1)
-        )
-      )
-    )
-  )
-
   (sheet (at 306.07 53.34) (size 29.21 21.59) (fields_autoplaced)
     (stroke (width 0.1524) (type solid))
     (fill (color 0 0 0 0.0000))