diff --git a/kicad-v2/main.kicad_pcb b/kicad-v2/main.kicad_pcb
index 11ab39de..3c7ed6cd 100644
--- a/kicad-v2/main.kicad_pcb
+++ b/kicad-v2/main.kicad_pcb
@@ -102,41 +102,31 @@
   (net 24 "BCK")
   (net 25 "DIN")
   (net 26 "LRCK")
-  (net 27 "unconnected-(J3-Pin_3-Pad3)")
-  (net 28 "unconnected-(J3-Pin_4-Pad4)")
-  (net 29 "unconnected-(J3-Pin_5-Pad5)")
-  (net 30 "unconnected-(J3-Pin_6-Pad6)")
-  (net 31 "unconnected-(J3-Pin_7-Pad7)")
-  (net 32 "unconnected-(J3-Pin_8-Pad8)")
-  (net 33 "unconnected-(J3-Pin_9-Pad9)")
-  (net 34 "Net-(BZ1-+)")
-  (net 35 "unconnected-(J3-Pin_10-Pad10)")
-  (net 36 "unconnected-(J3-Pin_11-Pad11)")
-  (net 37 "unconnected-(U4-GPIO3{slash}TOUCH3{slash}ADC1_CH2-Pad15)")
-  (net 38 "unconnected-(U4-GPIO46-Pad16)")
-  (net 39 "~{DISP_CS}")
-  (net 40 "unconnected-(U4-GPIO12{slash}TOUCH12{slash}ADC2_CH1{slash}FSPICLK{slash}FSPIIO6{slash}SUBSPICLK-Pad20)")
-  (net 41 "unconnected-(U4-GPIO13{slash}TOUCH13{slash}ADC2_CH2{slash}FSPIQ{slash}FSPIIO7{slash}SUBSPIQ-Pad21)")
-  (net 42 "unconnected-(U4-GPIO14{slash}TOUCH14{slash}ADC2_CH3{slash}FSPIWP{slash}FSPIDQS{slash}SUBSPIWP-Pad22)")
-  (net 43 "unconnected-(J7-GAIN-Pad4)")
-  (net 44 "unconnected-(J7-SD-Pad5)")
-  (net 45 "Net-(D1-K)")
-  (net 46 "Net-(D1-A)")
-  (net 47 "Net-(J2-Pin_1)")
-  (net 48 "Net-(J2-Pin_2)")
-  (net 49 "unconnected-(J3-Pin_12-Pad12)")
-  (net 50 "Net-(J8-OUT+)")
-  (net 51 "Net-(Q1-D)")
-  (net 52 "BUZZER")
-  (net 53 "C")
-  (net 54 "D")
-  (net 55 "unconnected-(U4-GPIO21-Pad23)")
-  (net 56 "unconnected-(U4-GPIO47{slash}SPICLK_P{slash}SUBSPICLK_P_DIFF-Pad24)")
-  (net 57 "unconnected-(U4-GPIO48{slash}SPICLK_N{slash}SUBSPICLK_N_DIFF-Pad25)")
-  (net 58 "unconnected-(U4-GPIO45-Pad26)")
-  (net 59 "unconnected-(U4-SPIIO6{slash}GPIO35{slash}FSPID{slash}SUBSPID-Pad28)")
-  (net 60 "unconnected-(U4-SPIIO7{slash}GPIO36{slash}FSPICLK{slash}SUBSPICLK-Pad29)")
-  (net 61 "unconnected-(U4-SPIDQS{slash}GPIO37{slash}FSPIQ{slash}SUBSPIQ-Pad30)")
+  (net 27 "Net-(BZ1-+)")
+  (net 28 "unconnected-(U4-GPIO3{slash}TOUCH3{slash}ADC1_CH2-Pad15)")
+  (net 29 "unconnected-(U4-GPIO46-Pad16)")
+  (net 30 "~{DISP_CS}")
+  (net 31 "GPIO12")
+  (net 32 "GPIO13")
+  (net 33 "GPIO14")
+  (net 34 "unconnected-(J7-GAIN-Pad4)")
+  (net 35 "unconnected-(J7-SD-Pad5)")
+  (net 36 "Net-(D1-K)")
+  (net 37 "Net-(D1-A)")
+  (net 38 "Net-(J2-Pin_1)")
+  (net 39 "Net-(J2-Pin_2)")
+  (net 40 "Net-(J8-OUT+)")
+  (net 41 "Net-(Q1-D)")
+  (net 42 "BUZZER")
+  (net 43 "C")
+  (net 44 "D")
+  (net 45 "GPIO21")
+  (net 46 "GPIO47")
+  (net 47 "GPIO48")
+  (net 48 "unconnected-(U4-GPIO45-Pad26)")
+  (net 49 "unconnected-(U4-SPIIO6{slash}GPIO35{slash}FSPID{slash}SUBSPID-Pad28)")
+  (net 50 "unconnected-(U4-SPIIO7{slash}GPIO36{slash}FSPICLK{slash}SUBSPICLK-Pad29)")
+  (net 51 "unconnected-(U4-SPIDQS{slash}GPIO37{slash}FSPIQ{slash}SUBSPIQ-Pad30)")
 
   (footprint "Buzzer_Beeper:MagneticBuzzer_Kobitone_254-EMB73-RO" (layer "F.Cu")
     (tstamp 0104ac2c-db8b-4cd2-9b08-4c90bdc811a2)
@@ -178,7 +168,7 @@
     (fp_circle (center 1.5 0) (end 4.85 0)
       (stroke (width 0.1) (type solid)) (fill none) (layer "F.Fab") (tstamp 60fefd27-0613-4571-b3b1-c95f3a040813))
     (pad "1" thru_hole rect (at 0 0) (size 2 2) (drill 0.9) (layers "*.Cu" "*.Mask")
-      (net 34 "Net-(BZ1-+)") (pinfunction "+") (pintype "passive") (tstamp 4bb0b550-591e-4840-b0f9-2aad7ecc1a96))
+      (net 27 "Net-(BZ1-+)") (pinfunction "+") (pintype "passive") (tstamp 4bb0b550-591e-4840-b0f9-2aad7ecc1a96))
     (pad "2" thru_hole circle (at 3 0) (size 2 2) (drill 0.9) (layers "*.Cu" "*.Mask")
       (net 3 "GND") (pinfunction "-") (pintype "passive") (tstamp c2d359b4-b281-46ac-8a09-47622f74634b))
     (model "${KICAD7_3DMODEL_DIR}/Buzzer_Beeper.3dshapes/MagneticBuzzer_Kobitone_254-EMB73-RO.wrl"
@@ -262,9 +252,9 @@
     (fp_line (start 10.16 0) (end 7.68 0)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 8196af2a-4705-4dd5-b289-c1fc736b1963))
     (pad "1" thru_hole rect (at 0 0) (size 2.2 2.2) (drill 1.1) (layers "*.Cu" "*.Mask")
-      (net 45 "Net-(D1-K)") (pinfunction "K") (pintype "passive") (tstamp 22f0eaa2-af1e-4a0b-b762-f495b89dec9b))
+      (net 36 "Net-(D1-K)") (pinfunction "K") (pintype "passive") (tstamp 22f0eaa2-af1e-4a0b-b762-f495b89dec9b))
     (pad "2" thru_hole oval (at 10.16 0) (size 2.2 2.2) (drill 1.1) (layers "*.Cu" "*.Mask")
-      (net 46 "Net-(D1-A)") (pinfunction "A") (pintype "passive") (tstamp 4ef80a8e-40a9-4bae-8d74-0be581b9f068))
+      (net 37 "Net-(D1-A)") (pinfunction "A") (pintype "passive") (tstamp 4ef80a8e-40a9-4bae-8d74-0be581b9f068))
     (model "${KICAD6_3DMODEL_DIR}/Diode_THT.3dshapes/D_DO-41_SOD81_P10.16mm_Horizontal.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -312,7 +302,7 @@
     (pad "6" thru_hole circle (at 19.31 1.5 270) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
       (net 14 "DISP_D{slash}C") (pinfunction "D/C") (pintype "input") (tstamp 705e793a-f58d-4dab-98b9-e22923f72c29))
     (pad "7" thru_hole circle (at 21.85 1.5 270) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 39 "~{DISP_CS}") (pinfunction "CS") (pintype "input") (tstamp 368e51de-abf0-4c14-a9b3-fb8a1fe1695a))
+      (net 30 "~{DISP_CS}") (pinfunction "CS") (pintype "input") (tstamp 368e51de-abf0-4c14-a9b3-fb8a1fe1695a))
     (pad "8" thru_hole circle (at 24.39 1.5 270) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
       (net 18 "+3V3") (pinfunction "BLK") (pintype "input") (tstamp 1ad2b142-17de-48c6-a437-6097322ada84))
     (model "${KIPRJMOD}/3dmodels/Display 1.69 ST7789V2.stp"
@@ -373,11 +363,11 @@
     (fp_line (start 0.65 1.45) (end -0.65 1.45)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 605c2a34-ba17-4ccc-967f-af3384b552b5))
     (pad "1" smd roundrect (at -0.9375 -0.95 270) (size 1.475 0.6) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 46 "Net-(D1-A)") (pinfunction "G") (pintype "input") (tstamp a678fd87-a16d-4a62-81db-74bcc50f13bb))
+      (net 37 "Net-(D1-A)") (pinfunction "G") (pintype "input") (tstamp a678fd87-a16d-4a62-81db-74bcc50f13bb))
     (pad "2" smd roundrect (at -0.9375 0.95 270) (size 1.475 0.6) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 45 "Net-(D1-K)") (pinfunction "S") (pintype "passive") (tstamp a9d4ac8e-45ef-4568-9043-d8545ef1fe97))
