diff --git a/electronics/analog.kicad_sch b/electronics/analog.kicad_sch
index 5d076a1..1cc8465 100644
--- a/electronics/analog.kicad_sch
+++ b/electronics/analog.kicad_sch
@@ -7,7 +7,7 @@
   (title_block
     (title "CIMDID")
     (date "2022-02-08")
-    (rev "1.0")
+    (rev "1.1")
     (comment 1 "@grumpydevelop@contentnation.net")
     (comment 2 "https://contentnation.net/en/grumpydevelop/cimdit_1")
   )
diff --git a/electronics/cimdit.kicad_pcb b/electronics/cimdit.kicad_pcb
index 8cbdf9b..f47f407 100644
--- a/electronics/cimdit.kicad_pcb
+++ b/electronics/cimdit.kicad_pcb
@@ -161,10 +161,10 @@
   (net 72 "Net-(JKD6-Pad1)")
   (net 73 "Net-(JKD7-Pad1)")
   (net 74 "Net-(JKD8-Pad1)")
-  (net 75 "Net-(JR1-Pad1)")
-  (net 76 "Net-(JR1-Pad2)")
-  (net 77 "Net-(JR2-Pad1)")
-  (net 78 "Net-(JR2-Pad2)")
+  (net 75 "Net-(J6-Pad1)")
+  (net 76 "Net-(J7-Pad1)")
+  (net 77 "Net-(J8-Pad1)")
+  (net 78 "Net-(J9-Pad1)")
   (net 79 "/Key Matrix Diode/+5V_KEY")
   (net 80 "/Key Matrix Diode/GND_KEY")
   (net 81 "/Key Matrix Diode/I2C_CLOCK_KEY")
@@ -185,10 +185,10 @@
   (net 96 "Net-(DKD15-Pad2)")
   (net 97 "Net-(DKD8-Pad2)")
   (net 98 "Net-(DKD16-Pad2)")
-  (net 99 "Net-(JR5-Pad1)")
-  (net 100 "Net-(JR5-Pad2)")
-  (net 101 "Net-(JR3-Pad1)")
-  (net 102 "Net-(JR3-Pad2)")
+  (net 99 "Net-(J10-Pad1)")
+  (net 100 "Net-(J11-Pad1)")
+  (net 101 "Net-(J12-Pad1)")
+  (net 102 "Net-(J13-Pad1)")
   (net 103 "Net-(DKD17-Pad2)")
   (net 104 "Net-(DKD18-Pad2)")
   (net 105 "Net-(DKD19-Pad2)")
@@ -237,14 +237,14 @@
   (net 148 "Net-(DKD62-Pad2)")
   (net 149 "Net-(DKD63-Pad2)")
   (net 150 "Net-(DKD64-Pad2)")
-  (net 151 "Net-(JR4-Pad1)")
-  (net 152 "Net-(JR4-Pad2)")
-  (net 153 "Net-(JR6-Pad1)")
-  (net 154 "Net-(JR6-Pad2)")
-  (net 155 "Net-(JR7-Pad1)")
-  (net 156 "Net-(JR7-Pad2)")
-  (net 157 "Net-(JR8-Pad1)")
-  (net 158 "Net-(JR8-Pad2)")
+  (net 151 "Net-(J14-Pad1)")
+  (net 152 "Net-(J15-Pad1)")
+  (net 153 "Net-(J16-Pad1)")
+  (net 154 "Net-(J17-Pad1)")
+  (net 155 "Net-(J18-Pad1)")
+  (net 156 "Net-(J19-Pad1)")
+  (net 157 "Net-(J20-Pad1)")
+  (net 158 "Net-(J23-Pad1)")
   (net 159 "unconnected-(J100-Pad1)")
   (net 160 "unconnected-(J100-Pad2)")
   (net 161 "unconnected-(J100-Pad3)")
@@ -254,25 +254,49 @@
   (net 165 "unconnected-(J101-Pad8)")
   (net 166 "unconnected-(J101-Pad10)")
   (net 167 "unconnected-(J101-Pad12)")
+  (net 168 "/KeyMatrix wired/+5V_KEY")
+  (net 169 "Net-(J30-Pad1)")
+  (net 170 "Net-(J31-Pad1)")
+  (net 171 "Net-(J32-Pad1)")
+  (net 172 "Net-(J33-Pad1)")
+  (net 173 "Net-(J34-Pad1)")
+  (net 174 "Net-(J35-Pad1)")
+  (net 175 "Net-(J36-Pad1)")
+  (net 176 "Net-(J37-Pad1)")
+  (net 177 "Net-(J38-Pad1)")
+  (net 178 "Net-(J39-Pad1)")
+  (net 179 "Net-(J40-Pad1)")
+  (net 180 "Net-(J41-Pad1)")
+  (net 181 "Net-(J42-Pad1)")
+  (net 182 "Net-(J43-Pad1)")
+  (net 183 "Net-(J44-Pad1)")
+  (net 184 "Net-(J45-Pad1)")
+  (net 185 "/KeyMatrix wired/GND_KEY")
+  (net 186 "/KeyMatrix wired/I2C_DATA_KEY")
+  (net 187 "/KeyMatrix wired/I2C_CLOCK_KEY")
+  (net 188 "unconnected-(U1-Pad11)")
+  (net 189 "unconnected-(U1-Pad14)")
+  (net 190 "unconnected-(U1-Pad19)")
+  (net 191 "unconnected-(U1-Pad20)")
 
   (footprint "Connector_PinSocket_2.54mm:PinSocket_1x04_P2.54mm_Vertical" (layer "F.Cu")
     (tedit 5A19A429) (tstamp 00000000-0000-0000-0000-000061fdfa80)
-    (at 45.72 111.76 -90)
+    (at 63.5 96.52)
     (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" "cimdit.kicad_sch")
     (property "Sheetname" "")
     (path "/27de3dac-3961-4a93-bc2f-08d7f9d0c9e7")
     (attr through_hole)
-    (fp_text reference "J22" (at 0 -2.77 -270) (layer "F.SilkS") hide
+    (fp_text reference "J22" (at 0 -2.77) (layer "F.SilkS") hide
       (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 793a5c8e-e35a-48bf-b3ce-7150d8d81329)
     )
-    (fp_text value "KEY" (at 0 -2.54 -270) (layer "F.SilkS")
+    (fp_text value "KEY" (at 0 -2.54) (layer "F.SilkS")
       (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 92360226-9a8f-403a-8a31-06f251c161ed)
     )
-    (fp_text user "${REFERENCE}" (at 0 3.81) (layer "F.Fab") hide
+    (fp_text user "${REFERENCE}" (at 0 3.81 90) (layer "F.Fab") hide
       (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 14dfe1df-9130-408b-8e92-e333eab5e657)
     )
@@ -291,13 +315,13 @@
     (fp_line (start 1.27 -0.635) (end 1.27 8.89) (layer "F.Fab") (width 0.1) (tstamp 4ac5f4ab-f271-4d93-9d90-9371518377ee))
     (fp_line (start -1.27 8.89) (end -1.27 -1.27) (layer "F.Fab") (width 0.1) (tstamp 82c21d94-c942-4e75-a775-d50699c9ccbc))
     (fp_line (start -1.27 -1.27) (end 0.635 -1.27) (layer "F.Fab") (width 0.1) (tstamp ebd2d722-b1f4-4660-8688-03bcc8dd0369))
-    (pad "1" thru_hole rect (at 0 0 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "1" thru_hole rect (at 0 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 35 "/KeyMatrix Ext Diodes/I2C_DATA_KEY") (pinfunction "Pin_1") (pintype "passive") (tstamp 90778d24-7d72-4e05-9f17-5b3edfbbaebf))
-    (pad "2" thru_hole oval (at 0 2.54 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "2" thru_hole oval (at 0 2.54) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 36 "/KeyMatrix Ext Diodes/I2C_CLOCK_KEY") (pinfunction "Pin_2") (pintype "passive") (tstamp 0a5988ff-be2f-47d6-ae81-4946cccccf6f))
-    (pad "3" thru_hole oval (at 0 5.08 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "3" thru_hole oval (at 0 5.08) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 37 "/KeyMatrix Ext Diodes/GND_KEY") (pinfunction "Pin_3") (pintype "passive") (tstamp 837d1dd1-7d93-48e9-a1c0-ac450e2f5cf2))
-    (pad "4" thru_hole oval (at 0 7.62 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "4" thru_hole oval (at 0 7.62) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 38 "/KeyMatrix Ext Diodes/+5V_KEY") (pinfunction "Pin_4") (pintype "passive") (tstamp 9358a53e-a337-4ac5-b1a7-7742caa43548))
     (model "${KICAD6_3DMODEL_DIR}/Connector_PinSocket_2.54mm.3dshapes/PinSocket_1x04_P2.54mm_Vertical.wrl"
       (offset (xyz 0 0 0))
@@ -359,7 +383,7 @@
 
   (footprint "Connector_PinSocket_2.54mm:PinSocket_1x08_P2.54mm_Vertical" (layer "F.Cu")
     (tedit 5A19A420) (tstamp 00000000-0000-0000-0000-000061fef633)
-    (at 76.2 55.88 90)
+    (at 68.58 55.88 90)
     (descr "Through hole straight socket strip, 1x08, 2.54mm pitch, single row (from Kicad 4.0.7), script generated")
     (tags "Through hole socket strip THT 1x08 2.54mm single row")
     (property "Sheetfile" "cimdit.kicad_sch")
@@ -418,7 +442,7 @@
 
   (footprint "Connector_PinSocket_2.54mm:PinSocket_1x06_P2.54mm_Vertical" (layer "F.Cu")
     (tedit 5A19A430) (tstamp 00000000-0000-0000-0000-000061fef717)
-    (at 99.06 38.1)
+    (at 91.44 38.1)
     (descr "Through hole straight socket strip, 1x06, 2.54mm pitch, single row (from Kicad 4.0.7), script generated")
     (tags "Through hole socket strip THT 1x06 2.54mm single row")
     (property "Sheetfile" "cimdit.kicad_sch")
@@ -473,7 +497,7 @@
 
   (footprint "Connector_PinSocket_2.54mm:PinSocket_1x04_P2.54mm_Vertical" (layer "F.Cu")
     (tedit 5A19A429) (tstamp 00000000-0000-0000-0000-000061fef75d)
-    (at 71.12 33.02)
+    (at 63.5 33.02)
     (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" "cimdit.kicad_sch")
@@ -524,7 +548,7 @@
 
   (footprint "Connector_PinSocket_2.54mm:PinSocket_1x05_P2.54mm_Vertical" (layer "F.Cu")
     (tedit 5A19A420) (tstamp 00000000-0000-0000-0000-000061fef7d9)
-    (at 76.2 33.02)
+    (at 68.58 33.02)
     (descr "Through hole straight socket strip, 1x05, 2.54mm pitch, single row (from Kicad 4.0.7), script generated")
     (tags "Through hole socket strip THT 1x05 2.54mm single row")
     (property "Sheetfile" "cimdit.kicad_sch")
@@ -577,7 +601,7 @@
 
   (footprint "Connector_PinSocket_2.54mm:PinSocket_1x04_P2.54mm_Vertical" (layer "F.Cu")
     (tedit 5A19A429) (tstamp 00000000-0000-0000-0000-000061fef84a)
-    (at 73.66 33.02)
+    (at 66.04 33.02)
     (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" "cimdit.kicad_sch")
@@ -829,53 +853,43 @@
     )
   )
 
-  (footprint "Connector_PinSocket_2.54mm:PinSocket_1x05_P2.54mm_Vertical" (layer "F.Cu")
-    (tedit 5A19A420) (tstamp 0df8cfff-f345-4ce9-85bc-b5a7fa1a4030)
-    (at 17.78 35.56)
-    (descr "Through hole straight socket strip, 1x05, 2.54mm pitch, single row (from Kicad 4.0.7), script generated")
-    (tags "Through hole socket strip THT 1x05 2.54mm single row")
+  (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (layer "F.Cu")
+    (tedit 5A1DC084) (tstamp 0ec7ecea-1eb7-446b-a8e3-cfbe4228889a)
+    (at 30.48 25.4)
+    (descr "solder Pin_ with flat fork, hole diameter 0.7mm, length 6.5mm, width 1.8mm")
+    (tags "solder Pin_ with flat fork")
     (property "Sheetfile" "cimdit.kicad_sch")
     (property "Sheetname" "")
-    (path "/ac08bef7-c849-4df1-ad9c-81030f8a73f4")
+    (path "/94fdd15c-87b2-446c-b1e3-ea23bfcc286f")
     (attr through_hole)
-    (fp_text reference "J40" (at 0 -2.77) (layer "F.SilkS") hide
+    (fp_text reference "J28" (at 0 1.8) (layer "F.SilkS") hide
       (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp fa50a1c8-1165-40b0-a896-bc24b9e0cd49)
+      (tstamp ae7b2497-1736-4aa7-9c92-c79b4a2ba12e)
     )
-    (fp_text value "ROTARY" (at 0 12.93) (layer "F.SilkS")
+    (fp_text value "CLK" (at 2.54 0 90) (layer "F.Fab")
       (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 631b76a2-c275-4a7b-a687-58e9434fda54)
+      (tstamp 7e829b2e-79c1-4650-838f-977c7fbc34ca)
     )
-    (fp_text user "${REFERENCE}" (at 0 5.08 90) (layer "F.Fab") hide
+    (fp_text user "${REFERENCE}" (at 0 1.8) (layer "F.Fab") hide
       (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp d1dede26-4c7b-47b8-8c64-c657d9f087a4)
+      (tstamp 7c40cd61-9106-4e87-8021-9529e806a4fa)
     )
-    (fp_line (start -1.33 11.49) (end 1.33 11.49) (layer "F.SilkS") (width 0.12) (tstamp 15c638ae-c733-443f-8175-826b5e469c57))
-    (fp_line (start 1.33 1.27) (end 1.33 11.49) (layer "F.SilkS") (width 0.12) (tstamp 1af0d817-4750-429b-9443-fd123cecf600))
-    (fp_line (start 1.33 -1.33) (end 1.33 0) (layer "F.SilkS") (width 0.12) (tstamp 2de3a67c-4934-4928-9887-0659a619f7a6))
-    (fp_line (start 0 -1.33) (end 1.33 -1.33) (layer "F.SilkS") (width 0.12) (tstamp 8545057b-e8b7-49e5-84a2-3b3b90a19bbb))
-    (fp_line (start -1.33 1.27) (end 1.33 1.27) (layer "F.SilkS") (width 0.12) (tstamp 92387207-139c-461d-b5a5-1495e5bd799f))
-    (fp_line (start -1.33 1.27) (end -1.33 11.49) (layer "F.SilkS") (width 0.12) (tstamp f0a7cdf9-fb16-4c79-bec3-c4ec6a240db5))
-    (fp_line (start -1.8 11.9) (end -1.8 -1.8) (layer "F.CrtYd") (width 0.05) (tstamp 812cbb0d-eb38-4ff9-a0da-972dee4429fc))
-    (fp_line (start 1.75 11.9) (end -1.8 11.9) (layer "F.CrtYd") (width 0.05) (tstamp 862564e6-3882-4f50-8de0-69ce61cae0bf))
-    (fp_line (start 1.75 -1.8) (end 1.75 11.9) (layer "F.CrtYd") (width 0.05) (tstamp 9b9a83cf-0178-41d1-87ac-dad695f972d8))
-    (fp_line (start -1.8 -1.8) (end 1.75 -1.8) (layer "F.CrtYd") (width 0.05) (tstamp 9cc8709b-0492-47c1-8598-83456e6c6eb7))
-    (fp_line (start -1.27 -1.27) (end 0.635 -1.27) (layer "F.Fab") (width 0.1) (tstamp 0bab6bc1-21e5-431a-a138-965f36a8236e))
-    (fp_line (start 0.635 -1.27) (end 1.27 -0.635) (layer "F.Fab") (width 0.1) (tstamp 2fc89e16-6d0b-4db2-9cba-46e06813e611))
-    (fp_line (start -1.27 11.43) (end -1.27 -1.27) (layer "F.Fab") (width 0.1) (tstamp 4b5225d9-5be6-4129-b054-bd15ba3c546f))
-    (fp_line (start 1.27 -0.635) (end 1.27 11.43) (layer "F.Fab") (width 0.1) (tstamp 596a1e81-5ffa-4f9a-95de-74a07a83cb7b))
-    (fp_line (start 1.27 11.43) (end -1.27 11.43) (layer "F.Fab") (width 0.1) (tstamp 99e95b62-b6d5-4ff6-ad1e-b5b326cb8189))
-    (pad "1" thru_hole rect (at 0 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-      (net 12 "/Rotary Encoder/I2C_CLOCK_ROT") (pinfunction "Pin_1") (pintype "passive") (tstamp 7f0d04dc-cc77-4cdd-86d6-723d6c21edde))
-    (pad "2" thru_hole oval (at 0 2.54) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-      (net 13 "/Rotary Encoder/I2C_DATA_ROT") (pinfunction "Pin_2") (pintype "passive") (tstamp eb5440ba-8bf4-431b-819e-dfbd4b5bbccf))
-    (pad "3" thru_hole oval (at 0 5.08) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-      (net 14 "/Rotary Encoder/GND_ROT") (pinfunction "Pin_3") (pintype "passive") (tstamp 6b6c8788-42f1-42d0-bb92-dc24401d2001))
-    (pad "4" thru_hole oval (at 0 7.62) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-      (net 15 "/Rotary Encoder/+5V_ROT") (pinfunction "Pin_4") (pintype "passive") (tstamp 3b159757-580e-4d12-bbd0-634b8cc2369e))
-    (pad "5" thru_hole oval (at 0 10.16) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-      (net 16 "/Rotary Encoder/INT_ROT") (pinfunction "Pin_5") (pintype "passive") (tstamp bc83b63c-e19a-4b41-8b34-6c2126412728))
-    (model "${KICAD6_3DMODEL_DIR}/Connector_PinSocket_2.54mm.3dshapes/PinSocket_1x05_P2.54mm_Vertical.wrl"
+    (fp_line (start -0.95 -0.95) (end -0.95 0.95) (layer "F.SilkS") (width 0.12) (tstamp 451d1f81-9b2b-4af5-8728-d381ceb9fa2a))
+    (fp_line (start 0.9 0.95) (end 0.9 -0.9) (layer "F.SilkS") (width 0.12) (tstamp 4fe6981b-b29c-4bff-8414-9cf327d56d31))
+    (fp_line (start -0.95 0.95) (end 0.9 0.95) (layer "F.SilkS") (width 0.12) (tstamp 725d4335-a8df-4de6-b22d-adf90c885ed7))
+    (fp_line (start 0.9 -0.9) (end 0.9 -0.95) (layer "F.SilkS") (width 0.12) (tstamp ec24305a-fe45-40a8-bced-f8a7c12c6997))
+    (fp_line (start 0.9 -0.95) (end -0.95 -0.95) (layer "F.SilkS") (width 0.12) (tstamp f502d467-1eea-4740-aa02-5ec768378ee2))
+    (fp_line (start 1.35 1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp 0c6addf4-b6fc-4def-8466-3dfac9c38931))
+    (fp_line (start -1.4 -1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp 36f072da-5cf4-42b3-8b46-ce0a76085163))
+    (fp_line (start -1.4 -1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp 6557ea9e-c90e-4ed9-984e-32c4c2bf5b2d))
+    (fp_line (start 1.35 1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp b7b49d45-1872-42fc-a893-cfaa03379edd))
+    (fp_line (start -0.9 0.25) (end -0.9 -0.25) (layer "F.Fab") (width 0.12) (tstamp 30232234-b76c-4ef5-be01-5b9ed89bac9a))
+    (fp_line (start -0.9 -0.25) (end 0.85 -0.25) (layer "F.Fab") (width 0.12) (tstamp 5301d788-3064-49ec-9a31-f5ee69083ef1))
+    (fp_line (start 0.85 -0.25) (end 0.85 0.25) (layer "F.Fab") (width 0.12) (tstamp 7280a6b6-2838-4619-9a09-170c1ee98a4b))
+    (fp_line (start 0.85 0.25) (end -0.9 0.25) (layer "F.Fab") (width 0.12) (tstamp d6e24b4e-e165-441b-92f7-0a67c0529c28))
+    (pad "1" thru_hole circle (at 0 0) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 12 "/Rotary Encoder/I2C_CLOCK_ROT") (pinfunction "Pin_1") (pintype "passive") (tstamp 823bdb72-b3da-47c7-8be1-d919cd2d99f3))
+    (model "${KICAD6_3DMODEL_DIR}/Connector_Pin.3dshapes/Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
       (rotate (xyz 0 0 0))
@@ -884,22 +898,22 @@
 
   (footprint "Connector_PinSocket_2.54mm:PinSocket_1x08_P2.54mm_Vertical" (layer "F.Cu")
     (tedit 5A19A420) (tstamp 11d3e685-7cd8-45d7-b177-6fa1a10d4678)
-    (at 15.24 93.98 180)
+    (at 45.72 127 -90)
     (descr "Through hole straight socket strip, 1x08, 2.54mm pitch, single row (from Kicad 4.0.7), script generated")
     (tags "Through hole socket strip THT 1x08 2.54mm single row")
     (property "Sheetfile" "keymatrix_extdiode.kicad_sch")
     (property "Sheetname" "KeyMatrix Ext Diodes")
     (path "/7a807cd9-4b53-4d34-8616-454af4054d6a/d62c8def-2104-48cb-be0b-4df1dbf1aeff")
     (attr through_hole)
-    (fp_text reference "JK18" (at 0 -2.77) (layer "F.SilkS") hide
+    (fp_text reference "JK18" (at 0 -2.77 -270) (layer "F.SilkS") hide
       (effects (font (size 1 1) (thickness 0.15)))
       (tstamp b4d0789f-b3bc-4f20-b553-f82ad1608bfb)
     )
-    (fp_text value "COL8" (at 0 20.55) (layer "F.SilkS")
+    (fp_text value "COL8" (at 0 20.55 -270) (layer "F.SilkS")
       (effects (font (size 1 1) (thickness 0.15)))
       (tstamp b9dd3ab7-1f4e-4e35-8e26-4299e8482a48)
     )
-    (fp_text user "${REFERENCE}" (at 0 8.89 90) (layer "F.Fab") hide
+    (fp_text user "${REFERENCE}" (at 0 8.89) (layer "F.Fab") hide
       (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 56bad6ff-8fb1-4d5d-b4cb-6c86aee3caf9)
     )
@@ -918,21 +932,21 @@
     (fp_line (start 0.635 -1.27) (end 1.27 -0.635) (layer "F.Fab") (width 0.1) (tstamp 57d862fb-b97a-4294-8ee6-e0c4c02546b1))
     (fp_line (start 1.27 -0.635) (end 1.27 19.05) (layer "F.Fab") (width 0.1) (tstamp a612b906-e840-4e52-865a-2fb7b60b23b8))
     (fp_line (start 1.27 19.05) (end -1.27 19.05) (layer "F.Fab") (width 0.1) (tstamp ab576e45-f81f-4202-85e2-3e8a7b52482d))
-    (pad "1" thru_hole rect (at 0 0 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "1" thru_hole rect (at 0 0 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 67 "Net-(JK18-Pad1)") (pinfunction "Pin_1") (pintype "passive") (tstamp 7983748a-b0b7-4e76-ab65-1dd7d7b22204))
-    (pad "2" thru_hole oval (at 0 2.54 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "2" thru_hole oval (at 0 2.54 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 67 "Net-(JK18-Pad1)") (pinfunction "Pin_2") (pintype "passive") (tstamp 437f4763-eff7-41fb-aac6-3917ee011cb0))
-    (pad "3" thru_hole oval (at 0 5.08 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "3" thru_hole oval (at 0 5.08 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 67 "Net-(JK18-Pad1)") (pinfunction "Pin_3") (pintype "passive") (tstamp a0755c88-c86f-46f8-86f5-7ebffda3aaf7))
-    (pad "4" thru_hole oval (at 0 7.62 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "4" thru_hole oval (at 0 7.62 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 67 "Net-(JK18-Pad1)") (pinfunction "Pin_4") (pintype "passive") (tstamp b3d9ba28-fa2e-4105-8c13-85a2d7dc3746))
-    (pad "5" thru_hole oval (at 0 10.16 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "5" thru_hole oval (at 0 10.16 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 67 "Net-(JK18-Pad1)") (pinfunction "Pin_5") (pintype "passive") (tstamp 4b3df2bd-6122-4d77-9431-2f7de7159c30))
-    (pad "6" thru_hole oval (at 0 12.7 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "6" thru_hole oval (at 0 12.7 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 67 "Net-(JK18-Pad1)") (pinfunction "Pin_6") (pintype "passive") (tstamp 741963cb-a892-47d0-aceb-af393112160b))
-    (pad "7" thru_hole oval (at 0 15.24 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "7" thru_hole oval (at 0 15.24 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 67 "Net-(JK18-Pad1)") (pinfunction "Pin_7") (pintype "passive") (tstamp b59802bf-011b-413e-be68-ba5e3aebb98b))
-    (pad "8" thru_hole oval (at 0 17.78 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "8" thru_hole oval (at 0 17.78 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 67 "Net-(JK18-Pad1)") (pinfunction "Pin_8") (pintype "passive") (tstamp e860b77a-1b5f-445f-ad54-53809659f0ae))
     (model "${KICAD6_3DMODEL_DIR}/Connector_PinSocket_2.54mm.3dshapes/PinSocket_1x08_P2.54mm_Vertical.wrl"
       (offset (xyz 0 0 0))
@@ -989,6 +1003,49 @@
     )
   )
 
+  (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (layer "F.Cu")
+    (tedit 5A1DC084) (tstamp 148d4173-b063-4b10-8a8d-efdde1f30322)
+    (at 50.8 25.4)
+    (descr "solder Pin_ with flat fork, hole diameter 0.7mm, length 6.5mm, width 1.8mm")
+    (tags "solder Pin_ with flat fork")
+    (property "Sheetfile" "rotary.kicad_sch")
+    (property "Sheetname" "Rotary Encoder")
+    (path "/0e0cd3f9-9e59-4187-9e69-2f18dd8368cc/f1e08948-6b85-492c-99de-5fd6a459b81f")
+    (attr through_hole)
+    (fp_text reference "J9" (at 0 1.8) (layer "F.SilkS") hide
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 2d5b3e10-9b65-4abf-803e-969a546fc8e3)
+    )
+    (fp_text value "B1" (at -0.025 4.445) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 18648368-8315-41f6-b287-55706b48f79e)
+    )
+    (fp_text user "${REFERENCE}" (at 0 1.8) (layer "F.Fab") hide
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 69814d9b-0367-4de8-9718-43b37031d240)
+    )
+    (fp_line (start 0.9 -0.95) (end -0.95 -0.95) (layer "F.SilkS") (width 0.12) (tstamp 3bb6370c-713d-4d7f-8232-809c9ec621ba))
+    (fp_line (start -0.95 -0.95) (end -0.95 0.95) (layer "F.SilkS") (width 0.12) (tstamp 5b17d47a-a4a2-4ddf-966a-e6b5821094ec))
+    (fp_line (start 0.9 -0.9) (end 0.9 -0.95) (layer "F.SilkS") (width 0.12) (tstamp 69b9c43b-f07d-440f-a8c0-3e74d8fe8255))
+    (fp_line (start 0.9 0.95) (end 0.9 -0.9) (layer "F.SilkS") (width 0.12) (tstamp a4016004-dc80-4dea-8e6b-d39f67a11e91))
+    (fp_line (start -0.95 0.95) (end 0.9 0.95) (layer "F.SilkS") (width 0.12) (tstamp facfc131-66c7-4b5b-b59f-7d81e0c94438))
+    (fp_line (start -1.4 -1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp 5880b9b0-aa32-4505-8669-deb95429be37))
+    (fp_line (start 1.35 1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp 8eb5e770-d904-422f-814b-21543d34976a))
+    (fp_line (start 1.35 1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp c8fb0e8c-a702-4abf-8afe-bedb64abe0e1))
+    (fp_line (start -1.4 -1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp de9814ea-c668-40c7-a581-41a00d5ad413))
+    (fp_line (start -0.9 0.25) (end -0.9 -0.25) (layer "F.Fab") (width 0.12) (tstamp 13ca6f98-495b-4848-a1b9-619bdbf2e008))
+    (fp_line (start -0.9 -0.25) (end 0.85 -0.25) (layer "F.Fab") (width 0.12) (tstamp 207f3729-b16f-4bed-8e25-6323ca6af59d))
+    (fp_line (start 0.85 -0.25) (end 0.85 0.25) (layer "F.Fab") (width 0.12) (tstamp 3969f1a4-cee5-45d1-af73-48102fab1b79))
+    (fp_line (start 0.85 0.25) (end -0.9 0.25) (layer "F.Fab") (width 0.12) (tstamp c7f16784-da95-4ab7-905d-9889694975ee))
+    (pad "1" thru_hole circle (at 0 0) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 78 "Net-(J9-Pad1)") (pinfunction "Pin_1") (pintype "passive") (tstamp abdf1fc0-a5f4-4a26-adc8-ba7216defb10))
+    (model "${KICAD6_3DMODEL_DIR}/Connector_Pin.3dshapes/Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
   (footprint "Package_DIP:DIP-28_W7.62mm" (layer "F.Cu")
     (tedit 5A02E8C5) (tstamp 149894f6-4705-4c0d-a25a-682eb998df21)
     (at 127 35.56)
@@ -1147,6 +1204,178 @@
     )
   )
 
+  (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (layer "F.Cu")
+    (tedit 5A1DC084) (tstamp 188bd81e-55cf-4eb8-ac51-32c0165c3b7f)
+    (at 48.26 25.4)
+    (descr "solder Pin_ with flat fork, hole diameter 0.7mm, length 6.5mm, width 1.8mm")
+    (tags "solder Pin_ with flat fork")
+    (property "Sheetfile" "rotary.kicad_sch")
+    (property "Sheetname" "Rotary Encoder")
+    (path "/0e0cd3f9-9e59-4187-9e69-2f18dd8368cc/355984fe-c4ef-4584-9c88-7aed9a4b1db8")
+    (attr through_hole)
+    (fp_text reference "J10" (at 0 1.8) (layer "F.SilkS") hide
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp cb625889-a39e-48a1-b5ca-64b654415724)
+    )
+    (fp_text value "A2" (at -0.025 4.445) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 7f8398d1-1fcb-4b17-b71c-c5df98433848)
+    )
+    (fp_text user "${REFERENCE}" (at 0 1.8) (layer "F.Fab") hide
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 253438e1-b2d5-45c8-bcfc-742c8344ecea)
+    )
+    (fp_line (start 0.9 -0.9) (end 0.9 -0.95) (layer "F.SilkS") (width 0.12) (tstamp 0bc4a849-5f93-40a7-8f00-efd98ea94086))
+    (fp_line (start 0.9 0.95) (end 0.9 -0.9) (layer "F.SilkS") (width 0.12) (tstamp 20b6f547-8f23-4ca0-8198-b15b71fba76d))
+    (fp_line (start 0.9 -0.95) (end -0.95 -0.95) (layer "F.SilkS") (width 0.12) (tstamp 95576a76-91bb-4db4-bcad-45ffa1fb7580))
+    (fp_line (start -0.95 -0.95) (end -0.95 0.95) (layer "F.SilkS") (width 0.12) (tstamp 9c614a92-4db0-4682-b200-e8121deaa926))
+    (fp_line (start -0.95 0.95) (end 0.9 0.95) (layer "F.SilkS") (width 0.12) (tstamp ce1871bd-0dbe-421e-af45-ef8b1716fbf2))
+    (fp_line (start -1.4 -1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp 102c4f15-f7f0-47b3-b463-90324a621426))
+    (fp_line (start -1.4 -1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp d92a0282-1577-4ce4-be7e-0b4d890f47ad))
+    (fp_line (start 1.35 1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp dc2f95e5-e18b-4da3-b935-6bac0924cb34))
+    (fp_line (start 1.35 1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp deb67a9b-326e-4e7c-9ffe-380d8b743b4a))
+    (fp_line (start -0.9 0.25) (end -0.9 -0.25) (layer "F.Fab") (width 0.12) (tstamp 0f8c7f8e-c569-41d5-a9c5-be2602986fec))
+    (fp_line (start 0.85 -0.25) (end 0.85 0.25) (layer "F.Fab") (width 0.12) (tstamp 2a3045fd-49b2-4e17-94bf-b5864659b054))
+    (fp_line (start 0.85 0.25) (end -0.9 0.25) (layer "F.Fab") (width 0.12) (tstamp 422c943d-0851-47e8-8fa0-a7c617f12578))
+    (fp_line (start -0.9 -0.25) (end 0.85 -0.25) (layer "F.Fab") (width 0.12) (tstamp e6c57be4-076b-4791-b5f7-950dec1eba7d))
+    (pad "1" thru_hole circle (at 0 0) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 99 "Net-(J10-Pad1)") (pinfunction "Pin_1") (pintype "passive") (tstamp fbc71af7-de54-4238-9761-e2dd07bc84ed))
+    (model "${KICAD6_3DMODEL_DIR}/Connector_Pin.3dshapes/Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (layer "F.Cu")
+    (tedit 5A1DC084) (tstamp 191475d3-9362-42bc-8055-82669e94bcd9)
+    (at 27.94 45.72)
+    (descr "solder Pin_ with flat fork, hole diameter 0.7mm, length 6.5mm, width 1.8mm")
+    (tags "solder Pin_ with flat fork")
+    (property "Sheetfile" "cimdit.kicad_sch")
+    (property "Sheetname" "")
+    (path "/4562bbed-1cf5-48d3-8b27-4accd2fdf26c")
+    (attr through_hole)
+    (fp_text reference "J47" (at 0 1.8) (layer "F.SilkS") hide
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 2f9f3f60-56a1-45cf-882f-50aaebfa09cb)
+    )
+    (fp_text value "DATA" (at -2.54 0 90) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 4d1b2393-824a-499b-a95f-2075bb4b4583)
+    )
+    (fp_text user "${REFERENCE}" (at 0 1.8) (layer "F.Fab") hide
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp c03df382-5cbe-4fcd-950a-f61491833ee4)
+    )
+    (fp_line (start -0.95 0.95) (end 0.9 0.95) (layer "F.SilkS") (width 0.12) (tstamp 12c13ea8-2139-4fe5-ba69-406b77e8074b))
+    (fp_line (start 0.9 -0.95) (end -0.95 -0.95) (layer "F.SilkS") (width 0.12) (tstamp 6685bc04-b56a-4eaa-9536-e9db5e23803c))
+    (fp_line (start 0.9 0.95) (end 0.9 -0.9) (layer "F.SilkS") (width 0.12) (tstamp 8502e297-d4a6-4d0e-94de-15fa33cfb187))
+    (fp_line (start -0.95 -0.95) (end -0.95 0.95) (layer "F.SilkS") (width 0.12) (tstamp 8755f4c6-2784-4bcd-ac51-f52ffbf56b7a))
+    (fp_line (start 0.9 -0.9) (end 0.9 -0.95) (layer "F.SilkS") (width 0.12) (tstamp acda603d-d9d1-48db-bfba-528d53cbad4d))
+    (fp_line (start 1.35 1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp 5ef62951-7280-429e-9e7c-900f1d4e2e62))
+    (fp_line (start -1.4 -1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp a3f19e3e-ad93-4f99-b053-425bd0781702))
+    (fp_line (start -1.4 -1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp b1350e58-ab13-4b6f-b458-5c9b665953a0))
+    (fp_line (start 1.35 1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp d11a93ee-bbc5-47df-b420-3dc32c01aa6b))
+    (fp_line (start -0.9 -0.25) (end 0.85 -0.25) (layer "F.Fab") (width 0.12) (tstamp 0a5849e2-6070-4fe2-9b63-a7e959741eb3))
+    (fp_line (start -0.9 0.25) (end -0.9 -0.25) (layer "F.Fab") (width 0.12) (tstamp 0f2e9923-80f5-4cf4-833f-1a6fa7fed589))
+    (fp_line (start 0.85 -0.25) (end 0.85 0.25) (layer "F.Fab") (width 0.12) (tstamp 12bbc2b2-5bac-413d-a185-45f0b0010405))
+    (fp_line (start 0.85 0.25) (end -0.9 0.25) (layer "F.Fab") (width 0.12) (tstamp c60f863c-7626-4df3-8cef-7c2d084b634b))
+    (pad "1" thru_hole circle (at 0 0) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 186 "/KeyMatrix wired/I2C_DATA_KEY") (pinfunction "Pin_1") (pintype "passive") (tstamp 76505e0f-c9fd-4712-acff-3f53e6a70db8))
+    (model "${KICAD6_3DMODEL_DIR}/Connector_Pin.3dshapes/Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (layer "F.Cu")
+    (tedit 5A1DC084) (tstamp 19550ef8-e46a-41a3-b33c-7bafbbd02474)
+    (at 53.34 58.42)
+    (descr "solder Pin_ with flat fork, hole diameter 0.7mm, length 6.5mm, width 1.8mm")
+    (tags "solder Pin_ with flat fork")
+    (property "Sheetfile" "keymatrix_extdiode_wire.kicad_sch")
+    (property "Sheetname" "KeyMatrix wired")
+    (path "/86fd0b4b-b0c8-4da7-922a-6650d5003f71/e203d836-01b9-4742-95b0-b818b8d5ad1d")
+    (attr through_hole)
+    (fp_text reference "J43" (at 0 1.8) (layer "F.SilkS") hide
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp a8bc2b00-f952-401e-bdbb-23fdb63a0fbd)
+    )
+    (fp_text value "C5" (at 0 -5.08) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 28b9b428-cba2-4b43-bbef-20f7c140ab5b)
+    )
+    (fp_text user "${REFERENCE}" (at 0 1.8) (layer "F.Fab") hide
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 17c9c32b-822d-40a3-bf45-1a05c9f42d6f)
+    )
+    (fp_line (start 0.9 -0.95) (end -0.95 -0.95) (layer "F.SilkS") (width 0.12) (tstamp 21584ec6-80e5-4dd6-ba7d-50a1a21763eb))
+    (fp_line (start 0.9 -0.9) (end 0.9 -0.95) (layer "F.SilkS") (width 0.12) (tstamp 660b79fd-0c3e-4fcd-9ea5-eb3a6f080691))
+    (fp_line (start -0.95 0.95) (end 0.9 0.95) (layer "F.SilkS") (width 0.12) (tstamp d0e5cb06-b4ca-4f44-97ec-26352abfdc84))
+    (fp_line (start 0.9 0.95) (end 0.9 -0.9) (layer "F.SilkS") (width 0.12) (tstamp d4258bcb-b075-46b2-9a52-dc9c21a8da12))
+    (fp_line (start -0.95 -0.95) (end -0.95 0.95) (layer "F.SilkS") (width 0.12) (tstamp e53aeee7-3e42-43bf-864e-ced55aaf1e15))
+    (fp_line (start 1.35 1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp 630dd9b0-cb67-4fac-b74e-117bc032e9a7))
+    (fp_line (start 1.35 1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp 8438854e-39ec-4b1b-bc8e-daf8fba9160d))
+    (fp_line (start -1.4 -1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp d5170e75-d9bc-49e3-bd92-f94f596ffa01))
+    (fp_line (start -1.4 -1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp f6173929-82fe-4f42-a09f-38683d840ce0))
+    (fp_line (start 0.85 0.25) (end -0.9 0.25) (layer "F.Fab") (width 0.12) (tstamp 2ed7eb1a-7e7e-4013-a754-41fc54eb2207))
+    (fp_line (start -0.9 -0.25) (end 0.85 -0.25) (layer "F.Fab") (width 0.12) (tstamp 7978c4a0-cf66-4cf0-8ba1-e6609225f7d5))
+    (fp_line (start 0.85 -0.25) (end 0.85 0.25) (layer "F.Fab") (width 0.12) (tstamp 7b850855-a177-4b2f-8e3e-e7958232dc46))
+    (fp_line (start -0.9 0.25) (end -0.9 -0.25) (layer "F.Fab") (width 0.12) (tstamp 7bf1e578-3c95-4f34-91af-bb8faa5d187b))
+    (pad "1" thru_hole circle (at 0 0) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 182 "Net-(J43-Pad1)") (pinfunction "Pin_1") (pintype "passive") (tstamp 7e725ec7-da05-4975-a58d-fd6af4f65ab0))
+    (model "${KICAD6_3DMODEL_DIR}/Connector_Pin.3dshapes/Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (layer "F.Cu")
+    (tedit 5A1DC084) (tstamp 19f4b8b4-be0c-4288-abe5-c17502fc672f)
+    (at 40.64 38.1)
+    (descr "solder Pin_ with flat fork, hole diameter 0.7mm, length 6.5mm, width 1.8mm")
+    (tags "solder Pin_ with flat fork")
+    (property "Sheetfile" "rotary.kicad_sch")
+    (property "Sheetname" "Rotary Encoder")
+    (path "/0e0cd3f9-9e59-4187-9e69-2f18dd8368cc/0e20cbc1-6cd0-4252-8a14-c1d9146f2a63")
+    (attr through_hole)
+    (fp_text reference "J14" (at 0 1.8) (layer "F.SilkS") hide
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp c2e16797-bb9c-43d0-8751-7646864e22e4)
+    )
+    (fp_text value "A4" (at -0.025 -4.445) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 73eb1d6b-3e2d-4317-bc4c-c77f232aa2cf)
+    )
+    (fp_text user "${REFERENCE}" (at 0 1.8) (layer "F.Fab") hide
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 7d64a0a0-384d-4e31-a03a-22264a524862)
+    )
+    (fp_line (start -0.95 0.95) (end 0.9 0.95) (layer "F.SilkS") (width 0.12) (tstamp 0aadf54d-dacf-4007-aabb-7ac26ba5bd37))
+    (fp_line (start -0.95 -0.95) (end -0.95 0.95) (layer "F.SilkS") (width 0.12) (tstamp 96fd148c-2abd-4da2-a739-1fc716e496e9))
+    (fp_line (start 0.9 -0.95) (end -0.95 -0.95) (layer "F.SilkS") (width 0.12) (tstamp af925654-dfb9-45aa-816e-cb4703dcab2f))
+    (fp_line (start 0.9 0.95) (end 0.9 -0.9) (layer "F.SilkS") (width 0.12) (tstamp e07d5869-f4e0-43a4-8e08-83daa6e67700))
+    (fp_line (start 0.9 -0.9) (end 0.9 -0.95) (layer "F.SilkS") (width 0.12) (tstamp f8d4ba33-e493-4c36-93a3-a7a967fd6532))
+    (fp_line (start 1.35 1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp 6383d51c-2a4a-451b-80f6-d8ddd181fcca))
+    (fp_line (start -1.4 -1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp 997ebd3b-fb52-489d-905e-2a7aae5bd517))
+    (fp_line (start -1.4 -1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp f0d57cc9-c4de-4eb8-97e9-9df19eea248e))
+    (fp_line (start 1.35 1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp f2ae85d9-7640-48a3-83c4-8d4b3e89cde3))
+    (fp_line (start 0.85 0.25) (end -0.9 0.25) (layer "F.Fab") (width 0.12) (tstamp 2536e930-06a4-43c1-bb06-fbe9f6f63e41))
+    (fp_line (start 0.85 -0.25) (end 0.85 0.25) (layer "F.Fab") (width 0.12) (tstamp 26d0960c-3dad-40b7-9ad0-2a8d7207d84f))
+    (fp_line (start -0.9 0.25) (end -0.9 -0.25) (layer "F.Fab") (width 0.12) (tstamp 75b57470-3933-4be6-8842-b2898714961d))
+    (fp_line (start -0.9 -0.25) (end 0.85 -0.25) (layer "F.Fab") (width 0.12) (tstamp c030dc50-5966-4aad-8d18-d61b053ef0ce))
+    (pad "1" thru_hole circle (at 0 0) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 151 "Net-(J14-Pad1)") (pinfunction "Pin_1") (pintype "passive") (tstamp a4ac0519-b7a7-4509-bdb5-35a62928ff28))
+    (model "${KICAD6_3DMODEL_DIR}/Connector_Pin.3dshapes/Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
   (footprint "Diode_THT:D_DO-35_SOD27_P2.54mm_Vertical_AnodeUp" (layer "F.Cu")
     (tedit 5AE50CD5) (tstamp 1a2d78e0-24f8-46e2-ae75-c9d7f0a8588a)
     (at 180.34 53.34 -90)
@@ -1195,6 +1424,49 @@
     )
   )
 
+  (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (layer "F.Cu")
+    (tedit 5A1DC084) (tstamp 1b918202-cf42-4316-9f7f-988f6edf3e52)
+    (at 35.56 45.72)
+    (descr "solder Pin_ with flat fork, hole diameter 0.7mm, length 6.5mm, width 1.8mm")
+    (tags "solder Pin_ with flat fork")
+    (property "Sheetfile" "cimdit.kicad_sch")
+    (property "Sheetname" "")
+    (path "/73bcbbc6-a043-409a-ab80-98753b715cbc")
+    (attr through_hole)
+    (fp_text reference "J46" (at 0 1.8) (layer "F.SilkS") hide
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp da0ea1c1-a5a9-456f-9369-2ce567f94fd7)
+    )
+    (fp_text value "GND" (at 2.54 0 90) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 57b151cd-d89c-4ab0-a769-6fbf25582c46)
+    )
+    (fp_text user "${REFERENCE}" (at 0 1.8) (layer "F.Fab") hide
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp e1ccb051-bd30-48f3-a274-f42c42af90ac)
+    )
+    (fp_line (start -0.95 -0.95) (end -0.95 0.95) (layer "F.SilkS") (width 0.12) (tstamp 7ae91763-f0a3-4a18-9244-057e21c36da7))
+    (fp_line (start 0.9 -0.95) (end -0.95 -0.95) (layer "F.SilkS") (width 0.12) (tstamp 988a9d07-287a-47a6-ac01-bd1183623825))
+    (fp_line (start 0.9 0.95) (end 0.9 -0.9) (layer "F.SilkS") (width 0.12) (tstamp bfdaae07-969c-474d-a54f-6c5708462e18))
+    (fp_line (start -0.95 0.95) (end 0.9 0.95) (layer "F.SilkS") (width 0.12) (tstamp f2f97b90-1e01-417d-8af1-5f9ccbd88198))
+    (fp_line (start 0.9 -0.9) (end 0.9 -0.95) (layer "F.SilkS") (width 0.12) (tstamp fe1fe3b5-7b4a-4bf7-9e7b-c7ee2c49c6a7))
+    (fp_line (start -1.4 -1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp 3ac835f3-d4e4-4445-ba04-2bf1d0eb5b0a))
+    (fp_line (start 1.35 1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp 3fac69f1-dea4-4f51-b564-c4698dd0f72b))
+    (fp_line (start -1.4 -1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp a7191198-7722-4775-b3ba-0abe4075cbbf))
+    (fp_line (start 1.35 1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp db0b6b1e-09b5-4ca4-b3e6-08db2298b56d))
+    (fp_line (start 0.85 -0.25) (end 0.85 0.25) (layer "F.Fab") (width 0.12) (tstamp 1d2a7927-5e2c-4248-91b5-e3b3b59f7d68))
+    (fp_line (start -0.9 0.25) (end -0.9 -0.25) (layer "F.Fab") (width 0.12) (tstamp 7dc8e40d-760c-4c3c-b38c-d861f2b29eeb))
+    (fp_line (start 0.85 0.25) (end -0.9 0.25) (layer "F.Fab") (width 0.12) (tstamp ed18d5df-e63b-420f-bcda-7083503b3cb4))
+    (fp_line (start -0.9 -0.25) (end 0.85 -0.25) (layer "F.Fab") (width 0.12) (tstamp f15e333d-3b52-441b-a356-bb51801e8787))
+    (pad "1" thru_hole circle (at 0 0) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 185 "/KeyMatrix wired/GND_KEY") (pinfunction "Pin_1") (pintype "passive") (tstamp 8c4a4a48-0e00-4f86-ae38-eaf2e71cf328))
+    (model "${KICAD6_3DMODEL_DIR}/Connector_Pin.3dshapes/Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
   (footprint "Diode_THT:D_DO-35_SOD27_P2.54mm_Vertical_AnodeUp" (layer "F.Cu")
     (tedit 5AE50CD5) (tstamp 1d4761aa-9671-49ea-8557-6ea9c5e81570)
     (at 180.34 43.18 -90)
@@ -1243,9 +1515,95 @@
     )
   )
 
+  (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (layer "F.Cu")
+    (tedit 5A1DC084) (tstamp 1defacb9-7bca-41a0-b362-3566a384c9da)
+    (at 33.02 38.1)
+    (descr "solder Pin_ with flat fork, hole diameter 0.7mm, length 6.5mm, width 1.8mm")
+    (tags "solder Pin_ with flat fork")
+    (property "Sheetfile" "cimdit.kicad_sch")
+    (property "Sheetname" "")
+    (path "/3e7d3ba7-4edd-4535-8c09-fa92c51dc657")
+    (attr through_hole)
+    (fp_text reference "J25" (at 0 1.8) (layer "F.SilkS") hide
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 7c999cd9-380c-4645-8e1d-cd50e73f1aac)
+    )
+    (fp_text value "+5V" (at 1.905 0 90) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp e686dc0d-0ddd-4a59-bb4f-909d83897018)
+    )
+    (fp_text user "${REFERENCE}" (at 0 1.8) (layer "F.Fab") hide
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp c325042c-ee47-47aa-a96f-84bfc4126fe3)
+    )
+    (fp_line (start 0.9 0.95) (end 0.9 -0.9) (layer "F.SilkS") (width 0.12) (tstamp 5c8796ed-0e8d-4e5f-93fc-1864b7d6f7db))
+    (fp_line (start -0.95 0.95) (end 0.9 0.95) (layer "F.SilkS") (width 0.12) (tstamp 78bf525d-6cdf-4984-886a-d31a70711d20))
+    (fp_line (start 0.9 -0.9) (end 0.9 -0.95) (layer "F.SilkS") (width 0.12) (tstamp 89eb91c5-88d4-4e27-88ac-997a5f812226))
+    (fp_line (start 0.9 -0.95) (end -0.95 -0.95) (layer "F.SilkS") (width 0.12) (tstamp 9c8a7bd4-517b-4df8-b522-fb906de1e6a1))
+    (fp_line (start -0.95 -0.95) (end -0.95 0.95) (layer "F.SilkS") (width 0.12) (tstamp bd949d1e-3838-40ce-8338-e3416dbddf44))
+    (fp_line (start 1.35 1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp 3749553d-b3f1-4f21-8fbf-1adb20d44f9a))
+    (fp_line (start -1.4 -1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp 535e3851-ef11-46ba-8e69-ed6f2448d191))
+    (fp_line (start 1.35 1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp 8841214d-dd0e-4d87-bdf6-f5358a0d764c))
+    (fp_line (start -1.4 -1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp fdbec5e1-e74d-42d1-a15f-9870270449de))
+    (fp_line (start 0.85 -0.25) (end 0.85 0.25) (layer "F.Fab") (width 0.12) (tstamp 1053723d-f511-40f1-ae40-bf7ef45b9a90))
+    (fp_line (start -0.9 -0.25) (end 0.85 -0.25) (layer "F.Fab") (width 0.12) (tstamp 26e7e72a-a079-4605-93e8-56ec5e0640a7))
+    (fp_line (start -0.9 0.25) (end -0.9 -0.25) (layer "F.Fab") (width 0.12) (tstamp 2f1ebd2b-d08b-4301-aae2-f6ef217f6430))
+    (fp_line (start 0.85 0.25) (end -0.9 0.25) (layer "F.Fab") (width 0.12) (tstamp 4832ec94-33d2-491a-987b-7def90eed38f))
+    (pad "1" thru_hole circle (at 0 0) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 15 "/Rotary Encoder/+5V_ROT") (pinfunction "Pin_1") (pintype "passive") (tstamp 0abd9d53-e15b-46ed-a9e6-cb5a12201568))
+    (model "${KICAD6_3DMODEL_DIR}/Connector_Pin.3dshapes/Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (layer "F.Cu")
+    (tedit 5A1DC084) (tstamp 1ee5bda6-1e63-4580-bf44-1e1ac78dcc5a)
+    (at 55.88 45.72)
+    (descr "solder Pin_ with flat fork, hole diameter 0.7mm, length 6.5mm, width 1.8mm")
+    (tags "solder Pin_ with flat fork")
+    (property "Sheetfile" "keymatrix_extdiode_wire.kicad_sch")
+    (property "Sheetname" "KeyMatrix wired")
+    (path "/86fd0b4b-b0c8-4da7-922a-6650d5003f71/fe4436c3-ec9b-4d4d-9a37-5d16547a866e")
+    (attr through_hole)
+    (fp_text reference "J31" (at 0 1.8) (layer "F.SilkS") hide
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp c99cbbbc-39b6-4e4e-847a-487ed1ae9373)
+    )
+    (fp_text value "R1" (at -0.025 5.08) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp fa0cb989-8034-4a44-b66d-98e61fe3c111)
+    )
+    (fp_text user "${REFERENCE}" (at 0 1.8) (layer "F.Fab") hide
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp f24f62cf-f376-444b-928f-063a73c7f3a2)
+    )
+    (fp_line (start 0.9 -0.95) (end -0.95 -0.95) (layer "F.SilkS") (width 0.12) (tstamp 0c23c2d1-f7c2-49e2-834a-dcfca9f547ee))
+    (fp_line (start -0.95 -0.95) (end -0.95 0.95) (layer "F.SilkS") (width 0.12) (tstamp 9d036c59-af68-4c67-9096-2592d799fbad))
+    (fp_line (start -0.95 0.95) (end 0.9 0.95) (layer "F.SilkS") (width 0.12) (tstamp c949f750-102a-4c7b-b53e-b6cc5b3764f7))
+    (fp_line (start 0.9 -0.9) (end 0.9 -0.95) (layer "F.SilkS") (width 0.12) (tstamp e2b09f57-323f-43df-916c-056852033c09))
+    (fp_line (start 0.9 0.95) (end 0.9 -0.9) (layer "F.SilkS") (width 0.12) (tstamp eaf332d5-4a73-4573-bc6a-06cddac4c0fd))
+    (fp_line (start 1.35 1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp 069e5de6-1cde-4527-9f46-9f0bf11d264c))
+    (fp_line (start -1.4 -1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp 27c7a05d-2c40-403c-be35-4c66d5a163f9))
+    (fp_line (start 1.35 1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp 71ef1232-a6f0-48e5-9f2a-77fdefaf4936))
+    (fp_line (start -1.4 -1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp 847be3b5-d4f9-4ba1-8294-b52cfec08f1f))
+    (fp_line (start 0.85 -0.25) (end 0.85 0.25) (layer "F.Fab") (width 0.12) (tstamp 032a366d-27c2-40c1-9dd9-fe2bc83646fd))
+    (fp_line (start -0.9 0.25) (end -0.9 -0.25) (layer "F.Fab") (width 0.12) (tstamp 4aaadb93-4e8b-47b6-9fe2-addc1ece0151))
+    (fp_line (start 0.85 0.25) (end -0.9 0.25) (layer "F.Fab") (width 0.12) (tstamp 50c45063-68cb-4e92-ac5c-fe3d1a5bee40))
+    (fp_line (start -0.9 -0.25) (end 0.85 -0.25) (layer "F.Fab") (width 0.12) (tstamp eff2af4c-95ed-4349-acb5-6b2d58c2cdd4))
+    (pad "1" thru_hole circle (at 0 0) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 170 "Net-(J31-Pad1)") (pinfunction "Pin_1") (pintype "passive") (tstamp 9538bd59-c6ed-4dbf-b450-0b1418ad25a9))
+    (model "${KICAD6_3DMODEL_DIR}/Connector_Pin.3dshapes/Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
   (footprint "Package_DIP:DIP-28_W7.62mm" (layer "F.Cu")
     (tedit 5A02E8C5) (tstamp 1f8f0787-dbcd-4c4c-ae4e-90128558bde4)
-    (at 53.34 35.585 -90)
+    (at 58.42 27.94 -90)
     (descr "28-lead though-hole mounted DIP package, row spacing 7.62 mm (300 mils)")
     (tags "THT DIP DIL PDIP 2.54mm 7.62mm 300mil")
     (property "Sheetfile" "rotary.kicad_sch")
@@ -1256,7 +1614,7 @@
       (effects (font (size 1 1) (thickness 0.15)))
       (tstamp bcd8a653-fe5d-4b14-ba75-93cc9e8b15ef)
     )
-    (fp_text value "MCP23017_SP" (at 3.81 17.78 180) (layer "F.SilkS")
+    (fp_text value "MCP23017_SP" (at 3.81 12.7 180) (layer "F.SilkS")
       (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 089ce730-0424-478b-b4cc-105f9b59b8c9)
     )
@@ -1280,21 +1638,21 @@
     (fp_line (start 0.635 -0.27) (end 1.635 -1.27) (layer "F.Fab") (width 0.1) (tstamp d9bec634-1b16-439c-a985-65cd482f5936))
     (fp_line (start 0.635 34.29) (end 0.635 -0.27) (layer "F.Fab") (width 0.1) (tstamp dfde2c1f-f7e6-4285-b15a-032861861e78))
     (pad "1" thru_hole rect locked (at 0 0 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 99 "Net-(JR5-Pad1)") (pinfunction "GPB0") (pintype "bidirectional") (tstamp c304bd06-f71a-4015-993a-83226725abbc))
+      (net 75 "Net-(J6-Pad1)") (pinfunction "GPB0") (pintype "bidirectional") (tstamp c304bd06-f71a-4015-993a-83226725abbc))
     (pad "2" thru_hole oval locked (at 0 2.54 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 100 "Net-(JR5-Pad2)") (pinfunction "GPB1") (pintype "bidirectional") (tstamp 190e81ff-73b6-42d6-a044-3de60c68b533))
+      (net 76 "Net-(J7-Pad1)") (pinfunction "GPB1") (pintype "bidirectional") (tstamp 190e81ff-73b6-42d6-a044-3de60c68b533))
     (pad "3" thru_hole oval locked (at 0 5.08 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 153 "Net-(JR6-Pad1)") (pinfunction "GPB2") (pintype "bidirectional") (tstamp db815b65-2e01-4e79-b0a4-f722f7ccdb56))
+      (net 77 "Net-(J8-Pad1)") (pinfunction "GPB2") (pintype "bidirectional") (tstamp db815b65-2e01-4e79-b0a4-f722f7ccdb56))
     (pad "4" thru_hole oval locked (at 0 7.62 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 154 "Net-(JR6-Pad2)") (pinfunction "GPB3") (pintype "bidirectional") (tstamp f9bb7c0d-144c-4477-8c1e-c4f03702b4f0))
+      (net 78 "Net-(J9-Pad1)") (pinfunction "GPB3") (pintype "bidirectional") (tstamp f9bb7c0d-144c-4477-8c1e-c4f03702b4f0))
     (pad "5" thru_hole oval locked (at 0 10.16 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 155 "Net-(JR7-Pad1)") (pinfunction "GPB4") (pintype "bidirectional") (tstamp 295ccbca-ec52-4627-8aa8-4f65fecc5ccc))
+      (net 99 "Net-(J10-Pad1)") (pinfunction "GPB4") (pintype "bidirectional") (tstamp 295ccbca-ec52-4627-8aa8-4f65fecc5ccc))
     (pad "6" thru_hole oval locked (at 0 12.7 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 156 "Net-(JR7-Pad2)") (pinfunction "GPB5") (pintype "bidirectional") (tstamp 079e7ee5-246f-4d56-830e-c74c7f0ff0bc))
+      (net 100 "Net-(J11-Pad1)") (pinfunction "GPB5") (pintype "bidirectional") (tstamp 079e7ee5-246f-4d56-830e-c74c7f0ff0bc))
     (pad "7" thru_hole oval locked (at 0 15.24 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 157 "Net-(JR8-Pad1)") (pinfunction "GPB6") (pintype "bidirectional") (tstamp 24a1cdab-c9ce-4136-88e4-ae4c940e4508))
+      (net 101 "Net-(J12-Pad1)") (pinfunction "GPB6") (pintype "bidirectional") (tstamp 24a1cdab-c9ce-4136-88e4-ae4c940e4508))
     (pad "8" thru_hole oval locked (at 0 17.78 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 158 "Net-(JR8-Pad2)") (pinfunction "GPB7") (pintype "bidirectional") (tstamp daab4222-f234-406f-9856-d8d7ea988c8e))
+      (net 102 "Net-(J13-Pad1)") (pinfunction "GPB7") (pintype "bidirectional") (tstamp daab4222-f234-406f-9856-d8d7ea988c8e))
     (pad "9" thru_hole oval locked (at 0 20.32 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 15 "/Rotary Encoder/+5V_ROT") (pinfunction "VDD") (pintype "power_in") (tstamp e4688208-e370-4724-b274-e25b1b91f0ae))
     (pad "10" thru_hole oval locked (at 0 22.86 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
@@ -1320,21 +1678,21 @@
     (pad "20" thru_hole oval locked (at 7.62 20.32 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 16 "/Rotary Encoder/INT_ROT") (pinfunction "INTA") (pintype "tri_state") (tstamp df4a707f-c422-45b9-846e-5f8beda1b995))
     (pad "21" thru_hole oval locked (at 7.62 17.78 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 75 "Net-(JR1-Pad1)") (pinfunction "GPA0") (pintype "bidirectional") (tstamp b4d2c23a-7cc4-45c9-8b80-2fac4ca991f3))
+      (net 151 "Net-(J14-Pad1)") (pinfunction "GPA0") (pintype "bidirectional") (tstamp b4d2c23a-7cc4-45c9-8b80-2fac4ca991f3))
     (pad "22" thru_hole oval locked (at 7.62 15.24 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 76 "Net-(JR1-Pad2)") (pinfunction "GPA1") (pintype "bidirectional") (tstamp 7dc2d1f0-9853-41c5-82ef-3e8bfad85b15))
+      (net 152 "Net-(J15-Pad1)") (pinfunction "GPA1") (pintype "bidirectional") (tstamp 7dc2d1f0-9853-41c5-82ef-3e8bfad85b15))
     (pad "23" thru_hole oval locked (at 7.62 12.7 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 77 "Net-(JR2-Pad1)") (pinfunction "GPA2") (pintype "bidirectional") (tstamp a835fe7e-5fe3-4753-8be0-85264176b5b1))
+      (net 153 "Net-(J16-Pad1)") (pinfunction "GPA2") (pintype "bidirectional") (tstamp a835fe7e-5fe3-4753-8be0-85264176b5b1))
     (pad "24" thru_hole oval locked (at 7.62 10.16 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 78 "Net-(JR2-Pad2)") (pinfunction "GPA3") (pintype "bidirectional") (tstamp c217cc02-b8ca-45cd-9e37-ba17e558e20b))
+      (net 154 "Net-(J17-Pad1)") (pinfunction "GPA3") (pintype "bidirectional") (tstamp c217cc02-b8ca-45cd-9e37-ba17e558e20b))
     (pad "25" thru_hole oval locked (at 7.62 7.62 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 101 "Net-(JR3-Pad1)") (pinfunction "GPA4") (pintype "bidirectional") (tstamp cfadeddf-442b-4347-ae7a-f19df8b9afb9))
+      (net 155 "Net-(J18-Pad1)") (pinfunction "GPA4") (pintype "bidirectional") (tstamp cfadeddf-442b-4347-ae7a-f19df8b9afb9))
     (pad "26" thru_hole oval locked (at 7.62 5.08 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 102 "Net-(JR3-Pad2)") (pinfunction "GPA5") (pintype "bidirectional") (tstamp 45dd312a-4854-4626-ae8a-71a3ad2284b7))
+      (net 156 "Net-(J19-Pad1)") (pinfunction "GPA5") (pintype "bidirectional") (tstamp 45dd312a-4854-4626-ae8a-71a3ad2284b7))
     (pad "27" thru_hole oval locked (at 7.62 2.54 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 151 "Net-(JR4-Pad1)") (pinfunction "GPA6") (pintype "bidirectional") (tstamp e4504463-45b2-469f-ba7e-89cbf4245f8e))
+      (net 157 "Net-(J20-Pad1)") (pinfunction "GPA6") (pintype "bidirectional") (tstamp e4504463-45b2-469f-ba7e-89cbf4245f8e))
     (pad "28" thru_hole oval locked (at 7.62 0 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 152 "Net-(JR4-Pad2)") (pinfunction "GPA7") (pintype "bidirectional") (tstamp 22e36685-b889-4540-8920-0f092b032b4f))
+      (net 158 "Net-(J23-Pad1)") (pinfunction "GPA7") (pintype "bidirectional") (tstamp 22e36685-b889-4540-8920-0f092b032b4f))
     (model "${KISYS3DMOD}/Package_DIP.3dshapes/DIP-28_W7.62mm.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1344,22 +1702,22 @@
 
   (footprint "Connector_PinSocket_2.54mm:PinSocket_1x08_P2.54mm_Vertical" (layer "F.Cu")
     (tedit 5A19A420) (tstamp 1fbed9e5-7de0-4ce9-9c55-ad7572e12e59)
-    (at 20.32 129.54 180)
+    (at 81.28 121.92 -90)
     (descr "Through hole straight socket strip, 1x08, 2.54mm pitch, single row (from Kicad 4.0.7), script generated")
     (tags "Through hole socket strip THT 1x08 2.54mm single row")
     (property "Sheetfile" "keymatrix_extdiode.kicad_sch")
     (property "Sheetname" "KeyMatrix Ext Diodes")
     (path "/7a807cd9-4b53-4d34-8616-454af4054d6a/09a83b1d-03d4-4819-9c4b-c384e604fd5a")
     (attr through_hole)
-    (fp_text reference "JK3" (at 0 -2.77) (layer "F.SilkS") hide
+    (fp_text reference "JK3" (at 0 -2.77 -270) (layer "F.SilkS") hide
       (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 95dd0dcc-e6ba-4cb9-9a88-76b380c1434c)
     )
-    (fp_text value "ROW3" (at 0 20.55) (layer "F.SilkS")
+    (fp_text value "ROW3" (at 0 20.55 -270) (layer "F.SilkS")
       (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 78fa9d0a-b319-40f5-af5c-9b67602adf03)
     )
-    (fp_text user "${REFERENCE}" (at 0 8.89 90) (layer "F.Fab") hide
+    (fp_text user "${REFERENCE}" (at 0 8.89) (layer "F.Fab") hide
       (effects (font (size 1 1) (thickness 0.15)))
       (tstamp fb94971b-230a-497e-9daf-e8f08c0c2223)
     )
@@ -1378,21 +1736,21 @@
     (fp_line (start 1.27 19.05) (end -1.27 19.05) (layer "F.Fab") (width 0.1) (tstamp 5b89da72-879f-440b-96c6-c1f1e0879801))
     (fp_line (start -1.27 19.05) (end -1.27 -1.27) (layer "F.Fab") (width 0.1) (tstamp e3e0fcc8-c608-43ea-afd3-660516bd7071))
     (fp_line (start -1.27 -1.27) (end 0.635 -1.27) (layer "F.Fab") (width 0.1) (tstamp fdd408ca-5d6d-48c9-8073-ad1770355341))
-    (pad "1" thru_hole rect (at 0 0 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "1" thru_hole rect (at 0 0 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 50 "Net-(JK3-Pad1)") (pinfunction "Pin_1") (pintype "passive") (tstamp 925ce23b-0098-40fe-8ac7-c13cd1cf1f9d))
-    (pad "2" thru_hole oval (at 0 2.54 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "2" thru_hole oval (at 0 2.54 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 50 "Net-(JK3-Pad1)") (pinfunction "Pin_2") (pintype "passive") (tstamp 6249050e-da8b-480e-ba89-59b6fa9cb4cb))
-    (pad "3" thru_hole oval (at 0 5.08 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "3" thru_hole oval (at 0 5.08 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 50 "Net-(JK3-Pad1)") (pinfunction "Pin_3") (pintype "passive") (tstamp b15c58f2-138f-4e2e-a1f0-f72bcc780684))
-    (pad "4" thru_hole oval (at 0 7.62 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "4" thru_hole oval (at 0 7.62 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 50 "Net-(JK3-Pad1)") (pinfunction "Pin_4") (pintype "passive") (tstamp 3be5bcc6-6fde-4e00-9ca1-bdc52f967f0f))
-    (pad "5" thru_hole oval (at 0 10.16 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "5" thru_hole oval (at 0 10.16 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 50 "Net-(JK3-Pad1)") (pinfunction "Pin_5") (pintype "passive") (tstamp 5681f026-6461-4b97-af09-2b771dee272e))
-    (pad "6" thru_hole oval (at 0 12.7 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "6" thru_hole oval (at 0 12.7 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 50 "Net-(JK3-Pad1)") (pinfunction "Pin_6") (pintype "passive") (tstamp 4461fe1c-911c-4869-abec-1bd3f3171e7b))
-    (pad "7" thru_hole oval (at 0 15.24 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "7" thru_hole oval (at 0 15.24 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 50 "Net-(JK3-Pad1)") (pinfunction "Pin_7") (pintype "passive") (tstamp 11c2657f-4884-45b1-91f9-c468486f0c77))
-    (pad "8" thru_hole oval (at 0 17.78 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "8" thru_hole oval (at 0 17.78 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 50 "Net-(JK3-Pad1)") (pinfunction "Pin_8") (pintype "passive") (tstamp 0643c5fb-ba8e-486e-ab50-199940b54645))
     (model "${KICAD6_3DMODEL_DIR}/Connector_PinSocket_2.54mm.3dshapes/PinSocket_1x08_P2.54mm_Vertical.wrl"
       (offset (xyz 0 0 0))
@@ -1497,24 +1855,67 @@
     )
   )
 
+  (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (layer "F.Cu")
+    (tedit 5A1DC084) (tstamp 22876da4-6173-4cee-aff0-6f741c24d508)
+    (at 53.34 45.72)
+    (descr "solder Pin_ with flat fork, hole diameter 0.7mm, length 6.5mm, width 1.8mm")
+    (tags "solder Pin_ with flat fork")
+    (property "Sheetfile" "keymatrix_extdiode_wire.kicad_sch")
+    (property "Sheetname" "KeyMatrix wired")
+    (path "/86fd0b4b-b0c8-4da7-922a-6650d5003f71/4819908d-cfd1-465f-9b62-2ce7b5db795b")
+    (attr through_hole)
+    (fp_text reference "J32" (at 0 1.8) (layer "F.SilkS") hide
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 0d925833-dccb-4e15-be23-69beff1a5884)
+    )
+    (fp_text value "R2" (at -0.025 5.08) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 02a319e0-fb9d-4e3c-9b70-0723d9e4addc)
+    )
+    (fp_text user "${REFERENCE}" (at 0 1.8) (layer "F.Fab") hide
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 2e886aba-90d1-4427-9ed6-dfc77d460eae)
+    )
+    (fp_line (start 0.9 -0.95) (end -0.95 -0.95) (layer "F.SilkS") (width 0.12) (tstamp 1238fc37-b0ef-40ea-80c5-a10ab39725c3))
+    (fp_line (start -0.95 0.95) (end 0.9 0.95) (layer "F.SilkS") (width 0.12) (tstamp 1c2e0d04-0111-48cc-ac9d-8a4fa42d4d51))
+    (fp_line (start -0.95 -0.95) (end -0.95 0.95) (layer "F.SilkS") (width 0.12) (tstamp 6bce3627-7853-4ba9-8ec6-b207afe8ebab))
+    (fp_line (start 0.9 0.95) (end 0.9 -0.9) (layer "F.SilkS") (width 0.12) (tstamp d8892d27-c191-402a-af96-2f58d4d323d2))
+    (fp_line (start 0.9 -0.9) (end 0.9 -0.95) (layer "F.SilkS") (width 0.12) (tstamp e0d47248-ce8a-439d-b01c-7ca6af193523))
+    (fp_line (start -1.4 -1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp 391ac68b-dda1-4114-a497-a5a7f3466ccf))
+    (fp_line (start -1.4 -1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp 54329482-0ea1-436e-83f0-c843539b8b9e))
+    (fp_line (start 1.35 1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp 621b96af-5459-4b8a-bdaa-ff7146d60274))
+    (fp_line (start 1.35 1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp ea3e800f-913a-4265-a41e-c2f859811fe8))
+    (fp_line (start -0.9 0.25) (end -0.9 -0.25) (layer "F.Fab") (width 0.12) (tstamp 431a68ed-cce3-4fae-9281-596d89cd2342))
+    (fp_line (start 0.85 -0.25) (end 0.85 0.25) (layer "F.Fab") (width 0.12) (tstamp 4c24fb55-aa3f-4c64-951b-43707d65d73a))
+    (fp_line (start -0.9 -0.25) (end 0.85 -0.25) (layer "F.Fab") (width 0.12) (tstamp 5deb3030-34ec-4bf5-a74e-0c5896bb1476))
+    (fp_line (start 0.85 0.25) (end -0.9 0.25) (layer "F.Fab") (width 0.12) (tstamp 7de44ea4-e660-4b7b-9f5c-00a5cc43e645))
+    (pad "1" thru_hole circle (at 0 0) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 171 "Net-(J32-Pad1)") (pinfunction "Pin_1") (pintype "passive") (tstamp bc2eff40-16d3-440f-b575-2b07b4310bdf))
+    (model "${KICAD6_3DMODEL_DIR}/Connector_Pin.3dshapes/Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
   (footprint "Connector_PinSocket_2.54mm:PinSocket_1x08_P2.54mm_Vertical" (layer "F.Cu")
     (tedit 5A19A420) (tstamp 234b8920-a74a-4224-ba9e-cfdb60241bb4)
-    (at 33.02 129.54 180)
+    (at 81.28 109.22 -90)
     (descr "Through hole straight socket strip, 1x08, 2.54mm pitch, single row (from Kicad 4.0.7), script generated")
     (tags "Through hole socket strip THT 1x08 2.54mm single row")
     (property "Sheetfile" "keymatrix_extdiode.kicad_sch")
     (property "Sheetname" "KeyMatrix Ext Diodes")
     (path "/7a807cd9-4b53-4d34-8616-454af4054d6a/254082e6-8a5a-4a48-b6e0-9d740cdfde71")
     (attr through_hole)
-    (fp_text reference "JK8" (at 0 -2.77) (layer "F.SilkS") hide
+    (fp_text reference "JK8" (at 0 -2.77 -270) (layer "F.SilkS") hide
       (effects (font (size 1 1) (thickness 0.15)))
       (tstamp e38ac691-790d-4d0b-a87f-ebab35f8baa1)
     )
-    (fp_text value "ROW8" (at 0 -2.54) (layer "F.SilkS")
+    (fp_text value "ROW8" (at 0 -2.54 -270) (layer "F.SilkS")
       (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 5775e194-b2fd-4007-8048-b771adfec218)
     )
-    (fp_text user "${REFERENCE}" (at 0 8.89 90) (layer "F.Fab") hide
+    (fp_text user "${REFERENCE}" (at 0 8.89) (layer "F.Fab") hide
       (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 1242995d-428f-40a2-bd95-02f213fe78f6)
     )
@@ -1533,21 +1934,21 @@
     (fp_line (start 1.27 -0.635) (end 1.27 19.05) (layer "F.Fab") (width 0.1) (tstamp 9d784278-e2f6-42ae-a3c7-1bf55508c20f))
     (fp_line (start -1.27 19.05) (end -1.27 -1.27) (layer "F.Fab") (width 0.1) (tstamp b913eae4-beea-4246-b1aa-cbecc96a0971))
     (fp_line (start 1.27 19.05) (end -1.27 19.05) (layer "F.Fab") (width 0.1) (tstamp d4d856da-3698-430f-84c4-4e691a7fb2d9))
-    (pad "1" thru_hole rect (at 0 0 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "1" thru_hole rect (at 0 0 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 59 "Net-(JK8-Pad1)") (pinfunction "Pin_1") (pintype "passive") (tstamp 6d6d6b20-c742-46d7-81dd-71843426bd72))
-    (pad "2" thru_hole oval (at 0 2.54 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "2" thru_hole oval (at 0 2.54 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 59 "Net-(JK8-Pad1)") (pinfunction "Pin_2") (pintype "passive") (tstamp 590bd1b0-55f7-4e1a-b85a-60a9b0243bd1))
-    (pad "3" thru_hole oval (at 0 5.08 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "3" thru_hole oval (at 0 5.08 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 59 "Net-(JK8-Pad1)") (pinfunction "Pin_3") (pintype "passive") (tstamp 55c6e39b-b120-44a4-af4c-e7eb7b02a6bd))
-    (pad "4" thru_hole oval (at 0 7.62 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "4" thru_hole oval (at 0 7.62 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 59 "Net-(JK8-Pad1)") (pinfunction "Pin_4") (pintype "passive") (tstamp e5c63fa4-d1c1-4af3-b7db-1ef290d50144))
-    (pad "5" thru_hole oval (at 0 10.16 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "5" thru_hole oval (at 0 10.16 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 59 "Net-(JK8-Pad1)") (pinfunction "Pin_5") (pintype "passive") (tstamp 453420d5-9d85-497c-9ec0-e19fb4314dd3))
-    (pad "6" thru_hole oval (at 0 12.7 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "6" thru_hole oval (at 0 12.7 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 59 "Net-(JK8-Pad1)") (pinfunction "Pin_6") (pintype "passive") (tstamp e30018fc-b176-4d90-a7f6-0a2c2226b2cd))
-    (pad "7" thru_hole oval (at 0 15.24 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "7" thru_hole oval (at 0 15.24 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 59 "Net-(JK8-Pad1)") (pinfunction "Pin_7") (pintype "passive") (tstamp c032e423-cdbd-40ad-92b2-0a107dd5179a))
-    (pad "8" thru_hole oval (at 0 17.78 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "8" thru_hole oval (at 0 17.78 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 59 "Net-(JK8-Pad1)") (pinfunction "Pin_8") (pintype "passive") (tstamp 02ad6ba0-ce4a-4f6d-b42f-849d16084f7a))
     (model "${KICAD6_3DMODEL_DIR}/Connector_PinSocket_2.54mm.3dshapes/PinSocket_1x08_P2.54mm_Vertical.wrl"
       (offset (xyz 0 0 0))
@@ -1556,6 +1957,49 @@
     )
   )
 
+  (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (layer "F.Cu")
+    (tedit 5A1DC084) (tstamp 257a43be-3849-4c05-9f72-7ad1bcea5448)
+    (at 48.26 58.42)
+    (descr "solder Pin_ with flat fork, hole diameter 0.7mm, length 6.5mm, width 1.8mm")
+    (tags "solder Pin_ with flat fork")
+    (property "Sheetfile" "keymatrix_extdiode_wire.kicad_sch")
+    (property "Sheetname" "KeyMatrix wired")
+    (path "/86fd0b4b-b0c8-4da7-922a-6650d5003f71/31c61803-b73f-4a77-8c6a-0adc05864be1")
+    (attr through_hole)
+    (fp_text reference "J41" (at 0 1.8) (layer "F.SilkS") hide
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp b5094eef-9f39-4eff-9d68-32771bd2a5d7)
+    )
+    (fp_text value "C3" (at 0 -5.08) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 89b4cd9e-3141-400b-807d-70bde2e207c1)
+    )
+    (fp_text user "${REFERENCE}" (at 0 1.8) (layer "F.Fab") hide
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 7de73a63-1203-4cf6-b197-7c7ef986c70f)
+    )
+    (fp_line (start 0.9 -0.95) (end -0.95 -0.95) (layer "F.SilkS") (width 0.12) (tstamp 0658d96c-bfbd-425f-a8dd-b760f9811985))
+    (fp_line (start -0.95 0.95) (end 0.9 0.95) (layer "F.SilkS") (width 0.12) (tstamp 19d2e95a-dc04-407f-be81-df67b85eb5a7))
+    (fp_line (start 0.9 -0.9) (end 0.9 -0.95) (layer "F.SilkS") (width 0.12) (tstamp 35077b29-c5e2-4a4e-8b10-c979e46b261f))
+    (fp_line (start -0.95 -0.95) (end -0.95 0.95) (layer "F.SilkS") (width 0.12) (tstamp 3c64a8a7-5b1b-4cb6-9ae0-97f2ec0bb19a))
+    (fp_line (start 0.9 0.95) (end 0.9 -0.9) (layer "F.SilkS") (width 0.12) (tstamp ae533d36-6d70-4511-85bf-22b0a2f39320))
+    (fp_line (start -1.4 -1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp 69264c76-9f0e-4895-af38-f93fc82bbad4))
+    (fp_line (start 1.35 1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp 79d73f8e-ca17-4607-b895-8c7c2b10c5d2))
+    (fp_line (start -1.4 -1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp b3b0a7cb-49cd-48e2-a918-b7d3f1c3cd2f))
+    (fp_line (start 1.35 1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp c9fcd0a1-fff3-4987-a890-6b2882deb5c2))
+    (fp_line (start 0.85 -0.25) (end 0.85 0.25) (layer "F.Fab") (width 0.12) (tstamp 03d73340-7d05-4084-979c-7691c75cb4de))
+    (fp_line (start -0.9 -0.25) (end 0.85 -0.25) (layer "F.Fab") (width 0.12) (tstamp 28c3f832-75c6-472c-9ddd-8a90ab09c03d))
+    (fp_line (start -0.9 0.25) (end -0.9 -0.25) (layer "F.Fab") (width 0.12) (tstamp 2e19352a-2d06-44a4-ab94-29cd261b2fe6))
+    (fp_line (start 0.85 0.25) (end -0.9 0.25) (layer "F.Fab") (width 0.12) (tstamp bf74ef38-2ae8-4b93-b987-6f937b195342))
+    (pad "1" thru_hole circle (at 0 0) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 180 "Net-(J41-Pad1)") (pinfunction "Pin_1") (pintype "passive") (tstamp b82e839d-feff-485f-a698-8db273695973))
+    (model "${KICAD6_3DMODEL_DIR}/Connector_Pin.3dshapes/Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
   (footprint "Diode_THT:D_DO-35_SOD27_P2.54mm_Vertical_AnodeUp" (layer "F.Cu")
     (tedit 5AE50CD5) (tstamp 25c72e85-368b-4f4d-b62e-88af5da66328)
     (at 175.26 33.02 -90)
@@ -1652,6 +2096,49 @@
     )
   )
 
+  (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (layer "F.Cu")
+    (tedit 5A1DC084) (tstamp 260d316a-afcb-47fb-9cc4-c0ebdd6e99e0)
+    (at 27.94 25.4)
+    (descr "solder Pin_ with flat fork, hole diameter 0.7mm, length 6.5mm, width 1.8mm")
+    (tags "solder Pin_ with flat fork")
+    (property "Sheetfile" "cimdit.kicad_sch")
+    (property "Sheetname" "")
+    (path "/a9a75cb9-f8cf-4866-ad8c-e5c1c70caaa2")
+    (attr through_hole)
+    (fp_text reference "J27" (at 0 1.8) (layer "F.SilkS") hide
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp d0f7394c-ceb3-4217-9ecb-df09d2215173)
+    )
+    (fp_text value "DATA" (at -2.54 0 90) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp c03aac8f-2c88-4d06-9566-5dae9b575cac)
+    )
+    (fp_text user "${REFERENCE}" (at 0 1.8) (layer "F.Fab") hide
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 588edd11-2e50-4108-9a03-93d34c69db3f)
+    )
+    (fp_line (start -0.95 -0.95) (end -0.95 0.95) (layer "F.SilkS") (width 0.12) (tstamp 13829c8a-4754-49a5-a64f-833517abd83b))
+    (fp_line (start 0.9 -0.95) (end -0.95 -0.95) (layer "F.SilkS") (width 0.12) (tstamp 3ae99dd6-68c6-4c0f-8029-48571177a4a4))
+    (fp_line (start 0.9 0.95) (end 0.9 -0.9) (layer "F.SilkS") (width 0.12) (tstamp 4d3fbe30-8d80-40e0-b7ae-5eda5664f629))
+    (fp_line (start 0.9 -0.9) (end 0.9 -0.95) (layer "F.SilkS") (width 0.12) (tstamp 5a2ffe10-ce02-42f9-a474-f76d881a7163))
+    (fp_line (start -0.95 0.95) (end 0.9 0.95) (layer "F.SilkS") (width 0.12) (tstamp 5f567410-98c0-4c61-86ba-d95ac31b434f))
+    (fp_line (start -1.4 -1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp 2b3b87fe-178d-462c-ba75-4c49c832fa94))
+    (fp_line (start 1.35 1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp 719bda63-4195-4c5c-a44b-ca388f59907f))
+    (fp_line (start 1.35 1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp 9eccfedf-a791-4695-b0af-985ec515edcb))
+    (fp_line (start -1.4 -1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp c0358443-e9f9-4f80-a497-d7dbc807ef4d))
+    (fp_line (start 0.85 -0.25) (end 0.85 0.25) (layer "F.Fab") (width 0.12) (tstamp 05cb59fe-da5f-4695-a492-e1a7a16aeb5e))
+    (fp_line (start 0.85 0.25) (end -0.9 0.25) (layer "F.Fab") (width 0.12) (tstamp 472fc804-d674-4867-b49d-d0b7110e09ff))
+    (fp_line (start -0.9 -0.25) (end 0.85 -0.25) (layer "F.Fab") (width 0.12) (tstamp 6280022d-17f6-48ad-a197-535eafd9dff4))
+    (fp_line (start -0.9 0.25) (end -0.9 -0.25) (layer "F.Fab") (width 0.12) (tstamp 86d0ebd6-3f72-4457-9c26-bbd62913d687))
+    (pad "1" thru_hole circle (at 0 0) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 13 "/Rotary Encoder/I2C_DATA_ROT") (pinfunction "Pin_1") (pintype "passive") (tstamp 1cb8969e-d6f6-458f-ad19-ff8d1f94f199))
+    (model "${KICAD6_3DMODEL_DIR}/Connector_Pin.3dshapes/Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
   (footprint "Connector_PinSocket_2.54mm:PinSocket_1x08_P2.54mm_Vertical" (layer "F.Cu")
     (tedit 5A19A420) (tstamp 27dc23fe-58b6-49a5-96f7-ae1c17cf5172)
     (at 147.32 68.605 90)
@@ -1711,6 +2198,49 @@
     )
   )
 
+  (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (layer "F.Cu")
+    (tedit 5A1DC084) (tstamp 27ff589f-3de7-4185-b7df-d1dbb0da622f)
+    (at 43.18 38.1)
+    (descr "solder Pin_ with flat fork, hole diameter 0.7mm, length 6.5mm, width 1.8mm")
+    (tags "solder Pin_ with flat fork")
+    (property "Sheetfile" "rotary.kicad_sch")
+    (property "Sheetname" "Rotary Encoder")
+    (path "/0e0cd3f9-9e59-4187-9e69-2f18dd8368cc/afaec224-6eb9-4aa4-acce-937066a89442")
+    (attr through_hole)
+    (fp_text reference "J15" (at 0 1.8) (layer "F.SilkS") hide
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp d9e49fc4-46fe-482b-8906-61af7c1472eb)
+    )
+    (fp_text value "B4" (at -0.025 -4.445) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp a3c320b8-4eef-49ac-b336-329b66e86bef)
+    )
+    (fp_text user "${REFERENCE}" (at 0 1.8) (layer "F.Fab") hide
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 225fc398-2971-432f-ba6d-b4d5757d1c6e)
+    )
+    (fp_line (start -0.95 -0.95) (end -0.95 0.95) (layer "F.SilkS") (width 0.12) (tstamp 156771b5-21dc-43d8-ba98-5c070b5e3b90))
+    (fp_line (start 0.9 0.95) (end 0.9 -0.9) (layer "F.SilkS") (width 0.12) (tstamp 677f7fd6-fe65-4132-818c-44a0c91f5c31))
+    (fp_line (start 0.9 -0.95) (end -0.95 -0.95) (layer "F.SilkS") (width 0.12) (tstamp 8727dfe0-a564-4062-a385-c46672a2b168))
+    (fp_line (start 0.9 -0.9) (end 0.9 -0.95) (layer "F.SilkS") (width 0.12) (tstamp 8edc60cf-d5df-4697-953b-31cc055aba5f))
+    (fp_line (start -0.95 0.95) (end 0.9 0.95) (layer "F.SilkS") (width 0.12) (tstamp 915afd34-85f2-4f65-b2f6-5c607c325148))
+    (fp_line (start 1.35 1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp 8bf24a80-dffc-49df-8d9b-da527be5fdc9))
+    (fp_line (start 1.35 1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp 9eac701a-d699-4247-93a2-af5e41c3ae6e))
+    (fp_line (start -1.4 -1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp a1357a48-2956-4148-ac29-519f0e770f12))
+    (fp_line (start -1.4 -1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp e0ba3ee5-78a5-4635-88aa-b5b3d5589222))
+    (fp_line (start 0.85 -0.25) (end 0.85 0.25) (layer "F.Fab") (width 0.12) (tstamp 004d701c-7e69-4a10-9c95-7de04fa2be20))
+    (fp_line (start 0.85 0.25) (end -0.9 0.25) (layer "F.Fab") (width 0.12) (tstamp 787fdc1e-7e28-46d4-9188-bbfe7882ee50))
+    (fp_line (start -0.9 -0.25) (end 0.85 -0.25) (layer "F.Fab") (width 0.12) (tstamp abcba4f1-6f59-48a1-8ae5-91c9b3b973a4))
+    (fp_line (start -0.9 0.25) (end -0.9 -0.25) (layer "F.Fab") (width 0.12) (tstamp eda12c9f-b24f-4458-a3cc-61f318dc57fe))
+    (pad "1" thru_hole circle (at 0 0) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 152 "Net-(J15-Pad1)") (pinfunction "Pin_1") (pintype "passive") (tstamp 58ed07e4-b138-4a86-827e-36284fa14c0b))
+    (model "${KICAD6_3DMODEL_DIR}/Connector_Pin.3dshapes/Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
   (footprint "Diode_THT:D_DO-35_SOD27_P2.54mm_Vertical_AnodeUp" (layer "F.Cu")
     (tedit 5AE50CD5) (tstamp 2928ea20-8541-4021-a606-452f78a20d19)
     (at 162.56 63.5 -90)
@@ -1759,24 +2289,67 @@
     )
   )
 
+  (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (layer "F.Cu")
+    (tedit 5A1DC084) (tstamp 29df3f6f-748c-4874-adac-147e5b573cc0)
+    (at 40.64 58.42)
+    (descr "solder Pin_ with flat fork, hole diameter 0.7mm, length 6.5mm, width 1.8mm")
+    (tags "solder Pin_ with flat fork")
+    (property "Sheetfile" "keymatrix_extdiode_wire.kicad_sch")
+    (property "Sheetname" "KeyMatrix wired")
+    (path "/86fd0b4b-b0c8-4da7-922a-6650d5003f71/ad826993-8060-4ac8-b31b-fb9ea3e66c9e")
+    (attr through_hole)
+    (fp_text reference "J38" (at 0 1.8) (layer "F.SilkS") hide
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp ad033d3f-7515-4bd5-8071-19514401ff9c)
+    )
+    (fp_text value "C0" (at 0 -5.08) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 386e0141-bfec-4df2-994c-6e60070752a4)
+    )
+    (fp_text user "${REFERENCE}" (at 0 1.8) (layer "F.Fab") hide
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 07c35ce4-407e-46bd-9fd6-02e59a1a39c0)
+    )
+    (fp_line (start -0.95 -0.95) (end -0.95 0.95) (layer "F.SilkS") (width 0.12) (tstamp 5448dfbe-f8c5-4321-83be-b8da4a6f7008))
+    (fp_line (start 0.9 -0.9) (end 0.9 -0.95) (layer "F.SilkS") (width 0.12) (tstamp 7ccba34f-4bcd-4aaf-a5ff-8608b3ef7a07))
+    (fp_line (start 0.9 -0.95) (end -0.95 -0.95) (layer "F.SilkS") (width 0.12) (tstamp 82d18c53-ae61-47b8-8220-d0c0f67879dc))
+    (fp_line (start 0.9 0.95) (end 0.9 -0.9) (layer "F.SilkS") (width 0.12) (tstamp d793383b-7c58-4e0c-8e2d-5ddb26c377e3))
+    (fp_line (start -0.95 0.95) (end 0.9 0.95) (layer "F.SilkS") (width 0.12) (tstamp f7c68938-c19e-48f9-88bf-5a1a6ebe7506))
+    (fp_line (start -1.4 -1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp 50d363e5-01c1-4695-965f-b8325a3fe035))
+    (fp_line (start -1.4 -1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp 5b17eec4-07a7-4eb8-a2a5-5eafc122f204))
+    (fp_line (start 1.35 1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp 64430570-0a8e-4d39-a725-9ce9c1f0532e))
+    (fp_line (start 1.35 1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp 6d66f42e-0f95-4b42-b02b-c52ef54a5f8b))
+    (fp_line (start -0.9 0.25) (end -0.9 -0.25) (layer "F.Fab") (width 0.12) (tstamp 3880c54a-722f-4831-82c4-cb9c60b240ac))
+    (fp_line (start -0.9 -0.25) (end 0.85 -0.25) (layer "F.Fab") (width 0.12) (tstamp 4f92886e-1254-41f5-bdfb-f991f8f5e60d))
+    (fp_line (start 0.85 0.25) (end -0.9 0.25) (layer "F.Fab") (width 0.12) (tstamp 5a455553-33d6-41a4-9d5c-5fc0d0702eda))
+    (fp_line (start 0.85 -0.25) (end 0.85 0.25) (layer "F.Fab") (width 0.12) (tstamp c5a6c2f2-238c-4e0b-8412-a2399875cc4a))
+    (pad "1" thru_hole circle (at 0 0) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 177 "Net-(J38-Pad1)") (pinfunction "Pin_1") (pintype "passive") (tstamp e5340b9c-b4e5-423d-ab82-ef3bd8f3bf9e))
+    (model "${KICAD6_3DMODEL_DIR}/Connector_Pin.3dshapes/Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
   (footprint "Connector_PinSocket_2.54mm:PinSocket_1x08_P2.54mm_Vertical" (layer "F.Cu")
     (tedit 5A19A420) (tstamp 29f9e224-de0c-40d3-8828-3dbebcd4cdb9)
-    (at 30.48 129.54 180)
+    (at 81.28 111.76 -90)
     (descr "Through hole straight socket strip, 1x08, 2.54mm pitch, single row (from Kicad 4.0.7), script generated")
     (tags "Through hole socket strip THT 1x08 2.54mm single row")
     (property "Sheetfile" "keymatrix_extdiode.kicad_sch")
     (property "Sheetname" "KeyMatrix Ext Diodes")
     (path "/7a807cd9-4b53-4d34-8616-454af4054d6a/1fad7c0e-1222-4e2c-b60d-86033f546938")
     (attr through_hole)
-    (fp_text reference "JK7" (at 0 -2.77) (layer "F.SilkS") hide
+    (fp_text reference "JK7" (at 0 -2.77 -270) (layer "F.SilkS") hide
       (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 1e2ea8e0-e55b-4eb5-b5df-25dd678a2bf7)
     )
-    (fp_text value "ROW7" (at 0 20.55) (layer "F.SilkS")
+    (fp_text value "ROW7" (at 0 20.55 -270) (layer "F.SilkS")
       (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 7a93b4f7-bbee-42bc-bb48-05087cffe2dc)
     )
-    (fp_text user "${REFERENCE}" (at 0 8.89 90) (layer "F.Fab") hide
+    (fp_text user "${REFERENCE}" (at 0 8.89) (layer "F.Fab") hide
       (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 4c5578e4-2f01-4b64-b5d0-7d34e23c6a97)
     )
@@ -1795,21 +2368,21 @@
     (fp_line (start -1.27 -1.27) (end 0.635 -1.27) (layer "F.Fab") (width 0.1) (tstamp 58e0d859-6778-48c4-84de-c1fd4abdc723))
     (fp_line (start -1.27 19.05) (end -1.27 -1.27) (layer "F.Fab") (width 0.1) (tstamp 83b29e81-6fad-4977-aca1-5d9c3a19eb33))
     (fp_line (start 0.635 -1.27) (end 1.27 -0.635) (layer "F.Fab") (width 0.1) (tstamp adb74a00-dc7b-4987-9e42-24debc8606b9))
-    (pad "1" thru_hole rect (at 0 0 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "1" thru_hole rect (at 0 0 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 58 "Net-(JK7-Pad1)") (pinfunction "Pin_1") (pintype "passive") (tstamp 75bb3744-a91c-4e8d-8460-cfe5b4546c2d))
-    (pad "2" thru_hole oval (at 0 2.54 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "2" thru_hole oval (at 0 2.54 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 58 "Net-(JK7-Pad1)") (pinfunction "Pin_2") (pintype "passive") (tstamp 2a7bbcab-fc15-4f5b-b8f6-a7cdaacb84c4))
-    (pad "3" thru_hole oval (at 0 5.08 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "3" thru_hole oval (at 0 5.08 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 58 "Net-(JK7-Pad1)") (pinfunction "Pin_3") (pintype "passive") (tstamp abc66a50-6214-42a1-b1c4-c5e3527744b6))
-    (pad "4" thru_hole oval (at 0 7.62 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "4" thru_hole oval (at 0 7.62 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 58 "Net-(JK7-Pad1)") (pinfunction "Pin_4") (pintype "passive") (tstamp 31626a48-065a-445f-8bde-b4a32ed2c7b1))
-    (pad "5" thru_hole oval (at 0 10.16 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "5" thru_hole oval (at 0 10.16 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 58 "Net-(JK7-Pad1)") (pinfunction "Pin_5") (pintype "passive") (tstamp 9e377702-74b2-4c5f-965a-a13cac8dd9b8))
-    (pad "6" thru_hole oval (at 0 12.7 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "6" thru_hole oval (at 0 12.7 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 58 "Net-(JK7-Pad1)") (pinfunction "Pin_6") (pintype "passive") (tstamp 5fa44da3-fe2c-43e9-9e1a-30cb987e5331))
-    (pad "7" thru_hole oval (at 0 15.24 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "7" thru_hole oval (at 0 15.24 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 58 "Net-(JK7-Pad1)") (pinfunction "Pin_7") (pintype "passive") (tstamp bdbed806-9dae-4b96-adec-b1df8ed6ba43))
-    (pad "8" thru_hole oval (at 0 17.78 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "8" thru_hole oval (at 0 17.78 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 58 "Net-(JK7-Pad1)") (pinfunction "Pin_8") (pintype "passive") (tstamp 645574fc-37aa-4582-aec8-2cf6be3dabc5))
     (model "${KICAD6_3DMODEL_DIR}/Connector_PinSocket_2.54mm.3dshapes/PinSocket_1x08_P2.54mm_Vertical.wrl"
       (offset (xyz 0 0 0))
@@ -1818,6 +2391,49 @@
     )
   )
 
+  (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (layer "F.Cu")
+    (tedit 5A1DC084) (tstamp 2df97280-a7fd-4d41-8dbd-6b6c7b25d23b)
+    (at 50.8 58.42)
+    (descr "solder Pin_ with flat fork, hole diameter 0.7mm, length 6.5mm, width 1.8mm")
+    (tags "solder Pin_ with flat fork")
+    (property "Sheetfile" "keymatrix_extdiode_wire.kicad_sch")
+    (property "Sheetname" "KeyMatrix wired")
+    (path "/86fd0b4b-b0c8-4da7-922a-6650d5003f71/308a8331-62e8-47c8-97d7-77c125dbca58")
+    (attr through_hole)
+    (fp_text reference "J42" (at 0 1.8) (layer "F.SilkS") hide
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 1cc0cee9-b5cd-46f1-be4e-672b3110c552)
+    )
+    (fp_text value "C4" (at 0 -5.08) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 39fe0ad2-879e-4613-80db-b6597ddd715f)
+    )
+    (fp_text user "${REFERENCE}" (at 0 1.8) (layer "F.Fab") hide
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 42f95bdf-2bbf-4138-91d4-3465ff587469)
+    )
+    (fp_line (start 0.9 -0.95) (end -0.95 -0.95) (layer "F.SilkS") (width 0.12) (tstamp 08bd36f6-27d6-4196-8311-2f9fbef01a8b))
+    (fp_line (start -0.95 -0.95) (end -0.95 0.95) (layer "F.SilkS") (width 0.12) (tstamp 1fb16541-bc7d-4847-83a0-0c4eec111ac0))
+    (fp_line (start 0.9 -0.9) (end 0.9 -0.95) (layer "F.SilkS") (width 0.12) (tstamp 6e2999e0-6117-41cf-9fad-01e6edef9c84))
+    (fp_line (start 0.9 0.95) (end 0.9 -0.9) (layer "F.SilkS") (width 0.12) (tstamp bbdb96ac-b023-404c-b291-c0956d537adf))
+    (fp_line (start -0.95 0.95) (end 0.9 0.95) (layer "F.SilkS") (width 0.12) (tstamp bc67eb24-176e-4903-8ea6-c24e90adad44))
+    (fp_line (start 1.35 1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp 1ba9cee0-3351-421a-92fd-2a4dfa088328))
+    (fp_line (start -1.4 -1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp 31347198-46c5-4ca3-aab0-0fb2ecbe1887))
+    (fp_line (start 1.35 1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp 48809651-568a-44d7-9220-81ecac8c4776))
+    (fp_line (start -1.4 -1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp f3f15c00-e138-45fe-b851-d56b93c71c4a))
+    (fp_line (start -0.9 0.25) (end -0.9 -0.25) (layer "F.Fab") (width 0.12) (tstamp 816d0585-8f64-4c5c-9e96-e44a5078155d))
+    (fp_line (start -0.9 -0.25) (end 0.85 -0.25) (layer "F.Fab") (width 0.12) (tstamp 8e6d0d3e-22d3-41e2-9846-097b0e7f84d4))
+    (fp_line (start 0.85 0.25) (end -0.9 0.25) (layer "F.Fab") (width 0.12) (tstamp b39c647d-5f7c-4dd0-b7f3-04178b86815a))
+    (fp_line (start 0.85 -0.25) (end 0.85 0.25) (layer "F.Fab") (width 0.12) (tstamp c9de39da-e912-42ff-a2b7-7995c2f44381))
+    (pad "1" thru_hole circle (at 0 0) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 181 "Net-(J42-Pad1)") (pinfunction "Pin_1") (pintype "passive") (tstamp ffb655a1-f3da-42de-aec2-c9d423064714))
+    (model "${KICAD6_3DMODEL_DIR}/Connector_Pin.3dshapes/Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
   (footprint "Diode_THT:D_DO-35_SOD27_P2.54mm_Vertical_AnodeUp" (layer "F.Cu")
     (tedit 5AE50CD5) (tstamp 2e919ef1-aef7-4093-8e65-23f808c67039)
     (at 180.34 33.02 -90)
@@ -2261,6 +2877,92 @@
     )
   )
 
+  (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (layer "F.Cu")
+    (tedit 5A1DC084) (tstamp 3b0bbe34-c31b-4e8f-858d-5fb9f9a1f254)
+    (at 50.8 45.72)
+    (descr "solder Pin_ with flat fork, hole diameter 0.7mm, length 6.5mm, width 1.8mm")
+    (tags "solder Pin_ with flat fork")
+    (property "Sheetfile" "keymatrix_extdiode_wire.kicad_sch")
+    (property "Sheetname" "KeyMatrix wired")
+    (path "/86fd0b4b-b0c8-4da7-922a-6650d5003f71/4971e12a-d07a-4b0a-8cfd-ea8bd16efa5a")
+    (attr through_hole)
+    (fp_text reference "J33" (at 0 1.8) (layer "F.SilkS") hide
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp da172ae5-842d-42c7-a49c-20bae12c4b8f)
+    )
+    (fp_text value "R3" (at -0.025 5.08) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 99d49147-09e0-409a-bef7-5e2145406ba2)
+    )
+    (fp_text user "${REFERENCE}" (at 0 1.8) (layer "F.Fab") hide
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 7fd485bf-fcb4-41a1-8c5b-087505f61e04)
+    )
+    (fp_line (start 0.9 -0.9) (end 0.9 -0.95) (layer "F.SilkS") (width 0.12) (tstamp 150da4b1-6451-44a7-8ae6-faa342460210))
+    (fp_line (start 0.9 -0.95) (end -0.95 -0.95) (layer "F.SilkS") (width 0.12) (tstamp 19916063-f7e3-4504-a5bc-a60c8c71bb86))
+    (fp_line (start 0.9 0.95) (end 0.9 -0.9) (layer "F.SilkS") (width 0.12) (tstamp 47140528-c4e2-44b3-bc20-53f7a46f493e))
+    (fp_line (start -0.95 -0.95) (end -0.95 0.95) (layer "F.SilkS") (width 0.12) (tstamp 813c7e94-7e04-4a47-9c64-d2fbfca8a5db))
+    (fp_line (start -0.95 0.95) (end 0.9 0.95) (layer "F.SilkS") (width 0.12) (tstamp de58e641-9ad5-4173-bead-6e926668f202))
+    (fp_line (start 1.35 1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp 1082cfe9-dbb3-462a-ba9c-3da280275e6a))
+    (fp_line (start 1.35 1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp 2369cff2-508c-4f84-ac99-d8ce6e3bcf34))
+    (fp_line (start -1.4 -1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp 847da94c-120c-49e7-86b7-a77a20365a6a))
+    (fp_line (start -1.4 -1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp cdc85718-888c-4146-8050-4d029e3bad37))
+    (fp_line (start -0.9 0.25) (end -0.9 -0.25) (layer "F.Fab") (width 0.12) (tstamp 31d2eed2-98cc-4e09-aa60-e9a00cc8af36))
+    (fp_line (start -0.9 -0.25) (end 0.85 -0.25) (layer "F.Fab") (width 0.12) (tstamp 43605d53-3ca7-4ed3-be10-db6af8d179c5))
+    (fp_line (start 0.85 -0.25) (end 0.85 0.25) (layer "F.Fab") (width 0.12) (tstamp 4861ac2f-8d8c-4811-9567-2a97a88d31e0))
+    (fp_line (start 0.85 0.25) (end -0.9 0.25) (layer "F.Fab") (width 0.12) (tstamp 7063db2b-e9ac-4a3e-b28b-aaa87a857d14))
+    (pad "1" thru_hole circle (at 0 0) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 172 "Net-(J33-Pad1)") (pinfunction "Pin_1") (pintype "passive") (tstamp 515ef9a9-6c73-4ab9-abec-a02cc2abcc02))
+    (model "${KICAD6_3DMODEL_DIR}/Connector_Pin.3dshapes/Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (layer "F.Cu")
+    (tedit 5A1DC084) (tstamp 3ba82779-31bf-4934-9ae9-ede599803b0b)
+    (at 55.88 25.4)
+    (descr "solder Pin_ with flat fork, hole diameter 0.7mm, length 6.5mm, width 1.8mm")
+    (tags "solder Pin_ with flat fork")
+    (property "Sheetfile" "rotary.kicad_sch")
+    (property "Sheetname" "Rotary Encoder")
+    (path "/0e0cd3f9-9e59-4187-9e69-2f18dd8368cc/b93d027f-21f6-4fc9-ad3f-317eded6973b")
+    (attr through_hole)
+    (fp_text reference "J7" (at 0 1.8) (layer "F.SilkS") hide
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp b481b075-9fdf-42c9-9f4f-1820179a57db)
+    )
+    (fp_text value "B0" (at -0.025 4.445) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp c1d61362-65a2-49c7-92c4-42116f69f186)
+    )
+    (fp_text user "${REFERENCE}" (at 0 1.8) (layer "F.Fab") hide
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 06bea721-6e44-443f-a10b-fdb382354c72)
+    )
+    (fp_line (start 0.9 -0.9) (end 0.9 -0.95) (layer "F.SilkS") (width 0.12) (tstamp 2bf57d54-6508-4cde-9868-7d1a1f902503))
+    (fp_line (start -0.95 -0.95) (end -0.95 0.95) (layer "F.SilkS") (width 0.12) (tstamp 39dd4899-db7b-4f42-9636-f6aaf1c5eb3e))
+    (fp_line (start -0.95 0.95) (end 0.9 0.95) (layer "F.SilkS") (width 0.12) (tstamp 468f1465-a526-429e-822b-774275d0ce38))
+    (fp_line (start 0.9 0.95) (end 0.9 -0.9) (layer "F.SilkS") (width 0.12) (tstamp 5606c2c9-8d20-49a7-a220-882fb12b6de9))
+    (fp_line (start 0.9 -0.95) (end -0.95 -0.95) (layer "F.SilkS") (width 0.12) (tstamp fe34a838-864c-4aee-999e-a4d9d2a53aa1))
+    (fp_line (start 1.35 1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp 21ae025c-519f-452f-85f8-6c4a5765c910))
+    (fp_line (start 1.35 1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp b2a6473b-dbac-4141-9e30-38f28870da3c))
+    (fp_line (start -1.4 -1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp f7929113-ed56-486c-8bcb-866485096b1d))
+    (fp_line (start -1.4 -1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp fbcf8f18-273b-4de6-a7fa-1aa52b6a30eb))
+    (fp_line (start 0.85 0.25) (end -0.9 0.25) (layer "F.Fab") (width 0.12) (tstamp c594017f-aa60-467a-ab4f-3544e1ac6b56))
+    (fp_line (start -0.9 -0.25) (end 0.85 -0.25) (layer "F.Fab") (width 0.12) (tstamp c9519dbb-7fda-4b2d-904a-05f32731be38))
+    (fp_line (start 0.85 -0.25) (end 0.85 0.25) (layer "F.Fab") (width 0.12) (tstamp ce049c30-6629-4827-b32b-d3c8b0d57289))
+    (fp_line (start -0.9 0.25) (end -0.9 -0.25) (layer "F.Fab") (width 0.12) (tstamp eb5539f7-1c4d-429b-928b-15d4b3d0598a))
+    (pad "1" thru_hole circle (at 0 0) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 76 "Net-(J7-Pad1)") (pinfunction "Pin_1") (pintype "passive") (tstamp c63dc724-2c12-428d-a6d9-e73eaba68b2c))
+    (model "${KICAD6_3DMODEL_DIR}/Connector_Pin.3dshapes/Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
   (footprint "Connector_PinSocket_2.54mm:PinSocket_1x08_P2.54mm_Vertical" (layer "F.Cu")
     (tedit 5A19A420) (tstamp 3c2eb42f-9013-4478-a977-42449c129146)
     (at 185.42 38.1 -90)
@@ -2429,22 +3131,22 @@
 
   (footprint "Connector_PinSocket_2.54mm:PinSocket_1x08_P2.54mm_Vertical" (layer "F.Cu")
     (tedit 5A19A420) (tstamp 40b20146-03e0-4b43-a71c-eccef9a00c98)
-    (at 22.835 129.525 180)
+    (at 81.265 119.405 -90)
     (descr "Through hole straight socket strip, 1x08, 2.54mm pitch, single row (from Kicad 4.0.7), script generated")
     (tags "Through hole socket strip THT 1x08 2.54mm single row")
     (property "Sheetfile" "keymatrix_extdiode.kicad_sch")
     (property "Sheetname" "KeyMatrix Ext Diodes")
     (path "/7a807cd9-4b53-4d34-8616-454af4054d6a/7b075ef6-34f5-497d-b2c4-d126c3850d1c")
     (attr through_hole)
-    (fp_text reference "JK4" (at 0 -2.77) (layer "F.SilkS") hide
+    (fp_text reference "JK4" (at 0 -2.77 -270) (layer "F.SilkS") hide
       (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 3325de8c-f2c2-4c6c-8acb-8c6d57fbb840)
     )
-    (fp_text value "ROW4" (at 0 -2.555) (layer "F.SilkS")
+    (fp_text value "ROW4" (at 0 -2.555 -270) (layer "F.SilkS")
       (effects (font (size 1 1) (thickness 0.15)))
       (tstamp c5964992-9cbc-4489-9e7f-e31e383b5123)
     )
-    (fp_text user "${REFERENCE}" (at 0 8.89 90) (layer "F.Fab") hide
+    (fp_text user "${REFERENCE}" (at 0 8.89) (layer "F.Fab") hide
       (effects (font (size 1 1) (thickness 0.15)))
       (tstamp af01c317-7284-4268-a701-f371c29f155c)
     )
@@ -2459,25 +3161,25 @@
     (fp_line (start 1.75 -1.8) (end 1.75 19.55) (layer "F.CrtYd") (width 0.05) (tstamp 964fdbdd-d817-46f7-bb5a-b19937f82ab9))
     (fp_line (start 1.75 19.55) (end -1.8 19.55) (layer "F.CrtYd") (width 0.05) (tstamp d740f583-b66a-4a0b-99db-915a7d058bbf))
     (fp_line (start -1.27 19.05) (end -1.27 -1.27) (layer "F.Fab") (width 0.1) (tstamp 42f46636-9c84-4e87-8dfb-72c05e13d743))
-    (fp_line (start 1.27 19.05) (end -1.27 19.05) (layer "F.Fab") (width 0.1) (tstamp 94c5169c-6d89-4cf1-acdb-0202793b2ea9))
     (fp_line (start 0.635 -1.27) (end 1.27 -0.635) (layer "F.Fab") (width 0.1) (tstamp ab895532-8ca9-41d5-91f8-06d737eec62b))
     (fp_line (start -1.27 -1.27) (end 0.635 -1.27) (layer "F.Fab") (width 0.1) (tstamp d6c6da7f-994d-4778-8657-e8dbe44cf50f))
+    (fp_line (start 1.27 19.05) (end -1.27 19.05) (layer "F.Fab") (width 0.1) (tstamp dfdae403-bb08-48d4-b042-b5f0fa182e90))
     (fp_line (start 1.27 -0.635) (end 1.27 19.05) (layer "F.Fab") (width 0.1) (tstamp f813ffe1-fc01-4d76-adc2-b56acdf35680))
-    (pad "1" thru_hole rect (at 0 0 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "1" thru_hole rect (at 0 0 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 51 "Net-(JK4-Pad1)") (pinfunction "Pin_1") (pintype "passive") (tstamp bd8bc864-1cb8-4ad9-9e6d-35e1bc437948))
-    (pad "2" thru_hole oval (at 0 2.54 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "2" thru_hole oval (at 0 2.54 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 51 "Net-(JK4-Pad1)") (pinfunction "Pin_2") (pintype "passive") (tstamp b4d8bb6a-4f72-4b99-b3a6-eeb2b1a0c6f3))
-    (pad "3" thru_hole oval (at 0 5.08 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "3" thru_hole oval (at 0 5.08 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 51 "Net-(JK4-Pad1)") (pinfunction "Pin_3") (pintype "passive") (tstamp 8fc3a5f6-af60-48d9-951e-21c0bd122a69))
-    (pad "4" thru_hole oval (at 0 7.62 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "4" thru_hole oval (at 0 7.62 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 51 "Net-(JK4-Pad1)") (pinfunction "Pin_4") (pintype "passive") (tstamp 41d4f8af-1867-4d58-b12b-9bef3ec5f44b))
-    (pad "5" thru_hole oval (at 0 10.16 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "5" thru_hole oval (at 0 10.16 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 51 "Net-(JK4-Pad1)") (pinfunction "Pin_5") (pintype "passive") (tstamp acd231c3-d87a-41aa-a37a-d99be4caff1b))
-    (pad "6" thru_hole oval (at 0 12.7 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "6" thru_hole oval (at 0 12.7 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 51 "Net-(JK4-Pad1)") (pinfunction "Pin_6") (pintype "passive") (tstamp eb0d05e7-5fd4-4ff4-b2a1-56d0078fba45))
-    (pad "7" thru_hole oval (at 0 15.24 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "7" thru_hole oval (at 0 15.24 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 51 "Net-(JK4-Pad1)") (pinfunction "Pin_7") (pintype "passive") (tstamp 326f8b6a-9cc1-48ad-9792-3e4c8fde7153))
-    (pad "8" thru_hole oval (at 0 17.78 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "8" thru_hole oval (at 0 17.78 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 51 "Net-(JK4-Pad1)") (pinfunction "Pin_8") (pintype "passive") (tstamp 9d8807e3-f82b-4f8a-8f8e-86296401e24c))
     (model "${KICAD6_3DMODEL_DIR}/Connector_PinSocket_2.54mm.3dshapes/PinSocket_1x08_P2.54mm_Vertical.wrl"
       (offset (xyz 0 0 0))
@@ -2486,55 +3188,6 @@
     )
   )
 
-  (footprint "Connector_PinSocket_2.54mm:PinSocket_1x03_P2.54mm_Vertical" (layer "F.Cu")
-    (tedit 5A19A429) (tstamp 422ebb7d-7bc9-4168-ba91-f171ba601768)
-    (at 40.64 45.72)
-    (descr "Through hole straight socket strip, 1x03, 2.54mm pitch, single row (from Kicad 4.0.7), script generated")
-    (tags "Through hole socket strip THT 1x03 2.54mm single row")
-    (property "Sheetfile" "rotary.kicad_sch")
-    (property "Sheetname" "Rotary Encoder")
-    (path "/0e0cd3f9-9e59-4187-9e69-2f18dd8368cc/00000000-0000-0000-0000-000061fc080e")
-    (attr through_hole)
-    (fp_text reference "JR2" (at 0 -2.77) (layer "F.SilkS") hide
-      (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 38784c9b-c0d7-4bce-b8f7-0efef7d73fba)
-    )
-    (fp_text value "ROT2" (at 0 -2.54) (layer "F.SilkS")
-      (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp f28404b2-f037-43e6-9506-b9b2c0e48e51)
-    )
-    (fp_text user "${REFERENCE}" (at 0 2.54 90) (layer "F.Fab") hide
-      (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp b80b3b70-4b43-40ff-8985-8929fc250377)
-    )
-    (fp_line (start 1.33 -1.33) (end 1.33 0) (layer "F.SilkS") (width 0.12) (tstamp 214d2551-95a1-4f13-aaab-7f71789bbadc))
-    (fp_line (start 0 -1.33) (end 1.33 -1.33) (layer "F.SilkS") (width 0.12) (tstamp 4c3fdddc-606b-43a6-b079-45425e571a94))
-    (fp_line (start -1.33 1.27) (end -1.33 6.41) (layer "F.SilkS") (width 0.12) (tstamp 5660e4f0-519e-44fb-86b0-9411ded3d9fd))
-    (fp_line (start -1.33 1.27) (end 1.33 1.27) (layer "F.SilkS") (width 0.12) (tstamp 69e938f2-1b88-464c-8bb4-83c48a0ddc3a))
-    (fp_line (start -1.33 6.41) (end 1.33 6.41) (layer "F.SilkS") (width 0.12) (tstamp 944bfff4-6b83-48c6-8bb6-b49d9ea22016))
-    (fp_line (start 1.33 1.27) (end 1.33 6.41) (layer "F.SilkS") (width 0.12) (tstamp ac2805f4-5727-4261-b92c-bcedf51200d9))
-    (fp_line (start 1.75 6.85) (end -1.8 6.85) (layer "F.CrtYd") (width 0.05) (tstamp 094a189d-ebd8-4cf9-9a4f-20a0fb8a4a62))
-    (fp_line (start -1.8 -1.8) (end 1.75 -1.8) (layer "F.CrtYd") (width 0.05) (tstamp 6145f8e9-b6ce-4d9d-9649-bb8250827550))
-    (fp_line (start 1.75 -1.8) (end 1.75 6.85) (layer "F.CrtYd") (width 0.05) (tstamp 971fb8f4-e6ba-4185-a6ba-6dbf4c4746ec))
-    (fp_line (start -1.8 6.85) (end -1.8 -1.8) (layer "F.CrtYd") (width 0.05) (tstamp caaca21a-00d9-46f6-9804-09b640cb2a1b))
-    (fp_line (start 1.27 6.35) (end -1.27 6.35) (layer "F.Fab") (width 0.1) (tstamp 1a4b5240-e2d9-41e9-a21b-814fb3c7b35a))
-    (fp_line (start 0.635 -1.27) (end 1.27 -0.635) (layer "F.Fab") (width 0.1) (tstamp 3dc88477-e3c6-4460-821b-c49f03e0bcef))
-    (fp_line (start 1.27 -0.635) (end 1.27 6.35) (layer "F.Fab") (width 0.1) (tstamp 5f969d3b-22ea-45ca-a311-088a0e143664))
-    (fp_line (start -1.27 -1.27) (end 0.635 -1.27) (layer "F.Fab") (width 0.1) (tstamp 82be5f56-178f-4cff-944e-5b385cee84a0))
-    (fp_line (start -1.27 6.35) (end -1.27 -1.27) (layer "F.Fab") (width 0.1) (tstamp e5799e93-33a8-4e0c-bb41-0ebec109627c))
-    (pad "1" thru_hole rect (at 0 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-      (net 77 "Net-(JR2-Pad1)") (pinfunction "Pin_1") (pintype "passive") (tstamp 44695572-9f74-4cd0-a4e2-71162c760f47))
-    (pad "2" thru_hole oval (at 0 2.54) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-      (net 78 "Net-(JR2-Pad2)") (pinfunction "Pin_2") (pintype "passive") (tstamp b7efef42-316c-48ab-97b7-9a568b24908a))
-    (pad "3" thru_hole oval (at 0 5.08) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-      (net 14 "/Rotary Encoder/GND_ROT") (pinfunction "Pin_3") (pintype "passive") (tstamp 0f4cec82-e87f-41c3-a064-0d857e7e1e85))
-    (model "${KICAD6_3DMODEL_DIR}/Connector_PinSocket_2.54mm.3dshapes/PinSocket_1x03_P2.54mm_Vertical.wrl"
-      (offset (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
   (footprint "Diode_THT:D_DO-35_SOD27_P2.54mm_Vertical_AnodeUp" (layer "F.Cu")
     (tedit 5AE50CD5) (tstamp 43b2885c-bd72-4099-9f8f-2099fa3e98fb)
     (at 180.34 63.5 -90)
@@ -2633,30 +3286,30 @@
 
   (footprint "Connector_PinSocket_2.54mm:PinSocket_1x08_P2.54mm_Vertical" (layer "F.Cu")
     (tedit 5A19A420) (tstamp 49f451f3-8725-4518-8619-93498068637a)
-    (at 20.295 93.98 180)
+    (at 45.72 121.945 -90)
     (descr "Through hole straight socket strip, 1x08, 2.54mm pitch, single row (from Kicad 4.0.7), script generated")
     (tags "Through hole socket strip THT 1x08 2.54mm single row")
     (property "Sheetfile" "keymatrix_extdiode.kicad_sch")
     (property "Sheetname" "KeyMatrix Ext Diodes")
     (path "/7a807cd9-4b53-4d34-8616-454af4054d6a/a9ec2a0e-723d-4586-bb29-c7e7adc2beea")
     (attr through_hole)
-    (fp_text reference "JK16" (at 0 -2.77) (layer "F.SilkS") hide
+    (fp_text reference "JK16" (at 0 -2.77 -270) (layer "F.SilkS") hide
       (effects (font (size 1 1) (thickness 0.15)))
       (tstamp bccb0510-9df1-4c15-8035-daedfc13ae5e)
     )
-    (fp_text value "COL6" (at 0 20.55) (layer "F.SilkS")
+    (fp_text value "COL6" (at 0 20.55 -270) (layer "F.SilkS")
       (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 304a6dd7-a837-4272-b1c0-56a40dc6b4ac)
     )
-    (fp_text user "${REFERENCE}" (at 0 8.89 90) (layer "F.Fab") hide
+    (fp_text user "${REFERENCE}" (at 0 8.89) (layer "F.Fab") hide
       (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 987c85c3-5203-4907-b9ed-589791ecde2e)
     )
     (fp_line (start 0 -1.33) (end 1.33 -1.33) (layer "F.SilkS") (width 0.12) (tstamp 083f32c3-f1b9-47a3-ab83-63fed9648c92))
     (fp_line (start -1.33 1.27) (end -1.33 19.11) (layer "F.SilkS") (width 0.12) (tstamp 1f0a8375-ee31-4829-802f-2f66c7e80095))
     (fp_line (start -1.33 1.27) (end 1.33 1.27) (layer "F.SilkS") (width 0.12) (tstamp 241932b5-3590-4619-bdd4-6de9ce6dc426))
+    (fp_line (start 1.33 -1.33) (end 1.33 0) (layer "F.SilkS") (width 0.12) (tstamp 4b8be3ff-4f25-49f4-9eee-d26026895d38))
     (fp_line (start -1.33 19.11) (end 1.33 19.11) (layer "F.SilkS") (width 0.12) (tstamp 908c7b6a-0cdc-40f3-b71d-cc6e61fa3ee4))
-    (fp_line (start 1.33 -1.33) (end 1.33 0) (layer "F.SilkS") (width 0.12) (tstamp 9d665c46-7e87-4633-b424-129725306384))
     (fp_line (start 1.33 1.27) (end 1.33 19.11) (layer "F.SilkS") (width 0.12) (tstamp cfe354f3-a152-4130-8cf8-3db201a85cc6))
     (fp_line (start -1.8 19.55) (end -1.8 -1.8) (layer "F.CrtYd") (width 0.05) (tstamp 6520a531-76e6-425d-8997-a1a2279f9dc8))
     (fp_line (start 1.75 19.55) (end -1.8 19.55) (layer "F.CrtYd") (width 0.05) (tstamp 8a29e9ac-167c-450e-836d-840c410eb487))
@@ -2667,21 +3320,21 @@
     (fp_line (start -1.27 -1.27) (end 0.635 -1.27) (layer "F.Fab") (width 0.1) (tstamp 79ea7338-2596-41cf-bdd1-428363143cd9))
     (fp_line (start 0.635 -1.27) (end 1.27 -0.635) (layer "F.Fab") (width 0.1) (tstamp a4ed682d-b072-4d7b-a158-66bdda88358b))
     (fp_line (start 1.27 19.05) (end -1.27 19.05) (layer "F.Fab") (width 0.1) (tstamp fbe50840-3f2b-4c2e-a821-ca8b29aada40))
-    (pad "1" thru_hole rect (at 0 0 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "1" thru_hole rect (at 0 0 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 65 "Net-(JK16-Pad1)") (pinfunction "Pin_1") (pintype "passive") (tstamp 680d9c2f-9684-4229-bc57-145857e7aae3))
-    (pad "2" thru_hole oval (at 0 2.54 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "2" thru_hole oval (at 0 2.54 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 65 "Net-(JK16-Pad1)") (pinfunction "Pin_2") (pintype "passive") (tstamp 01ccc412-83ac-4f51-aa4c-3b661b9cc31f))
-    (pad "3" thru_hole oval (at 0 5.08 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "3" thru_hole oval (at 0 5.08 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 65 "Net-(JK16-Pad1)") (pinfunction "Pin_3") (pintype "passive") (tstamp 39ebc0e7-8a31-458e-ac32-21184b87aa70))
-    (pad "4" thru_hole oval (at 0 7.62 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "4" thru_hole oval (at 0 7.62 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 65 "Net-(JK16-Pad1)") (pinfunction "Pin_4") (pintype "passive") (tstamp 1861bb60-f0af-409f-8bfc-bd57508b6e72))
-    (pad "5" thru_hole oval (at 0 10.16 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "5" thru_hole oval (at 0 10.16 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 65 "Net-(JK16-Pad1)") (pinfunction "Pin_5") (pintype "passive") (tstamp e3cac474-8192-49b4-9c24-8dfdabd42c61))
-    (pad "6" thru_hole oval (at 0 12.7 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "6" thru_hole oval (at 0 12.7 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 65 "Net-(JK16-Pad1)") (pinfunction "Pin_6") (pintype "passive") (tstamp 5c31cc22-ef91-4cb2-806e-a0afc8e57c9f))
-    (pad "7" thru_hole oval (at 0 15.24 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "7" thru_hole oval (at 0 15.24 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 65 "Net-(JK16-Pad1)") (pinfunction "Pin_7") (pintype "passive") (tstamp 5548e0bb-9382-4e2a-83fe-f8f4f5c613e3))
-    (pad "8" thru_hole oval (at 0 17.78 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "8" thru_hole oval (at 0 17.78 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 65 "Net-(JK16-Pad1)") (pinfunction "Pin_8") (pintype "passive") (tstamp 677bc118-6808-4a49-b3f1-068f10ecee31))
     (model "${KICAD6_3DMODEL_DIR}/Connector_PinSocket_2.54mm.3dshapes/PinSocket_1x08_P2.54mm_Vertical.wrl"
       (offset (xyz 0 0 0))
@@ -2690,55 +3343,6 @@
     )
   )
 
-  (footprint "Connector_PinSocket_2.54mm:PinSocket_1x03_P2.54mm_Vertical" (layer "F.Cu")
-    (tedit 5A19A429) (tstamp 4f37996a-ce18-4305-b9fc-5623c3e2e8bf)
-    (at 38.1 33.02 180)
-    (descr "Through hole straight socket strip, 1x03, 2.54mm pitch, single row (from Kicad 4.0.7), script generated")
-    (tags "Through hole socket strip THT 1x03 2.54mm single row")
-    (property "Sheetfile" "rotary.kicad_sch")
-    (property "Sheetname" "Rotary Encoder")
-    (path "/0e0cd3f9-9e59-4187-9e69-2f18dd8368cc/00000000-0000-0000-0000-000063db2d3d")
-    (attr through_hole)
-    (fp_text reference "JR8" (at 0 -2.77) (layer "F.SilkS") hide
-      (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 97e42faa-b69d-4def-89b7-a246327f9c1d)
-    )
-    (fp_text value "ROT8" (at 0 7.62) (layer "F.SilkS")
-      (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp d12da2ee-314b-4349-af55-3abc3e61bcbc)
-    )
-    (fp_text user "${REFERENCE}" (at 0 2.54 90) (layer "F.Fab") hide
-      (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 94ec2539-7132-454f-ae70-a02d35b231ae)
-    )
-    (fp_line (start -1.33 1.27) (end -1.33 6.41) (layer "F.SilkS") (width 0.12) (tstamp 241c141f-76ea-41ab-a025-e056f184318f))
-    (fp_line (start 1.33 -1.33) (end 1.33 0) (layer "F.SilkS") (width 0.12) (tstamp 52b66bd8-9413-497e-a0cf-0d0eca5ebb83))
-    (fp_line (start 1.33 1.27) (end 1.33 6.41) (layer "F.SilkS") (width 0.12) (tstamp 9ebfefaf-b46f-4a45-8dd8-757925f9f16a))
-    (fp_line (start -1.33 1.27) (end 1.33 1.27) (layer "F.SilkS") (width 0.12) (tstamp bea2edf9-5ae2-4fc3-8495-8c88224e1258))
-    (fp_line (start 0 -1.33) (end 1.33 -1.33) (layer "F.SilkS") (width 0.12) (tstamp d2778490-1fcc-4428-9afa-4a3c05af8c64))
-    (fp_line (start -1.33 6.41) (end 1.33 6.41) (layer "F.SilkS") (width 0.12) (tstamp fc9a82c1-0bd3-4fdb-8f22-06c377aac8e8))
-    (fp_line (start 1.75 6.85) (end -1.8 6.85) (layer "F.CrtYd") (width 0.05) (tstamp 67755896-3a3e-4465-b12e-405a14320cf8))
-    (fp_line (start 1.75 -1.8) (end 1.75 6.85) (layer "F.CrtYd") (width 0.05) (tstamp c2f40523-77e8-46a6-a306-eade5c47d92a))
-    (fp_line (start -1.8 6.85) (end -1.8 -1.8) (layer "F.CrtYd") (width 0.05) (tstamp fa4ebd80-0259-4d07-ab90-96ff5732cae8))
-    (fp_line (start -1.8 -1.8) (end 1.75 -1.8) (layer "F.CrtYd") (width 0.05) (tstamp fdd8411b-fea8-48fa-b118-9752169e86b0))
-    (fp_line (start 1.27 -0.635) (end 1.27 6.35) (layer "F.Fab") (width 0.1) (tstamp 21a0410f-526c-4a7f-bc4d-86fc771cd5c2))
-    (fp_line (start -1.27 6.35) (end -1.27 -1.27) (layer "F.Fab") (width 0.1) (tstamp 314f4e93-8e75-48fd-a176-77383d9d241b))
-    (fp_line (start 1.27 6.35) (end -1.27 6.35) (layer "F.Fab") (width 0.1) (tstamp 8cd0f936-9f1d-4935-94eb-f5b6f02fd595))
-    (fp_line (start -1.27 -1.27) (end 0.635 -1.27) (layer "F.Fab") (width 0.1) (tstamp 95e34f29-7730-4e20-a086-ed4e67062a1f))
-    (fp_line (start 0.635 -1.27) (end 1.27 -0.635) (layer "F.Fab") (width 0.1) (tstamp d7d1e980-07a4-4949-afd8-b78782eb75f7))
-    (pad "1" thru_hole rect (at 0 0 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-      (net 157 "Net-(JR8-Pad1)") (pinfunction "Pin_1") (pintype "passive") (tstamp d19137af-d344-4a85-9def-fe693fe1ce20))
-    (pad "2" thru_hole oval (at 0 2.54 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-      (net 158 "Net-(JR8-Pad2)") (pinfunction "Pin_2") (pintype "passive") (tstamp 1c65221c-4387-40e1-bbb0-eaa0ba27fc81))
-    (pad "3" thru_hole oval (at 0 5.08 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-      (net 14 "/Rotary Encoder/GND_ROT") (pinfunction "Pin_3") (pintype "passive") (tstamp 64385495-7fda-479b-9d3b-9fe5ee32b3c6))
-    (model "${KICAD6_3DMODEL_DIR}/Connector_PinSocket_2.54mm.3dshapes/PinSocket_1x03_P2.54mm_Vertical.wrl"
-      (offset (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
   (footprint "Diode_THT:D_DO-35_SOD27_P2.54mm_Vertical_AnodeUp" (layer "F.Cu")
     (tedit 5AE50CD5) (tstamp 516ab4a4-a8fc-46f7-bb63-fa55d12d120f)
     (at 182.88 43.18 -90)
@@ -2789,22 +3393,22 @@
 
   (footprint "Connector_PinSocket_2.54mm:PinSocket_1x08_P2.54mm_Vertical" (layer "F.Cu")
     (tedit 5A19A420) (tstamp 5299b0fb-f74d-4e79-b7d7-40687e8d5bd3)
-    (at 25.375 93.965 180)
+    (at 45.705 116.865 -90)
     (descr "Through hole straight socket strip, 1x08, 2.54mm pitch, single row (from Kicad 4.0.7), script generated")
     (tags "Through hole socket strip THT 1x08 2.54mm single row")
     (property "Sheetfile" "keymatrix_extdiode.kicad_sch")
     (property "Sheetname" "KeyMatrix Ext Diodes")
     (path "/7a807cd9-4b53-4d34-8616-454af4054d6a/ab4f2aaf-c08d-4b11-a37d-319ce4b9b7d7")
     (attr through_hole)
-    (fp_text reference "JK14" (at 0 -2.77) (layer "F.SilkS") hide
+    (fp_text reference "JK14" (at 0 -2.77 -270) (layer "F.SilkS") hide
       (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 8e30a1e0-3916-490f-a7d0-169d613b5bda)
     )
-    (fp_text value "COL4" (at 0 20.55) (layer "F.SilkS")
+    (fp_text value "COL4" (at 0 20.55 -270) (layer "F.SilkS")
       (effects (font (size 1 1) (thickness 0.15)))
       (tstamp c2eaf71b-2d04-43b1-a52f-d59a7a480dea)
     )
-    (fp_text user "${REFERENCE}" (at 0 8.89 90) (layer "F.Fab") hide
+    (fp_text user "${REFERENCE}" (at 0 8.89) (layer "F.Fab") hide
       (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 61263771-a8e1-487c-9d7e-34afacb6d74d)
     )
@@ -2823,21 +3427,21 @@
     (fp_line (start 1.27 -0.635) (end 1.27 19.05) (layer "F.Fab") (width 0.1) (tstamp 9b6994e6-c40e-498d-ac9f-887afe9ad4a8))
     (fp_line (start -1.27 19.05) (end -1.27 -1.27) (layer "F.Fab") (width 0.1) (tstamp b082c83c-dc3b-4bb7-84b5-c1603d0912fc))
     (fp_line (start 1.27 19.05) (end -1.27 19.05) (layer "F.Fab") (width 0.1) (tstamp b792fe2a-3fd6-4054-ac4a-abb07d4b4c33))
-    (pad "1" thru_hole rect (at 0 0 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "1" thru_hole rect (at 0 0 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 63 "Net-(JK14-Pad1)") (pinfunction "Pin_1") (pintype "passive") (tstamp 19c3ae37-c6c9-4b6e-8922-ff1148aa181d))
-    (pad "2" thru_hole oval (at 0 2.54 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "2" thru_hole oval (at 0 2.54 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 63 "Net-(JK14-Pad1)") (pinfunction "Pin_2") (pintype "passive") (tstamp 81386521-8f9b-411f-9833-1dd6b271ccd8))
-    (pad "3" thru_hole oval (at 0 5.08 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "3" thru_hole oval (at 0 5.08 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 63 "Net-(JK14-Pad1)") (pinfunction "Pin_3") (pintype "passive") (tstamp e9e5e01c-f4d6-4a09-9021-86688a24622f))
-    (pad "4" thru_hole oval (at 0 7.62 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "4" thru_hole oval (at 0 7.62 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 63 "Net-(JK14-Pad1)") (pinfunction "Pin_4") (pintype "passive") (tstamp 8468016d-0a6a-4ce2-beef-67673f688aec))
-    (pad "5" thru_hole oval (at 0 10.16 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "5" thru_hole oval (at 0 10.16 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 63 "Net-(JK14-Pad1)") (pinfunction "Pin_5") (pintype "passive") (tstamp 52281a8d-9e32-4a02-9b76-7747c697e85b))
-    (pad "6" thru_hole oval (at 0 12.7 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "6" thru_hole oval (at 0 12.7 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 63 "Net-(JK14-Pad1)") (pinfunction "Pin_6") (pintype "passive") (tstamp 7342b642-c7fc-4002-bfd0-19b422093d13))
-    (pad "7" thru_hole oval (at 0 15.24 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "7" thru_hole oval (at 0 15.24 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 63 "Net-(JK14-Pad1)") (pinfunction "Pin_7") (pintype "passive") (tstamp da67059f-e8a1-4b43-a3d9-1ddaf6e948a0))
-    (pad "8" thru_hole oval (at 0 17.78 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "8" thru_hole oval (at 0 17.78 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 63 "Net-(JK14-Pad1)") (pinfunction "Pin_8") (pintype "passive") (tstamp 2835bcca-4b5b-4404-b3d7-cfbd434919c9))
     (model "${KICAD6_3DMODEL_DIR}/Connector_PinSocket_2.54mm.3dshapes/PinSocket_1x08_P2.54mm_Vertical.wrl"
       (offset (xyz 0 0 0))
@@ -2846,49 +3450,185 @@
     )
   )
 
-  (footprint "Connector_PinSocket_2.54mm:PinSocket_1x03_P2.54mm_Vertical" (layer "F.Cu")
-    (tedit 5A19A429) (tstamp 58fbcab3-e2e4-46e9-88f7-485d2c2f5304)
-    (at 45.72 45.72)
-    (descr "Through hole straight socket strip, 1x03, 2.54mm pitch, single row (from Kicad 4.0.7), script generated")
-    (tags "Through hole socket strip THT 1x03 2.54mm single row")
+  (footprint "Package_DIP:DIP-28_W7.62mm" (layer "F.Cu")
+    (tedit 5A02E8C5) (tstamp 570d66d5-2854-404a-b3ef-8a618d8c3fa9)
+    (at 58.42 48.26 -90)
+    (descr "28-lead though-hole mounted DIP package, row spacing 7.62 mm (300 mils)")
+    (tags "THT DIP DIL PDIP 2.54mm 7.62mm 300mil")
+    (property "Sheetfile" "keymatrix_extdiode_wire.kicad_sch")
+    (property "Sheetname" "KeyMatrix wired")
+    (path "/86fd0b4b-b0c8-4da7-922a-6650d5003f71/b22185af-1de2-40b6-9e80-0da54f88759e")
+    (attr through_hole)
+    (fp_text reference "U1" (at 3.81 -2.33 90) (layer "F.SilkS") hide
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp f491419a-4a73-49a0-84d6-676e320ae74a)
+    )
+    (fp_text value "MCP23017_SP" (at 3.81 12.7 180) (layer "F.SilkS")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 018ac0ca-e905-4956-882d-cd184ed826bb)
+    )
+    (fp_text user "${REFERENCE}" (at 3.81 16.51 90) (layer "F.Fab") hide
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 50e960c4-6d6f-4449-aef5-2fc7d5426fc8)
+    )
+    (fp_line (start 1.16 34.35) (end 6.46 34.35) (layer "F.SilkS") (width 0.12) (tstamp 28e4cea2-bc58-45f6-a2a9-a4645c15862a))
+    (fp_line (start 6.46 34.35) (end 6.46 -1.33) (layer "F.SilkS") (width 0.12) (tstamp 75852742-e7c0-4ae3-bf5f-3e6d27110e7e))
+    (fp_line (start 1.16 -1.33) (end 1.16 34.35) (layer "F.SilkS") (width 0.12) (tstamp 803e9b4f-7806-41fd-a8f4-c2cb3da5bebe))
+    (fp_line (start 2.81 -1.33) (end 1.16 -1.33) (layer "F.SilkS") (width 0.12) (tstamp 97e5dcfd-c8a0-4d08-9ec7-297c86da9ce3))
+    (fp_line (start 6.46 -1.33) (end 4.81 -1.33) (layer "F.SilkS") (width 0.12) (tstamp d66f75eb-2912-46cd-b5af-0a315fed9bc9))
+    (fp_arc (start 4.81 -1.33) (mid 3.81 -0.33) (end 2.81 -1.33) (layer "F.SilkS") (width 0.12) (tstamp 81fe1463-89d2-4343-ba25-2acdf78bd5d6))
+    (fp_line (start 8.7 -1.55) (end -1.1 -1.55) (layer "F.CrtYd") (width 0.05) (tstamp 287ac47b-db32-4a94-8cdc-fc4964081b5e))
+    (fp_line (start 8.7 34.55) (end 8.7 -1.55) (layer "F.CrtYd") (width 0.05) (tstamp 2ad00b42-9555-4c5b-99df-e36d4e59d274))
+    (fp_line (start -1.1 -1.55) (end -1.1 34.55) (layer "F.CrtYd") (width 0.05) (tstamp 680c9338-b49d-4168-adf1-7ca0efc08cc2))
+    (fp_line (start -1.1 34.55) (end 8.7 34.55) (layer "F.CrtYd") (width 0.05) (tstamp b189398d-80b1-44ab-9f2d-2bb02a73b131))
+    (fp_line (start 0.635 34.29) (end 0.635 -0.27) (layer "F.Fab") (width 0.1) (tstamp 243be0f9-9dd8-4d43-a34e-0746d6525c73))
+    (fp_line (start 6.985 -1.27) (end 6.985 34.29) (layer "F.Fab") (width 0.1) (tstamp 4386aa39-bb1f-46b5-9dd6-efabb8746d63))
+    (fp_line (start 1.635 -1.27) (end 6.985 -1.27) (layer "F.Fab") (width 0.1) (tstamp ab978915-8c30-40ee-9c70-59f4e5a53c03))
+    (fp_line (start 6.985 34.29) (end 0.635 34.29) (layer "F.Fab") (width 0.1) (tstamp b6463d1a-58cc-4e86-980d-5696f73b9bc3))
+    (fp_line (start 0.635 -0.27) (end 1.635 -1.27) (layer "F.Fab") (width 0.1) (tstamp ee87a575-4c85-467a-9e60-819334432063))
+    (pad "1" thru_hole rect (at 0 0 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 169 "Net-(J30-Pad1)") (pinfunction "GPB0") (pintype "bidirectional") (tstamp ac54e68f-3856-48b9-84ae-658930835ca6))
+    (pad "2" thru_hole oval (at 0 2.54 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 170 "Net-(J31-Pad1)") (pinfunction "GPB1") (pintype "bidirectional") (tstamp 30ccc610-1103-4304-bc72-c447e671abfb))
+    (pad "3" thru_hole oval (at 0 5.08 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 171 "Net-(J32-Pad1)") (pinfunction "GPB2") (pintype "bidirectional") (tstamp 0d97d0a7-1cd1-4f9c-8f0d-80354719c46f))
+    (pad "4" thru_hole oval (at 0 7.62 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 172 "Net-(J33-Pad1)") (pinfunction "GPB3") (pintype "bidirectional") (tstamp f52cbf36-51d1-4d33-8de4-637622a2b888))
+    (pad "5" thru_hole oval (at 0 10.16 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 173 "Net-(J34-Pad1)") (pinfunction "GPB4") (pintype "bidirectional") (tstamp a4fa321b-bf67-4550-84af-1aa6b788cd86))
+    (pad "6" thru_hole oval (at 0 12.7 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 174 "Net-(J35-Pad1)") (pinfunction "GPB5") (pintype "bidirectional") (tstamp 7e3514c1-07c0-4b04-84b0-e42ae820b405))
+    (pad "7" thru_hole oval (at 0 15.24 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 175 "Net-(J36-Pad1)") (pinfunction "GPB6") (pintype "bidirectional") (tstamp be38b6b4-07fe-46cb-9636-991ca80eb1da))
+    (pad "8" thru_hole oval (at 0 17.78 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 176 "Net-(J37-Pad1)") (pinfunction "GPB7") (pintype "bidirectional") (tstamp a0a8a96b-b779-4daf-97dd-7e5cf44be371))
+    (pad "9" thru_hole oval (at 0 20.32 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 168 "/KeyMatrix wired/+5V_KEY") (pinfunction "VDD") (pintype "power_in") (tstamp 8e314bfd-d550-4b68-95bf-ec0edf94e0d3))
+    (pad "10" thru_hole oval (at 0 22.86 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 185 "/KeyMatrix wired/GND_KEY") (pinfunction "VSS") (pintype "power_in") (tstamp 731fc123-f9ee-497e-a05b-dc66b3aa4158))
+    (pad "11" thru_hole oval (at 0 25.4 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 188 "unconnected-(U1-Pad11)") (pinfunction "NC") (pintype "no_connect") (tstamp 494911de-32e7-413f-9b51-ac71676da46d))
+    (pad "12" thru_hole oval (at 0 27.94 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 187 "/KeyMatrix wired/I2C_CLOCK_KEY") (pinfunction "SCK") (pintype "input") (tstamp fcf420d5-9724-420f-9a5b-8b335cf3fa2b))
+    (pad "13" thru_hole oval (at 0 30.48 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 186 "/KeyMatrix wired/I2C_DATA_KEY") (pinfunction "SDA") (pintype "bidirectional") (tstamp b16f6f24-33ec-43ab-b619-2c22c2efba22))
+    (pad "14" thru_hole oval (at 0 33.02 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 189 "unconnected-(U1-Pad14)") (pinfunction "NC") (pintype "no_connect") (tstamp 20327333-565e-476a-93c8-6bb2da5b4ea1))
+    (pad "15" thru_hole oval (at 7.62 33.02 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 185 "/KeyMatrix wired/GND_KEY") (pinfunction "A0") (pintype "input") (tstamp 909cbb47-9e5f-42cf-83f3-656d7d25af3f))
+    (pad "16" thru_hole oval (at 7.62 30.48 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 185 "/KeyMatrix wired/GND_KEY") (pinfunction "A1") (pintype "input") (tstamp 82c81cb3-3539-4e2d-8028-99156bdf1daa))
+    (pad "17" thru_hole oval (at 7.62 27.94 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 185 "/KeyMatrix wired/GND_KEY") (pinfunction "A2") (pintype "input") (tstamp 52b10da1-d858-4a3b-b810-cb4019703dd8))
+    (pad "18" thru_hole oval (at 7.62 25.4 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 168 "/KeyMatrix wired/+5V_KEY") (pinfunction "~{RESET}") (pintype "input") (tstamp ff6a6c0d-8c42-4206-ba80-8b05040ccf1c))
+    (pad "19" thru_hole oval (at 7.62 22.86 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 190 "unconnected-(U1-Pad19)") (pinfunction "INTB") (pintype "tri_state+no_connect") (tstamp a8d53190-e910-498f-bd45-4346f0f093d2))
+    (pad "20" thru_hole oval (at 7.62 20.32 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 191 "unconnected-(U1-Pad20)") (pinfunction "INTA") (pintype "tri_state+no_connect") (tstamp da77077a-dbc7-47dc-bc2a-414d2f31f8db))
+    (pad "21" thru_hole oval (at 7.62 17.78 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 177 "Net-(J38-Pad1)") (pinfunction "GPA0") (pintype "bidirectional") (tstamp 7d59b625-3ba8-4d2a-ac26-706eb0829f73))
+    (pad "22" thru_hole oval (at 7.62 15.24 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 178 "Net-(J39-Pad1)") (pinfunction "GPA1") (pintype "bidirectional") (tstamp bf202eeb-8cde-478a-9c54-f57622ca78b3))
+    (pad "23" thru_hole oval (at 7.62 12.7 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 179 "Net-(J40-Pad1)") (pinfunction "GPA2") (pintype "bidirectional") (tstamp 2fca7c4e-45f9-4507-93b1-6de47f287731))
+    (pad "24" thru_hole oval (at 7.62 10.16 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 180 "Net-(J41-Pad1)") (pinfunction "GPA3") (pintype "bidirectional") (tstamp bd52a347-67a1-48c0-9fa0-cd31697e7a79))
+    (pad "25" thru_hole oval (at 7.62 7.62 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 181 "Net-(J42-Pad1)") (pinfunction "GPA4") (pintype "bidirectional") (tstamp d2b07926-2d1a-40e9-8d4d-cd832f289460))
+    (pad "26" thru_hole oval (at 7.62 5.08 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 182 "Net-(J43-Pad1)") (pinfunction "GPA5") (pintype "bidirectional") (tstamp 9bb96b4b-f248-446f-baa7-ba0d3b1fd45d))
+    (pad "27" thru_hole oval (at 7.62 2.54 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 183 "Net-(J44-Pad1)") (pinfunction "GPA6") (pintype "bidirectional") (tstamp 84a84d60-fdc7-474d-ba62-a738cac994bf))
+    (pad "28" thru_hole oval (at 7.62 0 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 184 "Net-(J45-Pad1)") (pinfunction "GPA7") (pintype "bidirectional") (tstamp a4114195-75a4-47fb-9546-0cd2ee584a1c))
+    (model "${KICAD6_3DMODEL_DIR}/Package_DIP.3dshapes/DIP-28_W7.62mm.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (layer "F.Cu")
+    (tedit 5A1DC084) (tstamp 593b6382-e8d0-4286-af7e-c963ce1047fa)
+    (at 58.42 25.4)
+    (descr "solder Pin_ with flat fork, hole diameter 0.7mm, length 6.5mm, width 1.8mm")
+    (tags "solder Pin_ with flat fork")
     (property "Sheetfile" "rotary.kicad_sch")
     (property "Sheetname" "Rotary Encoder")
-    (path "/0e0cd3f9-9e59-4187-9e69-2f18dd8368cc/00000000-0000-0000-0000-000062000db3")
+    (path "/0e0cd3f9-9e59-4187-9e69-2f18dd8368cc/0acb7b97-c6e6-44df-ad0d-230a70aa8726")
     (attr through_hole)
-    (fp_text reference "JR3" (at 0 -2.77) (layer "F.SilkS") hide
+    (fp_text reference "J6" (at 0 1.8) (layer "F.SilkS") hide
       (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp c2122f4c-9fd7-4e19-95a5-728d9ffb185c)
+      (tstamp 33dd8803-71f2-44bd-b4cc-8dfca4a89608)
     )
-    (fp_text value "ROT3" (at 0 -2.54) (layer "F.SilkS")
+    (fp_text value "A0" (at 0 4.445) (layer "F.Fab")
       (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 045f6564-bda4-4fd1-83c8-5e8cf6c63d81)
+      (tstamp e7073ff3-5477-4e8e-8eac-c6c839211d13)
     )
-    (fp_text user "${REFERENCE}" (at 0 2.54 90) (layer "F.Fab") hide
+    (fp_text user "${REFERENCE}" (at 0 1.8) (layer "F.Fab") hide
       (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp a5bcd584-f401-4908-8303-2f4295d08bd9)
+      (tstamp 4118ca42-cbf5-4007-8f00-3c853caebfae)
     )
-    (fp_line (start 1.33 -1.33) (end 1.33 0) (layer "F.SilkS") (width 0.12) (tstamp 2c960aa7-474d-4210-a04a-5d373ca0b683))
-    (fp_line (start -1.33 6.41) (end 1.33 6.41) (layer "F.SilkS") (width 0.12) (tstamp 40da4b54-e090-4533-aca0-876e1aa6c94d))
-    (fp_line (start -1.33 1.27) (end -1.33 6.41) (layer "F.SilkS") (width 0.12) (tstamp 66283bcd-ce07-4955-9ce0-67df98aa5fbe))
-    (fp_line (start -1.33 1.27) (end 1.33 1.27) (layer "F.SilkS") (width 0.12) (tstamp 8fae4109-134b-4e77-8828-65b921ff18b3))
-    (fp_line (start 1.33 1.27) (end 1.33 6.41) (layer "F.SilkS") (width 0.12) (tstamp afc1cda9-b355-4a65-92b8-2768c705745f))
-    (fp_line (start 0 -1.33) (end 1.33 -1.33) (layer "F.SilkS") (width 0.12) (tstamp f3a572d4-5192-43d5-b6e9-b9c875aa955a))
-    (fp_line (start -1.8 -1.8) (end 1.75 -1.8) (layer "F.CrtYd") (width 0.05) (tstamp 1bef5b1c-5aba-4e23-8748-ea44cb5e23bb))
-    (fp_line (start 1.75 -1.8) (end 1.75 6.85) (layer "F.CrtYd") (width 0.05) (tstamp 387a8664-4730-4888-a058-f69d90493bd6))
-    (fp_line (start 1.75 6.85) (end -1.8 6.85) (layer "F.CrtYd") (width 0.05) (tstamp c627778d-6deb-4dba-83a2-18f7083c85c3))
-    (fp_line (start -1.8 6.85) (end -1.8 -1.8) (layer "F.CrtYd") (width 0.05) (tstamp d5955590-dc3c-4885-9085-04a0979df419))
-    (fp_line (start 1.27 -0.635) (end 1.27 6.35) (layer "F.Fab") (width 0.1) (tstamp 1abf0148-93ef-4bb7-bd2b-c895acac401b))
-    (fp_line (start -1.27 -1.27) (end 0.635 -1.27) (layer "F.Fab") (width 0.1) (tstamp 8d5d2859-907c-47b8-b8d5-6b7e936ffaa0))
-    (fp_line (start 0.635 -1.27) (end 1.27 -0.635) (layer "F.Fab") (width 0.1) (tstamp 9fa25466-61d4-4f76-ac8b-14756e81abaf))
-    (fp_line (start 1.27 6.35) (end -1.27 6.35) (layer "F.Fab") (width 0.1) (tstamp ed1bf9e5-996a-4929-8a1b-47cadb85cc58))
-    (fp_line (start -1.27 6.35) (end -1.27 -1.27) (layer "F.Fab") (width 0.1) (tstamp feee177b-f831-47bb-a298-866779e9669f))
-    (pad "1" thru_hole rect (at 0 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-      (net 101 "Net-(JR3-Pad1)") (pinfunction "Pin_1") (pintype "passive") (tstamp 730ad048-a6b2-4436-9c61-331ad28fbe00))
-    (pad "2" thru_hole oval (at 0 2.54) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-      (net 102 "Net-(JR3-Pad2)") (pinfunction "Pin_2") (pintype "passive") (tstamp 7ce09f06-97e7-4be2-ba0e-c763a97c9451))
-    (pad "3" thru_hole oval (at 0 5.08) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-      (net 14 "/Rotary Encoder/GND_ROT") (pinfunction "Pin_3") (pintype "passive") (tstamp 45862437-b199-4467-87e2-39b85ef6d28b))
-    (model "${KICAD6_3DMODEL_DIR}/Connector_PinSocket_2.54mm.3dshapes/PinSocket_1x03_P2.54mm_Vertical.wrl"
+    (fp_line (start -0.95 -0.95) (end -0.95 0.95) (layer "F.SilkS") (width 0.12) (tstamp 2db73e12-8d55-4c9f-9111-06321ff1bf3b))
+    (fp_line (start -0.95 0.95) (end 0.9 0.95) (layer "F.SilkS") (width 0.12) (tstamp 5e131de0-59dd-4487-8337-de0dce828791))
+    (fp_line (start 0.9 0.95) (end 0.9 -0.9) (layer "F.SilkS") (width 0.12) (tstamp a944a0a0-302a-485c-ac01-78d811b92b30))
+    (fp_line (start 0.9 -0.95) (end -0.95 -0.95) (layer "F.SilkS") (width 0.12) (tstamp eec9adee-0ca3-4f4a-bc2a-d385e11c22f3))
+    (fp_line (start 0.9 -0.9) (end 0.9 -0.95) (layer "F.SilkS") (width 0.12) (tstamp eef0b708-d745-482f-aca0-70f6e8b031a8))
+    (fp_line (start -1.4 -1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp 0dd8a88a-3c85-402b-a2dd-d98bc5ddbd5e))
+    (fp_line (start 1.35 1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp 2c9e77bc-a78b-4385-bbfd-f567e0df96c3))
+    (fp_line (start -1.4 -1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp 4d24f783-afb0-42a0-9683-e8b59325e024))
+    (fp_line (start 1.35 1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp 7df80943-5e57-4498-aea6-993562316ae9))
+    (fp_line (start 0.85 0.25) (end -0.9 0.25) (layer "F.Fab") (width 0.12) (tstamp 11fed0fd-e478-4d70-a2a4-ec27e972ebf4))
+    (fp_line (start -0.9 -0.25) (end 0.85 -0.25) (layer "F.Fab") (width 0.12) (tstamp 397c7179-11c5-4ba2-8026-b27a0edfc173))
+    (fp_line (start -0.9 0.25) (end -0.9 -0.25) (layer "F.Fab") (width 0.12) (tstamp 3aa9856c-47e9-4ecc-b55c-c27c5da2092b))
+    (fp_line (start 0.85 -0.25) (end 0.85 0.25) (layer "F.Fab") (width 0.12) (tstamp 611b89fe-c54b-4f54-9b17-d4142ae633a4))
+    (pad "1" thru_hole circle (at 0 0) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 75 "Net-(J6-Pad1)") (pinfunction "Pin_1") (pintype "passive") (tstamp f744641e-4674-436f-97f8-bda7558362c2))
+    (model "${KICAD6_3DMODEL_DIR}/Connector_Pin.3dshapes/Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (layer "F.Cu")
+    (tedit 5A1DC084) (tstamp 5ada835d-561a-4dce-a1cc-333025507ece)
+    (at 33.02 58.42)
+    (descr "solder Pin_ with flat fork, hole diameter 0.7mm, length 6.5mm, width 1.8mm")
+    (tags "solder Pin_ with flat fork")
+    (property "Sheetfile" "cimdit.kicad_sch")
+    (property "Sheetname" "")
+    (path "/8c90d3b7-ed32-4c78-b2d9-31baec8389d6")
+    (attr through_hole)
+    (fp_text reference "J29" (at 0 1.8) (layer "F.SilkS") hide
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp c4139120-c7c9-4616-a0ae-9a851adb1f9c)
+    )
+    (fp_text value "+5V" (at 1.905 0.635 90) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 81d2a3d7-9e78-42be-94e9-00bae4f7e7f6)
+    )
+    (fp_text user "${REFERENCE}" (at 0 1.8) (layer "F.Fab") hide
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 5ec35fb6-fbea-4c53-bc7c-52d581e3adb1)
+    )
+    (fp_line (start 0.9 -0.9) (end 0.9 -0.95) (layer "F.SilkS") (width 0.12) (tstamp 196f058e-8f27-44e0-b0fd-f8cc62686315))
+    (fp_line (start 0.9 0.95) (end 0.9 -0.9) (layer "F.SilkS") (width 0.12) (tstamp 43cfb8fd-8455-45c8-8b72-d7070ac63b03))
+    (fp_line (start -0.95 -0.95) (end -0.95 0.95) (layer "F.SilkS") (width 0.12) (tstamp 7b95a7c4-cda8-4bcd-807a-99b5ef03fe1e))
+    (fp_line (start 0.9 -0.95) (end -0.95 -0.95) (layer "F.SilkS") (width 0.12) (tstamp 923cb571-19be-4be6-8532-02c9d244b0d5))
+    (fp_line (start -0.95 0.95) (end 0.9 0.95) (layer "F.SilkS") (width 0.12) (tstamp a6a29a4c-0a52-437b-8da0-296025dac4fb))
+    (fp_line (start 1.35 1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp 970993a2-1f28-4914-a470-29d59376f99a))
+    (fp_line (start 1.35 1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp c7ed31dc-b1b6-4ead-abad-3a055196871a))
+    (fp_line (start -1.4 -1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp ca4af12e-71cb-4b12-bbb3-009474823ee5))
+    (fp_line (start -1.4 -1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp d66161e6-ec5e-4c68-8f75-63f16b295d6b))
+    (fp_line (start -0.9 -0.25) (end 0.85 -0.25) (layer "F.Fab") (width 0.12) (tstamp 33106bd2-3e98-41f6-988c-7158791c3c4a))
+    (fp_line (start 0.85 -0.25) (end 0.85 0.25) (layer "F.Fab") (width 0.12) (tstamp 812a9bf5-0cb0-4a5f-bce8-2a3cdb8d7062))
+    (fp_line (start -0.9 0.25) (end -0.9 -0.25) (layer "F.Fab") (width 0.12) (tstamp c47df8d6-d01b-4f21-8eaa-4777f8956be5))
+    (fp_line (start 0.85 0.25) (end -0.9 0.25) (layer "F.Fab") (width 0.12) (tstamp d9fa1bba-ba87-4376-952a-41bb8392f957))
+    (pad "1" thru_hole circle (at 0 0) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 168 "/KeyMatrix wired/+5V_KEY") (pinfunction "Pin_1") (pintype "passive") (tstamp 818e6ca1-9b10-4d24-a98f-05f907ff65f3))
+    (model "${KICAD6_3DMODEL_DIR}/Connector_Pin.3dshapes/Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
       (rotate (xyz 0 0 0))
@@ -3013,6 +3753,49 @@
     )
   )
 
+  (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (layer "F.Cu")
+    (tedit 5A1DC084) (tstamp 5d44cc4e-a8eb-4036-9770-8d574c03b5a0)
+    (at 48.26 45.72)
+    (descr "solder Pin_ with flat fork, hole diameter 0.7mm, length 6.5mm, width 1.8mm")
+    (tags "solder Pin_ with flat fork")
+    (property "Sheetfile" "keymatrix_extdiode_wire.kicad_sch")
+    (property "Sheetname" "KeyMatrix wired")
+    (path "/86fd0b4b-b0c8-4da7-922a-6650d5003f71/0bdb6175-8701-43d4-9212-8e88185a01b9")
+    (attr through_hole)
+    (fp_text reference "J34" (at 0 1.8) (layer "F.SilkS") hide
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 5526f846-fded-45e1-ab8f-3e77f29baa8b)
+    )
+    (fp_text value "R4" (at -0.025 5.08) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 50edec12-f2d7-486c-a238-cf600b34e1b5)
+    )
+    (fp_text user "${REFERENCE}" (at 0 1.8) (layer "F.Fab") hide
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 2e8c4c72-0a75-464e-9b42-9d31d1c354c9)
+    )
+    (fp_line (start 0.9 -0.9) (end 0.9 -0.95) (layer "F.SilkS") (width 0.12) (tstamp 31e0c95a-78ca-44bb-9184-1c4d48ccbf3e))
+    (fp_line (start -0.95 -0.95) (end -0.95 0.95) (layer "F.SilkS") (width 0.12) (tstamp 603ffe71-d502-43f7-9155-6e6da6e380c8))
+    (fp_line (start -0.95 0.95) (end 0.9 0.95) (layer "F.SilkS") (width 0.12) (tstamp 8dd2ebd0-beab-4a6a-a970-4109d2d0d2a4))
+    (fp_line (start 0.9 0.95) (end 0.9 -0.9) (layer "F.SilkS") (width 0.12) (tstamp c01a1ce6-aea6-4b9e-95ac-caf2bdbfe10e))
+    (fp_line (start 0.9 -0.95) (end -0.95 -0.95) (layer "F.SilkS") (width 0.12) (tstamp d9c0241a-6ebb-41a4-87f6-309aab930fa4))
+    (fp_line (start 1.35 1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp 2e89248a-15d7-4656-a7ee-18b697173f47))
+    (fp_line (start 1.35 1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp 53e09637-2981-4ef0-9061-5a44f519a23c))
+    (fp_line (start -1.4 -1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp abf99505-1c46-46f4-816f-6fedb93ce4af))
+    (fp_line (start -1.4 -1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp ee8a6fd8-1e7f-4e43-ab8e-8f82128f2170))
+    (fp_line (start -0.9 -0.25) (end 0.85 -0.25) (layer "F.Fab") (width 0.12) (tstamp 06587bee-b192-4516-ae60-9e51f83ce577))
+    (fp_line (start 0.85 0.25) (end -0.9 0.25) (layer "F.Fab") (width 0.12) (tstamp 1f7f935c-1486-4d74-a7be-35320430f56f))
+    (fp_line (start 0.85 -0.25) (end 0.85 0.25) (layer "F.Fab") (width 0.12) (tstamp 4ff116fb-9ea8-487d-8c52-fdafb2a9e05c))
+    (fp_line (start -0.9 0.25) (end -0.9 -0.25) (layer "F.Fab") (width 0.12) (tstamp baa55708-ee83-445f-90d3-122f514b8a19))
+    (pad "1" thru_hole circle (at 0 0) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 173 "Net-(J34-Pad1)") (pinfunction "Pin_1") (pintype "passive") (tstamp 968e9c9f-cd24-4a12-bbe3-5cd4499e2633))
+    (model "${KICAD6_3DMODEL_DIR}/Connector_Pin.3dshapes/Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
   (footprint "Connector_PinSocket_2.54mm:PinSocket_1x08_P2.54mm_Vertical" (layer "F.Cu")
     (tedit 5A19A420) (tstamp 5d685473-9730-4a87-a74f-ac0c7d9ae88e)
     (at 165.085 48.285 -90)
@@ -3120,49 +3903,43 @@
     )
   )
 
-  (footprint "Connector_PinSocket_2.54mm:PinSocket_1x03_P2.54mm_Vertical" (layer "F.Cu")
-    (tedit 5A19A429) (tstamp 60539f21-7e03-4fa7-aeab-06fd1be63b60)
-    (at 48.26 33.02 180)
-    (descr "Through hole straight socket strip, 1x03, 2.54mm pitch, single row (from Kicad 4.0.7), script generated")
-    (tags "Through hole socket strip THT 1x03 2.54mm single row")
-    (property "Sheetfile" "rotary.kicad_sch")
-    (property "Sheetname" "Rotary Encoder")
-    (path "/0e0cd3f9-9e59-4187-9e69-2f18dd8368cc/00000000-0000-0000-0000-000063db2cef")
+  (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (layer "F.Cu")
+    (tedit 5A1DC084) (tstamp 5ee5dba6-bc2c-408f-88e2-269ae0e3ec9f)
+    (at 45.72 58.42)
+    (descr "solder Pin_ with flat fork, hole diameter 0.7mm, length 6.5mm, width 1.8mm")
+    (tags "solder Pin_ with flat fork")
+    (property "Sheetfile" "keymatrix_extdiode_wire.kicad_sch")
+    (property "Sheetname" "KeyMatrix wired")
+    (path "/86fd0b4b-b0c8-4da7-922a-6650d5003f71/9bac6bac-7f2a-4129-b344-f43fb7c2d498")
     (attr through_hole)
-    (fp_text reference "JR6" (at 0 -2.77) (layer "F.SilkS") hide
+    (fp_text reference "J40" (at 0 1.8) (layer "F.SilkS") hide
       (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 3c0187bf-fbbc-4df6-9175-a8259ddc32cc)
+      (tstamp ca747592-63b8-4c46-a923-52775f5763ce)
     )
-    (fp_text value "ROT6" (at 0 7.85) (layer "F.SilkS")
+    (fp_text value "C2" (at 0 -5.08) (layer "F.Fab")
       (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 154426fa-75a7-4f39-91d1-f5d5904ff00c)
+      (tstamp 6a7af943-e293-4d91-9bd4-7440e6fd2953)
     )
-    (fp_text user "${REFERENCE}" (at 0 2.54 90) (layer "F.Fab") hide
+    (fp_text user "${REFERENCE}" (at 0 1.8) (layer "F.Fab") hide
       (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp d1eb3eac-d902-4387-a715-d47330e25aa1)
+      (tstamp 4fa23a0a-7519-4aba-8b1e-f626b601ba0d)
     )
-    (fp_line (start -1.33 1.27) (end -1.33 6.41) (layer "F.SilkS") (width 0.12) (tstamp 016a0d94-cbb6-4bfe-a638-dbf2e062027c))
-    (fp_line (start 1.33 1.27) (end 1.33 6.41) (layer "F.SilkS") (width 0.12) (tstamp 35afb089-9fdf-4674-9ec7-76a0c05da5b2))
-    (fp_line (start 1.33 -1.33) (end 1.33 0) (layer "F.SilkS") (width 0.12) (tstamp 369501e2-63a9-4c64-a19d-5f38804d814c))
-    (fp_line (start 0 -1.33) (end 1.33 -1.33) (layer "F.SilkS") (width 0.12) (tstamp c5e99f63-0cea-4cd1-8903-44b8ebd40df1))
-    (fp_line (start -1.33 6.41) (end 1.33 6.41) (layer "F.SilkS") (width 0.12) (tstamp d44d0391-377c-4cd3-b517-c487266e4f71))
-    (fp_line (start -1.33 1.27) (end 1.33 1.27) (layer "F.SilkS") (width 0.12) (tstamp e54fd6dd-4c67-4e77-af25-550d221437c6))
-    (fp_line (start -1.8 6.85) (end -1.8 -1.8) (layer "F.CrtYd") (width 0.05) (tstamp 3b978fb5-431e-4487-9df6-f0c5321ca5da))
-    (fp_line (start 1.75 6.85) (end -1.8 6.85) (layer "F.CrtYd") (width 0.05) (tstamp 5670a948-abf3-453d-b1ea-e226f53e60db))
-    (fp_line (start 1.75 -1.8) (end 1.75 6.85) (layer "F.CrtYd") (width 0.05) (tstamp 6534f609-fffc-4768-9880-87b7aebacb24))
-    (fp_line (start -1.8 -1.8) (end 1.75 -1.8) (layer "F.CrtYd") (width 0.05) (tstamp dda65fc5-0922-493c-83d2-3852476fe7c3))
-    (fp_line (start -1.27 6.35) (end -1.27 -1.27) (layer "F.Fab") (width 0.1) (tstamp 1bfd969e-69bc-45a0-8b87-7f91099ddeb7))
-    (fp_line (start 0.635 -1.27) (end 1.27 -0.635) (layer "F.Fab") (width 0.1) (tstamp 24ecd28e-b69a-4976-bbd0-38235b1f74d4))
-    (fp_line (start 1.27 -0.635) (end 1.27 6.35) (layer "F.Fab") (width 0.1) (tstamp 43967b33-6cb8-4421-895a-c13308f66faf))
-    (fp_line (start -1.27 -1.27) (end 0.635 -1.27) (layer "F.Fab") (width 0.1) (tstamp 62f807dc-ba74-461e-a0fc-24ea9cb6ff91))
-    (fp_line (start 1.27 6.35) (end -1.27 6.35) (layer "F.Fab") (width 0.1) (tstamp 6682dcd7-7f72-4af8-8437-f1bd68badafb))
-    (pad "1" thru_hole rect (at 0 0 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-      (net 153 "Net-(JR6-Pad1)") (pinfunction "Pin_1") (pintype "passive") (tstamp e7a8c9b7-e9b7-4fbe-813c-9cb6cfaf0616))
-    (pad "2" thru_hole oval (at 0 2.54 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-      (net 154 "Net-(JR6-Pad2)") (pinfunction "Pin_2") (pintype "passive") (tstamp 1df2e6c1-ba42-4c18-8cb3-f4c0cbb7c547))
-    (pad "3" thru_hole oval (at 0 5.08 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-      (net 14 "/Rotary Encoder/GND_ROT") (pinfunction "Pin_3") (pintype "passive") (tstamp abd52951-242d-42a6-85da-9c6452baf96d))
-    (model "${KICAD6_3DMODEL_DIR}/Connector_PinSocket_2.54mm.3dshapes/PinSocket_1x03_P2.54mm_Vertical.wrl"
+    (fp_line (start 0.9 0.95) (end 0.9 -0.9) (layer "F.SilkS") (width 0.12) (tstamp 4fe4f960-cdd9-4a2c-be2c-494e2da47eb6))
+    (fp_line (start 0.9 -0.9) (end 0.9 -0.95) (layer "F.SilkS") (width 0.12) (tstamp 8848cedc-b195-4cec-85af-5d99a2c3ce72))
+    (fp_line (start -0.95 -0.95) (end -0.95 0.95) (layer "F.SilkS") (width 0.12) (tstamp b6aef2d5-a3e7-4ab4-9b63-77387460522d))
+    (fp_line (start 0.9 -0.95) (end -0.95 -0.95) (layer "F.SilkS") (width 0.12) (tstamp d3a0b23d-9d89-48e9-b40c-114194336960))
+    (fp_line (start -0.95 0.95) (end 0.9 0.95) (layer "F.SilkS") (width 0.12) (tstamp dacd3f78-200b-44e4-a99f-02807b16a25f))
+    (fp_line (start -1.4 -1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp 242bf942-1d00-40e0-8e33-9df3436484ba))
+    (fp_line (start 1.35 1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp 8557376b-c91c-4f76-bbd0-b9ce3e5ca7e9))
+    (fp_line (start -1.4 -1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp ae798f09-b18f-4364-9a21-29af6407b872))
+    (fp_line (start 1.35 1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp b57a84cb-d025-4c68-a211-a81a285de21d))
+    (fp_line (start 0.85 0.25) (end -0.9 0.25) (layer "F.Fab") (width 0.12) (tstamp 18026e32-7d3a-4d8d-be21-54d45d069462))
+    (fp_line (start 0.85 -0.25) (end 0.85 0.25) (layer "F.Fab") (width 0.12) (tstamp 671da2e0-3045-4f39-bfa9-3c6d34ad540b))
+    (fp_line (start -0.9 -0.25) (end 0.85 -0.25) (layer "F.Fab") (width 0.12) (tstamp 860f3769-08bd-431f-a7f0-67e3f35b257e))
+    (fp_line (start -0.9 0.25) (end -0.9 -0.25) (layer "F.Fab") (width 0.12) (tstamp e04ac0c2-721f-4c45-8e11-a01a38fe375d))
+    (pad "1" thru_hole circle (at 0 0) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 179 "Net-(J40-Pad1)") (pinfunction "Pin_1") (pintype "passive") (tstamp 62a833ac-3d86-4c63-9e37-db24bb2ba350))
+    (model "${KICAD6_3DMODEL_DIR}/Connector_Pin.3dshapes/Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
       (rotate (xyz 0 0 0))
@@ -3228,49 +4005,43 @@
     )
   )
 
-  (footprint "Connector_PinSocket_2.54mm:PinSocket_1x03_P2.54mm_Vertical" (layer "F.Cu")
-    (tedit 5A19A429) (tstamp 68a9fad0-9545-4b36-9d8b-cb5eb8156c0e)
-    (at 50.8 45.72)
-    (descr "Through hole straight socket strip, 1x03, 2.54mm pitch, single row (from Kicad 4.0.7), script generated")
-    (tags "Through hole socket strip THT 1x03 2.54mm single row")
+  (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (layer "F.Cu")
+    (tedit 5A1DC084) (tstamp 66b19a0b-d07c-43ff-9bd5-abe61a163306)
+    (at 40.64 25.4)
+    (descr "solder Pin_ with flat fork, hole diameter 0.7mm, length 6.5mm, width 1.8mm")
+    (tags "solder Pin_ with flat fork")
     (property "Sheetfile" "rotary.kicad_sch")
     (property "Sheetname" "Rotary Encoder")
-    (path "/0e0cd3f9-9e59-4187-9e69-2f18dd8368cc/00000000-0000-0000-0000-000061fc9334")
+    (path "/0e0cd3f9-9e59-4187-9e69-2f18dd8368cc/3074fade-b34d-479b-8200-fadd967b837d")
     (attr through_hole)
-    (fp_text reference "JR4" (at 0 -2.77) (layer "F.SilkS") hide
+    (fp_text reference "J13" (at 0 1.8) (layer "F.SilkS") hide
       (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp d7b107e0-d5d5-4e2c-9770-b4cac49863b3)
+      (tstamp 22ba7011-af16-481a-be60-4832e2fa49b7)
     )
-    (fp_text value "ROT4" (at 0 -2.54) (layer "F.SilkS")
+    (fp_text value "B3" (at -0.025 4.445) (layer "F.Fab")
       (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 36929c7a-a029-4eb5-b1cc-045ad7f643c3)
+      (tstamp 3147e880-51e1-4334-9901-8c646d0f1c58)
     )
-    (fp_text user "${REFERENCE}" (at 0 2.54 90) (layer "F.Fab") hide
+    (fp_text user "${REFERENCE}" (at 0 1.8) (layer "F.Fab") hide
       (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 9a370594-801f-4c7c-9f67-ed645f0a0f6e)
+      (tstamp 674dfd9c-2241-44b5-bfb4-f6d11b1ff583)
     )
-    (fp_line (start 1.33 -1.33) (end 1.33 0) (layer "F.SilkS") (width 0.12) (tstamp 176c5b52-146f-45c6-968f-6bf6f0117e8d))
-    (fp_line (start 0 -1.33) (end 1.33 -1.33) (layer "F.SilkS") (width 0.12) (tstamp 2d987a4a-c40d-447a-b5e7-c4bd0e07757d))
-    (fp_line (start -1.33 1.27) (end 1.33 1.27) (layer "F.SilkS") (width 0.12) (tstamp 44597677-028d-431c-9ada-0b5949902bc3))
-    (fp_line (start 1.33 1.27) (end 1.33 6.41) (layer "F.SilkS") (width 0.12) (tstamp 4cb41f27-c0f5-4432-aa4b-0e57b9aa7033))
-    (fp_line (start -1.33 6.41) (end 1.33 6.41) (layer "F.SilkS") (width 0.12) (tstamp 9f95701d-2876-4223-990f-d706d5845c81))
-    (fp_line (start -1.33 1.27) (end -1.33 6.41) (layer "F.SilkS") (width 0.12) (tstamp a95aedbc-986a-488d-a94d-893f27950cf7))
-    (fp_line (start -1.8 6.85) (end -1.8 -1.8) (layer "F.CrtYd") (width 0.05) (tstamp 010c52d5-3d60-4e88-a05f-e4d5a82242f3))
-    (fp_line (start -1.8 -1.8) (end 1.75 -1.8) (layer "F.CrtYd") (width 0.05) (tstamp 557d55b3-3532-47d5-8bde-c718cdacefe8))
-    (fp_line (start 1.75 6.85) (end -1.8 6.85) (layer "F.CrtYd") (width 0.05) (tstamp b8b13667-04fe-43d7-8f03-2d384a3a808d))
-    (fp_line (start 1.75 -1.8) (end 1.75 6.85) (layer "F.CrtYd") (width 0.05) (tstamp cef282c5-a156-40d0-8e73-1675ca5bd5de))
-    (fp_line (start -1.27 6.35) (end -1.27 -1.27) (layer "F.Fab") (width 0.1) (tstamp 03cc5b09-0f5d-41fa-b8b9-5ceb8d9efb60))
-    (fp_line (start 0.635 -1.27) (end 1.27 -0.635) (layer "F.Fab") (width 0.1) (tstamp 0ebe11ff-acc4-4886-bb19-a92ea1981a0b))
-    (fp_line (start 1.27 6.35) (end -1.27 6.35) (layer "F.Fab") (width 0.1) (tstamp 404d9d67-3a96-4b36-81bb-c70fdd878d33))
-    (fp_line (start -1.27 -1.27) (end 0.635 -1.27) (layer "F.Fab") (width 0.1) (tstamp c358a6ca-2fd1-47af-ae34-33e18c68542c))
-    (fp_line (start 1.27 -0.635) (end 1.27 6.35) (layer "F.Fab") (width 0.1) (tstamp f96a0041-d4cc-4184-9af5-9113d4bf39e1))
-    (pad "1" thru_hole rect (at 0 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-      (net 151 "Net-(JR4-Pad1)") (pinfunction "Pin_1") (pintype "passive") (tstamp 02589269-37b2-454e-8de9-1a6f777d6b95))
-    (pad "2" thru_hole oval (at 0 2.54) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-      (net 152 "Net-(JR4-Pad2)") (pinfunction "Pin_2") (pintype "passive") (tstamp 618070c9-0a05-45b4-ae02-d6e866e89a1b))
-    (pad "3" thru_hole oval (at 0 5.08) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-      (net 14 "/Rotary Encoder/GND_ROT") (pinfunction "Pin_3") (pintype "passive") (tstamp b5d77abe-83ee-4c0e-bcbc-c2a796ea3a03))
-    (model "${KICAD6_3DMODEL_DIR}/Connector_PinSocket_2.54mm.3dshapes/PinSocket_1x03_P2.54mm_Vertical.wrl"
+    (fp_line (start -0.95 0.95) (end 0.9 0.95) (layer "F.SilkS") (width 0.12) (tstamp 02fad080-98cd-46ab-9ee4-13a74595ac68))
+    (fp_line (start -0.95 -0.95) (end -0.95 0.95) (layer "F.SilkS") (width 0.12) (tstamp 3e2733b2-429a-48e0-a5f6-9bc75cea3fb3))
+    (fp_line (start 0.9 0.95) (end 0.9 -0.9) (layer "F.SilkS") (width 0.12) (tstamp 3ec4c6d4-d672-41bf-9275-f96679fe932f))
+    (fp_line (start 0.9 -0.95) (end -0.95 -0.95) (layer "F.SilkS") (width 0.12) (tstamp 5ed867d6-e24b-4827-bb08-f4f5e703c946))
+    (fp_line (start 0.9 -0.9) (end 0.9 -0.95) (layer "F.SilkS") (width 0.12) (tstamp c0d36b8c-6b63-418d-9fae-b9063f7e525a))
+    (fp_line (start 1.35 1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp 785e7afb-5347-4e11-b292-701c649113fb))
+    (fp_line (start 1.35 1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp 7e75e4cc-e0cb-4b98-b80b-d3c04ae9a412))
+    (fp_line (start -1.4 -1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp 8c6484b7-f099-4c5c-b5fd-abaa05b4ab18))
+    (fp_line (start -1.4 -1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp a72be1e0-9af1-4c8b-a80a-e23a2ce6ded3))
+    (fp_line (start -0.9 0.25) (end -0.9 -0.25) (layer "F.Fab") (width 0.12) (tstamp 36ddd131-24a1-406c-a011-522c67b17ac1))
+    (fp_line (start 0.85 0.25) (end -0.9 0.25) (layer "F.Fab") (width 0.12) (tstamp 6613902d-850f-4102-9d7b-cc5a5ef20ea0))
+    (fp_line (start -0.9 -0.25) (end 0.85 -0.25) (layer "F.Fab") (width 0.12) (tstamp 9d68ca63-4f76-4c15-8edd-c79507b64ea4))
+    (fp_line (start 0.85 -0.25) (end 0.85 0.25) (layer "F.Fab") (width 0.12) (tstamp b3c4f9ea-9465-428d-a878-c35a35b4a0ec))
+    (pad "1" thru_hole circle (at 0 0) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 102 "Net-(J13-Pad1)") (pinfunction "Pin_1") (pintype "passive") (tstamp 05d71641-765e-42e9-b112-428ee2e771ec))
+    (model "${KICAD6_3DMODEL_DIR}/Connector_Pin.3dshapes/Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
       (rotate (xyz 0 0 0))
@@ -3375,7 +4146,7 @@
 
   (footprint "Connector_PinSocket_2.54mm:PinSocket_1x12_P2.54mm_Vertical" (layer "F.Cu")
     (tedit 5A19A41D) (tstamp 69c7190c-e105-4931-afc6-fe0b07e0d673)
-    (at 78.74 25.4)
+    (at 71.12 25.4)
     (descr "Through hole straight socket strip, 1x12, 2.54mm pitch, single row (from Kicad 4.0.7), script generated")
     (tags "Through hole socket strip THT 1x12 2.54mm single row")
     (property "Sheetfile" "cimdit.kicad_sch")
@@ -3440,49 +4211,43 @@
     )
   )
 
-  (footprint "Connector_PinSocket_2.54mm:PinSocket_1x03_P2.54mm_Vertical" (layer "F.Cu")
-    (tedit 5A19A429) (tstamp 6f14f71c-12e3-4a67-84de-8a6907c74601)
-    (at 35.56 45.72)
-    (descr "Through hole straight socket strip, 1x03, 2.54mm pitch, single row (from Kicad 4.0.7), script generated")
-    (tags "Through hole socket strip THT 1x03 2.54mm single row")
-    (property "Sheetfile" "rotary.kicad_sch")
-    (property "Sheetname" "Rotary Encoder")
-    (path "/0e0cd3f9-9e59-4187-9e69-2f18dd8368cc/00000000-0000-0000-0000-000061fbdff9")
+  (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (layer "F.Cu")
+    (tedit 5A1DC084) (tstamp 6c346650-092b-4155-a2d5-433c85250b59)
+    (at 38.1 38.1)
+    (descr "solder Pin_ with flat fork, hole diameter 0.7mm, length 6.5mm, width 1.8mm")
+    (tags "solder Pin_ with flat fork")
+    (property "Sheetfile" "cimdit.kicad_sch")
+    (property "Sheetname" "")
+    (path "/41415bac-1126-4467-b765-03fce423d075")
     (attr through_hole)
-    (fp_text reference "JR1" (at 0 -2.77) (layer "F.SilkS") hide
+    (fp_text reference "J24" (at 0 1.8) (layer "F.SilkS") hide
       (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp bcbf54a0-6fed-4879-9aec-21f775326d96)
+      (tstamp 7ff6e72d-92d2-4ff9-bb22-8c5267b456dd)
     )
-    (fp_text value "ROT1" (at 0 -2.54) (layer "F.SilkS")
+    (fp_text value "INT" (at -1.905 0 90) (layer "F.Fab")
       (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp f104e79d-a94c-4d53-acb0-d4e3204bc2a3)
+      (tstamp 8462fe3c-6fb2-4a5b-b8b1-e3ff86e3ad06)
     )
-    (fp_text user "${REFERENCE}" (at 0 2.54 90) (layer "F.Fab") hide
+    (fp_text user "${REFERENCE}" (at 0 1.8) (layer "F.Fab") hide
       (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 60564450-8c65-453f-aa81-3e1710794e30)
+      (tstamp c04375d1-586e-4875-bcd1-7762af6c20ad)
     )
-    (fp_line (start -1.33 6.41) (end 1.33 6.41) (layer "F.SilkS") (width 0.12) (tstamp 0ed3a892-0502-48f9-851b-dfef27b686c7))
-    (fp_line (start 0 -1.33) (end 1.33 -1.33) (layer "F.SilkS") (width 0.12) (tstamp 2cee4561-12b3-48b7-81af-223435c0ab41))
-    (fp_line (start 1.33 1.27) (end 1.33 6.41) (layer "F.SilkS") (width 0.12) (tstamp 53c168bd-bf0e-4c47-9b5f-4a75baa042a1))
-    (fp_line (start 1.33 -1.33) (end 1.33 0) (layer "F.SilkS") (width 0.12) (tstamp 842e45c9-999d-459c-a527-f7265fb7a567))
-    (fp_line (start -1.33 1.27) (end 1.33 1.27) (layer "F.SilkS") (width 0.12) (tstamp 916c287c-df71-44c5-9f9b-10eaeb214017))
-    (fp_line (start -1.33 1.27) (end -1.33 6.41) (layer "F.SilkS") (width 0.12) (tstamp eb707b3d-ebff-4427-a2de-ec9a76ef5908))
-    (fp_line (start -1.8 -1.8) (end 1.75 -1.8) (layer "F.CrtYd") (width 0.05) (tstamp 504b352f-8f5f-4033-988e-98c3967132dc))
-    (fp_line (start -1.8 6.85) (end -1.8 -1.8) (layer "F.CrtYd") (width 0.05) (tstamp b8de2e07-cb24-4e72-999f-637f52c53bf4))
-    (fp_line (start 1.75 -1.8) (end 1.75 6.85) (layer "F.CrtYd") (width 0.05) (tstamp bd89eb8e-f2ab-4045-bf7b-6bf4adffabfa))
-    (fp_line (start 1.75 6.85) (end -1.8 6.85) (layer "F.CrtYd") (width 0.05) (tstamp fc109585-cc65-40ee-bd0e-f2de64061277))
-    (fp_line (start -1.27 6.35) (end -1.27 -1.27) (layer "F.Fab") (width 0.1) (tstamp 16e316b6-299a-49bb-8e3d-be39e89cf7e4))
-    (fp_line (start 1.27 6.35) (end -1.27 6.35) (layer "F.Fab") (width 0.1) (tstamp 3432273d-295a-43d1-83f8-841db46ea3e9))
-    (fp_line (start 0.635 -1.27) (end 1.27 -0.635) (layer "F.Fab") (width 0.1) (tstamp 67289850-ba35-44c2-9823-fc814fbe08b0))
-    (fp_line (start 1.27 -0.635) (end 1.27 6.35) (layer "F.Fab") (width 0.1) (tstamp 8110a7c2-2315-494c-8a46-94e4001fec88))
-    (fp_line (start -1.27 -1.27) (end 0.635 -1.27) (layer "F.Fab") (width 0.1) (tstamp f882a7c5-7ba6-4c4c-a6e1-015d94305887))
-    (pad "1" thru_hole rect (at 0 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-      (net 75 "Net-(JR1-Pad1)") (pinfunction "Pin_1") (pintype "passive") (tstamp 45a6ed70-d20d-498e-9a1e-f94e80e43ab1))
-    (pad "2" thru_hole oval (at 0 2.54) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-      (net 76 "Net-(JR1-Pad2)") (pinfunction "Pin_2") (pintype "passive") (tstamp 9db59bbd-5349-4131-bc67-8c214473edf6))
-    (pad "3" thru_hole oval (at 0 5.08) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-      (net 14 "/Rotary Encoder/GND_ROT") (pinfunction "Pin_3") (pintype "passive") (tstamp 0cffba40-7bc2-436e-a819-d6a7e0e0e768))
-    (model "${KICAD6_3DMODEL_DIR}/Connector_PinSocket_2.54mm.3dshapes/PinSocket_1x03_P2.54mm_Vertical.wrl"
+    (fp_line (start -0.95 -0.95) (end -0.95 0.95) (layer "F.SilkS") (width 0.12) (tstamp 3b871e0c-ab38-4719-a2d5-ed90930aedba))
+    (fp_line (start 0.9 0.95) (end 0.9 -0.9) (layer "F.SilkS") (width 0.12) (tstamp 42116bfd-457d-4593-ac30-a7ae4508e2ee))
+    (fp_line (start 0.9 -0.9) (end 0.9 -0.95) (layer "F.SilkS") (width 0.12) (tstamp d5ca8fc8-81f8-4a87-b951-6a5fa74306bd))
+    (fp_line (start 0.9 -0.95) (end -0.95 -0.95) (layer "F.SilkS") (width 0.12) (tstamp e606296b-e2ca-468d-ac38-71b5344b6e85))
+    (fp_line (start -0.95 0.95) (end 0.9 0.95) (layer "F.SilkS") (width 0.12) (tstamp e666a0db-591f-48b6-8a0d-7c7a6373c0a3))
+    (fp_line (start -1.4 -1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp 03088ce0-e686-48cc-8f83-98dc3013c127))
+    (fp_line (start 1.35 1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp 29121967-985e-4629-9206-85806f8f2a9c))
+    (fp_line (start 1.35 1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp 9875cb24-9ea3-45b2-a974-1b8edc7b9af5))
+    (fp_line (start -1.4 -1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp a354a73b-54b0-4dc8-a419-fbc76de5e799))
+    (fp_line (start -0.9 0.25) (end -0.9 -0.25) (layer "F.Fab") (width 0.12) (tstamp 010c43a2-732c-48b0-bbc7-9b5dac471893))
+    (fp_line (start 0.85 -0.25) (end 0.85 0.25) (layer "F.Fab") (width 0.12) (tstamp 53a6249a-2895-4514-93d3-6e61542c69fb))
+    (fp_line (start 0.85 0.25) (end -0.9 0.25) (layer "F.Fab") (width 0.12) (tstamp 6c879b85-62f9-4a6e-a7ee-23bdecc74acf))
+    (fp_line (start -0.9 -0.25) (end 0.85 -0.25) (layer "F.Fab") (width 0.12) (tstamp e4bc409f-c38c-4340-be74-f1985233ba4d))
+    (pad "1" thru_hole circle (at 0 0) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 16 "/Rotary Encoder/INT_ROT") (pinfunction "Pin_1") (pintype "passive") (tstamp 8cdb0859-c152-438f-a411-753aa02c1177))
+    (model "${KICAD6_3DMODEL_DIR}/Connector_Pin.3dshapes/Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
       (rotate (xyz 0 0 0))
@@ -3779,22 +4544,22 @@
 
   (footprint "Connector_PinSocket_2.54mm:PinSocket_1x08_P2.54mm_Vertical" (layer "F.Cu")
     (tedit 5A19A420) (tstamp 78bd3887-fdc4-4e9a-acd1-e467b76bd693)
-    (at 25.4 129.54 180)
+    (at 81.28 116.84 -90)
     (descr "Through hole straight socket strip, 1x08, 2.54mm pitch, single row (from Kicad 4.0.7), script generated")
     (tags "Through hole socket strip THT 1x08 2.54mm single row")
     (property "Sheetfile" "keymatrix_extdiode.kicad_sch")
     (property "Sheetname" "KeyMatrix Ext Diodes")
     (path "/7a807cd9-4b53-4d34-8616-454af4054d6a/067ca1f6-1bce-44a5-aa4d-1b7dc1cce057")
     (attr through_hole)
-    (fp_text reference "JK5" (at 0 -2.77) (layer "F.SilkS") hide
+    (fp_text reference "JK5" (at 0 -2.77 -270) (layer "F.SilkS") hide
       (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 67ea16e1-0c55-4397-8a77-4000de8a246f)
     )
-    (fp_text value "ROW5" (at 0 20.55) (layer "F.SilkS")
+    (fp_text value "ROW5" (at 0 20.55 -270) (layer "F.SilkS")
       (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 32345de2-9ba8-4bb7-9953-31ce8feaf06c)
     )
-    (fp_text user "${REFERENCE}" (at 0 8.89 90) (layer "F.Fab") hide
+    (fp_text user "${REFERENCE}" (at 0 8.89) (layer "F.Fab") hide
       (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 61d905c6-3a9e-4103-b419-c7340a7ca7b0)
     )
@@ -3813,21 +4578,21 @@
     (fp_line (start 1.27 19.05) (end -1.27 19.05) (layer "F.Fab") (width 0.1) (tstamp 5aeaf742-32cd-4108-9f64-a97de6c418f4))
     (fp_line (start 0.635 -1.27) (end 1.27 -0.635) (layer "F.Fab") (width 0.1) (tstamp c56e6725-eec3-4d3a-b89d-8f584d36f831))
     (fp_line (start 1.27 -0.635) (end 1.27 19.05) (layer "F.Fab") (width 0.1) (tstamp d81d1402-c429-4283-bfcd-5c29562dcb4e))
-    (pad "1" thru_hole rect (at 0 0 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "1" thru_hole rect (at 0 0 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 52 "Net-(JK5-Pad1)") (pinfunction "Pin_1") (pintype "passive") (tstamp 30e68e7a-0af9-44dc-a2d9-0c080e913c30))
-    (pad "2" thru_hole oval (at 0 2.54 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "2" thru_hole oval (at 0 2.54 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 52 "Net-(JK5-Pad1)") (pinfunction "Pin_2") (pintype "passive") (tstamp b9292852-4810-400f-be14-76e0b93df842))
-    (pad "3" thru_hole oval (at 0 5.08 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "3" thru_hole oval (at 0 5.08 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 52 "Net-(JK5-Pad1)") (pinfunction "Pin_3") (pintype "passive") (tstamp 7dc40a91-5f48-48f8-b713-3a14049bfe71))
-    (pad "4" thru_hole oval (at 0 7.62 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "4" thru_hole oval (at 0 7.62 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 52 "Net-(JK5-Pad1)") (pinfunction "Pin_4") (pintype "passive") (tstamp 3c7661d0-ecd4-4d8c-8608-9da0708e25b1))
-    (pad "5" thru_hole oval (at 0 10.16 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "5" thru_hole oval (at 0 10.16 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 52 "Net-(JK5-Pad1)") (pinfunction "Pin_5") (pintype "passive") (tstamp 17ff9da3-4a0b-4e6f-b8c9-d48e3f5a7f9e))
-    (pad "6" thru_hole oval (at 0 12.7 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "6" thru_hole oval (at 0 12.7 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 52 "Net-(JK5-Pad1)") (pinfunction "Pin_6") (pintype "passive") (tstamp 578ae6c0-5141-4fb3-a151-91926dd02aab))
-    (pad "7" thru_hole oval (at 0 15.24 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "7" thru_hole oval (at 0 15.24 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 52 "Net-(JK5-Pad1)") (pinfunction "Pin_7") (pintype "passive") (tstamp 2b5c2297-5758-457d-a7db-0cb44470c725))
-    (pad "8" thru_hole oval (at 0 17.78 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "8" thru_hole oval (at 0 17.78 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 52 "Net-(JK5-Pad1)") (pinfunction "Pin_8") (pintype "passive") (tstamp a3c33b4d-11fe-4008-a759-b013130f2c29))
     (model "${KICAD6_3DMODEL_DIR}/Connector_PinSocket_2.54mm.3dshapes/PinSocket_1x08_P2.54mm_Vertical.wrl"
       (offset (xyz 0 0 0))
@@ -3838,22 +4603,22 @@
 
   (footprint "Connector_PinSocket_2.54mm:PinSocket_1x08_P2.54mm_Vertical" (layer "F.Cu")
     (tedit 5A19A420) (tstamp 7a782070-3833-4958-b2b6-05cbb20bd722)
-    (at 27.94 129.54 180)
+    (at 81.28 114.3 -90)
     (descr "Through hole straight socket strip, 1x08, 2.54mm pitch, single row (from Kicad 4.0.7), script generated")
     (tags "Through hole socket strip THT 1x08 2.54mm single row")
     (property "Sheetfile" "keymatrix_extdiode.kicad_sch")
     (property "Sheetname" "KeyMatrix Ext Diodes")
     (path "/7a807cd9-4b53-4d34-8616-454af4054d6a/03ac933a-a006-4d8b-ac97-af6cd6e29abb")
     (attr through_hole)
-    (fp_text reference "JK6" (at 0 -2.77) (layer "F.SilkS") hide
+    (fp_text reference "JK6" (at 0 -2.77 -270) (layer "F.SilkS") hide
       (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 7496c309-1d2c-4f04-b676-68aeee5ba04d)
     )
-    (fp_text value "ROW6" (at 0 -2.54) (layer "F.SilkS")
+    (fp_text value "ROW6" (at 0 -2.54 -270) (layer "F.SilkS")
       (effects (font (size 1 1) (thickness 0.15)))
       (tstamp af81f7a4-5c1e-4ea3-827c-38acfeb82fa6)
     )
-    (fp_text user "${REFERENCE}" (at 0 8.89 90) (layer "F.Fab") hide
+    (fp_text user "${REFERENCE}" (at 0 8.89) (layer "F.Fab") hide
       (effects (font (size 1 1) (thickness 0.15)))
       (tstamp faf7580c-b600-4480-9328-0c0284b85aa9)
     )
@@ -3872,21 +4637,21 @@
     (fp_line (start -1.27 19.05) (end -1.27 -1.27) (layer "F.Fab") (width 0.1) (tstamp 63bb0e26-a3ab-45a1-8dea-c453b08ba504))
     (fp_line (start 0.635 -1.27) (end 1.27 -0.635) (layer "F.Fab") (width 0.1) (tstamp 6bc8db1a-19fd-4ebb-b0d6-d7d2cc4f39f2))
     (fp_line (start 1.27 19.05) (end -1.27 19.05) (layer "F.Fab") (width 0.1) (tstamp ba125761-3316-4f13-a904-c7c4d34cf79c))
-    (pad "1" thru_hole rect (at 0 0 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "1" thru_hole rect (at 0 0 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 57 "Net-(JK6-Pad1)") (pinfunction "Pin_1") (pintype "passive") (tstamp 0f52deab-fbd1-4237-bd48-b364b82c9220))
-    (pad "2" thru_hole oval (at 0 2.54 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "2" thru_hole oval (at 0 2.54 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 57 "Net-(JK6-Pad1)") (pinfunction "Pin_2") (pintype "passive") (tstamp 94d4ea18-12a7-4775-bea8-c4aa302596a7))
-    (pad "3" thru_hole oval (at 0 5.08 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "3" thru_hole oval (at 0 5.08 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 57 "Net-(JK6-Pad1)") (pinfunction "Pin_3") (pintype "passive") (tstamp 04f5e42b-efae-444c-96df-a2809cf5206c))
-    (pad "4" thru_hole oval (at 0 7.62 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "4" thru_hole oval (at 0 7.62 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 57 "Net-(JK6-Pad1)") (pinfunction "Pin_4") (pintype "passive") (tstamp 3af99b0f-b64b-4839-a145-eff04622e95f))
-    (pad "5" thru_hole oval (at 0 10.16 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "5" thru_hole oval (at 0 10.16 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 57 "Net-(JK6-Pad1)") (pinfunction "Pin_5") (pintype "passive") (tstamp c90e05f1-845b-49ff-a5ff-632b6e493572))
-    (pad "6" thru_hole oval (at 0 12.7 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "6" thru_hole oval (at 0 12.7 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 57 "Net-(JK6-Pad1)") (pinfunction "Pin_6") (pintype "passive") (tstamp 642dcd58-9cbb-4cff-bce4-a61e9d1b3912))
-    (pad "7" thru_hole oval (at 0 15.24 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "7" thru_hole oval (at 0 15.24 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 57 "Net-(JK6-Pad1)") (pinfunction "Pin_7") (pintype "passive") (tstamp 690f7826-e55a-47e7-9149-776663bb4722))
-    (pad "8" thru_hole oval (at 0 17.78 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "8" thru_hole oval (at 0 17.78 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 57 "Net-(JK6-Pad1)") (pinfunction "Pin_8") (pintype "passive") (tstamp 3d169365-9f6f-4736-90ac-3f71c34555f5))
     (model "${KICAD6_3DMODEL_DIR}/Connector_PinSocket_2.54mm.3dshapes/PinSocket_1x08_P2.54mm_Vertical.wrl"
       (offset (xyz 0 0 0))
@@ -3897,22 +4662,22 @@
 
   (footprint "Connector_PinSocket_2.54mm:PinSocket_1x08_P2.54mm_Vertical" (layer "F.Cu")
     (tedit 5A19A420) (tstamp 7e56c17a-e250-4674-a335-a07c1d26d709)
-    (at 17.755 93.965 180)
+    (at 45.705 124.485 -90)
     (descr "Through hole straight socket strip, 1x08, 2.54mm pitch, single row (from Kicad 4.0.7), script generated")
     (tags "Through hole socket strip THT 1x08 2.54mm single row")
     (property "Sheetfile" "keymatrix_extdiode.kicad_sch")
     (property "Sheetname" "KeyMatrix Ext Diodes")
     (path "/7a807cd9-4b53-4d34-8616-454af4054d6a/b8d83914-0438-4fa3-8570-97a47796af50")
     (attr through_hole)
-    (fp_text reference "JK17" (at 0 -2.77) (layer "F.SilkS") hide
+    (fp_text reference "JK17" (at 0 -2.77 -270) (layer "F.SilkS") hide
       (effects (font (size 1 1) (thickness 0.15)))
       (tstamp ec7ba6e9-706f-48bc-9bf3-0aa8a7296a91)
     )
-    (fp_text value "COL7" (at 0 -2.555) (layer "F.SilkS")
+    (fp_text value "COL7" (at 0 -2.555 -270) (layer "F.SilkS")
       (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 7b0b9e9f-b7db-4e23-b6f7-a478520df1d4)
     )
-    (fp_text user "${REFERENCE}" (at 0 8.89 90) (layer "F.Fab") hide
+    (fp_text user "${REFERENCE}" (at 0 8.89) (layer "F.Fab") hide
       (effects (font (size 1 1) (thickness 0.15)))
       (tstamp a2abe392-0890-4e93-8b86-e15362369e61)
     )
@@ -3931,21 +4696,21 @@
     (fp_line (start 1.27 19.05) (end -1.27 19.05) (layer "F.Fab") (width 0.1) (tstamp 49819e4d-f38b-46dc-aba9-2278b7c30508))
     (fp_line (start 0.635 -1.27) (end 1.27 -0.635) (layer "F.Fab") (width 0.1) (tstamp 7187af9d-ab36-44a7-9fbb-00293559c62d))
     (fp_line (start -1.27 19.05) (end -1.27 -1.27) (layer "F.Fab") (width 0.1) (tstamp baf6cf17-83a4-4f18-bd63-a4cdb7bc82dc))
-    (pad "1" thru_hole rect (at 0 0 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "1" thru_hole rect (at 0 0 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 66 "Net-(JK17-Pad1)") (pinfunction "Pin_1") (pintype "passive") (tstamp 031eb1d7-d1d9-4f4b-983d-0672a0b9b149))
-    (pad "2" thru_hole oval (at 0 2.54 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "2" thru_hole oval (at 0 2.54 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 66 "Net-(JK17-Pad1)") (pinfunction "Pin_2") (pintype "passive") (tstamp 9a5723fc-0029-4ffa-b6ca-7b53296397a2))
-    (pad "3" thru_hole oval (at 0 5.08 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "3" thru_hole oval (at 0 5.08 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 66 "Net-(JK17-Pad1)") (pinfunction "Pin_3") (pintype "passive") (tstamp f98d8754-c464-42b5-8242-4019ec32e431))
-    (pad "4" thru_hole oval (at 0 7.62 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "4" thru_hole oval (at 0 7.62 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 66 "Net-(JK17-Pad1)") (pinfunction "Pin_4") (pintype "passive") (tstamp ed3b56a3-e420-4cd5-87ba-a5e6119f12c7))
-    (pad "5" thru_hole oval (at 0 10.16 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "5" thru_hole oval (at 0 10.16 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 66 "Net-(JK17-Pad1)") (pinfunction "Pin_5") (pintype "passive") (tstamp f0caadda-19c4-4109-8f5b-0e8e82d3002e))
-    (pad "6" thru_hole oval (at 0 12.7 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "6" thru_hole oval (at 0 12.7 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 66 "Net-(JK17-Pad1)") (pinfunction "Pin_6") (pintype "passive") (tstamp 595897e4-690e-438c-9e16-b8968e11750e))
-    (pad "7" thru_hole oval (at 0 15.24 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "7" thru_hole oval (at 0 15.24 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 66 "Net-(JK17-Pad1)") (pinfunction "Pin_7") (pintype "passive") (tstamp c1c07011-9684-4a86-baa3-f2da39be2f0f))
-    (pad "8" thru_hole oval (at 0 17.78 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "8" thru_hole oval (at 0 17.78 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 66 "Net-(JK17-Pad1)") (pinfunction "Pin_8") (pintype "passive") (tstamp b4cd7ba5-2e9c-4b48-9a8b-a603d392d4b3))
     (model "${KICAD6_3DMODEL_DIR}/Connector_PinSocket_2.54mm.3dshapes/PinSocket_1x08_P2.54mm_Vertical.wrl"
       (offset (xyz 0 0 0))
@@ -4002,55 +4767,6 @@
     )
   )
 
-  (footprint "Connector_PinSocket_2.54mm:PinSocket_1x03_P2.54mm_Vertical" (layer "F.Cu")
-    (tedit 5A19A429) (tstamp 862c9b45-742b-414e-853d-752548c1117f)
-    (at 43.18 33.02 180)
-    (descr "Through hole straight socket strip, 1x03, 2.54mm pitch, single row (from Kicad 4.0.7), script generated")
-    (tags "Through hole socket strip THT 1x03 2.54mm single row")
-    (property "Sheetfile" "rotary.kicad_sch")
-    (property "Sheetname" "Rotary Encoder")
-    (path "/0e0cd3f9-9e59-4187-9e69-2f18dd8368cc/00000000-0000-0000-0000-000063db2d31")
-    (attr through_hole)
-    (fp_text reference "JR7" (at 0 -2.77) (layer "F.SilkS") hide
-      (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 5d90a93c-b21c-4d62-b836-ab13c0810d10)
-    )
-    (fp_text value "ROT7" (at 0 7.85) (layer "F.SilkS")
-      (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp d25e4497-4bbb-4e66-b73c-3bb667885290)
-    )
-    (fp_text user "${REFERENCE}" (at 0 2.54 90) (layer "F.Fab") hide
-      (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp f7be4ed4-c72a-4e61-8b2f-7952938e4234)
-    )
-    (fp_line (start -1.33 6.41) (end 1.33 6.41) (layer "F.SilkS") (width 0.12) (tstamp 255814d5-4e4b-46be-908d-7c96cb244ba6))
-    (fp_line (start 1.33 1.27) (end 1.33 6.41) (layer "F.SilkS") (width 0.12) (tstamp 2a79da45-bcfb-4b3d-9fb6-bdadd6b5517c))
-    (fp_line (start -1.33 1.27) (end 1.33 1.27) (layer "F.SilkS") (width 0.12) (tstamp 7df7084d-2077-4b42-8977-99c56e5bf5f0))
-    (fp_line (start 0 -1.33) (end 1.33 -1.33) (layer "F.SilkS") (width 0.12) (tstamp a3170fa4-16fc-41fd-aec8-72954068bd87))
-    (fp_line (start -1.33 1.27) (end -1.33 6.41) (layer "F.SilkS") (width 0.12) (tstamp be4c72cf-a657-4fea-8a6c-9b79a990f8c3))
-    (fp_line (start 1.33 -1.33) (end 1.33 0) (layer "F.SilkS") (width 0.12) (tstamp e96d73b1-83f3-4449-aad3-e00389a825e3))
-    (fp_line (start 1.75 6.85) (end -1.8 6.85) (layer "F.CrtYd") (width 0.05) (tstamp 10c3bdd6-2ba4-41e3-99cd-936f14f567e8))
-    (fp_line (start 1.75 -1.8) (end 1.75 6.85) (layer "F.CrtYd") (width 0.05) (tstamp 7266f5bd-7906-4402-8e04-4f3217346f65))
-    (fp_line (start -1.8 6.85) (end -1.8 -1.8) (layer "F.CrtYd") (width 0.05) (tstamp 9be6fe7b-bdb9-4b03-83b1-c365dbb223d4))
-    (fp_line (start -1.8 -1.8) (end 1.75 -1.8) (layer "F.CrtYd") (width 0.05) (tstamp cacac4af-0415-421e-b028-1167147fb8b1))
-    (fp_line (start 1.27 6.35) (end -1.27 6.35) (layer "F.Fab") (width 0.1) (tstamp 0363a42f-99e7-494b-90e4-f58a82809267))
-    (fp_line (start 1.27 -0.635) (end 1.27 6.35) (layer "F.Fab") (width 0.1) (tstamp 4bf3089a-6d58-444a-a00f-1adddcb480ba))
-    (fp_line (start 0.635 -1.27) (end 1.27 -0.635) (layer "F.Fab") (width 0.1) (tstamp 5a115516-6739-4646-9359-3e18666d478f))
-    (fp_line (start -1.27 6.35) (end -1.27 -1.27) (layer "F.Fab") (width 0.1) (tstamp 7bfa9ab5-2fb4-48b7-8296-67801a5ceb73))
-    (fp_line (start -1.27 -1.27) (end 0.635 -1.27) (layer "F.Fab") (width 0.1) (tstamp 94c58b6c-b627-4058-93fb-d4c70fd6d43d))
-    (pad "1" thru_hole rect (at 0 0 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-      (net 155 "Net-(JR7-Pad1)") (pinfunction "Pin_1") (pintype "passive") (tstamp 717bb0a9-88e4-4b53-834b-7e467fadc496))
-    (pad "2" thru_hole oval (at 0 2.54 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-      (net 156 "Net-(JR7-Pad2)") (pinfunction "Pin_2") (pintype "passive") (tstamp 31328b98-3b47-428d-b604-9be266eb96d3))
-    (pad "3" thru_hole oval (at 0 5.08 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-      (net 14 "/Rotary Encoder/GND_ROT") (pinfunction "Pin_3") (pintype "passive") (tstamp 5c2e7bd1-3660-474c-a8c5-eb2d6847f4ce))
-    (model "${KICAD6_3DMODEL_DIR}/Connector_PinSocket_2.54mm.3dshapes/PinSocket_1x03_P2.54mm_Vertical.wrl"
-      (offset (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
   (footprint "Diode_THT:D_DO-35_SOD27_P2.54mm_Vertical_AnodeUp" (layer "F.Cu")
     (tedit 5AE50CD5) (tstamp 87aff286-2e69-481c-9559-5aab153e1d8b)
     (at 172.72 33.02 -90)
@@ -4101,22 +4817,22 @@
 
   (footprint "Connector_PinSocket_2.54mm:PinSocket_1x08_P2.54mm_Vertical" (layer "F.Cu")
     (tedit 5A19A420) (tstamp 8a1736e6-6862-4e8e-8e5a-db85366269d8)
-    (at 33.02 93.98 180)
+    (at 45.72 109.22 -90)
     (descr "Through hole straight socket strip, 1x08, 2.54mm pitch, single row (from Kicad 4.0.7), script generated")
     (tags "Through hole socket strip THT 1x08 2.54mm single row")
     (property "Sheetfile" "keymatrix_extdiode.kicad_sch")
     (property "Sheetname" "KeyMatrix Ext Diodes")
     (path "/7a807cd9-4b53-4d34-8616-454af4054d6a/05daa335-54bd-4d79-af6c-b601f9f5818b")
     (attr through_hole)
-    (fp_text reference "JK11" (at 0 -2.77) (layer "F.SilkS") hide
+    (fp_text reference "JK11" (at 0 -2.77 -270) (layer "F.SilkS") hide
       (effects (font (size 1 1) (thickness 0.15)))
       (tstamp fa5b8c91-5987-42d2-aee2-e6e34fe61b11)
     )
-    (fp_text value "COL1" (at 0 -2.54) (layer "F.SilkS")
+    (fp_text value "COL1" (at 0 -2.54 -270) (layer "F.SilkS")
       (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 04b6e096-a911-44ae-9e10-ae475098768f)
     )
-    (fp_text user "${REFERENCE}" (at 0 8.89 90) (layer "F.Fab") hide
+    (fp_text user "${REFERENCE}" (at 0 8.89) (layer "F.Fab") hide
       (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 3007a75c-c42d-49f0-9ee8-607587317630)
     )
@@ -4128,28 +4844,28 @@
     (fp_line (start 0 -1.33) (end 1.33 -1.33) (layer "F.SilkS") (width 0.12) (tstamp 5d5d903b-9080-4ea0-bbb9-3a14aa388097))
     (fp_line (start 1.75 -1.8) (end 1.75 19.55) (layer "F.CrtYd") (width 0.05) (tstamp 4942a16c-350c-4cc3-b6d6-034e51735bcb))
     (fp_line (start 1.75 19.55) (end -1.8 19.55) (layer "F.CrtYd") (width 0.05) (tstamp 4c18b21c-df55-4b1c-b514-ab1015f3c674))
-    (fp_line (start -1.8 19.55) (end -1.8 -1.8) (layer "F.CrtYd") (width 0.05) (tstamp bd46998a-ae54-421c-b8e7-d6d07c32ea52))
+    (fp_line (start -1.8 19.55) (end -1.8 -1.8) (layer "F.CrtYd") (width 0.05) (tstamp 9c352ce5-8dcd-4676-8f85-0d97597fd098))
     (fp_line (start -1.8 -1.8) (end 1.75 -1.8) (layer "F.CrtYd") (width 0.05) (tstamp f142eda0-0816-4e1e-90cf-3664d7d377c7))
     (fp_line (start 1.27 19.05) (end -1.27 19.05) (layer "F.Fab") (width 0.1) (tstamp 2f01a09f-3b40-4211-8f44-414b31f601a3))
     (fp_line (start 1.27 -0.635) (end 1.27 19.05) (layer "F.Fab") (width 0.1) (tstamp 6f866dfc-46da-42f0-b96d-1fc7f081b832))
     (fp_line (start -1.27 19.05) (end -1.27 -1.27) (layer "F.Fab") (width 0.1) (tstamp a198bda7-be5c-4500-a7af-192f2bf9c4be))
     (fp_line (start -1.27 -1.27) (end 0.635 -1.27) (layer "F.Fab") (width 0.1) (tstamp e9bf2310-d776-4451-ba9b-11c6767ed223))
     (fp_line (start 0.635 -1.27) (end 1.27 -0.635) (layer "F.Fab") (width 0.1) (tstamp f27d5be4-66ac-49bd-b481-775213af8981))
-    (pad "1" thru_hole rect (at 0 0 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "1" thru_hole rect (at 0 0 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 60 "Net-(JK11-Pad1)") (pinfunction "Pin_1") (pintype "passive") (tstamp 2543cd22-a280-40ad-8a48-6f245d4f3128))
-    (pad "2" thru_hole oval (at 0 2.54 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "2" thru_hole oval (at 0 2.54 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 60 "Net-(JK11-Pad1)") (pinfunction "Pin_2") (pintype "passive") (tstamp 91abda88-a077-44a4-be08-64ddde98a781))
-    (pad "3" thru_hole oval (at 0 5.08 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "3" thru_hole oval (at 0 5.08 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 60 "Net-(JK11-Pad1)") (pinfunction "Pin_3") (pintype "passive") (tstamp f7edba16-03fb-48d4-9ada-50a21353a670))
-    (pad "4" thru_hole oval (at 0 7.62 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "4" thru_hole oval (at 0 7.62 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 60 "Net-(JK11-Pad1)") (pinfunction "Pin_4") (pintype "passive") (tstamp 83b50757-cd58-41c0-bec9-21d155cfd7b1))
-    (pad "5" thru_hole oval (at 0 10.16 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "5" thru_hole oval (at 0 10.16 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 60 "Net-(JK11-Pad1)") (pinfunction "Pin_5") (pintype "passive") (tstamp 9ee8beb8-098b-4f7a-b56e-7834b8c10924))
-    (pad "6" thru_hole oval (at 0 12.7 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "6" thru_hole oval (at 0 12.7 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 60 "Net-(JK11-Pad1)") (pinfunction "Pin_6") (pintype "passive") (tstamp 4194b4a0-f335-4ad3-8095-b9ef0e2282f2))
-    (pad "7" thru_hole oval (at 0 15.24 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "7" thru_hole oval (at 0 15.24 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 60 "Net-(JK11-Pad1)") (pinfunction "Pin_7") (pintype "passive") (tstamp ce779216-9b0f-4bbe-9db4-258749d7fe63))
-    (pad "8" thru_hole oval (at 0 17.78 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "8" thru_hole oval (at 0 17.78 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 60 "Net-(JK11-Pad1)") (pinfunction "Pin_8") (pintype "passive") (tstamp fb379631-96dc-4030-bba3-a9f12c023051))
     (model "${KICAD6_3DMODEL_DIR}/Connector_PinSocket_2.54mm.3dshapes/PinSocket_1x08_P2.54mm_Vertical.wrl"
       (offset (xyz 0 0 0))
@@ -4254,9 +4970,95 @@
     )
   )
 
+  (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (layer "F.Cu")
+    (tedit 5A1DC084) (tstamp 96ea7aa6-700e-42b4-bef6-e684a17d5aa9)
+    (at 35.56 25.4)
+    (descr "solder Pin_ with flat fork, hole diameter 0.7mm, length 6.5mm, width 1.8mm")
+    (tags "solder Pin_ with flat fork")
+    (property "Sheetfile" "cimdit.kicad_sch")
+    (property "Sheetname" "")
+    (path "/8fbaf924-d871-450e-a1f0-30fbf0262d25")
+    (attr through_hole)
+    (fp_text reference "J26" (at 0 1.8) (layer "F.SilkS") hide
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp bd66e6de-b853-4de2-bf42-06831b49fe08)
+    )
+    (fp_text value "GND" (at 2.54 0 90) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 61446f17-835b-4791-9188-67c3e22457bd)
+    )
+    (fp_text user "${REFERENCE}" (at 0 1.8) (layer "F.Fab") hide
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 23b1c6b7-24b8-452a-afee-8dc8caa001c5)
+    )
+    (fp_line (start -0.95 -0.95) (end -0.95 0.95) (layer "F.SilkS") (width 0.12) (tstamp 232c2654-a24e-4679-a9c5-8a14111d3a59))
+    (fp_line (start 0.9 -0.95) (end -0.95 -0.95) (layer "F.SilkS") (width 0.12) (tstamp 330aa160-0dcf-4d86-b12c-6facdce00691))
+    (fp_line (start 0.9 -0.9) (end 0.9 -0.95) (layer "F.SilkS") (width 0.12) (tstamp a067e2a9-2168-4a75-b1ae-07175f3097e7))
+    (fp_line (start 0.9 0.95) (end 0.9 -0.9) (layer "F.SilkS") (width 0.12) (tstamp d00d473b-dbf2-4046-9ca4-13245b851c7d))
+    (fp_line (start -0.95 0.95) (end 0.9 0.95) (layer "F.SilkS") (width 0.12) (tstamp e35f74da-1ad9-4cb8-ac48-b4ba064240a7))
+    (fp_line (start 1.35 1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp 0f015f70-b9be-4792-8502-9235baab7ad3))
+    (fp_line (start -1.4 -1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp 58bcb7be-d6fc-44fe-98cc-4ab651432282))
+    (fp_line (start 1.35 1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp 7ef98de2-0407-484c-b75f-d3f0938f17b0))
+    (fp_line (start -1.4 -1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp cf9b593f-7152-4b36-a501-419aa3f30746))
+    (fp_line (start 0.85 0.25) (end -0.9 0.25) (layer "F.Fab") (width 0.12) (tstamp 0b8acda2-e6d4-4de7-b591-ea0c9b51fcec))
+    (fp_line (start -0.9 0.25) (end -0.9 -0.25) (layer "F.Fab") (width 0.12) (tstamp 7af2ff61-aa57-437e-b3e4-6de63a8458e0))
+    (fp_line (start 0.85 -0.25) (end 0.85 0.25) (layer "F.Fab") (width 0.12) (tstamp ba7195ae-a1f4-4965-82ea-89d705092be4))
+    (fp_line (start -0.9 -0.25) (end 0.85 -0.25) (layer "F.Fab") (width 0.12) (tstamp c3c02496-b038-43f1-99b8-409718a4222c))
+    (pad "1" thru_hole circle (at 0 0) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 14 "/Rotary Encoder/GND_ROT") (pinfunction "Pin_1") (pintype "passive") (tstamp ec3e67b0-4243-4656-a7ba-dca7a98ee1e2))
+    (model "${KICAD6_3DMODEL_DIR}/Connector_Pin.3dshapes/Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (layer "F.Cu")
+    (tedit 5A1DC084) (tstamp 99a7cfc8-5cbf-4d9c-aad3-f866de8a288d)
+    (at 55.88 38.1)
+    (descr "solder Pin_ with flat fork, hole diameter 0.7mm, length 6.5mm, width 1.8mm")
+    (tags "solder Pin_ with flat fork")
+    (property "Sheetfile" "rotary.kicad_sch")
+    (property "Sheetname" "Rotary Encoder")
+    (path "/0e0cd3f9-9e59-4187-9e69-2f18dd8368cc/54238fb1-8778-4633-862d-fd76f64f1725")
+    (attr through_hole)
+    (fp_text reference "J20" (at 0 1.8) (layer "F.SilkS") hide
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 86fb7087-6ba8-4b85-b696-07c14f0a9fb5)
+    )
+    (fp_text value "A7" (at -0.025 -4.445) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp cd7002a5-dbf1-4947-bf07-b7ae28be3b4a)
+    )
+    (fp_text user "${REFERENCE}" (at 0 1.8) (layer "F.Fab") hide
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp b1bdb303-cb9b-4bc2-a172-da9546d29135)
+    )
+    (fp_line (start 0.9 0.95) (end 0.9 -0.9) (layer "F.SilkS") (width 0.12) (tstamp 51e52e2d-6785-4c86-9dd7-8aebf7924453))
+    (fp_line (start -0.95 -0.95) (end -0.95 0.95) (layer "F.SilkS") (width 0.12) (tstamp 6fecb7b3-ef3d-4da6-9d91-57f091c44310))
+    (fp_line (start 0.9 -0.9) (end 0.9 -0.95) (layer "F.SilkS") (width 0.12) (tstamp 82b4e16b-220e-4644-bf1c-0c096f491472))
+    (fp_line (start 0.9 -0.95) (end -0.95 -0.95) (layer "F.SilkS") (width 0.12) (tstamp f239c5a8-dbfe-4237-89fc-56c709be30b1))
+    (fp_line (start -0.95 0.95) (end 0.9 0.95) (layer "F.SilkS") (width 0.12) (tstamp f80c9353-1371-4ac2-a3fe-3c48b88b02f5))
+    (fp_line (start -1.4 -1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp 2a1e126f-a9a5-414b-9647-9870ac9981f9))
+    (fp_line (start 1.35 1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp b6456347-a8b0-4beb-be5d-c94cb7d030d6))
+    (fp_line (start 1.35 1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp cbfed367-b5ba-46b2-9266-1ffd7189ad3b))
+    (fp_line (start -1.4 -1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp fcd784d4-f3bc-4084-8a2a-7b74ccc9478b))
+    (fp_line (start 0.85 0.25) (end -0.9 0.25) (layer "F.Fab") (width 0.12) (tstamp 18dcb17a-d81c-4b8b-8db2-863005a99fab))
+    (fp_line (start 0.85 -0.25) (end 0.85 0.25) (layer "F.Fab") (width 0.12) (tstamp 26a15f37-7ac7-4448-bfb4-f78a37fce015))
+    (fp_line (start -0.9 0.25) (end -0.9 -0.25) (layer "F.Fab") (width 0.12) (tstamp 28717230-cde2-4374-9345-a50192a67a85))
+    (fp_line (start -0.9 -0.25) (end 0.85 -0.25) (layer "F.Fab") (width 0.12) (tstamp f054547f-18bb-49fc-9aff-91e047769f87))
+    (pad "1" thru_hole circle (at 0 0) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 157 "Net-(J20-Pad1)") (pinfunction "Pin_1") (pintype "passive") (tstamp b78043a5-7a02-4945-aa76-579ca8313cb9))
+    (model "${KICAD6_3DMODEL_DIR}/Connector_Pin.3dshapes/Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
   (footprint "Connector_PinSocket_2.54mm:PinSocket_1x12_P2.54mm_Vertical" (layer "F.Cu")
     (tedit 5A19A41D) (tstamp 99da0a1e-0e84-4a04-92fe-5e54b8d4b54a)
-    (at 93.98 53.34 180)
+    (at 86.36 53.34 180)
     (descr "Through hole straight socket strip, 1x12, 2.54mm pitch, single row (from Kicad 4.0.7), script generated")
     (tags "Through hole socket strip THT 1x12 2.54mm single row")
     (property "Sheetfile" "cimdit.kicad_sch")
@@ -4369,6 +5171,49 @@
     )
   )
 
+  (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (layer "F.Cu")
+    (tedit 5A1DC084) (tstamp 9b547084-c7e0-40c4-9e5b-1b70bd77fc6f)
+    (at 40.64 45.72)
+    (descr "solder Pin_ with flat fork, hole diameter 0.7mm, length 6.5mm, width 1.8mm")
+    (tags "solder Pin_ with flat fork")
+    (property "Sheetfile" "keymatrix_extdiode_wire.kicad_sch")
+    (property "Sheetname" "KeyMatrix wired")
+    (path "/86fd0b4b-b0c8-4da7-922a-6650d5003f71/2c4dff0e-97cb-430c-b06b-cd8446c042f5")
+    (attr through_hole)
+    (fp_text reference "J37" (at 0 1.8) (layer "F.SilkS") hide
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 12d85746-843a-4457-8a10-3788392e76c7)
+    )
+    (fp_text value "R7" (at 0 5.08) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp d2c92adf-1fe1-47c3-8ff6-f267b017628c)
+    )
+    (fp_text user "${REFERENCE}" (at 0 1.8) (layer "F.Fab") hide
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp e0685f3a-590d-4608-9d26-146a166a084e)
+    )
+    (fp_line (start 0.9 0.95) (end 0.9 -0.9) (layer "F.SilkS") (width 0.12) (tstamp 09c82046-ec4f-4d8b-a599-623eb4c90e55))
+    (fp_line (start -0.95 0.95) (end 0.9 0.95) (layer "F.SilkS") (width 0.12) (tstamp 23319b93-8872-4015-ae92-a25e2d30ff15))
+    (fp_line (start -0.95 -0.95) (end -0.95 0.95) (layer "F.SilkS") (width 0.12) (tstamp 6b2547cf-2adf-41c4-a4a8-d1cd26b63aaa))
+    (fp_line (start 0.9 -0.95) (end -0.95 -0.95) (layer "F.SilkS") (width 0.12) (tstamp 75db9b73-547b-44b5-91e6-0aadeadd89fe))
+    (fp_line (start 0.9 -0.9) (end 0.9 -0.95) (layer "F.SilkS") (width 0.12) (tstamp e6d29fdc-66fa-405e-a61e-768cff1fe41e))
+    (fp_line (start -1.4 -1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp 9f4d031b-bcae-4d2b-b4fe-e555a7a445f4))
+    (fp_line (start -1.4 -1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp b161d14f-f972-4c9e-bb89-30daef53ccb3))
+    (fp_line (start 1.35 1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp cd0b1421-5548-41b7-bf57-1c2cff9a030f))
+    (fp_line (start 1.35 1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp f78d2c25-640a-4548-a027-472fc3511f21))
+    (fp_line (start 0.85 -0.25) (end 0.85 0.25) (layer "F.Fab") (width 0.12) (tstamp 9a266aed-18b6-4ff8-a7be-7791928bc708))
+    (fp_line (start 0.85 0.25) (end -0.9 0.25) (layer "F.Fab") (width 0.12) (tstamp cd3fa90f-5708-44b0-ac6a-8f9c3f18de22))
+    (fp_line (start -0.9 -0.25) (end 0.85 -0.25) (layer "F.Fab") (width 0.12) (tstamp edf90760-7f2c-4758-b79e-4873fba75358))
+    (fp_line (start -0.9 0.25) (end -0.9 -0.25) (layer "F.Fab") (width 0.12) (tstamp f323c458-bf9f-4d9f-8f08-814ab4ceef0e))
+    (pad "1" thru_hole circle (at 0 0) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 176 "Net-(J37-Pad1)") (pinfunction "Pin_1") (pintype "passive") (tstamp f356780b-7769-4a78-85e6-e1375ee9b7a4))
+    (model "${KICAD6_3DMODEL_DIR}/Connector_Pin.3dshapes/Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
   (footprint "Diode_THT:D_DO-35_SOD27_P2.54mm_Vertical_AnodeUp" (layer "F.Cu")
     (tedit 5AE50CD5) (tstamp a020398e-a550-480f-a3f6-334f08c54d17)
     (at 175.26 53.34 -90)
@@ -4417,24 +5262,67 @@
     )
   )
 
+  (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (layer "F.Cu")
+    (tedit 5A1DC084) (tstamp a3c1a97d-5474-41fc-9bcb-837360527251)
+    (at 55.88 58.42)
+    (descr "solder Pin_ with flat fork, hole diameter 0.7mm, length 6.5mm, width 1.8mm")
+    (tags "solder Pin_ with flat fork")
+    (property "Sheetfile" "keymatrix_extdiode_wire.kicad_sch")
+    (property "Sheetname" "KeyMatrix wired")
+    (path "/86fd0b4b-b0c8-4da7-922a-6650d5003f71/cddd98ec-06b3-4b4b-bd3e-77cb1b75197e")
+    (attr through_hole)
+    (fp_text reference "J44" (at 0 1.8) (layer "F.SilkS") hide
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 56c9de1f-b590-406d-9440-c897fe15152c)
+    )
+    (fp_text value "C6" (at 0 -5.08) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp e9543f3c-cd46-4dbe-9725-9e4f6abbbc7a)
+    )
+    (fp_text user "${REFERENCE}" (at 0 1.8) (layer "F.Fab") hide
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 1f0b52b7-1cb4-424d-af8a-799a42f4f1c1)
+    )
+    (fp_line (start 0.9 0.95) (end 0.9 -0.9) (layer "F.SilkS") (width 0.12) (tstamp 8d4e2929-4411-4597-8c87-8dcb1df47ea0))
+    (fp_line (start -0.95 0.95) (end 0.9 0.95) (layer "F.SilkS") (width 0.12) (tstamp 8e943e4d-bb7a-4187-9536-b7c28ba62816))
+    (fp_line (start 0.9 -0.9) (end 0.9 -0.95) (layer "F.SilkS") (width 0.12) (tstamp edb6c311-a95a-484f-aafd-726b7f62accb))
+    (fp_line (start -0.95 -0.95) (end -0.95 0.95) (layer "F.SilkS") (width 0.12) (tstamp f7fc9e09-f875-4f17-a255-8cec9b248a05))
+    (fp_line (start 0.9 -0.95) (end -0.95 -0.95) (layer "F.SilkS") (width 0.12) (tstamp fd5dace0-f317-41a1-b7d4-73f491b500e4))
+    (fp_line (start -1.4 -1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp 12dac358-e34f-4cdd-a0b9-24c9a009f82b))
+    (fp_line (start 1.35 1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp 46755be3-b815-4af6-a3d6-85e2c83d2780))
+    (fp_line (start 1.35 1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp e5dd8363-7d79-4f98-8f67-10ab4e3bfb29))
+    (fp_line (start -1.4 -1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp fd19f347-1055-40d5-b762-4b48fc48e586))
+    (fp_line (start 0.85 -0.25) (end 0.85 0.25) (layer "F.Fab") (width 0.12) (tstamp 054e2bd1-40be-432f-b01e-7eb877390200))
+    (fp_line (start -0.9 -0.25) (end 0.85 -0.25) (layer "F.Fab") (width 0.12) (tstamp 21e40f47-68f1-4e6b-b41b-96c38b453398))
+    (fp_line (start 0.85 0.25) (end -0.9 0.25) (layer "F.Fab") (width 0.12) (tstamp 7bc878bc-9fbf-4d8d-a5f1-fe6c257b39d9))
+    (fp_line (start -0.9 0.25) (end -0.9 -0.25) (layer "F.Fab") (width 0.12) (tstamp b5b57aaa-3fb4-417d-a10e-9199d42e1eb1))
+    (pad "1" thru_hole circle (at 0 0) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 183 "Net-(J44-Pad1)") (pinfunction "Pin_1") (pintype "passive") (tstamp ebaca5cf-ad9e-4eb6-a6f0-8116d87b1f63))
+    (model "${KICAD6_3DMODEL_DIR}/Connector_Pin.3dshapes/Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
   (footprint "Connector_PinSocket_2.54mm:PinSocket_1x08_P2.54mm_Vertical" (layer "F.Cu")
     (tedit 5A19A420) (tstamp a4257c70-fa6d-495c-99eb-48dc07d98831)
-    (at 17.755 129.525 180)
+    (at 81.265 124.485 -90)
     (descr "Through hole straight socket strip, 1x08, 2.54mm pitch, single row (from Kicad 4.0.7), script generated")
     (tags "Through hole socket strip THT 1x08 2.54mm single row")
     (property "Sheetfile" "keymatrix_extdiode.kicad_sch")
     (property "Sheetname" "KeyMatrix Ext Diodes")
     (path "/7a807cd9-4b53-4d34-8616-454af4054d6a/9d8821d5-4a46-42af-bc96-ab0db55e6097")
     (attr through_hole)
-    (fp_text reference "JK2" (at 0 -2.77) (layer "F.SilkS") hide
+    (fp_text reference "JK2" (at 0 -2.77 -270) (layer "F.SilkS") hide
       (effects (font (size 1 1) (thickness 0.15)))
       (tstamp c201b801-be57-43f1-9ad1-189ee6e7bc11)
     )
-    (fp_text value "ROW2" (at -0.025 -2.555) (layer "F.SilkS")
+    (fp_text value "ROW2" (at -0.025 -2.555 -270) (layer "F.SilkS")
       (effects (font (size 1 1) (thickness 0.15)))
       (tstamp cd687d4b-472a-4b2d-85ce-917f03a73835)
     )
-    (fp_text user "${REFERENCE}" (at 0 8.89 90) (layer "F.Fab") hide
+    (fp_text user "${REFERENCE}" (at 0 8.89) (layer "F.Fab") hide
       (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 200427ad-2832-4dbb-9227-2f456bd31af2)
     )
@@ -4453,21 +5341,21 @@
     (fp_line (start 1.27 -0.635) (end 1.27 19.05) (layer "F.Fab") (width 0.1) (tstamp 82867bf4-f706-48dc-ab65-fa19c1c7efd9))
     (fp_line (start 0.635 -1.27) (end 1.27 -0.635) (layer "F.Fab") (width 0.1) (tstamp cffb2abb-c1d3-43d1-a481-0af242966521))
     (fp_line (start -1.27 -1.27) (end 0.635 -1.27) (layer "F.Fab") (width 0.1) (tstamp d336bb33-8551-45e1-9a37-39a5964e22ad))
-    (pad "1" thru_hole rect (at 0 0 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "1" thru_hole rect (at 0 0 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 49 "Net-(JK2-Pad1)") (pinfunction "Pin_1") (pintype "passive") (tstamp 43706053-4f4e-461f-b054-7f5de6dc0258))
-    (pad "2" thru_hole oval (at 0 2.54 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "2" thru_hole oval (at 0 2.54 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 49 "Net-(JK2-Pad1)") (pinfunction "Pin_2") (pintype "passive") (tstamp bd08beb9-5319-4ea5-bcca-5d8f756c28f7))
-    (pad "3" thru_hole oval (at 0 5.08 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "3" thru_hole oval (at 0 5.08 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 49 "Net-(JK2-Pad1)") (pinfunction "Pin_3") (pintype "passive") (tstamp 3e36d46d-8471-4871-8ec9-6da665345d8a))
-    (pad "4" thru_hole oval (at 0 7.62 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "4" thru_hole oval (at 0 7.62 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 49 "Net-(JK2-Pad1)") (pinfunction "Pin_4") (pintype "passive") (tstamp 9bf6eaf0-8b37-4e51-b5e7-a2be99b52b96))
-    (pad "5" thru_hole oval (at 0 10.16 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "5" thru_hole oval (at 0 10.16 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 49 "Net-(JK2-Pad1)") (pinfunction "Pin_5") (pintype "passive") (tstamp b3179e89-cad8-48ce-93ab-34954f0b69ac))
-    (pad "6" thru_hole oval (at 0 12.7 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "6" thru_hole oval (at 0 12.7 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 49 "Net-(JK2-Pad1)") (pinfunction "Pin_6") (pintype "passive") (tstamp ca2dd9ba-0ecd-4f8d-808e-d875ef4c56c9))
-    (pad "7" thru_hole oval (at 0 15.24 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "7" thru_hole oval (at 0 15.24 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 49 "Net-(JK2-Pad1)") (pinfunction "Pin_7") (pintype "passive") (tstamp 9907ec5f-30b6-4f70-8109-7a4eb7e28e38))
-    (pad "8" thru_hole oval (at 0 17.78 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "8" thru_hole oval (at 0 17.78 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 49 "Net-(JK2-Pad1)") (pinfunction "Pin_8") (pintype "passive") (tstamp a3919a37-6c0b-458e-808f-5709bfa0fd57))
     (model "${KICAD6_3DMODEL_DIR}/Connector_PinSocket_2.54mm.3dshapes/PinSocket_1x08_P2.54mm_Vertical.wrl"
       (offset (xyz 0 0 0))
@@ -4524,6 +5412,49 @@
     )
   )
 
+  (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (layer "F.Cu")
+    (tedit 5A1DC084) (tstamp a65de6f7-a57d-4433-8d00-2faaf28702a5)
+    (at 53.34 25.4)
+    (descr "solder Pin_ with flat fork, hole diameter 0.7mm, length 6.5mm, width 1.8mm")
+    (tags "solder Pin_ with flat fork")
+    (property "Sheetfile" "rotary.kicad_sch")
+    (property "Sheetname" "Rotary Encoder")
+    (path "/0e0cd3f9-9e59-4187-9e69-2f18dd8368cc/92529218-3086-4e38-a5d7-361f20edc13a")
+    (attr through_hole)
+    (fp_text reference "J8" (at 0 1.8) (layer "F.SilkS") hide
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 34123646-538f-4d29-99e3-ef929983a259)
+    )
+    (fp_text value "A1" (at 0 4.445) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 792df31f-d7c8-4ab7-9004-848451dfcc4f)
+    )
+    (fp_text user "${REFERENCE}" (at 0 1.8) (layer "F.Fab") hide
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp c3d52d09-a3df-4a1f-b4d9-6c9229ec3718)
+    )
+    (fp_line (start 0.9 0.95) (end 0.9 -0.9) (layer "F.SilkS") (width 0.12) (tstamp 403f035e-89c7-4267-bc39-540407f9432f))
+    (fp_line (start 0.9 -0.95) (end -0.95 -0.95) (layer "F.SilkS") (width 0.12) (tstamp 5112e7ff-94f4-4953-9b3b-e89ab066bf44))
+    (fp_line (start 0.9 -0.9) (end 0.9 -0.95) (layer "F.SilkS") (width 0.12) (tstamp 633ef1d6-5811-4caa-b46b-b2c44b20f0ff))
+    (fp_line (start -0.95 0.95) (end 0.9 0.95) (layer "F.SilkS") (width 0.12) (tstamp 8a26463c-6132-4640-81bb-e4ad34aa7d3c))
+    (fp_line (start -0.95 -0.95) (end -0.95 0.95) (layer "F.SilkS") (width 0.12) (tstamp a682d36d-28f3-4c0f-8f71-912aa876dffd))
+    (fp_line (start -1.4 -1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp 291d9785-819b-4ab3-8871-6887bb427f84))
+    (fp_line (start 1.35 1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp 2e74c5cf-df21-4ecb-90c2-e2781152c95b))
+    (fp_line (start -1.4 -1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp 5f30f18a-2eb5-4274-9d3d-af9601238118))
+    (fp_line (start 1.35 1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp 91d720eb-a86c-46fd-9f6a-0dddf20bde1e))
+    (fp_line (start -0.9 -0.25) (end 0.85 -0.25) (layer "F.Fab") (width 0.12) (tstamp 72596630-6f62-446b-a788-e57836f8a3c1))
+    (fp_line (start 0.85 0.25) (end -0.9 0.25) (layer "F.Fab") (width 0.12) (tstamp 744bf9ad-3201-4631-b4df-82ae02271ec9))
+    (fp_line (start 0.85 -0.25) (end 0.85 0.25) (layer "F.Fab") (width 0.12) (tstamp bac0882a-cd95-40e5-bcae-36dd00c1e400))
+    (fp_line (start -0.9 0.25) (end -0.9 -0.25) (layer "F.Fab") (width 0.12) (tstamp dfcdf09d-9f20-4402-b580-09edd237e4fb))
+    (pad "1" thru_hole circle (at 0 0) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 77 "Net-(J8-Pad1)") (pinfunction "Pin_1") (pintype "passive") (tstamp 08def91c-96a1-4452-a029-3015fe0a2365))
+    (model "${KICAD6_3DMODEL_DIR}/Connector_Pin.3dshapes/Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
   (footprint "Diode_THT:D_DO-35_SOD27_P2.54mm_Vertical_AnodeUp" (layer "F.Cu")
     (tedit 5AE50CD5) (tstamp a7fe22b6-b84d-4572-88e2-d53a39988d8e)
     (at 177.8 43.18 -90)
@@ -4572,6 +5503,49 @@
     )
   )
 
+  (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (layer "F.Cu")
+    (tedit 5A1DC084) (tstamp acdc19ad-2d03-410d-b428-0229e9757c86)
+    (at 58.42 45.72)
+    (descr "solder Pin_ with flat fork, hole diameter 0.7mm, length 6.5mm, width 1.8mm")
+    (tags "solder Pin_ with flat fork")
+    (property "Sheetfile" "keymatrix_extdiode_wire.kicad_sch")
+    (property "Sheetname" "KeyMatrix wired")
+    (path "/86fd0b4b-b0c8-4da7-922a-6650d5003f71/7ce8fcd7-ee6c-4af5-92da-5d397d1d555e")
+    (attr through_hole)
+    (fp_text reference "J30" (at 0 1.8) (layer "F.SilkS") hide
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 8714ff81-a855-4fd8-9732-ddd502df00a1)
+    )
+    (fp_text value "R0" (at 0 5.08) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 6d55896f-2f3d-4bd7-8b5b-85ea2c518d49)
+    )
+    (fp_text user "${REFERENCE}" (at 0 1.8) (layer "F.Fab") hide
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 9da609b7-fe60-47f0-9e40-40a42c3997d4)
+    )
+    (fp_line (start -0.95 0.95) (end 0.9 0.95) (layer "F.SilkS") (width 0.12) (tstamp 0ad3949b-21ee-431d-8d86-3c3c8edfbc61))
+    (fp_line (start 0.9 0.95) (end 0.9 -0.9) (layer "F.SilkS") (width 0.12) (tstamp 1f7abaaf-d23f-440b-adc3-25bac38bb936))
+    (fp_line (start 0.9 -0.95) (end -0.95 -0.95) (layer "F.SilkS") (width 0.12) (tstamp 20268fb3-13d6-4179-98d2-70291583fa2c))
+    (fp_line (start 0.9 -0.9) (end 0.9 -0.95) (layer "F.SilkS") (width 0.12) (tstamp b351138f-c54d-4626-955e-d86ccb154148))
+    (fp_line (start -0.95 -0.95) (end -0.95 0.95) (layer "F.SilkS") (width 0.12) (tstamp ba49fd39-28cc-4fca-88f1-a37cc4f98a46))
+    (fp_line (start -1.4 -1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp 0f08e558-7e5e-4c1e-8503-d96b836058a3))
+    (fp_line (start 1.35 1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp 3e6b8f5c-7f12-4d82-8011-dc1fd9fd0356))
+    (fp_line (start -1.4 -1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp 625bf30b-b634-48aa-91f7-ca803f4966c9))
+    (fp_line (start 1.35 1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp 64704956-2983-4ef9-bd08-b61b254129f5))
+    (fp_line (start 0.85 -0.25) (end 0.85 0.25) (layer "F.Fab") (width 0.12) (tstamp 6103885a-aac0-4142-a439-da65bb88a09b))
+    (fp_line (start 0.85 0.25) (end -0.9 0.25) (layer "F.Fab") (width 0.12) (tstamp 718c6bc9-54fb-4902-b091-b75900fbec5d))
+    (fp_line (start -0.9 -0.25) (end 0.85 -0.25) (layer "F.Fab") (width 0.12) (tstamp 71de7f86-b4ed-4815-8f13-085ef513c926))
+    (fp_line (start -0.9 0.25) (end -0.9 -0.25) (layer "F.Fab") (width 0.12) (tstamp aed21c63-9316-45e5-b341-4d36629d2fb2))
+    (pad "1" thru_hole circle (at 0 0) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 169 "Net-(J30-Pad1)") (pinfunction "Pin_1") (pintype "passive") (tstamp 37f9345c-43b6-4e31-8280-acb94755535c))
+    (model "${KICAD6_3DMODEL_DIR}/Connector_Pin.3dshapes/Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
   (footprint "Connector_PinSocket_2.54mm:PinSocket_1x08_P2.54mm_Vertical" (layer "F.Cu")
     (tedit 5A19A420) (tstamp ae0fff6a-54a1-4c88-a6a0-552ae2b18136)
     (at 119.38 55.88)
@@ -4969,22 +5943,22 @@
 
   (footprint "Package_DIP:DIP-28_W7.62mm" (layer "F.Cu")
     (tedit 5A02E8C5) (tstamp b75a61b3-7249-411c-9b84-f29450ac12cf)
-    (at 15.24 106.68 90)
+    (at 58.42 127 180)
     (descr "28-lead though-hole mounted DIP package, row spacing 7.62 mm (300 mils)")
     (tags "THT DIP DIL PDIP 2.54mm 7.62mm 300mil")
     (property "Sheetfile" "keymatrix_extdiode.kicad_sch")
     (property "Sheetname" "KeyMatrix Ext Diodes")
     (path "/7a807cd9-4b53-4d34-8616-454af4054d6a/d04feb71-13a2-42f3-bf5c-5a872bc136db")
     (attr through_hole)
-    (fp_text reference "U4" (at 3.81 -2.33 90) (layer "F.SilkS") hide
+    (fp_text reference "U4" (at 3.81 -2.33) (layer "F.SilkS") hide
       (effects (font (size 1 1) (thickness 0.15)))
       (tstamp d8a40e66-9193-4ea0-bb90-6adefac55e31)
     )
-    (fp_text value "MCP23017_SP" (at 3.81 7.645) (layer "F.SilkS")
+    (fp_text value "MCP23017_SP" (at 3.81 7.645 90) (layer "F.SilkS")
       (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 92dd96ae-7a33-4a80-a3d9-203c50aae3b9)
     )
-    (fp_text user "${REFERENCE}" (at 3.81 16.51 90) (layer "F.Fab") hide
+    (fp_text user "${REFERENCE}" (at 3.81 16.51) (layer "F.Fab") hide
       (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 4b8359d2-b152-4e40-b073-6f21c63eb6ff)
     )
@@ -5003,61 +5977,61 @@
     (fp_line (start 0.635 -0.27) (end 1.635 -1.27) (layer "F.Fab") (width 0.1) (tstamp a6893bd5-f260-4563-9033-51242ba5bd1b))
     (fp_line (start 0.635 34.29) (end 0.635 -0.27) (layer "F.Fab") (width 0.1) (tstamp d9969fbf-35d2-4e51-8af9-4be7ea6a102a))
     (fp_line (start 1.635 -1.27) (end 6.985 -1.27) (layer "F.Fab") (width 0.1) (tstamp fa266a27-6870-4915-bf82-970b050bd2ef))
-    (pad "1" thru_hole rect locked (at 0 0 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad "1" thru_hole rect locked (at 0 0 180) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 48 "Net-(JK1-Pad1)") (pinfunction "GPB0") (pintype "bidirectional") (tstamp 28013d4f-c155-43b4-bfea-cd85955803c8))
-    (pad "2" thru_hole oval locked (at 0 2.54 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad "2" thru_hole oval locked (at 0 2.54 180) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 49 "Net-(JK2-Pad1)") (pinfunction "GPB1") (pintype "bidirectional") (tstamp 73775b96-1be6-4d48-95c7-2a6112393261))
-    (pad "3" thru_hole oval locked (at 0 5.08 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad "3" thru_hole oval locked (at 0 5.08 180) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 50 "Net-(JK3-Pad1)") (pinfunction "GPB2") (pintype "bidirectional") (tstamp a55657b2-79e0-47d9-9d82-ba503ed330c4))
-    (pad "4" thru_hole oval locked (at 0 7.62 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad "4" thru_hole oval locked (at 0 7.62 180) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 51 "Net-(JK4-Pad1)") (pinfunction "GPB3") (pintype "bidirectional") (tstamp cf051e12-3a7b-4739-8f13-f30f9d9ffbd8))
-    (pad "5" thru_hole oval locked (at 0 10.16 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad "5" thru_hole oval locked (at 0 10.16 180) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 52 "Net-(JK5-Pad1)") (pinfunction "GPB4") (pintype "bidirectional") (tstamp da042666-6cf8-4b6a-8882-f343de9fedb5))
-    (pad "6" thru_hole oval locked (at 0 12.7 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad "6" thru_hole oval locked (at 0 12.7 180) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 57 "Net-(JK6-Pad1)") (pinfunction "GPB5") (pintype "bidirectional") (tstamp 1f4ffa1c-74bb-40f1-9a87-c8c7ae01469e))
-    (pad "7" thru_hole oval locked (at 0 15.24 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad "7" thru_hole oval locked (at 0 15.24 180) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 58 "Net-(JK7-Pad1)") (pinfunction "GPB6") (pintype "bidirectional") (tstamp 5b13342c-44b1-4a1d-8e55-0aa2ed400a1d))
-    (pad "8" thru_hole oval locked (at 0 17.78 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad "8" thru_hole oval locked (at 0 17.78 180) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 59 "Net-(JK8-Pad1)") (pinfunction "GPB7") (pintype "bidirectional") (tstamp a46f5c0e-7b98-4810-ae01-a80772aa65ba))
-    (pad "9" thru_hole oval locked (at 0 20.32 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad "9" thru_hole oval locked (at 0 20.32 180) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 38 "/KeyMatrix Ext Diodes/+5V_KEY") (pinfunction "VDD") (pintype "power_in") (tstamp fa7d4586-0faf-4e76-974e-6a593c27cc46))
-    (pad "10" thru_hole oval locked (at 0 22.86 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad "10" thru_hole oval locked (at 0 22.86 180) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 37 "/KeyMatrix Ext Diodes/GND_KEY") (pinfunction "VSS") (pintype "power_in") (tstamp 2677bd75-5f41-458c-be5e-32eeeb3e769b))
-    (pad "11" thru_hole oval locked (at 0 25.4 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad "11" thru_hole oval locked (at 0 25.4 180) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 55 "unconnected-(U4-Pad11)") (pinfunction "NC") (pintype "no_connect") (tstamp 5b04d356-9b80-4bad-a02d-af8f683851d9))
-    (pad "12" thru_hole oval locked (at 0 27.94 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad "12" thru_hole oval locked (at 0 27.94 180) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 36 "/KeyMatrix Ext Diodes/I2C_CLOCK_KEY") (pinfunction "SCK") (pintype "input") (tstamp 2582ad59-0b6d-4f54-b398-b0193b524c3c))
-    (pad "13" thru_hole oval locked (at 0 30.48 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad "13" thru_hole oval locked (at 0 30.48 180) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 35 "/KeyMatrix Ext Diodes/I2C_DATA_KEY") (pinfunction "SDA") (pintype "bidirectional") (tstamp e4474014-c7b4-4d3c-9f74-52b067ffda1f))
-    (pad "14" thru_hole oval locked (at 0 33.02 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad "14" thru_hole oval locked (at 0 33.02 180) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 56 "unconnected-(U4-Pad14)") (pinfunction "NC") (pintype "no_connect") (tstamp 6916e120-a3af-4ae6-a7ea-158859b18d6e))
-    (pad "15" thru_hole oval locked (at 7.62 33.02 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad "15" thru_hole oval locked (at 7.62 33.02 180) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 37 "/KeyMatrix Ext Diodes/GND_KEY") (pinfunction "A0") (pintype "input") (tstamp 8c14b2f8-b6d9-4cbe-b982-9af24c5eeb24))
-    (pad "16" thru_hole oval locked (at 7.62 30.48 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad "16" thru_hole oval locked (at 7.62 30.48 180) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 37 "/KeyMatrix Ext Diodes/GND_KEY") (pinfunction "A1") (pintype "input") (tstamp 5c35c5d9-9cb0-4a1d-a782-ab700176fae5))
-    (pad "17" thru_hole oval locked (at 7.62 27.94 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad "17" thru_hole oval locked (at 7.62 27.94 180) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 37 "/KeyMatrix Ext Diodes/GND_KEY") (pinfunction "A2") (pintype "input") (tstamp 084f8335-f8d4-4612-8998-a301079d7751))
-    (pad "18" thru_hole oval locked (at 7.62 25.4 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad "18" thru_hole oval locked (at 7.62 25.4 180) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 38 "/KeyMatrix Ext Diodes/+5V_KEY") (pinfunction "~{RESET}") (pintype "input") (tstamp 65f0ddab-df14-4e1a-a1d0-cecef7caf555))
-    (pad "19" thru_hole oval locked (at 7.62 22.86 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad "19" thru_hole oval locked (at 7.62 22.86 180) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 53 "unconnected-(U4-Pad19)") (pinfunction "INTB") (pintype "tri_state+no_connect") (tstamp 58d16e18-ae63-40bc-9399-d753b84af8f5))
-    (pad "20" thru_hole oval locked (at 7.62 20.32 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad "20" thru_hole oval locked (at 7.62 20.32 180) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 54 "unconnected-(U4-Pad20)") (pinfunction "INTA") (pintype "tri_state+no_connect") (tstamp ad45a499-27cc-48fd-8f9d-237e4fc9c3d8))
-    (pad "21" thru_hole oval locked (at 7.62 17.78 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad "21" thru_hole oval locked (at 7.62 17.78 180) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 60 "Net-(JK11-Pad1)") (pinfunction "GPA0") (pintype "bidirectional") (tstamp 5bddf81b-04a7-43e1-8857-2461efbac6ab))
-    (pad "22" thru_hole oval locked (at 7.62 15.24 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad "22" thru_hole oval locked (at 7.62 15.24 180) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 61 "Net-(JK12-Pad1)") (pinfunction "GPA1") (pintype "bidirectional") (tstamp 6bfb23de-870c-417a-a5b3-52a99a51d307))
-    (pad "23" thru_hole oval locked (at 7.62 12.7 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad "23" thru_hole oval locked (at 7.62 12.7 180) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 62 "Net-(JK13-Pad1)") (pinfunction "GPA2") (pintype "bidirectional") (tstamp e1db2773-2d65-44bd-9002-d861be2d2cff))
-    (pad "24" thru_hole oval locked (at 7.62 10.16 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad "24" thru_hole oval locked (at 7.62 10.16 180) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 63 "Net-(JK14-Pad1)") (pinfunction "GPA3") (pintype "bidirectional") (tstamp 44195891-8326-460e-9817-79cd37f6691c))
-    (pad "25" thru_hole oval locked (at 7.62 7.62 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad "25" thru_hole oval locked (at 7.62 7.62 180) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 64 "Net-(JK15-Pad1)") (pinfunction "GPA4") (pintype "bidirectional") (tstamp 36bbb615-9c3b-43c5-817a-da89d3b6dbfc))
-    (pad "26" thru_hole oval locked (at 7.62 5.08 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad "26" thru_hole oval locked (at 7.62 5.08 180) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 65 "Net-(JK16-Pad1)") (pinfunction "GPA5") (pintype "bidirectional") (tstamp b9cf6d8e-3ab7-4d68-9e32-fe2997d8bf79))
-    (pad "27" thru_hole oval locked (at 7.62 2.54 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad "27" thru_hole oval locked (at 7.62 2.54 180) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 66 "Net-(JK17-Pad1)") (pinfunction "GPA6") (pintype "bidirectional") (tstamp 56d73c68-6a39-4dbc-a29f-e0b2252c96ff))
-    (pad "28" thru_hole oval locked (at 7.62 0 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad "28" thru_hole oval locked (at 7.62 0 180) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 67 "Net-(JK18-Pad1)") (pinfunction "GPA7") (pintype "bidirectional") (tstamp 2c53a12e-2752-45f7-86f7-dd5d3e1cefcf))
     (model "${KISYS3DMOD}/Package_DIP.3dshapes/DIP-28_W7.62mm.wrl"
       (offset (xyz 0 0 0))
@@ -5066,55 +6040,6 @@
     )
   )
 
-  (footprint "Connector_PinSocket_2.54mm:PinSocket_1x03_P2.54mm_Vertical" (layer "F.Cu")
-    (tedit 5A19A429) (tstamp b92111e1-7fbe-4239-b612-668367ec4ca8)
-    (at 53.34 33.02 180)
-    (descr "Through hole straight socket strip, 1x03, 2.54mm pitch, single row (from Kicad 4.0.7), script generated")
-    (tags "Through hole socket strip THT 1x03 2.54mm single row")
-    (property "Sheetfile" "rotary.kicad_sch")
-    (property "Sheetname" "Rotary Encoder")
-    (path "/0e0cd3f9-9e59-4187-9e69-2f18dd8368cc/00000000-0000-0000-0000-000063db2cfd")
-    (attr through_hole)
-    (fp_text reference "JR5" (at 0 -2.77) (layer "F.SilkS") hide
-      (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 03da4046-ad9a-47c3-8a6e-c509bc1c2231)
-    )
-    (fp_text value "ROT5" (at 0 7.85) (layer "F.SilkS")
-      (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp a1853786-d2dd-41fe-88ca-52bca81d8a76)
-    )
-    (fp_text user "${REFERENCE}" (at 0 2.54 90) (layer "F.Fab") hide
-      (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp df24dc54-3581-4718-952b-c5c0f0bc1ed2)
-    )
-    (fp_line (start -1.33 6.41) (end 1.33 6.41) (layer "F.SilkS") (width 0.12) (tstamp 236ae65c-bb28-4e2b-819f-5c51cbb3e559))
-    (fp_line (start 0 -1.33) (end 1.33 -1.33) (layer "F.SilkS") (width 0.12) (tstamp 42403a9e-4424-44db-9f0a-d79080a81425))
-    (fp_line (start -1.33 1.27) (end 1.33 1.27) (layer "F.SilkS") (width 0.12) (tstamp c71d52c4-1843-4a6b-a20e-3fb583f8e810))
-    (fp_line (start 1.33 1.27) (end 1.33 6.41) (layer "F.SilkS") (width 0.12) (tstamp cb77840f-ef76-4add-a3d6-d28842dbddd1))
-    (fp_line (start 1.33 -1.33) (end 1.33 0) (layer "F.SilkS") (width 0.12) (tstamp ec71cdaa-0605-4139-905a-a1122c4f226d))
-    (fp_line (start -1.33 1.27) (end -1.33 6.41) (layer "F.SilkS") (width 0.12) (tstamp ee1982b2-3318-41a4-9715-6d4f8c6a1e41))
-    (fp_line (start -1.8 -1.8) (end 1.75 -1.8) (layer "F.CrtYd") (width 0.05) (tstamp 4b4e3873-ac0f-4653-a8d4-3778a5c5455d))
-    (fp_line (start 1.75 6.85) (end -1.8 6.85) (layer "F.CrtYd") (width 0.05) (tstamp ce0bca9d-bdcf-450f-994d-4ff7eab3bdac))
-    (fp_line (start 1.75 -1.8) (end 1.75 6.85) (layer "F.CrtYd") (width 0.05) (tstamp dbb04b76-d0a8-4988-9e67-3ce83d44f1da))
-    (fp_line (start -1.8 6.85) (end -1.8 -1.8) (layer "F.CrtYd") (width 0.05) (tstamp f5a7b44a-4461-44e6-bc3d-474ae26b2c68))
-    (fp_line (start 1.27 6.35) (end -1.27 6.35) (layer "F.Fab") (width 0.1) (tstamp 682e58f2-8e89-42b0-9ca5-eddc516989ad))
-    (fp_line (start 0.635 -1.27) (end 1.27 -0.635) (layer "F.Fab") (width 0.1) (tstamp 7d126977-7d5b-45bd-a969-4dc0b43eba2b))
-    (fp_line (start -1.27 6.35) (end -1.27 -1.27) (layer "F.Fab") (width 0.1) (tstamp 8051b70a-367b-4a7a-87c0-c905b68cadf2))
-    (fp_line (start -1.27 -1.27) (end 0.635 -1.27) (layer "F.Fab") (width 0.1) (tstamp 9aff6190-5fe8-4c51-914e-ec06f906518a))
-    (fp_line (start 1.27 -0.635) (end 1.27 6.35) (layer "F.Fab") (width 0.1) (tstamp d649d185-3a4b-4396-ba07-4baff9db2aa3))
-    (pad "1" thru_hole rect (at 0 0 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-      (net 99 "Net-(JR5-Pad1)") (pinfunction "Pin_1") (pintype "passive") (tstamp e5def5a0-0535-48e4-aa07-8b904e8e9d72))
-    (pad "2" thru_hole oval (at 0 2.54 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-      (net 100 "Net-(JR5-Pad2)") (pinfunction "Pin_2") (pintype "passive") (tstamp c9544097-085f-4c6c-80b1-192b5b4e6434))
-    (pad "3" thru_hole oval (at 0 5.08 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-      (net 14 "/Rotary Encoder/GND_ROT") (pinfunction "Pin_3") (pintype "passive") (tstamp 1700d5d2-f287-4bd8-a211-f0517d9d41fb))
-    (model "${KICAD6_3DMODEL_DIR}/Connector_PinSocket_2.54mm.3dshapes/PinSocket_1x03_P2.54mm_Vertical.wrl"
-      (offset (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
   (footprint "Diode_THT:D_DO-35_SOD27_P2.54mm_Vertical_AnodeUp" (layer "F.Cu")
     (tedit 5AE50CD5) (tstamp be24ae03-b884-491c-bd4d-04bc48a1877a)
     (at 160.02 63.5 -90)
@@ -5211,6 +6136,92 @@
     )
   )
 
+  (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (layer "F.Cu")
+    (tedit 5A1DC084) (tstamp c1ae0bc4-d493-4918-b4f9-f3161bf2fd78)
+    (at 43.18 45.72)
+    (descr "solder Pin_ with flat fork, hole diameter 0.7mm, length 6.5mm, width 1.8mm")
+    (tags "solder Pin_ with flat fork")
+    (property "Sheetfile" "keymatrix_extdiode_wire.kicad_sch")
+    (property "Sheetname" "KeyMatrix wired")
+    (path "/86fd0b4b-b0c8-4da7-922a-6650d5003f71/55bb1663-5f30-46ba-abeb-15eb836bc9d5")
+    (attr through_hole)
+    (fp_text reference "J36" (at 0 1.8) (layer "F.SilkS") hide
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 5a852190-2f18-41f0-b357-4a1bd13f2f4b)
+    )
+    (fp_text value "R6" (at -0.025 5.08) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 0f936359-83b0-437e-a930-cfd4e3e8c3dd)
+    )
+    (fp_text user "${REFERENCE}" (at 0 1.8) (layer "F.Fab") hide
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 218ed193-86e9-4590-88cf-584091e454fa)
+    )
+    (fp_line (start -0.95 0.95) (end 0.9 0.95) (layer "F.SilkS") (width 0.12) (tstamp 533bc9b3-57fc-4b39-b09f-f0226bda591b))
+    (fp_line (start 0.9 0.95) (end 0.9 -0.9) (layer "F.SilkS") (width 0.12) (tstamp 85bc4398-c4d5-46dc-a31f-fd7a41f10264))
+    (fp_line (start -0.95 -0.95) (end -0.95 0.95) (layer "F.SilkS") (width 0.12) (tstamp 9b1102b7-0351-47e7-b73e-5bb515b1d50e))
+    (fp_line (start 0.9 -0.95) (end -0.95 -0.95) (layer "F.SilkS") (width 0.12) (tstamp b610759c-a6aa-4963-9928-31539aae5108))
+    (fp_line (start 0.9 -0.9) (end 0.9 -0.95) (layer "F.SilkS") (width 0.12) (tstamp e96def04-8e6d-44cd-ae43-dd53cec285ed))
+    (fp_line (start -1.4 -1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp 1eb949be-49f6-4e5b-a675-6b403636048f))
+    (fp_line (start 1.35 1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp ab0e6089-78d7-4500-b3b8-bc8c92102ccb))
+    (fp_line (start -1.4 -1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp b8be7d38-a474-420b-97f3-f713b524e263))
+    (fp_line (start 1.35 1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp c38b477b-8356-4d22-81c6-e2b90d44c035))
+    (fp_line (start -0.9 -0.25) (end 0.85 -0.25) (layer "F.Fab") (width 0.12) (tstamp c4b40da8-c4c5-4a3e-bde6-11adc0b1330f))
+    (fp_line (start 0.85 -0.25) (end 0.85 0.25) (layer "F.Fab") (width 0.12) (tstamp f8b3a069-edb0-4ae2-9f6e-520a504023be))
+    (fp_line (start -0.9 0.25) (end -0.9 -0.25) (layer "F.Fab") (width 0.12) (tstamp fb2dc1bb-16c3-429b-86ab-10dfc4a18e6e))
+    (fp_line (start 0.85 0.25) (end -0.9 0.25) (layer "F.Fab") (width 0.12) (tstamp ff72b64a-8dc3-4b06-9bdf-8a29a3f3b4ef))
+    (pad "1" thru_hole circle (at 0 0) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 175 "Net-(J36-Pad1)") (pinfunction "Pin_1") (pintype "passive") (tstamp 881e030b-be4a-43b9-9e22-22aaa56cfb36))
+    (model "${KICAD6_3DMODEL_DIR}/Connector_Pin.3dshapes/Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (layer "F.Cu")
+    (tedit 5A1DC084) (tstamp c3919767-e4bc-4aa4-89a3-77d8f27a2291)
+    (at 30.48 45.72)
+    (descr "solder Pin_ with flat fork, hole diameter 0.7mm, length 6.5mm, width 1.8mm")
+    (tags "solder Pin_ with flat fork")
+    (property "Sheetfile" "cimdit.kicad_sch")
+    (property "Sheetname" "")
+    (path "/2203e43f-03d3-4724-9dd2-784030ce3703")
+    (attr through_hole)
+    (fp_text reference "J48" (at 0 1.8) (layer "F.SilkS") hide
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 40ff2bb7-182d-493e-bf2b-36ba83038f3a)
+    )
+    (fp_text value "CLK" (at 2.54 0 90) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 0f0704a5-b8cf-441d-a46f-0c3d5d22a609)
+    )
+    (fp_text user "${REFERENCE}" (at 0 1.8) (layer "F.Fab") hide
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp feb26b97-9192-43a0-b47f-cc408e65afeb)
+    )
+    (fp_line (start 0.9 -0.9) (end 0.9 -0.95) (layer "F.SilkS") (width 0.12) (tstamp 15beb506-5c01-450d-8e1b-8afa781797ec))
+    (fp_line (start 0.9 -0.95) (end -0.95 -0.95) (layer "F.SilkS") (width 0.12) (tstamp 5753cc55-77e8-4925-88dd-45639691fd28))
+    (fp_line (start -0.95 -0.95) (end -0.95 0.95) (layer "F.SilkS") (width 0.12) (tstamp 66c5b128-7624-4c04-bc6b-b3d355c93056))
+    (fp_line (start 0.9 0.95) (end 0.9 -0.9) (layer "F.SilkS") (width 0.12) (tstamp 6789f180-42c2-4e39-ae51-abd90535b39b))
+    (fp_line (start -0.95 0.95) (end 0.9 0.95) (layer "F.SilkS") (width 0.12) (tstamp fde1bb0a-28d2-49a9-8bf3-58062ea36ddc))
+    (fp_line (start -1.4 -1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp 01d3944a-eec0-447a-8dfe-662b847ce924))
+    (fp_line (start 1.35 1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp 01dbdea3-b29c-4291-9e33-6eead9b4b21c))
+    (fp_line (start 1.35 1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp 99a754a7-1566-4a13-af0d-a9dbcdd914ed))
+    (fp_line (start -1.4 -1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp 9d6500e2-6a96-44b8-9ed7-06f1e8ff443f))
+    (fp_line (start -0.9 0.25) (end -0.9 -0.25) (layer "F.Fab") (width 0.12) (tstamp 466ce0c8-9050-45c1-ac73-0ddc2d8e3981))
+    (fp_line (start 0.85 -0.25) (end 0.85 0.25) (layer "F.Fab") (width 0.12) (tstamp 611d605a-e0ad-45b5-9dd3-7e0e4b27f9b2))
+    (fp_line (start 0.85 0.25) (end -0.9 0.25) (layer "F.Fab") (width 0.12) (tstamp 742c4d3b-0f03-4162-8195-5fd6cdd95254))
+    (fp_line (start -0.9 -0.25) (end 0.85 -0.25) (layer "F.Fab") (width 0.12) (tstamp a5bd7528-7513-4f94-bd14-41aca476124e))
+    (pad "1" thru_hole circle (at 0 0) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 187 "/KeyMatrix wired/I2C_CLOCK_KEY") (pinfunction "Pin_1") (pintype "passive") (tstamp f6de6dc9-f6ae-46c3-b8f8-13f01d985f52))
+    (model "${KICAD6_3DMODEL_DIR}/Connector_Pin.3dshapes/Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
   (footprint "Diode_THT:D_DO-35_SOD27_P2.54mm_Vertical_AnodeUp" (layer "F.Cu")
     (tedit 5AE50CD5) (tstamp c504d8af-5a1f-489d-b53e-05734e316e49)
     (at 185.42 43.18 -90)
@@ -5368,22 +6379,22 @@
 
   (footprint "Connector_PinSocket_2.54mm:PinSocket_1x08_P2.54mm_Vertical" (layer "F.Cu")
     (tedit 5A19A420) (tstamp c8f213cd-0099-42f8-9510-87508d4732cc)
-    (at 27.94 93.98 180)
+    (at 45.72 114.3 -90)
     (descr "Through hole straight socket strip, 1x08, 2.54mm pitch, single row (from Kicad 4.0.7), script generated")
     (tags "Through hole socket strip THT 1x08 2.54mm single row")
     (property "Sheetfile" "keymatrix_extdiode.kicad_sch")
     (property "Sheetname" "KeyMatrix Ext Diodes")
     (path "/7a807cd9-4b53-4d34-8616-454af4054d6a/f681b41a-8750-4d97-b200-70bbad5e12d2")
     (attr through_hole)
-    (fp_text reference "JK13" (at 0 -2.77) (layer "F.SilkS") hide
+    (fp_text reference "JK13" (at 0 -2.77 -270) (layer "F.SilkS") hide
       (effects (font (size 1 1) (thickness 0.15)))
       (tstamp d3d7d791-05a2-400b-b575-898d97367905)
     )
-    (fp_text value "COL3" (at 0 -2.54) (layer "F.SilkS")
+    (fp_text value "COL3" (at 0 -2.54 -270) (layer "F.SilkS")
       (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 41789951-05ce-4881-81bc-960a13406cf5)
     )
-    (fp_text user "${REFERENCE}" (at 0 8.89 90) (layer "F.Fab") hide
+    (fp_text user "${REFERENCE}" (at 0 8.89) (layer "F.Fab") hide
       (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 9f6db306-132f-49a0-b46f-e061c931c23d)
     )
@@ -5402,21 +6413,21 @@
     (fp_line (start -1.27 19.05) (end -1.27 -1.27) (layer "F.Fab") (width 0.1) (tstamp 5c93ba4b-aba6-48e7-8232-e3279a27f58d))
     (fp_line (start 0.635 -1.27) (end 1.27 -0.635) (layer "F.Fab") (width 0.1) (tstamp 831079af-e11d-48e2-89a0-71c69fc96be5))
     (fp_line (start 1.27 -0.635) (end 1.27 19.05) (layer "F.Fab") (width 0.1) (tstamp af7a51bf-1bc7-4511-bad5-3969001dce96))
-    (pad "1" thru_hole rect (at 0 0 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "1" thru_hole rect (at 0 0 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 62 "Net-(JK13-Pad1)") (pinfunction "Pin_1") (pintype "passive") (tstamp 5b14f90e-8d95-4991-b8ff-c460b36ba3a8))
-    (pad "2" thru_hole oval (at 0 2.54 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "2" thru_hole oval (at 0 2.54 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 62 "Net-(JK13-Pad1)") (pinfunction "Pin_2") (pintype "passive") (tstamp b978a9d2-1f4b-441d-8043-d71668310fa1))
-    (pad "3" thru_hole oval (at 0 5.08 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "3" thru_hole oval (at 0 5.08 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 62 "Net-(JK13-Pad1)") (pinfunction "Pin_3") (pintype "passive") (tstamp 1e186f38-d505-47f0-9817-6daf97ef59e1))
-    (pad "4" thru_hole oval (at 0 7.62 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "4" thru_hole oval (at 0 7.62 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 62 "Net-(JK13-Pad1)") (pinfunction "Pin_4") (pintype "passive") (tstamp 7197cb6a-60cd-43a7-8154-b8fd99c5fc33))
-    (pad "5" thru_hole oval (at 0 10.16 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "5" thru_hole oval (at 0 10.16 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 62 "Net-(JK13-Pad1)") (pinfunction "Pin_5") (pintype "passive") (tstamp d030a329-df24-47e1-9c5a-9b61fa11dcd5))
-    (pad "6" thru_hole oval (at 0 12.7 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "6" thru_hole oval (at 0 12.7 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 62 "Net-(JK13-Pad1)") (pinfunction "Pin_6") (pintype "passive") (tstamp 068fe57f-7ff7-4be4-be72-11fafb931d99))
-    (pad "7" thru_hole oval (at 0 15.24 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "7" thru_hole oval (at 0 15.24 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 62 "Net-(JK13-Pad1)") (pinfunction "Pin_7") (pintype "passive") (tstamp 29d4af86-63e5-4cec-b024-45e55ea68ee8))
-    (pad "8" thru_hole oval (at 0 17.78 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "8" thru_hole oval (at 0 17.78 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 62 "Net-(JK13-Pad1)") (pinfunction "Pin_8") (pintype "passive") (tstamp e953b70e-1a7d-4e1b-a2fc-15fa3e9fb900))
     (model "${KICAD6_3DMODEL_DIR}/Connector_PinSocket_2.54mm.3dshapes/PinSocket_1x08_P2.54mm_Vertical.wrl"
       (offset (xyz 0 0 0))
@@ -5425,6 +6436,49 @@
     )
   )
 
+  (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (layer "F.Cu")
+    (tedit 5A1DC084) (tstamp c9abd8e7-9bac-4f32-b61e-7ee03ea544b5)
+    (at 58.42 38.1)
+    (descr "solder Pin_ with flat fork, hole diameter 0.7mm, length 6.5mm, width 1.8mm")
+    (tags "solder Pin_ with flat fork")
+    (property "Sheetfile" "rotary.kicad_sch")
+    (property "Sheetname" "Rotary Encoder")
+    (path "/0e0cd3f9-9e59-4187-9e69-2f18dd8368cc/cc823f72-f0e4-4202-8e7e-d5cbcbc3c9fe")
+    (attr through_hole)
+    (fp_text reference "J23" (at 0 1.8) (layer "F.SilkS") hide
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 2e1fa008-357a-4aac-8cf5-970493fa664d)
+    )
+    (fp_text value "B7" (at -0.025 -4.445) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 80e302b7-97a6-4d5e-8db8-a2ecb63bf436)
+    )
+    (fp_text user "${REFERENCE}" (at 0 1.8) (layer "F.Fab") hide
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 79467a30-f83f-4a69-bc32-033df608d42c)
+    )
+    (fp_line (start 0.9 -0.9) (end 0.9 -0.95) (layer "F.SilkS") (width 0.12) (tstamp 014fd689-fe01-4a73-ac80-3c226a12a5bc))
+    (fp_line (start -0.95 -0.95) (end -0.95 0.95) (layer "F.SilkS") (width 0.12) (tstamp 031a6158-41bb-434c-9952-f633292a0643))
+    (fp_line (start -0.95 0.95) (end 0.9 0.95) (layer "F.SilkS") (width 0.12) (tstamp 2ce4fb29-0ccb-4d7f-a490-6e4518b7173f))
+    (fp_line (start 0.9 0.95) (end 0.9 -0.9) (layer "F.SilkS") (width 0.12) (tstamp 8b764051-f191-46fd-bc3d-0b22f8af5e5b))
+    (fp_line (start 0.9 -0.95) (end -0.95 -0.95) (layer "F.SilkS") (width 0.12) (tstamp b5c4303a-4bc2-4089-a1eb-ab41ec53cfbe))
+    (fp_line (start 1.35 1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp 2a47e126-8855-40dd-9e4e-56cb5c33cec1))
+    (fp_line (start 1.35 1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp 9f1245f2-9177-4975-bfa0-f75992444b8a))
+    (fp_line (start -1.4 -1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp fdb3150f-7b5c-4b67-b101-e0eba3c66191))
+    (fp_line (start -1.4 -1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp fe294f12-b7ae-46d2-886f-9cdff5563bdf))
+    (fp_line (start -0.9 -0.25) (end 0.85 -0.25) (layer "F.Fab") (width 0.12) (tstamp 18af1d88-91db-4163-9359-d7124e411ab6))
+    (fp_line (start -0.9 0.25) (end -0.9 -0.25) (layer "F.Fab") (width 0.12) (tstamp 1c0d02da-5b5c-42ee-b683-56c0e59ebf5f))
+    (fp_line (start 0.85 -0.25) (end 0.85 0.25) (layer "F.Fab") (width 0.12) (tstamp d768292d-7ad8-48cb-973b-82d3c96ed0e4))
+    (fp_line (start 0.85 0.25) (end -0.9 0.25) (layer "F.Fab") (width 0.12) (tstamp f6a0f3c6-29f4-4236-9faf-ca3f64f72dcc))
+    (pad "1" thru_hole circle (at 0 0) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 158 "Net-(J23-Pad1)") (pinfunction "Pin_1") (pintype "passive") (tstamp 89658244-8e23-45d4-89fa-a2eb92c896cb))
+    (model "${KICAD6_3DMODEL_DIR}/Connector_Pin.3dshapes/Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
   (footprint "Diode_THT:D_DO-35_SOD27_P2.54mm_Vertical_AnodeUp" (layer "F.Cu")
     (tedit 5AE50CD5) (tstamp c9c252ce-b0f7-42e1-9dff-3e0e7b3b29ef)
     (at 162.56 53.34 -90)
@@ -5521,6 +6575,92 @@
     )
   )
 
+  (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (layer "F.Cu")
+    (tedit 5A1DC084) (tstamp cce66d06-ed54-4eae-867a-a3f52946556d)
+    (at 50.8 38.1)
+    (descr "solder Pin_ with flat fork, hole diameter 0.7mm, length 6.5mm, width 1.8mm")
+    (tags "solder Pin_ with flat fork")
+    (property "Sheetfile" "rotary.kicad_sch")
+    (property "Sheetname" "Rotary Encoder")
+    (path "/0e0cd3f9-9e59-4187-9e69-2f18dd8368cc/ab8c7386-0042-433f-b83d-d0d190b2c608")
+    (attr through_hole)
+    (fp_text reference "J18" (at 0 1.8) (layer "F.SilkS") hide
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp ed4be033-e859-4855-b148-62dd9430802f)
+    )
+    (fp_text value "A6" (at -0.025 -4.445) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 6face538-98d0-40ae-a653-e8999ce4e018)
+    )
+    (fp_text user "${REFERENCE}" (at 0 1.8) (layer "F.Fab") hide
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp eb0915de-c86a-4d8e-a0f1-84dcf28d1327)
+    )
+    (fp_line (start 0.9 -0.9) (end 0.9 -0.95) (layer "F.SilkS") (width 0.12) (tstamp 05a60061-f69f-4cf0-982b-3b600d194cef))
+    (fp_line (start 0.9 -0.95) (end -0.95 -0.95) (layer "F.SilkS") (width 0.12) (tstamp 4eae949d-97a9-49f3-9fbc-cba93e4e519c))
+    (fp_line (start -0.95 -0.95) (end -0.95 0.95) (layer "F.SilkS") (width 0.12) (tstamp 895c2a55-d35b-4bc4-9770-a708d43f72ca))
+    (fp_line (start 0.9 0.95) (end 0.9 -0.9) (layer "F.SilkS") (width 0.12) (tstamp bc94524b-c378-44e8-acce-7c1ac0292375))
+    (fp_line (start -0.95 0.95) (end 0.9 0.95) (layer "F.SilkS") (width 0.12) (tstamp d7d96405-8ab4-4875-86e3-09261d23b5fe))
+    (fp_line (start 1.35 1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp 0d525ad4-3f7e-4e8e-b572-5aed774da48c))
+    (fp_line (start -1.4 -1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp 5e1594bb-0ff8-4379-a06e-7271e78563fe))
+    (fp_line (start -1.4 -1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp 64c39fd2-36c7-4cd2-b0b8-1a1e70b12069))
+    (fp_line (start 1.35 1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp cd568267-8fa9-414e-ae44-a717296573c5))
+    (fp_line (start -0.9 0.25) (end -0.9 -0.25) (layer "F.Fab") (width 0.12) (tstamp 53c3dfa0-4629-47d5-b909-4a3f4eb869c5))
+    (fp_line (start -0.9 -0.25) (end 0.85 -0.25) (layer "F.Fab") (width 0.12) (tstamp 602a1461-f2fc-4f38-9213-73e41c428934))
+    (fp_line (start 0.85 0.25) (end -0.9 0.25) (layer "F.Fab") (width 0.12) (tstamp b64d922b-f1cc-4940-96f6-60cbefb80766))
+    (fp_line (start 0.85 -0.25) (end 0.85 0.25) (layer "F.Fab") (width 0.12) (tstamp dafa8fd1-c18d-4c85-9433-2b8c8008bb67))
+    (pad "1" thru_hole circle (at 0 0) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 155 "Net-(J18-Pad1)") (pinfunction "Pin_1") (pintype "passive") (tstamp 550e0f79-ef9f-4d36-adf7-81e26d574c59))
+    (model "${KICAD6_3DMODEL_DIR}/Connector_Pin.3dshapes/Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (layer "F.Cu")
+    (tedit 5A1DC084) (tstamp cd456294-dca4-4c26-9abc-c7a07f86c1c8)
+    (at 45.72 25.4)
+    (descr "solder Pin_ with flat fork, hole diameter 0.7mm, length 6.5mm, width 1.8mm")
+    (tags "solder Pin_ with flat fork")
+    (property "Sheetfile" "rotary.kicad_sch")
+    (property "Sheetname" "Rotary Encoder")
+    (path "/0e0cd3f9-9e59-4187-9e69-2f18dd8368cc/e92cc26d-27f8-43e9-a58e-4cbff1061bf5")
+    (attr through_hole)
+    (fp_text reference "J11" (at 0 1.8) (layer "F.SilkS") hide
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp e5c9e5a1-eb3c-47d6-be9a-b6b058a3d5d9)
+    )
+    (fp_text value "B2" (at -0.025 4.445) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 2db578cd-b125-49d3-b68b-3360b8f58d41)
+    )
+    (fp_text user "${REFERENCE}" (at 0 1.8) (layer "F.Fab") hide
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 1c67d947-286e-4eeb-ad61-68de893b3f2c)
+    )
+    (fp_line (start 0.9 -0.95) (end -0.95 -0.95) (layer "F.SilkS") (width 0.12) (tstamp 3be93bf9-8c44-4bd5-ab0f-f48691dd7c5d))
+    (fp_line (start 0.9 0.95) (end 0.9 -0.9) (layer "F.SilkS") (width 0.12) (tstamp 3de5b137-b7ed-4a67-a65d-5332350a142e))
+    (fp_line (start -0.95 0.95) (end 0.9 0.95) (layer "F.SilkS") (width 0.12) (tstamp 4a7a8704-b751-4f8c-aedf-2558a0174a72))
+    (fp_line (start -0.95 -0.95) (end -0.95 0.95) (layer "F.SilkS") (width 0.12) (tstamp dc4ad6d5-b7e2-4098-b974-50466b3890e2))
+    (fp_line (start 0.9 -0.9) (end 0.9 -0.95) (layer "F.SilkS") (width 0.12) (tstamp ea0658cd-816e-408e-924b-067dc4ea75f8))
+    (fp_line (start -1.4 -1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp 872056a8-3317-408d-800b-762b71027ed5))
+    (fp_line (start 1.35 1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp 973720a6-f461-4d46-b2fe-59915df69d25))
+    (fp_line (start 1.35 1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp a2da6c4b-cf98-4d3d-b54c-e05e54dfd2b6))
+    (fp_line (start -1.4 -1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp fcf72183-7571-4ba1-a298-770fa333efdf))
+    (fp_line (start -0.9 0.25) (end -0.9 -0.25) (layer "F.Fab") (width 0.12) (tstamp 5278fb5e-f15e-42fe-84df-a59fee8119f1))
+    (fp_line (start -0.9 -0.25) (end 0.85 -0.25) (layer "F.Fab") (width 0.12) (tstamp cb232dae-017e-46a0-81d3-8ae4432055dd))
+    (fp_line (start 0.85 0.25) (end -0.9 0.25) (layer "F.Fab") (width 0.12) (tstamp df8f1fc7-0af7-4ef1-91a4-ae074793bf79))
+    (fp_line (start 0.85 -0.25) (end 0.85 0.25) (layer "F.Fab") (width 0.12) (tstamp fa2253b1-674a-48db-8f5b-f4c85dcb27ae))
+    (pad "1" thru_hole circle (at 0 0) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 100 "Net-(J11-Pad1)") (pinfunction "Pin_1") (pintype "passive") (tstamp 3962f024-df76-4ce5-a845-a5bfd0cc118f))
+    (model "${KICAD6_3DMODEL_DIR}/Connector_Pin.3dshapes/Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
   (footprint "Diode_THT:D_DO-35_SOD27_P2.54mm_Vertical_AnodeUp" (layer "F.Cu")
     (tedit 5AE50CD5) (tstamp cef7d52c-da57-4ad1-986b-a7d5f0d0c4c3)
     (at 170.18 33.02 -90)
@@ -5678,22 +6818,22 @@
 
   (footprint "Connector_PinSocket_2.54mm:PinSocket_1x08_P2.54mm_Vertical" (layer "F.Cu")
     (tedit 5A19A420) (tstamp d697b8e4-68eb-481e-bc57-2fd5df6100db)
-    (at 22.86 93.98 180)
+    (at 45.72 119.38 -90)
     (descr "Through hole straight socket strip, 1x08, 2.54mm pitch, single row (from Kicad 4.0.7), script generated")
     (tags "Through hole socket strip THT 1x08 2.54mm single row")
     (property "Sheetfile" "keymatrix_extdiode.kicad_sch")
     (property "Sheetname" "KeyMatrix Ext Diodes")
     (path "/7a807cd9-4b53-4d34-8616-454af4054d6a/d4d6afce-f368-4ed7-b36d-7c4b38bb8c62")
     (attr through_hole)
-    (fp_text reference "JK15" (at 0 -2.77) (layer "F.SilkS") hide
+    (fp_text reference "JK15" (at 0 -2.77 -270) (layer "F.SilkS") hide
       (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 538f2bd0-afec-4e97-be19-cf929eb93187)
     )
-    (fp_text value "COL5" (at 0 -2.54) (layer "F.SilkS")
+    (fp_text value "COL5" (at 0 -2.54 -270) (layer "F.SilkS")
       (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 0b74f0ed-fd0f-47cc-a98d-90d5521842bc)
     )
-    (fp_text user "${REFERENCE}" (at 0 8.89 90) (layer "F.Fab") hide
+    (fp_text user "${REFERENCE}" (at 0 8.89) (layer "F.Fab") hide
       (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 67de83a3-095b-40a7-a0f5-dabf35170f88)
     )
@@ -5712,21 +6852,21 @@
     (fp_line (start 1.27 19.05) (end -1.27 19.05) (layer "F.Fab") (width 0.1) (tstamp 8060ab5f-c0d0-4800-9f9a-c9664b906f04))
     (fp_line (start 1.27 -0.635) (end 1.27 19.05) (layer "F.Fab") (width 0.1) (tstamp a54675c0-0acc-4968-ac10-011864601794))
     (fp_line (start -1.27 19.05) (end -1.27 -1.27) (layer "F.Fab") (width 0.1) (tstamp e4812f20-3342-4241-ad8b-9fbb0b8ef8af))
-    (pad "1" thru_hole rect (at 0 0 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "1" thru_hole rect (at 0 0 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 64 "Net-(JK15-Pad1)") (pinfunction "Pin_1") (pintype "passive") (tstamp 9faa421d-f6a7-41a2-aecf-fe28b3e90dcc))
-    (pad "2" thru_hole oval (at 0 2.54 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "2" thru_hole oval (at 0 2.54 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 64 "Net-(JK15-Pad1)") (pinfunction "Pin_2") (pintype "passive") (tstamp 6b1e6700-5783-4142-b83c-b11d6ea16e69))
-    (pad "3" thru_hole oval (at 0 5.08 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "3" thru_hole oval (at 0 5.08 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 64 "Net-(JK15-Pad1)") (pinfunction "Pin_3") (pintype "passive") (tstamp 88431cd8-35c8-4f27-a56c-98e34ac94dee))
-    (pad "4" thru_hole oval (at 0 7.62 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "4" thru_hole oval (at 0 7.62 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 64 "Net-(JK15-Pad1)") (pinfunction "Pin_4") (pintype "passive") (tstamp e038a785-3dcd-4c0e-8cd1-14376d89e66d))
-    (pad "5" thru_hole oval (at 0 10.16 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "5" thru_hole oval (at 0 10.16 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 64 "Net-(JK15-Pad1)") (pinfunction "Pin_5") (pintype "passive") (tstamp 95ff33b2-1d6a-4a57-ac1a-b82d11b6c440))
-    (pad "6" thru_hole oval (at 0 12.7 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "6" thru_hole oval (at 0 12.7 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 64 "Net-(JK15-Pad1)") (pinfunction "Pin_6") (pintype "passive") (tstamp 619071aa-0abe-42df-bba5-d55a5c1a4d5a))
-    (pad "7" thru_hole oval (at 0 15.24 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "7" thru_hole oval (at 0 15.24 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 64 "Net-(JK15-Pad1)") (pinfunction "Pin_7") (pintype "passive") (tstamp 62905531-e4c9-49a3-ab44-d00e96f2ca58))
-    (pad "8" thru_hole oval (at 0 17.78 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "8" thru_hole oval (at 0 17.78 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 64 "Net-(JK15-Pad1)") (pinfunction "Pin_8") (pintype "passive") (tstamp a6368107-2128-4bc3-a9c5-43d20cb3dd97))
     (model "${KICAD6_3DMODEL_DIR}/Connector_PinSocket_2.54mm.3dshapes/PinSocket_1x08_P2.54mm_Vertical.wrl"
       (offset (xyz 0 0 0))
@@ -5735,6 +6875,49 @@
     )
   )
 
+  (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (layer "F.Cu")
+    (tedit 5A1DC084) (tstamp d6a8f316-1392-4ab3-858a-2bdd1e8ab61d)
+    (at 43.18 25.4)
+    (descr "solder Pin_ with flat fork, hole diameter 0.7mm, length 6.5mm, width 1.8mm")
+    (tags "solder Pin_ with flat fork")
+    (property "Sheetfile" "rotary.kicad_sch")
+    (property "Sheetname" "Rotary Encoder")
+    (path "/0e0cd3f9-9e59-4187-9e69-2f18dd8368cc/2ea45036-6908-4767-a4a0-ac16e09767ee")
+    (attr through_hole)
+    (fp_text reference "J12" (at 0 1.8) (layer "F.SilkS") hide
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 9858a585-1ecc-4893-a1c6-bacba18521ec)
+    )
+    (fp_text value "A3" (at -0.025 4.445) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 76adfc93-1bf2-41b7-b4bf-eb835ea8821f)
+    )
+    (fp_text user "${REFERENCE}" (at 0 1.8) (layer "F.Fab") hide
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp cc490913-daab-4fa1-87b9-975705ee9dbd)
+    )
+    (fp_line (start 0.9 -0.95) (end -0.95 -0.95) (layer "F.SilkS") (width 0.12) (tstamp 480d5422-6d33-4319-a5c2-9ce1cd04fa90))
+    (fp_line (start -0.95 0.95) (end 0.9 0.95) (layer "F.SilkS") (width 0.12) (tstamp 8d3d3e35-82e0-40ba-907a-a8ab9693853e))
+    (fp_line (start 0.9 0.95) (end 0.9 -0.9) (layer "F.SilkS") (width 0.12) (tstamp d08f9431-ef8a-42b7-a850-bcd8bb770f1b))
+    (fp_line (start 0.9 -0.9) (end 0.9 -0.95) (layer "F.SilkS") (width 0.12) (tstamp e82e6c3a-dba3-44b6-823e-2bd844f08cca))
+    (fp_line (start -0.95 -0.95) (end -0.95 0.95) (layer "F.SilkS") (width 0.12) (tstamp ecff6837-a08b-483d-9647-9310dfc674e3))
+    (fp_line (start -1.4 -1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp 3a6e1b00-aa08-416c-85dc-bf006b0a4a78))
+    (fp_line (start -1.4 -1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp b825db6d-eaf6-475d-bf93-964d29afb19e))
+    (fp_line (start 1.35 1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp da1874bd-bc34-4d30-85e0-173930a32a31))
+    (fp_line (start 1.35 1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp f68ae795-1f05-4a39-94cd-eb3e2d140979))
+    (fp_line (start -0.9 0.25) (end -0.9 -0.25) (layer "F.Fab") (width 0.12) (tstamp 2b02e529-0dd1-4c56-92a3-7eb22d2ee260))
+    (fp_line (start 0.85 -0.25) (end 0.85 0.25) (layer "F.Fab") (width 0.12) (tstamp ae5c31ab-a505-4959-ae0e-cec81fcbf815))
+    (fp_line (start -0.9 -0.25) (end 0.85 -0.25) (layer "F.Fab") (width 0.12) (tstamp deba7d89-f9a2-4354-82a6-0d3192f950f8))
+    (fp_line (start 0.85 0.25) (end -0.9 0.25) (layer "F.Fab") (width 0.12) (tstamp ed93faec-dea3-4b89-9648-290ad7f4effb))
+    (pad "1" thru_hole circle (at 0 0) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 101 "Net-(J12-Pad1)") (pinfunction "Pin_1") (pintype "passive") (tstamp 58f281db-090d-4a92-8a73-05e2a97a7ee9))
+    (model "${KICAD6_3DMODEL_DIR}/Connector_Pin.3dshapes/Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
   (footprint "Diode_THT:D_DO-35_SOD27_P2.54mm_Vertical_AnodeUp" (layer "F.Cu")
     (tedit 5AE50CD5) (tstamp d6fc5299-22ca-46eb-a8be-9fa35c664ef3)
     (at 175.26 43.18 -90)
@@ -5783,24 +6966,67 @@
     )
   )
 
+  (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (layer "F.Cu")
+    (tedit 5A1DC084) (tstamp db41e836-6945-404a-8e36-2d5f7579c882)
+    (at 45.72 38.1)
+    (descr "solder Pin_ with flat fork, hole diameter 0.7mm, length 6.5mm, width 1.8mm")
+    (tags "solder Pin_ with flat fork")
+    (property "Sheetfile" "rotary.kicad_sch")
+    (property "Sheetname" "Rotary Encoder")
+    (path "/0e0cd3f9-9e59-4187-9e69-2f18dd8368cc/0a4a5095-16ff-4ec8-b82d-45b4d38ffde6")
+    (attr through_hole)
+    (fp_text reference "J16" (at 0 1.8) (layer "F.SilkS") hide
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp d7d62d74-e40d-48f8-9eac-491ee6420441)
+    )
+    (fp_text value "A5" (at 0 -4.445) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 77882400-606a-4159-9b6d-7be7ce590e63)
+    )
+    (fp_text user "${REFERENCE}" (at 0 1.8) (layer "F.Fab") hide
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 04dfc243-0f51-4603-bf53-e1e3c0de09b3)
+    )
+    (fp_line (start 0.9 0.95) (end 0.9 -0.9) (layer "F.SilkS") (width 0.12) (tstamp 3397e828-549f-4d19-910c-989534dfee84))
+    (fp_line (start -0.95 0.95) (end 0.9 0.95) (layer "F.SilkS") (width 0.12) (tstamp 55d86872-e23e-4870-a2e5-31f924442b2e))
+    (fp_line (start 0.9 -0.9) (end 0.9 -0.95) (layer "F.SilkS") (width 0.12) (tstamp a86ce70c-0b0b-4e00-81fd-fa720b16c5ec))
+    (fp_line (start -0.95 -0.95) (end -0.95 0.95) (layer "F.SilkS") (width 0.12) (tstamp dfcff0c6-14ab-4e61-b849-baf49cfbbd13))
+    (fp_line (start 0.9 -0.95) (end -0.95 -0.95) (layer "F.SilkS") (width 0.12) (tstamp f3fc3ce5-4efa-4006-8983-46e918c0de75))
+    (fp_line (start 1.35 1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp 349aae3a-4c5e-4552-af38-0bc89507f49c))
+    (fp_line (start -1.4 -1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp 401fab3c-23b1-4753-9559-4f10bf6840bd))
+    (fp_line (start -1.4 -1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp 553e83e2-46ab-4c23-99b1-63f20f063cd2))
+    (fp_line (start 1.35 1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp c73bfff6-9c34-45cb-853c-863990f11aa7))
+    (fp_line (start -0.9 -0.25) (end 0.85 -0.25) (layer "F.Fab") (width 0.12) (tstamp 607bd1dc-3a6b-4b00-8871-0e4f8cbd31b4))
+    (fp_line (start 0.85 0.25) (end -0.9 0.25) (layer "F.Fab") (width 0.12) (tstamp 7a0dea2f-98b5-4afe-8d5d-f39ea5db6892))
+    (fp_line (start -0.9 0.25) (end -0.9 -0.25) (layer "F.Fab") (width 0.12) (tstamp 9934072c-5674-4ed3-9146-61b9347f189d))
+    (fp_line (start 0.85 -0.25) (end 0.85 0.25) (layer "F.Fab") (width 0.12) (tstamp ec870b96-a94e-4dc6-9900-ce74b92f8bb5))
+    (pad "1" thru_hole circle (at 0 0) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 153 "Net-(J16-Pad1)") (pinfunction "Pin_1") (pintype "passive") (tstamp c07aea70-6106-44bf-96ff-8e775e4243b1))
+    (model "${KICAD6_3DMODEL_DIR}/Connector_Pin.3dshapes/Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
   (footprint "Connector_PinSocket_2.54mm:PinSocket_1x08_P2.54mm_Vertical" (layer "F.Cu")
     (tedit 5A19A420) (tstamp df57f87b-7268-48c8-9915-991d77f6b8dd)
-    (at 15.24 129.54 180)
+    (at 81.28 127 -90)
     (descr "Through hole straight socket strip, 1x08, 2.54mm pitch, single row (from Kicad 4.0.7), script generated")
     (tags "Through hole socket strip THT 1x08 2.54mm single row")
     (property "Sheetfile" "keymatrix_extdiode.kicad_sch")
     (property "Sheetname" "KeyMatrix Ext Diodes")
     (path "/7a807cd9-4b53-4d34-8616-454af4054d6a/e736b25b-b772-4a49-88d1-cee950617bdd")
     (attr through_hole)
-    (fp_text reference "JK1" (at 0 -2.77) (layer "F.SilkS") hide
+    (fp_text reference "JK1" (at 0 -2.77 -270) (layer "F.SilkS") hide
       (effects (font (size 1 1) (thickness 0.15)))
       (tstamp af66090f-a672-4e1c-9786-b5f80caced8b)
     )
-    (fp_text value "ROW1" (at 0 20.32) (layer "F.SilkS")
+    (fp_text value "ROW1" (at 0 20.32 -270) (layer "F.SilkS")
       (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 3107e0fc-47a4-49c9-a928-6a37b216ea16)
     )
-    (fp_text user "${REFERENCE}" (at 0 8.89 90) (layer "F.Fab") hide
+    (fp_text user "${REFERENCE}" (at 0 8.89) (layer "F.Fab") hide
       (effects (font (size 1 1) (thickness 0.15)))
       (tstamp bb7c71f3-f969-47eb-b17a-0f964980b243)
     )
@@ -5819,21 +7045,21 @@
     (fp_line (start -1.27 -1.27) (end 0.635 -1.27) (layer "F.Fab") (width 0.1) (tstamp 7d93dce9-e391-4d4b-8782-41af30da5f83))
     (fp_line (start 0.635 -1.27) (end 1.27 -0.635) (layer "F.Fab") (width 0.1) (tstamp a758e3d7-001f-4777-9f13-6c834564b598))
     (fp_line (start 1.27 19.05) (end -1.27 19.05) (layer "F.Fab") (width 0.1) (tstamp ce67dea8-ff14-4d6d-a114-bf427606e91e))
-    (pad "1" thru_hole rect (at 0 0 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "1" thru_hole rect (at 0 0 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 48 "Net-(JK1-Pad1)") (pinfunction "Pin_1") (pintype "passive") (tstamp 70ac9a14-a4ab-43d3-9d89-92ac4c47af94))
-    (pad "2" thru_hole oval (at 0 2.54 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "2" thru_hole oval (at 0 2.54 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 48 "Net-(JK1-Pad1)") (pinfunction "Pin_2") (pintype "passive") (tstamp 6d208d8d-d9a4-4d11-8aa8-f13a6f31c29b))
-    (pad "3" thru_hole oval (at 0 5.08 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "3" thru_hole oval (at 0 5.08 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 48 "Net-(JK1-Pad1)") (pinfunction "Pin_3") (pintype "passive") (tstamp 95f131a7-5425-48ae-8a80-7cb3391270ab))
-    (pad "4" thru_hole oval (at 0 7.62 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "4" thru_hole oval (at 0 7.62 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 48 "Net-(JK1-Pad1)") (pinfunction "Pin_4") (pintype "passive") (tstamp 70b62b46-4cf5-4873-926b-95a3ba418dbf))
-    (pad "5" thru_hole oval (at 0 10.16 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "5" thru_hole oval (at 0 10.16 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 48 "Net-(JK1-Pad1)") (pinfunction "Pin_5") (pintype "passive") (tstamp ba1aba78-dbbf-4a1a-bb46-c6c27018ca0c))
-    (pad "6" thru_hole oval (at 0 12.7 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "6" thru_hole oval (at 0 12.7 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 48 "Net-(JK1-Pad1)") (pinfunction "Pin_6") (pintype "passive") (tstamp e58f5cf6-7c51-43ff-8ede-97ceb5cccbb4))
-    (pad "7" thru_hole oval (at 0 15.24 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "7" thru_hole oval (at 0 15.24 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 48 "Net-(JK1-Pad1)") (pinfunction "Pin_7") (pintype "passive") (tstamp f29a3cff-a351-40b6-b31f-d4b89c3f6876))
-    (pad "8" thru_hole oval (at 0 17.78 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "8" thru_hole oval (at 0 17.78 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 48 "Net-(JK1-Pad1)") (pinfunction "Pin_8") (pintype "passive") (tstamp f519647d-9142-4233-83a8-5c7efa60a024))
     (model "${KICAD6_3DMODEL_DIR}/Connector_PinSocket_2.54mm.3dshapes/PinSocket_1x08_P2.54mm_Vertical.wrl"
       (offset (xyz 0 0 0))
@@ -5842,6 +7068,49 @@
     )
   )
 
+  (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (layer "F.Cu")
+    (tedit 5A1DC084) (tstamp e2d0f7de-130f-45fe-8137-c98d54977ba1)
+    (at 53.34 38.1)
+    (descr "solder Pin_ with flat fork, hole diameter 0.7mm, length 6.5mm, width 1.8mm")
+    (tags "solder Pin_ with flat fork")
+    (property "Sheetfile" "rotary.kicad_sch")
+    (property "Sheetname" "Rotary Encoder")
+    (path "/0e0cd3f9-9e59-4187-9e69-2f18dd8368cc/371abc5a-52a7-4b87-8ec7-281e5dbbd659")
+    (attr through_hole)
+    (fp_text reference "J19" (at 0 1.8) (layer "F.SilkS") hide
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp b96b731a-92c2-4e6b-a452-39f1d33f53c2)
+    )
+    (fp_text value "B6" (at 0 -4.445) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp c517de34-4f09-44c4-870e-606e92563fb1)
+    )
+    (fp_text user "${REFERENCE}" (at 0 1.8) (layer "F.Fab") hide
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 39f69e4c-3d98-4642-8cee-de7f9bf86b5e)
+    )
+    (fp_line (start -0.95 -0.95) (end -0.95 0.95) (layer "F.SilkS") (width 0.12) (tstamp 0536025a-6414-4951-bfd6-905537685d7e))
+    (fp_line (start 0.9 -0.95) (end -0.95 -0.95) (layer "F.SilkS") (width 0.12) (tstamp 35328af0-2bbe-4eda-b255-c9bb9c6e435e))
+    (fp_line (start -0.95 0.95) (end 0.9 0.95) (layer "F.SilkS") (width 0.12) (tstamp 97d7f8c9-b0b4-436a-9b5e-5ccb959ea185))
+    (fp_line (start 0.9 0.95) (end 0.9 -0.9) (layer "F.SilkS") (width 0.12) (tstamp e794ab59-7bcd-4983-8681-ae56dc6f451c))
+    (fp_line (start 0.9 -0.9) (end 0.9 -0.95) (layer "F.SilkS") (width 0.12) (tstamp f069c764-5d8d-402a-b60c-f5f2b694001c))
+    (fp_line (start 1.35 1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp 74a79877-8958-41da-8944-562e6bba6c01))
+    (fp_line (start -1.4 -1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp 8416cc67-e5d6-41f8-bce2-3d8fbd36986b))
+    (fp_line (start 1.35 1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp afcd91b3-4753-4f50-890c-aed354e976e6))
+    (fp_line (start -1.4 -1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp ecc742f9-8e62-4db4-90e9-b040a131cae6))
+    (fp_line (start -0.9 -0.25) (end 0.85 -0.25) (layer "F.Fab") (width 0.12) (tstamp 7d393522-d44b-4d20-8f0b-b7142987aa89))
+    (fp_line (start -0.9 0.25) (end -0.9 -0.25) (layer "F.Fab") (width 0.12) (tstamp b7bae9c8-4fed-4c69-a28c-182e2480bcdb))
+    (fp_line (start 0.85 -0.25) (end 0.85 0.25) (layer "F.Fab") (width 0.12) (tstamp ca677453-09f3-4d39-9e39-a44be56569d9))
+    (fp_line (start 0.85 0.25) (end -0.9 0.25) (layer "F.Fab") (width 0.12) (tstamp eb8c4f77-d931-4888-a754-0b09c6b8907f))
+    (pad "1" thru_hole circle (at 0 0) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 156 "Net-(J19-Pad1)") (pinfunction "Pin_1") (pintype "passive") (tstamp 30a8d4e5-202c-4d57-80d8-c5f2ad3ce2dd))
+    (model "${KICAD6_3DMODEL_DIR}/Connector_Pin.3dshapes/Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
   (footprint "Diode_THT:D_DO-35_SOD27_P2.54mm_Vertical_AnodeUp" (layer "F.Cu")
     (tedit 5AE50CD5) (tstamp e4b35e05-e395-4983-bf07-109fcbe36ce1)
     (at 154.94 63.5 -90)
@@ -5938,9 +7207,52 @@
     )
   )
 
+  (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (layer "F.Cu")
+    (tedit 5A1DC084) (tstamp e7d77ce7-e08d-4153-a89a-1b9824a2b90c)
+    (at 45.72 45.72)
+    (descr "solder Pin_ with flat fork, hole diameter 0.7mm, length 6.5mm, width 1.8mm")
+    (tags "solder Pin_ with flat fork")
+    (property "Sheetfile" "keymatrix_extdiode_wire.kicad_sch")
+    (property "Sheetname" "KeyMatrix wired")
+    (path "/86fd0b4b-b0c8-4da7-922a-6650d5003f71/fcb79e8e-23cf-418a-85d2-2ac39e345d6c")
+    (attr through_hole)
+    (fp_text reference "J35" (at 0 1.8) (layer "F.SilkS") hide
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp e2def774-2363-4585-8554-cd8fc856a5ac)
+    )
+    (fp_text value "R5" (at -0.025 5.08) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 8ced3081-bcd3-4c18-bb13-ae5959f11a13)
+    )
+    (fp_text user "${REFERENCE}" (at 0 1.8) (layer "F.Fab") hide
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp dd30ffcc-a60d-46b3-8fe9-b2ad66829a27)
+    )
+    (fp_line (start -0.95 0.95) (end 0.9 0.95) (layer "F.SilkS") (width 0.12) (tstamp 0d419671-d27f-45c9-8ff2-99401a361b69))
+    (fp_line (start 0.9 0.95) (end 0.9 -0.9) (layer "F.SilkS") (width 0.12) (tstamp 41c8d788-1f48-46e8-bcfe-ef988216a368))
+    (fp_line (start 0.9 -0.95) (end -0.95 -0.95) (layer "F.SilkS") (width 0.12) (tstamp 57824df1-8d76-4a17-9512-1c8039af1b39))
+    (fp_line (start 0.9 -0.9) (end 0.9 -0.95) (layer "F.SilkS") (width 0.12) (tstamp 9bfe2315-672f-438c-9b3a-c36cb505af51))
+    (fp_line (start -0.95 -0.95) (end -0.95 0.95) (layer "F.SilkS") (width 0.12) (tstamp fd365f0a-c3ac-4bbe-b914-0863a9d64fcf))
+    (fp_line (start -1.4 -1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp 85941b76-3eda-424c-9d0b-5544cc5d9dca))
+    (fp_line (start 1.35 1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp dd493107-2a31-4211-ab66-76dd1f222066))
+    (fp_line (start 1.35 1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp f0541591-b717-4bbe-a4d4-c359259e2002))
+    (fp_line (start -1.4 -1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp f2185193-04f1-40b5-8f5c-b32964204dfb))
+    (fp_line (start -0.9 -0.25) (end 0.85 -0.25) (layer "F.Fab") (width 0.12) (tstamp 08e3e4dd-ac21-45ec-b559-ad4d83ac9237))
+    (fp_line (start -0.9 0.25) (end -0.9 -0.25) (layer "F.Fab") (width 0.12) (tstamp 0be45535-b3a8-418c-a4c0-8474e868751a))
+    (fp_line (start 0.85 -0.25) (end 0.85 0.25) (layer "F.Fab") (width 0.12) (tstamp 652625eb-5f74-4422-9570-47b79a3f843f))
+    (fp_line (start 0.85 0.25) (end -0.9 0.25) (layer "F.Fab") (width 0.12) (tstamp f547678a-8512-4a6d-b65f-f39317b3a893))
+    (pad "1" thru_hole circle (at 0 0) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 174 "Net-(J35-Pad1)") (pinfunction "Pin_1") (pintype "passive") (tstamp 2f8a9f91-5ed6-4cd0-a235-3880b8ab1684))
+    (model "${KICAD6_3DMODEL_DIR}/Connector_Pin.3dshapes/Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
   (footprint "Connector_PinSocket_2.54mm:PinSocket_1x08_P2.54mm_Vertical" (layer "F.Cu")
     (tedit 5A19A420) (tstamp e82c6728-328a-4fb4-b819-3d2b4377817e)
-    (at 73.66 73.66)
+    (at 93.98 93.98)
     (descr "Through hole straight socket strip, 1x08, 2.54mm pitch, single row (from Kicad 4.0.7), script generated")
     (tags "Through hole socket strip THT 1x08 2.54mm single row")
     (property "Sheetfile" "cimdit.kicad_sch")
@@ -6154,22 +7466,22 @@
 
   (footprint "Connector_PinSocket_2.54mm:PinSocket_1x08_P2.54mm_Vertical" (layer "F.Cu")
     (tedit 5A19A420) (tstamp eed70916-7311-45e4-bf91-e6066a8a0a16)
-    (at 30.455 93.98 180)
+    (at 45.72 111.785 -90)
     (descr "Through hole straight socket strip, 1x08, 2.54mm pitch, single row (from Kicad 4.0.7), script generated")
     (tags "Through hole socket strip THT 1x08 2.54mm single row")
     (property "Sheetfile" "keymatrix_extdiode.kicad_sch")
     (property "Sheetname" "KeyMatrix Ext Diodes")
     (path "/7a807cd9-4b53-4d34-8616-454af4054d6a/41d61275-7588-41de-9c27-01f35f46da91")
     (attr through_hole)
-    (fp_text reference "JK12" (at 0 -2.77) (layer "F.SilkS") hide
+    (fp_text reference "JK12" (at 0 -2.77 -270) (layer "F.SilkS") hide
       (effects (font (size 1 1) (thickness 0.15)))
       (tstamp cc04ca3b-8673-4c68-a628-036eb7a4aaa5)
     )
-    (fp_text value "COL2" (at 0 20.55) (layer "F.SilkS")
+    (fp_text value "COL2" (at 0 20.55 -270) (layer "F.SilkS")
       (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 7ea99ef6-fe71-4339-94bd-bd4a3df23301)
     )
-    (fp_text user "${REFERENCE}" (at 0 8.89 90) (layer "F.Fab") hide
+    (fp_text user "${REFERENCE}" (at 0 8.89) (layer "F.Fab") hide
       (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 141f677b-8a0a-44fd-aa8a-2a12eea2133f)
     )
@@ -6188,21 +7500,21 @@
     (fp_line (start -1.27 -1.27) (end 0.635 -1.27) (layer "F.Fab") (width 0.1) (tstamp 80f8b1d1-3bef-4c0d-9bba-380984e137d2))
     (fp_line (start 1.27 -0.635) (end 1.27 19.05) (layer "F.Fab") (width 0.1) (tstamp c5832b3f-2a93-4cb6-8138-104616b48af6))
     (fp_line (start 1.27 19.05) (end -1.27 19.05) (layer "F.Fab") (width 0.1) (tstamp f751289e-d826-482f-9390-97167f4fb48f))
-    (pad "1" thru_hole rect (at 0 0 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "1" thru_hole rect (at 0 0 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 61 "Net-(JK12-Pad1)") (pinfunction "Pin_1") (pintype "passive") (tstamp dcd839be-d8f9-4df6-ad91-af29dba9acc7))
-    (pad "2" thru_hole oval (at 0 2.54 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "2" thru_hole oval (at 0 2.54 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 61 "Net-(JK12-Pad1)") (pinfunction "Pin_2") (pintype "passive") (tstamp 2f646f6c-07bd-4eaf-837a-a0a5a9720e4d))
-    (pad "3" thru_hole oval (at 0 5.08 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "3" thru_hole oval (at 0 5.08 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 61 "Net-(JK12-Pad1)") (pinfunction "Pin_3") (pintype "passive") (tstamp 5f62ba32-5712-4f57-a4ee-7984048dec20))
-    (pad "4" thru_hole oval (at 0 7.62 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "4" thru_hole oval (at 0 7.62 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 61 "Net-(JK12-Pad1)") (pinfunction "Pin_4") (pintype "passive") (tstamp cd5a4dda-c60d-4982-aa17-ed95b9351ec6))
-    (pad "5" thru_hole oval (at 0 10.16 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "5" thru_hole oval (at 0 10.16 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 61 "Net-(JK12-Pad1)") (pinfunction "Pin_5") (pintype "passive") (tstamp 38e8b9a5-20dc-40ef-9db4-1ad422a4870a))
-    (pad "6" thru_hole oval (at 0 12.7 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "6" thru_hole oval (at 0 12.7 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 61 "Net-(JK12-Pad1)") (pinfunction "Pin_6") (pintype "passive") (tstamp 48e3c8e6-f068-48d7-a75f-b33be9b57bef))
-    (pad "7" thru_hole oval (at 0 15.24 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "7" thru_hole oval (at 0 15.24 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 61 "Net-(JK12-Pad1)") (pinfunction "Pin_7") (pintype "passive") (tstamp c06c436c-b46a-4d20-9cd6-2916a32522ae))
-    (pad "8" thru_hole oval (at 0 17.78 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "8" thru_hole oval (at 0 17.78 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
       (net 61 "Net-(JK12-Pad1)") (pinfunction "Pin_8") (pintype "passive") (tstamp f156067d-13ff-4a50-a39a-c4ddaa8a74d6))
     (model "${KICAD6_3DMODEL_DIR}/Connector_PinSocket_2.54mm.3dshapes/PinSocket_1x08_P2.54mm_Vertical.wrl"
       (offset (xyz 0 0 0))
@@ -6211,6 +7523,49 @@
     )
   )
 
+  (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (layer "F.Cu")
+    (tedit 5A1DC084) (tstamp ef575fde-6a4f-4ef7-a180-7a51a7d778a9)
+    (at 58.42 58.42)
+    (descr "solder Pin_ with flat fork, hole diameter 0.7mm, length 6.5mm, width 1.8mm")
+    (tags "solder Pin_ with flat fork")
+    (property "Sheetfile" "keymatrix_extdiode_wire.kicad_sch")
+    (property "Sheetname" "KeyMatrix wired")
+    (path "/86fd0b4b-b0c8-4da7-922a-6650d5003f71/599495f8-b69f-4a68-82fa-d7c87ad23fb8")
+    (attr through_hole)
+    (fp_text reference "J45" (at 0 1.8) (layer "F.SilkS") hide
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 2879c5e8-aafb-4a07-849d-35933435aba2)
+    )
+    (fp_text value "C7" (at 0 -5.08) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 2837c0cf-ef1b-4254-ae4b-6ef635bbb262)
+    )
+    (fp_text user "${REFERENCE}" (at 0 1.8) (layer "F.Fab") hide
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp fef5e210-1b1f-44df-a2da-1b5d850306f0)
+    )
+    (fp_line (start -0.95 -0.95) (end -0.95 0.95) (layer "F.SilkS") (width 0.12) (tstamp 49a3599f-39f6-4cbe-9878-027f944e55d3))
+    (fp_line (start 0.9 -0.95) (end -0.95 -0.95) (layer "F.SilkS") (width 0.12) (tstamp 5aefd83d-adbe-4fb4-a687-1c995b5ce80f))
+    (fp_line (start 0.9 0.95) (end 0.9 -0.9) (layer "F.SilkS") (width 0.12) (tstamp 735c9d48-2a48-4ae1-a7e6-9d055abe5ff9))
+    (fp_line (start 0.9 -0.9) (end 0.9 -0.95) (layer "F.SilkS") (width 0.12) (tstamp 888f0702-fa19-43d9-9729-eed0e4393e37))
+    (fp_line (start -0.95 0.95) (end 0.9 0.95) (layer "F.SilkS") (width 0.12) (tstamp a62edac3-42ab-40f8-af7d-87bcea8b0bb6))
+    (fp_line (start -1.4 -1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp 04f5b9ae-1427-4f77-bd42-5ae27f039332))
+    (fp_line (start -1.4 -1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp 288829b6-4099-4ab0-84eb-8a4d43e0f81a))
+    (fp_line (start 1.35 1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp 65c9b880-fe4e-4ca0-a886-40d0161c2ad9))
+    (fp_line (start 1.35 1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp 8e9be0a8-e062-4904-8a28-e0ba35891aea))
+    (fp_line (start -0.9 0.25) (end -0.9 -0.25) (layer "F.Fab") (width 0.12) (tstamp 2a090783-e8f2-47c1-8e74-67e3896ac297))
+    (fp_line (start 0.85 0.25) (end -0.9 0.25) (layer "F.Fab") (width 0.12) (tstamp 783e79f7-eca2-4551-a3b1-ad149f1459af))
+    (fp_line (start 0.85 -0.25) (end 0.85 0.25) (layer "F.Fab") (width 0.12) (tstamp f9f94fec-8ec5-46ba-9f4a-501106495ed3))
+    (fp_line (start -0.9 -0.25) (end 0.85 -0.25) (layer "F.Fab") (width 0.12) (tstamp fda887bf-b29e-4476-b946-9b9ca4bb8ec6))
+    (pad "1" thru_hole circle (at 0 0) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 184 "Net-(J45-Pad1)") (pinfunction "Pin_1") (pintype "passive") (tstamp 33f6b87b-361e-4681-8f78-6d37946c6353))
+    (model "${KICAD6_3DMODEL_DIR}/Connector_Pin.3dshapes/Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
   (footprint "Connector_PinSocket_2.54mm:PinSocket_1x08_P2.54mm_Vertical" (layer "F.Cu")
     (tedit 5A19A420) (tstamp ef6a15e7-e8b3-4203-bb6b-dfba8ce753a0)
     (at 121.92 55.88)
@@ -6230,7 +7585,7 @@
     )
     (fp_text user "${REFERENCE}" (at 0 8.89 90) (layer "F.Fab") hide
       (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp c840e95b-4463-4596-a8ff-6ce79851566f)
+      (tstamp 4035c6d5-0218-4683-a405-7b7b1fd841f8)
     )
     (fp_line (start 1.33 -1.33) (end 1.33 0) (layer "F.SilkS") (width 0.12) (tstamp 0a265ffd-2d6a-406b-93a8-36c3d8ec1b7d))
     (fp_line (start -1.33 1.27) (end -1.33 19.11) (layer "F.SilkS") (width 0.12) (tstamp 0bc477ec-347c-4723-afc2-6a435eed7f48))
@@ -6318,6 +7673,49 @@
     )
   )
 
+  (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (layer "F.Cu")
+    (tedit 5A1DC084) (tstamp f27144ea-3be0-41a7-9439-aa5788ec9192)
+    (at 48.26 38.1)
+    (descr "solder Pin_ with flat fork, hole diameter 0.7mm, length 6.5mm, width 1.8mm")
+    (tags "solder Pin_ with flat fork")
+    (property "Sheetfile" "rotary.kicad_sch")
+    (property "Sheetname" "Rotary Encoder")
+    (path "/0e0cd3f9-9e59-4187-9e69-2f18dd8368cc/c9521a26-be15-4a1e-8acc-422906829663")
+    (attr through_hole)
+    (fp_text reference "J17" (at 0 1.8) (layer "F.SilkS") hide
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 9dbd9e26-9782-45c4-9403-4d72b07f29de)
+    )
+    (fp_text value "B5" (at -0.025 -4.445) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 437250d9-eb22-42a7-a0ee-f2e6a9628e2b)
+    )
+    (fp_text user "${REFERENCE}" (at 0 1.8) (layer "F.Fab") hide
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 5d56d28a-c4af-4430-8964-9b60bd37a4ca)
+    )
+    (fp_line (start 0.9 -0.9) (end 0.9 -0.95) (layer "F.SilkS") (width 0.12) (tstamp 59e90f16-96b8-49bc-86de-566bbe3dd75d))
+    (fp_line (start -0.95 0.95) (end 0.9 0.95) (layer "F.SilkS") (width 0.12) (tstamp 6915e2da-1017-43ad-9e3e-de99af10b4da))
+    (fp_line (start 0.9 -0.95) (end -0.95 -0.95) (layer "F.SilkS") (width 0.12) (tstamp da502ba4-a51e-4a20-8efb-4020dc3cfdab))
+    (fp_line (start 0.9 0.95) (end 0.9 -0.9) (layer "F.SilkS") (width 0.12) (tstamp ecebfbae-5921-4400-8c7c-d6d4cfb57f3d))
+    (fp_line (start -0.95 -0.95) (end -0.95 0.95) (layer "F.SilkS") (width 0.12) (tstamp f3569ccd-85e3-4d52-b53d-a2b9f3673ed0))
+    (fp_line (start 1.35 1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp 025b67ec-fe6a-4ee1-9f43-89b9b5fad3d7))
+    (fp_line (start -1.4 -1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp 3081c45f-0a62-4dc8-a706-c2b3c5e194d8))
+    (fp_line (start 1.35 1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp 85705930-0850-44b9-bc2d-76e756994d34))
+    (fp_line (start -1.4 -1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp aea380b3-0b16-4ad3-8281-37f0d2673e39))
+    (fp_line (start -0.9 -0.25) (end 0.85 -0.25) (layer "F.Fab") (width 0.12) (tstamp 0693453a-34c3-4bfd-b360-f7994c4e507f))
+    (fp_line (start 0.85 0.25) (end -0.9 0.25) (layer "F.Fab") (width 0.12) (tstamp 3258ef2e-7dfd-4b7b-a84c-a8f03af613a6))
+    (fp_line (start 0.85 -0.25) (end 0.85 0.25) (layer "F.Fab") (width 0.12) (tstamp b7148d4c-a9db-4405-915a-b55a0c6f6c34))
+    (fp_line (start -0.9 0.25) (end -0.9 -0.25) (layer "F.Fab") (width 0.12) (tstamp db1fd106-5c41-422b-b451-e2c7dd2c942d))
+    (pad "1" thru_hole circle (at 0 0) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 154 "Net-(J17-Pad1)") (pinfunction "Pin_1") (pintype "passive") (tstamp 62ff3f34-d3e2-41a5-ae11-1b931533f98a))
+    (model "${KICAD6_3DMODEL_DIR}/Connector_Pin.3dshapes/Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
   (footprint "Connector_PinSocket_2.54mm:PinSocket_1x08_P2.54mm_Vertical" (layer "F.Cu")
     (tedit 5A19A420) (tstamp f28b8a8b-50c8-4e8f-8d82-601a9eca65c6)
     (at 147.335 58.395 90)
@@ -6425,6 +7823,49 @@
     )
   )
 
+  (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (layer "F.Cu")
+    (tedit 5A1DC084) (tstamp f93318ea-75fc-439b-a84d-3325e06a4308)
+    (at 43.18 58.42)
+    (descr "solder Pin_ with flat fork, hole diameter 0.7mm, length 6.5mm, width 1.8mm")
+    (tags "solder Pin_ with flat fork")
+    (property "Sheetfile" "keymatrix_extdiode_wire.kicad_sch")
+    (property "Sheetname" "KeyMatrix wired")
+    (path "/86fd0b4b-b0c8-4da7-922a-6650d5003f71/8a000d34-f9aa-4a96-b043-193e6a1c4d76")
+    (attr through_hole)
+    (fp_text reference "J39" (at 0 1.8) (layer "F.SilkS") hide
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp bda3b583-fcf3-408e-a21b-ef3d435a31a4)
+    )
+    (fp_text value "C1" (at 0 -5.08) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 68c30ce3-559e-432f-b064-542a6d7d824f)
+    )
+    (fp_text user "${REFERENCE}" (at 0 1.8) (layer "F.Fab") hide
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 9e2e2c12-24d4-485b-8a09-6cc5f2c61d6b)
+    )
+    (fp_line (start -0.95 -0.95) (end -0.95 0.95) (layer "F.SilkS") (width 0.12) (tstamp 11f24b31-83c9-4027-aae8-15fe14022316))
+    (fp_line (start 0.9 -0.95) (end -0.95 -0.95) (layer "F.SilkS") (width 0.12) (tstamp 90ffcb4e-6813-4ae9-b923-cf828a0b9e25))
+    (fp_line (start 0.9 -0.9) (end 0.9 -0.95) (layer "F.SilkS") (width 0.12) (tstamp cb0ac944-5fdf-4ddb-8033-c5e8bd84f4a1))
+    (fp_line (start 0.9 0.95) (end 0.9 -0.9) (layer "F.SilkS") (width 0.12) (tstamp d9395ac3-ab1a-40d8-a2a4-6348105b716c))
+    (fp_line (start -0.95 0.95) (end 0.9 0.95) (layer "F.SilkS") (width 0.12) (tstamp de0ad173-d7a5-4933-8ed7-987a8641b7ba))
+    (fp_line (start 1.35 1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp 31571f3e-b43e-4df7-bab9-6f2abfe9cb4a))
+    (fp_line (start -1.4 -1.2) (end -1.4 1.2) (layer "F.CrtYd") (width 0.05) (tstamp 604c3200-28b9-4c61-a0d2-f7aa0a813f1a))
+    (fp_line (start -1.4 -1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp 82e23e73-ee45-47f9-a6bf-2badcc93f90a))
+    (fp_line (start 1.35 1.2) (end 1.35 -1.2) (layer "F.CrtYd") (width 0.05) (tstamp a8783df5-a72c-4d78-9adc-5920fc01bcfc))
+    (fp_line (start -0.9 0.25) (end -0.9 -0.25) (layer "F.Fab") (width 0.12) (tstamp 37e7fd13-c5a7-491a-b156-387202ac29af))
+    (fp_line (start 0.85 0.25) (end -0.9 0.25) (layer "F.Fab") (width 0.12) (tstamp 46c18a6c-2dc8-4a33-8531-233c2e3cb10f))
+    (fp_line (start -0.9 -0.25) (end 0.85 -0.25) (layer "F.Fab") (width 0.12) (tstamp 6646907e-04e3-40d8-9e8d-5826fd162145))
+    (fp_line (start 0.85 -0.25) (end 0.85 0.25) (layer "F.Fab") (width 0.12) (tstamp d2cb90bf-1cec-4aa3-b684-3da758aabd85))
+    (pad "1" thru_hole circle (at 0 0) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
+      (net 178 "Net-(J39-Pad1)") (pinfunction "Pin_1") (pintype "passive") (tstamp 82399e9a-3ace-413e-a311-db8270bbac4b))
+    (model "${KICAD6_3DMODEL_DIR}/Connector_Pin.3dshapes/Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
   (footprint "Diode_THT:D_DO-35_SOD27_P2.54mm_Vertical_AnodeUp" (layer "F.Cu")
     (tedit 5AE50CD5) (tstamp f93ab8f3-48a6-45c8-8d50-c3bf6d6e9c19)
     (at 182.88 53.34 -90)
@@ -6521,29 +7962,40 @@
     )
   )
 
-  (gr_rect (start 10.16 22.86) (end 114.3 88.9) (layer "F.SilkS") (width 0.12) (fill none) (tstamp afb8b546-2d34-49f9-b048-809d9d067ebb))
+  (gr_rect (start 22.86 22.86) (end 93.98 60.96) (layer "F.SilkS") (width 0.12) (fill none) (tstamp afb8b546-2d34-49f9-b048-809d9d067ebb))
+  (gr_line (start 60.96 40.64) (end 60.96 22.86) (layer "Dwgs.User") (width 0.15) (tstamp 1b0f80ce-3556-4b76-9706-d607659b7b6f))
+  (gr_line (start 22.86 40.64) (end 60.96 40.64) (layer "Dwgs.User") (width 0.2) (tstamp 58fbda34-e62f-4525-a3b1-91a77c26980f))
+  (gr_line (start 60.96 43.18) (end 22.86 43.18) (layer "Dwgs.User") (width 0.2) (tstamp 6c69c66f-6e3c-41e8-8da7-f4d17455a380))
+  (gr_line (start 60.96 43.18) (end 60.96 60.96) (layer "Dwgs.User") (width 0.15) (tstamp 8544b55a-6739-490d-835e-4b5b67f1784f))
   (gr_line (start 162.56 78.74) (end 162.56 81.28) (layer "Dwgs.User") (width 0.15) (tstamp 9abf2699-7a67-468c-ae02-1e86c6fb7d63))
   (gr_line (start 137.16 78.74) (end 137.16 81.28) (layer "Dwgs.User") (width 0.15) (tstamp bd8c4ef8-c0b7-4ad2-8997-d8faefd4e8f0))
-  (gr_line (start 101.6 22.86) (end 101.6 60.96) (layer "Edge.Cuts") (width 0.15) (tstamp 00000000-0000-0000-0000-000061fec633))
-  (gr_line (start 50.8 71.12) (end 50.8 134.62) (layer "Edge.Cuts") (width 0.15) (tstamp 0d7333ca-0587-43cb-9af7-f59016c85820))
-  (gr_line (start 68.58 22.86) (end 68.58 60.96) (layer "Edge.Cuts") (width 0.2) (tstamp 29106fb5-143e-4e20-878e-052e2b3383b0))
-  (gr_line (start 58.42 25.4) (end 12.7 25.4) (layer "Edge.Cuts") (width 0.2) (tstamp 3d61f21c-8463-4865-919d-06cc81e88738))
-  (gr_line (start 68.58 60.96) (end 101.6 60.96) (layer "Edge.Cuts") (width 0.2) (tstamp 46a7dba6-e84c-4e04-a72e-86e4c6e4e198))
+  (gr_line (start 93.98 22.86) (end 93.98 60.96) (layer "Edge.Cuts") (width 0.15) (tstamp 00000000-0000-0000-0000-000061fec633))
+  (gr_line (start 60.96 60.96) (end 22.86 60.96) (layer "Edge.Cuts") (width 0.2) (tstamp 0d307ee3-061e-49b7-9aeb-7d710491afc9))
+  (gr_line (start 22.86 91.44) (end 86.36 91.44) (layer "Edge.Cuts") (width 0.15) (tstamp 0d7333ca-0587-43cb-9af7-f59016c85820))
+  (gr_line (start 60.96 22.86) (end 22.86 22.86) (layer "Edge.Cuts") (width 0.2) (tstamp 3d61f21c-8463-4865-919d-06cc81e88738))
+  (gr_line (start 60.96 60.96) (end 93.98 60.96) (layer "Edge.Cuts") (width 0.2) (tstamp 46a7dba6-e84c-4e04-a72e-86e4c6e4e198))
   (gr_line (start 111.76 22.86) (end 187.96 22.86) (layer "Edge.Cuts") (width 0.2) (tstamp 57d86d0f-6776-4ecc-9849-ac260f5b0ff2))
-  (gr_line (start 78.74 96.52) (end 68.58 96.52) (layer "Edge.Cuts") (width 0.05) (tstamp 582f3731-2b1d-41f9-bc19-6be19222b82f))
-  (gr_line (start 12.7 53.34) (end 58.42 53.34) (layer "Edge.Cuts") (width 0.2) (tstamp 58fbda34-e62f-4525-a3b1-91a77c26980f))
+  (gr_line (start 99.06 116.84) (end 88.9 116.84) (layer "Edge.Cuts") (width 0.05) (tstamp 582f3731-2b1d-41f9-bc19-6be19222b82f))
   (gr_line (start 187.96 76.2) (end 111.76 76.2) (layer "Edge.Cuts") (width 0.2) (tstamp 6051bc58-8dbb-4b22-97e8-7eb00f734903))
-  (gr_line (start 12.7 53.34) (end 12.7 25.4) (layer "Edge.Cuts") (width 0.15) (tstamp 6597e724-ffad-43f1-9619-cca25cced87f))
+  (gr_line (start 22.86 60.96) (end 22.86 22.86) (layer "Edge.Cuts") (width 0.15) (tstamp 6597e724-ffad-43f1-9619-cca25cced87f))
   (gr_line (start 111.76 76.2) (end 111.76 22.86) (layer "Edge.Cuts") (width 0.2) (tstamp 6f358e43-79f9-4a38-b453-0c34277a27de))
-  (gr_line (start 12.7 134.62) (end 12.7 71.12) (layer "Edge.Cuts") (width 0.2) (tstamp 73123040-7d91-4ece-b049-ee26e19f852f))
-  (gr_line (start 12.7 134.62) (end 50.8 134.62) (layer "Edge.Cuts") (width 0.2) (tstamp aae7067d-9b5e-4a24-a5f6-2b78929cd219))
-  (gr_line (start 68.58 22.86) (end 101.6 22.86) (layer "Edge.Cuts") (width 0.2) (tstamp aeae1c08-0511-41ff-896d-95b95a86eb35))
+  (gr_line (start 86.36 129.54) (end 22.86 129.54) (layer "Edge.Cuts") (width 0.2) (tstamp 73123040-7d91-4ece-b049-ee26e19f852f))
+  (gr_line (start 86.36 129.54) (end 86.36 91.44) (layer "Edge.Cuts") (width 0.2) (tstamp aae7067d-9b5e-4a24-a5f6-2b78929cd219))
+  (gr_line (start 60.96 22.86) (end 93.98 22.86) (layer "Edge.Cuts") (width 0.2) (tstamp aeae1c08-0511-41ff-896d-95b95a86eb35))
   (gr_line (start 187.96 22.86) (end 187.96 76.2) (layer "Edge.Cuts") (width 0.2) (tstamp c6151bb4-beb6-483d-8734-a5fd18c39104))
-  (gr_line (start 12.7 71.12) (end 50.8 71.12) (layer "Edge.Cuts") (width 0.2) (tstamp c772e430-b260-4ff0-8e81-061edbadfc67))
-  (gr_line (start 58.42 53.34) (end 58.42 25.4) (layer "Edge.Cuts") (width 0.2) (tstamp d86de366-b062-45a7-bdc6-eee27735041a))
-  (gr_line (start 78.74 71.12) (end 78.74 96.52) (layer "Edge.Cuts") (width 0.05) (tstamp e0450c32-6c7d-418d-bc0f-aa7cbff84d35))
-  (gr_line (start 68.58 71.12) (end 78.74 71.12) (layer "Edge.Cuts") (width 0.05) (tstamp e97a138c-907f-4ac2-909d-5420774bbc49))
-  (gr_line (start 68.58 96.52) (end 68.58 71.12) (layer "Edge.Cuts") (width 0.05) (tstamp ee47853b-21ae-48ec-beb8-af4b8238c9b6))
+  (gr_line (start 22.86 129.54) (end 22.86 91.44) (layer "Edge.Cuts") (width 0.2) (tstamp c772e430-b260-4ff0-8e81-061edbadfc67))
+  (gr_line (start 99.06 91.44) (end 99.06 116.84) (layer "Edge.Cuts") (width 0.05) (tstamp e0450c32-6c7d-418d-bc0f-aa7cbff84d35))
+  (gr_line (start 88.9 91.44) (end 99.06 91.44) (layer "Edge.Cuts") (width 0.05) (tstamp e97a138c-907f-4ac2-909d-5420774bbc49))
+  (gr_line (start 88.9 116.84) (end 88.9 91.44) (layer "Edge.Cuts") (width 0.05) (tstamp ee47853b-21ae-48ec-beb8-af4b8238c9b6))
+  (dimension (type aligned) (layer "Dwgs.User") (tstamp 05697a0e-112c-46cd-817f-8be0a3348a22)
+    (pts (xy 22.86 60.96) (xy 93.98 60.96))
+    (height 5.08)
+    (gr_text "71,1200 mm" (at 58.42 64.24) (layer "Dwgs.User") (tstamp 05697a0e-112c-46cd-817f-8be0a3348a22)
+      (effects (font (size 1.5 1.5) (thickness 0.3)))
+    )
+    (format (units 3) (units_format 1) (precision 4))
+    (style (thickness 0.2) (arrow_length 1.27) (text_position_mode 0) (extension_height 0.58642) (extension_offset 0.5) keep_text_aligned)
+  )
   (dimension (type aligned) (layer "Dwgs.User") (tstamp 419ee62a-59be-4184-abc2-f987d6dbe27a)
     (pts (xy 111.76 22.86) (xy 187.96 22.86))
     (height -5.08)
@@ -6554,18 +8006,18 @@
     (style (thickness 0.2) (arrow_length 1.27) (text_position_mode 0) (extension_height 0.58642) (extension_offset 0.5) keep_text_aligned)
   )
   (dimension (type aligned) (layer "Dwgs.User") (tstamp 5c7b7457-2362-4d39-9b08-119f7428e7ce)
-    (pts (xy 12.7 71.12) (xy 50.8 71.12))
+    (pts (xy 22.86 129.54) (xy 22.86 91.44))
     (height -5.08)
-    (gr_text "38,1000 mm" (at 31.75 64.24) (layer "Dwgs.User") (tstamp 5c7b7457-2362-4d39-9b08-119f7428e7ce)
+    (gr_text "38,1000 mm" (at 15.98 110.49 90) (layer "Dwgs.User") (tstamp 5c7b7457-2362-4d39-9b08-119f7428e7ce)
       (effects (font (size 1.5 1.5) (thickness 0.3)))
     )
     (format (units 3) (units_format 1) (precision 4))
     (style (thickness 0.2) (arrow_length 1.27) (text_position_mode 0) (extension_height 0.58642) (extension_offset 0.5) keep_text_aligned)
   )
   (dimension (type aligned) (layer "Dwgs.User") (tstamp 7da6dd22-6820-4812-8b65-ceb1440c016d)
-    (pts (xy 101.6 60.96) (xy 101.6 22.86))
+    (pts (xy 93.98 60.96) (xy 93.98 22.86))
     (height 5.08)
-    (gr_text "38.1000 mm" (at 104.88 41.91 90) (layer "Dwgs.User") (tstamp 7da6dd22-6820-4812-8b65-ceb1440c016d)
+    (gr_text "38.1000 mm" (at 97.26 41.91 90) (layer "Dwgs.User") (tstamp 7da6dd22-6820-4812-8b65-ceb1440c016d)
       (effects (font (size 1.5 1.5) (thickness 0.3)))
     )
     (format (units 2) (units_format 1) (precision 4))
@@ -6581,91 +8033,87 @@
     (style (thickness 0.2) (arrow_length 1.27) (text_position_mode 0) (extension_height 0.58642) (extension_offset 0.5) keep_text_aligned)
   )
   (dimension (type aligned) (layer "Dwgs.User") (tstamp 8dd54862-df4e-4faf-bdd6-951ae815871e)
-    (pts (xy 50.8 71.12) (xy 50.8 134.62))
+    (pts (xy 22.86 91.44) (xy 86.36 91.44))
     (height -5.08)
-    (gr_text "63,5000 mm" (at 54.08 102.87 90) (layer "Dwgs.User") (tstamp 8dd54862-df4e-4faf-bdd6-951ae815871e)
+    (gr_text "63,5000 mm" (at 54.61 84.56) (layer "Dwgs.User") (tstamp 8dd54862-df4e-4faf-bdd6-951ae815871e)
       (effects (font (size 1.5 1.5) (thickness 0.3)))
     )
     (format (units 3) (units_format 1) (precision 4))
     (style (thickness 0.2) (arrow_length 1.27) (text_position_mode 0) (extension_height 0.58642) (extension_offset 0.5) keep_text_aligned)
   )
   (dimension (type aligned) (layer "Dwgs.User") (tstamp 9f5c7a80-7220-432e-865b-d1468e8a8d4c)
-    (pts (xy 58.42 25.4) (xy 12.7 25.4))
+    (pts (xy 60.96 22.86) (xy 22.86 22.86))
     (height 5.08)
-    (gr_text "45.7200 mm" (at 35.56 18.52) (layer "Dwgs.User") (tstamp 9f5c7a80-7220-432e-865b-d1468e8a8d4c)
+    (gr_text "38.1000 mm" (at 41.91 15.98) (layer "Dwgs.User") (tstamp 9f5c7a80-7220-432e-865b-d1468e8a8d4c)
       (effects (font (size 1.5 1.5) (thickness 0.3)))
     )
     (format (units 2) (units_format 1) (precision 4))
     (style (thickness 0.2) (arrow_length 1.27) (text_position_mode 0) (extension_height 0.58642) (extension_offset 0) keep_text_aligned)
   )
+  (dimension (type aligned) (layer "Dwgs.User") (tstamp ab0384ad-0bc0-4c1a-a140-d93b08a8bb1b)
+    (pts (xy 22.86 43.18) (xy 22.86 60.96))
+    (height 5.079999)
+    (gr_text "17,7800 mm" (at 15.980001 52.07 90) (layer "Dwgs.User") (tstamp ab0384ad-0bc0-4c1a-a140-d93b08a8bb1b)
+      (effects (font (size 1.5 1.5) (thickness 0.3)))
+    )
+    (format (units 3) (units_format 1) (precision 4))
+    (style (thickness 0.2) (arrow_length 1.27) (text_position_mode 0) (extension_height 0.58642) (extension_offset 0.5) keep_text_aligned)
+  )
   (dimension (type aligned) (layer "Dwgs.User") (tstamp cc88164c-e798-4e72-b304-d7f93f5c4c65)
-    (pts (xy 68.58 22.86) (xy 104.14 22.86))
+    (pts (xy 60.96 22.86) (xy 93.98 22.86))
     (height -5.248057)
-    (gr_text "35,5600 mm" (at 86.36 15.811943) (layer "Dwgs.User") (tstamp cc88164c-e798-4e72-b304-d7f93f5c4c65)
+    (gr_text "33,0200 mm" (at 77.47 15.811943) (layer "Dwgs.User") (tstamp cc88164c-e798-4e72-b304-d7f93f5c4c65)
       (effects (font (size 1.5 1.5) (thickness 0.3)))
     )
     (format (units 3) (units_format 1) (precision 4))
     (style (thickness 0.2) (arrow_length 1.27) (text_position_mode 0) (extension_height 0.58642) (extension_offset 0.5) keep_text_aligned)
   )
   (dimension (type aligned) (layer "Dwgs.User") (tstamp e04696fb-5bdb-4f42-8255-8e2001c19ba3)
-    (pts (xy 58.42 25.4) (xy 58.42 53.34))
+    (pts (xy 22.86 40.64) (xy 22.86 22.86))
     (height -5.08)
-    (gr_text "27,9400 mm" (at 61.7 39.37 90) (layer "Dwgs.User") (tstamp e04696fb-5bdb-4f42-8255-8e2001c19ba3)
+    (gr_text "17,7800 mm" (at 15.98 31.75 90) (layer "Dwgs.User") (tstamp e04696fb-5bdb-4f42-8255-8e2001c19ba3)
       (effects (font (size 1.5 1.5) (thickness 0.3)))
     )
     (format (units 3) (units_format 1) (precision 4))
     (style (thickness 0.2) (arrow_length 1.27) (text_position_mode 0) (extension_height 0.58642) (extension_offset 0.5) keep_text_aligned)
   )
 
-  (segment (start 98.83 38.1) (end 98.83 27.94) (width 1) (layer "B.Cu") (net 1) (tstamp 37f1b63b-f111-472e-a1e0-cdd29eeee905))
-  (segment (start 98.83 27.94) (end 83.82 27.94) (width 1) (layer "B.Cu") (net 1) (tstamp 60968a90-dfb4-40f1-955a-dc7de49bb0ab))
-  (segment (start 83.82 27.94) (end 83.82 33.02) (width 1) (layer "B.Cu") (net 1) (tstamp 772de199-72ea-462b-9986-0bbdbbf5edfa))
-  (segment (start 71.12 33.02) (end 78.74 33.02) (width 1) (layer "B.Cu") (net 1) (tstamp 79550362-ac1e-4c3f-ad25-45aa3bf3611a))
-  (segment (start 78.74 33.02) (end 83.82 33.02) (width 1) (layer "B.Cu") (net 1) (tstamp 7ba154cb-06ee-4bab-b50e-d4eb610b0bf6))
-  (segment (start 83.82 55.88) (end 83.82 33.02) (width 1) (layer "B.Cu") (net 1) (tstamp d9d8b053-e63f-4367-93b9-3af27580e0db))
-  (segment (start 86.36 55.88) (end 83.82 55.88) (width 1) (layer "B.Cu") (net 1) (tstamp eb9cafe5-7c33-4cda-a85c-eab240f2ca89))
-  (segment (start 73.66 40.64) (end 76.2 40.64) (width 1) (layer "B.Cu") (net 2) (tstamp 00000000-0000-0000-0000-000061fef61a))
-  (segment (start 71.12 40.64) (end 73.66 40.64) (width 1) (layer "B.Cu") (net 2) (tstamp 00000000-0000-0000-0000-000061fef82d))
-  (segment (start 96.52 33.02) (end 96.52 40.64) (width 1) (layer "B.Cu") (net 2) (tstamp 1ac7d70b-049b-43e6-95aa-c9bd5200fceb))
-  (segment (start 71.12 40.64) (end 71.12 58.42) (width 1) (layer "B.Cu") (net 2) (tstamp 3f70548d-c145-40d7-b665-faff167579fe))
-  (segment (start 88.9 58.42) (end 88.9 33.02) (width 1) (layer "B.Cu") (net 2) (tstamp 4d5d352c-980d-4805-8ecc-93bddef59b32))
-  (segment (start 88.9 33.02) (end 96.52 33.02) (width 1) (layer "B.Cu") (net 2) (tstamp 793a58ac-b02d-4461-9935-6e03f855a299))
-  (segment (start 71.12 58.42) (end 88.9 58.42) (width 1) (layer "B.Cu") (net 2) (tstamp a8419819-5d6a-4bca-919c-c81d99629775))
-  (segment (start 96.52 40.64) (end 99.06 40.64) (width 1) (layer "B.Cu") (net 2) (tstamp ca5518eb-6e37-49c3-aac1-bc84fa41dfa6))
-  (segment (start 78.51 35.56) (end 71.12 35.56) (width 1) (layer "B.Cu") (net 3) (tstamp 99e01380-6fe1-4389-b4d9-30f64a90ab1b))
-  (segment (start 78.51 38.1) (end 71.12 38.1) (width 1) (layer "B.Cu") (net 4) (tstamp 4be0b938-babf-4f34-b2f0-ade9f0188d38))
-  (segment (start 78.74 53.34) (end 78.74 55.88) (width 1) (layer "B.Cu") (net 9) (tstamp 84a508ab-f022-41bc-b09d-df562d10a71f))
-  (segment (start 76.2 50.8) (end 76.2 55.88) (width 1) (layer "B.Cu") (net 10) (tstamp 9e5b5d5c-173e-4a46-a113-4100114e9aa0))
-  (segment (start 78.74 50.8) (end 76.2 50.8) (width 1) (layer "B.Cu") (net 10) (tstamp b0394a41-fd64-45a7-8d6e-3109d76934f2))
-  (segment (start 78.51 45.72) (end 81.28 45.72) (width 1) (layer "B.Cu") (net 11) (tstamp 5fbb285f-38f2-4cb3-8e9a-659d036348bb))
-  (segment (start 81.28 45.72) (end 81.28 55.88) (width 1) (layer "B.Cu") (net 11) (tstamp b8e00c87-082f-49f1-a3f7-abf8106aed2f))
-  (segment (start 17.78 35.56) (end 17.78 33.02) (width 1) (layer "B.Cu") (net 12) (tstamp 7a7e2f14-7c55-4199-ac1b-61bba35d2dad))
-  (segment (start 25.4 33.02) (end 25.4 35.56) (width 1) (layer "B.Cu") (net 12) (tstamp 8918ad0e-9843-4827-b68e-6cab52806df4))
-  (segment (start 17.78 33.02) (end 25.4 33.02) (width 1) (layer "B.Cu") (net 12) (tstamp 8f5f01fe-1c7e-4ffd-b73e-a4537e03a689))
-  (segment (start 22.86 38.1) (end 22.86 35.56) (width 1) (layer "B.Cu") (net 13) (tstamp 83fe581d-119f-43ee-962c-ad43ffda1673))
-  (segment (start 17.78 38.1) (end 22.86 38.1) (width 1) (layer "B.Cu") (net 13) (tstamp bcd1d003-705a-4a74-aa1b-8b1527ce112a))
-  (segment (start 55.88 50.8) (end 50.8 50.8) (width 1) (layer "B.Cu") (net 14) (tstamp 047abfc6-179e-4fac-b9d3-f6fc48368f7d))
-  (segment (start 50.8 50.8) (end 45.72 50.8) (width 1) (layer "B.Cu") (net 14) (tstamp 12b5b1d6-ce5f-4056-8a3d-13639304c9cd))
-  (segment (start 30.48 40.64) (end 30.48 35.56) (width 1) (layer "B.Cu") (net 14) (tstamp 13f4df76-5af2-405c-b137-958f9a82537a))
-  (segment (start 43.18 27.94) (end 55.88 27.94) (width 1) (layer "B.Cu") (net 14) (tstamp 1588a0bc-fb3d-4fe5-9c0c-f82ee2625d24))
-  (segment (start 25.4 43.205) (end 22.86 43.205) (width 1) (layer "B.Cu") (net 14) (tstamp 37ed7359-18c4-4394-a3f3-6fb336c0bb27))
-  (segment (start 17.78 40.64) (end 25.4 40.64) (width 1) (layer "B.Cu") (net 14) (tstamp 633f75c5-3e59-4c5c-acaa-7b07045091db))
-  (segment (start 30.48 40.64) (end 55.88 40.64) (width 1) (layer "B.Cu") (net 14) (tstamp 9daf85d4-3199-418e-b1b4-3677f696c616))
-  (segment (start 43.18 27.94) (end 38.1 27.94) (width 1) (layer "B.Cu") (net 14) (tstamp c4a69666-fcef-4aaa-91c2-5fa4bdf62e58))
-  (segment (start 25.4 40.64) (end 30.48 40.64) (width 1) (layer "B.Cu") (net 14) (tstamp c96e7a55-b8eb-44d6-be3d-c0744c75107b))
-  (segment (start 55.88 27.94) (end 55.88 50.8) (width 1) (layer "B.Cu") (net 14) (tstamp ca5dd7c1-84e8-4800-8c11-20364986cca8))
-  (segment (start 45.72 50.8) (end 35.56 50.8) (width 1) (layer "B.Cu") (net 14) (tstamp d4c3a626-feee-410e-a1ab-e15e8f882e2e))
-  (segment (start 25.4 40.64) (end 25.4 43.205) (width 1) (layer "B.Cu") (net 14) (tstamp eeb4521d-f88d-46bd-8556-75a4a756a9ee))
-  (segment (start 15.24 30.48) (end 15.24 43.18) (width 1) (layer "B.Cu") (net 15) (tstamp 3cc963c5-8514-48de-8b6b-23e261423ac7))
-  (segment (start 20.32 43.18) (end 20.32 45.72) (width 1) (layer "B.Cu") (net 15) (tstamp 5229cd57-cdd8-46bf-80cc-0a5016c831d4))
-  (segment (start 15.24 43.18) (end 20.32 43.18) (width 1) (layer "B.Cu") (net 15) (tstamp 5521a2b1-eab9-46d0-bbd1-bc6f89db5d51))
-  (segment (start 33.02 35.56) (end 33.02 30.48) (width 1) (layer "B.Cu") (net 15) (tstamp cae9f394-d509-45ad-a165-834d63dce8b7))
-  (segment (start 27.94 45.72) (end 27.94 43.18) (width 1) (layer "B.Cu") (net 15) (tstamp d19130a8-d976-4407-b34d-b6f290901bb9))
-  (segment (start 20.32 45.72) (end 27.94 45.72) (width 1) (layer "B.Cu") (net 15) (tstamp ee4fa114-b0a8-4583-9c63-25e46f8e5051))
-  (segment (start 33.02 30.48) (end 15.24 30.48) (width 1) (layer "B.Cu") (net 15) (tstamp f3e4f781-5f85-4ab6-b2b5-3483a16e105b))
-  (segment (start 33.02 43.18) (end 33.02 48.26) (width 1) (layer "B.Cu") (net 16) (tstamp 98f19deb-c1d4-4e23-9fcb-5c4c17204212))
-  (segment (start 17.78 48.26) (end 17.78 45.72) (width 1) (layer "B.Cu") (net 16) (tstamp a85aae93-bf7f-4f5b-9698-8eadf0f73625))
-  (segment (start 33.02 48.26) (end 17.78 48.26) (width 1) (layer "B.Cu") (net 16) (tstamp b4b060f7-2b3e-4bed-999d-f50d14e3554a))
+  (segment (start 91.21 38.1) (end 91.21 27.94) (width 1) (layer "B.Cu") (net 1) (tstamp 37f1b63b-f111-472e-a1e0-cdd29eeee905))
+  (segment (start 91.21 27.94) (end 76.2 27.94) (width 1) (layer "B.Cu") (net 1) (tstamp 60968a90-dfb4-40f1-955a-dc7de49bb0ab))
+  (segment (start 76.2 27.94) (end 76.2 33.02) (width 1) (layer "B.Cu") (net 1) (tstamp 772de199-72ea-462b-9986-0bbdbbf5edfa))
+  (segment (start 63.5 33.02) (end 71.12 33.02) (width 1) (layer "B.Cu") (net 1) (tstamp 79550362-ac1e-4c3f-ad25-45aa3bf3611a))
+  (segment (start 71.12 33.02) (end 76.2 33.02) (width 1) (layer "B.Cu") (net 1) (tstamp 7ba154cb-06ee-4bab-b50e-d4eb610b0bf6))
+  (segment (start 76.2 55.88) (end 76.2 33.02) (width 1) (layer "B.Cu") (net 1) (tstamp d9d8b053-e63f-4367-93b9-3af27580e0db))
+  (segment (start 78.74 55.88) (end 76.2 55.88) (width 1) (layer "B.Cu") (net 1) (tstamp eb9cafe5-7c33-4cda-a85c-eab240f2ca89))
+  (segment (start 66.04 40.64) (end 68.58 40.64) (width 1) (layer "B.Cu") (net 2) (tstamp 00000000-0000-0000-0000-000061fef61a))
+  (segment (start 63.5 40.64) (end 66.04 40.64) (width 1) (layer "B.Cu") (net 2) (tstamp 00000000-0000-0000-0000-000061fef82d))
+  (segment (start 88.9 33.02) (end 88.9 40.64) (width 1) (layer "B.Cu") (net 2) (tstamp 1ac7d70b-049b-43e6-95aa-c9bd5200fceb))
+  (segment (start 63.5 40.64) (end 63.5 58.42) (width 1) (layer "B.Cu") (net 2) (tstamp 3f70548d-c145-40d7-b665-faff167579fe))
+  (segment (start 81.28 58.42) (end 81.28 33.02) (width 1) (layer "B.Cu") (net 2) (tstamp 4d5d352c-980d-4805-8ecc-93bddef59b32))
+  (segment (start 81.28 33.02) (end 88.9 33.02) (width 1) (layer "B.Cu") (net 2) (tstamp 793a58ac-b02d-4461-9935-6e03f855a299))
+  (segment (start 63.5 58.42) (end 81.28 58.42) (width 1) (layer "B.Cu") (net 2) (tstamp a8419819-5d6a-4bca-919c-c81d99629775))
+  (segment (start 88.9 40.64) (end 91.44 40.64) (width 1) (layer "B.Cu") (net 2) (tstamp ca5518eb-6e37-49c3-aac1-bc84fa41dfa6))
+  (segment (start 70.89 35.56) (end 63.5 35.56) (width 1) (layer "B.Cu") (net 3) (tstamp 99e01380-6fe1-4389-b4d9-30f64a90ab1b))
+  (segment (start 70.89 38.1) (end 63.5 38.1) (width 1) (layer "B.Cu") (net 4) (tstamp 4be0b938-babf-4f34-b2f0-ade9f0188d38))
+  (segment (start 71.12 53.34) (end 71.12 55.88) (width 1) (layer "B.Cu") (net 9) (tstamp 84a508ab-f022-41bc-b09d-df562d10a71f))
+  (segment (start 68.58 50.8) (end 68.58 55.88) (width 1) (layer "B.Cu") (net 10) (tstamp 9e5b5d5c-173e-4a46-a113-4100114e9aa0))
+  (segment (start 71.12 50.8) (end 68.58 50.8) (width 1) (layer "B.Cu") (net 10) (tstamp b0394a41-fd64-45a7-8d6e-3109d76934f2))
+  (segment (start 70.89 45.72) (end 73.66 45.72) (width 1) (layer "B.Cu") (net 11) (tstamp 5fbb285f-38f2-4cb3-8e9a-659d036348bb))
+  (segment (start 73.66 45.72) (end 73.66 55.88) (width 1) (layer "B.Cu") (net 11) (tstamp b8e00c87-082f-49f1-a3f7-abf8106aed2f))
+  (segment (start 30.48 25.4) (end 30.48 27.94) (width 1) (layer "B.Cu") (net 12) (tstamp 8918ad0e-9843-4827-b68e-6cab52806df4))
+  (segment (start 27.94 27.94) (end 27.94 25.4) (width 1) (layer "B.Cu") (net 13) (tstamp 0bade7ce-1a13-4feb-803c-c3f66baf92bf))
+  (segment (start 35.56 27.94) (end 35.56 25.4) (width 1) (layer "B.Cu") (net 14) (tstamp 345fa7fa-5734-400b-bf95-4810656a382e))
+  (segment (start 27.94 35.585) (end 30.48 35.585) (width 1) (layer "B.Cu") (net 14) (tstamp 5c2d9a86-40d0-43a7-a065-b3cb4bcc80af))
+  (segment (start 35.56 30.48) (end 35.56 27.94) (width 1) (layer "B.Cu") (net 14) (tstamp bd5adf77-acaf-4f80-9c97-26a3f93d6925))
+  (segment (start 30.48 35.585) (end 30.48 30.48) (width 1) (layer "B.Cu") (net 14) (tstamp cda51170-7a58-4a3b-8284-3e801374e939))
+  (segment (start 30.48 30.48) (end 35.56 30.48) (width 1) (layer "B.Cu") (net 14) (tstamp fbe51953-a661-4253-b343-75c549a50817))
+  (segment (start 25.4 35.56) (end 25.4 38.1) (width 1) (layer "B.Cu") (net 15) (tstamp 5229cd57-cdd8-46bf-80cc-0a5016c831d4))
+  (segment (start 38.1 27.94) (end 38.1 33.02) (width 1) (layer "B.Cu") (net 15) (tstamp 5e10ebed-e13b-4443-ae8d-93be866f9b73))
+  (segment (start 38.1 33.02) (end 33.02 33.02) (width 1) (layer "B.Cu") (net 15) (tstamp 7cfb425c-f5fd-4603-b97b-2eef8a374a2d))
+  (segment (start 33.02 38.1) (end 33.02 35.56) (width 1) (layer "B.Cu") (net 15) (tstamp d19130a8-d976-4407-b34d-b6f290901bb9))
+  (segment (start 33.02 35.56) (end 33.02 33.02) (width 1) (layer "B.Cu") (net 15) (tstamp d570e93c-5545-48d4-af35-1e19dc141390))
+  (segment (start 25.4 38.1) (end 33.02 38.1) (width 1) (layer "B.Cu") (net 15) (tstamp ee4fa114-b0a8-4583-9c63-25e46f8e5051))
+  (segment (start 38.1 35.56) (end 38.1 38.1) (width 1) (layer "B.Cu") (net 16) (tstamp 20b3822b-614a-40f5-920b-cdbab9d6362d))
   (segment (start 154.94 63.5) (end 157.48 63.5) (width 1) (layer "B.Cu") (net 17) (tstamp 0667208e-872f-444a-9ed0-78a1b5f392d2))
   (segment (start 149.86 63.5) (end 147.32 63.5) (width 1) (layer "B.Cu") (net 17) (tstamp 22fd57c4-481e-4417-b920-694451210da2))
   (segment (start 134.62 53.34) (end 137.16 53.34) (width 1) (layer "B.Cu") (net 17) (tstamp 27c272da-77b4-480f-9bc8-84e4fe805cf2))
@@ -6678,10 +8126,10 @@
   (segment (start 165.1 63.5) (end 162.56 63.5) (width 1) (layer "B.Cu") (net 17) (tstamp 969d876f-dc87-40bf-9e96-03cbb9ea5e82))
   (segment (start 137.16 53.34) (end 137.16 58.42) (width 1) (layer "B.Cu") (net 17) (tstamp b8166eaa-020c-4da1-a55e-954a75de49ab))
   (segment (start 149.86 63.5) (end 152.4 63.5) (width 1) (layer "B.Cu") (net 17) (tstamp bc29a09d-ebbe-4bab-9edb-114e75ee17a4))
-  (segment (start 93.98 45.72) (end 99.06 45.72) (width 1) (layer "B.Cu") (net 19) (tstamp 00000000-0000-0000-0000-000061fef7a9))
-  (segment (start 93.98 48.26) (end 99.06 48.26) (width 1) (layer "B.Cu") (net 20) (tstamp 00000000-0000-0000-0000-000061fef7a6))
-  (segment (start 76.2 48.26) (end 78.74 48.26) (width 1) (layer "B.Cu") (net 21) (tstamp 767d2f0d-bfd0-43a6-b026-106981f30c14))
-  (segment (start 76.2 43.18) (end 76.2 48.26) (width 1) (layer "B.Cu") (net 21) (tstamp c9b79ea2-d1f8-429e-9487-b3ffb383cb72))
+  (segment (start 86.36 45.72) (end 91.44 45.72) (width 1) (layer "B.Cu") (net 19) (tstamp 00000000-0000-0000-0000-000061fef7a9))
+  (segment (start 86.36 48.26) (end 91.44 48.26) (width 1) (layer "B.Cu") (net 20) (tstamp 00000000-0000-0000-0000-000061fef7a6))
+  (segment (start 68.58 48.26) (end 71.12 48.26) (width 1) (layer "B.Cu") (net 21) (tstamp 767d2f0d-bfd0-43a6-b026-106981f30c14))
+  (segment (start 68.58 43.18) (end 68.58 48.26) (width 1) (layer "B.Cu") (net 21) (tstamp c9b79ea2-d1f8-429e-9487-b3ffb383cb72))
   (segment (start 139.7 55.88) (end 144.78 55.88) (width 1) (layer "B.Cu") (net 24) (tstamp 0ac5faed-9e87-462c-bb1a-327838d4535d))
   (segment (start 177.8 63.5) (end 180.34 63.5) (width 1) (layer "B.Cu") (net 24) (tstamp 11cae898-6e02-4314-87c3-bfa88f249303))
   (segment (start 180.34 63.5) (end 182.88 63.5) (width 1) (layer "B.Cu") (net 24) (tstamp 3a4d7b94-8b26-4555-b396-f2e88aea5db3))
@@ -6743,11 +8191,11 @@
   (segment (start 134.62 38.1) (end 144.78 38.1) (width 1) (layer "B.Cu") (net 29) (tstamp 91c69423-de51-44fe-bc70-fec455b50634))
   (segment (start 160.02 33.02) (end 162.56 33.02) (width 1) (layer "B.Cu") (net 29) (tstamp a072347a-1cac-4ead-8c61-cfe38fd40342))
   (segment (start 152.4 33.02) (end 154.94 33.02) (width 1) (layer "B.Cu") (net 29) (tstamp fa16f237-4e21-4b18-8c54-f7de4e62bbb6))
-  (segment (start 93.98 43.18) (end 99.06 43.18) (width 1) (layer "B.Cu") (net 30) (tstamp 5217593b-12c6-4e51-8978-ee739bb65a01))
-  (segment (start 93.98 53.34) (end 93.98 55.88) (width 1) (layer "B.Cu") (net 31) (tstamp 6703d014-3f3c-4fce-a948-5810f768589a))
-  (segment (start 93.98 50.8) (end 99.06 50.8) (width 1) (layer "B.Cu") (net 32) (tstamp 00000000-0000-0000-0000-000061fef81b))
-  (segment (start 91.44 40.64) (end 91.44 55.88) (width 1) (layer "B.Cu") (net 33) (tstamp 2169a7c4-ccbe-4a75-bd5d-301b3e899865))
-  (segment (start 93.98 40.64) (end 91.44 40.64) (width 1) (layer "B.Cu") (net 33) (tstamp f319a88e-154c-4208-8701-4c90befb33ca))
+  (segment (start 86.36 43.18) (end 91.44 43.18) (width 1) (layer "B.Cu") (net 30) (tstamp 5217593b-12c6-4e51-8978-ee739bb65a01))
+  (segment (start 86.36 53.34) (end 86.36 55.88) (width 1) (layer "B.Cu") (net 31) (tstamp 6703d014-3f3c-4fce-a948-5810f768589a))
+  (segment (start 86.36 50.8) (end 91.44 50.8) (width 1) (layer "B.Cu") (net 32) (tstamp 00000000-0000-0000-0000-000061fef81b))
+  (segment (start 83.82 40.64) (end 83.82 55.88) (width 1) (layer "B.Cu") (net 33) (tstamp 2169a7c4-ccbe-4a75-bd5d-301b3e899865))
+  (segment (start 86.36 40.64) (end 83.82 40.64) (width 1) (layer "B.Cu") (net 33) (tstamp f319a88e-154c-4208-8701-4c90befb33ca))
   (segment (start 142.24 35.56) (end 142.24 30.48) (width 1) (layer "B.Cu") (net 34) (tstamp 1b00c2af-158e-4e04-ada0-b2313f59b860))
   (segment (start 170.18 33.02) (end 172.72 33.02) (width 1) (layer "B.Cu") (net 34) (tstamp 41fc1c23-edd4-45a5-8036-7f62b013770f))
   (segment (start 175.26 33.02) (end 177.8 33.02) (width 1) (layer "B.Cu") (net 34) (tstamp 42b7a68a-3837-4773-af68-a35059da48c3))
@@ -6759,24 +8207,24 @@
   (segment (start 177.8 33.02) (end 180.34 33.02) (width 1) (layer "B.Cu") (net 34) (tstamp dfa2c928-7d9a-4cd3-90db-112716296421))
   (segment (start 167.64 30.48) (end 167.64 33.02) (width 1) (layer "B.Cu") (net 34) (tstamp e8cb6cb3-dd2b-4328-8592-132e369ebb71))
   (segment (start 172.72 33.02) (end 175.26 33.02) (width 1) (layer "B.Cu") (net 34) (tstamp f9e60890-c09c-4221-9409-43a2ec4885e8))
-  (segment (start 45.72 106.68) (end 45.72 111.76) (width 1) (layer "B.Cu") (net 35) (tstamp 7ffe2fe0-e283-4008-bb81-b744115763a3))
-  (segment (start 43.18 109.22) (end 43.205 109.22) (width 1) (layer "B.Cu") (net 36) (tstamp 1ec1a39e-5500-45a6-85b4-b30fd51c077b))
-  (segment (start 43.18 106.68) (end 43.18 109.22) (width 1) (layer "B.Cu") (net 36) (tstamp efffdc3a-c78d-4adf-816d-74eb08a95164))
-  (segment (start 43.205 109.22) (end 43.205 111.76) (width 1) (layer "B.Cu") (net 36) (tstamp f8011993-5cf3-4747-8305-09d6c4cc0a7f))
-  (segment (start 43.18 104.14) (end 43.18 99.06) (width 1) (layer "B.Cu") (net 37) (tstamp 04610a05-94dc-4bf1-b81f-762b61d295f9))
-  (segment (start 38.125 109.22) (end 38.1 106.68) (width 1) (layer "B.Cu") (net 37) (tstamp 20771021-7905-489e-9c92-945889a3f78f))
-  (segment (start 38.1 104.14) (end 43.18 104.14) (width 1) (layer "B.Cu") (net 37) (tstamp 37962402-dd9e-426a-9c92-a475328cd3a1))
-  (segment (start 38.1 106.68) (end 38.1 104.14) (width 1) (layer "B.Cu") (net 37) (tstamp 73256830-9a41-4d6c-afa3-5b76e1aa47f1))
-  (segment (start 48.26 99.06) (end 45.72 99.06) (width 1) (layer "B.Cu") (net 37) (tstamp 93120b4f-0606-46bd-bd3d-8a65e1b2928f))
-  (segment (start 45.72 99.06) (end 43.18 99.06) (width 1) (layer "B.Cu") (net 37) (tstamp 982e1a04-c954-4d77-b933-63f53f4010bc))
-  (segment (start 40.64 109.22) (end 40.665 109.245) (width 1) (layer "B.Cu") (net 37) (tstamp d63b5c76-a8e8-4ff4-8cfe-d3f696f9e893))
-  (segment (start 38.125 109.22) (end 40.64 109.22) (width 1) (layer "B.Cu") (net 37) (tstamp d68426fe-0e60-4f3c-b69a-58f51622af5a))
-  (segment (start 40.665 109.245) (end 40.665 111.76) (width 1) (layer "B.Cu") (net 37) (tstamp f9138fb1-4e9b-4c0a-a6f1-bc9a6cdec635))
-  (segment (start 35.56 101.6) (end 35.56 106.68) (width 1) (layer "B.Cu") (net 38) (tstamp 16d0caa3-5850-4ad2-a5b4-98be779ddb19))
-  (segment (start 35.56 111.76) (end 38.125 111.76) (width 1) (layer "B.Cu") (net 38) (tstamp 235a635c-ebdd-4a3f-b968-63be7d3f6e65))
-  (segment (start 40.64 101.6) (end 35.56 101.6) (width 1) (layer "B.Cu") (net 38) (tstamp 3376eb55-d1c4-41fa-85f6-b25849c717c8))
-  (segment (start 40.64 99.06) (end 40.64 101.6) (width 1) (layer "B.Cu") (net 38) (tstamp b7ad3053-bada-408b-853d-a64274a09935))
-  (segment (start 35.56 111.76) (end 35.56 106.68) (width 1) (layer "B.Cu") (net 38) (tstamp c58acce4-a818-4c96-b08e-54e2c0d6f7b9))
+  (segment (start 58.42 96.52) (end 63.5 96.52) (width 1) (layer "B.Cu") (net 35) (tstamp 7ffe2fe0-e283-4008-bb81-b744115763a3))
+  (segment (start 60.96 99.06) (end 60.96 99.035) (width 1) (layer "B.Cu") (net 36) (tstamp 1ec1a39e-5500-45a6-85b4-b30fd51c077b))
+  (segment (start 58.42 99.06) (end 60.96 99.06) (width 1) (layer "B.Cu") (net 36) (tstamp efffdc3a-c78d-4adf-816d-74eb08a95164))
+  (segment (start 60.96 99.035) (end 63.5 99.035) (width 1) (layer "B.Cu") (net 36) (tstamp f8011993-5cf3-4747-8305-09d6c4cc0a7f))
+  (segment (start 55.88 99.06) (end 50.8 99.06) (width 1) (layer "B.Cu") (net 37) (tstamp 04610a05-94dc-4bf1-b81f-762b61d295f9))
+  (segment (start 60.96 104.115) (end 58.42 104.14) (width 1) (layer "B.Cu") (net 37) (tstamp 20771021-7905-489e-9c92-945889a3f78f))
+  (segment (start 55.88 104.14) (end 55.88 99.06) (width 1) (layer "B.Cu") (net 37) (tstamp 37962402-dd9e-426a-9c92-a475328cd3a1))
+  (segment (start 58.42 104.14) (end 55.88 104.14) (width 1) (layer "B.Cu") (net 37) (tstamp 73256830-9a41-4d6c-afa3-5b76e1aa47f1))
+  (segment (start 50.8 93.98) (end 50.8 96.52) (width 1) (layer "B.Cu") (net 37) (tstamp 93120b4f-0606-46bd-bd3d-8a65e1b2928f))
+  (segment (start 50.8 96.52) (end 50.8 99.06) (width 1) (layer "B.Cu") (net 37) (tstamp 982e1a04-c954-4d77-b933-63f53f4010bc))
+  (segment (start 60.96 101.6) (end 60.985 101.575) (width 1) (layer "B.Cu") (net 37) (tstamp d63b5c76-a8e8-4ff4-8cfe-d3f696f9e893))
+  (segment (start 60.96 104.115) (end 60.96 101.6) (width 1) (layer "B.Cu") (net 37) (tstamp d68426fe-0e60-4f3c-b69a-58f51622af5a))
+  (segment (start 60.985 101.575) (end 63.5 101.575) (width 1) (layer "B.Cu") (net 37) (tstamp f9138fb1-4e9b-4c0a-a6f1-bc9a6cdec635))
+  (segment (start 53.34 106.68) (end 58.42 106.68) (width 1) (layer "B.Cu") (net 38) (tstamp 16d0caa3-5850-4ad2-a5b4-98be779ddb19))
+  (segment (start 63.5 106.68) (end 63.5 104.115) (width 1) (layer "B.Cu") (net 38) (tstamp 235a635c-ebdd-4a3f-b968-63be7d3f6e65))
+  (segment (start 53.34 101.6) (end 53.34 106.68) (width 1) (layer "B.Cu") (net 38) (tstamp 3376eb55-d1c4-41fa-85f6-b25849c717c8))
+  (segment (start 50.8 101.6) (end 53.34 101.6) (width 1) (layer "B.Cu") (net 38) (tstamp b7ad3053-bada-408b-853d-a64274a09935))
+  (segment (start 63.5 106.68) (end 58.42 106.68) (width 1) (layer "B.Cu") (net 38) (tstamp c58acce4-a818-4c96-b08e-54e2c0d6f7b9))
   (segment (start 129.54 25.4) (end 127 25.4) (width 1) (layer "B.Cu") (net 47) (tstamp 00000000-0000-0000-0000-000061fdeecc))
   (segment (start 139.7 25.4) (end 137.16 25.4) (width 1) (layer "B.Cu") (net 47) (tstamp 00000000-0000-0000-0000-000061fdf5d4))
   (segment (start 132.08 25.4) (end 129.54 25.4) (width 1) (layer "B.Cu") (net 47) (tstamp 00000000-0000-0000-0000-000061fdf7c6))
@@ -6787,30 +8235,30 @@
   (segment (start 114.3 25.4) (end 121.92 25.4) (width 1) (layer "B.Cu") (net 47) (tstamp 0a0346a5-cc15-49b4-b524-e2b1fe239833))
   (segment (start 127 43.18) (end 114.3 43.18) (width 1) (layer "B.Cu") (net 47) (tstamp 265edf09-7837-44bd-bbba-e573c921fdc9))
   (segment (start 114.3 43.18) (end 114.3 25.4) (width 1) (layer "B.Cu") (net 47) (tstamp 712871c5-c2b3-4736-b68a-703b64855ed4))
-  (segment (start 15.24 119.38) (end 15.24 116.84) (width 1) (layer "B.Cu") (net 48) (tstamp 09651a32-2ffb-4ba7-bacf-01ea96d1be02))
-  (segment (start 15.24 121.92) (end 15.24 119.38) (width 1) (layer "B.Cu") (net 48) (tstamp 5896687c-e9a8-4aef-a628-1eb2b86ccd16))
-  (segment (start 15.24 124.46) (end 15.24 121.92) (width 1) (layer "B.Cu") (net 48) (tstamp 60234cff-4d98-47cd-98a4-0dd0dca159ff))
-  (segment (start 15.24 116.84) (end 15.24 114.3) (width 1) (layer "B.Cu") (net 48) (tstamp 6dfab612-4b24-425c-8f62-e2bf4099b3cd))
-  (segment (start 15.24 111.76) (end 15.24 106.68) (width 1) (layer "B.Cu") (net 48) (tstamp 7588450f-6150-4ede-90f2-5facd1af394d))
-  (segment (start 15.24 127) (end 15.24 124.46) (width 1) (layer "B.Cu") (net 48) (tstamp 7cd2341d-4c64-4afc-9b2f-b50569e7f684))
-  (segment (start 15.24 129.54) (end 15.24 127) (width 1) (layer "B.Cu") (net 48) (tstamp de894b3d-4072-496d-9305-4c90628f05b6))
-  (segment (start 15.24 114.3) (end 15.24 111.76) (width 1) (layer "B.Cu") (net 48) (tstamp fdaa131a-bfa4-4876-a88c-d3cb6f2d3c38))
-  (segment (start 17.78 129.54) (end 17.78 106.68) (width 1) (layer "B.Cu") (net 49) (tstamp fc3db889-c906-4cf5-b504-823c88b3b3b8))
-  (segment (start 20.32 129.54) (end 20.32 106.68) (width 1) (layer "B.Cu") (net 50) (tstamp 98b78fdb-608b-4db7-a3ce-1a416d1d2ad0))
-  (segment (start 22.86 106.68) (end 22.86 129.54) (width 1) (layer "B.Cu") (net 51) (tstamp 14a8f7d1-6e93-4bd3-b053-b00fed2e7fb8))
-  (segment (start 25.4 129.54) (end 25.4 106.68) (width 1) (layer "B.Cu") (net 52) (tstamp 49184143-0723-474b-9715-ecd741597af4))
-  (segment (start 27.94 106.68) (end 27.94 129.54) (width 1) (layer "B.Cu") (net 57) (tstamp 4266ce3d-7d9d-47df-8fbe-f0a6c2411338))
-  (segment (start 30.48 106.68) (end 30.48 129.54) (width 1) (layer "B.Cu") (net 58) (tstamp a0126f95-0f49-4b8f-876a-762ac24812eb))
-  (segment (start 33.02 106.68) (end 33.02 129.54) (width 1) (layer "B.Cu") (net 59) (tstamp d73c318c-aaba-4f18-8520-b7020fa6e453))
-  (segment (start 33.02 99.06) (end 33.02 76.2) (width 1) (layer "B.Cu") (net 60) (tstamp ea54c124-b52d-492a-bf9b-15af7fdd574e))
-  (segment (start 30.48 99.06) (end 30.48 76.225) (width 1) (layer "B.Cu") (net 61) (tstamp 6c2622f0-9263-4638-987a-a92f72d6c5bf))
-  (segment (start 30.48 76.225) (end 30.455 76.2) (width 1) (layer "B.Cu") (net 61) (tstamp 816f643a-39ec-45bd-beb5-7993889300ec))
-  (segment (start 27.94 99.06) (end 27.94 76.2) (width 1) (layer "B.Cu") (net 62) (tstamp 7847e806-7e06-4653-a19e-a5bb4381303d))
-  (segment (start 25.4 99.06) (end 25.4 76.2) (width 1) (layer "B.Cu") (net 63) (tstamp cf3da0fe-0dd1-4725-8c77-123d09e9cc1d))
-  (segment (start 22.86 99.06) (end 22.86 76.2) (width 1) (layer "B.Cu") (net 64) (tstamp 578792be-bc65-40ac-9353-2bbbe538bafc))
-  (segment (start 20.32 99.06) (end 20.32 76.2) (width 1) (layer "B.Cu") (net 65) (tstamp 29cf7012-6e45-4cf4-a2ea-811cf0d6a07a))
-  (segment (start 17.78 99.06) (end 17.78 76.2) (width 1) (layer "B.Cu") (net 66) (tstamp f929717e-253f-475a-95b7-793433223175))
-  (segment (start 15.24 99.06) (end 15.24 76.2) (width 1) (layer "B.Cu") (net 67) (tstamp 7638e151-4aaf-4c29-af58-18220e898536))
+  (segment (start 71.12 127) (end 68.58 127) (width 1) (layer "B.Cu") (net 48) (tstamp 09651a32-2ffb-4ba7-bacf-01ea96d1be02))
+  (segment (start 73.66 127) (end 71.12 127) (width 1) (layer "B.Cu") (net 48) (tstamp 5896687c-e9a8-4aef-a628-1eb2b86ccd16))
+  (segment (start 76.2 127) (end 73.66 127) (width 1) (layer "B.Cu") (net 48) (tstamp 60234cff-4d98-47cd-98a4-0dd0dca159ff))
+  (segment (start 68.58 127) (end 66.04 127) (width 1) (layer "B.Cu") (net 48) (tstamp 6dfab612-4b24-425c-8f62-e2bf4099b3cd))
+  (segment (start 63.5 127) (end 58.42 127) (width 1) (layer "B.Cu") (net 48) (tstamp 7588450f-6150-4ede-90f2-5facd1af394d))
+  (segment (start 78.74 127) (end 76.2 127) (width 1) (layer "B.Cu") (net 48) (tstamp 7cd2341d-4c64-4afc-9b2f-b50569e7f684))
+  (segment (start 81.28 127) (end 78.74 127) (width 1) (layer "B.Cu") (net 48) (tstamp de894b3d-4072-496d-9305-4c90628f05b6))
+  (segment (start 66.04 127) (end 63.5 127) (width 1) (layer "B.Cu") (net 48) (tstamp fdaa131a-bfa4-4876-a88c-d3cb6f2d3c38))
+  (segment (start 81.28 124.46) (end 58.42 124.46) (width 1) (layer "B.Cu") (net 49) (tstamp fc3db889-c906-4cf5-b504-823c88b3b3b8))
+  (segment (start 81.28 121.92) (end 58.42 121.92) (width 1) (layer "B.Cu") (net 50) (tstamp 98b78fdb-608b-4db7-a3ce-1a416d1d2ad0))
+  (segment (start 58.42 119.38) (end 81.28 119.38) (width 1) (layer "B.Cu") (net 51) (tstamp 14a8f7d1-6e93-4bd3-b053-b00fed2e7fb8))
+  (segment (start 81.28 116.84) (end 58.42 116.84) (width 1) (layer "B.Cu") (net 52) (tstamp 49184143-0723-474b-9715-ecd741597af4))
+  (segment (start 58.42 114.3) (end 81.28 114.3) (width 1) (layer "B.Cu") (net 57) (tstamp 4266ce3d-7d9d-47df-8fbe-f0a6c2411338))
+  (segment (start 58.42 111.76) (end 81.28 111.76) (width 1) (layer "B.Cu") (net 58) (tstamp a0126f95-0f49-4b8f-876a-762ac24812eb))
+  (segment (start 58.42 109.22) (end 81.28 109.22) (width 1) (layer "B.Cu") (net 59) (tstamp d73c318c-aaba-4f18-8520-b7020fa6e453))
+  (segment (start 50.8 109.22) (end 27.94 109.22) (width 1) (layer "B.Cu") (net 60) (tstamp ea54c124-b52d-492a-bf9b-15af7fdd574e))
+  (segment (start 50.8 111.76) (end 27.965 111.76) (width 1) (layer "B.Cu") (net 61) (tstamp 6c2622f0-9263-4638-987a-a92f72d6c5bf))
+  (segment (start 27.965 111.76) (end 27.94 111.785) (width 1) (layer "B.Cu") (net 61) (tstamp 816f643a-39ec-45bd-beb5-7993889300ec))
+  (segment (start 50.8 114.3) (end 27.94 114.3) (width 1) (layer "B.Cu") (net 62) (tstamp 7847e806-7e06-4653-a19e-a5bb4381303d))
+  (segment (start 50.8 116.84) (end 27.94 116.84) (width 1) (layer "B.Cu") (net 63) (tstamp cf3da0fe-0dd1-4725-8c77-123d09e9cc1d))
+  (segment (start 50.8 119.38) (end 27.94 119.38) (width 1) (layer "B.Cu") (net 64) (tstamp 578792be-bc65-40ac-9353-2bbbe538bafc))
+  (segment (start 50.8 121.92) (end 27.94 121.92) (width 1) (layer "B.Cu") (net 65) (tstamp 29cf7012-6e45-4cf4-a2ea-811cf0d6a07a))
+  (segment (start 50.8 124.46) (end 27.94 124.46) (width 1) (layer "B.Cu") (net 66) (tstamp f929717e-253f-475a-95b7-793433223175))
+  (segment (start 50.8 127) (end 27.94 127) (width 1) (layer "B.Cu") (net 67) (tstamp 7638e151-4aaf-4c29-af58-18220e898536))
   (segment (start 121.92 33.02) (end 124.46 33.02) (width 1) (layer "B.Cu") (net 68) (tstamp 00000000-0000-0000-0000-00006201033b))
   (segment (start 134.62 33.02) (end 137.16 33.02) (width 1) (layer "B.Cu") (net 68) (tstamp 00000000-0000-0000-0000-00006201033e))
   (segment (start 132.08 33.02) (end 134.62 33.02) (width 1) (layer "B.Cu") (net 68) (tstamp 00000000-0000-0000-0000-000062010341))
@@ -6854,12 +8302,10 @@
   (segment (start 121.92 73.66) (end 121.92 71.12) (width 1) (layer "B.Cu") (net 74) (tstamp 00000000-0000-0000-0000-000061fdf2fb))
   (segment (start 121.92 71.12) (end 121.92 68.58) (width 1) (layer "B.Cu") (net 74) (tstamp 00000000-0000-0000-0000-000061fdf9b5))
   (segment (start 127 53.34) (end 121.92 53.34) (width 1) (layer "B.Cu") (net 74) (tstamp a1223b95-aa11-427a-b201-9190a86a68be))
-  (segment (start 35.56 43.18) (end 35.56 45.72) (width 1) (layer "B.Cu") (net 75) (tstamp 4ad5f6bc-6ae6-4e1c-8525-1e31a01a7930))
-  (segment (start 35.56 48.26) (end 38.1 48.26) (width 1) (layer "B.Cu") (net 76) (tstamp 9cc834b5-0d20-4eb2-8241-354ca4a5adfc))
-  (segment (start 38.1 48.26) (end 38.1 43.18) (width 1) (layer "B.Cu") (net 76) (tstamp bb16ddb2-9138-49e7-ad79-08049f4202da))
-  (segment (start 40.64 45.72) (end 40.64 43.18) (width 1) (layer "B.Cu") (net 77) (tstamp 68551524-5d23-4a54-a0a7-07cbb43d361d))
-  (segment (start 43.18 48.26) (end 43.18 43.18) (width 1) (layer "B.Cu") (net 78) (tstamp 4d93edd4-3fe5-4a85-a849-429789fe23b4))
-  (segment (start 40.64 48.26) (end 43.18 48.26) (width 1) (layer "B.Cu") (net 78) (tstamp 55010e67-b1d0-44f6-9a5f-2372aa83867e))
+  (segment (start 58.42 27.94) (end 58.42 25.4) (width 1) (layer "B.Cu") (net 75) (tstamp 97d666e9-392b-4f0c-93ba-3e0d45dca2b3))
+  (segment (start 55.88 27.94) (end 55.88 25.4) (width 1) (layer "B.Cu") (net 76) (tstamp 9fd33adc-e4ce-4d70-8686-06f7043353d9))
+  (segment (start 53.34 27.94) (end 53.34 25.4) (width 1) (layer "B.Cu") (net 77) (tstamp 32a54804-75d5-42bd-a73c-9926aaef52c9))
+  (segment (start 50.8 27.94) (end 50.8 25.4) (width 1) (layer "B.Cu") (net 78) (tstamp 862cd59a-2451-440d-b853-4aefbbb15454))
   (segment (start 134.62 60.96) (end 132.08 60.96) (width 1) (layer "B.Cu") (net 79) (tstamp 023aac86-48c5-42f5-b426-074128ded4b1))
   (segment (start 134.62 60.96) (end 137.16 60.96) (width 1) (layer "B.Cu") (net 79) (tstamp 569eec56-192f-4f3d-85de-66112d72b628))
   (segment (start 132.08 60.96) (end 132.08 55.88) (width 1) (layer "B.Cu") (net 79) (tstamp 7cf14c0f-d8a6-4f0b-bb50-32fbcf4700c0))
@@ -6891,12 +8337,10 @@
   (segment (start 162.56 35.56) (end 162.56 38.1) (width 1) (layer "B.Cu") (net 96) (tstamp 59246647-4e57-4b5f-9f1e-b0cc1fb90bb2))
   (segment (start 185.42 35.56) (end 185.42 38.1) (width 1) (layer "B.Cu") (net 97) (tstamp f58742f8-e57e-4646-a6f5-0463e0eceeb8))
   (segment (start 182.88 35.56) (end 182.88 38.1) (width 1) (layer "B.Cu") (net 98) (tstamp 51bdd1cb-8a01-4b1c-940a-3ff4dd1de87c))
-  (segment (start 53.34 35.56) (end 53.34 33.02) (width 1) (layer "B.Cu") (net 99) (tstamp 97d666e9-392b-4f0c-93ba-3e0d45dca2b3))
-  (segment (start 50.8 35.56) (end 50.8 30.48) (width 1) (layer "B.Cu") (net 100) (tstamp 1ee44092-8c49-401d-9df4-130e39ea4442))
-  (segment (start 50.8 30.48) (end 53.34 30.48) (width 1) (layer "B.Cu") (net 100) (tstamp 9a1a36ae-83d2-42f4-8400-f832c995665b))
-  (segment (start 45.72 45.72) (end 45.72 43.18) (width 1) (layer "B.Cu") (net 101) (tstamp bb27c4a8-d58e-4c64-9502-0f15c15c3b43))
-  (segment (start 45.72 48.26) (end 48.26 48.26) (width 1) (layer "B.Cu") (net 102) (tstamp 19a6270f-627c-4c3f-8780-9cdf4d4386e6))
-  (segment (start 48.26 48.26) (end 48.26 43.18) (width 1) (layer "B.Cu") (net 102) (tstamp 35e90595-22fc-4ede-b090-878db476a9ea))
+  (segment (start 48.26 27.94) (end 48.26 25.4) (width 1) (layer "B.Cu") (net 99) (tstamp 96ff7901-397b-4805-be63-a50021c1204e))
+  (segment (start 45.72 27.94) (end 45.72 25.4) (width 1) (layer "B.Cu") (net 100) (tstamp c1cf7bb0-c2ea-4f94-962c-ac20c4c0f2a7))
+  (segment (start 43.18 27.94) (end 43.18 25.4) (width 1) (layer "B.Cu") (net 101) (tstamp 6cbce139-87df-4554-a528-17f1ab2ac3fd))
+  (segment (start 40.64 27.94) (end 40.64 25.4) (width 1) (layer "B.Cu") (net 102) (tstamp adb36798-0fe9-413e-b035-edd5622ed7a9))
   (segment (start 152.4 66.04) (end 152.4 68.58) (width 1) (layer "B.Cu") (net 103) (tstamp 054f8e07-0141-451f-a3c4-ea786b83b680))
   (segment (start 172.72 68.58) (end 172.72 66.04) (width 1) (layer "B.Cu") (net 104) (tstamp ed6caead-58a0-4a37-97cf-621d3ffb0ca4))
   (segment (start 152.4 55.88) (end 152.4 58.42) (width 1) (layer "B.Cu") (net 105) (tstamp 62af6e3c-7d06-438a-b62f-014ae3262ea1))
@@ -6945,17 +8389,41 @@
   (segment (start 167.64 45.72) (end 167.64 48.26) (width 1) (layer "B.Cu") (net 148) (tstamp a6386af6-d744-458e-b19d-8fd97b5ad9f9))
   (segment (start 147.32 38.1) (end 147.32 35.56) (width 1) (layer "B.Cu") (net 149) (tstamp 01600802-66c5-45a2-be7f-4fa2327d845b))
   (segment (start 167.64 35.56) (end 167.64 38.1) (width 1) (layer "B.Cu") (net 150) (tstamp fc80fa5b-8c07-4dda-8002-331dcafd556b))
-  (segment (start 50.8 45.72) (end 50.8 43.18) (width 1) (layer "B.Cu") (net 151) (tstamp 98f16e8d-7d53-4d1e-b2b5-936f535e3a6d))
-  (segment (start 50.8 48.26) (end 53.34 48.26) (width 1) (layer "B.Cu") (net 152) (tstamp 107a1981-3109-4b67-9c71-d14ddb59b8fe))
-  (segment (start 53.34 48.26) (end 53.34 43.18) (width 1) (layer "B.Cu") (net 152) (tstamp f218a17d-02e3-4f2b-a05e-41d50a16ffeb))
-  (segment (start 48.26 35.56) (end 48.26 33.02) (width 1) (layer "B.Cu") (net 153) (tstamp 32a54804-75d5-42bd-a73c-9926aaef52c9))
-  (segment (start 45.72 30.48) (end 48.26 30.48) (width 1) (layer "B.Cu") (net 154) (tstamp 15788f4e-08a4-4a20-a167-b7e823d6c18e))
-  (segment (start 45.72 35.56) (end 45.72 30.48) (width 1) (layer "B.Cu") (net 154) (tstamp 65fe598d-f6eb-4da3-9081-b41e5e1e5ce4))
-  (segment (start 43.18 35.56) (end 43.18 33.02) (width 1) (layer "B.Cu") (net 155) (tstamp 96ff7901-397b-4805-be63-a50021c1204e))
-  (segment (start 40.64 30.48) (end 43.18 30.48) (width 1) (layer "B.Cu") (net 156) (tstamp 7cc910f2-74fd-451b-bb1b-0a6c296c61e3))
-  (segment (start 40.64 35.56) (end 40.64 30.48) (width 1) (layer "B.Cu") (net 156) (tstamp bcf6b6cb-d2d2-411f-b221-af728d1d11df))
-  (segment (start 38.1 35.56) (end 38.1 33.02) (width 1) (layer "B.Cu") (net 157) (tstamp 6cbce139-87df-4554-a528-17f1ab2ac3fd))
-  (segment (start 35.56 35.56) (end 35.56 30.48) (width 1) (layer "B.Cu") (net 158) (tstamp 51f09328-e22c-4c1f-90e5-6300e02a2116))
-  (segment (start 35.56 30.48) (end 38.1 30.48) (width 1) (layer "B.Cu") (net 158) (tstamp d3fe2d02-f12c-44f6-a03d-87064d076224))
+  (segment (start 40.64 35.56) (end 40.64 38.1) (width 1) (layer "B.Cu") (net 151) (tstamp 4ad5f6bc-6ae6-4e1c-8525-1e31a01a7930))
+  (segment (start 43.18 38.1) (end 43.18 35.56) (width 1) (layer "B.Cu") (net 152) (tstamp 6802b5d4-85bc-4506-b915-e3373f657648))
+  (segment (start 45.72 38.1) (end 45.72 35.56) (width 1) (layer "B.Cu") (net 153) (tstamp 68551524-5d23-4a54-a0a7-07cbb43d361d))
+  (segment (start 48.26 38.1) (end 48.26 35.56) (width 1) (layer "B.Cu") (net 154) (tstamp caf5789c-8255-4529-8b56-f7568ad55af7))
+  (segment (start 50.8 38.1) (end 50.8 35.56) (width 1) (layer "B.Cu") (net 155) (tstamp bb27c4a8-d58e-4c64-9502-0f15c15c3b43))
+  (segment (start 53.34 38.1) (end 53.34 35.56) (width 1) (layer "B.Cu") (net 156) (tstamp fafeafcb-685f-41f2-bbe7-a18250d8fbe4))
+  (segment (start 55.88 38.1) (end 55.88 35.56) (width 1) (layer "B.Cu") (net 157) (tstamp 98f16e8d-7d53-4d1e-b2b5-936f535e3a6d))
+  (segment (start 58.42 38.1) (end 58.42 35.56) (width 1) (layer "B.Cu") (net 158) (tstamp f08bd128-ad91-4e83-b37f-2ad975a540cc))
+  (segment (start 33.02 58.42) (end 33.02 55.88) (width 1) (layer "B.Cu") (net 168) (tstamp 52d06145-6ecc-4258-8b28-5673da5da386))
+  (segment (start 38.1 53.34) (end 33.02 53.34) (width 1) (layer "B.Cu") (net 168) (tstamp 6fafa09f-b34f-4183-bceb-868b804308f9))
+  (segment (start 33.02 53.34) (end 33.02 55.88) (width 1) (layer "B.Cu") (net 168) (tstamp a9ab623c-bc91-4cfd-9357-bc71cc66025d))
+  (segment (start 38.1 48.26) (end 38.1 53.34) (width 1) (layer "B.Cu") (net 168) (tstamp bbe5c00c-19fc-4d57-bdaf-434080a9cd15))
+  (segment (start 58.42 45.72) (end 58.42 48.26) (width 1) (layer "B.Cu") (net 169) (tstamp 7a58c66d-88d7-4c34-b31f-f5cdfcab923a))
+  (segment (start 55.88 45.72) (end 55.88 48.26) (width 1) (layer "B.Cu") (net 170) (tstamp 0ac0dc2c-1ce5-4a62-8531-b68c56f41095))
+  (segment (start 53.34 48.26) (end 53.34 45.72) (width 1) (layer "B.Cu") (net 171) (tstamp bd46998a-ae54-421c-b8e7-d6d07c32ea52))
+  (segment (start 50.8 45.72) (end 50.8 48.26) (width 1) (layer "B.Cu") (net 172) (tstamp 94c5169c-6d89-4cf1-acdb-0202793b2ea9))
+  (segment (start 48.26 48.26) (end 48.26 45.72) (width 1) (layer "B.Cu") (net 173) (tstamp e02127e7-d232-4387-af9b-628b71d0b8e7))
+  (segment (start 45.72 45.72) (end 45.72 48.26) (width 1) (layer "B.Cu") (net 174) (tstamp 9c8a1312-b716-4c8c-a328-252fb4259147))
+  (segment (start 43.18 45.72) (end 43.18 48.26) (width 1) (layer "B.Cu") (net 175) (tstamp e6848f87-9e82-4a77-aeab-3ae292f7cd81))
+  (segment (start 40.64 48.26) (end 40.64 45.72) (width 1) (layer "B.Cu") (net 176) (tstamp 1f389677-5a99-494f-944d-9214759c9831))
+  (segment (start 40.64 55.88) (end 40.64 58.42) (width 1) (layer "B.Cu") (net 177) (tstamp 26691fec-9520-43b2-81cf-de094d98c49a))
+  (segment (start 43.18 58.42) (end 43.18 55.88) (width 1) (layer "B.Cu") (net 178) (tstamp 255814d5-4e4b-46be-908d-7c96cb244ba6))
+  (segment (start 45.72 55.88) (end 45.72 58.42) (width 1) (layer "B.Cu") (net 179) (tstamp 37bb33b3-24da-4276-ad68-63e4a18e9d06))
+  (segment (start 48.26 58.42) (end 48.26 55.88) (width 1) (layer "B.Cu") (net 180) (tstamp e64bacd0-33c2-44b7-8376-5dca0e0fd988))
+  (segment (start 50.8 55.88) (end 50.8 58.42) (width 1) (layer "B.Cu") (net 181) (tstamp c840e95b-4463-4596-a8ff-6ce79851566f))
+  (segment (start 53.34 58.42) (end 53.34 55.88) (width 1) (layer "B.Cu") (net 182) (tstamp cfcf3410-f022-4731-a1da-2b5d60e67189))
+  (segment (start 55.88 58.42) (end 55.88 55.88) (width 1) (layer "B.Cu") (net 183) (tstamp 6cfdc61e-9238-4bf1-8adc-0aa2afd5e23c))
+  (segment (start 58.42 55.88) (end 58.42 58.42) (width 1) (layer "B.Cu") (net 184) (tstamp 9d665c46-7e87-4633-b424-129725306384))
+  (segment (start 35.56 45.72) (end 35.56 48.26) (width 1) (layer "B.Cu") (net 185) (tstamp 2a1c651e-004a-4460-ab24-57dd24aad133))
+  (segment (start 30.48 55.88) (end 27.94 55.88) (width 1) (layer "B.Cu") (net 185) (tstamp 395876dc-25ca-4ac6-b54f-626217f82dba))
+  (segment (start 30.48 50.8) (end 30.48 55.88) (width 1) (layer "B.Cu") (net 185) (tstamp 7a8688d7-8605-4222-91a0-983384c364c9))
+  (segment (start 35.56 50.8) (end 30.48 50.8) (width 1) (layer "B.Cu") (net 185) (tstamp 8acd8a3e-3426-488b-89ed-18ed2111896e))
+  (segment (start 35.56 48.26) (end 35.56 50.8) (width 1) (layer "B.Cu") (net 185) (tstamp bd614e74-ba37-45d1-97aa-35ec67b9eb29))
+  (segment (start 27.94 55.88) (end 25.4 55.88) (width 1) (layer "B.Cu") (net 185) (tstamp df75c386-3877-4b84-8d39-8cba635c1f49))
+  (segment (start 27.94 48.26) (end 27.94 45.72) (width 1) (layer "B.Cu") (net 186) (tstamp 14e60353-3e9b-4f93-afec-271fdf3266fa))
+  (segment (start 30.48 45.72) (end 30.48 48.26) (width 1) (layer "B.Cu") (net 187) (tstamp db4945a1-1cda-4739-a221-abd106873083))
 
 )
diff --git a/electronics/cimdit.kicad_pro b/electronics/cimdit.kicad_pro
index 41e26df..f006530 100644
--- a/electronics/cimdit.kicad_pro
+++ b/electronics/cimdit.kicad_pro
@@ -448,6 +448,10 @@
     [
       "3965b2f5-8083-4434-b660-fbd8c009922e",
       "Analog Multiplexer"
+    ],
+    [
+      "86fd0b4b-b0c8-4da7-922a-6650d5003f71",
+      "KeyMatrix wired"
     ]
   ],
   "text_variables": {}
diff --git a/electronics/cimdit.kicad_sch b/electronics/cimdit.kicad_sch
index 3f6c77d..2df863f 100644
--- a/electronics/cimdit.kicad_sch
+++ b/electronics/cimdit.kicad_sch
@@ -7,12 +7,53 @@
   (title_block
     (title "CIMDID")
     (date "2022-02-08")
-    (rev "1.0")
+    (rev "1.1")
     (comment 1 "@grumpydevelop@contentnation.net")
     (comment 2 "https://contentnation.net/en/grumpydevelop/cimdit_1")
   )
 
   (lib_symbols
+    (symbol "Connector:Conn_01x01_Male" (pin_names (offset 1.016) hide) (in_bom yes) (on_board yes)
+      (property "Reference" "J" (id 0) (at 0 2.54 0)
+        (effects (font (size 1.27 1.27)))
+      )
+      (property "Value" "Conn_01x01_Male" (id 1) (at 0 -2.54 0)
+        (effects (font (size 1.27 1.27)))
+      )
+      (property "Footprint" "" (id 2) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Datasheet" "~" (id 3) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_keywords" "connector" (id 4) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_description" "Generic connector, single row, 01x01, script generated (kicad-library-utils/schlib/autogen/connector/)" (id 5) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_fp_filters" "Connector*:*" (id 6) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (symbol "Conn_01x01_Male_1_1"
+        (polyline
+          (pts
+            (xy 1.27 0)
+            (xy 0.8636 0)
+          )
+          (stroke (width 0.1524) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (rectangle (start 0.8636 0.127) (end 0 -0.127)
+          (stroke (width 0.1524) (type default) (color 0 0 0 0))
+          (fill (type outline))
+        )
+        (pin passive line (at 5.08 0 180) (length 3.81)
+          (name "Pin_1" (effects (font (size 1.27 1.27))))
+          (number "1" (effects (font (size 1.27 1.27))))
+        )
+      )
+    )
     (symbol "Connector:Conn_01x04_Female" (pin_names (offset 1.016) hide) (in_bom yes) (on_board yes)
       (property "Reference" "J" (id 0) (at 0 5.08 0)
         (effects (font (size 1.27 1.27)))
@@ -1660,6 +1701,24 @@
     (pin "9" (uuid 21a106a9-f156-4f38-82e8-e87715762355))
   )
 
+  (symbol (lib_id "Connector:Conn_01x01_Male") (at 152.4 58.42 0) (mirror x) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 2203e43f-03d3-4724-9dd2-784030ce3703)
+    (property "Reference" "J48" (id 0) (at 143.51 58.42 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+    (property "Value" "CLK" (id 1) (at 147.32 58.42 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (id 2) (at 152.4 58.42 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 152.4 58.42 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 5b776f4c-8c89-4693-ae1d-b113dd65853c))
+  )
+
   (symbol (lib_id "Connector:Conn_01x04_Female") (at 110.49 64.77 180) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 27de3dac-3961-4a93-bc2f-08d7f9d0c9e7)
@@ -1681,6 +1740,60 @@
     (pin "4" (uuid e0891940-cda0-450e-a605-d865a6410bd0))
   )
 
+  (symbol (lib_id "Connector:Conn_01x01_Male") (at 110.49 21.59 0) (mirror x) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 3e7d3ba7-4edd-4535-8c09-fa92c51dc657)
+    (property "Reference" "J25" (id 0) (at 102.87 21.59 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+    (property "Value" "+5V" (id 1) (at 105.41 21.59 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (id 2) (at 110.49 21.59 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 110.49 21.59 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 1d7d252a-c258-4853-bfe5-e31d850b04b3))
+  )
+
+  (symbol (lib_id "Connector:Conn_01x01_Male") (at 110.49 19.05 0) (mirror x) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 41415bac-1126-4467-b765-03fce423d075)
+    (property "Reference" "J24" (id 0) (at 101.6 19.05 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+    (property "Value" "INT" (id 1) (at 105.41 19.05 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (id 2) (at 110.49 19.05 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 110.49 19.05 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid f6d13cfa-ac60-401d-826d-1fdda2fda8f3))
+  )
+
+  (symbol (lib_id "Connector:Conn_01x01_Male") (at 152.4 55.88 0) (mirror x) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 4562bbed-1cf5-48d3-8b27-4accd2fdf26c)
+    (property "Reference" "J47" (id 0) (at 143.51 55.88 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+    (property "Value" "DATA" (id 1) (at 147.32 55.88 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (id 2) (at 152.4 55.88 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 152.4 55.88 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 86038d35-e892-4790-8968-221b90cacd9c))
+  )
+
   (symbol (lib_id "Connector:Conn_01x08_Female") (at 151.13 29.21 180) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 669e5b20-562e-4901-8e1c-8d74bc81ea2f)
@@ -1706,26 +1819,94 @@
     (pin "8" (uuid 6fa522d9-b0ca-482b-aa92-7a802ba51caa))
   )
 
-  (symbol (lib_id "Connector:Conn_01x05_Female") (at 110.49 24.13 180) (unit 1)
+  (symbol (lib_id "Connector:Conn_01x01_Male") (at 152.4 53.34 0) (mirror x) (unit 1)
     (in_bom yes) (on_board yes)
-    (uuid ac08bef7-c849-4df1-ad9c-81030f8a73f4)
-    (property "Reference" "J40" (id 0) (at 113.03 31.75 0)
+    (uuid 73bcbbc6-a043-409a-ab80-98753b715cbc)
+    (property "Reference" "J46" (id 0) (at 143.51 53.34 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+    (property "Value" "GND" (id 1) (at 147.32 53.34 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "ROTARY" (id 1) (at 109.22 20.32 90)
+    (property "Footprint" "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (id 2) (at 152.4 53.34 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 152.4 53.34 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid c5127659-1082-4b19-961b-943fbfde9e08))
+  )
+
+  (symbol (lib_id "Connector:Conn_01x01_Male") (at 152.4 50.8 0) (mirror x) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 8c90d3b7-ed32-4c78-b2d9-31baec8389d6)
+    (property "Reference" "J29" (id 0) (at 144.78 50.8 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+    (property "Value" "+5V" (id 1) (at 147.32 50.8 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Connector_PinSocket_2.54mm:PinSocket_1x05_P2.54mm_Vertical" (id 2) (at 110.49 24.13 0)
+    (property "Footprint" "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (id 2) (at 152.4 50.8 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 152.4 50.8 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid a8966c1c-e84e-454e-ade2-df803cf30a6d))
+  )
+
+  (symbol (lib_id "Connector:Conn_01x01_Male") (at 110.49 24.13 0) (mirror x) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 8fbaf924-d871-450e-a1f0-30fbf0262d25)
+    (property "Reference" "J26" (id 0) (at 101.6 24.13 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+    (property "Value" "GND" (id 1) (at 105.41 24.13 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (id 2) (at 110.49 24.13 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 110.49 24.13 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 0e2b78b7-d95f-4131-8972-556faedd7c2c))
-    (pin "2" (uuid 47f87831-13dd-44d0-98dc-e311c0107416))
-    (pin "3" (uuid 758027e9-d877-42ef-a646-3046198aa57d))
-    (pin "4" (uuid 398cc113-a7d1-4f7f-ab96-a94f6f1d1056))
-    (pin "5" (uuid 75f082f4-7b13-4278-a288-f0777ea45205))
+    (pin "1" (uuid 3eac318d-e923-405d-8f76-0255df38ce01))
+  )
+
+  (symbol (lib_id "Connector:Conn_01x01_Male") (at 110.49 29.21 0) (mirror x) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 94fdd15c-87b2-446c-b1e3-ea23bfcc286f)
+    (property "Reference" "J28" (id 0) (at 101.6 29.21 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+    (property "Value" "CLK" (id 1) (at 105.41 29.21 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (id 2) (at 110.49 29.21 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 110.49 29.21 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 66e92984-6ec5-4737-adfe-591c6f42f882))
+  )
+
+  (symbol (lib_id "Connector:Conn_01x01_Male") (at 110.49 26.67 0) (mirror x) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid a9a75cb9-f8cf-4866-ad8c-e5c1c70caaa2)
+    (property "Reference" "J27" (id 0) (at 101.6 26.67 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+    (property "Value" "DATA" (id 1) (at 105.41 26.67 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (id 2) (at 110.49 26.67 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 110.49 26.67 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 8d2e602f-cb20-4fc6-8748-da2c292f2bb6))
   )
 
   (symbol (lib_id "Connector:Conn_01x04_Female") (at 110.49 45.72 180) (unit 1)
@@ -1906,12 +2087,41 @@
     )
   )
 
+  (sheet (at 157.48 48.26) (size 22.86 12.7) (fields_autoplaced)
+    (stroke (width 0.1524) (type solid) (color 0 0 0 0))
+    (fill (color 0 0 0 0.0000))
+    (uuid 86fd0b4b-b0c8-4da7-922a-6650d5003f71)
+    (property "Sheet name" "KeyMatrix wired" (id 0) (at 157.48 47.5484 0)
+      (effects (font (size 1.27 1.27)) (justify left bottom))
+    )
+    (property "Sheet file" "keymatrix_extdiode_wire.kicad_sch" (id 1) (at 157.48 61.5446 0)
+      (effects (font (size 1.27 1.27)) (justify left top))
+    )
+    (pin "I2C_DATA_KEY" input (at 157.48 55.88 180)
+      (effects (font (size 1.27 1.27)) (justify left))
+      (uuid 83fc104a-4fe5-492a-972a-233881caef3e)
+    )
+    (pin "GND_KEY" input (at 157.48 53.34 180)
+      (effects (font (size 1.27 1.27)) (justify left))
+      (uuid 5a324345-7c39-4ab2-8bfc-b37ccf57a21e)
+    )
+    (pin "I2C_CLOCK_KEY" input (at 157.48 58.42 180)
+      (effects (font (size 1.27 1.27)) (justify left))
+      (uuid 24aaefe1-101a-49ba-9d99-778dc4cc0961)
+    )
+    (pin "+5V_KEY" input (at 157.48 50.8 180)
+      (effects (font (size 1.27 1.27)) (justify left))
+      (uuid 535cc370-d29c-4272-bbcf-16172d404be7)
+    )
+  )
+
   (sheet_instances
     (path "/" (page "1"))
     (path "/814f65df-6ffe-42dd-b527-4f3b27cc438e" (page "2"))
     (path "/0e0cd3f9-9e59-4187-9e69-2f18dd8368cc" (page "3"))
     (path "/7a807cd9-4b53-4d34-8616-454af4054d6a" (page "4"))
     (path "/3965b2f5-8083-4434-b660-fbd8c009922e" (page "5"))
+    (path "/86fd0b4b-b0c8-4da7-922a-6650d5003f71" (page "6"))
   )
 
   (symbol_instances
@@ -1939,6 +2149,12 @@
     (path "/7a807cd9-4b53-4d34-8616-454af4054d6a/f079dc59-1902-4f60-91a5-aa85c9a137cd"
       (reference "#FLG0108") (unit 1) (value "PWR_FLAG") (footprint "")
     )
+    (path "/86fd0b4b-b0c8-4da7-922a-6650d5003f71/efd0eb00-65d7-4a3f-8a9f-803f13854b91"
+      (reference "#FLG0109") (unit 1) (value "PWR_FLAG") (footprint "")
+    )
+    (path "/86fd0b4b-b0c8-4da7-922a-6650d5003f71/895e9604-841c-4793-bfc5-24d2129b3f0a"
+      (reference "#FLG0110") (unit 1) (value "PWR_FLAG") (footprint "")
+    )
     (path "/00000000-0000-0000-0000-00006605cfe5"
       (reference "#PWR0101") (unit 1) (value "+5V") (footprint "")
     )
@@ -2191,14 +2407,134 @@
     (path "/00000000-0000-0000-0000-000068677448"
       (reference "J5") (unit 1) (value "ANALOG") (footprint "Connector_PinSocket_2.54mm:PinSocket_1x08_P2.54mm_Vertical")
     )
+    (path "/0e0cd3f9-9e59-4187-9e69-2f18dd8368cc/0acb7b97-c6e6-44df-ad0d-230a70aa8726"
+      (reference "J6") (unit 1) (value "A0") (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork")
+    )
+    (path "/0e0cd3f9-9e59-4187-9e69-2f18dd8368cc/b93d027f-21f6-4fc9-ad3f-317eded6973b"
+      (reference "J7") (unit 1) (value "B0") (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork")
+    )
+    (path "/0e0cd3f9-9e59-4187-9e69-2f18dd8368cc/92529218-3086-4e38-a5d7-361f20edc13a"
+      (reference "J8") (unit 1) (value "A1") (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork")
+    )
+    (path "/0e0cd3f9-9e59-4187-9e69-2f18dd8368cc/f1e08948-6b85-492c-99de-5fd6a459b81f"
+      (reference "J9") (unit 1) (value "B1") (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork")
+    )
+    (path "/0e0cd3f9-9e59-4187-9e69-2f18dd8368cc/355984fe-c4ef-4584-9c88-7aed9a4b1db8"
+      (reference "J10") (unit 1) (value "A2") (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork")
+    )
+    (path "/0e0cd3f9-9e59-4187-9e69-2f18dd8368cc/e92cc26d-27f8-43e9-a58e-4cbff1061bf5"
+      (reference "J11") (unit 1) (value "B2") (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork")
+    )
+    (path "/0e0cd3f9-9e59-4187-9e69-2f18dd8368cc/2ea45036-6908-4767-a4a0-ac16e09767ee"
+      (reference "J12") (unit 1) (value "A3") (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork")
+    )
+    (path "/0e0cd3f9-9e59-4187-9e69-2f18dd8368cc/3074fade-b34d-479b-8200-fadd967b837d"
+      (reference "J13") (unit 1) (value "B3") (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork")
+    )
+    (path "/0e0cd3f9-9e59-4187-9e69-2f18dd8368cc/0e20cbc1-6cd0-4252-8a14-c1d9146f2a63"
+      (reference "J14") (unit 1) (value "A4") (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork")
+    )
+    (path "/0e0cd3f9-9e59-4187-9e69-2f18dd8368cc/afaec224-6eb9-4aa4-acce-937066a89442"
+      (reference "J15") (unit 1) (value "B4") (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork")
+    )
+    (path "/0e0cd3f9-9e59-4187-9e69-2f18dd8368cc/0a4a5095-16ff-4ec8-b82d-45b4d38ffde6"
+      (reference "J16") (unit 1) (value "A5") (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork")
+    )
+    (path "/0e0cd3f9-9e59-4187-9e69-2f18dd8368cc/c9521a26-be15-4a1e-8acc-422906829663"
+      (reference "J17") (unit 1) (value "B5") (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork")
+    )
+    (path "/0e0cd3f9-9e59-4187-9e69-2f18dd8368cc/ab8c7386-0042-433f-b83d-d0d190b2c608"
+      (reference "J18") (unit 1) (value "A6") (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork")
+    )
+    (path "/0e0cd3f9-9e59-4187-9e69-2f18dd8368cc/371abc5a-52a7-4b87-8ec7-281e5dbbd659"
+      (reference "J19") (unit 1) (value "B6") (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork")
+    )
+    (path "/0e0cd3f9-9e59-4187-9e69-2f18dd8368cc/54238fb1-8778-4633-862d-fd76f64f1725"
+      (reference "J20") (unit 1) (value "A7") (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork")
+    )
     (path "/b4f31029-aadc-49e1-aae0-4cc5be4e6966"
       (reference "J21") (unit 1) (value "KEY DIODE") (footprint "Connector_PinSocket_2.54mm:PinSocket_1x04_P2.54mm_Vertical")
     )
     (path "/27de3dac-3961-4a93-bc2f-08d7f9d0c9e7"
       (reference "J22") (unit 1) (value "KEY") (footprint "Connector_PinSocket_2.54mm:PinSocket_1x04_P2.54mm_Vertical")
     )
-    (path "/ac08bef7-c849-4df1-ad9c-81030f8a73f4"
-      (reference "J40") (unit 1) (value "ROTARY") (footprint "Connector_PinSocket_2.54mm:PinSocket_1x05_P2.54mm_Vertical")
+    (path "/0e0cd3f9-9e59-4187-9e69-2f18dd8368cc/cc823f72-f0e4-4202-8e7e-d5cbcbc3c9fe"
+      (reference "J23") (unit 1) (value "B7") (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork")
+    )
+    (path "/41415bac-1126-4467-b765-03fce423d075"
+      (reference "J24") (unit 1) (value "INT") (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork")
+    )
+    (path "/3e7d3ba7-4edd-4535-8c09-fa92c51dc657"
+      (reference "J25") (unit 1) (value "+5V") (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork")
+    )
+    (path "/8fbaf924-d871-450e-a1f0-30fbf0262d25"
+      (reference "J26") (unit 1) (value "GND") (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork")
+    )
+    (path "/a9a75cb9-f8cf-4866-ad8c-e5c1c70caaa2"
+      (reference "J27") (unit 1) (value "DATA") (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork")
+    )
+    (path "/94fdd15c-87b2-446c-b1e3-ea23bfcc286f"
+      (reference "J28") (unit 1) (value "CLK") (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork")
+    )
+    (path "/8c90d3b7-ed32-4c78-b2d9-31baec8389d6"
+      (reference "J29") (unit 1) (value "+5V") (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork")
+    )
+    (path "/86fd0b4b-b0c8-4da7-922a-6650d5003f71/7ce8fcd7-ee6c-4af5-92da-5d397d1d555e"
+      (reference "J30") (unit 1) (value "R0") (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork")
+    )
+    (path "/86fd0b4b-b0c8-4da7-922a-6650d5003f71/fe4436c3-ec9b-4d4d-9a37-5d16547a866e"
+      (reference "J31") (unit 1) (value "R1") (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork")
+    )
+    (path "/86fd0b4b-b0c8-4da7-922a-6650d5003f71/4819908d-cfd1-465f-9b62-2ce7b5db795b"
+      (reference "J32") (unit 1) (value "R2") (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork")
+    )
+    (path "/86fd0b4b-b0c8-4da7-922a-6650d5003f71/4971e12a-d07a-4b0a-8cfd-ea8bd16efa5a"
+      (reference "J33") (unit 1) (value "R3") (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork")
+    )
+    (path "/86fd0b4b-b0c8-4da7-922a-6650d5003f71/0bdb6175-8701-43d4-9212-8e88185a01b9"
+      (reference "J34") (unit 1) (value "R4") (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork")
+    )
+    (path "/86fd0b4b-b0c8-4da7-922a-6650d5003f71/fcb79e8e-23cf-418a-85d2-2ac39e345d6c"
+      (reference "J35") (unit 1) (value "R5") (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork")
+    )
+    (path "/86fd0b4b-b0c8-4da7-922a-6650d5003f71/55bb1663-5f30-46ba-abeb-15eb836bc9d5"
+      (reference "J36") (unit 1) (value "R6") (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork")
+    )
+    (path "/86fd0b4b-b0c8-4da7-922a-6650d5003f71/2c4dff0e-97cb-430c-b06b-cd8446c042f5"
+      (reference "J37") (unit 1) (value "R7") (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork")
+    )
+    (path "/86fd0b4b-b0c8-4da7-922a-6650d5003f71/ad826993-8060-4ac8-b31b-fb9ea3e66c9e"
+      (reference "J38") (unit 1) (value "C0") (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork")
+    )
+    (path "/86fd0b4b-b0c8-4da7-922a-6650d5003f71/8a000d34-f9aa-4a96-b043-193e6a1c4d76"
+      (reference "J39") (unit 1) (value "C1") (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork")
+    )
+    (path "/86fd0b4b-b0c8-4da7-922a-6650d5003f71/9bac6bac-7f2a-4129-b344-f43fb7c2d498"
+      (reference "J40") (unit 1) (value "C2") (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork")
+    )
+    (path "/86fd0b4b-b0c8-4da7-922a-6650d5003f71/31c61803-b73f-4a77-8c6a-0adc05864be1"
+      (reference "J41") (unit 1) (value "C3") (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork")
+    )
+    (path "/86fd0b4b-b0c8-4da7-922a-6650d5003f71/308a8331-62e8-47c8-97d7-77c125dbca58"
+      (reference "J42") (unit 1) (value "C4") (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork")
+    )
+    (path "/86fd0b4b-b0c8-4da7-922a-6650d5003f71/e203d836-01b9-4742-95b0-b818b8d5ad1d"
+      (reference "J43") (unit 1) (value "C5") (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork")
+    )
+    (path "/86fd0b4b-b0c8-4da7-922a-6650d5003f71/cddd98ec-06b3-4b4b-bd3e-77cb1b75197e"
+      (reference "J44") (unit 1) (value "C6") (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork")
+    )
+    (path "/86fd0b4b-b0c8-4da7-922a-6650d5003f71/599495f8-b69f-4a68-82fa-d7c87ad23fb8"
+      (reference "J45") (unit 1) (value "C7") (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork")
+    )
+    (path "/73bcbbc6-a043-409a-ab80-98753b715cbc"
+      (reference "J46") (unit 1) (value "GND") (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork")
+    )
+    (path "/4562bbed-1cf5-48d3-8b27-4accd2fdf26c"
+      (reference "J47") (unit 1) (value "DATA") (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork")
+    )
+    (path "/2203e43f-03d3-4724-9dd2-784030ce3703"
+      (reference "J48") (unit 1) (value "CLK") (footprint "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork")
     )
     (path "/669e5b20-562e-4901-8e1c-8d74bc81ea2f"
       (reference "J50") (unit 1) (value "ANALOG") (footprint "Connector_PinSocket_2.54mm:PinSocket_1x08_P2.54mm_Vertical")
@@ -2305,29 +2641,8 @@
     (path "/814f65df-6ffe-42dd-b527-4f3b27cc438e/00000000-0000-0000-0000-00006331405e"
       (reference "JKD18") (unit 1) (value "COL8") (footprint "Connector_PinSocket_2.54mm:PinSocket_1x08_P2.54mm_Vertical")
     )
-    (path "/0e0cd3f9-9e59-4187-9e69-2f18dd8368cc/00000000-0000-0000-0000-000061fbdff9"
-      (reference "JR1") (unit 1) (value "ROT1") (footprint "Connector_PinSocket_2.54mm:PinSocket_1x03_P2.54mm_Vertical")
-    )
-    (path "/0e0cd3f9-9e59-4187-9e69-2f18dd8368cc/00000000-0000-0000-0000-000061fc080e"
-      (reference "JR2") (unit 1) (value "ROT2") (footprint "Connector_PinSocket_2.54mm:PinSocket_1x03_P2.54mm_Vertical")
-    )
-    (path "/0e0cd3f9-9e59-4187-9e69-2f18dd8368cc/00000000-0000-0000-0000-000062000db3"
-      (reference "JR3") (unit 1) (value "ROT3") (footprint "Connector_PinSocket_2.54mm:PinSocket_1x03_P2.54mm_Vertical")
-    )
-    (path "/0e0cd3f9-9e59-4187-9e69-2f18dd8368cc/00000000-0000-0000-0000-000061fc9334"
-      (reference "JR4") (unit 1) (value "ROT4") (footprint "Connector_PinSocket_2.54mm:PinSocket_1x03_P2.54mm_Vertical")
-    )
-    (path "/0e0cd3f9-9e59-4187-9e69-2f18dd8368cc/00000000-0000-0000-0000-000063db2cfd"
-      (reference "JR5") (unit 1) (value "ROT5") (footprint "Connector_PinSocket_2.54mm:PinSocket_1x03_P2.54mm_Vertical")
-    )
-    (path "/0e0cd3f9-9e59-4187-9e69-2f18dd8368cc/00000000-0000-0000-0000-000063db2cef"
-      (reference "JR6") (unit 1) (value "ROT6") (footprint "Connector_PinSocket_2.54mm:PinSocket_1x03_P2.54mm_Vertical")
-    )
-    (path "/0e0cd3f9-9e59-4187-9e69-2f18dd8368cc/00000000-0000-0000-0000-000063db2d31"
-      (reference "JR7") (unit 1) (value "ROT7") (footprint "Connector_PinSocket_2.54mm:PinSocket_1x03_P2.54mm_Vertical")
-    )
-    (path "/0e0cd3f9-9e59-4187-9e69-2f18dd8368cc/00000000-0000-0000-0000-000063db2d3d"
-      (reference "JR8") (unit 1) (value "ROT8") (footprint "Connector_PinSocket_2.54mm:PinSocket_1x03_P2.54mm_Vertical")
+    (path "/86fd0b4b-b0c8-4da7-922a-6650d5003f71/b22185af-1de2-40b6-9e80-0da54f88759e"
+      (reference "U1") (unit 1) (value "MCP23017_SP") (footprint "Package_DIP:DIP-28_W7.62mm")
     )
     (path "/814f65df-6ffe-42dd-b527-4f3b27cc438e/00000000-0000-0000-0000-000061fa6e27"
       (reference "U2") (unit 1) (value "MCP23017_SP") (footprint "Package_DIP:DIP-28_W7.62mm")
diff --git a/electronics/keymatrix_diode.kicad_sch b/electronics/keymatrix_diode.kicad_sch
index 680c9a2..ef868bd 100644
--- a/electronics/keymatrix_diode.kicad_sch
+++ b/electronics/keymatrix_diode.kicad_sch
@@ -7,7 +7,7 @@
   (title_block
     (title "CIMDID")
     (date "2022-02-08")
-    (rev "1.0")
+    (rev "1.1")
     (comment 1 "@grumpydevelop@contentnation.net")
     (comment 2 "https://contentnation.net/en/grumpydevelop/cimdit_1")
   )
diff --git a/electronics/keymatrix_extdiode.kicad_sch b/electronics/keymatrix_extdiode.kicad_sch
index 47c3a8f..3e9d112 100644
--- a/electronics/keymatrix_extdiode.kicad_sch
+++ b/electronics/keymatrix_extdiode.kicad_sch
@@ -7,7 +7,7 @@
   (title_block
     (title "CIMDID")
     (date "2022-02-08")
-    (rev "1.0")
+    (rev "1.1")
     (comment 1 "@grumpydevelop@contentnation.net")
     (comment 2 "https://contentnation.net/en/grumpydevelop/cimdit_1")
   )
diff --git a/electronics/keymatrix_extdiode_wire.kicad_sch b/electronics/keymatrix_extdiode_wire.kicad_sch
new file mode 100644
index 0000000..f416006
--- /dev/null
+++ b/electronics/keymatrix_extdiode_wire.kicad_sch
@@ -0,0 +1,815 @@
+(kicad_sch (version 20211123) (generator eeschema)
+
+  (uuid 59c4658a-c71a-4617-8bda-5c2a43e86c1e)
+
+  (paper "A5")
+
+  (title_block
+    (title "CIMDID")
+    (date "2022-02-08")
+    (rev "1.1")
+    (comment 1 "@grumpydevelop@contentnation.net")
+    (comment 2 "https://contentnation.net/en/grumpydevelop/cimdit_1")
+  )
+
+  (lib_symbols
+    (symbol "Connector:Conn_01x01_Male" (pin_names (offset 1.016) hide) (in_bom yes) (on_board yes)
+      (property "Reference" "J" (id 0) (at 0 2.54 0)
+        (effects (font (size 1.27 1.27)))
+      )
+      (property "Value" "Conn_01x01_Male" (id 1) (at 0 -2.54 0)
+        (effects (font (size 1.27 1.27)))
+      )
+      (property "Footprint" "" (id 2) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Datasheet" "~" (id 3) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_keywords" "connector" (id 4) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_description" "Generic connector, single row, 01x01, script generated (kicad-library-utils/schlib/autogen/connector/)" (id 5) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_fp_filters" "Connector*:*" (id 6) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (symbol "Conn_01x01_Male_1_1"
+        (polyline
+          (pts
+            (xy 1.27 0)
+            (xy 0.8636 0)
+          )
+          (stroke (width 0.1524) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (rectangle (start 0.8636 0.127) (end 0 -0.127)
+          (stroke (width 0.1524) (type default) (color 0 0 0 0))
+          (fill (type outline))
+        )
+        (pin passive line (at 5.08 0 180) (length 3.81)
+          (name "Pin_1" (effects (font (size 1.27 1.27))))
+          (number "1" (effects (font (size 1.27 1.27))))
+        )
+      )
+    )
+    (symbol "Interface_Expansion:MCP23017_SP" (pin_names (offset 1.016)) (in_bom yes) (on_board yes)
+      (property "Reference" "U" (id 0) (at -11.43 24.13 0)
+        (effects (font (size 1.27 1.27)))
+      )
+      (property "Value" "MCP23017_SP" (id 1) (at 0 0 0)
+        (effects (font (size 1.27 1.27)))
+      )
+      (property "Footprint" "Package_DIP:DIP-28_W7.62mm" (id 2) (at 5.08 -25.4 0)
+        (effects (font (size 1.27 1.27)) (justify left) hide)
+      )
+      (property "Datasheet" "http://ww1.microchip.com/downloads/en/DeviceDoc/20001952C.pdf" (id 3) (at 5.08 -27.94 0)
+        (effects (font (size 1.27 1.27)) (justify left) hide)
+      )
+      (property "ki_keywords" "I2C parallel port expander" (id 4) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_description" "16-bit I/O expander, I2C, interrupts, w pull-ups, SPDIP-28" (id 5) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_fp_filters" "DIP*W7.62mm*" (id 6) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (symbol "MCP23017_SP_0_1"
+        (rectangle (start -12.7 22.86) (end 12.7 -22.86)
+          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (fill (type background))
+        )
+      )
+      (symbol "MCP23017_SP_1_1"
+        (pin bidirectional line (at 17.78 20.32 180) (length 5.08)
+          (name "GPB0" (effects (font (size 1.27 1.27))))
+          (number "1" (effects (font (size 1.27 1.27))))
+        )
+        (pin power_in line (at 0 -27.94 90) (length 5.08)
+          (name "VSS" (effects (font (size 1.27 1.27))))
+          (number "10" (effects (font (size 1.27 1.27))))
+        )
+        (pin no_connect line (at -12.7 15.24 0) (length 5.08) hide
+          (name "NC" (effects (font (size 1.27 1.27))))
+          (number "11" (effects (font (size 1.27 1.27))))
+        )
+        (pin input line (at -17.78 17.78 0) (length 5.08)
+          (name "SCK" (effects (font (size 1.27 1.27))))
+          (number "12" (effects (font (size 1.27 1.27))))
+        )
+        (pin bidirectional line (at -17.78 20.32 0) (length 5.08)
+          (name "SDA" (effects (font (size 1.27 1.27))))
+          (number "13" (effects (font (size 1.27 1.27))))
+        )
+        (pin no_connect line (at -12.7 12.7 0) (length 5.08) hide
+          (name "NC" (effects (font (size 1.27 1.27))))
+          (number "14" (effects (font (size 1.27 1.27))))
+        )
+        (pin input line (at -17.78 -20.32 0) (length 5.08)
+          (name "A0" (effects (font (size 1.27 1.27))))
+          (number "15" (effects (font (size 1.27 1.27))))
+        )
+        (pin input line (at -17.78 -17.78 0) (length 5.08)
+          (name "A1" (effects (font (size 1.27 1.27))))
+          (number "16" (effects (font (size 1.27 1.27))))
+        )
+        (pin input line (at -17.78 -15.24 0) (length 5.08)
+          (name "A2" (effects (font (size 1.27 1.27))))
+          (number "17" (effects (font (size 1.27 1.27))))
+        )
+        (pin input line (at -17.78 -2.54 0) (length 5.08)
+          (name "~{RESET}" (effects (font (size 1.27 1.27))))
+          (number "18" (effects (font (size 1.27 1.27))))
+        )
+        (pin tri_state line (at -17.78 5.08 0) (length 5.08)
+          (name "INTB" (effects (font (size 1.27 1.27))))
+          (number "19" (effects (font (size 1.27 1.27))))
+        )
+        (pin bidirectional line (at 17.78 17.78 180) (length 5.08)
+          (name "GPB1" (effects (font (size 1.27 1.27))))
+          (number "2" (effects (font (size 1.27 1.27))))
+        )
+        (pin tri_state line (at -17.78 2.54 0) (length 5.08)
+          (name "INTA" (effects (font (size 1.27 1.27))))
+          (number "20" (effects (font (size 1.27 1.27))))
+        )
+        (pin bidirectional line (at 17.78 -2.54 180) (length 5.08)
+          (name "GPA0" (effects (font (size 1.27 1.27))))
+          (number "21" (effects (font (size 1.27 1.27))))
+        )
+        (pin bidirectional line (at 17.78 -5.08 180) (length 5.08)
+          (name "GPA1" (effects (font (size 1.27 1.27))))
+          (number "22" (effects (font (size 1.27 1.27))))
+        )
+        (pin bidirectional line (at 17.78 -7.62 180) (length 5.08)
+          (name "GPA2" (effects (font (size 1.27 1.27))))
+          (number "23" (effects (font (size 1.27 1.27))))
+        )
+        (pin bidirectional line (at 17.78 -10.16 180) (length 5.08)
+          (name "GPA3" (effects (font (size 1.27 1.27))))
+          (number "24" (effects (font (size 1.27 1.27))))
+        )
+        (pin bidirectional line (at 17.78 -12.7 180) (length 5.08)
+          (name "GPA4" (effects (font (size 1.27 1.27))))
+          (number "25" (effects (font (size 1.27 1.27))))
+        )
+        (pin bidirectional line (at 17.78 -15.24 180) (length 5.08)
+          (name "GPA5" (effects (font (size 1.27 1.27))))
+          (number "26" (effects (font (size 1.27 1.27))))
+        )
+        (pin bidirectional line (at 17.78 -17.78 180) (length 5.08)
+          (name "GPA6" (effects (font (size 1.27 1.27))))
+          (number "27" (effects (font (size 1.27 1.27))))
+        )
+        (pin bidirectional line (at 17.78 -20.32 180) (length 5.08)
+          (name "GPA7" (effects (font (size 1.27 1.27))))
+          (number "28" (effects (font (size 1.27 1.27))))
+        )
+        (pin bidirectional line (at 17.78 15.24 180) (length 5.08)
+          (name "GPB2" (effects (font (size 1.27 1.27))))
+          (number "3" (effects (font (size 1.27 1.27))))
+        )
+        (pin bidirectional line (at 17.78 12.7 180) (length 5.08)
+          (name "GPB3" (effects (font (size 1.27 1.27))))
+          (number "4" (effects (font (size 1.27 1.27))))
+        )
+        (pin bidirectional line (at 17.78 10.16 180) (length 5.08)
+          (name "GPB4" (effects (font (size 1.27 1.27))))
+          (number "5" (effects (font (size 1.27 1.27))))
+        )
+        (pin bidirectional line (at 17.78 7.62 180) (length 5.08)
+          (name "GPB5" (effects (font (size 1.27 1.27))))
+          (number "6" (effects (font (size 1.27 1.27))))
+        )
+        (pin bidirectional line (at 17.78 5.08 180) (length 5.08)
+          (name "GPB6" (effects (font (size 1.27 1.27))))
+          (number "7" (effects (font (size 1.27 1.27))))
+        )
+        (pin bidirectional line (at 17.78 2.54 180) (length 5.08)
+          (name "GPB7" (effects (font (size 1.27 1.27))))
+          (number "8" (effects (font (size 1.27 1.27))))
+        )
+        (pin power_in line (at 0 27.94 270) (length 5.08)
+          (name "VDD" (effects (font (size 1.27 1.27))))
+          (number "9" (effects (font (size 1.27 1.27))))
+        )
+      )
+    )
+    (symbol "power:PWR_FLAG" (power) (pin_numbers hide) (pin_names (offset 0) hide) (in_bom yes) (on_board yes)
+      (property "Reference" "#FLG" (id 0) (at 0 1.905 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Value" "PWR_FLAG" (id 1) (at 0 3.81 0)
+        (effects (font (size 1.27 1.27)))
+      )
+      (property "Footprint" "" (id 2) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Datasheet" "~" (id 3) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_keywords" "power-flag" (id 4) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_description" "Special symbol for telling ERC where power comes from" (id 5) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (symbol "PWR_FLAG_0_0"
+        (pin power_out line (at 0 0 90) (length 0)
+          (name "pwr" (effects (font (size 1.27 1.27))))
+          (number "1" (effects (font (size 1.27 1.27))))
+        )
+      )
+      (symbol "PWR_FLAG_0_1"
+        (polyline
+          (pts
+            (xy 0 0)
+            (xy 0 1.27)
+            (xy -1.016 1.905)
+            (xy 0 2.54)
+            (xy 1.016 1.905)
+            (xy 0 1.27)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+      )
+    )
+  )
+
+
+  (junction (at 26.67 78.74) (diameter 0) (color 0 0 0 0)
+    (uuid 977582b9-2db9-468a-ad10-20c44324c67a)
+  )
+  (junction (at 26.67 86.36) (diameter 0) (color 0 0 0 0)
+    (uuid e481e043-7788-4ea9-b402-ccbe27f6fa2d)
+  )
+  (junction (at 26.67 76.2) (diameter 0) (color 0 0 0 0)
+    (uuid fc9d291a-bb62-40fb-affa-0748830acc2e)
+  )
+
+  (no_connect (at 43.18 55.88) (uuid 6d76ecd6-08c5-46fe-bf99-217079cfcdb4))
+  (no_connect (at 43.18 53.34) (uuid c3bef0d8-2182-40fa-bdc2-4a33194cb678))
+
+  (wire (pts (xy 78.74 53.34) (xy 80.01 53.34))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 02024d77-9b08-4d63-959a-d89d9f57df24)
+  )
+  (wire (pts (xy 26.67 73.66) (xy 43.18 73.66))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 059e9b2b-3832-42a3-ab7e-ce89464bc84b)
+  )
+  (wire (pts (xy 60.96 86.36) (xy 26.67 86.36))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 086f8e3c-fded-46e0-a5e4-8b83e64e840a)
+  )
+  (wire (pts (xy 19.05 105.41) (xy 34.29 105.41))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 09d2489c-28dd-4730-baa2-017ae21b4a01)
+  )
+  (wire (pts (xy 78.74 48.26) (xy 80.01 48.26))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 11613f84-55b1-4cf8-92c3-5c5bae7ed329)
+  )
+  (wire (pts (xy 78.74 68.58) (xy 80.01 68.58))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 190e49f2-33ca-4e94-81ba-2dd951fbdf2c)
+  )
+  (wire (pts (xy 43.18 38.1) (xy 16.51 38.1))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 1e105208-9627-4bb4-9388-4f89f00d4ba4)
+  )
+  (wire (pts (xy 72.39 30.48) (xy 60.96 30.48))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 2058ebf4-6231-4389-a81f-781d7618f9a6)
+  )
+  (wire (pts (xy 34.29 113.03) (xy 19.05 113.03))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 28445e91-96b9-47cb-98a3-00978eb716f7)
+  )
+  (wire (pts (xy 26.67 60.96) (xy 43.18 60.96))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 34ca5c43-bcc6-48bc-babc-79946396877f)
+  )
+  (wire (pts (xy 26.67 78.74) (xy 26.67 76.2))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 3a9d95f8-ea64-4569-b9c8-77c1a1f5b1ba)
+  )
+  (wire (pts (xy 19.05 107.95) (xy 34.29 107.95))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 440e2d22-4b0d-4627-ae79-11e873013b1b)
+  )
+  (wire (pts (xy 80.01 78.74) (xy 78.74 78.74))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 44f0a22e-d720-48d6-8733-665d1ef4a2c9)
+  )
+  (wire (pts (xy 78.74 73.66) (xy 80.01 73.66))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 46015c43-8e0c-4685-8ff9-3fce189e484f)
+  )
+  (wire (pts (xy 78.74 76.2) (xy 80.01 76.2))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 483e34f1-47be-4c13-a403-0d468fa05660)
+  )
+  (wire (pts (xy 78.74 71.12) (xy 80.01 71.12))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 485cb808-21c6-4979-9036-bc03b5e367ca)
+  )
+  (wire (pts (xy 26.67 86.36) (xy 26.67 88.9))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 4a908391-c3c7-445a-85cb-d6547b9af0ea)
+  )
+  (wire (pts (xy 26.67 76.2) (xy 26.67 73.66))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 4eeb6573-9b3b-4baa-b5f8-bf01bbc58e18)
+  )
+  (wire (pts (xy 34.29 24.13) (xy 34.29 21.59))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 5a0f2dc4-540a-460b-a5b6-0e7e0baafdef)
+  )
+  (wire (pts (xy 78.74 63.5) (xy 80.01 63.5))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 60639e45-32e2-4ddb-93a4-b24cd5fa47c7)
+  )
+  (wire (pts (xy 78.74 40.64) (xy 80.01 40.64))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 63185c31-ad5f-44ac-b17d-b1f042949a09)
+  )
+  (wire (pts (xy 78.74 66.04) (xy 80.01 66.04))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 6cbc6b9c-37f8-4d4a-9780-7abd8c87c83f)
+  )
+  (wire (pts (xy 26.67 86.36) (xy 26.67 78.74))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 6d545457-db3d-42ca-a561-eb49aa6589a0)
+  )
+  (wire (pts (xy 26.67 78.74) (xy 43.18 78.74))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 71e336af-3a4f-4b7e-9773-4ab219dcbe4d)
+  )
+  (wire (pts (xy 78.74 38.1) (xy 80.01 38.1))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 76bc5345-9c2c-4403-9e8c-0ed835a41298)
+  )
+  (wire (pts (xy 21.59 24.13) (xy 21.59 21.59))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 7e40e111-abf4-47d2-9216-6098c5b86d76)
+  )
+  (wire (pts (xy 78.74 55.88) (xy 80.01 55.88))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 898cfd1a-46e9-4edf-9886-c39eb3af0640)
+  )
+  (wire (pts (xy 19.05 110.49) (xy 34.29 110.49))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 8ab71750-3877-45d3-8b64-c321f83fcf96)
+  )
+  (wire (pts (xy 78.74 45.72) (xy 80.01 45.72))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 9ee01db0-fdb4-4964-b888-2644c5ff6aaa)
+  )
+  (wire (pts (xy 78.74 43.18) (xy 80.01 43.18))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid a9ce2ecb-eff8-45cc-ba2d-4bdf7cc1bce6)
+  )
+  (wire (pts (xy 78.74 60.96) (xy 80.01 60.96))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid baf11baa-495a-4758-bf50-34c5cc6c126d)
+  )
+  (wire (pts (xy 78.74 50.8) (xy 80.01 50.8))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid bdcd32e9-fcae-4c55-a150-d730aae63da5)
+  )
+  (wire (pts (xy 26.67 76.2) (xy 43.18 76.2))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid c63646f9-5b42-4e52-9d84-c4020c857ee6)
+  )
+  (wire (pts (xy 43.18 40.64) (xy 16.51 40.64))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid e91b0bdf-9c91-4751-9601-453b1d2cb531)
+  )
+
+  (label "+5V_KEY" (at 72.39 30.48 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid 0cacaf74-e0bc-45c2-a8a7-70eb1369043e)
+  )
+  (label "+5V_KEY" (at 19.05 113.03 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid 169a3f2c-537d-461f-a967-30351cbeaa03)
+  )
+  (label "GND_KEY" (at 19.05 110.49 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid 25062c32-7451-4313-9e93-384b2aaeeabd)
+  )
+  (label "+5V_KEY" (at 21.59 24.13 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid 3063d3c5-17ff-458a-ab9b-c80f58f3ed07)
+  )
+  (label "I2C_DATA_KEY" (at 19.05 105.41 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid 3454d9cc-94b4-4b04-a04f-c74bc4d1eea6)
+  )
+  (label "I2C_CLOCK_KEY" (at 19.05 107.95 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid 40ea0df3-5556-4205-99fb-e9665f5ae6b7)
+  )
+  (label "I2C_DATA_KEY" (at 16.51 38.1 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid 4a170adf-2c48-4dd3-8899-5bdfb579b6d7)
+  )
+  (label "GND_KEY" (at 34.29 24.13 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid 8314209d-97cb-4c91-a11c-c6feda840b33)
+  )
+  (label "+5V_KEY" (at 26.67 60.96 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid a75d61d6-c529-46f7-a577-ff3b47fdb36e)
+  )
+  (label "I2C_CLOCK_KEY" (at 16.51 40.64 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid c6cf0879-fae5-498d-a647-b87e1ea08878)
+  )
+  (label "GND_KEY" (at 26.67 88.9 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid e0723ce8-0ee3-4ef8-8070-26417d03176c)
+  )
+
+  (hierarchical_label "I2C_DATA_KEY" (shape input) (at 34.29 105.41 0)
+    (effects (font (size 1.27 1.27)) (justify left))
+    (uuid 4d35e834-3956-409c-b7a2-4948a760e864)
+  )
+  (hierarchical_label "GND_KEY" (shape input) (at 34.29 110.49 0)
+    (effects (font (size 1.27 1.27)) (justify left))
+    (uuid 5bd8645f-adb3-4d03-9eda-3c9489ba48b5)
+  )
+  (hierarchical_label "I2C_CLOCK_KEY" (shape input) (at 34.29 107.95 0)
+    (effects (font (size 1.27 1.27)) (justify left))
+    (uuid 795ce941-96c3-49d2-92a8-10c5de98ab2e)
+  )
+  (hierarchical_label "+5V_KEY" (shape input) (at 34.29 113.03 0)
+    (effects (font (size 1.27 1.27)) (justify left))
+    (uuid d5886bdc-a7ac-41a1-9ce5-5e6950da83c4)
+  )
+
+  (symbol (lib_id "Connector:Conn_01x01_Male") (at 85.09 48.26 0) (mirror y) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 0bdb6175-8701-43d4-9212-8e88185a01b9)
+    (property "Reference" "J34" (id 0) (at 93.98 48.26 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+    (property "Value" "R4" (id 1) (at 90.17 48.26 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (id 2) (at 85.09 48.26 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 85.09 48.26 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 78a96c46-e39e-47d0-af13-4edb99e12c43))
+  )
+
+  (symbol (lib_id "Connector:Conn_01x01_Male") (at 85.09 55.88 0) (mirror y) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 2c4dff0e-97cb-430c-b06b-cd8446c042f5)
+    (property "Reference" "J37" (id 0) (at 93.98 55.88 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+    (property "Value" "R7" (id 1) (at 90.17 55.88 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (id 2) (at 85.09 55.88 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 85.09 55.88 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 3c34917a-1f48-461d-8e29-0eb608acd0ad))
+  )
+
+  (symbol (lib_id "Connector:Conn_01x01_Male") (at 85.09 71.12 0) (mirror y) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 308a8331-62e8-47c8-97d7-77c125dbca58)
+    (property "Reference" "J42" (id 0) (at 93.98 71.12 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+    (property "Value" "C4" (id 1) (at 90.17 71.12 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (id 2) (at 85.09 71.12 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 85.09 71.12 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid a62591c2-a9ad-4a0c-9e15-edb44e412055))
+  )
+
+  (symbol (lib_id "Connector:Conn_01x01_Male") (at 85.09 68.58 0) (mirror y) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 31c61803-b73f-4a77-8c6a-0adc05864be1)
+    (property "Reference" "J41" (id 0) (at 93.98 68.58 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+    (property "Value" "C3" (id 1) (at 90.17 68.58 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (id 2) (at 85.09 68.58 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 85.09 68.58 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 34562de3-7ab5-4415-8360-8747fce5a304))
+  )
+
+  (symbol (lib_id "Connector:Conn_01x01_Male") (at 85.09 43.18 0) (mirror y) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 4819908d-cfd1-465f-9b62-2ce7b5db795b)
+    (property "Reference" "J32" (id 0) (at 93.98 43.18 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+    (property "Value" "R2" (id 1) (at 90.17 43.18 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (id 2) (at 85.09 43.18 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 85.09 43.18 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid a74b58a4-fdd8-4a9c-ba98-f8a33bcc4688))
+  )
+
+  (symbol (lib_id "Connector:Conn_01x01_Male") (at 85.09 45.72 0) (mirror y) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 4971e12a-d07a-4b0a-8cfd-ea8bd16efa5a)
+    (property "Reference" "J33" (id 0) (at 93.98 45.72 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+    (property "Value" "R3" (id 1) (at 90.17 45.72 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (id 2) (at 85.09 45.72 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 85.09 45.72 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid c4058ddb-8484-4407-a61b-696c6042c04a))
+  )
+
+  (symbol (lib_id "Connector:Conn_01x01_Male") (at 85.09 53.34 0) (mirror y) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 55bb1663-5f30-46ba-abeb-15eb836bc9d5)
+    (property "Reference" "J36" (id 0) (at 93.98 53.34 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+    (property "Value" "R6" (id 1) (at 90.17 53.34 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (id 2) (at 85.09 53.34 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 85.09 53.34 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 5aae9d06-3efc-4c63-a3e3-1495b728637d))
+  )
+
+  (symbol (lib_id "Connector:Conn_01x01_Male") (at 85.09 78.74 0) (mirror y) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 599495f8-b69f-4a68-82fa-d7c87ad23fb8)
+    (property "Reference" "J45" (id 0) (at 93.98 78.74 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+    (property "Value" "C7" (id 1) (at 90.17 78.74 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (id 2) (at 85.09 78.74 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 85.09 78.74 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 9186795a-6c25-4aaa-9eb7-6ae2b81d35da))
+  )
+
+  (symbol (lib_id "Connector:Conn_01x01_Male") (at 85.09 38.1 0) (mirror y) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 7ce8fcd7-ee6c-4af5-92da-5d397d1d555e)
+    (property "Reference" "J30" (id 0) (at 93.98 38.1 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+    (property "Value" "R0" (id 1) (at 90.17 38.1 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (id 2) (at 85.09 38.1 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 85.09 38.1 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 4edb9f44-6c9b-4261-88cb-1c6870ee3aad))
+  )
+
+  (symbol (lib_id "power:PWR_FLAG") (at 34.29 21.59 0) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 895e9604-841c-4793-bfc5-24d2129b3f0a)
+    (property "Reference" "#FLG0110" (id 0) (at 34.29 19.685 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "PWR_FLAG" (id 1) (at 34.29 17.1958 0))
+    (property "Footprint" "" (id 2) (at 34.29 21.59 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 34.29 21.59 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 8f6999f5-dc78-43b0-8fa3-d632446e68d4))
+  )
+
+  (symbol (lib_id "Connector:Conn_01x01_Male") (at 85.09 63.5 0) (mirror y) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 8a000d34-f9aa-4a96-b043-193e6a1c4d76)
+    (property "Reference" "J39" (id 0) (at 93.98 63.5 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+    (property "Value" "C1" (id 1) (at 90.17 63.5 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (id 2) (at 85.09 63.5 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 85.09 63.5 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 00d2d950-76e2-4b71-8bae-6215f5920c3d))
+  )
+
+  (symbol (lib_id "Connector:Conn_01x01_Male") (at 85.09 66.04 0) (mirror y) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 9bac6bac-7f2a-4129-b344-f43fb7c2d498)
+    (property "Reference" "J40" (id 0) (at 93.98 66.04 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+    (property "Value" "C2" (id 1) (at 90.17 66.04 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (id 2) (at 85.09 66.04 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 85.09 66.04 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 5dd8b753-5b17-41d4-9d0c-52cdd73a0c77))
+  )
+
+  (symbol (lib_id "Connector:Conn_01x01_Male") (at 85.09 60.96 0) (mirror y) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid ad826993-8060-4ac8-b31b-fb9ea3e66c9e)
+    (property "Reference" "J38" (id 0) (at 93.98 60.96 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+    (property "Value" "C0" (id 1) (at 90.17 60.96 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (id 2) (at 85.09 60.96 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 85.09 60.96 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 301df795-2bb4-4825-adf8-b4e5bc31879d))
+  )
+
+  (symbol (lib_id "Interface_Expansion:MCP23017_SP") (at 60.96 58.42 0) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid b22185af-1de2-40b6-9e80-0da54f88759e)
+    (property "Reference" "U1" (id 0) (at 60.96 25.8826 0))
+    (property "Value" "MCP23017_SP" (id 1) (at 60.96 28.194 0))
+    (property "Footprint" "Package_DIP:DIP-28_W7.62mm" (id 2) (at 66.04 83.82 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+    (property "Datasheet" "http://ww1.microchip.com/downloads/en/DeviceDoc/20001952C.pdf" (id 3) (at 66.04 86.36 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+    (pin "1" (uuid bfcb39fe-b237-43ed-95ab-ed4f0ebe3027))
+    (pin "10" (uuid 0e52d5ee-cba7-4f0b-9d50-7cab8bdbde51))
+    (pin "11" (uuid 5f4bb5ae-e235-450e-b526-c6d99bcf8569))
+    (pin "12" (uuid cded3975-bb53-4f1e-89bf-735f7ca6f050))
+    (pin "13" (uuid e3049d10-3b1b-4851-85d6-99e2fc4f0d1f))
+    (pin "14" (uuid c4716f96-b401-4ceb-86d8-b7e2a3084f6a))
+    (pin "15" (uuid fc32a7f5-2954-4290-bd31-71af87b800ea))
+    (pin "16" (uuid b0299330-8904-4455-9542-397037efe6d7))
+    (pin "17" (uuid 13a16057-f26b-4d35-840d-4ef1ba8535e4))
+    (pin "18" (uuid 6fb7778b-112c-41dd-bb0e-ff9f979f7f94))
+    (pin "19" (uuid 147e535e-de52-4d32-8b9e-7284da549da8))
+    (pin "2" (uuid ea372e81-8b28-411a-9c12-6e691d461399))
+    (pin "20" (uuid 7b77a475-9223-4175-8348-b89e89f3dd70))
+    (pin "21" (uuid a5f3df81-3222-4e28-b1e1-1a0d9b0edd61))
+    (pin "22" (uuid b996a73e-3f99-4fd6-982b-571652d61198))
+    (pin "23" (uuid 7b22eb2f-01a7-4c6f-adf4-69a29552f5d0))
+    (pin "24" (uuid 7fae9457-3e9a-4a2a-a6d9-1c0e0890b789))
+    (pin "25" (uuid 3ca92ab0-5bde-4feb-a5b8-75c19683a698))
+    (pin "26" (uuid 72a8f13f-7830-4a81-b67f-cd66e2a5d573))
+    (pin "27" (uuid a8b31ffe-8f48-4090-81bd-dbdf2399a476))
+    (pin "28" (uuid 86517672-a312-4d96-a62d-d401c4f3f511))
+    (pin "3" (uuid 4c814fe7-fbe2-4570-a363-581304414d73))
+    (pin "4" (uuid 2636cd5d-2e0b-44ad-9671-c8d32fd81ce8))
+    (pin "5" (uuid aafb9083-314f-45e8-a8fb-2f0c4e2d22a0))
+    (pin "6" (uuid 1ea27332-2337-4a17-8f0c-2dc582472deb))
+    (pin "7" (uuid 5342d71c-4e34-4737-b7da-732d0fc20348))
+    (pin "8" (uuid 302c19ea-a1f1-4d51-bbd7-83e7f3c96c7a))
+    (pin "9" (uuid ccc9d90b-da4a-4e8d-ad59-1906856fc820))
+  )
+
+  (symbol (lib_id "Connector:Conn_01x01_Male") (at 85.09 76.2 0) (mirror y) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid cddd98ec-06b3-4b4b-bd3e-77cb1b75197e)
+    (property "Reference" "J44" (id 0) (at 93.98 76.2 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+    (property "Value" "C6" (id 1) (at 90.17 76.2 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (id 2) (at 85.09 76.2 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 85.09 76.2 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid eaaebe9e-4dee-456e-86f6-9fe8d961d12c))
+  )
+
+  (symbol (lib_id "Connector:Conn_01x01_Male") (at 85.09 73.66 0) (mirror y) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid e203d836-01b9-4742-95b0-b818b8d5ad1d)
+    (property "Reference" "J43" (id 0) (at 93.98 73.66 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+    (property "Value" "C5" (id 1) (at 90.17 73.66 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (id 2) (at 85.09 73.66 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 85.09 73.66 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 2f529f26-14b4-4c1c-b5fa-d9887fe7fbc9))
+  )
+
+  (symbol (lib_id "power:PWR_FLAG") (at 21.59 21.59 0) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid efd0eb00-65d7-4a3f-8a9f-803f13854b91)
+    (property "Reference" "#FLG0109" (id 0) (at 21.59 19.685 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "PWR_FLAG" (id 1) (at 21.59 17.1958 0))
+    (property "Footprint" "" (id 2) (at 21.59 21.59 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 21.59 21.59 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid ac3d8e64-6352-47c7-a237-ee908b166e3d))
+  )
+
+  (symbol (lib_id "Connector:Conn_01x01_Male") (at 85.09 50.8 0) (mirror y) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid fcb79e8e-23cf-418a-85d2-2ac39e345d6c)
+    (property "Reference" "J35" (id 0) (at 93.98 50.8 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+    (property "Value" "R5" (id 1) (at 90.17 50.8 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (id 2) (at 85.09 50.8 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 85.09 50.8 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid ca6464d3-66e3-4d00-9338-4462e5033e8c))
+  )
+
+  (symbol (lib_id "Connector:Conn_01x01_Male") (at 85.09 40.64 0) (mirror y) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid fe4436c3-ec9b-4d4d-9a37-5d16547a866e)
+    (property "Reference" "J31" (id 0) (at 93.98 40.64 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+    (property "Value" "R1" (id 1) (at 90.17 40.64 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (id 2) (at 85.09 40.64 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 85.09 40.64 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid c12d5fff-2d0a-4916-9a7c-3110d0aa8918))
+  )
+)
diff --git a/electronics/rotary.kicad_sch b/electronics/rotary.kicad_sch
index d914197..40f946c 100644
--- a/electronics/rotary.kicad_sch
+++ b/electronics/rotary.kicad_sch
@@ -7,17 +7,17 @@
   (title_block
     (title "CIMDID")
     (date "2022-02-08")
-    (rev "1.0")
+    (rev "1.1")
     (comment 1 "@grumpydevelop@contentnation.net")
     (comment 2 "https://contentnation.net/en/grumpydevelop/cimdit_1")
   )
 
   (lib_symbols
-    (symbol "Connector:Conn_01x03_Female" (pin_names (offset 1.016) hide) (in_bom yes) (on_board yes)
-      (property "Reference" "J" (id 0) (at 0 5.08 0)
+    (symbol "Connector:Conn_01x01_Male" (pin_names (offset 1.016) hide) (in_bom yes) (on_board yes)
+      (property "Reference" "J" (id 0) (at 0 2.54 0)
         (effects (font (size 1.27 1.27)))
       )
-      (property "Value" "Conn_01x03_Female" (id 1) (at 0 -5.08 0)
+      (property "Value" "Conn_01x01_Male" (id 1) (at 0 -2.54 0)
         (effects (font (size 1.27 1.27)))
       )
       (property "Footprint" "" (id 2) (at 0 0 0)
@@ -29,61 +29,29 @@
       (property "ki_keywords" "connector" (id 4) (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_description" "Generic connector, single row, 01x03, script generated (kicad-library-utils/schlib/autogen/connector/)" (id 5) (at 0 0 0)
+      (property "ki_description" "Generic connector, single row, 01x01, script generated (kicad-library-utils/schlib/autogen/connector/)" (id 5) (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_fp_filters" "Connector*:*_1x??_*" (id 6) (at 0 0 0)
+      (property "ki_fp_filters" "Connector*:*" (id 6) (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (symbol "Conn_01x03_Female_1_1"
-        (arc (start 0 -2.032) (mid -0.508 -2.54) (end 0 -3.048)
-          (stroke (width 0.1524) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
+      (symbol "Conn_01x01_Male_1_1"
         (polyline
           (pts
-            (xy -1.27 -2.54)
-            (xy -0.508 -2.54)
+            (xy 1.27 0)
+            (xy 0.8636 0)
           )
           (stroke (width 0.1524) (type default) (color 0 0 0 0))
           (fill (type none))
         )
-        (polyline
-          (pts
-            (xy -1.27 0)
-            (xy -0.508 0)
-          )
+        (rectangle (start 0.8636 0.127) (end 0 -0.127)
           (stroke (width 0.1524) (type default) (color 0 0 0 0))
-          (fill (type none))
+          (fill (type outline))
         )
-        (polyline
-          (pts
-            (xy -1.27 2.54)
-            (xy -0.508 2.54)
-          )
-          (stroke (width 0.1524) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (arc (start 0 0.508) (mid -0.508 0) (end 0 -0.508)
-          (stroke (width 0.1524) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (arc (start 0 3.048) (mid -0.508 2.54) (end 0 2.032)
-          (stroke (width 0.1524) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (pin passive line (at -5.08 2.54 0) (length 3.81)
+        (pin passive line (at 5.08 0 180) (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))))
-        )
       )
     )
     (symbol "Interface_Expansion:MCP23017_SP" (pin_names (offset 1.016)) (in_bom yes) (on_board yes)
@@ -280,39 +248,11 @@
 
   (no_connect (at 39.37 49.53) (uuid 77aa6db5-9b8d-4983-b88e-30fe5af25975))
 
-  (wire (pts (xy 102.87 36.83) (xy 102.87 31.75))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 0351df45-d042-41d4-ba35-88092c7be2fc)
-  )
   (wire (pts (xy 39.37 52.07) (xy 22.86 52.07))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 07652224-af43-42a2-841c-1883ba305bc4)
   )
-  (wire (pts (xy 120.65 36.83) (xy 120.65 31.75))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 097edb1b-8998-4e70-b670-bba125982348)
-  )
-  (wire (pts (xy 81.28 64.77) (xy 81.28 69.85))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 0fc5db66-6188-4c1f-bb14-0868bef113eb)
-  )
-  (wire (pts (xy 97.79 57.15) (xy 97.79 67.31))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 10e52e95-44f3-4059-a86d-dcda603e0623)
-  )
-  (wire (pts (xy 76.2 80.01) (xy 135.89 80.01))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 1427bb3f-0689-4b41-a816-cd79a5202fd0)
-  )
-  (wire (pts (xy 82.55 67.31) (xy 97.79 67.31))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 142dd724-2a9f-4eea-ab21-209b1bc7ec65)
-  )
-  (wire (pts (xy 97.79 26.67) (xy 104.14 26.67))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 14769dc5-8525-4984-8b15-a734ee247efa)
-  )
-  (wire (pts (xy 74.93 64.77) (xy 81.28 64.77))
+  (wire (pts (xy 74.93 64.77) (xy 76.2 64.77))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 15a82541-58d8-45b5-99c5-fb52e017e3ea)
   )
@@ -324,39 +264,19 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 182b2d54-931d-49d6-9f39-60a752623e36)
   )
-  (wire (pts (xy 100.33 29.21) (xy 104.14 29.21))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 19c56563-5fe3-442a-885b-418dbc2421eb)
-  )
-  (wire (pts (xy 74.93 72.39) (xy 77.47 72.39))
+  (wire (pts (xy 74.93 72.39) (xy 76.2 72.39))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 20caf6d2-76a7-497e-ac56-f6d31eb9027b)
   )
-  (wire (pts (xy 115.57 26.67) (xy 121.92 26.67))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 21ae9c3a-7138-444e-be38-56a4842ab594)
-  )
-  (wire (pts (xy 102.87 31.75) (xy 104.14 31.75))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 240e5dac-6242-47a5-bbef-f76d11c715c0)
-  )
-  (wire (pts (xy 138.43 62.23) (xy 139.7 62.23))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 252f1275-081d-4d77-8bd5-3b9e6916ef42)
-  )
   (wire (pts (xy 176.53 52.07) (xy 161.29 52.07))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 269f19c3-6824-45a8-be29-fa58d70cbb42)
   )
-  (wire (pts (xy 77.47 34.29) (xy 77.47 26.67))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 275aa44a-b61f-489f-9e2a-819a0fe0d1eb)
-  )
-  (wire (pts (xy 74.93 39.37) (xy 97.79 39.37))
+  (wire (pts (xy 74.93 39.37) (xy 76.2 39.37))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 2c60448a-e30f-46b2-89e1-a44f51688efc)
   )
-  (wire (pts (xy 74.93 34.29) (xy 77.47 34.29))
+  (wire (pts (xy 74.93 34.29) (xy 76.2 34.29))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 2dc272bd-3aa2-45b5-889d-1d3c8aac80f8)
   )
@@ -364,47 +284,19 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 2f291a4b-4ecb-4692-9ad2-324f9784c0d4)
   )
-  (wire (pts (xy 133.35 57.15) (xy 133.35 77.47))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 319639ae-c2c5-486d-93b1-d03bb1b64252)
-  )
-  (wire (pts (xy 100.33 59.69) (xy 104.14 59.69))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 337e8520-cbd2-42c0-8d17-743bab17cbbd)
-  )
-  (wire (pts (xy 138.43 31.75) (xy 139.7 31.75))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 34a74736-156e-4bf3-9200-cd137cfa59da)
-  )
-  (wire (pts (xy 85.09 36.83) (xy 85.09 31.75))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 37e8181c-a81e-498b-b2e2-0aef0c391059)
-  )
   (wire (pts (xy 176.53 46.99) (xy 161.29 46.99))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 38cfe839-c630-43d3-a9ec-6a89ba9e318a)
   )
-  (wire (pts (xy 77.47 72.39) (xy 77.47 77.47))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 3a70978e-dcc2-4620-a99c-514362812927)
-  )
-  (wire (pts (xy 82.55 62.23) (xy 82.55 67.31))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 3c8d03bf-f31d-4aa0-b8db-a227ffd7d8d6)
-  )
-  (wire (pts (xy 115.57 57.15) (xy 115.57 72.39))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 3d6cdd62-5634-4e30-acf8-1b9c1dbf6653)
-  )
   (wire (pts (xy 171.45 60.96) (xy 171.45 63.5))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 475ed8b3-90bf-48cd-bce5-d8f48b689541)
   )
-  (wire (pts (xy 74.93 52.07) (xy 135.89 52.07))
+  (wire (pts (xy 74.93 52.07) (xy 76.2 52.07))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 4a54c707-7b6f-4a3d-a74d-5e3526114aba)
   )
-  (wire (pts (xy 74.93 44.45) (xy 115.57 44.45))
+  (wire (pts (xy 74.93 44.45) (xy 76.2 44.45))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 4b1fce17-dec7-457e-ba3b-a77604e77dc9)
   )
@@ -416,159 +308,51 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 5114c7bf-b955-49f3-a0a8-4b954c81bde0)
   )
-  (wire (pts (xy 85.09 62.23) (xy 86.36 62.23))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 59fc765e-1357-4c94-9529-5635418c7d73)
-  )
-  (wire (pts (xy 135.89 59.69) (xy 135.89 80.01))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 62a1f3d4-027d-4ecf-a37a-6fcf4263e9d2)
-  )
-  (wire (pts (xy 138.43 67.31) (xy 138.43 62.23))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 62e8c4d4-266c-4e53-8981-1028251d724c)
-  )
-  (wire (pts (xy 85.09 31.75) (xy 86.36 31.75))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 676efd2f-1c48-4786-9e4b-2444f1e8f6ff)
-  )
-  (wire (pts (xy 135.89 59.69) (xy 139.7 59.69))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 6b91a3ee-fdcd-4bfe-ad57-c8d5ea9903a8)
-  )
-  (wire (pts (xy 74.93 36.83) (xy 80.01 36.83))
+  (wire (pts (xy 74.93 36.83) (xy 76.2 36.83))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 6c2d26bc-6eca-436c-8025-79f817bf57d6)
   )
-  (wire (pts (xy 77.47 26.67) (xy 86.36 26.67))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 6c67e4f6-9d04-4539-b356-b76e915ce848)
-  )
-  (wire (pts (xy 100.33 59.69) (xy 100.33 69.85))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 74f5ec08-7600-4a0b-a9e4-aae29f9ea08a)
-  )
-  (wire (pts (xy 78.74 69.85) (xy 78.74 74.93))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 759788bd-3cb9-4d38-b58c-5cb10b7dca6b)
-  )
   (wire (pts (xy 22.86 85.09) (xy 22.86 82.55))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 770ad51a-7219-4633-b24a-bd20feb0a6c5)
   )
-  (wire (pts (xy 77.47 77.47) (xy 133.35 77.47))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 78f9c3d3-3556-46f6-9744-05ad54b330f0)
-  )
-  (wire (pts (xy 74.93 46.99) (xy 118.11 46.99))
+  (wire (pts (xy 74.93 46.99) (xy 76.2 46.99))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 869d6302-ae22-478f-9723-3feacbb12eef)
   )
-  (wire (pts (xy 138.43 36.83) (xy 138.43 31.75))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 87d7448e-e139-4209-ae0b-372f805267da)
-  )
-  (wire (pts (xy 102.87 66.04) (xy 102.87 62.23))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 89a8e170-a222-41c0-b545-c9f4c5604011)
-  )
-  (wire (pts (xy 80.01 72.39) (xy 115.57 72.39))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 89c9afdc-c346-4300-a392-5f9dd8c1e5bd)
-  )
-  (wire (pts (xy 78.74 74.93) (xy 118.11 74.93))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 8b7bbefd-8f78-41f8-809c-2534a5de3b39)
-  )
-  (wire (pts (xy 97.79 39.37) (xy 97.79 26.67))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 8d9a3ecc-539f-41da-8099-d37cea9c28e7)
-  )
-  (wire (pts (xy 102.87 62.23) (xy 104.14 62.23))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 9529c01f-e1cd-40be-b7f0-83780a544249)
-  )
-  (wire (pts (xy 85.09 66.04) (xy 85.09 62.23))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 96db52e2-6336-4f5e-846e-528c594d0509)
-  )
-  (wire (pts (xy 120.65 31.75) (xy 121.92 31.75))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 994b6220-4755-4d84-91b3-6122ac1c2c5e)
-  )
   (wire (pts (xy 57.15 82.55) (xy 22.86 82.55))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a17904b9-135e-4dae-ae20-401c7787de72)
   )
-  (wire (pts (xy 115.57 44.45) (xy 115.57 26.67))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid aa2ea573-3f20-43c1-aa99-1f9c6031a9aa)
-  )
   (wire (pts (xy 39.37 34.29) (xy 22.86 34.29))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid b1c649b1-f44d-46c7-9dea-818e75a1b87e)
   )
-  (wire (pts (xy 80.01 36.83) (xy 80.01 29.21))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid b447dbb1-d38e-4a15-93cb-12c25382ea53)
-  )
-  (wire (pts (xy 74.93 57.15) (xy 86.36 57.15))
+  (wire (pts (xy 74.93 57.15) (xy 76.2 57.15))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid b854a395-bfc6-4140-9640-75d4f9296771)
   )
-  (wire (pts (xy 74.93 67.31) (xy 80.01 67.31))
+  (wire (pts (xy 74.93 67.31) (xy 76.2 67.31))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid bb59b92a-e4d0-4b9e-82cd-26304f5c15b8)
   )
-  (wire (pts (xy 133.35 57.15) (xy 139.7 57.15))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid bd793ae5-cde5-43f6-8def-1f95f35b1be6)
-  )
   (wire (pts (xy 176.53 49.53) (xy 161.29 49.53))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid be4b72db-0e02-4d9b-844a-aff689b4e648)
   )
-  (wire (pts (xy 120.65 67.31) (xy 120.65 62.23))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid c7df8431-dcf5-4ab4-b8f8-21c1cafc5246)
-  )
-  (wire (pts (xy 118.11 29.21) (xy 121.92 29.21))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid c7e7067c-5f5e-48d8-ab59-df26f9b35863)
-  )
   (wire (pts (xy 64.77 26.67) (xy 57.15 26.67))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid cdfb07af-801b-44ba-8c30-d021a6ad3039)
   )
-  (wire (pts (xy 80.01 29.21) (xy 86.36 29.21))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid cfa5c16e-7859-460d-a0b8-cea7d7ea629c)
-  )
-  (wire (pts (xy 118.11 74.93) (xy 118.11 59.69))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid d0cd3439-276c-41ba-b38d-f84f6da38415)
-  )
-  (wire (pts (xy 135.89 29.21) (xy 139.7 29.21))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid d0d2eee9-31f6-44fa-8149-ebb4dc2dc0dc)
-  )
-  (wire (pts (xy 120.65 62.23) (xy 121.92 62.23))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid d38aa458-d7c4-47af-ba08-2b6be506a3fd)
-  )
-  (wire (pts (xy 74.93 41.91) (xy 100.33 41.91))
+  (wire (pts (xy 74.93 41.91) (xy 76.2 41.91))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid d66d3c12-11ce-4566-9a45-962e329503d8)
   )
-  (wire (pts (xy 135.89 52.07) (xy 135.89 29.21))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid da481376-0e49-44d3-91b8-aaa39b869dd1)
-  )
   (wire (pts (xy 22.86 72.39) (xy 22.86 69.85))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid db36f6e3-e72a-487f-bda9-88cc84536f62)
   )
-  (wire (pts (xy 74.93 59.69) (xy 86.36 59.69))
+  (wire (pts (xy 74.93 59.69) (xy 76.2 59.69))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid dda1e6ca-91ec-4136-b90b-3c54d79454b9)
   )
@@ -576,18 +360,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid df2a6036-7274-4398-9365-148b6ddab90d)
   )
-  (wire (pts (xy 97.79 57.15) (xy 104.14 57.15))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid e0c7ddff-8c90-465f-be62-21fb49b059fa)
-  )
-  (wire (pts (xy 74.93 49.53) (xy 133.35 49.53))
+  (wire (pts (xy 74.93 49.53) (xy 76.2 49.53))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid e1b88aa4-d887-4eea-83ff-5c009f4390c4)
   )
-  (wire (pts (xy 100.33 41.91) (xy 100.33 29.21))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid e472dac4-5b65-4920-b8b2-6065d140a69d)
-  )
   (wire (pts (xy 22.86 69.85) (xy 39.37 69.85))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid e4c6fdbb-fdc7-4ad4-a516-240d84cdc120)
@@ -600,55 +376,19 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid e6b860cc-cb76-4220-acfb-68f1eb348bfa)
   )
-  (wire (pts (xy 74.93 62.23) (xy 82.55 62.23))
+  (wire (pts (xy 74.93 62.23) (xy 76.2 62.23))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid e70b6168-f98e-4322-bc55-500948ef7b77)
   )
-  (wire (pts (xy 133.35 26.67) (xy 139.7 26.67))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid ee41cb8e-512d-41d2-81e1-3c50fff32aeb)
-  )
-  (wire (pts (xy 118.11 59.69) (xy 121.92 59.69))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid f0ff5d1c-5481-4958-b844-4f68a17d4166)
-  )
   (wire (pts (xy 39.37 36.83) (xy 22.86 36.83))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid f3628265-0155-43e2-a467-c40ff783e265)
   )
-  (wire (pts (xy 118.11 46.99) (xy 118.11 29.21))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid f40d350f-0d3e-4f8a-b004-d950f2f8f1ba)
-  )
-  (wire (pts (xy 76.2 74.93) (xy 76.2 80.01))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid f447e585-df78-4239-b8cb-4653b3837bb1)
-  )
-  (wire (pts (xy 74.93 69.85) (xy 78.74 69.85))
+  (wire (pts (xy 74.93 69.85) (xy 76.2 69.85))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid f44d04c5-0d17-4d52-8328-ef3b4fdfba5f)
   )
-  (wire (pts (xy 81.28 69.85) (xy 100.33 69.85))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid f5bf5b4a-5213-48af-a5cd-0d67969d2de6)
-  )
-  (wire (pts (xy 80.01 67.31) (xy 80.01 72.39))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid f6983918-fe05-46ea-b355-bc522ec53440)
-  )
-  (wire (pts (xy 133.35 49.53) (xy 133.35 26.67))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid f988d6ea-11c5-4837-b1d1-5c292ded50c6)
-  )
-  (wire (pts (xy 115.57 57.15) (xy 121.92 57.15))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid fdc60c06-30fa-4dfb-96b4-809b755999e1)
-  )
 
-  (label "GND_ROT" (at 120.65 67.31 0)
-    (effects (font (size 1.27 1.27)) (justify left bottom))
-    (uuid 014d13cd-26ad-4d0e-86ad-a43b541cab14)
-  )
   (label "+5V_ROT" (at 161.29 44.45 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 0cbeb329-a88d-4a47-a5c2-a1d693de2f8c)
@@ -661,10 +401,6 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 39845449-7a31-4262-86b1-e7af14a6659f)
   )
-  (label "GND_ROT" (at 102.87 36.83 0)
-    (effects (font (size 1.27 1.27)) (justify left bottom))
-    (uuid 443bc73a-8dc0-4e2f-a292-a5eff00efa5b)
-  )
   (label "I2C_DATA_ROT" (at 161.29 49.53 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 4cafb73d-1ad8-4d24-acf7-63d78095ae46)
@@ -677,18 +413,10 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 63286bbb-78a3-4368-a50a-f6bf5f1653b0)
   )
-  (label "GND_ROT" (at 102.87 66.04 0)
-    (effects (font (size 1.27 1.27)) (justify left bottom))
-    (uuid 633292d3-80c5-4986-be82-ce926e9f09f4)
-  )
   (label "I2C_DATA_ROT" (at 22.86 34.29 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 6595b9c7-02ee-4647-bde5-6b566e35163e)
   )
-  (label "GND_ROT" (at 85.09 66.04 0)
-    (effects (font (size 1.27 1.27)) (justify left bottom))
-    (uuid 7744b6ee-910d-401d-b730-65c35d3d8092)
-  )
   (label "+5V_ROT" (at 161.29 63.5 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 7b766787-7689-40b8-9ef5-c0b1af45a9ae)
@@ -697,14 +425,6 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 810ed4ff-ffe2-4032-9af6-fb5ada3bae5b)
   )
-  (label "GND_ROT" (at 138.43 36.83 0)
-    (effects (font (size 1.27 1.27)) (justify left bottom))
-    (uuid 83021f70-e61e-4ad3-bae7-b9f02b28be4f)
-  )
-  (label "GND_ROT" (at 138.43 67.31 0)
-    (effects (font (size 1.27 1.27)) (justify left bottom))
-    (uuid a25b7e01-1754-4cc9-8a14-3d9c461e5af5)
-  )
   (label "GND_ROT" (at 171.45 63.5 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid aee7520e-3bfc-435f-a66b-1dd1f5aa6a87)
@@ -713,18 +433,10 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid b7199d9b-bebb-4100-9ad3-c2bd31e21d65)
   )
-  (label "GND_ROT" (at 120.65 36.83 0)
-    (effects (font (size 1.27 1.27)) (justify left bottom))
-    (uuid cc75e5ae-3348-4e7a-bd16-4df685ee47bd)
-  )
   (label "INT_ROT" (at 161.29 41.91 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid dd6c35f3-ae45-4706-ad6f-8028797ca8e0)
   )
-  (label "GND_ROT" (at 85.09 36.83 0)
-    (effects (font (size 1.27 1.27)) (justify left bottom))
-    (uuid eac8d865-0226-4958-b547-6b5592f39713)
-  )
   (label "GND_ROT" (at 22.86 85.09 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid f2480d0c-9b08-4037-9175-b2369af04d4c)
@@ -796,166 +508,6 @@
     (pin "9" (uuid ff203a9b-3d2e-4e1d-a6f0-12d16e5120fb))
   )
 
-  (symbol (lib_id "Connector:Conn_01x03_Female") (at 91.44 59.69 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 00000000-0000-0000-0000-000061fbdff9)
-    (property "Reference" "JR1" (id 0) (at 92.1512 59.0296 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "ROT1" (id 1) (at 92.1512 61.341 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "Connector_PinSocket_2.54mm:PinSocket_1x03_P2.54mm_Vertical" (id 2) (at 91.44 59.69 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 91.44 59.69 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 1b5a32e4-0b8e-4f38-b679-71dc277c2087))
-    (pin "2" (uuid 84febc35-87fd-4cad-8e04-2b66390cfc12))
-    (pin "3" (uuid 494d4ce3-60c4-4021-8bd1-ab41a12b14ed))
-  )
-
-  (symbol (lib_id "Connector:Conn_01x03_Female") (at 109.22 59.69 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 00000000-0000-0000-0000-000061fc080e)
-    (property "Reference" "JR2" (id 0) (at 109.9312 59.0296 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "ROT2" (id 1) (at 109.9312 61.341 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "Connector_PinSocket_2.54mm:PinSocket_1x03_P2.54mm_Vertical" (id 2) (at 109.22 59.69 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 109.22 59.69 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 2d0d333a-99a0-4575-9433-710c8cc7ac0b))
-    (pin "2" (uuid 7c6e532b-1afd-48d4-9389-2942dcbc7c3c))
-    (pin "3" (uuid d53baa32-ba88-4646-9db3-0e9b0f0da4f0))
-  )
-
-  (symbol (lib_id "Connector:Conn_01x03_Female") (at 144.78 59.69 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 00000000-0000-0000-0000-000061fc9334)
-    (property "Reference" "JR4" (id 0) (at 145.4912 59.0296 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "ROT4" (id 1) (at 145.4912 61.341 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "Connector_PinSocket_2.54mm:PinSocket_1x03_P2.54mm_Vertical" (id 2) (at 144.78 59.69 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 144.78 59.69 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 5fe7a4eb-9f04-4df6-a1fa-36c071e280d7))
-    (pin "2" (uuid a6891c49-3648-41ce-811e-fccb4c4653af))
-    (pin "3" (uuid 2d4d8c24-5b38-445b-8733-2a81ba21d33e))
-  )
-
-  (symbol (lib_id "Connector:Conn_01x03_Female") (at 127 59.69 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 00000000-0000-0000-0000-000062000db3)
-    (property "Reference" "JR3" (id 0) (at 127.7112 59.0296 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "ROT3" (id 1) (at 127.7112 61.341 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "Connector_PinSocket_2.54mm:PinSocket_1x03_P2.54mm_Vertical" (id 2) (at 127 59.69 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 127 59.69 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid fec6f717-d723-4676-89ef-8ea691e209c2))
-    (pin "2" (uuid 18cf1537-83e6-4374-a277-6e3e21479ab0))
-    (pin "3" (uuid a6c7f556-10bb-4a6d-b61b-a732ec6fa5cc))
-  )
-
-  (symbol (lib_id "Connector:Conn_01x03_Female") (at 109.22 29.21 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 00000000-0000-0000-0000-000063db2cef)
-    (property "Reference" "JR6" (id 0) (at 109.9312 28.5496 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "ROT6" (id 1) (at 109.9312 30.861 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "Connector_PinSocket_2.54mm:PinSocket_1x03_P2.54mm_Vertical" (id 2) (at 109.22 29.21 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 109.22 29.21 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid e746ec00-0dfd-4bc7-b357-6b4860c148ef))
-    (pin "2" (uuid 11547ba3-d459-4ced-9333-92979d5b86e1))
-    (pin "3" (uuid 3a274653-eff3-4ffe-9be8-2bfd0950af0a))
-  )
-
-  (symbol (lib_id "Connector:Conn_01x03_Female") (at 91.44 29.21 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 00000000-0000-0000-0000-000063db2cfd)
-    (property "Reference" "JR5" (id 0) (at 92.1512 28.5496 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "ROT5" (id 1) (at 92.1512 30.861 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "Connector_PinSocket_2.54mm:PinSocket_1x03_P2.54mm_Vertical" (id 2) (at 91.44 29.21 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 91.44 29.21 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 3ce4c631-4e8b-4ee6-a520-34bf7b12880c))
-    (pin "2" (uuid 062fbe79-da43-4e6a-bd6f-509557f2df9b))
-    (pin "3" (uuid 7147b342-4ca8-4694-a1ec-b615c151a5d0))
-  )
-
-  (symbol (lib_id "Connector:Conn_01x03_Female") (at 127 29.21 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 00000000-0000-0000-0000-000063db2d31)
-    (property "Reference" "JR7" (id 0) (at 127.7112 28.5496 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "ROT7" (id 1) (at 127.7112 30.861 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "Connector_PinSocket_2.54mm:PinSocket_1x03_P2.54mm_Vertical" (id 2) (at 127 29.21 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 127 29.21 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 84e154cc-34e9-48ac-ab7e-fc52b3bc90d0))
-    (pin "2" (uuid a57e46ab-4127-4b88-afea-d94b5d7bc928))
-    (pin "3" (uuid 5b5611ee-3a4f-4573-978f-2e48db0ecaf5))
-  )
-
-  (symbol (lib_id "Connector:Conn_01x03_Female") (at 144.78 29.21 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 00000000-0000-0000-0000-000063db2d3d)
-    (property "Reference" "JR8" (id 0) (at 145.4912 28.5496 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "ROT8" (id 1) (at 145.4912 30.861 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "Connector_PinSocket_2.54mm:PinSocket_1x03_P2.54mm_Vertical" (id 2) (at 144.78 29.21 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 144.78 29.21 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid eecd895d-4aa1-458c-8512-c9957fd00fad))
-    (pin "2" (uuid 8527ef2e-5212-4629-b6f5-b0130ab61dab))
-    (pin "3" (uuid 6c715627-9fe9-4566-9325-aed34f2a0ebd))
-  )
-
   (symbol (lib_id "power:PWR_FLAG") (at 161.29 60.96 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00006781ac6e)
@@ -988,6 +540,294 @@
     (pin "1" (uuid a543a4a0-b8e2-45a4-be48-7207020a5b1f))
   )
 
+  (symbol (lib_id "Connector:Conn_01x01_Male") (at 81.28 62.23 0) (mirror y) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 0a4a5095-16ff-4ec8-b82d-45b4d38ffde6)
+    (property "Reference" "J16" (id 0) (at 90.17 62.23 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+    (property "Value" "A5" (id 1) (at 86.36 62.23 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (id 2) (at 81.28 62.23 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 81.28 62.23 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 100a73e7-13ce-43bc-8783-1b4a2e371823))
+  )
+
+  (symbol (lib_id "Connector:Conn_01x01_Male") (at 81.28 34.29 0) (mirror y) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 0acb7b97-c6e6-44df-ad0d-230a70aa8726)
+    (property "Reference" "J6" (id 0) (at 90.17 34.29 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+    (property "Value" "A0" (id 1) (at 86.36 34.29 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (id 2) (at 81.28 34.29 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 81.28 34.29 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 868f491a-5ff7-4d2f-abbf-765cbc1ddc85))
+  )
+
+  (symbol (lib_id "Connector:Conn_01x01_Male") (at 81.28 57.15 0) (mirror y) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 0e20cbc1-6cd0-4252-8a14-c1d9146f2a63)
+    (property "Reference" "J14" (id 0) (at 90.17 57.15 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+    (property "Value" "A4" (id 1) (at 86.36 57.15 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (id 2) (at 81.28 57.15 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 81.28 57.15 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid ce619f39-5aaf-49e9-a33c-26732dec8e95))
+  )
+
+  (symbol (lib_id "Connector:Conn_01x01_Male") (at 81.28 49.53 0) (mirror y) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 2ea45036-6908-4767-a4a0-ac16e09767ee)
+    (property "Reference" "J12" (id 0) (at 90.17 49.53 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+    (property "Value" "A3" (id 1) (at 86.36 49.53 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (id 2) (at 81.28 49.53 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 81.28 49.53 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid bdda70c2-3421-4655-b5b9-d211191a6325))
+  )
+
+  (symbol (lib_id "Connector:Conn_01x01_Male") (at 81.28 52.07 0) (mirror y) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 3074fade-b34d-479b-8200-fadd967b837d)
+    (property "Reference" "J13" (id 0) (at 90.17 52.07 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+    (property "Value" "B3" (id 1) (at 86.36 52.07 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (id 2) (at 81.28 52.07 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 81.28 52.07 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid a5da963a-270f-4c3d-a079-114d8eef79b7))
+  )
+
+  (symbol (lib_id "Connector:Conn_01x01_Male") (at 81.28 44.45 0) (mirror y) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 355984fe-c4ef-4584-9c88-7aed9a4b1db8)
+    (property "Reference" "J10" (id 0) (at 90.17 44.45 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+    (property "Value" "A2" (id 1) (at 86.36 44.45 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (id 2) (at 81.28 44.45 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 81.28 44.45 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 537d030b-54bb-4562-9f1e-378ccefb4b2e))
+  )
+
+  (symbol (lib_id "Connector:Conn_01x01_Male") (at 81.28 69.85 0) (mirror y) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 371abc5a-52a7-4b87-8ec7-281e5dbbd659)
+    (property "Reference" "J19" (id 0) (at 90.17 69.85 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+    (property "Value" "B6" (id 1) (at 86.36 69.85 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (id 2) (at 81.28 69.85 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 81.28 69.85 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 0e441e9b-127f-4bc3-9162-215c89745050))
+  )
+
+  (symbol (lib_id "Connector:Conn_01x01_Male") (at 81.28 72.39 0) (mirror y) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 54238fb1-8778-4633-862d-fd76f64f1725)
+    (property "Reference" "J20" (id 0) (at 90.17 72.39 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+    (property "Value" "A7" (id 1) (at 86.36 72.39 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (id 2) (at 81.28 72.39 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 81.28 72.39 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid de89df40-cf54-4b4a-b610-257a50bfac09))
+  )
+
+  (symbol (lib_id "Connector:Conn_01x01_Male") (at 81.28 39.37 0) (mirror y) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 92529218-3086-4e38-a5d7-361f20edc13a)
+    (property "Reference" "J8" (id 0) (at 90.17 39.37 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+    (property "Value" "A1" (id 1) (at 86.36 39.37 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (id 2) (at 81.28 39.37 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 81.28 39.37 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 40af157d-bec1-489e-8581-29ec391f5c92))
+  )
+
+  (symbol (lib_id "Connector:Conn_01x01_Male") (at 81.28 67.31 0) (mirror y) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid ab8c7386-0042-433f-b83d-d0d190b2c608)
+    (property "Reference" "J18" (id 0) (at 90.17 67.31 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+    (property "Value" "A6" (id 1) (at 86.36 67.31 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (id 2) (at 81.28 67.31 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 81.28 67.31 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 09e255b2-6ceb-48d3-ab16-dfdfbff7cc7e))
+  )
+
+  (symbol (lib_id "Connector:Conn_01x01_Male") (at 81.28 59.69 0) (mirror y) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid afaec224-6eb9-4aa4-acce-937066a89442)
+    (property "Reference" "J15" (id 0) (at 90.17 59.69 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+    (property "Value" "B4" (id 1) (at 86.36 59.69 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (id 2) (at 81.28 59.69 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 81.28 59.69 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid fbe4ca78-db1d-425c-822e-cbaf51a10d48))
+  )
+
+  (symbol (lib_id "Connector:Conn_01x01_Male") (at 81.28 36.83 0) (mirror y) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid b93d027f-21f6-4fc9-ad3f-317eded6973b)
+    (property "Reference" "J7" (id 0) (at 90.17 36.83 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+    (property "Value" "B0" (id 1) (at 86.36 36.83 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (id 2) (at 81.28 36.83 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 81.28 36.83 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 395df0a5-800c-4cca-a0f1-3ad76d2e76ca))
+  )
+
+  (symbol (lib_id "Connector:Conn_01x01_Male") (at 81.28 64.77 0) (mirror y) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid c9521a26-be15-4a1e-8acc-422906829663)
+    (property "Reference" "J17" (id 0) (at 90.17 64.77 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+    (property "Value" "B5" (id 1) (at 86.36 64.77 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (id 2) (at 81.28 64.77 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 81.28 64.77 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 706e8940-8275-4fec-9841-867bd410d21e))
+  )
+
+  (symbol (lib_id "Connector:Conn_01x01_Male") (at 81.28 74.93 0) (mirror y) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid cc823f72-f0e4-4202-8e7e-d5cbcbc3c9fe)
+    (property "Reference" "J23" (id 0) (at 90.17 74.93 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+    (property "Value" "B7" (id 1) (at 86.36 74.93 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (id 2) (at 81.28 74.93 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 81.28 74.93 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid e7e652d0-8288-428b-b475-904d727ce73f))
+  )
+
+  (symbol (lib_id "Connector:Conn_01x01_Male") (at 81.28 46.99 0) (mirror y) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid e92cc26d-27f8-43e9-a58e-4cbff1061bf5)
+    (property "Reference" "J11" (id 0) (at 90.17 46.99 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+    (property "Value" "B2" (id 1) (at 86.36 46.99 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (id 2) (at 81.28 46.99 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 81.28 46.99 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 061b0977-703d-47fc-ba64-d6fb3f8737c3))
+  )
+
+  (symbol (lib_id "Connector:Conn_01x01_Male") (at 81.28 41.91 0) (mirror y) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid f1e08948-6b85-492c-99de-5fd6a459b81f)
+    (property "Reference" "J9" (id 0) (at 90.17 41.91 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+    (property "Value" "B1" (id 1) (at 86.36 41.91 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Connector_Pin:Pin_D0.7mm_L6.5mm_W1.8mm_FlatFork" (id 2) (at 81.28 41.91 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 81.28 41.91 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 50abaddd-47f5-4d26-a1ac-040e0a5b2a4e))
+  )
+
   (sheet_instances
     (path "/" (page "1"))
   )