+      (net 36 "Net-(D1-K)") (pinfunction "S") (pintype "passive") (tstamp a9d4ac8e-45ef-4568-9043-d8545ef1fe97))
     (pad "3" smd roundrect (at 0.9375 0 270) (size 1.475 0.6) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 51 "Net-(Q1-D)") (pinfunction "D") (pintype "passive") (tstamp 1bbac069-0479-4b86-bc91-5d90ada1f52b))
+      (net 41 "Net-(Q1-D)") (pinfunction "D") (pintype "passive") (tstamp 1bbac069-0479-4b86-bc91-5d90ada1f52b))
     (model "${KICAD6_3DMODEL_DIR}/Package_TO_SOT_SMD.3dshapes/SOT-23.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -586,92 +576,84 @@
     )
   )
 
-  (footprint "Connector_PinHeader_2.54mm:PinHeader_2x07_P2.54mm_Vertical" (layer "F.Cu")
+  (footprint "Connector_PinHeader_2.54mm:PinHeader_2x05_P2.54mm_Vertical" (layer "F.Cu")
     (tstamp 529311c6-281d-4286-b47a-f7776b9b98ba)
     (at 87.63 44.45 90)
-    (descr "Through hole straight pin header, 2x07, 2.54mm pitch, double rows")
-    (tags "Through hole pin header THT 2x07 2.54mm double row")
+    (descr "Through hole straight pin header, 2x05, 2.54mm pitch, double rows")
+    (tags "Through hole pin header THT 2x05 2.54mm double row")
     (property "Sheetfile" "main.kicad_sch")
     (property "Sheetname" "")
-    (property "ki_description" "Generic connector, double row, 02x07, 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, double row, 02x05, 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 "/711cee46-470c-4a0a-a6df-1079da36e9fd")
+    (path "/279f74f6-b91b-4de9-b94c-65ba1c582e0c")
     (attr through_hole)
     (fp_text reference "J3" (at 1.27 -2.33 90) (layer "F.SilkS")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 4d79c617-30c7-42f2-9fae-1f474bb9ac46)
+      (tstamp 22b93466-e4a8-4b17-8b56-24473c0b81ec)
     )
-    (fp_text value "Ext" (at 1.27 17.57 90) (layer "F.SilkS")
+    (fp_text value "Ext" (at 1.27 12.49 90) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 9d58a63d-bc15-4564-adf0-ae6b3d1541e1)
+      (tstamp 1df5eb9e-3fe9-479b-8842-aebd67b8d601)
     )
-    (fp_text user "${REFERENCE}" (at 1.27 7.62 180) (layer "F.Fab")
+    (fp_text user "${REFERENCE}" (at 1.27 5.08 180) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 1109fbb6-f34f-45b7-acdf-3b47394fceab)
+      (tstamp 056dd4ab-9e7c-4a13-8373-f248b20a3baf)
     )
     (fp_line (start -1.33 -1.33) (end 0 -1.33)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 46781732-44e0-4ba8-9680-264b6f109d00))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 2de25325-3682-4968-94ab-e646ad2d2bb4))
     (fp_line (start -1.33 0) (end -1.33 -1.33)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 77a16d4e-ad03-4b39-8ccc-bef7c709f44b))
-    (fp_line (start -1.33 1.27) (end -1.33 16.57)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 419a4876-0df9-4959-a7de-d2b772d7f955))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 34c874e9-8517-4c15-99c0-78c412922abb))
+    (fp_line (start -1.33 1.27) (end -1.33 11.49)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 72265b6d-6e6f-4df3-b342-66ff7993d08d))
     (fp_line (start -1.33 1.27) (end 1.27 1.27)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp bb44ef37-96bf-475b-8604-a05abf499f34))
-    (fp_line (start -1.33 16.57) (end 3.87 16.57)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 449098ad-a09f-4285-8690-3d8d734209a0))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 58344293-7937-41db-a0c2-8edc0f5e98b4))
+    (fp_line (start -1.33 11.49) (end 3.87 11.49)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 2d7f8cec-a462-4388-8ccc-613ff900af46))
     (fp_line (start 1.27 -1.33) (end 3.87 -1.33)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 554a83db-e786-4e25-b96d-c5c3de19f8df))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 45d981ea-1725-4527-a26f-c3f60e640344))
     (fp_line (start 1.27 1.27) (end 1.27 -1.33)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 1c81a3db-b48b-430b-941e-6c521cbcb3eb))
-    (fp_line (start 3.87 -1.33) (end 3.87 16.57)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 6577d2a5-df0b-42d8-92dc-f36e8fd3a365))
-    (fp_line (start -1.8 -1.8) (end -1.8 17.05)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 0262aa8b-0b28-4fef-bb27-37e1f0bbb91f))
-    (fp_line (start -1.8 17.05) (end 4.35 17.05)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp ab04f249-10d1-4590-8561-4ecd1d559426))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 6084a34b-061d-4557-bf37-094d84c9e58a))
+    (fp_line (start 3.87 -1.33) (end 3.87 11.49)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 80ce39fc-0ed1-44a1-891b-1e90d6469772))
+    (fp_line (start -1.8 -1.8) (end -1.8 11.95)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 3c020d6d-87f5-4d52-b267-e5fe6c888493))
+    (fp_line (start -1.8 11.95) (end 4.35 11.95)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 41b14464-ab64-4269-81a4-b7e8e01d8993))
     (fp_line (start 4.35 -1.8) (end -1.8 -1.8)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 4c3c798b-5088-4ce5-8256-c40b72ae4225))
-    (fp_line (start 4.35 17.05) (end 4.35 -1.8)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 853d3416-3c87-4e7a-972c-3e94a3c93158))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp da23a508-e387-4415-8739-618e64b653fd))
+    (fp_line (start 4.35 11.95) (end 4.35 -1.8)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp a099df93-0aa4-4c51-ac14-d632ff212b46))
     (fp_line (start -1.27 0) (end 0 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp bbceaf7b-a44f-402a-a261-30339106865b))
-    (fp_line (start -1.27 16.51) (end -1.27 0)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 2b45af0f-43c8-48cf-8fed-9390e48254c5))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 021c3e3c-d85c-4f05-85e5-1ce1c9523a56))
+    (fp_line (start -1.27 11.43) (end -1.27 0)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp caa22f66-457c-497e-8805-124997913278))
     (fp_line (start 0 -1.27) (end 3.81 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 3a534535-ab99-47f0-95f8-5a3488e85cd2))
-    (fp_line (start 3.81 -1.27) (end 3.81 16.51)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 3784e11a-4bad-4c4a-bff4-ab0a65ccd628))
-    (fp_line (start 3.81 16.51) (end -1.27 16.51)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp b244e6fd-7005-4c09-b9d5-a750d7e430ad))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp a16fb4f8-27d1-4ca6-81df-ad0e9bfbede7))
+    (fp_line (start 3.81 -1.27) (end 3.81 11.43)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp c6b30478-2510-4e00-a807-2d3217788f5f))
+    (fp_line (start 3.81 11.43) (end -1.27 11.43)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 89eeb367-69b9-45f2-9101-01eed7e9ae46))
     (pad "1" thru_hole rect (at 0 0 90) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 3 "GND") (pinfunction "Pin_1") (pintype "passive") (tstamp 7f8f1903-2182-4195-8b2e-50ae82bff8ee))
+      (net 3 "GND") (pinfunction "Pin_1") (pintype "passive") (tstamp c4853695-64e6-4be9-8735-08e4afe01c76))
     (pad "2" thru_hole oval (at 2.54 0 90) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 18 "+3V3") (pinfunction "Pin_2") (pintype "passive") (tstamp 5862e750-16eb-40b9-9cd0-5a3e7aa3f990))
+      (net 18 "+3V3") (pinfunction "Pin_2") (pintype "passive") (tstamp b0801f44-5f42-4f43-bd6d-fb09f8df7a66))
     (pad "3" thru_hole oval (at 0 2.54 90) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 27 "unconnected-(J3-Pin_3-Pad3)") (pinfunction "Pin_3") (pintype "passive+no_connect") (tstamp a4ba4cac-2781-4939-910b-bdc9e05446fc))
+      (net 47 "GPIO48") (pinfunction "Pin_3") (pintype "passive") (tstamp be8b70b6-d255-4842-98cc-f5905b038ab5))
     (pad "4" thru_hole oval (at 2.54 2.54 90) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 28 "unconnected-(J3-Pin_4-Pad4)") (pinfunction "Pin_4") (pintype "passive+no_connect") (tstamp aa2415aa-aeaa-4d5d-9259-88a94e23f9b7))
+      (net 46 "GPIO47") (pinfunction "Pin_4") (pintype "passive") (tstamp 3d7ed373-c1db-4587-9455-b61daa4cbac2))
     (pad "5" thru_hole oval (at 0 5.08 90) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 29 "unconnected-(J3-Pin_5-Pad5)") (pinfunction "Pin_5") (pintype "passive+no_connect") (tstamp 25fa991c-fc63-4837-b020-4261092dea64))
+      (net 45 "GPIO21") (pinfunction "Pin_5") (pintype "passive") (tstamp c381a3c0-f870-457a-887f-f7213c058b26))
     (pad "6" thru_hole oval (at 2.54 5.08 90) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 30 "unconnected-(J3-Pin_6-Pad6)") (pinfunction "Pin_6") (pintype "passive+no_connect") (tstamp bb99442b-892c-4dbd-aa0e-af072b73c70a))
+      (net 33 "GPIO14") (pinfunction "Pin_6") (pintype "passive") (tstamp 0231e259-f7e3-4a0d-bd34-817ea410e47c))
     (pad "7" thru_hole oval (at 0 7.62 90) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 31 "unconnected-(J3-Pin_7-Pad7)") (pinfunction "Pin_7") (pintype "passive+no_connect") (tstamp f4360d6c-7874-44a4-b477-281f475402bc))
+      (net 32 "GPIO13") (pinfunction "Pin_7") (pintype "passive") (tstamp 082d21de-049d-416d-8d11-97f10914c0e8))
     (pad "8" thru_hole oval (at 2.54 7.62 90) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 32 "unconnected-(J3-Pin_8-Pad8)") (pinfunction "Pin_8") (pintype "passive+no_connect") (tstamp f54b2027-07d2-401a-af08-45b0058af379))
+      (net 31 "GPIO12") (pinfunction "Pin_8") (pintype "passive") (tstamp 9dd980a2-d7d5-408e-8aae-b6428e709bd1))
     (pad "9" thru_hole oval (at 0 10.16 90) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 33 "unconnected-(J3-Pin_9-Pad9)") (pinfunction "Pin_9") (pintype "passive+no_connect") (tstamp 72a6720a-f7ff-409c-b5a3-95df195ddcb8))
+      (net 18 "+3V3") (pinfunction "Pin_9") (pintype "passive") (tstamp cc5af79c-80f9-435a-9ab4-d430cd6ff9d1))
     (pad "10" thru_hole oval (at 2.54 10.16 90) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 35 "unconnected-(J3-Pin_10-Pad10)") (pinfunction "Pin_10") (pintype "passive+no_connect") (tstamp c31803a0-3178-4f75-aab7-8b07e98693ac))
-    (pad "11" thru_hole oval (at 0 12.7 90) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 36 "unconnected-(J3-Pin_11-Pad11)") (pinfunction "Pin_11") (pintype "passive+no_connect") (tstamp e5cac089-64bf-4989-96f7-548de0b3b981))
-    (pad "12" thru_hole oval (at 2.54 12.7 90) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 49 "unconnected-(J3-Pin_12-Pad12)") (pinfunction "Pin_12") (pintype "passive+no_connect") (tstamp 5131d86f-511c-4f5e-b0cb-1b81df408545))
-    (pad "13" thru_hole oval (at 0 15.24 90) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 18 "+3V3") (pinfunction "Pin_13") (pintype "passive") (tstamp ffe0785d-638c-4a0b-ba94-d2718d07c696))
-    (pad "14" thru_hole oval (at 2.54 15.24 90) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 3 "GND") (pinfunction "Pin_14") (pintype "passive") (tstamp 38bcdbf7-9fd2-4208-9f5f-b67572d8f530))
-    (model "${KICAD6_3DMODEL_DIR}/Connector_PinHeader_2.54mm.3dshapes/PinHeader_2x07_P2.54mm_Vertical.wrl"
+      (net 3 "GND") (pinfunction "Pin_10") (pintype "passive") (tstamp 19feae75-b9d3-4140-a74c-e8f87d57e890))
+    (model "${KICAD6_3DMODEL_DIR}/Connector_PinHeader_2.54mm.3dshapes/PinHeader_2x05_P2.54mm_Vertical.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
       (rotate (xyz 0 0 0))
@@ -844,9 +826,9 @@
     (fp_line (start 1.27 3.81) (end -1.27 3.81)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 57388847-7cff-440f-83d3-ee861d72f38a))
     (pad "1" thru_hole rect (at 0 0 180) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 47 "Net-(J2-Pin_1)") (pinfunction "Pin_1") (pintype "passive") (tstamp 50731a24-533d-4418-8a2e-6e75491f44f8))
+      (net 38 "Net-(J2-Pin_1)") (pinfunction "Pin_1") (pintype "passive") (tstamp 50731a24-533d-4418-8a2e-6e75491f44f8))
     (pad "2" thru_hole oval (at 0 2.54 180) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 48 "Net-(J2-Pin_2)") (pinfunction "Pin_2") (pintype "passive") (tstamp 776dc0ce-ed30-45e1-b0ff-ea2137bb7eba))
+      (net 39 "Net-(J2-Pin_2)") (pinfunction "Pin_2") (pintype "passive") (tstamp 776dc0ce-ed30-45e1-b0ff-ea2137bb7eba))
     (model "${KICAD6_3DMODEL_DIR}/Connector_PinSocket_2.54mm.3dshapes/PinSocket_1x02_P2.54mm_Vertical.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -938,7 +920,7 @@
     (pad "2" smd rect (at -3.15 0) (size 2 1.5) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 18 "+3V3") (pinfunction "VO") (pintype "power_out") (tstamp 906182a2-b957-49b9-9b51-340543a41a96))
     (pad "3" smd rect (at -3.15 2.3) (size 2 1.5) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 45 "Net-(D1-K)") (pinfunction "VI") (pintype "power_in") (tstamp 23bac1b0-b604-4a95-acfb-29faccdf0a57))
+      (net 36 "Net-(D1-K)") (pinfunction "VI") (pintype "power_in") (tstamp 23bac1b0-b604-4a95-acfb-29faccdf0a57))
     (pad "4" smd rect (at 3.15 0) (size 2 3.8) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp ac3f4634-94ac-44ea-990f-1fe90117494a))
     (model "${KICAD6_3DMODEL_DIR}/Package_TO_SOT_SMD.3dshapes/SOT-223.wrl"
       (offset (xyz 0 0 0))
@@ -1005,7 +987,7 @@
     (pad "1" thru_hole circle (at 0 0 90) (size 1.4 1.4) (drill 0.7) (layers "*.Cu" "*.Mask")
       (net 3 "GND") (pintype "passive") (tstamp b2aed2de-7e42-49da-ba4e-7e95b1c9ac9c))
     (pad "2" thru_hole oval (at 7.62 0 90) (size 1.4 1.4) (drill 0.7) (layers "*.Cu" "*.Mask")
-      (net 46 "Net-(D1-A)") (pintype "passive") (tstamp 500be605-98f2-4814-a5b6-67e6b3a95f04))
+      (net 37 "Net-(D1-A)") (pintype "passive") (tstamp 500be605-98f2-4814-a5b6-67e6b3a95f04))
     (model "${KICAD6_3DMODEL_DIR}/Resistor_THT.3dshapes/R_Axial_DIN0204_L3.6mm_D1.6mm_P7.62mm_Horizontal.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1067,7 +1049,7 @@
     (pad "1" thru_hole oval (at 0 0 315) (size 3.048 1.85) (drill 1.3) (layers "*.Cu" "*.Mask")
       (net 3 "GND") (pinfunction "1") (pintype "passive") (tstamp d1a01e2c-5c9c-467b-bc3b-7a92aec4d4e6))
     (pad "2" thru_hole oval (at 0 5 315) (size 3.048 1.85) (drill 1.3) (layers "*.Cu" "*.Mask")
-      (net 53 "C") (pinfunction "2") (pintype "passive") (tstamp 87572c3b-8dd2-401f-91b3-3687bba9b358))
+      (net 43 "C") (pinfunction "2") (pintype "passive") (tstamp 87572c3b-8dd2-401f-91b3-3687bba9b358))
     (model "${KICAD6_3DMODEL_DIR}/Button_Switch_THT.3dshapes/SW_PUSH-12mm.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1233,11 +1215,11 @@
     (pad "1" thru_hole rect (at 0 0) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
       (net 20 "VBUS") (pinfunction "A") (pintype "passive") (tstamp c0fc3379-a9b8-41de-a426-97d7f02da1c9))
     (pad "2" thru_hole circle (at 2.5 0) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 46 "Net-(D1-A)") (pinfunction "B") (pintype "passive") (tstamp b1203564-67bb-4963-8c65-5b9afebdec5d))
+      (net 37 "Net-(D1-A)") (pinfunction "B") (pintype "passive") (tstamp b1203564-67bb-4963-8c65-5b9afebdec5d))
     (pad "3" thru_hole circle (at 5 0) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 50 "Net-(J8-OUT+)") (pinfunction "A") (pintype "passive") (tstamp f609bf03-9b10-459a-a2cd-16166793bf68))
+      (net 40 "Net-(J8-OUT+)") (pinfunction "A") (pintype "passive") (tstamp f609bf03-9b10-459a-a2cd-16166793bf68))
     (pad "4" thru_hole circle (at 0 3.2) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 51 "Net-(Q1-D)") (pinfunction "B") (pintype "passive") (tstamp b0dea9cf-d729-449b-918e-693593133509))
+      (net 41 "Net-(Q1-D)") (pinfunction "B") (pintype "passive") (tstamp b0dea9cf-d729-449b-918e-693593133509))
     (pad "5" thru_hole circle (at 2.5 3.2) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask") (tstamp 85bcac94-272d-4599-95d7-51957b5b5a2c))
     (pad "6" thru_hole circle (at 5 3.2) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask") (tstamp dd467671-ed26-44bb-adbe-a1fb9419be67))
     (model "${KICAD7_3DMODEL_DIR}/Button_Switch_THT.3dshapes/SW_E-Switch_EG1271_SPDT.wrl"
@@ -1361,7 +1343,7 @@
     (fp_line (start 4.65 0.95) (end 4.65 -0.95)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp fab344a7-49e9-438c-a3ab-162b94245c90))
     (pad "1" thru_hole circle (at 0 0 90) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 45 "Net-(D1-K)") (pintype "passive") (tstamp 9463b5fb-cdd9-4d2e-891c-98c6c1e1d277))
+      (net 36 "Net-(D1-K)") (pintype "passive") (tstamp 9463b5fb-cdd9-4d2e-891c-98c6c1e1d277))
     (pad "2" thru_hole circle (at 5 0 90) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
       (net 3 "GND") (pintype "passive") (tstamp e2acef98-e469-4003-85ff-68b0028e13fc))
     (model "${KICAD6_3DMODEL_DIR}/Capacitor_THT.3dshapes/C_Disc_D4.3mm_W1.9mm_P5.00mm.wrl"
@@ -1515,13 +1497,13 @@
     (pad "2" thru_hole rect (at 1.5 15.6 180) (size 1.7 1.5) (drill 1) (layers "*.Cu" "*.Mask")
       (net 3 "GND") (pinfunction "IN-") (pintype "power_in") (tstamp b8658bb3-986e-4335-a4c9-b15f00062f08))
     (pad "3" thru_hole rect (at 24.5 1.6 180) (size 1.7 1.5) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 50 "Net-(J8-OUT+)") (pinfunction "OUT+") (pintype "power_out") (tstamp c9d6f008-b909-4313-a522-4742ef6c32bb))
+      (net 40 "Net-(J8-OUT+)") (pinfunction "OUT+") (pintype "power_out") (tstamp c9d6f008-b909-4313-a522-4742ef6c32bb))
     (pad "4" thru_hole rect (at 24.5 15.6 180) (size 1.7 1.5) (drill 1) (layers "*.Cu" "*.Mask")
       (net 3 "GND") (pinfunction "OUT-") (pintype "power_out") (tstamp c328f709-9216-41fd-934b-4e593c8aa6cf))
     (pad "5" thru_hole rect (at 24.5 4.89 180) (size 1.7 3) (drill oval 1 2) (layers "*.Cu" "*.Mask")
-      (net 47 "Net-(J2-Pin_1)") (pinfunction "BAT+") (pintype "passive") (tstamp 8e77b3c3-c2c8-47db-8c9d-28b46a271c0f))
+      (net 38 "Net-(J2-Pin_1)") (pinfunction "BAT+") (pintype "passive") (tstamp 8e77b3c3-c2c8-47db-8c9d-28b46a271c0f))
     (pad "6" thru_hole rect (at 24.5 12.31 180) (size 1.7 3) (drill oval 1 2) (layers "*.Cu" "*.Mask")
-      (net 48 "Net-(J2-Pin_2)") (pinfunction "BAT-") (pintype "passive") (tstamp 42ef7f1e-7212-4e0e-8d42-bfe148e5328c))
+      (net 39 "Net-(J2-Pin_2)") (pinfunction "BAT-") (pintype "passive") (tstamp 42ef7f1e-7212-4e0e-8d42-bfe148e5328c))
     (model "${KIPRJMOD}/3dmodels/tp4056_pcb_asm.stp"
       (offset (xyz 14 -8.5 1.5))
       (scale (xyz 1 1 1))
@@ -2096,7 +2078,7 @@
     (pad "4" smd rect (at -8.75 -4.45 180) (size 1.5 0.9) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 12 "START") (pinfunction "GPIO4/TOUCH4/ADC1_CH3") (pintype "bidirectional") (tstamp e2cf17f0-277f-4403-8fc9-b020f4dbcaf5))
     (pad "5" smd rect (at -8.75 -3.18 180) (size 1.5 0.9) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 39 "~{DISP_CS}") (pinfunction "GPIO5/TOUCH5/ADC1_CH4") (pintype "bidirectional") (tstamp 6ffb278f-fce9-4cc0-adf5-d38d07b96713))
+      (net 30 "~{DISP_CS}") (pinfunction "GPIO5/TOUCH5/ADC1_CH4") (pintype "bidirectional") (tstamp 6ffb278f-fce9-4cc0-adf5-d38d07b96713))
     (pad "6" smd rect (at -8.75 -1.91 180) (size 1.5 0.9) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 14 "DISP_D{slash}C") (pinfunction "GPIO6/TOUCH6/ADC1_CH5") (pintype "bidirectional") (tstamp cc118594-befe-470a-a371-07d1644161ae))
     (pad "7" smd rect (at -8.75 -0.64 180) (size 1.5 0.9) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -2116,37 +2098,37 @@
     (pad "14" smd rect (at -8.75 8.25 180) (size 1.5 0.9) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 6 "USB+") (pinfunction "GPIO20/U1CTS/ADC2_CH9/CLK_OUT1") (pintype "bidirectional") (tstamp b1682f3c-8362-4920-a062-f10ba5478ffa))
     (pad "15" smd rect (at -6.985 9.5 270) (size 1.5 0.9) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 37 "unconnected-(U4-GPIO3{slash}TOUCH3{slash}ADC1_CH2-Pad15)") (pinfunction "GPIO3/TOUCH3/ADC1_CH2") (pintype "bidirectional+no_connect") (tstamp ad2ee121-7a65-47c7-9b14-5efbb98c3365))
+      (net 28 "unconnected-(U4-GPIO3{slash}TOUCH3{slash}ADC1_CH2-Pad15)") (pinfunction "GPIO3/TOUCH3/ADC1_CH2") (pintype "bidirectional+no_connect") (tstamp ad2ee121-7a65-47c7-9b14-5efbb98c3365))
     (pad "16" smd rect (at -5.715 9.5 270) (size 1.5 0.9) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 38 "unconnected-(U4-GPIO46-Pad16)") (pinfunction "GPIO46") (pintype "bidirectional+no_connect") (tstamp 3ebdc9b6-3591-41f1-b030-fa20ad637ba7))
+      (net 29 "unconnected-(U4-GPIO46-Pad16)") (pinfunction "GPIO46") (pintype "bidirectional+no_connect") (tstamp 3ebdc9b6-3591-41f1-b030-fa20ad637ba7))
     (pad "17" smd rect (at -4.445 9.5 270) (size 1.5 0.9) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 53 "C") (pinfunction "GPIO9/TOUCH9/ADC1_CH8/FSPIHD/SUBSPIHD") (pintype "bidirectional") (tstamp c7fc5a92-d1d8-4ebe-b496-9380b186296b))
+      (net 43 "C") (pinfunction "GPIO9/TOUCH9/ADC1_CH8/FSPIHD/SUBSPIHD") (pintype "bidirectional") (tstamp c7fc5a92-d1d8-4ebe-b496-9380b186296b))
     (pad "18" smd rect (at -3.175 9.5 270) (size 1.5 0.9) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 54 "D") (pinfunction "GPIO10/TOUCH10/ADC1_CH9/FSPICS0/FSPIIO4/SUBSPICS0") (pintype "bidirectional") (tstamp e3f1b2bb-d743-46cb-bccd-7a095cc6101d))
+      (net 44 "D") (pinfunction "GPIO10/TOUCH10/ADC1_CH9/FSPICS0/FSPIIO4/SUBSPICS0") (pintype "bidirectional") (tstamp e3f1b2bb-d743-46cb-bccd-7a095cc6101d))
     (pad "19" smd rect (at -1.905 9.5 270) (size 1.5 0.9) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 52 "BUZZER") (pinfunction "GPIO11/TOUCH11/ADC2_CH0/FSPID/FSPIIO5/SUBSPID") (pintype "bidirectional") (tstamp dbfddc84-c819-4824-90ad-6fd4d718c0f4))
+      (net 42 "BUZZER") (pinfunction "GPIO11/TOUCH11/ADC2_CH0/FSPID/FSPIIO5/SUBSPID") (pintype "bidirectional") (tstamp dbfddc84-c819-4824-90ad-6fd4d718c0f4))
     (pad "20" smd rect (at -0.635 9.5 270) (size 1.5 0.9) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 40 "unconnected-(U4-GPIO12{slash}TOUCH12{slash}ADC2_CH1{slash}FSPICLK{slash}FSPIIO6{slash}SUBSPICLK-Pad20)") (pinfunction "GPIO12/TOUCH12/ADC2_CH1/FSPICLK/FSPIIO6/SUBSPICLK") (pintype "bidirectional+no_connect") (tstamp 5930b60c-3dc5-4fe4-a53b-bc3c1efe1f05))
+      (net 31 "GPIO12") (pinfunction "GPIO12/TOUCH12/ADC2_CH1/FSPICLK/FSPIIO6/SUBSPICLK") (pintype "bidirectional") (tstamp 5930b60c-3dc5-4fe4-a53b-bc3c1efe1f05))
     (pad "21" smd rect (at 0.635 9.5 270) (size 1.5 0.9) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 41 "unconnected-(U4-GPIO13{slash}TOUCH13{slash}ADC2_CH2{slash}FSPIQ{slash}FSPIIO7{slash}SUBSPIQ-Pad21)") (pinfunction "GPIO13/TOUCH13/ADC2_CH2/FSPIQ/FSPIIO7/SUBSPIQ") (pintype "bidirectional+no_connect") (tstamp e57ce07b-6f09-4451-ad30-2f9d0663bb98))
+      (net 32 "GPIO13") (pinfunction "GPIO13/TOUCH13/ADC2_CH2/FSPIQ/FSPIIO7/SUBSPIQ") (pintype "bidirectional") (tstamp e57ce07b-6f09-4451-ad30-2f9d0663bb98))
     (pad "22" smd rect (at 1.905 9.5 270) (size 1.5 0.9) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 42 "unconnected-(U4-GPIO14{slash}TOUCH14{slash}ADC2_CH3{slash}FSPIWP{slash}FSPIDQS{slash}SUBSPIWP-Pad22)") (pinfunction "GPIO14/TOUCH14/ADC2_CH3/FSPIWP/FSPIDQS/SUBSPIWP") (pintype "bidirectional+no_connect") (tstamp 20ec954e-537f-4ce2-aeee-8a4986921999))
+      (net 33 "GPIO14") (pinfunction "GPIO14/TOUCH14/ADC2_CH3/FSPIWP/FSPIDQS/SUBSPIWP") (pintype "bidirectional") (tstamp 20ec954e-537f-4ce2-aeee-8a4986921999))
     (pad "23" smd rect (at 3.175 9.5 270) (size 1.5 0.9) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 55 "unconnected-(U4-GPIO21-Pad23)") (pinfunction "GPIO21") (pintype "bidirectional+no_connect") (tstamp 9fec5d69-e23e-4a18-b5a8-b73374512271))
+      (net 45 "GPIO21") (pinfunction "GPIO21") (pintype "bidirectional") (tstamp 9fec5d69-e23e-4a18-b5a8-b73374512271))
     (pad "24" smd rect (at 4.445 9.5 270) (size 1.5 0.9) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 56 "unconnected-(U4-GPIO47{slash}SPICLK_P{slash}SUBSPICLK_P_DIFF-Pad24)") (pinfunction "GPIO47/SPICLK_P/SUBSPICLK_P_DIFF") (pintype "bidirectional+no_connect") (tstamp aa36db66-7883-4514-812e-835878d3fe66))
+      (net 46 "GPIO47") (pinfunction "GPIO47/SPICLK_P/SUBSPICLK_P_DIFF") (pintype "bidirectional") (tstamp aa36db66-7883-4514-812e-835878d3fe66))
     (pad "25" smd rect (at 5.715 9.5 270) (size 1.5 0.9) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 57 "unconnected-(U4-GPIO48{slash}SPICLK_N{slash}SUBSPICLK_N_DIFF-Pad25)") (pinfunction "GPIO48/SPICLK_N/SUBSPICLK_N_DIFF") (pintype "bidirectional+no_connect") (tstamp ca3dc928-5014-47a4-b57e-64bc53f446f1))
+      (net 47 "GPIO48") (pinfunction "GPIO48/SPICLK_N/SUBSPICLK_N_DIFF") (pintype "bidirectional") (tstamp ca3dc928-5014-47a4-b57e-64bc53f446f1))
     (pad "26" smd rect (at 6.985 9.5 270) (size 1.5 0.9) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 58 "unconnected-(U4-GPIO45-Pad26)") (pinfunction "GPIO45") (pintype "bidirectional+no_connect") (tstamp decc33df-f20d-4118-aea3-b633dd79648f))
+      (net 48 "unconnected-(U4-GPIO45-Pad26)") (pinfunction "GPIO45") (pintype "bidirectional+no_connect") (tstamp decc33df-f20d-4118-aea3-b633dd79648f))
     (pad "27" smd rect (at 8.75 8.25) (size 1.5 0.9) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 11 "SELECT") (pinfunction "GPIO0/BOOT") (pintype "bidirectional") (tstamp bbf02e13-573d-4f7a-a92b-7d15ca97ecce))
     (pad "28" smd rect (at 8.75 6.98) (size 1.5 0.9) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 59 "unconnected-(U4-SPIIO6{slash}GPIO35{slash}FSPID{slash}SUBSPID-Pad28)") (pinfunction "SPIIO6/GPIO35/FSPID/SUBSPID") (pintype "no_connect") (tstamp 7530c817-7e5c-4359-b279-26c52eb9b726))
+      (net 49 "unconnected-(U4-SPIIO6{slash}GPIO35{slash}FSPID{slash}SUBSPID-Pad28)") (pinfunction "SPIIO6/GPIO35/FSPID/SUBSPID") (pintype "no_connect") (tstamp 7530c817-7e5c-4359-b279-26c52eb9b726))
     (pad "29" smd rect (at 8.75 5.71) (size 1.5 0.9) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 60 "unconnected-(U4-SPIIO7{slash}GPIO36{slash}FSPICLK{slash}SUBSPICLK-Pad29)") (pinfunction "SPIIO7/GPIO36/FSPICLK/SUBSPICLK") (pintype "no_connect") (tstamp b4f9482b-1409-4123-b445-81a5d8c9d2db))
+      (net 50 "unconnected-(U4-SPIIO7{slash}GPIO36{slash}FSPICLK{slash}SUBSPICLK-Pad29)") (pinfunction "SPIIO7/GPIO36/FSPICLK/SUBSPICLK") (pintype "no_connect") (tstamp b4f9482b-1409-4123-b445-81a5d8c9d2db))
     (pad "30" smd rect (at 8.75 4.44) (size 1.5 0.9) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 61 "unconnected-(U4-SPIDQS{slash}GPIO37{slash}FSPIQ{slash}SUBSPIQ-Pad30)") (pinfunction "SPIDQS/GPIO37/FSPIQ/SUBSPIQ") (pintype "no_connect") (tstamp a9241e55-f622-43a8-9b59-406e3df12905))
+      (net 51 "unconnected-(U4-SPIDQS{slash}GPIO37{slash}FSPIQ{slash}SUBSPIQ-Pad30)") (pinfunction "SPIDQS/GPIO37/FSPIQ/SUBSPIQ") (pintype "no_connect") (tstamp a9241e55-f622-43a8-9b59-406e3df12905))
     (pad "31" smd rect (at 8.75 3.17) (size 1.5 0.9) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "UP") (pinfunction "GPIO38/FSPIWP/SUBSPIWP") (pintype "bidirectional") (tstamp faae1858-85fc-4248-838f-6e0efd43e8c1))
     (pad "32" smd rect (at 8.75 1.9) (size 1.5 0.9) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -2231,11 +2213,11 @@
     (fp_arc (start 1.19 -2.48) (mid 3.437211 -1.049019) (end 3.091103 1.592547)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 86d707d7-4230-450a-a71d-4081ef29aa6a))
     (pad "1" thru_hole rect (at 0 0) (size 1.05 1.5) (drill 0.75) (layers "*.Cu" "*.Mask")
-      (net 45 "Net-(D1-K)") (pinfunction "S") (pintype "passive") (tstamp a67183c1-d2b8-47ac-872c-ccadd6fd666f))
+      (net 36 "Net-(D1-K)") (pinfunction "S") (pintype "passive") (tstamp a67183c1-d2b8-47ac-872c-ccadd6fd666f))
     (pad "2" thru_hole oval (at 1.27 0) (size 1.05 1.5) (drill 0.75) (layers "*.Cu" "*.Mask")
-      (net 46 "Net-(D1-A)") (pinfunction "G") (pintype "input") (tstamp 92f4c2de-9622-4370-9026-b69466cc1978))
+      (net 37 "Net-(D1-A)") (pinfunction "G") (pintype "input") (tstamp 92f4c2de-9622-4370-9026-b69466cc1978))
     (pad "3" thru_hole oval (at 2.54 0) (size 1.05 1.5) (drill 0.75) (layers "*.Cu" "*.Mask")
-      (net 51 "Net-(Q1-D)") (pinfunction "D") (pintype "passive") (tstamp 9342fd15-4422-41af-9836-bc691c80ff9e))
+      (net 41 "Net-(Q1-D)") (pinfunction "D") (pintype "passive") (tstamp 9342fd15-4422-41af-9836-bc691c80ff9e))
     (model "${KICAD6_3DMODEL_DIR}/Package_TO_SOT_THT.3dshapes/TO-92L_Inline.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2366,9 +2348,9 @@
     (fp_line (start 7.62 0) (end 5.61 0)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp f56def97-30ca-494c-842e-e1b4a6b07574))
     (pad "1" thru_hole circle (at 0 0 180) (size 1.4 1.4) (drill 0.7) (layers "*.Cu" "*.Mask")
-      (net 34 "Net-(BZ1-+)") (pintype "passive") (tstamp 8019b86c-b61a-4742-b83b-81c44a8ec85c))
+      (net 27 "Net-(BZ1-+)") (pintype "passive") (tstamp 8019b86c-b61a-4742-b83b-81c44a8ec85c))
     (pad "2" thru_hole oval (at 7.62 0 180) (size 1.4 1.4) (drill 0.7) (layers "*.Cu" "*.Mask")
-      (net 52 "BUZZER") (pintype "passive") (tstamp 8cf3a82d-c1e9-4db3-b8e2-37a3d13f630a))
+      (net 42 "BUZZER") (pintype "passive") (tstamp 8cf3a82d-c1e9-4db3-b8e2-37a3d13f630a))
     (model "${KICAD6_3DMODEL_DIR}/Resistor_THT.3dshapes/R_Axial_DIN0204_L3.6mm_D1.6mm_P7.62mm_Horizontal.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2496,7 +2478,7 @@
     (pad "1" thru_hole oval (at 0 0 45) (size 3.048 1.85) (drill 1.3) (layers "*.Cu" "*.Mask")
       (net 3 "GND") (pinfunction "1") (pintype "passive") (tstamp 3a018fb3-35db-4f4b-8a9a-88c61b5c7a1a))
     (pad "2" thru_hole oval (at 0 5 45) (size 3.048 1.85) (drill 1.3) (layers "*.Cu" "*.Mask")
-      (net 54 "D") (pinfunction "2") (pintype "passive") (tstamp 7b5c1712-3da0-43ec-98fd-9feac2e3d6f5))
+      (net 44 "D") (pinfunction "2") (pintype "passive") (tstamp 7b5c1712-3da0-43ec-98fd-9feac2e3d6f5))
     (model "${KICAD6_3DMODEL_DIR}/Button_Switch_THT.3dshapes/SW_PUSH-12mm.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2569,9 +2551,9 @@
     (pad "3" thru_hole circle (at -7.62 1.905 180) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
       (net 25 "DIN") (pinfunction "DIN") (pintype "input") (tstamp 0bbc51fc-5bd5-440b-ab1f-52a0ec83dfb5))
     (pad "4" thru_hole circle (at -7.62 -0.635 180) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 43 "unconnected-(J7-GAIN-Pad4)") (pinfunction "GAIN") (pintype "input+no_connect") (tstamp d778c619-a9f1-451f-ab8d-6f713fc02866))
+      (net 34 "unconnected-(J7-GAIN-Pad4)") (pinfunction "GAIN") (pintype "input+no_connect") (tstamp d778c619-a9f1-451f-ab8d-6f713fc02866))
     (pad "5" thru_hole circle (at -7.62 -3.175 180) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 44 "unconnected-(J7-SD-Pad5)") (pinfunction "SD") (pintype "input+no_connect") (tstamp a623bd85-006b-4d78-94d2-2f37236e2bae))
+      (net 35 "unconnected-(J7-SD-Pad5)") (pinfunction "SD") (pintype "input+no_connect") (tstamp a623bd85-006b-4d78-94d2-2f37236e2bae))
     (pad "6" thru_hole circle (at -7.62 -5.715 180) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
       (net 3 "GND") (pinfunction "GND") (pintype "power_in") (tstamp a186dba0-edc9-4b9b-84e8-8ea0f84a52c6))
     (pad "7" thru_hole circle (at -7.62 -8.255 180) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
diff --git a/kicad-v2/main.kicad_sch b/kicad-v2/main.kicad_sch
index 9ee3ef60..6a141e36 100644
--- a/kicad-v2/main.kicad_sch
+++ b/kicad-v2/main.kicad_sch
@@ -111,11 +111,11 @@
         )
       )
     )
-    (symbol "Connector_Generic:Conn_02x07_Odd_Even" (pin_names (offset 1.016) hide) (in_bom yes) (on_board yes)
-      (property "Reference" "J" (at 1.27 10.16 0)
+    (symbol "Connector_Generic:Conn_02x05_Odd_Even" (pin_names (offset 1.016) hide) (in_bom yes) (on_board yes)
+      (property "Reference" "J" (at 1.27 7.62 0)
         (effects (font (size 1.27 1.27)))
       )
-      (property "Value" "Conn_02x07_Odd_Even" (at 1.27 -10.16 0)
+      (property "Value" "Conn_02x05_Odd_Even" (at 1.27 -7.62 0)
         (effects (font (size 1.27 1.27)))
       )
       (property "Footprint" "" (at 0 0 0)
@@ -127,17 +127,13 @@
       (property "ki_keywords" "connector" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_description" "Generic connector, double row, 02x07, 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)
+      (property "ki_description" "Generic connector, double row, 02x05, 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_02x07_Odd_Even_1_1"
-        (rectangle (start -1.27 -7.493) (end 0 -7.747)
-          (stroke (width 0.1524) (type default))
-          (fill (type none))
-        )
+      (symbol "Conn_02x05_Odd_Even_1_1"
         (rectangle (start -1.27 -4.953) (end 0 -5.207)
           (stroke (width 0.1524) (type default))
           (fill (type none))
@@ -158,18 +154,10 @@
           (stroke (width 0.1524) (type default))
           (fill (type none))
         )
-        (rectangle (start -1.27 7.747) (end 0 7.493)
-          (stroke (width 0.1524) (type default))
-          (fill (type none))
-        )
-        (rectangle (start -1.27 8.89) (end 3.81 -8.89)
+        (rectangle (start -1.27 6.35) (end 3.81 -6.35)
           (stroke (width 0.254) (type default))
           (fill (type background))
         )
-        (rectangle (start 3.81 -7.493) (end 2.54 -7.747)
-          (stroke (width 0.1524) (type default))
-          (fill (type none))
-        )
         (rectangle (start 3.81 -4.953) (end 2.54 -5.207)
           (stroke (width 0.1524) (type default))
           (fill (type none))
@@ -190,63 +178,43 @@
           (stroke (width 0.1524) (type default))
           (fill (type none))
         )
-        (rectangle (start 3.81 7.747) (end 2.54 7.493)
-          (stroke (width 0.1524) (type default))
-          (fill (type none))
-        )
-        (pin passive line (at -5.08 7.62 0) (length 3.81)
+        (pin passive line (at -5.08 5.08 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 -2.54 180) (length 3.81)
+        (pin passive line (at 7.62 -5.08 180) (length 3.81)
           (name "Pin_10" (effects (font (size 1.27 1.27))))
           (number "10" (effects (font (size 1.27 1.27))))
         )
-        (pin passive line (at -5.08 -5.08 0) (length 3.81)
-          (name "Pin_11" (effects (font (size 1.27 1.27))))
-          (number "11" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at 7.62 -5.08 180) (length 3.81)
-          (name "Pin_12" (effects (font (size 1.27 1.27))))
-          (number "12" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at -5.08 -7.62 0) (length 3.81)
-          (name "Pin_13" (effects (font (size 1.27 1.27))))
-          (number "13" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at 7.62 -7.62 180) (length 3.81)
-          (name "Pin_14" (effects (font (size 1.27 1.27))))
-          (number "14" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at 7.62 7.62 180) (length 3.81)
+        (pin passive line (at 7.62 5.08 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 5.08 0) (length 3.81)
+        (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 5.08 180) (length 3.81)
+        (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))))
         )
-        (pin passive line (at -5.08 2.54 0) (length 3.81)
+        (pin passive line (at -5.08 0 0) (length 3.81)
           (name "Pin_5" (effects (font (size 1.27 1.27))))
           (number "5" (effects (font (size 1.27 1.27))))
         )
-        (pin passive line (at 7.62 2.54 180) (length 3.81)
+        (pin passive line (at 7.62 0 180) (length 3.81)
           (name "Pin_6" (effects (font (size 1.27 1.27))))
           (number "6" (effects (font (size 1.27 1.27))))
         )
-        (pin passive line (at -5.08 0 0) (length 3.81)
+        (pin passive line (at -5.08 -2.54 0) (length 3.81)
           (name "Pin_7" (effects (font (size 1.27 1.27))))
           (number "7" (effects (font (size 1.27 1.27))))
         )
-        (pin passive line (at 7.62 0 180) (length 3.81)
+        (pin passive line (at 7.62 -2.54 180) (length 3.81)
           (name "Pin_8" (effects (font (size 1.27 1.27))))
           (number "8" (effects (font (size 1.27 1.27))))
         )
-        (pin passive line (at -5.08 -2.54 0) (length 3.81)
+        (pin passive line (at -5.08 -5.08 0) (length 3.81)
           (name "Pin_9" (effects (font (size 1.27 1.27))))
           (number "9" (effects (font (size 1.27 1.27))))
         )
@@ -1819,27 +1787,11 @@
     (uuid e6385e83-3812-4782-97ce-4bc0df27c770)
   )
 
-  (no_connect (at 323.85 60.96) (uuid 012f44f9-fcd2-4754-9278-e0e7145deb61))
-  (no_connect (at 41.91 243.84) (uuid 0559fa3b-5067-4f0e-ab3f-6ff0a237fdbe))
-  (no_connect (at 323.85 55.88) (uuid 0de6cb16-c3d7-47f2-8260-88a8ca64b08f))
-  (no_connect (at 69.85 246.38) (uuid 13b79115-09e7-4c19-a164-7d2c54b9277a))
   (no_connect (at 119.38 196.85) (uuid 1b3ade85-f836-421b-9552-cfc0db95d796))
-  (no_connect (at 69.85 254) (uuid 1dd61104-cfdc-4769-80f1-b63f02e81e9e))
-  (no_connect (at 41.91 246.38) (uuid 1fb073f1-50cc-4c4d-8254-b4858ad9a9b3))
-  (no_connect (at 69.85 251.46) (uuid 21df5c5b-43c3-4663-8538-fcf1c2a9f733))
-  (no_connect (at 41.91 254) (uuid 2f0aa541-16cf-411a-92ed-a16e1b193d73))
-  (no_connect (at 323.85 58.42) (uuid 41006f1a-53ed-4903-9c0e-5e1ce3be0aea))
-  (no_connect (at 69.85 243.84) (uuid 6de4d6d6-4e46-4ff5-bed6-0e17da444966))
   (no_connect (at 332.74 82.55) (uuid 74b7baf6-828a-49db-b5ff-c70d80107b03))
-  (no_connect (at 41.91 248.92) (uuid 942515fd-f745-4c59-9fba-c0669536c58e))
-  (no_connect (at 323.85 63.5) (uuid a258a84c-208b-4a09-bec2-bfd664a6a448))
   (no_connect (at 119.38 194.31) (uuid b2d417a4-521c-4af1-ba97-a713d1ab3531))
-  (no_connect (at 69.85 248.92) (uuid ba767792-bb2a-43b9-ba73-006a3c03b5b2))
-  (no_connect (at 323.85 53.34) (uuid d5da656d-d2d6-4dcf-8c59-985e2483738a))
   (no_connect (at 332.74 78.74) (uuid d611ca23-c977-435a-861b-c6a163780251))
   (no_connect (at 330.2 46.99) (uuid df3c13f2-56d5-40b2-ac06-7f98d6f8fa96))
-  (no_connect (at 323.85 66.04) (uuid e532a93f-51e8-443c-9225-d8e018de4292))
-  (no_connect (at 41.91 251.46) (uuid fc97eca4-c2cd-4fc0-a72b-ec5dcb71d8b4))
 
   (wire (pts (xy 129.54 118.11) (xy 132.08 118.11))
     (stroke (width 0) (type default))
@@ -1905,10 +1857,6 @@
     (stroke (width 0) (type default))
     (uuid 13f15eb0-90fd-45a2-8448-d64702024924)
   )
-  (wire (pts (xy 69.85 251.46) (xy 62.23 251.46))
-    (stroke (width 0) (type default))
-    (uuid 145a67f5-760f-4147-b583-8e4f5fb77542)
-  )
   (wire (pts (xy 168.91 45.72) (xy 166.37 45.72))
     (stroke (width 0) (type default))
     (uuid 1627cb98-5547-4551-89c8-e4160190416b)
@@ -1929,10 +1877,6 @@
     (stroke (width 0) (type default))
     (uuid 1d89d4ca-788b-4645-8d65-f9a53aa1b9c1)
   )
-  (wire (pts (xy 41.91 254) (xy 49.53 254))
-    (stroke (width 0) (type default))
-    (uuid 1f614e2d-ae7e-4d6e-82f3-e8eb81cdf84e)
-  )
   (wire (pts (xy 168.91 193.04) (xy 171.45 193.04))
     (stroke (width 0) (type default))
     (uuid 210121a9-1295-4649-8904-efe2ad2ce161)
@@ -1953,10 +1897,6 @@
     (stroke (width 0) (type default))
     (uuid 28b04855-5f71-4507-8183-65e4bd933dfa)
   )
-  (wire (pts (xy 69.85 254) (xy 62.23 254))
-    (stroke (width 0) (type default))
-    (uuid 2953628c-69af-4469-8fa3-8a28d7abebf5)
-  )
   (wire (pts (xy 85.09 48.26) (xy 99.06 48.26))
     (stroke (width 0) (type default))
     (uuid 2f49921c-0c8b-4035-968d-b4d77fdb36ca)
@@ -1965,6 +1905,10 @@
     (stroke (width 0) (type default))
     (uuid 30839bc3-1032-48ec-a989-d3f8771b226a)
   )
+  (wire (pts (xy 323.85 58.42) (xy 328.93 58.42))
+    (stroke (width 0) (type default))
+    (uuid 3100c37c-e350-4854-9334-5931c74a6632)
+  )
   (wire (pts (xy 34.29 44.45) (xy 36.83 44.45))
     (stroke (width 0) (type default))
     (uuid 32efbf72-70b3-4cbf-8771-1395d7eb2489)
@@ -2045,10 +1989,6 @@
     (stroke (width 0) (type default))
     (uuid 4a41576d-9b41-4d2c-bf9d-470bace21667)
   )
-  (wire (pts (xy 41.91 251.46) (xy 49.53 251.46))
-    (stroke (width 0) (type default))
-    (uuid 4e4fae8a-94a8-4ba9-8419-7eb1aa84b18b)
-  )
   (wire (pts (xy 97.79 45.72) (xy 102.87 45.72))
     (stroke (width 0) (type default))
     (uuid 4ffd765d-8b04-4668-81ad-63d157d774b6)
@@ -2241,6 +2181,10 @@
     (stroke (width 0) (type default))
     (uuid 9030bbba-9bbb-4a91-8e69-7d448141301f)
   )
+  (wire (pts (xy 328.93 53.34) (xy 323.85 53.34))
+    (stroke (width 0) (type default))
+    (uuid 929fb7ed-e1a0-4851-b40c-a6b09d0a54cb)
+  )
   (wire (pts (xy 328.93 106.68) (xy 323.85 106.68))
     (stroke (width 0) (type default))
     (uuid 9479f13a-528b-4c09-a148-355e19046060)
@@ -2337,6 +2281,10 @@
     (stroke (width 0) (type default))
     (uuid b2d7a41a-bcbc-4f55-b85a-e938f1e96f3d)
   )
+  (wire (pts (xy 328.93 66.04) (xy 323.85 66.04))
+    (stroke (width 0) (type default))
+    (uuid b587a874-0d3d-4a0e-b5f3-968aadc3eca1)
+  )
   (wire (pts (xy 127 110.49) (xy 132.08 110.49))
     (stroke (width 0) (type default))
     (uuid ba4f435e-e79b-439d-8de9-12903961fed9)
@@ -2461,6 +2409,10 @@
     (stroke (width 0) (type default))
     (uuid f6dfc28f-7264-41b1-80df-fc21bcb1ffed)
   )
+  (wire (pts (xy 328.93 60.96) (xy 323.85 60.96))
+    (stroke (width 0) (type default))
+    (uuid f8c65875-e78c-4c86-91eb-9d44187c9ad7)
+  )
   (wire (pts (xy 36.83 52.07) (xy 36.83 55.88))
     (stroke (width 0) (type default))
     (uuid f9a5c19d-3bc6-467c-8250-0b6411d53651)
@@ -2469,10 +2421,18 @@
     (stroke (width 0) (type default))
     (uuid f9a97b2a-7c02-4af6-b1b5-dff64a461a9a)
   )
+  (wire (pts (xy 328.93 55.88) (xy 323.85 55.88))
+    (stroke (width 0) (type default))
+    (uuid fa1492d7-d27a-4548-b4b1-42d9e4efad56)
+  )
   (wire (pts (xy 66.04 110.49) (xy 66.04 118.11))
     (stroke (width 0) (type default))
     (uuid fa1bd5b0-4bbd-4dce-a118-a06d55147bd9)
   )
+  (wire (pts (xy 323.85 63.5) (xy 328.93 63.5))
+    (stroke (width 0) (type default))
+    (uuid fff79612-96c3-42e8-867b-246ed7504b1d)
+  )
 
   (rectangle (start 20.32 226.06) (end 149.86 270.51)
     (stroke (width 0) (type default))
@@ -2619,6 +2579,13 @@
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
+  (global_label "GPIO47" (shape passive) (at 328.93 55.88 0) (fields_autoplaced)
+    (effects (font (size 1.27 1.27) (color 64 255 29 1)) (justify left))
+    (uuid 22bd3f5b-6e1c-4f84-922e-348a6396204c)
+    (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 337.6982 55.88 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+  )
   (global_label "BCK" (shape input) (at 71.12 190.5 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27) (color 255 0 189 1)) (justify right))
     (uuid 25d1327d-1419-498b-8822-e28745b84116)
@@ -2626,6 +2593,13 @@
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
+  (global_label "GPIO47" (shape passive) (at 69.85 243.84 0) (fields_autoplaced)
+    (effects (font (size 1.27 1.27) (color 64 255 29 1)) (justify left))
+    (uuid 261f4584-5628-4178-afed-7d80b51c38aa)
+    (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 78.6182 243.84 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+  )
   (global_label "B" (shape output) (at 92.71 107.95 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27) (color 255 244 119 1)) (justify left))
     (uuid 2f2326a7-4814-44fd-a353-c89f9ec7397d)
@@ -2640,6 +2614,13 @@
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
+  (global_label "GPIO14" (shape passive) (at 328.93 60.96 0) (fields_autoplaced)
+    (effects (font (size 1.27 1.27) (color 64 255 29 1)) (justify left))
+    (uuid 3d8cb149-1b0c-4968-b64a-7e82c12f5a1f)
+    (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 337.6982 60.96 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+  )
   (global_label "USB-" (shape bidirectional) (at 339.09 91.44 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27) (color 29 75 255 1)) (justify left))
     (uuid 3f09beb5-88a4-4635-b311-b659c9d460e7)
@@ -2654,6 +2635,13 @@
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
+  (global_label "GPIO14" (shape passive) (at 69.85 246.38 0) (fields_autoplaced)
+    (effects (font (size 1.27 1.27) (color 64 255 29 1)) (justify left))
+    (uuid 42cf697f-9628-43f4-bfa9-f94c515ff09b)
+    (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 78.6182 246.38 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+  )
   (global_label "DISP_D{slash}C" (shape input) (at 127 113.03 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27) (color 255 151 1 1)) (justify right))
     (uuid 453b9d8d-f119-4dd4-8ee4-7f75d3821996)
@@ -2717,6 +2705,13 @@
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
+  (global_label "GPIO12" (shape passive) (at 69.85 248.92 0) (fields_autoplaced)
+    (effects (font (size 1.27 1.27) (color 64 255 29 1)) (justify left))
+    (uuid 5b954ef4-729a-46b0-8b81-65f9f6f8977f)
+    (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 78.6182 248.92 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+  )
   (global_label "DIN" (shape input) (at 114.3 191.77 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27) (color 255 0 189 1)) (justify right))
     (uuid 5bf6fd56-0695-4aa3-bbec-8086d2fa6e20)
@@ -2759,6 +2754,13 @@
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
+  (global_label "GPIO48" (shape passive) (at 41.91 243.84 180) (fields_autoplaced)
+    (effects (font (size 1.27 1.27) (color 64 255 29 1)) (justify right))
+    (uuid 761acce4-0702-415c-83e8-3986d71b43c0)
+    (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 33.1418 243.84 0)
+      (effects (font (size 1.27 1.27)) (justify right) hide)
+    )
+  )
   (global_label "DOWN" (shape output) (at 92.71 97.79 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27) (color 255 244 119 1)) (justify left))
     (uuid 79b31b9f-284d-40df-89c8-6f3b31ecc991)
@@ -2766,6 +2768,13 @@
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
+  (global_label "GPIO13" (shape passive) (at 328.93 63.5 0) (fields_autoplaced)
+    (effects (font (size 1.27 1.27) (color 64 255 29 1)) (justify left))
+    (uuid 7c98229c-e783-478b-b1a2-e8515e206793)
+    (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 337.6982 63.5 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+  )
   (global_label "RIGHT" (shape input) (at 231.14 101.6 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27) (color 255 244 119 1)) (justify right))
     (uuid 7cf0e9fc-9296-4fde-a861-e8d23c0fb23a)
@@ -2780,6 +2789,13 @@
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
+  (global_label "GPIO21" (shape passive) (at 41.91 246.38 180) (fields_autoplaced)
+    (effects (font (size 1.27 1.27) (color 64 255 29 1)) (justify right))
+    (uuid 805a1836-4393-4cb8-948f-383dd9685088)
+    (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 33.1418 246.38 0)
+      (effects (font (size 1.27 1.27)) (justify right) hide)
+    )
+  )
   (global_label "RX" (shape output) (at 105.41 250.19 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27) (color 0 146 255 1)) (justify right))
     (uuid 82514954-e4c0-4671-bb04-2489fec4110f)
@@ -2850,6 +2866,13 @@
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
+  (global_label "GPIO21" (shape passive) (at 328.93 58.42 0) (fields_autoplaced)
+    (effects (font (size 1.27 1.27) (color 64 255 29 1)) (justify left))
+    (uuid a6cbc8a7-3fe2-4a9f-bdfa-825f4c1d8077)
+    (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 337.6982 58.42 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+  )
   (global_label "~{RESET}" (shape output) (at 215.9 48.26 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27) (color 255 255 255 1)) (justify left))
     (uuid aad34bbe-3a44-4338-9fba-afe22b60925a)
@@ -2878,6 +2901,13 @@
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
+  (global_label "GPIO12" (shape passive) (at 328.93 66.04 0) (fields_autoplaced)
+    (effects (font (size 1.27 1.27) (color 64 255 29 1)) (justify left))
+    (uuid bf31f128-345f-415c-aecd-930809695752)
+    (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 337.6982 66.04 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+  )
   (global_label "USB+" (shape bidirectional) (at 39.37 49.53 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27) (color 29 75 255 1)) (justify left))
     (uuid c0f733c3-0676-48ee-a728-77cf9051a678)
@@ -2906,6 +2936,20 @@
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
+  (global_label "GPIO48" (shape passive) (at 328.93 53.34 0) (fields_autoplaced)
+    (effects (font (size 1.27 1.27) (color 64 255 29 1)) (justify left))
+    (uuid c8873844-2a13-46fe-b4f4-4c8eba1eb1cd)
+    (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 337.6982 53.34 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+  )
+  (global_label "GPIO13" (shape passive) (at 41.91 248.92 180) (fields_autoplaced)
+    (effects (font (size 1.27 1.27) (color 64 255 29 1)) (justify right))
+    (uuid c8a78cb6-c2ab-4949-8413-0bdab887747e)
+    (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 33.1418 248.92 0)
+      (effects (font (size 1.27 1.27)) (justify right) hide)
+    )
+  )
   (global_label "MOSI" (shape input) (at 127 107.95 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27) (color 255 151 1 1)) (justify right))
     (uuid ccface57-f7e6-41ff-9951-0a845a3cb1c8)
@@ -3267,6 +3311,40 @@
     )
   )
 
+  (symbol (lib_id "Connector_Generic:Conn_02x05_Odd_Even") (at 54.61 246.38 0) (unit 1)
+    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
+    (uuid 279f74f6-b91b-4de9-b94c-65ba1c582e0c)
+    (property "Reference" "J3" (at 55.88 234.95 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Value" "Ext" (at 55.88 237.49 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "Connector_PinHeader_2.54mm:PinHeader_2x05_P2.54mm_Vertical" (at 54.61 246.38 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (at 54.61 246.38 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "7" (uuid 17554af7-4731-419c-9e53-dd23c9b5f1e4))
+    (pin "9" (uuid 402edca0-45c6-4ce9-b255-7346c6b49e74))
+    (pin "6" (uuid 1cfb85d6-5b9a-417c-8a26-a45f10594556))
+    (pin "5" (uuid fd304525-c102-4149-853a-25f297d0d7b1))
+    (pin "3" (uuid 3847677a-18ee-43aa-9594-45a009023713))
+    (pin "1" (uuid 44e7eb2b-1dd1-45f8-8aa1-8e2f6eb31b0f))
+    (pin "4" (uuid 96464ca7-8b36-4ce6-a9f8-9d6a28ff0530))
+    (pin "8" (uuid b15be10d-bad5-4222-9140-61cebff71094))
+    (pin "10" (uuid ca024074-9d2a-484f-a54e-2991e074951a))
+    (pin "2" (uuid 07713eee-b865-4255-9126-bc56c804b3c0))
+    (instances
+      (project "main"
+        (path "/acd95ae8-394c-495e-b013-2a405fdaf383"
+          (reference "J3") (unit 1)
+        )
+      )
+    )
+  )
+
   (symbol (lib_id "connector:Charge_Controller_TP4056") (at 67.31 43.18 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
     (uuid 28ee8a30-3d51-4f00-90bb-45c9c36e2dc3)
@@ -3695,44 +3773,6 @@
     )
   )
 
-  (symbol (lib_id "Connector_Generic:Conn_02x07_Odd_Even") (at 54.61 248.92 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid 711cee46-470c-4a0a-a6df-1079da36e9fd)
-    (property "Reference" "J3" (at 55.88 234.95 0)
-      (effects (font (size 1.27 1.27)))
-    )
-    (property "Value" "Ext" (at 55.88 237.49 0)
-      (effects (font (size 1.27 1.27)))
-    )
-    (property "Footprint" "Connector_PinHeader_2.54mm:PinHeader_2x07_P2.54mm_Vertical" (at 54.61 248.92 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (at 54.61 248.92 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "7" (uuid f5fb6c6f-1175-4802-8bd0-525120aa99cb))
-    (pin "3" (uuid e27e826d-ba40-42ef-b353-491c2c0a33b1))
-    (pin "13" (uuid d59e2a9e-01d5-4af0-84ee-8caf6270b0ef))
-    (pin "14" (uuid 01c9f572-1be6-4dd6-8ac6-2e2e8d8c18a8))
-    (pin "8" (uuid 2a11655e-01c4-468c-bf7c-43f651b1fec6))
-    (pin "9" (uuid 2a7fd46f-2781-45b4-9197-13372d064fd6))
-    (pin "5" (uuid d0784310-b09d-4e77-bfac-4c41b1b47504))
-    (pin "6" (uuid a716143d-5617-4d1f-a001-9284db0b2379))
-    (pin "11" (uuid d203767f-4494-4410-95da-45be0bab6d73))
-    (pin "1" (uuid aa4e2c5e-711e-476e-a2ac-1dee56206cfd))
-    (pin "2" (uuid 27561eca-31af-4294-b59d-df1b0205657c))
-    (pin "10" (uuid b0f9bc01-6e23-4d8e-9c8f-df8dec7c32a9))
-    (pin "4" (uuid 49fb1a25-646f-466b-9673-d7d06968c645))
-    (pin "12" (uuid 049b9d3e-5055-4d8e-9f51-8925d71a9253))
-    (instances
-      (project "main"
-        (path "/acd95ae8-394c-495e-b013-2a405fdaf383"
-          (reference "J3") (unit 1)
-        )
-      )
-    )
-  )
-
   (symbol (lib_id "power:VBUS") (at 62.23 31.75 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
     (uuid 786478d0-c71c-43eb-af3b-a53b7ca824d4)
@@ -4016,19 +4056,19 @@
     )
   )
 
-  (symbol (lib_id "power:+3V3") (at 49.53 256.54 90) (unit 1)
+  (symbol (lib_id "power:+3V3") (at 49.53 251.46 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
     (uuid a1d5c2e4-5c1f-4bda-b5f0-aa8143800c99)
-    (property "Reference" "#PWR031" (at 53.34 256.54 0)
+    (property "Reference" "#PWR031" (at 53.34 251.46 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "+3V3" (at 45.72 256.54 90)
+    (property "Value" "+3V3" (at 45.72 251.46 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (at 49.53 256.54 0)
+    (property "Footprint" "" (at 49.53 251.46 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (at 49.53 256.54 0)
+    (property "Datasheet" "" (at 49.53 251.46 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 4dd29c32-0bfb-46f0-b1ad-771c4c4c7beb))
@@ -4346,19 +4386,19 @@
     )
   )
 
-  (symbol (lib_id "power:GND") (at 62.23 256.54 90) (unit 1)
+  (symbol (lib_id "power:GND") (at 62.23 251.46 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
     (uuid b777d16b-b646-40eb-a25c-72ad6d95ba16)
-    (property "Reference" "#PWR01" (at 68.58 256.54 0)
+    (property "Reference" "#PWR01" (at 68.58 251.46 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (at 66.04 256.54 90)
+    (property "Value" "GND" (at 66.04 251.46 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "" (at 62.23 256.54 0)
+    (property "Footprint" "" (at 62.23 251.46 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (at 62.23 256.54 0)
+    (property "Datasheet" "" (at 62.23 251.46 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 6536f774-519e-413d-a14d-013f65e5bab7))