Starting over from scratch apparently

author: XANTRONIX Development 2023-09-06 13:11:02 -0400
committer: XANTRONIX Development 2023-09-06 13:11:22 -0400
commit: 0a0f5618cd882dc47d92558146059de4e6bd0c54 (patch)
tree: 941e1969190daadc42d1c593b69b4c1ed8683797 /pcb
parent: 32177e8f0aa81bfbad003f3aed6c12d2d3a66fd1 (diff)
download: xantronix-z32-0a0f5618cd882dc47d92558146059de4e6bd0c54.tar.gz
xantronix-z32-0a0f5618cd882dc47d92558146059de4e6bd0c54.tar.bz2
xantronix-z32-0a0f5618cd882dc47d92558146059de4e6bd0c54.zip
2 files changed, 6229 insertions, 6716 deletions
diff --git a/pcb/xantronix-z32.kicad_pcb b/pcb/xantronix-z32.kicad_pcb
index f096a63..2efc11d 100644
--- a/pcb/xantronix-z32.kicad_pcb
+++ b/pcb/xantronix-z32.kicad_pcb
@@ -78,149 +78,149 @@
   (net 0 "")
   (net 1 "Net-(D1-K)")
   (net 2 "Net-(D1-A)")
-  (net 3 "Net-(D2-K)")
-  (net 4 "Net-(D3-K)")
-  (net 5 "Net-(D4-K)")
-  (net 6 "Net-(D5-K)")
-  (net 7 "Net-(D6-K)")
-  (net 8 "Net-(D7-K)")
-  (net 9 "Net-(D8-K)")
-  (net 10 "Net-(D9-K)")
-  (net 11 "Net-(D10-A)")
-  (net 12 "Net-(D10-K)")
-  (net 13 "Net-(D11-K)")
-  (net 14 "Net-(D12-K)")
-  (net 15 "Net-(D13-K)")
-  (net 16 "Net-(D14-K)")
-  (net 17 "Net-(D15-K)")
-  (net 18 "Net-(D16-K)")
-  (net 19 "Net-(D17-K)")
-  (net 20 "Net-(D17-A)")
-  (net 21 "Net-(D18-K)")
-  (net 22 "Net-(D19-K)")
-  (net 23 "Net-(D20-K)")
-  (net 24 "Net-(D21-K)")
-  (net 25 "Net-(D22-K)")
-  (net 26 "Net-(D23-K)")
-  (net 27 "Net-(D24-K)")
-  (net 28 "Net-(D25-K)")
-  (net 29 "Net-(D25-A)")
-  (net 30 "Net-(D26-K)")
-  (net 31 "Net-(D27-K)")
-  (net 32 "Net-(D28-K)")
-  (net 33 "Net-(D29-K)")
-  (net 34 "Net-(D30-K)")
-  (net 35 "Net-(D31-K)")
-  (net 36 "Net-(D32-K)")
-  (net 37 "Net-(D33-K)")
-  (net 38 "Net-(D33-A)")
-  (net 39 "Net-(D34-K)")
-  (net 40 "Net-(D35-K)")
-  (net 41 "Net-(D36-K)")
-  (net 42 "Net-(D37-K)")
-  (net 43 "Net-(D38-K)")
-  (net 44 "Net-(D39-K)")
-  (net 45 "Net-(D40-K)")
-  (net 46 "Net-(D41-K)")
-  (net 47 "Net-(D41-A)")
-  (net 48 "Net-(D42-K)")
-  (net 49 "Net-(D43-K)")
-  (net 50 "Net-(D44-K)")
-  (net 51 "Net-(D45-K)")
-  (net 52 "Net-(D46-K)")
-  (net 53 "Net-(D47-K)")
-  (net 54 "Net-(D48-K)")
-  (net 55 "Net-(D49-K)")
-  (net 56 "Net-(D49-A)")
-  (net 57 "Net-(D50-K)")
-  (net 58 "Net-(D51-K)")
-  (net 59 "Net-(D52-K)")
-  (net 60 "Net-(D53-K)")
-  (net 61 "Net-(D54-K)")
-  (net 62 "Net-(D55-K)")
-  (net 63 "Net-(D56-K)")
-  (net 64 "Net-(D56-A)")
-  (net 65 "Net-(D57-K)")
-  (net 66 "Net-(D58-K)")
-  (net 67 "Net-(D59-K)")
-  (net 68 "Net-(D60-K)")
-  (net 69 "Net-(D61-K)")
-  (net 70 "Net-(D62-K)")
-  (net 71 "Net-(J2-Pin_1)")
-  (net 72 "Net-(J2-Pin_2)")
-  (net 73 "Net-(J2-Pin_3)")
-  (net 74 "Net-(J2-Pin_4)")
-  (net 75 "Net-(J2-Pin_5)")
-  (net 76 "Net-(J2-Pin_6)")
-  (net 77 "Net-(J2-Pin_7)")
-  (net 78 "Net-(J2-Pin_8)")
-  (net 79 "unconnected-(SW63-Pad1)")
-  (net 80 "unconnected-(SW63-Pad2)")
-  (net 81 "unconnected-(SW64-Pad1)")
-  (net 82 "unconnected-(SW64-Pad2)")
+  (net 3 "Net-(D10-A)")
+  (net 4 "Net-(D10-K)")
+  (net 5 "Net-(D17-K)")
+  (net 6 "Net-(D17-A)")
+  (net 7 "Net-(D25-K)")
+  (net 8 "Net-(D25-A)")
+  (net 9 "Net-(D32-K)")
+  (net 10 "Net-(D33-A)")
+  (net 11 "Net-(D40-K)")
+  (net 12 "Net-(D41-A)")
+  (net 13 "Net-(D48-K)")
+  (net 14 "Net-(D49-A)")
+  (net 15 "Net-(D56-K)")
+  (net 16 "Net-(D56-A)")
+  (net 17 "Net-(J2-Pin_1)")
+  (net 18 "Net-(J2-Pin_2)")
+  (net 19 "Net-(J2-Pin_3)")
+  (net 20 "Net-(J2-Pin_4)")
+  (net 21 "Net-(J2-Pin_5)")
+  (net 22 "Net-(J2-Pin_6)")
+  (net 23 "Net-(J2-Pin_7)")
+  (net 24 "Net-(J2-Pin_8)")
+  (net 25 "unconnected-(SW63-Pad1)")
+  (net 26 "unconnected-(SW63-Pad2)")
+  (net 27 "unconnected-(SW64-Pad1)")
+  (net 28 "unconnected-(SW64-Pad2)")
+  (net 29 "Net-(D2-A)")
+  (net 30 "Net-(D3-A)")
+  (net 31 "Net-(D4-A)")
+  (net 32 "Net-(D5-A)")
+  (net 33 "Net-(D6-A)")
+  (net 34 "Net-(D7-A)")
+  (net 35 "Net-(D8-A)")
+  (net 36 "Net-(D9-A)")
+  (net 37 "Net-(D11-A)")
+  (net 38 "Net-(D12-A)")
+  (net 39 "Net-(D13-A)")
+  (net 40 "Net-(D14-A)")
+  (net 41 "Net-(D15-A)")
+  (net 42 "Net-(D16-A)")
+  (net 43 "Net-(D18-A)")
+  (net 44 "Net-(D19-A)")
+  (net 45 "Net-(D20-A)")
+  (net 46 "Net-(D21-A)")
+  (net 47 "Net-(D22-A)")
+  (net 48 "Net-(D23-A)")
+  (net 49 "Net-(D24-A)")
+  (net 50 "Net-(D26-A)")
+  (net 51 "Net-(D27-A)")
+  (net 52 "Net-(D28-A)")
+  (net 53 "Net-(D29-A)")
+  (net 54 "Net-(D30-A)")
+  (net 55 "Net-(D31-A)")
+  (net 56 "Net-(D32-A)")
+  (net 57 "Net-(D34-A)")
+  (net 58 "Net-(D35-A)")
+  (net 59 "Net-(D36-A)")
+  (net 60 "Net-(D37-A)")
+  (net 61 "Net-(D38-A)")
+  (net 62 "Net-(D39-A)")
+  (net 63 "Net-(D40-A)")
+  (net 64 "Net-(D42-A)")
+  (net 65 "Net-(D43-A)")
+  (net 66 "Net-(D44-A)")
+  (net 67 "Net-(D45-A)")
+  (net 68 "Net-(D46-A)")
+  (net 69 "Net-(D47-A)")
+  (net 70 "Net-(D48-A)")
+  (net 71 "Net-(D50-A)")
+  (net 72 "Net-(D51-A)")
+  (net 73 "Net-(D52-A)")
+  (net 74 "Net-(D53-A)")
+  (net 75 "Net-(D54-A)")
+  (net 76 "Net-(D55-A)")
+  (net 77 "Net-(D57-A)")
+  (net 78 "Net-(D58-A)")
+  (net 79 "Net-(D59-A)")
+  (net 80 "Net-(D60-A)")
+  (net 81 "Net-(D61-A)")
+  (net 82 "Net-(D62-A)")
 
   (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (layer "F.Cu")
-    (tstamp 00e9ccd0-f03b-4075-a23b-31e4c6f1e463)
-    (at 205.26375 197.32625)
+    (tstamp 0054825f-2007-446b-b02c-ccdb2cf4924e)
+    (at 309.72125 116.36375)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
     (property "Sheetname" "")
     (property "ki_description" "Push button switch, generic, two pins")
     (property "ki_keywords" "switch normally-open pushbutton push-button")
-    (path "/e4be4472-791a-45fb-b9b9-f7341dc1b2b5")
+    (path "/47f08870-2ce8-4aac-8b63-59c1ef74eb88")
     (attr through_hole)
-    (fp_text reference "SW63" (at -2.54 -2.794) (layer "F.SilkS")
+    (fp_text reference "SW44" (at -2.54 -2.794) (layer "F.SilkS")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 6f638d6c-5d6d-4142-aee6-c1699bb87d3f)
+      (tstamp 1c4beb5f-e44d-4770-8bae-753edb802414)
     )
     (fp_text value "SW_Push" (at -2.54 12.954) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 4e27ac82-ea88-4104-a6f8-ce5e0ae99cc0)
+      (tstamp 54991a7c-93ef-40af-a1e9-b5cd5158339a)
     )
     (fp_text user "${REFERENCE}" (at -2.54 -2.794) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp b6b844af-9d9a-40ff-bed5-05fca4cbe449)
+      (tstamp 9127d059-982b-484c-a3fe-db3065573daa)
     )
     (fp_line (start -9.525 -1.905) (end 4.445 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp fe6bedb8-3e3f-4c05-a9d2-20f9ce8e0708))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp e75f8059-384a-4cad-92d5-1511b3281125))
     (fp_line (start -9.525 12.065) (end -9.525 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 6a77a2c0-e424-4d66-a4ee-e5d59eeb246d))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp e51967c0-56c3-48a8-9cb7-a867e472c94c))
     (fp_line (start 4.445 -1.905) (end 4.445 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 90793919-d606-40d9-a840-a9dd0c03fd86))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 4b931207-d513-44fd-86a5-9afc811bc486))
     (fp_line (start 4.445 12.065) (end -9.525 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 6f667351-3ba5-4882-8229-55440bf65555))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 8253ea68-d8c9-4a2c-809f-db601c29b4c4))
     (fp_line (start -12.065 -4.445) (end 6.985 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp bfb78bc1-5351-48c2-8483-c1a845d4eb18))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp ca4fe866-c2c6-4af4-b34a-9ec1db6e45a7))
     (fp_line (start -12.065 14.605) (end -12.065 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp cf440cda-8bd2-410c-829c-b62608916805))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp b16c5961-c7d1-401a-8bac-88dca3049bf2))
     (fp_line (start 6.985 -4.445) (end 6.985 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 89fde748-7c98-4c42-ae7e-af6f9f1f38f4))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 9c113599-9ecd-4496-be71-3708aceae279))
     (fp_line (start 6.985 14.605) (end -12.065 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp c4dd2001-9227-4875-a55f-b87f3ec31229))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp ec81e38c-6e16-40ba-8247-82b4825c1cef))
     (fp_line (start -9.14 -1.52) (end 4.06 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 375db362-4108-4335-ab4a-e7085b68e917))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 04f0997d-f6c4-4fce-a1ec-56440f5825be))
     (fp_line (start -9.14 11.68) (end -9.14 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp fda5fe86-2b2f-4b9d-9d66-1ba458d7c1e1))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 10e589f0-1320-48cb-9203-177edfd14629))
     (fp_line (start 4.06 -1.52) (end 4.06 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp f85e4807-b668-4a81-b9bd-e29a244d263b))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 55070483-7b65-4ded-a61b-33d42104eaf3))
     (fp_line (start 4.06 11.68) (end -9.14 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 296980d0-cdc8-496f-8386-f180b0db01ec))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 36dc2860-218f-4f2f-862c-d1eb77958bf0))
     (fp_line (start -8.89 -1.27) (end 3.81 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp e24c5672-96dc-4680-a2ef-a5135ba738f8))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 9d59ba68-05e3-425a-b288-8a491190efa7))
     (fp_line (start -8.89 11.43) (end -8.89 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 490e379e-9599-4777-acc5-08ddf96ed2ae))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 6c0f4f9e-516c-4578-b16f-27681ba6f985))
     (fp_line (start 3.81 -1.27) (end 3.81 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 8268ec60-e712-4266-8b52-65afbe374a69))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp e2f1e942-f45c-4958-a7a7-5fa4430c7c0d))
     (fp_line (start 3.81 11.43) (end -8.89 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 1a2dcf22-0d32-438f-9fa4-31bb9854ce9b))
-    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 4363b3ac-f31b-4194-9790-ec21cd9f8cf3))
-    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 167c4303-5a94-4b49-ac6a-299d5aaead47))
-    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp fe6e46a2-3064-4a78-8c9d-a1cb76bce92b))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp e791271d-1b4c-499c-8835-3c85e1e8079b))
+    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 9be1d51e-9f07-4f59-8195-b4362fb4020f))
+    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp debb7ba7-2cd7-4919-a0c7-ac7049bcc032))
+    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 36d9e586-df6b-4933-8073-585695e67e47))
     (pad "1" thru_hole circle (at 0 0) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 79 "unconnected-(SW63-Pad1)") (pinfunction "1") (pintype "passive+no_connect") (tstamp 261765bc-32a6-4639-9a00-0670b872b81e))
+      (net 66 "Net-(D44-A)") (pinfunction "1") (pintype "passive") (tstamp 7649d76f-5e26-492b-a6f4-868a7316a53f))
     (pad "2" thru_hole circle (at -6.35 2.54) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 80 "unconnected-(SW63-Pad2)") (pinfunction "2") (pintype "passive+no_connect") (tstamp 4d5e7004-d799-42c9-8603-ec4efbe41e44))
+      (net 21 "Net-(J2-Pin_5)") (pinfunction "2") (pintype "passive") (tstamp ef0e1213-ab87-4f91-b9c9-735e29d7dafd))
     (model "${KICAD6_3DMODEL_DIR}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -228,69 +228,69 @@
     )
   )
 
-  (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.25u_PCB" (layer "F.Cu")
-    (tstamp 0318e298-97e3-4615-99d7-63b49f1b2f06)
-    (at 140.97 197.32625)
-    (descr "Cherry MX keyswitch, 1.25u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
-    (tags "Cherry MX keyswitch 1.25u PCB")
+  (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (layer "F.Cu")
+    (tstamp 031baba9-cb14-439b-a009-1100fcbed825)
+    (at 285.90875 154.46375)
+    (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
+    (tags "Cherry MX keyswitch 1.00u PCB")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
     (property "Sheetname" "")
     (property "ki_description" "Push button switch, generic, two pins")
     (property "ki_keywords" "switch normally-open pushbutton push-button")
-    (path "/8d496179-4b29-45bb-bc55-6a12488778b5")
+    (path "/4e3fcb84-d92f-4e3f-8c66-c773b77fd38f")
     (attr through_hole)
-    (fp_text reference "SW34" (at -2.54 -2.794) (layer "F.SilkS")
+    (fp_text reference "SW62" (at -2.54 -2.794) (layer "F.SilkS")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp f7ac0414-2ac8-4d17-9218-7f92a3880030)
+      (tstamp 91ecf8c4-f124-4553-9b5f-8d0edc7643bb)
     )
     (fp_text value "SW_Push" (at -2.54 12.954) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp a8d329e5-06b7-4c30-83a9-f4cb9f151ee6)
+      (tstamp 40da90bf-d6b1-4d81-b87c-e00c8196978e)
     )
     (fp_text user "${REFERENCE}" (at -2.54 -2.794) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 23a08364-6adb-47d4-bc39-bbaf80f5782d)
+      (tstamp e7ec4756-df3d-43b3-aa6a-1fdbf9650fdf)
     )
     (fp_line (start -9.525 -1.905) (end 4.445 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp a55d2a7e-a50e-48ba-aa47-be64194f966f))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp f7c81f7d-2da7-4fc4-aa47-4b65003aadd5))
     (fp_line (start -9.525 12.065) (end -9.525 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp a43091d2-16e4-4a2b-92ba-901173fbbafe))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp d11b58c2-f981-4c32-aac2-955c1af7c9c3))
     (fp_line (start 4.445 -1.905) (end 4.445 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp e03648f3-07a6-4ac8-9ec5-19fa5d4af29e))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 5187fe7a-9376-454a-96de-d54f3f1ee5d7))
     (fp_line (start 4.445 12.065) (end -9.525 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp a5d8ea9c-ac02-4957-8f08-adea1175c3b2))
-    (fp_line (start -14.44625 -4.445) (end 9.36625 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 9a304810-4611-4746-9eed-f3ca9f87bd00))
-    (fp_line (start -14.44625 14.605) (end -14.44625 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp a6e4e84f-a015-4dbf-a5c3-e036d494b6df))
-    (fp_line (start 9.36625 -4.445) (end 9.36625 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 3a8e1ae1-b9f0-4b2f-81fa-c3470f563f1e))
-    (fp_line (start 9.36625 14.605) (end -14.44625 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp f626e173-f69d-44f2-a279-1b6ad8449081))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 69293c24-0338-4742-b151-4f556d68eeb9))
+    (fp_line (start -12.065 -4.445) (end 6.985 -4.445)
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 4333ac38-4e83-49bc-aabf-2934f310aeca))
+    (fp_line (start -12.065 14.605) (end -12.065 -4.445)
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 05345818-d3c5-41a7-ba81-985a0d5018e6))
+    (fp_line (start 6.985 -4.445) (end 6.985 14.605)
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp d32628ff-ca65-436a-b08b-9ce1caa2ea96))
+    (fp_line (start 6.985 14.605) (end -12.065 14.605)
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 249b2272-3695-4868-aa82-6f0d103e5899))
     (fp_line (start -9.14 -1.52) (end 4.06 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 2a05002b-f3fe-4fe1-af0c-436e857bf482))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp f1bbad00-4895-44f3-a47a-56ce022761fd))
     (fp_line (start -9.14 11.68) (end -9.14 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp bb3da34f-7cbe-4f26-9f00-08e32ef68464))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 77444d31-8df6-4a57-829e-b750ed12c5c5))
     (fp_line (start 4.06 -1.52) (end 4.06 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp cf5f1787-b1d1-4458-b596-a472679639b0))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 267adaee-b986-4d4d-bd5c-c5de1d95bd21))
     (fp_line (start 4.06 11.68) (end -9.14 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 55bcea4c-1712-4e2a-a1b1-1bdb6503f222))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp a45c89eb-e658-425a-8f32-27ccde540233))
     (fp_line (start -8.89 -1.27) (end 3.81 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp a6fb12c5-74df-444a-900a-81261127aa1f))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp ff439708-30ec-4070-a32c-34226155d848))
     (fp_line (start -8.89 11.43) (end -8.89 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 22c034d3-f509-4e9c-b658-8f4199ec8934))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 80a4064f-7b79-4d15-b202-70e788bd66bf))
     (fp_line (start 3.81 -1.27) (end 3.81 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 77a4f46b-80d5-4dee-adab-c0278f3789e4))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp ecfb51af-8e28-4656-98c4-518005a93b88))
     (fp_line (start 3.81 11.43) (end -8.89 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 956ee788-3817-49ec-b4f3-9f5de6ac26e3))
-    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 71e19a40-d2f2-4c3a-a754-1c140a8e5ab4))
-    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 5f2bb7da-2621-4891-ac80-febd1be8f557))
-    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp d9f9fb08-a6e0-47ba-808b-0c23ce44611b))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 8639a1ee-41f7-45ba-83fa-abc5a6db3580))
+    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp d004f155-a878-4ba8-a346-f8748e0a6015))
+    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 9e99308b-67d5-4b6b-ae77-f96876fe199c))
+    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp c532b92a-8b35-432e-b172-df8f6558fa4e))
     (pad "1" thru_hole circle (at 0 0) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 39 "Net-(D34-K)") (pinfunction "1") (pintype "passive") (tstamp 998d5c0a-bd0e-4999-a54e-e141bea303d4))
+      (net 82 "Net-(D62-A)") (pinfunction "1") (pintype "passive") (tstamp f1f63627-782b-4cb8-8b05-c610f474b021))
     (pad "2" thru_hole circle (at -6.35 2.54) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 72 "Net-(J2-Pin_2)") (pinfunction "2") (pintype "passive") (tstamp 6001f0aa-24de-473c-a7c1-1be1f0b4af60))
-    (model "${KICAD6_3DMODEL_DIR}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.25u_PCB.wrl"
+      (net 23 "Net-(J2-Pin_7)") (pinfunction "2") (pintype "passive") (tstamp 0f91093b-0373-4343-a01d-8c6d5f595739))
+    (model "${KICAD6_3DMODEL_DIR}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
       (rotate (xyz 0 0 0))
@@ -298,67 +298,67 @@
   )
 
   (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (layer "F.Cu")
-    (tstamp 0492d96d-9fff-467c-b0f0-12f5e348e8e5)
-    (at 333.85125 159.22625)
+    (tstamp 04e9616c-2aca-4e7d-a718-69ed8063867d)
+    (at 138.27125 116.36375)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
     (property "Sheetname" "")
     (property "ki_description" "Push button switch, generic, two pins")
     (property "ki_keywords" "switch normally-open pushbutton push-button")
-    (path "/580209c0-81a3-4b19-a136-db4fe075bf06")
+    (path "/196294c1-afe7-404d-bdc1-53ab04a64e48")
     (attr through_hole)
-    (fp_text reference "SW27" (at -2.54 -2.794) (layer "F.SilkS")
+    (fp_text reference "SW11" (at -2.54 -2.794) (layer "F.SilkS")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp ee64e931-aec1-418b-822f-47eb39adc233)
+      (tstamp 605b1966-4016-4f38-bfa1-6452733b9bf0)
     )
     (fp_text value "SW_Push" (at -2.54 12.954) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 91bc0a03-991f-4770-ae7a-abda16063696)
+      (tstamp e879d6c5-97d0-4e2d-9d6e-28b925c2b647)
     )
     (fp_text user "${REFERENCE}" (at -2.54 -2.794) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp ebbe5d38-48fd-4d9a-a6bc-96d9921a0808)
+      (tstamp c1952511-d4d9-4843-b5ee-08d6e9613242)
     )
     (fp_line (start -9.525 -1.905) (end 4.445 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 4241764f-9282-4090-8fea-024a57b3da51))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 357a9c2a-28a7-4a32-bbdb-20be3a9cdb3b))
     (fp_line (start -9.525 12.065) (end -9.525 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp eab33406-2827-46e3-95e1-f55467c77816))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 4f876bdf-ab0c-4e4d-9765-f3e79eacf998))
     (fp_line (start 4.445 -1.905) (end 4.445 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp fff47a72-f8be-4c5a-8eaa-aeed3b1c7e26))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 78f53815-e80b-44d2-a6e6-79d450164f41))
     (fp_line (start 4.445 12.065) (end -9.525 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp d57131df-ab27-4a6b-9672-426fc0554d17))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 9714771d-3547-4e1c-b3ec-56b1020315c5))
     (fp_line (start -12.065 -4.445) (end 6.985 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 308e4c96-adf7-41db-85bc-f66bff897517))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp d76d5a3d-3140-4f96-b18a-ed9dc9dcf990))
     (fp_line (start -12.065 14.605) (end -12.065 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 6ec0c427-361a-4859-ae89-b33c75f89c15))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 33c9667c-7948-433d-8956-84d8e6ed23db))
     (fp_line (start 6.985 -4.445) (end 6.985 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp e52fafff-9cb0-4a81-bd26-700f06357e67))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 697ee2ef-5c18-404e-9dc7-3f70fa594f9a))
     (fp_line (start 6.985 14.605) (end -12.065 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp f1bee96d-5316-4bf5-b162-1b45295c793b))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp fff30890-7dc4-4f68-80a0-1f25db9205df))
     (fp_line (start -9.14 -1.52) (end 4.06 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 9e67b870-cf8e-435e-b4ec-5f2a358e56d3))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp be43fb9b-4e01-4651-b552-382ed29fd797))
     (fp_line (start -9.14 11.68) (end -9.14 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp b0cb6de9-99e8-4b53-91b3-c13382cd138e))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp ff9ed96d-abda-4d67-8f45-ed2ba87bc73b))
     (fp_line (start 4.06 -1.52) (end 4.06 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 9decb846-4fef-4ad5-bb9b-74478a991a39))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 4c17a572-3893-4c66-81a5-6e2d41f3d2c5))
     (fp_line (start 4.06 11.68) (end -9.14 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 0ee9a9b7-a6a9-486c-a530-52015b346c31))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 61647f2a-a04f-40f5-b2d7-1fd5537fabed))
     (fp_line (start -8.89 -1.27) (end 3.81 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 1f7c4569-0b33-4bde-9250-3a189fed9b18))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp d1d163fb-55b5-4789-88e5-c2b79945a955))
     (fp_line (start -8.89 11.43) (end -8.89 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 34584254-f96c-4aa6-83ac-4603e075c18d))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp ff2fe072-a614-492e-be00-ca13049918e3))
     (fp_line (start 3.81 -1.27) (end 3.81 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 9708503f-2dd3-4fbe-b696-bb08a81fb1d0))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 1c680665-a105-4b50-93c2-d508ba566f55))
     (fp_line (start 3.81 11.43) (end -8.89 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 7fc35f73-3c4a-4513-b02b-aab4206eb03f))
-    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 3b0ebeef-d5d1-4e18-8273-95ca8a1a8a7d))
-    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp ea2b1e01-9d32-4da8-8489-bf624bcbe2b6))
-    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 5eba13f4-4ae3-44af-8151-01075ec81f61))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp a6437b79-e497-491d-b673-078f46f7963d))
+    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 74754c50-efce-4c98-8fac-881479167c33))
+    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 5c55d25a-ebf2-46e3-9d54-8d487fa5691d))
+    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp cab31074-ba4d-4696-9db3-63ab27f191b9))
     (pad "1" thru_hole circle (at 0 0) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 31 "Net-(D27-K)") (pinfunction "1") (pintype "passive") (tstamp 19ef29bc-890f-4d0e-b763-a5f6fcbc729a))
+      (net 37 "Net-(D11-A)") (pinfunction "1") (pintype "passive") (tstamp 507d33f6-93db-4c6d-b931-543452e4bbad))
     (pad "2" thru_hole circle (at -6.35 2.54) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 73 "Net-(J2-Pin_3)") (pinfunction "2") (pintype "passive") (tstamp 6806cca1-9fcb-415c-a606-e35a626442ae))
+      (net 19 "Net-(J2-Pin_3)") (pinfunction "2") (pintype "passive") (tstamp 71869527-033c-448c-b5e5-7acb4e7e60a4))
     (model "${KICAD6_3DMODEL_DIR}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -366,138 +366,138 @@
     )
   )
 
-  (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.75u_PCB" (layer "F.Cu")
-    (tstamp 06c5f7ce-6f91-442b-9bfe-2e518e7f148b)
-    (at 350.52 178.27625)
-    (descr "Cherry MX keyswitch, 1.75u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
-    (tags "Cherry MX keyswitch 1.75u PCB")
+  (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (layer "F.Cu")
+    (tstamp 11c2ba1c-626b-4f57-bba4-6ecba70b9832)
+    (at 276.38375 135.41375)
+    (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
+    (tags "Cherry MX keyswitch 1.00u PCB")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
     (property "Sheetname" "")
     (property "ki_description" "Push button switch, generic, two pins")
     (property "ki_keywords" "switch normally-open pushbutton push-button")
-    (path "/bb5ca01c-fc8b-4d30-a0c8-370eea6d521a")
+    (path "/cacec6bd-a2af-4d16-9a24-063ed221e6c5")
     (attr through_hole)
-    (fp_text reference "SW25" (at -2.54 -2.794) (layer "F.SilkS")
+    (fp_text reference "SW54" (at -2.54 -2.794) (layer "F.SilkS")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp b82ad82c-24b8-4cc7-9785-a5a147bf6662)
+      (tstamp 7265a149-81e6-48e1-8b5b-44d41ea9f758)
     )
     (fp_text value "SW_Push" (at -2.54 12.954) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 1ed03750-fd67-48be-a2b0-9272b60550ab)
+      (tstamp a5c8fd79-306b-4b56-8bc3-e894de435de8)
     )
     (fp_text user "${REFERENCE}" (at -2.54 -2.794) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp efb5142b-7f48-4c7c-aaf5-c1d6740b37f7)
+      (tstamp ddf0d727-d508-4506-b6c3-34245b7adf9f)
     )
     (fp_line (start -9.525 -1.905) (end 4.445 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 3f81af46-ecd7-4e2a-aa5c-92122073b954))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 52fa40ef-8041-47be-ac0f-eeea54f2abfe))
     (fp_line (start -9.525 12.065) (end -9.525 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp fa949c94-7be4-459b-834f-b713eba774ef))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 339e2e92-9cd3-45fd-9f8b-e9a30f5a2027))
     (fp_line (start 4.445 -1.905) (end 4.445 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 478be102-6db9-4970-9e41-8b634c9638e8))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp e6e879db-7992-416c-a65c-dba25bb53bfb))
     (fp_line (start 4.445 12.065) (end -9.525 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 84de3d37-6307-46c0-9f3e-3944005be6fc))
-    (fp_line (start -19.20875 -4.445) (end 14.12875 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 328bb0a0-9597-42f2-878c-96271c99803b))
-    (fp_line (start -19.20875 14.605) (end -19.20875 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 27cc0101-0986-4867-98dc-7725085f1495))
-    (fp_line (start 14.12875 -4.445) (end 14.12875 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp a408c5f8-0268-45ac-92a2-aff353078596))
-    (fp_line (start 14.12875 14.605) (end -19.20875 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 61bb05d9-7db3-4af1-8610-be11e284a96c))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 853ac91e-7966-46fd-84ad-482ccf04948e))
+    (fp_line (start -12.065 -4.445) (end 6.985 -4.445)
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 70731eeb-5b35-4b65-a7dd-525a44d2ef27))
+    (fp_line (start -12.065 14.605) (end -12.065 -4.445)
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 88b4df19-9f38-48b9-be7d-b87cc8dffd55))
+    (fp_line (start 6.985 -4.445) (end 6.985 14.605)
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 907830b5-10a1-4f2c-9a08-40da69365447))
+    (fp_line (start 6.985 14.605) (end -12.065 14.605)
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 6b78de82-1d1d-4a9c-8421-c2ea36010689))
     (fp_line (start -9.14 -1.52) (end 4.06 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 346a5d1d-26c0-45e5-a4c6-d30303cdccf0))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 8bcdf6a8-eb47-454f-a1ee-f97de1fbacf0))
     (fp_line (start -9.14 11.68) (end -9.14 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 97ce28dd-d2f0-4546-8395-f2467e890c0f))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 8ec67a36-c67d-49ea-8a00-6f4a7787c260))
     (fp_line (start 4.06 -1.52) (end 4.06 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 6c54ef11-017c-4d18-8cf6-22821e71b275))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 7f69bf15-4dde-4742-a4fc-f2b9463b8767))
     (fp_line (start 4.06 11.68) (end -9.14 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp c6c23492-1c1e-4ea2-85c5-82e4671ecb3b))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp e2b1bbb1-67d8-47cc-bbe3-3368f9b33357))
     (fp_line (start -8.89 -1.27) (end 3.81 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp c4c0a44a-e2b5-4388-9c93-53597aaf37f1))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp ad893bfa-030a-48c9-a171-77de3b85c394))
     (fp_line (start -8.89 11.43) (end -8.89 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 3675a22a-87c0-4900-9064-16e18b613008))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 055626f8-d986-44ff-92fe-db87825ade09))
     (fp_line (start 3.81 -1.27) (end 3.81 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 8c1f096f-823d-44ec-9d33-c3bcb4bab4a3))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp a3457a14-36f7-4265-8297-aaefc07bafba))
     (fp_line (start 3.81 11.43) (end -8.89 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp f2f39270-862f-41ac-88a8-8bf88ac57fe4))
-    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp cb7957c9-5930-4370-97f7-3d5edc72490b))
-    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 444bb130-dc03-4832-a3b3-3f17c503179e))
-    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp a3f6ee94-7952-40b0-bbe7-48e24e4383a3))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 3647f15a-5464-406d-99e1-ab4b2b076ca3))
+    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp efd9e91e-e50e-4fd0-8210-115cd03b5ecb))
+    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 7e516afe-59a5-4839-b03d-d05172a82a4b))
+    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 8452ead2-8434-4243-b1e5-bda3859984b5))
     (pad "1" thru_hole circle (at 0 0) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 28 "Net-(D25-K)") (pinfunction "1") (pintype "passive") (tstamp 0d6071ed-0e5c-4e4a-8d9b-2133762645f8))
+      (net 75 "Net-(D54-A)") (pinfunction "1") (pintype "passive") (tstamp d46eda46-0f2c-450c-90a2-839aebb7fdee))
     (pad "2" thru_hole circle (at -6.35 2.54) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 71 "Net-(J2-Pin_1)") (pinfunction "2") (pintype "passive") (tstamp edf6eabd-bf5b-4371-bb20-f5cbdaef870d))
-    (model "${KICAD6_3DMODEL_DIR}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.75u_PCB.wrl"
+      (net 23 "Net-(J2-Pin_7)") (pinfunction "2") (pintype "passive") (tstamp 091eb1fc-b60b-4784-87b7-0e0658aac62c))
+    (model "${KICAD6_3DMODEL_DIR}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
       (rotate (xyz 0 0 0))
     )
   )
 
-  (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (layer "F.Cu")
-    (tstamp 096d9cc3-c7ba-467d-9dd5-37b09b861d02)
-    (at 243.36375 197.32625)
-    (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
-    (tags "Cherry MX keyswitch 1.00u PCB")
+  (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.25u_PCB" (layer "F.Cu")
+    (tstamp 13cce2dc-4a40-4edc-822a-8bff3cc2b599)
+    (at 164.465 173.51375)
+    (descr "Cherry MX keyswitch, 1.25u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
+    (tags "Cherry MX keyswitch 1.25u PCB")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
     (property "Sheetname" "")
     (property "ki_description" "Push button switch, generic, two pins")
     (property "ki_keywords" "switch normally-open pushbutton push-button")
-    (path "/588bef79-1bc3-4dc1-b83d-38785b9b2f6f")
+    (path "/ced96de0-056e-47c5-b41f-131429d6ca9b")
     (attr through_hole)
-    (fp_text reference "SW64" (at -2.54 -2.794) (layer "F.SilkS")
+    (fp_text reference "SW25" (at -2.54 -2.794) (layer "F.SilkS")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp bd319c11-af97-4680-9d87-bea7d8490a0e)
+      (tstamp 4aec9147-60e3-40ba-9fab-3c1a75344390)
     )
     (fp_text value "SW_Push" (at -2.54 12.954) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 7d458e28-b7af-4a65-9f69-cc797ec99ee6)
+      (tstamp 463732c1-0ab7-4627-b6c0-d5cf9165aec4)
     )
     (fp_text user "${REFERENCE}" (at -2.54 -2.794) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp be2d0ac5-141b-4b41-b023-fe720b737ce3)
+      (tstamp b7b74d0b-7d9a-4e3b-8692-4c67e2f56a25)
     )
     (fp_line (start -9.525 -1.905) (end 4.445 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp d85ec96d-8ee3-4f8c-800a-7a7658787ea3))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 9da94c97-f34c-4a1a-b817-6605a3ac2962))
     (fp_line (start -9.525 12.065) (end -9.525 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 6f11d0ea-cba8-44fe-a261-67fd3af4e410))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 9301d196-777c-40ca-ae25-95148904a73b))
     (fp_line (start 4.445 -1.905) (end 4.445 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp f0037792-65cc-41ba-bcf8-a85c22e6809b))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 68d9515b-d850-4f1f-9cd9-e1bb794ba03a))
     (fp_line (start 4.445 12.065) (end -9.525 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 1d060b17-20a6-41b0-874e-6afb8c071c4a))
-    (fp_line (start -12.065 -4.445) (end 6.985 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 7db9e4a9-ce00-4a8b-9e10-bbe7ff8a33bc))
-    (fp_line (start -12.065 14.605) (end -12.065 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp a3c8f6c4-3ff3-49c7-92d2-793f228bc9bf))
-    (fp_line (start 6.985 -4.445) (end 6.985 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp cdae5cd8-e7f6-408e-99b5-2484b46b9b16))
-    (fp_line (start 6.985 14.605) (end -12.065 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 0f1fad8a-9243-4dfc-af82-6df60177f07b))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 3384fc0f-c0b9-4305-a073-50b2bad84955))
+    (fp_line (start -14.44625 -4.445) (end 9.36625 -4.445)
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 0710f6a1-05a7-4425-bbd1-21809fc1b96d))
+    (fp_line (start -14.44625 14.605) (end -14.44625 -4.445)
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 77305e18-e4de-42a1-a2a8-f6ab0e5a7985))
+    (fp_line (start 9.36625 -4.445) (end 9.36625 14.605)
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp e55ecf90-23bf-481b-86fd-4eecfb1c1afd))
+    (fp_line (start 9.36625 14.605) (end -14.44625 14.605)
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 548374aa-ea3b-4c47-98f8-fcc60a8116f4))
     (fp_line (start -9.14 -1.52) (end 4.06 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp dbf69d11-bff1-4f75-9594-fa1fb8e75d2c))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 1cbb47e3-51a5-448b-99fd-d00dd2e5156d))
     (fp_line (start -9.14 11.68) (end -9.14 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 9ba30b9d-2d12-4281-bbef-936b3e799b2d))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 485d09b9-c429-4895-b883-89a16e2375cb))
     (fp_line (start 4.06 -1.52) (end 4.06 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp eebfb41f-05ec-46a7-aeaf-dff857592394))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp adc5e1e3-fd94-4fe1-86d9-3ebfb8833a44))
     (fp_line (start 4.06 11.68) (end -9.14 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 0b9f09b9-141c-4334-be7f-12dc29e22972))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp faa41b66-fbea-4e30-8e83-4148eb660516))
     (fp_line (start -8.89 -1.27) (end 3.81 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 246851b3-6004-40bd-9862-6cebb826837c))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp c4938d42-30f9-43df-9586-a158b59b7cbd))
     (fp_line (start -8.89 11.43) (end -8.89 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp dec16fee-f6c3-4c4c-8c6c-d54585626abe))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp d6fc4e65-0d8d-49a1-9679-f49725dc0702))
     (fp_line (start 3.81 -1.27) (end 3.81 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 7ad16628-a178-47ee-8d9a-5bae00cb51ec))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp bfd4dfd9-4552-4393-bff3-20e8149baecf))
     (fp_line (start 3.81 11.43) (end -8.89 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 89eb2d9c-16bc-432e-816a-583552e8bef4))
-    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 7ff40f6a-9e18-4d49-8d2e-603ac4134581))
-    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 700eca44-a385-49bd-bc18-2ac8278ece3c))
-    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 472bc3e0-4a1f-4e87-aaf0-0438bdf2b419))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 1e239fd8-8ab3-4c09-b3fa-21185ab87b3c))
+    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp f04f378e-c444-42b8-b4d6-3d4839126544))
+    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp a579e612-51bc-4527-8523-cf99d7736b18))
+    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp ef12baa6-3c4b-45b1-9311-c2c2d7c2fc4a))
     (pad "1" thru_hole circle (at 0 0) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 81 "unconnected-(SW64-Pad1)") (pinfunction "1") (pintype "passive+no_connect") (tstamp 31541249-bbf4-42c5-a581-c3b9ecd32daa))
+      (net 8 "Net-(D25-A)") (pinfunction "1") (pintype "passive") (tstamp 7f3725e4-f689-4435-a296-6b422d9c8616))
     (pad "2" thru_hole circle (at -6.35 2.54) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 82 "unconnected-(SW64-Pad2)") (pinfunction "2") (pintype "passive+no_connect") (tstamp 310088c4-54ed-464f-b7ac-81f41ed4aad1))
-    (model "${KICAD6_3DMODEL_DIR}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl"
+      (net 17 "Net-(J2-Pin_1)") (pinfunction "2") (pintype "passive") (tstamp 038bae8e-ac68-42dc-aa06-834ce142a923))
+    (model "${KICAD6_3DMODEL_DIR}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.25u_PCB.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
       (rotate (xyz 0 0 0))
@@ -505,67 +505,67 @@
   )
 
   (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (layer "F.Cu")
-    (tstamp 0fa88c27-73c2-4141-a22d-6b0a42ea91e2)
-    (at 229.07625 178.27625)
+    (tstamp 187de4fc-1991-4192-8907-d57a3a171e30)
+    (at 300.19625 173.51375)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
     (property "Sheetname" "")
     (property "ki_description" "Push button switch, generic, two pins")
     (property "ki_keywords" "switch normally-open pushbutton push-button")
-    (path "/4f36469a-154b-4cf1-9106-421bebfbe45e")
+    (path "/ab32895c-cd3b-4a30-8de1-e6146316953a")
     (attr through_hole)
-    (fp_text reference "SW53" (at -2.54 -2.794) (layer "F.SilkS")
+    (fp_text reference "SW60" (at -2.54 -2.794) (layer "F.SilkS")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 20dcb517-b287-45a9-9bbb-dd01d29c064d)
+      (tstamp 2c6842c2-3f3d-40c5-ba4f-f9616633ff6a)
     )
     (fp_text value "SW_Push" (at -2.54 12.954) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 938bd3d8-15a6-49b2-b9a4-67aa10ceb318)
+      (tstamp aa1cc866-1667-47c6-ad05-013f32b014fa)
     )
     (fp_text user "${REFERENCE}" (at -2.54 -2.794) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp a5737aba-9d89-41c7-96d7-22780577d7f2)
+      (tstamp 96614d82-9d6e-4606-be35-5184b90e8ebc)
     )
     (fp_line (start -9.525 -1.905) (end 4.445 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 8e048f9d-938e-4509-99ff-6cd5da5addaa))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 05add9a3-6c25-41ac-9efd-2d99f6526d82))
     (fp_line (start -9.525 12.065) (end -9.525 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp bf799370-1bc1-4d0a-b996-951548fd04bd))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp f023bf58-a581-45be-9e92-59f1e51057a9))
     (fp_line (start 4.445 -1.905) (end 4.445 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp f7ff8f2a-30e4-4809-8194-a8ce9b2071c4))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 504460d5-f08c-4358-900d-032a5eae4701))
     (fp_line (start 4.445 12.065) (end -9.525 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 568c5635-c64c-4135-bd0d-5206a82ec377))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp d89090e7-ecc0-4ab0-92ab-b72f25491aba))
     (fp_line (start -12.065 -4.445) (end 6.985 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 1c599cd1-77bc-4a55-9186-290469cef751))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 8a2d3ba0-582e-4a98-b6ad-27106d2243be))
     (fp_line (start -12.065 14.605) (end -12.065 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 6c29b35e-8a09-44e7-8f11-07c16686907f))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp dc56cf4a-7799-43af-ad7f-bbad63899106))
     (fp_line (start 6.985 -4.445) (end 6.985 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 5b0d28c0-befd-4527-a9bb-40764f69e296))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 4e308fe6-82b3-4e12-9ec4-96e3afb19ed0))
     (fp_line (start 6.985 14.605) (end -12.065 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 8afab7ff-5b85-42e8-b236-90573d1a8a92))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 89f81298-607c-4e57-940f-bedd1c0792d4))
     (fp_line (start -9.14 -1.52) (end 4.06 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp e3dd6a32-9b09-4f6f-9566-be5bdbb1f62c))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp eaa1b0b5-978a-4afe-a97f-68fe118e46f8))
     (fp_line (start -9.14 11.68) (end -9.14 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp d3938393-d935-4304-865a-07755e2869ce))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp dc094b47-311f-47b2-826e-55105e783e12))
     (fp_line (start 4.06 -1.52) (end 4.06 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp fc36ea02-7ff0-4303-b328-95b627856a92))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp ab9cc38b-a7e4-4c32-a3ff-6ec4bdd0e3ad))
     (fp_line (start 4.06 11.68) (end -9.14 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 00cd1f24-2c82-48a4-a30a-4bc67e1c6640))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 3df52e8f-f403-4042-86bd-ee7c799bae75))
     (fp_line (start -8.89 -1.27) (end 3.81 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp dd4b611a-023a-48f6-a08f-a68707e6b6e8))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp c41a83ed-7cd0-4d73-885f-389b03495bad))
     (fp_line (start -8.89 11.43) (end -8.89 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 4008b763-18b0-4d1d-b3d3-2cf51167db0f))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 00182949-886f-4b9c-b2d2-abb26b17e341))
     (fp_line (start 3.81 -1.27) (end 3.81 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 2e0b0412-d36d-4232-a0ec-e873ac422cf2))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 5d78dd0b-582a-45f4-bcaa-b4474d37cb40))
     (fp_line (start 3.81 11.43) (end -8.89 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp c04c0972-ee51-4262-a860-58f5dcd6c2dd))
-    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 9c85ae1a-187a-45de-9193-9d9550696479))
-    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp ec436866-51db-44b4-83b1-10e169064f5a))
-    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp c02665b2-d4bd-44be-a6b9-4e3ef2eb450c))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 22109c30-1b41-4c6f-9f34-a9f907048dd6))
+    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 298b7af9-6682-4b2e-9815-1228ad357510))
+    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 63c9a319-d184-4991-a7ec-fa8ed145574d))
+    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 3cc762ac-b246-493c-abf1-49bb3a7ed3a5))
     (pad "1" thru_hole circle (at 0 0) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 60 "Net-(D53-K)") (pinfunction "1") (pintype "passive") (tstamp 961e4a0b-f78c-4ef8-b0fd-3a914a2278a6))
+      (net 80 "Net-(D60-A)") (pinfunction "1") (pintype "passive") (tstamp d389bf61-a41f-4c94-a26b-7b90d0f4080e))
     (pad "2" thru_hole circle (at -6.35 2.54) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 75 "Net-(J2-Pin_5)") (pinfunction "2") (pintype "passive") (tstamp 1352a2ea-0e35-408a-8f93-9c539361a396))
+      (net 21 "Net-(J2-Pin_5)") (pinfunction "2") (pintype "passive") (tstamp bdb0c767-d7a5-4e1c-8ce7-0cb45904b4db))
     (model "${KICAD6_3DMODEL_DIR}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -574,67 +574,67 @@
   )
 
   (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (layer "F.Cu")
-    (tstamp 14a79680-be77-4b1b-9203-c1390e66cad4)
-    (at 214.78875 140.17625)
+    (tstamp 1b68f3da-f54a-4304-babc-ea95b3bd92e6)
+    (at 281.14625 97.31375)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
     (property "Sheetname" "")
     (property "ki_description" "Push button switch, generic, two pins")
     (property "ki_keywords" "switch normally-open pushbutton push-button")
-    (path "/c9b0db19-e9a1-4572-b67a-906ff145f290")
+    (path "/29f0773c-cd8a-4a03-9335-c2747ca05849")
     (attr through_hole)
-    (fp_text reference "SW23" (at -2.54 -2.794) (layer "F.SilkS")
+    (fp_text reference "SW37" (at -2.54 -2.794) (layer "F.SilkS")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 80daaee9-05b9-4596-9d42-74d338da0c39)
+      (tstamp 51dc8394-e9e1-48fb-a283-5f0fdf1d5690)
     )
     (fp_text value "SW_Push" (at -2.54 12.954) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp e06206a7-4f9c-4123-9949-a000f7a7f094)
+      (tstamp 7c652553-e75e-47d2-aafe-da8581839f98)
     )
     (fp_text user "${REFERENCE}" (at -2.54 -2.794) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp f0a2e9cc-ebf4-4ada-bd52-a63a375d6440)
+      (tstamp 06853e74-9b40-4abb-8ea7-164153b9a670)
     )
     (fp_line (start -9.525 -1.905) (end 4.445 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 307089f9-ab06-4473-a584-036ae9857c4d))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 1b763728-ad3a-472e-ae56-1a1494e75914))
     (fp_line (start -9.525 12.065) (end -9.525 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp b9fbb8ce-e78f-4aea-9bba-68d4b2822fbe))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp c245cc0a-dec8-48e6-b377-f32bb33ca0c1))
     (fp_line (start 4.445 -1.905) (end 4.445 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 2faa82b7-17c2-41bd-8031-aad6a99b303f))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp dbfa73ad-97c2-4c65-acdd-9702b34c672c))
     (fp_line (start 4.445 12.065) (end -9.525 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp ec6a8181-96a7-46e7-9034-47340fdadc23))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 52ad177b-deab-4d8b-b7cc-ab63d77e907d))
     (fp_line (start -12.065 -4.445) (end 6.985 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 6c429d40-36d5-4cfc-8858-939563ff8629))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 00c44e3a-c912-4a94-95cc-9bc10cf8bbcd))
     (fp_line (start -12.065 14.605) (end -12.065 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 4f4fb0a4-f445-473e-99c2-20b25aa15074))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 0e4a353a-1831-4c79-bc36-7a6146b268ea))
     (fp_line (start 6.985 -4.445) (end 6.985 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 60f6fa64-a75c-4669-8783-0eb63beca750))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 63e85233-b9e2-44d9-a957-c533255a27fb))
     (fp_line (start 6.985 14.605) (end -12.065 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 1d9295bf-a363-4323-92df-bbe85f0f6de5))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 8d56469d-116c-4fce-97d4-1dd21e4f1262))
     (fp_line (start -9.14 -1.52) (end 4.06 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp ac4372c3-269d-47bb-a2fd-845c26d1c606))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 6a2768b0-d722-4555-88ae-ea5d642dd69a))
     (fp_line (start -9.14 11.68) (end -9.14 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 199a68d0-c511-4879-8c7d-ba98e60fc68f))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp bdf7fe9c-bbf9-45a0-aa0e-63613e2f3989))
     (fp_line (start 4.06 -1.52) (end 4.06 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp f45d9baf-71b6-430f-9dec-986d846c54d3))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 617fdbd3-2a3c-4df3-94d6-15af1f162d06))
     (fp_line (start 4.06 11.68) (end -9.14 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp de163c5d-1e22-4500-9684-46d5fcbfb6ac))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 16b94bac-bc62-433d-b5e6-dec2e13d3b6c))
     (fp_line (start -8.89 -1.27) (end 3.81 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 98de7cd7-ba6c-46d5-a7eb-63a6d7a2d831))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 9fa1b01a-7cac-4c2b-bd19-9a6e591dca67))
     (fp_line (start -8.89 11.43) (end -8.89 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp c41231bf-9cab-41cd-a7d8-d373321bfbf9))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 9d2732ae-c735-450d-80ab-ae0236ebf497))
     (fp_line (start 3.81 -1.27) (end 3.81 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 3bdb7e8e-bb27-49b7-b89e-56463db512d4))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp dd8f50ce-777f-45f4-84c7-560b69dd4fb3))
     (fp_line (start 3.81 11.43) (end -8.89 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 774fc5f5-5ff5-4b3a-8b40-eeffb4f80638))
-    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 53f729e5-9124-482e-9dce-284ffb5e3c69))
-    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 465d65dd-3afe-46c4-9e96-a71edb8a3962))
-    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 2d5922c2-4d84-4538-93f3-e5250a4fe907))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 47aaa359-fff6-480f-b1ca-e3fb0715bc1a))
+    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 2aaab31c-9f5e-4d2c-9ced-adb5a2619b7b))
+    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp e85c6777-a091-46e2-bf56-e6b0eee0e9af))
+    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp b6c0f5bb-c497-4ca8-91af-b1639581dc44))
     (pad "1" thru_hole circle (at 0 0) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 26 "Net-(D23-K)") (pinfunction "1") (pintype "passive") (tstamp d7d68ec7-4b0c-4696-aa3f-e3912311e69a))
+      (net 60 "Net-(D37-A)") (pinfunction "1") (pintype "passive") (tstamp 9841842f-71f7-4eb1-be6c-00c03c11d2a6))
     (pad "2" thru_hole circle (at -6.35 2.54) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 77 "Net-(J2-Pin_7)") (pinfunction "2") (pintype "passive") (tstamp 057b0f47-3497-40d1-af6f-8fe167e03024))
+      (net 22 "Net-(J2-Pin_6)") (pinfunction "2") (pintype "passive") (tstamp e2b750a9-2ea4-4bb1-a056-d2f7496043a9))
     (model "${KICAD6_3DMODEL_DIR}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -643,67 +643,67 @@
   )
 
   (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (layer "F.Cu")
-    (tstamp 18b96f86-0c11-4320-a3e1-607152e23c99)
-    (at 157.63875 140.17625)
+    (tstamp 1bda636c-b960-43b2-a4c7-a0c46e2a87f9)
+    (at 238.28375 135.41375)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
     (property "Sheetname" "")
     (property "ki_description" "Push button switch, generic, two pins")
     (property "ki_keywords" "switch normally-open pushbutton push-button")
-    (path "/fd7031ae-9a15-4c99-a16c-9f29eda042a9")
+    (path "/b6752ca5-6428-4e1a-a772-05cb44d23bc7")
     (attr through_hole)
-    (fp_text reference "SW20" (at -2.54 -2.794) (layer "F.SilkS")
+    (fp_text reference "SW24" (at -2.54 -2.794) (layer "F.SilkS")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 0cf48aff-1aab-4b52-a218-6b17c84c1688)
+      (tstamp 58c280ab-7817-420c-af2e-c47a0a1ebc94)
     )
     (fp_text value "SW_Push" (at -2.54 12.954) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 1787c9be-766a-4528-bfe2-2aef4cd3f29a)
+      (tstamp 7fd87b31-470b-42d3-aed2-3eb78f7b8e83)
     )
     (fp_text user "${REFERENCE}" (at -2.54 -2.794) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 77c8d57f-414b-45a8-9ff4-e69a327f43ed)
+      (tstamp d9671ac2-84af-4efa-b017-17e1df732d2a)
     )
     (fp_line (start -9.525 -1.905) (end 4.445 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp efedf02b-7c00-480c-8841-23cdc4ee2fee))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp a6e8db47-6d4c-420d-b47b-52c8f69cad15))
     (fp_line (start -9.525 12.065) (end -9.525 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp d322ec92-d595-414b-8e6f-ee79186701d4))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp b09d994c-5585-4445-8cd5-e9b1065e55a1))
     (fp_line (start 4.445 -1.905) (end 4.445 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 4a92c831-6c26-4420-b46e-6016d1abea5e))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 229be0ef-a485-4655-84d3-dbaf6ac06467))
     (fp_line (start 4.445 12.065) (end -9.525 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp aa294846-9d53-4d3f-a205-ca1e6b19aedb))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp aa11c1ba-3286-4805-ab02-022595bb14b2))
     (fp_line (start -12.065 -4.445) (end 6.985 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 6a02ae36-8254-4f2d-9b7c-9c6c2d6386a6))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 7a351930-5d21-455e-bbff-1902e10c8dc8))
     (fp_line (start -12.065 14.605) (end -12.065 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 5b0aa806-d154-42e7-8661-35218f60ceab))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp c78b527e-c0b4-423a-80e8-131b27197ff5))
     (fp_line (start 6.985 -4.445) (end 6.985 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp c8b9b562-fc96-4754-a0fc-a9b443f22e90))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 4fb36dfb-c59b-45a7-a0ee-6b0e49393998))
     (fp_line (start 6.985 14.605) (end -12.065 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 318a4430-15f3-40ad-baeb-511e9351d207))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 4b6fcb62-3b6b-4b3b-afca-bb1906fd1ea0))
     (fp_line (start -9.14 -1.52) (end 4.06 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 4202ab8f-97dc-439b-8f24-7eef086528a4))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 92f0c6fd-7f6e-4264-bbb0-ce83606f38d0))
     (fp_line (start -9.14 11.68) (end -9.14 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp a04d06ba-a2e8-488e-8364-15e1b577c769))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 6b7d262e-6478-4bd4-afd8-63d2c31e34f6))
     (fp_line (start 4.06 -1.52) (end 4.06 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 29d07d69-b7a9-4881-a015-55dd77fb58f9))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp b3b93243-06c5-4863-8054-208c299a19dd))
     (fp_line (start 4.06 11.68) (end -9.14 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 509a8273-ba39-4734-bd84-0627dd9027fb))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp d27caf3e-eef5-44d7-ab5c-154980027929))
     (fp_line (start -8.89 -1.27) (end 3.81 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 523ba353-764d-4e13-9495-f57f1d78e0a2))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp c4984ef0-a26a-4292-86fe-a3e871d93342))
     (fp_line (start -8.89 11.43) (end -8.89 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 9876c8e3-be11-4345-8d8e-0f56d5623911))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 2fbe3673-fdd1-4e41-ad00-35bdf1c9afa7))
     (fp_line (start 3.81 -1.27) (end 3.81 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 2b297ab4-6d93-4e59-8b94-dda302b0569a))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp e9923fbe-85c1-428e-9ee4-738a0bdddaee))
     (fp_line (start 3.81 11.43) (end -8.89 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 0d774446-ceba-4fe2-8ff2-51fad62d838c))
-    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 7a7a1e4b-608b-4d54-a6ec-f0a2fa81e0ee))
-    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 906300e7-f293-48fd-97e5-9385d11045fd))
-    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp a9e5b248-0ded-4e9b-a51c-168d7320224e))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp eff40a8e-1e39-46f3-9e9c-7fe9da2df8da))
+    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp d520e299-885f-4a97-a451-6d92427f8a01))
+    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp e6a2e199-ff09-4216-bf4c-d84dba24b722))
+    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp a66225df-17a6-4954-958e-bb7de4b9cde7))
     (pad "1" thru_hole circle (at 0 0) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 23 "Net-(D20-K)") (pinfunction "1") (pintype "passive") (tstamp 026beb57-01a3-46b9-b149-f3e1e1c807c4))
+      (net 49 "Net-(D24-A)") (pinfunction "1") (pintype "passive") (tstamp 6b46184e-b1dd-4aa1-af2c-1d400d0dd1e9))
     (pad "2" thru_hole circle (at -6.35 2.54) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 74 "Net-(J2-Pin_4)") (pinfunction "2") (pintype "passive") (tstamp c78294b3-347c-465b-88c9-22c68206e130))
+      (net 24 "Net-(J2-Pin_8)") (pinfunction "2") (pintype "passive") (tstamp a23c3cfd-0841-4bc9-98e3-637df1fc8247))
     (model "${KICAD6_3DMODEL_DIR}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -712,67 +712,67 @@
   )
 
   (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (layer "F.Cu")
-    (tstamp 212c0c16-af47-4b33-8b13-9739c41bccee)
-    (at 167.16375 121.12625)
+    (tstamp 1d81b2e1-bc66-4958-9a6d-134e4a297a5d)
+    (at 204.94625 97.31375)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
     (property "Sheetname" "")
     (property "ki_description" "Push button switch, generic, two pins")
     (property "ki_keywords" "switch normally-open pushbutton push-button")
-    (path "/6f025a7c-8e60-48d0-b8b7-aa528cdd8f8f")
+    (path "/05c6dbc4-daf6-4c29-857b-0140dd94691e")
     (attr through_hole)
-    (fp_text reference "SW5" (at -2.54 -2.794) (layer "F.SilkS")
+    (fp_text reference "SW7" (at -2.54 -2.794) (layer "F.SilkS")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp d0342f1e-fede-4334-8bcf-02fcff95ab75)
+      (tstamp b90ffafc-df9c-469c-885e-336202f17278)
     )
     (fp_text value "SW_Push" (at -2.54 12.954) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp d087473b-406e-46f6-9f29-dea13649458f)
+      (tstamp 34bc7cb9-6864-4990-a80d-703681b609e8)
     )
     (fp_text user "${REFERENCE}" (at -2.54 -2.794) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp d64a3885-772d-454d-9730-213841fae3cd)
+      (tstamp 350a4054-4fdc-4a73-a37f-b862f787b7bc)
     )
     (fp_line (start -9.525 -1.905) (end 4.445 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 8ed8ba34-3bf9-4d85-8668-172a10898bb8))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 41f8ba76-4f23-4b72-a33a-ad46eb6f40e2))
     (fp_line (start -9.525 12.065) (end -9.525 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 3c78e13b-0764-41b5-b400-3c151667e3f0))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 55177c17-43b2-4267-988c-5a5f5b69fcbe))
     (fp_line (start 4.445 -1.905) (end 4.445 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp c5090f6c-b5be-4d31-92d0-6d57649c9c80))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 555dfcaf-c586-4a2d-83c1-ea6b97007206))
     (fp_line (start 4.445 12.065) (end -9.525 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 13473923-c8f3-4046-b7cf-db0619828f8c))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 13f3972b-d7d9-4463-aea9-cb1bd48f812e))
     (fp_line (start -12.065 -4.445) (end 6.985 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 5b23cc51-b963-41ad-9016-d076f2feb4c1))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp f23d4c0f-a279-4edd-969b-a6183e30a769))
     (fp_line (start -12.065 14.605) (end -12.065 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 705a51a2-5940-4c0e-8528-f99ebe720d15))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp a84c7e45-6769-42bf-9f85-0af074eb0368))
     (fp_line (start 6.985 -4.445) (end 6.985 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 1e2f4f15-cc99-4dbf-bb07-5112037bb109))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 15038f9d-34cf-43e4-ab1e-429acb5db060))
     (fp_line (start 6.985 14.605) (end -12.065 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 720e64aa-533a-4374-93b5-f452eec912b2))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp d94e6cc7-e3f1-4688-bd8f-a623cdae0f47))
     (fp_line (start -9.14 -1.52) (end 4.06 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 493aae9b-c2d7-4ecc-b3a1-91ebeb1ecb0b))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp a1a76e2f-f75e-4449-9769-4fd855d46e69))
     (fp_line (start -9.14 11.68) (end -9.14 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp bb5fe40b-59b6-410f-beb8-c07592aca7d9))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 3ec4ec22-d73b-4670-ab65-e6bb0ccd1301))
     (fp_line (start 4.06 -1.52) (end 4.06 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 4f88b143-3650-4c02-95cf-c17011d9c2f8))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 224fa517-65da-49e1-934f-cb4dda83992c))
     (fp_line (start 4.06 11.68) (end -9.14 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 42a7fa23-2f45-46b5-a128-1fb6cd236dd2))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 94c2948f-21d7-4835-804d-1e44c51c519f))
     (fp_line (start -8.89 -1.27) (end 3.81 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp d69d0649-9f68-40d8-ab49-5f709654f678))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp ca621b20-5806-452c-88dd-7ff93da04fdc))
     (fp_line (start -8.89 11.43) (end -8.89 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp f573075d-402f-4f2e-b716-0c0222be0b18))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp c65b81b3-8590-4832-b7b5-4957513198ab))
     (fp_line (start 3.81 -1.27) (end 3.81 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 29ca9a6d-8bdc-493f-ab31-d5fb76de3e96))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 77d31cb4-a896-4800-b167-293dbc499da0))
     (fp_line (start 3.81 11.43) (end -8.89 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 7c21c18b-b3b6-4812-a8b7-87a485891835))
-    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 50c611eb-b0b4-41c5-b6a8-a7f2103624e5))
-    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 5deb75ca-2452-4d69-9e25-1f10e09d2331))
-    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp fdbf7bef-5b43-4869-9735-d8259e94e30e))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp e6e9372a-6feb-4d38-8294-2fae9fe95ce4))
+    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 0254db4d-b31e-4810-a424-ca62916047d9))
+    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp c6c6bafe-20b3-45af-95f7-4aa1c1fe7be0))
+    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 2b1588f9-aa74-4d6e-abd2-ccc8ad1d07e0))
     (pad "1" thru_hole circle (at 0 0) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 6 "Net-(D5-K)") (pinfunction "1") (pintype "passive") (tstamp 2493965c-62ef-408b-8e49-ab7a66333175))
+      (net 34 "Net-(D7-A)") (pinfunction "1") (pintype "passive") (tstamp 086cbb4d-0402-47b0-94d9-7e4cc316913d))
     (pad "2" thru_hole circle (at -6.35 2.54) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 75 "Net-(J2-Pin_5)") (pinfunction "2") (pintype "passive") (tstamp a567214f-3241-45f3-b7e9-7632a51526b7))
+      (net 23 "Net-(J2-Pin_7)") (pinfunction "2") (pintype "passive") (tstamp 49d9efdc-eb71-4711-a982-b3b6e6359b51))
     (model "${KICAD6_3DMODEL_DIR}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -781,67 +781,67 @@
   )
 
   (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (layer "F.Cu")
-    (tstamp 252ff4aa-29f0-489f-8133-fe60fcebaa08)
-    (at 276.70125 159.22625)
+    (tstamp 1e5c140b-9289-46ad-ac2a-9e319c7186d3)
+    (at 223.99625 173.51375)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
     (property "Sheetname" "")
     (property "ki_description" "Push button switch, generic, two pins")
     (property "ki_keywords" "switch normally-open pushbutton push-button")
-    (path "/88598707-986d-472e-9465-caaaf71b8e12")
+    (path "/c45bb3a7-317b-40b1-bd65-109c2d35b917")
     (attr through_hole)
-    (fp_text reference "SW47" (at -2.54 -2.794) (layer "F.SilkS")
+    (fp_text reference "SW57" (at -2.54 -2.794) (layer "F.SilkS")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp fd8af45c-0650-4e78-ac82-a2350baf93ff)
+      (tstamp 7607187a-dd9d-4061-a971-397aeb0a739d)
     )
     (fp_text value "SW_Push" (at -2.54 12.954) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 377bfa31-759d-4a0b-a25f-ec0d76a8db92)
+      (tstamp 49ba72d8-a6b4-440d-88d0-29398f22fb76)
     )
     (fp_text user "${REFERENCE}" (at -2.54 -2.794) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp a47b9f72-e162-4899-aaf5-60ef93836d59)
+      (tstamp 6e684a86-e372-4a20-adc6-7e9990e4d28e)
     )
     (fp_line (start -9.525 -1.905) (end 4.445 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp cb5daf4f-d54d-41f9-a4bf-ad25f41c5070))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 0c3610ed-f20d-4fe4-974e-b017dcd59409))
     (fp_line (start -9.525 12.065) (end -9.525 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 722ac60b-11e9-447c-a302-68ea35f91cf7))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp b7f5b967-d527-4b53-a012-668de40721b7))
     (fp_line (start 4.445 -1.905) (end 4.445 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 785ef82a-398f-444e-b7c1-e8b5d0db1295))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 33aedd8b-e07c-47ba-b02f-28d2aea88428))
     (fp_line (start 4.445 12.065) (end -9.525 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 0a93e8a7-21e1-4fb4-ac65-dd705db8c01b))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 733ca717-419c-49e0-9cff-40b71154a99b))
     (fp_line (start -12.065 -4.445) (end 6.985 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp c43c3444-6f36-4b2a-8025-3c29af613f24))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 5856f454-0ecc-4621-985b-1319908dda9f))
     (fp_line (start -12.065 14.605) (end -12.065 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp b0e8e035-728a-47d1-b6ab-af41bb8e3529))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp f097a159-cb04-441d-8014-bdb6a02187eb))
     (fp_line (start 6.985 -4.445) (end 6.985 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 09b03ba7-3e77-46fe-bad3-d5afa22395f9))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 44b2b7bd-55a3-4d2f-9b1c-b9b66203254a))
     (fp_line (start 6.985 14.605) (end -12.065 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 64743529-db24-4fe6-91be-98155c6b5795))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp da1ee9ce-7cca-4c9c-876d-4ade80056732))
     (fp_line (start -9.14 -1.52) (end 4.06 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 95514f56-3443-41f8-9b91-96b896bc698d))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 00288070-ab94-4e1e-8dc4-c814d1b3a140))
     (fp_line (start -9.14 11.68) (end -9.14 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 16177fe4-e104-44f3-8471-d409e86b6235))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp cad12e1c-cb53-4298-8790-438badc94e0a))
     (fp_line (start 4.06 -1.52) (end 4.06 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 55cf55cc-0a26-4904-99a6-d3d40b20d355))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 60a076ca-ccdd-41f6-a7c3-1bd0055bf166))
     (fp_line (start 4.06 11.68) (end -9.14 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 4eecd6fe-db7f-4b61-b07e-d1d7805ad768))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 02de7514-5bb7-4f4c-bc9f-b4a018b2adfc))
     (fp_line (start -8.89 -1.27) (end 3.81 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 1a491f1a-5a45-47a6-a802-18eaebec294c))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 4b900feb-6332-44a2-8c67-426d05d2762f))
     (fp_line (start -8.89 11.43) (end -8.89 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 3372531f-14d0-4e41-bea2-3391fd425376))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp ea2af13d-59c9-47cc-8ab9-1a55d5eee1c8))
     (fp_line (start 3.81 -1.27) (end 3.81 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 92f65408-ca44-4ef6-ac75-969a45707c62))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 7a2dea64-f7f0-4300-af06-50207fcf021e))
     (fp_line (start 3.81 11.43) (end -8.89 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp a4a5ed3c-6b70-4ca1-87bf-009a753291c3))
-    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 88b9a1e7-4f85-4a4d-88b6-3513439c164d))
-    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp afcf71c1-8d21-48e3-8978-f7e789b7ca61))
-    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 571d7178-af6c-4f6d-abb8-366e09968c6b))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 708eaa2e-3901-45c8-90f5-a50d13e6528a))
+    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 02ef4248-a6e0-43dd-b548-80a6f19e72ea))
+    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 17259f37-6b28-4237-b7ad-aa36cc37eeb7))
+    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp add1c051-c4a2-4dd1-b16a-e8ad72590031))
     (pad "1" thru_hole circle (at 0 0) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 53 "Net-(D47-K)") (pinfunction "1") (pintype "passive") (tstamp 23781ef7-816c-4c33-9a61-e8d8159bb560))
+      (net 77 "Net-(D57-A)") (pinfunction "1") (pintype "passive") (tstamp d9253df0-e61d-41bf-a0e0-d36fa691e84d))
     (pad "2" thru_hole circle (at -6.35 2.54) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 77 "Net-(J2-Pin_7)") (pinfunction "2") (pintype "passive") (tstamp f5249588-182a-4b95-a161-3912c10452db))
+      (net 18 "Net-(J2-Pin_2)") (pinfunction "2") (pintype "passive") (tstamp 89ab473f-2fbb-4ff9-9e1d-1354fe88e0a6))
     (model "${KICAD6_3DMODEL_DIR}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -850,67 +850,67 @@
   )
 
   (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (layer "F.Cu")
-    (tstamp 258cc853-c535-400a-92f4-57e2c7d7a14e)
-    (at 286.22625 178.27625)
+    (tstamp 20610996-0014-47f6-9739-93dd496591d7)
+    (at 223.99625 97.31375)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
     (property "Sheetname" "")
     (property "ki_description" "Push button switch, generic, two pins")
     (property "ki_keywords" "switch normally-open pushbutton push-button")
-    (path "/ea1a6a1f-8ef9-4aa2-9027-14c3157340d6")
+    (path "/2b925e69-2ee9-4323-a403-750de4bfc921")
     (attr through_hole)
-    (fp_text reference "SW62" (at -2.54 -2.794) (layer "F.SilkS")
+    (fp_text reference "SW8" (at -2.54 -2.794) (layer "F.SilkS")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 8666cd6c-a859-41f0-a34c-a0846547e783)
+      (tstamp 1f2101f7-cf01-4889-b21a-29de5df1ad7c)
     )
     (fp_text value "SW_Push" (at -2.54 12.954) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp c3c514e8-edaf-4ae7-93b6-af15f98a2c41)
+      (tstamp 306c5774-5726-432c-a574-4594184ded2a)
     )
     (fp_text user "${REFERENCE}" (at -2.54 -2.794) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 3da064e3-4271-43b7-ab53-6116a1a58c6a)
+      (tstamp 7573e46a-9082-493f-b62d-34d4bee20d7c)
     )
     (fp_line (start -9.525 -1.905) (end 4.445 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp a72cfbc8-62f3-4412-bf52-c6f6a5c9ffb0))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 6e68aec6-0cc7-43ca-85e2-082756600b7f))
     (fp_line (start -9.525 12.065) (end -9.525 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 3b211eb8-da96-46d6-816e-81b684e76bf5))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp c7b14699-5c27-474e-862f-f91ce2784f6a))
     (fp_line (start 4.445 -1.905) (end 4.445 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 09dd41d7-7c3f-4f3e-985b-12facf36eebb))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp b700c428-6ea0-4dce-8a05-d889cc7ea7d0))
     (fp_line (start 4.445 12.065) (end -9.525 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 26eb8f3e-817b-4afb-9f4a-1178ca52574b))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp cd418864-b8a7-427f-b127-77210c0d59cd))
     (fp_line (start -12.065 -4.445) (end 6.985 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp c2e70347-ad79-4b17-bb87-4a240d9b0bf9))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp ff412fd0-5988-462d-ab83-2010dda0c911))
     (fp_line (start -12.065 14.605) (end -12.065 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 0596066f-04fb-4f3c-a0a7-126dda69a7ea))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp b8b454f0-38f3-41f7-be4d-d2cc3f23cfdc))
     (fp_line (start 6.985 -4.445) (end 6.985 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 4cc09467-3269-407d-a2e3-92b6b9ddac7b))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 0745cb3a-38c4-49c2-bc79-fb9fef014532))
     (fp_line (start 6.985 14.605) (end -12.065 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 5ef06632-2cd9-4419-9c7c-66225537d01f))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp f075d157-8048-47b7-a3bb-f35dec57037f))
     (fp_line (start -9.14 -1.52) (end 4.06 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 3e7a35c2-c17d-432d-af74-dd960d66ed49))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp ffcbadd7-d84f-4062-a5fa-db4106e45d60))
     (fp_line (start -9.14 11.68) (end -9.14 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp def31a75-ea24-42ea-bf1a-b1143e2c3e14))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 473ec46b-0b3b-4fc1-a7e8-1b48d3b9e262))
     (fp_line (start 4.06 -1.52) (end 4.06 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 62bc4d2d-c197-4796-a116-a3c879aebe65))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 26f94b06-59aa-46a0-81ac-5f59f4719080))
     (fp_line (start 4.06 11.68) (end -9.14 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 167837ee-46ff-41f7-9787-a768ebaa47f4))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp cb778e04-29a3-4a44-95f4-4f0b656fa671))
     (fp_line (start -8.89 -1.27) (end 3.81 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 6856375d-f664-4eeb-8e4b-06c7dedf47e0))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 24f117aa-5a91-4102-8d52-daf413f03da7))
     (fp_line (start -8.89 11.43) (end -8.89 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 98e0e735-a713-48d9-b5f0-3d91a394011f))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 7df6dc21-ed33-4e03-86e9-2af50c2da9ce))
     (fp_line (start 3.81 -1.27) (end 3.81 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp dadb717d-e2e0-4a6b-84b3-e31c69c2f6b1))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 5ed80d5c-b0d8-43c7-8db6-7a40de48ffba))
     (fp_line (start 3.81 11.43) (end -8.89 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 55113a0c-48e5-4c37-ac97-09d0cb03ab28))
-    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 95b21bbb-2592-49c7-b4d3-ebf1432fb3a7))
-    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp b3b2de31-d897-4df6-83e0-99ab20dc8b28))
-    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 96fbd379-824d-40e9-87bb-ef4d6dce3a83))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 3cc55e39-6296-4b97-8c28-24dfb7a8222e))
+    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp c21918e1-5046-46a7-a0af-2432fc526af3))
+    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 68834b05-da0a-4083-8c83-77cb874f6eca))
+    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp dcb907cf-b0a2-4ab9-b4f5-07800659bb5e))
     (pad "1" thru_hole circle (at 0 0) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 70 "Net-(D62-K)") (pinfunction "1") (pintype "passive") (tstamp e797e570-60e3-4688-9d80-85dbfa377938))
+      (net 35 "Net-(D8-A)") (pinfunction "1") (pintype "passive") (tstamp 1a86b567-5e0b-4b4a-a20c-a48acaae2ee8))
     (pad "2" thru_hole circle (at -6.35 2.54) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 77 "Net-(J2-Pin_7)") (pinfunction "2") (pintype "passive") (tstamp d49c714e-1a7d-4cf0-9f5d-77fbff73bca6))
+      (net 24 "Net-(J2-Pin_8)") (pinfunction "2") (pintype "passive") (tstamp 2916bae1-d68d-43f2-a760-4ae3a71832cf))
     (model "${KICAD6_3DMODEL_DIR}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -919,67 +919,67 @@
   )
 
   (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (layer "F.Cu")
-    (tstamp 274e88f2-8a51-4172-8355-299f7cf3a1ce)
-    (at 262.41375 197.32625)
+    (tstamp 2470943c-2025-4738-bb69-49cea0618eb0)
+    (at 257.33375 135.41375)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
     (property "Sheetname" "")
     (property "ki_description" "Push button switch, generic, two pins")
     (property "ki_keywords" "switch normally-open pushbutton push-button")
-    (path "/b8f30f5d-817c-4096-887a-8615c8302be7")
+    (path "/73272eda-b015-46d9-a1a1-dbbaa977eb5f")
     (attr through_hole)
-    (fp_text reference "SW58" (at -2.54 -2.794) (layer "F.SilkS")
+    (fp_text reference "SW55" (at -2.54 -2.794) (layer "F.SilkS")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp af97af89-194e-43e2-ac88-eb42e98f34b2)
+      (tstamp dfa815dc-196e-43ec-82c1-21a2322dd0e1)
     )
     (fp_text value "SW_Push" (at -2.54 12.954) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp ff832969-5bdd-44e6-b5c0-fcb4cc720a06)
+      (tstamp 91002eee-047b-447a-9a4c-898051fe3454)
     )
     (fp_text user "${REFERENCE}" (at -2.54 -2.794) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 43f714d6-760d-4048-bd6c-356b25847f93)
+      (tstamp 11f2bda3-ea1e-45e4-883b-aefd0de9cda1)
     )
     (fp_line (start -9.525 -1.905) (end 4.445 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 04b6282e-1232-4207-a229-a595a3f6a3e2))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 0d46ef5c-baa6-4d91-9dbd-b4adbd3711e6))
     (fp_line (start -9.525 12.065) (end -9.525 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp d110425f-edce-41cf-8755-33d591d6d686))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 826b5b46-e815-45ed-a108-e29446278227))
     (fp_line (start 4.445 -1.905) (end 4.445 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp a18e8161-e666-4060-a640-0d6964fb57a9))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp b28abfb7-fe8c-4941-8ed4-d18d4cc68100))
     (fp_line (start 4.445 12.065) (end -9.525 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp a954b83b-93c1-49f0-902e-7b93b2246ece))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp db51a623-401a-47db-ab16-ffdabaa14285))
     (fp_line (start -12.065 -4.445) (end 6.985 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 8b07dde4-12ef-4771-9547-9ce565038fbb))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 06a22b58-4f1e-485e-b8e5-138a0af1aabe))
     (fp_line (start -12.065 14.605) (end -12.065 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp c37a6f67-e98e-48d7-a785-d13993dcf27d))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp bcffd3c4-87cd-4195-97b8-efead982f3ad))
     (fp_line (start 6.985 -4.445) (end 6.985 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 3a8cb06a-f13d-42f9-badd-95d5102474bf))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 2f171ce8-dda4-46cb-8c26-2d094706419f))
     (fp_line (start 6.985 14.605) (end -12.065 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 65953e23-d911-43c3-8ab8-1906cddcffdf))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp ba1dea97-e31b-4f4f-82aa-d79dff99af55))
     (fp_line (start -9.14 -1.52) (end 4.06 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 4202e6c5-4340-4847-b7a5-8a7dad569e93))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 97fe1f70-eeed-4764-bba4-89fcd991deee))
     (fp_line (start -9.14 11.68) (end -9.14 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp ad0b6bdd-7ff5-4d47-89fa-3e326cce0019))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 8a354a39-8282-4e93-b603-ec200082df55))
     (fp_line (start 4.06 -1.52) (end 4.06 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 7b2cd388-1fcd-46e9-847d-8fae7f73a83c))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp a5e28a4e-63e5-4adb-b7b5-4f396e1ef54a))
     (fp_line (start 4.06 11.68) (end -9.14 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 62de4c12-9326-48a0-8762-cb1db6ce5117))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 6ba34a55-a96e-49c0-a018-c496fb099b67))
     (fp_line (start -8.89 -1.27) (end 3.81 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 8dc5535c-049d-4227-a26f-d17edfe4972a))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp c675ce82-4a07-440a-9b87-f31306e7fe69))
     (fp_line (start -8.89 11.43) (end -8.89 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp f4dc8b9d-9006-42b0-a987-fb82f1026d5f))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp c9315f7f-6faf-4d04-84b1-7fa7d61cddc0))
     (fp_line (start 3.81 -1.27) (end 3.81 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp b5de4dc9-afeb-4219-bd15-21a130f70800))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 36faa7fa-46dc-4c42-9da2-241cb74fe294))
     (fp_line (start 3.81 11.43) (end -8.89 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 587c7b7c-0786-4045-bdf0-c95685bcc0cc))
-    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 138a4540-06d6-46d4-a1c2-1bd747e43447))
-    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 54651257-5b43-4cd8-9d46-d8f23bda59e1))
-    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 055af864-a92e-460a-a3eb-55f74152b20f))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp a341329d-d8d7-4d51-a39f-0bf88d0789db))
+    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 4ad685e7-9dd5-4cbf-840a-6f28872e649f))
+    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp e98876a8-10a3-42b2-897b-3bdc0cfc0adf))
+    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 21b3cdf5-12ed-48c8-ac93-34eec6447989))
     (pad "1" thru_hole circle (at 0 0) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 66 "Net-(D58-K)") (pinfunction "1") (pintype "passive") (tstamp 6728b506-0101-4d9f-90f9-23ca34304233))
+      (net 76 "Net-(D55-A)") (pinfunction "1") (pintype "passive") (tstamp bbbeddf6-fc55-413a-a0f4-939cb0449657))
     (pad "2" thru_hole circle (at -6.35 2.54) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 73 "Net-(J2-Pin_3)") (pinfunction "2") (pintype "passive") (tstamp b7fbed6f-95c7-4b06-b439-5c2571f6ad06))
+      (net 24 "Net-(J2-Pin_8)") (pinfunction "2") (pintype "passive") (tstamp d7025971-f041-4eef-aae9-660ec60608da))
     (model "${KICAD6_3DMODEL_DIR}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -988,67 +988,67 @@
   )
 
   (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (layer "F.Cu")
-    (tstamp 383d3a75-1f05-4f2a-bd59-f1a95306a057)
-    (at 252.88875 140.17625)
+    (tstamp 29c76345-b75a-4dee-a6b6-d193a2e34a6c)
+    (at 328.77125 116.36375)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
     (property "Sheetname" "")
     (property "ki_description" "Push button switch, generic, two pins")
     (property "ki_keywords" "switch normally-open pushbutton push-button")
-    (path "/afd53d0d-8465-4028-bd37-c56b69171861")
+    (path "/b709237e-27eb-4613-b85f-2c7f18c83220")
     (attr through_hole)
-    (fp_text reference "SW32" (at -2.54 -2.794) (layer "F.SilkS")
+    (fp_text reference "SW43" (at -2.54 -2.794) (layer "F.SilkS")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 4e570d3c-a5c7-4d1b-9aa9-2305d917da60)
+      (tstamp c560788c-7df0-45da-85cb-62136d99d386)
     )
     (fp_text value "SW_Push" (at -2.54 12.954) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 8ff4080f-45c7-429b-8ad2-e4ad33195cc3)
+      (tstamp a9308485-3e02-4ed6-86f5-2ff7fc71a22c)
     )
     (fp_text user "${REFERENCE}" (at -2.54 -2.794) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp c2d9c709-5ea0-4403-bff6-bb5ab8ba9061)
+      (tstamp b9400767-6fdb-417b-b105-90bf4f37b789)
     )
     (fp_line (start -9.525 -1.905) (end 4.445 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 7f5d0742-0635-4873-9165-b341a6ac64ff))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 2bf7fe78-c709-4842-a4ab-fe7a689df5d5))
     (fp_line (start -9.525 12.065) (end -9.525 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp d748d3b9-61a4-4222-a5f5-e7ad03b2e82b))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp deb8f284-ef77-4e55-b1fd-728141aad4aa))
     (fp_line (start 4.445 -1.905) (end 4.445 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 10e456bf-0dba-4767-b0b4-000b04261070))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp e1427d3e-efb6-4210-aa66-13b862741f38))
     (fp_line (start 4.445 12.065) (end -9.525 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 0e0c6fd3-db52-47ce-9571-05b5e63d1e66))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 3ff09bd5-22a0-43d5-a431-da3d50ce05c2))
     (fp_line (start -12.065 -4.445) (end 6.985 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 9ad4e5ff-a097-4a06-9a84-2373e58d8abc))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 9c87ef09-aacb-4bab-9b09-1f82c7d5180a))
     (fp_line (start -12.065 14.605) (end -12.065 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 1e747cbe-a579-4d23-ae3d-7b5b408cfc3f))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 12a4c1f2-7594-4ce0-95b9-b15a99e56acf))
     (fp_line (start 6.985 -4.445) (end 6.985 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 613c55fa-00b7-483d-a07c-ca3688d0606b))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 60bdd6d5-2fab-48e1-9a2d-53ccbea64a7d))
     (fp_line (start 6.985 14.605) (end -12.065 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp b665efef-e39e-42ae-aa0d-f25418a08831))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp f463f401-70c0-47a7-8cda-f4457ca1e564))
     (fp_line (start -9.14 -1.52) (end 4.06 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp eea97f2a-c926-49ca-ad50-424fb1e1275d))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 5f158aba-8615-42f7-af8e-9357494584f2))
     (fp_line (start -9.14 11.68) (end -9.14 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp c404e8d9-cd92-484d-acd7-344c51995521))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp e8293f03-257c-415d-b94a-7e3fc6a87b21))
     (fp_line (start 4.06 -1.52) (end 4.06 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 79f05e6f-815f-46c5-9a90-06b3fcc16ff6))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 46428911-0e72-4c07-a354-6801c3ffa45c))
     (fp_line (start 4.06 11.68) (end -9.14 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 2a7b7687-bdbb-42f2-9a48-3bbaf4bda57a))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 26fc6c2b-a424-43a9-b856-cbebac77f2b4))
     (fp_line (start -8.89 -1.27) (end 3.81 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp f2b2b604-e0d7-4041-a7c0-49c5372f425e))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp b3357fcd-134a-4f22-a47b-b0f85cdc8fab))
     (fp_line (start -8.89 11.43) (end -8.89 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp aeefce6e-7115-4679-aef7-2f1bd3499fbc))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 9a8046c2-ffe7-4646-b56c-2378e46802d6))
     (fp_line (start 3.81 -1.27) (end 3.81 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 97787ff3-7c87-41b5-afcd-749490f56ddd))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp c9dd9df2-0004-4bad-bfa5-c70dbe2e61b4))
     (fp_line (start 3.81 11.43) (end -8.89 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp a6c6e2c6-64ad-4958-aa53-0cfad3daf93e))
-    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 6fb8de60-278b-4591-8f38-c814bc6a41b4))
-    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 86038abc-b7cb-4a74-b276-e5715dd694c8))
-    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 6919b2dd-2f8b-4f8a-9d40-c499e16dbcf9))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 4e232a5e-bcd3-45db-a840-e19d4f09752d))
+    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp a575a42d-ca87-41b7-aedf-aa60768b192f))
+    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp e86a72cc-a9e5-4f63-9090-15510600b37f))
+    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp b1d6d2e8-c7d8-47dc-bb8a-6dba7e6941f2))
     (pad "1" thru_hole circle (at 0 0) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 36 "Net-(D32-K)") (pinfunction "1") (pintype "passive") (tstamp 74ee056a-554b-45c5-829f-bf07801b6b55))
+      (net 65 "Net-(D43-A)") (pinfunction "1") (pintype "passive") (tstamp 49e23492-20bf-48d3-8ffe-e39e2a013cbe))
     (pad "2" thru_hole circle (at -6.35 2.54) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 78 "Net-(J2-Pin_8)") (pinfunction "2") (pintype "passive") (tstamp 6c644171-9c60-4c65-85fa-d24383896baf))
+      (net 20 "Net-(J2-Pin_4)") (pinfunction "2") (pintype "passive") (tstamp ff2259a3-dcd0-4faf-a268-f5c41be3b3db))
     (model "${KICAD6_3DMODEL_DIR}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1056,69 +1056,69 @@
     )
   )
 
-  (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.75u_PCB" (layer "F.Cu")
-    (tstamp 399d0c7f-6a55-4c23-bf70-7fc56ccb55af)
-    (at 126.6825 178.27625)
-    (descr "Cherry MX keyswitch, 1.75u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
-    (tags "Cherry MX keyswitch 1.75u PCB")
+  (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (layer "F.Cu")
+    (tstamp 2c74d939-2b4d-4c74-8f46-09294955bafa)
+    (at 119.22125 116.36375)
+    (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
+    (tags "Cherry MX keyswitch 1.00u PCB")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
     (property "Sheetname" "")
     (property "ki_description" "Push button switch, generic, two pins")
     (property "ki_keywords" "switch normally-open pushbutton push-button")
-    (path "/5d25de8d-38bb-4cf0-8ae1-39a46997b3c0")
+    (path "/0ea9c959-7d13-41cc-8b95-a3bf5214d411")
     (attr through_hole)
-    (fp_text reference "SW17" (at -2.54 -2.794) (layer "F.SilkS")
+    (fp_text reference "SW2" (at -2.54 -2.794) (layer "F.SilkS")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 7a70ecab-0e57-4883-a0dd-13c03a26d084)
+      (tstamp 2e4d221c-682b-4414-8d9d-3c67868b7672)
     )
     (fp_text value "SW_Push" (at -2.54 12.954) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp ac3a4c4e-ef17-4a52-b62c-04c1713fae7f)
+      (tstamp 7e048edb-a859-45b5-b050-3101d3efb692)
     )
     (fp_text user "${REFERENCE}" (at -2.54 -2.794) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 7f242bec-a6a2-4d4e-ab30-adfd031f8ece)
+      (tstamp 1561f7d9-ab07-4002-a2b9-913307f70c9f)
     )
     (fp_line (start -9.525 -1.905) (end 4.445 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp cd337bbf-4e3a-4452-81fe-f5af28daee1d))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp ac65fd9f-0507-485e-a522-8486f38fdef9))
     (fp_line (start -9.525 12.065) (end -9.525 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp f259e667-1c6c-46ff-835e-f466d1b3e54e))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 77ac9605-6137-43fa-9ca9-4e48f2259657))
     (fp_line (start 4.445 -1.905) (end 4.445 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp c0056783-a455-4af5-9a7e-97d1e62fc7f6))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 71f4d9d5-21ba-4098-9605-42389a6eed4a))
     (fp_line (start 4.445 12.065) (end -9.525 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 419ce55f-5fdd-404d-afe1-adc3e42754a3))
-    (fp_line (start -19.20875 -4.445) (end 14.12875 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp b5466eb7-8399-41d1-9286-46de92e16146))
-    (fp_line (start -19.20875 14.605) (end -19.20875 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp ccfe62a5-c8a1-47ea-a859-9d5c63609390))
-    (fp_line (start 14.12875 -4.445) (end 14.12875 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 8a13a1d5-1c59-4cc7-b581-305d667253f4))
-    (fp_line (start 14.12875 14.605) (end -19.20875 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 15fcc84a-23d2-4524-89fb-455a77223083))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 72feaca6-5d4e-46cd-940f-7b323ab4b82e))
+    (fp_line (start -12.065 -4.445) (end 6.985 -4.445)
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 35caab66-db36-42f9-a045-0b4b69c4916d))
+    (fp_line (start -12.065 14.605) (end -12.065 -4.445)
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 2714b669-6317-4982-9c20-f81c1feaa895))
+    (fp_line (start 6.985 -4.445) (end 6.985 14.605)
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp d1a7cb25-1a36-4033-b394-daa6c9437e68))
+    (fp_line (start 6.985 14.605) (end -12.065 14.605)
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 5ddc040c-b618-4603-8d4f-7c316742fffe))
     (fp_line (start -9.14 -1.52) (end 4.06 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 5f8fba59-e4d3-4498-9fad-3d7f492a44c2))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 63b3d318-c026-4821-ab6a-fe84a8ea7ad8))
     (fp_line (start -9.14 11.68) (end -9.14 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp e327b6ed-03d6-4e19-8245-d51d476a739f))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp e1c707b9-ad60-4ddf-9e25-6aed7035f718))
     (fp_line (start 4.06 -1.52) (end 4.06 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp cd326ca8-7567-43c6-acb7-3d4354318d03))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 34d55511-3230-4947-9f26-eae933856166))
     (fp_line (start 4.06 11.68) (end -9.14 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 4a9ea7e3-c2d1-4ef3-8f37-28368393eb09))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 7f1e1bd6-64ac-4a58-a784-c7740465716b))
     (fp_line (start -8.89 -1.27) (end 3.81 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 53613d72-673b-4406-814b-44883ed0d94d))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp a1960aed-980f-4441-8231-82a14b8f99d6))
     (fp_line (start -8.89 11.43) (end -8.89 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 57950683-6093-4923-96cb-0152b2b65197))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 0540f68d-2005-4131-a4fa-059f42822694))
     (fp_line (start 3.81 -1.27) (end 3.81 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 517f73f5-9e1e-4018-8328-2b00e737a935))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 6f64d82f-12e8-4d3a-8119-03982bd735c9))
     (fp_line (start 3.81 11.43) (end -8.89 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp ef79c9af-68db-46cc-923f-688c14dd28fa))
-    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 63f8d013-57d6-42d2-8570-c889a31de70a))
-    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 3807482c-c5e5-4bee-a8de-8b4823e5dcdd))
-    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 438599f0-e212-4ab0-bdd7-53743aec6943))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp fb7bac17-4097-4ce5-bf92-bd1174a36582))
+    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 57922191-d7f5-4616-bd37-0f16fba536ae))
+    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 0626bb97-ec14-4357-ad3c-f06a4106f515))
+    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 39fa1a0d-4e03-4f3a-9db6-9223ffb9f07a))
     (pad "1" thru_hole circle (at 0 0) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 19 "Net-(D17-K)") (pinfunction "1") (pintype "passive") (tstamp fd87cbc9-78a8-43ef-a919-cfae9c2f780a))
+      (net 29 "Net-(D2-A)") (pinfunction "1") (pintype "passive") (tstamp 770ae9a8-9c63-453e-8f6c-666bd47dd07b))
     (pad "2" thru_hole circle (at -6.35 2.54) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 71 "Net-(J2-Pin_1)") (pinfunction "2") (pintype "passive") (tstamp dfd4379d-e047-437c-bbc0-d1206f1869ff))
-    (model "${KICAD6_3DMODEL_DIR}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.75u_PCB.wrl"
+      (net 18 "Net-(J2-Pin_2)") (pinfunction "2") (pintype "passive") (tstamp a0099381-721f-47cf-aa54-df1badec65fc))
+    (model "${KICAD6_3DMODEL_DIR}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
       (rotate (xyz 0 0 0))
@@ -1126,67 +1126,67 @@
   )
 
   (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (layer "F.Cu")
-    (tstamp 3a62ebb6-ed6a-4a22-925c-962b49debe92)
-    (at 248.12625 178.27625)
+    (tstamp 33f49cca-292c-4e5d-bbf9-40285667e7be)
+    (at 319.24625 97.31375)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
     (property "Sheetname" "")
     (property "ki_description" "Push button switch, generic, two pins")
     (property "ki_keywords" "switch normally-open pushbutton push-button")
-    (path "/43d29f27-d902-43ef-9248-5b9cefff86f5")
+    (path "/26fda850-05ae-496a-896c-5d85a57af862")
     (attr through_hole)
-    (fp_text reference "SW54" (at -2.54 -2.794) (layer "F.SilkS")
+    (fp_text reference "SW35" (at -2.54 -2.794) (layer "F.SilkS")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 01d82864-5476-408b-9962-ebac18c9a2c2)
+      (tstamp 7baf7ae8-2b4c-44f3-8622-ce7a4f496ac9)
     )
     (fp_text value "SW_Push" (at -2.54 12.954) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 15e77deb-202a-49f1-8330-1db5ad0cc493)
+      (tstamp b637bdc6-ab60-47cd-b208-900a7a06f5ed)
     )
     (fp_text user "${REFERENCE}" (at -2.54 -2.794) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 3dd48740-d705-4ab6-a67c-1c71f4aad09f)
+      (tstamp 847bcf34-4778-4ac3-ab15-cbda895b8090)
     )
     (fp_line (start -9.525 -1.905) (end 4.445 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 58eca9b6-afeb-4682-a45a-8efa1cd10e9b))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 1fb2869b-25e0-4b17-a35e-3f8b5e6779af))
     (fp_line (start -9.525 12.065) (end -9.525 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp b09c8163-7d05-4149-abd3-26ff9f654463))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 3f3513d7-61db-4e52-bbf4-54973617127a))
     (fp_line (start 4.445 -1.905) (end 4.445 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 626177b4-e6b8-4b1a-a8ae-ac0568f9fdca))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 72b7e366-de4d-4f4f-a3af-035aa7b11b7e))
     (fp_line (start 4.445 12.065) (end -9.525 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 3bce48a1-a69b-4cef-8d75-a23230475b49))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 507a0e7b-971f-44c3-bd4e-ce965bb56c6a))
     (fp_line (start -12.065 -4.445) (end 6.985 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 42ef7177-5973-438c-9ce7-5696bc653e72))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp a43d0a61-cc44-413c-8a23-05e26717ae9f))
     (fp_line (start -12.065 14.605) (end -12.065 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 3a817d00-4e81-41dc-a039-d87c72655cd4))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp beaea356-0aca-4fa2-8630-0303e481326c))
     (fp_line (start 6.985 -4.445) (end 6.985 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 4ac10056-8d10-4de0-9749-eaf4db8428de))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 2c1c17de-fd56-4b37-96c9-963676acab2d))
     (fp_line (start 6.985 14.605) (end -12.065 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 2958f336-af14-4f53-80f7-603244d5f585))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 2ba2c827-9322-477d-a02a-75cbf2ea0639))
     (fp_line (start -9.14 -1.52) (end 4.06 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 18a0f865-029d-42e0-abbf-9ffa8f0fa122))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp b1323aac-fe55-47de-b598-74d5d177ea3a))
     (fp_line (start -9.14 11.68) (end -9.14 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp a1a1719e-97d5-4cd0-b8b8-2a31bba73df1))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 3d8c7f4f-8e58-458a-84ef-95807f42e5c8))
     (fp_line (start 4.06 -1.52) (end 4.06 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp b3f591ef-ef4e-433e-9690-63db926ac196))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 099fa459-0a98-4afc-9a62-965f1b42c0b8))
     (fp_line (start 4.06 11.68) (end -9.14 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp e9a908f1-604f-4ed1-b152-5de1cf63aaa6))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 65532a6d-6b28-41b8-a918-0bd84c497998))
     (fp_line (start -8.89 -1.27) (end 3.81 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp a44ac115-2ac5-4030-81a9-a069a0ed0c4c))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp ee53510c-8c2c-4f6b-b4d6-d4a353f0350d))
     (fp_line (start -8.89 11.43) (end -8.89 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 505d862c-93a7-4bb7-936e-5531d7f7eb54))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 4915c986-fd46-4b78-b488-c790934e6cff))
     (fp_line (start 3.81 -1.27) (end 3.81 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 865436bf-002d-4fe9-b30e-378d8cea088a))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 1ef82105-068f-4b69-83d4-d218e4405cf0))
     (fp_line (start 3.81 11.43) (end -8.89 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 2f835a9d-e258-4942-82b1-d9ca37fad032))
-    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 9d4c96c9-13cb-40a9-88fd-3f5dff76de74))
-    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp ff71c337-54c5-4b72-a6c4-dcc4a3579cb8))
-    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 000906bc-9515-49d0-88e5-5ef3a8aacc6f))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 1230fddb-690b-44d9-8c43-29e5b6bbe1d1))
+    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp eb809dd4-bea2-43cf-ae4d-feae1fc64db2))
+    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 61a9a0c5-2976-4c01-9c52-62286a589b88))
+    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp c3e2907c-8176-4d2c-a2fc-118a406168ac))
     (pad "1" thru_hole circle (at 0 0) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 61 "Net-(D54-K)") (pinfunction "1") (pintype "passive") (tstamp 621a99e2-e378-498d-a3e2-f049bec9c5aa))
+      (net 58 "Net-(D35-A)") (pinfunction "1") (pintype "passive") (tstamp fb3f721a-5f8f-4358-88f1-f4a4cc130352))
     (pad "2" thru_hole circle (at -6.35 2.54) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 76 "Net-(J2-Pin_6)") (pinfunction "2") (pintype "passive") (tstamp 5ea1b9c8-f646-4be0-a8d3-47526dd71f51))
+      (net 20 "Net-(J2-Pin_4)") (pinfunction "2") (pintype "passive") (tstamp fe4f47fc-b739-4002-9a6d-23092c43b32a))
     (model "${KICAD6_3DMODEL_DIR}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1195,67 +1195,67 @@
   )
 
   (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (layer "F.Cu")
-    (tstamp 482d5e8e-b40f-44d7-9c53-7887c9c699db)
-    (at 181.45125 159.22625)
+    (tstamp 3b28df6c-1b0f-46df-942c-222b55751c19)
+    (at 171.60875 154.46375)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
     (property "Sheetname" "")
     (property "ki_description" "Push button switch, generic, two pins")
     (property "ki_keywords" "switch normally-open pushbutton push-button")
-    (path "/6a7aa636-e32b-4609-95df-048e58aa6352")
+    (path "/d2dcbac1-343c-4de3-9097-e36bdf799165")
     (attr through_hole)
-    (fp_text reference "SW37" (at -2.54 -2.794) (layer "F.SilkS")
+    (fp_text reference "SW26" (at -2.54 -2.794) (layer "F.SilkS")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp d0751761-5f61-4c29-9fb0-c4615dcef323)
+      (tstamp 9656b829-9212-4bfb-b9bd-9f4ccdc2c43f)
     )
     (fp_text value "SW_Push" (at -2.54 12.954) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp dbac6173-f846-494d-a289-b612a9857331)
+      (tstamp 48aeffc6-c4fc-4109-adba-b52d99440f93)
     )
     (fp_text user "${REFERENCE}" (at -2.54 -2.794) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 8119b633-5b6e-4dc9-9455-f748dcf487a6)
+      (tstamp ee1cd76e-0568-47a6-b539-d40999dede72)
     )
     (fp_line (start -9.525 -1.905) (end 4.445 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 817db383-7c94-467a-ad08-458905e277af))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 19d8900d-d468-4712-8829-a377e5eeddfe))
     (fp_line (start -9.525 12.065) (end -9.525 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp a28110b6-2f89-459b-8439-b2c7c630a6d2))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 83ab8398-dd5b-47f9-a632-e60fc6dfa3ad))
     (fp_line (start 4.445 -1.905) (end 4.445 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 1abaac31-81ac-4edf-a068-76a1dc2fe9c6))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp e8d1194a-611e-4fd0-aeb0-1f752bf74a9e))
     (fp_line (start 4.445 12.065) (end -9.525 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 2b1c1198-c111-4172-9786-0da7e99f2573))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 0a6230a2-9eb0-4e00-a820-8ce3fe6909d0))
     (fp_line (start -12.065 -4.445) (end 6.985 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp e42bc0a4-72c5-44e1-85ab-a4cc27122ee1))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 543c77a4-6c3c-414b-9d63-c57812944d53))
     (fp_line (start -12.065 14.605) (end -12.065 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp ce87394d-1842-41b3-bc13-a2966199d75f))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 771f66dd-7ab7-47a3-b948-68998e344ccd))
     (fp_line (start 6.985 -4.445) (end 6.985 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp d2f85b1d-40c5-427e-82ce-f15f8743b1eb))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 5b367af9-5c39-4a57-a044-ce566a5b58d0))
     (fp_line (start 6.985 14.605) (end -12.065 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp ca73564a-6c00-4e89-b96e-d61960d191dd))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp f3929e08-ea5d-4d45-b1eb-4858ded75ec7))
     (fp_line (start -9.14 -1.52) (end 4.06 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 7701f2d3-4203-4741-8407-0d683c3875b2))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 69d8ed50-f781-4d01-abd4-896172189376))
     (fp_line (start -9.14 11.68) (end -9.14 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp f262a061-1ad0-4e81-ad8b-842be98c9e14))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 6a08455d-7012-4fec-a580-8eb416064dcd))
     (fp_line (start 4.06 -1.52) (end 4.06 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 58c2f150-ff03-4944-9369-d33172a318b3))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 5e13d214-2302-4437-8b36-0acfe590b663))
     (fp_line (start 4.06 11.68) (end -9.14 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 97e8bdff-6545-4723-903e-be4308a72369))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 8cb88b0a-aa57-41dd-8f34-fcd5e37494ef))
     (fp_line (start -8.89 -1.27) (end 3.81 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 9f5a236f-609d-429a-b519-b39a581a9480))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 002bb6ef-ff81-477e-94ff-6d57de1fb071))
     (fp_line (start -8.89 11.43) (end -8.89 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp d5d1bba6-774b-4b8a-a900-57c5cacd363d))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 9f907e6c-6518-4d96-81cd-cb8901ef1f11))
     (fp_line (start 3.81 -1.27) (end 3.81 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp ce0ded98-56b8-40b1-a07f-b10fdaf1df5c))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 0f6d2580-247f-4abc-9db7-8c9f737fef17))
     (fp_line (start 3.81 11.43) (end -8.89 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 500a7fcf-b036-4a3e-bf94-6291589bb703))
-    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 8fe7e2f1-908d-4a5f-b56a-973994a698eb))
-    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp a086ab88-33ca-487a-ae03-86d23a450bf6))
-    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp d1ccc68e-c955-4b3c-9b39-d533f1c96fab))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 9a2fe280-6669-4321-9101-be4c1060480a))
+    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 1c1a96b3-c3f6-4c7c-b159-845017923bbf))
+    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 57200027-a366-440b-a9c0-320a2aabbf1c))
+    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 64119734-58e1-41c5-9671-3d381c7fc960))
     (pad "1" thru_hole circle (at 0 0) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 42 "Net-(D37-K)") (pinfunction "1") (pintype "passive") (tstamp acd97f48-15ab-4b03-ace1-a25c49deb117))
+      (net 50 "Net-(D26-A)") (pinfunction "1") (pintype "passive") (tstamp ed881b16-7f9b-4a80-b879-517d77c4f8d7))
     (pad "2" thru_hole circle (at -6.35 2.54) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 75 "Net-(J2-Pin_5)") (pinfunction "2") (pintype "passive") (tstamp b92730e5-94df-4a33-846c-3a82404dbfab))
+      (net 18 "Net-(J2-Pin_2)") (pinfunction "2") (pintype "passive") (tstamp 0943ee4f-5b8d-41ca-859c-a37a1c77ecce))
     (model "${KICAD6_3DMODEL_DIR}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1263,69 +1263,69 @@
     )
   )
 
-  (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.25u_PCB" (layer "F.Cu")
-    (tstamp 4aed76f8-015f-4683-8b62-03f7587beb24)
-    (at 355.2825 159.22625)
-    (descr "Cherry MX keyswitch, 1.25u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
-    (tags "Cherry MX keyswitch 1.25u PCB")
+  (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (layer "F.Cu")
+    (tstamp 3c1d0111-c773-4d83-8f65-abb7f5402ebb)
+    (at 176.37125 116.36375)
+    (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
+    (tags "Cherry MX keyswitch 1.00u PCB")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
     (property "Sheetname" "")
     (property "ki_description" "Push button switch, generic, two pins")
     (property "ki_keywords" "switch normally-open pushbutton push-button")
-    (path "/3257b422-d8f6-4442-8a0b-6ededf40da0a")
+    (path "/3a31fca7-b12c-4b5d-aa51-ffedf95827f9")
     (attr through_hole)
-    (fp_text reference "SW26" (at -2.54 -2.794) (layer "F.SilkS")
+    (fp_text reference "SW13" (at -2.54 -2.794) (layer "F.SilkS")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp a6253ee6-3658-4c1e-adcb-d9ccb72ec1c1)
+      (tstamp 0fd7ab73-1bad-4141-8ef9-2471cf1d2ef8)
     )
     (fp_text value "SW_Push" (at -2.54 12.954) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 15b46f5c-cf1f-4e3d-94e6-0679f51396b2)
+      (tstamp 679d3c0a-daf7-49bc-8167-9940bf11fbd7)
     )
     (fp_text user "${REFERENCE}" (at -2.54 -2.794) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp fd4065ab-20c5-416a-a032-d09552963997)
+      (tstamp c601644a-774c-4674-8380-60dae15cce6e)
     )
     (fp_line (start -9.525 -1.905) (end 4.445 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp e72bd42e-a6b2-4695-b694-4b8c92a8b2e6))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 0cc5ff0e-7953-46ce-9654-38750bf780ea))
     (fp_line (start -9.525 12.065) (end -9.525 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 69b4cc86-a975-424e-b47d-8e1a6d79cf41))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 8454957e-f5a2-461f-9e17-3006c1782cd0))
     (fp_line (start 4.445 -1.905) (end 4.445 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 2e986f2e-8593-4ac1-aec0-81a30eabe4a5))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 02b092a4-ec98-4b04-adce-833642956485))
     (fp_line (start 4.445 12.065) (end -9.525 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 99fa97d6-340b-45b9-97ee-21d4dae8b317))
-    (fp_line (start -14.44625 -4.445) (end 9.36625 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 44d3f005-cdbe-45f4-8fac-37bbef33bf39))
-    (fp_line (start -14.44625 14.605) (end -14.44625 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 45189823-8cae-4b46-831a-c2b13e46363d))
-    (fp_line (start 9.36625 -4.445) (end 9.36625 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp f09455fb-1f7b-43e5-811b-2ec2baa7f1db))
-    (fp_line (start 9.36625 14.605) (end -14.44625 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 357fbfad-bde6-45eb-8c6a-f49e186d7553))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 36eb0022-d315-47c1-9b5d-52a21af70570))
+    (fp_line (start -12.065 -4.445) (end 6.985 -4.445)
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 74b2199f-a27b-4d31-bdb6-c4f564762b56))
+    (fp_line (start -12.065 14.605) (end -12.065 -4.445)
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 447b91a3-af5f-4f0a-9240-fd8321edf896))
+    (fp_line (start 6.985 -4.445) (end 6.985 14.605)
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 038616cc-523e-417d-ad02-2efaff03b111))
+    (fp_line (start 6.985 14.605) (end -12.065 14.605)
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 761ccb11-e4ac-41e5-b934-be7f712611b3))
     (fp_line (start -9.14 -1.52) (end 4.06 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 2f31a267-289c-4f07-8258-6a0037a4d966))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 23d42f42-6fb7-4ffd-995b-6dab63139e3d))
     (fp_line (start -9.14 11.68) (end -9.14 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp bf2499f4-9741-4299-bb67-4e927978b6bc))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 2293fe8b-59cc-41a6-a296-87e39e5b8e9a))
     (fp_line (start 4.06 -1.52) (end 4.06 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 0135a964-976b-43a8-937b-03cb2fbcc1bf))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp a405a562-f429-4a5c-aa66-55aeba5f4619))
     (fp_line (start 4.06 11.68) (end -9.14 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 6f0fa117-cf0a-4c01-a2ea-118c14ab4e27))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp c93a848d-a459-4ba5-a402-12b64980a67b))
     (fp_line (start -8.89 -1.27) (end 3.81 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 573b7281-be69-4436-bb0c-5b43331689e2))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp beaa5616-65a1-46ad-b3ab-f401dc2111e6))
     (fp_line (start -8.89 11.43) (end -8.89 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp ccab4520-6064-4b44-bc0a-1e10cdf1d0b2))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp eecd7440-49a9-4e6d-ab07-63600447a72b))
     (fp_line (start 3.81 -1.27) (end 3.81 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 0f3aa8f9-0cf6-4ab4-b052-23357ebd5963))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 945e4bbf-7ffc-40da-a9cf-ec3c82c12654))
     (fp_line (start 3.81 11.43) (end -8.89 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 5d088ec1-c119-4d9b-963e-b1c1bb3a572b))
-    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 21fd6eea-47a2-4aba-a99e-83cb99d24eb2))
-    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 34e9cc67-27ba-43cc-b5b3-70b59212901e))
-    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 12f671d4-0f2b-43c8-9361-1d795e38f3cd))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 0f88f4ad-66b0-4b91-94ea-13d8f44691d2))
+    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 5539964e-ad5c-46cc-b66f-ef4bcc2e49eb))
+    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp fc0e155a-6824-44bb-9e32-02c65bf6e67a))
+    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp ed60ae26-0545-4900-968f-97ecd6dc4bbd))
     (pad "1" thru_hole circle (at 0 0) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 30 "Net-(D26-K)") (pinfunction "1") (pintype "passive") (tstamp 8246c29b-acf7-4166-baea-3ac1173ee625))
+      (net 39 "Net-(D13-A)") (pinfunction "1") (pintype "passive") (tstamp 1a3c251b-4e63-4812-abb7-e22a87209e5d))
     (pad "2" thru_hole circle (at -6.35 2.54) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 72 "Net-(J2-Pin_2)") (pinfunction "2") (pintype "passive") (tstamp 09b9cb80-93fc-4900-b89c-875ca55d3280))
-    (model "${KICAD6_3DMODEL_DIR}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.25u_PCB.wrl"
+      (net 21 "Net-(J2-Pin_5)") (pinfunction "2") (pintype "passive") (tstamp ea41e16a-5c21-4f5c-bfcd-4c1613c268cb))
+    (model "${KICAD6_3DMODEL_DIR}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
       (rotate (xyz 0 0 0))
@@ -1333,67 +1333,67 @@
   )
 
   (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (layer "F.Cu")
-    (tstamp 4ea7031c-5d57-4070-a347-a1d39ba2c27f)
-    (at 310.03875 140.17625)
+    (tstamp 42654236-5a92-47eb-af79-ba7ab254c42c)
+    (at 314.48375 135.41375)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
     (property "Sheetname" "")
     (property "ki_description" "Push button switch, generic, two pins")
     (property "ki_keywords" "switch normally-open pushbutton push-button")
-    (path "/53c52244-99d8-46a3-a793-8aca97d2cc31")
+    (path "/40e20354-aaa9-4ad1-8f12-9a4f25b60d5e")
     (attr through_hole)
-    (fp_text reference "SW29" (at -2.54 -2.794) (layer "F.SilkS")
+    (fp_text reference "SW52" (at -2.54 -2.794) (layer "F.SilkS")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 91675e39-0322-44d2-b559-9d013b2cf16d)
+      (tstamp dc79fbdd-27fe-4982-8e12-396f3fa0cdde)
     )
     (fp_text value "SW_Push" (at -2.54 12.954) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 9ab35c02-47cc-4dd3-9860-b1821748a877)
+      (tstamp afd08ff7-ec0a-4803-acce-6bf872b81067)
     )
     (fp_text user "${REFERENCE}" (at -2.54 -2.794) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 7b193aa1-13dd-4a66-adec-cb7f8c7424e7)
+      (tstamp f6d4b2a6-1a98-46ca-85ea-07db096855b3)
     )
     (fp_line (start -9.525 -1.905) (end 4.445 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 14ea3b30-9d1f-4c95-a911-ffdd85d0c666))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 468819a2-c00a-4a8d-bbec-3eb17ddcb061))
     (fp_line (start -9.525 12.065) (end -9.525 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp e2963340-1d8f-473b-aa75-6dcff46ccdba))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp d10c4140-51b2-4cc6-a059-71be14147b1d))
     (fp_line (start 4.445 -1.905) (end 4.445 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 144dfa08-470a-4960-adf4-27e747216124))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp c85c500c-bf2f-420a-8ec6-934af24ff79a))
     (fp_line (start 4.445 12.065) (end -9.525 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp d1b572e7-9944-45d6-a94a-65a98bf576c7))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp bbcd0bcb-effa-415b-92b1-ce548be02595))
     (fp_line (start -12.065 -4.445) (end 6.985 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 6dfa59a2-9fed-42dd-a6a6-4c05fa1f4912))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 98f7e5c1-65f6-4b04-b7a6-5ef1a755e917))
     (fp_line (start -12.065 14.605) (end -12.065 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 38619104-070e-42c8-8a20-13dca2fa6b77))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp aa786680-78ea-4459-b75a-2018b19e9a15))
     (fp_line (start 6.985 -4.445) (end 6.985 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp a3bbf56f-336d-49b3-9ae7-d3fa8ba13054))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp da0d9c79-4e41-41f7-933c-e5a0c4c23b8e))
     (fp_line (start 6.985 14.605) (end -12.065 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp c19bf776-9e23-448b-afed-4d11440459f3))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 2108c8d5-3453-4817-8e78-054171bacfca))
     (fp_line (start -9.14 -1.52) (end 4.06 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp c1249603-f3db-48ed-93e0-c2f4386ce8f9))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp fe048c7c-18ba-4127-91dd-837f772f6b86))
     (fp_line (start -9.14 11.68) (end -9.14 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 70aaaeb4-a41d-41ec-be23-426b0c2d3858))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 215ca255-7608-4bd8-a7e5-8af7de8f8cef))
     (fp_line (start 4.06 -1.52) (end 4.06 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 9f724b21-9ba4-41fd-8405-2e66ea8e601c))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 7b4417f5-a182-4654-aa70-c673f7b21485))
     (fp_line (start 4.06 11.68) (end -9.14 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 6609760d-9211-4690-9201-2a1c9bcfa581))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp c6b9187c-fa0c-434f-ac21-e09814341ee6))
     (fp_line (start -8.89 -1.27) (end 3.81 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 429ef717-b96e-4070-9583-a78b6d55bdd4))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 1f281f28-0514-4c65-9a10-d92498ad2022))
     (fp_line (start -8.89 11.43) (end -8.89 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 437464c8-601e-46b0-af2e-5478e7784b7f))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 104f731c-dfc1-4f8e-a885-5b26e82fb380))
     (fp_line (start 3.81 -1.27) (end 3.81 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 41a9c2b8-1b1b-42ef-8216-a2b9168363d9))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 5c5d24aa-d530-4fd8-b087-33f80fa619cc))
     (fp_line (start 3.81 11.43) (end -8.89 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp c2290d0e-3bdf-439c-bb90-61748a813d1d))
-    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp bdfcdd2c-c9ee-4fe5-a62d-a2bcf72d410a))
-    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp a5e4133c-c22c-4044-9d24-5a250bc9fc4e))
-    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 46fd49a1-72e4-442f-af8b-62e467da35d4))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 5a3eddb9-6ca6-43d1-a239-4421d21eff09))
+    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp bb056c8f-edd1-4c52-bf82-c6f0400b6cf0))
+    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 5c566e96-5924-4f7b-9b00-082123970c0f))
+    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 6c78ff0d-48aa-4e2d-9a43-de56be2f0c8b))
     (pad "1" thru_hole circle (at 0 0) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 33 "Net-(D29-K)") (pinfunction "1") (pintype "passive") (tstamp 17d959bc-716b-4b90-9844-aa7c89cbd014))
+      (net 73 "Net-(D52-A)") (pinfunction "1") (pintype "passive") (tstamp 515a115c-df51-40f4-8aba-61f898853525))
     (pad "2" thru_hole circle (at -6.35 2.54) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 75 "Net-(J2-Pin_5)") (pinfunction "2") (pintype "passive") (tstamp c295dd87-b948-4d64-a9ee-bf9b9ed4137d))
+      (net 21 "Net-(J2-Pin_5)") (pinfunction "2") (pintype "passive") (tstamp 0e1d4c20-d5b3-42c6-a8f8-808ccc2b88ab))
     (model "${KICAD6_3DMODEL_DIR}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1402,67 +1402,67 @@
   )
 
   (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (layer "F.Cu")
-    (tstamp 550be80f-a86d-4973-9f54-9e25e1005ec1)
-    (at 233.83875 140.17625)
+    (tstamp 4287aac2-e526-4e9b-8a2f-49308e98a895)
+    (at 143.03375 135.41375)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
     (property "Sheetname" "")
     (property "ki_description" "Push button switch, generic, two pins")
     (property "ki_keywords" "switch normally-open pushbutton push-button")
-    (path "/d22f7904-94c7-4339-b6f7-ec2e273cce55")
+    (path "/339e8116-41df-4f72-a009-962503a97fe7")
     (attr through_hole)
-    (fp_text reference "SW24" (at -2.54 -2.794) (layer "F.SilkS")
+    (fp_text reference "SW10" (at -2.54 -2.794) (layer "F.SilkS")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp fe047498-7e63-4eaf-b646-e7410b98fff1)
+      (tstamp 3073daea-bdae-4d40-a640-989423ffdce2)
     )
     (fp_text value "SW_Push" (at -2.54 12.954) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 64522e01-4194-4dd6-b066-e0824116aa0e)
+      (tstamp 7008a265-045f-400b-89ad-b3993e6203dd)
     )
     (fp_text user "${REFERENCE}" (at -2.54 -2.794) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 4e6f025d-b64f-4491-b203-9aa946decc41)
+      (tstamp 0fb8a935-56be-4ba2-a451-f9ee73a89dc2)
     )
     (fp_line (start -9.525 -1.905) (end 4.445 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 91902a5a-931b-47e8-a512-f7be5a74569e))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 2eaa5f38-c2e9-4134-b2ab-7a8f80a1d14e))
     (fp_line (start -9.525 12.065) (end -9.525 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 50166396-aeef-4ef6-a857-03224e2ce013))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 69cbbd55-636f-43d0-9278-b09fe265f1a9))
     (fp_line (start 4.445 -1.905) (end 4.445 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp c6f3dbc7-b920-4632-bcd2-7b2e931a0a9f))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp f2dd538a-3a18-4594-a98b-cc1f955a62a7))
     (fp_line (start 4.445 12.065) (end -9.525 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 90ad6cfb-a0b7-43bc-be36-36975cbea51d))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 2dd02e11-15c3-4a00-8470-f82cf58f8692))
     (fp_line (start -12.065 -4.445) (end 6.985 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 7dbaa8a6-82e3-4351-b886-3e8d72c994b3))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 6615761f-d719-448b-b53f-0affe2ecb729))
     (fp_line (start -12.065 14.605) (end -12.065 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp ef776da9-4e53-4632-af9c-a6a30cc9e6f1))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 7fb42d70-d3f2-4f26-bf83-826f18185b4d))
     (fp_line (start 6.985 -4.445) (end 6.985 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 649c904d-36a7-44ea-af79-a70e2167e6da))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 45c526cc-aa1a-4f16-8a14-bfe298dd530d))
     (fp_line (start 6.985 14.605) (end -12.065 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 72ce309c-1ce1-4478-b20e-aa95363ee6d1))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 2a1f7385-aa0c-4e64-9df7-531cc066cbae))
     (fp_line (start -9.14 -1.52) (end 4.06 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp f22cb54c-bcef-4ea3-b270-56f69cddcb6b))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 5a8e8710-a05a-4c1c-94dc-a95e1a9365a3))
     (fp_line (start -9.14 11.68) (end -9.14 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 4017b089-4669-4865-857c-395ffb6965df))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 332425b2-ed36-421a-906a-6604c21c60a2))
     (fp_line (start 4.06 -1.52) (end 4.06 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp a9ec7468-94bd-4a05-bde2-8f939deb0fe3))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 164389a9-3a38-4e1f-a1cc-1866e294b28c))
     (fp_line (start 4.06 11.68) (end -9.14 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp e5829e12-4687-4310-8197-4e0aa7b3a151))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 16d16962-0d22-4f55-9b8c-4f005def31b9))
     (fp_line (start -8.89 -1.27) (end 3.81 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 916d377f-4fdb-4405-a5aa-0fd5f9ebc1e2))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 9de0e24c-2996-41b4-85d8-01b2b47530ae))
     (fp_line (start -8.89 11.43) (end -8.89 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 7c38054c-052b-484a-88a5-ca5c964636a1))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp e5d96a10-bc49-40e5-979f-bb928729d9ab))
     (fp_line (start 3.81 -1.27) (end 3.81 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp a9140f27-dc2b-4e37-952f-aca20ddaec0e))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp ab3c5fcc-ad9a-4713-8392-8a0e07fbe32e))
     (fp_line (start 3.81 11.43) (end -8.89 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 1546680d-d6cc-4b0a-abac-f7248df73a5a))
-    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp c57358ab-beff-430d-8417-c741e147bd3f))
-    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 6f6e5be7-d291-4dd0-bc82-a8106dffe2e8))
-    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 23fd5cfd-3ec4-4b2a-9852-01f6d1f84e3c))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp fecaaf00-50ab-46b7-8616-830f6acd97c2))
+    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp f4d7af18-2ff8-4477-ad05-f38bdd02c535))
+    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 5a3bb9bc-5535-4997-a8a3-de26a6408612))
+    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp f0a8af52-6892-4d58-a962-675b2a93044f))
     (pad "1" thru_hole circle (at 0 0) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 27 "Net-(D24-K)") (pinfunction "1") (pintype "passive") (tstamp 561b4b04-3959-4391-b995-c4b650f17c36))
+      (net 3 "Net-(D10-A)") (pinfunction "1") (pintype "passive") (tstamp 6d674a1e-fd2b-4475-9ab2-3ba2fc8a98d2))
     (pad "2" thru_hole circle (at -6.35 2.54) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 78 "Net-(J2-Pin_8)") (pinfunction "2") (pintype "passive") (tstamp 10d96e70-a4a0-4c0e-8e8b-20b442f06695))
+      (net 18 "Net-(J2-Pin_2)") (pinfunction "2") (pintype "passive") (tstamp f4d444b3-2359-4255-baa9-6258a199d488))
     (model "${KICAD6_3DMODEL_DIR}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1471,67 +1471,67 @@
   )
 
   (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (layer "F.Cu")
-    (tstamp 581c244b-6fc6-4966-a280-7ef0c213104c)
-    (at 324.32625 178.27625)
+    (tstamp 47c1cd0f-fcd8-47b5-a203-4ba626121dec)
+    (at 166.84625 97.31375)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
     (property "Sheetname" "")
     (property "ki_description" "Push button switch, generic, two pins")
     (property "ki_keywords" "switch normally-open pushbutton push-button")
-    (path "/b150266a-54b4-4adf-84af-c439387d4f4e")
+    (path "/1253844f-7183-4232-9f24-053e93f33ee8")
     (attr through_hole)
-    (fp_text reference "SW44" (at -2.54 -2.794) (layer "F.SilkS")
+    (fp_text reference "SW5" (at -2.54 -2.794) (layer "F.SilkS")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp c13c45d9-af1e-4b33-9e33-645239b6f469)
+      (tstamp 5c7c12b7-162c-4ad9-ac2d-e1709cabf47e)
     )
     (fp_text value "SW_Push" (at -2.54 12.954) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 889537bb-a207-45dd-a9a4-ab624efee1f6)
+      (tstamp fd28653c-aeee-4b72-b09c-5962edfd7e02)
     )
     (fp_text user "${REFERENCE}" (at -2.54 -2.794) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 0ea9f481-2aa3-4a69-9e75-4993fcdb4222)
+      (tstamp 1a3de972-02a5-47ab-b3e8-6def21797e87)
     )
     (fp_line (start -9.525 -1.905) (end 4.445 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 56cd30cd-063c-4528-99a1-9082617ddfdb))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 7e96fcba-29a0-4835-b575-c1796935d4db))
     (fp_line (start -9.525 12.065) (end -9.525 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp dc296b6f-5264-4e2c-b6e0-ef3b3ac93ce3))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp cb653562-10a5-4dca-87d1-d7a9c364a72d))
     (fp_line (start 4.445 -1.905) (end 4.445 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 8fc8fc4a-6e64-47d9-ba4b-d14cdbcda3c8))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 40f1896c-96bf-43c5-a0ff-c3dd2b2caa26))
     (fp_line (start 4.445 12.065) (end -9.525 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 1c3be023-254e-458d-9ec0-87958d111e71))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 48116dd6-049b-4afb-8757-382bb5e97e01))
     (fp_line (start -12.065 -4.445) (end 6.985 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp b67f1edb-dcdc-442e-b670-9ce69f2184f0))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp b58a462c-4a17-49fc-a91b-d78ccc464a07))
     (fp_line (start -12.065 14.605) (end -12.065 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 03c34770-9742-49fb-aac1-12af073a2437))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 5acde124-9955-4215-b970-88b0b6d887ef))
     (fp_line (start 6.985 -4.445) (end 6.985 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 26edc91a-02f2-4cae-8f35-bd2372686294))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp f5a2f78a-a491-44f4-ba20-8fa8fbfab18a))
     (fp_line (start 6.985 14.605) (end -12.065 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 404051ec-7e21-48e8-bacf-df1b02330840))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp b78f4306-170f-495f-acfc-e43c2c63fad3))
     (fp_line (start -9.14 -1.52) (end 4.06 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 4f7644f1-db15-49d9-9f5e-23e0af4bc048))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp accbfa24-df81-4117-97ee-fe7702a874a1))
     (fp_line (start -9.14 11.68) (end -9.14 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp da376ac3-f889-4e82-98e8-8014cefc199e))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 791885af-4f63-431a-937c-758479895d52))
     (fp_line (start 4.06 -1.52) (end 4.06 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp fd523d0a-5fd0-48b4-a9a6-6a62768acfc9))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 2aafcb53-a44e-4116-9bcf-1e043b3ae6ae))
     (fp_line (start 4.06 11.68) (end -9.14 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 76334993-9766-41ea-b6e7-c8f1e2f7a860))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 4271ad86-bb39-4294-8b5c-6e2bdd0c0cac))
     (fp_line (start -8.89 -1.27) (end 3.81 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp ac177639-d759-4d66-adef-df92852854a7))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 9384977b-4ffc-40ef-99a4-bf41653ae1ac))
     (fp_line (start -8.89 11.43) (end -8.89 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 8e762ee7-a2a6-4d37-beea-065e0f3533f5))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 1b54fad5-af23-4906-879d-f9bce0e383f8))
     (fp_line (start 3.81 -1.27) (end 3.81 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 901e3ec7-c2b8-4872-8aea-a638ad1f22a5))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 11a827b9-b565-4eaf-830e-047eafd02009))
     (fp_line (start 3.81 11.43) (end -8.89 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 927fda45-9d6b-4a2d-b59c-39d6f4c33f51))
-    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 4077e1ae-c869-4fd1-b851-57e9464b2cb8))
-    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp edadf9a7-01aa-4308-9080-25919ddd72ab))
-    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp c35de6bf-e3d9-497f-96ae-a70d4e4a74c0))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 480a1349-7457-436b-b264-1abedcb335ab))
+    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 997afe4d-0b8e-4fd5-8e92-c869a6cb949a))
+    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 96aa50da-668f-4a84-a1bb-fc78de7cdc5c))
+    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp cfab196d-ccbf-4fd4-a495-3d775c5e48fd))
     (pad "1" thru_hole circle (at 0 0) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 50 "Net-(D44-K)") (pinfunction "1") (pintype "passive") (tstamp 6fcd5d4b-5741-473a-b836-da06463f45ff))
+      (net 32 "Net-(D5-A)") (pinfunction "1") (pintype "passive") (tstamp e1b4300f-a94d-41f2-ab1c-c64662aa76ee))
     (pad "2" thru_hole circle (at -6.35 2.54) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 74 "Net-(J2-Pin_4)") (pinfunction "2") (pintype "passive") (tstamp a848641d-c48d-4382-acf1-6c7ec6f93547))
+      (net 21 "Net-(J2-Pin_5)") (pinfunction "2") (pintype "passive") (tstamp b7b45b23-f9a3-4799-8fde-cdd2419afd5f))
     (model "${KICAD6_3DMODEL_DIR}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1540,67 +1540,67 @@
   )
 
   (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (layer "F.Cu")
-    (tstamp 58de7766-58b6-4fa1-8d38-f2e3603eb9ca)
-    (at 143.35125 159.22625)
+    (tstamp 48fc4792-e0f6-4bc2-a43c-9c317b4f3ae3)
+    (at 300.19625 97.31375)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
     (property "Sheetname" "")
     (property "ki_description" "Push button switch, generic, two pins")
     (property "ki_keywords" "switch normally-open pushbutton push-button")
-    (path "/78b01cd8-2b96-4366-ae95-9fd9e7c2bb82")
+    (path "/fa0b1f24-9f7d-4004-aa9a-6c18cbb714d6")
     (attr through_hole)
-    (fp_text reference "SW18" (at -2.54 -2.794) (layer "F.SilkS")
+    (fp_text reference "SW36" (at -2.54 -2.794) (layer "F.SilkS")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 63735e87-e39b-47ec-ac15-f3fa2d270d84)
+      (tstamp 5754e94a-99ef-42a8-ab8f-ec8059adfc91)
     )
     (fp_text value "SW_Push" (at -2.54 12.954) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 166ce41d-33e0-4c0c-89f7-90fce542c02d)
+      (tstamp 8638ed12-e03f-4a54-92a7-36f0af2ab573)
     )
     (fp_text user "${REFERENCE}" (at -2.54 -2.794) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp c3fc3e62-9779-4fbc-87ba-131aa0db5250)
+      (tstamp f651059b-619e-4e30-bb39-b239fca0ae86)
     )
     (fp_line (start -9.525 -1.905) (end 4.445 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp f0663afe-1104-47a1-8f86-2e7a918803e2))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 66bc0298-0d68-44e8-82b1-922f8bc98392))
     (fp_line (start -9.525 12.065) (end -9.525 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp ef5584a0-c710-4ff9-88fa-962189b5c43e))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp f05793c5-4957-496c-b640-39c618619d51))
     (fp_line (start 4.445 -1.905) (end 4.445 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 940f5d43-040c-49da-91e6-fd8a0510d15f))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 62a876fe-e557-4952-8891-2458bf862105))
     (fp_line (start 4.445 12.065) (end -9.525 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp b1f97f79-b2d4-4ab8-a352-f1ad827edc39))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp d1ff38ae-4a0c-4b5a-bb0c-328c7a3a42d7))
     (fp_line (start -12.065 -4.445) (end 6.985 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp cd603c07-cafe-4dff-a3ea-02e27456801c))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp aef91d92-ecf8-4045-aa52-2c6b5fe5c5ca))
     (fp_line (start -12.065 14.605) (end -12.065 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 88e94285-8b92-4677-9e75-3233419c8cff))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 99546acd-6a0c-428a-bc50-1cad24ba8281))
     (fp_line (start 6.985 -4.445) (end 6.985 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 770a1ecc-bd43-4a0f-a258-70ef8a696a52))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp bca5cc7c-311e-4cf2-a1b5-37efaab6d340))
     (fp_line (start 6.985 14.605) (end -12.065 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp c59cb4cd-a570-4fed-be0c-52fc250d12ab))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp acfe3519-dfbc-4b46-a716-eb83617a6303))
     (fp_line (start -9.14 -1.52) (end 4.06 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 8be26a2f-8362-4526-863c-b3e26428e2ab))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 6fd62dab-7555-4f38-936d-e2974b6791b3))
     (fp_line (start -9.14 11.68) (end -9.14 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp f4608d8a-9550-478f-9160-ac69df0e7adb))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 5a15e8ad-b209-4fbf-ad80-43cb8e7c5e63))
     (fp_line (start 4.06 -1.52) (end 4.06 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 48d969ed-9960-4cc1-9abf-b3d77526de7d))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 3fd46290-86db-4d2e-ab7a-8037c1d99c94))
     (fp_line (start 4.06 11.68) (end -9.14 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp cd9c072e-783b-401b-abc8-12d9b4ddbf85))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 214664be-77ce-455f-91ca-d46895f1d3be))
     (fp_line (start -8.89 -1.27) (end 3.81 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 78c6a573-15be-445d-88e0-52e0b492f837))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 74971196-23e3-4b4d-b103-63816e211b83))
     (fp_line (start -8.89 11.43) (end -8.89 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 68ea4ee5-5508-4451-99a2-6f3efee9a086))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 2e055097-f81b-4839-a874-c28dd76bc6eb))
     (fp_line (start 3.81 -1.27) (end 3.81 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp ec2f7e35-61c2-49b0-9333-8f25533a2d25))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp f250d122-0993-4651-a9c0-e88ddfbefcda))
     (fp_line (start 3.81 11.43) (end -8.89 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp b72dcea0-0eff-417d-913c-5832edb9d3ee))
-    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp a48f3123-8208-4177-b043-b31dd84228ce))
-    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 6cc66028-510e-4f51-8e90-6fb0d1359cb5))
-    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp b93c4bef-aae4-452f-84bf-dee8a81a0cf1))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 2bc7bbe2-69c3-466d-bce4-8dd13f9af20e))
+    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp ff52f4c4-0017-4438-85c8-05d445ac9fff))
+    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 3bfea981-e0d1-4945-9efd-7c101b054745))
+    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp bbbe0ef4-2631-41e2-936e-b184799f53e8))
     (pad "1" thru_hole circle (at 0 0) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 21 "Net-(D18-K)") (pinfunction "1") (pintype "passive") (tstamp 4c25b121-6a65-438d-930e-0701ca228b61))
+      (net 59 "Net-(D36-A)") (pinfunction "1") (pintype "passive") (tstamp 999a9ca4-52e0-478d-9a0a-6258e260f644))
     (pad "2" thru_hole circle (at -6.35 2.54) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 72 "Net-(J2-Pin_2)") (pinfunction "2") (pintype "passive") (tstamp 1c78a123-f18c-4114-9ec1-d48d4225ffb1))
+      (net 21 "Net-(J2-Pin_5)") (pinfunction "2") (pintype "passive") (tstamp b0bbffb7-0fb8-4860-aa3f-78fd35504d6a))
     (model "${KICAD6_3DMODEL_DIR}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1609,67 +1609,67 @@
   )
 
   (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (layer "F.Cu")
-    (tstamp 59448e3b-b46e-4cae-bc22-2c2c6e1419c2)
-    (at 238.60125 159.22625)
+    (tstamp 4a862199-91cb-4d14-9637-8fcb86b364d0)
+    (at 347.82125 116.36375)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
     (property "Sheetname" "")
     (property "ki_description" "Push button switch, generic, two pins")
     (property "ki_keywords" "switch normally-open pushbutton push-button")
-    (path "/02bb0712-cc0a-4ddc-a851-d17ba498eaa8")
+    (path "/baed0053-f464-4f66-9d48-db131a091a15")
     (attr through_hole)
-    (fp_text reference "SW40" (at -2.54 -2.794) (layer "F.SilkS")
+    (fp_text reference "SW32" (at -2.54 -2.794) (layer "F.SilkS")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp d610c101-839a-4381-afbb-abc8bc5d44f4)
+      (tstamp 984238fc-aaea-44db-b2bc-e149d13ff315)
     )
     (fp_text value "SW_Push" (at -2.54 12.954) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 22097468-ac76-402e-ad25-2405bb57fd6c)
+      (tstamp aba87c3d-5310-42ca-baa0-5a37880a6a6e)
     )
     (fp_text user "${REFERENCE}" (at -2.54 -2.794) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp fd263734-279b-44f1-aba6-2129f6896cb3)
+      (tstamp ae7eed8f-2919-4dc3-b2e8-48d733a91c83)
     )
     (fp_line (start -9.525 -1.905) (end 4.445 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 90d32aa6-e804-44fd-832c-45e27217461f))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 9e25dc27-d5c6-4b81-bb62-73d06874e84f))
     (fp_line (start -9.525 12.065) (end -9.525 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 8967486c-7c69-4754-b20b-cee6423d11fb))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 3fa15fa7-571e-4354-93dc-b423dc5eff1d))
     (fp_line (start 4.445 -1.905) (end 4.445 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp c3df9d46-e819-4c1f-8ec5-403e1ce80c63))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp ed10e1a3-5431-4f62-b865-fab655c98433))
     (fp_line (start 4.445 12.065) (end -9.525 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp eed32329-a04f-45b3-bc62-7ef5ca033859))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp d0b0dbc9-19d1-4e9b-a072-73aa2c9de50c))
     (fp_line (start -12.065 -4.445) (end 6.985 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp fbafc64a-0fdb-49b2-92ab-aa1e5a55b4fc))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 2d5e1429-a8f6-4bc1-bef7-e66a7045d196))
     (fp_line (start -12.065 14.605) (end -12.065 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp cb6871c1-bb39-44f4-8119-a7e3c40f0f81))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp f52124d6-8d25-4389-b262-dc2c3eeb04ec))
     (fp_line (start 6.985 -4.445) (end 6.985 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp bf7729b5-cd76-4aeb-aacc-32c11669a378))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp de64ca7b-7f7d-40df-ad00-63a5abc9c4f9))
     (fp_line (start 6.985 14.605) (end -12.065 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 3132af55-9337-4ab0-b377-7d3ef99e4e74))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp ed4553a2-e159-4c5e-b283-3a998138526a))
     (fp_line (start -9.14 -1.52) (end 4.06 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp f07013f2-7466-4315-bf27-18d7377562c0))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 6f37a300-4fb2-4c01-985d-359c6d0964f2))
     (fp_line (start -9.14 11.68) (end -9.14 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 89967f05-eb5a-4398-99fa-602e7ff1ae13))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 6e8e17bf-7221-4d58-a99f-019b89259fb4))
     (fp_line (start 4.06 -1.52) (end 4.06 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp c5966e28-c6fa-4815-8631-9f7933ee4a2c))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 39e32ce3-b06c-4bce-b6b0-7cea891d89ab))
     (fp_line (start 4.06 11.68) (end -9.14 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp c1afbe65-0906-4f3f-9020-1a3ab596682b))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp ccdcc932-878c-4731-8db2-3600d1d8a6ff))
     (fp_line (start -8.89 -1.27) (end 3.81 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 0db4306a-879b-4664-bf22-f6b2e327e912))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 137ee7ac-d8f3-4d38-8b2b-b955a4c68e93))
     (fp_line (start -8.89 11.43) (end -8.89 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp f29f6baf-7d4d-4af4-bc0e-11b4c3ecf1ed))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp a3f99edd-d837-44e4-adb0-427dd59a8439))
     (fp_line (start 3.81 -1.27) (end 3.81 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp d362944d-6db1-4b22-a46b-0fe2f281cf42))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 9d813d09-c64e-4003-85e9-52f2a01d49f0))
     (fp_line (start 3.81 11.43) (end -8.89 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp fc911ab0-6b7c-4ecc-95f6-1fc0e78f6897))
-    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp aa50a1b6-75d0-43bf-8285-8a834c87a318))
-    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 99640954-d342-45ea-83f3-84c8b3b16d30))
-    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp ce3e9eab-0f83-4e69-8d67-821d22542470))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 7ac0d0f7-142a-49c7-89e8-f0488f705d7d))
+    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp ebb61d44-476e-4670-8584-78d04f870a4d))
+    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 67256ed3-ba10-4c5a-b8f0-704415eaad1c))
+    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp b3784185-c91c-419b-90b4-e195af760021))
     (pad "1" thru_hole circle (at 0 0) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 45 "Net-(D40-K)") (pinfunction "1") (pintype "passive") (tstamp 1df25d5f-0747-4ea5-94ea-c9e05387a7c9))
+      (net 56 "Net-(D32-A)") (pinfunction "1") (pintype "passive") (tstamp 0e148ff9-cd4a-41a0-ba7a-46a021832270))
     (pad "2" thru_hole circle (at -6.35 2.54) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 78 "Net-(J2-Pin_8)") (pinfunction "2") (pintype "passive") (tstamp d5c66273-063b-4cca-b5fd-08b61460c77e))
+      (net 17 "Net-(J2-Pin_1)") (pinfunction "2") (pintype "passive") (tstamp bb21d8ae-4569-42f2-9c3e-0826936519f9))
     (model "${KICAD6_3DMODEL_DIR}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1678,67 +1678,67 @@
   )
 
   (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (layer "F.Cu")
-    (tstamp 5c1b1f77-f7b2-44fe-a994-523af27c472a)
-    (at 210.02625 178.27625)
+    (tstamp 4caac1ec-3329-43b2-b1c5-e4953f8be864)
+    (at 333.53375 135.41375)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
     (property "Sheetname" "")
     (property "ki_description" "Push button switch, generic, two pins")
     (property "ki_keywords" "switch normally-open pushbutton push-button")
-    (path "/c22441b9-97c5-4d44-b4c5-2db8cf50626d")
+    (path "/ebac2496-a9b9-4865-be80-d480b42256ae")
     (attr through_hole)
-    (fp_text reference "SW52" (at -2.54 -2.794) (layer "F.SilkS")
+    (fp_text reference "SW42" (at -2.54 -2.794) (layer "F.SilkS")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 282582a3-9d4f-4fc7-a787-1aafd6eff7d6)
+      (tstamp 475b0b39-80ff-4032-b036-7d2f6d3e6d6a)
     )
     (fp_text value "SW_Push" (at -2.54 12.954) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 2721ac64-b26d-4b72-bf5b-f4ec5ef7cc7e)
+      (tstamp f43c98f6-ec52-4a9a-a30a-11d1845a1d3e)
     )
     (fp_text user "${REFERENCE}" (at -2.54 -2.794) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 0ff1e114-330a-4216-82f4-ddfd6beb6e58)
+      (tstamp bee3f04e-9c24-4b27-b82d-9ef5bc0e9549)
     )
     (fp_line (start -9.525 -1.905) (end 4.445 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 1d1086f9-f2ba-4733-9833-fc216610330f))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 6dbac124-454f-4972-9938-39c088002586))
     (fp_line (start -9.525 12.065) (end -9.525 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp b3a1887b-a29f-4c78-83a2-c9936813b241))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 071501a9-9dbb-4d8d-854a-65f0de2cd742))
     (fp_line (start 4.445 -1.905) (end 4.445 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 4101c598-786f-4918-a40d-3931ffb6fe92))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 49bb2cf4-8ad4-4aec-883a-602b52356844))
     (fp_line (start 4.445 12.065) (end -9.525 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp b86123c8-14cb-4f22-908d-297cfdffc3ac))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 797186ad-76f1-4a5d-8d60-c08e6fa795f2))
     (fp_line (start -12.065 -4.445) (end 6.985 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp b388975c-eee3-4b03-9faa-129d84cd8193))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 34821b56-7235-4eb1-a89c-61c9e2797851))
     (fp_line (start -12.065 14.605) (end -12.065 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 772d1f7f-5858-4556-9316-be7b3b38882c))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp e7526da1-127f-4157-bd01-10e0554a9114))
     (fp_line (start 6.985 -4.445) (end 6.985 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 95157b94-c7e2-48da-94d5-adfdbf07c808))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 48d046d1-17db-4f2b-93ef-158f432ac777))
     (fp_line (start 6.985 14.605) (end -12.065 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 8f089b1f-cab5-4e77-9617-4db4827d10a8))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 210cb687-6d89-466b-bc5c-9b8321de03f7))
     (fp_line (start -9.14 -1.52) (end 4.06 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 430acfcf-d9dc-42c9-a0fb-aea3757e0975))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 2849efab-9375-482b-9e4b-3a6e5a76fcb2))
     (fp_line (start -9.14 11.68) (end -9.14 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp f4789346-13c0-4ead-8cbc-e8773cfa910e))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 2f7877ed-12f0-43f5-bd73-4e979be5eb5d))
     (fp_line (start 4.06 -1.52) (end 4.06 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp fe110108-6476-48c6-8c41-89f51b1a1672))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 16809424-08c4-4de7-a2b0-cc49906ebb22))
     (fp_line (start 4.06 11.68) (end -9.14 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 45881ab4-621d-4f75-b224-3d162b5a9f4b))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 36a7c121-6d34-490b-aee9-8df3e570520c))
     (fp_line (start -8.89 -1.27) (end 3.81 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 1dcb1614-b7da-466b-bcb7-0f09be69e0ac))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp f604049c-fb5e-4d59-b3e8-480196234c22))
     (fp_line (start -8.89 11.43) (end -8.89 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 7248627e-8b2e-431e-a334-bcc6ffd8e57b))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 2a44932f-02fb-49dc-8156-50ad44a0725b))
     (fp_line (start 3.81 -1.27) (end 3.81 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 0e82b6f4-ee50-4f04-b97c-b32232a629fb))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 2a88772e-0055-4000-9d80-a4e7bf1d35b5))
     (fp_line (start 3.81 11.43) (end -8.89 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 684172d9-7163-4c25-a064-911533ef94f6))
-    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp cd3b700f-c628-4af3-a683-1dfa1cec991a))
-    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 18a6a38f-004b-443a-8213-0d6c32c7e137))
-    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp d8d85df6-0362-4a25-a242-a27d2ae0e476))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp d94738f1-7935-4710-a2de-cd6bfdda60a0))
+    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 3fe69e29-2d56-47f4-a286-96a5cabfb0bc))
+    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 9cd9269d-63c3-4ac0-bf87-390d6acc4934))
+    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 4f10e7e7-c1ae-4c68-97b8-1a4d998ee4e5))
     (pad "1" thru_hole circle (at 0 0) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 59 "Net-(D52-K)") (pinfunction "1") (pintype "passive") (tstamp 2462d45b-8965-427e-aae4-23e049a4be86))
+      (net 64 "Net-(D42-A)") (pinfunction "1") (pintype "passive") (tstamp 43da8399-ee8d-4596-9cc6-96d4e03dc371))
     (pad "2" thru_hole circle (at -6.35 2.54) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 74 "Net-(J2-Pin_4)") (pinfunction "2") (pintype "passive") (tstamp 54db8cb3-480d-4731-ab3c-14a99bc315b1))
+      (net 19 "Net-(J2-Pin_3)") (pinfunction "2") (pintype "passive") (tstamp 6b770671-476d-46b7-97ad-a95ebac4f335))
     (model "${KICAD6_3DMODEL_DIR}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1747,67 +1747,67 @@
   )
 
   (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (layer "F.Cu")
-    (tstamp 63cbd44a-2695-4d63-adb2-0eeb015c4960)
-    (at 171.92625 178.27625)
+    (tstamp 4d959000-0e53-457e-9326-f472c5343719)
+    (at 209.70875 154.46375)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
     (property "Sheetname" "")
     (property "ki_description" "Push button switch, generic, two pins")
     (property "ki_keywords" "switch normally-open pushbutton push-button")
-    (path "/dea6b2f7-bfaf-4459-bc9b-ec6265a250a6")
+    (path "/720e2271-0a6b-40ee-befd-2cd3f682d50d")
     (attr through_hole)
-    (fp_text reference "SW50" (at -2.54 -2.794) (layer "F.SilkS")
+    (fp_text reference "SW28" (at -2.54 -2.794) (layer "F.SilkS")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp ffacabdd-7498-4790-a19d-36f4af3b2814)
+      (tstamp 8892ba6d-6e91-4a74-9977-5099e22be454)
     )
     (fp_text value "SW_Push" (at -2.54 12.954) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 9595b7f4-70d8-44e2-89f1-12c37df846d6)
+      (tstamp b80a0d0f-1eeb-4a93-b230-08bdac8e500d)
     )
     (fp_text user "${REFERENCE}" (at -2.54 -2.794) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp ed07095d-b56e-4404-b300-0475cd0a9f0d)
+      (tstamp 10513fb6-5614-4e7f-9335-89a4b6c8afe5)
     )
     (fp_line (start -9.525 -1.905) (end 4.445 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp de010f2a-ad3b-49d7-afb7-7c0128a46afd))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 04afb919-831e-4f7e-9bef-42ef28baf166))
     (fp_line (start -9.525 12.065) (end -9.525 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 501b69a7-7d69-46ec-85bc-297f178f5d05))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 1e3bf037-01ef-4b73-ae95-3e76d7b12e2f))
     (fp_line (start 4.445 -1.905) (end 4.445 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp f25107e0-1f68-4e91-a91b-abdf919d36ac))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp c899ad77-155b-486f-86a2-18a3df2b8cf0))
     (fp_line (start 4.445 12.065) (end -9.525 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 15008c33-da9c-469b-8659-d0ae3a80b788))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 740dd595-510a-4853-b6d4-9df5bc9b33cb))
     (fp_line (start -12.065 -4.445) (end 6.985 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp a915b308-50dc-4686-8e39-323db5257cf2))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 72ecde48-c98b-4576-ba03-eb3fa03674f1))
     (fp_line (start -12.065 14.605) (end -12.065 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp c2a8f494-b323-4622-9fcb-afbe47e4e14c))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 147adc70-2771-4d0f-b6f6-057e1a9adc20))
     (fp_line (start 6.985 -4.445) (end 6.985 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 598feb1b-c714-4666-bf36-94d648c8cf50))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp c4e65d5a-7421-40b4-a424-dc4a1624cb12))
     (fp_line (start 6.985 14.605) (end -12.065 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 67f27e24-02fb-4abe-b21b-1726eb9797b1))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 452d62c0-2975-45f1-80e6-0183e03b5978))
     (fp_line (start -9.14 -1.52) (end 4.06 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 4978e946-ff2f-48c6-9882-ea14e523a64d))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp f7651526-3f8b-415a-99f1-e8763cb5b1ae))
     (fp_line (start -9.14 11.68) (end -9.14 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 23117883-89f2-4638-9ed3-b19af2001543))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp b3aa15bd-4dc7-4477-9504-1a84c0b9b96f))
     (fp_line (start 4.06 -1.52) (end 4.06 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp d150b6c0-f0fd-47e4-9b8c-50def45517e0))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 43a466ca-153a-4aea-98d3-1f573d55408e))
     (fp_line (start 4.06 11.68) (end -9.14 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp b2c88021-b503-4df3-9025-8cd336ba1308))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 6f4f4218-37f9-41fd-9288-65a69ccd7079))
     (fp_line (start -8.89 -1.27) (end 3.81 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp e75a015c-109f-47b4-a7d2-65e53a8e2c25))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 27caef78-33e2-4a76-aebb-7d23c5058b2b))
     (fp_line (start -8.89 11.43) (end -8.89 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 252c60e7-288b-4857-8b05-55a4adf2d0e3))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 31f0e934-7e80-48c3-ba15-ea8d7712d829))
     (fp_line (start 3.81 -1.27) (end 3.81 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 004526fe-22ae-42df-b01c-15f5f3fb346f))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp b9a75e87-9d45-4fde-a1bb-da51fc1204cf))
     (fp_line (start 3.81 11.43) (end -8.89 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 3fcd0696-44ea-4321-9ba4-857c903a923a))
-    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 76c62237-6939-42ca-84d9-42d9b4ecdc93))
-    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 8f06f9bd-f3bc-45e1-96bf-4f0a80d1e851))
-    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp fadb4b12-920b-4163-8197-ded3e8ee6bb2))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 7dd1db8d-45bf-4bf7-8d51-ade61ab45d8d))
+    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 8b44c15e-b266-465f-8767-ea451950995d))
+    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp bc7e9e3d-2558-4918-b18c-a34a1006d0e5))
+    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 3888214e-7a0b-4408-b7d2-c4f08de8ee4b))
     (pad "1" thru_hole circle (at 0 0) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 57 "Net-(D50-K)") (pinfunction "1") (pintype "passive") (tstamp 3c04345a-bec3-4ffc-b47e-099d075ffd6a))
+      (net 52 "Net-(D28-A)") (pinfunction "1") (pintype "passive") (tstamp ccbfb5ce-36e0-4db9-9d81-ccd3ee854e72))
     (pad "2" thru_hole circle (at -6.35 2.54) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 72 "Net-(J2-Pin_2)") (pinfunction "2") (pintype "passive") (tstamp c1ef04a4-27bf-46b8-ae7e-c7ba2fc27579))
+      (net 20 "Net-(J2-Pin_4)") (pinfunction "2") (pintype "passive") (tstamp 12a05e36-b1fd-4417-aabc-acfed458e73e))
     (model "${KICAD6_3DMODEL_DIR}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1815,69 +1815,69 @@
     )
   )
 
-  (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (layer "F.Cu")
-    (tstamp 684f1aaa-3bf6-45fa-bd94-fbf3f0505c5e)
-    (at 319.56375 121.12625)
-    (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
-    (tags "Cherry MX keyswitch 1.00u PCB")
+  (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.25u_PCB" (layer "F.Cu")
+    (tstamp 51d1d5fa-d53a-44e3-b8f6-4bef0d76e3f6)
+    (at 121.6025 135.41375)
+    (descr "Cherry MX keyswitch, 1.25u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
+    (tags "Cherry MX keyswitch 1.25u PCB")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
     (property "Sheetname" "")
     (property "ki_description" "Push button switch, generic, two pins")
     (property "ki_keywords" "switch normally-open pushbutton push-button")
-    (path "/f7dc83b8-f0e4-42c0-8dd1-ef6db1f0e396")
+    (path "/e76b9ee1-537d-4bb2-9fff-78ac2d601e07")
     (attr through_hole)
-    (fp_text reference "SW12" (at -2.54 -2.794) (layer "F.SilkS")
+    (fp_text reference "SW1" (at -2.54 -2.794) (layer "F.SilkS")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 0476ebcc-a286-4923-b7fd-8020b866fdb5)
+      (tstamp ada25aeb-2a85-4ba2-95cd-a5186bf562e6)
     )
     (fp_text value "SW_Push" (at -2.54 12.954) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 7d502e78-0768-4ab9-b389-5b68cdb30641)
+      (tstamp 9a67811e-c6e9-4fa6-a17f-2ca16bd408a8)
     )
     (fp_text user "${REFERENCE}" (at -2.54 -2.794) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 7b90c090-8bd5-42a2-b4a8-a8a670d86485)
+      (tstamp 9a8d3d5d-5c10-470e-8730-d90e50af4303)
     )
     (fp_line (start -9.525 -1.905) (end 4.445 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp d79add71-4358-422f-8c7f-1b91cf2db127))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp a897488f-d675-455a-a943-cfe0d928bc56))
     (fp_line (start -9.525 12.065) (end -9.525 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 21f1a982-5029-44b2-8adf-9888007235bd))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 03935648-5cc8-462b-89a8-c5d8e92d415c))
     (fp_line (start 4.445 -1.905) (end 4.445 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 018a65b5-aa89-4240-88f5-46619f2ce9d0))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 0672dc2c-a10d-4670-a101-8a17df6b7d49))
     (fp_line (start 4.445 12.065) (end -9.525 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 931a12b0-5bdd-49b1-a44e-fcd2798a5f7f))
-    (fp_line (start -12.065 -4.445) (end 6.985 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 81e4cf42-4580-4421-ac02-ac73d00e7bd7))
-    (fp_line (start -12.065 14.605) (end -12.065 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 687fa4ef-9f1f-447c-8bb0-bfac283596a3))
-    (fp_line (start 6.985 -4.445) (end 6.985 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 16c8a5b0-2c8f-4659-97df-e8c9ab15ca88))
-    (fp_line (start 6.985 14.605) (end -12.065 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp ad200de6-1b9a-4398-a401-6a5e8d11330f))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 93d1731d-a920-499b-a8c4-8cb7ffce5e30))
+    (fp_line (start -14.44625 -4.445) (end 9.36625 -4.445)
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp efe025dc-917a-487e-b574-92866d7d9846))
+    (fp_line (start -14.44625 14.605) (end -14.44625 -4.445)
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp b7909ca8-ac6d-4296-8051-34474636189a))
+    (fp_line (start 9.36625 -4.445) (end 9.36625 14.605)
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp b53f8462-87e0-456e-997e-8510bdc2e27a))
+    (fp_line (start 9.36625 14.605) (end -14.44625 14.605)
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 6d9ea1de-554b-4fb4-8474-b3e7b497135d))
     (fp_line (start -9.14 -1.52) (end 4.06 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 2adec8bf-c799-4524-a496-9ab5178867c0))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 5d6c40a7-4846-4312-9252-7c8467c15e7b))
     (fp_line (start -9.14 11.68) (end -9.14 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp b57eec6c-fec6-4858-aebb-f1ed95b7b087))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp a3ce5e36-b688-41c3-af85-f7adea6b2fa1))
     (fp_line (start 4.06 -1.52) (end 4.06 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 0531ab91-7752-417f-90c3-cb121517c759))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 16314eb0-c3d4-41da-9336-664a527dab1d))
     (fp_line (start 4.06 11.68) (end -9.14 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 001ae07a-5b62-4b22-93c5-08469030e6a5))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp d9d3bca2-3103-4d23-88e9-106c783ba87c))
     (fp_line (start -8.89 -1.27) (end 3.81 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp fd69c51b-5397-4dd9-a912-3aff2f6804ee))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 25dc2566-e7ad-4594-8a5f-02dc765846d0))
     (fp_line (start -8.89 11.43) (end -8.89 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp f0d4cd7d-2521-4f9d-b03b-5c6861569ff9))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 6033f466-a339-4118-a827-7d3745dcd94e))
     (fp_line (start 3.81 -1.27) (end 3.81 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp ca638e62-f3f8-4ca9-aeb1-feda07b0efbc))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 9ef6a533-f732-4a54-9e46-7834f5fb2fe0))
     (fp_line (start 3.81 11.43) (end -8.89 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp ba6725a1-7bb5-4516-9e43-161aaea33f51))
-    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 3a4da249-a05a-4706-97cd-552667efb82c))
-    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 894a0e58-ba6b-479b-b5d8-cf7de684dc3f))
-    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp a8681175-9794-4e54-b995-c19bdfa45e13))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 50147ada-7d4f-46f7-985a-c6487286fc61))
+    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp c4741b9f-1498-4718-8538-acd4e0ad8666))
+    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 18c3f8d7-d8f0-4446-a8ed-eca841119012))
+    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 10227994-7d67-499e-90b5-6559370c2659))
     (pad "1" thru_hole circle (at 0 0) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 14 "Net-(D12-K)") (pinfunction "1") (pintype "passive") (tstamp 5390bad2-bacb-4d3e-b4d8-977d3e4562a1))
+      (net 2 "Net-(D1-A)") (pinfunction "1") (pintype "passive") (tstamp 8ee67bbb-30b6-475a-8e5b-3a0468f20b53))
     (pad "2" thru_hole circle (at -6.35 2.54) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 74 "Net-(J2-Pin_4)") (pinfunction "2") (pintype "passive") (tstamp 27171961-bc33-4a5e-9240-179030ece068))
-    (model "${KICAD6_3DMODEL_DIR}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl"
+      (net 17 "Net-(J2-Pin_1)") (pinfunction "2") (pintype "passive") (tstamp c917acba-3ae6-4110-b016-17cd67865928))
+    (model "${KICAD6_3DMODEL_DIR}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.25u_PCB.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
       (rotate (xyz 0 0 0))
@@ -1885,67 +1885,67 @@
   )
 
   (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (layer "F.Cu")
-    (tstamp 6ae87533-d177-46e7-8b9a-091104de51ac)
-    (at 186.21375 121.12625)
+    (tstamp 5a60e691-59d2-49f6-b205-f14a09e12968)
+    (at 243.04625 173.51375)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
     (property "Sheetname" "")
     (property "ki_description" "Push button switch, generic, two pins")
     (property "ki_keywords" "switch normally-open pushbutton push-button")
-    (path "/d054aae8-7274-45d8-8444-8823c85a2c61")
+    (path "/588bef79-1bc3-4dc1-b83d-38785b9b2f6f")
     (attr through_hole)
-    (fp_text reference "SW6" (at -2.54 -2.794) (layer "F.SilkS")
+    (fp_text reference "SW64" (at -2.54 -2.794) (layer "F.SilkS")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp d9d6bbbc-a58d-4b1d-9868-4a69fc1da770)
+      (tstamp 06f7f89f-7f3d-4dab-829f-513935579ba6)
     )
     (fp_text value "SW_Push" (at -2.54 12.954) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 53b2d2e9-5177-44db-8862-97759882ac00)
+      (tstamp b30fa7dc-19c5-482b-91ab-95150f571191)
     )
     (fp_text user "${REFERENCE}" (at -2.54 -2.794) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp c3c9e1dd-f8c5-440e-90f3-ce869b241ca6)
+      (tstamp a8a050e2-fb66-46e1-8b49-26e286f62066)
     )
     (fp_line (start -9.525 -1.905) (end 4.445 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 02b29add-d900-4bbe-b3cb-483c2e5d0358))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp f0957e0c-792d-41a7-b52d-9b1a3ddd1bcc))
     (fp_line (start -9.525 12.065) (end -9.525 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp b55edc8d-a5d8-4435-b05a-e0f762fc9e26))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 51d8728c-3fe3-4ffe-80e0-a59dbaf55ce4))
     (fp_line (start 4.445 -1.905) (end 4.445 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp b630042c-0b1a-490c-bbb9-db28d8175f43))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 538a923a-4702-4f18-9d87-892d7718af65))
     (fp_line (start 4.445 12.065) (end -9.525 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp b17a597e-eab3-4efa-93d9-8278ef4177a5))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp a57c5c1b-8382-4026-8efa-6cef216ff0f5))
     (fp_line (start -12.065 -4.445) (end 6.985 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 6fdb16f8-fa2e-4078-b6e7-48acf75cdc97))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp dabcd8f9-3d21-4069-9e08-27b1887e7681))
     (fp_line (start -12.065 14.605) (end -12.065 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 249b3cfb-872e-40f7-97fd-2c2acba28d40))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 39d8c607-ecfc-4d39-901d-1e71296c2a67))
     (fp_line (start 6.985 -4.445) (end 6.985 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp b5ca4b31-47f2-4ecc-a471-88c519fb906c))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp fe849914-27f4-408b-bba9-d5bae26111cf))
     (fp_line (start 6.985 14.605) (end -12.065 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 3fcc0829-ba70-4d48-b764-b19504bb840e))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 1a5139c3-8428-495e-a9d3-230efc0a022e))
     (fp_line (start -9.14 -1.52) (end 4.06 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp d2be50ca-b593-4aed-8b24-e8ba01fb2311))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp f92eac11-91a4-468a-830c-04ea4da086f8))
     (fp_line (start -9.14 11.68) (end -9.14 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 8de8e24d-5bc2-4ab2-b6ce-2cedaab3e3fd))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp c6ceb586-0c15-4f7c-beae-a4eab9896524))
     (fp_line (start 4.06 -1.52) (end 4.06 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 956c4533-2e8c-40ec-b765-68cb9e5fb50a))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 91c4f7fe-34fc-4b7b-b08e-b11b547775d8))
     (fp_line (start 4.06 11.68) (end -9.14 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 3f1a9dd5-fa72-48e3-b854-daffae350f7e))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 60efa73e-3ef5-489c-99f4-173fda6f46fc))
     (fp_line (start -8.89 -1.27) (end 3.81 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp a71e5919-43d9-40fa-aa79-3740c1d2b6b1))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 8c259474-8205-412f-8784-34d3a8c5c59d))
     (fp_line (start -8.89 11.43) (end -8.89 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 681e1cab-2448-4114-af4e-12a37c2a6610))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp d7d96402-c80d-46c4-92e9-ad5bc5d88b60))
     (fp_line (start 3.81 -1.27) (end 3.81 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 83eedd99-c079-4d7c-8bdf-a9cd1cf4a376))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp ea3ddb94-1cf0-4090-8d98-f3f5a3fac6fd))
     (fp_line (start 3.81 11.43) (end -8.89 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 99e7e1e1-136b-478e-904d-991e43f9b7ea))
-    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 9c01759a-830c-4ecc-98b3-dd95f51c72bb))
-    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 3cb575fe-cbaa-439d-928f-4f928cdd709f))
-    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 5daa8e73-3586-4120-a1d1-0616c0c9b630))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp cf5059d0-3e22-419d-9cd5-0ff8a5db67ef))
+    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 7e928c69-5613-4b28-ae51-fad5451675f2))
+    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp c7d26c62-1680-46be-956f-09124cde50d1))
+    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 6e0ab461-c4ed-4a52-91e9-c944754d9bce))
     (pad "1" thru_hole circle (at 0 0) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 7 "Net-(D6-K)") (pinfunction "1") (pintype "passive") (tstamp 48662e67-f2bc-4e0a-8c26-03d44ca6b1d0))
+      (net 27 "unconnected-(SW64-Pad1)") (pinfunction "1") (pintype "passive+no_connect") (tstamp 0ad1bb98-3184-4f8a-bb9f-6f457f563eb9))
     (pad "2" thru_hole circle (at -6.35 2.54) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 76 "Net-(J2-Pin_6)") (pinfunction "2") (pintype "passive") (tstamp 49826ae9-50d2-4e40-959b-dc9dcaa64cd6))
+      (net 28 "unconnected-(SW64-Pad2)") (pinfunction "2") (pintype "passive+no_connect") (tstamp a95d9756-0337-4ffe-a0b1-913ac9390cc9))
     (model "${KICAD6_3DMODEL_DIR}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1954,67 +1954,67 @@
   )
 
   (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (layer "F.Cu")
-    (tstamp 6e012e45-8a45-4044-837c-128c10e8b617)
-    (at 357.66375 197.32625)
+    (tstamp 5e277eea-4fd7-43a1-bb31-ab4387d08687)
+    (at 304.95875 154.46375)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
     (property "Sheetname" "")
     (property "ki_description" "Push button switch, generic, two pins")
     (property "ki_keywords" "switch normally-open pushbutton push-button")
-    (path "/232bffc6-a2b6-42bb-8a92-54ce333e4375")
+    (path "/1e7ade3f-0ffb-4d94-a84f-ede83bb34476")
     (attr through_hole)
-    (fp_text reference "SW41" (at -2.54 -2.794) (layer "F.SilkS")
+    (fp_text reference "SW61" (at -2.54 -2.794) (layer "F.SilkS")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp c188a3e1-886e-4644-ac8e-bfe6c4fd0db4)
+      (tstamp cb9a93d0-9d17-4f63-9d8a-0d8c6a4868cf)
     )
     (fp_text value "SW_Push" (at -2.54 12.954) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp a13e7801-560a-4b32-a66c-86987ab4c0d4)
+      (tstamp cf5c715b-0df3-4364-aca6-fa1e04749406)
     )
     (fp_text user "${REFERENCE}" (at -2.54 -2.794) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 70faadab-f4c7-4a03-8ee9-1cb60de654da)
+      (tstamp 727f5ce1-d1c3-4812-8b4d-6dd68cfcd70e)
     )
     (fp_line (start -9.525 -1.905) (end 4.445 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 9d238c85-da5e-4b6f-b15f-ec086a31730d))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp db64456f-032b-4c4b-a049-d4728cb56b65))
     (fp_line (start -9.525 12.065) (end -9.525 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 5f9a36fc-495a-4df7-a4f5-5330471cfa01))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 44ad6b55-e752-41dd-a7a3-9256e60ca3a1))
     (fp_line (start 4.445 -1.905) (end 4.445 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 2100fe5d-4e22-4dea-88ee-fe48ed0147fc))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp e0a70efe-ee24-46f3-b19c-c7540823f41b))
     (fp_line (start 4.445 12.065) (end -9.525 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 8506e6bd-4752-463e-8e4b-7775ca60723a))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 1ca65547-0b41-434e-99c1-6856f3b6aa7d))
     (fp_line (start -12.065 -4.445) (end 6.985 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 53dfb18f-9faf-4d84-9912-486b10d3ddb7))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp f667969d-a3ea-4ad4-90e4-a1f7d21b0641))
     (fp_line (start -12.065 14.605) (end -12.065 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 5b01a313-26ac-46d7-8905-6bd8a2ef9ad8))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp d3aa5fab-33f3-41b5-938f-cfb8fa1be071))
     (fp_line (start 6.985 -4.445) (end 6.985 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 06237c75-e151-4b50-a99c-fd20a42d9249))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp a76e2d77-54af-4cbb-98eb-482a494abd08))
     (fp_line (start 6.985 14.605) (end -12.065 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 65d7e228-5dbc-4930-b3ea-28ef14ea944d))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 1f3b8445-f049-4ab7-ab80-b6b3d7da91bd))
     (fp_line (start -9.14 -1.52) (end 4.06 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 48adfbad-5ec2-4759-93c4-c2191297491d))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 8620c443-e6d8-4cf3-a4d0-47905c044a74))
     (fp_line (start -9.14 11.68) (end -9.14 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp b2cc4d93-3b7e-404f-b05c-899f4cf3243e))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp af2919b0-b610-4777-9d9a-ee9ab0938e9d))
     (fp_line (start 4.06 -1.52) (end 4.06 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 1f52f0c2-36d3-4cc5-9586-b358d5ce545a))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 48e93910-9677-44f3-8abc-ba9e2e5f7dd0))
     (fp_line (start 4.06 11.68) (end -9.14 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 314214eb-f4d1-44f8-8a46-64b4aac890da))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 464286c1-15fa-4f15-a52b-9446257c6eea))
     (fp_line (start -8.89 -1.27) (end 3.81 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 86ea84f4-5e03-4800-985c-1333f94b483e))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 599d15dd-df18-43aa-849a-c2abaf7fdd31))
     (fp_line (start -8.89 11.43) (end -8.89 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp fcd5c1ac-ace4-44db-a157-70430be46553))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 5bbae861-c587-4599-b153-20ed2b3d5017))
     (fp_line (start 3.81 -1.27) (end 3.81 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp b870c053-a905-41b3-a0ab-4931c3a0dd47))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 77a5eebf-c74e-46fc-a43a-d0d7ce48633d))
     (fp_line (start 3.81 11.43) (end -8.89 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp d838112c-ad19-4c4c-841a-23d41e64e991))
-    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 00131d71-eeda-4187-9d9c-1638d1786fd3))
-    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 0ffbca3f-1095-4722-8fb3-3b1f076af6fe))
-    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp af3febc6-2194-4bc3-816f-e044c17012ed))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 0dbaaa45-8f86-4ab9-a628-24a743669522))
+    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 07fecf5c-185c-4e52-9457-3deaa6ca2c3e))
+    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 430885bd-5458-4a93-851f-e3de2966d226))
+    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 5d8ac2e9-1db3-423e-8771-22eed40f5650))
     (pad "1" thru_hole circle (at 0 0) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 46 "Net-(D41-K)") (pinfunction "1") (pintype "passive") (tstamp a4944c54-31cb-42d4-acf8-412e2dfbb3e3))
+      (net 81 "Net-(D61-A)") (pinfunction "1") (pintype "passive") (tstamp eeaad303-f88d-4b61-8a3f-7f8427b9f9d8))
     (pad "2" thru_hole circle (at -6.35 2.54) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 71 "Net-(J2-Pin_1)") (pinfunction "2") (pintype "passive") (tstamp 70d4b4f3-62a8-4a66-993c-a6e9c94e30d1))
+      (net 22 "Net-(J2-Pin_6)") (pinfunction "2") (pintype "passive") (tstamp daa721fa-dd30-4b8f-814a-a0458dff7b92))
     (model "${KICAD6_3DMODEL_DIR}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2023,67 +2023,67 @@
   )
 
   (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (layer "F.Cu")
-    (tstamp 762ce523-d7a4-4d7d-b037-0456f16d7846)
-    (at 224.31375 121.12625)
+    (tstamp 63d3670d-8d94-4734-ab8a-0845b0d7ca05)
+    (at 228.75875 154.46375)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
     (property "Sheetname" "")
     (property "ki_description" "Push button switch, generic, two pins")
     (property "ki_keywords" "switch normally-open pushbutton push-button")
-    (path "/dd13baa2-690a-4d15-8899-a39a9aa27394")
+    (path "/403a22b3-6bd3-441a-a301-33eee452364b")
     (attr through_hole)
-    (fp_text reference "SW8" (at -2.54 -2.794) (layer "F.SilkS")
+    (fp_text reference "SW29" (at -2.54 -2.794) (layer "F.SilkS")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 7f3f6d90-5abf-4ef5-8dfc-bb2cb455af01)
+      (tstamp 18c878a7-3a8f-471d-b81b-5af4e06d7f6f)
     )
     (fp_text value "SW_Push" (at -2.54 12.954) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp cb6b995d-61b9-4b19-a879-b289a7fb971e)
+      (tstamp 32ff14ab-bf9c-4fe6-a716-8cba5b587495)
     )
     (fp_text user "${REFERENCE}" (at -2.54 -2.794) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp bd390769-2837-460f-a849-f047404760b2)
+      (tstamp f9e2d3cb-13a5-4429-a447-a2ce08135271)
     )
     (fp_line (start -9.525 -1.905) (end 4.445 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp be1eaa98-e9a9-416d-bb62-c971c994df2e))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 77e8d33f-e95a-4a0a-ab77-cf79c9e6e6d5))
     (fp_line (start -9.525 12.065) (end -9.525 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp fb3352c3-7092-4ee6-badd-4366bcf7b014))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 6cbb7f00-0b59-43a8-a27f-198d2c82fb70))
     (fp_line (start 4.445 -1.905) (end 4.445 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 992356eb-e7f6-4883-9714-8ed5478009c4))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp b6804379-454b-434b-b520-020f43889559))
     (fp_line (start 4.445 12.065) (end -9.525 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 88cc5810-ed80-48c3-bcb5-4bed8b18e2dd))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp eb1a0482-b1c3-4e54-8f90-aa02ab275635))
     (fp_line (start -12.065 -4.445) (end 6.985 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp c9d791d8-02e7-4d16-b2fb-0ceeda2dfc98))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 7dcfc86b-63a1-4252-9dbd-9189db3c5164))
     (fp_line (start -12.065 14.605) (end -12.065 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 1d1be3a3-e3fa-4569-9f4c-f49510a79484))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp f2757050-d09e-49bf-ad24-6cb8831e9c03))
     (fp_line (start 6.985 -4.445) (end 6.985 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 233d5212-6049-4922-acf8-c041951a29ed))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp d7f9b726-a334-4ee0-9d0b-33c93858bde1))
     (fp_line (start 6.985 14.605) (end -12.065 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 82dfa1dd-f461-4c17-ad3d-1bb69c15427e))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 3018a5d4-206f-4129-b733-163eca155ee9))
     (fp_line (start -9.14 -1.52) (end 4.06 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 495e3907-f8d7-48e5-958c-347efeb66efb))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp a5c9b24b-f873-48df-b7a0-c13969e4b084))
     (fp_line (start -9.14 11.68) (end -9.14 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 8c6a9642-b924-4670-935d-53d6c9facb3e))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp ce221567-a638-42f8-b146-cfb0d406195a))
     (fp_line (start 4.06 -1.52) (end 4.06 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp d2c9ba07-7136-4229-b0fe-38e28b2f8043))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 61a690a7-f372-477a-94b1-e1f1f21b41ac))
     (fp_line (start 4.06 11.68) (end -9.14 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 27f2b668-33be-486a-9bb3-9debdc78540b))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 46fd2bfb-0fd7-4d80-968e-a84cf0835201))
     (fp_line (start -8.89 -1.27) (end 3.81 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 457a8e35-9abf-4d58-8595-97090d6fda08))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp ea829e77-83fa-4421-9570-768b19509aa9))
     (fp_line (start -8.89 11.43) (end -8.89 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp a6a6530e-bfed-431e-a7ac-ec98db8f0215))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp ff6c343a-e808-4951-906e-ae9cbae8094b))
     (fp_line (start 3.81 -1.27) (end 3.81 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 38f41b07-73eb-423f-b171-0b37ee90502b))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 48b1db20-bae6-4cf3-b957-4ee1b125d533))
     (fp_line (start 3.81 11.43) (end -8.89 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp a2aaebc9-2aa1-4a16-959d-18fc32010a8e))
-    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 824a9f8f-436b-4b63-a635-409d64a08bb2))
-    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 5a00de41-c2b4-4ce0-9186-3703132b44cb))
-    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 4e388beb-4d4a-414f-a55f-d914cb4a28ac))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp f2914d44-2119-47aa-a794-6bab1c2665ad))
+    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp f19e1f49-d873-4e34-8d6f-5f0ba1d4f0af))
+    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 1d0011c8-a89c-4660-857b-71a6a8cdc9f0))
+    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 03f7ea07-d6eb-4803-ae03-7e22223adc81))
     (pad "1" thru_hole circle (at 0 0) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 9 "Net-(D8-K)") (pinfunction "1") (pintype "passive") (tstamp a711ec1e-9eca-407c-94a8-8088a0e80a95))
+      (net 53 "Net-(D29-A)") (pinfunction "1") (pintype "passive") (tstamp 329d6052-794d-4b27-8736-ab2a03f88638))
     (pad "2" thru_hole circle (at -6.35 2.54) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 78 "Net-(J2-Pin_8)") (pinfunction "2") (pintype "passive") (tstamp f5383eaa-1d7f-440a-9e7b-0106e94d75df))
+      (net 21 "Net-(J2-Pin_5)") (pinfunction "2") (pintype "passive") (tstamp 6137e3e8-d047-416a-8eb8-1310c4a41c69))
     (model "${KICAD6_3DMODEL_DIR}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2092,67 +2092,67 @@
   )
 
   (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (layer "F.Cu")
-    (tstamp 7c666216-7e51-4d51-89b6-288633ffcc8d)
-    (at 205.26375 121.12625)
+    (tstamp 6624f21a-847a-4a4b-9285-b6cbd8013a96)
+    (at 324.00875 154.46375)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
     (property "Sheetname" "")
     (property "ki_description" "Push button switch, generic, two pins")
     (property "ki_keywords" "switch normally-open pushbutton push-button")
-    (path "/a086fc03-9b65-4fd4-be35-c16092a84063")
+    (path "/31e3b70a-2bdb-4c8d-ba8c-4408144aa9f5")
     (attr through_hole)
-    (fp_text reference "SW7" (at -2.54 -2.794) (layer "F.SilkS")
+    (fp_text reference "SW51" (at -2.54 -2.794) (layer "F.SilkS")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 965e2e14-ce30-48f3-9440-28de5a729c33)
+      (tstamp 418e0542-1fe7-45d3-a7a6-46d3f5b71a70)
     )
     (fp_text value "SW_Push" (at -2.54 12.954) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp e06e925d-19a8-4721-9a45-f26f6ea028a8)
+      (tstamp 54d5ab72-46a5-492a-832e-a39267ac054b)
     )
     (fp_text user "${REFERENCE}" (at -2.54 -2.794) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp c399224d-46d5-4e79-a88d-d06766aae5d2)
+      (tstamp 9009236f-a845-4fa1-8978-94ab75f8c63e)
     )
     (fp_line (start -9.525 -1.905) (end 4.445 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp dd6a49e1-26aa-4e9a-97a5-ec1075d1a707))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 8a500cb1-c49b-452d-a832-83b1e2f77c60))
     (fp_line (start -9.525 12.065) (end -9.525 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp dcef032d-eb28-486f-8429-57e402848733))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp b7973698-fc51-4e3a-b8f4-f6c4a6ed24b5))
     (fp_line (start 4.445 -1.905) (end 4.445 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 7f293fb5-12be-4e73-a8f5-6a1f47457cc4))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp c1052e9f-c5d3-4f50-9a16-35c55a50d64b))
     (fp_line (start 4.445 12.065) (end -9.525 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp d33777d3-2506-4fa8-a41e-6a656919f5d9))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 121efecc-0a7e-4b17-adcd-637fb13706fe))
     (fp_line (start -12.065 -4.445) (end 6.985 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 30d10c2e-9bd7-4021-adfb-3e7a4fb258d9))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp a6f5f65c-11b1-433a-8fc4-eb82556a5b38))
     (fp_line (start -12.065 14.605) (end -12.065 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 67f34fca-371d-404e-b1d1-61e0a5e8075f))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp a5b4bd3b-d59e-491e-be70-9dc794eb99e1))
     (fp_line (start 6.985 -4.445) (end 6.985 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 16ac9c70-91d3-4560-91f2-2dbca13e897d))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 5b96eb3b-87dd-4e72-8084-8c3ddb7125b7))
     (fp_line (start 6.985 14.605) (end -12.065 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 9ab511ef-1e36-40b1-a0a0-1e262e3a49da))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 3a94c867-32c7-423c-8412-46212bfcfe8c))
     (fp_line (start -9.14 -1.52) (end 4.06 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 74736ab1-d6f0-4b3f-875a-fac4c1afed18))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 0d292b99-0b3c-42d6-a7c9-600024f163e5))
     (fp_line (start -9.14 11.68) (end -9.14 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp a5ffe745-0284-48c7-a2b4-c33c33ab6ce0))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp c925915d-eee5-4fc1-b2fb-ccb106a27b85))
     (fp_line (start 4.06 -1.52) (end 4.06 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 9e18838b-6a91-47b6-b2d0-a5f903c3771c))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 1469c22f-e7f8-4bb3-bff3-66e2803a659b))
     (fp_line (start 4.06 11.68) (end -9.14 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 84b4fd6f-561f-4532-bf8e-e9a6c8fc5875))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 13d947a9-4ebf-4120-8fb5-d04e4961a9d0))
     (fp_line (start -8.89 -1.27) (end 3.81 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 923c6a66-ec8a-4f71-ac46-f20a793cbf04))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp ce1f9629-e8b2-4d6e-8fdb-a6e939ca0d3b))
     (fp_line (start -8.89 11.43) (end -8.89 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 8fd29ca5-cdaa-429c-a234-603069a52a07))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 1dd124bd-ed65-47a4-9775-2168e50b1a18))
     (fp_line (start 3.81 -1.27) (end 3.81 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 6a4645ce-c80d-4c53-a623-bf240086ef53))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 96ae1ad3-e1b8-4015-bf2e-a3a85ef36023))
     (fp_line (start 3.81 11.43) (end -8.89 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 05e72347-33bc-4c7e-b0d0-a8319437b0ae))
-    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 80d9d4af-2557-4de9-981a-71947663a6cd))
-    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp b7852932-1e7b-4b8a-b6b9-7e42fbf61337))
-    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 4cf0b7b4-f804-4800-ab61-9f7a83d65c36))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp a51cfda0-d992-4edb-ad91-0da780647ecb))
+    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 5a17c4d9-8b28-45c5-a7ab-b0663ce23d56))
+    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp b3c0ee1d-78b5-431e-ae52-ab07deeb821d))
+    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 9f6b6b32-1f86-4acf-b4ef-a4c8ea5ec053))
     (pad "1" thru_hole circle (at 0 0) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 8 "Net-(D7-K)") (pinfunction "1") (pintype "passive") (tstamp 30805eac-bede-4666-836e-cbe3b4dbd6a0))
+      (net 72 "Net-(D51-A)") (pinfunction "1") (pintype "passive") (tstamp b09d578c-dc74-4a34-aa26-d934d8d1d44a))
     (pad "2" thru_hole circle (at -6.35 2.54) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 77 "Net-(J2-Pin_7)") (pinfunction "2") (pintype "passive") (tstamp fc69a3eb-b300-49fa-a36a-7594e9ca8ef3))
+      (net 20 "Net-(J2-Pin_4)") (pinfunction "2") (pintype "passive") (tstamp 67f0c6aa-3337-44b9-a594-ddd92c63f764))
     (model "${KICAD6_3DMODEL_DIR}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2161,67 +2161,67 @@
   )
 
   (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (layer "F.Cu")
-    (tstamp 7ec7764f-c3a6-48a3-907f-95848864ed58)
-    (at 119.53875 140.17625)
+    (tstamp 69156bea-cd56-4676-b36a-6a7caaf98895)
+    (at 271.62125 116.36375)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
     (property "Sheetname" "")
     (property "ki_description" "Push button switch, generic, two pins")
     (property "ki_keywords" "switch normally-open pushbutton push-button")
-    (path "/722cbd63-0049-404c-94d8-c4bff75ecf66")
+    (path "/330ceb41-882a-41b8-be1d-ab1d6385689e")
     (attr through_hole)
-    (fp_text reference "SW2" (at -2.54 -2.794) (layer "F.SilkS")
+    (fp_text reference "SW46" (at -2.54 -2.794) (layer "F.SilkS")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 169db336-75fa-4a98-ab22-10fd39c244ce)
+      (tstamp 8a5efc99-6ebc-490b-9051-5847d40169d2)
     )
     (fp_text value "SW_Push" (at -2.54 12.954) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp c2ae25ce-4873-4f5a-939d-52ae993f51e7)
+      (tstamp f831e92b-2255-4ea2-8ef2-0705869978b8)
     )
     (fp_text user "${REFERENCE}" (at -2.54 -2.794) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 5a34844c-8dd7-4165-b47c-aa42b0bc4fa0)
+      (tstamp 7f25a142-2942-4975-86b2-8567bafbcaa5)
     )
     (fp_line (start -9.525 -1.905) (end 4.445 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp c5c4ae14-b7e8-46ce-8c76-17f003a0c667))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp b9f7f6dd-8cf5-4e34-b0d6-448aa5710055))
     (fp_line (start -9.525 12.065) (end -9.525 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp b743ca50-36f1-42f6-88b2-5ff219796d2b))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp ac576d21-764f-4f95-8cb9-30628174b4f8))
     (fp_line (start 4.445 -1.905) (end 4.445 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp d238e257-f9c1-45b0-84c0-2ba35427a23a))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp b1a6fb5b-81c8-47f2-ace3-057eaec3aade))
     (fp_line (start 4.445 12.065) (end -9.525 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 8a3fd801-7a5f-43cb-88c6-4def3fb194d4))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp cdc7c67c-9c36-4fdc-a18f-9dabe36a336e))
     (fp_line (start -12.065 -4.445) (end 6.985 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 32873572-fa03-4ca7-9784-de6236ab8707))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 3a94e2a8-dba0-43d4-b0a1-0bd76e3c6b52))
     (fp_line (start -12.065 14.605) (end -12.065 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp a44ea5a1-f903-4e7c-9f61-b99c016ca9c6))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp ce24f8fa-b8a3-4ba5-877e-eac07e157b68))
     (fp_line (start 6.985 -4.445) (end 6.985 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 23162b68-e649-466a-97ed-01c9e63d9e23))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 6cd12aed-2470-4a1e-8f8d-7f51b0c8c2ac))
     (fp_line (start 6.985 14.605) (end -12.065 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 3e3bb07a-9664-475e-a7c6-6f813fc89d52))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp bcbfc7f3-b9dd-4ae7-9fe9-aa33b2fde817))
     (fp_line (start -9.14 -1.52) (end 4.06 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 95ba6824-ad13-4fb3-8def-fe6d6a2d75ea))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 69fd1a09-f03a-46c0-b107-4921ed93d678))
     (fp_line (start -9.14 11.68) (end -9.14 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 40f5d294-dadb-442c-a261-0f5a18d5e068))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 5ccada2a-c04f-4d25-b644-f66b4cf3dd20))
     (fp_line (start 4.06 -1.52) (end 4.06 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 3e0d6b40-7441-4f82-a844-03f35bd7bfcc))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp b885974b-3d15-42a0-8c0d-f84ffd926450))
     (fp_line (start 4.06 11.68) (end -9.14 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp b08c7796-8abb-403c-ab41-be9a9c6cc80b))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp ffe9629e-9056-428f-8eaf-c8190cf1c411))
     (fp_line (start -8.89 -1.27) (end 3.81 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp f3cebdbd-74aa-4c86-9b4f-b03250e14b2b))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp f31552f0-a16c-41b3-b9bc-9ca9df1e0348))
     (fp_line (start -8.89 11.43) (end -8.89 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp ec7e25f8-9cf6-40bc-a681-7e9667823a6c))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 1fc45dc4-0b8b-497d-b8d3-3680b35e83cb))
     (fp_line (start 3.81 -1.27) (end 3.81 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 7bad33be-3aa1-48db-a85d-cd54014bb7e8))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 5b8ff919-175d-4dfd-8ea1-a81c5afd4d6d))
     (fp_line (start 3.81 11.43) (end -8.89 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 9c9e11e2-06a6-4ecb-9fe8-cb5944df2b16))
-    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 2f2e64e2-5205-4b3c-95eb-d34c8d0d6913))
-    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp edec3294-f2d4-4bb5-ac7f-64fb76dfaee5))
-    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp c76f533f-ad27-4536-8038-f443da6f332b))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 5a7196d3-485f-436b-8c4e-31892d467021))
+    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 3c87d0c5-eb60-4ae0-a709-65a76a2d2e97))
+    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 5424f244-99b5-4975-a64a-f23b70b227e7))
+    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 1c967ff3-3f67-4ae9-8d60-88939a2cd7cc))
     (pad "1" thru_hole circle (at 0 0) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 3 "Net-(D2-K)") (pinfunction "1") (pintype "passive") (tstamp d8fe6c4c-2138-4af7-84ff-6d1be9c4c171))
+      (net 68 "Net-(D46-A)") (pinfunction "1") (pintype "passive") (tstamp 721991a8-6d43-4cb1-8218-35a75d7c7cc2))
     (pad "2" thru_hole circle (at -6.35 2.54) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 72 "Net-(J2-Pin_2)") (pinfunction "2") (pintype "passive") (tstamp a4fae567-1442-4d44-ae7a-02a9c1de0be0))
+      (net 23 "Net-(J2-Pin_7)") (pinfunction "2") (pintype "passive") (tstamp c379657c-88c3-4295-bb79-2b4076c7b486))
     (model "${KICAD6_3DMODEL_DIR}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2230,67 +2230,67 @@
   )
 
   (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (layer "F.Cu")
-    (tstamp 85f11413-ef7c-46fc-9cb7-7b196b86c85d)
-    (at 267.17625 178.27625)
+    (tstamp 6e228033-d730-49e9-9162-c4d21dc0e3f8)
+    (at 281.14625 173.51375)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
     (property "Sheetname" "")
     (property "ki_description" "Push button switch, generic, two pins")
     (property "ki_keywords" "switch normally-open pushbutton push-button")
-    (path "/203cddf9-5d54-468e-b3b1-069ecccfe3af")
+    (path "/98ec9a9e-31b2-4873-8cae-ccafd4d39bd1")
     (attr through_hole)
-    (fp_text reference "SW55" (at -2.54 -2.794) (layer "F.SilkS")
+    (fp_text reference "SW59" (at -2.54 -2.794) (layer "F.SilkS")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 57b0e26f-fdbc-4799-98b3-fb19e53af17b)
+      (tstamp 675106b6-6db7-4f61-b52e-5c1308c61e6c)
     )
     (fp_text value "SW_Push" (at -2.54 12.954) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp cfa9d7b2-7563-48a7-b445-fa9eddf78d77)
+      (tstamp 11382790-8234-4b36-ad63-d32b0c7284ee)
     )
     (fp_text user "${REFERENCE}" (at -2.54 -2.794) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 0ee41d30-eb66-4ebe-ac48-5c8d66445a02)
+      (tstamp 6a9bcc11-695c-43fc-a231-5c0bdaa5b8f0)
     )
     (fp_line (start -9.525 -1.905) (end 4.445 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 2fa17f85-89c0-4e95-ab89-53272b03f28a))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 969e1869-307f-4d6c-b018-f347b90960f7))
     (fp_line (start -9.525 12.065) (end -9.525 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 95d21863-e9f9-4030-8cde-f3e66ad6500b))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 89cfd11e-a1b1-4079-804b-a03c24237544))
     (fp_line (start 4.445 -1.905) (end 4.445 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 8aec4600-5667-449b-a7da-b721b12a42aa))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp d6396420-8535-4699-a926-bcf4385a3590))
     (fp_line (start 4.445 12.065) (end -9.525 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp ac8bec7a-21db-43a6-a82e-738de93d53c1))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 69c204e1-1b37-419e-8beb-3be65b94d282))
     (fp_line (start -12.065 -4.445) (end 6.985 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 7db0f6d2-cc37-47a4-b6c7-a07312fcfce4))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 16c43cb8-1375-485a-bc8e-e9a4519b0d4d))
     (fp_line (start -12.065 14.605) (end -12.065 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 5b86d08b-8779-44ba-b680-a5af2381beb4))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp a4d17432-0e77-4df0-882d-3b5593ec93ae))
     (fp_line (start 6.985 -4.445) (end 6.985 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 8ce6192f-23ad-450a-bdb8-7623c3dc5e76))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp e2bf8c89-fd20-4d88-9a3d-6c27a6392566))
     (fp_line (start 6.985 14.605) (end -12.065 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp b26afa2d-867b-4adb-a4bf-7c8b5ed096d7))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 0f5d8bdb-1d71-4c4f-9e0f-efb2300a2274))
     (fp_line (start -9.14 -1.52) (end 4.06 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 5e4a46b1-17a3-4c5e-a5d3-e0377bc5bdf7))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 7ddcdde4-e389-4888-8844-7062de0f4fd0))
     (fp_line (start -9.14 11.68) (end -9.14 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp a2b95ef2-093e-4679-a3ba-2ec9566ab38d))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 57bd87d7-a101-4bc0-9b22-68e05c289340))
     (fp_line (start 4.06 -1.52) (end 4.06 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp b2ac29ec-952c-4ec9-a635-503c6fb268e8))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp bf549078-6b2a-4774-aa57-2afc04d27cc2))
     (fp_line (start 4.06 11.68) (end -9.14 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp bb0fde91-8bcd-4e94-90cb-46d13723c07c))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 57bfa644-cbc0-4208-80ec-76a89c3f3c70))
     (fp_line (start -8.89 -1.27) (end 3.81 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 9f6385b8-2809-42d8-9cc6-c32dcb6c42a8))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp c5dfaa61-0c40-477e-b03f-48af10afc78e))
     (fp_line (start -8.89 11.43) (end -8.89 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp aa09677f-5df7-4fd9-b525-0f76ea4d0df1))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 6052672a-4d85-429d-b758-7ed4352bb6d3))
     (fp_line (start 3.81 -1.27) (end 3.81 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 09f6289c-d2b7-4a34-9c04-3ad5c148d342))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp b0af5791-be45-4f6f-b88c-bdb7d7f33f92))
     (fp_line (start 3.81 11.43) (end -8.89 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp b8fa1f62-e13a-4495-8b23-76b9793f193b))
-    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp dd2a6ab9-2800-44e3-8a0b-c113374fcd8b))
-    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp cd15f1dc-745c-4136-96cc-bf063b395d13))
-    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 46b2f385-d64a-4478-a472-17840503c9d6))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp f8b4da7a-adc9-4e18-98d2-81f4a620bd11))
+    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 53497d89-2a90-4cad-b2d6-871525e47d1d))
+    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp e8705292-e2ad-410a-a447-0f200851dc1b))
+    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 764f3503-53d0-47cf-96bc-c29aaae198cf))
     (pad "1" thru_hole circle (at 0 0) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 62 "Net-(D55-K)") (pinfunction "1") (pintype "passive") (tstamp deb705ad-ea00-40c0-8f3d-9d9a1b2eb923))
+      (net 79 "Net-(D59-A)") (pinfunction "1") (pintype "passive") (tstamp 0e7c0a28-5743-410b-bbdf-ed6e1261af2d))
     (pad "2" thru_hole circle (at -6.35 2.54) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 77 "Net-(J2-Pin_7)") (pinfunction "2") (pintype "passive") (tstamp 0793e3c2-5807-4772-9285-8fed22a72e7f))
+      (net 20 "Net-(J2-Pin_4)") (pinfunction "2") (pintype "passive") (tstamp 4b02a8f3-54a1-4dd2-a02d-cda6dea07737))
     (model "${KICAD6_3DMODEL_DIR}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2299,67 +2299,67 @@
   )
 
   (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (layer "F.Cu")
-    (tstamp 8e49061d-cfca-49f8-8753-0b61ab40a3d1)
-    (at 290.98875 140.17625)
+    (tstamp 74721904-64c3-4078-ac5a-ae1067d663fe)
+    (at 157.32125 116.36375)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
     (property "Sheetname" "")
     (property "ki_description" "Push button switch, generic, two pins")
     (property "ki_keywords" "switch normally-open pushbutton push-button")
-    (path "/c32f8b44-8c14-4546-9e37-f296758a59fb")
+    (path "/fa4d60bb-f63b-4700-a3cc-b34e3ff2f6a7")
     (attr through_hole)
-    (fp_text reference "SW30" (at -2.54 -2.794) (layer "F.SilkS")
+    (fp_text reference "SW12" (at -2.54 -2.794) (layer "F.SilkS")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 31c22499-5fbf-4cb9-b522-f08a89535e5a)
+      (tstamp 40ce1045-769c-4293-af74-9b09ec5f602d)
     )
     (fp_text value "SW_Push" (at -2.54 12.954) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 9da8ef17-c92b-4dd0-b7d5-7d9b0addfdc1)
+      (tstamp 8370ea9c-6bf0-461d-aa70-8f935b1eee55)
     )
     (fp_text user "${REFERENCE}" (at -2.54 -2.794) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 088c2a1e-b97b-411f-acf6-acaf60e2ba86)
+      (tstamp f0fb1a3a-673a-4811-a926-b921da85df20)
     )
     (fp_line (start -9.525 -1.905) (end 4.445 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 3b3784a1-fbfb-4925-9c19-663d51aa4157))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 0e34289f-dd9d-45bd-836c-df13cca2030e))
     (fp_line (start -9.525 12.065) (end -9.525 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp a0ffbc0a-b126-4c6b-92ac-c3665ac12e20))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp b92d8de6-2e37-4cab-a7a1-ba7f520fb0d0))
     (fp_line (start 4.445 -1.905) (end 4.445 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 6e6f270b-7c01-4627-b508-4adef39ffa61))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 86a14131-40b2-4ec2-8eb4-4667f5c4b085))
     (fp_line (start 4.445 12.065) (end -9.525 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp b7ee51a8-eb65-4387-bb1e-caa6ea800b1f))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 47068391-0317-4c2c-85d7-e0afaeef851e))
     (fp_line (start -12.065 -4.445) (end 6.985 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 84391cd3-3378-4a4d-9160-dada8fd3ba9f))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 1e6b4c9c-eb14-4957-8f08-11b47af67c6f))
     (fp_line (start -12.065 14.605) (end -12.065 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp cc624498-76d2-4fdc-b237-08ebdb7deb4e))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 6eaf67c5-89d2-4a24-bec3-01bd98716528))
     (fp_line (start 6.985 -4.445) (end 6.985 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp bf8e18b6-f43b-42d2-847a-9b89149b6999))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 0f20492c-4c86-4932-af88-c209644de8c5))
     (fp_line (start 6.985 14.605) (end -12.065 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp c878abfd-e141-4fc8-82f4-4ecb3499321c))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 202a83c7-9298-43fc-97b9-dca0ecbc8529))
     (fp_line (start -9.14 -1.52) (end 4.06 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 1647bdb6-8307-45bb-bad4-d836a902264b))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 3b78fe8d-a163-4b94-8017-c44e4eb33390))
     (fp_line (start -9.14 11.68) (end -9.14 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 60b4415b-ad76-48df-8e4b-93f4a3e1d55a))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 33a0b629-9a8d-40b4-9373-9558e935b76d))
     (fp_line (start 4.06 -1.52) (end 4.06 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 635e1da0-a3dc-4abf-bbb9-1543e2ca59cd))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 5384e7a0-d798-46e9-ad47-e75c1fb5987c))
     (fp_line (start 4.06 11.68) (end -9.14 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 9cfeab56-4232-4444-8551-c07787239ccd))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 0739d5f6-063c-4da3-a7bc-7860dfd3db6d))
     (fp_line (start -8.89 -1.27) (end 3.81 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp c8677e90-a2b7-49b4-9a3e-35dd70bb3a85))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp a3c1d467-bb43-4089-b74c-22d5317b1121))
     (fp_line (start -8.89 11.43) (end -8.89 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 37b45d4c-ddb8-4bd8-8fb0-f07fbe429adb))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp e7e462a9-c9a6-483c-8acc-8370cbe609c0))
     (fp_line (start 3.81 -1.27) (end 3.81 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 2fb9e61b-0b9e-48c4-a61d-e9707f58d6aa))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 00c2d891-18d1-4296-b71a-e608b2a5f9c5))
     (fp_line (start 3.81 11.43) (end -8.89 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 29d45de8-4c20-437c-aeba-9f1da2b8c150))
-    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 6610c81f-8e20-4931-bff1-b2be7acc850a))
-    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 1fbc5e33-ca4e-4cb9-897f-b1ce9ccea310))
-    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 60422d76-91f4-49b3-b092-071513ce0786))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 2be05a45-271e-40ff-b2e0-96ca66fca3d4))
+    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp c41c0aa2-b741-4d18-ac6c-1df021fd5223))
+    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 7f31d674-db04-41ed-a377-abc2d311237d))
+    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp df93b673-116a-42f9-80e2-fada7ea2f04f))
     (pad "1" thru_hole circle (at 0 0) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 34 "Net-(D30-K)") (pinfunction "1") (pintype "passive") (tstamp e530bf02-88fd-41fe-85c5-2b1577c4ea9f))
+      (net 38 "Net-(D12-A)") (pinfunction "1") (pintype "passive") (tstamp 423f9f8a-12e7-45b6-a3bc-a3e6b293c613))
     (pad "2" thru_hole circle (at -6.35 2.54) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 76 "Net-(J2-Pin_6)") (pinfunction "2") (pintype "passive") (tstamp 887bc5e7-7770-4208-9f22-72f5d06a1dd2))
+      (net 20 "Net-(J2-Pin_4)") (pinfunction "2") (pintype "passive") (tstamp cb91ea48-cef2-4f7e-97b5-e55fe654ac5c))
     (model "${KICAD6_3DMODEL_DIR}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2368,67 +2368,67 @@
   )
 
   (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (layer "F.Cu")
-    (tstamp 8f89d4fe-40cd-4106-b780-8e5afbf5a007)
-    (at 129.06375 121.12625)
+    (tstamp 77fffb6a-63e7-401d-8994-de4dd10ae3a3)
+    (at 185.89625 173.51375)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
     (property "Sheetname" "")
     (property "ki_description" "Push button switch, generic, two pins")
     (property "ki_keywords" "switch normally-open pushbutton push-button")
-    (path "/ef09ed9e-f925-4cad-a3a4-aa1b018e5321")
+    (path "/f6aedb53-1c01-40a1-b653-d686e96b9c7a")
     (attr through_hole)
-    (fp_text reference "SW3" (at -2.54 -2.794) (layer "F.SilkS")
+    (fp_text reference "SW56" (at -2.54 -2.794) (layer "F.SilkS")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 2573bee3-e2e8-4017-927e-e86f44cbdbae)
+      (tstamp 2f530f89-0970-4e73-8d3e-38db0f9f1c02)
     )
     (fp_text value "SW_Push" (at -2.54 12.954) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 5063c38d-f879-401d-9bbb-2b07684ab00a)
+      (tstamp 59239eac-a762-4089-8bfd-c950beaa5fbd)
     )
     (fp_text user "${REFERENCE}" (at -2.54 -2.794) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp e935c2b2-be88-46fa-8a72-d2352903620a)
+      (tstamp 39a70af6-7992-4255-9393-9755c0ebc3b8)
     )
     (fp_line (start -9.525 -1.905) (end 4.445 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 6109425e-c61e-4d89-acf5-a98f8ef065df))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp e011606b-9915-4e4c-91c6-9de62c2fddcf))
     (fp_line (start -9.525 12.065) (end -9.525 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp df9fe1a4-7d8b-41ed-b660-4d0019471509))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 6ee94e11-cedb-4f8f-96c9-d14e70814ea7))
     (fp_line (start 4.445 -1.905) (end 4.445 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp bd4be219-a322-4cdb-ba84-aac6c48fe7df))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp d924c192-c6de-4641-ac01-e4a1407967f4))
     (fp_line (start 4.445 12.065) (end -9.525 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 23fa7fd7-f3ae-4f2e-b0e3-476494b3863b))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp fb8db0ab-73fc-4891-839e-2cf3bccacc30))
     (fp_line (start -12.065 -4.445) (end 6.985 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp f94e24e9-3062-425c-8926-2c31c6a44cc7))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp ee114600-3d9c-440a-add6-9825e9e6421a))
     (fp_line (start -12.065 14.605) (end -12.065 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 18622fea-9098-4cbd-9471-63c61303ce81))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp a4747ce7-9b40-423b-95c1-85b3e8d75110))
     (fp_line (start 6.985 -4.445) (end 6.985 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp ab65def7-1517-4464-ac96-0c63586c8c23))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp ef68f7f9-f222-48da-81b0-fbf3225a44a4))
     (fp_line (start 6.985 14.605) (end -12.065 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 356f3d58-4be2-46d8-94a3-5d7761190fb0))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp f3cca2cb-5a1b-4a63-82fe-d586956ad252))
     (fp_line (start -9.14 -1.52) (end 4.06 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 49a538d5-8798-4dd1-b10b-d5fc713e9bca))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp ccbc8832-18eb-4390-8043-570db588685b))
     (fp_line (start -9.14 11.68) (end -9.14 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp b6a3b8ca-7db7-4acd-9c09-a456c38e0e52))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 0a078199-3424-4b9d-bdac-d8379ed848fe))
     (fp_line (start 4.06 -1.52) (end 4.06 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 2b68fd8c-abcd-4fc5-98cc-4714acb60491))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 9e5d8191-ec96-4d02-98ee-4ae4166fb9db))
     (fp_line (start 4.06 11.68) (end -9.14 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 40f873d8-4e8d-4584-b386-2d4b301b1702))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 525c37a0-986d-4a61-98f8-791dbea63130))
     (fp_line (start -8.89 -1.27) (end 3.81 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 1f2ce682-10ed-47c3-afd8-368d5021c092))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 8ded1264-f36c-4b00-845f-d684e6965d6b))
     (fp_line (start -8.89 11.43) (end -8.89 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 1b230415-ae54-4a55-8420-07d7353a1f0b))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 60d3ce3e-7377-4be3-b77d-c7996a95265f))
     (fp_line (start 3.81 -1.27) (end 3.81 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 38012bb7-1ddd-43b6-9911-fb17a7d73b7f))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 57f35583-5514-4091-abad-6f5f2cd7f238))
     (fp_line (start 3.81 11.43) (end -8.89 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 8e15b9c7-752b-4e64-a423-db4e475732fa))
-    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 6afa8f63-87de-4b03-bce5-31ae0737a9ec))
-    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 73be602c-26f7-4733-a3a7-ed3c308a41e9))
-    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 5ab913c4-81ab-42bc-8413-f31251b83a75))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp b7672864-3326-4b8d-bbc7-5f91dd40ed64))
+    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp a15149e2-579b-475d-87de-3539caf39cc4))
+    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp abc33ab6-6151-48fe-b951-23941fe60eaf))
+    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 6adbae4a-7e26-4ea5-84ed-6a25a8f4756d))
     (pad "1" thru_hole circle (at 0 0) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 4 "Net-(D3-K)") (pinfunction "1") (pintype "passive") (tstamp 3e658554-098e-45fb-b0ae-49355712938c))
+      (net 16 "Net-(D56-A)") (pinfunction "1") (pintype "passive") (tstamp 15651eee-577f-4adf-af0f-2225ea1fe821))
     (pad "2" thru_hole circle (at -6.35 2.54) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 73 "Net-(J2-Pin_3)") (pinfunction "2") (pintype "passive") (tstamp 17b2eed4-cf6a-4001-8f94-154b99348765))
+      (net 17 "Net-(J2-Pin_1)") (pinfunction "2") (pintype "passive") (tstamp d5370446-ba2b-4aae-b2f9-e8b1e625ec6a))
     (model "${KICAD6_3DMODEL_DIR}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2437,67 +2437,67 @@
   )
 
   (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (layer "F.Cu")
-    (tstamp 91a21c22-9948-4dff-a13d-83093aa9f89c)
-    (at 319.56375 197.32625)
+    (tstamp 7bef2c8d-4926-48a6-af1e-6600cc86cda2)
+    (at 233.52125 116.36375)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
     (property "Sheetname" "")
     (property "ki_description" "Push button switch, generic, two pins")
     (property "ki_keywords" "switch normally-open pushbutton push-button")
-    (path "/31bb3b60-6672-40b1-bedf-3143a6f47340")
+    (path "/82b89cb2-98c1-4fbd-a48a-3114ae7a6a3c")
     (attr through_hole)
-    (fp_text reference "SW43" (at -2.54 -2.794) (layer "F.SilkS")
+    (fp_text reference "SW16" (at -2.54 -2.794) (layer "F.SilkS")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 304a0f39-34fb-4684-a0e0-ffe435a06f4f)
+      (tstamp 4c46e924-0773-4b6a-a326-d6fda88b5195)
     )
     (fp_text value "SW_Push" (at -2.54 12.954) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp c29aebe6-f90f-4566-83c9-369540004441)
+      (tstamp 2fa64d73-bbd2-4376-bbe1-a305f2475f45)
     )
     (fp_text user "${REFERENCE}" (at -2.54 -2.794) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 196d4c62-d735-4678-8b66-b443ce0e81e5)
+      (tstamp 6792e697-7fcb-4145-b5d3-8a37a58b4711)
     )
     (fp_line (start -9.525 -1.905) (end 4.445 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 67fef8b9-1cc8-49dc-bfb9-0984076da8d5))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 8f7b93c1-3a33-43a0-bc32-21917289f55a))
     (fp_line (start -9.525 12.065) (end -9.525 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 2604cac2-1b37-486c-b70e-923540df51d4))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 255e20fe-0f31-4287-9bf9-93d8860c10bf))
     (fp_line (start 4.445 -1.905) (end 4.445 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 575a4ace-0ff1-4fff-a36b-6f6a983d47c8))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 245b910f-0b9c-42fa-86bf-18dd20a7bd24))
     (fp_line (start 4.445 12.065) (end -9.525 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 2f00a734-41b3-4b99-944f-3d96d21cb0b3))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp f4281a5e-9191-4ec9-84c5-28a9ddeac33b))
     (fp_line (start -12.065 -4.445) (end 6.985 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 896deebd-7c67-4b34-8b7f-8ad094275db5))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 2b9b5247-6b34-48d8-8c9a-13d541c9eef1))
     (fp_line (start -12.065 14.605) (end -12.065 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp ba1cc6d9-cc57-4e90-bec6-355c19956816))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp d9739a67-6fae-4722-b709-a2528abe3292))
     (fp_line (start 6.985 -4.445) (end 6.985 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp ee149206-396f-485c-947d-07f79e9cb3d9))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp f49f0fd8-bf2b-4321-8d99-7c918e13ef17))
     (fp_line (start 6.985 14.605) (end -12.065 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp b29a6139-94b2-4175-8c97-05131675d546))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 8a9baff8-ab80-4c82-90dd-701bd2496b32))
     (fp_line (start -9.14 -1.52) (end 4.06 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 1116ec59-b097-453d-bf42-b561b7e30179))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 2c2e8b2d-2f02-4fa2-b2d5-805ef62329e2))
     (fp_line (start -9.14 11.68) (end -9.14 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp c3150746-6090-4f9c-b47e-5189efcf002e))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp acb1f960-7103-4367-9c5c-dfbf4aa9438b))
     (fp_line (start 4.06 -1.52) (end 4.06 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp d95ea19d-aacd-476c-be12-460bca313876))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 8b7584e0-55ec-4b8f-aae9-089c636520ed))
     (fp_line (start 4.06 11.68) (end -9.14 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp bf8ea49b-129d-4283-8f24-cb1a64e24f80))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 372b7be2-bbea-4b7d-a861-da9cd8c85161))
     (fp_line (start -8.89 -1.27) (end 3.81 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 99cde202-a3f9-4133-bf02-a7facf3cb0dd))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp b0f1feb3-e83b-4d5f-bcb8-5eb2a01e53c9))
     (fp_line (start -8.89 11.43) (end -8.89 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 5795c7e3-6d4d-4cf9-bf26-772f315ccfab))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 10f02468-185d-479b-9938-7307ef02fdf2))
     (fp_line (start 3.81 -1.27) (end 3.81 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp a4d06e34-dcd6-416d-a9b7-f9d77b97b4f8))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 318c796c-aabd-480b-8f5d-ec5b9890a372))
     (fp_line (start 3.81 11.43) (end -8.89 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp d9bbd25f-78da-4204-9ecb-eb4b89a5e8ed))
-    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 1fd6bb8b-1ac2-4319-9445-801619550575))
-    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp e9002ba1-442b-42f1-ab48-68b6590d01d4))
-    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 2ebecfd9-5bab-4080-92f1-ee4bc01b9a0f))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 10b1f9e4-2691-4021-a61f-a9a9e8ab1a83))
+    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 6506c323-cd14-4137-931b-59c279b2b9d9))
+    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 198b3957-9907-46a2-9f6a-b4062c038ace))
+    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp bd9e877b-9dfc-4f32-8aa2-04f1398e21a9))
     (pad "1" thru_hole circle (at 0 0) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 49 "Net-(D43-K)") (pinfunction "1") (pintype "passive") (tstamp 5e7bf277-c6ee-4aa5-b6d3-14edf0d848e5))
+      (net 42 "Net-(D16-A)") (pinfunction "1") (pintype "passive") (tstamp c45f058d-c952-4818-a91d-7d8b2edb2526))
     (pad "2" thru_hole circle (at -6.35 2.54) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 73 "Net-(J2-Pin_3)") (pinfunction "2") (pintype "passive") (tstamp 2a420e3e-c549-4445-ac16-9f783c979740))
+      (net 24 "Net-(J2-Pin_8)") (pinfunction "2") (pintype "passive") (tstamp 45dd37a7-72b5-48eb-bfee-26f17800bc88))
     (model "${KICAD6_3DMODEL_DIR}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2506,67 +2506,67 @@
   )
 
   (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (layer "F.Cu")
-    (tstamp 926d5774-1c19-4cbb-984f-1d6a4fc3a6ac)
-    (at 300.51375 197.32625)
+    (tstamp 7c71fc68-7d52-4c7b-a67b-01b8bbf912e4)
+    (at 119.22125 173.51375)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
     (property "Sheetname" "")
     (property "ki_description" "Push button switch, generic, two pins")
     (property "ki_keywords" "switch normally-open pushbutton push-button")
-    (path "/62616e1f-c8cd-4413-8c05-18ca43455cd8")
+    (path "/d17c26c2-abfa-4826-930a-c0200af47e5c")
     (attr through_hole)
-    (fp_text reference "SW60" (at -2.54 -2.794) (layer "F.SilkS")
+    (fp_text reference "SW17" (at -2.54 -2.794) (layer "F.SilkS")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp be90279c-128d-40c0-8e51-968cd2180a38)
+      (tstamp a91d80b9-611e-462e-bb3e-9ae5cbb8a4b5)
     )
     (fp_text value "SW_Push" (at -2.54 12.954) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 216c32f0-6fc0-46f5-8473-99cfe7f4048c)
+      (tstamp 925f889f-4056-4f34-b2ea-bba6bba8c112)
     )
     (fp_text user "${REFERENCE}" (at -2.54 -2.794) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 00b43a2f-01b6-4fed-8e69-70efea501264)
+      (tstamp 47433950-fb0e-4839-87cf-3f4bf6b27713)
     )
     (fp_line (start -9.525 -1.905) (end 4.445 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 84f0059a-519a-411d-a299-a6b8d21262a2))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 8a0d0bff-4047-4b09-a273-91e6db807e9a))
     (fp_line (start -9.525 12.065) (end -9.525 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 6aa9267a-b7c9-41b5-ac0c-c5bc587c374c))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp f2964584-4851-499b-8ff1-380b99c788b7))
     (fp_line (start 4.445 -1.905) (end 4.445 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 269e295b-8100-46d5-97f5-760048e84d31))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 3ac2221c-02e5-487f-a23d-1ee5a1755de3))
     (fp_line (start 4.445 12.065) (end -9.525 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 4d01bc27-10f9-4922-8160-6229b221d802))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 2e4cf84a-61be-4c9d-a43a-0338920f35b6))
     (fp_line (start -12.065 -4.445) (end 6.985 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 43350a5b-dad6-458c-bf1f-9a46ef84a669))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 366252d9-b0f8-49a3-a0a1-7876d7ec7f8b))
     (fp_line (start -12.065 14.605) (end -12.065 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 99832910-bf79-46bb-adc3-95c67e885de9))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 1ac603f4-5bee-49fc-b2bd-69634f335e36))
     (fp_line (start 6.985 -4.445) (end 6.985 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 374582e0-6468-433d-acd0-4e943b813a83))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 95f8e2ff-bcd7-437d-b42b-57f96fcd988d))
     (fp_line (start 6.985 14.605) (end -12.065 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp ea849f2d-ef88-4cac-bb47-6336d1861877))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 83413c6a-b528-48ce-89aa-c7d1f66d2704))
     (fp_line (start -9.14 -1.52) (end 4.06 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 72a3313f-bfe0-4753-9114-5cdd2bebe909))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 0134a19b-3cd2-4dd2-967f-78ae1fd5f7fd))
     (fp_line (start -9.14 11.68) (end -9.14 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp b287ef38-9c12-43eb-8dd6-b46ad1ba3d83))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 213af3ba-0440-42cb-93e7-96ade3f60d8d))
     (fp_line (start 4.06 -1.52) (end 4.06 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 0fac5d2a-570b-46f8-b3e8-5f52aa00e445))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp edafd8a0-5ab1-48e5-b09f-b90431cf6352))
     (fp_line (start 4.06 11.68) (end -9.14 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 7d70901b-1bdb-46ff-99a0-a4fa2206e2b8))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 830509f6-4021-41e5-a701-75f368a7e29e))
     (fp_line (start -8.89 -1.27) (end 3.81 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 1172334b-5924-4a0c-afaf-aed927cefa25))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp b70ee23c-6783-46a0-9158-aa80b9dba1cd))
     (fp_line (start -8.89 11.43) (end -8.89 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 6640a834-4177-402d-b254-121c6a2c061d))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 393e8dbc-12b2-4897-ad8d-47c302d0a617))
     (fp_line (start 3.81 -1.27) (end 3.81 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp f47ffd9b-81d6-441f-b4d8-2a1e7abc7880))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp b6e6eaf7-2bff-4405-8a63-638cb0cb63f2))
     (fp_line (start 3.81 11.43) (end -8.89 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 81de25b7-cf78-49ec-8001-ee4c1fc00f43))
-    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 5496a8c1-26f4-4cd1-99cc-5dbd29cf897b))
-    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp d7aaade2-6730-4f6d-9dbf-afcee0e342b5))
-    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 1f090e95-715c-4a4a-aed7-84cb1d073a34))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp a89cb5c1-8e46-4b57-af1c-e34824bbbb53))
+    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp cb734fdd-d201-4506-b85a-247ee5000225))
+    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 8ecf5784-e9ae-45da-9caf-0b4049be1f39))
+    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 9e86b45f-1dc8-479f-ab7c-8082194d84c7))
     (pad "1" thru_hole circle (at 0 0) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 68 "Net-(D60-K)") (pinfunction "1") (pintype "passive") (tstamp 25e31e84-ace7-4830-8761-f0d796867a97))
+      (net 6 "Net-(D17-A)") (pinfunction "1") (pintype "passive") (tstamp 2a01e84a-b11c-4bfe-a748-63784ec06f91))
     (pad "2" thru_hole circle (at -6.35 2.54) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 75 "Net-(J2-Pin_5)") (pinfunction "2") (pintype "passive") (tstamp 7a1e3625-69e2-492f-a758-5a611d3e4c51))
+      (net 17 "Net-(J2-Pin_1)") (pinfunction "2") (pintype "passive") (tstamp cdd802d0-862f-4cc6-be3d-aff2f58f0507))
     (model "${KICAD6_3DMODEL_DIR}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2574,69 +2574,69 @@
     )
   )
 
-  (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (layer "F.Cu")
-    (tstamp 9448649b-f5da-48e9-8ab3-44786700e4b4)
-    (at 271.93875 140.17625)
-    (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
-    (tags "Cherry MX keyswitch 1.00u PCB")
+  (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.25u_PCB" (layer "F.Cu")
+    (tstamp 7ec61987-b3fa-4b62-a64f-b9c724e295e1)
+    (at 354.965 135.41375)
+    (descr "Cherry MX keyswitch, 1.25u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
+    (tags "Cherry MX keyswitch 1.25u PCB")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
     (property "Sheetname" "")
     (property "ki_description" "Push button switch, generic, two pins")
     (property "ki_keywords" "switch normally-open pushbutton push-button")
-    (path "/2a4bcb2f-9075-4795-975f-9c4911447fbe")
+    (path "/3c1e70b2-0a1d-4c8d-9d44-8cb4aa82e65d")
     (attr through_hole)
-    (fp_text reference "SW31" (at -2.54 -2.794) (layer "F.SilkS")
+    (fp_text reference "SW41" (at -2.54 -2.794) (layer "F.SilkS")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 5d081908-47ac-4308-a700-275147be459f)
+      (tstamp 68e1db3e-917b-4680-8f2e-b640b3211772)
     )
     (fp_text value "SW_Push" (at -2.54 12.954) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 57f973f5-c256-49bf-a063-655d8abe89f4)
+      (tstamp 9b6c6ee4-90be-4fa8-97a1-c9e5de8a764b)
     )
     (fp_text user "${REFERENCE}" (at -2.54 -2.794) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 48d69c51-1bb0-4659-b07c-57e13b305629)
+      (tstamp 4197e347-dd66-41e7-a936-85ab092f4f31)
     )
     (fp_line (start -9.525 -1.905) (end 4.445 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 476d0351-d4aa-41f8-94c2-d1948deb2779))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp bc647dd7-1cc2-42de-bc6a-0008fa8c5695))
     (fp_line (start -9.525 12.065) (end -9.525 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 2eab9fca-3ff8-4f45-91fe-b7db4ecf638f))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 4c1d1aeb-3682-4c5f-adf1-83008fb7c1ce))
     (fp_line (start 4.445 -1.905) (end 4.445 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 8ca80e98-f29b-4033-844f-47797bf8d827))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 4cd0a037-c1f1-4b77-b54f-c4bf184ca866))
     (fp_line (start 4.445 12.065) (end -9.525 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp e8e066b1-0f1f-4314-b9ed-791f50242885))
-    (fp_line (start -12.065 -4.445) (end 6.985 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 86f3826c-03b5-4a8d-8325-e076ee04c9f4))
-    (fp_line (start -12.065 14.605) (end -12.065 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp d0cc83dd-0c7b-4610-885c-542df135fd0b))
-    (fp_line (start 6.985 -4.445) (end 6.985 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 8044fcc6-8c70-474e-b0b8-a36c3abe5394))
-    (fp_line (start 6.985 14.605) (end -12.065 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp c794463a-a3f4-4133-95da-5d7c3c1770d0))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 65c6a357-cf00-48b2-b00c-497b02ce9cbb))
+    (fp_line (start -14.44625 -4.445) (end 9.36625 -4.445)
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp d06be89a-cdf9-4bcd-ac32-402771c5533e))
+    (fp_line (start -14.44625 14.605) (end -14.44625 -4.445)
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 5b9a1f0b-a27c-4239-a47e-0e4a709e2842))
+    (fp_line (start 9.36625 -4.445) (end 9.36625 14.605)
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp a109af98-d3f3-48f1-920e-48cbb963d3ea))
+    (fp_line (start 9.36625 14.605) (end -14.44625 14.605)
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 38940513-e66a-48f6-a9b4-9147505e3345))
     (fp_line (start -9.14 -1.52) (end 4.06 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 5c4f63b1-dd45-4d14-9319-5b073b55913a))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 50fdec26-6201-457b-b90b-881cdf963d42))
     (fp_line (start -9.14 11.68) (end -9.14 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 39918074-1869-4b41-bc3e-8d9cc5e758c3))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp dfcf0b7e-d21a-42ef-9518-189fe1ba31c9))
     (fp_line (start 4.06 -1.52) (end 4.06 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 0bf23293-2970-4eca-9468-e2c203fea012))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 1cb47e43-c7ff-4b6f-afa2-3c4134ef3e44))
     (fp_line (start 4.06 11.68) (end -9.14 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 77c2f8e7-4d9e-4a5f-9346-cbe15bda70e2))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp a452042d-7982-417f-8af9-f1458832d86c))
     (fp_line (start -8.89 -1.27) (end 3.81 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp c327d3a9-d9c5-4a23-81d7-595dbf23b5d1))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp f96ef729-1b69-4a1a-8da4-02c9fe394290))
     (fp_line (start -8.89 11.43) (end -8.89 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp e3bc05db-e919-4ee8-97c1-4cbb747bd32a))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 959465b0-1885-4c4b-afc3-c2f87e6cbaf4))
     (fp_line (start 3.81 -1.27) (end 3.81 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp df94d13d-cb11-431e-826c-d90fd296cd35))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 46fb791e-5c4c-4a5d-8a98-4cc0cc571d14))
     (fp_line (start 3.81 11.43) (end -8.89 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp a8413174-d639-4ba2-a721-c5eae39df5d0))
-    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp a8af38de-b5f4-43a8-b77b-b4b0000c13d8))
-    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 7b9af240-b801-48f6-ba1a-1e8db57209cb))
-    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp dfd1b690-7206-4f5d-ac11-c053eadca496))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 54f39e07-a675-47ba-8bf4-2b0fe42f9dfd))
+    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 32d3e554-3b18-464c-a8fa-6aadf774341d))
+    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp fcbab8d9-2cda-4478-861c-7686e511d7e3))
+    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp d2c24714-fa0d-4782-81e1-e31c706a66a6))
     (pad "1" thru_hole circle (at 0 0) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 35 "Net-(D31-K)") (pinfunction "1") (pintype "passive") (tstamp 6ab88790-ab97-44f7-960d-45120e3e9187))
+      (net 12 "Net-(D41-A)") (pinfunction "1") (pintype "passive") (tstamp 7cdb1208-ea90-4a9f-8304-d206c00f3a07))
     (pad "2" thru_hole circle (at -6.35 2.54) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 77 "Net-(J2-Pin_7)") (pinfunction "2") (pintype "passive") (tstamp c4c3f32c-f594-425e-9240-637aaf179d0a))
-    (model "${KICAD6_3DMODEL_DIR}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl"
+      (net 18 "Net-(J2-Pin_2)") (pinfunction "2") (pintype "passive") (tstamp af7d81fc-5a3a-472d-ab8d-55c1b779ba7c))
+    (model "${KICAD6_3DMODEL_DIR}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.25u_PCB.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
       (rotate (xyz 0 0 0))
@@ -2644,67 +2644,67 @@
   )
 
   (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (layer "F.Cu")
-    (tstamp 94701cc5-5c93-408d-9d70-c2724e63657c)
-    (at 314.80125 159.22625)
+    (tstamp 83cafeff-bd2d-41ec-8469-3e85cc3da0c3)
+    (at 152.55875 154.46375)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
     (property "Sheetname" "")
     (property "ki_description" "Push button switch, generic, two pins")
     (property "ki_keywords" "switch normally-open pushbutton push-button")
-    (path "/c53c57b6-040c-4509-afcd-ac3814d75aa5")
+    (path "/e00fae27-8bca-4817-91f1-a5849fc03048")
     (attr through_hole)
-    (fp_text reference "SW45" (at -2.54 -2.794) (layer "F.SilkS")
+    (fp_text reference "SW19" (at -2.54 -2.794) (layer "F.SilkS")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp eb2a5d5c-3c60-4db1-911d-0c0ff05123cc)
+      (tstamp 5e60a657-5ae0-4a48-bff5-3c81bea88e24)
     )
     (fp_text value "SW_Push" (at -2.54 12.954) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 69ff405c-a559-4174-9e28-0379e8731f64)
+      (tstamp 04ba9234-17d7-4d27-8902-d27c80976c59)
     )
     (fp_text user "${REFERENCE}" (at -2.54 -2.794) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp ebf4bc7f-b178-43a5-bd73-b055e149ccd3)
+      (tstamp 030a3575-ac23-48a2-84c4-99e505dfb504)
     )
     (fp_line (start -9.525 -1.905) (end 4.445 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp fb16f812-1ea9-44ad-8fb7-0294088698aa))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp b642a6d4-239f-4e22-965b-b4bb6ba2b5c8))
     (fp_line (start -9.525 12.065) (end -9.525 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 59727592-0c0b-48ae-87fd-68ea127cb411))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp cf37bd76-19d2-48b4-a7ca-da9ee2401dda))
     (fp_line (start 4.445 -1.905) (end 4.445 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 9d8773ad-0580-4062-a166-52e7ef2f7847))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 504ea332-6769-470f-b21a-1eacd24fb276))
     (fp_line (start 4.445 12.065) (end -9.525 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 21faae48-d683-4a10-852e-3346dcd6fba8))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 91c61d37-fc33-4925-9f68-d625be4c91e8))
     (fp_line (start -12.065 -4.445) (end 6.985 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 58258d3e-ba6f-4d13-b3fa-3c1e21faefa6))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 577785a2-8aaa-429d-b1ef-a8ef5f31a490))
     (fp_line (start -12.065 14.605) (end -12.065 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp a231aa86-812f-4cbb-9a0b-d58d3b80c8b7))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 028ebf93-f342-4917-a03b-6aeced2d7747))
     (fp_line (start 6.985 -4.445) (end 6.985 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 1c1c6ed4-b25a-41e0-acfe-b816a5a3de2f))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 7180b1d0-fb69-4dd3-a648-ed0cc8d91a27))
     (fp_line (start 6.985 14.605) (end -12.065 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 4e7756ce-b47c-4574-9bcd-fb2a145bbfd1))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 45ad5cd3-2df7-4ee7-bce4-7bb2d7398af8))
     (fp_line (start -9.14 -1.52) (end 4.06 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 362736cf-5931-465f-b8b0-6dd3a4ccc63d))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 1a223dbb-f3af-4bcb-b73f-d53a7df8cdd8))
     (fp_line (start -9.14 11.68) (end -9.14 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp b0846908-8bd1-4073-9a26-3f6c01de6590))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp a4345bdb-67cd-49c2-85e9-025bcf61184c))
     (fp_line (start 4.06 -1.52) (end 4.06 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp dd68d55b-47f9-4206-85a5-a112201cad7a))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 050288a2-7538-400d-9c61-5e1a4312a5e9))
     (fp_line (start 4.06 11.68) (end -9.14 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 53b5ea72-64c6-4f1d-875c-aa97fa3872f0))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp ef93c39e-4f2c-43a5-a6b9-2341569ca891))
     (fp_line (start -8.89 -1.27) (end 3.81 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 43ea4801-3436-4337-a8ae-1c702b8d8441))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 2b020f7d-b9d2-476e-82e5-9137e6a17f8c))
     (fp_line (start -8.89 11.43) (end -8.89 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp ea7fe927-8718-4db5-b023-5b5f8aa32552))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 98b66e3b-1ce2-4c00-848e-ef3dd09c3982))
     (fp_line (start 3.81 -1.27) (end 3.81 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 91202f3c-40e5-49c4-b16f-3a9e066d16a5))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp dbb4a639-4628-4786-8906-c616c499b178))
     (fp_line (start 3.81 11.43) (end -8.89 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 593a17db-10be-4fa1-975a-b039c3e1f64f))
-    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp ddb28d23-de45-4d31-ab4c-fc81cb195f18))
-    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp dd6a480d-e233-4db3-9942-2a2b06b73a8b))
-    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp aa7ab1e5-3e3e-479c-8e4e-a1f640fc6f19))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 84fc8d85-beff-4fc2-9d68-26a404fcd831))
+    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 90eb694e-565a-4d73-86f7-ef7372ce36a9))
+    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 8e719faa-49ef-45b1-87b8-61d7cbd91c7e))
+    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 5892d55f-7bb6-4272-bc81-c842466ab836))
     (pad "1" thru_hole circle (at 0 0) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 51 "Net-(D45-K)") (pinfunction "1") (pintype "passive") (tstamp ad909a54-5eab-4a75-910a-e8d87b6b1ee4))
+      (net 44 "Net-(D19-A)") (pinfunction "1") (pintype "passive") (tstamp 619c329f-8e12-43e5-8be2-4376cde92473))
     (pad "2" thru_hole circle (at -6.35 2.54) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 75 "Net-(J2-Pin_5)") (pinfunction "2") (pintype "passive") (tstamp d7252aa6-278d-43c0-95e9-979fd494439c))
+      (net 19 "Net-(J2-Pin_3)") (pinfunction "2") (pintype "passive") (tstamp 448f4ff6-afcb-4dab-92d0-26d2d0990439))
     (model "${KICAD6_3DMODEL_DIR}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2713,67 +2713,67 @@
   )
 
   (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (layer "F.Cu")
-    (tstamp 96563695-799d-40e1-869f-9535486dfea3)
-    (at 348.13875 140.17625)
+    (tstamp 851e1c83-a75a-41b8-8f50-cc06bb0e8b23)
+    (at 357.34625 173.51375)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
     (property "Sheetname" "")
     (property "ki_description" "Push button switch, generic, two pins")
     (property "ki_keywords" "switch normally-open pushbutton push-button")
-    (path "/c0ddd1e7-2424-4937-a313-6c91b8ba40de")
+    (path "/eb33cfec-66cd-494a-96cd-eaa33828e08f")
     (attr through_hole)
-    (fp_text reference "SW9" (at -2.54 -2.794) (layer "F.SilkS")
+    (fp_text reference "SW48" (at -2.54 -2.794) (layer "F.SilkS")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp e002e997-3eb8-45af-ad59-ec94f1eb7ccd)
+      (tstamp f8cfd4d7-0616-487e-a3d0-a56cd7b3532f)
     )
     (fp_text value "SW_Push" (at -2.54 12.954) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp ff7344db-38e8-4508-945a-680f2d6ce0cd)
+      (tstamp f65dbc0f-2f6d-4acd-84ef-6884d85a0d55)
     )
     (fp_text user "${REFERENCE}" (at -2.54 -2.794) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 8f4b163c-eea5-4c52-bfb6-b22389b1a1bc)
+      (tstamp 00e3b0a3-a9b0-4f1f-86a2-776be9a64501)
     )
     (fp_line (start -9.525 -1.905) (end 4.445 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp c7c921de-1abb-4f74-a6c9-624c85b55bd2))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 149f13e0-6fd8-44a0-be9b-ef8fd1d8d259))
     (fp_line (start -9.525 12.065) (end -9.525 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 71fce2a9-e35a-49f1-b497-691a85759483))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp e116ab83-82d8-42e5-a35e-46e64d61def9))
     (fp_line (start 4.445 -1.905) (end 4.445 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 8be2eb4b-2582-4998-b73b-4af2c91b13e9))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 1870aaf9-a0dc-4d27-a527-f3764916431d))
     (fp_line (start 4.445 12.065) (end -9.525 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 12d00669-526b-48c3-a0dd-d40259460a50))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp a87bfb89-cea8-492f-8b47-144a62ed69e6))
     (fp_line (start -12.065 -4.445) (end 6.985 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 9634c147-e128-4e9b-a6e5-2ab26297efa5))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 3b7b903e-460e-4e59-8ac7-aaeecbd5504a))
     (fp_line (start -12.065 14.605) (end -12.065 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 5d1392ff-83e8-4edb-9070-1a44369cb48a))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 7a8e4ba4-7ed7-454c-b8a5-8c326dfb7f28))
     (fp_line (start 6.985 -4.445) (end 6.985 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 1e1c2b14-32aa-4c34-b63c-b2c509ffd5a9))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 613b798b-8f80-4c43-90ce-1a0f42909936))
     (fp_line (start 6.985 14.605) (end -12.065 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp d0156c78-1aec-416c-8d32-d36eb7a6d5a8))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 8fca026f-51ec-4866-b883-888fa77c3758))
     (fp_line (start -9.14 -1.52) (end 4.06 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 1da1c839-a358-42e4-9a22-97fcf163f084))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 811785ce-3e68-4908-9c11-604c37442093))
     (fp_line (start -9.14 11.68) (end -9.14 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 6ae34572-3b27-4366-ac61-11f1df9352f3))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 7ba947d2-537e-4dc1-9f3c-e3538a89b030))
     (fp_line (start 4.06 -1.52) (end 4.06 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 41885cd4-9345-4ea9-a18e-fddf26e79904))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 2ec4f11f-4eb1-474e-9f02-feaa7fdd4bcb))
     (fp_line (start 4.06 11.68) (end -9.14 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp b98a8595-07c7-4ee1-b2cd-17ce3af159d7))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp fe46c2d2-56cd-498f-90d3-484b408dd514))
     (fp_line (start -8.89 -1.27) (end 3.81 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 8b61750b-92d4-4c34-939e-0c6efda02400))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 9ce8e5a9-66a4-4750-9759-38c9e98cd69d))
     (fp_line (start -8.89 11.43) (end -8.89 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 7e671811-454b-46fc-a3fd-ee3cb65b2613))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp d16a4232-382c-44eb-b047-3ebcaab462c3))
     (fp_line (start 3.81 -1.27) (end 3.81 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 29bfd194-d405-47a5-b218-dc753d5a9ada))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 0dba5210-011a-4dd9-a493-6ae11f9f3bdc))
     (fp_line (start 3.81 11.43) (end -8.89 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp e4f64d52-0491-4f6f-ac83-8a7e32c294ac))
-    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp ff327be7-19bb-4bbb-80ff-b2445ef6553e))
-    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 2e3da26a-104c-4f1f-80d7-200a46222fe5))
-    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp dc926c88-f37a-4911-bd6c-874be8027bda))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp a776e3b0-af39-4249-b971-c48305f5fbbb))
+    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 28664fe4-2729-4209-9315-8959b65d9c30))
+    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 857a91aa-37b7-4386-a0c3-0ffac21afab8))
+    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 4ab6d917-9574-4b0a-9153-b383b19a3cd5))
     (pad "1" thru_hole circle (at 0 0) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 10 "Net-(D9-K)") (pinfunction "1") (pintype "passive") (tstamp 3a3f7011-5fa9-4798-8994-c6d43946d798))
+      (net 70 "Net-(D48-A)") (pinfunction "1") (pintype "passive") (tstamp 4d939752-38ac-4c59-8689-7aae317f7ae3))
     (pad "2" thru_hole circle (at -6.35 2.54) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 71 "Net-(J2-Pin_1)") (pinfunction "2") (pintype "passive") (tstamp 010f7fd7-e6aa-40b5-aa2c-d5857aac6002))
+      (net 17 "Net-(J2-Pin_1)") (pinfunction "2") (pintype "passive") (tstamp 651e9b0b-8084-4dd0-94a4-aa2c1b43d985))
     (model "${KICAD6_3DMODEL_DIR}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2782,67 +2782,67 @@
   )
 
   (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (layer "F.Cu")
-    (tstamp 98b25bd7-bec0-478d-92a0-325b531d3c61)
-    (at 257.65125 159.22625)
+    (tstamp 87141d08-42c0-404f-bc25-31a703f56eaa)
+    (at 262.09625 97.31375)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
     (property "Sheetname" "")
     (property "ki_description" "Push button switch, generic, two pins")
     (property "ki_keywords" "switch normally-open pushbutton push-button")
-    (path "/00997820-4112-4784-b8c1-c9f67654ccb3")
+    (path "/5e868f74-6685-4c48-a770-f5e84305daec")
     (attr through_hole)
-    (fp_text reference "SW48" (at -2.54 -2.794) (layer "F.SilkS")
+    (fp_text reference "SW38" (at -2.54 -2.794) (layer "F.SilkS")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 7edb7182-8215-484d-bd00-52c59fdc80d2)
+      (tstamp 61087c06-7fd9-426c-bb95-52c3fbb4d177)
     )
     (fp_text value "SW_Push" (at -2.54 12.954) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp fda1ec55-2ed5-4b76-b1f5-1909a4c5a557)
+      (tstamp 0bba44a6-bee3-4c5e-b44f-1eb1fd4bda1f)
     )
     (fp_text user "${REFERENCE}" (at -2.54 -2.794) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp d43bbb2f-c7ba-4e59-938a-3fc68ec1a58a)
+      (tstamp 045e683e-e5cb-40d3-8846-5d0fb0cf315e)
     )
     (fp_line (start -9.525 -1.905) (end 4.445 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 635a7877-2a6f-47ba-9792-d016f45055d0))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 0c24a00a-d4a7-474f-a504-16d0d1a49d06))
     (fp_line (start -9.525 12.065) (end -9.525 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp efd0ea75-9925-4779-a23b-c86fa7afd98e))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 2ff9d038-bd0c-47d1-8ff6-65797f04ca45))
     (fp_line (start 4.445 -1.905) (end 4.445 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp b08b37ed-ecfd-4427-96e7-2e64cd27d09f))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 737a7898-d96c-412a-b512-96e427480630))
     (fp_line (start 4.445 12.065) (end -9.525 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp cbe34d92-bb2d-4a18-adef-3919437cc7a4))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 76226891-8447-44f3-abbd-c27467eabea4))
     (fp_line (start -12.065 -4.445) (end 6.985 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp f32146d7-4e12-44a9-b0bd-87479e6e4d75))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 6623a395-2937-4c69-84fb-0100f62c7d86))
     (fp_line (start -12.065 14.605) (end -12.065 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp a3f6ff66-429b-4bd2-bc4a-762d3fa3bc59))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 79ecf9ce-767c-433d-a087-22ce2b2ed66a))
     (fp_line (start 6.985 -4.445) (end 6.985 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 7d4e05fb-515f-4693-a0c6-1f4e9b7b14fb))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp ea3e41cd-cd27-49b1-9ccd-b626f37fc5cd))
     (fp_line (start 6.985 14.605) (end -12.065 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp dac5edb6-a868-49b2-8eb9-bddfce6113dc))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 3818c15a-cd08-4461-abad-836ac1e78e62))
     (fp_line (start -9.14 -1.52) (end 4.06 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 13890fa8-3c18-44f1-a47f-06338d96b837))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 05c9fc0f-57dc-4308-a323-b91659104c13))
     (fp_line (start -9.14 11.68) (end -9.14 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp f6ec344e-9a65-4b7e-959a-ec99ad13f91f))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp ea79abf4-0a8d-4a68-b0bf-a3536941eb8c))
     (fp_line (start 4.06 -1.52) (end 4.06 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp ba3085cd-1322-4a4a-8b2b-85fc5f9b5cfc))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp b50effbb-6453-487b-adfa-81ba8f657cf6))
     (fp_line (start 4.06 11.68) (end -9.14 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp dd64dff2-cc4e-44cb-a282-ea1784eb8d8d))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 2f5771ba-3906-4ed2-abdf-c1d66e5fcfd5))
     (fp_line (start -8.89 -1.27) (end 3.81 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp dc43b4fe-ea87-4b26-b437-078aa5693b7e))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 1f979949-31b7-47e6-903b-03148dd20b9e))
     (fp_line (start -8.89 11.43) (end -8.89 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 051ad1f0-0ed8-410b-ab06-384047155805))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 86c6d09c-c590-4317-8ae9-7715fdd9b21f))
     (fp_line (start 3.81 -1.27) (end 3.81 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp ee74c3c4-2264-4455-a8c7-5e42b808ebfb))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 0fd27f7b-2dee-45ee-923f-62f30460c0be))
     (fp_line (start 3.81 11.43) (end -8.89 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp defbef84-70ee-4df9-bdba-59f41038dcfb))
-    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp f6d2cc5b-9112-468c-80ce-7a1aeb4977f8))
-    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp bceb6832-1720-4b05-b8d8-8c26196eb16e))
-    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 6c55df63-caf9-432e-873c-ea59f71c41e3))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp f982dca1-4d93-4b23-8a92-f30400e8fa3c))
+    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 430d1845-98ba-43b4-bd19-84b6b73d85b1))
+    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 622ed7fb-ce50-4f35-a0b9-47774ad1f7a0))
+    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp ae872a13-ef75-4741-83a4-62ba7b839b72))
     (pad "1" thru_hole circle (at 0 0) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 54 "Net-(D48-K)") (pinfunction "1") (pintype "passive") (tstamp 961dd716-363b-40b5-8000-7ff1fe6aab0d))
+      (net 61 "Net-(D38-A)") (pinfunction "1") (pintype "passive") (tstamp 1ec697c3-4595-4568-90c6-7ed9b41e7c44))
     (pad "2" thru_hole circle (at -6.35 2.54) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 78 "Net-(J2-Pin_8)") (pinfunction "2") (pintype "passive") (tstamp 70c9cfd9-a632-4217-988d-84d9e9abd835))
+      (net 23 "Net-(J2-Pin_7)") (pinfunction "2") (pintype "passive") (tstamp da811979-2af1-4e96-84a6-3e51c8fbfdc4))
     (model "${KICAD6_3DMODEL_DIR}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2851,67 +2851,67 @@
   )
 
   (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (layer "F.Cu")
-    (tstamp 99c8f786-7812-4bc8-9ba4-c535b32676fa)
-    (at 300.51375 121.12625)
+    (tstamp 88e3e74f-cee6-4418-9e6a-a8b81a46dd59)
+    (at 247.80875 154.46375)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
     (property "Sheetname" "")
     (property "ki_description" "Push button switch, generic, two pins")
     (property "ki_keywords" "switch normally-open pushbutton push-button")
-    (path "/5e68b751-652c-46bb-94d5-7804332131c2")
+    (path "/ec0d1f8a-200f-47a2-9b02-204e111ef3f3")
     (attr through_hole)
-    (fp_text reference "SW13" (at -2.54 -2.794) (layer "F.SilkS")
+    (fp_text reference "SW30" (at -2.54 -2.794) (layer "F.SilkS")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp d7fcca8d-ae2d-4184-8a69-8cd835513e67)
+      (tstamp 2194b577-6a2d-45b3-a767-b81edfae6a69)
     )
     (fp_text value "SW_Push" (at -2.54 12.954) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 52cf8b13-372b-4640-b626-3d07a1af6eb8)
+      (tstamp d8f2d570-9c6c-4540-b90c-7c9405b1f65e)
     )
     (fp_text user "${REFERENCE}" (at -2.54 -2.794) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 0cdb48ef-0836-4581-9953-365a32749e19)
+      (tstamp a2922e49-54dd-44a8-abdd-873fa3082e15)
     )
     (fp_line (start -9.525 -1.905) (end 4.445 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 2e135a50-e427-4731-b8e3-76fb7ba84427))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 8e875f05-3bf4-47d2-9015-3fdc7afdc1b6))
     (fp_line (start -9.525 12.065) (end -9.525 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 61713625-fe16-4d7f-8a22-3449bb65b0d6))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 7ffab517-1b2b-4b4f-a545-da25d28eb58b))
     (fp_line (start 4.445 -1.905) (end 4.445 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 1ba3e22f-61a4-4459-86bc-323156ec67ab))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp aac00175-0faf-474a-9356-0d5ef975205d))
     (fp_line (start 4.445 12.065) (end -9.525 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 5fb13d07-db10-401f-9130-e122a175b1d4))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 60f509fd-e53b-4504-aea8-13277052550c))
     (fp_line (start -12.065 -4.445) (end 6.985 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp b83dec13-67a6-4bd1-bb5e-9492795d380c))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 13f93331-4402-473b-b43d-3ecf13697e12))
     (fp_line (start -12.065 14.605) (end -12.065 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 2c26ea13-bf89-4637-9297-dbc7651dd7c5))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 73b7068a-a136-4896-bb53-9ae59cd4db24))
     (fp_line (start 6.985 -4.445) (end 6.985 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 544cc585-b1b2-4ee0-a157-b10129a954d8))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 40796dd5-afa4-400b-917d-bb3d0122dbf5))
     (fp_line (start 6.985 14.605) (end -12.065 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp eddaf521-e5bf-4d4d-aaa2-677b09d03be5))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 52d2397b-bd36-45f9-83f4-fc8bb88a5f06))
     (fp_line (start -9.14 -1.52) (end 4.06 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 834106e4-1697-4262-9870-20b76ae30dd1))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 23d34cf5-6f29-4694-99f5-997a988549fe))
     (fp_line (start -9.14 11.68) (end -9.14 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 3bbbdedc-e7ac-4d01-9731-2147c35d0973))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp b067b5ac-63c3-42f1-bc5e-cbf4c65955ae))
     (fp_line (start 4.06 -1.52) (end 4.06 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp c8e0ab95-a626-402a-882e-f5649af3cd7e))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 99e89135-6faa-434b-ab5f-fae7d7a074e9))
     (fp_line (start 4.06 11.68) (end -9.14 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp a32de87b-70e9-4e72-98c3-a7aa374e10b0))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp acc07001-162c-4813-b0f4-69b2362e01f5))
     (fp_line (start -8.89 -1.27) (end 3.81 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp a96c48f6-1101-4219-ad22-6c5762a11d2d))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp de3a5efa-2626-4a79-83db-3fb33af00500))
     (fp_line (start -8.89 11.43) (end -8.89 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 2e22e5ba-c471-4a1d-a3f2-9b8063af9d33))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 8f41e249-ce1c-4a4f-aaea-3cac8a48a493))
     (fp_line (start 3.81 -1.27) (end 3.81 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp a8987ae2-a502-4927-83df-6f20fc957d8c))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp b1c4fa06-760e-447f-b338-acfc50ddd368))
     (fp_line (start 3.81 11.43) (end -8.89 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 88f289b6-87a2-4ea4-a1e0-d54796ae623e))
-    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 303870d9-343a-4a4d-8928-9e773f64dcc9))
-    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp ae815f5b-2fa6-40a1-a00e-229365812511))
-    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 28a6b45d-fdd2-4190-be4b-4c0915459aa7))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp e0ef5a00-8e71-4f28-8b17-a2dd84bde1b0))
+    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp d057d95d-2922-434a-afcc-c3954c2f6435))
+    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp e4dda7c3-2ce6-46b3-b331-9f7e86e79b54))
+    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp ce9c2b70-b828-4dcb-b933-129b5215b350))
     (pad "1" thru_hole circle (at 0 0) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 15 "Net-(D13-K)") (pinfunction "1") (pintype "passive") (tstamp dd78646b-b81e-4b8a-a20b-1d3774a4c69c))
+      (net 54 "Net-(D30-A)") (pinfunction "1") (pintype "passive") (tstamp ffe845e7-f291-4d0c-b626-c48139908819))
     (pad "2" thru_hole circle (at -6.35 2.54) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 75 "Net-(J2-Pin_5)") (pinfunction "2") (pintype "passive") (tstamp 026afe6b-89fa-4ce5-949d-e3dcb3874243))
+      (net 22 "Net-(J2-Pin_6)") (pinfunction "2") (pintype "passive") (tstamp 21921c00-c24b-4248-a011-294eb5a6b858))
     (model "${KICAD6_3DMODEL_DIR}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2920,67 +2920,67 @@
   )
 
   (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (layer "F.Cu")
-    (tstamp 9e8ae6d5-8233-4ce6-8b26-9e4aebf60ad0)
-    (at 186.21375 197.32625)
+    (tstamp 976cb9ce-e631-4a07-988d-d94dca76d087)
+    (at 243.04625 97.31375)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
     (property "Sheetname" "")
     (property "ki_description" "Push button switch, generic, two pins")
     (property "ki_keywords" "switch normally-open pushbutton push-button")
-    (path "/3ea817f6-51e2-4468-8a2a-2e90c6aa7cf5")
+    (path "/851bf40d-2439-4374-84f7-bf723570f928")
     (attr through_hole)
-    (fp_text reference "SW56" (at -2.54 -2.794) (layer "F.SilkS")
+    (fp_text reference "SW39" (at -2.54 -2.794) (layer "F.SilkS")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 16baaa40-c89f-4b6d-8c3e-6dddca7653e9)
+      (tstamp d5e10dfc-6c80-4c29-87ff-8f995c07bd44)
     )
     (fp_text value "SW_Push" (at -2.54 12.954) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp e0d6202c-42cf-4933-9e91-2e878595a63e)
+      (tstamp 09951611-4cf2-4b94-8060-3eafc430344b)
     )
     (fp_text user "${REFERENCE}" (at -2.54 -2.794) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 9328e153-b7bc-4a37-a96a-408502724e35)
+      (tstamp a262e151-c0b8-4ff0-8430-f583f8a38708)
     )
     (fp_line (start -9.525 -1.905) (end 4.445 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 1f38646f-a88d-4b16-9c11-86cc32acc8e5))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp b548ed35-5a1a-4059-95d4-1b1e5f394396))
     (fp_line (start -9.525 12.065) (end -9.525 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 5a090917-6a50-4392-b826-daa74b84e725))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp a06d207f-8b8a-4cc1-9395-d3e39abde248))
     (fp_line (start 4.445 -1.905) (end 4.445 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 18e53adf-db0d-49a2-bbc7-3d05aa7fc0f2))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp cc4c0b89-9955-4917-9071-7131074328be))
     (fp_line (start 4.445 12.065) (end -9.525 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 4a380937-8368-47c0-9f64-af917f115bda))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp c6c228d9-aa6a-41c6-8616-05315a4ae560))
     (fp_line (start -12.065 -4.445) (end 6.985 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 73256b91-8b22-4ca5-8474-9e56528f4665))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 8335b5a3-2bde-4bfa-86c4-bc21c73aefed))
     (fp_line (start -12.065 14.605) (end -12.065 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 693b9d85-347b-4b1f-b917-3e4d2b3e3f4f))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 06e700b3-c8f0-40e4-bf21-82da18a210d4))
     (fp_line (start 6.985 -4.445) (end 6.985 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 724ca5cb-39a9-4163-bf0f-8a337c47f5ef))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 9ac8fcee-e069-433e-b84a-1e12f2cec511))
     (fp_line (start 6.985 14.605) (end -12.065 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp e8131b90-4fb5-4c6a-bebf-99d4a17057da))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 4c7c7e27-7da9-47bb-9684-0674038e6521))
     (fp_line (start -9.14 -1.52) (end 4.06 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 8e20cd98-5fb6-4bbe-bb2e-2315c800b62a))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp d0cf5f43-6df8-4edd-9007-69c941e5986d))
     (fp_line (start -9.14 11.68) (end -9.14 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp cb5c11c1-186a-4b28-ae1d-c6612da783ca))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 2eedc4a6-be3d-4666-9b81-25eda5994de4))
     (fp_line (start 4.06 -1.52) (end 4.06 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 273f3d21-fe61-4440-a61c-f186fb0d5765))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 26674f43-4792-425f-af12-6fe1794cd3ad))
     (fp_line (start 4.06 11.68) (end -9.14 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 5cad5221-28b2-4f3f-9ba5-505eb138a07c))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 4ff9c889-f381-4736-95b4-fd3020213652))
     (fp_line (start -8.89 -1.27) (end 3.81 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 386f7638-ccc1-47f6-8b98-53530f691ab3))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 26bd6483-5631-42f2-bb6d-8036804a224e))
     (fp_line (start -8.89 11.43) (end -8.89 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 755f0fe7-ac52-428c-a000-61d4bc7101da))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 55dc5eaa-e7bf-4387-b298-320442a4859f))
     (fp_line (start 3.81 -1.27) (end 3.81 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp fa7f0760-ad15-4188-8467-7e5e1f8ecbc2))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 95269cc2-94e4-4e02-9454-5f672a0d31d0))
     (fp_line (start 3.81 11.43) (end -8.89 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 5f878393-253f-41a3-89b8-efbb2b6ba565))
-    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 44db0682-f0da-4419-8eb1-ea674c8555fb))
-    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 9aa6d849-53a2-4bb1-9394-d9438a4e53de))
-    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 03137aae-08c0-462b-91d4-c6703912d0c8))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 7edf34e5-4b13-4888-a534-8a482e8293d8))
+    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp f62f8cae-47f1-4611-bfbc-510a2c35b26d))
+    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 3548fb6f-ff02-49d5-b064-02eb07a3cd95))
+    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp d75e585d-7ae0-40e0-953e-78e80ea5ebc5))
     (pad "1" thru_hole circle (at 0 0) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 63 "Net-(D56-K)") (pinfunction "1") (pintype "passive") (tstamp d867a316-96d7-4a01-b356-4ccc31983213))
+      (net 62 "Net-(D39-A)") (pinfunction "1") (pintype "passive") (tstamp 19c4101f-0b3c-41aa-82e3-6238b91b1b48))
     (pad "2" thru_hole circle (at -6.35 2.54) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 71 "Net-(J2-Pin_1)") (pinfunction "2") (pintype "passive") (tstamp 1bcb36e9-c94c-4c38-9578-287cc5c64fd3))
+      (net 24 "Net-(J2-Pin_8)") (pinfunction "2") (pintype "passive") (tstamp ec9c7ca4-13b0-425c-8eaf-ff3dcece8acc))
     (model "${KICAD6_3DMODEL_DIR}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2988,69 +2988,69 @@
     )
   )
 
-  (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.25u_PCB" (layer "F.Cu")
-    (tstamp a18bf5f9-e788-40ba-a91b-8b2efda1b6be)
-    (at 121.92 159.22625)
-    (descr "Cherry MX keyswitch, 1.25u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
-    (tags "Cherry MX keyswitch 1.25u PCB")
+  (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (layer "F.Cu")
+    (tstamp a29d0987-fc1b-479e-89c1-4957eae3384f)
+    (at 295.43375 135.41375)
+    (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
+    (tags "Cherry MX keyswitch 1.00u PCB")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
     (property "Sheetname" "")
     (property "ki_description" "Push button switch, generic, two pins")
     (property "ki_keywords" "switch normally-open pushbutton push-button")
-    (path "/e76b9ee1-537d-4bb2-9fff-78ac2d601e07")
+    (path "/e818bc00-1e8f-44e3-b9f4-0bae43ab4fb8")
     (attr through_hole)
-    (fp_text reference "SW1" (at -2.54 -2.794) (layer "F.SilkS")
+    (fp_text reference "SW53" (at -2.54 -2.794) (layer "F.SilkS")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 988b5319-14e2-4359-ac6a-47497a8c684a)
+      (tstamp cb3cf7f9-8c81-468e-8413-26def3be3526)
     )
     (fp_text value "SW_Push" (at -2.54 12.954) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp c92f2bee-9db2-41b7-b81e-c0d25e6d89fc)
+      (tstamp 5182fbc3-0c7b-453c-aafd-532198d8e30e)
     )
     (fp_text user "${REFERENCE}" (at -2.54 -2.794) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 96fcb291-c433-4814-a3cf-a51eefbe09fd)
+      (tstamp 68a1dcc7-8161-4f6b-9b42-7c6638961b1c)
     )
     (fp_line (start -9.525 -1.905) (end 4.445 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp ea20c24e-61ef-41f6-88e3-7b6c070ddc32))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 08667e8a-8c72-429f-b2e6-5db12ca88ec3))
     (fp_line (start -9.525 12.065) (end -9.525 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 5fa4a84d-75ae-4d2d-ad9e-48ce7698578c))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 0c747d89-b9cd-4ce8-9ab2-10088c866c2a))
     (fp_line (start 4.445 -1.905) (end 4.445 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 66253bf2-e5b4-427d-8b4a-3b8b468bbcec))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp f19d8e3e-1608-4cbf-9820-4000cc5e77a2))
     (fp_line (start 4.445 12.065) (end -9.525 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 9312d933-0465-43c2-a620-93c215eef9e7))
-    (fp_line (start -14.44625 -4.445) (end 9.36625 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 7d01491d-09be-4a67-bcf0-116981247fee))
-    (fp_line (start -14.44625 14.605) (end -14.44625 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp e12cde89-d355-4d0b-9b41-59df053b810f))
-    (fp_line (start 9.36625 -4.445) (end 9.36625 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp fff3cb0e-84d3-452d-b8d2-cb9899878e97))
-    (fp_line (start 9.36625 14.605) (end -14.44625 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 83232cba-482f-4edd-b437-49de737f7248))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 4c4f0c93-87ab-4c00-841e-6a65574447aa))
+    (fp_line (start -12.065 -4.445) (end 6.985 -4.445)
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp e7e1ea46-d40c-432d-9e55-5a9b96b52741))
+    (fp_line (start -12.065 14.605) (end -12.065 -4.445)
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 8db66b3b-fa37-4c8f-aaa0-111a725d8bc4))
+    (fp_line (start 6.985 -4.445) (end 6.985 14.605)
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp b1ad30f7-8a1d-476a-a2c5-5037a5d7450c))
+    (fp_line (start 6.985 14.605) (end -12.065 14.605)
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 4924eca8-f13b-43e7-a3d0-2f8a8208b8df))
     (fp_line (start -9.14 -1.52) (end 4.06 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp a4fac6d1-d9a8-4272-9799-a1e09847b851))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 4c571deb-6250-4704-99cc-40921f516ed5))
     (fp_line (start -9.14 11.68) (end -9.14 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 0ee11aef-fee0-479c-a8ba-f3976939d285))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 1b094382-d76d-488a-a324-ff10e4f36338))
     (fp_line (start 4.06 -1.52) (end 4.06 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp b86e4e87-e3e5-4fa1-a9f2-8ccde0b77bdb))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 89448610-988a-4bf6-a2c6-2dada1b54951))
     (fp_line (start 4.06 11.68) (end -9.14 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 70747f34-da8d-4142-b35b-d66adddfe84d))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp dd830a99-f202-4c35-8a7c-8ca4b32c8c62))
     (fp_line (start -8.89 -1.27) (end 3.81 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp cbb9b3c9-dadf-4b63-8d2a-0ad83d2d0cb9))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 6c4caae7-9bd5-40ab-a49b-c727061e82b4))
     (fp_line (start -8.89 11.43) (end -8.89 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 9d167875-f8b4-43c2-b600-86e1c8ac44ee))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 8fcd478f-b69b-402e-8481-620b1acf66d9))
     (fp_line (start 3.81 -1.27) (end 3.81 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 5a5c2f49-5e2e-45f4-8cfa-1c2b50fe0189))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 9f17b91f-3a14-4cb5-8037-7ad7d725085a))
     (fp_line (start 3.81 11.43) (end -8.89 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 62ef0403-17ff-4966-95cf-e82d9b788865))
-    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp cf8be6d2-e5e7-4ff4-920e-9cce2f7915d7))
-    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 0fd49b50-dbc5-4dbe-911f-58663926b153))
-    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 861468f5-fcae-49ed-aedf-1ff7ecf2951b))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 27f2a415-b2a8-42dd-95c5-93d14073607e))
+    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp ed089306-906e-4fa8-9441-1692fcba4875))
+    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 02c18d68-c299-466a-b242-a2dd2d4ef9e4))
+    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp d93cd41f-daf2-497c-b29e-56ca70b30faa))
     (pad "1" thru_hole circle (at 0 0) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 1 "Net-(D1-K)") (pinfunction "1") (pintype "passive") (tstamp e745084b-ab93-42da-8ea8-3fa5221c8e6d))
+      (net 74 "Net-(D53-A)") (pinfunction "1") (pintype "passive") (tstamp f0d776df-a813-4fd5-be1a-c7e36635489c))
     (pad "2" thru_hole circle (at -6.35 2.54) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 71 "Net-(J2-Pin_1)") (pinfunction "2") (pintype "passive") (tstamp a4aaf8ba-2c70-4385-a54d-14c6480b2799))
-    (model "${KICAD6_3DMODEL_DIR}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.25u_PCB.wrl"
+      (net 22 "Net-(J2-Pin_6)") (pinfunction "2") (pintype "passive") (tstamp 47c184c4-ec9e-4501-aa74-a7d2c3f50551))
+    (model "${KICAD6_3DMODEL_DIR}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
       (rotate (xyz 0 0 0))
@@ -3058,67 +3058,67 @@
   )
 
   (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (layer "F.Cu")
-    (tstamp a35d1514-31aa-4d2b-a0b9-21956ff62e30)
-    (at 243.36375 121.12625)
+    (tstamp ab829212-59a4-4112-938c-825b310e8d27)
+    (at 266.85875 154.46375)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
     (property "Sheetname" "")
     (property "ki_description" "Push button switch, generic, two pins")
     (property "ki_keywords" "switch normally-open pushbutton push-button")
-    (path "/f3a91f22-9a79-4402-9c89-174fb2d8ce83")
+    (path "/c3d72692-ab11-40c7-a981-70c1f17ae289")
     (attr through_hole)
-    (fp_text reference "SW16" (at -2.54 -2.794) (layer "F.SilkS")
+    (fp_text reference "SW31" (at -2.54 -2.794) (layer "F.SilkS")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp a867be62-b864-4a32-88a0-3d2324c109a8)
+      (tstamp 521205cc-7c5d-4cfb-ae0b-e4ebc7e0b5d4)
     )
     (fp_text value "SW_Push" (at -2.54 12.954) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp e293570b-37e6-476e-90f3-b6deae07895e)
+      (tstamp f009ace0-87fb-4f26-9903-3b307733b683)
     )
     (fp_text user "${REFERENCE}" (at -2.54 -2.794) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 82b87927-e35a-404c-a68b-8734a5be9f1c)
+      (tstamp 40eb1810-cd1b-43f0-bdf3-0c4f30dd121d)
     )
     (fp_line (start -9.525 -1.905) (end 4.445 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 0ee7b7e3-5f22-4d55-8a24-669e08fc06ba))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 70d266c9-346d-42a7-86d8-6aec60e75db3))
     (fp_line (start -9.525 12.065) (end -9.525 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 42419bb8-d15d-4c7a-9ea1-cb367355b7fa))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 229a6f5c-e6b3-4e92-a6c1-934162b4d4ea))
     (fp_line (start 4.445 -1.905) (end 4.445 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 69a78f20-6fff-423b-bc22-2a68c8d20877))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 4baade0f-4dac-49a2-94b9-5faeff47ca3e))
     (fp_line (start 4.445 12.065) (end -9.525 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp dceb70c6-5a13-4e00-9b35-be7848eaab6f))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 08901ab9-bbfc-473a-a623-de01bcb6ebf7))
     (fp_line (start -12.065 -4.445) (end 6.985 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp b1685bcb-a6f5-4d8b-af3d-16ad83bb7b68))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 10cd3610-f42e-45c3-ab29-a9e786417008))
     (fp_line (start -12.065 14.605) (end -12.065 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp c2c322ea-7b11-4fc4-9767-126262be42c7))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 9e3526aa-f3d2-472c-a896-35ea07336d56))
     (fp_line (start 6.985 -4.445) (end 6.985 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp ba58ea4f-bac6-4ce8-bc6f-4626bbe3639a))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 37409d74-b852-4131-b5fa-55a88f4627a6))
     (fp_line (start 6.985 14.605) (end -12.065 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp f587bb36-95b7-425a-afa1-08660707286b))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 298a7b0e-f383-468f-b4a8-05ee366d661a))
     (fp_line (start -9.14 -1.52) (end 4.06 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 093b3547-fece-451f-b168-c1d43763c08a))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 03a525e6-aa3f-4999-a895-832754a73cde))
     (fp_line (start -9.14 11.68) (end -9.14 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp ea8b8c32-ce0d-48b6-aa91-7b826f803784))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 3a62fd18-8f4f-47d4-90e4-2af0d4e71bc0))
     (fp_line (start 4.06 -1.52) (end 4.06 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 065ec91f-66c1-48ac-b379-3ad2d30d47d1))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 40770f4d-3168-4056-9427-e42f416d73ad))
     (fp_line (start 4.06 11.68) (end -9.14 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 10d1e4ee-d1d2-4275-b9ac-0ff85cdd06ee))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp f76a1f0f-9e05-4e50-af82-c87ca2f32d9e))
     (fp_line (start -8.89 -1.27) (end 3.81 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 8c561c84-2228-45a3-940f-8cd0fcef07fd))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 3126ba1b-4d79-46b7-92f5-7aec7d7994a3))
     (fp_line (start -8.89 11.43) (end -8.89 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 9d0b0357-c84a-438b-b205-19f1403e9d49))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp e988e87e-c9d7-49a4-948d-96b696c28b11))
     (fp_line (start 3.81 -1.27) (end 3.81 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 92eebb1b-b9d0-423e-9da5-9623b5bae088))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 341a3844-589d-4420-bcbf-9902d18cd070))
     (fp_line (start 3.81 11.43) (end -8.89 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 4d5d5ced-4bfa-4c26-a248-2d81ad04682e))
-    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 17aa7d03-be3e-4b70-9b32-94876ae6d64b))
-    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 9c19ef00-9428-42b2-bbc5-d4a2dd49509d))
-    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 0dd4d124-e69c-480a-ab29-c104c8811f1c))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp cff1f38d-677d-45f8-8745-f061e7624c1a))
+    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 424440d9-27a7-4566-b85e-71dd8b8e10cb))
+    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 3139aea9-fcd6-4550-8772-ee6f682033eb))
+    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 47997ddb-71d2-42a5-a8d9-7f63bdb0ddd2))
     (pad "1" thru_hole circle (at 0 0) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 18 "Net-(D16-K)") (pinfunction "1") (pintype "passive") (tstamp 22fd3a1c-7cf3-4217-867b-af3f4c5796bc))
+      (net 55 "Net-(D31-A)") (pinfunction "1") (pintype "passive") (tstamp 7df8f04a-0772-4ae5-9d21-f492ff7e249c))
     (pad "2" thru_hole circle (at -6.35 2.54) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 78 "Net-(J2-Pin_8)") (pinfunction "2") (pintype "passive") (tstamp 3d296a50-07b9-4675-98b2-931b89541fa7))
+      (net 23 "Net-(J2-Pin_7)") (pinfunction "2") (pintype "passive") (tstamp b97aa028-1df5-4e18-9810-95b98f6f636a))
     (model "${KICAD6_3DMODEL_DIR}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3127,67 +3127,67 @@
   )
 
   (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (layer "F.Cu")
-    (tstamp a4f75316-4df6-46df-a4a5-e3146414e78f)
-    (at 262.41375 121.12625)
+    (tstamp aba1f6ff-ee73-4a07-a8c1-fe7ef7721659)
+    (at 290.67125 116.36375)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
     (property "Sheetname" "")
     (property "ki_description" "Push button switch, generic, two pins")
     (property "ki_keywords" "switch normally-open pushbutton push-button")
-    (path "/31063621-d313-48e0-a149-f997d88cb4d9")
+    (path "/0488ee5c-fc08-4d0b-9400-e7c1a2787632")
     (attr through_hole)
-    (fp_text reference "SW15" (at -2.54 -2.794) (layer "F.SilkS")
+    (fp_text reference "SW45" (at -2.54 -2.794) (layer "F.SilkS")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 16609a0b-4f21-4dc5-84f7-870e342346cd)
+      (tstamp 83d990dc-0323-4f1f-9c6c-5d830a926e81)
     )
     (fp_text value "SW_Push" (at -2.54 12.954) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 061b08be-3f36-49de-a990-1b85a3311d33)
+      (tstamp 6caa748f-451d-4bb9-a5da-4a9e16cb077f)
     )
     (fp_text user "${REFERENCE}" (at -2.54 -2.794) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp ce762621-cd62-454d-aeda-4dc295ad3cf6)
+      (tstamp b14ed521-0f95-4ada-9e26-1936f4b0a81b)
     )
     (fp_line (start -9.525 -1.905) (end 4.445 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 146ea030-25d2-43ee-bf2b-cbc75282bb97))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp c3c0561e-c9b4-4b5d-ae2c-057b876f6d7e))
     (fp_line (start -9.525 12.065) (end -9.525 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp a572443a-1110-40a1-8ed9-d77212e823b6))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp b9c8aea2-1af0-40fe-b424-56920598ed69))
     (fp_line (start 4.445 -1.905) (end 4.445 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 84e8846a-3b1a-4674-ad9b-c2c9b82fcc5d))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 9cc5558f-de1e-4806-84e6-5f35e0842b7f))
     (fp_line (start 4.445 12.065) (end -9.525 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 5322d9af-7d5f-4669-8a2c-eb1940a75f43))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 5a9315a7-cfde-4a47-accb-dc718ecce800))
     (fp_line (start -12.065 -4.445) (end 6.985 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp d732e9ea-01af-47f7-89fb-849ec1386cca))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 87bd5db9-ddd0-45d0-aaff-f126b6f5f390))
     (fp_line (start -12.065 14.605) (end -12.065 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp fad1ff26-bdc8-4864-b037-5b85d38f7ab8))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 64307a9a-617d-42c9-b8f2-060a13ee7e77))
     (fp_line (start 6.985 -4.445) (end 6.985 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 8178cee0-d159-4df6-9d91-545606e1ab8d))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 135854f6-a8f7-40e9-a696-efa354b91227))
     (fp_line (start 6.985 14.605) (end -12.065 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 20439615-bd29-446b-a780-2c21848b9800))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp a0df5f25-5a0b-4dfb-93df-ee7408ec4e0d))
     (fp_line (start -9.14 -1.52) (end 4.06 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp c9f2a25a-d767-40a0-82be-336faad72fba))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 2cef854e-7635-4340-a623-fd9998929230))
     (fp_line (start -9.14 11.68) (end -9.14 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp de5db1c2-e910-401b-a26c-790c9b55b2ca))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 5b10b3ab-767a-4452-bfde-2ab7972e0ba6))
     (fp_line (start 4.06 -1.52) (end 4.06 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 9ae40a9d-e639-40ae-b2da-00f7a754d39a))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp b20dbcac-f561-407a-8dba-13c85e6a681b))
     (fp_line (start 4.06 11.68) (end -9.14 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 9f19ea2d-6a57-425e-aca5-d1bb9ed7d029))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp f7726be5-3b57-4733-86fe-ecbbb9972be4))
     (fp_line (start -8.89 -1.27) (end 3.81 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp acc4c1f8-5911-408d-8757-a7187af7c3cd))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 3f88a189-9fa7-4b39-8b66-371d29b376db))
     (fp_line (start -8.89 11.43) (end -8.89 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 55b403a5-39d0-4af0-93ad-8bcf1d74e538))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp d159d546-aaef-41fb-aecb-854760d5c756))
     (fp_line (start 3.81 -1.27) (end 3.81 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 325697c6-a5a5-4085-8319-144a9abcab8a))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 6e2947e5-8735-4db0-b385-bb47a5999a62))
     (fp_line (start 3.81 11.43) (end -8.89 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 1f4be882-ad5a-446c-ba75-bb4ecb01d5df))
-    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 3d3b91f2-ae15-47b8-99a8-b52a64d11a87))
-    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 487875e7-7663-4b5e-8794-100060b2dd7a))
-    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 4a56c833-1926-4c54-9447-e25f0fadb5d5))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp d5e83782-0082-4181-84da-cc0c94a5a678))
+    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp f93f9b98-6769-4bee-8f97-af2021abf4c2))
+    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 356f3301-2738-44ad-b939-feb926442a66))
+    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 5e9beb27-1a5e-49a2-8f43-96ba6ff9163f))
     (pad "1" thru_hole circle (at 0 0) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 17 "Net-(D15-K)") (pinfunction "1") (pintype "passive") (tstamp 28dd551a-8306-428c-9f39-f133e9236507))
+      (net 67 "Net-(D45-A)") (pinfunction "1") (pintype "passive") (tstamp 739d8208-50a0-425b-8e23-653dd5822dc3))
     (pad "2" thru_hole circle (at -6.35 2.54) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 77 "Net-(J2-Pin_7)") (pinfunction "2") (pintype "passive") (tstamp 2bb7f2cb-bf52-4aee-af9a-2ce41fbd13f0))
+      (net 22 "Net-(J2-Pin_6)") (pinfunction "2") (pintype "passive") (tstamp e1fbbb67-3260-42ff-92d1-52bc3e1869c9))
     (model "${KICAD6_3DMODEL_DIR}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3196,67 +3196,67 @@
   )
 
   (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (layer "F.Cu")
-    (tstamp a94d4b58-5acc-45f4-948c-2ab489f97433)
-    (at 152.87625 178.27625)
+    (tstamp b2c347ad-d4cb-458d-8cc2-3892b7352f58)
+    (at 319.24625 173.51375)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
     (property "Sheetname" "")
     (property "ki_description" "Push button switch, generic, two pins")
     (property "ki_keywords" "switch normally-open pushbutton push-button")
-    (path "/63b7c575-44fd-415b-8b42-24f2e6b527a1")
+    (path "/e0213e79-6e5b-4edc-b73a-af0e9b76853f")
     (attr through_hole)
-    (fp_text reference "SW35" (at -2.54 -2.794) (layer "F.SilkS")
+    (fp_text reference "SW50" (at -2.54 -2.794) (layer "F.SilkS")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 549017b5-63e5-49e8-b5ca-3220de64aa5a)
+      (tstamp 082907d5-71ee-4b88-8c6d-de4193bc9662)
     )
     (fp_text value "SW_Push" (at -2.54 12.954) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp e0a06fb4-80a8-494d-8af6-5579ec504b7b)
+      (tstamp 41a1dd82-8abb-412f-aa46-f2005f3dcf49)
     )
     (fp_text user "${REFERENCE}" (at -2.54 -2.794) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 64c5c1e3-024c-422d-add3-c7aede61324e)
+      (tstamp 5e911b1d-0d33-4105-b24a-c8dd9d5bc162)
     )
     (fp_line (start -9.525 -1.905) (end 4.445 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp f405aee5-1589-408b-9b29-de73173ce65a))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp ae482af7-f02b-4430-9778-a72671d2cc54))
     (fp_line (start -9.525 12.065) (end -9.525 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 6430ccf5-5b60-4a30-87d2-bff80ff9dc1a))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 20f95bff-2555-4be5-a6e9-7991980d3b36))
     (fp_line (start 4.445 -1.905) (end 4.445 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 955bfd71-f1b7-4208-97fe-e5905438e1c9))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 9b1ae69e-7a5b-4228-8402-86dae7f8f388))
     (fp_line (start 4.445 12.065) (end -9.525 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 61d72508-3081-499c-93b6-985de8648a3e))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp b7e9cbae-34e8-41f0-bcd9-545efee5abaf))
     (fp_line (start -12.065 -4.445) (end 6.985 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 3f61202e-7863-4e4d-bc11-2a0f17e3ff32))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 70bc044f-4584-48d7-8818-54680b1ae867))
     (fp_line (start -12.065 14.605) (end -12.065 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp f3c00859-916c-4277-9e08-aab53ab1fe4e))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 47376f74-f145-4ccb-9f0e-9c18b6bf8656))
     (fp_line (start 6.985 -4.445) (end 6.985 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp b022d121-4121-4fa2-bcce-4998aac32f0e))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp b23b420a-997f-480b-916c-03c94d8aae6f))
     (fp_line (start 6.985 14.605) (end -12.065 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 4a78ba10-e6e0-432c-b99d-285c15cf3cf8))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp eee7e4f9-8448-4c10-a3b2-8eff756827e7))
     (fp_line (start -9.14 -1.52) (end 4.06 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 433a93a3-6c12-4de9-9f5a-b29a72276597))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp f9a2666a-31bf-476b-8e3c-fb972d448c20))
     (fp_line (start -9.14 11.68) (end -9.14 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 22dfdbf0-cea3-40aa-9803-5a356687f2da))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 1d193242-6451-4baa-83e5-bc0d00967da7))
     (fp_line (start 4.06 -1.52) (end 4.06 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 053c3dd8-db9c-4c96-bdd6-6c8ad6e44dc5))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 6de65f21-c0b0-40c0-b439-8267357390fe))
     (fp_line (start 4.06 11.68) (end -9.14 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 75ab7a19-f11c-4551-84d0-1c4dbb48c43b))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 0cdda3a9-5b17-4a75-95b3-54e2e3b1b20d))
     (fp_line (start -8.89 -1.27) (end 3.81 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp f8f2a6df-92a2-40c2-bb5e-f22a4ee42a36))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 0988be38-8eae-4bd5-9961-498236d66f5b))
     (fp_line (start -8.89 11.43) (end -8.89 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 668cfed4-41db-485c-8dbc-ca03babc0cbd))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp a6124ee3-10c5-4d0a-937d-38242b71b150))
     (fp_line (start 3.81 -1.27) (end 3.81 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp dc4321c6-f280-4550-872f-b982913b5779))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 29c5b596-cc39-43c2-b8ce-0cf2833d1872))
     (fp_line (start 3.81 11.43) (end -8.89 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 5077ebc7-1d07-4bf7-b24e-32dd2e244eaf))
-    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 37384515-bac7-449e-b964-a5cc634e27f1))
-    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 6c76b907-f337-4e3a-a84e-749556ae6ec7))
-    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp c9797ed9-cffd-49f4-9a0a-be9c6dbace8d))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 2c02c7f0-4837-4a7d-acd5-f912d4d6b145))
+    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 4e481d71-c771-45c7-b045-fd4c8838960b))
+    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 566ef39b-0186-4abe-8f95-8b4ce1a6bd8d))
+    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 30947c76-20d3-4208-b6a2-2c03a3be9f1c))
     (pad "1" thru_hole circle (at 0 0) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 40 "Net-(D35-K)") (pinfunction "1") (pintype "passive") (tstamp 951ee216-84cc-40f1-ace3-85ade40a8933))
+      (net 71 "Net-(D50-A)") (pinfunction "1") (pintype "passive") (tstamp a4db86ca-54ea-4a52-8971-b58f12beac89))
     (pad "2" thru_hole circle (at -6.35 2.54) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 73 "Net-(J2-Pin_3)") (pinfunction "2") (pintype "passive") (tstamp 0e40a6b1-ff09-4987-8c02-46ea2899a921))
+      (net 19 "Net-(J2-Pin_3)") (pinfunction "2") (pintype "passive") (tstamp 23821504-62c3-4575-a00e-29725c9ee8f2))
     (model "${KICAD6_3DMODEL_DIR}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3265,67 +3265,67 @@
   )
 
   (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (layer "F.Cu")
-    (tstamp abf806f5-8298-4884-96a6-25c8fdea48bb)
-    (at 148.11375 121.12625)
+    (tstamp b96aebba-22d8-45fc-b055-6781e8212dc4)
+    (at 181.13375 135.41375)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
     (property "Sheetname" "")
     (property "ki_description" "Push button switch, generic, two pins")
     (property "ki_keywords" "switch normally-open pushbutton push-button")
-    (path "/0f5d192f-c41f-4b57-8b45-c24ca3b99f3a")
+    (path "/c2ed0e55-e7ca-451a-9eb7-76a77b9e7711")
     (attr through_hole)
-    (fp_text reference "SW4" (at -2.54 -2.794) (layer "F.SilkS")
+    (fp_text reference "SW21" (at -2.54 -2.794) (layer "F.SilkS")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp aa2d11ad-414a-4ace-909a-e155df041ddf)
+      (tstamp 97b42fd9-40db-4624-85e6-9379f5e0d9c7)
     )
     (fp_text value "SW_Push" (at -2.54 12.954) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 48156cbd-5286-4b02-80ba-3232101a9073)
+      (tstamp 939372ae-d9d7-40ee-8962-eab24e09027f)
     )
     (fp_text user "${REFERENCE}" (at -2.54 -2.794) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp d177beb4-bd32-421a-a7ef-113d6b122dfd)
+      (tstamp aaf0b7bf-6cff-40ba-8127-93cc9cb7070d)
     )
     (fp_line (start -9.525 -1.905) (end 4.445 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 912babb9-e180-4f3a-b778-31a94e04147a))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp b304d57f-b4ca-4028-87ba-b851c117f7d4))
     (fp_line (start -9.525 12.065) (end -9.525 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 341000fc-93ba-48c5-899e-5c897643f36f))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 485dd741-7716-495d-8642-c3b476302b54))
     (fp_line (start 4.445 -1.905) (end 4.445 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 52c9e4c4-b12a-4a00-8f4c-e70395353df5))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 4e97a7ae-fb33-473d-8c17-2b3bc1af6c7f))
     (fp_line (start 4.445 12.065) (end -9.525 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 6265a250-4d2a-409f-8197-36979e127e39))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 5a103376-a48c-4a49-b2f6-ac5f389963a5))
     (fp_line (start -12.065 -4.445) (end 6.985 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp ee32e092-90eb-4246-8d55-5ad97aaac474))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 20905798-1a98-4601-b8a6-e0044ddb6d99))
     (fp_line (start -12.065 14.605) (end -12.065 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp ad19c364-5ef4-438c-a2d9-ec25900dcfa6))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 71df3714-484c-4dd0-a8ea-103e660fddf2))
     (fp_line (start 6.985 -4.445) (end 6.985 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp c5f3f800-e653-4ada-a0a7-5d09b1cc1179))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 210a0d28-5878-42be-848b-18d6cb3a79ce))
     (fp_line (start 6.985 14.605) (end -12.065 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp e3540b24-c904-4566-8830-e620ce1356a7))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 1fcde8f1-75a5-4138-b7d7-88339d7d3caf))
     (fp_line (start -9.14 -1.52) (end 4.06 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 44ff39b0-7fb5-47e3-bc04-b52c9baf7ed0))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp da5e7e35-2873-47ed-bcf0-9feb109ba587))
     (fp_line (start -9.14 11.68) (end -9.14 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp e11e781b-09ce-4c29-a5a4-433c46af4991))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 1f3a5ad5-f557-456a-9507-7b737979e80e))
     (fp_line (start 4.06 -1.52) (end 4.06 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp ce2c1f9d-a969-4e8c-985f-0d3703907bca))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 204edff3-7f2a-4336-984d-05660fd7ec1e))
     (fp_line (start 4.06 11.68) (end -9.14 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp d1534888-5dda-4cd7-8bf2-7c73d12eab8c))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 0f24705b-a322-4a86-84db-6864670da202))
     (fp_line (start -8.89 -1.27) (end 3.81 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 3a131712-4119-454a-b79e-3d92128c3440))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp b940554c-8dbb-4544-b5e2-797d0aae72b9))
     (fp_line (start -8.89 11.43) (end -8.89 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp a4b8246a-c746-4d28-a698-d3260b09c501))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp e1586e17-e7e8-4bec-be6a-b0cf42037df5))
     (fp_line (start 3.81 -1.27) (end 3.81 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 1aef5f17-a891-4331-883d-55cf52f105f3))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 7a225224-52c0-4ca4-af67-c3c4e5177216))
     (fp_line (start 3.81 11.43) (end -8.89 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 2b00c9bc-ff2d-4b4e-afe0-d8c232abc680))
-    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp de978d75-3bc5-4b00-b6f6-5868043debab))
-    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 5190a85e-92ab-4b61-8e2f-16828a998d71))
-    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 6c35708e-6e57-4a66-a5bd-f711b9abc8f5))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 6ac329e1-38c3-480a-90c7-3a11475ec0aa))
+    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 99c8c702-12ae-4ca7-8079-e1a1b0da8aa9))
+    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp b6dc4dea-0cfb-4f58-8022-a103d17129bb))
+    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp c0c2e5cb-f167-4aaf-a230-1f9ec74a68c9))
     (pad "1" thru_hole circle (at 0 0) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 5 "Net-(D4-K)") (pinfunction "1") (pintype "passive") (tstamp 9f142946-e0a7-4941-bd45-024c4a4d33d3))
+      (net 46 "Net-(D21-A)") (pinfunction "1") (pintype "passive") (tstamp 375af1e7-de69-4969-869a-54dbb21e6bd4))
     (pad "2" thru_hole circle (at -6.35 2.54) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 74 "Net-(J2-Pin_4)") (pinfunction "2") (pintype "passive") (tstamp b3c67838-4324-4026-bad5-6a54808db8f7))
+      (net 21 "Net-(J2-Pin_5)") (pinfunction "2") (pintype "passive") (tstamp 6829a4ad-0d8a-43c4-abcd-8f6d89a4203c))
     (model "${KICAD6_3DMODEL_DIR}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3334,67 +3334,67 @@
   )
 
   (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (layer "F.Cu")
-    (tstamp ae7d05c4-ae32-4900-900b-76bc3b60762b)
-    (at 119.53875 197.32625)
+    (tstamp bf30a3c2-6dff-4355-a2a9-62e3629e56bf)
+    (at 338.29625 173.51375)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
     (property "Sheetname" "")
     (property "ki_description" "Push button switch, generic, two pins")
     (property "ki_keywords" "switch normally-open pushbutton push-button")
-    (path "/3af66a99-1cae-4b75-a4b2-eca4274ce819")
+    (path "/419cc5ff-879d-406a-a760-8161d78c81dc")
     (attr through_hole)
-    (fp_text reference "SW33" (at -2.54 -2.794) (layer "F.SilkS")
+    (fp_text reference "SW49" (at -2.54 -2.794) (layer "F.SilkS")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 5343463f-30c6-4add-806a-13d0e4b49473)
+      (tstamp d8e8d6cd-2d77-40bb-ab76-876cdcd24f81)
     )
     (fp_text value "SW_Push" (at -2.54 12.954) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 643ef155-0c9b-40cd-bf6f-98ce188a9bed)
+      (tstamp 62d5ec2e-0ebe-4071-864a-397ec2d769c7)
     )
     (fp_text user "${REFERENCE}" (at -2.54 -2.794) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 1e04934a-0f83-4c7e-903d-cfd701ef55bb)
+      (tstamp 60f737ba-0c87-4afc-8efc-205ce7b20f61)
     )
     (fp_line (start -9.525 -1.905) (end 4.445 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 24921e72-eb51-4c33-a926-0a28bff4b5a4))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp f031d9fa-c4a7-4e18-8ae5-4f947d671e18))
     (fp_line (start -9.525 12.065) (end -9.525 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp df0afe58-00dc-41d3-a959-31dcdc113568))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 847f6a59-eaab-42b2-b1e1-ca32c70f0e2d))
     (fp_line (start 4.445 -1.905) (end 4.445 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 7fc059de-73ce-496d-be64-df2e94ae7bc5))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 7a56e4b4-c6dc-42e5-a1c3-7fa550d83ada))
     (fp_line (start 4.445 12.065) (end -9.525 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp adb23d27-44de-4952-9d54-278cd64a4844))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 9695b568-0cfd-4d41-84b3-00521fc051b7))
     (fp_line (start -12.065 -4.445) (end 6.985 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 47c8e1a2-4623-4a87-8d15-e807158d21f1))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp af15ed9d-2779-4574-a686-1c6027ee12c0))
     (fp_line (start -12.065 14.605) (end -12.065 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp af2a479a-0227-420c-b706-5178d4758e5d))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp d4cea1cc-7741-4e71-96aa-a47ea51f92aa))
     (fp_line (start 6.985 -4.445) (end 6.985 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 71371e5c-ddfa-478e-b9fb-2b92f21e5495))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp bc86d2b7-749e-4716-80ac-e7d0838312f7))
     (fp_line (start 6.985 14.605) (end -12.065 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp ae4bf572-a505-4141-bf93-97e7793fe682))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 1103fbef-ea08-43b3-ba69-be49276d504e))
     (fp_line (start -9.14 -1.52) (end 4.06 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp b5a2fd19-24d8-43ab-9974-18bef68608f1))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 5cba0e13-f92e-46d1-a501-8cfce0412caf))
     (fp_line (start -9.14 11.68) (end -9.14 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 7f7876e2-340b-46b3-9047-3e8c58c14844))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp b2d2e341-915f-43ae-9e0d-6f28d9def16c))
     (fp_line (start 4.06 -1.52) (end 4.06 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 09456d46-b29a-4aa7-aec8-3d61c489f3dd))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 58957d65-5248-4c87-ac26-da978528cc89))
     (fp_line (start 4.06 11.68) (end -9.14 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 25e89e1c-9608-40dd-8b5e-34422365616e))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 9b6da409-7dd0-4f0c-ad20-49af17da42f6))
     (fp_line (start -8.89 -1.27) (end 3.81 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 96398844-8af9-4057-a01a-2e2cac81f573))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 7ffddc22-4fbf-4e2e-9f1f-daa035ee026c))
     (fp_line (start -8.89 11.43) (end -8.89 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 98409ab9-9ffe-4537-bd4f-307bee084159))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp eac9055f-9b1b-48f0-aec9-de9acd36a618))
     (fp_line (start 3.81 -1.27) (end 3.81 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 81952331-90ba-4da0-a185-c8f9fe5986e9))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 3226c077-a739-4554-86cb-0db2c98a73f6))
     (fp_line (start 3.81 11.43) (end -8.89 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 234652c6-b938-4a9f-a4af-a0b903068efb))
-    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 7a873ab7-de74-4850-b4e7-a5109baa033b))
-    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 977b26e0-5f34-4c14-a0ce-51c4fecb8e02))
-    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 516e9b2d-5bee-459a-b2f1-bd4e73172327))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp dd6d8c68-3645-44e2-bcef-af029dba4327))
+    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp bcba8fc0-1963-4eed-a6bf-d163df04d9a5))
+    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 53ca260c-3882-4519-89a3-e11ce025834d))
+    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 0ebbd2d4-97d7-47c0-b750-cebce60f0ef8))
     (pad "1" thru_hole circle (at 0 0) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 37 "Net-(D33-K)") (pinfunction "1") (pintype "passive") (tstamp 43d61c7a-0f4b-4966-8b52-88f652fd1a2a))
+      (net 14 "Net-(D49-A)") (pinfunction "1") (pintype "passive") (tstamp ec945bf9-1862-43cf-9d0f-a6ac48718c13))
     (pad "2" thru_hole circle (at -6.35 2.54) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 71 "Net-(J2-Pin_1)") (pinfunction "2") (pintype "passive") (tstamp fb0afba7-15f3-4b93-92ed-ca9dec0aa9b2))
+      (net 18 "Net-(J2-Pin_2)") (pinfunction "2") (pintype "passive") (tstamp 056188ae-ba8e-4297-b1b8-7c03a625b735))
     (model "${KICAD6_3DMODEL_DIR}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3402,69 +3402,69 @@
     )
   )
 
-  (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (layer "F.Cu")
-    (tstamp b3d74507-d54d-426b-9a3d-8051b1fa45d3)
-    (at 305.27625 178.27625)
-    (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
-    (tags "Cherry MX keyswitch 1.00u PCB")
+  (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.75u_PCB" (layer "F.Cu")
+    (tstamp c2860524-ff34-4ebf-93c2-389505ee48a8)
+    (at 126.365 154.46375)
+    (descr "Cherry MX keyswitch, 1.75u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
+    (tags "Cherry MX keyswitch 1.75u PCB")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
     (property "Sheetname" "")
     (property "ki_description" "Push button switch, generic, two pins")
     (property "ki_keywords" "switch normally-open pushbutton push-button")
-    (path "/c2742b7e-afae-4012-8356-adb74663d8e9")
+    (path "/41bf90b8-d46a-45c4-91b4-96f01b47fb16")
     (attr through_hole)
-    (fp_text reference "SW61" (at -2.54 -2.794) (layer "F.SilkS")
+    (fp_text reference "SW9" (at -2.54 -2.794) (layer "F.SilkS")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 376f930e-1494-4f69-976c-f8c15736dda0)
+      (tstamp 5e9f3327-e1b5-4f16-82cd-cec2bc82ed64)
     )
     (fp_text value "SW_Push" (at -2.54 12.954) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp c68e397d-8ebd-4aca-942a-f624e76a77f3)
+      (tstamp 9188aefd-bda1-4b04-8a93-3f09f4b62376)
     )
     (fp_text user "${REFERENCE}" (at -2.54 -2.794) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 9bd59912-c698-4518-b70d-afcbbd4fe30a)
+      (tstamp 726956c1-656e-450e-af0a-bd3c3fd50b1e)
     )
     (fp_line (start -9.525 -1.905) (end 4.445 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 55ba98ac-3f31-4067-bcc4-8a2cdcc869a8))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 550db8b6-dd3f-499b-a60c-22faca70901b))
     (fp_line (start -9.525 12.065) (end -9.525 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp de5fc4c5-4673-48a5-96d5-de35136eec38))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp ba830870-58e7-4282-ba5c-603799cdafde))
     (fp_line (start 4.445 -1.905) (end 4.445 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 354117de-04e1-435e-8315-773bc26461d0))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp ea50b223-3e27-4829-ae5a-84943aa71ff9))
     (fp_line (start 4.445 12.065) (end -9.525 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 65e4d17e-9312-49e6-b048-81d916596e92))
-    (fp_line (start -12.065 -4.445) (end 6.985 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 90ae1df6-13f6-414b-842e-512d88fa1094))
-    (fp_line (start -12.065 14.605) (end -12.065 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 42e2468f-445b-492f-b165-b1547bb98027))
-    (fp_line (start 6.985 -4.445) (end 6.985 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 9ee33568-6c8e-425a-b756-ff6a3f56ea26))
-    (fp_line (start 6.985 14.605) (end -12.065 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 3b783091-7b11-43c6-8fa9-06fb4faec2d6))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 0f285819-1c98-43d9-9c82-78cd36af5a0d))
+    (fp_line (start -19.20875 -4.445) (end 14.12875 -4.445)
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 6d23be02-8638-4710-9f8d-06598d8d4902))
+    (fp_line (start -19.20875 14.605) (end -19.20875 -4.445)
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 100805a5-fd04-45dc-9e72-b35bcb692ebf))
+    (fp_line (start 14.12875 -4.445) (end 14.12875 14.605)
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp ecd4a08c-a3b1-4df2-a294-a656be15f29b))
+    (fp_line (start 14.12875 14.605) (end -19.20875 14.605)
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp eeadbfdd-6d7c-4b6c-a847-c18c6e77e3b4))
     (fp_line (start -9.14 -1.52) (end 4.06 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 5a8a48e7-ba15-443e-8c55-49cba9720d83))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 974321ed-2609-4819-8f92-cd5d337344a2))
     (fp_line (start -9.14 11.68) (end -9.14 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp a298d4a0-8122-456c-9067-a1a4f69c0fc4))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 527c1a26-440a-4ff8-b534-3f181efe5b1b))
     (fp_line (start 4.06 -1.52) (end 4.06 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp cdeac255-71d4-4ab8-a49c-ca9a16948f6c))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 441beb07-85ac-4a04-89ff-cc9076ce5444))
     (fp_line (start 4.06 11.68) (end -9.14 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp f8cc5f8f-6ef1-4dfd-9f29-0b31f5d6a62a))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 24f3ed16-b59d-4918-bc7b-76fae7f676c8))
     (fp_line (start -8.89 -1.27) (end 3.81 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp f9a3aaeb-0112-4c20-97bf-b57f04da589e))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 1dd148e8-860b-4341-a7eb-f6145d3f162f))
     (fp_line (start -8.89 11.43) (end -8.89 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 0f2bcecf-3f0f-41ea-9d85-ee023d490cbd))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 3329ee3d-ee32-475b-8b19-4d7cedf4484d))
     (fp_line (start 3.81 -1.27) (end 3.81 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 23932d99-4be1-43dc-8589-55ddf543debd))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 2934306b-463a-4a09-b92a-45072beaaecc))
     (fp_line (start 3.81 11.43) (end -8.89 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 01360b59-4742-4da7-bfae-5525d752bc45))
-    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp f9dd574c-8d16-4ebd-b3e2-5467a3419645))
-    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 4f50dc08-d5a6-4c33-8b76-4cfdad24ca39))
-    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp bb10d0ea-4cf7-4c38-99d8-d1be7ff61142))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 4734cf82-362e-4f85-aa18-47d810a14364))
+    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 480fece0-d763-4bea-a16f-955691714287))
+    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 45dd197f-74c5-4283-84d9-5386cf0d4c6c))
+    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp a682de22-be3a-4f25-9757-215b7fe08096))
     (pad "1" thru_hole circle (at 0 0) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 69 "Net-(D61-K)") (pinfunction "1") (pintype "passive") (tstamp 362a02a7-7aac-4384-ab9b-91cdb621f1a9))
+      (net 36 "Net-(D9-A)") (pinfunction "1") (pintype "passive") (tstamp 123afccf-ef32-4baa-8bbc-a5d0ec1b5a50))
     (pad "2" thru_hole circle (at -6.35 2.54) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 76 "Net-(J2-Pin_6)") (pinfunction "2") (pintype "passive") (tstamp 6155145e-2740-476a-8c9d-fa68028376a6))
-    (model "${KICAD6_3DMODEL_DIR}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl"
+      (net 17 "Net-(J2-Pin_1)") (pinfunction "2") (pintype "passive") (tstamp be0a4275-9e03-4860-880f-c88d0f118d86))
+    (model "${KICAD6_3DMODEL_DIR}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.75u_PCB.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
       (rotate (xyz 0 0 0))
@@ -3472,67 +3472,67 @@
   )
 
   (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (layer "F.Cu")
-    (tstamp b79120dc-6c97-406a-9e6a-bafaf751914c)
-    (at 200.50125 159.22625)
+    (tstamp c670ec31-1a01-4913-a59d-e5829cdcd3bf)
+    (at 185.89625 97.31375)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
     (property "Sheetname" "")
     (property "ki_description" "Push button switch, generic, two pins")
     (property "ki_keywords" "switch normally-open pushbutton push-button")
-    (path "/1fd37091-ab0d-462a-81a9-282f0e6c3ad6")
+    (path "/caab852b-3488-44c7-b572-57600b824e30")
     (attr through_hole)
-    (fp_text reference "SW38" (at -2.54 -2.794) (layer "F.SilkS")
+    (fp_text reference "SW6" (at -2.54 -2.794) (layer "F.SilkS")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 2fbae1b9-bdad-4108-b5ec-6659940fbf36)
+      (tstamp e813e969-9ef8-4c2f-957a-dfeb364ba3bf)
     )
     (fp_text value "SW_Push" (at -2.54 12.954) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 1d4eb8e5-3803-4417-b167-2f879afed359)
+      (tstamp df9a8da4-d308-4d07-881c-184d3d72d6d5)
     )
     (fp_text user "${REFERENCE}" (at -2.54 -2.794) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 45c2c21e-8321-4920-a24b-4d9926099cca)
+      (tstamp 684bcc7e-f784-4801-a70e-d644c32b7b4c)
     )
     (fp_line (start -9.525 -1.905) (end 4.445 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 9327da8c-b95b-4c76-9a10-c2a797498d6d))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp c0349abd-fc80-4a6b-b5fe-bd63af8a64c8))
     (fp_line (start -9.525 12.065) (end -9.525 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp c54f4a26-a4b5-4780-b687-3f108affc9b9))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp b1324953-3103-4daa-8c10-f2022569a71f))
     (fp_line (start 4.445 -1.905) (end 4.445 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp f19b46a1-b10e-4cdc-8c48-89abcb8ab685))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 0701162e-d405-431f-bf10-2b08201d253b))
     (fp_line (start 4.445 12.065) (end -9.525 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 93cbeb52-3e2f-48ef-ad04-ce4519ffc191))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp aec76fe2-b892-4525-84ab-dcafedea6c24))
     (fp_line (start -12.065 -4.445) (end 6.985 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 49a6374f-cd29-4b8d-8141-a7645487897b))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp d18fd5c7-7b06-4260-b920-3d6331e95df8))
     (fp_line (start -12.065 14.605) (end -12.065 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 614cdff0-686f-4f92-8870-97afe5319d15))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp fa6e267b-bda9-463c-ae6c-5e799af10579))
     (fp_line (start 6.985 -4.445) (end 6.985 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 4c039aa3-d27d-451f-a973-993b9aba3510))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp f51daed2-1d28-4c06-ac24-138bf6550259))
     (fp_line (start 6.985 14.605) (end -12.065 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp ebca1485-74a6-446c-b3d4-488dd6e58509))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 128e2a5c-bfe6-44c8-a57f-f32c261a5025))
     (fp_line (start -9.14 -1.52) (end 4.06 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 5fcce948-c36c-4ae3-9a80-7d0998f7b8ff))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp c62587af-93db-4db9-af15-833333d4692b))
     (fp_line (start -9.14 11.68) (end -9.14 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp fa53976d-b4b6-4425-9d54-da40e2e71468))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp a8c2b0b6-1336-498f-9c3c-f267ffb4215e))
     (fp_line (start 4.06 -1.52) (end 4.06 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 769f1ae1-7ce6-404e-823d-456d2da84d31))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp cf34d116-547a-4aef-9557-23c196fa3292))
     (fp_line (start 4.06 11.68) (end -9.14 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp d4651751-fee7-43c5-ae06-b0ce7fe15087))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 3981f994-204a-4db0-9ebf-74499eaf152a))
     (fp_line (start -8.89 -1.27) (end 3.81 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp ee02ef13-2760-4aa0-8dcb-6990018c82f6))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp d6cd059c-1362-4aaf-bbbc-84871087d9ee))
     (fp_line (start -8.89 11.43) (end -8.89 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp eec44a05-06df-4095-b56f-9c4694aa251d))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 15b01747-38e5-4d6e-a623-bd885fd2d968))
     (fp_line (start 3.81 -1.27) (end 3.81 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp b6814c18-a64f-426b-a9cc-189e417cf567))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 87a29dab-2d38-4730-85d4-fdacda2c9a1f))
     (fp_line (start 3.81 11.43) (end -8.89 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 8d8a81fd-9742-4f09-ba02-c4cb3c72387a))
-    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 17fd0db4-1fe1-485a-a850-5392987daac6))
-    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 59c15873-0499-4e49-a3c4-edda3ce5b646))
-    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp eef421bb-bc0e-4403-b17f-59bdf207ae20))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 09597e7b-891e-4be8-8397-2e356fd1d455))
+    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp d138b3a1-68fa-46eb-aa7e-4052cbc4dd4e))
+    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 3d34a201-4c7e-45b8-b60e-e78bb3034ecc))
+    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 81368c49-fbf9-46e4-a5ea-c391238b9a76))
     (pad "1" thru_hole circle (at 0 0) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 43 "Net-(D38-K)") (pinfunction "1") (pintype "passive") (tstamp 5587b567-be59-4daa-9535-cd188ce29333))
+      (net 33 "Net-(D6-A)") (pinfunction "1") (pintype "passive") (tstamp 56217708-579d-4c3b-9fce-56e2f923be79))
     (pad "2" thru_hole circle (at -6.35 2.54) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 76 "Net-(J2-Pin_6)") (pinfunction "2") (pintype "passive") (tstamp 0cb5676b-7b4b-4a26-8e1c-f6d10ba23b7d))
+      (net 22 "Net-(J2-Pin_6)") (pinfunction "2") (pintype "passive") (tstamp 8df5a398-e8d6-4f13-a5bb-b7809017a255))
     (model "${KICAD6_3DMODEL_DIR}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3541,67 +3541,67 @@
   )
 
   (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (layer "F.Cu")
-    (tstamp c268f41a-58a1-4159-8952-286a857ea552)
-    (at 162.40125 159.22625)
+    (tstamp cfc8ada6-4852-417b-8530-05826e934f01)
+    (at 262.09625 173.51375)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
     (property "Sheetname" "")
     (property "ki_description" "Push button switch, generic, two pins")
     (property "ki_keywords" "switch normally-open pushbutton push-button")
-    (path "/e686b0ec-4adb-446a-9822-f1cf464105e1")
+    (path "/58c2141c-4cca-4aee-8742-fc3408642ffd")
     (attr through_hole)
-    (fp_text reference "SW36" (at -2.54 -2.794) (layer "F.SilkS")
+    (fp_text reference "SW58" (at -2.54 -2.794) (layer "F.SilkS")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp a5f4cf46-e728-417f-a92d-b6e5f08f7b5f)
+      (tstamp dad5ba56-fe66-4f3c-a57a-1db5f93ffcaf)
     )
     (fp_text value "SW_Push" (at -2.54 12.954) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp bf31724d-b846-418f-b85f-5b45c36227f9)
+      (tstamp e3f1b702-cd9d-415f-a74e-96f6be35ffd1)
     )
     (fp_text user "${REFERENCE}" (at -2.54 -2.794) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp d20c7fd3-837f-407d-8844-f3252a1322e3)
+      (tstamp 8170d496-3e7a-4edf-b5ac-04ebf8629610)
     )
     (fp_line (start -9.525 -1.905) (end 4.445 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 2fbb9600-4538-43da-bc15-24212af4e91c))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp e98cd0b9-8770-4d91-a913-ee649964d598))
     (fp_line (start -9.525 12.065) (end -9.525 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp c234a802-e408-4e2f-834d-d40baf54b3dd))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 706672f6-c14f-4c58-a7e1-f374f9bdbccf))
     (fp_line (start 4.445 -1.905) (end 4.445 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 224fd7aa-3992-4e1e-a243-575b3c6fbb2e))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp c03cf918-2949-473f-b2f4-323d6c215ca9))
     (fp_line (start 4.445 12.065) (end -9.525 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 47193172-6b46-4024-a07a-79633b7c2567))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 31845b03-fb64-4a0e-9e5e-9421c8dae309))
     (fp_line (start -12.065 -4.445) (end 6.985 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp a53b9325-3cc6-4210-aabc-43da262c65f5))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp c183ed05-48ff-4e74-b545-7a3a0f968d23))
     (fp_line (start -12.065 14.605) (end -12.065 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 927957d0-55a7-4013-a4b1-010146ff5042))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 3aa53a62-1d42-4d6f-bd00-f3599f375ca9))
     (fp_line (start 6.985 -4.445) (end 6.985 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 9cd41d27-5b02-455e-97a4-5d8ee4d0c7e4))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 84fcb284-671f-4646-9128-7147367e20aa))
     (fp_line (start 6.985 14.605) (end -12.065 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp ba79bec2-f2c6-4348-a388-11f78dc426cd))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 62c81fe4-1244-49bd-ac9c-043365740f6e))
     (fp_line (start -9.14 -1.52) (end 4.06 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 99c7d73e-feca-4425-aa89-372444d78319))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp e95f5877-40af-44dc-b024-9a9036d9a59a))
     (fp_line (start -9.14 11.68) (end -9.14 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 43ac794d-3739-4665-b7f0-29b3a4f17ae8))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 73a9e5ce-1d2f-4d40-ad67-974c5a9ccce4))
     (fp_line (start 4.06 -1.52) (end 4.06 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp bbacaa9e-8c11-4e42-b098-e2c1d7915a86))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 11ca8863-8c26-45c1-9464-aceab5a75410))
     (fp_line (start 4.06 11.68) (end -9.14 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 903cbb51-3b05-4195-9897-c873d5dccf2e))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp a31ded8e-f357-4d3d-b2dc-35560608de5d))
     (fp_line (start -8.89 -1.27) (end 3.81 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 53acff7d-e6ca-444e-8887-e879a23c66c2))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 942205b3-e2b0-4fac-a6ab-1dc3e09a75cf))
     (fp_line (start -8.89 11.43) (end -8.89 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp d6371675-646d-49c7-a9e5-6f48231c49a1))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp d59d52b7-3204-439f-836e-9a04561bd9f6))
     (fp_line (start 3.81 -1.27) (end 3.81 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 0e903bc5-baab-4ba7-aff6-51d12b4c7f4a))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 06c1f75f-45d5-40ca-9646-1002068eb91c))
     (fp_line (start 3.81 11.43) (end -8.89 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp f23b1745-c236-4bd1-905f-b37ab1808593))
-    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 244a6747-a661-467b-ba23-a41bc4957904))
-    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 2a430402-4ac0-40d6-a0bc-45048fa75d30))
-    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp a81a316d-1c23-495f-bf95-a763d72ee209))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp fb15d088-1261-4655-a4c9-497687e674d1))
+    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp dae13148-0069-41ba-8580-576c7e169d3e))
+    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 8d6e4845-7929-42cc-9eee-9e0190b1a5d0))
+    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 16a3e6b7-d385-46e4-9abf-bbb4d5c551d9))
     (pad "1" thru_hole circle (at 0 0) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 41 "Net-(D36-K)") (pinfunction "1") (pintype "passive") (tstamp b1fce708-7491-4f86-bc56-f30faca39b7d))
+      (net 78 "Net-(D58-A)") (pinfunction "1") (pintype "passive") (tstamp df70d38c-2a16-433a-99ba-9ae7f0717a8e))
     (pad "2" thru_hole circle (at -6.35 2.54) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 74 "Net-(J2-Pin_4)") (pinfunction "2") (pintype "passive") (tstamp 2b751452-7b55-40af-82a7-2c10b5302024))
+      (net 19 "Net-(J2-Pin_3)") (pinfunction "2") (pintype "passive") (tstamp b5808936-fa4f-4f43-b0f4-63a7db294f14))
     (model "${KICAD6_3DMODEL_DIR}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3610,67 +3610,67 @@
   )
 
   (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (layer "F.Cu")
-    (tstamp c33bb304-0f54-4f79-a1ba-1f1bcdc6af7e)
-    (at 281.46375 121.12625)
+    (tstamp d2996a99-44fd-4cf9-8cd1-40a10a5c7b49)
+    (at 357.34625 97.31375)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
     (property "Sheetname" "")
     (property "ki_description" "Push button switch, generic, two pins")
     (property "ki_keywords" "switch normally-open pushbutton push-button")
-    (path "/f6a9d339-1270-4579-9c56-1eb5103f9250")
+    (path "/46d3c37c-cac6-4270-8a43-0d9cec0373b0")
     (attr through_hole)
-    (fp_text reference "SW14" (at -2.54 -2.794) (layer "F.SilkS")
+    (fp_text reference "SW33" (at -2.54 -2.794) (layer "F.SilkS")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp ed0bceef-d36d-4bc0-a832-4047f9906bf2)
+      (tstamp 1c096c62-93c7-45d0-af2b-9411fed579f3)
     )
     (fp_text value "SW_Push" (at -2.54 12.954) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 40fe35ce-463f-465f-a12d-b44d8fe1758c)
+      (tstamp 7403df34-2cf2-424c-9dce-4293fb1b598a)
     )
     (fp_text user "${REFERENCE}" (at -2.54 -2.794) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 7b1e50c6-8568-4a81-afb0-6b5b3cce7902)
+      (tstamp 2b51134e-4ce7-4b7e-a863-ca94b9800d86)
     )
     (fp_line (start -9.525 -1.905) (end 4.445 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 78e1f1d5-c7c5-4ea7-a6dd-9950932fb342))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp a3398218-7f44-48d4-8fe1-e348621b1c4a))
     (fp_line (start -9.525 12.065) (end -9.525 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 21743f4a-cab5-4488-a7d6-e2c113bb9611))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 338e3484-72f6-4ddf-8444-b94ebf68c336))
     (fp_line (start 4.445 -1.905) (end 4.445 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 21813947-6681-4224-a51e-f67a3804fc91))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 896af631-2e5b-46d2-8bdc-05eed0429936))
     (fp_line (start 4.445 12.065) (end -9.525 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 7a0638d5-0277-4ef7-9673-a1eb774ac63b))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 3cef7ef0-4978-48f2-ae48-f4b0ee19328e))
     (fp_line (start -12.065 -4.445) (end 6.985 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 6b5fa157-4dbb-4a05-883a-442e7d76b84d))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 7f8d4e60-d3e5-4470-9294-c966e0490ee6))
     (fp_line (start -12.065 14.605) (end -12.065 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 49b0902e-c8ff-4491-a82a-bed99cb61c71))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp f2f02682-38d5-4787-aede-6418573b4ea6))
     (fp_line (start 6.985 -4.445) (end 6.985 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 89dfde2d-9c08-4751-b309-498ffd51c888))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 01bae8f7-aeb5-4e6e-b4af-96991ac1c3b9))
     (fp_line (start 6.985 14.605) (end -12.065 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 7f4f13d3-93d9-49b3-b101-3365f24bbc69))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp ea8d365c-5b72-4bd5-a427-b79d826f1596))
     (fp_line (start -9.14 -1.52) (end 4.06 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 7638de4c-1710-48e4-b366-4b894e1bcdaf))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 4e2fffef-b082-4c69-9b37-16c26730d292))
     (fp_line (start -9.14 11.68) (end -9.14 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 67a5cc2d-aaed-48fd-bbab-4998a4d79fc6))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp b37edef0-edfa-4fc8-9bb1-beffd01d7159))
     (fp_line (start 4.06 -1.52) (end 4.06 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 5d27269c-9f4e-4785-b5a3-314b837b6cfd))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 0738aa67-be5c-4eb3-9b11-67a10bc482b5))
     (fp_line (start 4.06 11.68) (end -9.14 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 2acc5932-e9d2-4d52-878a-318ee6cdf281))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp a21a9278-33b9-450d-915b-2a92ca3702cf))
     (fp_line (start -8.89 -1.27) (end 3.81 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp c484e9c5-5155-4f51-9244-a3f3e30d7e52))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp e805e964-f90b-4e5c-b945-4524775bc767))
     (fp_line (start -8.89 11.43) (end -8.89 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp f5370908-9704-4d1c-a5b1-7c019bfaad03))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp e898c933-7b6a-4789-b1bf-0e9abd6dc75e))
     (fp_line (start 3.81 -1.27) (end 3.81 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp faa21d3d-5e95-4d68-97ee-3920482187f0))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 53a8284d-20e3-4688-b603-3beeb5575f09))
     (fp_line (start 3.81 11.43) (end -8.89 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 47d901a8-15ab-4b85-abc9-d6b1d7564741))
-    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 31938c9b-04d2-4657-98d4-ed8394e6193e))
-    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 3be57baf-076a-42a9-8745-f119c6105242))
-    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 2db6cc93-08a8-4a6c-b9f5-45118189f28f))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp a1793657-3a88-48a0-812c-7d8b70eb0cc7))
+    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 68e625be-9267-49b8-a286-63fa3e176d5d))
+    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 39f4feb0-9a2e-4f2e-a7a2-89c02df96882))
+    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 6fc7c6e6-c1bb-489c-a635-054263d22cd2))
     (pad "1" thru_hole circle (at 0 0) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 16 "Net-(D14-K)") (pinfunction "1") (pintype "passive") (tstamp ae5ecf62-31df-40fe-90e8-30bc9af026c8))
+      (net 10 "Net-(D33-A)") (pinfunction "1") (pintype "passive") (tstamp 4eeb01dd-d30f-4207-b086-262d693ab96e))
     (pad "2" thru_hole circle (at -6.35 2.54) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 76 "Net-(J2-Pin_6)") (pinfunction "2") (pintype "passive") (tstamp 3b2960f3-8f70-441f-9967-d49d7b0773f9))
+      (net 18 "Net-(J2-Pin_2)") (pinfunction "2") (pintype "passive") (tstamp 005e8cc8-ea9b-4ded-bd2f-699b9885cd91))
     (model "${KICAD6_3DMODEL_DIR}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3679,67 +3679,67 @@
   )
 
   (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (layer "F.Cu")
-    (tstamp c33e50d5-b6eb-49e8-ad05-e6e7324390ec)
-    (at 281.46375 197.32625)
+    (tstamp d3703e85-49de-4b30-a520-67c10147871d)
+    (at 204.94625 173.51375)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
     (property "Sheetname" "")
     (property "ki_description" "Push button switch, generic, two pins")
     (property "ki_keywords" "switch normally-open pushbutton push-button")
-    (path "/698cd2e5-fa6d-4a27-9110-5eeedd87c7d1")
+    (path "/e4be4472-791a-45fb-b9b9-f7341dc1b2b5")
     (attr through_hole)
-    (fp_text reference "SW59" (at -2.54 -2.794) (layer "F.SilkS")
+    (fp_text reference "SW63" (at -2.54 -2.794) (layer "F.SilkS")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp a3ca6316-2c81-442b-aca6-4b3f6ba6c323)
+      (tstamp f0cff570-baa2-423a-8396-5daef67ef661)
     )
     (fp_text value "SW_Push" (at -2.54 12.954) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp dd2430fd-5e3e-4a91-b2a9-fafa06c8c1fe)
+      (tstamp 4600b411-78a3-4228-9b38-b6390512ee10)
     )
     (fp_text user "${REFERENCE}" (at -2.54 -2.794) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 0ede7559-65a2-4310-9271-8df6d827d15c)
+      (tstamp 7275bed5-2b8c-4c57-85e2-5f31c86715bb)
     )
     (fp_line (start -9.525 -1.905) (end 4.445 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 7f9a34f2-67b3-4acc-b4f0-1e57993173c1))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 25699a91-d500-4957-b569-dba088188a3c))
     (fp_line (start -9.525 12.065) (end -9.525 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 0baf9918-6a92-4a18-a296-ee98be657d2e))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp fc530752-cd1b-40bc-9fc7-ddabd8ce03a7))
     (fp_line (start 4.445 -1.905) (end 4.445 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 245e375e-fd09-4d95-aac1-4b4c033baae4))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 9cce630a-2021-446e-b3d6-cdd9d90df88f))
     (fp_line (start 4.445 12.065) (end -9.525 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 17c98bdb-5561-466a-bc20-4dd07394e834))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp b47b3b17-135a-471b-b355-da58f877d9ac))
     (fp_line (start -12.065 -4.445) (end 6.985 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp b3da5e63-2b74-4520-bd93-082d6ccb94ff))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp e18353ad-3df5-4628-906f-9c712b6a0d6d))
     (fp_line (start -12.065 14.605) (end -12.065 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 72be18e7-0b0a-417a-b325-fbe1062362d7))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 8ed05703-f756-47df-9d19-06af64df0779))
     (fp_line (start 6.985 -4.445) (end 6.985 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 93ebaecb-359d-4161-948b-6bbc3a7c7d51))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 27f70025-a067-409c-9189-032abbda0fcc))
     (fp_line (start 6.985 14.605) (end -12.065 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp ce1cde89-0063-42f5-9f96-8d648daac9bd))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 5f228701-d8f0-46fe-aaef-c77a5cc6a608))
     (fp_line (start -9.14 -1.52) (end 4.06 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 0facaaba-c2e6-4ffe-a384-d8b74cb7e220))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 585b7747-2e8b-48ed-8074-f52140b24bb8))
     (fp_line (start -9.14 11.68) (end -9.14 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp f1ee921e-f51b-4174-b4eb-e68576432aec))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 72dcb4fe-a0de-46ca-9f23-729e7b177766))
     (fp_line (start 4.06 -1.52) (end 4.06 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 93404d4a-83ec-42a1-9555-e59607c6905e))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 85c4e200-9078-4275-816d-29198ad8a105))
     (fp_line (start 4.06 11.68) (end -9.14 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 2b98a9d3-7dfc-40ac-b470-70246e18d6bc))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 1286c01a-7718-4a13-b994-8af3c13a7b10))
     (fp_line (start -8.89 -1.27) (end 3.81 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 770dd9f0-e2f1-42dc-a556-060d368a9944))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 18a53e41-ba0e-4887-ab2a-cee302afe171))
     (fp_line (start -8.89 11.43) (end -8.89 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp cb04d937-2d31-4250-ab2c-8d65527c613b))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 72ff11d9-192e-47b6-aadd-280c368fa1e2))
     (fp_line (start 3.81 -1.27) (end 3.81 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 173c3d2d-04b4-4ffd-af62-d254f1ef99fb))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp e6cfa59a-43ca-4646-b056-0d1d288db443))
     (fp_line (start 3.81 11.43) (end -8.89 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 077a19da-3ad7-4726-b81c-dde7cdcb133d))
-    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 3b4fa079-7cde-4d5e-9a8c-8d982e69ff83))
-    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp bb80d265-a92f-459d-bada-7ba2467774de))
-    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp c19ac18f-466c-4502-9211-5ebbba23f72e))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 38e11e72-2c0c-45d6-b143-168276f92dc1))
+    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 09c01304-0c82-4f3c-a2e5-05930bfad699))
+    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 1b05c966-4658-4ecb-914f-b88345284b41))
+    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 6826ef99-1a63-4b35-9b07-a6c89dad8bfe))
     (pad "1" thru_hole circle (at 0 0) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 67 "Net-(D59-K)") (pinfunction "1") (pintype "passive") (tstamp e615b391-976b-4b88-a2bf-99517bfe66e6))
+      (net 25 "unconnected-(SW63-Pad1)") (pinfunction "1") (pintype "passive+no_connect") (tstamp 4007b0fb-83f9-4550-a014-fa00e6049ac2))
     (pad "2" thru_hole circle (at -6.35 2.54) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 74 "Net-(J2-Pin_4)") (pinfunction "2") (pintype "passive") (tstamp 69f40459-f12b-45d4-980a-9e8fb6ffef95))
+      (net 26 "unconnected-(SW63-Pad2)") (pinfunction "2") (pintype "passive+no_connect") (tstamp b8c13024-71e6-44f6-bdc7-20126f2a2a90))
     (model "${KICAD6_3DMODEL_DIR}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3748,67 +3748,67 @@
   )
 
   (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (layer "F.Cu")
-    (tstamp c49cc9a3-f07f-4346-a9b8-36d1e226f77e)
-    (at 338.61375 197.32625)
+    (tstamp d670375c-565b-44f7-a17d-31d0d0a4c05d)
+    (at 252.57125 116.36375)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
     (property "Sheetname" "")
     (property "ki_description" "Push button switch, generic, two pins")
     (property "ki_keywords" "switch normally-open pushbutton push-button")
-    (path "/8d01b77e-79bc-4bfb-8322-4e49bb11768d")
+    (path "/ee230526-07fb-4ca1-a80f-07b85a14a5bd")
     (attr through_hole)
-    (fp_text reference "SW42" (at -2.54 -2.794) (layer "F.SilkS")
+    (fp_text reference "SW47" (at -2.54 -2.794) (layer "F.SilkS")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp bfd0d355-16cf-4a94-bb7b-b5a2e60738ad)
+      (tstamp 608754df-595e-4cb2-a1ba-c4dd1cdeb632)
     )
     (fp_text value "SW_Push" (at -2.54 12.954) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp a5b7c023-3aa2-48a0-a351-f101734efb61)
+      (tstamp c3bd6bd5-75e6-4dd4-9116-b2558ba820f9)
     )
     (fp_text user "${REFERENCE}" (at -2.54 -2.794) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 8e04a5d4-99e0-47ca-9aeb-29f8d36dfd64)
+      (tstamp 56884e6b-7cd6-4acf-9098-dbae8d66c876)
     )
     (fp_line (start -9.525 -1.905) (end 4.445 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp cdfaa1ab-6aa9-46d2-8f40-f8b250a849cf))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 213a08cd-8823-4908-bdf7-7099156bd8ed))
     (fp_line (start -9.525 12.065) (end -9.525 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp b46a9bfe-bbc4-4cd5-a8c0-94849c3f3220))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp e225559e-ef42-4cd4-916c-b12c104f8eca))
     (fp_line (start 4.445 -1.905) (end 4.445 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 78997f97-db71-499e-bc07-a25c51dd54d6))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp c91701f4-3407-4bf6-b3a3-350eef272247))
     (fp_line (start 4.445 12.065) (end -9.525 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 61a9aba7-9c46-468d-a19d-a165040335ac))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 69e52fa4-c36b-4e4e-8384-d59a87ef7ed5))
     (fp_line (start -12.065 -4.445) (end 6.985 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 05d38d13-615e-4611-b2c3-7b93ac60c195))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp b61d1596-3394-4ad8-b771-690f2f5201c0))
     (fp_line (start -12.065 14.605) (end -12.065 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp aa0603e6-6a57-42a0-ba05-c01686ab640d))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp a70ae43e-7dbb-4e7c-b4a3-07608d58b59c))
     (fp_line (start 6.985 -4.445) (end 6.985 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp ca349d27-2aca-4d91-8b69-991deaed8123))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp c5b4724a-a344-4f78-8d28-3abdf0c6aeeb))
     (fp_line (start 6.985 14.605) (end -12.065 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 43050faa-e629-438f-84e3-4d8455da50a6))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 893b5917-86ab-4ce1-bed9-4d1589190bd7))
     (fp_line (start -9.14 -1.52) (end 4.06 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp f20d2d1b-2e02-4f3e-9b8e-f3399d0ee5d7))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp fcda322f-d8a3-4e7d-ab08-2636144e41d8))
     (fp_line (start -9.14 11.68) (end -9.14 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 6b858561-0ae6-44e8-b993-7c4f34077f39))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 4f5fd072-46ef-4466-81f0-8a118de868b9))
     (fp_line (start 4.06 -1.52) (end 4.06 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 6252dd86-8021-461d-ad6b-4c8d3080c46a))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 99431dcf-2c72-45b6-b32d-9e8a03cd0bb4))
     (fp_line (start 4.06 11.68) (end -9.14 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 26fab402-537a-475f-bc64-d8c564ae9e2b))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 7499b40e-787a-4392-8fb6-9cc32d34ffee))
     (fp_line (start -8.89 -1.27) (end 3.81 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 348d21db-50cb-4b81-bb27-59c1297ba75a))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 4673a40a-148a-42e5-a768-053113f2608c))
     (fp_line (start -8.89 11.43) (end -8.89 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp c7a19467-c0cb-463b-9380-56a49e91bcd5))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp d0260dda-2350-4d40-8c4c-1f6eaf008322))
     (fp_line (start 3.81 -1.27) (end 3.81 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp cb1eccb4-8117-40b3-8789-4a96ad69ba16))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 2b2ce541-598e-433a-a249-34a17b22b75e))
     (fp_line (start 3.81 11.43) (end -8.89 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp b3cf3c55-1c4d-4096-8dbf-b5d9070c9282))
-    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 3449c5e0-e156-458f-a864-af107b466e2b))
-    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 9573cbb3-7f47-421c-a6bf-567b0bd18fe3))
-    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp cc203024-efbc-49e1-bf9a-24792ad5f28c))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 0c9ae4cd-cae2-488c-9641-ea074c069fc3))
+    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 2be0c3ab-ba1c-47e5-b6ce-a4f02750401d))
+    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 03eb5066-60ab-4d50-806a-f0e2d976cebf))
+    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 44f6d740-fbf0-418e-9a32-7b512cb68682))
     (pad "1" thru_hole circle (at 0 0) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 48 "Net-(D42-K)") (pinfunction "1") (pintype "passive") (tstamp 3bf707b3-cd71-42e2-a05e-e09e335ec334))
+      (net 69 "Net-(D47-A)") (pinfunction "1") (pintype "passive") (tstamp ba8c28b5-4aca-47f2-84da-02d75a13750b))
     (pad "2" thru_hole circle (at -6.35 2.54) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 72 "Net-(J2-Pin_2)") (pinfunction "2") (pintype "passive") (tstamp 5288ebdb-9968-455a-bc53-12cb729b5912))
+      (net 24 "Net-(J2-Pin_8)") (pinfunction "2") (pintype "passive") (tstamp a0625b97-252b-4af3-98bf-30ec4b96b4a3))
     (model "${KICAD6_3DMODEL_DIR}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3817,67 +3817,67 @@
   )
 
   (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (layer "F.Cu")
-    (tstamp c85f8e8e-804b-4642-8cad-dc8b95e535d5)
-    (at 190.97625 178.27625)
+    (tstamp d839a29a-2920-417f-af13-ad615c4b680f)
+    (at 214.47125 116.36375)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
     (property "Sheetname" "")
     (property "ki_description" "Push button switch, generic, two pins")
     (property "ki_keywords" "switch normally-open pushbutton push-button")
-    (path "/a0df2262-f209-4aed-aeab-0b741e16fd5b")
+    (path "/eb0f5624-a761-459b-a3c2-bb95c8029e2d")
     (attr through_hole)
-    (fp_text reference "SW51" (at -2.54 -2.794) (layer "F.SilkS")
+    (fp_text reference "SW15" (at -2.54 -2.794) (layer "F.SilkS")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 3c2e15da-8697-43ff-9cc1-65f722b0ebd7)
+      (tstamp 6d59ae64-3793-4a0a-9c07-7916ff8d1d19)
     )
     (fp_text value "SW_Push" (at -2.54 12.954) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 66b4d332-b962-48e2-9627-d91cd8bbacf7)
+      (tstamp 3407f4a4-7e8e-4477-99d5-de43588ddd66)
     )
     (fp_text user "${REFERENCE}" (at -2.54 -2.794) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 9a864a4c-e914-45ef-8350-a776ebf28bf1)
+      (tstamp 0c5d947b-f58f-4174-9815-12c0535ab1d3)
     )
     (fp_line (start -9.525 -1.905) (end 4.445 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 997b5607-1948-47f8-b75d-cf939948ee78))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp e9f21c50-bdc4-4876-858e-3508db3abc00))
     (fp_line (start -9.525 12.065) (end -9.525 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp a301a3d7-09bf-4c77-8b20-b1996a4c90f1))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 370ec630-6288-410e-9777-89e1b2b92b5f))
     (fp_line (start 4.445 -1.905) (end 4.445 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp c5fb9511-7178-426a-b168-17671252f84c))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 06b3b616-bcaa-4cc0-8dd1-48880428c4ec))
     (fp_line (start 4.445 12.065) (end -9.525 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp f9295c8c-8fdf-428d-9f52-33341d7dc37e))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp a39b2ee4-adcc-4b54-a246-2bcace43c3b5))
     (fp_line (start -12.065 -4.445) (end 6.985 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 18fd6e32-1884-41d2-b89b-ae2c0d0197ea))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 54558ac6-3019-4074-9e23-a4c0b2a38308))
     (fp_line (start -12.065 14.605) (end -12.065 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 3f043128-6bc1-493c-bc65-02269d7f14d5))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 1f4b6b37-0aff-4c9a-8632-44be789e58cf))
     (fp_line (start 6.985 -4.445) (end 6.985 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp a2fc6fa0-8238-452d-bba1-85e3d88d61cb))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp d9323526-a0f9-437b-9e45-1d87b0fcf4e6))
     (fp_line (start 6.985 14.605) (end -12.065 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 1ce5c6e8-f09c-425f-9c6b-40d5f2e90c0e))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp b19f873a-a01e-46f2-a288-e0862d9cfa1c))
     (fp_line (start -9.14 -1.52) (end 4.06 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 8aedc398-682c-438f-bdfb-bb76d57f8a84))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 3c1f4c53-b223-41a7-9dba-8edd7c04c981))
     (fp_line (start -9.14 11.68) (end -9.14 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 58225025-0f42-49a6-872c-b6fb641a6adc))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 6b178578-f240-4fcb-99e7-579ccb4ccfbf))
     (fp_line (start 4.06 -1.52) (end 4.06 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp ae6a4eec-568a-4b95-9fc0-f49663fd4452))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 295db24a-8a26-4b7b-8705-2c8cada2b0f4))
     (fp_line (start 4.06 11.68) (end -9.14 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 741a49f7-3657-4f66-b51a-9944dad33eed))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 08875c58-2a6f-4268-93f8-cd0282f394f3))
     (fp_line (start -8.89 -1.27) (end 3.81 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 160ada1b-f2e2-421c-b11c-fc1949c0f6c3))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp c1ed3c99-46b6-445f-b665-d843c791db5a))
     (fp_line (start -8.89 11.43) (end -8.89 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 3b0a5595-89bb-40bf-8779-61f45c42a9c1))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 26b29b93-2059-4cd9-a3bd-0b530c646fcf))
     (fp_line (start 3.81 -1.27) (end 3.81 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 8c190351-22ff-41b3-aae5-91085c0995c6))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 3613c53c-5d74-487d-a795-1fe80b821c8f))
     (fp_line (start 3.81 11.43) (end -8.89 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 2347ccce-ac0c-4966-ae7b-fa7bdee4270d))
-    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp c21c40a9-0ba6-452a-9057-b1a87cf7c854))
-    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 6ca9bc88-369d-423c-ad4d-02e35e922b56))
-    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 3fb992db-3171-44bf-b4e4-322a352cabb4))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 6011f211-b1b1-480b-838c-7c0b961a0ade))
+    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp dd1be21e-e877-4c46-8f6b-792709f11f1c))
+    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 756f84ad-92e4-4f93-ae2b-05b6ae23cbb6))
+    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 71bf0050-afdd-45b1-8d72-6217713ba9c8))
     (pad "1" thru_hole circle (at 0 0) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 58 "Net-(D51-K)") (pinfunction "1") (pintype "passive") (tstamp 4f550b1d-4d77-4b62-8b2e-2b252dacfaba))
+      (net 41 "Net-(D15-A)") (pinfunction "1") (pintype "passive") (tstamp 57153f59-6638-42ba-9f91-c7896b35b82c))
     (pad "2" thru_hole circle (at -6.35 2.54) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 73 "Net-(J2-Pin_3)") (pinfunction "2") (pintype "passive") (tstamp 864a867d-09a1-4d71-9f1d-c3879bdac35a))
+      (net 23 "Net-(J2-Pin_7)") (pinfunction "2") (pintype "passive") (tstamp a4a76795-9c43-4d5d-804d-3d7b9ac0874c))
     (model "${KICAD6_3DMODEL_DIR}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3886,67 +3886,67 @@
   )
 
   (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (layer "F.Cu")
-    (tstamp de2b2e95-be03-433e-bd06-bd9f33687bde)
-    (at 357.66375 121.12625)
+    (tstamp d9c85118-1964-4ecf-b29d-e60bfd3782ab)
+    (at 147.79625 97.31375)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
     (property "Sheetname" "")
     (property "ki_description" "Push button switch, generic, two pins")
     (property "ki_keywords" "switch normally-open pushbutton push-button")
-    (path "/e139d123-71d6-4e24-a415-f2ae39c8df80")
+    (path "/8d997587-7593-45cf-82e7-844d6d4af7ad")
     (attr through_hole)
-    (fp_text reference "SW10" (at -2.54 -2.794) (layer "F.SilkS")
+    (fp_text reference "SW4" (at -2.54 -2.794) (layer "F.SilkS")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 48b35bc8-6be6-4251-91c0-248d2c3e81fa)
+      (tstamp 9b63ab5a-f12c-4a80-bd17-3a0d3c2b7950)
     )
     (fp_text value "SW_Push" (at -2.54 12.954) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 2360f91f-0d94-43b8-821f-50301e27db7c)
+      (tstamp f63ad865-2888-453e-9800-79c1cd7f27c8)
     )
     (fp_text user "${REFERENCE}" (at -2.54 -2.794) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 6636cce7-74a2-48d0-8e7e-13a0e0851bf3)
+      (tstamp c80d9238-aca9-4e34-9821-a1b6b750d744)
     )
     (fp_line (start -9.525 -1.905) (end 4.445 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 34992175-6ff3-409c-bc99-2beb42a97385))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 6d006669-4559-4cb8-a926-a50f75a3b37b))
     (fp_line (start -9.525 12.065) (end -9.525 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 2ebe7778-6fb7-49a2-bb55-15695f7f4053))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 722b51c1-b2cb-4ad7-8278-8b81fc667134))
     (fp_line (start 4.445 -1.905) (end 4.445 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp f032ff40-f15e-4344-bb56-8a06d1743383))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp b1d69b9c-fd0b-4dcd-9ff5-47a7c3d424f5))
     (fp_line (start 4.445 12.065) (end -9.525 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 932aaf71-b198-461a-a5ce-5e84f8fe8e44))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 29128e2b-47ed-497c-8972-4651035dfc55))
     (fp_line (start -12.065 -4.445) (end 6.985 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp e369a6da-4cae-49d1-9e86-49b8f9796a2b))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 700a4528-3997-47cf-865e-93738d9773c9))
     (fp_line (start -12.065 14.605) (end -12.065 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp e920ace9-48f4-408c-8f24-cfcdbefb9707))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp d2cd3c49-77e9-4e2c-8ca3-35c4ff0e32bf))
     (fp_line (start 6.985 -4.445) (end 6.985 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp c1b5f28d-6455-4942-9768-ade182232d96))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 62851367-a42c-4fbf-b156-301858ba8511))
     (fp_line (start 6.985 14.605) (end -12.065 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 8f5ba8c9-489c-49ff-9b16-7814aa177381))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 73b5ba0c-1c96-46fd-acc1-b9ab1b0a1100))
     (fp_line (start -9.14 -1.52) (end 4.06 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp d147f378-75e5-46ca-900e-c3dcbeb676d5))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 27f634a8-cd45-44e9-b7a9-ace3039c6550))
     (fp_line (start -9.14 11.68) (end -9.14 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 7a9e3479-41cc-4c2e-a7ea-e67cb65acdff))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 86193999-d965-4425-a797-51da82771c01))
     (fp_line (start 4.06 -1.52) (end 4.06 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp ce87ba1c-19f0-47d5-ae10-4af6f9b9e6c3))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 01201ad3-f345-42c7-a712-8ae34fdb3aec))
     (fp_line (start 4.06 11.68) (end -9.14 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp b5064b4c-a606-4d9d-a253-250823a564d8))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 069d1a90-2ec3-483d-8f02-6878a27242be))
     (fp_line (start -8.89 -1.27) (end 3.81 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 41972707-8871-4b11-bcfb-733266d1003f))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 5680939d-145f-4801-a59e-b4b4ddd7aad1))
     (fp_line (start -8.89 11.43) (end -8.89 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 99d1013e-dd27-41b6-b29a-7b8c75f34e38))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 1aee78a3-29eb-45d0-a13f-e6f4ba732775))
     (fp_line (start 3.81 -1.27) (end 3.81 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 73a0b4be-31f6-4310-9f58-06bf389b5beb))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 64b65dad-2f1e-4ef4-bccd-050dc6904357))
     (fp_line (start 3.81 11.43) (end -8.89 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 854d5e64-01e9-4f08-a573-49c336a9cb83))
-    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 489a5707-b3fc-4d25-bdf0-97d392c6dd7b))
-    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp b2196a87-515a-4f40-b562-5b925b62f9ca))
-    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp c3f0d5c2-720b-4d43-b3a3-3c89880f1db7))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 8ccc8536-acb5-4029-aef9-ce79d385c418))
+    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp e56526fd-bda7-4ef6-9244-7aa22cb8b685))
+    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 42fdee26-578c-4ea8-87a6-94ac88c7fdbc))
+    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 163daef9-f8d7-4f77-a912-c951ff3f4ed7))
     (pad "1" thru_hole circle (at 0 0) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 12 "Net-(D10-K)") (pinfunction "1") (pintype "passive") (tstamp 6e2bb12b-3d5a-4ade-927d-ed14ee9cce4d))
+      (net 31 "Net-(D4-A)") (pinfunction "1") (pintype "passive") (tstamp 6747310b-75b2-474b-88e4-6d1bea5da0ab))
     (pad "2" thru_hole circle (at -6.35 2.54) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 72 "Net-(J2-Pin_2)") (pinfunction "2") (pintype "passive") (tstamp 2754b8e6-d892-4d3a-86dd-9220215eedef))
+      (net 20 "Net-(J2-Pin_4)") (pinfunction "2") (pintype "passive") (tstamp 643b4ce9-bb9e-4c86-8471-bba13e445975))
     (model "${KICAD6_3DMODEL_DIR}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3955,67 +3955,67 @@
   )
 
   (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (layer "F.Cu")
-    (tstamp dfbe277b-f1cf-4614-a7d2-3833c17f6646)
-    (at 338.61375 121.12625)
+    (tstamp d9f4d17d-fdbe-4aba-a0f0-911392a9b432)
+    (at 190.65875 154.46375)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
     (property "Sheetname" "")
     (property "ki_description" "Push button switch, generic, two pins")
     (property "ki_keywords" "switch normally-open pushbutton push-button")
-    (path "/a3883511-72b7-4b68-979b-50b08f15697a")
+    (path "/bb93e82b-f405-4fdc-a95d-00a5968d486b")
     (attr through_hole)
-    (fp_text reference "SW11" (at -2.54 -2.794) (layer "F.SilkS")
+    (fp_text reference "SW27" (at -2.54 -2.794) (layer "F.SilkS")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp a747c84f-bfd6-4e33-8571-e4c4c77b2e50)
+      (tstamp db0dc651-25ec-4bee-9f26-fbf85756fa69)
     )
     (fp_text value "SW_Push" (at -2.54 12.954) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 34fa2ee7-b120-489e-b9b8-cb5b2df65b27)
+      (tstamp 846899bb-0026-4838-9e03-f31745178464)
     )
     (fp_text user "${REFERENCE}" (at -2.54 -2.794) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp bc6872d9-8010-4edc-9e85-a61b66dac288)
+      (tstamp 84f75255-9f2a-4489-aa17-ba064d053026)
     )
     (fp_line (start -9.525 -1.905) (end 4.445 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp c8762abb-df6a-4765-86a6-5b34349aa4bb))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 6cb5ec9e-de7d-4130-9f72-242bf259b5d3))
     (fp_line (start -9.525 12.065) (end -9.525 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 1e94903e-6551-4146-9308-a3feb8acda4b))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 3bee46b1-67ff-480d-8e45-1af42e213eed))
     (fp_line (start 4.445 -1.905) (end 4.445 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp acbd5b67-3dbe-43cc-9532-43a0f28cd142))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 3343fa61-1d70-48fa-a8c8-ab44d3ff0387))
     (fp_line (start 4.445 12.065) (end -9.525 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp b23f79b9-b6a5-4abc-b7a1-31d3cb673907))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 713f8482-5ba9-42a7-a929-11ef3ea49753))
     (fp_line (start -12.065 -4.445) (end 6.985 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 7238c800-1780-41d2-962d-d615a2862ada))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 16614a08-3b7a-41fc-9776-4c97abf9c6ac))
     (fp_line (start -12.065 14.605) (end -12.065 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 7884991a-0b92-4480-be73-b5202aeb937b))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 22cfd2df-1d4b-4135-b4d4-b61d61d9b2f8))
     (fp_line (start 6.985 -4.445) (end 6.985 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 7a924f25-76fc-444d-9658-8772c9509671))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 38b23096-a1ab-4f00-8c4e-e659f4317942))
     (fp_line (start 6.985 14.605) (end -12.065 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 2f7237e7-0a77-4212-9085-9b7bc13dbb64))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 73b3e55e-a934-4f2b-90f6-84814a5b36b7))
     (fp_line (start -9.14 -1.52) (end 4.06 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp c995a634-353e-4056-ae1d-80dbcd0e5be9))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp bd6bea90-7c4e-4dc2-86b9-50db6b5bb667))
     (fp_line (start -9.14 11.68) (end -9.14 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 6d0a18ce-4f1c-4b48-9cca-1d6901268786))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp ae02e007-fde7-4996-8476-863bafc3dbb6))
     (fp_line (start 4.06 -1.52) (end 4.06 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 98e84df2-4770-432a-800e-6e7906aa69f0))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 1ef1dce8-0565-4219-907c-d404ac5ab21b))
     (fp_line (start 4.06 11.68) (end -9.14 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp da16a1cd-91a4-4028-bfff-c4024f6813ee))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 4805c191-6547-4a7f-9b02-4c006b2b430f))
     (fp_line (start -8.89 -1.27) (end 3.81 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 81c09a3a-fc18-4696-9efd-747b2aaa6d55))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 7f81cdc4-1f5a-438d-9153-fdf7c7f9f32a))
     (fp_line (start -8.89 11.43) (end -8.89 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 3edf75cd-96ce-4c65-a44a-9438aa8dba54))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 6de9cefc-f034-4b26-93d1-8ee674234c8b))
     (fp_line (start 3.81 -1.27) (end 3.81 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 19c761c3-e0da-4efc-98a9-cd702d4aa884))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp c3d0a271-113a-4157-9135-a0ca46ba2b6a))
     (fp_line (start 3.81 11.43) (end -8.89 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 32453055-b387-4250-b1c3-c3c84907b2f6))
-    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 5cc0b4d8-1e7b-4833-8250-9d63b902c09d))
-    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp e0b6b5a2-d4b6-4b09-aacb-2af8d710dbb6))
-    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 4e1be52c-4663-4e42-9b55-bdc767458bb2))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp ae65af40-b6b6-49ee-99b0-3c10678d82a3))
+    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp cbebd09d-b08e-4d96-bfd4-87e65640a92d))
+    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp f6907885-194e-4623-9b2e-b365041408e1))
+    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp da694ca9-6632-44ca-b06e-1bcc2c888f9a))
     (pad "1" thru_hole circle (at 0 0) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 13 "Net-(D11-K)") (pinfunction "1") (pintype "passive") (tstamp 07957793-3c46-4032-9f41-c8a2f37bd3bf))
+      (net 51 "Net-(D27-A)") (pinfunction "1") (pintype "passive") (tstamp 1ae5ea9b-9df3-4678-9c7e-8b808027a7e2))
     (pad "2" thru_hole circle (at -6.35 2.54) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 73 "Net-(J2-Pin_3)") (pinfunction "2") (pintype "passive") (tstamp 8ee06eb7-42ce-4de7-ab6d-23f6aaba4eee))
+      (net 19 "Net-(J2-Pin_3)") (pinfunction "2") (pintype "passive") (tstamp cb575e2c-0ada-4c91-94c6-ecc95f5b2845))
     (model "${KICAD6_3DMODEL_DIR}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -4023,69 +4023,69 @@
     )
   )
 
-  (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (layer "F.Cu")
-    (tstamp e21a9125-3c5b-43b6-b360-881af36a6d5e)
-    (at 295.75125 159.22625)
-    (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
-    (tags "Cherry MX keyswitch 1.00u PCB")
+  (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.25u_PCB" (layer "F.Cu")
+    (tstamp e8fa3dd9-0f0e-4d6c-a207-1faae2db6c20)
+    (at 140.6525 173.51375)
+    (descr "Cherry MX keyswitch, 1.25u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
+    (tags "Cherry MX keyswitch 1.25u PCB")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
     (property "Sheetname" "")
     (property "ki_description" "Push button switch, generic, two pins")
     (property "ki_keywords" "switch normally-open pushbutton push-button")
-    (path "/7e13fe0a-493e-4d1d-8d60-2b05dd71f696")
+    (path "/9e903890-7968-4134-88dc-04b94404eafe")
     (attr through_hole)
-    (fp_text reference "SW46" (at -2.54 -2.794) (layer "F.SilkS")
+    (fp_text reference "SW18" (at -2.54 -2.794) (layer "F.SilkS")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp beaa32b1-90f4-450a-b2c8-3e4a61011c21)
+      (tstamp 5c41e235-ce5f-4db0-a0ae-12ea3309bd2f)
     )
     (fp_text value "SW_Push" (at -2.54 12.954) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 2c53a73c-a075-4a8a-aac1-a41a3df9cdc1)
+      (tstamp aabfab5b-95f8-490e-8ef8-f5beb17ecb70)
     )
     (fp_text user "${REFERENCE}" (at -2.54 -2.794) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 6eb0c2c2-271e-4278-81c4-106a2f98db3f)
+      (tstamp 9dbe30b9-bee6-4f44-aa4e-cea2621259a5)
     )
     (fp_line (start -9.525 -1.905) (end 4.445 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 6b48bae8-dd34-4d55-a6ae-21d3729668d7))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 23be4717-1c30-411f-9eb5-e1049833f86c))
     (fp_line (start -9.525 12.065) (end -9.525 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 839f3639-5eb7-4231-851f-6197e06fe182))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 28c65f5d-1a59-4c5d-bc51-af3b6272a7fa))
     (fp_line (start 4.445 -1.905) (end 4.445 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 393a5119-d975-46ac-8540-26bde96d6c34))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 0f801820-7751-46ef-a6e0-66ecaf691b22))
     (fp_line (start 4.445 12.065) (end -9.525 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 231b8e6c-4bfd-4b11-b5ec-781a3cdfe6cf))
-    (fp_line (start -12.065 -4.445) (end 6.985 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 199b09a1-2e05-4c85-bb43-2fb4802426b4))
-    (fp_line (start -12.065 14.605) (end -12.065 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 3e00f275-d3c5-40a3-8722-2bea8ed65f7e))
-    (fp_line (start 6.985 -4.445) (end 6.985 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 48774e4b-882a-47c1-a1f2-447446ed492a))
-    (fp_line (start 6.985 14.605) (end -12.065 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 9a88e3c7-4923-418e-bdf3-df9743fc0095))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 12a3f212-76c3-415c-8398-35f64641dc9a))
+    (fp_line (start -14.44625 -4.445) (end 9.36625 -4.445)
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 6ac7c232-b6c8-464c-8a1e-09df5e2701d1))
+    (fp_line (start -14.44625 14.605) (end -14.44625 -4.445)
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 1bbfae22-167c-4b8b-87f8-ece0196801c1))
+    (fp_line (start 9.36625 -4.445) (end 9.36625 14.605)
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 9bcd056e-a45e-4f0f-b4ed-805e67892b87))
+    (fp_line (start 9.36625 14.605) (end -14.44625 14.605)
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 260c23ce-1ab3-4831-818f-a6ee8ed365d6))
     (fp_line (start -9.14 -1.52) (end 4.06 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 4c0a858b-9eba-43cb-9296-27f6ff62a1d9))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 22442393-e0cf-473f-8afa-832f4278bbc3))
     (fp_line (start -9.14 11.68) (end -9.14 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp da9cbdb0-af4d-4072-a003-28193c2856ee))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp a309bbf8-25aa-4085-82a2-f7c8055a085d))
     (fp_line (start 4.06 -1.52) (end 4.06 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 0a6ec8a4-3ed3-40cf-b3da-97282d924540))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp cba529e4-4f8c-4f55-9ab8-88374fdaf031))
     (fp_line (start 4.06 11.68) (end -9.14 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 43a7f30d-1d1d-4958-b715-620e1b8892c8))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 23f2249e-eec0-4641-a626-960b9076d67e))
     (fp_line (start -8.89 -1.27) (end 3.81 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 9c1b9d13-13cf-474a-ab46-4dbb887a80fe))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 527c8bc2-e00b-4fea-82b2-60e760418873))
     (fp_line (start -8.89 11.43) (end -8.89 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp f97899b9-ee14-4dda-bce0-b74e75d5a47c))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 61880dec-00e2-412e-b486-04b48401a9dc))
     (fp_line (start 3.81 -1.27) (end 3.81 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 214256b0-9d41-49fa-9696-9a781bbb41e8))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 8e2708a7-72b3-42de-a72e-85d5d5df8771))
     (fp_line (start 3.81 11.43) (end -8.89 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 52982d67-3046-4d1e-950e-be6cafac8635))
-    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp e9245d84-bd79-4b79-a3b8-340508cbb63d))
-    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 9b5394f1-cdc9-4c8c-bd10-99f6c35713fe))
-    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp bae708c7-7144-4749-a655-5909006e9dab))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 297544a5-6074-4f9b-ab8e-c0c9b1521f23))
+    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 7e86b8d0-8b79-46bb-afb8-899b73600f5d))
+    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp ed1cc6a8-6e20-4300-9431-65352f04e20a))
+    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 6bbe6de1-62ed-40fb-b4da-5127001c8638))
     (pad "1" thru_hole circle (at 0 0) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 52 "Net-(D46-K)") (pinfunction "1") (pintype "passive") (tstamp e84253d1-3313-46c3-ad8a-b3d8f919c4fe))
+      (net 43 "Net-(D18-A)") (pinfunction "1") (pintype "passive") (tstamp 6ff23b55-0bbb-4328-b944-5afca743440a))
     (pad "2" thru_hole circle (at -6.35 2.54) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 76 "Net-(J2-Pin_6)") (pinfunction "2") (pintype "passive") (tstamp 989129b6-6c2d-4da2-93ca-96c2504415fc))
-    (model "${KICAD6_3DMODEL_DIR}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl"
+      (net 18 "Net-(J2-Pin_2)") (pinfunction "2") (pintype "passive") (tstamp a6c2cc82-2962-41f3-8e93-bf218d6e2650))
+    (model "${KICAD6_3DMODEL_DIR}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.25u_PCB.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
       (rotate (xyz 0 0 0))
@@ -4093,67 +4093,67 @@
   )
 
   (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (layer "F.Cu")
-    (tstamp e66f9e51-387c-4eb3-a4a4-5e58b48d0574)
-    (at 329.08875 140.17625)
+    (tstamp ee0306a4-c88e-429e-937f-a0414b255ed7)
+    (at 128.74625 97.31375)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
     (property "Sheetname" "")
     (property "ki_description" "Push button switch, generic, two pins")
     (property "ki_keywords" "switch normally-open pushbutton push-button")
-    (path "/863aa541-5bce-4855-8092-11a31871b7dc")
+    (path "/57b9cdb2-871a-4a20-bddd-2256c28ee9a3")
     (attr through_hole)
-    (fp_text reference "SW28" (at -2.54 -2.794) (layer "F.SilkS")
+    (fp_text reference "SW3" (at -2.54 -2.794) (layer "F.SilkS")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp a47ee711-8b56-4310-8892-e3b9119a50a6)
+      (tstamp de0c6410-ab6b-4a83-83c9-354456662602)
     )
     (fp_text value "SW_Push" (at -2.54 12.954) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp a33defd9-83fa-46d4-9347-bc2bbae4f032)
+      (tstamp 5bc5b5e3-3179-4b5d-92a4-de894a83c399)
     )
     (fp_text user "${REFERENCE}" (at -2.54 -2.794) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp b36393d6-fcb8-4695-8636-cd1d5c3f71b4)
+      (tstamp 0bb04def-a9c8-4e7c-a70e-922987896aaa)
     )
     (fp_line (start -9.525 -1.905) (end 4.445 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 9ef1cb7a-e275-4c52-b1d2-33eb9e449cef))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 77be0d36-1561-4167-8df8-cfb027e8852d))
     (fp_line (start -9.525 12.065) (end -9.525 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 1c0ecded-f1f6-48bd-8afb-08507033849b))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp c762b12f-444e-4be3-bce5-0ad7e5f08ca7))
     (fp_line (start 4.445 -1.905) (end 4.445 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 6eec58ac-f6cb-4d39-b7c8-98d8e2129841))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 49fdfc04-3f76-4d89-a170-03bdc4672f65))
     (fp_line (start 4.445 12.065) (end -9.525 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 61e0d46b-814f-4217-acea-d4a7519541e7))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 09e863d1-a9b8-4180-9755-d1070dbddc3a))
     (fp_line (start -12.065 -4.445) (end 6.985 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp e6f365dc-b7fb-409e-b093-636d57651747))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 4a2d52ff-2e79-462c-9cda-4ba71e4d629b))
     (fp_line (start -12.065 14.605) (end -12.065 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 915937bb-478c-44a6-9a17-559b1ae4265a))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp db846465-6898-48ab-a409-314c00ee0beb))
     (fp_line (start 6.985 -4.445) (end 6.985 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 810ccd4c-66b8-4eed-97c0-6eb6802c2a2b))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp ddd139dc-0e99-490e-912c-72c90f6e1262))
     (fp_line (start 6.985 14.605) (end -12.065 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp a300c504-5639-458d-9af8-8a93a6a7753f))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 6a36b89a-96de-4a5e-bb5a-0645fa2b2111))
     (fp_line (start -9.14 -1.52) (end 4.06 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 27f1280a-22d3-4c36-9ccc-b2bd5125f7d9))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 86ee1050-8818-4fd4-bfea-d4ff6b72e87b))
     (fp_line (start -9.14 11.68) (end -9.14 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 6e1433c5-3742-4666-8543-f99a5894e7ab))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp a76f1c93-9c2d-4d7d-a9c5-006a452bd55d))
     (fp_line (start 4.06 -1.52) (end 4.06 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 7cab5e51-9ad1-4b23-b61a-644098b66b48))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 007f7dc8-0ca7-4f46-b508-956cd15f41a1))
     (fp_line (start 4.06 11.68) (end -9.14 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp e0df0568-5179-4985-9de1-626671f6dd47))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 346b5769-c9bc-49c0-9905-ec88b3a01d81))
     (fp_line (start -8.89 -1.27) (end 3.81 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp d4a05426-2115-4b86-aa4e-49bd34959082))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp e23250ba-ecc6-43e3-addb-d10dcbd990c6))
     (fp_line (start -8.89 11.43) (end -8.89 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp febccbe8-ba6b-493f-a508-b238fa0a4c91))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp fb2e6f88-5194-4c39-a8e5-65a6f933d9f2))
     (fp_line (start 3.81 -1.27) (end 3.81 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 840b5980-f45b-47fa-87a5-57a03d9394da))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 6e6cb09d-7c99-4ca3-a2b5-dcddffcfec5f))
     (fp_line (start 3.81 11.43) (end -8.89 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 802b4dbb-880d-44d8-9d66-91c1ea73c6dc))
-    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 23ad1e12-12a6-48b9-82b3-5a608b5e7620))
-    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 9a0fb1d6-59c6-427e-9c1b-5e6670da0d31))
-    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 9bcb721a-838f-4a68-b590-e38c4f4fa2a2))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 2e2d7a7e-0dec-4957-9b9f-2694be92d421))
+    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 7a50c605-1b07-4ce2-ad42-a7e226d61ae9))
+    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp e1303d99-64f8-463e-ac90-79e55802638b))
+    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 6e6b5547-ae68-4104-95dd-4db02c4d59bb))
     (pad "1" thru_hole circle (at 0 0) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 32 "Net-(D28-K)") (pinfunction "1") (pintype "passive") (tstamp 34390250-620d-418f-ba9e-f6f56302ae72))
+      (net 30 "Net-(D3-A)") (pinfunction "1") (pintype "passive") (tstamp daac18ca-0392-45ee-be0b-53fc7c2defb9))
     (pad "2" thru_hole circle (at -6.35 2.54) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 74 "Net-(J2-Pin_4)") (pinfunction "2") (pintype "passive") (tstamp 922ab401-30be-4397-bcee-3d03fc7f9ca4))
+      (net 19 "Net-(J2-Pin_3)") (pinfunction "2") (pintype "passive") (tstamp bdd234f0-85dc-418b-ad29-a27c954f5703))
     (model "${KICAD6_3DMODEL_DIR}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -4161,138 +4161,138 @@
     )
   )
 
-  (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (layer "F.Cu")
-    (tstamp e6e396d4-69df-40eb-9192-4b0a5b487e9f)
-    (at 224.31375 197.32625)
-    (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
-    (tags "Cherry MX keyswitch 1.00u PCB")
+  (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.75u_PCB" (layer "F.Cu")
+    (tstamp f2d642de-3fa3-40c7-b2cb-a97188d6f50f)
+    (at 350.2025 154.46375)
+    (descr "Cherry MX keyswitch, 1.75u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
+    (tags "Cherry MX keyswitch 1.75u PCB")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
     (property "Sheetname" "")
     (property "ki_description" "Push button switch, generic, two pins")
     (property "ki_keywords" "switch normally-open pushbutton push-button")
-    (path "/4fafeb0c-5360-40c8-a32c-2b55f2fad38d")
+    (path "/d9b38236-426d-43c9-9877-14be994b5e1e")
     (attr through_hole)
-    (fp_text reference "SW57" (at -2.54 -2.794) (layer "F.SilkS")
+    (fp_text reference "SW40" (at -2.54 -2.794) (layer "F.SilkS")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp a98a2f72-608d-47c5-9870-b6126ef0f1e4)
+      (tstamp 379d0400-b6f9-4486-a570-5c49410e95ae)
     )
     (fp_text value "SW_Push" (at -2.54 12.954) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 88281a77-189e-478d-8eaf-78c2e078d8c7)
+      (tstamp 0014a471-7965-49ee-a5d3-bde862c5ef1f)
     )
     (fp_text user "${REFERENCE}" (at -2.54 -2.794) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 2945d8be-114b-411d-bf1c-73cb6cbdef2d)
+      (tstamp 7fd2d76f-9982-41d5-ad5e-344523bba979)
     )
     (fp_line (start -9.525 -1.905) (end 4.445 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 2abd8c3f-5729-47af-9990-0fdbdd8595f2))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 6b8b7dbd-9997-4067-a94b-2db8ae5f430a))
     (fp_line (start -9.525 12.065) (end -9.525 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 8b629aa0-bf7d-4a56-ba6a-1e9c298d0488))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp fe8e45f9-8044-4e63-bbec-c5a31840991b))
     (fp_line (start 4.445 -1.905) (end 4.445 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 2716c971-62ea-4aa9-84e0-1f9f83ede068))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp e8c70aef-088e-4a40-b01f-6f0a1a620619))
     (fp_line (start 4.445 12.065) (end -9.525 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp f2fef3c3-d82e-4868-86bc-a4e42bb30bd0))
-    (fp_line (start -12.065 -4.445) (end 6.985 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 6fad9955-2d36-4a8c-b0dc-9031e77abc06))
-    (fp_line (start -12.065 14.605) (end -12.065 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 12799fd9-31bb-4d85-9ac3-4b3f9afefa6e))
-    (fp_line (start 6.985 -4.445) (end 6.985 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp ef7fc1cd-d372-4347-808f-36b00331c7c5))
-    (fp_line (start 6.985 14.605) (end -12.065 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 69fd2faa-45aa-4e6f-a0e2-7c0e9ad98936))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp a005a9e0-5ddc-4ea5-8a96-aa523fda5536))
+    (fp_line (start -19.20875 -4.445) (end 14.12875 -4.445)
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp d95f9ff0-56c7-498b-ad88-dd13df690c5d))
+    (fp_line (start -19.20875 14.605) (end -19.20875 -4.445)
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 4bcb89cf-1cc9-4719-953f-00e4965cdd35))
+    (fp_line (start 14.12875 -4.445) (end 14.12875 14.605)
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp ce9e7df7-fdeb-48cd-a1f3-80fa485f7bdd))
+    (fp_line (start 14.12875 14.605) (end -19.20875 14.605)
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 7a888538-4ac6-4edc-a681-6abe5ab7eed0))
     (fp_line (start -9.14 -1.52) (end 4.06 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 487af4ca-3775-4e2b-a7f8-78ea4a10a18e))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 5ca3d9e3-f47a-40e4-adf1-4a750a116f3f))
     (fp_line (start -9.14 11.68) (end -9.14 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 95a66566-73cd-47e5-af4a-53cb26aea2c1))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 9110fcbe-b204-4050-b82a-886099a8db8b))
     (fp_line (start 4.06 -1.52) (end 4.06 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 66fb6ca5-8c2c-4dfd-a301-b786f4dbf563))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp f34160fa-9328-4478-ba34-32310f092f35))
     (fp_line (start 4.06 11.68) (end -9.14 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 1ab49a2c-0999-4204-ba98-bf907d7ebd30))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp febc9b53-ae5f-4daa-b660-af3f6a13d18d))
     (fp_line (start -8.89 -1.27) (end 3.81 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 21d5a2cb-0697-49e3-a059-e1993166bf1a))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 2e955880-14d9-4cb7-bb40-150ffab007a5))
     (fp_line (start -8.89 11.43) (end -8.89 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 18827de1-c8da-4a82-aaae-57e749d77888))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 71ae536e-f981-481d-a3f1-e356e1d657d0))
     (fp_line (start 3.81 -1.27) (end 3.81 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 1e0f619d-5fc3-4500-a7ae-11ae781434d3))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 81f8e066-8071-443d-b416-2cedefeadd9b))
     (fp_line (start 3.81 11.43) (end -8.89 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp c73f3ff2-c95d-4e08-9dc0-f8387c71e2df))
-    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 18230724-62af-44f3-9435-67d798372943))
-    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp ca795eba-b92c-425e-ade3-b1924d979c41))
-    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp c7275e25-f3a3-481f-b73f-52c8983fa3a7))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 5c4006dd-a502-408a-8129-7b9ebb3130e7))
+    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 887c5486-48a7-4a9e-a9ab-82cddbbe055f))
+    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 9dc21bd0-d542-4bab-8496-a158a33781c3))
+    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp f1d4021d-c5ff-4b41-9f8b-a524581b7b29))
     (pad "1" thru_hole circle (at 0 0) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 65 "Net-(D57-K)") (pinfunction "1") (pintype "passive") (tstamp 408f0dc4-81a9-477f-ab07-7fc2dc6b3643))
+      (net 63 "Net-(D40-A)") (pinfunction "1") (pintype "passive") (tstamp fa9c55e1-fd77-4aaa-b09d-2c0b9fd1d345))
     (pad "2" thru_hole circle (at -6.35 2.54) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 72 "Net-(J2-Pin_2)") (pinfunction "2") (pintype "passive") (tstamp edc5adf5-6c41-485e-97cd-eb0a648c437b))
-    (model "${KICAD6_3DMODEL_DIR}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl"
+      (net 17 "Net-(J2-Pin_1)") (pinfunction "2") (pintype "passive") (tstamp 05f16054-75df-4183-901f-4965f6b80414))
+    (model "${KICAD6_3DMODEL_DIR}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.75u_PCB.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
       (rotate (xyz 0 0 0))
     )
   )
 
-  (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.25u_PCB" (layer "F.Cu")
-    (tstamp ed453a27-c643-4eb1-996c-7e29af8eb4ff)
-    (at 164.7825 197.32625)
-    (descr "Cherry MX keyswitch, 1.25u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
-    (tags "Cherry MX keyswitch 1.25u PCB")
+  (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (layer "F.Cu")
+    (tstamp f2e42b4f-ccc0-46c3-bd2e-baecda7dc23b)
+    (at 338.29625 97.31375)
+    (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
+    (tags "Cherry MX keyswitch 1.00u PCB")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
     (property "Sheetname" "")
     (property "ki_description" "Push button switch, generic, two pins")
     (property "ki_keywords" "switch normally-open pushbutton push-button")
-    (path "/1ac3c60a-fc64-4c31-b525-903c742a0471")
+    (path "/05d6f603-f320-4a01-94d6-1956e06846f0")
     (attr through_hole)
-    (fp_text reference "SW49" (at -2.54 -2.794) (layer "F.SilkS")
+    (fp_text reference "SW34" (at -2.54 -2.794) (layer "F.SilkS")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 08ed3115-1fab-4f42-9627-5b8fafa585e9)
+      (tstamp 13ef2160-3320-4730-8c65-094766ad8adc)
     )
     (fp_text value "SW_Push" (at -2.54 12.954) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp c60b3272-6232-423e-9dd4-e24e01774277)
+      (tstamp a7fc5d3d-bd2e-4822-97fc-105d862cca62)
     )
     (fp_text user "${REFERENCE}" (at -2.54 -2.794) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 14df1bcb-75e8-4ea4-8264-c5d3d2a92eeb)
+      (tstamp 0e1f13f8-a346-4890-a275-57be3bb41340)
     )
     (fp_line (start -9.525 -1.905) (end 4.445 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp b207fe4d-2122-4d7a-b347-a6124fee3612))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp d8299cf4-d1d4-487d-8fd8-4a4a4e570519))
     (fp_line (start -9.525 12.065) (end -9.525 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 17129b3c-f39b-49ad-947a-8d447674d751))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 1d73fc21-fe63-475a-beff-fa6f8a294a27))
     (fp_line (start 4.445 -1.905) (end 4.445 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 4ace860f-3478-4529-a09f-58d343e97346))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp b0665cbf-84b6-4aa1-a65b-74ac9f452770))
     (fp_line (start 4.445 12.065) (end -9.525 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp a5441bca-3d1c-47c1-b551-bc70d5b29cb9))
-    (fp_line (start -14.44625 -4.445) (end 9.36625 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp e0fe2ef4-344e-4426-b3a1-f6ae28aba2b8))
-    (fp_line (start -14.44625 14.605) (end -14.44625 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp a608d4ee-0be7-4565-8108-d366263ee3d0))
-    (fp_line (start 9.36625 -4.445) (end 9.36625 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp abac375f-e1c4-497a-99d1-1e222b20e96d))
-    (fp_line (start 9.36625 14.605) (end -14.44625 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 7197452d-c1ef-4c85-a69b-ca68aaab551f))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 73c66c16-e563-4167-9d95-42f9703cfbdd))
+    (fp_line (start -12.065 -4.445) (end 6.985 -4.445)
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 48378bf6-622e-4976-8791-8a8c5b611f73))
+    (fp_line (start -12.065 14.605) (end -12.065 -4.445)
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 266b2176-288b-4445-aa3a-1b2bcfe14e24))
+    (fp_line (start 6.985 -4.445) (end 6.985 14.605)
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 937ece57-a96c-4427-9fbd-a622c59a48ad))
+    (fp_line (start 6.985 14.605) (end -12.065 14.605)
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp ec734607-ae79-47b7-a4ea-c585510f8db7))
     (fp_line (start -9.14 -1.52) (end 4.06 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 6c40048b-56cb-49b7-9501-41290d26afe0))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 5bba903c-2b74-4306-a8c4-052f9be2edc6))
     (fp_line (start -9.14 11.68) (end -9.14 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 22a3ada2-220e-4484-8e3b-5245436daee0))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 1ccc4ef0-a670-4164-856d-6afdeb88e020))
     (fp_line (start 4.06 -1.52) (end 4.06 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp f0302790-2ef4-48c5-b71e-44a25e165e75))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 28a9b3f5-c660-4c18-bb20-9f5da6048cab))
     (fp_line (start 4.06 11.68) (end -9.14 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 45781758-23b1-4c93-8ec4-32f200b26f9e))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 44db99a3-7ee2-4331-a89b-b3f606e4f759))
     (fp_line (start -8.89 -1.27) (end 3.81 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 4f55a319-05a9-42ad-acd2-0d824ef02b3c))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp d8941c36-5485-496d-963a-5a0c75557bfa))
     (fp_line (start -8.89 11.43) (end -8.89 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 970ffc64-adc9-4adc-9b38-3b5ce5981397))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 9e91d1d3-ac1f-4530-8209-dbd016e1193e))
     (fp_line (start 3.81 -1.27) (end 3.81 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 6f36ada8-b756-43d8-878a-8d0458348789))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 7cfb71b5-6d8d-4d1d-9978-91c17122dc40))
     (fp_line (start 3.81 11.43) (end -8.89 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 704bf023-3e68-4c7f-a004-02c19b44d2c3))
-    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 3e21113d-da8a-485e-8267-835953b87029))
-    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp ba9a25a8-5cef-41c1-b6ec-0b66b74007bc))
-    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp a5ff86cb-1122-4f4f-b85b-942730485048))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp bfae4457-9477-4d97-b7b3-290ad2dede42))
+    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp e0620c04-bb10-41c2-9054-a43472760755))
+    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp c9cfba4e-49c5-4221-b989-bc4b0a5d6a34))
+    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp c53a0e58-6006-4dc3-a982-b71098192da5))
     (pad "1" thru_hole circle (at 0 0) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 55 "Net-(D49-K)") (pinfunction "1") (pintype "passive") (tstamp d918b64a-98f6-4193-8553-23c5d32198e5))
+      (net 57 "Net-(D34-A)") (pinfunction "1") (pintype "passive") (tstamp 7edfb074-1e36-4a9d-9469-8b68ffc02956))
     (pad "2" thru_hole circle (at -6.35 2.54) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 71 "Net-(J2-Pin_1)") (pinfunction "2") (pintype "passive") (tstamp ea507fa5-c603-4ea9-a07d-08b6a9bf6487))
-    (model "${KICAD6_3DMODEL_DIR}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.25u_PCB.wrl"
+      (net 19 "Net-(J2-Pin_3)") (pinfunction "2") (pintype "passive") (tstamp 3bb691bd-bec1-4dc3-9516-5b0a4e2b5c62))
+    (model "${KICAD6_3DMODEL_DIR}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
       (rotate (xyz 0 0 0))
@@ -4300,67 +4300,67 @@
   )
 
   (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (layer "F.Cu")
-    (tstamp f4b8daec-193e-4a87-a68c-bbf719c586db)
-    (at 219.55125 159.22625)
+    (tstamp f32aaf1c-67c4-44ff-b533-a649d7b7439c)
+    (at 219.23375 135.41375)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
     (property "Sheetname" "")
     (property "ki_description" "Push button switch, generic, two pins")
     (property "ki_keywords" "switch normally-open pushbutton push-button")
-    (path "/fbad6430-ddca-4d01-94bd-06efde5263c4")
+    (path "/dd5fe8ac-f424-4618-80be-059a11b3b3e2")
     (attr through_hole)
-    (fp_text reference "SW39" (at -2.54 -2.794) (layer "F.SilkS")
+    (fp_text reference "SW23" (at -2.54 -2.794) (layer "F.SilkS")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 4eb4309c-1b43-42d9-84ec-4897c78400cc)
+      (tstamp 1b24feb1-ffce-44a7-a95d-aa9eac37a26f)
     )
     (fp_text value "SW_Push" (at -2.54 12.954) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp df6fbae0-8f5d-44ab-a8e0-f12f221a12b5)
+      (tstamp f502faf8-217f-4093-8ccf-bba5914659b7)
     )
     (fp_text user "${REFERENCE}" (at -2.54 -2.794) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 0e2a1461-47b7-4d15-86a9-d9c0e5f9ed93)
+      (tstamp e14508e3-d097-4ca4-b95e-c4e9da5cfe47)
     )
     (fp_line (start -9.525 -1.905) (end 4.445 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 7bc9dd02-94f6-440f-945d-c3dbf9d9b1c7))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 1cc78e65-1638-446f-ab46-ebc5d78d7c49))
     (fp_line (start -9.525 12.065) (end -9.525 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 6cbe630b-4c63-4b8c-8512-7a17b6b388cd))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp d2502f18-3d71-4ce8-be28-28515798114b))
     (fp_line (start 4.445 -1.905) (end 4.445 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp ce3a8419-b42b-40ae-9f60-f567f3cab9f3))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 163d0f59-d7d8-4bd3-8e19-d1ee2eae0ae9))
     (fp_line (start 4.445 12.065) (end -9.525 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp f5412c9b-dbde-4393-bb78-e6977fc453a0))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp d0eb1344-44db-4276-95a6-7bf7da7f997d))
     (fp_line (start -12.065 -4.445) (end 6.985 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp e41fa607-424b-441b-b1cd-647da78956fb))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp ddd8ca44-e2a0-43da-b05b-c5f491c0c0ce))
     (fp_line (start -12.065 14.605) (end -12.065 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp aaecc468-11ff-4664-b5db-8c35f369b4a4))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 0aab0827-a164-43f5-a791-ae644379bafe))
     (fp_line (start 6.985 -4.445) (end 6.985 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp af07466c-7593-4951-8b9e-0bf9edbe7511))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 9e05c50e-1254-488a-8815-2fed97b61564))
     (fp_line (start 6.985 14.605) (end -12.065 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp ae9de794-3c1f-47a7-8ff4-431de382954e))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 281f4292-8171-43b0-a68b-f51b6dc83d3f))
     (fp_line (start -9.14 -1.52) (end 4.06 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 6bec4558-bf61-4e9d-9fd3-dba53f4bb442))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp d9ca8746-2eba-49ae-8423-400f4c0d9dfb))
     (fp_line (start -9.14 11.68) (end -9.14 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 973e4200-2324-44f2-85c8-1772af17d943))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 6d7d1881-733e-46c5-98fc-b5d481894636))
     (fp_line (start 4.06 -1.52) (end 4.06 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp f1b20a3a-55a4-4d82-9306-a5abdb6e85a0))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 9209640c-e7b8-442e-b0a4-f229b6856fb9))
     (fp_line (start 4.06 11.68) (end -9.14 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp a89f4c9c-a014-46a5-a23d-dd79e35c785f))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 55abaa35-1bb0-4268-ba90-6b7f04c0c9ef))
     (fp_line (start -8.89 -1.27) (end 3.81 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp f1bc7265-2215-4a4b-b2da-ac0aceb2bc6f))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 5cd7afd5-3b46-4098-9487-842a49001d4b))
     (fp_line (start -8.89 11.43) (end -8.89 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 304d99c1-f53e-498f-be78-cda47cf2f1a3))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 19b7dff1-46e1-4976-b5c8-5614a28f4333))
     (fp_line (start 3.81 -1.27) (end 3.81 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 286abc77-ec11-4d59-baca-0c521342549c))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 7cf94547-4b16-4285-8e61-4f861172f1b9))
     (fp_line (start 3.81 11.43) (end -8.89 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp a7e5bf70-5417-4295-ae77-c30b14b95f4e))
-    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp e1cc3753-35ca-473e-9ed9-fe1b3246b561))
-    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp e012ff10-3e44-4b6f-9ea6-809935599bdd))
-    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 11288314-a3f8-4c5b-b76b-88f7f3b5bfaf))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 9696e71a-65d8-458e-833f-91306b07255b))
+    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp c4ce7888-f0e4-483e-bede-82e70b9d39df))
+    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 23b7da3e-ae34-4959-b4d7-7c74ac99f7fe))
+    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp dd0b6bb8-0fe5-4ff1-b1f6-26d2d3d28475))
     (pad "1" thru_hole circle (at 0 0) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 44 "Net-(D39-K)") (pinfunction "1") (pintype "passive") (tstamp c7068b54-c7bd-4b0d-b7c2-57c21556fe35))
+      (net 48 "Net-(D23-A)") (pinfunction "1") (pintype "passive") (tstamp 03e95deb-7fc4-40a9-843b-c0b8b9b02deb))
     (pad "2" thru_hole circle (at -6.35 2.54) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 77 "Net-(J2-Pin_7)") (pinfunction "2") (pintype "passive") (tstamp 7822e9b4-7270-4517-81d0-3ca81d10e9c4))
+      (net 23 "Net-(J2-Pin_7)") (pinfunction "2") (pintype "passive") (tstamp fd0d3bcf-c66c-4bb5-b0d4-f66ca6bc74f2))
     (model "${KICAD6_3DMODEL_DIR}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -4369,67 +4369,67 @@
   )
 
   (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (layer "F.Cu")
-    (tstamp f5d0fd01-1a51-4cd5-8281-3d2e8a4e0600)
-    (at 138.58875 140.17625)
+    (tstamp f84a0836-1e5b-47c3-8626-c8017e2e78e1)
+    (at 162.08375 135.41375)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
     (property "Sheetname" "")
     (property "ki_description" "Push button switch, generic, two pins")
     (property "ki_keywords" "switch normally-open pushbutton push-button")
-    (path "/1610e140-d854-4cad-bb97-f99ad8968acd")
+    (path "/748af136-b543-4a91-a075-02c17dd4e555")
     (attr through_hole)
-    (fp_text reference "SW19" (at -2.54 -2.794) (layer "F.SilkS")
+    (fp_text reference "SW20" (at -2.54 -2.794) (layer "F.SilkS")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 5df95359-f1fa-4b8d-baa3-3697cb64f3f9)
+      (tstamp 560aa9b8-5eb2-4e7d-807e-542b27390964)
     )
     (fp_text value "SW_Push" (at -2.54 12.954) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp f1b747bd-6e81-484d-a77f-a45595e097c3)
+      (tstamp bb59cb1c-ae5f-4e82-8235-f81066108ceb)
     )
     (fp_text user "${REFERENCE}" (at -2.54 -2.794) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp e2fe6c95-1162-4c63-816d-a60b72838b8f)
+      (tstamp 38d8c71a-d66d-468d-8641-b4953c34dc20)
     )
     (fp_line (start -9.525 -1.905) (end 4.445 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp afef3f3b-7098-424c-866b-79979494f131))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp d16ee73b-2307-456c-8769-92d52c6414ee))
     (fp_line (start -9.525 12.065) (end -9.525 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 0bdb8f9d-4f62-460b-98f6-c69d88850b76))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp f49c0d9d-bc34-4d1c-83eb-9190cb4afa9a))
     (fp_line (start 4.445 -1.905) (end 4.445 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp f13e4d10-f11b-4d61-9703-d16d3789bbcf))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp df9a0bfc-c8d4-4ea2-b2db-5b5edbfd98da))
     (fp_line (start 4.445 12.065) (end -9.525 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 125f173c-e035-41b7-bfb2-2884dd52276b))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 0781725f-cbda-4f3c-b88e-49068792d797))
     (fp_line (start -12.065 -4.445) (end 6.985 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 0384eca7-f238-4da4-b07e-5b02941a46a1))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp fdaa1f4e-d716-484b-8b8f-e1d89235e80d))
     (fp_line (start -12.065 14.605) (end -12.065 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp a167e487-7ca3-4635-bf63-650247d4b875))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 1f0ff198-83b7-4d4e-8e6e-99f061d006b4))
     (fp_line (start 6.985 -4.445) (end 6.985 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 4abdab4c-60ce-4ca1-bd62-af5424151ffc))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 03e2d1bd-b636-410b-8089-4824e25578c1))
     (fp_line (start 6.985 14.605) (end -12.065 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 94618e7f-8ca1-41e7-a590-dad4718452e4))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 2a4d8951-8a82-4976-bfac-cde0761d44f5))
     (fp_line (start -9.14 -1.52) (end 4.06 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp bb9b6e6c-0fa7-4266-ba89-c331ded3abc5))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp f1a3fcd4-ac07-4e7b-a6f6-40a2acaf4ed8))
     (fp_line (start -9.14 11.68) (end -9.14 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 248c2d56-cb79-4a2a-94b4-745fc0202da1))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp eac6b271-e266-4cf0-a55c-086009e84f92))
     (fp_line (start 4.06 -1.52) (end 4.06 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 065807d5-627c-4de3-a4ad-a651189190c6))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp b867e922-f9cd-4a8d-851a-8e4cf8da92fb))
     (fp_line (start 4.06 11.68) (end -9.14 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 1a1338e6-3fa4-4a8a-be21-e08278e46500))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 5afe0a04-a313-4105-b100-0a28bcac8729))
     (fp_line (start -8.89 -1.27) (end 3.81 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 87f85c21-2b7f-41c8-9fc8-06bf13730d1c))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp e687793b-f1a1-4a89-b34f-cf3a304f8b5e))
     (fp_line (start -8.89 11.43) (end -8.89 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp da73a342-f592-4caf-957b-82ae7eb20a94))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 57f13da8-f436-46f8-91ba-e41c60ea1b1c))
     (fp_line (start 3.81 -1.27) (end 3.81 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp db11f2e0-d215-432f-a0f8-fad6ab725390))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 90813933-1d9d-43d4-9ae8-fa8d18ebec40))
     (fp_line (start 3.81 11.43) (end -8.89 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp a15e13d1-99a9-408c-bd9e-43b5ee34b5eb))
-    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp fbad7d06-4aba-43b4-98cf-bd73d383e3e3))
-    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp ebe436d2-6f1e-460c-b771-b5f57bf8418d))
-    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 17b47710-978c-4224-a8c0-0016cc5ec0f8))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 8f747b63-5458-4c97-97ed-d05ab693dadd))
+    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp f722ae9c-242f-4fe8-accc-083d443c234b))
+    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 7666be41-7833-47ee-80e7-90825bf65ca9))
+    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 0597cfb6-be86-45e2-b9b2-cdbb1230e85c))
     (pad "1" thru_hole circle (at 0 0) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 22 "Net-(D19-K)") (pinfunction "1") (pintype "passive") (tstamp ddee3a21-3faf-483d-a97d-377475170f6a))
+      (net 45 "Net-(D20-A)") (pinfunction "1") (pintype "passive") (tstamp d6813791-d11f-41ec-b18c-75d94709e80a))
     (pad "2" thru_hole circle (at -6.35 2.54) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 73 "Net-(J2-Pin_3)") (pinfunction "2") (pintype "passive") (tstamp 00a55578-48df-48e2-9c7b-934421bfee7a))
+      (net 20 "Net-(J2-Pin_4)") (pinfunction "2") (pintype "passive") (tstamp 97b8cd24-28a7-417e-8cee-6dd698f6d6cb))
     (model "${KICAD6_3DMODEL_DIR}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -4438,67 +4438,67 @@
   )
 
   (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (layer "F.Cu")
-    (tstamp f8897f9c-bcfa-47c4-bfc9-f9e512779020)
-    (at 195.73875 140.17625)
+    (tstamp fcd92c8b-5f1e-4be3-91d9-ff192e208d3b)
+    (at 200.18375 135.41375)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
     (property "Sheetname" "")
     (property "ki_description" "Push button switch, generic, two pins")
     (property "ki_keywords" "switch normally-open pushbutton push-button")
-    (path "/3cf46e9e-7507-48f6-9bd6-24957b52476d")
+    (path "/3153e61b-c8ea-4705-83a1-5cca43126c63")
     (attr through_hole)
     (fp_text reference "SW22" (at -2.54 -2.794) (layer "F.SilkS")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 1511a77d-63cb-4723-a24f-8661d7e825b3)
+      (tstamp 4e74c27f-4b10-4747-8431-216b807d296a)
     )
     (fp_text value "SW_Push" (at -2.54 12.954) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 6599823b-af1f-4eab-8ea3-fd6011501d16)
+      (tstamp caebed33-544f-4213-a5d1-f0880865c796)
     )
     (fp_text user "${REFERENCE}" (at -2.54 -2.794) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 09cde8d5-cda5-46a5-9d61-c8802b5ec6ab)
+      (tstamp fefd0412-926f-4927-9d92-e66df7628bbd)
     )
     (fp_line (start -9.525 -1.905) (end 4.445 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp cb81352a-41aa-4a3c-b602-de23c972d0bf))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp b3cf54e4-3613-4c93-9a14-63a472e9c0bb))
     (fp_line (start -9.525 12.065) (end -9.525 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 16bda8e8-3e7a-4d8d-8777-9076611f9541))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 16b9ccea-80cb-4fe7-b32d-f1daf908524f))
     (fp_line (start 4.445 -1.905) (end 4.445 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp e6a20058-833f-45d2-bc41-2fbccf719a99))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp ddf97a40-1251-4299-98ed-e5128d0a5237))
     (fp_line (start 4.445 12.065) (end -9.525 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 0eef0254-41de-4c49-a17c-43ad14b2891f))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp e6ebb9d4-cbf6-48df-993b-804baa92fec0))
     (fp_line (start -12.065 -4.445) (end 6.985 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp cb2702f0-a374-498d-a451-37b06c1f4e56))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 0d179ee4-52e1-4975-a446-1419b4549221))
     (fp_line (start -12.065 14.605) (end -12.065 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 6183e4ef-d69a-41f3-91ec-0b7b952231fc))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 8ee5f745-c2ce-4de0-9a3f-36b79933914c))
     (fp_line (start 6.985 -4.445) (end 6.985 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 1946c12f-76eb-4dc7-bfa8-db2ffe68cfad))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp c5a30ec9-fb0a-4046-85c9-0e62d0d86555))
     (fp_line (start 6.985 14.605) (end -12.065 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 32e06c3e-b80d-4958-b399-383ecccabdcb))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp cebdf67a-e7db-4bcc-b4fa-6726e4fa2cc2))
     (fp_line (start -9.14 -1.52) (end 4.06 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp e1c779f2-7d5d-4675-88f0-cc718d97db09))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 50d30bd3-5c4b-43a2-b603-5babaf0b20f0))
     (fp_line (start -9.14 11.68) (end -9.14 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp b7179f02-cc6a-47a2-9b27-d702991154db))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp ea19b493-f297-468b-966b-4a8a786686e0))
     (fp_line (start 4.06 -1.52) (end 4.06 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 8acbf4a8-4dd0-4f3c-adec-41f080716ce3))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp acf97a2f-e8a1-42e0-ba2e-39e55e30e9cf))
     (fp_line (start 4.06 11.68) (end -9.14 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 0d27e6be-8495-454f-b996-bdb49794aa73))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 5f0c7991-0429-43a8-85af-b511a08183c8))
     (fp_line (start -8.89 -1.27) (end 3.81 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 024a8e07-b911-4017-8b3b-7988dc07eb7f))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 9027c30b-2c1a-4f56-a1ef-cca5a3a665c0))
     (fp_line (start -8.89 11.43) (end -8.89 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 279864dc-1b99-4c9b-ad1a-c6f6e740fe89))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp ca361eaf-7fe6-45e9-a3bc-e1268f267ef1))
     (fp_line (start 3.81 -1.27) (end 3.81 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 5804eb79-f4c9-45ea-ba18-cc4bf3051a7a))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 51f0a073-2f49-4b19-8b68-7fb9fe0a37ab))
     (fp_line (start 3.81 11.43) (end -8.89 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 6c0a4779-cdab-42fc-821d-794ad7f99c72))
-    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp dcd8d906-4c65-4418-a08b-cb92df0c8a10))
-    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp d6cb3e65-0a18-4109-ad5a-6adc6510bfae))
-    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp e0bbeccd-287d-46bd-a8d8-4d8f0c76ffd6))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 5f6ea92b-2d9a-4890-a3da-622d26d9c902))
+    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 43e3f929-6dee-43a0-bb5f-f28892fe6b76))
+    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 490f3847-e2aa-481c-9f01-e668baef5458))
+    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp cc0c4d28-0149-4ac6-b883-66309afa5288))
     (pad "1" thru_hole circle (at 0 0) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 25 "Net-(D22-K)") (pinfunction "1") (pintype "passive") (tstamp c33d5010-b3fe-4434-89ee-132b4fbf4b58))
+      (net 47 "Net-(D22-A)") (pinfunction "1") (pintype "passive") (tstamp 78b35363-4f3c-4026-a4bc-0d31b781e38a))
     (pad "2" thru_hole circle (at -6.35 2.54) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 76 "Net-(J2-Pin_6)") (pinfunction "2") (pintype "passive") (tstamp 0b6f5b77-83f9-4898-98b7-59d02945601b))
+      (net 22 "Net-(J2-Pin_6)") (pinfunction "2") (pintype "passive") (tstamp 9880c1a3-4333-4628-b858-9809f0424c3b))
     (model "${KICAD6_3DMODEL_DIR}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -4507,67 +4507,67 @@
   )
 
   (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (layer "F.Cu")
-    (tstamp ff439efc-b8cc-4619-ada3-72ecab48055b)
-    (at 176.68875 140.17625)
+    (tstamp ff65eef4-da10-4e38-9823-91304b63192f)
+    (at 195.42125 116.36375)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
     (property "Sheetname" "")
     (property "ki_description" "Push button switch, generic, two pins")
     (property "ki_keywords" "switch normally-open pushbutton push-button")
-    (path "/525f78ea-85cb-4483-b815-6eed6d00cc76")
+    (path "/c395cb45-14f0-4205-ab3a-4ff15c7ab0c6")
     (attr through_hole)
-    (fp_text reference "SW21" (at -2.54 -2.794) (layer "F.SilkS")
+    (fp_text reference "SW14" (at -2.54 -2.794) (layer "F.SilkS")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp e3775a69-33ce-42ac-ad3d-4d39715efe1b)
+      (tstamp 59f438a0-036a-4741-993c-9a8edd91bd65)
     )
     (fp_text value "SW_Push" (at -2.54 12.954) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 302b1c95-4442-490a-95c8-03cb64eafd5d)
+      (tstamp 7da91e99-c414-4976-b4cf-a77e18c4982d)
     )
     (fp_text user "${REFERENCE}" (at -2.54 -2.794) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp ea2cf760-3a69-4ee2-9bc8-73edf20e88a1)
+      (tstamp 2459abc8-6bfc-4369-bf3c-858f87957479)
     )
     (fp_line (start -9.525 -1.905) (end 4.445 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp a90babdf-86c5-4613-a2ed-1a2124e1f00f))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 83980e28-4ca7-480a-aea2-01e89587d3ab))
     (fp_line (start -9.525 12.065) (end -9.525 -1.905)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp e1ca8457-7e86-4ad7-b0da-7e0b2abba5b4))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 53d9de50-08c9-4334-94f8-d0d4c67b5e50))
     (fp_line (start 4.445 -1.905) (end 4.445 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp a0e73e3b-a4bf-47b5-9505-c7126acd99c5))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 684f4b98-8088-45fb-947b-1da7e0c6dc54))
     (fp_line (start 4.445 12.065) (end -9.525 12.065)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp e2969c8d-75b2-450d-96fd-f23f261e0539))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 48f37ac7-a862-491f-a7e0-4aa6e0aadf28))
     (fp_line (start -12.065 -4.445) (end 6.985 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 1dd00ec9-63c5-4ce2-b6d3-dcb75d4403b0))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 2c03b7a0-8f60-4e84-860e-d52e61d1d91a))
     (fp_line (start -12.065 14.605) (end -12.065 -4.445)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 0c9b5289-883e-4bef-bead-389a155a59eb))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp c59a6169-d83e-4048-bff9-3483294870f7))
     (fp_line (start 6.985 -4.445) (end 6.985 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 5b885bd8-274b-4fff-9d63-4d373c8f3329))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 03f75cb2-fad0-4b1f-9f7e-753a8557ecef))
     (fp_line (start 6.985 14.605) (end -12.065 14.605)
-      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp fa27ca27-ce12-4c7d-a8c0-cdd91ff79bb1))
+      (stroke (width 0.15) (type solid)) (layer "Dwgs.User") (tstamp 2fc65ad1-1277-460b-aa88-19e87e2017f2))
     (fp_line (start -9.14 -1.52) (end 4.06 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp ca3f2934-e7c1-41a6-9703-739350cb0231))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp dd49487e-fb47-4542-a7dd-1337ced4dec6))
     (fp_line (start -9.14 11.68) (end -9.14 -1.52)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp d32de052-21b1-407f-9534-8c5f8a2dba90))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 41286e12-546e-4f04-89b6-f6f8b1b48d78))
     (fp_line (start 4.06 -1.52) (end 4.06 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 6572aaab-67ff-41c4-a71b-7c370769471d))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp a83b809b-4f9a-43b1-b1b4-f60d45496d8a))
     (fp_line (start 4.06 11.68) (end -9.14 11.68)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp fb06ad3c-882d-467a-84d4-0818fdf12751))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 2a777213-744f-4360-a180-b759791f9ad0))
     (fp_line (start -8.89 -1.27) (end 3.81 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp cf66b12c-4258-404b-9c8b-09f6e8033013))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp bbae3d2c-c8dd-4c9b-b489-314a7d9c2185))
     (fp_line (start -8.89 11.43) (end -8.89 -1.27)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp a4364ace-8f5c-442e-b4a7-298b936cfe4e))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 6101d3b7-7cf0-47fa-9868-c188e7775896))
     (fp_line (start 3.81 -1.27) (end 3.81 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 53b140d1-98fe-4931-b404-459462accd9b))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp aa32648f-abab-4ad5-9588-8890d92f2b01))
     (fp_line (start 3.81 11.43) (end -8.89 11.43)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 517d0317-179f-4693-bc87-d6e7aa80a1da))
-    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 35c06b53-f4d4-473b-959a-215d2af4bce1))
-    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp b07410db-55be-449d-871e-b03f47f2d936))
-    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 7ef6b3be-6676-461a-a41e-a2b1311ace76))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp e152c614-8dbd-4c30-9450-f6e57b80cc38))
+    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp 99adeece-7a9f-4ccb-9dca-ad614df2591f))
+    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers "*.Cu" "*.Mask") (tstamp 41169fa9-b5d3-4c3a-a92f-03a1563b078a))
+    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers "*.Cu" "*.Mask") (tstamp f61bad53-6a95-4a9b-ba2f-aba87440a914))
     (pad "1" thru_hole circle (at 0 0) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 24 "Net-(D21-K)") (pinfunction "1") (pintype "passive") (tstamp 35b37981-b331-4ec8-8ba4-e1fb7e7406d1))
+      (net 40 "Net-(D14-A)") (pinfunction "1") (pintype "passive") (tstamp 26377c8a-bf8d-4660-86e5-a4570f7bf5d5))
     (pad "2" thru_hole circle (at -6.35 2.54) (size 2.2 2.2) (drill 1.5) (layers "*.Cu" "*.Mask")
-      (net 75 "Net-(J2-Pin_5)") (pinfunction "2") (pintype "passive") (tstamp eede521f-4b10-4020-90b2-30bae5df9dee))
+      (net 22 "Net-(J2-Pin_6)") (pinfunction "2") (pintype "passive") (tstamp 63c5c94b-d052-40cf-ab32-4ff6cdf83752))
     (model "${KICAD6_3DMODEL_DIR}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -4575,9 +4575,221 @@
     )
   )
 
+  (footprint "Connector_PinSocket_2.54mm:PinSocket_1x08_P2.54mm_Horizontal" (layer "B.Cu")
+    (tstamp 01a11d80-4186-4938-a76b-07a09501b1ba)
+    (at 260.20625 85.3625 -90)
+    (descr "Through hole angled socket strip, 1x08, 2.54mm pitch, 8.51mm socket length, single row (from Kicad 4.0.7), script generated")
+    (tags "Through hole angled socket strip THT 1x08 2.54mm single row")
+    (property "Sheetfile" "xantronix-z32.kicad_sch")
+    (property "Sheetname" "")
+    (property "ki_description" "Generic connector, single row, 01x08, script generated")
+    (property "ki_keywords" "connector")
+    (path "/b14e5b38-c5e1-4b26-bec8-ab8bec19e312")
+    (attr through_hole)
+    (fp_text reference "J2" (at -4.38 2.77 90) (layer "B.SilkS")
+        (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+      (tstamp 5139ffef-d62e-4922-8071-5274a4903d9d)
+    )
+    (fp_text value "Conn_01x08_Socket" (at -4.38 -20.55 90) (layer "B.Fab")
+        (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+      (tstamp 9c2b6884-b20e-4ac6-b20a-06a9a5c69b3a)
+    )
+    (fp_text user "${REFERENCE}" (at -5.775 -8.89) (layer "B.Fab")
+        (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+      (tstamp 0fd748d7-4b70-4f45-9de2-6e23a1705fab)
+    )
+    (fp_line (start -10.09 -19.11) (end -1.46 -19.11)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 48ecc9cd-3de5-4b71-899e-ce31aaeb5d7b))
+    (fp_line (start -10.09 -16.51) (end -1.46 -16.51)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp e3d97985-d1f1-43aa-a702-c26b7df540d2))
+    (fp_line (start -10.09 -13.97) (end -1.46 -13.97)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 87d23f17-0c78-4044-a10f-dc4c03b412d5))
+    (fp_line (start -10.09 -11.43) (end -1.46 -11.43)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 24130cfd-151c-4298-a1f1-373451803678))
+    (fp_line (start -10.09 -8.89) (end -1.46 -8.89)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 18023931-cfeb-455b-abee-c5837eec3920))
+    (fp_line (start -10.09 -6.35) (end -1.46 -6.35)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp a8adfb3e-c374-49d5-843e-ae147a27ab99))
+    (fp_line (start -10.09 -3.81) (end -1.46 -3.81)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp d729810b-bc66-4b85-880e-7f6f223debc0))
+    (fp_line (start -10.09 -1.27) (end -1.46 -1.27)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp be4b481f-14a9-4a4f-87b5-abfe77528bb4))
+    (fp_line (start -10.09 -1.1519) (end -1.46 -1.1519)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 9f26213b-a551-465c-afbb-cd66b8274529))
+    (fp_line (start -10.09 -1.033805) (end -1.46 -1.033805)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 99e918df-1f45-46a0-a204-2d1a58757d1e))
+    (fp_line (start -10.09 -0.91571) (end -1.46 -0.91571)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 8ab06f91-5bd5-4c59-bbcc-7e02dc8c540d))
+    (fp_line (start -10.09 -0.797615) (end -1.46 -0.797615)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 8b79de13-a8fd-4728-b653-94f8e0149cf9))
+    (fp_line (start -10.09 -0.67952) (end -1.46 -0.67952)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 5f2a034d-5296-4af1-a621-ccc62230a3a5))
+    (fp_line (start -10.09 -0.561425) (end -1.46 -0.561425)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 687469ef-49e9-4f82-adfb-49c7196c6a90))
+    (fp_line (start -10.09 -0.44333) (end -1.46 -0.44333)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 2d232d93-0b5d-4122-896a-c5df3d2299f5))
+    (fp_line (start -10.09 -0.325235) (end -1.46 -0.325235)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 62812b52-005b-4346-8815-5b7a0fe72472))
+    (fp_line (start -10.09 -0.20714) (end -1.46 -0.20714)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 4b6846e7-580b-4bd9-b4bc-f00bd06d0e73))
+    (fp_line (start -10.09 -0.089045) (end -1.46 -0.089045)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 3889b8ee-a74f-4ff8-aa11-da20a0dd4e63))
+    (fp_line (start -10.09 0.02905) (end -1.46 0.02905)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp ca9fd22e-7d74-4e73-aba6-aa68774ebeaf))
+    (fp_line (start -10.09 0.147145) (end -1.46 0.147145)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp ca178140-169d-4af5-9a3e-339cb2321438))
+    (fp_line (start -10.09 0.26524) (end -1.46 0.26524)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp bec44e0d-e04d-458a-a68a-25b80c08757b))
+    (fp_line (start -10.09 0.383335) (end -1.46 0.383335)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 2f7f49ec-d77b-4662-9fb1-64976978ce2b))
+    (fp_line (start -10.09 0.50143) (end -1.46 0.50143)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 0de29ab9-a093-4b77-ac47-a85183fa1f53))
+    (fp_line (start -10.09 0.619525) (end -1.46 0.619525)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 9e1eeee1-67e5-41c4-8e7f-175f3279dca9))
+    (fp_line (start -10.09 0.73762) (end -1.46 0.73762)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 2da3451a-372c-47bd-8dd6-2ff5c3a19aab))
+    (fp_line (start -10.09 0.855715) (end -1.46 0.855715)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 1d5b7a39-6b22-4928-8d6d-065a86242b00))
+    (fp_line (start -10.09 0.97381) (end -1.46 0.97381)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 046aee30-f4cc-4f62-8ff6-03e9b29f3570))
+    (fp_line (start -10.09 1.091905) (end -1.46 1.091905)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 33f420ab-cfbc-43e5-91ac-f6343e472782))
+    (fp_line (start -10.09 1.21) (end -1.46 1.21)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 1374373b-48cd-41f8-bb97-10fb25bcb5c6))
+    (fp_line (start -10.09 1.33) (end -10.09 -19.11)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 163fcf38-d5cf-4cda-8839-50b748c00cc9))
+    (fp_line (start -10.09 1.33) (end -1.46 1.33)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 1c61e4bd-8d0e-438c-a49b-5d9aab3f5b88))
+    (fp_line (start -1.46 -18.14) (end -1.05 -18.14)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp ed1fda3d-1a58-4cd8-96bf-bb4d5d4bb759))
+    (fp_line (start -1.46 -17.42) (end -1.05 -17.42)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 06dfdcc0-5134-4f9d-b0c8-747053e6b0d7))
+    (fp_line (start -1.46 -15.6) (end -1.05 -15.6)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp cb43c1fc-bf4c-46b8-ad0c-a0c2e5370f02))
+    (fp_line (start -1.46 -14.88) (end -1.05 -14.88)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp c9de87e3-b499-4307-91b9-34078ff6df1a))
+    (fp_line (start -1.46 -13.06) (end -1.05 -13.06)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp f7c0ac67-f35f-449c-8607-2cd9ce7a006d))
+    (fp_line (start -1.46 -12.34) (end -1.05 -12.34)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp cbd15d57-d6f9-439e-9e1f-49b9b18c4a9b))
+    (fp_line (start -1.46 -10.52) (end -1.05 -10.52)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 8b64c8f7-c287-4aac-8f2b-94e495f3614f))
+    (fp_line (start -1.46 -9.8) (end -1.05 -9.8)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp d525dac7-7bd7-4f3d-a736-6d7e8cc26590))
+    (fp_line (start -1.46 -7.98) (end -1.05 -7.98)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 8d349058-6433-491b-ba2f-495469b75d1a))
+    (fp_line (start -1.46 -7.26) (end -1.05 -7.26)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 2f7e8480-4c29-42fe-8614-802cdf7a3e2b))
+    (fp_line (start -1.46 -5.44) (end -1.05 -5.44)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 840ccd3a-a9f3-48c3-bbe9-8bb04f29e6a6))
+    (fp_line (start -1.46 -4.72) (end -1.05 -4.72)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 34fa8a6e-30df-4baa-94e2-9a5a3fccca71))
+    (fp_line (start -1.46 -2.9) (end -1.05 -2.9)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp bc522ece-1934-49d1-ade9-54171c8abbb6))
+    (fp_line (start -1.46 -2.18) (end -1.05 -2.18)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp bb1f8c07-c872-433a-8513-f6e62e0eca2e))
+    (fp_line (start -1.46 -0.36) (end -1.11 -0.36)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 14246c51-e6f5-4844-97d4-e3c942acfb03))
+    (fp_line (start -1.46 0.36) (end -1.11 0.36)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp f1da437b-00f6-41fe-9dd5-e2ad5452e4a3))
+    (fp_line (start -1.46 1.33) (end -1.46 -19.11)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp af896aa1-2722-4365-ba40-c05c1f813162))
+    (fp_line (start 0 1.33) (end 1.11 1.33)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp bbcaae2d-ca4b-4476-b025-ddbbbdb15eb1))
+    (fp_line (start 1.11 1.33) (end 1.11 0)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 85829ebf-5e1f-4e48-b76d-286dd1426ef3))
+    (fp_line (start -10.55 -19.55) (end 1.75 -19.55)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp f2e07dca-a538-48cb-bcf1-3a9d58928a62))
+    (fp_line (start -10.55 1.8) (end -10.55 -19.55)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 27618565-3011-4316-bbaa-15be188294b0))
+    (fp_line (start 1.75 -19.55) (end 1.75 1.8)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 16a2f45c-a394-4a6a-9ea0-c707960f33c7))
+    (fp_line (start 1.75 1.8) (end -10.55 1.8)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp b6e0c809-f424-480b-9bb0-78254cbfccf3))
+    (fp_line (start -10.03 -19.05) (end -10.03 1.27)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp c33229a3-7ae3-4f5c-a248-5e76da4b4fb0))
+    (fp_line (start -10.03 1.27) (end -2.49 1.27)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp d25ea20e-b61c-4e39-bf2b-f168abcd8d95))
+    (fp_line (start -2.49 1.27) (end -1.52 0.3)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 077ddc6d-745a-4a11-8292-72b3131d0f5e))
+    (fp_line (start -1.52 -19.05) (end -10.03 -19.05)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 95bc588e-7fa7-4e0b-bb96-d455908d98bf))
+    (fp_line (start -1.52 -18.08) (end 0 -18.08)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp ef982392-de71-41ed-b77a-3885c895c3ce))
+    (fp_line (start -1.52 -15.54) (end 0 -15.54)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp e493dcb2-9c9a-4a30-a8c7-22146b5b1e0f))
+    (fp_line (start -1.52 -13) (end 0 -13)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp a53d5e66-470f-4ea5-9451-5a466cc992d4))
+    (fp_line (start -1.52 -10.46) (end 0 -10.46)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp f58583a9-e2cb-48d4-904e-5deb6652c5ea))
+    (fp_line (start -1.52 -7.92) (end 0 -7.92)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 46aa13a7-e664-4326-87e2-a46b12124ffd))
+    (fp_line (start -1.52 -5.38) (end 0 -5.38)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 8fd9a1b6-850d-497c-8726-cea2cccc01b8))
+    (fp_line (start -1.52 -2.84) (end 0 -2.84)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 2b85dd04-4a32-41ed-9827-ea01897cadec))
+    (fp_line (start -1.52 -0.3) (end 0 -0.3)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 34e61ae5-7fab-421d-b9fc-eeed1566ab4b))
+    (fp_line (start -1.52 0.3) (end -1.52 -19.05)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp b274f108-2458-459d-a229-5d974161a76b))
+    (fp_line (start 0 -18.08) (end 0 -17.48)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 8423b6ee-f010-4143-afd0-4a222002ec3f))
+    (fp_line (start 0 -17.48) (end -1.52 -17.48)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 01e58a9e-0644-4218-a25c-ce39b6861429))
+    (fp_line (start 0 -15.54) (end 0 -14.94)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 502de6f3-27e4-4d8c-8fda-73ff347ff929))
+    (fp_line (start 0 -14.94) (end -1.52 -14.94)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp d0e38876-36d9-4fb3-823b-4cb7b50a768a))
+    (fp_line (start 0 -13) (end 0 -12.4)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp ffe0bc58-a359-475a-a8fb-b3beebf23f22))
+    (fp_line (start 0 -12.4) (end -1.52 -12.4)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp ef33f2fc-efca-46df-b055-9f476345bc14))
+    (fp_line (start 0 -10.46) (end 0 -9.86)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp db4431b6-e4e3-466d-bf29-9ca135761f7f))
+    (fp_line (start 0 -9.86) (end -1.52 -9.86)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 08d234dd-1ee8-4ca1-aa8a-e479ff64b2e7))
+    (fp_line (start 0 -7.92) (end 0 -7.32)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp c75109c5-0586-4cfe-b4bc-0b8ce3ef91b9))
+    (fp_line (start 0 -7.32) (end -1.52 -7.32)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 59035ed4-2727-43c8-86b0-c339f172ade1))
+    (fp_line (start 0 -5.38) (end 0 -4.78)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 80ae0993-6887-49d9-9808-0a231467715f))
+    (fp_line (start 0 -4.78) (end -1.52 -4.78)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp ec535aac-285d-4a49-ad17-1a2f7c449e22))
+    (fp_line (start 0 -2.84) (end 0 -2.24)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 49994b57-d77f-4224-8523-8b86fd297916))
+    (fp_line (start 0 -2.24) (end -1.52 -2.24)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 77febdf6-fa02-4086-a0df-c1ba7dfa9d30))
+    (fp_line (start 0 -0.3) (end 0 0.3)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp ef0ac9c9-ac3f-438a-b54d-31e5712541df))
+    (fp_line (start 0 0.3) (end -1.52 0.3)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp d254c5bc-59c2-433a-b59a-700cfeb35a56))
+    (pad "1" thru_hole rect (at 0 0 270) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
+      (net 17 "Net-(J2-Pin_1)") (pinfunction "Pin_1") (pintype "passive") (tstamp 97beef68-5a29-4c28-8a5b-056f9e4a3867))
+    (pad "2" thru_hole oval (at 0 -2.54 270) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
+      (net 18 "Net-(J2-Pin_2)") (pinfunction "Pin_2") (pintype "passive") (tstamp ca1c566a-68dd-4aeb-b108-ae7e142a9663))
+    (pad "3" thru_hole oval (at 0 -5.08 270) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
+      (net 19 "Net-(J2-Pin_3)") (pinfunction "Pin_3") (pintype "passive") (tstamp f4f9c34f-9a4b-4401-8151-540ddc1d239f))
+    (pad "4" thru_hole oval (at 0 -7.62 270) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
+      (net 20 "Net-(J2-Pin_4)") (pinfunction "Pin_4") (pintype "passive") (tstamp 98e2b1a9-8e89-4f4b-996b-aa04d82bc197))
+    (pad "5" thru_hole oval (at 0 -10.16 270) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
+      (net 21 "Net-(J2-Pin_5)") (pinfunction "Pin_5") (pintype "passive") (tstamp 4f1b9831-9efd-482d-8e81-0bde92bb14d5))
+    (pad "6" thru_hole oval (at 0 -12.7 270) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
+      (net 22 "Net-(J2-Pin_6)") (pinfunction "Pin_6") (pintype "passive") (tstamp 726e15bc-f058-4d1b-a013-89ac531b6e0e))
+    (pad "7" thru_hole oval (at 0 -15.24 270) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
+      (net 23 "Net-(J2-Pin_7)") (pinfunction "Pin_7") (pintype "passive") (tstamp 437aa0ac-5fe8-43c1-8643-d38f590a7a91))
+    (pad "8" thru_hole oval (at 0 -17.78 270) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
+      (net 24 "Net-(J2-Pin_8)") (pinfunction "Pin_8") (pintype "passive") (tstamp d1c10b73-a838-46fd-9697-402c2513aae3))
+    (model "${KICAD6_3DMODEL_DIR}/Connector_PinSocket_2.54mm.3dshapes/PinSocket_1x08_P2.54mm_Horizontal.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
   (footprint "Diode_SMD:D_SOD-123" (layer "B.Cu")
-    (tstamp 0461af4f-0c04-42e1-a940-f1c8068e5649)
-    (at 297.97375 130.96875 180)
+    (tstamp 0dc0c00c-2124-4e49-ada4-488e7faa9fa7)
+    (at 297.65625 183.35625)
     (descr "SOD-123")
     (tags "SOD-123")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
@@ -4586,60 +4798,60 @@
     (property "Sim.Pins" "1=K 2=A")
     (property "ki_description" "100V 0.15A standard switching diode, DO-35")
     (property "ki_keywords" "diode")
-    (path "/0e10329f-8857-405f-bac1-a5ce97f08aad")
+    (path "/27241b96-3864-46f1-b632-a98ae76729de")
     (attr smd)
-    (fp_text reference "D13" (at 0 2) (layer "B.SilkS")
+    (fp_text reference "D60" (at 0 2) (layer "B.SilkS")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp a8a3ad65-46ae-4cad-a335-483acb4debc4)
+      (tstamp cac8275c-ce5e-4a02-8795-ee32a1e4ed05)
     )
     (fp_text value "1N4148" (at 0 -2.1) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 755f267b-f2c2-4782-abc9-d98f6e7f6494)
+      (tstamp 373445d6-d90c-4274-9bd9-bca8f888df31)
     )
     (fp_text user "${REFERENCE}" (at 0 2) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 475e9030-f071-4221-82d4-1cdae53dfb34)
+      (tstamp c24abb99-ff7d-41b1-9575-d2580c0f4868)
     )
     (fp_line (start -2.36 -1) (end 1.65 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 6e304815-0b86-4427-b000-fb534c9dc2cc))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 683a442e-843e-4ce8-9219-74b80c9cbeb9))
     (fp_line (start -2.36 1) (end -2.36 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp caae386b-9595-46a7-bf92-522ecbfe4005))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp ee773970-fbf4-4f06-bcbe-2865f3459872))
     (fp_line (start -2.36 1) (end 1.65 1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 33280476-2821-4085-be1e-5776c9ca65b4))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp f92f9422-e629-4740-8608-a435fe82388c))
     (fp_line (start -2.35 1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 65f46ba1-c404-42a5-9c0b-d242ff520511))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 7efb23a8-1997-4c00-81d1-a5ced03fc71b))
     (fp_line (start -2.35 1.15) (end 2.35 1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp e2f429f0-8576-4374-9a26-06fe8ca25c99))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 6ac298d3-7617-4c1b-bd8f-e3394fa084df))
     (fp_line (start 2.35 -1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp a717edad-6e86-4c2b-810b-3f89961603c7))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 12dcd0c8-506a-4507-aa5a-f6a8a14a0233))
     (fp_line (start 2.35 1.15) (end 2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp c9a62d58-faff-49d6-bd98-234669bf3b6e))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 609c4c81-5747-433e-9e2c-1a3ff154cc4b))
     (fp_line (start -1.4 -0.9) (end -1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp b5ff86c3-07d8-4c73-a667-cf8fb48ee75d))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 6360ebd4-f392-4169-90f8-8ad4f4b377f0))
     (fp_line (start -1.4 0.9) (end 1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp f8e724a2-f155-4052-b0d7-a984f497959c))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp fea03bbc-abaa-43b2-9ec4-2f1d010dd3d2))
     (fp_line (start -0.75 0) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 8c9967c8-0252-4698-81fa-b84bc0723ff0))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp f1c183fd-0db4-47a2-8d31-ae99677184eb))
     (fp_line (start -0.35 0) (end -0.35 -0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp fd7231b3-65a7-4048-ac21-7d0b99d1c762))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 8e6b7d91-95eb-4492-8962-da7c29f77a5e))
     (fp_line (start -0.35 0) (end -0.35 0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 3048e8fa-6ae1-4ae8-b33b-29267189db92))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 82ee331d-d732-4438-9eba-e1762ff88bc6))
     (fp_line (start -0.35 0) (end 0.25 0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 22f91a13-4848-4819-9c01-00ed42fbb9bf))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 813f491a-3957-4d36-943c-a610ec917b14))
     (fp_line (start 0.25 -0.4) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 5cd83e74-955a-484f-99e9-743b3899a704))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp bf68c2cf-326d-4ee3-8bde-b2ff32063cf4))
     (fp_line (start 0.25 0) (end 0.75 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 00a94739-ac8a-4a59-8c2e-dc7d8c27ad61))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 1a57bdda-9845-4290-b74c-d55549634d4c))
     (fp_line (start 0.25 0.4) (end 0.25 -0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 6b06cf8b-5ec0-416f-a0c6-de69f87e5d13))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp a5542612-d10a-4f7e-b7bf-b012c73edfe4))
     (fp_line (start 1.4 -0.9) (end -1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 5f078bde-db6b-4a49-b0ba-093e0d3ca0f9))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp e4dd0831-0362-4bbc-a9bf-fddc86ac1bdd))
     (fp_line (start 1.4 0.9) (end 1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 877d52b2-0372-4d61-a6df-db3052d9e8f0))
-    (pad "1" smd roundrect (at -1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 15 "Net-(D13-K)") (pinfunction "K") (pintype "passive") (tstamp cbd0c912-d66a-4ae2-88c5-e8dad0f7192b))
-    (pad "2" smd roundrect (at 1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 11 "Net-(D10-A)") (pinfunction "A") (pintype "passive") (tstamp 1eccf028-b24a-4320-9f4d-997e70080f8a))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp cb97ad99-8abc-4c74-9519-afe014b558ac))
+    (pad "1" smd roundrect (at -1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 15 "Net-(D56-K)") (pinfunction "K") (pintype "passive") (tstamp 3af80114-4c4e-4078-9325-e950aa60e5a4))
+    (pad "2" smd roundrect (at 1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 80 "Net-(D60-A)") (pinfunction "A") (pintype "passive") (tstamp 5cff1602-79ca-4957-b05d-def3aadd7ba4))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SOD-123.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -4648,8 +4860,8 @@
   )
 
   (footprint "Diode_SMD:D_SOD-123" (layer "B.Cu")
-    (tstamp 08854740-c0ad-4cf0-bb08-d1c58d2c66d1)
-    (at 212.24875 150.01875 180)
+    (tstamp 0ef3572a-7e7b-4f74-90ac-03ba4907e073)
+    (at 288.13125 126.20625)
     (descr "SOD-123")
     (tags "SOD-123")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
@@ -4658,60 +4870,60 @@
     (property "Sim.Pins" "1=K 2=A")
     (property "ki_description" "100V 0.15A standard switching diode, DO-35")
     (property "ki_keywords" "diode")
-    (path "/072f2c74-93e4-47fc-9aff-ca685fc2f964")
+    (path "/a82dca72-9bab-4299-9be5-5c7001742fb9")
     (attr smd)
-    (fp_text reference "D23" (at 0 2) (layer "B.SilkS")
+    (fp_text reference "D45" (at 0 2) (layer "B.SilkS")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 2323ef2a-07e6-405c-9050-b596ba61e769)
+      (tstamp 872a3bfb-4d7f-4a47-b829-cad5ab33b2e0)
     )
     (fp_text value "1N4148" (at 0 -2.1) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 5251f16a-1320-4f69-b181-7d37afafef74)
+      (tstamp 0f97fb79-18ec-450e-b945-3d1d17886e33)
     )
     (fp_text user "${REFERENCE}" (at 0 2) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 7ff2022b-ac54-4a4c-8be7-8baf98344b09)
+      (tstamp f8d10dbe-54ff-4bc2-9248-1e992761edc9)
     )
     (fp_line (start -2.36 -1) (end 1.65 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 5ab2f9ce-4bf0-4f3c-af94-4dee232aa10a))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 1fec6ef6-509c-493f-a090-ba16917b998f))
     (fp_line (start -2.36 1) (end -2.36 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 4b555d7a-4958-4571-abbb-7c18ca92a9c5))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp fb4031c6-547c-4aea-924d-50a42dc0510a))
     (fp_line (start -2.36 1) (end 1.65 1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp d5d023c6-2d03-4b66-b8b1-76bc140bff8e))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 11872800-c648-4b79-b3c5-e7ab0d3ee3ee))
     (fp_line (start -2.35 1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp ea352e57-5b47-4015-935f-96d470a1845c))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 3b870394-af18-467d-a0cf-cd6598fc3d1a))
     (fp_line (start -2.35 1.15) (end 2.35 1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 54bbef73-c3bb-4cb7-81d6-ec7afa0c7467))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 95e2be4d-3ea1-4934-8102-77a7c8a4a022))
     (fp_line (start 2.35 -1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 86183f34-d271-418b-adf5-6acb4c94fbc4))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 079c1a60-a2a0-4409-9499-4e7e28e1cedd))
     (fp_line (start 2.35 1.15) (end 2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 1d1b5f4e-1d1d-449d-acc7-8746db2300ae))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 85fd3904-c833-41c6-ba6a-803cb0e822e6))
     (fp_line (start -1.4 -0.9) (end -1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 0490ea79-4e9c-496d-99fc-c44ca4a66019))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 4709b31c-a4f1-4814-90cb-98c02613be8a))
     (fp_line (start -1.4 0.9) (end 1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp c355914f-645a-47de-81bd-cc27aca2837e))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp a356cb08-d80e-4221-a947-18153af20b4f))
     (fp_line (start -0.75 0) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 9f49de98-fef7-420a-9682-1103328efe9c))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 7d8308e5-918f-4dc7-9ca4-5bff9e88f32f))
     (fp_line (start -0.35 0) (end -0.35 -0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp ef2a1b4f-0648-4d21-9b4a-1a7b317bc8fe))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp f35e42d6-e110-4d02-bb5c-4674656fb843))
     (fp_line (start -0.35 0) (end -0.35 0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 26f3992d-1cd0-489a-addc-dd00a9c16b03))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 544a5167-d41f-476e-a281-a9659d7037f7))
     (fp_line (start -0.35 0) (end 0.25 0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 806eeeb9-5607-441b-aff6-9e724626255b))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp bf3e52f4-a43f-468a-bb94-dfbbd756e0ed))
     (fp_line (start 0.25 -0.4) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp e220d6dc-5d62-49c3-bcf1-61027d140725))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 94d77a6d-74e8-4749-bae0-7264088ed487))
     (fp_line (start 0.25 0) (end 0.75 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 929e0d07-ec29-4982-afe9-d67d3c468dae))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 2c4db38d-899e-47c3-bfb3-c262e96fdba4))
     (fp_line (start 0.25 0.4) (end 0.25 -0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 868c0db1-96b3-4a3a-8216-ea7f912ded38))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 2b169881-9ab0-43bb-afa7-6c1eb87212f4))
     (fp_line (start 1.4 -0.9) (end -1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp f252665a-7a08-4199-a4a2-7c7f88a3b271))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp d161ab25-1fd7-4864-bd53-d97194f23548))
     (fp_line (start 1.4 0.9) (end 1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 886b2cc2-486b-4a80-b794-5d6360ed8442))
-    (pad "1" smd roundrect (at -1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 26 "Net-(D23-K)") (pinfunction "K") (pintype "passive") (tstamp 8f1d30d6-7325-4a0b-9f89-54de2b058068))
-    (pad "2" smd roundrect (at 1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 20 "Net-(D17-A)") (pinfunction "A") (pintype "passive") (tstamp 63ce6afb-ff00-40a7-8ae5-7b9f8f49b864))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 3aa290e1-e8d2-4fb6-9d03-8f844a3f0ad3))
+    (pad "1" smd roundrect (at -1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 11 "Net-(D40-K)") (pinfunction "K") (pintype "passive") (tstamp fba82ef7-a3e9-4b04-b6e3-424f83211dbd))
+    (pad "2" smd roundrect (at 1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 67 "Net-(D45-A)") (pinfunction "A") (pintype "passive") (tstamp e222d6a1-f19b-4a47-9e37-76e462c2a1cc))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SOD-123.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -4720,8 +4932,8 @@
   )
 
   (footprint "Diode_SMD:D_SOD-123" (layer "B.Cu")
-    (tstamp 0a9e3c3e-6dd3-45e5-9b68-7a18d0a742d8)
-    (at 240.82375 130.96875 180)
+    (tstamp 11245240-9d1d-46ac-97c3-cdfa12b14dc5)
+    (at 254.79375 145.25625)
     (descr "SOD-123")
     (tags "SOD-123")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
@@ -4730,60 +4942,60 @@
     (property "Sim.Pins" "1=K 2=A")
     (property "ki_description" "100V 0.15A standard switching diode, DO-35")
     (property "ki_keywords" "diode")
-    (path "/5f5ebe5f-218b-462c-89b8-f4294a8805ad")
+    (path "/54a24f0d-8f44-48e2-a7b5-79e63c0f2119")
     (attr smd)
-    (fp_text reference "D16" (at 0 2) (layer "B.SilkS")
+    (fp_text reference "D55" (at 0 2) (layer "B.SilkS")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp dffe38f3-d1d0-44b7-a8b4-4fde43e7839f)
+      (tstamp 9dc37a83-8548-4c11-a106-45bb5c8b4394)
     )
     (fp_text value "1N4148" (at 0 -2.1) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 886d545c-9b12-45d9-9ac1-67a7173af510)
+      (tstamp 1d6be8d0-39be-40f2-9544-77d5ab770fdd)
     )
     (fp_text user "${REFERENCE}" (at 0 2) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 91220b88-5786-4c75-a059-5419b27c2d3d)
+      (tstamp a649d514-00a8-4ebd-b053-12800af3db08)
     )
     (fp_line (start -2.36 -1) (end 1.65 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 6f0e561c-d26a-45b6-85b5-d7fbce49daa1))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp b1a6cbb1-12db-4bb8-bac1-b2dce53c89a3))
     (fp_line (start -2.36 1) (end -2.36 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 2ca14716-152c-4e9d-9bda-65a8a9e8a366))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp f02b17b3-2448-4fd2-9863-1bf9b1a7d5d7))
     (fp_line (start -2.36 1) (end 1.65 1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp e5dbf27d-6983-4c22-a8f0-cf86ededff52))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp bdea16d3-7ebb-4b45-b9d3-9344df4ef6cc))
     (fp_line (start -2.35 1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp e85b3c5c-3c05-4bbc-b620-d6dc76d4f4cd))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp c8823daf-86f1-40dd-ac5c-a028aaa03946))
     (fp_line (start -2.35 1.15) (end 2.35 1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp a2cc58b6-4dd1-481f-ac90-dc7ca0f95eab))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp ed44182d-b895-4e60-b1e8-641e7338b52d))
     (fp_line (start 2.35 -1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 783ebd60-d56c-4fc6-b3cd-9bedc8e45bee))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 3d0fe01a-b6ba-4376-a139-99e2d825a0d0))
     (fp_line (start 2.35 1.15) (end 2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 8716b849-3fd4-4474-adb6-a58481f02c22))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 774d227a-2d84-475f-8720-126142204976))
     (fp_line (start -1.4 -0.9) (end -1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp b0564448-15ee-4d27-8cbd-54da650258c7))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 89b6d7b9-c39a-4404-aeb2-c6f0a6d9fa60))
     (fp_line (start -1.4 0.9) (end 1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp d6b17fd7-0e19-48b0-bb5c-5f349f331218))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 111c3d9f-f409-4f6a-8b8e-efcb34f18878))
     (fp_line (start -0.75 0) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 909d3426-6bf6-40ff-956d-ff2253fe52d0))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 39479cd2-a77f-4bf4-9930-b7adda774831))
     (fp_line (start -0.35 0) (end -0.35 -0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp db70eaf6-80f5-4894-9540-8f9a9be20441))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp c5ac2c22-da28-4c22-935c-fc0db0d80036))
     (fp_line (start -0.35 0) (end -0.35 0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 95b54ab3-5ff9-43fa-a5bc-52f787a3ec65))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp b18f8a08-3d97-44ea-adf9-77209b5a6a66))
     (fp_line (start -0.35 0) (end 0.25 0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp c64e97ec-83f6-445f-881c-456bec68be08))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 034d3580-b1f2-42eb-ad39-2966e80a116b))
     (fp_line (start 0.25 -0.4) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 70d5b720-6d21-43e0-9416-e080df1cb6bd))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 8cc45349-5ece-4b9c-a476-9c5f1debde93))
     (fp_line (start 0.25 0) (end 0.75 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 7cb5c5b5-cdf6-4aca-9861-0f36801eddfe))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 4e4e6a0e-ff0b-4883-8844-2ffe281f4c60))
     (fp_line (start 0.25 0.4) (end 0.25 -0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 409e5d37-cd3c-4b08-9599-e8a573fd0479))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 692d56a8-bd74-416d-8f3f-a0edce78ac4f))
     (fp_line (start 1.4 -0.9) (end -1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 886432b1-947a-4656-8393-9da4595ba270))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp bbb3e4a9-d6c5-4ac7-99f6-3de512ac9a9d))
     (fp_line (start 1.4 0.9) (end 1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp fed1b727-db73-4a5b-85d5-93bbef95b124))
-    (pad "1" smd roundrect (at -1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 18 "Net-(D16-K)") (pinfunction "K") (pintype "passive") (tstamp 4ea5d52a-b416-402c-9374-c049f7ebf3c4))
-    (pad "2" smd roundrect (at 1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 11 "Net-(D10-A)") (pinfunction "A") (pintype "passive") (tstamp 9b0c83c6-bd59-4645-ab5a-a3daebef3a5c))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp c06172ba-9ac0-470f-8da0-74ccf97932e3))
+    (pad "1" smd roundrect (at -1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 13 "Net-(D48-K)") (pinfunction "K") (pintype "passive") (tstamp 8d89adf9-73a6-4da8-8fd4-2ccd4bd40be7))
+    (pad "2" smd roundrect (at 1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 76 "Net-(D55-A)") (pinfunction "A") (pintype "passive") (tstamp a415d997-8af3-4d3a-9d8c-94d50d3773fa))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SOD-123.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -4792,8 +5004,8 @@
   )
 
   (footprint "Diode_SMD:D_SOD-123" (layer "B.Cu")
-    (tstamp 0cd14dc9-49c4-4fcf-aebd-fae07a1a0b89)
-    (at 264.63625 188.11875 180)
+    (tstamp 145c52e9-685a-471d-a818-a5eaf9ffd29a)
+    (at 335.75625 107.15625)
     (descr "SOD-123")
     (tags "SOD-123")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
@@ -4802,60 +5014,60 @@
     (property "Sim.Pins" "1=K 2=A")
     (property "ki_description" "100V 0.15A standard switching diode, DO-35")
     (property "ki_keywords" "diode")
-    (path "/d3f94644-5edb-47d4-9f54-0c25e67ed3d8")
+    (path "/5c851c5f-8fa4-46fb-93fc-ca9dacc87a22")
     (attr smd)
-    (fp_text reference "D55" (at 0 2) (layer "B.SilkS")
+    (fp_text reference "D34" (at 0 2) (layer "B.SilkS")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 744ab057-6c32-4f1d-8961-9a0b9c046cfb)
+      (tstamp d09ccd3b-a219-4f9a-889a-b56c40096355)
     )
     (fp_text value "1N4148" (at 0 -2.1) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 165a0d42-d454-465e-a643-6c0157fb9972)
+      (tstamp 93b36824-e5a2-4612-a103-fb05753f96ea)
     )
     (fp_text user "${REFERENCE}" (at 0 2) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 091d27d5-821e-45de-917e-19a9650090af)
+      (tstamp aedc276d-2dba-4279-b919-10a2e4a7fc6a)
     )
     (fp_line (start -2.36 -1) (end 1.65 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp e087b3e0-d911-411a-a1ba-c1beae32ff0c))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp ec200a5a-db96-4d12-919e-a158a093532d))
     (fp_line (start -2.36 1) (end -2.36 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp b6572b9f-54b8-4faf-8372-3c918c9093dd))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp f0d0eb0a-3d7e-4742-b75a-ad763e9574c4))
     (fp_line (start -2.36 1) (end 1.65 1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp c883f546-1144-4433-ac37-6d7999049eeb))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 4cbbcd4a-dbe6-4493-a4bb-4c882f1fec4d))
     (fp_line (start -2.35 1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp cee33f7a-43f1-407b-b61a-35e04df38769))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 9a7e3eda-960a-4764-b833-629361d6f971))
     (fp_line (start -2.35 1.15) (end 2.35 1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 7205d4ad-cfc2-46dd-9067-a4b7d2d64e17))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 4e19a373-9d80-4845-ba41-f33ef1b4e240))
     (fp_line (start 2.35 -1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 6bf476f5-2ce0-44f6-8693-8ce930eafaf0))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp cee2773f-6702-4910-8351-257d7646ace2))
     (fp_line (start 2.35 1.15) (end 2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 4d2d5044-32e9-4148-9407-e0f542e53090))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp ca339c5a-6ab5-4a66-be98-9d307edfa772))
     (fp_line (start -1.4 -0.9) (end -1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 9579fc23-96ac-4949-989a-1959f247087d))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp c5d03ac4-19a1-4001-9691-fadd2ace0552))
     (fp_line (start -1.4 0.9) (end 1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 784e866b-d9ed-4cdd-a129-a3060210eab4))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 37d9fa72-77a1-4453-87c1-0d4fcf22483f))
     (fp_line (start -0.75 0) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp c722f1ac-e6d2-483e-ac06-4ba173fa7d31))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp ea68a33f-ddbe-4b94-939c-49483296afe8))
     (fp_line (start -0.35 0) (end -0.35 -0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 2d2da592-0dac-45e3-bf3b-979648b87840))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp be7c346d-cc86-44a5-b09f-97cbf907446e))
     (fp_line (start -0.35 0) (end -0.35 0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp bd6e0c5d-830a-4267-9dd0-77fa2745cb7d))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp bdd219e6-798c-479e-ab51-c52cec033aca))
     (fp_line (start -0.35 0) (end 0.25 0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 697ec620-c9e7-42f6-8df0-9148875ee7de))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp cc45d85a-3629-45c4-8b05-a950a9f29054))
     (fp_line (start 0.25 -0.4) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp ba450d50-e1d2-41ec-b62f-7f7a9ee6bc14))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 1c537b0f-c4ad-4542-bfdd-43e10fd54e40))
     (fp_line (start 0.25 0) (end 0.75 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp f9867079-ae61-4e4a-abfc-418268b2794b))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp f72de797-d0b0-43aa-900e-6a8a17048675))
     (fp_line (start 0.25 0.4) (end 0.25 -0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp ff7cc603-2bc4-4185-b546-ea81f4704879))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 720b42cf-f171-4f62-b2f8-16c83e6d7cdf))
     (fp_line (start 1.4 -0.9) (end -1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp a529f91d-309b-48c2-8b34-11ef6ff00ee3))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp eaffe03e-b056-4918-a75a-64963345e661))
     (fp_line (start 1.4 0.9) (end 1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp eaacc6e1-ca2a-49a4-9111-80cf545f061d))
-    (pad "1" smd roundrect (at -1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 62 "Net-(D55-K)") (pinfunction "K") (pintype "passive") (tstamp f87c84a4-658b-4f2f-8783-5fa7ca174a28))
-    (pad "2" smd roundrect (at 1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 56 "Net-(D49-A)") (pinfunction "A") (pintype "passive") (tstamp 5d4e081e-03d9-420a-b9c0-c3de3ebb7fc6))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp ecc0fb67-afc7-4ec4-b8bb-caea909f1f59))
+    (pad "1" smd roundrect (at -1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 9 "Net-(D32-K)") (pinfunction "K") (pintype "passive") (tstamp e62dfb4c-d803-498c-9e92-9faa0ddd128a))
+    (pad "2" smd roundrect (at 1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 57 "Net-(D34-A)") (pinfunction "A") (pintype "passive") (tstamp 730f539f-02f4-46ea-ab31-13a948ff6e14))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SOD-123.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -4864,8 +5076,8 @@
   )
 
   (footprint "Diode_SMD:D_SOD-123" (layer "B.Cu")
-    (tstamp 0d0042fc-ce84-4fea-b5c4-67ed2e5df7ef)
-    (at 307.49875 150.01875 180)
+    (tstamp 1f13ee49-a3c9-4c14-83b3-d3eeb1e38901)
+    (at 302.41875 164.30625)
     (descr "SOD-123")
     (tags "SOD-123")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
@@ -4874,60 +5086,60 @@
     (property "Sim.Pins" "1=K 2=A")
     (property "ki_description" "100V 0.15A standard switching diode, DO-35")
     (property "ki_keywords" "diode")
-    (path "/b5cd210f-9798-440b-bdfc-0dfb6b9110c3")
+    (path "/79f880c2-39c3-41e1-a615-1a0f2c2c6c49")
     (attr smd)
-    (fp_text reference "D29" (at 0 2) (layer "B.SilkS")
+    (fp_text reference "D61" (at 0 2) (layer "B.SilkS")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 387b658d-2470-4fd5-9e24-9bbe5299af1a)
+      (tstamp 27e1dfff-a0f6-4c10-979d-47902ec4c7f9)
     )
     (fp_text value "1N4148" (at 0 -2.1) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 4d7048dd-adbf-41cf-98d3-65893f29d9a9)
+      (tstamp edc84b42-3d08-4659-96b1-4d0ea71eca32)
     )
     (fp_text user "${REFERENCE}" (at 0 2) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 54e4da39-f24e-49a8-a5f5-c6af8ef80e03)
+      (tstamp 77bd7d5b-1768-4384-9006-8b7cdaa8dd28)
     )
     (fp_line (start -2.36 -1) (end 1.65 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp d4fd9094-262a-45de-a93f-89de47e0523f))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 85b73d7c-ff7b-48a8-a3ae-c9004afe7db4))
     (fp_line (start -2.36 1) (end -2.36 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 8fb1211c-adaf-4dd5-b847-1f9fc580f2ba))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 83387122-e4d2-451f-8096-9702c75d648e))
     (fp_line (start -2.36 1) (end 1.65 1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 418c8d63-5284-4e17-b849-8d0544f265bf))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 40cfb5f2-060e-4d29-b864-cce563035c73))
     (fp_line (start -2.35 1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 026e7d4a-4eac-45c5-8759-c00230d68bab))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp eacda28b-878b-4c64-b20b-337da6d4607a))
     (fp_line (start -2.35 1.15) (end 2.35 1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp faed05a5-ad70-498c-9993-9e2e5a5798f1))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 6dee009e-19fb-47da-83c4-575d4736dd3a))
     (fp_line (start 2.35 -1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp a76870f4-e13f-4340-b800-0846044bc1e6))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 5ecdb11f-14b4-49de-bc95-7d44a5235c4e))
     (fp_line (start 2.35 1.15) (end 2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp bbf50199-5260-422a-bef6-e87bf756c2ae))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 98ac2e67-4450-45b8-96e4-5448e077d592))
     (fp_line (start -1.4 -0.9) (end -1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 18980207-1ee5-4333-9839-8b536295a686))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp a716b5cf-d201-4e7e-ae4c-af1426795335))
     (fp_line (start -1.4 0.9) (end 1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 5c7747db-5cc7-423c-b63b-7de884d4ae5d))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp a1b75bba-3e9d-44b4-9459-b73055be271d))
     (fp_line (start -0.75 0) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp af05a91c-9711-4336-82c9-64e6ad28eef2))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp bc273959-d541-4abf-bdab-a8cacb60a6fe))
     (fp_line (start -0.35 0) (end -0.35 -0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 80d54a1b-e50f-4445-9ac4-3b0d909aac57))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 0bbd3d7e-1e87-4cfc-a120-ecb54f4ed140))
     (fp_line (start -0.35 0) (end -0.35 0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 5e8e9228-59bb-48c2-8e5c-d5b1b54e74d5))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp d3b6999a-f870-4326-a9bb-a59a3a0e155d))
     (fp_line (start -0.35 0) (end 0.25 0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp fc7674a7-d241-400f-ad04-981078cc3b2c))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp dda7bfeb-de1c-45f0-9df5-6517134462c6))
     (fp_line (start 0.25 -0.4) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 189022e0-94f3-4ccb-85c1-5ce8a665f91e))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 95ad59cf-8a03-424e-8106-a31e03819230))
     (fp_line (start 0.25 0) (end 0.75 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 582c9428-1f1b-401d-b1f1-d57348dbe62c))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp aeb1cbf4-ee2f-49a8-8a23-8489581da38e))
     (fp_line (start 0.25 0.4) (end 0.25 -0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 0c7210af-838a-45a1-b5c3-1ff965cbfe26))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 86d91b3a-b052-48ab-becd-80a234139da6))
     (fp_line (start 1.4 -0.9) (end -1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 93c058c3-cab9-4767-9c8c-1d738fe833a6))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 88f569f1-a2bb-49e9-8e4e-aa7a9b4ff16f))
     (fp_line (start 1.4 0.9) (end 1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp c68c486d-7bcc-4d2f-8845-8044915ffd93))
-    (pad "1" smd roundrect (at -1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 33 "Net-(D29-K)") (pinfunction "K") (pintype "passive") (tstamp 0ea50606-714b-4ca3-ab7d-03e3007892aa))
-    (pad "2" smd roundrect (at 1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 29 "Net-(D25-A)") (pinfunction "A") (pintype "passive") (tstamp c359cdd2-514f-4048-8b82-2e6967c51c65))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 75aad73b-eed6-40c9-8bbd-82082dc701ad))
+    (pad "1" smd roundrect (at -1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 15 "Net-(D56-K)") (pinfunction "K") (pintype "passive") (tstamp bd645792-22ab-4a44-9041-32f4193aa1e1))
+    (pad "2" smd roundrect (at 1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 81 "Net-(D61-A)") (pinfunction "A") (pintype "passive") (tstamp 9faf278a-206d-488c-98e8-f78dfca592d4))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SOD-123.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -4936,8 +5148,8 @@
   )
 
   (footprint "Diode_SMD:D_SOD-123" (layer "B.Cu")
-    (tstamp 1be6204b-0e25-4d29-846b-5ff441803236)
-    (at 269.39875 150.01875 180)
+    (tstamp 1ffd5311-57bd-4771-9f56-078126ab986a)
+    (at 283.36875 164.30625)
     (descr "SOD-123")
     (tags "SOD-123")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
@@ -4946,60 +5158,60 @@
     (property "Sim.Pins" "1=K 2=A")
     (property "ki_description" "100V 0.15A standard switching diode, DO-35")
     (property "ki_keywords" "diode")
-    (path "/e559ebb4-6da4-4715-9592-deb119267ca1")
+    (path "/83689cf2-9853-476e-8360-f88d63878043")
     (attr smd)
-    (fp_text reference "D31" (at 0 2) (layer "B.SilkS")
+    (fp_text reference "D62" (at 0 2) (layer "B.SilkS")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 4a97c103-9197-4b5f-8506-b50a1afae663)
+      (tstamp 6126ece3-f8fc-4321-b2c0-90cedf6a362e)
     )
     (fp_text value "1N4148" (at 0 -2.1) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp e6975396-4579-4790-8883-ff7c2f19c06f)
+      (tstamp 3a41f412-8098-483d-a5a9-fa9d152a0e34)
     )
     (fp_text user "${REFERENCE}" (at 0 2) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 9dc813fd-a4ff-403d-9bc9-8804f149235a)
+      (tstamp 0c4a3706-97e3-4cb1-8418-cb1e901b73cc)
     )
     (fp_line (start -2.36 -1) (end 1.65 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp c60cd259-3116-46fe-bec7-0dfbcda0a608))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 28173fc4-39de-4a9e-84ef-d9138d94ed86))
     (fp_line (start -2.36 1) (end -2.36 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp ffe6805c-f2e4-4943-aecf-a7635c5775e6))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp c667c2f0-7cc4-47f0-b0d2-fc25a75dc73b))
     (fp_line (start -2.36 1) (end 1.65 1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 27734123-897d-4250-b937-6cbdba074834))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 18d5845d-bd98-44f3-bb20-1f175aa66c4e))
     (fp_line (start -2.35 1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 21a1a82a-0f42-4e95-a270-2e2cc723f13b))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 1446e3e5-968e-4b8e-b36a-f6116660f8d6))
     (fp_line (start -2.35 1.15) (end 2.35 1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 78ac8f9c-39ba-4356-a27c-b3a997ce43a9))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 9a80416c-9f4e-4775-b754-205ad367d6b8))
     (fp_line (start 2.35 -1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp d637f967-f37b-44f7-83eb-0fe93391753c))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 5678ccb1-b9d4-4533-a81c-7768e9982f85))
     (fp_line (start 2.35 1.15) (end 2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp b1cedc86-33bd-4a12-8602-6adabd04ddc6))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 3314dfd1-2740-4743-a44d-e89c5afa294d))
     (fp_line (start -1.4 -0.9) (end -1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 83b6984e-22d8-4371-8bfe-737e050b078f))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 75350ff8-5b2d-494b-9638-7594cb1deaf4))
     (fp_line (start -1.4 0.9) (end 1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp fdc8f7a3-9d18-4a6b-8e5d-86f18be4c057))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp abb84b27-eb14-43fc-bec2-ab80bf4ebcf1))
     (fp_line (start -0.75 0) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp b7532638-929b-4dd8-b425-b6d36c35c3fc))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 084f7d9e-2e13-4390-8258-eaff25ea3ad0))
     (fp_line (start -0.35 0) (end -0.35 -0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp da3c65e1-abb8-4b46-a816-297bd4ae4ee9))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 566e7d9d-88f7-4c31-93fa-c9c4c87116cb))
     (fp_line (start -0.35 0) (end -0.35 0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 383bb1d7-0217-4ddf-8ff9-92e41e43e3fe))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 46eb7625-0001-4f2f-b1f6-7397ac03bcbc))
     (fp_line (start -0.35 0) (end 0.25 0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp c55930c2-5678-4da3-9d65-9740ccf980e5))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp badc0382-502b-47eb-8a7a-90643bb28c0e))
     (fp_line (start 0.25 -0.4) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp a401d405-15e3-49fe-b131-4b62885f6d98))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 199e22d5-984e-41d1-99bc-8580fc8ffe34))
     (fp_line (start 0.25 0) (end 0.75 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 23599b29-a317-4da8-aff4-2fa0196e5cbf))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp aad75886-bc30-4ed6-901d-bdd783649675))
     (fp_line (start 0.25 0.4) (end 0.25 -0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp e241690b-d78c-4043-a09a-a2b435bd59d2))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 879f30d2-f7e1-426c-91b8-076531e197ea))
     (fp_line (start 1.4 -0.9) (end -1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 761d0ad2-0210-4db1-957f-ca65b31a9fdb))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 6052178b-c9cb-4e1a-90f5-ecfd0ab7568f))
     (fp_line (start 1.4 0.9) (end 1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp e9102526-9ffe-43b8-9a2b-6f883aea2761))
-    (pad "1" smd roundrect (at -1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 35 "Net-(D31-K)") (pinfunction "K") (pintype "passive") (tstamp dfdd8585-195a-42f5-992a-79d08b9cefac))
-    (pad "2" smd roundrect (at 1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 29 "Net-(D25-A)") (pinfunction "A") (pintype "passive") (tstamp 3d7eaf1b-05e1-4dd8-a801-3da7caa61bf5))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 99e88c72-d54b-4839-ade1-a286c940c8f0))
+    (pad "1" smd roundrect (at -1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 15 "Net-(D56-K)") (pinfunction "K") (pintype "passive") (tstamp 3dae4154-f21a-4563-a80e-c8bfd262bc9d))
+    (pad "2" smd roundrect (at 1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 82 "Net-(D62-A)") (pinfunction "A") (pintype "passive") (tstamp db2c4130-9737-4d5d-ac72-e9891273e07e))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SOD-123.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -5008,8 +5220,8 @@
   )
 
   (footprint "Diode_SMD:D_SOD-123" (layer "B.Cu")
-    (tstamp 1f439497-e4f6-41c6-9b37-b8e721897794)
-    (at 336.07375 207.16875 180)
+    (tstamp 20312c72-6620-41bf-88fc-ccb5cea7cbd0)
+    (at 354.80625 107.15625)
     (descr "SOD-123")
     (tags "SOD-123")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
@@ -5018,60 +5230,60 @@
     (property "Sim.Pins" "1=K 2=A")
     (property "ki_description" "100V 0.15A standard switching diode, DO-35")
     (property "ki_keywords" "diode")
-    (path "/950c0abf-e0c0-4c84-a13d-0efd81d7eb44")
+    (path "/e820e00b-cc28-4c9d-bc6c-ddc968b2a710")
     (attr smd)
-    (fp_text reference "D42" (at 0 2) (layer "B.SilkS")
+    (fp_text reference "D33" (at 0 2) (layer "B.SilkS")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 60b3dd4d-5a51-477d-ac15-7a50a257febf)
+      (tstamp 11e3b900-4f9c-40cd-a716-8460108c762f)
     )
     (fp_text value "1N4148" (at 0 -2.1) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 2b1800f3-a7fa-4e8b-acb2-9ec9988cf906)
+      (tstamp e7be9083-e13d-47a4-a4b4-ccd2405000a3)
     )
     (fp_text user "${REFERENCE}" (at 0 2) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp d377a940-724d-46de-9f88-8cb71ca8dfa9)
+      (tstamp 7d50f776-8b1c-4207-bbbf-a4b3b0f1df3a)
     )
     (fp_line (start -2.36 -1) (end 1.65 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 43ee0e0a-ddc7-40e5-b75a-430d23314f8f))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 7293b643-fe34-4b5e-951f-e33e397c21c1))
     (fp_line (start -2.36 1) (end -2.36 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 22c60cd2-8a7f-4f1f-b7b7-d452c535c01e))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp e1f620b6-9dd5-4b87-8321-4118573fc966))
     (fp_line (start -2.36 1) (end 1.65 1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 4f8833af-dc68-43c8-8494-356ba864fdfe))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp a6b42d2f-b09b-42f3-9b95-dc507f786337))
     (fp_line (start -2.35 1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 46bff302-29f4-4569-9ca8-38af6b104584))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 52591464-4484-4e85-88cd-cf86a3297a94))
     (fp_line (start -2.35 1.15) (end 2.35 1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp c3d31492-c4eb-44b9-b398-738a6e6523cc))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp ee87a2fa-b8e1-408b-9d22-46cd86f12739))
     (fp_line (start 2.35 -1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 9ee4e58c-f65f-4053-aef6-9beb02c053c8))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp a816a097-8602-48bd-8aab-367a237d5877))
     (fp_line (start 2.35 1.15) (end 2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 3144ebf6-5847-4b37-90c9-1fc902f885c2))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 30ab6218-1e78-4625-be06-06a7b78cb92b))
     (fp_line (start -1.4 -0.9) (end -1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 4c4ea581-b912-4848-9d6d-9378745ab5c8))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp c5914497-1c2b-47f6-9192-7d09a7e8879f))
     (fp_line (start -1.4 0.9) (end 1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 3dd99141-cd53-4ff0-9de1-5c678265e02a))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp b9c3c179-987b-4edd-ba3f-3bdd2f65f138))
     (fp_line (start -0.75 0) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp c3a55754-6b4b-43c2-9bcd-1a3e433b5dc7))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 9800c6b6-2a09-42d4-ba6b-a787054fdacc))
     (fp_line (start -0.35 0) (end -0.35 -0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 96786367-7b10-4f10-972a-1f5bbe38c384))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp e1f5580d-6ce1-47fd-91ec-bad8ed65d2c7))
     (fp_line (start -0.35 0) (end -0.35 0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp e1f7f18b-207a-458f-aed8-946be004d14f))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 6d5a9b77-b499-43c2-a2cf-a295e3bebb76))
     (fp_line (start -0.35 0) (end 0.25 0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 73e654f7-f33f-4e58-b867-ecdcc7d7e89b))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 3c6b95b5-0ffd-48d2-814d-28c429940d9a))
     (fp_line (start 0.25 -0.4) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 25c84d2f-3007-4001-b30f-22906d0e19dd))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 65035d07-c4cb-42a9-a199-63b1f5fe2fcb))
     (fp_line (start 0.25 0) (end 0.75 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp f7901547-43bf-4e7f-9b5d-c9746faf17c1))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 97b4f779-8c21-4ae5-a9b6-a6c2747dd8a8))
     (fp_line (start 0.25 0.4) (end 0.25 -0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp ce188c9f-9112-401f-a5fc-9db0269836ea))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 43f16034-a22b-42ab-966a-8622ed0a333d))
     (fp_line (start 1.4 -0.9) (end -1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 1c2a22b2-d346-486b-a677-e27ec967b2a1))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 5e32aeba-ee03-4697-bf13-5ac0814531c2))
     (fp_line (start 1.4 0.9) (end 1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 5a7bb13f-8f95-41ce-bea5-5f87454f45ca))
-    (pad "1" smd roundrect (at -1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 48 "Net-(D42-K)") (pinfunction "K") (pintype "passive") (tstamp 9b24b24a-ea32-4f37-b3d1-756cc5093882))
-    (pad "2" smd roundrect (at 1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 47 "Net-(D41-A)") (pinfunction "A") (pintype "passive") (tstamp 6cfeb418-baef-4a16-a484-4c6a55c150ec))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp b9884707-4571-488a-83c9-8eb4c415f89d))
+    (pad "1" smd roundrect (at -1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 9 "Net-(D32-K)") (pinfunction "K") (pintype "passive") (tstamp 3a6cbec5-4eeb-4dba-bf86-fb0d73cd426e))
+    (pad "2" smd roundrect (at 1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 10 "Net-(D33-A)") (pinfunction "A") (pintype "passive") (tstamp 20b4a693-ae86-4f18-9fc8-c4d00a76f066))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SOD-123.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -5080,8 +5292,8 @@
   )
 
   (footprint "Diode_SMD:D_SOD-123" (layer "B.Cu")
-    (tstamp 20357069-f7aa-4b47-80a7-68e3f4078826)
-    (at 178.91125 169.06875 180)
+    (tstamp 204d6f5b-3bf3-45ff-96c4-04a6a070f7ad)
+    (at 307.18125 126.20625)
     (descr "SOD-123")
     (tags "SOD-123")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
@@ -5090,60 +5302,60 @@
     (property "Sim.Pins" "1=K 2=A")
     (property "ki_description" "100V 0.15A standard switching diode, DO-35")
     (property "ki_keywords" "diode")
-    (path "/5ac02523-35d4-467f-805a-71db2340c320")
+    (path "/4f7a9883-d3f2-48d1-ba1c-4cd704d6400b")
     (attr smd)
-    (fp_text reference "D37" (at 0 2) (layer "B.SilkS")
+    (fp_text reference "D44" (at 0 2) (layer "B.SilkS")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp e3b84f94-0318-4a6d-a5c4-666ee74fda41)
+      (tstamp 22b1b22b-950c-42a6-9935-32901bdde8ef)
     )
     (fp_text value "1N4148" (at 0 -2.1) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp d216db3a-17c4-428f-85ae-1c701464faa6)
+      (tstamp a33b7174-2014-479e-af3a-2b888dee46c5)
     )
     (fp_text user "${REFERENCE}" (at 0 2) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 0fc21e95-0b4f-49f8-bcc2-5df64e908cf8)
+      (tstamp f1430f8e-9465-415c-ae46-5c72f90d298c)
     )
     (fp_line (start -2.36 -1) (end 1.65 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 8e02db43-50c4-477d-9c5e-b40d747c6b43))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp e825f194-a815-4c10-b0e3-e1a1db751fce))
     (fp_line (start -2.36 1) (end -2.36 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp fea66370-314b-4a72-8114-fb47177ec095))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp c9a11df8-d197-40e7-8bf5-a04c17c64b2b))
     (fp_line (start -2.36 1) (end 1.65 1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 803af1e3-e7ac-4311-a1ad-6c4be2b0f199))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp eae3c1c8-b594-4637-b12e-9a9849931987))
     (fp_line (start -2.35 1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp b9ecb1f3-3298-49b4-b231-f6ba5b78f3be))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp b129821a-96c4-4421-8d3f-554e58c0343d))
     (fp_line (start -2.35 1.15) (end 2.35 1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp ea224e45-f16a-448a-b403-a5c2d8f49217))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp a1d4dbad-7ecb-4b8f-921c-80dbb44eafa7))
     (fp_line (start 2.35 -1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 400ca727-a5ea-489f-a7ac-846ef9e1f3a7))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp f17f3f9d-6a08-425e-a1bf-75bf2faad2ce))
     (fp_line (start 2.35 1.15) (end 2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 29afd029-0527-49cd-90e5-48017d0348f0))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp f26216dd-9978-4de9-9606-04b7414110be))
     (fp_line (start -1.4 -0.9) (end -1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 27a80607-2c36-4980-bf10-5b79bef1d863))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 881d1eb1-361d-40b9-9ad2-1887de4d4a04))
     (fp_line (start -1.4 0.9) (end 1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 2f69efb9-2975-44d5-ad89-0efe2bbff896))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 371e7f51-6a8d-4d6c-aaad-ce69080398e9))
     (fp_line (start -0.75 0) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 10a7cb4c-4bc6-4732-bd86-112cb93e5913))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 103c866c-2b0d-4a26-b85c-3d2814658804))
     (fp_line (start -0.35 0) (end -0.35 -0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp ab2ca48d-c6b0-43c2-893b-2093e14221d7))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 1fe5bd9d-a1b6-45bb-8942-cf72aea92e69))
     (fp_line (start -0.35 0) (end -0.35 0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp ba1fbb6f-a792-441d-acfd-342a6752a679))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 2b88b34c-e185-4eb0-a53d-37f691918606))
     (fp_line (start -0.35 0) (end 0.25 0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 5cb67b0d-e475-453f-a3e9-df5470c50621))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 536634c6-95ff-4c3c-b41d-629dcdd34c04))
     (fp_line (start 0.25 -0.4) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 52debce1-5a02-4f1f-8906-a13b86d0a4be))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 60ea13cd-c950-439d-b98a-4c7e16ef8f16))
     (fp_line (start 0.25 0) (end 0.75 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 0103df3f-e024-4e3e-b59f-09d1a907bc8b))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 889f2b19-dca1-476a-8219-5fac4495efb0))
     (fp_line (start 0.25 0.4) (end 0.25 -0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp d8f0969c-dcec-4815-961b-bb8c7a27a2c9))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 38fde306-624b-4528-8a9e-f077433d5323))
     (fp_line (start 1.4 -0.9) (end -1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 3f6452c5-7b6e-4f97-9630-547c9b30cd53))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp b129cb51-ea79-4b80-86e9-d9ba4c9cb663))
     (fp_line (start 1.4 0.9) (end 1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp f09534b4-1a1e-4f8f-805c-4022ddf81a2d))
-    (pad "1" smd roundrect (at -1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 42 "Net-(D37-K)") (pinfunction "K") (pintype "passive") (tstamp ad230cc1-fda8-458f-b444-6523176b761e))
-    (pad "2" smd roundrect (at 1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 38 "Net-(D33-A)") (pinfunction "A") (pintype "passive") (tstamp c0dae515-5a25-4865-829f-05e955533bbd))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 97dd22eb-2774-42d2-a014-0e9955c326dc))
+    (pad "1" smd roundrect (at -1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 11 "Net-(D40-K)") (pinfunction "K") (pintype "passive") (tstamp 22a9e93b-bbe5-441c-9e76-7be0041ead94))
+    (pad "2" smd roundrect (at 1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 66 "Net-(D44-A)") (pinfunction "A") (pintype "passive") (tstamp 679e1039-a223-4b7e-bbee-6fb2a23dd3ef))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SOD-123.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -5152,8 +5364,8 @@
   )
 
   (footprint "Diode_SMD:D_SOD-123" (layer "B.Cu")
-    (tstamp 24d214f4-f9d5-4ecd-99a1-524827293fe8)
-    (at 169.38625 188.11875 180)
+    (tstamp 2167e990-08d6-4346-9ae2-68448d92c6f8)
+    (at 126.20625 107.15625)
     (descr "SOD-123")
     (tags "SOD-123")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
@@ -5162,60 +5374,60 @@
     (property "Sim.Pins" "1=K 2=A")
     (property "ki_description" "100V 0.15A standard switching diode, DO-35")
     (property "ki_keywords" "diode")
-    (path "/324a56d6-9167-4809-9886-3cfcc0b8dce4")
+    (path "/0420666a-00db-4016-b8b3-10201d1dcdda")
     (attr smd)
-    (fp_text reference "D50" (at 0 2) (layer "B.SilkS")
+    (fp_text reference "D3" (at 0 2) (layer "B.SilkS")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 2ee14e16-603b-4d7e-b815-113d33600b69)
+      (tstamp 53571866-26a5-436a-a0fd-db9a7b2a862e)
     )
     (fp_text value "1N4148" (at 0 -2.1) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 769f1a04-5865-47b0-a034-84d6bf8acb74)
+      (tstamp 732b42e3-22c6-485b-825e-a9b4380f0133)
     )
     (fp_text user "${REFERENCE}" (at 0 2) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 9d0f274f-a33f-4583-8c88-bddb5c42080e)
+      (tstamp f9a26d80-3cc2-4f74-94ad-902b07753b25)
     )
     (fp_line (start -2.36 -1) (end 1.65 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 338d809d-6af6-4501-b8c4-7cfd893ef606))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 2d838d78-0a2c-4d15-a795-26946113599b))
     (fp_line (start -2.36 1) (end -2.36 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp d5e432ff-e4fa-4442-bc56-07c9c91b0be6))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp bb144933-fe71-4c4f-8ceb-9ca0c3033e82))
     (fp_line (start -2.36 1) (end 1.65 1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 4f57604a-6c32-448f-b596-29add9f26dd1))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 6c569967-bcf0-4457-9578-e2abceb494f1))
     (fp_line (start -2.35 1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 556e54e4-82ad-4b4f-9b22-f37c1e57f16d))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 55f64f4c-29a2-4c21-9fd5-4aba4d0e58e6))
     (fp_line (start -2.35 1.15) (end 2.35 1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp bcbca02f-241d-4b15-accb-b7557b5969a1))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 5ba5e7d7-d1b3-401c-8a68-fb1fb3d8c91a))
     (fp_line (start 2.35 -1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp c48be03e-235e-4d90-90da-8ca95b1757a7))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 940563a1-056f-4722-969d-0527831fb426))
     (fp_line (start 2.35 1.15) (end 2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 46fc4160-fd6a-49fa-bc94-a514ca231a29))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 076451eb-983d-4a5e-a33f-7d3816dfbb05))
     (fp_line (start -1.4 -0.9) (end -1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 64ed49f5-f5fa-45c4-b640-2f13bb55beb5))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp befdd251-021f-4406-9da3-e854e7a96bc3))
     (fp_line (start -1.4 0.9) (end 1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp c1f53abe-62c2-43d1-8ccd-5bf54cbe8e1d))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 31864c4a-0417-4668-9628-b1852d352ce9))
     (fp_line (start -0.75 0) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp b9df6521-262d-4faa-a19f-a493c3bc5dac))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 3d379aee-4849-47b6-b477-237424c22f5f))
     (fp_line (start -0.35 0) (end -0.35 -0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 380f2d56-53e6-4bab-ab71-8bfad6e5aabd))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 8053942c-82d7-4143-a1d2-91ca1e1b0079))
     (fp_line (start -0.35 0) (end -0.35 0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 819777c1-1fda-4c36-b243-64ba86c43082))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp d6601026-fa7c-4d3c-a1b9-674f24fc249d))
     (fp_line (start -0.35 0) (end 0.25 0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp b25f82ae-64d3-4675-967f-a380b4388b88))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp cec986f4-9334-4e38-ab8f-e625b7df61e0))
     (fp_line (start 0.25 -0.4) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 1274cbbe-7346-4b0f-96a5-35ac8709d6e9))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 907122cd-494f-4777-a0b9-6288c84708a4))
     (fp_line (start 0.25 0) (end 0.75 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp b8750b96-e8fb-4924-a73b-2edef40dacd5))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 6043549e-9f55-4616-be26-946bd4822386))
     (fp_line (start 0.25 0.4) (end 0.25 -0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 54a3142c-217d-4bf7-80fd-c71ba407bd61))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp a545cfaf-5c00-4a05-937f-b0e70fa8e9ff))
     (fp_line (start 1.4 -0.9) (end -1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp dc935e8a-7039-4780-b686-17f5e848e308))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 63734935-becf-4e1d-8be8-439a3ac89a76))
     (fp_line (start 1.4 0.9) (end 1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 236f60d5-d23d-422c-9424-7063e8a1a585))
-    (pad "1" smd roundrect (at -1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 57 "Net-(D50-K)") (pinfunction "K") (pintype "passive") (tstamp 6355c84f-f3ea-492a-afc2-98b1360f2136))
-    (pad "2" smd roundrect (at 1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 56 "Net-(D49-A)") (pinfunction "A") (pintype "passive") (tstamp 6796d477-8e6b-4b34-971e-a0f8a24ec549))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp a97850a1-6f66-4ff7-bc14-b4bca4f91764))
+    (pad "1" smd roundrect (at -1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 1 "Net-(D1-K)") (pinfunction "K") (pintype "passive") (tstamp 9aaf477b-5393-4f03-ad6e-36c38bddce21))
+    (pad "2" smd roundrect (at 1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 30 "Net-(D3-A)") (pinfunction "A") (pintype "passive") (tstamp d637effb-1fd5-4c04-89ec-a8660b5c08a2))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SOD-123.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -5224,8 +5436,8 @@
   )
 
   (footprint "Diode_SMD:D_SOD-123" (layer "B.Cu")
-    (tstamp 27455f61-0910-4cef-b7be-3f1e5a8f8c49)
-    (at 259.87375 130.96875 180)
+    (tstamp 26e46764-6044-42be-9574-cb7a22caba32)
+    (at 240.50625 107.15625)
     (descr "SOD-123")
     (tags "SOD-123")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
@@ -5234,60 +5446,60 @@
     (property "Sim.Pins" "1=K 2=A")
     (property "ki_description" "100V 0.15A standard switching diode, DO-35")
     (property "ki_keywords" "diode")
-    (path "/1fbc8990-d89d-42de-abfb-87272828b11a")
+    (path "/98f56fc2-e4e4-4b24-be47-421b73dd0e3b")
     (attr smd)
-    (fp_text reference "D15" (at 0 2) (layer "B.SilkS")
+    (fp_text reference "D39" (at 0 2) (layer "B.SilkS")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp e2fa332e-4e84-4fa2-9b18-507ba1ea9890)
+      (tstamp 3f1a0a33-d8de-4576-af44-75db6184bba9)
     )
     (fp_text value "1N4148" (at 0 -2.1) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp cfcac8d5-233d-464e-843b-4fecb9bad87e)
+      (tstamp e5bb20bc-3a3b-4969-a9af-8ca071d0c67a)
     )
     (fp_text user "${REFERENCE}" (at 0 2) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 93b4f6b3-34dd-4593-8f65-468ec0714697)
+      (tstamp 86533203-fb67-49f5-b936-41a5eeecb8a5)
     )
     (fp_line (start -2.36 -1) (end 1.65 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp c80d450a-c7da-4478-9b39-c7c75c361054))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp cc440eb8-16f4-4a80-9732-fcea2e499c3d))
     (fp_line (start -2.36 1) (end -2.36 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp ea6b8a02-e754-42d7-bc1d-678ca9109aee))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 0cbbcdc4-cbd5-4780-a49b-9f5fd61c059d))
     (fp_line (start -2.36 1) (end 1.65 1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 4cd82392-aa99-46ff-a3ec-3f15652e895b))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 2fe882b4-2702-4c2e-97fe-81d0029af398))
     (fp_line (start -2.35 1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp a2efa58d-05f7-43f5-9296-2c58aa062b08))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 4dc5ff4e-8e70-4d7b-8918-9f81999525e2))
     (fp_line (start -2.35 1.15) (end 2.35 1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp bc937c23-85d3-40bc-bb65-d2093def80fb))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 187d24bc-a459-4e9a-ace1-a491def40b3c))
     (fp_line (start 2.35 -1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 6464c944-7a52-4628-b307-0765ed0afadb))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 184320dc-b2ca-41c4-ac01-78fc4563bd71))
     (fp_line (start 2.35 1.15) (end 2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 861d3980-cf14-4909-86bc-2a370a03255d))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 418074c7-f389-482d-874e-05e34bc5be20))
     (fp_line (start -1.4 -0.9) (end -1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp f168db88-3667-4c23-a2ee-477f02bfb5a5))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp beb29da6-4b5a-4442-841d-5ac8afa41c78))
     (fp_line (start -1.4 0.9) (end 1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp bc1857cf-0ba6-4a24-8f39-1186f6c7886f))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 6f68aeaa-4c62-4759-991c-b5bc565cac29))
     (fp_line (start -0.75 0) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp b83c1b00-2706-4330-b994-18b53420e052))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 42636842-9481-46ba-b63b-6fff9987f569))
     (fp_line (start -0.35 0) (end -0.35 -0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 12d3db15-1311-44e3-97ec-b9dd6dc83079))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 14bf552c-82ed-4b4a-8b2f-8fa283894a67))
     (fp_line (start -0.35 0) (end -0.35 0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 7508c934-031f-42fc-be58-88dd9afba328))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 48803f29-d9dd-455a-ada3-f78a452d5553))
     (fp_line (start -0.35 0) (end 0.25 0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 3838571c-3c77-47f9-9f2c-30f73ff2a2e5))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 3a7eaa9b-b0c8-417b-a557-231c3318536e))
     (fp_line (start 0.25 -0.4) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 67ac9c20-f83b-416b-aebf-54a0064d2c0d))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp e072714a-896a-4f60-9c49-634288ce4895))
     (fp_line (start 0.25 0) (end 0.75 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 1916e19f-e919-4ea7-950d-ea111f824e50))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 7973f79a-7676-4b8d-95d8-b0706e4fb535))
     (fp_line (start 0.25 0.4) (end 0.25 -0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 7f58da60-bdee-42f8-80f4-e5bde0147012))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 3ce7ac77-dacf-40b6-8c54-51b727a154d1))
     (fp_line (start 1.4 -0.9) (end -1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 4852ff7b-da27-40ce-b83d-0518fa127660))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 8a80e6f7-7870-41e5-ad56-159340f8f368))
     (fp_line (start 1.4 0.9) (end 1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp e922eb49-dc12-45cd-86fa-10fbf9eab7e2))
-    (pad "1" smd roundrect (at -1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 17 "Net-(D15-K)") (pinfunction "K") (pintype "passive") (tstamp f360096f-1313-44f8-ada8-eebc5c63166b))
-    (pad "2" smd roundrect (at 1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 11 "Net-(D10-A)") (pinfunction "A") (pintype "passive") (tstamp adf22c04-0ee1-4e15-9319-45dd38c25161))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 099b4d3a-dde6-4d77-901c-72c96816d179))
+    (pad "1" smd roundrect (at -1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 9 "Net-(D32-K)") (pinfunction "K") (pintype "passive") (tstamp 6eed940b-e202-4052-8f02-e0bde09ea51f))
+    (pad "2" smd roundrect (at 1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 62 "Net-(D39-A)") (pinfunction "A") (pintype "passive") (tstamp 85cc44de-570a-46e2-8016-e300d13b2b73))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SOD-123.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -5296,8 +5508,8 @@
   )
 
   (footprint "Diode_SMD:D_SOD-123" (layer "B.Cu")
-    (tstamp 28140478-abd6-4497-83fd-39c4cbda8d4f)
-    (at 159.86125 169.06875 180)
+    (tstamp 2967b1b9-5138-46a0-9504-a6a2354fe9b6)
+    (at 230.98125 126.20625)
     (descr "SOD-123")
     (tags "SOD-123")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
@@ -5306,60 +5518,60 @@
     (property "Sim.Pins" "1=K 2=A")
     (property "ki_description" "100V 0.15A standard switching diode, DO-35")
     (property "ki_keywords" "diode")
-    (path "/5bd3d315-43f0-4ab8-92b2-61affd61589c")
+    (path "/7e86451c-aadf-4fec-b580-ad83be680213")
     (attr smd)
-    (fp_text reference "D36" (at 0 2) (layer "B.SilkS")
+    (fp_text reference "D16" (at 0 2) (layer "B.SilkS")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp dc3b4fb9-d8d9-44b1-bbd0-4deea280edd3)
+      (tstamp ee2ea719-b068-418a-88e0-21f618838f5b)
     )
     (fp_text value "1N4148" (at 0 -2.1) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 24fa27eb-452b-4378-99ea-ee78a90988ca)
+      (tstamp 7ee6dce6-0588-45d2-976d-7da048be4ef2)
     )
     (fp_text user "${REFERENCE}" (at 0 2) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp d9be652c-fbb3-4995-955f-c1b33fac6f40)
+      (tstamp a0a3e977-35c5-439a-8aed-b25b6ce0872d)
     )
     (fp_line (start -2.36 -1) (end 1.65 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 6fe72d95-c580-466d-8362-27a511a6651d))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp d3122a6b-fac5-4b87-af35-693ff9a50d92))
     (fp_line (start -2.36 1) (end -2.36 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp c2de678f-5a46-444f-96cd-c24ff123786e))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp bdece1a1-197e-4209-8831-1a275d59ed3d))
     (fp_line (start -2.36 1) (end 1.65 1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp eb79ac87-7356-4798-ad7e-e22800f0a782))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 6891e694-1758-4c79-8e15-255cee51168d))
     (fp_line (start -2.35 1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp f33ef8bf-dd60-4bd6-bbb5-50b654342b3e))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp e11b2212-2276-48fc-9382-f76e83dbf20b))
     (fp_line (start -2.35 1.15) (end 2.35 1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 2bac1b9a-39f1-4a32-86ff-5aff2c5d6b68))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp a568798e-309a-410f-9093-c50e0e312f08))
     (fp_line (start 2.35 -1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 98464c13-2f20-44c3-8f94-65b8582271c9))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 1bc8e41f-66bc-4d94-966c-0844b77771c6))
     (fp_line (start 2.35 1.15) (end 2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp e0350506-deb1-44b2-81b5-c19b12daa2c2))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 3a958148-0da3-4a8b-b812-d21acdc92fb0))
     (fp_line (start -1.4 -0.9) (end -1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 097511df-8dab-4c3e-b089-b4f28e62dca1))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 0eeb02b6-67e8-4c08-8e9e-be0d849d71a7))
     (fp_line (start -1.4 0.9) (end 1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 946dc612-e6c8-4a3f-9cd8-cb6fb3541974))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 1cacc3ba-ade1-4b2a-8017-11a72b80d9a2))
     (fp_line (start -0.75 0) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 9173cec7-f262-43a0-aa0c-c12c39439eab))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 975cf897-61ff-4b15-abe9-59e57579106d))
     (fp_line (start -0.35 0) (end -0.35 -0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 22212e7e-876b-4d7c-84cc-bb256c400d7a))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 827e32bf-fda0-4b3f-97b7-9856db1062f5))
     (fp_line (start -0.35 0) (end -0.35 0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 590e6774-b8f7-472e-87a7-6c9963b6e1d0))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp cc92e544-af92-4643-b193-4a6dfb363662))
     (fp_line (start -0.35 0) (end 0.25 0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 18475132-45c4-4243-8cb8-d446162b51b8))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 5ead14a1-6651-4e0e-82d2-4c2bbe4278cd))
     (fp_line (start 0.25 -0.4) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp c58e04dd-fb2a-4f64-aa2f-8d645c369011))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 8f3adc8e-2e6f-4fc7-8abd-9a8e0468426d))
     (fp_line (start 0.25 0) (end 0.75 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 72fe9da0-7c3a-4da3-af1c-0db59133e30a))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 5ff48673-1b5b-4c06-9c7c-613504f09067))
     (fp_line (start 0.25 0.4) (end 0.25 -0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 8c681882-654c-41b0-a115-d0db0f5d44f9))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp c0eb554b-807f-43a6-8071-6ddc2d1111e1))
     (fp_line (start 1.4 -0.9) (end -1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp da4be1af-4301-4079-83d5-5b6de0c671f9))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 2524f046-b742-4b83-8e15-ac8b461f7cc0))
     (fp_line (start 1.4 0.9) (end 1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp b097a6b2-d14a-4298-a94c-2b227270b745))
-    (pad "1" smd roundrect (at -1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 41 "Net-(D36-K)") (pinfunction "K") (pintype "passive") (tstamp 7737f38c-c1ec-4b64-b1f6-c6327e5d9d3b))
-    (pad "2" smd roundrect (at 1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 38 "Net-(D33-A)") (pinfunction "A") (pintype "passive") (tstamp ad666e29-e64b-48e7-b088-1b4ce9458d87))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp f5907541-ac13-4720-a934-4664f0f3f411))
+    (pad "1" smd roundrect (at -1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 4 "Net-(D10-K)") (pinfunction "K") (pintype "passive") (tstamp 924c0160-1682-4c66-a9e5-9f496bc1821a))
+    (pad "2" smd roundrect (at 1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 42 "Net-(D16-A)") (pinfunction "A") (pintype "passive") (tstamp bb232dc7-fbfa-482f-9a46-942813ef5229))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SOD-123.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -5368,8 +5580,8 @@
   )
 
   (footprint "Diode_SMD:D_SOD-123" (layer "B.Cu")
-    (tstamp 290d1d65-a62b-40d8-9a59-40526e7a9a2c)
-    (at 116.99875 207.16875 180)
+    (tstamp 2b4d3bf5-886a-4e3d-9ecf-f1b8cc2cb686)
+    (at 250.03125 126.20625)
     (descr "SOD-123")
     (tags "SOD-123")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
@@ -5378,60 +5590,60 @@
     (property "Sim.Pins" "1=K 2=A")
     (property "ki_description" "100V 0.15A standard switching diode, DO-35")
     (property "ki_keywords" "diode")
-    (path "/ae0ae86d-03be-43ac-b332-a3f1441a8f55")
+    (path "/947f8f66-c061-4742-91f3-b722faabf557")
     (attr smd)
-    (fp_text reference "D33" (at 0 2) (layer "B.SilkS")
+    (fp_text reference "D47" (at 0 2) (layer "B.SilkS")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 9c0a1fd7-77aa-420a-9f8b-675a834b078b)
+      (tstamp 0ac21853-8585-45ce-a148-18c53f82d12d)
     )
     (fp_text value "1N4148" (at 0 -2.1) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 8486573d-aa2f-4c11-9027-1578829e0b27)
+      (tstamp 5ff91f33-3746-4a6b-a33c-24a1a46951a6)
     )
     (fp_text user "${REFERENCE}" (at 0 2) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 2a918292-7aeb-439c-bac7-b7495be1be51)
+      (tstamp d34971a3-9981-48b0-b7ab-16c1d36ac3ce)
     )
     (fp_line (start -2.36 -1) (end 1.65 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp c822ba98-bcd4-4803-9282-ca08214e7483))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 6ac14c99-a590-4aa4-9185-874b6858f12f))
     (fp_line (start -2.36 1) (end -2.36 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 0b30f8ce-cfbe-482b-8f7c-ee4dcac1585c))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp e50ec4e0-9198-4ed8-a129-16b0f3c7f283))
     (fp_line (start -2.36 1) (end 1.65 1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp cb3d6681-4e9f-4f55-8837-930d6644e163))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 6c26b880-6bba-40f1-8d88-09f049305ad8))
     (fp_line (start -2.35 1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp e52ba754-fb9c-4d4a-a71f-1ddfd54b276b))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 0d975e1e-dae8-4697-b755-2e2875dfce17))
     (fp_line (start -2.35 1.15) (end 2.35 1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp c810661a-a717-4c40-b2fe-2126aeb27dac))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp d9dbb575-8fc5-4a8a-934e-0a9c06b65092))
     (fp_line (start 2.35 -1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp d246ff98-2a79-4b29-95e3-73632b00f60e))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 0499c8e1-da4f-4fd8-99dd-087b450a3068))
     (fp_line (start 2.35 1.15) (end 2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp ff3a21f3-b259-430e-90eb-d79e043e5225))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp a9b934d0-882a-408f-84c3-d2abb39ffaa6))
     (fp_line (start -1.4 -0.9) (end -1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 6f298705-5bc1-46ad-b566-ed6af9ce2a0c))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 9964f2dc-9094-47d3-b376-ee5925fa9036))
     (fp_line (start -1.4 0.9) (end 1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 1e278e8b-c585-41d5-ac3c-09d5a128bc2f))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 052a716a-1020-4c5f-8bb8-88a58fefde34))
     (fp_line (start -0.75 0) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp ffc9f179-8448-44f3-9adc-1d9fa1ebc295))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp ddffb2ce-bc2f-4b68-a580-2d72194dff31))
     (fp_line (start -0.35 0) (end -0.35 -0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 72bfd278-c586-4954-ad8c-0ce7c3a6bb28))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp b86e41ca-d6eb-41d6-bf32-a50bb38a04d5))
     (fp_line (start -0.35 0) (end -0.35 0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp f831f067-5dd7-437d-b56e-fbe8e59e66c7))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 6dbdeb62-1fe4-4284-b355-6aba06d240c6))
     (fp_line (start -0.35 0) (end 0.25 0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 6a385e5a-bf25-4c72-965b-f20deb0bd60d))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 2e21d8df-0aa7-462f-868d-518f80bccb3b))
     (fp_line (start 0.25 -0.4) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 34a4ca97-d596-4d7c-a708-b6b53e1b5886))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp dff3eaed-4aec-47f3-bdb0-e688ce549b03))
     (fp_line (start 0.25 0) (end 0.75 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 1ba45e43-42e3-4cf6-bec1-3734fda05365))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 5c3015c4-d21b-4ee7-8682-ed7b3ee4edaf))
     (fp_line (start 0.25 0.4) (end 0.25 -0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp ee649664-3760-484f-aae0-24dce5a85b80))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 31c30bc9-ceb9-4913-916a-2820149bc20f))
     (fp_line (start 1.4 -0.9) (end -1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 0170184d-1eef-4558-aa97-7ba9b369b6be))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp fc1c942b-2d31-4846-9415-55e96626888c))
     (fp_line (start 1.4 0.9) (end 1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 2af5b2f9-8c87-4c6e-a39e-b642b4d7843f))
-    (pad "1" smd roundrect (at -1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 37 "Net-(D33-K)") (pinfunction "K") (pintype "passive") (tstamp 559fabac-6503-4d54-9a0d-3160a96fc5ad))
-    (pad "2" smd roundrect (at 1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 38 "Net-(D33-A)") (pinfunction "A") (pintype "passive") (tstamp 2af2128b-b8bf-406a-bbec-836dd76cc885))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp a7ce2689-59bd-410a-98e0-ca269e502d35))
+    (pad "1" smd roundrect (at -1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 11 "Net-(D40-K)") (pinfunction "K") (pintype "passive") (tstamp 011dd71c-c923-4ea2-8890-ced87ebb74a9))
+    (pad "2" smd roundrect (at 1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 69 "Net-(D47-A)") (pinfunction "A") (pintype "passive") (tstamp d948a701-de62-4956-a171-0b7a16cb81b9))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SOD-123.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -5440,8 +5652,8 @@
   )
 
   (footprint "Diode_SMD:D_SOD-123" (layer "B.Cu")
-    (tstamp 2efa7a31-61a1-45e0-b207-a3331df420c1)
-    (at 336.07375 130.96875 180)
+    (tstamp 2da85951-09aa-4048-ab59-ee841a8d979a)
+    (at 316.70625 183.35625)
     (descr "SOD-123")
     (tags "SOD-123")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
@@ -5450,60 +5662,60 @@
     (property "Sim.Pins" "1=K 2=A")
     (property "ki_description" "100V 0.15A standard switching diode, DO-35")
     (property "ki_keywords" "diode")
-    (path "/3d0e8f57-72fe-4242-86a0-671550efecc7")
+    (path "/a458ea56-ae87-4620-bc9e-8457d3c7c573")
     (attr smd)
-    (fp_text reference "D11" (at 0 2) (layer "B.SilkS")
+    (fp_text reference "D50" (at 0 2) (layer "B.SilkS")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 00fac871-c322-49e1-b6a0-c35191d46651)
+      (tstamp e17169e9-cc6e-448e-9a9d-920f4f56a20b)
     )
     (fp_text value "1N4148" (at 0 -2.1) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp bdbe96f6-2f77-4bba-b6f3-9e46c627c744)
+      (tstamp 9bf06452-199a-4b22-aa39-d05ea9b693fa)
     )
     (fp_text user "${REFERENCE}" (at 0 2) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp d3310905-9073-4b29-90ec-a6cf0e345d89)
+      (tstamp bfe0e9f9-2c7e-4fca-b62a-6fd40621d2f9)
     )
     (fp_line (start -2.36 -1) (end 1.65 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp acff2a39-cf72-45d9-b140-fc4b8729a724))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 04e9c607-beb3-48ab-85b7-f69eed3058fe))
     (fp_line (start -2.36 1) (end -2.36 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp b041688d-2477-462d-9367-c1e35d52cf31))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp d8d7c59e-5ed2-462e-922f-0e00a6cc1875))
     (fp_line (start -2.36 1) (end 1.65 1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp c3028caf-5802-4cd6-8371-e55a179236fa))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 63bce12c-ad9d-4a02-9817-775bdd02d630))
     (fp_line (start -2.35 1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp e0196c40-7062-4d83-aef3-bda49010be18))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 8302e1aa-a15c-40ab-ae0a-c07d8db68b6c))
     (fp_line (start -2.35 1.15) (end 2.35 1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 9349bbdd-0149-4222-8663-57511fdfbb7a))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 33690c7f-20a4-41ee-936d-372f9ecda386))
     (fp_line (start 2.35 -1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 74281ffe-3238-4b34-ae53-b5d8531b8c42))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 46c4f02e-0c5e-4fb9-b5db-aa76de3f7a39))
     (fp_line (start 2.35 1.15) (end 2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 9198c582-13e1-4176-a79a-d7196c539bca))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 2ae510a5-f455-4063-b9d1-17ab797e9453))
     (fp_line (start -1.4 -0.9) (end -1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp debd4a05-d3de-4265-99d7-8ca3444c0812))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 7a611854-1787-493d-b88e-c3a13fb095dd))
     (fp_line (start -1.4 0.9) (end 1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp d6615628-d364-4da7-91ce-6eccebd33d75))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 1353bf00-69a0-4c12-a870-70b4ed625404))
     (fp_line (start -0.75 0) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 3331df79-2ecd-4955-af50-43f9bbbccb3e))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 94baa7a3-abc8-4c12-bd30-ad60acd96a7c))
     (fp_line (start -0.35 0) (end -0.35 -0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 50600654-f4e0-4c24-8818-92868b9c06cf))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 0ffbcbe3-4416-4633-a4d9-7bf3f0bd5f04))
     (fp_line (start -0.35 0) (end -0.35 0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp eca02bcb-146e-43a4-b29a-4b19950d0822))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 88f4fa67-95bf-4863-b7af-14870a76ff33))
     (fp_line (start -0.35 0) (end 0.25 0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 6ce58f4b-69d4-4b22-bba7-a1204637eabb))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp c164aa63-a201-4826-85b3-f44e0f9cb326))
     (fp_line (start 0.25 -0.4) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 82110c40-367b-4085-a4e2-bc059991dfbc))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 112347a4-fe2a-4126-8145-9b4e4457f845))
     (fp_line (start 0.25 0) (end 0.75 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 177ace7b-97fb-41ec-91be-b22ac8117d61))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 92119a55-df86-44d3-a3d0-f5448aef815d))
     (fp_line (start 0.25 0.4) (end 0.25 -0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 5b285deb-3688-478e-991c-c1e1562ec3ce))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp fbc6d1e2-7cef-4b2d-9a82-7dd47e1c580b))
     (fp_line (start 1.4 -0.9) (end -1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 182a3501-e5ae-4a53-8326-356ee5c284b6))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp bfd9e292-3a37-4227-90a5-e632658b98b1))
     (fp_line (start 1.4 0.9) (end 1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 9a2aac2d-4140-4358-8945-23f5b5c7cdde))
-    (pad "1" smd roundrect (at -1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 13 "Net-(D11-K)") (pinfunction "K") (pintype "passive") (tstamp 214093ae-34a1-4274-ba5d-d09305e5cc95))
-    (pad "2" smd roundrect (at 1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 11 "Net-(D10-A)") (pinfunction "A") (pintype "passive") (tstamp 669ad3c1-110f-4cc7-a3da-aa1b48fd9577))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp b95e8120-e76d-4387-afb8-f4e26160e55a))
+    (pad "1" smd roundrect (at -1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 13 "Net-(D48-K)") (pinfunction "K") (pintype "passive") (tstamp 88e90d64-8892-421d-a6da-18e80fd8358b))
+    (pad "2" smd roundrect (at 1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 71 "Net-(D50-A)") (pinfunction "A") (pintype "passive") (tstamp 901eaebc-e93c-44eb-8463-ea513082fb1a))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SOD-123.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -5512,8 +5724,8 @@
   )
 
   (footprint "Diode_SMD:D_SOD-123" (layer "B.Cu")
-    (tstamp 331061a4-0cc1-4f94-96e5-d12b13b5574c)
-    (at 164.62375 130.96875 180)
+    (tstamp 2ffa005f-b338-4d3e-8a2d-ff6ed2c6d73b)
+    (at 226.21875 164.30625)
     (descr "SOD-123")
     (tags "SOD-123")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
@@ -5522,60 +5734,60 @@
     (property "Sim.Pins" "1=K 2=A")
     (property "ki_description" "100V 0.15A standard switching diode, DO-35")
     (property "ki_keywords" "diode")
-    (path "/b9f087c5-ffd9-4d6a-8dd2-5c528a8a82ff")
+    (path "/181fdda5-a45f-4107-ad6f-7b0b26a8caf4")
     (attr smd)
-    (fp_text reference "D5" (at 0 2) (layer "B.SilkS")
+    (fp_text reference "D29" (at 0 2) (layer "B.SilkS")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 427d46c4-7adf-4e3e-aa30-21e9f8e50065)
+      (tstamp fe9308a1-48aa-43e7-a2a3-553b773710f7)
     )
     (fp_text value "1N4148" (at 0 -2.1) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp d29aff2f-643b-4f6c-afb1-d3085345b3a4)
+      (tstamp abbe2fa4-fe6c-4653-bfba-3b20ea596cff)
     )
     (fp_text user "${REFERENCE}" (at 0 2) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 5ba388d7-a74e-4e77-a86c-6edae4f55aaa)
+      (tstamp 7390969c-9d65-4212-8288-7d754a9ac636)
     )
     (fp_line (start -2.36 -1) (end 1.65 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp b0d73dce-a256-4a79-99bf-e9cc3924f12c))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp f484f057-8bad-4daf-8971-7e0c10058849))
     (fp_line (start -2.36 1) (end -2.36 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 8b3503e1-51ab-405a-aeac-09083baf3313))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 82c6bb65-771a-4865-9465-9d439bb51c28))
     (fp_line (start -2.36 1) (end 1.65 1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 11015483-4d67-45d8-9b3c-931175f57bdf))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 0afce32d-04a8-4942-a333-e575fc9373fe))
     (fp_line (start -2.35 1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 838331ec-2c46-4c82-9354-fd7663f737ca))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 2e746512-e402-470a-941c-0865187cdb99))
     (fp_line (start -2.35 1.15) (end 2.35 1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 962c6f97-4016-4add-8707-aa947ee8e71e))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp d0c2de5e-0906-435a-bbdb-7656ed5afe7e))
     (fp_line (start 2.35 -1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 3863afa8-aec1-49a0-99a2-b4d27eb18dea))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp ad917787-89d9-41e5-930e-65ff5dbf5aa8))
     (fp_line (start 2.35 1.15) (end 2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp a4b5ef11-24db-40ad-bb3d-bfdd02b1830f))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp d85d5257-511a-4024-b224-44df8f1335b4))
     (fp_line (start -1.4 -0.9) (end -1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 3477be9c-877f-48a5-82e6-8be4b71ab820))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp e8e5e59c-6bd7-4cc7-b9b8-be7204244ea0))
     (fp_line (start -1.4 0.9) (end 1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 663878b8-f9dc-4569-b82c-b6c0d89cceab))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp d47d698d-0375-48f2-9f09-5a534db01e55))
     (fp_line (start -0.75 0) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp df5d468a-5ec4-4af8-af08-256791fa4c0b))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp b36f248b-8656-4e6d-9ff5-04f99b14895f))
     (fp_line (start -0.35 0) (end -0.35 -0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp a3254b84-2f09-42f3-b42a-5d2e2133894d))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 9a6fb641-5fb9-4b91-b1ba-c9f5a58002bb))
     (fp_line (start -0.35 0) (end -0.35 0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp f65a3e14-39d2-40a6-8b73-64ae55369ec8))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 79de59f8-ad6d-45af-8f53-5e9078bd51e0))
     (fp_line (start -0.35 0) (end 0.25 0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 46ca82e9-c289-4488-b32d-93586feefeae))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 94c74465-cab7-488a-8d1c-208786a9b5cc))
     (fp_line (start 0.25 -0.4) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 4c0b8b46-2171-4e33-8915-12ec674d52f6))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 4104395d-c76e-4fc6-bcf7-78a82572f4f9))
     (fp_line (start 0.25 0) (end 0.75 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp d50a5bdb-2b84-4590-be95-4f95199704c7))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 1cd6e246-4cf4-407a-b6cc-c833781cc10e))
     (fp_line (start 0.25 0.4) (end 0.25 -0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 645b9889-d2b7-4ab0-8b46-077086838c62))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp ac99e98c-67c2-4f72-b645-270dd65e2f8d))
     (fp_line (start 1.4 -0.9) (end -1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp eb80bbdd-83da-40f5-a9ed-e1d477b47341))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 3e0fd46a-254c-4967-b78e-fc19ec4aaa9d))
     (fp_line (start 1.4 0.9) (end 1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 1f62a981-e1c2-47c5-942c-1227a554546b))
-    (pad "1" smd roundrect (at -1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 6 "Net-(D5-K)") (pinfunction "K") (pintype "passive") (tstamp 87608a80-8224-44b9-8e40-ebfd4880fb57))
-    (pad "2" smd roundrect (at 1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 2 "Net-(D1-A)") (pinfunction "A") (pintype "passive") (tstamp 724e297c-2262-496e-922a-9ac6bf3c0c4d))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 8cca319e-e85d-487c-9bb6-62525cf20a10))
+    (pad "1" smd roundrect (at -1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 7 "Net-(D25-K)") (pinfunction "K") (pintype "passive") (tstamp d56c78f2-3808-4884-a1c1-269fd85575cb))
+    (pad "2" smd roundrect (at 1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 53 "Net-(D29-A)") (pinfunction "A") (pintype "passive") (tstamp 3d86eaa1-ba0f-4c98-9711-3e6660ec602e))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SOD-123.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -5584,8 +5796,8 @@
   )
 
   (footprint "Diode_SMD:D_SOD-123" (layer "B.Cu")
-    (tstamp 3599d226-3f89-418f-a6d0-8f56e38d0926)
-    (at 226.53625 188.11875 180)
+    (tstamp 30e779c4-4839-4d48-8b3e-3a1b1d3aef26)
+    (at 116.68125 126.20625)
     (descr "SOD-123")
     (tags "SOD-123")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
@@ -5594,60 +5806,60 @@
     (property "Sim.Pins" "1=K 2=A")
     (property "ki_description" "100V 0.15A standard switching diode, DO-35")
     (property "ki_keywords" "diode")
-    (path "/b5a6ebf1-912e-4308-a01b-fe25ac4ba072")
+    (path "/7bdcbe8a-4a48-4ca9-958b-17bc38d31d5f")
     (attr smd)
-    (fp_text reference "D53" (at 0 2) (layer "B.SilkS")
+    (fp_text reference "D2" (at 0 2) (layer "B.SilkS")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 82bd92e5-0bf7-4e75-81d5-f6e44f0ce1e3)
+      (tstamp 52fb4676-7956-497f-a61b-df9f37a2d46d)
     )
     (fp_text value "1N4148" (at 0 -2.1) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 92bae066-c2b5-4f7a-b269-f46b8f99a5d0)
+      (tstamp fd60ba78-18ce-4568-adf0-beff7dd7a56f)
     )
     (fp_text user "${REFERENCE}" (at 0 2) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 4cf28735-365b-48c3-b1c4-3774181aef60)
+      (tstamp 04465c71-21cc-4ff8-9a69-6f0e62c46a01)
     )
     (fp_line (start -2.36 -1) (end 1.65 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 6e865267-a462-4c01-91cb-7ba79db06416))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 04cadb06-6045-4439-85ce-44346b233239))
     (fp_line (start -2.36 1) (end -2.36 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp dc9373d3-3680-4e6c-ae45-f897afcf5a32))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 956716c4-3f68-48b6-b530-7bfccb334246))
     (fp_line (start -2.36 1) (end 1.65 1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 385ff1a8-2226-42a4-b743-cf4901d9cc71))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp af4c7dc2-f2e5-4b32-9013-aa7428ea319b))
     (fp_line (start -2.35 1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 6133f25a-784e-45dd-89c9-2152b5be2a19))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 7ca41a5a-7f22-4224-838f-a4af4c8c8b1d))
     (fp_line (start -2.35 1.15) (end 2.35 1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 671e4f8e-2ddb-4d30-a150-7cd77794d4a2))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp d58f0c59-e4d7-46ed-b2a7-79ad08ddd6d7))
     (fp_line (start 2.35 -1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 64964bd1-7fca-4b62-bd5a-87d74ece5e41))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 39bad805-f2fb-429c-9628-d31afb6fa559))
     (fp_line (start 2.35 1.15) (end 2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 2e4d989e-eef4-403a-ba85-188b0247473a))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 5186dbb1-99d1-47d9-8334-4bb10979f25d))
     (fp_line (start -1.4 -0.9) (end -1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp d06b6c59-9c88-41db-aa27-60af6038c092))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 1d033896-8abc-4424-9a64-e8beaeb9b030))
     (fp_line (start -1.4 0.9) (end 1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 84f29c1a-a25d-4780-8b27-70f08351e07c))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp f2257e42-6dc3-4026-ba91-ca6cd900a041))
     (fp_line (start -0.75 0) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 37161aa5-7395-4bdb-80a0-c5fbf4673cab))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 1e7adb72-45b0-4322-a5af-a55bf3a9541e))
     (fp_line (start -0.35 0) (end -0.35 -0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp c8f61cba-635b-4dd9-9e0f-ee5d8b4ea7b6))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp d1388aa5-30e2-4198-ab50-c0a2675a1568))
     (fp_line (start -0.35 0) (end -0.35 0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 7f30492a-879e-4501-9398-567de32468fb))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 91fffe65-3224-4148-946f-ca36192ab8f8))
     (fp_line (start -0.35 0) (end 0.25 0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 7f171018-1dc6-44c6-bd3c-20f853865c85))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 0caf189b-a7f6-47d6-a709-a1ea896c95a2))
     (fp_line (start 0.25 -0.4) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 8c2793ff-dca6-4ccf-9dbc-2697b7c618a4))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp e40db374-b973-4a32-9d03-473dc9e6a81f))
     (fp_line (start 0.25 0) (end 0.75 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 14596354-c4b1-458a-af9f-f7ff3eae189e))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 6494ca19-86dd-4884-8fbc-6a730d73d175))
     (fp_line (start 0.25 0.4) (end 0.25 -0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 54f84fd8-bafc-4581-a4af-9c11eac6f8fd))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 8212f18a-0eec-4a4e-a6b2-bab700c3ff01))
     (fp_line (start 1.4 -0.9) (end -1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 54911ae3-be12-43e3-9881-0434933ac047))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 653182cc-805e-4c0a-9bef-0fd6d2d082cf))
     (fp_line (start 1.4 0.9) (end 1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 014dd6d0-f5d3-4e98-9e38-d17fc5d2c311))
-    (pad "1" smd roundrect (at -1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 60 "Net-(D53-K)") (pinfunction "K") (pintype "passive") (tstamp f21dabf2-373a-4dd1-9618-775948396b8f))
-    (pad "2" smd roundrect (at 1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 56 "Net-(D49-A)") (pinfunction "A") (pintype "passive") (tstamp 2d2161f6-7436-4ef8-a3e4-ac914df558af))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 2abef54f-4465-4af0-a053-626433a77bb8))
+    (pad "1" smd roundrect (at -1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 1 "Net-(D1-K)") (pinfunction "K") (pintype "passive") (tstamp 6064ea59-3075-48b6-b10e-b89404121f5e))
+    (pad "2" smd roundrect (at 1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 29 "Net-(D2-A)") (pinfunction "A") (pintype "passive") (tstamp 17005908-88b1-42f3-802f-9fee07c9bb57))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SOD-123.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -5656,8 +5868,8 @@
   )
 
   (footprint "Diode_SMD:D_SOD-123" (layer "B.Cu")
-    (tstamp 35ba83e1-2529-483e-93ce-611f28be4bc7)
-    (at 140.81125 169.06875 180)
+    (tstamp 36b78f10-0431-4b0e-8863-a8526e8f736d)
+    (at 183.35625 107.15625)
     (descr "SOD-123")
     (tags "SOD-123")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
@@ -5666,60 +5878,60 @@
     (property "Sim.Pins" "1=K 2=A")
     (property "ki_description" "100V 0.15A standard switching diode, DO-35")
     (property "ki_keywords" "diode")
-    (path "/d493f114-ef94-4098-9fc8-b3e1767ef0ab")
+    (path "/da7dbfd1-6094-4c8c-998d-109154e530a6")
     (attr smd)
-    (fp_text reference "D18" (at 0 2) (layer "B.SilkS")
+    (fp_text reference "D6" (at 0 2) (layer "B.SilkS")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 13f73b13-1243-4d88-9ec8-8071bf2bc21b)
+      (tstamp 564da67a-59bb-452c-989a-ab2dabfea40e)
     )
     (fp_text value "1N4148" (at 0 -2.1) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 01774965-55cf-4ffd-9c8a-7ad4959fa54f)
+      (tstamp 27b656a4-7999-4326-b9a1-383e211686ad)
     )
     (fp_text user "${REFERENCE}" (at 0 2) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 19ad176c-eea9-4556-a5f1-f67b45617c08)
+      (tstamp 309646b9-fde4-4374-a4df-02132168f994)
     )
     (fp_line (start -2.36 -1) (end 1.65 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 5ee12562-153e-4f25-a6be-92680a058d71))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 66e198c3-c041-43b7-898b-f657da1cca2b))
     (fp_line (start -2.36 1) (end -2.36 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp db642550-fdd0-4541-9ee6-a9db37206a84))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 8282aa54-892f-44da-ab8c-e30105f7f060))
     (fp_line (start -2.36 1) (end 1.65 1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp ea5628e0-881c-41de-930a-601ea216bb04))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp ec1f521c-cb68-4d59-8389-0e23cdf3f454))
     (fp_line (start -2.35 1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp af779cdd-6d5a-4128-9f4e-f1f949d5716c))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 79a92cb9-e231-443b-bac1-fcedbf6d525f))
     (fp_line (start -2.35 1.15) (end 2.35 1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 576ca489-7d8a-4eec-9d26-161151328a6e))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 11dfc8dc-d5e1-4237-ba5a-0c166637d094))
     (fp_line (start 2.35 -1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 480319bb-47d2-422e-94f2-c0be4c4ae197))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 9b71b060-5613-4256-b6d2-fa3a3ab46fbf))
     (fp_line (start 2.35 1.15) (end 2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 7d61baa0-5931-46e5-a5d1-2ebaf875f023))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp c1208e44-8096-40d6-be87-0fb2ba94707f))
     (fp_line (start -1.4 -0.9) (end -1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 1c800395-02f9-4380-93aa-6a70597461ff))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp d9fd248c-746c-4f17-a6b5-6f6ee678ab71))
     (fp_line (start -1.4 0.9) (end 1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp a38fb385-1f22-42c7-bd7e-8ac4942ee91c))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 7290a348-2f3a-44a1-93c1-0786b1b82508))
     (fp_line (start -0.75 0) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 0aeb73a9-022a-4027-b1bf-c5ef6addfbad))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 5338b28f-7081-4e72-a799-cb732fa82830))
     (fp_line (start -0.35 0) (end -0.35 -0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 3baad25c-a054-4343-adc3-cf3661167ab5))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp c89484d9-e17c-4ceb-8ac2-8b8faffd51c1))
     (fp_line (start -0.35 0) (end -0.35 0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 56b087e3-43f6-44eb-9cb5-29b6c779100b))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 7ac8f3e9-8095-4b8b-86a2-215ca112f0cc))
     (fp_line (start -0.35 0) (end 0.25 0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 870c6eb5-0e1d-43ff-a852-f283f81d1e81))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 2b3178ad-29f1-40ba-81cf-00adb916644a))
     (fp_line (start 0.25 -0.4) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 67db51cc-5eb2-4631-8d88-700708160914))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 3a2e8a2d-cb17-41c6-8201-563399b4b75b))
     (fp_line (start 0.25 0) (end 0.75 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 75cb3c14-52fc-4f84-86b4-9d859b2b141d))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 4029c1f5-4e40-483d-af6e-cbc45802d519))
     (fp_line (start 0.25 0.4) (end 0.25 -0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 48c5d4fe-e742-441c-872e-d9d8a5eb59b6))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp c5eae55c-ded1-4926-8e94-285b4c15c5cd))
     (fp_line (start 1.4 -0.9) (end -1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp ccdc7a8a-6138-4058-aea9-e49bf9620ab7))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp c01ce779-b204-4e0f-9443-76983bde0871))
     (fp_line (start 1.4 0.9) (end 1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 852322fe-bdd2-460d-bd80-7e86f510e1a5))
-    (pad "1" smd roundrect (at -1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 21 "Net-(D18-K)") (pinfunction "K") (pintype "passive") (tstamp c7471a03-918b-4e53-9d17-95cf8f3ec958))
-    (pad "2" smd roundrect (at 1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 20 "Net-(D17-A)") (pinfunction "A") (pintype "passive") (tstamp 7cf21d8c-3f83-4cfc-a571-b8b09ec27aa1))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 6a7055bb-71f4-4e4a-8fa5-dda3865ee3e7))
+    (pad "1" smd roundrect (at -1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 1 "Net-(D1-K)") (pinfunction "K") (pintype "passive") (tstamp 954a1e99-986c-4919-96d7-aaafa13b807e))
+    (pad "2" smd roundrect (at 1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 33 "Net-(D6-A)") (pinfunction "A") (pintype "passive") (tstamp 017d268b-6ac3-4430-b305-998fe25e9ec6))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SOD-123.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -5728,8 +5940,8 @@
   )
 
   (footprint "Diode_SMD:D_SOD-123" (layer "B.Cu")
-    (tstamp 36d4e66a-c5a2-4ecf-8398-5279cf90fefb)
-    (at 193.19875 150.01875 180)
+    (tstamp 38249423-6f86-4b82-9ab9-a7b669fdf8d0)
+    (at 335.75625 183.35625)
     (descr "SOD-123")
     (tags "SOD-123")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
@@ -5738,60 +5950,60 @@
     (property "Sim.Pins" "1=K 2=A")
     (property "ki_description" "100V 0.15A standard switching diode, DO-35")
     (property "ki_keywords" "diode")
-    (path "/ea3abc4f-c5ef-478a-86ea-099d3abb5190")
+    (path "/365b1c86-91f9-4ca4-8449-0ea8080d414c")
     (attr smd)
-    (fp_text reference "D22" (at 0 2) (layer "B.SilkS")
+    (fp_text reference "D49" (at 0 2) (layer "B.SilkS")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 5f1dd0c0-8194-44e2-9208-4f76d21ff8be)
+      (tstamp 484d6e7a-2746-4d09-8bd3-b6860950681c)
     )
     (fp_text value "1N4148" (at 0 -2.1) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 07c9a9d3-89e5-4b54-920f-6a856c55db8f)
+      (tstamp 4ec7be18-14bb-479c-998b-7e2a20a3c095)
     )
     (fp_text user "${REFERENCE}" (at 0 2) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 7bf1ee60-f40a-4262-9939-9dd1904f8aeb)
+      (tstamp 33f8234f-5c9c-43a1-9e68-84990e4bcd34)
     )
     (fp_line (start -2.36 -1) (end 1.65 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 6df90359-41d4-4b32-9ffe-c5c91802d3ed))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 05df4213-f9db-4959-b8b9-9fb61f88bae3))
     (fp_line (start -2.36 1) (end -2.36 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp c724ab6e-bbe5-4af3-9246-d154eb6727ef))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 87333e95-4fe4-415c-af29-b3b61f1991b4))
     (fp_line (start -2.36 1) (end 1.65 1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 22635675-2db2-43a6-86ac-a7a331f179e4))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp f224579e-5814-4775-bfab-01791778013b))
     (fp_line (start -2.35 1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp b779e008-5587-45c7-b7b4-37d410853576))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 2e722b1f-70ea-4e6c-8e3f-2361b973116d))
     (fp_line (start -2.35 1.15) (end 2.35 1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp de3f6647-3049-49ac-8fc0-6b99593921ce))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 2ae069e4-454a-4310-a5d4-380c8b952787))
     (fp_line (start 2.35 -1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 3ae2afa2-de35-4bdd-9793-b43de76ac5b0))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 9dbea4ff-341c-4d60-841e-a9de83a66135))
     (fp_line (start 2.35 1.15) (end 2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 7306506d-82b4-4eef-a11b-dea48a3315a9))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 77d1df40-8619-4cae-8d75-f202d5526060))
     (fp_line (start -1.4 -0.9) (end -1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp ffdc4a94-f020-42d3-a24b-775e164b9db0))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp a27acc7e-321a-44cf-9ef8-ac00b690bbc8))
     (fp_line (start -1.4 0.9) (end 1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp b9b6b048-43ed-4a59-a6fd-92ccb468e55b))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp c23e169c-5cdb-4c91-b774-1d6ede46b985))
     (fp_line (start -0.75 0) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp bd2ab927-5486-464e-9708-56f7e3b5a68a))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp fb1a58b6-7196-4af7-8a9d-20d0dc72d52c))
     (fp_line (start -0.35 0) (end -0.35 -0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp c0ccee10-8382-48ca-823d-fc26f01fdefc))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp d2301e00-2a58-45b0-af00-c5bec4770c96))
     (fp_line (start -0.35 0) (end -0.35 0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 3b6e214e-2ba2-4f31-9c10-fdf6848e7377))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 4a594e46-a7aa-4e64-8511-766c1428a6e2))
     (fp_line (start -0.35 0) (end 0.25 0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp bf09e757-d4f8-4cb6-8a60-6998cd2b46e5))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp ea0bc7e1-f6db-4a5a-b72a-8b37d12414dd))
     (fp_line (start 0.25 -0.4) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 46e1e955-b1d1-40af-9118-64281f0dfa94))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 635efaa6-da97-459c-952a-44a2524a39b9))
     (fp_line (start 0.25 0) (end 0.75 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp cb311116-5767-475d-969f-ac92ef26c5ae))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 70910488-d63b-4c93-8759-9be1dd76f3f7))
     (fp_line (start 0.25 0.4) (end 0.25 -0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 8fae8bd6-ff55-4e4e-95d0-ceb26a1cbc5b))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 53935d7d-85fd-408e-8c7a-d2bd175927d0))
     (fp_line (start 1.4 -0.9) (end -1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 4c4010d2-e60f-424b-ac9d-f71a0de9018b))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 514713de-be49-4a29-a245-0715cea2c12a))
     (fp_line (start 1.4 0.9) (end 1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 731438d0-743e-44ae-b76d-272fc3d7462e))
-    (pad "1" smd roundrect (at -1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 25 "Net-(D22-K)") (pinfunction "K") (pintype "passive") (tstamp fac4f740-14ef-4198-92d3-f438b8856301))
-    (pad "2" smd roundrect (at 1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 20 "Net-(D17-A)") (pinfunction "A") (pintype "passive") (tstamp ef8f577a-0460-47a6-9fdb-0ffea3d6964e))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp de53eba5-814c-4bbc-9819-dc597377c6f1))
+    (pad "1" smd roundrect (at -1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 13 "Net-(D48-K)") (pinfunction "K") (pintype "passive") (tstamp 1dc25da0-06d7-4db3-822c-3b417286cd2c))
+    (pad "2" smd roundrect (at 1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 14 "Net-(D49-A)") (pinfunction "A") (pintype "passive") (tstamp aba012d7-1694-428a-9c8f-be8e5391ff4b))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SOD-123.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -5800,8 +6012,8 @@
   )
 
   (footprint "Diode_SMD:D_SOD-123" (layer "B.Cu")
-    (tstamp 3c33cee8-dca7-4b8a-8f4d-e6c4f5e0bb27)
-    (at 231.29875 150.01875 180)
+    (tstamp 3a4548f4-1cde-493c-b2a5-7a6b65354970)
+    (at 278.60625 107.15625)
     (descr "SOD-123")
     (tags "SOD-123")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
@@ -5810,60 +6022,60 @@
     (property "Sim.Pins" "1=K 2=A")
     (property "ki_description" "100V 0.15A standard switching diode, DO-35")
     (property "ki_keywords" "diode")
-    (path "/635ac940-23d9-47d9-b570-c76d26b6dd80")
+    (path "/5bdce1bd-c531-4cb5-bf77-5d3d02912405")
     (attr smd)
-    (fp_text reference "D24" (at 0 2) (layer "B.SilkS")
+    (fp_text reference "D37" (at 0 2) (layer "B.SilkS")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp ac4f7f53-d34a-4169-a7e9-45c4122f46ab)
+      (tstamp 91d179e2-d129-4029-815e-0674715372ac)
     )
     (fp_text value "1N4148" (at 0 -2.1) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 7c7836d1-3fc2-4e77-9cc8-14426b288a34)
+      (tstamp 5dee5e87-214a-49e2-959e-58c97f30b7f5)
     )
     (fp_text user "${REFERENCE}" (at 0 2) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 97ea1aa2-192c-4671-b9bd-c6a0f7af64ad)
+      (tstamp ab6da089-440a-4afb-883f-bd4816625327)
     )
     (fp_line (start -2.36 -1) (end 1.65 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 77211bd4-d016-47a0-82d4-80bbe63aa015))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 98cb9545-93a2-465a-a86b-032168ca09d7))
     (fp_line (start -2.36 1) (end -2.36 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 0071fefd-145c-470f-a860-12f701920963))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 3b81d75d-b48f-46d8-afa8-7301851d8774))
     (fp_line (start -2.36 1) (end 1.65 1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp eb3e64f7-feb9-4ee9-b3e3-6b17b4e96b4c))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 06369586-eaa4-42f1-8541-5ad5bb78a3ce))
     (fp_line (start -2.35 1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp d916fbd9-8d4a-47f1-9863-8438228987c7))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 0f13ec86-14e9-4fed-b251-780ab2219db9))
     (fp_line (start -2.35 1.15) (end 2.35 1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp c5457cd6-5527-4c7d-8bb1-a5211ec3259b))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 741d6c83-c1a2-4a96-8a1b-5a16e9598387))
     (fp_line (start 2.35 -1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 54ac9424-e2d7-495c-b185-2ceaad93531f))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 4da788ed-fd66-4596-adcb-b117ba64eca7))
     (fp_line (start 2.35 1.15) (end 2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 22133825-7f7c-44f5-9789-1e48e138338c))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 349c1861-007e-4552-9b87-6507512f1db1))
     (fp_line (start -1.4 -0.9) (end -1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp da3212db-20c6-476b-b908-a6f6939eefb9))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 6d71b2f6-9d6b-45c7-814d-9f9f68d22fd0))
     (fp_line (start -1.4 0.9) (end 1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 223ed4bf-c8ea-4571-8ffb-6de1471dcb72))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 742ab1ac-3d1e-4edd-84be-8a04794528f5))
     (fp_line (start -0.75 0) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 1456836a-b4fb-44d7-9f04-bca8492d1139))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 1a3ab7e9-9428-44ad-8a83-4d542fc82d34))
     (fp_line (start -0.35 0) (end -0.35 -0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 7d2dd028-5e14-4ebf-a6ff-85f7a0ec738e))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 50815fb9-d029-4392-aa58-e70870e42475))
     (fp_line (start -0.35 0) (end -0.35 0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 334925c3-d198-46f8-b88d-94a649d43330))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 4324917d-1a12-46f7-bdf2-d9345748f054))
     (fp_line (start -0.35 0) (end 0.25 0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 5e2464f6-3af0-4dac-b950-df53ea5a6c3a))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 1ede7cfe-ed90-4428-9d37-16a0cb4b39d1))
     (fp_line (start 0.25 -0.4) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 6615d048-b89d-417b-a384-e09e4a0881e7))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp e9430248-dc36-402b-8c4e-1fd66c626072))
     (fp_line (start 0.25 0) (end 0.75 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp e43cb2d9-6958-4dae-a4b7-ea101a05b7da))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 03210733-f2d0-49b1-8118-0c2533261f26))
     (fp_line (start 0.25 0.4) (end 0.25 -0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 4dce0d7a-9571-4ef4-9b3f-6476cc66be2d))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 92387d93-d708-4a01-bb85-07a33b4ae4ad))
     (fp_line (start 1.4 -0.9) (end -1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp defdef6e-4b92-4fd7-bfaa-5895add41209))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 2af9e9de-8aa3-4f98-86c6-911b2e013726))
     (fp_line (start 1.4 0.9) (end 1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 5d2b4a9b-d8c2-4b59-8aa8-e3223f89935d))
-    (pad "1" smd roundrect (at -1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 27 "Net-(D24-K)") (pinfunction "K") (pintype "passive") (tstamp 9c71a188-ba44-4f8c-8964-6bb9c94def5e))
-    (pad "2" smd roundrect (at 1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 20 "Net-(D17-A)") (pinfunction "A") (pintype "passive") (tstamp 4a551f6f-1e7e-42a8-bfab-f9ba45485765))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp d85e85a3-f2c3-4c43-9674-1feebad56bee))
+    (pad "1" smd roundrect (at -1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 9 "Net-(D32-K)") (pinfunction "K") (pintype "passive") (tstamp 53d3fc21-47eb-47c7-a729-6054ae292a6d))
+    (pad "2" smd roundrect (at 1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 60 "Net-(D37-A)") (pinfunction "A") (pintype "passive") (tstamp 1ab14dd7-b75d-4947-aae7-24232c112403))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SOD-123.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -5872,8 +6084,8 @@
   )
 
   (footprint "Diode_SMD:D_SOD-123" (layer "B.Cu")
-    (tstamp 3d8ea24b-7dc1-4f61-92ef-0f02bc0de109)
-    (at 116.99875 150.01875 180)
+    (tstamp 3b0f79fc-63a8-40f6-a62e-9144b30d01f0)
+    (at 245.26875 164.30625)
     (descr "SOD-123")
     (tags "SOD-123")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
@@ -5882,60 +6094,60 @@
     (property "Sim.Pins" "1=K 2=A")
     (property "ki_description" "100V 0.15A standard switching diode, DO-35")
     (property "ki_keywords" "diode")
-    (path "/5be27ebc-88f1-4d9d-943b-e6687b071050")
+    (path "/5737e3d0-a743-48ac-8bc5-5567d28004cb")
     (attr smd)
-    (fp_text reference "D2" (at 0 2) (layer "B.SilkS")
+    (fp_text reference "D30" (at 0 2) (layer "B.SilkS")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp de53425e-cb89-423d-b748-ce22b41ba05c)
+      (tstamp 492258cb-acde-4616-a332-ec8a5818657f)
     )
     (fp_text value "1N4148" (at 0 -2.1) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 4ce27aa1-2fd4-4964-ae81-c55ea924549b)
+      (tstamp 3ec8ae51-ab11-4264-97d3-f3e8cfdc61b9)
     )
     (fp_text user "${REFERENCE}" (at 0 2) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 354ca9dc-776c-4f97-8ea7-ee466d62a816)
+      (tstamp 227748b9-57f2-479c-bae4-8cd57456c98e)
     )
     (fp_line (start -2.36 -1) (end 1.65 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp cb9dd63f-7e0e-49bf-8469-e1be63d9838b))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 90b6c5d1-a97d-4038-8962-83545a4d7cf1))
     (fp_line (start -2.36 1) (end -2.36 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 4b0f508e-f1a9-435c-851f-e21a8424cf6c))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 399a6d79-a8c9-4016-b1b4-865dbbf1be33))
     (fp_line (start -2.36 1) (end 1.65 1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp cac52b7d-d39b-47c3-8cb1-63fb268a3a7e))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp e4af7792-1527-4d38-9171-b4bec5d43051))
     (fp_line (start -2.35 1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 26bdabb9-1460-4d6b-a418-a350a3b6bddc))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp f911132e-24f3-4b72-9094-3dfcb3eb0c04))
     (fp_line (start -2.35 1.15) (end 2.35 1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp c70eef1f-5ca5-41eb-9d17-a56a756cf10c))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 6c74f0e1-e76b-4d72-9aaf-cc7b985d4789))
     (fp_line (start 2.35 -1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 1f1c49b4-e2f3-4ce9-ba5b-a9ff5d561170))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 1bb72098-2a28-4dda-9b5b-1005412f4db3))
     (fp_line (start 2.35 1.15) (end 2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp c9ed693b-b51d-4d84-bac5-d8a58ee75847))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 3981c21d-56e6-4d22-886c-e2acd3cba769))
     (fp_line (start -1.4 -0.9) (end -1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 5e4f9033-d88f-4a84-9435-ac3928de94d9))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 5ba7be25-0ab2-4c35-aa87-2c734811a479))
     (fp_line (start -1.4 0.9) (end 1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 2899f810-4147-4ef2-ae90-4c9bb41b1c4c))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 07b6c8cf-1e22-426f-bf51-7259372661be))
     (fp_line (start -0.75 0) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 82f3d9a1-8766-4533-ba96-e34662308a9c))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp b431c77f-fcb2-4f4f-b95f-bccda9ce5828))
     (fp_line (start -0.35 0) (end -0.35 -0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp f84b8e29-b4b6-4430-bcbd-774243a1aa26))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp ff071eb6-6ec0-4a76-9e10-8f836e42394b))
     (fp_line (start -0.35 0) (end -0.35 0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 39025ecc-83a7-416a-bcb0-2703e6f62546))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 3ffde16b-1428-4e11-ac12-56e41ad4f976))
     (fp_line (start -0.35 0) (end 0.25 0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 499cd6b3-1fa4-4744-96bb-ff3b2bc11028))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 7ce454a3-72b4-4b2b-be5e-3d1a7b0b5a42))
     (fp_line (start 0.25 -0.4) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 5f7f3030-d425-4be7-8d0f-6953bd0e6383))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 918608e7-34ae-480e-9826-346e4d58f97e))
     (fp_line (start 0.25 0) (end 0.75 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp e3a8e80a-3115-4f13-b935-7223ea8af3c3))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 14a30ed4-4b2f-4074-88da-623bd19948c1))
     (fp_line (start 0.25 0.4) (end 0.25 -0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp a9fab502-1ad6-4c74-ae6c-3205d255c7ee))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 45a78f59-039a-4936-9ca6-d1855e2b40b6))
     (fp_line (start 1.4 -0.9) (end -1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 4abf3d2e-0b61-4952-aaf8-003a3cdc7ae6))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 3b3336e0-7e02-4a98-99ee-e8610d1c16ed))
     (fp_line (start 1.4 0.9) (end 1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 3ab6b617-b59e-4bb8-bdbc-eb8607edf141))
-    (pad "1" smd roundrect (at -1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 3 "Net-(D2-K)") (pinfunction "K") (pintype "passive") (tstamp 4e8c74d3-ce61-4f92-88ff-f2273a529d3b))
-    (pad "2" smd roundrect (at 1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 2 "Net-(D1-A)") (pinfunction "A") (pintype "passive") (tstamp bbe5ef06-f3cf-4f8d-83e4-eaa59681ce96))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 207ac93c-75be-4274-8125-35c4cbbf7aac))
+    (pad "1" smd roundrect (at -1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 7 "Net-(D25-K)") (pinfunction "K") (pintype "passive") (tstamp 6fbb6718-0e13-4bf1-a9e0-7dcb46d99f01))
+    (pad "2" smd roundrect (at 1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 54 "Net-(D30-A)") (pinfunction "A") (pintype "passive") (tstamp de0ad2b4-386b-456f-929a-da57c70477f2))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SOD-123.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -5944,8 +6156,8 @@
   )
 
   (footprint "Diode_SMD:D_SOD-123" (layer "B.Cu")
-    (tstamp 3fc93766-3150-47e2-b541-cae8e3d8d895)
-    (at 197.96125 169.06875 180)
+    (tstamp 3dfd3b1a-86ef-425d-84a9-1fed78efe7ce)
+    (at 169.06875 164.30625)
     (descr "SOD-123")
     (tags "SOD-123")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
@@ -5954,60 +6166,60 @@
     (property "Sim.Pins" "1=K 2=A")
     (property "ki_description" "100V 0.15A standard switching diode, DO-35")
     (property "ki_keywords" "diode")
-    (path "/46fd2d88-1e0a-45e0-bc5c-43bf19ff60b8")
+    (path "/631b33a8-d043-400d-8f51-8a738e923336")
     (attr smd)
-    (fp_text reference "D38" (at 0 2) (layer "B.SilkS")
+    (fp_text reference "D26" (at 0 2) (layer "B.SilkS")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 77b7da26-9ba0-462f-bc12-2f1887e0cfb0)
+      (tstamp 0ae35fbd-76bf-4668-8775-7af58154b89c)
     )
     (fp_text value "1N4148" (at 0 -2.1) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp dfbeae45-2b61-4a62-aa3e-9bcad7a6e7a7)
+      (tstamp 271a97c2-f1df-4be9-835e-d140c9116ec8)
     )
     (fp_text user "${REFERENCE}" (at 0 2) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 9ed3b596-9b50-4080-92f0-889238cbbb7e)
+      (tstamp 5b8f3855-e89a-4cca-95c3-df318992b8cf)
     )
     (fp_line (start -2.36 -1) (end 1.65 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp be3d9f62-d65c-4de4-a63d-20ce25b8e510))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 917b5bce-218c-42ec-af1f-e9a33e99974d))
     (fp_line (start -2.36 1) (end -2.36 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 3ce14222-d3af-46a3-89f1-959790570f8d))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 645f82ba-8de6-4a57-a673-4f544b92a01e))
     (fp_line (start -2.36 1) (end 1.65 1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp f3ff4155-33bf-4fe4-8d51-28e6ea45d93e))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 8b90e4b3-2857-4f02-9a96-aa332e2bfc28))
     (fp_line (start -2.35 1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 13c92f9f-3e50-489c-9e3e-5f5739925dd1))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp e32e2327-212d-4023-8630-f61a69573694))
     (fp_line (start -2.35 1.15) (end 2.35 1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 39d910ae-1a07-445f-90e0-219b06cb6478))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp bcb947ff-4f83-45b2-89fa-c212245979f7))
     (fp_line (start 2.35 -1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 4f93a8dc-74bc-4cb2-a775-f24d66356df2))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp fee5f0b1-b49b-4159-a867-e1b3591de548))
     (fp_line (start 2.35 1.15) (end 2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp d7ea0494-87ed-4e13-97fa-b41afb1c3054))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp eb3fd146-6fed-47f8-8937-a96302a86fd2))
     (fp_line (start -1.4 -0.9) (end -1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 0520403e-73e7-4bef-b257-dd92a952b054))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 6d509f73-43bf-42ea-847c-2e7c71b82335))
     (fp_line (start -1.4 0.9) (end 1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 28478fee-6f0f-4def-b3f1-ef0ff0485d38))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp da8c9bc9-4ebd-4858-a75e-c10cbb56fbdc))
     (fp_line (start -0.75 0) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp f5d18787-6701-48e0-8161-1001e4eb0ed1))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 68033d79-0ee0-4f26-b64f-1b788c3ffbd2))
     (fp_line (start -0.35 0) (end -0.35 -0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 90021b72-a2bb-4282-add5-45e6c7f0c3f3))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp d4d1baa7-0c89-4bc5-8310-3f09523358b6))
     (fp_line (start -0.35 0) (end -0.35 0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 0d58abc1-9c14-4989-8c1f-7381908b09d2))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 2cd309a1-0c99-4c2c-8658-f0d6d9cf38f3))
     (fp_line (start -0.35 0) (end 0.25 0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp e79a75ea-8eef-434d-a087-6fea66116ebe))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 53d60a03-294f-4924-8175-3378a4fb37ca))
     (fp_line (start 0.25 -0.4) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 4cfde025-3352-49e1-bf12-7ff19b3721d2))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 7ddf4892-2dc5-454d-8797-1673cd99c173))
     (fp_line (start 0.25 0) (end 0.75 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp d07516e2-59f5-4596-8225-f77f7d2127f5))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp f39033b6-bee1-46c5-b81c-1f1dc7ae6f92))
     (fp_line (start 0.25 0.4) (end 0.25 -0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 35c04dc3-d43e-46af-8d4d-75cfe72b0e88))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp bbe2fd4c-25ca-4484-ab0a-aa22862f17bc))
     (fp_line (start 1.4 -0.9) (end -1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 58726161-5342-41d8-b365-e7b2a226501d))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp ff5c7028-1120-4f51-ba23-91aac5173eda))
     (fp_line (start 1.4 0.9) (end 1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 3b74be59-c5ea-4edf-a43b-b8804071c532))
-    (pad "1" smd roundrect (at -1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 43 "Net-(D38-K)") (pinfunction "K") (pintype "passive") (tstamp cdcfca1c-9d7a-464f-ba64-6558bb17d89f))
-    (pad "2" smd roundrect (at 1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 38 "Net-(D33-A)") (pinfunction "A") (pintype "passive") (tstamp 338c01e4-32ba-4d51-b62a-bc82be77d204))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp e796c479-442b-446b-b0d6-8d37826a2376))
+    (pad "1" smd roundrect (at -1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 7 "Net-(D25-K)") (pinfunction "K") (pintype "passive") (tstamp b4e239dd-ac71-465a-9e78-f6172a660f4c))
+    (pad "2" smd roundrect (at 1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 50 "Net-(D26-A)") (pinfunction "A") (pintype "passive") (tstamp 2de7e954-7bb4-49cf-b255-a50c3f13efbc))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SOD-123.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -6016,8 +6228,8 @@
   )
 
   (footprint "Diode_SMD:D_SOD-123" (layer "B.Cu")
-    (tstamp 43e39839-9cf4-43ae-99e8-4c1d7c720dca)
-    (at 274.16125 169.06875 180)
+    (tstamp 3e89dde4-bd22-43cd-8302-1e450440df36)
+    (at 259.55625 183.35625)
     (descr "SOD-123")
     (tags "SOD-123")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
@@ -6026,60 +6238,60 @@
     (property "Sim.Pins" "1=K 2=A")
     (property "ki_description" "100V 0.15A standard switching diode, DO-35")
     (property "ki_keywords" "diode")
-    (path "/0eea3c0f-154d-4971-9223-a81be56382b2")
+    (path "/94fd6531-ee70-417c-9637-07ab88fbdd1e")
     (attr smd)
-    (fp_text reference "D47" (at 0 2) (layer "B.SilkS")
+    (fp_text reference "D58" (at 0 2) (layer "B.SilkS")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp f32793a4-0ce6-4b48-874d-e2425d82cfe8)
+      (tstamp 90ff6487-9a9a-4da2-aee3-d0a627e7e066)
     )
     (fp_text value "1N4148" (at 0 -2.1) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 2ceb6a27-8878-486f-ac37-c5ea086657ca)
+      (tstamp 6ed68c5d-b433-4ff7-81a2-7dd0df1cfa94)
     )
     (fp_text user "${REFERENCE}" (at 0 2) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 35a5bd92-3d36-44ef-8e14-1cf1ee576d3b)
+      (tstamp c37d469c-6021-4b90-89df-592a35a6269a)
     )
     (fp_line (start -2.36 -1) (end 1.65 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp ce8039e7-ba57-47ea-ad32-a30ea38b50c1))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 995fe488-82b4-4df1-b510-0405153127ab))
     (fp_line (start -2.36 1) (end -2.36 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 55e6f4dc-ac98-42d4-a9e8-7bf4cc8812f4))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 30975c20-7885-409b-b1fc-fb2ce4a17915))
     (fp_line (start -2.36 1) (end 1.65 1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 74997e21-bdb4-408c-b97c-4ebfdc079017))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp f3009f27-4424-48b2-8754-5bddb131b088))
     (fp_line (start -2.35 1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 84aae99e-d7ac-4fc8-b576-e24e065e0c1a))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp dff2b67e-5fe4-415a-b17b-3d2900ff427b))
     (fp_line (start -2.35 1.15) (end 2.35 1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp ff197ee2-2b2f-4c2c-8584-6bc8770f5728))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp b23dfae2-2ae3-433d-9247-2255dbdea8eb))
     (fp_line (start 2.35 -1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 4748517d-00d2-45ff-8686-c46fb33eba27))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 1a6d2989-4193-436d-876f-8e653244ea0b))
     (fp_line (start 2.35 1.15) (end 2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp cc4f1f9c-9f61-4bbc-b3d0-7a4d6dfa4cf1))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 0936544a-8b75-4411-b32a-517d0440051f))
     (fp_line (start -1.4 -0.9) (end -1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 9d8158d8-4057-42b5-a8b3-8a51ac77f316))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 9b3e3e92-1f26-4502-8ad2-5ed7cd956159))
     (fp_line (start -1.4 0.9) (end 1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 38b43d68-0453-4d5f-bcc9-df9871c89617))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp cf02fd81-232e-4f77-8a5f-88ba588ecfad))
     (fp_line (start -0.75 0) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 63bd1499-3b46-4d34-b44f-e7b24b85e011))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 1b3b9c1e-8eb5-4fc7-9995-8e5ca4b43ad8))
     (fp_line (start -0.35 0) (end -0.35 -0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 9c11e59e-1403-4d31-aa21-cfa84d0efd0c))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp cdb27bfc-aa78-4592-8c85-f6b39918a8bb))
     (fp_line (start -0.35 0) (end -0.35 0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 45f55f1c-f267-46b8-9bd2-4534c60119e9))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp a17c975e-9852-4cf3-acbc-f4e2b3fbff81))
     (fp_line (start -0.35 0) (end 0.25 0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 30311a42-a310-431c-9833-00b488540496))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 70bc720e-ad10-438e-b5a2-c90cb8732a8a))
     (fp_line (start 0.25 -0.4) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 49414369-2988-43e4-835c-d94775e0f1a4))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 1d5703d7-22b3-4d51-9ec9-f7c3f36c762c))
     (fp_line (start 0.25 0) (end 0.75 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 01156844-d026-4376-88df-3619bad48ecf))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp e2afa0f4-254f-4ec0-97d6-ffdc067b45b3))
     (fp_line (start 0.25 0.4) (end 0.25 -0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp e0698ade-7f55-4250-9233-a487f1a3f2f1))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp afcff877-826a-4116-83ee-40a023cafff3))
     (fp_line (start 1.4 -0.9) (end -1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 3b7cd44e-5ef6-4b0f-8663-eaf32d0d9f36))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp d918b195-9d03-4121-b5b3-fe27fe3de8de))
     (fp_line (start 1.4 0.9) (end 1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 6af186c8-10bd-4281-9f83-425c4c64a506))
-    (pad "1" smd roundrect (at -1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 53 "Net-(D47-K)") (pinfunction "K") (pintype "passive") (tstamp 76a4c808-a47d-4ffb-b08c-a013aab822a2))
-    (pad "2" smd roundrect (at 1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 47 "Net-(D41-A)") (pinfunction "A") (pintype "passive") (tstamp edaffa04-8e3e-4ce5-8125-e15d4c143c29))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp f8b1e052-fc36-4a8d-aa24-427d88cf38a0))
+    (pad "1" smd roundrect (at -1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 15 "Net-(D56-K)") (pinfunction "K") (pintype "passive") (tstamp 77a4dd5f-5db9-4762-a368-eedd1d83024c))
+    (pad "2" smd roundrect (at 1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 78 "Net-(D58-A)") (pinfunction "A") (pintype "passive") (tstamp 76ff7f1f-bb3b-4470-901a-185587bac12e))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SOD-123.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -6088,8 +6300,8 @@
   )
 
   (footprint "Diode_SMD:D_SOD-123" (layer "B.Cu")
-    (tstamp 4726a684-e7a6-4817-8a0d-4d841f7d285f)
-    (at 221.77375 207.16875 180)
+    (tstamp 473868d3-b410-4c4f-8205-e5e6ac11934d)
+    (at 216.69375 145.25625)
     (descr "SOD-123")
     (tags "SOD-123")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
@@ -6098,60 +6310,60 @@
     (property "Sim.Pins" "1=K 2=A")
     (property "ki_description" "100V 0.15A standard switching diode, DO-35")
     (property "ki_keywords" "diode")
-    (path "/b04b7ea9-c2f1-4c3f-a693-af29c6f98e67")
+    (path "/4c72ee9e-a0fc-4635-9c0a-25bd36ef860b")
     (attr smd)
-    (fp_text reference "D57" (at 0 2) (layer "B.SilkS")
+    (fp_text reference "D23" (at 0 2) (layer "B.SilkS")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 10e98645-0d22-4af0-a6eb-14128b019871)
+      (tstamp 403ad158-0dc4-429b-9412-9f1a21a6acb4)
     )
     (fp_text value "1N4148" (at 0 -2.1) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 23920ec4-0016-47cc-adcf-d86f0cf99b1a)
+      (tstamp 6f58c759-4f8b-447d-9e51-337383773a9c)
     )
     (fp_text user "${REFERENCE}" (at 0 2) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 28eb2fe7-4a36-43f9-beb1-5c631f94896d)
+      (tstamp c2376879-e80b-4c87-908a-f8ae07fea48c)
     )
     (fp_line (start -2.36 -1) (end 1.65 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 8fe72836-d438-4092-ab3f-2680a5ed16bb))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 8a5ea777-35a6-45b0-afc5-99f42a8e5d05))
     (fp_line (start -2.36 1) (end -2.36 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp d7b08c6e-b427-49fe-a750-e72b106a15d3))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp c883851c-f4bd-4504-b7c2-d14cbe1cd33e))
     (fp_line (start -2.36 1) (end 1.65 1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 462c73b8-f2a8-4bc8-a7ae-dddc16e102c1))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 267e4764-6eb5-4310-9dcf-f15d0a9b27cf))
     (fp_line (start -2.35 1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp a4d4c1ab-52b1-4149-8996-164adf76b0d5))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 5405e18c-2615-4e6f-98a0-1f20e905c444))
     (fp_line (start -2.35 1.15) (end 2.35 1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp e66e4443-58ea-42cf-b6cb-f0078552deaf))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 5a986ce1-0afc-4235-9297-1de552f6e0eb))
     (fp_line (start 2.35 -1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp d7ccc76a-5b04-4e4e-80d5-fc822cb5dcba))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 955a58de-3c72-4158-9e1a-9bb08d257ad4))
     (fp_line (start 2.35 1.15) (end 2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp e73562da-50f5-44db-b603-3a557cecc30c))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 80e058a0-fb9b-4e3d-ad78-cb66fdca74a9))
     (fp_line (start -1.4 -0.9) (end -1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp fb7f7bde-85b0-4bcb-a5be-b8fd8a975e01))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp df98a143-48cb-4468-be30-5af5fe56a30e))
     (fp_line (start -1.4 0.9) (end 1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 79386f27-ff1d-4ff5-bbc6-bcd22b234cf7))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 88cf3599-1b15-4c35-9b2e-86cb5befa6b8))
     (fp_line (start -0.75 0) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 9d8e9617-9850-4190-98dc-89840f4ce2b5))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 06c92f36-df18-48f8-aaed-64bfe69328af))
     (fp_line (start -0.35 0) (end -0.35 -0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 9ada2050-3763-446d-9205-aa644d210b57))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp b7ddf9db-0a43-4129-9953-2d2f54e91c0d))
     (fp_line (start -0.35 0) (end -0.35 0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp c76460d2-d4b1-494b-add9-b963932a6044))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 54b57989-c408-423b-ab4c-9399e4e24105))
     (fp_line (start -0.35 0) (end 0.25 0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp f80f0452-5a95-408a-a601-fa699e9e3dee))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 9875bcfb-ae9b-4dd3-89d0-5487dfbda48a))
     (fp_line (start 0.25 -0.4) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 4ff6a048-88ff-489e-a685-e569e8656503))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp a306c55e-a0f7-4e49-b494-646b8be7a2bb))
     (fp_line (start 0.25 0) (end 0.75 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 2202eb97-3ccd-4f8f-9a99-5b8ebe6ad4a1))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 8ccb8edb-fb41-4a56-a53d-f2e50d554f7f))
     (fp_line (start 0.25 0.4) (end 0.25 -0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp dce7a579-d520-419b-a9fa-42a2d8476049))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 76f2794a-0e78-4680-8cb7-2390cb367536))
     (fp_line (start 1.4 -0.9) (end -1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp dae450f9-70f8-4421-a17b-259c3002d284))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp b6d99993-d703-408e-8890-41991d804729))
     (fp_line (start 1.4 0.9) (end 1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp d30faddb-ebe7-4521-8754-adfb448975a1))
-    (pad "1" smd roundrect (at -1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 65 "Net-(D57-K)") (pinfunction "K") (pintype "passive") (tstamp aa522877-be42-4d1d-ac93-781db1597f36))
-    (pad "2" smd roundrect (at 1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 64 "Net-(D56-A)") (pinfunction "A") (pintype "passive") (tstamp 4c1c04ca-d04f-4417-83d9-362746195f9b))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp c75d5726-05e8-42b3-83e2-a20d54b751e0))
+    (pad "1" smd roundrect (at -1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 5 "Net-(D17-K)") (pinfunction "K") (pintype "passive") (tstamp 146f109b-984e-4a53-bc1e-1d46bdb2a1c9))
+    (pad "2" smd roundrect (at 1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 48 "Net-(D23-A)") (pinfunction "A") (pintype "passive") (tstamp 28134fd7-3523-4c4c-903f-9918672b6ffb))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SOD-123.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -6160,8 +6372,8 @@
   )
 
   (footprint "Diode_SMD:D_SOD-123" (layer "B.Cu")
-    (tstamp 49fb6f7d-4829-4184-a01a-703ad0aba0e6)
-    (at 236.06125 169.06875 180)
+    (tstamp 535eddbe-c876-417a-b13c-3eb9b108818d)
+    (at 354.80625 183.35625)
     (descr "SOD-123")
     (tags "SOD-123")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
@@ -6170,60 +6382,60 @@
     (property "Sim.Pins" "1=K 2=A")
     (property "ki_description" "100V 0.15A standard switching diode, DO-35")
     (property "ki_keywords" "diode")
-    (path "/a8dfca84-6623-4dd1-a479-45d23ed60030")
+    (path "/b093f74d-3434-4a1c-bf8f-6183bc68e4ca")
     (attr smd)
-    (fp_text reference "D40" (at 0 2) (layer "B.SilkS")
+    (fp_text reference "D48" (at 0 2) (layer "B.SilkS")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp e83862d1-016e-4a13-a010-326c2c5e07a9)
+      (tstamp a833b132-5b8e-462a-bb64-ad658068b8a8)
     )
     (fp_text value "1N4148" (at 0 -2.1) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp a93b9df7-0545-4a12-b7f0-f4edc5edba2f)
+      (tstamp 1cee6bb0-f146-4141-acba-08689e0071bd)
     )
     (fp_text user "${REFERENCE}" (at 0 2) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 6cfa82a7-7fc6-497d-940b-1c7b8d927035)
+      (tstamp f3dcbb02-0cae-41c3-a565-6a335f56d1e1)
     )
     (fp_line (start -2.36 -1) (end 1.65 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp af00548d-757d-4602-b175-8c99d9e564f9))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 1c809691-8a1e-4bf6-9f70-9d3f8f07175c))
     (fp_line (start -2.36 1) (end -2.36 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp e3a9fca2-325f-48aa-9dc5-0b7cfba3a381))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp f782d07c-c725-4d82-93db-db96cf5f2739))
     (fp_line (start -2.36 1) (end 1.65 1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp d5157996-8c10-49e4-9745-d846dad8dae3))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 1687b598-4c3f-490c-86b7-6602f5f8e54d))
     (fp_line (start -2.35 1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp d2202512-18f4-40f2-89a8-4528fc31e9c0))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp fe10a4cb-753a-468f-940f-47e2bda34449))
     (fp_line (start -2.35 1.15) (end 2.35 1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 89b68651-ee1d-4ed5-b02d-9eb0f0f59860))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp de7b96f4-93a3-4813-b8c4-a0efc4498ed9))
     (fp_line (start 2.35 -1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 9940cebc-f75d-492d-b215-1140f6e09e6f))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 1da5ef0e-d383-4381-9252-a313a757ecec))
     (fp_line (start 2.35 1.15) (end 2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp a067cc11-4437-40fe-95fd-5a52949ee8ef))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 2c964394-eb86-4c31-9a15-ea51e1a7cbd5))
     (fp_line (start -1.4 -0.9) (end -1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp f5dc2508-14c6-46fb-8981-8a21c229b9e0))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 53d21872-c906-495b-8a1a-294d50567bfe))
     (fp_line (start -1.4 0.9) (end 1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp ab5df4a7-793e-4ed8-bdd9-82efc07fbb20))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 7db43ad9-342b-4264-b0df-5977106982ad))
     (fp_line (start -0.75 0) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 26798eed-3866-41be-bf7c-6ce88b38cff9))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 4c43f417-0fa4-4886-a069-6eb39a033496))
     (fp_line (start -0.35 0) (end -0.35 -0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp b3984771-29a3-49b1-b702-44eddb820cf7))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp d4484fb9-6ae9-4a3c-9e47-72cd79cbce8d))
     (fp_line (start -0.35 0) (end -0.35 0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp efdad2c1-fbe8-4650-8e00-8951b1dc3c78))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 1127eec1-ac9c-4442-92ea-09ebc9226d68))
     (fp_line (start -0.35 0) (end 0.25 0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 8c456cce-5e9b-4420-9e1f-4510604595bc))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 5c6baf66-ad0d-4bea-b4f4-5cc1a27d5d20))
     (fp_line (start 0.25 -0.4) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp a6dc37a9-7dc4-4b9e-84b2-f56299792da5))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 6fa69f7d-605f-43ed-9606-ac1720b709a4))
     (fp_line (start 0.25 0) (end 0.75 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 792d21b6-ca38-4d16-aebe-35adab83773b))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp d08bcd1b-aa36-4479-b2a3-b842e747645f))
     (fp_line (start 0.25 0.4) (end 0.25 -0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 47db1a02-abf6-4c70-9686-6ba43728c5c9))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 9e6f67ea-c637-4aad-8b2a-1ad45bbdd9e6))
     (fp_line (start 1.4 -0.9) (end -1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 31a1ce3e-1fda-44df-a6db-71e7ff579bfd))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 8f6d68a4-0bf1-483f-8a57-4dced50a7b70))
     (fp_line (start 1.4 0.9) (end 1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 27dd2112-0971-4957-ac72-b0a341b673f4))
-    (pad "1" smd roundrect (at -1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 45 "Net-(D40-K)") (pinfunction "K") (pintype "passive") (tstamp 04f05a15-1e02-4013-b05c-241e4f09d424))
-    (pad "2" smd roundrect (at 1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 38 "Net-(D33-A)") (pinfunction "A") (pintype "passive") (tstamp 7d06bb7e-05df-4a81-a984-dc3c6a7adc13))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp baf951e6-e5f4-443b-b554-b1994cf2264a))
+    (pad "1" smd roundrect (at -1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 13 "Net-(D48-K)") (pinfunction "K") (pintype "passive") (tstamp 726b114b-c9e2-46d5-bd3c-2998013b7993))
+    (pad "2" smd roundrect (at 1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 70 "Net-(D48-A)") (pinfunction "A") (pintype "passive") (tstamp 3862b4d1-8c83-4bbd-bc4f-2e7d2e6ce7f8))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SOD-123.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -6232,8 +6444,8 @@
   )
 
   (footprint "Diode_SMD:D_SOD-123" (layer "B.Cu")
-    (tstamp 534bb3d7-dd13-48f0-b8d9-386448961b67)
-    (at 207.48625 188.11875 180)
+    (tstamp 580f98de-79c3-45ea-8ea7-6ad686d49b14)
+    (at 123.825 164.30625)
     (descr "SOD-123")
     (tags "SOD-123")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
@@ -6242,60 +6454,60 @@
     (property "Sim.Pins" "1=K 2=A")
     (property "ki_description" "100V 0.15A standard switching diode, DO-35")
     (property "ki_keywords" "diode")
-    (path "/03502f84-c00b-488f-8a2b-582448ec8b49")
+    (path "/056fb87c-8952-4d3f-9b19-12b2b1c084b7")
     (attr smd)
-    (fp_text reference "D52" (at 0 2) (layer "B.SilkS")
+    (fp_text reference "D9" (at 0 2) (layer "B.SilkS")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 7c3bbee2-0dd8-4dc3-a990-c9d311e0a72f)
+      (tstamp 54917222-8c78-462a-9b58-faafa0e036ff)
     )
     (fp_text value "1N4148" (at 0 -2.1) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp ee2d9cfe-a555-436e-941c-79b13fe3c38d)
+      (tstamp f9246491-beae-4aa9-aa9d-27c37a1e4232)
     )
     (fp_text user "${REFERENCE}" (at 0 2) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 7644555c-2db7-4beb-82f4-84754e3cdaf7)
+      (tstamp d463cfb8-ffd2-4873-ba6d-5a6efe3f23a3)
     )
     (fp_line (start -2.36 -1) (end 1.65 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 4a7a74eb-a88d-4f0d-9a1c-60e18ced8a83))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp a3b6ef5c-e5bb-4f77-982a-e23c1f55a5f5))
     (fp_line (start -2.36 1) (end -2.36 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp ccbd3dfa-433a-4cb4-89f5-e114f7d89e1b))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp a3bb28a4-e32d-47df-984e-eff03005ca9c))
     (fp_line (start -2.36 1) (end 1.65 1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 65ad09e7-4c93-4471-ac83-4d1254221c43))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 44579fdd-da5a-4610-9553-696fd1cd9e34))
     (fp_line (start -2.35 1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 59c1ca19-6dd8-42e6-92c5-26538c245000))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 3c50bef9-ae47-4518-a70d-4394df003846))
     (fp_line (start -2.35 1.15) (end 2.35 1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 3624af28-2109-4d75-bb84-1c8769f34087))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 31881865-636e-49d4-9345-cb1f8011b422))
     (fp_line (start 2.35 -1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp cae354c0-1c59-435a-a35b-cb976a079a05))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 6528724d-d391-442d-8de5-74eaa3d6992f))
     (fp_line (start 2.35 1.15) (end 2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 709238ab-bd7f-46e4-9355-6f7ec165245d))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 187ea0d7-c2fb-48b6-98a8-adf30ffed014))
     (fp_line (start -1.4 -0.9) (end -1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 354db9ad-52f3-4987-9f94-ad99e9c00e68))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 67d5de23-dae5-4106-b5d4-03beaaa5301d))
     (fp_line (start -1.4 0.9) (end 1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp b1ebd349-408d-4e44-ba0f-4f2d94ab092d))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 7a0f0d00-004c-4e6a-b34f-026b8dfe5098))
     (fp_line (start -0.75 0) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 0d23bc03-a6e3-4279-aca1-16d65eebc632))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp b7c04913-e414-4b08-9022-7f7817753da2))
     (fp_line (start -0.35 0) (end -0.35 -0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 57577143-369b-412f-acb2-09df964cc7a0))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 99328ada-e1be-4400-b265-170d405bd56e))
     (fp_line (start -0.35 0) (end -0.35 0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 50c0ab0a-a254-4f74-b98f-7320d760b78b))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 62038441-e851-4b25-a19d-307c9dbeba2d))
     (fp_line (start -0.35 0) (end 0.25 0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 1c6899e3-2828-46af-ae3d-148eca4b1560))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 07832545-0c7f-46e0-81cb-25a3a207ab49))
     (fp_line (start 0.25 -0.4) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp dc0e4d79-2460-4992-b2a2-bd20738c58c2))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp eb089f69-aec0-436b-b79b-6579edc46b20))
     (fp_line (start 0.25 0) (end 0.75 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp d956cb46-eef2-4e9e-a32a-76aaa018aac6))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 6e02ee44-3f79-408e-91b1-e1ef8b9e2382))
     (fp_line (start 0.25 0.4) (end 0.25 -0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 892bf330-4800-4c6d-a69c-efa8c925c7a6))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 4cbb742f-e9ef-4dee-8204-230b5a701421))
     (fp_line (start 1.4 -0.9) (end -1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp e2503388-9c08-4271-9ad4-cb16dc3aad29))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp ecdd27b0-59dc-489a-9abf-269b3d8e504d))
     (fp_line (start 1.4 0.9) (end 1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp f552fdd2-fcd6-432a-a905-4450031e2424))
-    (pad "1" smd roundrect (at -1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 59 "Net-(D52-K)") (pinfunction "K") (pintype "passive") (tstamp 595db248-51a4-4c4f-9c11-494b9edbc90b))
-    (pad "2" smd roundrect (at 1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 56 "Net-(D49-A)") (pinfunction "A") (pintype "passive") (tstamp 2af1f9c9-a76c-446d-8029-dffc19b98dd3))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 33e4244b-c895-4e08-8cd4-43acda6b28c1))
+    (pad "1" smd roundrect (at -1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 4 "Net-(D10-K)") (pinfunction "K") (pintype "passive") (tstamp 40850772-b329-425d-b968-f035e28efd80))
+    (pad "2" smd roundrect (at 1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 36 "Net-(D9-A)") (pinfunction "A") (pintype "passive") (tstamp 5c77bd88-f863-4695-bfa5-addaea4af3f0))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SOD-123.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -6304,8 +6516,8 @@
   )
 
   (footprint "Diode_SMD:D_SOD-123" (layer "B.Cu")
-    (tstamp 59071035-d649-44bb-b87d-c204a09b0acf)
-    (at 119.38 169.06875 180)
+    (tstamp 5a13392a-1342-4c0b-9fa6-4f1c377a8c2b)
+    (at 330.99375 145.25625)
     (descr "SOD-123")
     (tags "SOD-123")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
@@ -6314,60 +6526,60 @@
     (property "Sim.Pins" "1=K 2=A")
     (property "ki_description" "100V 0.15A standard switching diode, DO-35")
     (property "ki_keywords" "diode")
-    (path "/4acb1923-779f-40e6-9aae-90db6bac254d")
+    (path "/d7525d47-5d24-47f5-9dcb-c57665736b47")
     (attr smd)
-    (fp_text reference "D1" (at 0 2) (layer "B.SilkS")
+    (fp_text reference "D42" (at 0 2) (layer "B.SilkS")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 01befcfa-df79-4904-9216-085f12e4a2cb)
+      (tstamp 6ce26ee4-f7a8-4600-8e17-3ddd732551c0)
     )
     (fp_text value "1N4148" (at 0 -2.1) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp ca1ef79c-82e1-4cc3-b426-66502bbd5d57)
+      (tstamp 06ed4a33-9e90-42f2-9d2b-5d4b0eacc10b)
     )
     (fp_text user "${REFERENCE}" (at 0 2) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 546edfed-cb91-4733-a026-d860484e2a79)
+      (tstamp 0a9876a3-5e2d-45af-8c24-737e5d889e4d)
     )
     (fp_line (start -2.36 -1) (end 1.65 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 7478bf2e-fa54-4d2b-8e60-a368cea74da3))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 286c1178-94fe-437a-b86a-4fec9cc763c6))
     (fp_line (start -2.36 1) (end -2.36 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 40d550e8-8ee4-4570-826f-d300c7404a25))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp ffd64b54-a017-47d1-8ff1-e7667cd30568))
     (fp_line (start -2.36 1) (end 1.65 1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 7c466147-6726-456b-bb02-24352d9fcd12))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 6f3bbab0-78c9-4d69-9cf7-40fcb7243277))
     (fp_line (start -2.35 1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 88ffa464-a059-4b49-a392-178f5df22286))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp c82c6273-5b2f-47d9-91c7-9abc627515e2))
     (fp_line (start -2.35 1.15) (end 2.35 1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 7e38fbbc-6d41-4c4b-812d-50a02004671d))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 6a58d91c-4793-49b2-896f-f284b3e36d30))
     (fp_line (start 2.35 -1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp c4d4513f-9343-4e34-9c1a-a75c29af8f2e))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp b41ec39a-86b3-45b9-90ec-95f62758f43b))
     (fp_line (start 2.35 1.15) (end 2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp be8552ad-bb25-471e-8ab5-9839ea9bfd44))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 561acbb1-e325-4c79-8e53-feffef089f87))
     (fp_line (start -1.4 -0.9) (end -1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 29bd111e-9d8e-469b-b0e5-9783bd48576d))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp ec5d2645-5f52-4adc-b7de-333a2841b7a4))
     (fp_line (start -1.4 0.9) (end 1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp ae7a1e4e-ab1f-41d3-af53-e3a21504463e))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 35ec53be-6f9f-4766-ae01-0716cf385fd1))
     (fp_line (start -0.75 0) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 472538ee-ecbe-4240-acc5-8192d10eb285))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp dba28792-ec3b-4984-b7da-934c070ca4d6))
     (fp_line (start -0.35 0) (end -0.35 -0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 4545ed3f-5099-4c50-bc6d-166f00173f2a))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp fea695b6-1521-4384-80e0-d0a4bb08cf50))
     (fp_line (start -0.35 0) (end -0.35 0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 98622bdb-92e5-42e7-8bab-ab29c4ada005))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 24e7c738-2498-4f47-94a0-7f9a915abb39))
     (fp_line (start -0.35 0) (end 0.25 0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp c2ee0b9e-8935-4d2a-9647-afaa9256246e))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp e0feaf4e-44a0-46dd-9a51-2ca4363fa42d))
     (fp_line (start 0.25 -0.4) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp e65b940f-212c-415c-8a04-2de3eb7e851b))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 59d79a15-5357-43d3-8cff-7c511405e19c))
     (fp_line (start 0.25 0) (end 0.75 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 440aa92e-d407-4529-b1e8-0ea381f3d1b3))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp af1aa2b0-da07-4162-b16c-47a7ce1720b5))
     (fp_line (start 0.25 0.4) (end 0.25 -0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 3f92a6b4-1d06-4609-9aad-515f0592b182))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp f7f438c2-7aa9-41af-8392-c8ca3f208884))
     (fp_line (start 1.4 -0.9) (end -1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 2caa5298-fe87-431a-b0fa-3b8f236a7048))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 0d5e8932-9207-4527-a7e9-1553a3d2a442))
     (fp_line (start 1.4 0.9) (end 1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 06e531d2-6b3e-4188-84a4-3f74d1e97980))
-    (pad "1" smd roundrect (at -1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 1 "Net-(D1-K)") (pinfunction "K") (pintype "passive") (tstamp d12fa5c8-347f-4600-bffa-63886e22fa3c))
-    (pad "2" smd roundrect (at 1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 2 "Net-(D1-A)") (pinfunction "A") (pintype "passive") (tstamp 0a52db8c-6981-4862-8b2a-de5bb3a3d766))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 938c65fb-8a6f-4d15-bd56-fb6ca7f37ec8))
+    (pad "1" smd roundrect (at -1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 11 "Net-(D40-K)") (pinfunction "K") (pintype "passive") (tstamp c0cc16af-5814-4f4d-9096-8004da13597e))
+    (pad "2" smd roundrect (at 1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 64 "Net-(D42-A)") (pinfunction "A") (pintype "passive") (tstamp 361b13d2-21ac-4848-8daa-98b257e76898))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SOD-123.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -6376,8 +6588,8 @@
   )
 
   (footprint "Diode_SMD:D_SOD-123" (layer "B.Cu")
-    (tstamp 591ff305-ae38-4e54-95ca-aab9caef2258)
-    (at 317.02375 207.16875 180)
+    (tstamp 5b77056a-5284-4630-b9b7-affc474910ed)
+    (at 164.30625 107.15625)
     (descr "SOD-123")
     (tags "SOD-123")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
@@ -6386,60 +6598,60 @@
     (property "Sim.Pins" "1=K 2=A")
     (property "ki_description" "100V 0.15A standard switching diode, DO-35")
     (property "ki_keywords" "diode")
-    (path "/d4861e79-c3bf-4d8e-a4c2-1faffb75c11a")
+    (path "/04151445-0807-473f-9c7f-0d509963e510")
     (attr smd)
-    (fp_text reference "D43" (at 0 2) (layer "B.SilkS")
+    (fp_text reference "D5" (at 0 2) (layer "B.SilkS")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 7ffd977a-d3e9-452f-84f3-d11be50d37e3)
+      (tstamp f7a3ba37-be4b-4215-b0c1-259a5cf2216b)
     )
     (fp_text value "1N4148" (at 0 -2.1) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 210e6f36-561c-4e92-8c00-ebdd91c60488)
+      (tstamp a531e5db-6c8f-48fa-9f9a-51928d11db07)
     )
     (fp_text user "${REFERENCE}" (at 0 2) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 72cb85f8-24df-40b8-9391-815b1ce123b3)
+      (tstamp 60916fe3-c43f-465b-b59a-67560094e84e)
     )
     (fp_line (start -2.36 -1) (end 1.65 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 2b793215-f95c-411d-8ea4-e1a1b33ebe09))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 1326214a-d030-4a7a-aa65-c5d978a31078))
     (fp_line (start -2.36 1) (end -2.36 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp f92ae336-b3f8-4ebd-a913-99305feb6a10))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 71bdc960-e45f-4c66-bf84-41e8045f8f44))
     (fp_line (start -2.36 1) (end 1.65 1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 810b0ff0-95d5-4261-a0ba-84affd7168ca))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp bed2d999-da14-4df8-a7e0-748c9e10edd3))
     (fp_line (start -2.35 1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp a52a5a2d-015a-43eb-b49b-d979378e023e))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 6eff5b74-1a8b-4c63-ac6c-5ef359a5dc3f))
     (fp_line (start -2.35 1.15) (end 2.35 1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp c30ff25e-13eb-4942-a416-8d6aaa863907))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 54d71cf2-6e21-4ffe-874f-3aff240a8ffc))
     (fp_line (start 2.35 -1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp d434bd67-f0f9-487c-b01f-dacd96deeca3))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 20421ff5-8fc7-4604-a0d3-8b8ae745958e))
     (fp_line (start 2.35 1.15) (end 2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp c0a3c656-c5ec-4be9-804c-18fb64500f3e))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp c3fcca2c-65da-4555-92a4-ef910751f765))
     (fp_line (start -1.4 -0.9) (end -1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 2e765e08-f528-49e7-9836-4986adbfea7f))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 96b8a78f-52cc-42a9-bb37-482ed87b66f5))
     (fp_line (start -1.4 0.9) (end 1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 0701e83d-f98c-41ad-8d85-f7092eac09c8))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 1cf983a7-93f3-4d3b-994d-783919bfd38d))
     (fp_line (start -0.75 0) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 8c6a649d-b737-4b0d-99e8-b5e214d371a3))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 1c7fd138-608e-4f50-b96f-eedc869171b4))
     (fp_line (start -0.35 0) (end -0.35 -0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 9391d15e-cd3d-4830-9f51-d67e8d418582))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 874e4f6c-f27a-4169-a6bb-0aa947b9d6ca))
     (fp_line (start -0.35 0) (end -0.35 0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 1fcc0cfa-492b-4547-be19-5eb972205033))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 1b72380e-ee4a-42c3-a2cf-be6b9af281e7))
     (fp_line (start -0.35 0) (end 0.25 0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp ed5363ec-58af-4e31-8243-ca89ca868df2))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 6959c1ca-f568-46f1-94c4-da5b1f2e8ecc))
     (fp_line (start 0.25 -0.4) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp b6d11297-c82f-4b14-867b-a8af520e6187))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 90f715f7-bf37-4005-b75e-c420280021d4))
     (fp_line (start 0.25 0) (end 0.75 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 00b97cec-064a-4bfb-99ce-09c569134f01))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 7fa0c67b-45a9-48c1-84ca-59e8590cf93d))
     (fp_line (start 0.25 0.4) (end 0.25 -0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 06ded0fe-cbcb-4c81-a8fd-f52c30c2eb7b))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 6833d30a-f931-418b-bbcf-1d4d866bc464))
     (fp_line (start 1.4 -0.9) (end -1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 7003aa4e-b0d1-4eb7-83f9-67a4782df38c))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 0404f40e-ead6-4851-a8a0-32b0b17cb749))
     (fp_line (start 1.4 0.9) (end 1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 0fea23c5-2fe4-4adb-bd95-8be09cefae15))
-    (pad "1" smd roundrect (at -1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 49 "Net-(D43-K)") (pinfunction "K") (pintype "passive") (tstamp cc8aa13c-b27c-403a-9b62-2c5823ea66d5))
-    (pad "2" smd roundrect (at 1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 47 "Net-(D41-A)") (pinfunction "A") (pintype "passive") (tstamp ff606eb8-36a9-4232-a846-923329523b4a))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 2656dbd4-624e-466e-ac92-6c2c1a3a1a42))
+    (pad "1" smd roundrect (at -1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 1 "Net-(D1-K)") (pinfunction "K") (pintype "passive") (tstamp ae1e5af8-54c3-496d-bac7-58a77774824e))
+    (pad "2" smd roundrect (at 1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 32 "Net-(D5-A)") (pinfunction "A") (pintype "passive") (tstamp 02f3223b-b77c-43e2-b715-facbdce46df8))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SOD-123.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -6448,8 +6660,8 @@
   )
 
   (footprint "Diode_SMD:D_SOD-123" (layer "B.Cu")
-    (tstamp 6239a0d1-0aae-45f5-b8db-ce2a10acd2f5)
-    (at 317.02375 130.96875 180)
+    (tstamp 6283c89d-fa8d-499c-b90d-c7fb3c9c793f)
+    (at 321.46875 164.30625)
     (descr "SOD-123")
     (tags "SOD-123")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
@@ -6458,60 +6670,60 @@
     (property "Sim.Pins" "1=K 2=A")
     (property "ki_description" "100V 0.15A standard switching diode, DO-35")
     (property "ki_keywords" "diode")
-    (path "/1c276179-1cf4-4680-922b-e7e736415048")
+    (path "/b03fe2fc-a6ae-4228-b110-29caf0c49e70")
     (attr smd)
-    (fp_text reference "D12" (at 0 2) (layer "B.SilkS")
+    (fp_text reference "D51" (at 0 2) (layer "B.SilkS")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 5c582d96-db7e-4c93-a579-549487b81139)
+      (tstamp 7d3b50b0-b2df-4881-b7d0-d1a2fb27b0f3)
     )
     (fp_text value "1N4148" (at 0 -2.1) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 031e6e7f-52d3-4aa3-93a6-e15d65860f4f)
+      (tstamp d58a2f1b-ecf8-4a5b-b9ec-b2435d074ce9)
     )
     (fp_text user "${REFERENCE}" (at 0 2) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 6d24ef7e-09be-41ea-a824-bcf5664b8624)
+      (tstamp a66dbb3b-4745-4885-b000-f49f7e0e9193)
     )
     (fp_line (start -2.36 -1) (end 1.65 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp da6c8ca9-ee91-4b42-aeab-81baed8c4cc4))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 95fffa5f-a573-42e9-a8d7-00325b641b09))
     (fp_line (start -2.36 1) (end -2.36 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 7d6ffebd-663d-4306-af7c-02a7e330ca37))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 46eb76c0-6c26-48fd-86f0-3c30e493bf4c))
     (fp_line (start -2.36 1) (end 1.65 1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 79cc815e-bb39-41e9-a5a4-856fb487dcb2))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 3deabc24-a3f7-4e95-8539-f26b6480b9ad))
     (fp_line (start -2.35 1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 07beccd7-25fa-4989-9637-7460e98e3fba))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 2e9fc11d-1a01-4232-9831-0b8b627ee600))
     (fp_line (start -2.35 1.15) (end 2.35 1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 3b8de249-b90c-42d2-9021-0fba1ca6d173))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 2c3954cb-d662-4ada-b4da-c7ef57169f39))
     (fp_line (start 2.35 -1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 82e5f56c-e1a0-4672-b60b-3b68fa13c22c))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 24187164-7c57-4488-905b-e49d27cbbe50))
     (fp_line (start 2.35 1.15) (end 2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 48eb60c2-6d37-4d72-bbd3-a266e2ae8de7))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 34b8450c-2eeb-45af-b48c-1743a39cfbaa))
     (fp_line (start -1.4 -0.9) (end -1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 503a001e-b983-4b09-a408-3dc2208b0058))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 57cf5228-fb1a-4fc7-854b-910f410d5e69))
     (fp_line (start -1.4 0.9) (end 1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 2ac61d40-2f4f-4625-a0e7-e0edcde41221))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 61634efa-2622-4679-b824-4e77abdbc7ef))
     (fp_line (start -0.75 0) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp e67bcd60-4fad-4bd5-a121-ba757aaebc80))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 2a45d75b-ece7-4502-bc71-b39e954d8466))
     (fp_line (start -0.35 0) (end -0.35 -0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 92ba6c9b-f4f3-4871-9af5-ff937ecd3a36))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp b6bc4004-110e-42bb-97d5-de04166bd97f))
     (fp_line (start -0.35 0) (end -0.35 0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 35e9a34e-bc18-47ef-99e3-3789aeac0400))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 1073b709-e01e-4297-9ec5-002a8d48cd5f))
     (fp_line (start -0.35 0) (end 0.25 0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 50d5fa5b-1cb0-4813-a318-d4de914bea20))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 00118765-7700-4a42-9528-71e1577165fa))
     (fp_line (start 0.25 -0.4) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 207ed33f-acfb-4d01-b423-b54f0260064d))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp ae5210ec-8ec2-483d-b2c1-11d99c5f5fb7))
     (fp_line (start 0.25 0) (end 0.75 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp d5438deb-8e04-434d-8cd5-c52b3b5c9f75))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp de5f28a8-c9d6-4f7e-882a-023cb3b20b79))
     (fp_line (start 0.25 0.4) (end 0.25 -0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 90d3d1ab-cbd7-471b-9ba9-9609db636adc))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 78a09bfa-93a3-44c0-a0ff-9c787c4cf93b))
     (fp_line (start 1.4 -0.9) (end -1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp cc30ca7c-756c-47f2-8e19-a043669a44b3))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 24b6e7cb-583d-433b-bb02-aed8e29daea1))
     (fp_line (start 1.4 0.9) (end 1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 93aa6a55-37bd-4232-92dd-2889a9506d0f))
-    (pad "1" smd roundrect (at -1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 14 "Net-(D12-K)") (pinfunction "K") (pintype "passive") (tstamp 3ba40308-fe01-4f30-970c-e918367230e2))
-    (pad "2" smd roundrect (at 1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 11 "Net-(D10-A)") (pinfunction "A") (pintype "passive") (tstamp 1f052163-ac0a-43a5-8270-8c44b1ae3d89))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp ef072042-08ad-4cae-b1c1-8b62d8454d6c))
+    (pad "1" smd roundrect (at -1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 13 "Net-(D48-K)") (pinfunction "K") (pintype "passive") (tstamp ce0b64d0-d6ab-47d2-950a-799db3b0ca00))
+    (pad "2" smd roundrect (at 1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 72 "Net-(D51-A)") (pinfunction "A") (pintype "passive") (tstamp 341af809-ef57-4b3e-9e81-7bdcba762112))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SOD-123.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -6519,9 +6731,221 @@
     )
   )
 
+  (footprint "Connector_PinSocket_2.54mm:PinSocket_1x08_P2.54mm_Horizontal" (layer "B.Cu")
+    (tstamp 67172c92-d712-4ac4-9673-06ad20accd86)
+    (at 174.48125 85.3625 -90)
+    (descr "Through hole angled socket strip, 1x08, 2.54mm pitch, 8.51mm socket length, single row (from Kicad 4.0.7), script generated")
+    (tags "Through hole angled socket strip THT 1x08 2.54mm single row")
+    (property "Sheetfile" "xantronix-z32.kicad_sch")
+    (property "Sheetname" "")
+    (property "ki_description" "Generic connector, single row, 01x08, script generated")
+    (property "ki_keywords" "connector")
+    (path "/414f5e6b-4487-4c46-9567-a94f44838678")
+    (attr through_hole)
+    (fp_text reference "J1" (at -4.38 2.77 90) (layer "B.SilkS")
+        (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+      (tstamp fac393ba-1f95-4b99-9680-3b0aace3a974)
+    )
+    (fp_text value "Conn_01x08_Socket" (at -4.38 -20.55 90) (layer "B.Fab")
+        (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+      (tstamp 3f859e15-a6d1-4314-a824-83de86f4230d)
+    )
+    (fp_text user "${REFERENCE}" (at -5.775 -8.89) (layer "B.Fab")
+        (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+      (tstamp 9f6224fc-ab0e-4c20-832f-709d74e5ebe1)
+    )
+    (fp_line (start -10.09 -19.11) (end -1.46 -19.11)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 1db964f0-97d8-4365-aaa4-b9e7add4cf94))
+    (fp_line (start -10.09 -16.51) (end -1.46 -16.51)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp e1113b55-64e1-43d7-a0fc-e78dab97fa93))
+    (fp_line (start -10.09 -13.97) (end -1.46 -13.97)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp d64203cc-5eec-4dd6-b80c-a0a6ba590f9f))
+    (fp_line (start -10.09 -11.43) (end -1.46 -11.43)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 132e48a3-538b-42f7-8538-bfc53b5ab0f1))
+    (fp_line (start -10.09 -8.89) (end -1.46 -8.89)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 1f3b7571-e6a6-4e00-8f24-65951c6205e7))
+    (fp_line (start -10.09 -6.35) (end -1.46 -6.35)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 71769a16-1fce-4161-9737-f91320d8afb3))
+    (fp_line (start -10.09 -3.81) (end -1.46 -3.81)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp ce6c6741-962f-48c4-a9ba-1999bccc22ec))
+    (fp_line (start -10.09 -1.27) (end -1.46 -1.27)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 48ee4731-f165-4410-9f95-fee05367aa45))
+    (fp_line (start -10.09 -1.1519) (end -1.46 -1.1519)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp e1517c1f-9a28-4cae-ab75-b4ab95e91c95))
+    (fp_line (start -10.09 -1.033805) (end -1.46 -1.033805)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 4ef0e206-d83c-4a80-8626-b200b8945cfa))
+    (fp_line (start -10.09 -0.91571) (end -1.46 -0.91571)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 02dc18b8-10b1-4414-9b4c-5dee1f62836e))
+    (fp_line (start -10.09 -0.797615) (end -1.46 -0.797615)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 588258cd-4c25-496b-be80-11aa03c7cafc))
+    (fp_line (start -10.09 -0.67952) (end -1.46 -0.67952)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp ef1d4c58-173f-4be5-bb0f-08d45722bbe6))
+    (fp_line (start -10.09 -0.561425) (end -1.46 -0.561425)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 29695f3f-2d33-41cc-8fd7-bbf3cb9a3b6e))
+    (fp_line (start -10.09 -0.44333) (end -1.46 -0.44333)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp af76384c-c247-44a1-b64a-98f798f6022f))
+    (fp_line (start -10.09 -0.325235) (end -1.46 -0.325235)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 8e678fa8-5c3a-4968-a562-e053a221ab6d))
+    (fp_line (start -10.09 -0.20714) (end -1.46 -0.20714)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp bbd69efc-d4fa-46eb-96ea-7cb4127a9e0a))
+    (fp_line (start -10.09 -0.089045) (end -1.46 -0.089045)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 8ac4dea9-835e-434c-9b46-6cf7ef386ec8))
+    (fp_line (start -10.09 0.02905) (end -1.46 0.02905)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 47c67af6-5b6d-46ea-8608-ef79b8b3326d))
+    (fp_line (start -10.09 0.147145) (end -1.46 0.147145)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 7e26ef16-4cdf-4725-b2e5-d39b54be6084))
+    (fp_line (start -10.09 0.26524) (end -1.46 0.26524)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 0ce295c3-005c-41e0-9bc5-b6ea5e5d8d9d))
+    (fp_line (start -10.09 0.383335) (end -1.46 0.383335)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp af4648d3-411a-4134-b6ea-3a08659813ba))
+    (fp_line (start -10.09 0.50143) (end -1.46 0.50143)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 90b50ffc-46b5-4661-8218-f240bc6f6699))
+    (fp_line (start -10.09 0.619525) (end -1.46 0.619525)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp ec072660-f24a-4ed3-9df1-9a63d13a7977))
+    (fp_line (start -10.09 0.73762) (end -1.46 0.73762)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 4bb979b5-fd0a-4caf-a249-2274a3c6140d))
+    (fp_line (start -10.09 0.855715) (end -1.46 0.855715)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 46963f15-e0b9-4468-9b3f-ca0a16a4f8e1))
+    (fp_line (start -10.09 0.97381) (end -1.46 0.97381)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 6f68a861-47e8-4280-98cc-55fa9f9cc09f))
+    (fp_line (start -10.09 1.091905) (end -1.46 1.091905)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp a7b00ae5-ef45-424e-8496-144c94a63e75))
+    (fp_line (start -10.09 1.21) (end -1.46 1.21)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp b7b31cf9-4dc5-4a24-a5b9-a33ad9fd4601))
+    (fp_line (start -10.09 1.33) (end -10.09 -19.11)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp bfa3ad46-a797-42a9-872e-a8e237417785))
+    (fp_line (start -10.09 1.33) (end -1.46 1.33)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp cad0c76b-beb7-42a4-9221-8b53f934569c))
+    (fp_line (start -1.46 -18.14) (end -1.05 -18.14)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 4c97ee83-093c-4d67-8343-855893c0eef1))
+    (fp_line (start -1.46 -17.42) (end -1.05 -17.42)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp f0524bd6-f426-41b7-aae8-58524447cc9e))
+    (fp_line (start -1.46 -15.6) (end -1.05 -15.6)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 1bf95bd4-011c-41c1-ab27-8451c6cae93c))
+    (fp_line (start -1.46 -14.88) (end -1.05 -14.88)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp fa8cc292-f219-45d1-9dcd-31b132cec437))
+    (fp_line (start -1.46 -13.06) (end -1.05 -13.06)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 266ebbcf-1915-45df-8fc3-595be828b207))
+    (fp_line (start -1.46 -12.34) (end -1.05 -12.34)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp e3ece659-6961-4de5-b024-24f848091400))
+    (fp_line (start -1.46 -10.52) (end -1.05 -10.52)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp dcb78143-d3d0-4de0-a3c5-695981cbafbd))
+    (fp_line (start -1.46 -9.8) (end -1.05 -9.8)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp fe0319a8-f7ab-40c0-bcd2-30cf39ffcdf6))
+    (fp_line (start -1.46 -7.98) (end -1.05 -7.98)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 9b8798a2-178c-4a4b-bfb5-1b0c90db2479))
+    (fp_line (start -1.46 -7.26) (end -1.05 -7.26)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp b6f21f6f-f779-46b9-a0dd-77e6457e5363))
+    (fp_line (start -1.46 -5.44) (end -1.05 -5.44)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 711fbb01-daa7-4059-af3d-e80603291314))
+    (fp_line (start -1.46 -4.72) (end -1.05 -4.72)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 384bebfb-4068-4c9a-aafd-b148ea104e16))
+    (fp_line (start -1.46 -2.9) (end -1.05 -2.9)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 39c52200-6adc-4bdd-95de-b3d3237a03a3))
+    (fp_line (start -1.46 -2.18) (end -1.05 -2.18)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 5244b9f3-d337-4353-9969-8fa2362746da))
+    (fp_line (start -1.46 -0.36) (end -1.11 -0.36)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp a5ea43a1-cfca-46f9-99a8-cad80a2329f9))
+    (fp_line (start -1.46 0.36) (end -1.11 0.36)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp b828edad-9d23-471d-9804-c575670548f2))
+    (fp_line (start -1.46 1.33) (end -1.46 -19.11)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 8b36d4be-af5e-4617-a5a0-a1b809cceabf))
+    (fp_line (start 0 1.33) (end 1.11 1.33)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 2c1532bb-5434-4aa1-97c9-333797aff199))
+    (fp_line (start 1.11 1.33) (end 1.11 0)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 0b552a0e-1610-4b83-9812-1baf0a05fe33))
+    (fp_line (start -10.55 -19.55) (end 1.75 -19.55)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp d8c5b275-0b57-4335-843a-41840326d091))
+    (fp_line (start -10.55 1.8) (end -10.55 -19.55)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 9e4caa48-ad44-484a-927a-a9f2900f5b08))
+    (fp_line (start 1.75 -19.55) (end 1.75 1.8)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp a54232e6-6652-420e-a97a-dd1ebb8d7ee5))
+    (fp_line (start 1.75 1.8) (end -10.55 1.8)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 7d8be6a1-226a-4dcd-882d-0b749285ad51))
+    (fp_line (start -10.03 -19.05) (end -10.03 1.27)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp a5dd040f-3f6a-4df3-9adf-fd5edb435660))
+    (fp_line (start -10.03 1.27) (end -2.49 1.27)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp cb2153bd-2bb4-4be2-89f8-dbeb03351b87))
+    (fp_line (start -2.49 1.27) (end -1.52 0.3)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp c9243a83-6a3e-4921-82a2-273c4b9faaeb))
+    (fp_line (start -1.52 -19.05) (end -10.03 -19.05)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 78b6fb0f-238d-4a8d-894b-12f2a75c61a3))
+    (fp_line (start -1.52 -18.08) (end 0 -18.08)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 2b3508fd-75e5-47d5-8532-67459257691b))
+    (fp_line (start -1.52 -15.54) (end 0 -15.54)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 988b6521-d7f4-4558-82d6-1ed3b61f14c7))
+    (fp_line (start -1.52 -13) (end 0 -13)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 9ab6d32d-d537-4fdc-814c-58d7d7e75dda))
+    (fp_line (start -1.52 -10.46) (end 0 -10.46)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 8b7737eb-0d42-4835-af88-eebd85e68521))
+    (fp_line (start -1.52 -7.92) (end 0 -7.92)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp a42db191-1e7d-4f95-8377-ff568bd16e9c))
+    (fp_line (start -1.52 -5.38) (end 0 -5.38)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp ba51111b-2af1-4b44-9522-a4c3706b5cc4))
+    (fp_line (start -1.52 -2.84) (end 0 -2.84)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 8ea85299-e268-4143-9a68-e02f0fe64ba6))
+    (fp_line (start -1.52 -0.3) (end 0 -0.3)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 52b33c6c-5719-416f-b92a-eafbb3ea3ba5))
+    (fp_line (start -1.52 0.3) (end -1.52 -19.05)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp de87a891-76b0-4458-b8fa-9cf9af10ef09))
+    (fp_line (start 0 -18.08) (end 0 -17.48)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp b9a39cef-5392-40bd-abea-3805427fe071))
+    (fp_line (start 0 -17.48) (end -1.52 -17.48)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 9d692ddb-f634-4a5d-84f0-c7190c184af8))
+    (fp_line (start 0 -15.54) (end 0 -14.94)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 46e5c7bd-d67f-40b7-a75d-36082ad6105d))
+    (fp_line (start 0 -14.94) (end -1.52 -14.94)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 6b3ae9b9-5475-48bc-acdf-878eaca1333f))
+    (fp_line (start 0 -13) (end 0 -12.4)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 767ca4ee-8286-4899-8333-c4e695ea64c4))
+    (fp_line (start 0 -12.4) (end -1.52 -12.4)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp a2a63518-fc59-4045-8340-e747d2baf5d4))
+    (fp_line (start 0 -10.46) (end 0 -9.86)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 0200b577-745e-4e83-80ca-25dd2e507beb))
+    (fp_line (start 0 -9.86) (end -1.52 -9.86)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp b8c11194-c48e-4ad1-a405-5bfd31acb1b1))
+    (fp_line (start 0 -7.92) (end 0 -7.32)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 912159dc-cc8f-4150-8105-55baa0fa071f))
+    (fp_line (start 0 -7.32) (end -1.52 -7.32)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 888f279f-13fa-473c-b328-97b8de4f20ec))
+    (fp_line (start 0 -5.38) (end 0 -4.78)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 0852f1c0-e229-47b2-84ca-b66609462b76))
+    (fp_line (start 0 -4.78) (end -1.52 -4.78)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp aaf741d6-b898-47ff-9f07-5cc56cb9ca4e))
+    (fp_line (start 0 -2.84) (end 0 -2.24)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 7059eda7-13a2-4b0b-aa57-de2fd585049c))
+    (fp_line (start 0 -2.24) (end -1.52 -2.24)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 1d11fc75-765d-447b-a793-c548257ce5bc))
+    (fp_line (start 0 -0.3) (end 0 0.3)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 67c3012d-14e8-40f6-a70e-b962fd6dcfe9))
+    (fp_line (start 0 0.3) (end -1.52 0.3)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 3cf5f2f5-d140-4742-b59d-fc28348dc15e))
+    (pad "1" thru_hole rect (at 0 0 270) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
+      (net 1 "Net-(D1-K)") (pinfunction "Pin_1") (pintype "passive") (tstamp 474e2bd9-1109-4181-9a1e-c89f9cb0e2d1))
+    (pad "2" thru_hole oval (at 0 -2.54 270) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
+      (net 4 "Net-(D10-K)") (pinfunction "Pin_2") (pintype "passive") (tstamp 7bbed05a-1766-40db-b0ce-11397330c88c))
+    (pad "3" thru_hole oval (at 0 -5.08 270) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
+      (net 5 "Net-(D17-K)") (pinfunction "Pin_3") (pintype "passive") (tstamp 537d7c8c-c865-437d-be63-305d53dac949))
+    (pad "4" thru_hole oval (at 0 -7.62 270) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
+      (net 7 "Net-(D25-K)") (pinfunction "Pin_4") (pintype "passive") (tstamp f80c3c78-ecbc-48da-a1ef-6112e505581c))
+    (pad "5" thru_hole oval (at 0 -10.16 270) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
+      (net 9 "Net-(D32-K)") (pinfunction "Pin_5") (pintype "passive") (tstamp ee0f9651-77ab-4afe-bfe4-ba454811ebe3))
+    (pad "6" thru_hole oval (at 0 -12.7 270) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
+      (net 11 "Net-(D40-K)") (pinfunction "Pin_6") (pintype "passive") (tstamp 6962ff96-5daf-4a84-a196-23df5e6eb9b5))
+    (pad "7" thru_hole oval (at 0 -15.24 270) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
+      (net 13 "Net-(D48-K)") (pinfunction "Pin_7") (pintype "passive") (tstamp 95c77f0a-0ce7-469b-9f73-b8f4c06b5f85))
+    (pad "8" thru_hole oval (at 0 -17.78 270) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
+      (net 15 "Net-(D56-K)") (pinfunction "Pin_8") (pintype "passive") (tstamp 8ae9e4bb-1dbc-40d9-b4fc-02b9ef2937ff))
+    (model "${KICAD6_3DMODEL_DIR}/Connector_PinSocket_2.54mm.3dshapes/PinSocket_1x08_P2.54mm_Horizontal.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
   (footprint "Diode_SMD:D_SOD-123" (layer "B.Cu")
-    (tstamp 63aca59f-1c3f-4e53-8b0a-ea68d885779d)
-    (at 174.14875 150.01875 180)
+    (tstamp 678b1d0a-c8c6-412d-9483-3825c9745ebe)
+    (at 211.93125 126.20625)
     (descr "SOD-123")
     (tags "SOD-123")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
@@ -6530,60 +6954,60 @@
     (property "Sim.Pins" "1=K 2=A")
     (property "ki_description" "100V 0.15A standard switching diode, DO-35")
     (property "ki_keywords" "diode")
-    (path "/f3856cea-4d81-4780-8975-eb87575eba6c")
+    (path "/f3201d70-390a-4648-a915-26d43a1d9f16")
     (attr smd)
-    (fp_text reference "D21" (at 0 2) (layer "B.SilkS")
+    (fp_text reference "D15" (at 0 2) (layer "B.SilkS")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 5fc548a3-a266-46bc-ba0e-f323ae9ceba6)
+      (tstamp bb02a988-2d81-4fd6-aed2-c8404e955d6f)
     )
     (fp_text value "1N4148" (at 0 -2.1) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 5a3c55c9-24e4-48de-9fc0-d72d7259d407)
+      (tstamp deda966f-89bb-4955-bc9f-00a644f5f9b1)
     )
     (fp_text user "${REFERENCE}" (at 0 2) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 213612b9-e8e0-4429-a954-173379d5279c)
+      (tstamp 7f28ecf0-cce7-4b36-967a-7e2981fa8431)
     )
     (fp_line (start -2.36 -1) (end 1.65 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp dfdb63e5-b832-4bb2-80bc-983281cc9638))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 5a361cc1-5a1d-45cb-96bd-866088df2419))
     (fp_line (start -2.36 1) (end -2.36 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 5cb0882c-bf94-4ac7-88fe-ac8b883256e3))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 89534308-d08f-4b63-b96b-948fb3378cbf))
     (fp_line (start -2.36 1) (end 1.65 1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 4fa668a2-8163-4364-9f49-eb257abc1299))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp a5123634-bc94-4b14-8cb8-44c0c1ea7ee5))
     (fp_line (start -2.35 1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp aeab222a-f2a9-4ac8-91bd-098ba67b8479))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp bf4c9572-86c9-4f7e-a8f8-4220a560aeec))
     (fp_line (start -2.35 1.15) (end 2.35 1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 0ea27ff8-8214-4f1b-a30c-77bb38f13559))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp cf129821-9500-452f-bf33-a7ba5baa997b))
     (fp_line (start 2.35 -1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp e5c1e273-8441-4921-a9ae-c2d473260ed2))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp a202ae91-c12b-4ac6-911c-6cd3ff957824))
     (fp_line (start 2.35 1.15) (end 2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 1553970c-be95-4067-9194-70ef84d97f95))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 15c05846-b542-4773-9165-fe9bd75441e2))
     (fp_line (start -1.4 -0.9) (end -1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 2c044e2b-c8dd-4d62-932e-4cff023f7ff7))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp b2d23d6b-de73-4eda-b325-d7f96acf1730))
     (fp_line (start -1.4 0.9) (end 1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 55059f12-3afb-4a46-9ab2-0c3c11e06464))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp e972d418-fcef-41c2-946b-d2b229c321b4))
     (fp_line (start -0.75 0) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 9e16c49b-c0d8-4d09-8e6c-e6498d4caac9))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 43826179-a1ff-4ac1-9906-6733d953169a))
     (fp_line (start -0.35 0) (end -0.35 -0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 9a29a78b-9816-4456-b0ba-dbbf6320cb29))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 81db0c49-65a2-4315-a7db-725a4eac8d76))
     (fp_line (start -0.35 0) (end -0.35 0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 6736287c-feeb-4910-8abc-41991ee0f630))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 7db8065a-a069-433d-af26-5ff35f4888a5))
     (fp_line (start -0.35 0) (end 0.25 0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp f524849d-f4dc-4b1a-b37e-bc9784b4c6dc))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 0c64551e-4e21-4863-b10e-1d63f80caafb))
     (fp_line (start 0.25 -0.4) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp b84a232d-a3f4-44b3-a315-4e3b72f6ccc5))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp e891427e-66da-46c8-9262-189bcdfe83ee))
     (fp_line (start 0.25 0) (end 0.75 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 4e8f5237-e583-4259-b939-098a8294b953))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 1268a078-3f6f-4833-b74a-69389406f67b))
     (fp_line (start 0.25 0.4) (end 0.25 -0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp b1011aed-470e-4c4a-9399-8e23321fd50e))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 51944fe9-fb0d-4b04-9d9d-6be07bc7e8b2))
     (fp_line (start 1.4 -0.9) (end -1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 084e498a-a68c-42c2-884e-e0c8209b81c6))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp d4836589-78a9-44a3-9d3f-15b9a76e8779))
     (fp_line (start 1.4 0.9) (end 1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 339e4cb3-ca9c-4e8d-82f7-11444b57f559))
-    (pad "1" smd roundrect (at -1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 24 "Net-(D21-K)") (pinfunction "K") (pintype "passive") (tstamp 822dce37-a8e4-47e3-8d0c-01ea89f520cb))
-    (pad "2" smd roundrect (at 1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 20 "Net-(D17-A)") (pinfunction "A") (pintype "passive") (tstamp fbcde706-1a03-462f-aa04-8f6577a58d3b))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 83b719e7-4a41-46ca-9c7b-1006a959a100))
+    (pad "1" smd roundrect (at -1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 4 "Net-(D10-K)") (pinfunction "K") (pintype "passive") (tstamp 1e258beb-c172-4bce-8697-2c6d6c8e5e74))
+    (pad "2" smd roundrect (at 1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 41 "Net-(D15-A)") (pinfunction "A") (pintype "passive") (tstamp 48f197f3-4381-4415-9d35-9d7e61392f10))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SOD-123.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -6592,8 +7016,8 @@
   )
 
   (footprint "Diode_SMD:D_SOD-123" (layer "B.Cu")
-    (tstamp 66d98192-3862-4b4a-8b68-37161aef10ad)
-    (at 136.04875 150.01875 180)
+    (tstamp 6b8f3e0c-ed76-4e2b-aa25-089ac8a0362b)
+    (at 316.70625 107.15625)
     (descr "SOD-123")
     (tags "SOD-123")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
@@ -6602,60 +7026,60 @@
     (property "Sim.Pins" "1=K 2=A")
     (property "ki_description" "100V 0.15A standard switching diode, DO-35")
     (property "ki_keywords" "diode")
-    (path "/f955ac7a-219b-4ceb-8a0c-258f1600814b")
+    (path "/6513af38-89bc-4f19-8415-62ba29e6b996")
     (attr smd)
-    (fp_text reference "D19" (at 0 2) (layer "B.SilkS")
+    (fp_text reference "D35" (at 0 2) (layer "B.SilkS")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 591214c7-c786-4b41-810c-e40e32e7527b)
+      (tstamp d5044d23-175e-4bfa-8b70-bb54742be7e1)
     )
     (fp_text value "1N4148" (at 0 -2.1) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 73fed922-b75b-4183-9f7f-ec15085b4b9f)
+      (tstamp f543811b-0c25-450d-9f9e-c657ad3e4a92)
     )
     (fp_text user "${REFERENCE}" (at 0 2) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 6ebfb477-b598-4f50-8cc6-27e81256c8d1)
+      (tstamp 8c5236d6-9bcb-4823-8da4-7070bdae5778)
     )
     (fp_line (start -2.36 -1) (end 1.65 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 5e1271ee-5809-4e36-90f0-8a000dbdfcd9))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp b70cd70c-985d-410e-939e-9f1c9b004aba))
     (fp_line (start -2.36 1) (end -2.36 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp e0d91222-19dc-439e-8a49-0fa9d2134b5b))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 3f86903e-e9f5-4903-9f5a-6efbfc947f5a))
     (fp_line (start -2.36 1) (end 1.65 1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp ba1fc5a8-b8d3-476f-92f3-0f30033e26dd))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp a4015a24-aac1-45ce-a3b8-2fa5901cedc1))
     (fp_line (start -2.35 1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 674d8d09-c4e6-4a43-a641-f641ed3a4068))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp a2a7bbe2-efbe-458c-8f4d-5797c72614e0))
     (fp_line (start -2.35 1.15) (end 2.35 1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 79e3d784-c525-41a3-b238-2b421ba29125))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp b82a7f21-aefa-4f52-8b47-e7247bed81c9))
     (fp_line (start 2.35 -1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp dbacbb09-9f4a-4379-81fc-284a02539603))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 19980952-1953-4545-aa76-87c445006d4b))
     (fp_line (start 2.35 1.15) (end 2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 7d1a5940-ecfa-4b57-a28c-e850213eb693))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 0a61e2d8-7953-4c7b-ad46-4c75169c3956))
     (fp_line (start -1.4 -0.9) (end -1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp bee2add1-8a4e-43eb-a61b-1b2fa71f0598))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp a606a695-29eb-43fc-b6b6-6f6d3e4c222c))
     (fp_line (start -1.4 0.9) (end 1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 3880cb06-bff3-41ea-91f9-dea3d43c9cc5))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 7f8f30fe-602f-4881-818f-035bc8e01204))
     (fp_line (start -0.75 0) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp d352dc77-f479-40b7-bd43-303722379e95))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp fd2817b1-be58-479c-a52d-ebd9373493f9))
     (fp_line (start -0.35 0) (end -0.35 -0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 6971060b-dce4-4ec8-b7b8-28884e7ffbc9))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 61bc808e-c15a-474d-9a6e-39a2d0cf994d))
     (fp_line (start -0.35 0) (end -0.35 0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 140ca5b6-c88f-4602-b999-f9f835cd58db))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp fb899467-db70-4991-97dc-27a0b36ee772))
     (fp_line (start -0.35 0) (end 0.25 0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 8db69f55-3778-4d23-9397-67692a6999f1))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 1876deaa-11d3-457e-8b5e-2b8bd921f35f))
     (fp_line (start 0.25 -0.4) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 761c16e2-7397-4795-a357-71482126a9e7))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 0e7369ec-04de-4a2e-8fbc-952b897457cb))
     (fp_line (start 0.25 0) (end 0.75 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 198b2363-8cb1-401a-bfbc-587baf417953))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 79701c5f-bd84-4b38-8829-5e296fea7ac7))
     (fp_line (start 0.25 0.4) (end 0.25 -0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 965c7c6f-6d37-41a0-a391-74842254cebe))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 7fa3d7b2-39a5-41b1-9709-2a384b61e6aa))
     (fp_line (start 1.4 -0.9) (end -1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp c1e93dd7-a2b2-490f-bca7-ba654f61388b))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 410f501a-a8f3-4c7c-8cd3-0ca772ae72fa))
     (fp_line (start 1.4 0.9) (end 1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 9b70bfc7-e112-4600-b21c-b59d50fd2546))
-    (pad "1" smd roundrect (at -1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 22 "Net-(D19-K)") (pinfunction "K") (pintype "passive") (tstamp b6040920-f264-4735-91d9-00aebfc4c56d))
-    (pad "2" smd roundrect (at 1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 20 "Net-(D17-A)") (pinfunction "A") (pintype "passive") (tstamp 29ddd129-09a8-47f9-b327-950054d7fa23))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 040c0b1a-56d5-4194-89c8-80059e086137))
+    (pad "1" smd roundrect (at -1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 9 "Net-(D32-K)") (pinfunction "K") (pintype "passive") (tstamp b01ac1f6-5248-46fb-bf19-141a2c44955e))
+    (pad "2" smd roundrect (at 1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 58 "Net-(D35-A)") (pinfunction "A") (pintype "passive") (tstamp 66c2b638-68b9-475d-b184-441d66d405f9))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SOD-123.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -6664,8 +7088,8 @@
   )
 
   (footprint "Diode_SMD:D_SOD-123" (layer "B.Cu")
-    (tstamp 76df03b7-6cdf-4e69-84ef-2da28070f830)
-    (at 302.73625 188.11875 180)
+    (tstamp 71e77004-7d13-44c1-ae15-b9f795b71ed0)
+    (at 138.1125 183.35625)
     (descr "SOD-123")
     (tags "SOD-123")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
@@ -6674,60 +7098,60 @@
     (property "Sim.Pins" "1=K 2=A")
     (property "ki_description" "100V 0.15A standard switching diode, DO-35")
     (property "ki_keywords" "diode")
-    (path "/106e7334-79a0-4ee0-9bd3-c05ac4ca804d")
+    (path "/9119e94c-f042-40a4-87fb-100a66c4f571")
     (attr smd)
-    (fp_text reference "D61" (at 0 2) (layer "B.SilkS")
+    (fp_text reference "D18" (at 0 2) (layer "B.SilkS")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 1030b4af-4d9d-4af5-b2a2-ddcf5f54f652)
+      (tstamp 3fdd4184-5428-42fb-9a8e-481c74ef0b76)
     )
     (fp_text value "1N4148" (at 0 -2.1) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 714c5b90-aee4-420e-94a4-bfe8555a387a)
+      (tstamp a0e93da0-2e76-4b20-8ad6-08a5105faaab)
     )
     (fp_text user "${REFERENCE}" (at 0 2) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp b29550a4-fea4-4a2a-8fee-711a47e1621d)
+      (tstamp e4cdb3c9-28f3-443e-ae81-39be2a6b2e46)
     )
     (fp_line (start -2.36 -1) (end 1.65 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 4af00b41-7cfe-4b60-87fe-17b845e0bbe8))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 8be3c0e1-8dfb-4541-ae2e-61072dcfafa1))
     (fp_line (start -2.36 1) (end -2.36 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp c23b0d61-ca3e-4802-972c-bd90462fc880))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 0fb8f507-9512-4aa2-8a34-f35b30a3aeb8))
     (fp_line (start -2.36 1) (end 1.65 1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 84982ad9-813b-43c8-a2f5-5b4db18c7c08))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp aaa6ba85-8a28-4643-84be-29790bb3587f))
     (fp_line (start -2.35 1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 62275907-9c91-40f4-a32a-cdfa39ae95e4))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 0b1c2aa6-dde1-4045-8cae-5ec5abc90504))
     (fp_line (start -2.35 1.15) (end 2.35 1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp ce2a98c5-d86a-4cf7-bb7e-49d432bd8381))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp aa541d2f-eab6-49f2-a253-56f2ed1e5f3d))
     (fp_line (start 2.35 -1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp f928d8bf-2d8f-4ddc-9449-02e6c8edc1be))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 73986af0-9ce8-4a5a-9f38-a308dd5f05f9))
     (fp_line (start 2.35 1.15) (end 2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp bb31e13c-c9e4-4d61-b16e-1ae2117eaf58))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp ed303adf-4885-49ed-98de-8f565dc68386))
     (fp_line (start -1.4 -0.9) (end -1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp b0f2afa6-247d-4073-85d5-697d9ba6f025))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp f9931c1b-96d6-472e-bc25-8ecfd652dde8))
     (fp_line (start -1.4 0.9) (end 1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 3bef6aeb-9c58-4326-ba99-790d544bb17a))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp ea596d4f-b767-4ba6-be6e-2da6387f9a89))
     (fp_line (start -0.75 0) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp d3e25124-94cc-4b38-8ab3-6474f5b7c77c))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 717ce6f7-fde6-4ce5-813f-c371c6710086))
     (fp_line (start -0.35 0) (end -0.35 -0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 462bd97e-bcc8-43da-a0e0-c0510ca63c38))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp cadbd0e4-4ac0-4b98-ac04-d6f1799b180c))
     (fp_line (start -0.35 0) (end -0.35 0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp e790d8d4-f590-47e0-8559-be2cee9296ee))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 6d764eb2-1d8d-44da-82ad-9e6a7a8cecb3))
     (fp_line (start -0.35 0) (end 0.25 0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 274f5193-0557-4663-86c5-2757acd75a3b))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp c34838a1-f0ac-45fa-bb36-4f783e064362))
     (fp_line (start 0.25 -0.4) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp f3f47ea6-b18e-4d32-9756-6b94750b7c6f))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp b460a519-a8de-4f4b-8030-9ac2d16b3a64))
     (fp_line (start 0.25 0) (end 0.75 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 9c423c24-a265-4cc9-b8e7-58570fd31be3))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp d8201a5e-0f4b-4f9f-965d-a753214bfa1f))
     (fp_line (start 0.25 0.4) (end 0.25 -0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 1bd8469d-19ea-4fe9-96b5-5722606cf735))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp cadbf965-a464-454a-907d-090cd58a4f12))
     (fp_line (start 1.4 -0.9) (end -1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 2870d7f8-fc8b-4e3d-a085-a84619a09b7a))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 038bf74e-87a6-4c8f-a6c7-cf266ba204cd))
     (fp_line (start 1.4 0.9) (end 1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 05db2fb6-be4f-42b3-a8da-c21cb0acd263))
-    (pad "1" smd roundrect (at -1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 69 "Net-(D61-K)") (pinfunction "K") (pintype "passive") (tstamp 6efa412b-85cb-4394-8065-4d6d1d9e6afd))
-    (pad "2" smd roundrect (at 1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 64 "Net-(D56-A)") (pinfunction "A") (pintype "passive") (tstamp 3b474388-8c76-48a9-9d8b-e9ce17f13982))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp fd73e28b-f919-4858-bf37-e0c580ba7d13))
+    (pad "1" smd roundrect (at -1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 5 "Net-(D17-K)") (pinfunction "K") (pintype "passive") (tstamp 49bc9be0-60cc-4ab7-8557-1d2c1d98c4f5))
+    (pad "2" smd roundrect (at 1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 43 "Net-(D18-A)") (pinfunction "A") (pintype "passive") (tstamp a7b53669-f0cc-46a6-bbea-f32a1a13edab))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SOD-123.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -6736,8 +7160,8 @@
   )
 
   (footprint "Diode_SMD:D_SOD-123" (layer "B.Cu")
-    (tstamp 86d7e90e-3169-42a8-be4f-4d3e0f854340)
-    (at 124.1425 188.11875 180)
+    (tstamp 78cb8957-d1c4-427b-aecc-3357f20e0eb5)
+    (at 326.23125 126.20625)
     (descr "SOD-123")
     (tags "SOD-123")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
@@ -6746,60 +7170,60 @@
     (property "Sim.Pins" "1=K 2=A")
     (property "ki_description" "100V 0.15A standard switching diode, DO-35")
     (property "ki_keywords" "diode")
-    (path "/c7f146eb-e7de-4fd3-9ef6-5a950923aed2")
+    (path "/38f72305-c8fc-4a5b-94bd-5c44ac16d04d")
     (attr smd)
-    (fp_text reference "D17" (at 0 2) (layer "B.SilkS")
+    (fp_text reference "D43" (at 0 2) (layer "B.SilkS")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp b907a5a5-9de4-4f5d-9ace-d5d9875ab252)
+      (tstamp fd18463c-8ba9-4273-80ba-eb7fd47c04c8)
     )
     (fp_text value "1N4148" (at 0 -2.1) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp c60ec6ca-8f8f-4bb2-adf9-b949ad67e058)
+      (tstamp ce467184-c8ca-497e-a40f-b2a73a818b1d)
     )
     (fp_text user "${REFERENCE}" (at 0 2) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp b62e12f0-7763-40ca-becb-3ce9b18341b2)
+      (tstamp f7f59d3d-20ea-4f9d-8307-f5c8f1fdae75)
     )
     (fp_line (start -2.36 -1) (end 1.65 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp a31e4571-4777-43a8-bc48-2493cce3626c))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 00daebb0-6337-4d11-8eac-1627866f0805))
     (fp_line (start -2.36 1) (end -2.36 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 74e5ab89-f984-4c67-b5a0-dbe98aa55343))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp f48eebd0-15f0-4be6-aab2-89212f6c33fa))
     (fp_line (start -2.36 1) (end 1.65 1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp fdc3084d-1a4f-499b-8736-80b584e92f53))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 6747fb3c-718d-465e-8910-436376162e42))
     (fp_line (start -2.35 1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 04ad0a9d-aba5-45a6-b4f3-7f67cddd2b72))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp bf712bd9-2794-4b05-bf67-cf8f25ca268a))
     (fp_line (start -2.35 1.15) (end 2.35 1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp d4ad15ee-61ce-405a-9315-fdaca2303325))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 1c4e3255-bd1d-4b16-9ab4-3b5f9970d3b3))
     (fp_line (start 2.35 -1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 29e07c1c-79a6-4934-be93-c513a97b3373))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 7000a2cb-76d1-497a-bca7-295323fcc61e))
     (fp_line (start 2.35 1.15) (end 2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 162e80e1-57a0-44c8-8701-7a47990ac103))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 86ff02e2-4ac8-40db-a7fa-9e93f172e4bc))
     (fp_line (start -1.4 -0.9) (end -1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 85d22501-52e4-480e-a420-6e3ec9835018))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 83a2edb2-046a-448c-b4ff-84a06fddf709))
     (fp_line (start -1.4 0.9) (end 1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp cac41333-bf90-43cf-a9c6-abd0caf44527))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp c99d756e-fa60-4795-b6ad-a464fd9899e1))
     (fp_line (start -0.75 0) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp ebdb0e4e-8b5d-4d19-999d-29620ea89ed2))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp ec4ff4a3-4ae7-4024-a344-a5e27eececa6))
     (fp_line (start -0.35 0) (end -0.35 -0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 2f6c8461-bd51-4d1c-a69c-43a07788d20d))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 7c9216ba-f599-4d93-a1a4-23f858efe011))
     (fp_line (start -0.35 0) (end -0.35 0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp c3b8a6e4-5985-49b6-b855-1860e6d004bf))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 682e938c-f8dc-49ab-a7a8-0fc99f207375))
     (fp_line (start -0.35 0) (end 0.25 0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 4f210600-b76e-4d24-b9b2-e35238b37eaa))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp b31c12ff-f508-4416-9255-16af67fdf6d8))
     (fp_line (start 0.25 -0.4) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 2e74cb74-c5d7-4695-9417-21267cfc87ed))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 0ac382cc-0626-485d-aa4a-c319b0d9699c))
     (fp_line (start 0.25 0) (end 0.75 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 30ecc23c-ba06-42b0-9ba7-fe6af7c65274))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 1b3ccaa7-9244-4133-9630-ecd7ddd36e4e))
     (fp_line (start 0.25 0.4) (end 0.25 -0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 69fe0f2d-5ce9-4742-8617-01a5d233c3aa))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp e93fce0e-e4e1-47ce-a443-db92070d2b28))
     (fp_line (start 1.4 -0.9) (end -1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 17159d35-9b5d-4115-bbaa-ad703b1fa3c3))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 551c6d3e-eede-4f1b-ba68-2d67bd85d355))
     (fp_line (start 1.4 0.9) (end 1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 56cbc408-b0ec-4059-978e-9155e7d13c08))
-    (pad "1" smd roundrect (at -1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 19 "Net-(D17-K)") (pinfunction "K") (pintype "passive") (tstamp 4e4a1956-c22c-44a5-8b4f-ef5e96335e23))
-    (pad "2" smd roundrect (at 1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 20 "Net-(D17-A)") (pinfunction "A") (pintype "passive") (tstamp 2010ebf2-f58f-4977-8b7a-8a8f60df2dcc))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 4935f9a8-61bb-42d4-aaff-662f7b9f4678))
+    (pad "1" smd roundrect (at -1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 11 "Net-(D40-K)") (pinfunction "K") (pintype "passive") (tstamp 77286efb-1a37-416f-aff6-3da2d130218f))
+    (pad "2" smd roundrect (at 1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 65 "Net-(D43-A)") (pinfunction "A") (pintype "passive") (tstamp 640abb05-7baa-45db-93d6-c39dfe3e0fb0))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SOD-123.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -6808,8 +7232,8 @@
   )
 
   (footprint "Diode_SMD:D_SOD-123" (layer "B.Cu")
-    (tstamp 889df9c0-05bf-45e1-a891-5ad6bb19a5d1)
-    (at 321.78625 188.11875 180)
+    (tstamp 7a34d54f-6ba7-4ef6-868b-06e8ebbcdd51)
+    (at 154.78125 126.20625)
     (descr "SOD-123")
     (tags "SOD-123")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
@@ -6818,60 +7242,60 @@
     (property "Sim.Pins" "1=K 2=A")
     (property "ki_description" "100V 0.15A standard switching diode, DO-35")
     (property "ki_keywords" "diode")
-    (path "/ca546886-4d59-44b9-99d6-0678deca045a")
+    (path "/b01b8e94-17fe-4a0b-b347-7be6a451130e")
     (attr smd)
-    (fp_text reference "D44" (at 0 2) (layer "B.SilkS")
+    (fp_text reference "D12" (at 0 2) (layer "B.SilkS")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp b898deca-684f-474e-b335-15e4c3ac734a)
+      (tstamp 2d8c835c-defe-4de5-b86d-a65fefe66ea2)
     )
     (fp_text value "1N4148" (at 0 -2.1) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 57d20b2f-1f05-4352-88ea-7938f937ca69)
+      (tstamp e995c081-5f6f-4deb-b9d7-0e6e9e84e7cf)
     )
     (fp_text user "${REFERENCE}" (at 0 2) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 9075fe7d-f43a-4bb9-b0df-3a32e12ef72a)
+      (tstamp 5c6c7e38-d048-4ec5-9d1f-d6119552e21f)
     )
     (fp_line (start -2.36 -1) (end 1.65 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 69e355b6-2b83-416e-8f9e-d8ef65bf3853))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 7e5b791f-826b-438a-8db8-6a4c84a87769))
     (fp_line (start -2.36 1) (end -2.36 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp e71f4708-6645-4ba4-96e9-1f1245e1c751))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 367094c7-a3fa-498a-a83c-5d384c0d5b9a))
     (fp_line (start -2.36 1) (end 1.65 1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 3bd1d2ec-5e2a-48d2-a687-d3ae150c8300))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp d87db7bb-692c-4d9b-ad0e-f7276d71157a))
     (fp_line (start -2.35 1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp f66cdcfc-3d52-48dd-9e4a-6c3ca9a80b22))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 10de0cca-0470-4814-855f-d6c510096b07))
     (fp_line (start -2.35 1.15) (end 2.35 1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 9581a97b-4e74-4b7e-9d55-a914e4cfa7b1))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp e8b87740-4562-4a50-80cb-f1631fea5fd9))
     (fp_line (start 2.35 -1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp a838fa07-7631-453f-b924-dfd19af66e2b))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 9acbca71-ca77-49f3-a803-e14289f3d873))
     (fp_line (start 2.35 1.15) (end 2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 06b45231-4294-4d97-af38-07a3d3648d98))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp f409279e-6f28-4799-a107-43db5fe4725b))
     (fp_line (start -1.4 -0.9) (end -1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp f4f32f5b-b2c6-42fd-8e33-3dc4ea8db365))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 5ea9f6a5-07f8-45f1-aeaa-ae30b06800b9))
     (fp_line (start -1.4 0.9) (end 1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp b1b82cb0-2e0e-46ae-9a48-f0b985c4f5c3))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 09ff8443-0ba4-4173-a90c-b05424e35e3b))
     (fp_line (start -0.75 0) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp c362ec18-4c93-4960-adaf-d3e03d5ec4a7))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 2db191e0-9536-4d73-a036-1410522a661d))
     (fp_line (start -0.35 0) (end -0.35 -0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp a2176e32-58fe-4557-b2dd-abfd57623b78))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 69343e76-a304-4d39-9bf4-5f280bea3fc5))
     (fp_line (start -0.35 0) (end -0.35 0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 78fc4921-835f-47de-82b2-80a5400d4d82))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp eaac61fd-0a3c-4732-b0eb-90e8d444bbbc))
     (fp_line (start -0.35 0) (end 0.25 0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 88ec9633-15c0-4f16-bd89-783ebd5df275))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 2906a453-31ee-47cd-9753-faed30daced0))
     (fp_line (start 0.25 -0.4) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 75fdf7a2-5f08-4203-a7a9-b713dee61a6d))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 7a29be45-6278-41d5-8c95-3bb730e026a0))
     (fp_line (start 0.25 0) (end 0.75 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 5ea5f2bb-92e1-490f-83fe-8ef004584634))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 3f1e0504-320e-4105-8caf-f79f1a7b4062))
     (fp_line (start 0.25 0.4) (end 0.25 -0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp a5a37231-21bf-4b3b-94d9-047db87efcc2))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 19286d34-9883-457c-8803-2c9f4e7b954b))
     (fp_line (start 1.4 -0.9) (end -1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp b92e2f92-aa75-411e-af80-d93d9d00e5b3))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 971a8bdc-fe05-422b-ab8f-2840e307aa8d))
     (fp_line (start 1.4 0.9) (end 1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp a9f1ed14-fd19-41ef-8bd4-97ef5e652bfb))
-    (pad "1" smd roundrect (at -1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 50 "Net-(D44-K)") (pinfunction "K") (pintype "passive") (tstamp 1ea8b17c-c7c0-4677-9bc8-007a439089de))
-    (pad "2" smd roundrect (at 1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 47 "Net-(D41-A)") (pinfunction "A") (pintype "passive") (tstamp 159d8baf-e553-4727-b6cc-bab90d05da65))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp b6cc7716-7d6f-4157-9ce2-723eb06fdeea))
+    (pad "1" smd roundrect (at -1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 4 "Net-(D10-K)") (pinfunction "K") (pintype "passive") (tstamp 0698e18c-b670-482a-8057-630b97673ee5))
+    (pad "2" smd roundrect (at 1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 38 "Net-(D12-A)") (pinfunction "A") (pintype "passive") (tstamp 357cf7a8-4a7b-47b6-bd23-78ddf328d1e0))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SOD-123.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -6880,8 +7304,8 @@
   )
 
   (footprint "Diode_SMD:D_SOD-123" (layer "B.Cu")
-    (tstamp 8cf4bbc0-5c3f-49a0-8a34-551ead5b3dc6)
-    (at 278.92375 207.16875 180)
+    (tstamp 7ac33879-af43-4dd2-82b6-7c6639d6eecb)
+    (at 207.16875 164.30625)
     (descr "SOD-123")
     (tags "SOD-123")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
@@ -6890,60 +7314,60 @@
     (property "Sim.Pins" "1=K 2=A")
     (property "ki_description" "100V 0.15A standard switching diode, DO-35")
     (property "ki_keywords" "diode")
-    (path "/215124f5-5454-40c5-bf50-56964446fcf9")
+    (path "/7f2e8098-f089-454b-9a88-be2466bfe7d6")
     (attr smd)
-    (fp_text reference "D59" (at 0 2) (layer "B.SilkS")
+    (fp_text reference "D28" (at 0 2) (layer "B.SilkS")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 999e86fa-3c3d-4fff-8056-1d5197c91d9b)
+      (tstamp 1ebb7f39-f2da-439d-9e24-f0532c0c1569)
     )
     (fp_text value "1N4148" (at 0 -2.1) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 18bbacc1-549a-4dcd-9be3-736599753a95)
+      (tstamp 0e51b6e9-44fc-42f1-827c-864e93b76678)
     )
     (fp_text user "${REFERENCE}" (at 0 2) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp e29e03f9-d09b-46a3-9e9b-cb05b57746b6)
+      (tstamp aefd248a-3730-4eb8-b5c8-61e874e7af39)
     )
     (fp_line (start -2.36 -1) (end 1.65 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp b9eea06e-d8b6-41f3-8da2-aa59e080ae24))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp a5a48a79-6ffe-44a3-9029-ae621df0a894))
     (fp_line (start -2.36 1) (end -2.36 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 0919a4ed-40cc-4bf6-8385-8f87cb60ebaf))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp e30ad5e3-c9f1-4386-8c23-c1556041fe38))
     (fp_line (start -2.36 1) (end 1.65 1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 5017a8c3-a3fe-46bd-9e1e-4d269e46964f))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 1270d264-a3fd-45d0-ae0c-4acc2403ea54))
     (fp_line (start -2.35 1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp a9a9b966-a27c-4616-a710-81e1a3ea48ff))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp fa549add-3604-469c-9aaf-0b668e463293))
     (fp_line (start -2.35 1.15) (end 2.35 1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 9d2521ab-e185-4e83-83bb-dc29f0ac332c))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 3fd159f5-f348-4967-b9dc-a72fe61749c5))
     (fp_line (start 2.35 -1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 5a05330f-3c09-4368-a80a-0e38ba701ebc))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 6449fbd3-a11d-4d75-a76b-eff4b4ae86ef))
     (fp_line (start 2.35 1.15) (end 2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp d33950b5-1138-4c9a-879e-3fda9aabdad8))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 1f249644-ea2a-44c8-bbcc-f3148c8f9fb4))
     (fp_line (start -1.4 -0.9) (end -1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp d0b94d57-7a82-484b-9881-619de1b58b00))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp e904e6af-06a9-48ac-b60f-0bd4cad89e65))
     (fp_line (start -1.4 0.9) (end 1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 0506aeb6-7fdd-4cf8-b5ac-5bec10a4658d))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 54532803-ba41-431d-bb5a-677093a627d1))
     (fp_line (start -0.75 0) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp f8c81975-394a-493b-9c9b-0241c03b6285))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 2586f15e-6a87-46ad-940e-cd772b7a93df))
     (fp_line (start -0.35 0) (end -0.35 -0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 18ff7cf8-f469-400e-a6b9-b8de241a3c6f))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 4d6226a0-1745-4971-b779-812bf50e281b))
     (fp_line (start -0.35 0) (end -0.35 0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 905c3d02-b147-47c8-abbe-b433e80d97d3))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 49003d4b-3285-4a28-9169-cb2e2e5c140b))
     (fp_line (start -0.35 0) (end 0.25 0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp a8ef0e2e-abda-472c-a60c-fe5f9c17b8cf))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 373eb8d6-2287-4cd6-b68b-534b87c047a4))
     (fp_line (start 0.25 -0.4) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 0538823f-1bec-4617-a69f-a9442525af27))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp f4d47003-ff78-4c9e-93d5-2e2c7c809c85))
     (fp_line (start 0.25 0) (end 0.75 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp a5fa6271-4885-45df-b434-68f7ec0c98ce))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 36cd36f9-70a2-4c36-b425-aacde3ba5648))
     (fp_line (start 0.25 0.4) (end 0.25 -0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 638abcc6-0b29-4ae3-b42c-282ec5ecb840))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 83741308-daa2-4a4e-aa0e-8e3e22c079f6))
     (fp_line (start 1.4 -0.9) (end -1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 8c32a2d4-9fd9-468b-9349-7ee1d0f4963b))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp d8ff2722-94cd-440c-b260-193f5fb59ef7))
     (fp_line (start 1.4 0.9) (end 1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp f2dbd134-8945-4e96-8ccd-3fab670ba726))
-    (pad "1" smd roundrect (at -1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 67 "Net-(D59-K)") (pinfunction "K") (pintype "passive") (tstamp 481ccb15-e0b4-42e2-941f-17207ae37e09))
-    (pad "2" smd roundrect (at 1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 64 "Net-(D56-A)") (pinfunction "A") (pintype "passive") (tstamp 398b0051-70cf-49d1-a1de-b5974313b222))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp ccdfc38f-532f-4a68-bd48-bfc88fbe5fd4))
+    (pad "1" smd roundrect (at -1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 7 "Net-(D25-K)") (pinfunction "K") (pintype "passive") (tstamp 211e06dd-e5aa-4042-a248-e8da1a4355a3))
+    (pad "2" smd roundrect (at 1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 52 "Net-(D28-A)") (pinfunction "A") (pintype "passive") (tstamp 7339dda6-3028-4e18-8d9b-65ec250cd432))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SOD-123.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -6952,8 +7376,8 @@
   )
 
   (footprint "Diode_SMD:D_SOD-123" (layer "B.Cu")
-    (tstamp 8dd9bd6f-91cf-47a9-a053-b183884b6f32)
-    (at 283.68625 188.11875 180)
+    (tstamp 82c38471-432b-4b7f-8727-a6cc117e5ed3)
+    (at 150.01875 164.30625)
     (descr "SOD-123")
     (tags "SOD-123")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
@@ -6962,60 +7386,60 @@
     (property "Sim.Pins" "1=K 2=A")
     (property "ki_description" "100V 0.15A standard switching diode, DO-35")
     (property "ki_keywords" "diode")
-    (path "/83fe7dc9-c750-4634-8763-4b1e3b13a04e")
+    (path "/d78915f1-8534-40ab-bbe4-be45fb3de565")
     (attr smd)
-    (fp_text reference "D62" (at 0 2) (layer "B.SilkS")
+    (fp_text reference "D19" (at 0 2) (layer "B.SilkS")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 881004a6-f88a-43cd-b6ee-1caa131d334a)
+      (tstamp 21507ded-acc2-4a4a-b7c2-11279763ff87)
     )
     (fp_text value "1N4148" (at 0 -2.1) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp d33bdfdb-c91f-4537-bbb1-3cb45482a29c)
+      (tstamp 78e6c941-15ba-445a-b71e-8603404b70e7)
     )
     (fp_text user "${REFERENCE}" (at 0 2) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 1878ba6c-0bcc-42fd-9f1a-5fec483cd960)
+      (tstamp 7a8b5284-57b9-4646-93b7-879b379b4966)
     )
     (fp_line (start -2.36 -1) (end 1.65 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 256c68a3-4c39-4e14-966a-d6f9b0f06302))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 03ce90b9-a7c8-42fb-b803-e8780aa6f16c))
     (fp_line (start -2.36 1) (end -2.36 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 5d8cf28b-4413-4f15-a59d-f8e32d3989e1))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp d7295b4a-d99d-421d-bf9b-10d588533b24))
     (fp_line (start -2.36 1) (end 1.65 1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 7f6bb3ae-e08e-4790-af0d-d7f3be3f96e9))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp f2227ba3-f331-46eb-80e9-fd6e237fd817))
     (fp_line (start -2.35 1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 7b014345-2b91-4ffd-b5ba-9ffd2a88fd2c))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 37bb8a33-d61e-4443-9a3b-97fd06b041f9))
     (fp_line (start -2.35 1.15) (end 2.35 1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp b05732d0-5d1e-4e00-8bc1-957a3ea1c38c))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 20868b82-5d95-4c0b-b3d6-e9c42c94ea18))
     (fp_line (start 2.35 -1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp fdecc282-8437-4ee9-b223-261f185986fd))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp bbb6841a-4abb-44cd-82ee-2da469d3055d))
     (fp_line (start 2.35 1.15) (end 2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 8438d12a-88b1-47a8-a51a-285e69ec8f5e))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp fdc379cd-d33f-4af0-ad5c-62a552cc128d))
     (fp_line (start -1.4 -0.9) (end -1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp f90e7ff7-8f30-4765-a694-e4be191ea30e))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 8051627f-8a08-45ab-98f0-f79f07719def))
     (fp_line (start -1.4 0.9) (end 1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 59e6ccfd-7755-4de1-bd33-f46d6556c4ab))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 310ae71a-bf50-4441-9652-b607db55dbff))
     (fp_line (start -0.75 0) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 562ebe3d-6b3a-403c-b0ac-aae1c0441a3a))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 8d2543d2-526b-4ce5-8077-3710b423e273))
     (fp_line (start -0.35 0) (end -0.35 -0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 30b6d5fd-111e-478d-960c-faf85e46426d))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 7291e15e-9c84-4d1d-b88c-dbe2ef9a231f))
     (fp_line (start -0.35 0) (end -0.35 0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp ff2efb4f-ad29-47c7-826a-c6f22a44128f))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp efec975a-ab7c-4b57-b2e3-9bff9163ed5a))
     (fp_line (start -0.35 0) (end 0.25 0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 76e81f53-6fc6-4628-8ad3-4fe919cfb73f))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp c1f997f3-36cf-44a4-a9b7-ac929b4faeb7))
     (fp_line (start 0.25 -0.4) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp ecc653ec-3516-45d4-aef4-d7d34a94ba37))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp e22733e0-01c7-4a31-8362-b9c7f9b12982))
     (fp_line (start 0.25 0) (end 0.75 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp c070b795-1d05-4eaf-9c6d-34c97fb45d99))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp a4a7f961-9c99-4d75-9a8e-84714bca30f3))
     (fp_line (start 0.25 0.4) (end 0.25 -0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp d75204bd-19e3-4813-9743-b86b8ae8ea77))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 02d1e113-5cf9-4f81-8e95-8cd6f038fb7f))
     (fp_line (start 1.4 -0.9) (end -1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 8f004b8b-3a54-4f92-a153-22d5c5af5eff))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 6846f978-953a-48d6-a082-7a8afee6ce5a))
     (fp_line (start 1.4 0.9) (end 1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 9f7cf22f-83d3-4e7e-b81c-f6989ca0397c))
-    (pad "1" smd roundrect (at -1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 70 "Net-(D62-K)") (pinfunction "K") (pintype "passive") (tstamp 5f3d5d72-04b8-44d0-9d13-55b9abee7ae2))
-    (pad "2" smd roundrect (at 1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 64 "Net-(D56-A)") (pinfunction "A") (pintype "passive") (tstamp 0308de06-1fd8-4958-8a3b-f0bb08e4a5cf))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 94e2ebac-255c-4c1c-96c4-0d046f4b446a))
+    (pad "1" smd roundrect (at -1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 5 "Net-(D17-K)") (pinfunction "K") (pintype "passive") (tstamp 4c1b1242-d499-4468-9fdd-d6ac041d39fa))
+    (pad "2" smd roundrect (at 1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 44 "Net-(D19-A)") (pinfunction "A") (pintype "passive") (tstamp 1762abb2-64ef-4856-9563-2dae6aa53538))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SOD-123.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -7024,8 +7448,8 @@
   )
 
   (footprint "Diode_SMD:D_SOD-123" (layer "B.Cu")
-    (tstamp 997b847d-6795-4781-8f17-8579a637641e)
-    (at 293.21125 169.06875 180)
+    (tstamp 83b51e3f-27cd-47bf-b66b-9d3ac9766379)
+    (at 183.35625 183.35625)
     (descr "SOD-123")
     (tags "SOD-123")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
@@ -7034,60 +7458,60 @@
     (property "Sim.Pins" "1=K 2=A")
     (property "ki_description" "100V 0.15A standard switching diode, DO-35")
     (property "ki_keywords" "diode")
-    (path "/4daa19b2-b33b-4ebe-9d17-cbb4e0ec6849")
+    (path "/47a3a39a-affd-42dc-9425-03b5117c0ede")
     (attr smd)
-    (fp_text reference "D46" (at 0 2) (layer "B.SilkS")
+    (fp_text reference "D56" (at 0 2) (layer "B.SilkS")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 2d9e71ed-23d8-4e01-ab02-54d48319371b)
+      (tstamp 55124c6c-421d-414e-90f3-d59dad305a57)
     )
     (fp_text value "1N4148" (at 0 -2.1) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp ae793de3-0431-49b2-b5b2-8d76ef675ba7)
+      (tstamp 93c9d4a8-29ae-44f4-8064-0c8539f4936c)
     )
     (fp_text user "${REFERENCE}" (at 0 2) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp c4358e48-820d-4a77-89de-2e82bf38b4ff)
+      (tstamp c3667cc7-16c2-4478-90cb-8623c68c3d4c)
     )
     (fp_line (start -2.36 -1) (end 1.65 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 841f56ba-c537-4882-bf41-83e2e221b72c))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp fd5b0049-c716-47ff-a54c-d3db9f748fcf))
     (fp_line (start -2.36 1) (end -2.36 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 15d13425-6994-46ce-952a-dc67bed7261e))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 84fd5af1-c170-40f8-929c-a2beedf82eef))
     (fp_line (start -2.36 1) (end 1.65 1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 294560a2-1166-401a-a397-8e407c95c615))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp ba6aefc4-a277-4a71-91eb-3e2507053f9a))
     (fp_line (start -2.35 1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 7953158e-0df1-4220-9fe9-bcae5ccf5203))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp efa11e5c-eb91-470b-b48f-4e3ee3bb7a17))
     (fp_line (start -2.35 1.15) (end 2.35 1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 8a32cacb-4cf9-40e2-86c8-3564017d26d0))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 7e19aa7b-44e5-43c8-9a4d-eb0f55a25497))
     (fp_line (start 2.35 -1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 5a897a86-1a69-4100-9519-71d91437a99f))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 1192069c-5815-4797-9a33-a9ce4b274453))
     (fp_line (start 2.35 1.15) (end 2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 434a0b38-c7c1-42e5-bbac-77d5298d0d6f))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 8fe63949-25f5-4b04-a3f1-5932de653b5a))
     (fp_line (start -1.4 -0.9) (end -1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 9fec7148-5abc-445f-b9a3-11cb7f260ee4))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 0feb7381-374a-4896-a023-38b8dfee1be8))
     (fp_line (start -1.4 0.9) (end 1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp aa11903c-feb0-45a4-9fae-ca1204fa6dcf))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp ede95cd6-b08c-42fa-963e-547d894a7abc))
     (fp_line (start -0.75 0) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 268dd83a-f523-4444-a3e1-994c82eaa124))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp e1246d63-9125-41af-851d-aa7d63de7640))
     (fp_line (start -0.35 0) (end -0.35 -0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 87b08d3e-8250-4050-8feb-e78af1110e9f))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 7df46f86-bb35-4bbd-8cac-444294884370))
     (fp_line (start -0.35 0) (end -0.35 0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 8e5c73d8-f214-44b0-bfdc-1b060a885d99))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 0c555d64-9015-435a-b41d-c63fe542a16c))
     (fp_line (start -0.35 0) (end 0.25 0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp e11f9ad3-8aa1-4ac8-b4fd-49983578fa6d))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp ed528981-3ab3-4baa-9640-1f85280088c8))
     (fp_line (start 0.25 -0.4) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp d11cf865-c7ce-43b8-a02c-1bc009a36406))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 759929e4-8adb-4c0d-aa90-979d4c6d7d44))
     (fp_line (start 0.25 0) (end 0.75 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp c576f40c-a94a-4b55-811b-58103066ea6b))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 46859bea-5b68-4b31-9a72-5dee39f4bbe3))
     (fp_line (start 0.25 0.4) (end 0.25 -0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp d544fcc8-418c-49bd-8d65-4ef0e7085886))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 0cc70a1f-edf6-49b2-9918-7cceea7017f9))
     (fp_line (start 1.4 -0.9) (end -1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp e08cc364-1ae9-45a1-990e-dd4e05bcc8c6))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 13665047-f001-4aad-8533-8b88653f5a5c))
     (fp_line (start 1.4 0.9) (end 1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 6afe8449-213b-4590-a514-6f0b66a9e183))
-    (pad "1" smd roundrect (at -1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 52 "Net-(D46-K)") (pinfunction "K") (pintype "passive") (tstamp 79bed157-f3c7-47a0-827b-9df618c46124))
-    (pad "2" smd roundrect (at 1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 47 "Net-(D41-A)") (pinfunction "A") (pintype "passive") (tstamp ee84b477-47c7-4bc0-90a7-37e277c11bf5))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 57376e59-d426-4c88-bdfe-af4e4cdec9af))
+    (pad "1" smd roundrect (at -1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 15 "Net-(D56-K)") (pinfunction "K") (pintype "passive") (tstamp 43ba6467-7085-4041-8624-807164c6335f))
+    (pad "2" smd roundrect (at 1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 16 "Net-(D56-A)") (pinfunction "A") (pintype "passive") (tstamp c5b9beed-b0e6-4f47-abcd-a0f5ce7ecd5a))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SOD-123.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -7096,8 +7520,8 @@
   )
 
   (footprint "Diode_SMD:D_SOD-123" (layer "B.Cu")
-    (tstamp a0fad599-4a7b-4849-92a9-3582e3a1da16)
-    (at 221.77375 130.96875 180)
+    (tstamp 86615b1f-4347-4fbe-9f06-502e8e58032e)
+    (at 135.73125 126.20625)
     (descr "SOD-123")
     (tags "SOD-123")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
@@ -7106,60 +7530,60 @@
     (property "Sim.Pins" "1=K 2=A")
     (property "ki_description" "100V 0.15A standard switching diode, DO-35")
     (property "ki_keywords" "diode")
-    (path "/c48ab5a7-f0c1-4235-ba4e-b85c5c848929")
+    (path "/a61a20ee-8281-404e-bfde-796660176b8d")
     (attr smd)
-    (fp_text reference "D8" (at 0 2) (layer "B.SilkS")
+    (fp_text reference "D11" (at 0 2) (layer "B.SilkS")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp dfe36f25-86d1-4d71-9138-79873a58a168)
+      (tstamp 8659b14a-a9d7-4b93-bd11-6a9aa7027d17)
     )
     (fp_text value "1N4148" (at 0 -2.1) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 388104e5-cee3-48fa-806d-86eb68fb5595)
+      (tstamp deb24402-7eb3-4676-9848-916fea35c201)
     )
     (fp_text user "${REFERENCE}" (at 0 2) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp dfaf2738-3dd1-456a-ada0-7bca4cab82a7)
+      (tstamp 92bad272-0277-440f-9a5e-df7328ec9124)
     )
     (fp_line (start -2.36 -1) (end 1.65 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 51fb6852-117f-477d-a3c4-bef150482aff))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 83fd1877-e869-4425-8689-67250c4ca984))
     (fp_line (start -2.36 1) (end -2.36 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp e3b58d28-a537-44cf-bbd9-aace03c7f4f2))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp ab47db55-50e3-407c-a771-54d9479e3ab8))
     (fp_line (start -2.36 1) (end 1.65 1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp c7cff5e7-6018-4fec-bb70-ef0ab52c0cfc))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 5f4dd184-7f41-43d8-9c31-915a87a00893))
     (fp_line (start -2.35 1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp d1d5215d-03ff-45e3-9c5f-9217b05fb81f))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp ccec2b58-6f73-49e9-8e74-e3e9bcfdaead))
     (fp_line (start -2.35 1.15) (end 2.35 1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp df7ae9f9-8c72-4bff-8209-aa649b92fb16))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp a954bc9f-33e3-426b-9132-193899fc7f20))
     (fp_line (start 2.35 -1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 8e586f02-028d-46ec-b3bb-2ea7693abba7))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 5c699ac0-9659-4a6c-872e-86f263cc018d))
     (fp_line (start 2.35 1.15) (end 2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp b7538abd-c9c1-4767-af63-d8fd74246f72))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp b5f78e88-159c-46f9-acab-4ce1a5cf7bb6))
     (fp_line (start -1.4 -0.9) (end -1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp fcf67ac6-85e1-4425-9800-9be4c7c98d70))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 4baed3af-34b0-4c40-8ef9-e5a269a14521))
     (fp_line (start -1.4 0.9) (end 1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 29221e7a-b5b8-471b-9042-57912c69bd1b))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 23e0c868-6565-4ff8-bc4d-e90a87fb08fd))
     (fp_line (start -0.75 0) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 603c6365-279a-419b-bc60-c309aafe1ecf))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp a76319cc-657f-404b-8881-fac3c2f54507))
     (fp_line (start -0.35 0) (end -0.35 -0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 7cfd20f2-4745-48fc-8d44-32a5056f7451))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp e11a6bef-5779-4aad-b136-fca5ddc90c54))
     (fp_line (start -0.35 0) (end -0.35 0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp fd56f764-18f2-408d-bcef-d8b3f9590694))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 4b2383ab-4281-4eef-8626-f1f773a5191b))
     (fp_line (start -0.35 0) (end 0.25 0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp bd8dcb8b-d4c6-45b2-88af-b22c826ab1cf))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp e9465e27-8a09-4366-8d89-e2fa78baf6eb))
     (fp_line (start 0.25 -0.4) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp c0b87e59-4114-4158-891c-0e44b1fdff4f))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp f0d4766a-445d-4e51-a0be-e708dfb478bd))
     (fp_line (start 0.25 0) (end 0.75 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 01a9ed1a-0cbf-4e20-8cbd-4b20c51d92f8))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 0564c692-cc2e-42d8-adcf-2b1ca767c0be))
     (fp_line (start 0.25 0.4) (end 0.25 -0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 64807549-7def-40b1-a544-6f7944c3ee9a))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 366fb963-e779-4877-82f6-cfb03fd0d77a))
     (fp_line (start 1.4 -0.9) (end -1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp a1b580d6-9a87-4d3f-9366-5fa657b5390f))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 6dfe0577-8e0f-43eb-be76-4055fb517c11))
     (fp_line (start 1.4 0.9) (end 1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 7f247567-f67f-4f67-8796-92fe5dc71aeb))
-    (pad "1" smd roundrect (at -1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 9 "Net-(D8-K)") (pinfunction "K") (pintype "passive") (tstamp f2ecd53f-869c-47b2-a6ae-5939a417a627))
-    (pad "2" smd roundrect (at 1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 2 "Net-(D1-A)") (pinfunction "A") (pintype "passive") (tstamp 8e08d4b7-9435-4687-9615-eb2aaf0a28f3))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 6dd0764c-4a45-47bf-8459-d9dcbf9bb3be))
+    (pad "1" smd roundrect (at -1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 4 "Net-(D10-K)") (pinfunction "K") (pintype "passive") (tstamp d887172f-d07d-4795-8f01-b06823cbc649))
+    (pad "2" smd roundrect (at 1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 37 "Net-(D11-A)") (pinfunction "A") (pintype "passive") (tstamp 84193ce9-76fb-4fe1-844d-cc29ea6b85f7))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SOD-123.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -7168,8 +7592,8 @@
   )
 
   (footprint "Diode_SMD:D_SOD-123" (layer "B.Cu")
-    (tstamp a524565a-8f54-4d5d-9242-d7341c7f3af1)
-    (at 352.7425 169.06875 180)
+    (tstamp 8f19dedf-2f4e-4f80-85cb-0ec06a1ff7c4)
+    (at 159.54375 145.25625)
     (descr "SOD-123")
     (tags "SOD-123")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
@@ -7178,60 +7602,60 @@
     (property "Sim.Pins" "1=K 2=A")
     (property "ki_description" "100V 0.15A standard switching diode, DO-35")
     (property "ki_keywords" "diode")
-    (path "/bb47617c-0fe0-4107-85f6-8277f3ddaa64")
+    (path "/29753cd0-0629-4cc6-8ab2-1c77f7f52a40")
     (attr smd)
-    (fp_text reference "D26" (at 0 2) (layer "B.SilkS")
+    (fp_text reference "D20" (at 0 2) (layer "B.SilkS")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 2f5ce696-16f3-42e2-ab2b-1cd70e1b84f5)
+      (tstamp 80d7d28f-4160-4d6b-b8af-76c938f74bcb)
     )
     (fp_text value "1N4148" (at 0 -2.1) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp e242ae6f-cad5-4165-b2de-6f0ceaccf57f)
+      (tstamp e879c0c4-8d41-4af2-8229-54591bec42ba)
     )
     (fp_text user "${REFERENCE}" (at 0 2) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp a2755f28-c332-4c8c-b386-fcf979ebdd7d)
+      (tstamp 2092ddd9-f87a-42e3-b062-fed848287062)
     )
     (fp_line (start -2.36 -1) (end 1.65 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 54cc0928-4417-47d4-ae2a-1ad57a2b61d6))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 0a81130d-f0e9-426f-b26f-b0aa6729d3f5))
     (fp_line (start -2.36 1) (end -2.36 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 101cb411-229d-43d3-8a9b-a803b7357a59))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 7311a765-a84b-416d-85b8-84647d8d07f8))
     (fp_line (start -2.36 1) (end 1.65 1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 1766f41c-f535-4ea7-9ac8-c6471f455607))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 5e0bd6fb-735d-4dd5-8254-9d9f523b57f5))
     (fp_line (start -2.35 1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp fd340e68-f8af-4ed9-8caf-a58678d10b4a))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 4a7b3116-76df-459c-acd4-c10f1b33c1aa))
     (fp_line (start -2.35 1.15) (end 2.35 1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 3b8d3d78-b73f-4c61-946f-3c7eeaf0ace9))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 664079ad-e009-4f60-863b-087db6fe113d))
     (fp_line (start 2.35 -1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 9ecc6ad0-f6d7-4632-a94a-402dec10e786))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 5bcd7db8-709e-438b-8264-2c74f2d6d76b))
     (fp_line (start 2.35 1.15) (end 2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp b2cf96dd-e5cd-45f1-a8a6-9edd8deef6b5))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 9015d5d1-357f-4eef-9660-ccf6a2a91adc))
     (fp_line (start -1.4 -0.9) (end -1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 4428f739-9b75-40a4-82f3-029def2b2a89))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp dcb88158-d35d-44c8-b910-5e43fb741429))
     (fp_line (start -1.4 0.9) (end 1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 984bd28f-6281-4d83-9201-c4e1384a249d))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp fb55fe59-20b6-4108-a5f0-d4810eb2c06b))
     (fp_line (start -0.75 0) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp e2322f60-daf8-4d08-bcd8-c96e66545215))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 5fbad2ed-408a-4d21-91ef-85a7d39c94be))
     (fp_line (start -0.35 0) (end -0.35 -0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 6a9117b4-5223-4ab8-804f-254508e668d1))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 8f272c46-a987-429e-9b05-9fbbda08c885))
     (fp_line (start -0.35 0) (end -0.35 0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp aa4ae56b-5e82-4639-b337-c2560889314a))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 91aefd81-b3b2-426e-bf5c-70f5fe8fae6d))
     (fp_line (start -0.35 0) (end 0.25 0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp d6742008-08d4-4550-8350-4cc3245e601d))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 85380258-3ab3-41d3-a03f-aa3a3873cd80))
     (fp_line (start 0.25 -0.4) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 786f67a7-5b37-4f2d-90ad-13adceaa1b55))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 6c00042a-0e47-464c-8d65-db005a3362bd))
     (fp_line (start 0.25 0) (end 0.75 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 653733bd-1d21-4cce-a337-df3dced985b9))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 338f2a7c-ad13-4e88-8a30-ee7bdde65bbf))
     (fp_line (start 0.25 0.4) (end 0.25 -0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 4f2c258d-c929-4c77-8f47-74ab6e8ef251))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 2b912c69-2991-41ba-9402-b1d04e1ff5bb))
     (fp_line (start 1.4 -0.9) (end -1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp e00d5b79-5885-4cf3-8bfc-3a3355665ecf))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 3e43eeed-888f-406f-bb54-50ce3ff65625))
     (fp_line (start 1.4 0.9) (end 1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 78e44880-f0df-4053-8eef-16a07707a031))
-    (pad "1" smd roundrect (at -1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 30 "Net-(D26-K)") (pinfunction "K") (pintype "passive") (tstamp c069754c-c3fc-46d4-a3ea-0deb386fe642))
-    (pad "2" smd roundrect (at 1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 29 "Net-(D25-A)") (pinfunction "A") (pintype "passive") (tstamp f9a6f460-f3d4-4739-97a4-049187f53d09))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 2ba1997a-6993-4d16-9f8d-b63d4ae1fe32))
+    (pad "1" smd roundrect (at -1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 5 "Net-(D17-K)") (pinfunction "K") (pintype "passive") (tstamp dc2eb6cb-733d-419f-9326-0a1757063cdf))
+    (pad "2" smd roundrect (at 1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 45 "Net-(D20-A)") (pinfunction "A") (pintype "passive") (tstamp ee14bbfb-4760-408a-bcd6-50300af8f692))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SOD-123.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -7240,8 +7664,8 @@
   )
 
   (footprint "Diode_SMD:D_SOD-123" (layer "B.Cu")
-    (tstamp a6188d9b-236b-4fca-85bb-0a16f6a23531)
-    (at 278.92375 130.96875 180)
+    (tstamp 93822eb3-8ecb-4b77-9f8f-af4065d72e45)
+    (at 197.64375 145.25625)
     (descr "SOD-123")
     (tags "SOD-123")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
@@ -7250,60 +7674,60 @@
     (property "Sim.Pins" "1=K 2=A")
     (property "ki_description" "100V 0.15A standard switching diode, DO-35")
     (property "ki_keywords" "diode")
-    (path "/61b8042d-136a-43e7-a500-bc57d3881634")
+    (path "/313f6955-846e-482c-bea9-f4797c2daed9")
     (attr smd)
-    (fp_text reference "D14" (at 0 2) (layer "B.SilkS")
+    (fp_text reference "D22" (at 0 2) (layer "B.SilkS")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 7d6b41b2-9153-4858-82a8-d86bff03215a)
+      (tstamp 74833e26-cecb-42ea-a333-0b0f4c3909bd)
     )
     (fp_text value "1N4148" (at 0 -2.1) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp e69717aa-4073-41b1-906c-f99c3b7deea4)
+      (tstamp d31202c1-f1ef-4d60-894e-07f93f980beb)
     )
     (fp_text user "${REFERENCE}" (at 0 2) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp f14f96b2-431c-4671-9c3e-9c5fa342ee6b)
+      (tstamp 44c732ff-74b6-40c5-9dba-adc1b92d8279)
     )
     (fp_line (start -2.36 -1) (end 1.65 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 9a37e028-ed0d-43b4-b4c9-e418265d96bb))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp c43b3b67-1b82-4416-af1d-7bdaf661b12f))
     (fp_line (start -2.36 1) (end -2.36 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp d4ac63d8-8248-49da-805c-bdb1942c0d64))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp bb9df385-bc61-4bca-87c6-4421777cc7d3))
     (fp_line (start -2.36 1) (end 1.65 1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp fafc52e0-932f-4311-b9d5-dc43050a1318))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp e2de75f4-c7eb-4247-b5e5-a779399fbfec))
     (fp_line (start -2.35 1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 9816f644-a134-41e2-b3fd-70ff519cacc8))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp f23fcb0e-8815-4383-923a-9ca40d0b23e5))
     (fp_line (start -2.35 1.15) (end 2.35 1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp e44d42d1-9c9e-40e9-ac5c-1a9ecfeea2cd))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 7f9fae71-bda4-4447-8bda-53bc91e7b21d))
     (fp_line (start 2.35 -1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 22a9f5e5-80d6-4122-9485-50612a3e03b5))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 3d1d3aba-6406-4d93-b40e-ac10d289958d))
     (fp_line (start 2.35 1.15) (end 2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 95e70267-cbef-4f9e-8de5-0e49b8896626))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 7453e04e-cb55-47cf-be53-a652f17f7a7b))
     (fp_line (start -1.4 -0.9) (end -1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp efbbdf33-adc3-4b32-a53c-823df1e951ad))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 7abcf7cd-0fa9-4c30-8f84-71d1210b61ce))
     (fp_line (start -1.4 0.9) (end 1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 314ed548-aa9e-4549-ba49-d557f2d42e36))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 69f12efa-8916-477f-a654-2774e4ef1445))
     (fp_line (start -0.75 0) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 312eb989-f46d-43a9-adf7-28819a33b25f))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 6b6c86cc-01a3-47eb-83a5-02c7237fe2e5))
     (fp_line (start -0.35 0) (end -0.35 -0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 381b5b34-ebb5-42fc-8287-a2f05a76fa55))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 16bb2ef8-9074-4f53-9259-5f05a6dcd5a3))
     (fp_line (start -0.35 0) (end -0.35 0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 8b6ac730-ad98-4a16-98b6-df98db124be5))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 61cb3a85-c6af-4f2e-932c-b09ea6701665))
     (fp_line (start -0.35 0) (end 0.25 0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 83f6d2e2-37eb-46c0-b7be-28ae28bb0b9d))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 70ce6d0e-c796-42e3-98dd-e02ed616fa9a))
     (fp_line (start 0.25 -0.4) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 9fabe170-2470-4f09-b46b-1f0e54d3f0ea))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp f3431295-244f-4b2e-b755-622bd4c1e67a))
     (fp_line (start 0.25 0) (end 0.75 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp e533df84-e26e-4b93-9686-1be4e8f692ec))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp abe3a429-7027-4104-9d0a-11090aa35e32))
     (fp_line (start 0.25 0.4) (end 0.25 -0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 0b188424-32b0-4fc0-a078-3a08fa24bcd6))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp ac41fa89-ea23-4fe1-9ffa-4375edbc171c))
     (fp_line (start 1.4 -0.9) (end -1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 37a1550c-cc02-41af-b514-effeab0a83be))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 25651678-f0db-473a-8d98-c73810c1ad8b))
     (fp_line (start 1.4 0.9) (end 1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 77e03af9-d100-441f-99f7-ee4681d7d0ae))
-    (pad "1" smd roundrect (at -1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 16 "Net-(D14-K)") (pinfunction "K") (pintype "passive") (tstamp c12014b2-32ed-4501-9ce9-29d49f14c832))
-    (pad "2" smd roundrect (at 1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 11 "Net-(D10-A)") (pinfunction "A") (pintype "passive") (tstamp e5eaf2ef-e745-43c3-951a-98a4026b3cba))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp dc0af302-913e-4be5-a3b3-53578db60dfd))
+    (pad "1" smd roundrect (at -1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 5 "Net-(D17-K)") (pinfunction "K") (pintype "passive") (tstamp ae3abb42-ab8b-4aae-bcc8-94ddc0dfd7c3))
+    (pad "2" smd roundrect (at 1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 47 "Net-(D22-A)") (pinfunction "A") (pintype "passive") (tstamp ee27ef15-f77f-4ad0-8053-a08bdb44f35f))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SOD-123.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -7312,8 +7736,8 @@
   )
 
   (footprint "Diode_SMD:D_SOD-123" (layer "B.Cu")
-    (tstamp ac0a760f-a1b8-425f-ab6b-1736ff26a067)
-    (at 347.98 188.11875 180)
+    (tstamp 959909ae-a48c-46b0-b14b-2d481a3a06c0)
+    (at 202.40625 107.15625)
     (descr "SOD-123")
     (tags "SOD-123")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
@@ -7322,60 +7746,60 @@
     (property "Sim.Pins" "1=K 2=A")
     (property "ki_description" "100V 0.15A standard switching diode, DO-35")
     (property "ki_keywords" "diode")
-    (path "/30e3b22d-790f-4cfe-8b73-0619a08feb4f")
+    (path "/9fe37ff2-ccfb-497f-a4ff-adb7f18d12a7")
     (attr smd)
-    (fp_text reference "D25" (at 0 2) (layer "B.SilkS")
+    (fp_text reference "D7" (at 0 2) (layer "B.SilkS")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 0bbe02c1-f2dc-4860-8991-2ce99fbf88c9)
+      (tstamp b8aec02a-68a6-4240-a355-4a79db48b27f)
     )
     (fp_text value "1N4148" (at 0 -2.1) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp b6a69d9b-6792-4a7b-93a5-ab89b2ab945d)
+      (tstamp 59e26ebc-4bb7-49aa-b82a-956b80b0a31d)
     )
     (fp_text user "${REFERENCE}" (at 0 2) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 5690675d-d824-480e-babf-626f8955d954)
+      (tstamp cbd32992-be5d-43c3-9cdd-6b49aced71c1)
     )
     (fp_line (start -2.36 -1) (end 1.65 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp d56c5ba0-2510-494e-951c-e0fe8c5077f6))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 949499ac-6121-4fe8-a912-77c4f3f02f2e))
     (fp_line (start -2.36 1) (end -2.36 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 052fc6e2-11de-4d4d-87b1-746346c679ee))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp e0a70bc2-57d3-4837-8856-595717ddc559))
     (fp_line (start -2.36 1) (end 1.65 1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 1ed02aeb-1b7a-48d1-998e-0021174ab74b))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 1c193c67-81ef-4da0-9a10-702d647c8924))
     (fp_line (start -2.35 1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp d9a47266-cce2-4d30-94e0-9c8993b2961d))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 815c052f-c8c1-4db2-93ba-5e0b83a694f9))
     (fp_line (start -2.35 1.15) (end 2.35 1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 95399739-3a2e-494d-874b-d0752ec275a8))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp c8e71866-bdd3-4a98-8d7b-6a54f63f8568))
     (fp_line (start 2.35 -1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 58685879-9e01-4ce3-b0d0-740fa5609715))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp c661a178-2335-475d-9a98-cf488f442dbd))
     (fp_line (start 2.35 1.15) (end 2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 4d76ce40-61fb-40c6-8f94-601a876cd388))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp a0410ebb-13b1-4499-ba90-84ef2c8fc2b5))
     (fp_line (start -1.4 -0.9) (end -1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp bdc25abb-0800-48a8-87fa-2f99cde7c61a))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp b963bfd7-54c5-44e3-b9bb-cfd2bea97d14))
     (fp_line (start -1.4 0.9) (end 1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 83575b70-83c4-4e99-9e2b-55d25ede282d))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp e7981335-df1e-43ef-8d68-2cbde43ed942))
     (fp_line (start -0.75 0) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 8e858216-3293-4059-a03d-1c99773e6a30))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 4cb3a6d8-e117-406c-a2de-fddad3cbed6e))
     (fp_line (start -0.35 0) (end -0.35 -0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 5ce05b7b-ab72-4e53-8037-5c8f117fe30f))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 1f2bf4b7-64d3-4c93-9b5a-88d45eb66f1a))
     (fp_line (start -0.35 0) (end -0.35 0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 179315d6-7261-4df8-8053-20a1d87cd3d4))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 93dede63-d4ec-493d-9a94-bf69860d0c80))
     (fp_line (start -0.35 0) (end 0.25 0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp f8db6f18-0c67-4a4c-9521-fe301bdbbb5e))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 4521086b-96a2-4c79-8e54-edd10c6a6645))
     (fp_line (start 0.25 -0.4) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 23c427ff-ca7c-4343-8382-6e52dcf7eec3))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 0fbd10d7-03e5-48f8-8fb5-a1ab2d19627f))
     (fp_line (start 0.25 0) (end 0.75 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp e67a745b-4c99-4f34-ab72-45a5d68d0093))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp c3c81e46-1845-4a61-8d26-77eeae80c825))
     (fp_line (start 0.25 0.4) (end 0.25 -0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp bbd22ab4-58eb-4609-a8c0-03ccce8cea37))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp b1f63940-a1e1-49c2-9ba0-cb503a8bfb23))
     (fp_line (start 1.4 -0.9) (end -1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 29d4be5e-bc5a-4709-8fc7-471f7f9e7100))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp ecab1f75-4c22-41c3-9284-5fa649e8c4d7))
     (fp_line (start 1.4 0.9) (end 1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 3a1a0b03-2ea1-4a00-81fb-d06d7c0af930))
-    (pad "1" smd roundrect (at -1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 28 "Net-(D25-K)") (pinfunction "K") (pintype "passive") (tstamp 47a7bda5-513b-44a9-9d28-75dee38b3f6f))
-    (pad "2" smd roundrect (at 1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 29 "Net-(D25-A)") (pinfunction "A") (pintype "passive") (tstamp d3e78e29-c781-4630-abfa-2a184581af3d))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp cff2bc87-9829-4ee2-aaa5-e04d8fa96d89))
+    (pad "1" smd roundrect (at -1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 1 "Net-(D1-K)") (pinfunction "K") (pintype "passive") (tstamp 80641be8-6c28-4e7d-ae99-87b8e3e66089))
+    (pad "2" smd roundrect (at 1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 34 "Net-(D7-A)") (pinfunction "A") (pintype "passive") (tstamp 6b824796-e1a3-41d7-8f63-22a98a12c741))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SOD-123.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -7384,8 +7808,8 @@
   )
 
   (footprint "Diode_SMD:D_SOD-123" (layer "B.Cu")
-    (tstamp af144478-4e6f-4708-84aa-67ab4afe7018)
-    (at 145.57375 130.96875 180)
+    (tstamp 9fd02970-7b6c-40f0-9773-079264fd6d7a)
+    (at 116.68125 183.35625)
     (descr "SOD-123")
     (tags "SOD-123")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
@@ -7394,60 +7818,60 @@
     (property "Sim.Pins" "1=K 2=A")
     (property "ki_description" "100V 0.15A standard switching diode, DO-35")
     (property "ki_keywords" "diode")
-    (path "/3bec0c1a-3bf6-49c1-8d5b-2f9557d5c6ac")
+    (path "/69524dcf-107f-46a2-b8e9-12c0e473b454")
     (attr smd)
-    (fp_text reference "D4" (at 0 2) (layer "B.SilkS")
+    (fp_text reference "D17" (at 0 2) (layer "B.SilkS")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 2c6dd0bc-b779-46d6-9123-3ca3d99563b6)
+      (tstamp 61505276-5cba-4e7d-906f-cbae9411c48b)
     )
     (fp_text value "1N4148" (at 0 -2.1) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp ea037fe4-cee7-4eda-aed6-61ab3be5bd14)
+      (tstamp a08d4723-b5c2-4323-bf53-410aed5959fc)
     )
     (fp_text user "${REFERENCE}" (at 0 2) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 144d40e9-e2ed-4ff4-b211-234366b445f1)
+      (tstamp 2a248802-a3af-4a40-9cab-ab39c8ddf485)
     )
     (fp_line (start -2.36 -1) (end 1.65 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp e4ab0a52-b458-40a2-82d2-0d464aae0264))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 79aced9b-c3e9-4c88-8dcb-b658479f28e5))
     (fp_line (start -2.36 1) (end -2.36 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 2fcc7235-c91f-4d44-a4f1-9705f45594bf))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp acee2ecd-7f71-498d-ace9-c8deba7cffd1))
     (fp_line (start -2.36 1) (end 1.65 1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp fc0fb6e1-9824-4899-b0cb-9f9519828b92))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 4aa3d9b8-a565-4103-b213-ea539ba931f4))
     (fp_line (start -2.35 1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp b6c1240a-6243-498b-aa69-8aa1e427bc00))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 7301db31-55dc-4d17-be82-4e32e53a819d))
     (fp_line (start -2.35 1.15) (end 2.35 1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 2c26d4bf-bffc-4fde-8227-2e6049a5fdd1))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp dcf5bcc6-0d95-4bf5-923d-3997f421050c))
     (fp_line (start 2.35 -1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 5b287455-7f69-4c5f-ae08-9a5a667a6314))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 7d1a9030-a99a-420e-89b7-0dcc1c32c139))
     (fp_line (start 2.35 1.15) (end 2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 46d4e1c9-e903-4b81-bcff-0971bd0f1c8d))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 557ce7ac-b54e-43c5-a783-bcf426bd0b11))
     (fp_line (start -1.4 -0.9) (end -1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 210251b6-e327-4c10-ad02-72f30e90daa8))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 9458484c-8568-4da7-9c29-7f25b9d9295a))
     (fp_line (start -1.4 0.9) (end 1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp b28acc97-ac9a-4b9d-bd8d-0086da80562b))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 8f8d7862-983b-486b-9d96-844142ffbbce))
     (fp_line (start -0.75 0) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 6296d4b8-f09d-4d88-941e-bb43d9325439))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 555aa852-f556-425c-895d-907d11d61dd1))
     (fp_line (start -0.35 0) (end -0.35 -0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 94c0711d-b663-4907-8b21-1b30ac889a84))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 7592a0b5-df5d-461b-913a-80291933ba55))
     (fp_line (start -0.35 0) (end -0.35 0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 661b9352-4eec-4586-96a4-f54bb80deae7))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 30a872d5-ded5-4ec4-a7b5-f38ce4d307b8))
     (fp_line (start -0.35 0) (end 0.25 0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 5f76a991-ba3a-4865-8f46-eb88e1234cd6))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 9fc0dc3c-7734-401e-bfee-3974bee86d53))
     (fp_line (start 0.25 -0.4) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp fdaa242f-80fc-41ae-b222-38f47a0d1902))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 57ba7b79-31c7-4429-961f-809af6a6bda5))
     (fp_line (start 0.25 0) (end 0.75 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 5b28c527-07e7-4048-b5b8-a1ce327fe83a))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 95c1a524-b84d-443d-9d20-5ccb553ec470))
     (fp_line (start 0.25 0.4) (end 0.25 -0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 1affd70a-9290-4acc-ba8a-5b153bd37b77))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 3b7b7fb2-7aeb-4252-9043-20ebf08086fd))
     (fp_line (start 1.4 -0.9) (end -1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 2ac56fa7-2fe6-48e4-ade4-5fddf66ed3f5))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 51b6ce59-a499-4bba-871e-c8e8d2d5db01))
     (fp_line (start 1.4 0.9) (end 1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 8b2dd9b9-e42c-4f8d-9fea-e9b84f18041e))
-    (pad "1" smd roundrect (at -1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 5 "Net-(D4-K)") (pinfunction "K") (pintype "passive") (tstamp b7083475-ef8b-48a2-8bad-387990376130))
-    (pad "2" smd roundrect (at 1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 2 "Net-(D1-A)") (pinfunction "A") (pintype "passive") (tstamp dae39fe7-aa3c-4d43-9e09-9a6820650e00))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 8f2ee27e-a0f0-421c-b4fc-716f99080e5b))
+    (pad "1" smd roundrect (at -1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 5 "Net-(D17-K)") (pinfunction "K") (pintype "passive") (tstamp d2918232-bf78-4b84-b9f2-b3f459cbe2a3))
+    (pad "2" smd roundrect (at 1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 6 "Net-(D17-A)") (pinfunction "A") (pintype "passive") (tstamp 4a5e6659-6e0d-46a8-91dc-175130982c3f))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SOD-123.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -7456,8 +7880,8 @@
   )
 
   (footprint "Diode_SMD:D_SOD-123" (layer "B.Cu")
-    (tstamp b79e6d22-a5a2-4d48-9c2f-660ed40ded24)
-    (at 245.58625 188.11875 180)
+    (tstamp a06b7ce7-e70e-4e70-9272-469e1a796ab7)
+    (at 347.6625 164.30625)
     (descr "SOD-123")
     (tags "SOD-123")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
@@ -7466,60 +7890,60 @@
     (property "Sim.Pins" "1=K 2=A")
     (property "ki_description" "100V 0.15A standard switching diode, DO-35")
     (property "ki_keywords" "diode")
-    (path "/990b2aa2-469f-451a-921e-6f585235cb9c")
+    (path "/f713cb9c-5545-4614-b68b-67e36091bda8")
     (attr smd)
-    (fp_text reference "D54" (at 0 2) (layer "B.SilkS")
+    (fp_text reference "D40" (at 0 2) (layer "B.SilkS")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 0a7d0f2a-b1c6-48bf-b0c8-a03cb8fcfc88)
+      (tstamp f4d7767b-e5e7-46bc-a83d-9ed8d19514c5)
     )
     (fp_text value "1N4148" (at 0 -2.1) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp e43f55c1-cf3d-4e74-937a-85ad2195afbd)
+      (tstamp 2fe74dd8-ddd2-4439-b83b-786c1286b2ea)
     )
     (fp_text user "${REFERENCE}" (at 0 2) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp b1c2093e-5185-4923-b1f0-eb53e9ba9698)
+      (tstamp e8864479-2b0f-4a9e-b82a-326144e8a986)
     )
     (fp_line (start -2.36 -1) (end 1.65 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp da6c2da6-5296-4b9f-b8b2-585639aee3b5))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp c04e7da0-0ded-4c25-9c99-09809e650154))
     (fp_line (start -2.36 1) (end -2.36 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 5135c230-d322-4cd7-a617-66c8e3394350))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 74a2c54a-2d11-4f02-91e6-7ec3c0c15364))
     (fp_line (start -2.36 1) (end 1.65 1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp e1b0f0cc-de4c-431e-a24a-67a7bae399de))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 7e384337-c5d2-41ca-909a-1f11ba1bf504))
     (fp_line (start -2.35 1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 3df05afb-3c8f-47e9-af45-cd55090f0d40))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 42119c06-f594-4047-bacf-1cb694c347a8))
     (fp_line (start -2.35 1.15) (end 2.35 1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 409be7ce-9cca-4c09-9009-9925a8b63a11))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 1d9eec3b-8b12-4e69-9402-610ef23f1dbe))
     (fp_line (start 2.35 -1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 23a6e0e5-427c-468f-8e19-df70122c740d))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp acc6416a-6ab4-4351-a091-945012e71786))
     (fp_line (start 2.35 1.15) (end 2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp f7ffe173-d316-45ed-834a-3b1eb4088682))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 671a9fd2-c9ee-4826-90ed-1808b5b10907))
     (fp_line (start -1.4 -0.9) (end -1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp b6490275-b0f6-404c-bef3-d4b27ec5d06b))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp bcda40bc-0a2c-4e3d-bf2f-ff8ffeea7f7d))
     (fp_line (start -1.4 0.9) (end 1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp d3e1467d-ab6c-441c-8710-4cb825ec6be8))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 8b4e34c7-bbaa-4c98-9049-f0f6cfe138da))
     (fp_line (start -0.75 0) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp f0adada1-d00a-4889-8dc8-6f8a5cfbaa91))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp b724d807-d190-46eb-ab9e-2760cafecca6))
     (fp_line (start -0.35 0) (end -0.35 -0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 60d7dcf5-703c-49e5-9e73-3740f023ac1b))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 263a6ee4-20d9-489f-8158-90118d09a65d))
     (fp_line (start -0.35 0) (end -0.35 0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp a21521fb-fc7b-44b5-9010-9f77e501de9f))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 9a01c297-7d21-4e95-a21a-d362016fdb16))
     (fp_line (start -0.35 0) (end 0.25 0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 340c6ec7-c739-4f35-9cd7-3f79f2114950))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp ac73eaa9-ac03-4d1d-8d38-d0095ef6ac3a))
     (fp_line (start 0.25 -0.4) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp eccdab7a-a36c-42c6-b4ca-58d3329afa68))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 36ed866e-871d-4ad9-aa89-6b455ea51c56))
     (fp_line (start 0.25 0) (end 0.75 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 99109331-6f6f-402a-a1dd-07fadf3f6f9d))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 4f6aca62-1712-4398-afd7-61e3e01db843))
     (fp_line (start 0.25 0.4) (end 0.25 -0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 24c0a7c4-7f9c-4d4d-ab5c-b51409f78875))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 3a0d8630-ef9d-4c8d-a4bf-ff2460d2a2cd))
     (fp_line (start 1.4 -0.9) (end -1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 79ffabca-dbff-4a98-9511-030f9a0a4621))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 3829c4ce-7cc1-43f0-98a6-1add5f633898))
     (fp_line (start 1.4 0.9) (end 1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 064d3959-3be8-45d5-9eef-e4d9d7bfe2c4))
-    (pad "1" smd roundrect (at -1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 61 "Net-(D54-K)") (pinfunction "K") (pintype "passive") (tstamp f0229370-3056-4bc6-b052-a1f5d32661fb))
-    (pad "2" smd roundrect (at 1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 56 "Net-(D49-A)") (pinfunction "A") (pintype "passive") (tstamp 9d3a1355-3524-4abf-b095-1064bb41d174))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 60046165-e7f8-40d9-bb93-3b595b2ccfcb))
+    (pad "1" smd roundrect (at -1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 11 "Net-(D40-K)") (pinfunction "K") (pintype "passive") (tstamp 776f0edc-9fb8-43fb-9f1b-635560869a76))
+    (pad "2" smd roundrect (at 1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 63 "Net-(D40-A)") (pinfunction "A") (pintype "passive") (tstamp 64cd2a87-c279-45bc-b6c8-8d65566201b8))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SOD-123.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -7528,8 +7952,8 @@
   )
 
   (footprint "Diode_SMD:D_SOD-123" (layer "B.Cu")
-    (tstamp b90e1342-f16a-403f-8a52-1d489cfa770f)
-    (at 355.12375 207.16875 180)
+    (tstamp a42e9d3b-018a-45a7-861e-9e57cfe615cc)
+    (at 221.45625 183.35625)
     (descr "SOD-123")
     (tags "SOD-123")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
@@ -7538,60 +7962,60 @@
     (property "Sim.Pins" "1=K 2=A")
     (property "ki_description" "100V 0.15A standard switching diode, DO-35")
     (property "ki_keywords" "diode")
-    (path "/68e37679-760f-46da-913b-27cbcddb5ee6")
+    (path "/f538a370-228c-4422-b03b-04f37a22f3b6")
     (attr smd)
-    (fp_text reference "D41" (at 0 2) (layer "B.SilkS")
+    (fp_text reference "D57" (at 0 2) (layer "B.SilkS")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp e42bc022-c30d-4078-a03d-1a3da2d637b5)
+      (tstamp bff09eec-da12-4a92-a007-e95c410d0207)
     )
     (fp_text value "1N4148" (at 0 -2.1) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp fd81068e-7a60-4263-b80c-560454824e81)
+      (tstamp 49ac6e02-f254-4738-b136-198973ddeb43)
     )
     (fp_text user "${REFERENCE}" (at 0 2) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp e1419585-e91f-4102-9fa6-808cbf58ea3c)
+      (tstamp bf7bd28e-a692-4bdc-885d-c7caf50918af)
     )
     (fp_line (start -2.36 -1) (end 1.65 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 2794a8d0-4b4b-4f8d-ac29-5090a30df7ad))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 95297024-3d25-4641-b0b2-8e8369f20367))
     (fp_line (start -2.36 1) (end -2.36 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 108f528f-878d-4f5d-a468-7632b71753fd))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 6f75741a-e386-40a9-a833-d603f0a0748b))
     (fp_line (start -2.36 1) (end 1.65 1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 5d874419-d313-40ef-a12f-218128a6de95))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 54e3d8be-31d9-41ca-ba77-8fe737844a9e))
     (fp_line (start -2.35 1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 38671dfc-78ba-47d7-b7cf-1d057d866120))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 98dee28f-045d-440a-a265-641536ed7279))
     (fp_line (start -2.35 1.15) (end 2.35 1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 67ac2bd1-ac1a-402c-9b07-db3356bac6af))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 4648db59-273d-4e35-be87-3c5fd7b4dc7e))
     (fp_line (start 2.35 -1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 3f1fb330-8abe-485c-acf0-9fe0db5f4142))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp d65ad7d9-1d70-4e12-a3c1-91d77509de7b))
     (fp_line (start 2.35 1.15) (end 2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp d03559f3-04af-46a3-8882-4c49e9b55d9a))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 8424f06a-1086-44ad-bbb1-6e6a550f28cc))
     (fp_line (start -1.4 -0.9) (end -1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 679b1fb9-e939-4557-9acd-fb77a50e33bc))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp aec22aab-73c8-4a3c-8325-d55183177a89))
     (fp_line (start -1.4 0.9) (end 1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 2200eccd-5577-4d4b-a65b-1175b9583841))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp e6dfccfe-d0b9-43ff-be6c-a43bae0c4a5d))
     (fp_line (start -0.75 0) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 7c5c1dd9-fde7-4caa-89cd-8ebf3dac1d43))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 5bf52776-1959-4b17-86da-65a8c781de0b))
     (fp_line (start -0.35 0) (end -0.35 -0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 155a4097-df9f-4a91-8d71-45304574b5ff))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp ff6ca9a5-7227-4bf2-94cb-aa2720a7b0f2))
     (fp_line (start -0.35 0) (end -0.35 0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp eb50419c-7852-4415-bebf-80e45ddc2c01))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp dcdf11b3-6500-4ea7-83bb-a27dd49ca90e))
     (fp_line (start -0.35 0) (end 0.25 0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 17ffc4e3-c64f-41e0-90d2-ce8ba3ead0b3))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 29bd1635-19d8-4a62-a399-7d5054608ecb))
     (fp_line (start 0.25 -0.4) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 5e908300-6d63-4b12-8cb6-1f340161e0ea))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 07516048-072c-4d67-befb-617bb0a295b5))
     (fp_line (start 0.25 0) (end 0.75 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 41895b16-2ea8-4afd-ab66-2408530ec33a))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp e0b74cc6-1ef9-497e-9b56-3a350877c5c8))
     (fp_line (start 0.25 0.4) (end 0.25 -0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 4d77d485-b5df-4fdd-aa1e-de5ea91d6ac4))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 3e890792-0fe7-496e-932b-efc98df74eda))
     (fp_line (start 1.4 -0.9) (end -1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp abefad26-4f99-4233-bee2-c91cc5537c1d))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp ca0733f1-ac66-453f-8286-d12f91fa6eb2))
     (fp_line (start 1.4 0.9) (end 1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 55abf7ab-65a8-467b-92a1-ef2f2f3a86d8))
-    (pad "1" smd roundrect (at -1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 46 "Net-(D41-K)") (pinfunction "K") (pintype "passive") (tstamp 05defed0-9133-4085-81bd-72450a3b0911))
-    (pad "2" smd roundrect (at 1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 47 "Net-(D41-A)") (pinfunction "A") (pintype "passive") (tstamp e06a39e2-4548-434e-905e-d9ee66c01349))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp dc2e86a6-ae16-4644-a7d8-1d88d2217507))
+    (pad "1" smd roundrect (at -1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 15 "Net-(D56-K)") (pinfunction "K") (pintype "passive") (tstamp a747411a-bcef-4a50-9899-ab1f77a60bb8))
+    (pad "2" smd roundrect (at 1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 77 "Net-(D57-A)") (pinfunction "A") (pintype "passive") (tstamp 22f55c3b-7963-45d9-8fad-83bbee5e492c))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SOD-123.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -7600,8 +8024,8 @@
   )
 
   (footprint "Diode_SMD:D_SOD-123" (layer "B.Cu")
-    (tstamp c346d8a6-be46-4734-8758-283ebd97a3dc)
-    (at 297.97375 207.16875 180)
+    (tstamp a63f9b4e-64e5-43e7-9fd7-0ad9ffcacb69)
+    (at 178.59375 145.25625)
     (descr "SOD-123")
     (tags "SOD-123")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
@@ -7610,60 +8034,60 @@
     (property "Sim.Pins" "1=K 2=A")
     (property "ki_description" "100V 0.15A standard switching diode, DO-35")
     (property "ki_keywords" "diode")
-    (path "/775685ff-9c6d-4598-abbb-8375a1941e8d")
+    (path "/18046bef-9e40-4f58-be1a-e57c2154b906")
     (attr smd)
-    (fp_text reference "D60" (at 0 2) (layer "B.SilkS")
+    (fp_text reference "D21" (at 0 2) (layer "B.SilkS")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp cfbaea99-cc5f-40d2-8ac9-9f41f77195b1)
+      (tstamp 36c72199-dd2e-4179-b5e4-b594d75b0b5b)
     )
     (fp_text value "1N4148" (at 0 -2.1) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp fda398f0-af6a-4ca9-bb86-ae149bd72687)
+      (tstamp ec078737-8d03-4002-832c-c764891fee8e)
     )
     (fp_text user "${REFERENCE}" (at 0 2) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp b206dac5-a7c3-4b15-989c-70922d943c7a)
+      (tstamp f97574e7-f37f-4277-8d26-7231a849e3ea)
     )
     (fp_line (start -2.36 -1) (end 1.65 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp ed01ff4f-f026-471d-95cb-cc6a4c5dd15f))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 1adbf184-7aa6-483b-96f0-34fe4c072745))
     (fp_line (start -2.36 1) (end -2.36 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 0bac5dfe-a86a-4a15-8ec3-3e47f9732c2f))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 3be7d619-acb0-4bc9-aa1e-462e084bd4ad))
     (fp_line (start -2.36 1) (end 1.65 1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 64fa8bbc-2562-4ee3-9897-b120435b8ab1))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 93739bd2-1ff7-4119-bea8-04b1e00822f5))
     (fp_line (start -2.35 1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 7584ad81-14a8-4123-a84d-c5f8b008fa54))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 9edd522e-d6a9-4b2a-a95f-5b4e2567c71d))
     (fp_line (start -2.35 1.15) (end 2.35 1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 9d165dd8-383b-47e2-a444-b48dda7f6367))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 6c6878a4-ea66-4cd1-bdbf-2f5364c6a790))
     (fp_line (start 2.35 -1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 292d7812-e089-4d2c-89c1-42f35c24031b))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp bd176042-3188-4144-a821-44d6e0d31026))
     (fp_line (start 2.35 1.15) (end 2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 15c49351-b499-47ab-bd4b-6dd549dece6c))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp e0b0eaaf-9ed8-485a-abf9-5fddeb400191))
     (fp_line (start -1.4 -0.9) (end -1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp ea3f528a-d55c-4de4-9440-cea591d5b483))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp ce0cba4f-15e8-4ac2-bca8-43f5501bee2a))
     (fp_line (start -1.4 0.9) (end 1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 9bf26940-b667-4bb8-9512-113fd7469fe2))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 8961ff9b-affd-49a5-b465-bacf30fec58a))
     (fp_line (start -0.75 0) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp db78770c-b4fb-44f7-8694-ab9972c9fd3b))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 43ac69ec-7330-46ae-8510-d690b37cb8d8))
     (fp_line (start -0.35 0) (end -0.35 -0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp f3528d28-ca3b-4041-aeaa-f6f6b1b2b303))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 301a0a6c-bbcb-4a1e-9813-9a92f48e988b))
     (fp_line (start -0.35 0) (end -0.35 0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 383b4f07-751c-4c2e-9bde-5b07b6a06549))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 76d1ff0f-5db4-4b24-8a8f-6976242d0d73))
     (fp_line (start -0.35 0) (end 0.25 0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 7b9d52d1-e6b0-42ca-88f5-49b8c21c693f))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 51718c98-79a5-4476-bc59-0ca464f2ea92))
     (fp_line (start 0.25 -0.4) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 7df6a857-7f59-47bf-9a94-420de00d2d6a))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp db7bf1b5-e835-4e26-b728-7b937e89a10e))
     (fp_line (start 0.25 0) (end 0.75 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp af31e96c-6bd1-4daf-a90b-58000758c362))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp f2d15097-bb34-4314-b613-b2ffdc5049d8))
     (fp_line (start 0.25 0.4) (end 0.25 -0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp d3cc8d40-f80d-4306-9657-37b233433d13))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp d4c1a674-45c5-4977-8fed-8d310cedea62))
     (fp_line (start 1.4 -0.9) (end -1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp f47ce5a0-1776-459a-9692-cef6e8210801))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp e1f37432-50ce-482e-959d-9998f32e3663))
     (fp_line (start 1.4 0.9) (end 1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 57946bf2-8aef-43a2-a3cd-b438fd24b6db))
-    (pad "1" smd roundrect (at -1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 68 "Net-(D60-K)") (pinfunction "K") (pintype "passive") (tstamp 86c4b92b-4a20-4e3a-8520-b66af9d97b4a))
-    (pad "2" smd roundrect (at 1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 64 "Net-(D56-A)") (pinfunction "A") (pintype "passive") (tstamp d081df1c-98b7-4f96-bf7f-1fa34f19b1e5))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 228872a7-6817-4c7f-87a2-cc2a021f380d))
+    (pad "1" smd roundrect (at -1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 5 "Net-(D17-K)") (pinfunction "K") (pintype "passive") (tstamp 5c7c5298-e58b-48c5-8f80-64566b289b0d))
+    (pad "2" smd roundrect (at 1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 46 "Net-(D21-A)") (pinfunction "A") (pintype "passive") (tstamp 100c888d-76ba-4abe-8b0d-20cdc57467b8))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SOD-123.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -7672,8 +8096,8 @@
   )
 
   (footprint "Diode_SMD:D_SOD-123" (layer "B.Cu")
-    (tstamp c3af8874-16ea-4221-a0e7-bd826094a1cf)
-    (at 150.33625 188.11875 180)
+    (tstamp acb63a03-8996-433e-99f1-34bb7e94832c)
+    (at 235.74375 145.25625)
     (descr "SOD-123")
     (tags "SOD-123")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
@@ -7682,60 +8106,60 @@
     (property "Sim.Pins" "1=K 2=A")
     (property "ki_description" "100V 0.15A standard switching diode, DO-35")
     (property "ki_keywords" "diode")
-    (path "/218f7002-2d7f-4100-8c3d-2ecd52897059")
+    (path "/e64d51c4-14cd-4614-a81c-628d1a9f97ee")
     (attr smd)
-    (fp_text reference "D35" (at 0 2) (layer "B.SilkS")
+    (fp_text reference "D24" (at 0 2) (layer "B.SilkS")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp ec393a4c-0b02-4859-b1f9-89d932a11d2f)
+      (tstamp d14f471b-edda-41de-ae48-5b9cb2fe10a3)
     )
     (fp_text value "1N4148" (at 0 -2.1) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 15ecacc2-854e-46c0-8769-b6e443f0e18b)
+      (tstamp 5865a0a2-2660-4a59-b6fc-b301ab164aea)
     )
     (fp_text user "${REFERENCE}" (at 0 2) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 1cad2d7b-6b7e-45b0-aafa-2fc69d327fcf)
+      (tstamp 05cc4736-c58d-4d5c-bce1-af7b5aa74258)
     )
     (fp_line (start -2.36 -1) (end 1.65 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp b70ed244-4b67-4e5e-8ec6-f063af23da21))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 3f22edad-3459-4351-8a1b-d45dd6786068))
     (fp_line (start -2.36 1) (end -2.36 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp ba8a19cf-c5f1-4ee7-add9-b85318839d55))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 290adfbb-c509-4c7a-aeaf-5f9d9a57acbb))
     (fp_line (start -2.36 1) (end 1.65 1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp e0a5b6e8-6db1-4512-9a0e-1f5c04bd07f1))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 1b771eae-c8c3-4616-815e-e036776b9aba))
     (fp_line (start -2.35 1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp df6ebc4b-8aad-43ff-b16f-49232206eff5))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 37a29a7b-a56b-497f-804b-51dee80df814))
     (fp_line (start -2.35 1.15) (end 2.35 1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 1eebe53c-9e6e-4a78-8bbe-cb89366c4688))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 8334a469-26d9-44a3-a00b-c1e7d4b07ac5))
     (fp_line (start 2.35 -1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 40e51556-7e87-4e5f-a0ca-9c6bd8e2a85c))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 1ab71d36-44d4-4263-a6f3-a6fb59e8c35e))
     (fp_line (start 2.35 1.15) (end 2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 78301f62-9530-4432-b7fe-5b64fa8cd2c8))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 545bb650-eec3-4588-b4f6-ed1c72c6a7be))
     (fp_line (start -1.4 -0.9) (end -1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 1d5b9f79-13ca-433e-b05b-dab65a4479ae))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 5d3c7b20-9532-44e6-8419-b8818155f8e3))
     (fp_line (start -1.4 0.9) (end 1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp b70d934d-cdc3-4974-96dc-8a942b6384ee))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp bef5c5bc-50d0-4798-a832-2f08e8a302f8))
     (fp_line (start -0.75 0) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp f2a99950-a9c0-4962-9a5d-4f0385cf0c6c))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 7a00dc6c-1c3f-4fbf-bd8c-fe85612bf32d))
     (fp_line (start -0.35 0) (end -0.35 -0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp fbd140ca-9544-4e28-bef7-e86e1f6703ae))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp a7f86acc-492a-4a9c-838d-d5599c463db6))
     (fp_line (start -0.35 0) (end -0.35 0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 8e400e11-4a5c-4648-b5f5-7ba48be7da87))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp d5e81473-4705-42af-a1ff-5cf7d65a0cb1))
     (fp_line (start -0.35 0) (end 0.25 0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 4e5f6c45-0468-4180-b886-558497c6fcba))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp b23bc368-ac5d-445a-84df-1e0b849a026d))
     (fp_line (start 0.25 -0.4) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp e77ebb84-400b-4268-91cb-24ab017340d3))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp a1dd9106-b0ef-443f-88fd-835f761bd8c5))
     (fp_line (start 0.25 0) (end 0.75 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp aafb3939-1f7e-4b68-9eb4-02ffc195461b))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp bbe154d2-b960-48a0-aeef-d4750562d59b))
     (fp_line (start 0.25 0.4) (end 0.25 -0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 2709ef8f-0b43-4fcb-9d3c-8c4fa022fff2))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 0134613b-df41-4613-b8f1-012cf5fcc44c))
     (fp_line (start 1.4 -0.9) (end -1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp d618f8d4-36b2-4b8a-8baf-cf1d65e24e60))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 4e843d0e-46ed-4fec-b382-c44404673692))
     (fp_line (start 1.4 0.9) (end 1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 3318bc98-94ba-496c-8d4f-9807c7eb3b33))
-    (pad "1" smd roundrect (at -1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 40 "Net-(D35-K)") (pinfunction "K") (pintype "passive") (tstamp 089c9911-f50f-4424-bc3e-a8fdfe690dec))
-    (pad "2" smd roundrect (at 1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 38 "Net-(D33-A)") (pinfunction "A") (pintype "passive") (tstamp 6b54b8d5-dfc7-44c9-924f-9f83f7f4ab6a))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 04224850-9ebc-4b7f-bdc9-bac35468405f))
+    (pad "1" smd roundrect (at -1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 5 "Net-(D17-K)") (pinfunction "K") (pintype "passive") (tstamp b832f852-a0f7-4547-aa86-6bce9a5e96e1))
+    (pad "2" smd roundrect (at 1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 49 "Net-(D24-A)") (pinfunction "A") (pintype "passive") (tstamp e267efb3-e321-4e8e-a19c-ac09891b0cf8))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SOD-123.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -7744,8 +8168,8 @@
   )
 
   (footprint "Diode_SMD:D_SOD-123" (layer "B.Cu")
-    (tstamp cb934aa8-7f90-4441-a705-c9b5a54d2c24)
-    (at 138.43 207.16875 180)
+    (tstamp b141f7ab-a07a-4d2c-83b9-a258f541607b)
+    (at 345.28125 126.20625)
     (descr "SOD-123")
     (tags "SOD-123")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
@@ -7754,60 +8178,60 @@
     (property "Sim.Pins" "1=K 2=A")
     (property "ki_description" "100V 0.15A standard switching diode, DO-35")
     (property "ki_keywords" "diode")
-    (path "/d797d643-c12d-416e-b62b-4f23e748e813")
+    (path "/4bab00e1-2d5d-4413-a0b6-01c6c4965b6b")
     (attr smd)
-    (fp_text reference "D34" (at 0 2) (layer "B.SilkS")
+    (fp_text reference "D32" (at 0 2) (layer "B.SilkS")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp b9a21cc0-6bb4-40fd-915b-218380bea3b5)
+      (tstamp a4041640-45f9-4a3e-a14c-538631a6b7cb)
     )
     (fp_text value "1N4148" (at 0 -2.1) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 7ebdecff-fc68-4b25-a3ae-0d555069ddbd)
+      (tstamp db3bc630-5f7e-4959-ae76-03e7dad62e49)
     )
     (fp_text user "${REFERENCE}" (at 0 2) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp e35b1fda-bf19-4d21-a152-5326ff6036c0)
+      (tstamp e9620d24-2e23-43e5-bc55-cd39aac262bd)
     )
     (fp_line (start -2.36 -1) (end 1.65 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp a6dcd924-1d3e-4b6f-a973-13ebc8dd5f9b))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp d24b0f79-3998-43d6-838d-000e705708cb))
     (fp_line (start -2.36 1) (end -2.36 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 11cf0800-85f2-4d82-9c9c-2bef61faac22))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 6219d468-869a-4a11-ae58-e5dd5dfd0521))
     (fp_line (start -2.36 1) (end 1.65 1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 59a0227b-f875-4e69-803b-2e68912b0036))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp e40c6b7e-b5a5-42d8-ad93-c7af0e8500a9))
     (fp_line (start -2.35 1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp ff09be0b-2cdf-4533-8c64-c06b8974fba2))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp daf9ca1e-c648-450e-b89d-ae78b6facc18))
     (fp_line (start -2.35 1.15) (end 2.35 1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp c7fdb48c-9ba7-44df-af34-3aaa6f88c8bb))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp df7ea05f-d07c-42db-a1b9-d34f2e7967cc))
     (fp_line (start 2.35 -1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 60f6df72-098e-4eba-a183-904cd1cb66ce))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 5e5f09bf-e5df-401a-a216-d08a04195747))
     (fp_line (start 2.35 1.15) (end 2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp d7b62eca-2207-4ae1-95aa-07507fb406a3))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp e0789fb3-1678-4833-8615-6268963b7b20))
     (fp_line (start -1.4 -0.9) (end -1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 25c98e41-d6f1-412f-b365-c372a3b1e1e2))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 3d78532e-b283-48c8-bd03-51ba6e8dd66d))
     (fp_line (start -1.4 0.9) (end 1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 01dbb33c-a1f5-40f8-b7be-36b8477d1f2b))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp d0e5e5a8-9447-4e70-9354-1d738b1d3833))
     (fp_line (start -0.75 0) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 0f2d8c21-ddf4-4164-958a-dbf3151e3cc2))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp c369d77d-68b6-4403-bd6b-51565846f94e))
     (fp_line (start -0.35 0) (end -0.35 -0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 0a93bc0b-3ea6-4784-af49-88817401becd))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 1fe72673-9f75-4810-b4de-aec03402d808))
     (fp_line (start -0.35 0) (end -0.35 0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 5e17f4f0-5dbd-44cd-ae92-14729979a695))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 62a83bbd-2523-4e21-ad5e-8309fc3eec5a))
     (fp_line (start -0.35 0) (end 0.25 0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 6a8cb4a1-bce2-48f4-926f-f0306574c7b0))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 72318cdd-fe04-46b3-99de-fd1487bff481))
     (fp_line (start 0.25 -0.4) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 31f9d3ba-dcf6-48db-aade-922cbfd9ead0))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 2c379421-9c52-4beb-9ddc-046a88392ec7))
     (fp_line (start 0.25 0) (end 0.75 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp c6abcb98-a448-4895-a46d-23c8bd0faa87))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 9b6ed5fd-f4d9-4d91-889f-6cac6bac8616))
     (fp_line (start 0.25 0.4) (end 0.25 -0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 873ad51c-158d-42de-a590-fe639854f032))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp e5147cef-2995-41ae-82b3-cb7f1c7e26c4))
     (fp_line (start 1.4 -0.9) (end -1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp c2b09591-bb96-4d68-92d7-49a69f0250d8))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp a1b83dc9-c320-4f8b-9047-845eab32ea2a))
     (fp_line (start 1.4 0.9) (end 1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp b0fe15f7-9bb0-4655-9154-3521f830112c))
-    (pad "1" smd roundrect (at -1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 39 "Net-(D34-K)") (pinfunction "K") (pintype "passive") (tstamp 6745db4a-2b6b-4098-8432-3046a175cf0e))
-    (pad "2" smd roundrect (at 1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 38 "Net-(D33-A)") (pinfunction "A") (pintype "passive") (tstamp 94e28e21-1603-4e1f-bcbf-b51d9a700ed9))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp caa3db5c-1039-44f3-ba3c-693d533df829))
+    (pad "1" smd roundrect (at -1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 9 "Net-(D32-K)") (pinfunction "K") (pintype "passive") (tstamp a62379e2-a634-4caa-8b94-b0a6d632d3a9))
+    (pad "2" smd roundrect (at 1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 56 "Net-(D32-A)") (pinfunction "A") (pintype "passive") (tstamp 33df81c7-48a7-4421-8f39-172d90a2ff0e))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SOD-123.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -7816,8 +8240,8 @@
   )
 
   (footprint "Diode_SMD:D_SOD-123" (layer "B.Cu")
-    (tstamp cecdb10b-730b-46ba-bc3f-f4db38e58fb3)
-    (at 331.31125 169.06875 180)
+    (tstamp b6ca98f1-9664-434b-b817-6f5414c2f362)
+    (at 352.425 145.25625)
     (descr "SOD-123")
     (tags "SOD-123")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
@@ -7826,60 +8250,60 @@
     (property "Sim.Pins" "1=K 2=A")
     (property "ki_description" "100V 0.15A standard switching diode, DO-35")
     (property "ki_keywords" "diode")
-    (path "/f3558dee-265f-4dda-967c-4ec21906f1a3")
+    (path "/4f4399ee-0af6-4065-b0e4-d62186ffc327")
     (attr smd)
-    (fp_text reference "D27" (at 0 2) (layer "B.SilkS")
+    (fp_text reference "D41" (at 0 2) (layer "B.SilkS")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 36c60fd7-5f7f-418c-a0cd-f2fa9bad7a4d)
+      (tstamp d376330b-34ce-434b-8948-91f8b6b7bd38)
     )
     (fp_text value "1N4148" (at 0 -2.1) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp f73222e9-482e-49ab-a3aa-502138d57bc8)
+      (tstamp 0d7a1de0-ab6c-45e1-b588-3e09eb6a5650)
     )
     (fp_text user "${REFERENCE}" (at 0 2) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 1bbf73f4-1065-4cc4-badc-478328376274)
+      (tstamp c50151b4-39ad-4fd3-b97c-e7d5fad1cc99)
     )
     (fp_line (start -2.36 -1) (end 1.65 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 14666686-d51a-4e0d-9677-5e360385fb35))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 205ebfc1-b5e9-443f-9dfd-def87102ae4e))
     (fp_line (start -2.36 1) (end -2.36 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 09b5914d-fab9-429e-8f6f-d14d8ecd3be3))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 943c55cd-8a39-43c1-8dcc-524d68fa62f7))
     (fp_line (start -2.36 1) (end 1.65 1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 95bdd6ef-02fd-4f57-8c51-52196f8a4391))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp f53f8a77-1e24-4106-82c4-8bceed64a103))
     (fp_line (start -2.35 1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp bcee9865-37f5-43b4-af33-533c2a3386f8))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp a3473e37-0cb1-47b3-b5ca-bfe6648df028))
     (fp_line (start -2.35 1.15) (end 2.35 1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 6e5ff711-8021-4d57-8284-f4e3852feee3))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 8d1a2c1d-5799-4d21-96c9-c55662dac13f))
     (fp_line (start 2.35 -1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 4e3ecc60-054c-49de-83b4-060324322786))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 84ab1ca4-7289-4e3d-9752-3114bd330696))
     (fp_line (start 2.35 1.15) (end 2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp b5c3cfe4-4fe2-42db-b945-af624093c93f))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 6d039c44-073b-4017-821d-613a94932ec2))
     (fp_line (start -1.4 -0.9) (end -1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp c6534acb-1f32-437d-8805-729791d6d0f3))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp d947a547-d417-4c17-86fe-24e6405b2a66))
     (fp_line (start -1.4 0.9) (end 1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 9ba957f0-7702-4114-9ff1-b369382dc19a))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 0f3be9a1-c422-488c-b46e-251bf248d06f))
     (fp_line (start -0.75 0) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 28607f08-116b-4adc-b456-7a1e791da159))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 8e0f52ba-1e95-4e95-afa8-55e7833fcd32))
     (fp_line (start -0.35 0) (end -0.35 -0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp ce7a7922-a96a-4ed5-9733-0956f03886d3))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp bef9bc91-08f7-4747-acc7-5a4fe5c052b0))
     (fp_line (start -0.35 0) (end -0.35 0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 26efd9fe-277d-4d0e-9f2d-53f20f9d3a9d))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 3803ea00-4aeb-4fd7-8d38-103d7542a446))
     (fp_line (start -0.35 0) (end 0.25 0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 7090f804-315b-4e02-9cdc-dd64698881c6))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 44efc55d-76bb-4ee4-82d9-5d713933de4b))
     (fp_line (start 0.25 -0.4) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 69f77d0c-285b-4cb2-8e1a-883b72c6ca5c))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp c77adfb8-0721-4676-896b-13e26da1a002))
     (fp_line (start 0.25 0) (end 0.75 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp bb2ebca3-cc20-47d5-8557-27440c21357d))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 9fe15d54-d2a8-4add-8428-db4355278717))
     (fp_line (start 0.25 0.4) (end 0.25 -0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp b7d804d0-98a4-4e71-9e14-2da871e0c5a0))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 63cd6614-fbc4-49b2-bb13-d7e0ac03ca12))
     (fp_line (start 1.4 -0.9) (end -1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp f196e716-23eb-4db5-9cea-1dd6b2ac2893))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 3980a0b9-dda3-4d0d-88c8-4215b7b51732))
     (fp_line (start 1.4 0.9) (end 1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 601d0621-545b-41c7-89a5-fc8d0bb03df4))
-    (pad "1" smd roundrect (at -1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 31 "Net-(D27-K)") (pinfunction "K") (pintype "passive") (tstamp 90af4499-daf6-488c-9615-181d1329d747))
-    (pad "2" smd roundrect (at 1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 29 "Net-(D25-A)") (pinfunction "A") (pintype "passive") (tstamp c351e216-a47a-4fd8-94d3-9135957f2345))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 9578983e-2bfa-4ba5-8c00-d3d50824ae99))
+    (pad "1" smd roundrect (at -1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 11 "Net-(D40-K)") (pinfunction "K") (pintype "passive") (tstamp c64ac4ec-d2dd-44a6-aa65-d2453006498d))
+    (pad "2" smd roundrect (at 1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 12 "Net-(D41-A)") (pinfunction "A") (pintype "passive") (tstamp 851cda7d-6597-4130-9b44-26782c927ea4))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SOD-123.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -7888,8 +8312,8 @@
   )
 
   (footprint "Diode_SMD:D_SOD-123" (layer "B.Cu")
-    (tstamp d2e935df-e85e-4056-93c9-477b4f87e251)
-    (at 345.59875 150.01875 180)
+    (tstamp bea3c96d-5851-4570-8ac9-42dc33c4897a)
+    (at 188.11875 164.30625)
     (descr "SOD-123")
     (tags "SOD-123")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
@@ -7898,60 +8322,60 @@
     (property "Sim.Pins" "1=K 2=A")
     (property "ki_description" "100V 0.15A standard switching diode, DO-35")
     (property "ki_keywords" "diode")
-    (path "/ab443403-c0bf-46a2-9e19-ab754ababe09")
+    (path "/824c637b-dc84-43d9-90d1-ef47a27eead5")
     (attr smd)
-    (fp_text reference "D9" (at 0 2) (layer "B.SilkS")
+    (fp_text reference "D27" (at 0 2) (layer "B.SilkS")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 6fede0c7-3ac1-42b4-a2ab-46110ebf4cd3)
+      (tstamp de860aae-1bd9-4072-a896-5f9ab1d0e389)
     )
     (fp_text value "1N4148" (at 0 -2.1) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 92a02ee9-a714-4ebe-9d05-30fdd2bfbbb9)
+      (tstamp 0a7af245-e8d8-4a8f-bfcf-84df4032fe28)
     )
     (fp_text user "${REFERENCE}" (at 0 2) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 8b5e91c1-8c9a-43e8-9fa9-156f4327d62c)
+      (tstamp ba6b6956-19ae-4f8b-b43e-050f0381fa33)
     )
     (fp_line (start -2.36 -1) (end 1.65 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp c029f719-2bc3-4032-9c0d-3a97f86e4e76))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp e876e829-6c8b-433c-b3a8-60e38397e7b8))
     (fp_line (start -2.36 1) (end -2.36 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 97d1b27a-5e55-4f42-8204-3add566f2756))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp f7b4ad48-a440-432e-9174-efbdae0a569d))
     (fp_line (start -2.36 1) (end 1.65 1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 856f92fc-608b-4e67-9ca2-db2186b1be7a))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 9b76f5e7-26d2-420f-bbaf-4951c1ccb5e4))
     (fp_line (start -2.35 1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp f53463ec-fbfa-43ad-b2f2-3d5887e36eef))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 6389e76d-65f2-4f8f-a549-4cd24d19037d))
     (fp_line (start -2.35 1.15) (end 2.35 1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 508bc3d8-51e2-487a-91b3-88f7f10b2c1f))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 15149bba-a548-4281-b0c5-54a556e24c96))
     (fp_line (start 2.35 -1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 3d8efd1a-ede9-4871-ba8b-24c770af6b20))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp c1f219e7-83b2-4761-815c-aaf4a5bfa59b))
     (fp_line (start 2.35 1.15) (end 2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 514303ac-5b11-4608-bbd8-47b122a2224f))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp ee975a89-7cb4-434b-bf98-9c44d22d6bf4))
     (fp_line (start -1.4 -0.9) (end -1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 08e40797-b8c5-4e40-8621-e56e70f2654d))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp acf1e84d-4ad7-4355-988c-80c2e16d07bd))
     (fp_line (start -1.4 0.9) (end 1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 9c335219-0999-4b1e-a23a-1416de33c5d8))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 738a2191-6f47-4747-b9ef-ea6cbd4e2c96))
     (fp_line (start -0.75 0) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 6695367a-f288-49aa-9d94-2d099e38bdd0))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 39c02b12-3530-4cd4-b5fa-a64d4ee44e5c))
     (fp_line (start -0.35 0) (end -0.35 -0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 324f8b7b-348c-4d1a-a691-8b06f7fbdd7b))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 89923cad-babd-4e63-be6b-c4249d1430c1))
     (fp_line (start -0.35 0) (end -0.35 0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 596b9b0f-934a-4e4a-9147-053a9ae88441))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 9b12f748-9a48-4c3b-a259-d7754d90792c))
     (fp_line (start -0.35 0) (end 0.25 0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 7aaf7280-8052-473d-8af6-c9777439a54d))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 468fb0ce-99f4-4f12-80d2-71f1aaa8a9b2))
     (fp_line (start 0.25 -0.4) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 14183d9b-cd3e-4f33-abaf-3f41c64b9f8f))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 1957123f-c71f-4cdb-a935-c1327bebbfec))
     (fp_line (start 0.25 0) (end 0.75 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp ceaeeb78-9c59-4c70-8b8e-123d4528efd5))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 3884fde5-eb01-4377-9591-8768b233f61c))
     (fp_line (start 0.25 0.4) (end 0.25 -0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp c89d5b91-d779-4775-8d89-5cc27dcf0377))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 4ba1d225-ed22-4546-9991-33aa06a7a5bc))
     (fp_line (start 1.4 -0.9) (end -1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 3e61780e-0393-487a-8785-ce1c52fa11e6))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 8a450a8d-9c1f-4488-ab0f-08b1b6e9a4ca))
     (fp_line (start 1.4 0.9) (end 1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp e723d86f-28db-4ba0-a310-f6911890fe12))
-    (pad "1" smd roundrect (at -1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 10 "Net-(D9-K)") (pinfunction "K") (pintype "passive") (tstamp 4349f01d-9f5c-4854-9d00-42052a5f72e6))
-    (pad "2" smd roundrect (at 1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 11 "Net-(D10-A)") (pinfunction "A") (pintype "passive") (tstamp b740472e-6308-4486-a938-552c24e0ecd5))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 30807fd7-d9c4-4fb5-ab73-13d075ba35f9))
+    (pad "1" smd roundrect (at -1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 7 "Net-(D25-K)") (pinfunction "K") (pintype "passive") (tstamp 450decc8-49d9-4d06-bf0f-f3af8dd39c73))
+    (pad "2" smd roundrect (at 1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 51 "Net-(D27-A)") (pinfunction "A") (pintype "passive") (tstamp 9fa1295b-2156-4161-8adb-aa8b33de9d6b))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SOD-123.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -7960,8 +8384,8 @@
   )
 
   (footprint "Diode_SMD:D_SOD-123" (layer "B.Cu")
-    (tstamp daf67dbd-c04d-4865-b77a-71b7bb5abf12)
-    (at 255.11125 169.06875 180)
+    (tstamp c102cce0-02a1-49bd-8108-ce8057edb0cc)
+    (at 145.25625 107.15625)
     (descr "SOD-123")
     (tags "SOD-123")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
@@ -7970,60 +8394,60 @@
     (property "Sim.Pins" "1=K 2=A")
     (property "ki_description" "100V 0.15A standard switching diode, DO-35")
     (property "ki_keywords" "diode")
-    (path "/febb8583-7d31-4b2a-8fe5-dacea832e0d7")
+    (path "/cce3e395-07bc-4d33-9e8a-e501d2858cac")
     (attr smd)
-    (fp_text reference "D48" (at 0 2) (layer "B.SilkS")
+    (fp_text reference "D4" (at 0 2) (layer "B.SilkS")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp be003037-17cc-49fd-a6ba-189c6e90ffb6)
+      (tstamp d74a72b7-24b2-49b4-8809-2dc55d2a40ec)
     )
     (fp_text value "1N4148" (at 0 -2.1) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 6e93d008-138a-4bcb-8d98-bc632cca7213)
+      (tstamp 93e6f9ae-6ddc-4bd8-ab2c-dccd913c8b27)
     )
     (fp_text user "${REFERENCE}" (at 0 2) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp fa5cb0a7-d54f-4b7a-912d-cae29f425e54)
+      (tstamp 2dc8196d-03b4-4bda-9103-86fd9a8aad6c)
     )
     (fp_line (start -2.36 -1) (end 1.65 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 8b8bfed7-53e5-45ec-a1fb-e63d4c395ab1))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp e4de2aab-bb42-4f50-be52-4d78b3a8b0d6))
     (fp_line (start -2.36 1) (end -2.36 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 73361cc0-fb51-45da-a95d-9a86c3e3200f))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 04f04b18-ca24-4047-902f-4cefb45172da))
     (fp_line (start -2.36 1) (end 1.65 1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 43976175-3dee-4433-94ad-e50e91a26856))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp acdaf891-e9ea-49a8-8641-4cdbe41c28eb))
     (fp_line (start -2.35 1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 200b40b3-45df-405d-b19b-cbcff359e57f))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp d10e0164-71bb-4a2e-babe-d4afbdbc0876))
     (fp_line (start -2.35 1.15) (end 2.35 1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp ecac5f3a-d4e9-49fc-855b-7a2d02c150ad))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp d1fea953-a3fa-450a-8365-015831a340b3))
     (fp_line (start 2.35 -1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp feb25b74-918d-4a27-8a2c-6e4c7a6b97ca))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 2242ebd9-ad8a-45fc-b0ae-220cbf945bc2))
     (fp_line (start 2.35 1.15) (end 2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp c291c53c-04d7-464a-9322-3bb06fb4e3a5))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 8e28b370-2cfe-48a1-88f5-73f6622bc6d3))
     (fp_line (start -1.4 -0.9) (end -1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 16925e02-fb6e-4341-a252-9882cec5096c))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 3123d66b-1097-4b37-a95f-c19daa293e87))
     (fp_line (start -1.4 0.9) (end 1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 5584e448-ca8b-42cc-a189-f0d0b8edde98))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp a6fae920-96aa-498d-8a11-366b3aa9d7db))
     (fp_line (start -0.75 0) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 91e9b335-0b87-4038-a7b2-192d9d39b73b))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 10b64dba-141e-45a9-aae1-af20ada2655d))
     (fp_line (start -0.35 0) (end -0.35 -0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 8adf208f-0d2c-49fb-9334-3144e7ceab8d))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 894da981-fbb6-4f55-a268-fa945324b720))
     (fp_line (start -0.35 0) (end -0.35 0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 56de5209-ff3b-42ba-889d-0f2a3eab6e94))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 6fab4b1e-17e0-40ab-a833-635dabd3d9bf))
     (fp_line (start -0.35 0) (end 0.25 0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 35e4bdf5-7ae3-452c-b49c-7746242829ac))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 3034c64d-cf0c-4d70-9faf-08708d736ed2))
     (fp_line (start 0.25 -0.4) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 46239fd1-8461-4cfd-8fdb-60997276a11c))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp afe6f305-deb9-43e7-9de4-bccde9abcc7c))
     (fp_line (start 0.25 0) (end 0.75 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 073db4b0-7766-4396-9c8d-5cdecba521e7))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 7f9e657c-9c63-4eaa-bc56-9389d3ae8e93))
     (fp_line (start 0.25 0.4) (end 0.25 -0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp a08fda06-7e77-45e3-9a35-e192b1e4412e))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 16b068df-b170-4c21-9df0-998778d3fa6d))
     (fp_line (start 1.4 -0.9) (end -1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp be3f42fe-ca82-4569-83d2-48cf8015a546))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 59372195-08b0-46ab-b135-d552aef7e211))
     (fp_line (start 1.4 0.9) (end 1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp d421d7e6-3d7d-4ffc-a9ad-154b88b16510))
-    (pad "1" smd roundrect (at -1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 54 "Net-(D48-K)") (pinfunction "K") (pintype "passive") (tstamp a4284f87-d001-47e8-8f8d-483eb4b38900))
-    (pad "2" smd roundrect (at 1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 47 "Net-(D41-A)") (pinfunction "A") (pintype "passive") (tstamp bce64286-0b8f-409f-8160-c36294e68752))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 0af0a9a8-b93c-4992-aee4-cc0d0af62b56))
+    (pad "1" smd roundrect (at -1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 1 "Net-(D1-K)") (pinfunction "K") (pintype "passive") (tstamp afb83965-729c-42fc-8762-7bab40b3df19))
+    (pad "2" smd roundrect (at 1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 31 "Net-(D4-A)") (pinfunction "A") (pintype "passive") (tstamp 6a930ce2-5cb0-41d9-b033-ded4981456f4))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SOD-123.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -8032,8 +8456,8 @@
   )
 
   (footprint "Diode_SMD:D_SOD-123" (layer "B.Cu")
-    (tstamp db6d71a8-9d43-462e-8cd5-2ccb7e6bd052)
-    (at 155.09875 150.01875 180)
+    (tstamp c7c7cdcd-3bce-4afa-b0a0-e84f8f383a12)
+    (at 259.55625 107.15625)
     (descr "SOD-123")
     (tags "SOD-123")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
@@ -8042,60 +8466,60 @@
     (property "Sim.Pins" "1=K 2=A")
     (property "ki_description" "100V 0.15A standard switching diode, DO-35")
     (property "ki_keywords" "diode")
-    (path "/adebafea-3c3f-4aaa-a8d7-1a33fea7f290")
+    (path "/a03da3dd-890f-4bd6-9fd9-86ae1b9e6a51")
     (attr smd)
-    (fp_text reference "D20" (at 0 2) (layer "B.SilkS")
+    (fp_text reference "D38" (at 0 2) (layer "B.SilkS")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp b752ce41-9fae-4b01-aaec-b2e9a0141cad)
+      (tstamp e0b3c102-647c-4a65-b421-577b478ebb0b)
     )
     (fp_text value "1N4148" (at 0 -2.1) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp c92f9695-3e49-4e8c-b520-c24a7da8620e)
+      (tstamp 05f7d341-247d-4d59-9676-55c5942de03a)
     )
     (fp_text user "${REFERENCE}" (at 0 2) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 343c7e59-805a-47dd-8ef3-833926053421)
+      (tstamp 4d55aad2-dbc5-4cb0-a514-fed509f7d62a)
     )
     (fp_line (start -2.36 -1) (end 1.65 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 368194fc-e7d5-44f9-bd56-4258f16c8e01))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 5daf08b3-4d7e-4f3e-8c2c-d72de476fe68))
     (fp_line (start -2.36 1) (end -2.36 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 2869b03b-04ac-4825-9568-cd6e485d34ec))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp c76a39ad-9aaa-463c-a819-3f4224d14153))
     (fp_line (start -2.36 1) (end 1.65 1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 46fba5d8-49d8-4bf9-88f3-b83b870a664e))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 8c84a81b-f7cf-4726-aa60-483f151a73f9))
     (fp_line (start -2.35 1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp e382ad84-04c0-4c34-8794-40b86b29f14d))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 1073d48d-5d29-41e1-ad5a-fbc1fb6b4851))
     (fp_line (start -2.35 1.15) (end 2.35 1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 7c863143-c4a6-49bb-a513-4cbe185b2ad7))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 84ed8370-7d0e-481c-af88-8c4d53782776))
     (fp_line (start 2.35 -1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 5ff11ccd-fc4d-442c-8a29-7dcfea0d53d3))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp bb32d356-e31a-4afd-95d0-5c77abd79803))
     (fp_line (start 2.35 1.15) (end 2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 2e972405-8a48-48ee-abd5-31f162d71791))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 3efa375d-9513-41a9-907f-9429567901d7))
     (fp_line (start -1.4 -0.9) (end -1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 152b7fc4-558b-4640-9b1b-e7545b34e0e9))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 8d6c5c4d-0ed3-4293-b08a-7c3571c01bc4))
     (fp_line (start -1.4 0.9) (end 1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp dc0ee4ed-16ab-4f04-97f5-671783ff35a4))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp c31d4041-3be7-4f65-8925-94409e6fda0e))
     (fp_line (start -0.75 0) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp aa735e14-d1db-4732-b4d2-0a5863b4339f))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 43a87da7-43f1-44a7-9bf0-cf1ec16c8aa3))
     (fp_line (start -0.35 0) (end -0.35 -0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 08c25399-6cb2-4bcf-8dad-c0a78eaa6622))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 35b4f01d-f811-405f-a509-e285c8afce2c))
     (fp_line (start -0.35 0) (end -0.35 0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 2037278c-49b4-400d-a33f-0dcd9186e5ad))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 087add8a-f28b-4db3-a3fc-53596353d71d))
     (fp_line (start -0.35 0) (end 0.25 0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp decfbae3-d737-48a4-bd97-f7ffe2973666))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp a1c99ae3-3d0b-4775-bd38-57f855923598))
     (fp_line (start 0.25 -0.4) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp e769375c-62b5-4572-9fc4-e9b3d90bc70a))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp d628187a-5d26-4e6f-b875-08a41ad66092))
     (fp_line (start 0.25 0) (end 0.75 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 12423227-9d77-44d7-b5d1-6d43a6110a63))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 7576b7d4-68db-488a-8ad7-1b01aa306b8e))
     (fp_line (start 0.25 0.4) (end 0.25 -0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 916be4f1-8ce9-4693-8cbd-0c257aec1e32))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 2325eee6-f6d6-4a66-87a3-2bae08108e3c))
     (fp_line (start 1.4 -0.9) (end -1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp e4b0b9db-8c19-45e0-8eeb-41782e52052d))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp ffb3a98f-76b9-4dfd-80ef-b892e8d959ac))
     (fp_line (start 1.4 0.9) (end 1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp db51a374-8cf5-4c58-bc21-c4f834312ba9))
-    (pad "1" smd roundrect (at -1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 23 "Net-(D20-K)") (pinfunction "K") (pintype "passive") (tstamp db6b7612-2cc3-4300-bf54-485bad4a3ebf))
-    (pad "2" smd roundrect (at 1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 20 "Net-(D17-A)") (pinfunction "A") (pintype "passive") (tstamp c63795da-92d4-4db1-9001-2220d3409ce7))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp ef043872-0ced-4d9e-93ed-da91735555e9))
+    (pad "1" smd roundrect (at -1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 9 "Net-(D32-K)") (pinfunction "K") (pintype "passive") (tstamp a0cd7ce5-41d8-47b9-9704-3e1188c5a50b))
+    (pad "2" smd roundrect (at 1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 61 "Net-(D38-A)") (pinfunction "A") (pintype "passive") (tstamp 0262c439-a8a2-444b-a4b1-701f551ef573))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SOD-123.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -8104,8 +8528,8 @@
   )
 
   (footprint "Diode_SMD:D_SOD-123" (layer "B.Cu")
-    (tstamp e1478110-c9a5-4ce5-88ca-72aaa469e865)
-    (at 162.2425 207.16875 180)
+    (tstamp ce32b376-490d-4515-91b2-d493a921578d)
+    (at 192.88125 126.20625)
     (descr "SOD-123")
     (tags "SOD-123")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
@@ -8114,60 +8538,60 @@
     (property "Sim.Pins" "1=K 2=A")
     (property "ki_description" "100V 0.15A standard switching diode, DO-35")
     (property "ki_keywords" "diode")
-    (path "/38edf39b-e986-48f9-b533-d008d16dda37")
+    (path "/1a014af1-f04c-43cc-91a9-10a0ca2cad83")
     (attr smd)
-    (fp_text reference "D49" (at 0 2) (layer "B.SilkS")
+    (fp_text reference "D14" (at 0 2) (layer "B.SilkS")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp c3a8194d-837e-46ae-a58c-55f29bae8ad9)
+      (tstamp ef3e8339-5fee-40c7-94a4-bf227ccc9759)
     )
     (fp_text value "1N4148" (at 0 -2.1) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp c5028cef-a6a9-42ec-ae70-5e214d5ad065)
+      (tstamp dc69909f-a41e-4602-ab39-5cccd03870a7)
     )
     (fp_text user "${REFERENCE}" (at 0 2) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 06393921-97c5-4c31-ad92-a85d39ec17b4)
+      (tstamp 6927bf98-59f1-4f87-9385-089bad3c1649)
     )
     (fp_line (start -2.36 -1) (end 1.65 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp b083da8d-64be-4d7a-88b8-412db2e3b9a6))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 2667c64b-d278-45e8-9dd0-dc621096d756))
     (fp_line (start -2.36 1) (end -2.36 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 42a231c4-efa0-4bdc-9d63-dda71731b784))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp acc2aabe-aa9f-4856-ba5a-2ee6da7cf964))
     (fp_line (start -2.36 1) (end 1.65 1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 0b508727-b445-4427-a506-c8239d74c168))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp df797cf2-cde2-4ca1-b71b-2bcfbce9af01))
     (fp_line (start -2.35 1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp ec2d4e88-c0b0-48a5-9ee0-c36c21e25794))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 950bcd5e-f8db-443f-ae12-d6e604fc5736))
     (fp_line (start -2.35 1.15) (end 2.35 1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 8259ce51-390b-4fd6-a5d6-1a1b7ad32b60))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 3fcc6183-2d21-483c-8dbb-6c89e38e2dc8))
     (fp_line (start 2.35 -1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 6a4f404c-a750-4af4-8841-2c7fe15d6798))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp ed88fc7c-757e-49ac-835b-375998897342))
     (fp_line (start 2.35 1.15) (end 2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp dc61bab5-a5ce-4115-a6bf-25d50dd564ae))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 966646aa-48ce-426a-adbd-9dc428b9f493))
     (fp_line (start -1.4 -0.9) (end -1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 0ac8077d-6c37-4812-ad79-6c8850590aa3))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 8ef2dfd2-d1e8-43f5-b995-e2b5dae59680))
     (fp_line (start -1.4 0.9) (end 1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 9e66e1dc-c0b6-46c4-ae19-02f9aef58b51))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 1ee1e6a1-f9df-4ce3-972e-e2e2f19bdb63))
     (fp_line (start -0.75 0) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp baff7396-733b-408c-a890-6c79cb8c459d))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp ef38ee6f-1eb6-429f-bf3e-84f881d7875d))
     (fp_line (start -0.35 0) (end -0.35 -0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp b509ce98-f505-494a-bec9-2e94117d0bea))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 74143cad-20a7-445f-9190-3653db711c02))
     (fp_line (start -0.35 0) (end -0.35 0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp dc16f026-e544-4c34-8832-6c84c0c6d3ae))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 1c9704b5-f8d5-4753-bc55-ba4cfe7afd59))
     (fp_line (start -0.35 0) (end 0.25 0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp d818f0e9-0874-42c5-a60a-0899932844c3))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 002ab9cb-b74b-4675-a5ca-3e9fcf901cb9))
     (fp_line (start 0.25 -0.4) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 743f8c93-0f2b-45bc-be6c-192ba05e927c))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 99d05db0-bc6a-4d6e-a0f8-175ca92b3342))
     (fp_line (start 0.25 0) (end 0.75 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 250eff5f-5645-42c2-a010-21431959037b))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp db0d8cc3-6c7f-496a-9632-f7917d02b308))
     (fp_line (start 0.25 0.4) (end 0.25 -0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 4015d93a-cd3e-46a7-88bb-12c13d04aead))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 3e55ac9f-073f-4366-988e-e78f6fad86f2))
     (fp_line (start 1.4 -0.9) (end -1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 9331ab6d-3203-4941-acac-e21853476388))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp d245b30f-4a77-45e7-b812-871f6b541bd1))
     (fp_line (start 1.4 0.9) (end 1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 7a0c1ff8-b965-4321-98b1-174bb3e22ee7))
-    (pad "1" smd roundrect (at -1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 55 "Net-(D49-K)") (pinfunction "K") (pintype "passive") (tstamp 611f0bba-e707-4323-9c71-c0fa4b5a39c8))
-    (pad "2" smd roundrect (at 1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 56 "Net-(D49-A)") (pinfunction "A") (pintype "passive") (tstamp d0999ae8-dc89-4489-a466-fb0a66f2ce09))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp b105c845-be2c-4aa2-908d-390885e3442d))
+    (pad "1" smd roundrect (at -1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 4 "Net-(D10-K)") (pinfunction "K") (pintype "passive") (tstamp 81f2da57-1d87-41d5-aca6-c7fa01ecb811))
+    (pad "2" smd roundrect (at 1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 40 "Net-(D14-A)") (pinfunction "A") (pintype "passive") (tstamp 9a280b7e-b322-4e94-b180-4db09efe6a06))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SOD-123.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -8175,221 +8599,9 @@
     )
   )
 
-  (footprint "Connector_PinSocket_2.54mm:PinSocket_1x08_P2.54mm_Horizontal" (layer "B.Cu")
-    (tstamp e1a50b95-a425-4586-8afe-5b542c4cc53f)
-    (at 261.625 113.4 -90)
-    (descr "Through hole angled socket strip, 1x08, 2.54mm pitch, 8.51mm socket length, single row (from Kicad 4.0.7), script generated")
-    (tags "Through hole angled socket strip THT 1x08 2.54mm single row")
-    (property "Sheetfile" "xantronix-z32.kicad_sch")
-    (property "Sheetname" "")
-    (property "ki_description" "Generic connector, single row, 01x08, script generated")
-    (property "ki_keywords" "connector")
-    (path "/b14e5b38-c5e1-4b26-bec8-ab8bec19e312")
-    (attr through_hole)
-    (fp_text reference "J2" (at -4.38 2.77 90) (layer "B.SilkS")
-        (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 5e6877bd-5ed2-43b1-bc0d-6d589db9dc98)
-    )
-    (fp_text value "Conn_01x08_Socket" (at -4.38 -20.55 90) (layer "B.Fab")
-        (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 66e7cbcd-7db8-46ec-a7e6-1d5f6ec11086)
-    )
-    (fp_text user "${REFERENCE}" (at -5.775 -8.89 -360) (layer "B.Fab")
-        (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp c85de002-8415-4b69-b03e-cd8617a9e969)
-    )
-    (fp_line (start -10.09 -19.11) (end -1.46 -19.11)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp e9001150-1602-4f9a-89a6-c4ee9bcda70c))
-    (fp_line (start -10.09 -16.51) (end -1.46 -16.51)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp ad2a1d77-6a19-49bc-bbfb-2a2f4d2fec15))
-    (fp_line (start -10.09 -13.97) (end -1.46 -13.97)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 95729d45-e86f-40bb-b600-b36ecc170400))
-    (fp_line (start -10.09 -11.43) (end -1.46 -11.43)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 3c69aae8-f4c3-4322-a9fc-8b7053efa4a0))
-    (fp_line (start -10.09 -8.89) (end -1.46 -8.89)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp eb373bbc-4ba4-40c7-93f2-be0d2f036b32))
-    (fp_line (start -10.09 -6.35) (end -1.46 -6.35)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 980bc256-4b68-4eaa-a639-36e800bb2a9d))
-    (fp_line (start -10.09 -3.81) (end -1.46 -3.81)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 95f98fe5-6333-409a-8b73-d1c00dbe0c59))
-    (fp_line (start -10.09 -1.27) (end -1.46 -1.27)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp f59db2e9-2779-4c14-b9a9-f8237bf46169))
-    (fp_line (start -10.09 -1.1519) (end -1.46 -1.1519)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 498fd171-1d15-4ea2-b7e8-c377d8d9d0a7))
-    (fp_line (start -10.09 -1.033805) (end -1.46 -1.033805)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 05767e1c-5172-4595-8374-21e63c39ceff))
-    (fp_line (start -10.09 -0.91571) (end -1.46 -0.91571)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 3a1915f5-eb1e-4adf-85cb-aca16159486a))
-    (fp_line (start -10.09 -0.797615) (end -1.46 -0.797615)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 6118cca2-c92a-4dd3-9a3f-6f4b8b49cf23))
-    (fp_line (start -10.09 -0.67952) (end -1.46 -0.67952)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 0e145d57-53f4-4cf1-b4dc-0884b779a77e))
-    (fp_line (start -10.09 -0.561425) (end -1.46 -0.561425)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp a0611e39-9b60-4682-9637-4fd4db756fdf))
-    (fp_line (start -10.09 -0.44333) (end -1.46 -0.44333)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 0be89327-1fa6-4d3e-8e88-5f7ce085bf0c))
-    (fp_line (start -10.09 -0.325235) (end -1.46 -0.325235)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 45a0dc87-cab8-4950-9125-07b52cd05452))
-    (fp_line (start -10.09 -0.20714) (end -1.46 -0.20714)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 8c358d3a-f224-4932-96a2-7ff60897a9a6))
-    (fp_line (start -10.09 -0.089045) (end -1.46 -0.089045)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 77073f72-8c5e-4c5e-bf92-4d8300f252df))
-    (fp_line (start -10.09 0.02905) (end -1.46 0.02905)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 6e517fff-7c67-4ffa-82f1-7aa034dd44f6))
-    (fp_line (start -10.09 0.147145) (end -1.46 0.147145)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 57a6f9c1-95dd-4b5b-9ab2-99592fb3ffb1))
-    (fp_line (start -10.09 0.26524) (end -1.46 0.26524)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 152838e6-48ea-4e45-8d43-227aca9123fb))
-    (fp_line (start -10.09 0.383335) (end -1.46 0.383335)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 02d15afe-a03b-4f0a-957b-af8ae551993d))
-    (fp_line (start -10.09 0.50143) (end -1.46 0.50143)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp aaff7f1e-4612-466e-af15-707d4eaa6f0a))
-    (fp_line (start -10.09 0.619525) (end -1.46 0.619525)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp a3cdc958-cd8d-469e-aeb4-d2698a32e25c))
-    (fp_line (start -10.09 0.73762) (end -1.46 0.73762)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp c2ccb420-2f97-4519-87e8-a9ab52b1336b))
-    (fp_line (start -10.09 0.855715) (end -1.46 0.855715)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 684ea024-efd8-4d17-9eb8-6428ade63775))
-    (fp_line (start -10.09 0.97381) (end -1.46 0.97381)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp ccae243b-9278-4f2b-9c41-a7582fb7357a))
-    (fp_line (start -10.09 1.091905) (end -1.46 1.091905)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp b7f7d9e7-32ad-4d53-b9c7-aba9adf02e99))
-    (fp_line (start -10.09 1.21) (end -1.46 1.21)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp f0f062c1-5f86-4e84-92f0-dba72ec78604))
-    (fp_line (start -10.09 1.33) (end -10.09 -19.11)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 58a376a8-7c3f-419f-b35e-96bd7d26d052))
-    (fp_line (start -10.09 1.33) (end -1.46 1.33)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp e2327518-8428-4d25-b177-19483a465600))
-    (fp_line (start -1.46 -18.14) (end -1.05 -18.14)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 72659149-b2eb-45b7-9b4a-6cc54c1021a6))
-    (fp_line (start -1.46 -17.42) (end -1.05 -17.42)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 18a099b9-8f00-4a5c-ae93-771569eb518b))
-    (fp_line (start -1.46 -15.6) (end -1.05 -15.6)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 7d8aed10-d3aa-4838-a053-adf7d2d30983))
-    (fp_line (start -1.46 -14.88) (end -1.05 -14.88)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 84e8e218-7366-4f32-b3d4-5aceffd2113a))
-    (fp_line (start -1.46 -13.06) (end -1.05 -13.06)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp f54b8934-74a4-4b52-8ad7-494fddda3f25))
-    (fp_line (start -1.46 -12.34) (end -1.05 -12.34)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp b190df31-ded9-4f38-a3c0-fca890e49ae6))
-    (fp_line (start -1.46 -10.52) (end -1.05 -10.52)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 69d03d91-b097-4920-9e46-30ed134ac6f3))
-    (fp_line (start -1.46 -9.8) (end -1.05 -9.8)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp b73e0d9f-f777-4dff-8b41-d8ca8317bcf2))
-    (fp_line (start -1.46 -7.98) (end -1.05 -7.98)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 0b59d9fa-1df2-4774-a0c7-18356574ddd8))
-    (fp_line (start -1.46 -7.26) (end -1.05 -7.26)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp e7ce745b-3311-48db-92b7-9b7d1fa6d7e6))
-    (fp_line (start -1.46 -5.44) (end -1.05 -5.44)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 6e7cb01c-6d3a-4e79-9567-844b10b69dd4))
-    (fp_line (start -1.46 -4.72) (end -1.05 -4.72)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 08579352-f609-4253-9994-7c9e1acce2b2))
-    (fp_line (start -1.46 -2.9) (end -1.05 -2.9)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp c0ef7dd5-5f87-422b-8103-365ad3aeb46d))
-    (fp_line (start -1.46 -2.18) (end -1.05 -2.18)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 5c72202b-1720-4036-bb39-110e281b3fb1))
-    (fp_line (start -1.46 -0.36) (end -1.11 -0.36)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 9e08d5e8-ac5f-4f47-a2d4-02feb7e44f10))
-    (fp_line (start -1.46 0.36) (end -1.11 0.36)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp a40a9bfd-ac8a-4c5e-a8ba-077a4afe1fa6))
-    (fp_line (start -1.46 1.33) (end -1.46 -19.11)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 98097d6e-5b4c-4f60-8699-0602d202ad45))
-    (fp_line (start 0 1.33) (end 1.11 1.33)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 828c7011-2786-447e-bd0c-446a3fcedc68))
-    (fp_line (start 1.11 1.33) (end 1.11 0)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 7a559c29-038b-42a8-9c71-4b0a87ac6706))
-    (fp_line (start -10.55 -19.55) (end 1.75 -19.55)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp a13fc02d-b4f0-44cf-89de-717ff0a869d9))
-    (fp_line (start -10.55 1.8) (end -10.55 -19.55)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 1a3640f8-0de9-4378-bc0f-ea29173ba728))
-    (fp_line (start 1.75 -19.55) (end 1.75 1.8)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 5dcb9660-08de-4bde-997b-81b264726194))
-    (fp_line (start 1.75 1.8) (end -10.55 1.8)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 3eb8b4dd-153e-4d10-b8be-9b1d5c58bf41))
-    (fp_line (start -10.03 -19.05) (end -10.03 1.27)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp b67c11d6-bb6d-4fcf-8b56-cb7283a552b2))
-    (fp_line (start -10.03 1.27) (end -2.49 1.27)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 53674988-5446-436a-9c0c-e03947c2e549))
-    (fp_line (start -2.49 1.27) (end -1.52 0.3)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp f4d46f02-94fc-4545-818b-af594eb8d37b))
-    (fp_line (start -1.52 -19.05) (end -10.03 -19.05)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp f869bde5-52bb-4be1-9a2f-f8e1eb1f692e))
-    (fp_line (start -1.52 -18.08) (end 0 -18.08)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 9cecba79-fe9c-4c83-9d66-49f9e11e2d58))
-    (fp_line (start -1.52 -15.54) (end 0 -15.54)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp d2e328b2-93a3-4d09-9490-203540723d36))
-    (fp_line (start -1.52 -13) (end 0 -13)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 42a84629-7c8e-4b0b-84d2-ad1d3a0483ec))
-    (fp_line (start -1.52 -10.46) (end 0 -10.46)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 18ed2eae-3edf-40c2-a8d9-f68f61343bc0))
-    (fp_line (start -1.52 -7.92) (end 0 -7.92)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp bc79264a-d390-428e-b1d6-5302637e4c61))
-    (fp_line (start -1.52 -5.38) (end 0 -5.38)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp f479976a-7cd3-40de-a9f7-2634f0b363c0))
-    (fp_line (start -1.52 -2.84) (end 0 -2.84)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 546482d5-c1c5-4862-8401-e09bad97032c))
-    (fp_line (start -1.52 -0.3) (end 0 -0.3)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 85786281-d7ee-4b65-b767-b6049b076133))
-    (fp_line (start -1.52 0.3) (end -1.52 -19.05)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 15b66caf-ab5b-41c8-8e05-3fb26143beac))
-    (fp_line (start 0 -18.08) (end 0 -17.48)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 7f0593a0-68d9-466f-8be9-180ef7c7b8e3))
-    (fp_line (start 0 -17.48) (end -1.52 -17.48)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp eeb80379-bf1e-46e8-bed0-606426883eba))
-    (fp_line (start 0 -15.54) (end 0 -14.94)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 3aa360c9-09a7-4b8c-b62e-2d73938660b2))
-    (fp_line (start 0 -14.94) (end -1.52 -14.94)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 48784ba6-035a-4003-a26c-c13e97f501b5))
-    (fp_line (start 0 -13) (end 0 -12.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 4f118885-9b00-4ac6-903d-236bd099406d))
-    (fp_line (start 0 -12.4) (end -1.52 -12.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 6bdf1b1a-5518-44a0-b15d-3dc58071b349))
-    (fp_line (start 0 -10.46) (end 0 -9.86)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 230dee3e-1597-47cf-9a28-f424477b95a3))
-    (fp_line (start 0 -9.86) (end -1.52 -9.86)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 531d7fc3-f3c1-4873-a902-80010195e0af))
-    (fp_line (start 0 -7.92) (end 0 -7.32)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp d9f85d18-6983-4a4c-be2e-be22f73738c4))
-    (fp_line (start 0 -7.32) (end -1.52 -7.32)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 376c3114-0db1-44e7-a1d4-367cf2e585c8))
-    (fp_line (start 0 -5.38) (end 0 -4.78)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 0a42bf6e-6b3b-43c6-ac63-b27a8cd9da93))
-    (fp_line (start 0 -4.78) (end -1.52 -4.78)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 8c1874f5-9110-4806-b99b-4e5a2f83c337))
-    (fp_line (start 0 -2.84) (end 0 -2.24)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp ff3307d0-f214-4f09-afee-89086f2d2591))
-    (fp_line (start 0 -2.24) (end -1.52 -2.24)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp bbbe5253-e304-45b4-aff0-91a2f229268a))
-    (fp_line (start 0 -0.3) (end 0 0.3)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 3a9db876-e74e-4002-a170-c800a3fc9c57))
-    (fp_line (start 0 0.3) (end -1.52 0.3)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp e19465a0-c5d8-4ade-9e40-089744073f2a))
-    (pad "1" thru_hole rect (at 0 0 270) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 71 "Net-(J2-Pin_1)") (pinfunction "Pin_1") (pintype "passive") (tstamp cb4762e3-b7b2-45f9-bf24-1ac4cc0952ea))
-    (pad "2" thru_hole oval (at 0 -2.54 270) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 72 "Net-(J2-Pin_2)") (pinfunction "Pin_2") (pintype "passive") (tstamp 8dc388bf-1db1-456c-a25c-e32849270467))
-    (pad "3" thru_hole oval (at 0 -5.08 270) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 73 "Net-(J2-Pin_3)") (pinfunction "Pin_3") (pintype "passive") (tstamp bdbe81d7-a25e-4172-adbb-d2983c345838))
-    (pad "4" thru_hole oval (at 0 -7.62 270) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 74 "Net-(J2-Pin_4)") (pinfunction "Pin_4") (pintype "passive") (tstamp 71e1bbef-05af-4b38-8bc4-4eac21e7b059))
-    (pad "5" thru_hole oval (at 0 -10.16 270) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 75 "Net-(J2-Pin_5)") (pinfunction "Pin_5") (pintype "passive") (tstamp 0a723774-b88a-400f-afb3-c21fc75744aa))
-    (pad "6" thru_hole oval (at 0 -12.7 270) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 76 "Net-(J2-Pin_6)") (pinfunction "Pin_6") (pintype "passive") (tstamp 14e32890-99e5-48ea-91c6-4b9dc055f623))
-    (pad "7" thru_hole oval (at 0 -15.24 270) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 77 "Net-(J2-Pin_7)") (pinfunction "Pin_7") (pintype "passive") (tstamp aa939ab6-1a9a-4b1b-9351-c5e69adc5609))
-    (pad "8" thru_hole oval (at 0 -17.78 270) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 78 "Net-(J2-Pin_8)") (pinfunction "Pin_8") (pintype "passive") (tstamp 133a38cf-d1f4-4ac6-a7ed-f8815e5b1041))
-    (model "${KICAD6_3DMODEL_DIR}/Connector_PinSocket_2.54mm.3dshapes/PinSocket_1x08_P2.54mm_Horizontal.wrl"
-      (offset (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
   (footprint "Diode_SMD:D_SOD-123" (layer "B.Cu")
-    (tstamp e31ef5ff-c071-466b-8bff-df1d13d8a44b)
-    (at 312.26125 169.06875 180)
+    (tstamp d95a7492-bc50-448d-970c-c940719f1996)
+    (at 273.84375 145.25625)
     (descr "SOD-123")
     (tags "SOD-123")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
@@ -8398,60 +8610,60 @@
     (property "Sim.Pins" "1=K 2=A")
     (property "ki_description" "100V 0.15A standard switching diode, DO-35")
     (property "ki_keywords" "diode")
-    (path "/158ed329-1c3f-4644-aabe-86ea833761aa")
+    (path "/c2bb8cfc-5bf2-401a-9935-47aaa6519d17")
     (attr smd)
-    (fp_text reference "D45" (at 0 2) (layer "B.SilkS")
+    (fp_text reference "D54" (at 0 2) (layer "B.SilkS")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 1a11fd41-0565-420d-aac4-e187edfdfc44)
+      (tstamp 1006f9ea-2d93-47cd-8f60-0b8193a77662)
     )
     (fp_text value "1N4148" (at 0 -2.1) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp b3c84bb1-85c4-4c8b-88dd-32ed4add7d40)
+      (tstamp 35191cbe-bb22-4987-a82a-b5b3f431c36f)
     )
     (fp_text user "${REFERENCE}" (at 0 2) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 086e7207-4ad1-492c-8909-e23c46010fe1)
+      (tstamp 9717499d-3cc0-4a19-8592-1eeb1ccd85e2)
     )
     (fp_line (start -2.36 -1) (end 1.65 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 17b1b17a-fdbf-4dbe-b282-1abd4ce541b8))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp d45d7eee-cfe0-4c20-a320-247f348ec689))
     (fp_line (start -2.36 1) (end -2.36 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 5fd02b69-8ab7-4317-84d6-d88d3f65d22d))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp d4d724ff-ea4a-4937-94b4-a46a30b0e943))
     (fp_line (start -2.36 1) (end 1.65 1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 377e219f-e47c-4dd4-b659-f2b19f8d1a96))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp ada1961c-c5ee-4ded-bdca-8c99c9709de5))
     (fp_line (start -2.35 1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 426e84c6-a12d-4c7e-a880-c3df8120e66d))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp e8477fcf-de2b-443a-8c3b-55141aa8c803))
     (fp_line (start -2.35 1.15) (end 2.35 1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp ee132284-3074-48c4-bcc2-38ec7399915f))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp fa4a9e91-2bb7-4974-9f4c-dabfbad37137))
     (fp_line (start 2.35 -1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 7baa341f-db1c-402d-b6a9-9eaafa17651a))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 822ed81a-2e6c-4695-a8e3-97beab4247c3))
     (fp_line (start 2.35 1.15) (end 2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp f5fa5514-23a2-4344-a787-d9cfc5a77e1c))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp a3e4eec0-b950-42ab-bf88-632e22a8a713))
     (fp_line (start -1.4 -0.9) (end -1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 9a8340f2-b2c9-4a10-a01c-5863a9d6d66b))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 89774480-0223-4fe8-a614-b071376343ff))
     (fp_line (start -1.4 0.9) (end 1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 56ef9344-8aa8-4174-bdcb-bfc8919b58c9))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 951a933e-5cfe-449e-9a58-cc3e5a6df1b5))
     (fp_line (start -0.75 0) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 9c2a6888-21e3-43c5-aa7b-1c72e11ba6b9))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp e9d5c81c-cfcf-4c8e-a1f4-86c96010db4a))
     (fp_line (start -0.35 0) (end -0.35 -0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 99080b85-0848-484a-af32-8599a238b1ad))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 21e5271e-def3-4773-ab4a-061fb570651c))
     (fp_line (start -0.35 0) (end -0.35 0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp fbcb8ca3-8d3f-447b-a934-32f1f311a4a1))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 39ee21b9-9c76-4e7e-9902-5ca1bb43ebad))
     (fp_line (start -0.35 0) (end 0.25 0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 33c0018f-3e6b-4ca4-b2bb-a69994d295dd))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp fd2e24a9-cb59-4d3d-bcd6-e679901397aa))
     (fp_line (start 0.25 -0.4) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp f6c30111-cf52-405b-955d-79e39590c6b4))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 7997382a-2c68-4de9-ae4a-80ed549870ec))
     (fp_line (start 0.25 0) (end 0.75 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 45b965e8-9831-4e5c-aa70-cdfbc5301485))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp c121839c-c7bf-4048-b371-59f5eeed9276))
     (fp_line (start 0.25 0.4) (end 0.25 -0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp a3d8b7b2-b05d-4748-89db-367c609d5021))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 2b5f3592-cced-4878-b7a3-60470342a24e))
     (fp_line (start 1.4 -0.9) (end -1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 6eb83f0d-85d0-4859-a3c4-7bf4ce02ca2c))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 91ef182f-7048-4e24-abad-0221121c4a61))
     (fp_line (start 1.4 0.9) (end 1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 3f39fed4-449f-4925-9f23-c6368df5f187))
-    (pad "1" smd roundrect (at -1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 51 "Net-(D45-K)") (pinfunction "K") (pintype "passive") (tstamp 56808271-4373-4026-a3e8-62726e4177c5))
-    (pad "2" smd roundrect (at 1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 47 "Net-(D41-A)") (pinfunction "A") (pintype "passive") (tstamp b049b287-8bbf-4af0-9c77-65bd441a5812))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 708694e7-9854-4b0a-a3cb-9f4f929dd04b))
+    (pad "1" smd roundrect (at -1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 13 "Net-(D48-K)") (pinfunction "K") (pintype "passive") (tstamp aaa3d46f-0e9e-4a72-9187-996f233a4c35))
+    (pad "2" smd roundrect (at 1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 75 "Net-(D54-A)") (pinfunction "A") (pintype "passive") (tstamp 3446dc25-ea71-4d3f-aee8-22cb947c20a3))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SOD-123.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -8460,8 +8672,8 @@
   )
 
   (footprint "Diode_SMD:D_SOD-123" (layer "B.Cu")
-    (tstamp e46e57cb-88c3-4beb-adc4-66946b529bda)
-    (at 355.12375 130.96875 180)
+    (tstamp de32e7c2-5390-41d4-8683-b0f37c98cce5)
+    (at 311.94375 145.25625)
     (descr "SOD-123")
     (tags "SOD-123")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
@@ -8470,60 +8682,60 @@
     (property "Sim.Pins" "1=K 2=A")
     (property "ki_description" "100V 0.15A standard switching diode, DO-35")
     (property "ki_keywords" "diode")
-    (path "/68d9086a-766b-4add-aa8e-90a36ca77802")
+    (path "/a67775d6-390c-46f4-909d-d84b4ef25c24")
     (attr smd)
-    (fp_text reference "D10" (at 0 2) (layer "B.SilkS")
+    (fp_text reference "D52" (at 0 2) (layer "B.SilkS")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp ef35d6b5-dce7-458e-a8ed-2edb1a657d0e)
+      (tstamp 9072ce8e-6464-4b1b-b681-6840de523edc)
     )
     (fp_text value "1N4148" (at 0 -2.1) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 2614be2f-23de-4a45-96ac-5f8f0ded40a8)
+      (tstamp f1293c79-88ea-40bc-8c5e-b263ee267a6a)
     )
     (fp_text user "${REFERENCE}" (at 0 2) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp f2be1610-9653-42b4-85a6-bce6e0e3c7ac)
+      (tstamp de6801e8-a5ce-4e10-86df-0d9b1d3c654c)
     )
     (fp_line (start -2.36 -1) (end 1.65 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 67a9e860-67ed-4710-a519-56b6bdcf4e4a))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 5b910007-ff06-4920-b042-09a83d82063d))
     (fp_line (start -2.36 1) (end -2.36 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp dd51fbd4-fee9-4c01-b104-4dddd1a32674))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 81e31b2a-fb75-4ada-8ef2-3a4a4ceb66d5))
     (fp_line (start -2.36 1) (end 1.65 1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 63cb8064-03b5-442b-bc7b-7457a66d64fb))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 8eb2c405-d1d1-40cd-abe7-bd2ee2587454))
     (fp_line (start -2.35 1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 9173ec92-18ab-49b8-9727-9300f8528ade))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp e7673211-f76d-4994-a8f8-ffb25c4328bb))
     (fp_line (start -2.35 1.15) (end 2.35 1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 7693648a-66e7-4d78-adb5-3f7e2e42314f))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp de0fef8f-2185-44ca-9fcf-28cc03e421a5))
     (fp_line (start 2.35 -1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 2fc8c147-a56a-4e77-9db8-df37cf604514))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp fdedef67-9fc3-4402-b823-cb3f5b748adc))
     (fp_line (start 2.35 1.15) (end 2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp a68d3da3-d675-43f3-9078-c257d375a32f))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp d8b0635f-37ae-4229-9141-389845b6fb9e))
     (fp_line (start -1.4 -0.9) (end -1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 68be981b-973d-4bed-af82-b4930054282c))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 9a6c9566-cc11-4293-8aec-983b19982e8a))
     (fp_line (start -1.4 0.9) (end 1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 2d0b81f6-f47b-4966-a947-c8adfa913969))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp d24e6428-00bc-4ec1-8530-c3d9fb6cac4a))
     (fp_line (start -0.75 0) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 66a3a852-054f-4a91-97ae-1782f66ad73e))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 32f28715-92f6-436e-a335-2cf7b52c4bfb))
     (fp_line (start -0.35 0) (end -0.35 -0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp a19d0269-bbc3-4a34-bcea-bcde59e83ffb))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 6f27d6ac-2749-4bd1-ad9f-993c9003b569))
     (fp_line (start -0.35 0) (end -0.35 0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp e81a9893-7364-47f0-89fa-205ea7c95ff1))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp bb013b54-c374-4320-92f3-4d69f33b0b1f))
     (fp_line (start -0.35 0) (end 0.25 0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp d6b64132-7a8c-4acc-b6fc-c56f3a105d22))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 138c8406-6d91-4515-8511-67558e010030))
     (fp_line (start 0.25 -0.4) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 52c81b67-fb04-42f2-9539-429a750fc6f9))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 53519750-849e-49b0-8de0-a819569b3a64))
     (fp_line (start 0.25 0) (end 0.75 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp eb41a104-89d8-41a4-be8f-bef6ea6956c3))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 30e1c192-2094-4798-b08b-496fe57b917b))
     (fp_line (start 0.25 0.4) (end 0.25 -0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp eb5222cd-06e5-4629-8db4-ab4c701715ec))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp a6479cba-b977-4ef7-bd5b-c38385e15b00))
     (fp_line (start 1.4 -0.9) (end -1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 4fb8c9fd-0daa-4a0e-a069-edded26e0320))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 5fc8b0d1-5be9-4df0-83c9-856c99e8fe18))
     (fp_line (start 1.4 0.9) (end 1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp f9eaed9c-7fd6-4348-ae7f-a57de270b0c4))
-    (pad "1" smd roundrect (at -1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 12 "Net-(D10-K)") (pinfunction "K") (pintype "passive") (tstamp 154b73e7-0a66-4ca2-91a0-0e78b499dc96))
-    (pad "2" smd roundrect (at 1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 11 "Net-(D10-A)") (pinfunction "A") (pintype "passive") (tstamp 953be65c-1bf6-4435-942b-36b6732508a0))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp e954a237-7c22-4dce-b1e7-74a0223e02f2))
+    (pad "1" smd roundrect (at -1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 13 "Net-(D48-K)") (pinfunction "K") (pintype "passive") (tstamp 32a3e6c3-fa40-4f82-8a03-ebde9ceea658))
+    (pad "2" smd roundrect (at 1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 73 "Net-(D52-A)") (pinfunction "A") (pintype "passive") (tstamp 2c15e99a-ce57-4514-89d7-1b6dc7d50326))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SOD-123.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -8532,8 +8744,8 @@
   )
 
   (footprint "Diode_SMD:D_SOD-123" (layer "B.Cu")
-    (tstamp e874e62a-8a28-4dd0-96e9-9797ca0766e2)
-    (at 326.54875 150.01875 180)
+    (tstamp e3ad5ab9-bb59-4b40-a18b-d966388a2c9a)
+    (at 297.65625 107.15625)
     (descr "SOD-123")
     (tags "SOD-123")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
@@ -8542,60 +8754,60 @@
     (property "Sim.Pins" "1=K 2=A")
     (property "ki_description" "100V 0.15A standard switching diode, DO-35")
     (property "ki_keywords" "diode")
-    (path "/df18a2d3-928e-445b-ae26-26fa7a5b3ee0")
+    (path "/4978438d-42b2-4ecb-a223-df7cadd81ee6")
     (attr smd)
-    (fp_text reference "D28" (at 0 2) (layer "B.SilkS")
+    (fp_text reference "D36" (at 0 2) (layer "B.SilkS")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp a320bdad-06ab-458c-8bc2-2bd8b5aa9b13)
+      (tstamp 7fb289ac-9cee-4569-b2b7-91af192a87c8)
     )
     (fp_text value "1N4148" (at 0 -2.1) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp ce8c9167-6b7a-4b9a-a5a3-9e6546b19a18)
+      (tstamp 425e38d3-6187-40f0-9aac-45562c8475d4)
     )
     (fp_text user "${REFERENCE}" (at 0 2) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 8b83c0b7-cd84-4e51-9f62-055083f511f5)
+      (tstamp d7f7d8ba-ad4e-4696-99bc-4d4d444bc00f)
     )
     (fp_line (start -2.36 -1) (end 1.65 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 6ccc92cd-2ed3-47be-8963-9853e6d53256))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 66bb0ec3-e009-4435-84ee-3cf00508ad54))
     (fp_line (start -2.36 1) (end -2.36 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 8813435e-30ca-4796-8fa5-bb29bb4f3959))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 349291e0-01a2-45a2-828a-02f0a7ef115a))
     (fp_line (start -2.36 1) (end 1.65 1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 40b7cb20-f343-4a1b-a10d-18a53d3d0a56))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 8fa47558-b10f-4a70-8811-7c0f1cfc229b))
     (fp_line (start -2.35 1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp bb7f465f-bcde-4580-b1b1-478489260a6d))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp da22b819-fcf2-4f00-9523-4c1642ff1099))
     (fp_line (start -2.35 1.15) (end 2.35 1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp b98007b9-c4e9-4b91-9329-af00ce31f4c5))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp d5bbe28b-90b0-4232-90c1-a0e78cafe0dd))
     (fp_line (start 2.35 -1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 9bcad38b-c055-45e3-b11b-77a4422b55cb))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp f072acbc-dcd8-4f47-ab81-e33f6b9b4904))
     (fp_line (start 2.35 1.15) (end 2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 05aa419b-e73b-4184-b05d-325998171925))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 2c66aaa2-0ce1-4866-95f2-e15619dcca86))
     (fp_line (start -1.4 -0.9) (end -1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 4f1569be-c780-4180-961f-204ec3c58520))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 410ceb41-2931-4eae-bc93-fcc17b2c04b8))
     (fp_line (start -1.4 0.9) (end 1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 6447e2a7-b09d-49c6-ad12-d4c45ec4676f))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 7c8cd45a-8d5e-4eee-8b33-fc0fdfdda6aa))
     (fp_line (start -0.75 0) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 4d09e4b7-cb5e-4a5d-874f-6109cb832fba))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 3f00da7f-da4d-4465-8e89-435b9bd766b5))
     (fp_line (start -0.35 0) (end -0.35 -0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 8528bf34-5598-4cc8-9f28-ef3898b1651b))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp d9fce650-4995-496d-842d-50574174b19b))
     (fp_line (start -0.35 0) (end -0.35 0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 8d28a8bf-c39e-4eb1-b91b-da7880554f88))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 995f9920-7dbb-4f27-9239-8b788bdb3061))
     (fp_line (start -0.35 0) (end 0.25 0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 590474fb-bc6d-4a8a-8a89-7c09cca1cd74))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp d51dcc4a-104c-4b5c-addf-d184661a8cda))
     (fp_line (start 0.25 -0.4) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 2771ef59-f847-4089-b938-098f3766c4ce))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp e88b3b85-d076-49fc-833b-4378116fd329))
     (fp_line (start 0.25 0) (end 0.75 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp f1a63083-9bf0-4e12-b1f1-b8a53b9963a1))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp fb4df8f6-c05a-405d-b6f1-a292014a9765))
     (fp_line (start 0.25 0.4) (end 0.25 -0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 32a017c4-2c3c-4960-8ba6-6c162685bbcc))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp c03090af-4c87-432e-b828-ad7f1d5a2e2f))
     (fp_line (start 1.4 -0.9) (end -1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 92095803-8f04-4103-9139-de56f957afcd))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 3752fc18-139b-4c9f-afab-1a0b5b3080a6))
     (fp_line (start 1.4 0.9) (end 1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 0395593c-cc8b-4345-a3b7-82ebc3ef4f85))
-    (pad "1" smd roundrect (at -1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 32 "Net-(D28-K)") (pinfunction "K") (pintype "passive") (tstamp af14a7b2-47fd-454e-834c-c73a2443de0f))
-    (pad "2" smd roundrect (at 1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 29 "Net-(D25-A)") (pinfunction "A") (pintype "passive") (tstamp a6470529-1fa2-4382-b734-35d397bbeba3))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 97f1b657-01b7-4422-be26-217f1b54375f))
+    (pad "1" smd roundrect (at -1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 9 "Net-(D32-K)") (pinfunction "K") (pintype "passive") (tstamp da22e85e-658c-4302-ba3c-81a35e534b0e))
+    (pad "2" smd roundrect (at 1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 59 "Net-(D36-A)") (pinfunction "A") (pintype "passive") (tstamp 6b21a1ae-62eb-4899-98ba-9c4583fb453d))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SOD-123.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -8604,8 +8816,8 @@
   )
 
   (footprint "Diode_SMD:D_SOD-123" (layer "B.Cu")
-    (tstamp e8895502-f259-43e1-99b8-c5fcf4316d94)
-    (at 250.34875 150.01875 180)
+    (tstamp e604683d-de74-4b73-ae56-fbf979989e0f)
+    (at 278.60625 183.35625)
     (descr "SOD-123")
     (tags "SOD-123")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
@@ -8614,60 +8826,60 @@
     (property "Sim.Pins" "1=K 2=A")
     (property "ki_description" "100V 0.15A standard switching diode, DO-35")
     (property "ki_keywords" "diode")
-    (path "/8ce008a2-8b21-4720-81f1-f5a92bf532ae")
+    (path "/c52a8c28-511a-4533-822a-a7d6a29a1f36")
     (attr smd)
-    (fp_text reference "D32" (at 0 2) (layer "B.SilkS")
+    (fp_text reference "D59" (at 0 2) (layer "B.SilkS")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp aed2bd82-786f-46a3-81b9-d583a6f6da0c)
+      (tstamp 5ff1a67d-2d09-47c8-af13-cb21dca92bcc)
     )
     (fp_text value "1N4148" (at 0 -2.1) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 2d913db0-f38c-4db6-8107-767d6e04a7cc)
+      (tstamp c6186d51-4750-4ca8-8fd5-aee5c9b00514)
     )
     (fp_text user "${REFERENCE}" (at 0 2) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 66d0c1c5-fedc-4c54-9e94-93ce852243ae)
+      (tstamp 95a63e81-1d77-4eee-9b06-b457538b3885)
     )
     (fp_line (start -2.36 -1) (end 1.65 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 2d30b2af-e773-4ab9-8f68-e8f4564eb177))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 0d90dbc7-18a6-4577-8522-732e89e2479e))
     (fp_line (start -2.36 1) (end -2.36 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp a7fae8ba-3629-44dd-8fa8-3b6e1e853a14))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp e09d49f3-3290-4c99-ba38-50b8ec5ccf4a))
     (fp_line (start -2.36 1) (end 1.65 1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp c1c25656-0d68-4bbe-af52-63ae0cd14211))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 0ab4e08a-7ebf-4499-a5f6-3e994b298edc))
     (fp_line (start -2.35 1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 96bec975-a337-422a-9aa6-8fa3c72e0989))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp df4a592c-50f3-4835-8437-1910e68e8a06))
     (fp_line (start -2.35 1.15) (end 2.35 1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp e52057f5-1854-402e-a83e-6213b4d0352c))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 60fee2be-331e-4430-99c4-3ca25a0ea9d7))
     (fp_line (start 2.35 -1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 8fa944c8-3a95-4e95-ad05-c1713987b1bc))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 22c74081-1c2f-44aa-b224-4b8b5f4e866c))
     (fp_line (start 2.35 1.15) (end 2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 39c10d66-0136-4cd8-94a2-347b8165bcb1))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 566f88f5-f4a6-4ef6-bf94-ed658ec30e13))
     (fp_line (start -1.4 -0.9) (end -1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp ec3c5362-9a45-4f64-9534-f2cb442be21e))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 7701a957-f54a-4983-b69b-4d0df12f9a73))
     (fp_line (start -1.4 0.9) (end 1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 7d5a11f7-7769-421b-8c2d-82f6d8026fe3))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 703714f4-1b9a-419e-92d6-34e71cc40cf0))
     (fp_line (start -0.75 0) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 57eb8e82-3265-43f2-8d0a-a38bb3f98fe5))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp ff624023-a68b-454d-951c-a1a7fd7f25ae))
     (fp_line (start -0.35 0) (end -0.35 -0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 47a7b97a-95a3-47f3-b97d-a3601e92369d))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 484adccd-141c-478c-9e3d-5e07e5cc9aba))
     (fp_line (start -0.35 0) (end -0.35 0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp e8469287-19d8-4a6f-a0a6-7e8915955eec))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 32aa2922-f95b-447d-bfaf-107db39e03c7))
     (fp_line (start -0.35 0) (end 0.25 0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 3c7f040b-af3a-4470-9851-ab79f6940ead))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 8ec17983-4058-4f9d-b2a4-b9b27167fe71))
     (fp_line (start 0.25 -0.4) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 1b0ca1e2-586e-4c3d-9ffd-fb9765bd63b0))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp bb3b0228-b104-465e-bb16-eb1ea1c25b0e))
     (fp_line (start 0.25 0) (end 0.75 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp ad2aae0b-0e1e-4171-beba-e522149875aa))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 2aa2033f-d32a-44be-be71-17648513072c))
     (fp_line (start 0.25 0.4) (end 0.25 -0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp e647dbfa-f80a-480b-bf3c-46c5720a2e0b))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 6bb0bdd8-35d7-4f5e-9d0c-f691a6b7f067))
     (fp_line (start 1.4 -0.9) (end -1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 8420ca6c-d080-420c-ac5b-eabc1b88e835))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp aa9634bd-5e83-4861-955f-81b0d69b7719))
     (fp_line (start 1.4 0.9) (end 1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 172cb2c6-4dd1-4e92-9456-e48e1452a1c5))
-    (pad "1" smd roundrect (at -1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 36 "Net-(D32-K)") (pinfunction "K") (pintype "passive") (tstamp 7c829106-e19c-4d02-ac66-a56f78dbe8a3))
-    (pad "2" smd roundrect (at 1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 29 "Net-(D25-A)") (pinfunction "A") (pintype "passive") (tstamp 517865e1-1638-4383-9bc1-8a0ba1b36fc8))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 2857ba88-f133-447e-a3b9-a0c73632a76d))
+    (pad "1" smd roundrect (at -1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 15 "Net-(D56-K)") (pinfunction "K") (pintype "passive") (tstamp a0387f62-2cc4-4161-8c21-020dee7476f9))
+    (pad "2" smd roundrect (at 1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 79 "Net-(D59-A)") (pinfunction "A") (pintype "passive") (tstamp 84d2ed07-deac-4b9c-b807-e6a1873ab715))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SOD-123.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -8676,8 +8888,8 @@
   )
 
   (footprint "Diode_SMD:D_SOD-123" (layer "B.Cu")
-    (tstamp eb70c167-acd1-454a-9d29-61c8b1511cfc)
-    (at 188.43625 188.11875 180)
+    (tstamp e71b324f-d76d-4f64-83a5-da1f87da4bdf)
+    (at 292.89375 145.25625)
     (descr "SOD-123")
     (tags "SOD-123")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
@@ -8686,60 +8898,60 @@
     (property "Sim.Pins" "1=K 2=A")
     (property "ki_description" "100V 0.15A standard switching diode, DO-35")
     (property "ki_keywords" "diode")
-    (path "/7f2cec7e-c470-475d-80ec-d1ae4520cec3")
+    (path "/677e938f-b76a-49b6-8377-50a1b2d8898e")
     (attr smd)
-    (fp_text reference "D51" (at 0 2) (layer "B.SilkS")
+    (fp_text reference "D53" (at 0 2) (layer "B.SilkS")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp efd29141-6569-4494-825d-d9596b0f71e3)
+      (tstamp 0260ea01-c722-40a1-b4c5-c8c416007a25)
     )
     (fp_text value "1N4148" (at 0 -2.1) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp e87a4dc9-cddb-493f-afde-858ec95e0df8)
+      (tstamp d117b6ea-1aee-4814-8a0a-5d36ad628151)
     )
     (fp_text user "${REFERENCE}" (at 0 2) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 403ca50f-afea-479d-bcf5-34b1f54dbcba)
+      (tstamp 5ab1b95a-72c3-4336-b462-fdce68f0ec9b)
     )
     (fp_line (start -2.36 -1) (end 1.65 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp e66e3517-a080-40c7-9e0d-da0615c5129c))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 0c514010-032f-4b21-a838-c9a6b681aa98))
     (fp_line (start -2.36 1) (end -2.36 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 077fd126-222a-419f-a3d8-f0737c070e2a))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp c13a8a4d-41f4-4fc1-b08e-00268d8e10e3))
     (fp_line (start -2.36 1) (end 1.65 1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 84593dd7-3edd-432a-a47c-e3c63c2c11ae))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 2606cb64-f82b-40e7-b579-2dc7f88f4bda))
     (fp_line (start -2.35 1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp c783396c-2041-44c7-be5c-f77f97ac7383))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 8b6cb46a-6736-4bfe-b7c9-d309a3d43777))
     (fp_line (start -2.35 1.15) (end 2.35 1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 15a9a0f0-12be-4bba-ac4c-e3be5756b530))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp b4ae01c2-6fdc-443c-a0d3-0334f9e81564))
     (fp_line (start 2.35 -1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp d658e080-8e44-4be2-bf6f-6f2d5257736f))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 521a39ee-3e88-4673-a505-ea9e8d715e8b))
     (fp_line (start 2.35 1.15) (end 2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp b064ac4b-5791-4b91-ae88-bb9510d296b5))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 37b61d8e-7428-473b-a44e-da159f215756))
     (fp_line (start -1.4 -0.9) (end -1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 792f980d-ba66-4f15-8868-ce9753d71730))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 81ffb726-25dc-4afd-8ad9-66cb5def6fc6))
     (fp_line (start -1.4 0.9) (end 1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp a2c43992-9fcf-41a3-ba33-44682e6e405c))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 5131ab7d-891f-40a0-88c1-a0500e8309be))
     (fp_line (start -0.75 0) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 468174b3-f45c-499c-9307-8d1895db1ff9))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 690bf393-7ac2-497e-a562-3ca3ca873815))
     (fp_line (start -0.35 0) (end -0.35 -0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 60bfbb94-8a95-444e-8cbd-19a347e9c434))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 425dbab7-650e-4ec0-81e4-afa9c7420799))
     (fp_line (start -0.35 0) (end -0.35 0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 5a172f40-8074-42f3-a34f-d0d122bc70e4))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 7c171ef5-11e8-43aa-badc-e98a80ae4d12))
     (fp_line (start -0.35 0) (end 0.25 0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 4e73f1a1-d653-4804-aba7-c8874ae55d1c))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp c3962e07-a662-4987-b4ad-6d7e42a0af7c))
     (fp_line (start 0.25 -0.4) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp bc47dfd4-3dbf-475d-9a9d-6d88fe18542b))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 461c39b6-b7e3-4057-8eae-57815dbb5067))
     (fp_line (start 0.25 0) (end 0.75 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp b97f54c9-45bf-44f9-917a-a34806379487))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 4bd1246f-36fc-4096-8ec8-fe7e3c16b4a1))
     (fp_line (start 0.25 0.4) (end 0.25 -0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 13d4ee7d-ab1a-4c85-af0f-7850ff6a8d63))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 60eea0a8-d194-4289-9e13-f01bf726730c))
     (fp_line (start 1.4 -0.9) (end -1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 67cd287f-cb29-4ab1-8059-333ca2921365))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp b45ed056-44fc-4bac-a920-9d7d9cf85655))
     (fp_line (start 1.4 0.9) (end 1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 6b42c605-425f-4b02-98bd-ebcb661a642a))
-    (pad "1" smd roundrect (at -1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 58 "Net-(D51-K)") (pinfunction "K") (pintype "passive") (tstamp 2e668557-8d0a-44ec-97b5-3fa8d6403f67))
-    (pad "2" smd roundrect (at 1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 56 "Net-(D49-A)") (pinfunction "A") (pintype "passive") (tstamp 88ba04a5-b2a1-4360-ac25-629e6f9a3b64))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp eb8f6cd9-35ab-43d8-9ad3-a8720edd6f2e))
+    (pad "1" smd roundrect (at -1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 13 "Net-(D48-K)") (pinfunction "K") (pintype "passive") (tstamp abd49bc5-9cd8-4438-98e0-9abb963cb4f0))
+    (pad "2" smd roundrect (at 1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 74 "Net-(D53-A)") (pinfunction "A") (pintype "passive") (tstamp cf3ed1e9-cd00-482f-a48d-54b76ca4ca68))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SOD-123.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -8748,8 +8960,8 @@
   )
 
   (footprint "Diode_SMD:D_SOD-123" (layer "B.Cu")
-    (tstamp ebe45cb1-328d-4cd5-8305-adaa11ac8c03)
-    (at 126.52375 130.96875 180)
+    (tstamp eb9f0290-a45c-4184-ac2e-ef28cdcfdd11)
+    (at 140.49375 145.25625)
     (descr "SOD-123")
     (tags "SOD-123")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
@@ -8758,60 +8970,60 @@
     (property "Sim.Pins" "1=K 2=A")
     (property "ki_description" "100V 0.15A standard switching diode, DO-35")
     (property "ki_keywords" "diode")
-    (path "/390af9bf-e239-4cb1-9983-cab447082edc")
+    (path "/dbfcc61b-a63f-42de-b8a2-00b65cb73fa3")
     (attr smd)
-    (fp_text reference "D3" (at 0 2) (layer "B.SilkS")
+    (fp_text reference "D10" (at 0 2) (layer "B.SilkS")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp f1728f7b-e043-4292-96cb-acb2b4b76002)
+      (tstamp e555d493-5861-4920-87c0-42b600288f84)
     )
     (fp_text value "1N4148" (at 0 -2.1) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp b832b334-59c2-46bd-970e-7f154d00a79c)
+      (tstamp 121fc636-96dd-4409-b9db-2166e9844729)
     )
     (fp_text user "${REFERENCE}" (at 0 2) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp d4a4fb95-8e0b-414c-8b1c-7bb2dcd99633)
+      (tstamp ae39a2a7-fde8-43a5-a570-5a17b70e44cb)
     )
     (fp_line (start -2.36 -1) (end 1.65 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 0530dc97-fe26-4485-8616-17b8c22d3c04))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp d3f6b431-93b9-42fc-bf5e-f1879fa9efd6))
     (fp_line (start -2.36 1) (end -2.36 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 8e5ca304-c50f-4133-914c-d12c85e53de4))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 64ef47b7-e864-492d-bf25-1efb72c314b6))
     (fp_line (start -2.36 1) (end 1.65 1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp bd1c856a-a5f6-4bdc-9966-6d0278604c03))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 30571ae9-479b-4de8-92f6-f26ecfe597ea))
     (fp_line (start -2.35 1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp c7034a8c-44c0-4dc1-a6a5-1bf348cc1b87))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp f8a2979b-0974-49a2-a761-14b5d9b97402))
     (fp_line (start -2.35 1.15) (end 2.35 1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp ff2615a6-b991-4e91-90eb-0e0771b93989))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 8bb5dccc-b71d-497b-a56b-5f15a9654018))
     (fp_line (start 2.35 -1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 10e11e9e-619d-48bb-a5e2-adb6d91e371c))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 5d7681a0-6499-4273-8af7-c8d1617b0e59))
     (fp_line (start 2.35 1.15) (end 2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 0c5355e0-a1d6-4f40-b237-8d53e596d31d))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 32708542-39e3-4b22-8a37-9d4175a4669a))
     (fp_line (start -1.4 -0.9) (end -1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp e8046cc6-a7cd-4eab-9240-7237de6c1de6))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp cb7f380d-1dc1-4260-b629-72d8d82fc1f3))
     (fp_line (start -1.4 0.9) (end 1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 48ed4b05-dda8-4094-9577-623d0e21de06))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp feb2db8e-700f-42b1-a8f2-e88673d710b2))
     (fp_line (start -0.75 0) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 92c23131-0eb0-4efa-9625-44d8d23891e3))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp b274d94f-f89e-47e9-9fbd-bab5a0a700fa))
     (fp_line (start -0.35 0) (end -0.35 -0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 3242ea63-a6ea-43e5-9da9-93081ad7a3e4))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 344a2dd4-00fd-4a3d-b908-7a96d3b411f0))
     (fp_line (start -0.35 0) (end -0.35 0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 6319ceb9-2c19-4688-960b-0f35a0011a2a))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp d3e287e0-16c1-43d2-85fa-c424d1cc169c))
     (fp_line (start -0.35 0) (end 0.25 0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 5cc63df2-ca3c-44e0-b080-30c2fa180c10))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 4bcdccd0-dfaa-4ee0-b682-5e0184bdda1c))
     (fp_line (start 0.25 -0.4) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 31cb802b-fe6c-4776-9672-1f4cc4d0d4fc))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 953a183f-1f05-455d-88c9-2c59735c05fe))
     (fp_line (start 0.25 0) (end 0.75 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 7d40a142-2a32-46e8-aa46-8c1ab096ee1e))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 2c22bbae-b377-49cd-bfcf-34cc57cadd0a))
     (fp_line (start 0.25 0.4) (end 0.25 -0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp ddabe6b9-d73f-46d2-a001-354930b4815c))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp f4295067-bc2a-41fb-8345-f1ee9e8fb379))
     (fp_line (start 1.4 -0.9) (end -1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 61cf0f35-d8a2-46e3-b850-0b9372f8c9e1))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 27468b6d-44d8-4f0f-a0ac-acf5ee5b9fac))
     (fp_line (start 1.4 0.9) (end 1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp e964eb23-b47f-4b2a-83b2-d7fdac287701))
-    (pad "1" smd roundrect (at -1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 4 "Net-(D3-K)") (pinfunction "K") (pintype "passive") (tstamp 84034b14-b92d-47e6-b7cd-4c0a8ee40a12))
-    (pad "2" smd roundrect (at 1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 2 "Net-(D1-A)") (pinfunction "A") (pintype "passive") (tstamp 6fc83c1b-457b-4162-8eda-0962f36efe43))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp ea8988a8-7b47-4d00-87cb-4b734624409c))
+    (pad "1" smd roundrect (at -1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 4 "Net-(D10-K)") (pinfunction "K") (pintype "passive") (tstamp 577c13d6-15bc-4bb2-b931-2c159d9320c9))
+    (pad "2" smd roundrect (at 1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 3 "Net-(D10-A)") (pinfunction "A") (pintype "passive") (tstamp 7a3bfed5-3a92-45ee-b273-3c1478fd8141))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SOD-123.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -8820,8 +9032,8 @@
   )
 
   (footprint "Diode_SMD:D_SOD-123" (layer "B.Cu")
-    (tstamp eebce6ec-d8b0-4a6b-8a88-557d9f1eb90e)
-    (at 259.87375 207.16875 180)
+    (tstamp f0888ec2-0909-461d-a098-ed1949811a99)
+    (at 161.925 183.35625)
     (descr "SOD-123")
     (tags "SOD-123")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
@@ -8830,60 +9042,60 @@
     (property "Sim.Pins" "1=K 2=A")
     (property "ki_description" "100V 0.15A standard switching diode, DO-35")
     (property "ki_keywords" "diode")
-    (path "/3aa162e9-dc9d-4976-a0f1-c99e84e60cc9")
+    (path "/5c061352-3153-40a1-9b2c-bc11b41b3de4")
     (attr smd)
-    (fp_text reference "D58" (at 0 2) (layer "B.SilkS")
+    (fp_text reference "D25" (at 0 2) (layer "B.SilkS")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 1cebfd09-2e18-4a0b-a30b-dfbb74c3fd5a)
+      (tstamp 257f0f49-8273-45e6-8802-e933cd5e491d)
     )
     (fp_text value "1N4148" (at 0 -2.1) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp eec41ae6-76ad-45fa-b82d-2ee786b972e3)
+      (tstamp bdca9f29-5583-4cbb-8c96-333f92e5bc95)
     )
     (fp_text user "${REFERENCE}" (at 0 2) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 74f7742b-6b23-47f7-8abe-5cf9a529eef6)
+      (tstamp 67868b4a-f678-4cd8-ac88-8300d44849e5)
     )
     (fp_line (start -2.36 -1) (end 1.65 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp db24786f-484c-412f-95f5-6b0afc1a5677))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 6f41bd2d-9e35-4bcd-aba8-eb836b941beb))
     (fp_line (start -2.36 1) (end -2.36 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp bec8095e-053b-4d05-930c-1fc0e7a08974))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 94b85576-323f-441d-85ef-d8982f9aab98))
     (fp_line (start -2.36 1) (end 1.65 1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp d9a31d13-b1bd-473f-a66e-2eec2bc8d863))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 7341486d-c3e8-4434-92c2-270e69baa5ac))
     (fp_line (start -2.35 1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 62615488-1837-4ab1-b2cc-f2cc16fced03))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 69ef4928-794d-4ccb-a90d-d16a3790c23f))
     (fp_line (start -2.35 1.15) (end 2.35 1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 4fc06fe3-9772-493c-b00a-75928aa152a2))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 96be860d-5f21-4804-be76-02ad1f458534))
     (fp_line (start 2.35 -1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp b37c72c9-79b0-403d-8f56-b195642fd73d))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp ecbc5872-4d05-433c-8c04-6ac347c0e4ec))
     (fp_line (start 2.35 1.15) (end 2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp f857d2c7-6776-47a4-9993-453d652dfdd0))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 62a0aec2-b2fa-4ce1-91a6-181a8edb53f7))
     (fp_line (start -1.4 -0.9) (end -1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 092246ae-59a6-4f10-a7cf-747c34b29b60))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp b92493db-3fe0-451b-9f7b-3be6fbbdc0fb))
     (fp_line (start -1.4 0.9) (end 1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 56d8af35-213f-4d7b-b42a-a6d94d8d1a83))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp aee086f1-0c40-4a0b-8f6d-827854609aa5))
     (fp_line (start -0.75 0) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 543a4f0e-6d5a-4715-a607-9903ea788248))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 49847a55-e1b9-4b76-9e15-6ccf7daae7ba))
     (fp_line (start -0.35 0) (end -0.35 -0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 44cf325b-5173-4cb3-8817-52d6809401f8))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 54027fa9-a7a2-4240-89a0-fbfbd06a3cf3))
     (fp_line (start -0.35 0) (end -0.35 0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp db7076bf-e5b1-4263-a442-6637ee469bc1))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 9439f880-3ea7-42cb-a0d6-a7ca29661186))
     (fp_line (start -0.35 0) (end 0.25 0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 7a010b3e-16a7-491e-bdf0-ef036bb6996c))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 0a540aac-5bcd-4069-b8fe-5c0be520a0c8))
     (fp_line (start 0.25 -0.4) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 153d8f22-32c7-407e-b414-db2306f19122))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 4dd16a59-789f-4ee3-96e7-84f02eef5e67))
     (fp_line (start 0.25 0) (end 0.75 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp d6790499-04c1-487d-a7de-a9a130ec58d8))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 9b36b020-299b-40d5-96dc-e183127017a9))
     (fp_line (start 0.25 0.4) (end 0.25 -0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp e8f37128-e45c-45e9-bb1f-eac704521373))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp fe8d5cbe-c5dd-4195-a256-7c6fcd6fe521))
     (fp_line (start 1.4 -0.9) (end -1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp d183a893-820c-4fc3-98a0-f6e793e5d265))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 5c2ed94c-e393-4356-94bf-0799908e1398))
     (fp_line (start 1.4 0.9) (end 1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 92e0b65a-6049-4140-97e0-fa571c343c15))
-    (pad "1" smd roundrect (at -1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 66 "Net-(D58-K)") (pinfunction "K") (pintype "passive") (tstamp 4c10a52a-3602-49e8-9323-7682e8c810a1))
-    (pad "2" smd roundrect (at 1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 64 "Net-(D56-A)") (pinfunction "A") (pintype "passive") (tstamp 07042023-4d95-4b88-9bcb-85a135c22a94))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 158006cc-0ef2-411b-9223-98044c471ac5))
+    (pad "1" smd roundrect (at -1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 7 "Net-(D25-K)") (pinfunction "K") (pintype "passive") (tstamp 18b754ff-cc37-4b0a-863f-d841798530fd))
+    (pad "2" smd roundrect (at 1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 8 "Net-(D25-A)") (pinfunction "A") (pintype "passive") (tstamp 6a0d3a49-1627-4ed8-b60f-c3a34f0c6066))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SOD-123.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -8892,8 +9104,8 @@
   )
 
   (footprint "Diode_SMD:D_SOD-123" (layer "B.Cu")
-    (tstamp ef3066ab-b288-4181-8894-8f9786efab9c)
-    (at 217.01125 169.06875 180)
+    (tstamp f1a8ae02-520f-4b8a-b94e-f5dfa6bf59e3)
+    (at 221.45625 107.15625)
     (descr "SOD-123")
     (tags "SOD-123")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
@@ -8902,60 +9114,60 @@
     (property "Sim.Pins" "1=K 2=A")
     (property "ki_description" "100V 0.15A standard switching diode, DO-35")
     (property "ki_keywords" "diode")
-    (path "/b512093c-2816-4252-9e6d-0e1a5169cf65")
+    (path "/22d98d77-9ff4-4441-9f68-5ce4ecf9d3b9")
     (attr smd)
-    (fp_text reference "D39" (at 0 2) (layer "B.SilkS")
+    (fp_text reference "D8" (at 0 2) (layer "B.SilkS")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp cd213488-0e9d-4cac-ac24-8a0b0b661130)
+      (tstamp 62ddcb48-6675-48a4-b8b6-9ed25c7d3370)
     )
     (fp_text value "1N4148" (at 0 -2.1) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp fcf64201-a5e3-478e-9a19-91ed04775162)
+      (tstamp 5dac416a-8267-4ca7-b8c8-b7dd9dcf179b)
     )
     (fp_text user "${REFERENCE}" (at 0 2) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp a4d96e50-e34c-486e-8d86-7d76e95956c6)
+      (tstamp 9010bd72-1a54-4f3d-8fa6-099a7425fb78)
     )
     (fp_line (start -2.36 -1) (end 1.65 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp bde77561-babe-4536-98c7-ccc6eba9d374))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 4543834f-9107-4243-b835-e00201425523))
     (fp_line (start -2.36 1) (end -2.36 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp c4697266-f4c7-4582-8edc-13c910125b29))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 241bb6fb-2df3-4902-9d2c-d71dfaf094b6))
     (fp_line (start -2.36 1) (end 1.65 1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 3e670184-e68b-4705-8bf1-10676b8274ea))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 01a52d20-9dfd-48af-bb65-83f61e752c03))
     (fp_line (start -2.35 1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp d7080ec1-0d55-4470-8db5-b0e755daf481))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp defd6ff2-0308-4a3b-8132-7dd54169632d))
     (fp_line (start -2.35 1.15) (end 2.35 1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp a210b3ea-4d94-46bb-b0a5-9c46c5c31a9c))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 701a31aa-9403-45c1-a956-6f44e27ca488))
     (fp_line (start 2.35 -1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 624a0852-e348-4f87-92b7-e8bc6dc3ee55))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp ae68abdd-79a6-478a-b225-66e267191ac0))
     (fp_line (start 2.35 1.15) (end 2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 125b0e83-82d6-4c1e-a8a8-1ee4fc9f86c7))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 9afca693-a0e0-4597-a53b-58946effb2c1))
     (fp_line (start -1.4 -0.9) (end -1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 922b82af-f1fd-43f5-858b-7edf276e22c1))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 2ee8ade5-d107-4f12-9041-b30cda231ce1))
     (fp_line (start -1.4 0.9) (end 1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp ccc364cf-b591-4156-a719-1b2097b02303))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 4ea0a266-3bf6-425a-b67b-ccfc0d7073ce))
     (fp_line (start -0.75 0) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp d8c3622c-24f4-4d0b-88e7-042ca8f4d503))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 11975301-d346-4ba4-a243-80cb720c49bd))
     (fp_line (start -0.35 0) (end -0.35 -0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp f450977c-5641-44f0-a8ed-5f4091f6bd93))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp b626f07c-cde6-43ef-930e-ac5359b4d105))
     (fp_line (start -0.35 0) (end -0.35 0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 48ffdd44-5f4e-475d-97ab-a6c150eee8c6))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 435d6aa0-c3de-45e4-ba2b-a81ddaab490e))
     (fp_line (start -0.35 0) (end 0.25 0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp af1edc4b-b873-4d70-a40e-54aea493f990))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 7e65724b-1e81-4e0e-985e-0de353909938))
     (fp_line (start 0.25 -0.4) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 7e650236-6853-4e8c-b223-0525cd35cd64))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp f0d37ca0-95be-4766-a695-1c2c92d4ec20))
     (fp_line (start 0.25 0) (end 0.75 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp b18007cf-5669-482c-ac1e-8cebc43b7ae4))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 0440fba1-d8b5-4227-876b-ad8e5bc03a4a))
     (fp_line (start 0.25 0.4) (end 0.25 -0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 2307f889-6568-4189-b5d7-907c18a9c059))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 836257e4-2d2f-44b8-a406-ae97e9384309))
     (fp_line (start 1.4 -0.9) (end -1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp fe056434-dc49-47a2-8393-01310a3cfd4a))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 0ac88b6a-847c-4f6d-95a9-d258b573c640))
     (fp_line (start 1.4 0.9) (end 1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 40ca6596-b473-4f43-a9c7-c0ee0a80817d))
-    (pad "1" smd roundrect (at -1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 44 "Net-(D39-K)") (pinfunction "K") (pintype "passive") (tstamp 56039520-0258-42f9-9a19-bd7d49957d8c))
-    (pad "2" smd roundrect (at 1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 38 "Net-(D33-A)") (pinfunction "A") (pintype "passive") (tstamp 1a7bfd2d-f03b-48a6-a912-062a04d7b103))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp fc25d96b-2966-44d2-abd5-c07ed9db0eb4))
+    (pad "1" smd roundrect (at -1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 1 "Net-(D1-K)") (pinfunction "K") (pintype "passive") (tstamp 29af11d6-e3ab-4950-ac14-20ae04373f7f))
+    (pad "2" smd roundrect (at 1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 35 "Net-(D8-A)") (pinfunction "A") (pintype "passive") (tstamp a24f4668-fe02-4bcc-8689-da55567f5edc))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SOD-123.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -8963,221 +9175,9 @@
     )
   )
 
-  (footprint "Connector_PinSocket_2.54mm:PinSocket_1x08_P2.54mm_Horizontal" (layer "B.Cu")
-    (tstamp f3438162-34b8-4497-8ed9-9c63605a22cc)
-    (at 236.625 113.4 -90)
-    (descr "Through hole angled socket strip, 1x08, 2.54mm pitch, 8.51mm socket length, single row (from Kicad 4.0.7), script generated")
-    (tags "Through hole angled socket strip THT 1x08 2.54mm single row")
-    (property "Sheetfile" "xantronix-z32.kicad_sch")
-    (property "Sheetname" "")
-    (property "ki_description" "Generic connector, single row, 01x08, script generated")
-    (property "ki_keywords" "connector")
-    (path "/414f5e6b-4487-4c46-9567-a94f44838678")
-    (attr through_hole)
-    (fp_text reference "J1" (at -4.38 2.77 -270) (layer "B.SilkS")
-        (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 291aaccf-ed45-4f70-81aa-b7fa3104ee7d)
-    )
-    (fp_text value "Conn_01x08_Socket" (at -4.38 -20.55 -270) (layer "B.Fab")
-        (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 8860f8a2-0e55-4e01-8421-de79b6f11994)
-    )
-    (fp_text user "${REFERENCE}" (at -5.775 -8.89 -360) (layer "B.Fab")
-        (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 77c6f2a0-2357-4f4c-854e-c0e18728f0df)
-    )
-    (fp_line (start -10.09 -19.11) (end -1.46 -19.11)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 48629dc1-c586-4d1f-abbc-ecb374eac5e2))
-    (fp_line (start -10.09 -16.51) (end -1.46 -16.51)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 2c07c209-a3fc-41bb-a638-3b676c2ab527))
-    (fp_line (start -10.09 -13.97) (end -1.46 -13.97)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 87abe27c-872d-47fd-aa2a-c7d8c7e28c12))
-    (fp_line (start -10.09 -11.43) (end -1.46 -11.43)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp ab3d729d-c301-4949-bc00-c260d8ed518b))
-    (fp_line (start -10.09 -8.89) (end -1.46 -8.89)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 802b12ff-ccc8-485c-a288-90c61586be10))
-    (fp_line (start -10.09 -6.35) (end -1.46 -6.35)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp c9f6bb38-653d-4d45-ad15-38c95eea31b4))
-    (fp_line (start -10.09 -3.81) (end -1.46 -3.81)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 836503ae-6d57-4b9e-b3fd-ea42fcd5f007))
-    (fp_line (start -10.09 -1.27) (end -1.46 -1.27)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp a8f710fa-f0cf-48a1-b1e5-e4f6c808b887))
-    (fp_line (start -10.09 -1.1519) (end -1.46 -1.1519)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 60ce7258-7350-43c6-84a0-0159d64c084e))
-    (fp_line (start -10.09 -1.033805) (end -1.46 -1.033805)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 46eb5f0f-86bc-465c-8e05-3bd21d19ab10))
-    (fp_line (start -10.09 -0.91571) (end -1.46 -0.91571)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 21784fa5-c247-4a50-a749-bf65fdb8b8d8))
-    (fp_line (start -10.09 -0.797615) (end -1.46 -0.797615)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 56b97cf7-7729-4c16-a505-5169ce2a8342))
-    (fp_line (start -10.09 -0.67952) (end -1.46 -0.67952)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp be23f642-18ec-4cd9-bfa5-cc9385baf509))
-    (fp_line (start -10.09 -0.561425) (end -1.46 -0.561425)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp c9e2f61f-c6c6-4841-9b86-a8ac07dfc2c9))
-    (fp_line (start -10.09 -0.44333) (end -1.46 -0.44333)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp aca0d684-759f-45ac-b012-f8e8e1d7158b))
-    (fp_line (start -10.09 -0.325235) (end -1.46 -0.325235)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp aaee6ed2-aecd-44df-bfbc-4c407bd2f54b))
-    (fp_line (start -10.09 -0.20714) (end -1.46 -0.20714)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 51297458-5d33-46b2-812d-0650cdcceb76))
-    (fp_line (start -10.09 -0.089045) (end -1.46 -0.089045)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 70b2f9c5-d073-4ddb-a503-cdb80c25c38a))
-    (fp_line (start -10.09 0.02905) (end -1.46 0.02905)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp b7f3d00d-e2b9-4fbf-bb42-439afad93b6a))
-    (fp_line (start -10.09 0.147145) (end -1.46 0.147145)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 0654902a-fefc-4617-a3e0-0b82997b895c))
-    (fp_line (start -10.09 0.26524) (end -1.46 0.26524)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp ea7ae295-d678-499d-b7e4-e45ec79ed045))
-    (fp_line (start -10.09 0.383335) (end -1.46 0.383335)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 197f78ed-8ac4-42d0-aa57-be6a56fea133))
-    (fp_line (start -10.09 0.50143) (end -1.46 0.50143)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 4488ea25-866b-4377-b047-1ee150ee798a))
-    (fp_line (start -10.09 0.619525) (end -1.46 0.619525)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp af344959-8ed7-48d0-b16e-c2e62207fe64))
-    (fp_line (start -10.09 0.73762) (end -1.46 0.73762)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp dad76b6e-3e0d-4f40-85ef-e0c1c4e957e2))
-    (fp_line (start -10.09 0.855715) (end -1.46 0.855715)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 16c69685-597a-41ee-b43d-0f97370ecb96))
-    (fp_line (start -10.09 0.97381) (end -1.46 0.97381)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp bdfa81d4-2eeb-4833-b237-76fc9ea44ecd))
-    (fp_line (start -10.09 1.091905) (end -1.46 1.091905)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 5cf66583-e034-43fc-97ae-05387d18d97d))
-    (fp_line (start -10.09 1.21) (end -1.46 1.21)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp e057e5d2-9d76-41d6-97c3-1e0d7c919de2))
-    (fp_line (start -10.09 1.33) (end -10.09 -19.11)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 6b7eccb2-b98e-4e62-afce-1d35b5ea6265))
-    (fp_line (start -10.09 1.33) (end -1.46 1.33)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 625be31a-3055-484d-bb1f-e87176667243))
-    (fp_line (start -1.46 -18.14) (end -1.05 -18.14)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp d722d65f-d1ee-43bc-ae36-ff863106193e))
-    (fp_line (start -1.46 -17.42) (end -1.05 -17.42)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 477c2809-a577-41f4-80ec-b8a6c9c6a0ff))
-    (fp_line (start -1.46 -15.6) (end -1.05 -15.6)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp a12468e0-65a3-4b61-b4b1-a072f2d0d747))
-    (fp_line (start -1.46 -14.88) (end -1.05 -14.88)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp ee6827eb-468f-45c7-8768-ef5ceeb4cd23))
-    (fp_line (start -1.46 -13.06) (end -1.05 -13.06)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 7006d758-52f0-48ce-8a71-3f8e53698f53))
-    (fp_line (start -1.46 -12.34) (end -1.05 -12.34)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp f5c34b1f-df14-4e5a-b912-9c3497d643fb))
-    (fp_line (start -1.46 -10.52) (end -1.05 -10.52)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp e77bb8b6-2d24-406a-ba14-87533933685d))
-    (fp_line (start -1.46 -9.8) (end -1.05 -9.8)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 804415e4-2776-488d-a305-34e9e525e8c0))
-    (fp_line (start -1.46 -7.98) (end -1.05 -7.98)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 22bc757d-b520-4cf1-8932-5483702655b7))
-    (fp_line (start -1.46 -7.26) (end -1.05 -7.26)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 6b23e04c-34b8-40ca-9537-5e5e7e5f4e31))
-    (fp_line (start -1.46 -5.44) (end -1.05 -5.44)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 5daafa33-2cd8-4dea-9503-fe58aed105fe))
-    (fp_line (start -1.46 -4.72) (end -1.05 -4.72)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 4f3368f1-4d09-4f5e-868c-005650674911))
-    (fp_line (start -1.46 -2.9) (end -1.05 -2.9)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp adce84b7-4df6-4222-b388-88ed036bff00))
-    (fp_line (start -1.46 -2.18) (end -1.05 -2.18)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 3bd11276-b797-4e1b-b1c9-d89f84c8f726))
-    (fp_line (start -1.46 -0.36) (end -1.11 -0.36)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 32871233-2d02-48e6-ba57-370450358bdf))
-    (fp_line (start -1.46 0.36) (end -1.11 0.36)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp ba4210a0-aa5e-4ade-9f3c-d5a8f14a139a))
-    (fp_line (start -1.46 1.33) (end -1.46 -19.11)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 3b041ed2-2bd8-4a64-b231-b0b9335e91f2))
-    (fp_line (start 0 1.33) (end 1.11 1.33)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 06ac85d2-648e-42d0-a9ce-8390e4380710))
-    (fp_line (start 1.11 1.33) (end 1.11 0)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 7318c3aa-8737-4073-a316-7ed392404dec))
-    (fp_line (start -10.55 -19.55) (end 1.75 -19.55)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp e058b9f4-7c3f-4e9d-8a5b-d1cdc82e60ac))
-    (fp_line (start -10.55 1.8) (end -10.55 -19.55)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp a1315a1a-ecac-4541-be16-62f0d9361aa6))
-    (fp_line (start 1.75 -19.55) (end 1.75 1.8)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 4c29b549-64ff-462c-9a69-44e10d91cb14))
-    (fp_line (start 1.75 1.8) (end -10.55 1.8)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp e54a2564-a2cf-414c-a2a3-b0ac64016929))
-    (fp_line (start -10.03 -19.05) (end -10.03 1.27)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp bc30758e-26e3-4ca6-bc7f-73488dfde221))
-    (fp_line (start -10.03 1.27) (end -2.49 1.27)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 6776f4be-d898-4416-af16-38384b9e733f))
-    (fp_line (start -2.49 1.27) (end -1.52 0.3)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp e8647cbd-71dd-4449-a33d-afcbfc0d496e))
-    (fp_line (start -1.52 -19.05) (end -10.03 -19.05)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 9d3666f1-8136-43e1-907c-1ffdcf5faec0))
-    (fp_line (start -1.52 -18.08) (end 0 -18.08)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp ba733adf-0ed4-4a7b-a1d6-cfb1078d30b0))
-    (fp_line (start -1.52 -15.54) (end 0 -15.54)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 720cbea0-efe5-44ec-ae30-0eed1936a6d7))
-    (fp_line (start -1.52 -13) (end 0 -13)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp ec1a7df2-aef3-49a1-bd1d-a5407738365d))
-    (fp_line (start -1.52 -10.46) (end 0 -10.46)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp b342c322-7b26-4c2e-aa75-72c598f35eb5))
-    (fp_line (start -1.52 -7.92) (end 0 -7.92)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 9e038a3f-fcb5-406e-ab93-034b72cd4dae))
-    (fp_line (start -1.52 -5.38) (end 0 -5.38)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp dbf82b40-06da-4d89-a591-0b90fae531f3))
-    (fp_line (start -1.52 -2.84) (end 0 -2.84)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 49bf9e4e-0a63-42d8-ae75-2099a0db2212))
-    (fp_line (start -1.52 -0.3) (end 0 -0.3)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 86c8172f-dcc6-4c63-9173-343091f4c306))
-    (fp_line (start -1.52 0.3) (end -1.52 -19.05)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 4863df39-e725-4ffa-aeab-d46ee857da1c))
-    (fp_line (start 0 -18.08) (end 0 -17.48)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 6f7c34d9-2263-4f2d-904a-90a2aeb63714))
-    (fp_line (start 0 -17.48) (end -1.52 -17.48)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 30077ba9-becf-4f18-84e4-b03a44a0bfc4))
-    (fp_line (start 0 -15.54) (end 0 -14.94)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 939722c5-5531-405a-8b93-d41f569412d8))
-    (fp_line (start 0 -14.94) (end -1.52 -14.94)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp c7787d3b-c685-4761-b591-325f7b598495))
-    (fp_line (start 0 -13) (end 0 -12.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp bb00ffa7-07e6-4b71-b3ca-7993e5251528))
-    (fp_line (start 0 -12.4) (end -1.52 -12.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 73952c81-ec01-487b-ad1b-c37ca6896dbd))
-    (fp_line (start 0 -10.46) (end 0 -9.86)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 509d0080-ee58-458e-9d2c-8d663841a5e9))
-    (fp_line (start 0 -9.86) (end -1.52 -9.86)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp bc47a750-5387-435d-a5e3-5b40d165ea49))
-    (fp_line (start 0 -7.92) (end 0 -7.32)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 885025ea-ceb1-4088-8d23-1391c9a59f68))
-    (fp_line (start 0 -7.32) (end -1.52 -7.32)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 0d3448f7-239b-406b-b095-ede8c89487fd))
-    (fp_line (start 0 -5.38) (end 0 -4.78)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 39b30893-60b2-4020-82f7-4768031f76b5))
-    (fp_line (start 0 -4.78) (end -1.52 -4.78)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 605abc62-795b-40df-9271-d4e5a2446811))
-    (fp_line (start 0 -2.84) (end 0 -2.24)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 73ab49de-2f26-4de7-9b68-88a8e2e186d4))
-    (fp_line (start 0 -2.24) (end -1.52 -2.24)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 92b79203-5543-4e2f-884a-0232eb8e1d62))
-    (fp_line (start 0 -0.3) (end 0 0.3)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp c2712733-0085-4216-91a5-bd78af8c51be))
-    (fp_line (start 0 0.3) (end -1.52 0.3)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp d546cfba-a89d-4fff-9c27-6900a1ba03ea))
-    (pad "1" thru_hole rect (at 0 0 270) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 2 "Net-(D1-A)") (pinfunction "Pin_1") (pintype "passive") (tstamp 121425c9-759a-424d-8535-19c7e941f4e4))
-    (pad "2" thru_hole oval (at 0 -2.54 270) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 11 "Net-(D10-A)") (pinfunction "Pin_2") (pintype "passive") (tstamp 686b19bc-4304-4c52-9db3-28819135c24f))
-    (pad "3" thru_hole oval (at 0 -5.08 270) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 20 "Net-(D17-A)") (pinfunction "Pin_3") (pintype "passive") (tstamp 27447dd6-d27f-440c-a2a5-edc6655502ee))
-    (pad "4" thru_hole oval (at 0 -7.62 270) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 29 "Net-(D25-A)") (pinfunction "Pin_4") (pintype "passive") (tstamp 6297bdca-ece8-44b2-94b8-72c01a66d6db))
-    (pad "5" thru_hole oval (at 0 -10.16 270) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 38 "Net-(D33-A)") (pinfunction "Pin_5") (pintype "passive") (tstamp 12eaa179-c639-4b6c-9365-c29a1b2ade90))
-    (pad "6" thru_hole oval (at 0 -12.7 270) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 47 "Net-(D41-A)") (pinfunction "Pin_6") (pintype "passive") (tstamp cf7a93c9-f272-4e9d-a4a7-7e1166be5853))
-    (pad "7" thru_hole oval (at 0 -15.24 270) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 56 "Net-(D49-A)") (pinfunction "Pin_7") (pintype "passive") (tstamp 78ce8e89-c036-4d6b-8373-d630b3a006d1))
-    (pad "8" thru_hole oval (at 0 -17.78 270) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 64 "Net-(D56-A)") (pinfunction "Pin_8") (pintype "passive") (tstamp 2be4d613-f43d-4435-9b5b-b53ff2fe20a8))
-    (model "${KICAD6_3DMODEL_DIR}/Connector_PinSocket_2.54mm.3dshapes/PinSocket_1x08_P2.54mm_Horizontal.wrl"
-      (offset (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
   (footprint "Diode_SMD:D_SOD-123" (layer "B.Cu")
-    (tstamp f35e21e4-023a-4ff9-92f6-787382487428)
-    (at 288.44875 150.01875 180)
+    (tstamp f1b44e51-0de0-4e30-8721-261907f91a75)
+    (at 173.83125 126.20625)
     (descr "SOD-123")
     (tags "SOD-123")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
@@ -9186,60 +9186,60 @@
     (property "Sim.Pins" "1=K 2=A")
     (property "ki_description" "100V 0.15A standard switching diode, DO-35")
     (property "ki_keywords" "diode")
-    (path "/72197019-16cc-479e-b461-3a47722be1af")
+    (path "/6de8d931-e38a-4a4a-b711-2ecec491b810")
     (attr smd)
-    (fp_text reference "D30" (at 0 2) (layer "B.SilkS")
+    (fp_text reference "D13" (at 0 2) (layer "B.SilkS")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 873ceb6f-f5c2-4a21-9bb9-793d78b45efe)
+      (tstamp 35a0fc5f-723a-4090-b907-dff77c39cac3)
     )
     (fp_text value "1N4148" (at 0 -2.1) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp fb2a39c6-163b-4cef-9087-18a9458c1a9d)
+      (tstamp a965b6bb-b33d-44c9-8331-50b5e15d32c5)
     )
     (fp_text user "${REFERENCE}" (at 0 2) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 64cd38d4-bbbf-4da9-87b7-c36350cca7d4)
+      (tstamp 7f327a6c-68ec-4917-897a-a4c13909d046)
     )
     (fp_line (start -2.36 -1) (end 1.65 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 4260d0ef-2d9c-494a-9262-fb8ffa5c66d1))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 6c6b6580-9cec-42e5-b702-ade628e1f683))
     (fp_line (start -2.36 1) (end -2.36 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 8090668d-1bc5-4e9d-a5e7-469c1984cb98))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 046d6d21-c8dc-482a-8e94-d9d412c48e5c))
     (fp_line (start -2.36 1) (end 1.65 1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 32574163-3202-4db8-a14b-5d31ef29d83f))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp d210fb60-84cf-4b83-a02c-9792b9aca4b9))
     (fp_line (start -2.35 1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 362b96ea-86e3-4b9f-809f-8475960e0734))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp eef08788-25eb-460c-846e-b30d81086233))
     (fp_line (start -2.35 1.15) (end 2.35 1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp eae9e994-72ce-4cff-9499-56834d8695a4))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 8b141306-af8a-46da-8772-ca522f8ff3bf))
     (fp_line (start 2.35 -1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp ba62fe5b-0dfe-4628-92c7-0046fafcb381))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp b407759d-5e36-48cb-9677-b13195f65302))
     (fp_line (start 2.35 1.15) (end 2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 1ca1d91f-03f0-4af9-a0c9-6aaddae9a82b))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 359c7d67-5aa9-4d49-9013-0cc24f4c517a))
     (fp_line (start -1.4 -0.9) (end -1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 5fd8586f-10eb-4588-aca5-7e26903f9204))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp d063ba9c-5fa5-49af-801d-bccfb6651527))
     (fp_line (start -1.4 0.9) (end 1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 53706e85-bdff-445a-9b19-d3f1c74bbd1d))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 8541e34a-385a-447d-af21-167f5bb6e5c4))
     (fp_line (start -0.75 0) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 04744777-3882-4466-a536-27d8b27a16ec))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 23497e64-feb5-4899-89fd-ac0f9f52854d))
     (fp_line (start -0.35 0) (end -0.35 -0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 451ff4c3-6031-4df5-8d12-d921a1913cd5))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 99e5ca60-0deb-46b0-9ac7-bbe3ad5e28a4))
     (fp_line (start -0.35 0) (end -0.35 0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 91844055-ac0c-42d4-b0be-c1059acf529a))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp b877983c-c82c-439d-b863-42e716b78a55))
     (fp_line (start -0.35 0) (end 0.25 0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 04a4e913-ed39-4d94-96db-ab62a999e84c))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 623a3c71-4ec1-4c58-a82a-4721de3d712c))
     (fp_line (start 0.25 -0.4) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 00951926-cf49-4cce-b74c-d1fef4f90788))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 780c78e8-3003-46c7-9690-a7d5f04836d7))
     (fp_line (start 0.25 0) (end 0.75 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp adb14875-f1a8-470e-8701-0c66f51bb4dd))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 263c7c30-922f-4080-9770-f805155f03a6))
     (fp_line (start 0.25 0.4) (end 0.25 -0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 74c0678c-c01c-4509-9aa5-cc890867cf23))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 41a27d65-813c-430f-bb4b-ae97fae7c1c4))
     (fp_line (start 1.4 -0.9) (end -1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 1fee6fe6-9562-43c2-90df-6bf68829cbd2))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp a4cf4204-d297-4fdf-9ab8-cdcf59bde676))
     (fp_line (start 1.4 0.9) (end 1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp a53f9d15-e642-41e1-9126-1976da3da248))
-    (pad "1" smd roundrect (at -1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 34 "Net-(D30-K)") (pinfunction "K") (pintype "passive") (tstamp 45bbc83a-5c94-4d69-83b3-7349285c9753))
-    (pad "2" smd roundrect (at 1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 29 "Net-(D25-A)") (pinfunction "A") (pintype "passive") (tstamp 80dcbaad-93c2-48f0-9f3c-6c1c1cfdf0da))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 4289fd02-d977-4bd4-82a6-2fee026a58f2))
+    (pad "1" smd roundrect (at -1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 4 "Net-(D10-K)") (pinfunction "K") (pintype "passive") (tstamp f57da5d8-2db3-40e5-afc7-215e0e3367d9))
+    (pad "2" smd roundrect (at 1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 39 "Net-(D13-A)") (pinfunction "A") (pintype "passive") (tstamp f6c62100-4b6b-4c61-aa69-6db55526bef9))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SOD-123.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -9248,8 +9248,8 @@
   )
 
   (footprint "Diode_SMD:D_SOD-123" (layer "B.Cu")
-    (tstamp f5d8cfbb-f719-47b1-bb75-16b68c0f9a8c)
-    (at 202.72375 130.96875 180)
+    (tstamp f9615889-02bb-4ad0-a37f-fa824ca5d36b)
+    (at 119.0625 145.25625)
     (descr "SOD-123")
     (tags "SOD-123")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
@@ -9258,60 +9258,60 @@
     (property "Sim.Pins" "1=K 2=A")
     (property "ki_description" "100V 0.15A standard switching diode, DO-35")
     (property "ki_keywords" "diode")
-    (path "/00703402-f12b-4370-b687-1fcb59efa05c")
+    (path "/4acb1923-779f-40e6-9aae-90db6bac254d")
     (attr smd)
-    (fp_text reference "D7" (at 0 2) (layer "B.SilkS")
+    (fp_text reference "D1" (at 0 2) (layer "B.SilkS")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp d2f7112b-0cfa-4745-ab53-f8e4b960c8fb)
+      (tstamp 43e32f0a-0e5b-4e3d-a4fe-0dd953ab1aae)
     )
     (fp_text value "1N4148" (at 0 -2.1) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 27bc5197-4fa9-43f2-a3ed-5234a07ca84d)
+      (tstamp ef342a23-2ec9-450d-94af-1d34cdc93e84)
     )
     (fp_text user "${REFERENCE}" (at 0 2) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 9d41e570-f9ff-4899-bab7-b2e882e16e6e)
+      (tstamp f23184a0-9ec1-4092-b25b-8d281af0edde)
     )
     (fp_line (start -2.36 -1) (end 1.65 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp c342f013-ad4c-4c1f-bc7a-82fd625693ac))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp e7715c82-e16f-43ed-a6fe-222e9df24402))
     (fp_line (start -2.36 1) (end -2.36 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 66810cfd-8273-4fd0-ae44-5dabd1841d04))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 4abf6109-f95a-49a7-aed2-8f8716f18bd1))
     (fp_line (start -2.36 1) (end 1.65 1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp af53a3f3-178b-4e66-9a69-54052ee90d8d))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 16f61ff9-d1ca-4887-9559-51ed9b990579))
     (fp_line (start -2.35 1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 7875f559-68ea-4b42-a1d9-1005b10f970c))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 343b3823-083b-4173-83e6-3cc31233dfe0))
     (fp_line (start -2.35 1.15) (end 2.35 1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 1a32336e-91dc-4880-8f5d-309d0733609c))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp cd199501-e0e2-4626-a20a-30824023f4c1))
     (fp_line (start 2.35 -1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp d844883d-937d-49ea-a167-a52806715235))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 1e151373-d3a0-42c3-be29-ce7d286e9b76))
     (fp_line (start 2.35 1.15) (end 2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 608f3901-a73b-4945-803b-ea14866c9079))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 062f2e1a-0179-4cf4-8984-26e44a85ee7b))
     (fp_line (start -1.4 -0.9) (end -1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp fd78198d-f159-4b85-b65d-2ebf51b8a196))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp d9667199-1220-455a-84fb-8c2e5d4c0539))
     (fp_line (start -1.4 0.9) (end 1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp bb21aab4-246b-414b-b39a-e072dd36aee6))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 6ab3a2f7-7ba6-48a7-83a0-077f913827ee))
     (fp_line (start -0.75 0) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp e73e307f-aa04-4f16-9f3b-af9f2436b0e2))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp d9ee5813-2110-404c-ad72-0547c2b5d204))
     (fp_line (start -0.35 0) (end -0.35 -0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 2b5218f1-0b45-44a4-9b70-5c1f5b65ffe4))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 79646fac-8e43-40d3-a318-107c8acf6f1e))
     (fp_line (start -0.35 0) (end -0.35 0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp fa466098-d5f1-4822-9ff9-df344ab1d3d9))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 00635529-1af8-4987-8e6b-7fc1792ad157))
     (fp_line (start -0.35 0) (end 0.25 0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 5383eb16-9c9d-427d-a4d8-40579dd67097))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 7641c329-e11e-44a5-a555-d51f433fc341))
     (fp_line (start 0.25 -0.4) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp e88f725f-63c7-49e8-8bb8-13f18ead292d))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 4e385b9a-9500-41a7-8866-09fbc1cd3cb1))
     (fp_line (start 0.25 0) (end 0.75 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 7c2dcfb2-e936-4bec-8c78-d6ca3515e742))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp bb609408-4e1c-451a-a050-9175b4227539))
     (fp_line (start 0.25 0.4) (end 0.25 -0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp ca462435-2ed4-40e3-abaa-c885d1bb603a))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 4557e0e3-67a9-4988-b956-81508bcce5f1))
     (fp_line (start 1.4 -0.9) (end -1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 302b9d15-a41f-4c41-a550-2642003bc2f1))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 95b87792-0255-4c73-bef5-8cea4149a839))
     (fp_line (start 1.4 0.9) (end 1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp a319cb5d-1997-4c35-b968-74bebdfedfec))
-    (pad "1" smd roundrect (at -1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 8 "Net-(D7-K)") (pinfunction "K") (pintype "passive") (tstamp aa1a65c9-4c08-47c5-99ee-cd446340c0c7))
-    (pad "2" smd roundrect (at 1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 2 "Net-(D1-A)") (pinfunction "A") (pintype "passive") (tstamp 89d8235b-c985-40a3-999a-98e03a84541a))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 24ee8b4b-b352-441a-8be0-2e080eadeb6b))
+    (pad "1" smd roundrect (at -1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 1 "Net-(D1-K)") (pinfunction "K") (pintype "passive") (tstamp c8835bec-29b4-4e5c-bcae-ac4462429542))
+    (pad "2" smd roundrect (at 1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 2 "Net-(D1-A)") (pinfunction "A") (pintype "passive") (tstamp 23cdf919-7ca4-4baf-a7da-1e2b9f41da4e))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SOD-123.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -9320,8 +9320,8 @@
   )
 
   (footprint "Diode_SMD:D_SOD-123" (layer "B.Cu")
-    (tstamp fba961b1-d16d-49a9-b8ab-2bc80f2a7f1f)
-    (at 183.67375 130.96875 180)
+    (tstamp fbbb3c59-d0a0-4dbf-a5eb-96d19fed3934)
+    (at 269.08125 126.20625)
     (descr "SOD-123")
     (tags "SOD-123")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
@@ -9330,60 +9330,60 @@
     (property "Sim.Pins" "1=K 2=A")
     (property "ki_description" "100V 0.15A standard switching diode, DO-35")
     (property "ki_keywords" "diode")
-    (path "/d334ef21-20c8-44c0-92ed-8127294c42e9")
+    (path "/c2287a58-6e2a-4343-94f0-839e8e8d4bf9")
     (attr smd)
-    (fp_text reference "D6" (at 0 2) (layer "B.SilkS")
+    (fp_text reference "D46" (at 0 2) (layer "B.SilkS")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 5a5a1354-5d47-4712-ae45-11cc96ebb8db)
+      (tstamp 3bb0426a-c9a2-438d-96d2-f040224432a1)
     )
     (fp_text value "1N4148" (at 0 -2.1) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 358e49d2-5c4b-4c8b-9a24-f3da301340f6)
+      (tstamp acce517f-18c6-4264-8ce0-d524717a3f75)
     )
     (fp_text user "${REFERENCE}" (at 0 2) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 7a281fc3-562d-421e-9d65-1f5e94375500)
+      (tstamp e04e9cf0-fbfc-44a7-8827-b35ded5826ad)
     )
     (fp_line (start -2.36 -1) (end 1.65 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 80978265-551e-4a20-87cb-76a97c8e4d41))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 5be9b099-51e7-41af-8e44-91375bc74f14))
     (fp_line (start -2.36 1) (end -2.36 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 28c68b19-4615-4ae8-912c-82069c734b99))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 583874b5-fe37-4605-a79a-53fce7d18bc2))
     (fp_line (start -2.36 1) (end 1.65 1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 68738813-a66e-4aa1-bd43-6c68b1f9d2ea))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 0c515aac-ce85-46d1-b401-d5d6779d35b9))
     (fp_line (start -2.35 1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 1a641b65-faed-4bee-873f-07ef1dff8e46))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp a5157913-6f24-4100-9027-401ab7888a5a))
     (fp_line (start -2.35 1.15) (end 2.35 1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 55a0516e-3185-49dc-aaac-c3bfc413ea39))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp e5a5c17d-62d3-4e02-86c7-5de2b7e1934d))
     (fp_line (start 2.35 -1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 37a1e5e8-f155-4093-8589-8eafdb3ad9c5))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp bbed4b28-95d5-4c59-b9b5-41d6a0b989fb))
     (fp_line (start 2.35 1.15) (end 2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp ecd5c4f9-2014-4010-8924-5b6ccffb5603))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 4198e33c-a5cd-477c-b4de-28e94e93907d))
     (fp_line (start -1.4 -0.9) (end -1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 63f5ea79-fa7d-4166-9ce3-47743cbaad4c))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp fd97f9d7-3982-4709-80ac-409f25319278))
     (fp_line (start -1.4 0.9) (end 1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp a2956397-5ad7-4ceb-8c4f-f3c73628662f))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 5c1f99d8-82d3-45f4-bafc-69db46eb637b))
     (fp_line (start -0.75 0) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp c1095d8a-a8ac-4a1d-b7aa-5bc040f93dba))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 7414bc88-2a91-416a-93e5-4a0782820657))
     (fp_line (start -0.35 0) (end -0.35 -0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 8493593e-5068-464b-ad87-41c2c783f3a2))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 5b57c45c-d004-4bf2-a69c-16f0a99fb132))
     (fp_line (start -0.35 0) (end -0.35 0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 2821e9c5-4dba-433e-b3d4-909c386dc515))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp da2a73c3-2faf-418e-911e-d142402dbdd1))
     (fp_line (start -0.35 0) (end 0.25 0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 3019eaa8-e86c-4c6b-a781-d64f12bbfdc6))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 947cefd7-fb5c-4687-86cf-4e2fa383e498))
     (fp_line (start 0.25 -0.4) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 23c31545-052b-4457-b654-30fb8e58e9e1))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 586bc9b0-947e-419f-b269-f348b7698de3))
     (fp_line (start 0.25 0) (end 0.75 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp b47a472a-d50d-4352-88dd-5473fa1d0caa))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 092935fa-3470-40fc-80d3-187dfef2af6f))
     (fp_line (start 0.25 0.4) (end 0.25 -0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 0d153d61-567d-45b6-a5c5-2a36dd48ea87))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 67e3bd8a-bffa-4e78-846c-e7481856ffb1))
     (fp_line (start 1.4 -0.9) (end -1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp f668787a-e255-432d-85ba-986d43dff789))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp f50642a6-d4b7-4fb7-aabc-678052ca4c58))
     (fp_line (start 1.4 0.9) (end 1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 8e77820b-13db-4b83-b0a2-e1fe926f27e4))
-    (pad "1" smd roundrect (at -1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 7 "Net-(D6-K)") (pinfunction "K") (pintype "passive") (tstamp 71025256-d666-40cf-801d-28698558b16b))
-    (pad "2" smd roundrect (at 1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 2 "Net-(D1-A)") (pinfunction "A") (pintype "passive") (tstamp 80e7ff90-e33f-42c6-969e-2a7ef787f1b6))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp d9df2875-310a-41dc-bab9-2b3ba34675ef))
+    (pad "1" smd roundrect (at -1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 11 "Net-(D40-K)") (pinfunction "K") (pintype "passive") (tstamp 61b74d67-16ef-4d44-a384-5c4661116cea))
+    (pad "2" smd roundrect (at 1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 68 "Net-(D46-A)") (pinfunction "A") (pintype "passive") (tstamp da8158a6-5166-45a6-8292-7b7793e2ba79))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SOD-123.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -9392,8 +9392,8 @@
   )
 
   (footprint "Diode_SMD:D_SOD-123" (layer "B.Cu")
-    (tstamp ff3a9d88-7f99-44b9-8524-62e2a9da2670)
-    (at 183.67375 207.16875 180)
+    (tstamp fbddc9a3-267f-4e3e-a3d8-652aa0438712)
+    (at 264.31875 164.30625)
     (descr "SOD-123")
     (tags "SOD-123")
     (property "Sheetfile" "xantronix-z32.kicad_sch")
@@ -9402,60 +9402,60 @@
     (property "Sim.Pins" "1=K 2=A")
     (property "ki_description" "100V 0.15A standard switching diode, DO-35")
     (property "ki_keywords" "diode")
-    (path "/932bd5bf-2bc6-4d7c-bbc1-5e0a48fdc68c")
+    (path "/d91c025e-4ca4-400c-8753-11d7aae35b12")
     (attr smd)
-    (fp_text reference "D56" (at 0 2) (layer "B.SilkS")
+    (fp_text reference "D31" (at 0 2) (layer "B.SilkS")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 5ae29945-dc7d-49ba-add8-cfdba0c325ac)
+      (tstamp 7799fa46-07f5-411a-9954-baae3d772576)
     )
     (fp_text value "1N4148" (at 0 -2.1) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp bcc4a8ae-7251-49d3-bc92-ba51bfccc40e)
+      (tstamp b8eeff5e-717f-4b8d-9bde-602d0090f1a6)
     )
     (fp_text user "${REFERENCE}" (at 0 2) (layer "B.Fab")
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-      (tstamp 5570aa34-4d5e-479b-bc83-5a0f222251b8)
+      (tstamp 369b3ec9-02cd-441e-b522-2c7be6ff5d86)
     )
     (fp_line (start -2.36 -1) (end 1.65 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp dcf1b636-4d3e-49a4-9a59-5fd1b499c24b))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 52b0e84a-8232-4c4a-a999-5ebe978a561c))
     (fp_line (start -2.36 1) (end -2.36 -1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp f3a0ea3a-6414-4ab2-b386-a2bdb660b86d))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 648f4b01-8af2-4d2f-a675-91aadde3ebe9))
     (fp_line (start -2.36 1) (end 1.65 1)
-      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp bf2288d3-2fb6-4416-b68e-ff7babaefffd))
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 729eca1e-4392-4866-8030-dd7251d6a331))
     (fp_line (start -2.35 1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp d392c4de-7770-4786-b2ac-c3c290148c74))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 62d0c82b-8519-49bc-877d-6b089f3f7399))
     (fp_line (start -2.35 1.15) (end 2.35 1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 6aa0089a-72ba-4cc3-9536-33480d55893b))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 2e051ab0-ea9a-4e47-b5b9-04f4ee31f08a))
     (fp_line (start 2.35 -1.15) (end -2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 08f3eb33-a886-415a-9e03-51a24af51f89))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 97ecd183-2698-4f63-8701-b8319706ee1f))
     (fp_line (start 2.35 1.15) (end 2.35 -1.15)
-      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp faa91433-04c2-42b1-a6e8-a61ea148e856))
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 47f49768-dea6-4dd0-80af-606d106c9979))
     (fp_line (start -1.4 -0.9) (end -1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp db6c6b9f-615b-4686-94b0-2b89aa8d4b68))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp bb23bb68-478c-4abf-a546-815c2fa7b906))
     (fp_line (start -1.4 0.9) (end 1.4 0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp e7fe6607-86cf-45b0-96e6-25c69069c7b1))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 31fe599e-b46b-431f-b450-0acaa36f106b))
     (fp_line (start -0.75 0) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 9236a7e8-8605-459a-a164-d77a9563e57c))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp f0f085d6-8820-4c47-87dc-12b67c8a356f))
     (fp_line (start -0.35 0) (end -0.35 -0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 43caf55c-66ac-4d6f-bb39-4caec1d5990c))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 6d7a8820-a649-464d-88a8-7c19f30682a9))
     (fp_line (start -0.35 0) (end -0.35 0.55)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 09270b7d-0778-483d-bf95-1b2214580305))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp ef1322a5-ca55-45dc-91b0-ce006f9928a6))
     (fp_line (start -0.35 0) (end 0.25 0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 33f52028-c42c-437c-a96c-e6dafe64af61))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 57b93544-9db4-4548-8a96-ff8502ba59a7))
     (fp_line (start 0.25 -0.4) (end -0.35 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 09d1335b-e586-49a1-ac08-d5fd71239f7d))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp f8d5567e-bba5-45d1-a6ba-759963479af0))
     (fp_line (start 0.25 0) (end 0.75 0)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 2aaed222-5944-45a7-afbf-3e794daeb758))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp c2afe8c5-8770-4137-b4d5-e6081fcf7e24))
     (fp_line (start 0.25 0.4) (end 0.25 -0.4)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 6b6feae6-23c8-4b16-8b17-d4068946dce6))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 92708120-5d84-4f77-9866-6449f2d87583))
     (fp_line (start 1.4 -0.9) (end -1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 8a061a44-4456-4666-9872-daa0ebef9ab2))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp cf390114-1c34-4c0d-8430-45e4c882a32f))
     (fp_line (start 1.4 0.9) (end 1.4 -0.9)
-      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp c062cb32-8d57-40b9-88a8-42b15e6de004))
-    (pad "1" smd roundrect (at -1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 63 "Net-(D56-K)") (pinfunction "K") (pintype "passive") (tstamp 0a4a2dbf-2f1f-4289-8739-dbb9911e4e94))
-    (pad "2" smd roundrect (at 1.65 0 180) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 64 "Net-(D56-A)") (pinfunction "A") (pintype "passive") (tstamp 22f3fbbd-6a4f-4c9b-9d78-fe086ac32e5f))
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 9a8166ab-cb96-463b-9cf5-af1deb967ee3))
+    (pad "1" smd roundrect (at -1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 7 "Net-(D25-K)") (pinfunction "K") (pintype "passive") (tstamp a3c88fcc-5387-40d1-a17d-5b201ae27062))
+    (pad "2" smd roundrect (at 1.65 0) (size 0.9 1.2) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 55 "Net-(D31-A)") (pinfunction "A") (pintype "passive") (tstamp 4d1e41d4-c95d-4ca7-a063-0c70cffa10d4))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SOD-123.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -9463,491 +9463,4 @@
     )
   )
 
-  (segment (start 121.92 168.17875) (end 121.92 159.22625) (width 0.25) (layer "B.Cu") (net 1) (tstamp 788905ba-c2bd-432a-b321-18724d5a5c9b))
-  (segment (start 121.03 169.06875) (end 121.92 168.17875) (width 0.25) (layer "B.Cu") (net 1) (tstamp bc9f7b66-474f-4c33-984b-144e107f4a39))
-  (segment (start 149.5 136.275) (end 168 136.275) (width 0.25) (layer "B.Cu") (net 2) (tstamp 00308e24-14af-4912-ab82-0fc0b3adbab8))
-  (segment (start 231.5 121) (end 236.625 115.875) (width 0.25) (layer "B.Cu") (net 2) (tstamp 11e5ca7b-71c3-42fb-836d-c227e29c0c59))
-  (segment (start 236.625 115.875) (end 236.625 113.4) (width 0.25) (layer "B.Cu") (net 2) (tstamp 1d5c82f1-cfa1-4093-896f-b876bc05d1fd))
-  (segment (start 112.51875 150.01875) (end 115.34875 150.01875) (width 0.25) (layer "B.Cu") (net 2) (tstamp 2033ce52-3332-4bdd-a2d2-8b5ecebc94a7))
-  (segment (start 225.225 136.275) (end 226.5 135) (width 0.25) (layer "B.Cu") (net 2) (tstamp 24209228-8150-4aa0-940c-939bf3f81b8f))
-  (segment (start 117.330088 169.06875) (end 109 160.738662) (width 0.25) (layer "B.Cu") (net 2) (tstamp 3585f55a-883c-4e11-a5f6-32b8337a0d79))
-  (segment (start 220.12375 130.96875) (end 224.155 135) (width 0.25) (layer "B.Cu") (net 2) (tstamp 3d8116eb-34e6-44bc-b10f-360f573b4716))
-  (segment (start 162.97375 130.96875) (end 162.97375 131.24875) (width 0.25) (layer "B.Cu") (net 2) (tstamp 4e56942d-078f-42a8-a12f-e3f3851ca6cd))
-  (segment (start 224.155 135) (end 226.5 135) (width 0.25) (layer "B.Cu") (net 2) (tstamp 4f4960fd-7468-4767-9b7a-638072406870))
-  (segment (start 124.87375 130.96875) (end 130.18 136.275) (width 0.25) (layer "B.Cu") (net 2) (tstamp 53497a67-2f8a-49a9-9f97-5dc58fbf90f3))
-  (segment (start 144.19375 130.96875) (end 149.5 136.275) (width 0.25) (layer "B.Cu") (net 2) (tstamp 54c6c56c-ce13-42f1-86e6-9ac2704e3e95))
-  (segment (start 109 146.5) (end 109 141) (width 0.25) (layer "B.Cu") (net 2) (tstamp 628eb63f-0018-4741-973c-e6b2b4ec2f64))
-  (segment (start 143.92375 130.96875) (end 144.19375 130.96875) (width 0.25) (layer "B.Cu") (net 2) (tstamp 6a53f806-45ef-40af-8c60-67f9bc1d32b1))
-  (segment (start 109 146.5) (end 112.51875 150.01875) (width 0.25) (layer "B.Cu") (net 2) (tstamp 6e445b2b-2344-4862-9056-28a7dc88810d))
-  (segment (start 168 136.275) (end 188 136.275) (width 0.25) (layer "B.Cu") (net 2) (tstamp 6e68ab15-a0d2-4eea-95eb-c7a29a2cb512))
-  (segment (start 187.33 136.275) (end 188 136.275) (width 0.25) (layer "B.Cu") (net 2) (tstamp 75574c1d-615c-453d-9cd1-028e6c99f407))
-  (segment (start 162.97375 131.24875) (end 168 136.275) (width 0.25) (layer "B.Cu") (net 2) (tstamp 76251d99-5235-4cbd-9ee1-5ead7d96c8d9))
-  (segment (start 117.73 169.06875) (end 117.330088 169.06875) (width 0.25) (layer "B.Cu") (net 2) (tstamp 770e7416-31af-4f04-b58b-f94fc5b188e5))
-  (segment (start 226.5 135) (end 231.5 130) (width 0.25) (layer "B.Cu") (net 2) (tstamp 8d147acf-318e-44ad-ade1-26d8130820da))
-  (segment (start 182.02375 130.96875) (end 187.33 136.275) (width 0.25) (layer "B.Cu") (net 2) (tstamp b1f279f3-42f0-49f5-9695-a66a6c557934))
-  (segment (start 188 136.275) (end 209 136.275) (width 0.25) (layer "B.Cu") (net 2) (tstamp ba545985-a8ca-44b4-9630-8a64c954198e))
-  (segment (start 231.5 130) (end 231.5 121) (width 0.25) (layer "B.Cu") (net 2) (tstamp ba85f6bf-1d55-46b5-ac41-e7d951804a2c))
-  (segment (start 109 141) (end 113.725 136.275) (width 0.25) (layer "B.Cu") (net 2) (tstamp bcf43c89-776b-498f-b595-4b96e71aefc8))
-  (segment (start 131 136.275) (end 149.5 136.275) (width 0.25) (layer "B.Cu") (net 2) (tstamp c50c5765-1ca6-4d48-afde-dcfe7f7893fb))
-  (segment (start 201.07375 130.96875) (end 206.38 136.275) (width 0.25) (layer "B.Cu") (net 2) (tstamp c925e59a-9050-4ce7-8e01-9780e715d8a0))
-  (segment (start 113.725 136.275) (end 131 136.275) (width 0.25) (layer "B.Cu") (net 2) (tstamp d0fbb9ac-8925-48fb-a934-cfc990054bd1))
-  (segment (start 130.18 136.275) (end 131 136.275) (width 0.25) (layer "B.Cu") (net 2) (tstamp d5363688-9def-44e3-bf53-20f728ecd59c))
-  (segment (start 109 160.738662) (end 109 146.5) (width 0.25) (layer "B.Cu") (net 2) (tstamp dd8bdd2f-f58b-4f43-8f41-dd9c2b6e1b51))
-  (segment (start 206.38 136.275) (end 209 136.275) (width 0.25) (layer "B.Cu") (net 2) (tstamp e8710002-0819-4f5c-97e3-4424af98956b))
-  (segment (start 209 136.275) (end 225.225 136.275) (width 0.25) (layer "B.Cu") (net 2) (tstamp fecc697c-497b-40b4-aa11-72c00a060b73))
-  (segment (start 119.53875 149.12875) (end 119.53875 140.17625) (width 0.25) (layer "B.Cu") (net 3) (tstamp 4223de68-8d27-4f67-bb33-b5c5ae25ff62))
-  (segment (start 118.64875 150.01875) (end 119.53875 149.12875) (width 0.25) (layer "B.Cu") (net 3) (tstamp 4f145a82-813f-4ab4-9b7b-89f76589fc52))
-  (segment (start 128.17375 130.96875) (end 129.06375 130.07875) (width 0.25) (layer "B.Cu") (net 4) (tstamp 39ff2753-c18b-418f-9b14-2cbd4abfb491))
-  (segment (start 129.06375 130.07875) (end 129.06375 121.12625) (width 0.25) (layer "B.Cu") (net 4) (tstamp c0ba669e-040d-493f-b360-aab98e0b8561))
-  (segment (start 148.11375 130.07875) (end 148.11375 121.12625) (width 0.25) (layer "B.Cu") (net 5) (tstamp a72853e9-c379-4f8d-aaf1-39abf004c9f7))
-  (segment (start 147.22375 130.96875) (end 148.11375 130.07875) (width 0.25) (layer "B.Cu") (net 5) (tstamp cb1022c7-204a-47b2-98b4-2ae0fb87dd67))
-  (segment (start 167.16375 130.07875) (end 167.16375 121.12625) (width 0.25) (layer "B.Cu") (net 6) (tstamp 063da0f9-6ded-4f45-a230-8059cfb4e273))
-  (segment (start 166.27375 130.96875) (end 167.16375 130.07875) (width 0.25) (layer "B.Cu") (net 6) (tstamp 59138e23-bd83-4a09-814f-717f32387971))
-  (segment (start 185.32375 130.96875) (end 186.21375 130.07875) (width 0.25) (layer "B.Cu") (net 7) (tstamp 4b1ac3a6-2524-4248-bea3-e98c7afcaf41))
-  (segment (start 186.21375 130.07875) (end 186.21375 121.12625) (width 0.25) (layer "B.Cu") (net 7) (tstamp 8c5fbbc1-fe54-44a5-aab3-d32331a383b6))
-  (segment (start 205.26375 130.07875) (end 205.26375 121.12625) (width 0.25) (layer "B.Cu") (net 8) (tstamp 102a3236-2c04-45bd-af4d-b4a32589c6c4))
-  (segment (start 204.37375 130.96875) (end 205.26375 130.07875) (width 0.25) (layer "B.Cu") (net 8) (tstamp 22a3f845-27f3-453d-9159-db5c793ed99c))
-  (segment (start 223.42375 130.96875) (end 224.31375 130.07875) (width 0.25) (layer "B.Cu") (net 9) (tstamp a5bfef81-45aa-4d62-970e-c20da6cdef35))
-  (segment (start 224.31375 130.07875) (end 224.31375 121.12625) (width 0.25) (layer "B.Cu") (net 9) (tstamp fef319e6-6705-4ea1-bd5d-16ff3a871804))
-  (segment (start 347.24875 150.01875) (end 348.13875 149.12875) (width 0.25) (layer "B.Cu") (net 10) (tstamp 6b42e3cc-99ff-4ba0-8461-cbd00dd47a1a))
-  (segment (start 348.13875 149.12875) (end 348.13875 140.17625) (width 0.25) (layer "B.Cu") (net 10) (tstamp 9e07870e-4f92-4846-ac6d-9f6332dba7a5))
-  (segment (start 340.51875 150.01875) (end 343.94875 150.01875) (width 0.25) (layer "B.Cu") (net 11) (tstamp 022bc0bc-deaf-4362-83db-b272c576e029))
-  (segment (start 296.32375 130.96875) (end 296.32375 131.17625) (width 0.25) (layer "B.Cu") (net 11) (tstamp 1592dd4a-aa2b-44a9-8f9e-2b5e548597db))
-  (segment (start 239.165 113.4) (end 239.165 114.835) (width 0.25) (layer "B.Cu") (net 11) (tstamp 1a73607d-a002-4525-b626-33447f677fe6))
-  (segment (start 337.5 147) (end 340.51875 150.01875) (width 0.25) (layer "B.Cu") (net 11) (tstamp 3d196fe9-86b9-4904-b928-8c5f2d3ba21f))
-  (segment (start 239.165 114.835) (end 233 121) (width 0.25) (layer "B.Cu") (net 11) (tstamp 42364daa-a424-4e89-9bfe-bab8b81d95fa))
-  (segment (start 315.37375 130.96875) (end 315.37375 131.12625) (width 0.25) (layer "B.Cu") (net 11) (tstamp 48830902-7270-4fc4-a2ed-2771a507627b))
-  (segment (start 291.5 136) (end 310.5 136) (width 0.25) (layer "B.Cu") (net 11) (tstamp 4ed3f351-a4d5-414f-81b6-419fa587176c))
-  (segment (start 335.5 136) (end 348.4425 136) (width 0.25) (layer "B.Cu") (net 11) (tstamp 572a644f-d69d-4716-a7ae-33ef174cae8b))
-  (segment (start 258.22375 131.27625) (end 253.5 136) (width 0.25) (layer "B.Cu") (net 11) (tstamp 60ff4465-452f-4380-8689-bacb02f3c78e))
-  (segment (start 337.5 138) (end 337.5 147) (width 0.25) (layer "B.Cu") (net 11) (tstamp 62202191-2d16-44fb-ab68-11dc7025da0a))
-  (segment (start 258.22375 130.96875) (end 258.22375 131.27625) (width 0.25) (layer "B.Cu") (net 11) (tstamp 65801f49-3372-4177-ba8f-8a9d749207e9))
-  (segment (start 348.4425 136) (end 353.47375 130.96875) (width 0.25) (layer "B.Cu") (net 11) (tstamp 66b5f375-4784-4aba-8d42-8275f86554ec))
-  (segment (start 310.5 136) (end 329.5 136) (width 0.25) (layer "B.Cu") (net 11) (tstamp 67258914-e0b1-4afc-8670-651e3e40b00d))
-  (segment (start 234 131) (end 239.1425 131) (width 0.25) (layer "B.Cu") (net 11) (tstamp 79b02f43-30ad-4668-92f4-913fba7306a5))
-  (segment (start 277.27375 131.22625) (end 272.5 136) (width 0.25) (layer "B.Cu") (net 11) (tstamp 7a2a7df2-ba34-4d49-8ff2-982a1ec4d993))
-  (segment (start 233 121) (end 233 130) (width 0.25) (layer "B.Cu") (net 11) (tstamp 7b94c800-91ba-4452-933d-e247bdefd36d))
-  (segment (start 277.27375 130.96875) (end 277.27375 131.22625) (width 0.25) (layer "B.Cu") (net 11) (tstamp 7ea44231-19ad-4ffb-9c24-9c163469b243))
-  (segment (start 239 136) (end 253.5 136) (width 0.25) (layer "B.Cu") (net 11) (tstamp 833bbee2-eeaa-44c4-bd41-a92c7410be0a))
-  (segment (start 315.37375 131.12625) (end 310.5 136) (width 0.25) (layer "B.Cu") (net 11) (tstamp 84d0e256-be6e-4240-90c5-b63305d2f6c2))
-  (segment (start 272.5 136) (end 291.5 136) (width 0.25) (layer "B.Cu") (net 11) (tstamp 88ff051e-ffac-4b4f-96f8-a27a068a8f84))
-  (segment (start 335.5 136) (end 337.5 138) (width 0.25) (layer "B.Cu") (net 11) (tstamp 9e07127a-de34-4d7f-8434-8f94ec79d5f7))
-  (segment (start 233 130) (end 234 131) (width 0.25) (layer "B.Cu") (net 11) (tstamp a8dcc400-98a5-4a22-8d12-21e865ad9ec5))
-  (segment (start 239.1425 131) (end 239.17375 130.96875) (width 0.25) (layer "B.Cu") (net 11) (tstamp abf3d3e0-22aa-40c1-bef0-c6b63ee29de3))
-  (segment (start 296.32375 131.17625) (end 291.5 136) (width 0.25) (layer "B.Cu") (net 11) (tstamp b22023ce-e943-4aad-9085-4be920acffbe))
-  (segment (start 334.42375 131.07625) (end 329.5 136) (width 0.25) (layer "B.Cu") (net 11) (tstamp b490501e-332f-43c6-ac6c-8a13ffb5f758))
-  (segment (start 334.42375 130.96875) (end 334.42375 131.07625) (width 0.25) (layer "B.Cu") (net 11) (tstamp be329e6e-c16c-462d-9625-1062bc0f3f3b))
-  (segment (start 329.5 136) (end 335.5 136) (width 0.25) (layer "B.Cu") (net 11) (tstamp d3cf25f8-d208-475b-908a-17abe999d864))
-  (segment (start 234 131) (end 239 136) (width 0.25) (layer "B.Cu") (net 11) (tstamp d98c2731-0d96-4b1a-b6e7-25a66b5a474c))
-  (segment (start 253.5 136) (end 272.5 136) (width 0.25) (layer "B.Cu") (net 11) (tstamp da4941f9-83ed-473d-98ab-a673266ba5ea))
-  (segment (start 357.66375 130.07875) (end 357.66375 121.12625) (width 0.25) (layer "B.Cu") (net 12) (tstamp 13fcac99-0e17-4904-b906-bd340da3a143))
-  (segment (start 356.77375 130.96875) (end 357.66375 130.07875) (width 0.25) (layer "B.Cu") (net 12) (tstamp 54ccd94e-19bd-4d3f-877d-3ea6a7cd7317))
-  (segment (start 338.61375 130.07875) (end 338.61375 121.12625) (width 0.25) (layer "B.Cu") (net 13) (tstamp b52bc1d0-c83e-4872-9840-f40139a3be6c))
-  (segment (start 337.72375 130.96875) (end 338.61375 130.07875) (width 0.25) (layer "B.Cu") (net 13) (tstamp f42f26cf-5238-49f8-970d-e66611e37d0a))
-  (segment (start 319.56375 130.07875) (end 319.56375 121.12625) (width 0.25) (layer "B.Cu") (net 14) (tstamp cc404325-0a36-45a2-9641-5e1c8ed7d452))
-  (segment (start 318.67375 130.96875) (end 319.56375 130.07875) (width 0.25) (layer "B.Cu") (net 14) (tstamp d51a6b5d-832a-47a4-b79a-983672cb0ded))
-  (segment (start 299.62375 130.96875) (end 300.51375 130.07875) (width 0.25) (layer "B.Cu") (net 15) (tstamp 15ebe9b4-93ad-4bd9-bc86-38ef0356dd82))
-  (segment (start 300.51375 130.07875) (end 300.51375 121.12625) (width 0.25) (layer "B.Cu") (net 15) (tstamp 688db7d2-8754-45f1-b746-e5aef6ecf365))
-  (segment (start 281.46375 130.07875) (end 281.46375 121.12625) (width 0.25) (layer "B.Cu") (net 16) (tstamp 4fd67414-84bf-4397-bf88-435537e109c9))
-  (segment (start 280.57375 130.96875) (end 281.46375 130.07875) (width 0.25) (layer "B.Cu") (net 16) (tstamp 5f6db666-885b-492f-b842-611ed49ba357))
-  (segment (start 261.52375 130.96875) (end 262.41375 130.07875) (width 0.25) (layer "B.Cu") (net 17) (tstamp 7edaef45-a680-44cf-b6cf-297c2cd6bb6d))
-  (segment (start 262.41375 130.07875) (end 262.41375 121.12625) (width 0.25) (layer "B.Cu") (net 17) (tstamp a1b37082-c37e-4ae1-ba0e-7ba2f921e926))
-  (segment (start 243.36375 130.07875) (end 243.36375 121.12625) (width 0.25) (layer "B.Cu") (net 18) (tstamp 3f66a1d7-4d4c-4c48-992b-99e47904f2a6))
-  (segment (start 242.47375 130.96875) (end 243.36375 130.07875) (width 0.25) (layer "B.Cu") (net 18) (tstamp 81761c91-19aa-4a0f-b93d-391359c972c6))
-  (segment (start 125.7925 188.11875) (end 126.6825 187.22875) (width 0.25) (layer "B.Cu") (net 19) (tstamp 7547018b-f7eb-4abe-aea5-446cf4ab5f73))
-  (segment (start 126.6825 187.22875) (end 126.6825 178.27625) (width 0.25) (layer "B.Cu") (net 19) (tstamp 7603816a-fff9-41e8-9b68-593728e3a80e))
-  (segment (start 232.5 131.5) (end 232.5 122.605) (width 0.25) (layer "F.Cu") (net 20) (tstamp 3863752d-a008-43fa-8575-35b246ec8f84))
-  (segment (start 232.5 122.605) (end 241.705 113.4) (width 0.25) (layer "F.Cu") (net 20) (tstamp 8b78ab94-54a1-4fa5-9fec-9c377dff6cc6))
-  (via (at 232.5 131.5) (size 0.8) (drill 0.4) (layers "F.Cu" "B.Cu") (net 20) (tstamp 48f07646-4a42-4345-88ef-81a27b42b97b))
-  (segment (start 133.56875 169.06875) (end 139.16125 169.06875) (width 0.25) (layer "B.Cu") (net 20) (tstamp 02ca2645-bd2c-43b1-bf33-d58c807d65c2))
-  (segment (start 139 155) (end 158.5 155) (width 0.25) (layer "B.Cu") (net 20) (tstamp 17a99d10-e664-4715-925d-5db38b0c64df))
-  (segment (start 239 138) (end 232.5 131.5) (width 0.25) (layer "B.Cu") (net 20) (tstamp 1a2355ca-e61f-40ce-81d4-ce626e046f86))
-  (segment (start 118.5 173.5) (end 128 173.5) (width 0.25) (layer "B.Cu") (net 20) (tstamp 1e3b9e89-6d11-48f9-97e9-735278bf98a3))
-  (segment (start 131 166.5) (end 131 158) (width 0.25) (layer "B.Cu") (net 20) (tstamp 28553614-f47c-46e8-bd5b-41e90a687d66))
-  (segment (start 191.54875 150.04875) (end 196.5 155) (width 0.25) (layer "B.Cu") (net 20) (tstamp 29663d66-766b-4612-911e-f1cfc63a8a0d))
-  (segment (start 234.63 155) (end 235.5 155) (width 0.25) (layer "B.Cu") (net 20) (tstamp 2f7ca36c-bff2-4028-9391-b8a3b4d7eec1))
-  (segment (start 215.5 154.92) (end 215.5 155) (width 0.25) (layer "B.Cu") (net 20) (tstamp 347ad809-da79-4731-9d5c-db5b001fd232))
-  (segment (start 131 158) (end 134 155) (width 0.25) (layer "B.Cu") (net 20) (tstamp 364d85d5-da80-4141-9517-7c2879bd52e2))
-  (segment (start 210.59875 150.01875) (end 215.5 154.92) (width 0.25) (layer "B.Cu") (net 20) (tstamp 3e37adc4-d769-4312-9493-68282d528a1c))
-  (segment (start 122.4925 188.11875) (end 118.61875 188.11875) (width 0.25) (layer "B.Cu") (net 20) (tstamp 4c259402-695a-4709-a788-fcd7829cdfba))
-  (segment (start 215.5 155) (end 235.5 155) (width 0.25) (layer "B.Cu") (net 20) (tstamp 4e2ebe76-a648-4235-bcb5-7cdcf94fec15))
-  (segment (start 229.64875 150.01875) (end 234.63 155) (width 0.25) (layer "B.Cu") (net 20) (tstamp 55e23868-b378-4efa-b88f-755a7ea02407))
-  (segment (start 134 155) (end 139 155) (width 0.25) (layer "B.Cu") (net 20) (tstamp 5b6b868a-f91d-4432-a0bb-1dd697337339))
-  (segment (start 178 155) (end 196.5 155) (width 0.25) (layer "B.Cu") (net 20) (tstamp 685429f2-81e6-410f-b7ad-d18d84cc16a8))
-  (segment (start 191.54875 150.01875) (end 191.54875 150.04875) (width 0.25) (layer "B.Cu") (net 20) (tstamp 6d134c4f-43b6-4d00-acf4-d1d10bfb4bc0))
-  (segment (start 172.49875 150.01875) (end 177.48 155) (width 0.25) (layer "B.Cu") (net 20) (tstamp 7610b7c4-0ac2-4ee3-bf64-8df40a972305))
-  (segment (start 115 184.5) (end 115 177) (width 0.25) (layer "B.Cu") (net 20) (tstamp 777e072f-1814-4686-a8d2-35169636d85b))
-  (segment (start 239 153.5) (end 239 150) (width 0.25) (layer "B.Cu") (net 20) (tstamp 79c0f7cd-33ef-4e97-bb2e-da1d97b623f3))
-  (segment (start 131 166.5) (end 133.56875 169.06875) (width 0.25) (layer "B.Cu") (net 20) (tstamp 7d46e9a5-b601-4c00-aed2-f0d1611a2bad))
-  (segment (start 134.39875 150.01875) (end 134.39875 150.39875) (width 0.25) (layer "B.Cu") (net 20) (tstamp 8313d076-9c37-4dda-b92e-990c31bcbfbe))
-  (segment (start 177.48 155) (end 178 155) (width 0.25) (layer "B.Cu") (net 20) (tstamp 8cd4cf84-b063-470d-8e4e-4b75ec751033))
-  (segment (start 239 150) (end 239 138) (width 0.25) (layer "B.Cu") (net 20) (tstamp 8f68f75b-1d64-4f3b-995f-b98527954d6b))
-  (segment (start 134.39875 150.39875) (end 139 155) (width 0.25) (layer "B.Cu") (net 20) (tstamp a8e6f290-0ec1-405d-ae8a-b4feefb42403))
-  (segment (start 158.5 155) (end 178 155) (width 0.25) (layer "B.Cu") (net 20) (tstamp b7e9ce0f-81d5-47e6-bce4-749f9b89d6b6))
-  (segment (start 153.44875 150.01875) (end 153.51875 150.01875) (width 0.25) (layer "B.Cu") (net 20) (tstamp ba3d74e8-5360-4bd0-ba63-2378971f3452))
-  (segment (start 128 173.5) (end 131 170.5) (width 0.25) (layer "B.Cu") (net 20) (tstamp c3b4f354-eeae-4f41-99b2-593546d84ef2))
-  (segment (start 115 177) (end 118.5 173.5) (width 0.25) (layer "B.Cu") (net 20) (tstamp c3cc8026-8990-4b59-8aaf-6c6f09870129))
-  (segment (start 153.51875 150.01875) (end 158.5 155) (width 0.25) (layer "B.Cu") (net 20) (tstamp e25ea3fd-04e7-4e72-bbc7-910b62b46644))
-  (segment (start 237.5 155) (end 239 153.5) (width 0.25) (layer "B.Cu") (net 20) (tstamp e2727b0c-b425-4291-b83b-87657b86d327))
-  (segment (start 196.5 155) (end 215.5 155) (width 0.25) (layer "B.Cu") (net 20) (tstamp ee37ced3-0509-4b83-ba8e-a8490f5d9c36))
-  (segment (start 235.5 155) (end 237.5 155) (width 0.25) (layer "B.Cu") (net 20) (tstamp fd1ce8db-5619-496c-86e5-81d3f34e6438))
-  (segment (start 131 170.5) (end 131 166.5) (width 0.25) (layer "B.Cu") (net 20) (tstamp fe2f8c4f-0e11-4c59-baac-77ded58e86b4))
-  (segment (start 118.61875 188.11875) (end 115 184.5) (width 0.25) (layer "B.Cu") (net 20) (tstamp fef88301-ec6a-4f56-b48e-9431b5163310))
-  (segment (start 143.35125 168.17875) (end 143.35125 159.22625) (width 0.25) (layer "B.Cu") (net 21) (tstamp 1bed7146-8492-44f2-a548-23a80a9211b6))
-  (segment (start 142.46125 169.06875) (end 143.35125 168.17875) (width 0.25) (layer "B.Cu") (net 21) (tstamp 77ddab86-8271-472e-aed8-b98cb9cc6ca5))
-  (segment (start 137.69875 150.01875) (end 138.58875 149.12875) (width 0.25) (layer "B.Cu") (net 22) (tstamp 6eed21a7-b7a7-4426-ab15-408fbb7c884d))
-  (segment (start 138.58875 149.12875) (end 138.58875 140.17625) (width 0.25) (layer "B.Cu") (net 22) (tstamp a3796146-bb38-4e8f-a2c0-7bbf211cf497))
-  (segment (start 156.74875 150.01875) (end 157.63875 149.12875) (width 0.25) (layer "B.Cu") (net 23) (tstamp 5dd4cfca-5854-4ba5-9487-aa1d147969c1))
-  (segment (start 157.63875 149.12875) (end 157.63875 140.17625) (width 0.25) (layer "B.Cu") (net 23) (tstamp f6593083-d865-4b35-9472-737da6215e61))
-  (segment (start 175.79875 150.01875) (end 176.68875 149.12875) (width 0.25) (layer "B.Cu") (net 24) (tstamp cb9db657-ac86-486e-9834-065049d68400))
-  (segment (start 176.68875 149.12875) (end 176.68875 140.17625) (width 0.25) (layer "B.Cu") (net 24) (tstamp dd65d586-db0a-4b50-aac5-d5e80a193edf))
-  (segment (start 194.84875 150.01875) (end 195.73875 149.12875) (width 0.25) (layer "B.Cu") (net 25) (tstamp 6f2c779d-e177-4f28-8abf-de496edf3408))
-  (segment (start 195.73875 149.12875) (end 195.73875 140.17625) (width 0.25) (layer "B.Cu") (net 25) (tstamp fafeedf3-fbaa-45a3-88cc-f000021ee3ab))
-  (segment (start 214.78875 149.12875) (end 214.78875 140.17625) (width 0.25) (layer "B.Cu") (net 26) (tstamp 04b9d6cb-28d1-4d72-af4e-3efb84eb543b))
-  (segment (start 213.89875 150.01875) (end 214.78875 149.12875) (width 0.25) (layer "B.Cu") (net 26) (tstamp a958bf23-e892-47b3-b093-4d35e55c283f))
-  (segment (start 233.83875 149.12875) (end 233.83875 140.17625) (width 0.25) (layer "B.Cu") (net 27) (tstamp 5501299a-e0d1-40ff-aaf2-7d4f09583d61))
-  (segment (start 232.94875 150.01875) (end 233.83875 149.12875) (width 0.25) (layer "B.Cu") (net 27) (tstamp eafdf589-54b0-45e0-b75c-ff096e93d68c))
-  (segment (start 350.52 187.22875) (end 350.52 178.27625) (width 0.25) (layer "B.Cu") (net 28) (tstamp e85b0723-b0e3-445c-89a8-bac2ec87e95e))
-  (segment (start 349.63 188.11875) (end 350.52 187.22875) (width 0.25) (layer "B.Cu") (net 28) (tstamp fa99d3b3-5ab2-4c23-b33c-eacb4c8a2ede))
-  (segment (start 244.245 113.4) (end 234 123.645) (width 0.25) (layer "F.Cu") (net 29) (tstamp 01482aa1-f25b-4735-bcfc-d3b7ea004936))
-  (segment (start 234 131.975402) (end 240.5 138.475402) (width 0.25) (layer "F.Cu") (net 29) (tstamp 09a0a993-095b-4b9b-a0a1-0206cff5641e))
-  (segment (start 240.5 138.475402) (end 240.5 138.5) (width 0.25) (layer "F.Cu") (net 29) (tstamp 4067ed1f-0ba3-4e19-bfce-300d86af6397))
-  (segment (start 234 123.645) (end 234 131.975402) (width 0.25) (layer "F.Cu") (net 29) (tstamp 4bb5fb5e-bfce-4532-a1fd-73bcc225d4c5))
-  (via (at 240.5 138.5) (size 0.8) (drill 0.4) (layers "F.Cu" "B.Cu") (net 29) (tstamp 865adb6e-2e53-4ff2-9a81-4c0d23f3c938))
-  (segment (start 319.5 154.5) (end 322 157) (width 0.25) (layer "B.Cu") (net 29) (tstamp 014c6618-40f3-4207-a439-cac1c4a6c327))
-  (segment (start 322 157) (end 322 167.5) (width 0.25) (layer "B.Cu") (net 29) (tstamp 16760c90-b68f-4562-b612-443a2197f927))
-  (segment (start 347 169) (end 347.06875 169.06875) (width 0.25) (layer "B.Cu") (net 29) (tstamp 1bed58c0-3217-4620-ad14-911a3b535259))
-  (segment (start 282.3175 154.5) (end 281.5 154.5) (width 0.25) (layer "B.Cu") (net 29) (tstamp 23846a1f-f5dc-46ad-bedb-cf7a5d1af666))
-  (segment (start 322 167.5) (end 323.56875 169.06875) (width 0.25) (layer "B.Cu") (net 29) (tstamp 27e95523-fbb1-4eba-88fc-60049a401169))
-  (segment (start 263 154.5) (end 281.5 154.5) (width 0.25) (layer "B.Cu") (net 29) (tstamp 2a21ebc6-c756-4597-bc40-2ea444164b1d))
-  (segment (start 267.48125 150.01875) (end 263 154.5) (width 0.25) (layer "B.Cu") (net 29) (tstamp 3850be12-4fb3-46dc-a883-77d730da4219))
-  (segment (start 301.3675 154.5) (end 300.5 154.5) (width 0.25) (layer "B.Cu") (net 29) (tstamp 39b68c92-406f-4af1-a907-ac1abb085e82))
-  (segment (start 347.06875 169.06875) (end 351.0925 169.06875) (width 0.25) (layer "B.Cu") (net 29) (tstamp 55e64a6f-4d13-4204-9eb6-b6228c213d57))
-  (segment (start 340.11875 188.11875) (end 346.33 188.11875) (width 0.25) (layer "B.Cu") (net 29) (tstamp 5c300cc4-3450-43a2-bddc-38e3a6cbd8de))
-  (segment (start 240.5 145.5) (end 240.5 138.5) (width 0.25) (layer "B.Cu") (net 29) (tstamp 6a33d92d-3035-4dde-8092-009c1d57b481))
-  (segment (start 333 174.5) (end 338 179.5) (width 0.25) (layer "B.Cu") (net 29) (tstamp 7330a893-d572-49cc-b7af-1391c9141440))
-  (segment (start 305.84875 150.01875) (end 301.3675 154.5) (width 0.25) (layer "B.Cu") (net 29) (tstamp 7640a5a8-86b6-44c6-94e1-7119e907b017))
-  (segment (start 253.18 154.5) (end 263 154.5) (width 0.25) (layer "B.Cu") (net 29) (tstamp 7866a68f-1fce-4140-b317-91d789f2dbe7))
-  (segment (start 322 167.5) (end 322 171) (width 0.25) (layer "B.Cu") (net 29) (tstamp 84f20d78-53b2-47d3-be3b-4cff14f17f9a))
-  (segment (start 300.5 154.5) (end 319.5 154.5) (width 0.25) (layer "B.Cu") (net 29) (tstamp 86ce1960-2a2f-4eda-88c9-1d3ff95f3dc8))
-  (segment (start 267.74875 150.01875) (end 267.48125 150.01875) (width 0.25) (layer "B.Cu") (net 29) (tstamp 8a8df44b-cd30-4bd8-8a85-0eec1d866dc0))
-  (segment (start 248.68 150) (end 248.69875 150.01875) (width 0.25) (layer "B.Cu") (net 29) (tstamp 8b20b6d0-e661-498c-bd9d-b7cf3b219783))
-  (segment (start 333 174.5) (end 341.5 174.5) (width 0.25) (layer "B.Cu") (net 29) (tstamp 9a59473c-da3c-4092-9f5a-dc34eeaaf2cb))
-  (segment (start 281.5 154.5) (end 300.5 154.5) (width 0.25) (layer "B.Cu") (net 29) (tstamp a090e6d8-ae6b-475d-9ca1-523e60e9bb03))
-  (segment (start 322 171) (end 325.5 174.5) (width 0.25) (layer "B.Cu") (net 29) (tstamp a187cfbf-fdef-45de-9f2b-e52e5249c699))
-  (segment (start 323.98125 150.01875) (end 324.89875 150.01875) (width 0.25) (layer "B.Cu") (net 29) (tstamp ac42abaf-d1fe-412f-8ea9-be985c6d68ed))
-  (segment (start 248.69875 150.01875) (end 253.18 154.5) (width 0.25) (layer "B.Cu") (net 29) (tstamp c3591b30-87af-480b-af1c-08a14a0ba100))
-  (segment (start 325.5 174.5) (end 333 174.5) (width 0.25) (layer "B.Cu") (net 29) (tstamp d886ed72-1bd0-49a0-a604-4af98ef4d36b))
-  (segment (start 245 150) (end 248.68 150) (width 0.25) (layer "B.Cu") (net 29) (tstamp d91f572b-91ee-4b21-a894-1c59a2155a82))
-  (segment (start 323.56875 169.06875) (end 329.66125 169.06875) (width 0.25) (layer "B.Cu") (net 29) (tstamp e678db23-9a46-471d-8594-bd0b59de5c57))
-  (segment (start 338 186) (end 340.11875 188.11875) (width 0.25) (layer "B.Cu") (net 29) (tstamp e68df726-8619-4dbf-a5dc-bafd7993fb8a))
-  (segment (start 286.79875 150.01875) (end 282.3175 154.5) (width 0.25) (layer "B.Cu") (net 29) (tstamp eda2bb7f-7ac1-4b0e-828d-bf7135469edf))
-  (segment (start 245 150) (end 240.5 145.5) (width 0.25) (layer "B.Cu") (net 29) (tstamp ef9b8ece-70c0-4b79-959a-488bed4283fa))
-  (segment (start 319.5 154.5) (end 323.98125 150.01875) (width 0.25) (layer "B.Cu") (net 29) (tstamp f564918d-40b8-4096-8984-a774257c3aae))
-  (segment (start 341.5 174.5) (end 347 169) (width 0.25) (layer "B.Cu") (net 29) (tstamp f6c58dcd-1f81-4138-8f25-187b49df6f77))
-  (segment (start 338 179.5) (end 338 186) (width 0.25) (layer "B.Cu") (net 29) (tstamp faf6307d-8657-4591-b0f5-ae369168425c))
-  (segment (start 354.3925 169.06875) (end 355.2825 168.17875) (width 0.25) (layer "B.Cu") (net 30) (tstamp 73672302-936e-4d73-8613-caa46dd23939))
-  (segment (start 355.2825 168.17875) (end 355.2825 159.22625) (width 0.25) (layer "B.Cu") (net 30) (tstamp c07f27d7-7c5c-4885-95e5-19d6e50e4350))
-  (segment (start 332.96125 169.06875) (end 333.85125 168.17875) (width 0.25) (layer "B.Cu") (net 31) (tstamp 7f02d3a8-9195-4c42-88c4-97e639ef4b8a))
-  (segment (start 333.85125 168.17875) (end 333.85125 159.22625) (width 0.25) (layer "B.Cu") (net 31) (tstamp 89e5ddf2-2192-4fe9-bb68-d49344695068))
-  (segment (start 329.08875 149.12875) (end 329.08875 140.17625) (width 0.25) (layer "B.Cu") (net 32) (tstamp 730b1e61-400f-4940-bf84-b35710124872))
-  (segment (start 328.19875 150.01875) (end 329.08875 149.12875) (width 0.25) (layer "B.Cu") (net 32) (tstamp ad0e46e4-c8fd-4acc-bf87-a4e92fa99e44))
-  (segment (start 309.14875 150.01875) (end 310.03875 149.12875) (width 0.25) (layer "B.Cu") (net 33) (tstamp e81bfc99-8ef4-4105-927a-2a7365f0bb31))
-  (segment (start 310.03875 149.12875) (end 310.03875 140.17625) (width 0.25) (layer "B.Cu") (net 33) (tstamp fa0ce2be-f61c-4b70-924d-1a9086e73d1a))
-  (segment (start 290.98875 149.12875) (end 290.98875 140.17625) (width 0.25) (layer "B.Cu") (net 34) (tstamp 1655b994-1d98-4b3a-87b5-bcf736176914))
-  (segment (start 290.09875 150.01875) (end 290.98875 149.12875) (width 0.25) (layer "B.Cu") (net 34) (tstamp 56970f2d-40dd-4d99-8e35-58d24c8a5889))
-  (segment (start 271.04875 150.01875) (end 271.93875 149.12875) (width 0.25) (layer "B.Cu") (net 35) (tstamp 13d4ad48-2541-4e93-bba6-fee8a2e816cb))
-  (segment (start 271.93875 149.12875) (end 271.93875 140.17625) (width 0.25) (layer "B.Cu") (net 35) (tstamp e1570da2-e99e-4789-a457-043e167bada5))
-  (segment (start 252.88875 149.12875) (end 252.88875 140.17625) (width 0.25) (layer "B.Cu") (net 36) (tstamp 439c97dd-b1df-4ea7-b836-c87ec00ed518))
-  (segment (start 251.99875 150.01875) (end 252.88875 149.12875) (width 0.25) (layer "B.Cu") (net 36) (tstamp 711643ca-9104-4cdf-8317-34933586a518))
-  (segment (start 118.64875 207.16875) (end 119.53875 206.27875) (width 0.25) (layer "B.Cu") (net 37) (tstamp 1b8a7073-5f86-466a-977b-6ffedfe683ad))
-  (segment (start 119.53875 206.27875) (end 119.53875 197.32625) (width 0.25) (layer "B.Cu") (net 37) (tstamp c669f774-c49b-4a84-b032-d2cb176cce73))
-  (segment (start 240.5 148.5) (end 240.5 143) (width 0.25) (layer "F.Cu") (net 38) (tstamp 2ec1ee22-7fe3-434a-8580-0e9d6ca239c2))
-  (segment (start 240.5 143) (end 249 134.5) (width 0.25) (layer "F.Cu") (net 38) (tstamp 3d241127-114c-4f72-b2ef-ed09fe46a408))
-  (segment (start 249 118.5) (end 246.785 116.285) (width 0.25) (layer "F.Cu") (net 38) (tstamp 7aae2955-3938-470e-8e21-cca89739ff2b))
-  (segment (start 246.785 116.285) (end 246.785 113.4) (width 0.25) (layer "F.Cu") (net 38) (tstamp bc176da6-7d7e-405b-8fd9-7713e91c9abe))
-  (segment (start 249 134.5) (end 249 118.5) (width 0.25) (layer "F.Cu") (net 38) (tstamp cdd3b28c-49bb-46c7-99cb-fb4259e01b92))
-  (via (at 240.5 148.5) (size 0.8) (drill 0.4) (layers "F.Cu" "B.Cu") (net 38) (tstamp 6cb843ac-9011-4089-9a4a-fad5add29027))
-  (segment (start 165.5 173.5) (end 181.5 173.5) (width 0.25) (layer "B.Cu") (net 38) (tstamp 05dff3e6-08e0-4ccc-93cf-acc666057c44))
-  (segment (start 245 153) (end 240.5 148.5) (width 0.25) (layer "B.Cu") (net 38) (tstamp 08599180-bad4-4124-8b85-b34550a1adb7))
-  (segment (start 219.7925 173.5) (end 221 173.5) (width 0.25) (layer "B.Cu") (net 38) (tstamp 0d908d45-d571-49d3-ab84-ad9a6e3729c1))
-  (segment (start 131.66875 207.16875) (end 130 205.5) (width 0.25) (layer "B.Cu") (net 38) (tstamp 13d5ae95-1200-4986-8d05-eaa3daf26fa6))
-  (segment (start 142 178) (end 142 186.5) (width 0.25) (layer "B.Cu") (net 38) (tstamp 1c079145-7162-42bb-936e-402e14eed344))
-  (segment (start 119.5 211.5) (end 124 211.5) (width 0.25) (layer "B.Cu") (net 38) (tstamp 27754269-e0f6-4174-868e-95ee8f37f5f1))
-  (segment (start 221 173.5) (end 239 173.5) (width 0.25) (layer "B.Cu") (net 38) (tstamp 3241e52c-f2ea-44aa-9741-d7d7251208bf))
-  (segment (start 130 205.5) (end 130 195) (width 0.25) (layer "B.Cu") (net 38) (tstamp 359f2451-3795-4fa3-b6da-8ebc1eb417bc))
-  (segment (start 196.31125 169.06875) (end 200.7425 173.5) (width 0.25) (layer "B.Cu") (net 38) (tstamp 42678092-fc64-4101-986d-a3dafca8d77c))
-  (segment (start 142 186.5) (end 142 190) (width 0.25) (layer "B.Cu") (net 38) (tstamp 42bb6947-68ac-4f17-a57e-90aa61dd57c8))
-  (segment (start 177.26125 169.06875) (end 177.26125 169.26125) (width 0.25) (layer "B.Cu") (net 38) (tstamp 48aa1bc2-4def-41d1-af71-f80d018f0fe7))
-  (segment (start 234.41125 169.06875) (end 238.8425 173.5) (width 0.25) (layer "B.Cu") (net 38) (tstamp 4bf853f9-d997-4429-ac68-58425b63c61c))
-  (segment (start 158.21125 169.06875) (end 162.6425 173.5) (width 0.25) (layer "B.Cu") (net 38) (tstamp 5a94624b-d1d3-47e5-a433-61b6cc8b9007))
-  (segment (start 200.7425 173.5) (end 201 173.5) (width 0.25) (layer "B.Cu") (net 38) (tstamp 5dc02825-6044-4065-afef-9e8f047fd8bb))
-  (segment (start 130 195) (end 130.5 194.5) (width 0.25) (layer "B.Cu") (net 38) (tstamp 7e2e6b5c-32d4-46dc-98da-8f953439009b))
-  (segment (start 215.36125 169.06875) (end 219.7925 173.5) (width 0.25) (layer "B.Cu") (net 38) (tstamp 812155bb-6228-45a2-84c0-021075b5b26f))
-  (segment (start 143.61875 188.11875) (end 148.68625 188.11875) (width 0.25) (layer "B.Cu") (net 38) (tstamp 8269cd52-a2d5-4456-a99f-01a59d9fdf77))
-  (segment (start 245 170.5) (end 245 155.5) (width 0.25) (layer "B.Cu") (net 38) (tstamp 85591a70-551d-407b-876e-87bf1ece2a66))
-  (segment (start 132.5 192.5) (end 139.5 192.5) (width 0.25) (layer "B.Cu") (net 38) (tstamp 8c64eaa2-0c06-4e8a-b1b6-bbeec9ffc7ca))
-  (segment (start 201 173.5) (end 221 173.5) (width 0.25) (layer "B.Cu") (net 38) (tstamp 92dcf986-492e-423e-be39-e971852e78c7))
-  (segment (start 142 190) (end 139.5 192.5) (width 0.25) (layer "B.Cu") (net 38) (tstamp 98c7c1b8-86ad-4943-ad1f-28d93fe20e05))
-  (segment (start 242 173.5) (end 242.5 173) (width 0.25) (layer "B.Cu") (net 38) (tstamp a5389172-6b90-448d-93f1-96930bad3a82))
-  (segment (start 242.5 173) (end 245 170.5) (width 0.25) (layer "B.Cu") (net 38) (tstamp a5af45bc-62c5-4fd9-abf9-792806a63103))
-  (segment (start 177.26125 169.26125) (end 181.5 173.5) (width 0.25) (layer "B.Cu") (net 38) (tstamp a61af02a-b31f-457b-a914-3db69bc214be))
-  (segment (start 162.6425 173.5) (end 146.5 173.5) (width 0.25) (layer "B.Cu") (net 38) (tstamp a6fc07d5-1050-42e2-a969-7410709198d1))
-  (segment (start 162.6425 173.5) (end 165.5 173.5) (width 0.25) (layer "B.Cu") (net 38) (tstamp ae4c2c06-d241-4107-9add-a758c7819ce6))
-  (segment (start 245 155.5) (end 245 153) (width 0.25) (layer "B.Cu") (net 38) (tstamp bec5e937-1ca6-46fe-89ad-42466ed92313))
-  (segment (start 239 173.5) (end 242 173.5) (width 0.25) (layer "B.Cu") (net 38) (tstamp c007a05d-d3bb-4397-b073-62c39ba93351))
-  (segment (start 181.5 173.5) (end 201 173.5) (width 0.25) (layer "B.Cu") (net 38) (tstamp c3f1fb81-69fb-4559-b290-e6719ac15023))
-  (segment (start 238.8425 173.5) (end 239 173.5) (width 0.25) (layer "B.Cu") (net 38) (tstamp c8fe0cac-c288-4d4f-84b6-e5027a60eef9))
-  (segment (start 115.34875 207.16875) (end 115.34875 207.34875) (width 0.25) (layer "B.Cu") (net 38) (tstamp d71e8deb-6e5e-40a8-b3cf-607d0f1f9472))
-  (segment (start 146.5 173.5) (end 142 178) (width 0.25) (layer "B.Cu") (net 38) (tstamp db57c238-3371-49bd-ba9c-29ecbc121579))
-  (segment (start 130.5 194.5) (end 132.5 192.5) (width 0.25) (layer "B.Cu") (net 38) (tstamp db894c80-f92e-4411-8ee0-312360f442d9))
-  (segment (start 115.34875 207.34875) (end 119.5 211.5) (width 0.25) (layer "B.Cu") (net 38) (tstamp dca14256-a3d7-488d-aadb-00c801ec82c9))
-  (segment (start 124 211.5) (end 130 205.5) (width 0.25) (layer "B.Cu") (net 38) (tstamp e33e8ec5-78d7-498b-969b-9f8e8f4e40d5))
-  (segment (start 142 186.5) (end 143.61875 188.11875) (width 0.25) (layer "B.Cu") (net 38) (tstamp e8c4b028-f987-4f4c-9372-888fab941143))
-  (segment (start 136.78 207.16875) (end 131.66875 207.16875) (width 0.25) (layer "B.Cu") (net 38) (tstamp e9313e20-40b8-4a99-80a9-114ab22dec23))
-  (segment (start 140.08 207.16875) (end 140.97 206.27875) (width 0.25) (layer "B.Cu") (net 39) (tstamp 806080cf-cdc9-4602-ae42-b4878e5b6315))
-  (segment (start 140.97 206.27875) (end 140.97 197.32625) (width 0.25) (layer "B.Cu") (net 39) (tstamp d0f733db-abb9-4914-b971-e2f07b41e371))
-  (segment (start 152.87625 187.22875) (end 152.87625 178.27625) (width 0.25) (layer "B.Cu") (net 40) (tstamp 2f147d92-0acc-4964-83a9-783cdaece8e9))
-  (segment (start 151.98625 188.11875) (end 152.87625 187.22875) (width 0.25) (layer "B.Cu") (net 40) (tstamp c19a74a5-259c-483b-8a73-8970255915ff))
-  (segment (start 161.51125 169.06875) (end 162.40125 168.17875) (width 0.25) (layer "B.Cu") (net 41) (tstamp 58f4a643-93e2-4f80-b83f-2711c4d62be6))
-  (segment (start 162.40125 168.17875) (end 162.40125 159.22625) (width 0.25) (layer "B.Cu") (net 41) (tstamp 9fecb765-01b4-4984-9ee3-633e24cdbcb5))
-  (segment (start 181.45125 168.17875) (end 181.45125 159.22625) (width 0.25) (layer "B.Cu") (net 42) (tstamp 44e8063f-8568-4417-9e00-901313016a75))
-  (segment (start 180.56125 169.06875) (end 181.45125 168.17875) (width 0.25) (layer "B.Cu") (net 42) (tstamp eeb84fbb-6f19-4fe4-b390-1a9960d9fd97))
-  (segment (start 200.50125 168.17875) (end 200.50125 159.22625) (width 0.25) (layer "B.Cu") (net 43) (tstamp 28b24740-8b62-4427-b076-dd43a6a63b6f))
-  (segment (start 199.61125 169.06875) (end 200.50125 168.17875) (width 0.25) (layer "B.Cu") (net 43) (tstamp 7caf813c-52f9-4b45-b4ea-dfe77b26aaa8))
-  (segment (start 218.66125 169.06875) (end 219.55125 168.17875) (width 0.25) (layer "B.Cu") (net 44) (tstamp d5c27944-10f6-4a2e-8847-2bdae9c45ea2))
-  (segment (start 219.55125 168.17875) (end 219.55125 159.22625) (width 0.25) (layer "B.Cu") (net 44) (tstamp fc22563c-eeda-46ee-96d8-caf999d37d6c))
-  (segment (start 237.71125 169.06875) (end 238.60125 168.17875) (width 0.25) (layer "B.Cu") (net 45) (tstamp 0f0a5a1f-d571-4178-9f76-05b9612c47cc))
-  (segment (start 238.60125 168.17875) (end 238.60125 159.22625) (width 0.25) (layer "B.Cu") (net 45) (tstamp 68e077e5-f006-4d5c-867a-47200ef81505))
-  (segment (start 357.66375 206.27875) (end 357.66375 197.32625) (width 0.25) (layer "B.Cu") (net 46) (tstamp aa7cf116-441a-46c2-b223-00c9b39880ee))
-  (segment (start 356.77375 207.16875) (end 357.66375 206.27875) (width 0.25) (layer "B.Cu") (net 46) (tstamp ef850ebb-768c-46bd-8a0b-bb5655452362))
-  (segment (start 241.5 148) (end 241.5 143) (width 0.25) (layer "F.Cu") (net 47) (tstamp 19d3a27c-6fc0-4e28-abe1-913dec088cf4))
-  (segment (start 250 117.5) (end 249.325 116.825) (width 0.25) (layer "F.Cu") (net 47) (tstamp 71343b99-575d-4cfd-b014-8b25d6b2f153))
-  (segment (start 249.325 116.825) (end 249.325 113.4) (width 0.25) (layer "F.Cu") (net 47) (tstamp 80fa27f3-622b-40d9-9cd3-077159bb5ae6))
-  (segment (start 241.5 143) (end 250 134.5) (width 0.25) (layer "F.Cu") (net 47) (tstamp a8f949e3-fa7e-446c-ba11-0efc0d0a0078))
-  (segment (start 250 134.5) (end 250 117.5) (width 0.25) (layer "F.Cu") (net 47) (tstamp d33ca532-1192-45ba-a9c2-9b8171c034db))
-  (via (at 241.5 148) (size 0.8) (drill 0.4) (layers "F.Cu" "B.Cu") (net 47) (tstamp 505a7d08-5979-4de4-965c-153b0159ba51))
-  (segment (start 312.5 191) (end 312.5 176) (width 0.25) (layer "B.Cu") (net 47) (tstamp 0e11ac9f-1cc1-4eab-935f-9337bc6b7b37))
-  (segment (start 272.51125 169.06875) (end 268.08 173.5) (width 0.25) (layer "B.Cu") (net 47) (tstamp 1236bcb3-6f02-4b0d-957c-70f850c19bcf))
-  (segment (start 329 211.5) (end 319.705 211.5) (width 0.25) (layer "B.Cu") (net 47) (tstamp 220b11d1-bff8-414d-878c-f0d3c7549ba4))
-  (segment (start 349.1425 211.5) (end 329 211.5) (width 0.25) (layer "B.Cu") (net 47) (tstamp 236f0fbc-fc75-4cc2-96ef-939f671ceb34))
-  (segment (start 246.5 170.5) (end 246.5 170) (width 0.25) (layer "B.Cu") (net 47) (tstamp 2dc95e5e-5908-4265-a7ca-3cdaff82dfd5))
-  (segment (start 307.5 203) (end 307.5 196) (width 0.25) (layer "B.Cu") (net 47) (tstamp 31a0fa03-a8b4-4e5e-8f2c-f429b9dfc815))
-  (segment (start 246.5 170) (end 252.53 170) (width 0.25) (layer "B.Cu") (net 47) (tstamp 43cb6fa3-381d-4185-afb5-84e3d7b21a92))
-  (segment (start 307.5 196) (end 312.5 191) (width 0.25) (layer "B.Cu") (net 47) (tstamp 43d79fa3-8c96-42da-a823-57613aecdbfc))
-  (segment (start 246.5 153) (end 241.5 148) (width 0.25) (layer "B.Cu") (net 47) (tstamp 47d66f83-8e66-4a56-850d-cd9858ae7907))
-  (segment (start 314.805088 207) (end 311.5 207) (width 0.25) (layer "B.Cu") (net 47) (tstamp 4daadb2a-4aa2-4b25-ad7e-5ff3904f1b9b))
-  (segment (start 249.5 173.5) (end 246.5 170.5) (width 0.25) (layer "B.Cu") (net 47) (tstamp 5a6247af-f2d6-4a64-9b6b-53ca331bf45b))
-  (segment (start 246.5 170) (end 246.5 153) (width 0.25) (layer "B.Cu") (net 47) (tstamp 6061f976-200b-4317-b60c-1af9f8441317))
-  (segment (start 310 173.5) (end 266.5 173.5) (width 0.25) (layer "B.Cu") (net 47) (tstamp 6e93b97e-47ed-45f5-9ed4-adc7866a16e4))
-  (segment (start 259.5 173.5) (end 257.8925 173.5) (width 0.25) (layer "B.Cu") (net 47) (tstamp 714266a9-de5d-4e66-befd-bb93d13c99aa))
-  (segment (start 334.42375 207.16875) (end 330.0925 211.5) (width 0.25) (layer "B.Cu") (net 47) (tstamp 7ef1a315-05f2-4b16-ac66-1aff9431f2b2))
-  (segment (start 268.08 173.5) (end 266.5 173.5) (width 0.25) (layer "B.Cu") (net 47) (tstamp 8020006b-d7b9-4b1e-9944-74951923089f))
-  (segment (start 315.37375 207.16875) (end 314.973838 207.16875) (width 0.25) (layer "B.Cu") (net 47) (tstamp 95406232-30a7-42d0-8214-d128de37493b))
-  (segment (start 252.53 170) (end 253.46125 169.06875) (width 0.25) (layer "B.Cu") (net 47) (tstamp 9e7be682-d9af-4641-998e-8d10e3fdcfdd))
-  (segment (start 266.5 173.5) (end 259.5 173.5) (width 0.25) (layer "B.Cu") (net 47) (tstamp b6f1a21a-b209-481b-b3fa-8804fc7d32e6))
-  (segment (start 312.5 176) (end 310 173.5) (width 0.25) (layer "B.Cu") (net 47) (tstamp ba4ac7ca-f896-4698-8a1c-e6a240dce6df))
-  (segment (start 353.47375 207.16875) (end 349.1425 211.5) (width 0.25) (layer "B.Cu") (net 47) (tstamp bbc46009-88c8-41e8-8eb5-3b7018cca645))
-  (segment (start 330.0925 211.5) (end 329 211.5) (width 0.25) (layer "B.Cu") (net 47) (tstamp bde98c63-e2a7-46c4-8c61-532747bb88e2))
-  (segment (start 259.5 173.5) (end 249.5 173.5) (width 0.25) (layer "B.Cu") (net 47) (tstamp bdf3b452-3fba-425d-a3ce-fc597b3184c4))
-  (segment (start 314.973838 207.16875) (end 314.805088 207) (width 0.25) (layer "B.Cu") (net 47) (tstamp d4cb2a3d-121a-4418-ba17-b19b1a272008))
-  (segment (start 311.5 207) (end 307.5 203) (width 0.25) (layer "B.Cu") (net 47) (tstamp e7707163-e077-4dc8-baaf-0123bfa85e74))
-  (segment (start 319.705 211.5) (end 315.37375 207.16875) (width 0.25) (layer "B.Cu") (net 47) (tstamp f332dea2-7d63-4201-a2ce-ca695f75a845))
-  (segment (start 337.72375 207.16875) (end 338.61375 206.27875) (width 0.25) (layer "B.Cu") (net 48) (tstamp 2ec3ec29-f1b4-4db2-9d4b-05b3bc3bff04))
-  (segment (start 338.61375 206.27875) (end 338.61375 197.32625) (width 0.25) (layer "B.Cu") (net 48) (tstamp b7f6b8f6-fe3b-4212-87f2-359d3bfa228f))
-  (segment (start 319.56375 206.27875) (end 319.56375 197.32625) (width 0.25) (layer "B.Cu") (net 49) (tstamp 616a33c2-8772-4f4b-a8e3-973468bda6dd))
-  (segment (start 318.67375 207.16875) (end 319.56375 206.27875) (width 0.25) (layer "B.Cu") (net 49) (tstamp db535b5d-f99c-4eb4-9d52-870889727b4a))
-  (segment (start 323.43625 188.11875) (end 324.32625 187.22875) (width 0.25) (layer "B.Cu") (net 50) (tstamp 0846807d-ac9e-4332-abd9-57cf679d6d86))
-  (segment (start 324.32625 187.22875) (end 324.32625 178.27625) (width 0.25) (layer "B.Cu") (net 50) (tstamp 70a1b90e-a8ae-4d0f-b37d-f22687716b96))
-  (segment (start 313.91125 169.06875) (end 314.80125 168.17875) (width 0.25) (layer "B.Cu") (net 51) (tstamp 91204e9d-ee92-4db4-80ee-1b22ddd115e8))
-  (segment (start 314.80125 168.17875) (end 314.80125 159.22625) (width 0.25) (layer "B.Cu") (net 51) (tstamp a9e1657e-db8f-4e17-90c0-adeb1dca9791))
-  (segment (start 294.86125 169.06875) (end 295.75125 168.17875) (width 0.25) (layer "B.Cu") (net 52) (tstamp 15aad753-4dca-4b76-93f1-a7dc10970136))
-  (segment (start 295.75125 168.17875) (end 295.75125 159.22625) (width 0.25) (layer "B.Cu") (net 52) (tstamp bb8ac562-1ccb-48c5-adbb-315b2834da6b))
-  (segment (start 276.70125 168.17875) (end 276.70125 159.22625) (width 0.25) (layer "B.Cu") (net 53) (tstamp 123f678b-2b11-4ecc-95c5-6145aee900e4))
-  (segment (start 275.81125 169.06875) (end 276.70125 168.17875) (width 0.25) (layer "B.Cu") (net 53) (tstamp 4dd03308-4d0c-4190-a5a5-3e96f0761379))
-  (segment (start 257.65125 168.17875) (end 257.65125 159.22625) (width 0.25) (layer "B.Cu") (net 54) (tstamp 352cc84a-db21-446b-8ea9-c3179e321b9d))
-  (segment (start 256.76125 169.06875) (end 257.65125 168.17875) (width 0.25) (layer "B.Cu") (net 54) (tstamp 68c61797-f94b-4d14-a368-0091ed1242ae))
-  (segment (start 164.7825 206.27875) (end 164.7825 197.32625) (width 0.25) (layer "B.Cu") (net 55) (tstamp 613076ba-0dc6-4934-a0da-debd66028739))
-  (segment (start 163.8925 207.16875) (end 164.7825 206.27875) (width 0.25) (layer "B.Cu") (net 55) (tstamp a850dae1-7140-4687-b9ef-79d7c3815e68))
-  (segment (start 251.865 134.135) (end 251.865 113.4) (width 0.25) (layer "F.Cu") (net 56) (tstamp 158d127b-26df-4a35-82be-8ed20ffc9620))
-  (segment (start 245.5 172.5) (end 245.5 150) (width 0.25) (layer "F.Cu") (net 56) (tstamp 1ab86560-5a93-431f-b039-f2b7d88a158a))
-  (segment (start 242.5 143.5) (end 251.865 134.135) (width 0.25) (layer "F.Cu") (net 56) (tstamp 28578fdf-35ce-4959-8ef0-0c5e7381a890))
-  (segment (start 242.5 147) (end 242.5 143.5) (width 0.25) (layer "F.Cu") (net 56) (tstamp 5af44313-35c1-4e35-99a1-a4e63c5006b1))
-  (segment (start 245.5 150) (end 242.5 147) (width 0.25) (layer "F.Cu") (net 56) (tstamp 6061612e-05a7-48bc-86ed-95ea3057689c))
-  (via (at 245.5 172.5) (size 0.8) (drill 0.4) (layers "F.Cu" "B.Cu") (net 56) (tstamp 8e4fb3e2-6a39-4378-9b9c-56a191f466af))
-  (segment (start 201.455 192.5) (end 204.5 192.5) (width 0.25) (layer "B.Cu") (net 56) (tstamp 0013b9aa-deef-4ce9-b77d-758e484534e8))
-  (segment (start 252 192.5) (end 255 189.5) (width 0.25) (layer "B.Cu") (net 56) (tstamp 18911ba3-bf28-4623-a5ee-a9045c8183cf))
-  (segment (start 191.1675 192.5) (end 192.5 192.5) (width 0.25) (layer "B.Cu") (net 56) (tstamp 19dd74ec-bc7a-4e53-94e6-8e46a284fa87))
-  (segment (start 214.5 192.5) (end 252 192.5) (width 0.25) (layer "B.Cu") (net 56) (tstamp 1d4916cc-c685-4765-8103-297eb36c9844))
-  (segment (start 255 186) (end 257.11875 188.11875) (width 0.25) (layer "B.Cu") (net 56) (tstamp 220a65d6-5021-44b7-b778-4a919e7ff905))
-  (segment (start 167.73625 188.23625) (end 172 192.5) (width 0.25) (layer "B.Cu") (net 56) (tstamp 287fd83a-f9d5-4c92-995a-bfe5273c6efb))
-  (segment (start 257.11875 188.11875) (end 262.98625 188.11875) (width 0.25) (layer "B.Cu") (net 56) (tstamp 45fc7aa5-4e01-4ddd-8204-4871a4b13969))
-  (segment (start 205.83625 188.11875) (end 205.83625 188.33625) (width 0.25) (layer "B.Cu") (net 56) (tstamp 515a08cf-19c9-4828-9e93-c15dad9063fb))
-  (segment (start 172 192.5) (end 192.5 192.5) (width 0.25) (layer "B.Cu") (net 56) (tstamp 577136cf-b69d-4d36-aac7-fc413e915fa6))
-  (segment (start 255 176.5) (end 253.5 175) (width 0.25) (layer "B.Cu") (net 56) (tstamp 57e9127d-6029-4522-a706-6d99a7df81fe))
-  (segment (start 205.83625 188.33625) (end 210 192.5) (width 0.25) (layer "B.Cu") (net 56) (tstamp 5eb051c0-fa3f-4662-ba8b-46cee7101c73))
-  (segment (start 204.5 192.5) (end 210 192.5) (width 0.25) (layer "B.Cu") (net 56) (tstamp 6f18c519-713f-466a-b5ca-317f7ea40fbf))
-  (segment (start 192.5 192.5) (end 201.455 192.5) (width 0.25) (layer "B.Cu") (net 56) (tstamp 72213a35-7b30-4e31-a857-0fdd2c81ec07))
-  (segment (start 158 192.5) (end 172 192.5) (width 0.25) (layer "B.Cu") (net 56) (tstamp 7400294f-2d99-4fa5-acb9-80fbbe41f9a9))
-  (segment (start 167.73625 188.11875) (end 167.73625 188.23625) (width 0.25) (layer "B.Cu") (net 56) (tstamp 7ae49051-4156-465e-b36b-7676b9a0f9bf))
-  (segment (start 255 189.5) (end 255 186) (width 0.25) (layer "B.Cu") (net 56) (tstamp 7dcac5b6-a1dc-441f-9999-3d8ea47a57bd))
-  (segment (start 186.78625 188.11875) (end 191.1675 192.5) (width 0.25) (layer "B.Cu") (net 56) (tstamp 8a672325-7158-4c96-91e4-ad28c813736b))
-  (segment (start 153 204) (end 153 197.5) (width 0.25) (layer "B.Cu") (net 56) (tstamp 97c37799-ea5b-4601-bdec-1a75dc2ec053))
-  (segment (start 156.16875 207.16875) (end 153 204) (width 0.25) (layer "B.Cu") (net 56) (tstamp a5416e86-7327-43e7-b4a3-db28db4bceca))
-  (segment (start 253.5 175) (end 248 175) (width 0.25) (layer "B.Cu") (net 56) (tstamp ca56c17b-ae2f-4028-a7b7-cc2a3554b08c))
-  (segment (start 248 175) (end 245.5 172.5) (width 0.25) (layer "B.Cu") (net 56) (tstamp d0b8da58-c4b2-49c2-aa16-c446d9b6f989))
-  (segment (start 153 197.5) (end 158 192.5) (width 0.25) (layer "B.Cu") (net 56) (tstamp d5523913-70e9-4884-8879-99c101d53e92))
-  (segment (start 255 186) (end 255 176.5) (width 0.25) (layer "B.Cu") (net 56) (tstamp da6d0dff-1884-447a-b438-d984771077a8))
-  (segment (start 210 192.5) (end 214.5 192.5) (width 0.25) (layer "B.Cu") (net 56) (tstamp e944cfcd-8e21-4009-8063-cbfaeecbd668))
-  (segment (start 160.5925 207.16875) (end 156.16875 207.16875) (width 0.25) (layer "B.Cu") (net 56) (tstamp eaa8ea0d-baac-4599-8826-bd5ad932ef90))
-  (segment (start 171.92625 187.22875) (end 171.92625 178.27625) (width 0.25) (layer "B.Cu") (net 57) (tstamp 0bafcbdb-ec10-4d4b-ad40-a7105280ff32))
-  (segment (start 171.03625 188.11875) (end 171.92625 187.22875) (width 0.25) (layer "B.Cu") (net 57) (tstamp 262b49f0-4a7a-4079-a868-234a5deabbbe))
-  (segment (start 190.97625 187.22875) (end 190.97625 178.27625) (width 0.25) (layer "B.Cu") (net 58) (tstamp 2fa4ddfa-7941-4466-8015-bcc3b7c57b75))
-  (segment (start 190.08625 188.11875) (end 190.97625 187.22875) (width 0.25) (layer "B.Cu") (net 58) (tstamp 5dd0c0ff-73dd-4e2c-9b6e-168541f6b978))
-  (segment (start 210.02625 187.22875) (end 210.02625 178.27625) (width 0.25) (layer "B.Cu") (net 59) (tstamp 2a2c80cf-82a5-4513-a05c-c09e403b1bef))
-  (segment (start 209.13625 188.11875) (end 210.02625 187.22875) (width 0.25) (layer "B.Cu") (net 59) (tstamp 61d402fa-7464-4b0c-adfe-0a5113fa26bd))
-  (segment (start 229.07625 187.22875) (end 229.07625 178.27625) (width 0.25) (layer "B.Cu") (net 60) (tstamp 3ae26dde-4252-4ade-9404-166b9132499c))
-  (segment (start 228.18625 188.11875) (end 229.07625 187.22875) (width 0.25) (layer "B.Cu") (net 60) (tstamp d5866e16-2755-47d5-98fa-161b6369522a))
-  (segment (start 248.12625 187.22875) (end 248.12625 178.27625) (width 0.25) (layer "B.Cu") (net 61) (tstamp 4f4e1843-372e-489d-95d0-5b32b19af7d6))
-  (segment (start 247.23625 188.11875) (end 248.12625 187.22875) (width 0.25) (layer "B.Cu") (net 61) (tstamp 4fb0a1f8-7aac-4e37-9bb7-9195017af575))
-  (segment (start 267.17625 187.22875) (end 267.17625 178.27625) (width 0.25) (layer "B.Cu") (net 62) (tstamp 1b3f6920-1339-4b4b-8b9c-0ca8bc99bbaf))
-  (segment (start 266.28625 188.11875) (end 267.17625 187.22875) (width 0.25) (layer "B.Cu") (net 62) (tstamp ce29ed40-663d-49bb-8238-b20c9e34b326))
-  (segment (start 185.32375 207.16875) (end 186.21375 206.27875) (width 0.25) (layer "B.Cu") (net 63) (tstamp 9e7514ca-d2e1-4908-a0d0-b859377a7588))
-  (segment (start 186.21375 206.27875) (end 186.21375 197.32625) (width 0.25) (layer "B.Cu") (net 63) (tstamp a191d544-0a9b-42af-875d-00416c4a9d48))
-  (segment (start 293 175.5) (end 290 172.5) (width 0.25) (layer "F.Cu") (net 64) (tstamp 0391d8a0-1461-49e2-aeaa-828cd5c4df94))
-  (segment (start 251.46375 135.53625) (end 253.5 133.5) (width 0.25) (layer "F.Cu") (net 64) (tstamp 3e0ce671-28c0-4838-ae4b-f367ce048d8b))
-  (segment (start 254.405 115.595) (end 254.405 113.4) (width 0.25) (layer "F.Cu") (net 64) (tstamp 580c696e-b892-4780-b7c8-dd52e5cfca65))
-  (segment (start 253.5 116.5) (end 254.405 115.595) (width 0.25) (layer "F.Cu") (net 64) (tstamp 7d5e0f17-98a3-4bf6-be95-737f974d0134))
-  (segment (start 253.5 133.5) (end 253.5 116.5) (width 0.25) (layer "F.Cu") (net 64) (tstamp 896e0de7-ca32-4e04-89dd-3500cf283545))
-  (segment (start 290 172.5) (end 247.5 172.5) (width 0.25) (layer "F.Cu") (net 64) (tstamp 940a2475-b63e-4cac-ab4b-f34faa087a20))
-  (segment (start 251.46375 140.03625) (end 251.46375 135.53625) (width 0.25) (layer "F.Cu") (net 64) (tstamp 9b0df850-cee8-4076-8f67-f0753308221f))
-  (segment (start 246.5 171.5) (end 246.5 145) (width 0.25) (layer "F.Cu") (net 64) (tstamp a2d36614-3fb0-4a2b-8584-7e876fd36f4c))
-  (segment (start 246.5 145) (end 251.46375 140.03625) (width 0.25) (layer "F.Cu") (net 64) (tstamp b0e4d199-7a9c-43be-b4e9-f42e45890ee3))
-  (segment (start 247.5 172.5) (end 246.5 171.5) (width 0.25) (layer "F.Cu") (net 64) (tstamp dc01b210-5970-4f06-9d1e-9a8d247b91da))
-  (via (at 293 175.5) (size 0.8) (drill 0.4) (layers "F.Cu" "B.Cu") (net 64) (tstamp d5567ecf-812a-403b-846e-fc27b3e9d493))
-  (segment (start 296.61875 188.11875) (end 293 184.5) (width 0.25) (layer "B.Cu") (net 64) (tstamp 20402611-9137-46b1-8ca8-c0c97f0eb0df))
-  (segment (start 233.5 211.5) (end 285 211.5) (width 0.25) (layer "B.Cu") (net 64) (tstamp 20c1e437-747e-4fcf-bde9-e2287b650d4e))
-  (segment (start 285 211.5) (end 288.5 208) (width 0.25) (layer "B.Cu") (net 64) (tstamp 2e448050-18ae-4251-b125-2b068eebbdb3))
-  (segment (start 288.5 205) (end 290.66875 207.16875) (width 0.25) (layer "B.Cu") (net 64) (tstamp 381d7797-3d4d-47e1-b9a8-96df5caafdff))
-  (segment (start 293 188.5) (end 293 184.5) (width 0.25) (layer "B.Cu") (net 64) (tstamp 3d31d6cc-c3ef-48c1-8b7d-8ffa57910c58))
-  (segment (start 186.5 211.5) (end 224.5 211.5) (width 0.25) (layer "B.Cu") (net 64) (tstamp 3e047feb-75e6-4e83-bd43-c4ab87a8f13d))
-  (segment (start 224.5 211.5) (end 233.5 211.5) (width 0.25) (layer "B.Cu") (net 64) (tstamp 5b4ef0f0-7f1d-405c-9236-8c8bd75170d7))
-  (segment (start 290.25 191.25) (end 293 188.5) (width 0.25) (layer "B.Cu") (net 64) (tstamp 5b7242ff-5bcb-46b5-bfcd-fbb189412c37))
-  (segment (start 293 184.5) (end 293 175.5) (width 0.25) (layer "B.Cu") (net 64) (tstamp 6399e213-9557-4a57-acc2-d45811c714bb))
-  (segment (start 182.16875 207.16875) (end 186.5 211.5) (width 0.25) (layer "B.Cu") (net 64) (tstamp 67ca5c9a-11a3-4ce7-82db-5b375b58ff50))
-  (segment (start 288.5 205) (end 288.5 193) (width 0.25) (layer "B.Cu") (net 64) (tstamp 6dca0b71-d8e6-4e8f-8c1e-776a44eaebf8))
-  (segment (start 290.66875 207.16875) (end 296.32375 207.16875) (width 0.25) (layer "B.Cu") (net 64) (tstamp 86a59661-f700-4b83-bae2-9ae267ab52c2))
-  (segment (start 301.08625 188.11875) (end 296.61875 188.11875) (width 0.25) (layer "B.Cu") (net 64) (tstamp 9ea1d322-b67e-47cf-a4dc-e36a34e2e33f))
-  (segment (start 290.25 191.25) (end 285.1675 191.25) (width 0.25) (layer "B.Cu") (net 64) (tstamp a799cbeb-95dc-4af6-ac8f-403aff4bfee1))
-  (segment (start 288.5 193) (end 290.25 191.25) (width 0.25) (layer "B.Cu") (net 64) (tstamp aa132814-f5b6-43eb-9017-7d54c0cdc4ff))
-  (segment (start 285.1675 191.25) (end 282.03625 188.11875) (width 0.25) (layer "B.Cu") (net 64) (tstamp b52283d6-7480-4ffd-9f9f-2b3e29a6d49b))
-  (segment (start 182.02375 207.16875) (end 182.16875 207.16875) (width 0.25) (layer "B.Cu") (net 64) (tstamp c35366a8-72bb-426e-bd93-a62b47b005d1))
-  (segment (start 220.12375 207.16875) (end 220.16875 207.16875) (width 0.25) (layer "B.Cu") (net 64) (tstamp c8692b04-eb85-4175-8af8-082e1b835217))
-  (segment (start 288.5 208) (end 288.5 205) (width 0.25) (layer "B.Cu") (net 64) (tstamp e60d8c15-93ba-4c2b-961e-ec7c2df63079))
-  (segment (start 220.16875 207.16875) (end 224.5 211.5) (width 0.25) (layer "B.Cu") (net 64) (tstamp fbc00d15-23a0-42b0-bf8a-cfb2961627b0))
-  (segment (start 224.31375 206.27875) (end 224.31375 197.32625) (width 0.25) (layer "B.Cu") (net 65) (tstamp a3be7068-2911-49fc-bff2-e8ab7eb2fec6))
-  (segment (start 223.42375 207.16875) (end 224.31375 206.27875) (width 0.25) (layer "B.Cu") (net 65) (tstamp f62a24ae-280c-4866-bc6a-3ae9fe135e6a))
-  (segment (start 262.41375 206.27875) (end 262.41375 197.32625) (width 0.25) (layer "B.Cu") (net 66) (tstamp 1bd280d3-640a-4629-b113-fff876074025))
-  (segment (start 261.52375 207.16875) (end 262.41375 206.27875) (width 0.25) (layer "B.Cu") (net 66) (tstamp a9bd4494-f22e-4e21-8537-b753e826700a))
-  (segment (start 280.57375 207.16875) (end 281.46375 206.27875) (width 0.25) (layer "B.Cu") (net 67) (tstamp c651942c-49c0-4020-848f-693197baa1f4))
-  (segment (start 281.46375 206.27875) (end 281.46375 197.32625) (width 0.25) (layer "B.Cu") (net 67) (tstamp d3b302ce-9d3c-4ee9-abd2-26af547e2d86))
-  (segment (start 300.51375 206.27875) (end 300.51375 197.32625) (width 0.25) (layer "B.Cu") (net 68) (tstamp 894a6526-2ee5-4f03-9425-9880ae5a3739))
-  (segment (start 299.62375 207.16875) (end 300.51375 206.27875) (width 0.25) (layer "B.Cu") (net 68) (tstamp efe204f0-e6a5-48d4-8981-d09b0a8a0f08))
-  (segment (start 304.38625 188.11875) (end 305.27625 187.22875) (width 0.25) (layer "B.Cu") (net 69) (tstamp 1cddf749-f472-4bbd-a55e-90ce1e165577))
-  (segment (start 305.27625 187.22875) (end 305.27625 178.27625) (width 0.25) (layer "B.Cu") (net 69) (tstamp 9c01fedb-733e-420f-8011-571cd7a4de25))
-  (segment (start 285.33625 188.11875) (end 286.22625 187.22875) (width 0.25) (layer "B.Cu") (net 70) (tstamp 0091130f-df4e-4d44-8d28-8b80c1170cf2))
-  (segment (start 286.22625 187.22875) (end 286.22625 178.27625) (width 0.25) (layer "B.Cu") (net 70) (tstamp 92abfd26-5570-48df-ba58-cec41aa979da))
-  (segment (start 158.4325 208.9325) (end 158.4325 199.86625) (width 0.25) (layer "F.Cu") (net 71) (tstamp 01dd0270-a952-49e0-b35b-2a2de3b144bc))
-  (segment (start 336 140) (end 336 152.5) (width 0.25) (layer "F.Cu") (net 71) (tstamp 0acf8447-2991-49ac-aee7-5e0fcdeb3db6))
-  (segment (start 345.5 208.5) (end 345.5 204.124366) (width 0.25) (layer "F.Cu") (net 71) (tstamp 0d987534-2794-4151-943d-a5a066ee5ca5))
-  (segment (start 329.5 205) (end 336 211.5) (width 0.25) (layer "F.Cu") (net 71) (tstamp 0dc67efd-7663-4873-ad45-0c13e8df7dae))
-  (segment (start 261.625 113.4) (end 267.5 119.275) (width 0.25) (layer "F.Cu") (net 71) (tstamp 0ef20816-2c08-4075-88a7-126511baad3d))
-  (segment (start 110.5 189.5) (end 115.5 184.5) (width 0.25) (layer "F.Cu") (net 71) (tstamp 10015532-65b6-43f4-9f0d-0f54c5789079))
-  (segment (start 120.3325 180.81625) (end 119.18375 180.81625) (width 0.25) (layer "F.Cu") (net 71) (tstamp 10cccda1-8047-4e59-976c-a7fd29e60601))
-  (segment (start 349.758116 199.86625) (end 351.31375 199.86625) (width 0.25) (layer "F.Cu") (net 71) (tstamp 11823a7f-f4bc-4eea-9726-e3e081d72d97))
-  (segment (start 329.5 185) (end 329.5 205) (width 0.25) (layer "F.Cu") (net 71) (tstamp 15ef3001-8edc-479e-a2d7-821452239f1a))
-  (segment (start 182 211.5) (end 161 211.5) (width 0.25) (layer "F.Cu") (net 71) (tstamp 1cf84bf6-e7f1-4eda-8aa1-17221c5a00fb))
-  (segment (start 110.5 205) (end 110.5 200.5) (width 0.25) (layer "F.Cu") (net 71) (tstamp 230505fd-1dae-460f-b73d-03fb35aa00c8))
-  (segment (start 179.86375 209.36375) (end 182 211.5) (width 0.25) (layer "F.Cu") (net 71) (tstamp 27ddd7a5-8d46-4267-b733-9c9188b27844))
-  (segment (start 267.5 119.275) (end 267.5 133.5) (width 0.25) (layer "F.Cu") (net 71) (tstamp 2a5be3e7-8314-4166-a5bc-2471a2cd98d3))
-  (segment (start 340 137.5) (end 341.78875 139.28875) (width 0.25) (layer "F.Cu") (net 71) (tstamp 2c95af5e-4188-40d1-9add-15c0a7643efd))
-  (segment (start 110.5 200.5) (end 111.13375 199.86625) (width 0.25) (layer "F.Cu") (net 71) (tstamp 33aee8b2-c4c7-440c-8a2f-073497f1e4cd))
-  (segment (start 110.5 200.5) (end 110.5 189.5) (width 0.25) (layer "F.Cu") (net 71) (tstamp 38a1ac88-75b4-42e1-88b3-4c22ca2257dc))
-  (segment (start 345.5 204.124366) (end 349.758116 199.86625) (width 0.25) (layer "F.Cu") (net 71) (tstamp 3e15c075-7f81-47e1-a10b-fabb3f2ccaab))
-  (segment (start 115.57 184.43) (end 115.57 161.76625) (width 0.25) (layer "F.Cu") (net 71) (tstamp 3fab2266-d166-41a2-9a76-b99d908d979b))
-  (segment (start 336 152.5) (end 339 155.5) (width 0.25) (layer "F.Cu") (net 71) (tstamp 409fd0e1-86a6-480a-a21b-257a16533d20))
-  (segment (start 161 211.5) (end 117 211.5) (width 0.25) (layer "F.Cu") (net 71) (tstamp 49dce358-07e2-483a-9642-a5b1a1672191))
-  (segment (start 117 211.5) (end 110.5 205) (width 0.25) (layer "F.Cu") (net 71) (tstamp 517ec645-170d-4d7e-8ab2-c871a6b2ad37))
-  (segment (start 333.5 137.5) (end 340 137.5) (width 0.25) (layer "F.Cu") (net 71) (tstamp 55ad0415-b959-4cbb-97f6-5a21f3ed2261))
-  (segment (start 309.5 211.5) (end 182 211.5) (width 0.25) (layer "F.Cu") (net 71) (tstamp 5c711ff8-b9c6-49e7-aa86-8757587e7e3a))
-  (segment (start 309.5 211.5) (end 323 211.5) (width 0.25) (layer "F.Cu") (net 71) (tstamp 63f624c8-7245-4f75-9720-55931af1473d))
-  (segment (start 344.17 180.81625) (end 341 177.64625) (width 0.25) (layer "F.Cu") (net 71) (tstamp 69df8d8f-71e7-4838-b154-c085164919b0))
-  (segment (start 339 175.5) (end 329.5 185) (width 0.25) (layer "F.Cu") (net 71) (tstamp 77d21fe2-a01d-4dee-af76-f5edfc6eecbd))
-  (segment (start 333.5 137.5) (end 336 140) (width 0.25) (layer "F.Cu") (net 71) (tstamp 8e7cf166-6791-41b4-9a3c-7c54ee30befd))
-  (segment (start 119.18375 180.81625) (end 115.5 184.5) (width 0.25) (layer "F.Cu") (net 71) (tstamp 92c9e1c2-e335-4306-ae86-0d819e322999))
-  (segment (start 111.13375 199.86625) (end 113.18875 199.86625) (width 0.25) (layer "F.Cu") (net 71) (tstamp 95142fa8-0161-4e97-b266-d9516f010d1c))
-  (segment (start 341 177.64625) (end 341 177.5) (width 0.25) (layer "F.Cu") (net 71) (tstamp 9ac46245-eeb1-4ab5-b8dd-5ae087f86b44))
-  (segment (start 267.5 133.5) (end 271.5 137.5) (width 0.25) (layer "F.Cu") (net 71) (tstamp 9c3a802a-189a-4e1d-9de9-20c0a64a0a8f))
-  (segment (start 339 155.5) (end 339 175.5) (width 0.25) (layer "F.Cu") (net 71) (tstamp 9f0215ff-1322-400e-9e1a-aafffa85e87b))
-  (segment (start 336 211.5) (end 342.5 211.5) (width 0.25) (layer "F.Cu") (net 71) (tstamp a6f5c949-9a35-4fab-8f12-38be43ab8bf6))
-  (segment (start 179.86375 199.86625) (end 179.86375 209.36375) (width 0.25) (layer "F.Cu") (net 71) (tstamp b68f44f5-589e-4320-a900-5f848d33307c))
-  (segment (start 341.78875 139.28875) (end 341.78875 142.71625) (width 0.25) (layer "F.Cu") (net 71) (tstamp b9dc8706-578a-4ef1-98f0-8d4404174c6f))
-  (segment (start 339 175.5) (end 341 177.5) (width 0.25) (layer "F.Cu") (net 71) (tstamp bae5244d-55dd-4f78-8a53-81cd87dc38b6))
-  (segment (start 271.5 137.5) (end 333.5 137.5) (width 0.25) (layer "F.Cu") (net 71) (tstamp bbd7f809-d35d-4167-bfd0-5e73f5bd7a5c))
-  (segment (start 115.5 184.5) (end 115.57 184.43) (width 0.25) (layer "F.Cu") (net 71) (tstamp c754acd7-6799-4689-ad07-cd5fce2984dc))
-  (segment (start 342.5 211.5) (end 345.5 208.5) (width 0.25) (layer "F.Cu") (net 71) (tstamp ca9d7481-9b77-4c88-ae71-d85148315cbe))
-  (segment (start 329.5 205) (end 323 211.5) (width 0.25) (layer "F.Cu") (net 71) (tstamp d15a2053-5508-4daf-b55d-39a09a5643b4))
-  (segment (start 161 211.5) (end 158.4325 208.9325) (width 0.25) (layer "F.Cu") (net 71) (tstamp dc7fe2e4-b603-42b1-ae13-b6de91d3162c))
-  (segment (start 137.5 193) (end 133 188.5) (width 0.25) (layer "F.Cu") (net 72) (tstamp 0306da2d-a260-4658-b084-cc2f311eafa9))
-  (segment (start 214 211.05) (end 212 209.05) (width 0.25) (layer "F.Cu") (net 72) (tstamp 03084625-6fbe-48cc-9236-1d690eb8a89d))
-  (segment (start 133.26625 161.76625) (end 134 161.76625) (width 0.25) (layer "F.Cu") (net 72) (tstamp 13a3fcb0-4e39-4fcb-b55d-4b14e093ddb4))
-  (segment (start 170.5 193) (end 165.57625 188.07625) (width 0.25) (layer "F.Cu") (net 72) (tstamp 193009e3-fa0d-43ad-a8ce-f52003ef176f))
-  (segment (start 351.31375 123.66625) (end 347.33375 123.66625) (width 0.25) (layer "F.Cu") (net 72) (tstamp 1c0f7118-2917-40f5-9785-57e788bb9ad4))
-  (segment (start 268.5 117.735) (end 268.5 133.5) (width 0.25) (layer "F.Cu") (net 72) (tstamp 245e7254-667f-4172-96c4-7f7ba44cdc7f))
-  (segment (start 131 166) (end 131 160.5) (width 0.25) (layer "F.Cu") (net 72) (tstamp 25fd6288-bf69-4f7f-9937-40dd1d9785b7))
-  (segment (start 133 168) (end 131 166) (width 0.25) (layer "F.Cu") (net 72) (tstamp 2f04105f-5c8b-47fc-8d47-940fe5af9dab))
-  (segment (start 165.57625 188.07625) (end 165.57625 180.81625) (width 0.25) (layer "F.Cu") (net 72) (tstamp 309aa47f-d727-4dfb-b49e-05e40fa06e19))
-  (segment (start 352.5 155.5) (end 350.5 157.5) (width 0.25) (layer "F.Cu") (net 72) (tstamp 32e7accf-c84b-4e4a-9ed2-bf279d77d2a6))
-  (segment (start 321.95 211.05) (end 214 211.05) (width 0.25) (layer "F.Cu") (net 72) (tstamp 342d5660-5b6b-45e0-b922-47c3450607ca))
-  (segment (start 113.18875 148.18875) (end 119 154) (width 0.25) (layer "F.Cu") (net 72) (tstamp 35d73ea1-3218-4bc8-b014-ea17d7fd6857))
-  (segment (start 348.9325 159.0675) (end 348.9325 161.76625) (width 0.25) (layer "F.Cu") (net 72) (tstamp 36bd33e8-b6ec-428b-a862-fefa59a4a5bc))
-  (segment (start 359.5 194) (end 335 194) (width 0.25) (layer "F.Cu") (net 72) (tstamp 36fa7b0a-6fb8-44a9-b077-b75eaa8dc1b3))
-  (segment (start 325.5 207.5) (end 321.95 211.05) (width 0.25) (layer "F.Cu") (net 72) (tstamp 3f33bbea-367f-4a0d-ad9f-10b55c4d3bd4))
-  (segment (start 137.5 193) (end 134.62 195.88) (width 0.25) (layer "F.Cu") (net 72) (tstamp 40513854-9808-45ed-9244-30642f0575d5))
-  (segment (start 342.5 137) (end 346.977755 137) (width 0.25) (layer "F.Cu") (net 72) (tstamp 41bf9627-75a6-43b3-b324-4efb01c186a8))
-  (segment (start 134 161.76625) (end 137.00125 161.76625) (width 0.25) (layer "F.Cu") (net 72) (tstamp 457a62e4-a750-4a08-bd25-e9ad8337c38f))
-  (segment (start 131 160.5) (end 132.26625 161.76625) (width 0.25) (layer "F.Cu") (net 72) (tstamp 4a24d252-fb1b-4fcb-809e-1b2fed6053d0))
-  (segment (start 352.5 155.5) (end 359.5 155.5) (width 0.25) (layer "F.Cu") (net 72) (tstamp 4cf58987-50c6-49e9-8b2b-2245056d0739))
-  (segment (start 332.26375 196.73625) (end 332.26375 199.86625) (width 0.25) (layer "F.Cu") (net 72) (tstamp 5410721d-8d4d-4e16-9ef6-81c70fff0344))
-  (segment (start 212 195.5) (end 209.5 193) (width 0.25) (layer "F.Cu") (net 72) (tstamp 58255ff4-018c-4978-b0b7-b6e8d4fd7c62))
-  (segment (start 325.5 201.5) (end 325.5 207.5) (width 0.25) (layer "F.Cu") (net 72) (tstamp 58904206-97e6-41ad-8087-f63ce0a2fc03))
-  (segment (start 132.26625 161.76625) (end 134 161.76625) (width 0.25) (layer "F.Cu") (net 72) (tstamp 5a2ab0d5-c60d-4a43-b290-8e9bb9832eeb))
-  (segment (start 131 159.5) (end 131 160.5) (width 0.25) (layer "F.Cu") (net 72) (tstamp 5a486dc5-cdb6-406e-9b5b-b36990657448))
-  (segment (start 264.165 113.4) (end 268.5 117.735) (width 0.25) (layer "F.Cu") (net 72) (tstamp 6bda3a59-2462-4fe0-8e7e-86f5ebd3c393))
-  (segment (start 347.33375 123.66625) (end 346.5 124.5) (width 0.25) (layer "F.Cu") (net 72) (tstamp 794336c2-4a9a-4ad3-966d-c98f9ebf2a99))
-  (segment (start 170.5 193) (end 137.5 193) (width 0.25) (layer "F.Cu") (net 72) (tstamp 8a76f8fd-99b6-4af6-a3b7-0a82e6a21783))
-  (segment (start 268.5 133.5) (end 272 137) (width 0.25) (layer "F.Cu") (net 72) (tstamp ae1b6438-cad2-42f8-ada6-1fccae5a273d))
-  (segment (start 119 154) (end 125.5 154) (width 0.25) (layer "F.Cu") (net 72) (tstamp af988e4b-6b4f-42d5-a2ce-8cf0cceec13c))
-  (segment (start 346 125) (end 346.5 124.5) (width 0.25) (layer "F.Cu") (net 72) (tstamp bb8c906d-4923-4d28-856a-aceff55402e1))
-  (segment (start 350.5 157.5) (end 348.9325 159.0675) (width 0.25) (layer "F.Cu") (net 72) (tstamp ceb1e3e7-783d-498a-89d6-d1cbea69c5b8))
-  (segment (start 272 137) (end 342.5 137) (width 0.25) (layer "F.Cu") (net 72) (tstamp d68c471f-2e0e-49b5-b8f4-b8545d88e0fa))
-  (segment (start 209.5 193) (end 170.5 193) (width 0.25) (layer "F.Cu") (net 72) (tstamp d8148f06-496b-44f2-a372-551c810abcab))
-  (segment (start 359.5 155.5) (end 362 158) (width 0.25) (layer "F.Cu") (net 72) (tstamp dd2092be-f87e-4401-948a-15ee01884337))
-  (segment (start 125.5 154) (end 131 159.5) (width 0.25) (layer "F.Cu") (net 72) (tstamp de473a6a-c907-4c99-b3a7-182bc295ecc9))
-  (segment (start 113.18875 142.71625) (end 113.18875 148.18875) (width 0.25) (layer "F.Cu") (net 72) (tstamp de9c91f1-8284-4a84-9d0c-1dafe1cdad73))
-  (segment (start 335 194) (end 332.26375 196.73625) (width 0.25) (layer "F.Cu") (net 72) (tstamp e08c0964-2860-45ed-96cd-4d07dd130b88))
-  (segment (start 362 158) (end 362 191.5) (width 0.25) (layer "F.Cu") (net 72) (tstamp e487ca38-ab85-48a3-a02c-4c48d7993503))
-  (segment (start 327 200) (end 325.5 201.5) (width 0.25) (layer "F.Cu") (net 72) (tstamp e863e325-5f2b-4fa4-beff-0943cc2c6527))
-  (segment (start 352.5 142.522245) (end 352.5 155.5) (width 0.25) (layer "F.Cu") (net 72) (tstamp e94030e5-7e56-4d96-8b42-6f67837b7eed))
-  (segment (start 346 133.5) (end 346 125) (width 0.25) (layer "F.Cu") (net 72) (tstamp e9aa29da-f684-4f98-a7fd-fbe61f258a59))
-  (segment (start 346.977755 137) (end 352.5 142.522245) (width 0.25) (layer "F.Cu") (net 72) (tstamp f4302eac-1006-4031-acab-c4927711c2f0))
-  (segment (start 133 188.5) (end 133 168) (width 0.25) (layer "F.Cu") (net 72) (tstamp f84c68b4-3144-4075-8646-5b9493c13092))
-  (segment (start 342.5 137) (end 346 133.5) (width 0.25) (layer "F.Cu") (net 72) (tstamp f8bc5efb-1f9d-4926-b9f5-6683ec6eccca))
-  (segment (start 212 209.05) (end 212 195.5) (width 0.25) (layer "F.Cu") (net 72) (tstamp f9fd91cf-5780-4cd3-b4ae-233e5b70356f))
-  (segment (start 362 191.5) (end 359.5 194) (width 0.25) (layer "F.Cu") (net 72) (tstamp faff26af-3708-42c0-a115-1030bc3e8a4a))
-  (segment (start 134.62 195.88) (end 134.62 199.86625) (width 0.25) (layer "F.Cu") (net 72) (tstamp fef08aa2-9b83-4e9d-8dc1-d24523b9ebae))
-  (via (at 327 200) (size 0.8) (drill 0.4) (layers "F.Cu" "B.Cu") (net 72) (tstamp 34f72feb-102f-4a6d-b457-32bb244c7d59))
-  (segment (start 327.13375 199.86625) (end 327 200) (width 0.25) (layer "B.Cu") (net 72) (tstamp 3479b94f-2805-41c0-8592-b8cd6f894102))
-  (segment (start 332.26375 199.86625) (end 327.13375 199.86625) (width 0.25) (layer "B.Cu") (net 72) (tstamp 7d107dd7-855f-4e23-8bc4-d4878bbd9e66))
-
 )
diff --git a/pcb/xantronix-z32.kicad_sch b/pcb/xantronix-z32.kicad_sch
index 85aee7d..c9321c0 100644
--- a/pcb/xantronix-z32.kicad_sch
+++ b/pcb/xantronix-z32.kicad_sch
@@ -284,329 +284,329 @@
     )
   )
 
-  (junction (at 81.28 166.37) (diameter 0) (color 0 0 0 0)
-    (uuid 04400a8a-6706-4d3a-b4a9-6825fb7309ce)
+  (junction (at 137.16 114.3) (diameter 0) (color 0 0 0 0)
+    (uuid 0288fe00-bb28-42e2-919b-3a89eb6e9d8d)
   )
-  (junction (at 127 166.37) (diameter 0) (color 0 0 0 0)
-    (uuid 04e6b7ab-3b48-4549-8d92-a9abae523af7)
+  (junction (at 99.06 83.82) (diameter 0) (color 0 0 0 0)
+    (uuid 0297d1ed-9c3f-4bd4-a775-d79d4ad0da64)
   )
-  (junction (at 68.58 87.63) (diameter 0) (color 0 0 0 0)
-    (uuid 08129f60-602c-4214-8e93-d06f6999fae0)
+  (junction (at 147.32 91.44) (diameter 0) (color 0 0 0 0)
+    (uuid 07720007-546b-4254-b95d-2933b6c5baca)
   )
-  (junction (at 58.42 59.69) (diameter 0) (color 0 0 0 0)
-    (uuid 11f17e19-8184-4b86-83d8-e8af7226750b)
+  (junction (at 175.26 68.58) (diameter 0) (color 0 0 0 0)
+    (uuid 0f587549-9516-4771-8bcb-95315e33b7fa)
   )
-  (junction (at 104.14 166.37) (diameter 0) (color 0 0 0 0)
-    (uuid 12689aa0-e36f-4abc-b919-b80db9c6b911)
+  (junction (at 124.46 83.82) (diameter 0) (color 0 0 0 0)
+    (uuid 0f9d2b1a-6b4d-48b6-af20-a5fb168e02c0)
   )
-  (junction (at 182.88 52.07) (diameter 0) (color 0 0 0 0)
-    (uuid 13f6dd82-ae93-4f77-bf8b-448195165ad6)
+  (junction (at 121.92 60.96) (diameter 0) (color 0 0 0 0)
+    (uuid 11579600-5cda-45f4-b491-45675c1c4f4d)
   )
-  (junction (at 149.86 148.59) (diameter 0) (color 0 0 0 0)
-    (uuid 16afe498-2726-42fb-9908-8a1ec028a958)
+  (junction (at 121.92 106.68) (diameter 0) (color 0 0 0 0)
+    (uuid 11620678-9591-481a-b420-bcae6613e931)
   )
-  (junction (at 45.72 140.97) (diameter 0) (color 0 0 0 0)
-    (uuid 1b9bc55b-9819-4971-8a69-2e7851eaab06)
+  (junction (at 175.26 144.78) (diameter 0) (color 0 0 0 0)
+    (uuid 14561e6a-f3bd-4e08-818c-9af52764c7f3)
   )
-  (junction (at 91.44 69.85) (diameter 0) (color 0 0 0 0)
-    (uuid 1f46be93-675c-4528-8b01-1ec0c82b25e0)
+  (junction (at 160.02 76.2) (diameter 0) (color 0 0 0 0)
+    (uuid 1c185c39-a611-4f6f-b278-b2da68d8e9e8)
   )
-  (junction (at 91.44 140.97) (diameter 0) (color 0 0 0 0)
-    (uuid 1f4fb507-d47e-4f39-b9dc-ea1db2a41a16)
+  (junction (at 172.72 60.96) (diameter 0) (color 0 0 0 0)
+    (uuid 1c4e9bca-1621-4894-8454-b83aad40f011)
   )
-  (junction (at 68.58 105.41) (diameter 0) (color 0 0 0 0)
-    (uuid 22caf334-5a76-48cd-992b-6ec8370e4056)
+  (junction (at 137.16 68.58) (diameter 0) (color 0 0 0 0)
+    (uuid 1cabffe4-7efe-4ffc-85b7-0e6cf07472f8)
   )
-  (junction (at 182.88 140.97) (diameter 0) (color 0 0 0 0)
-    (uuid 23dedb6e-4cbe-4ca7-a005-86df57df59de)
+  (junction (at 109.22 60.96) (diameter 0) (color 0 0 0 0)
+    (uuid 1dfdfd07-8be4-47cc-8fb5-ff8d69dfde92)
   )
-  (junction (at 182.88 123.19) (diameter 0) (color 0 0 0 0)
-    (uuid 25b0d525-8c07-400d-8102-6be32f2b0d09)
+  (junction (at 124.46 144.78) (diameter 0) (color 0 0 0 0)
+    (uuid 210362ac-c7ec-46a7-861f-33f693fd322c)
   )
-  (junction (at 91.44 34.29) (diameter 0) (color 0 0 0 0)
-    (uuid 276d9da0-036a-4c1b-aa37-b5e833811be3)
+  (junction (at 134.62 106.68) (diameter 0) (color 0 0 0 0)
+    (uuid 2315b302-218b-4683-b8dd-1f64a0285a07)
   )
-  (junction (at 35.56 77.47) (diameter 0) (color 0 0 0 0)
-    (uuid 2bc34bc6-5fa3-4819-86a2-5f31b80e56a2)
+  (junction (at 99.06 68.58) (diameter 0) (color 0 0 0 0)
+    (uuid 293cb4be-2d62-43b5-857f-8aeaf17eecf8)
   )
-  (junction (at 205.74 105.41) (diameter 0) (color 0 0 0 0)
-    (uuid 2bc59269-8088-484c-9654-2c350fb3b73b)
+  (junction (at 134.62 91.44) (diameter 0) (color 0 0 0 0)
+    (uuid 2b9ddf71-1382-4b50-88b1-f3c83339f028)
   )
-  (junction (at 91.44 105.41) (diameter 0) (color 0 0 0 0)
-    (uuid 2dd5a625-46c0-4a1b-819e-73faf902d328)
+  (junction (at 172.72 76.2) (diameter 0) (color 0 0 0 0)
+    (uuid 2e96fc1f-54b3-4c0e-b1dc-8db6504039bc)
   )
-  (junction (at 58.42 77.47) (diameter 0) (color 0 0 0 0)
-    (uuid 2f5c2b34-1ff9-466f-b4d2-10dae3cf8b55)
+  (junction (at 137.16 144.78) (diameter 0) (color 0 0 0 0)
+    (uuid 3047ff44-bd5f-42a0-8084-1b3b96f2a7bb)
   )
-  (junction (at 68.58 123.19) (diameter 0) (color 0 0 0 0)
-    (uuid 326162b6-212b-46ce-89ec-bf070bebc123)
+  (junction (at 162.56 114.3) (diameter 0) (color 0 0 0 0)
+    (uuid 316711db-ffdb-464b-8fde-9aaeabbda687)
   )
-  (junction (at 45.72 34.29) (diameter 0) (color 0 0 0 0)
-    (uuid 36678570-81b1-4fda-8619-70e985785f5b)
+  (junction (at 147.32 137.16) (diameter 0) (color 0 0 0 0)
+    (uuid 36a69c02-00d1-48e1-8482-6c06d4859b43)
   )
-  (junction (at 137.16 105.41) (diameter 0) (color 0 0 0 0)
-    (uuid 368e6b68-19b8-4253-aaf8-470aee8e1e1c)
+  (junction (at 160.02 91.44) (diameter 0) (color 0 0 0 0)
+    (uuid 3c7b49cf-5f58-43c7-aaad-d6ea98bf5911)
   )
-  (junction (at 58.42 113.03) (diameter 0) (color 0 0 0 0)
-    (uuid 37516c6a-0220-464c-9e7e-1b36699935c3)
+  (junction (at 162.56 129.54) (diameter 0) (color 0 0 0 0)
+    (uuid 3ed9c6d3-361f-4a6a-a5b6-aa0cd72bd257)
   )
-  (junction (at 45.72 105.41) (diameter 0) (color 0 0 0 0)
-    (uuid 3a178b7c-6dad-49be-bc0f-132a75c57dcb)
+  (junction (at 162.56 144.78) (diameter 0) (color 0 0 0 0)
+    (uuid 3fa385a7-c89c-4dfd-a660-ed44837c86b8)
   )
-  (junction (at 114.3 105.41) (diameter 0) (color 0 0 0 0)
-    (uuid 3fa03eca-dab1-4896-8794-fb67df9951f9)
+  (junction (at 134.62 60.96) (diameter 0) (color 0 0 0 0)
+    (uuid 403aea76-9e39-4ebe-812f-398d3cd283ff)
   )
-  (junction (at 160.02 52.07) (diameter 0) (color 0 0 0 0)
-    (uuid 402a060f-5c0c-4177-924c-ccee785f0a65)
+  (junction (at 149.86 68.58) (diameter 0) (color 0 0 0 0)
+    (uuid 41d1f788-7111-4458-9f0a-b8eadb3a9cb9)
   )
-  (junction (at 91.44 123.19) (diameter 0) (color 0 0 0 0)
-    (uuid 42a5c3d5-e20b-48ad-b4de-49515cceea91)
+  (junction (at 99.06 129.54) (diameter 0) (color 0 0 0 0)
+    (uuid 4861b8ec-7b46-44e2-8150-077454e5b85f)
   )
-  (junction (at 104.14 130.81) (diameter 0) (color 0 0 0 0)
-    (uuid 48d3f34b-81ce-42c7-9dc9-bfc678b3882b)
+  (junction (at 137.16 160.02) (diameter 0) (color 0 0 0 0)
+    (uuid 4da33e52-a3c5-4f5c-bdfc-41b269eff4bc)
   )
-  (junction (at 35.56 130.81) (diameter 0) (color 0 0 0 0)
-    (uuid 4a78c7e8-c6d2-4134-b469-698d94aaccc2)
+  (junction (at 175.26 129.54) (diameter 0) (color 0 0 0 0)
+    (uuid 50ea7a61-f6b6-4a1f-8ff1-b1dfeb41831d)
   )
-  (junction (at 114.3 140.97) (diameter 0) (color 0 0 0 0)
-    (uuid 4bc43715-5630-4572-b4ab-28a6bbf9d8e0)
+  (junction (at 109.22 45.72) (diameter 0) (color 0 0 0 0)
+    (uuid 53394451-e7fa-46bb-b243-1dacb792df4c)
   )
-  (junction (at 182.88 105.41) (diameter 0) (color 0 0 0 0)
-    (uuid 4e81c5d1-3401-4aa0-90c5-2c28ec56dfee)
+  (junction (at 160.02 106.68) (diameter 0) (color 0 0 0 0)
+    (uuid 56a72d1f-cb1b-4701-ab59-031195fd2df8)
   )
-  (junction (at 205.74 34.29) (diameter 0) (color 0 0 0 0)
-    (uuid 5327be0a-65c1-445f-b639-3e65d39c4ecb)
+  (junction (at 147.32 76.2) (diameter 0) (color 0 0 0 0)
+    (uuid 58d9203c-2c14-4ab4-8c03-0aa8d0f413e7)
   )
-  (junction (at 35.56 41.91) (diameter 0) (color 0 0 0 0)
-    (uuid 6364a061-f0b0-4a1e-96c3-491c26684b89)
+  (junction (at 160.02 137.16) (diameter 0) (color 0 0 0 0)
+    (uuid 5bb894d3-65f1-47f7-ab8d-e2f69a1274d7)
   )
-  (junction (at 81.28 95.25) (diameter 0) (color 0 0 0 0)
-    (uuid 651bc8c7-102d-4843-bf3d-02911cc1e4f2)
+  (junction (at 162.56 83.82) (diameter 0) (color 0 0 0 0)
+    (uuid 5c4a111c-af64-4193-987c-30a097abd4f2)
   )
-  (junction (at 81.28 130.81) (diameter 0) (color 0 0 0 0)
-    (uuid 66ae157a-142b-4a6f-bb16-bb411603c9d8)
+  (junction (at 111.76 129.54) (diameter 0) (color 0 0 0 0)
+    (uuid 655cc8c9-6feb-44cf-a12b-1b5d7d701837)
   )
-  (junction (at 45.72 69.85) (diameter 0) (color 0 0 0 0)
-    (uuid 692753d3-6ac9-439e-91c2-946e5606a7b7)
+  (junction (at 162.56 68.58) (diameter 0) (color 0 0 0 0)
+    (uuid 6aaab0de-da19-411a-b521-2a8555bf5619)
   )
-  (junction (at 114.3 87.63) (diameter 0) (color 0 0 0 0)
-    (uuid 6b92d235-2791-4130-9314-528e287f3dc0)
+  (junction (at 137.16 129.54) (diameter 0) (color 0 0 0 0)
+    (uuid 6cbbec6c-f479-4545-901f-318f6a92576e)
   )
-  (junction (at 35.56 59.69) (diameter 0) (color 0 0 0 0)
-    (uuid 6ba7c0d3-0351-402d-b7bc-dadc2fb4bd99)
+  (junction (at 111.76 160.02) (diameter 0) (color 0 0 0 0)
+    (uuid 6f985f37-b153-4e36-9904-e9c1a8efb902)
   )
-  (junction (at 172.72 95.25) (diameter 0) (color 0 0 0 0)
-    (uuid 6f75d2d0-e6b3-4b09-b987-13f761ab05fa)
+  (junction (at 149.86 144.78) (diameter 0) (color 0 0 0 0)
+    (uuid 6fb35625-3468-4a0f-afa3-253612d0def3)
   )
-  (junction (at 160.02 69.85) (diameter 0) (color 0 0 0 0)
-    (uuid 727e8b7e-851e-45d1-9c92-0b0132e7180f)
+  (junction (at 111.76 83.82) (diameter 0) (color 0 0 0 0)
+    (uuid 70a24375-19d2-42d0-910d-749820811577)
   )
-  (junction (at 68.58 140.97) (diameter 0) (color 0 0 0 0)
-    (uuid 7325bed1-2605-466f-bfbb-9fd2204a72cd)
+  (junction (at 121.92 91.44) (diameter 0) (color 0 0 0 0)
+    (uuid 7346a4f5-9703-4d2c-977b-a0090194ce85)
   )
-  (junction (at 45.72 87.63) (diameter 0) (color 0 0 0 0)
-    (uuid 77ad0bf2-561a-49d3-8909-c107712124b3)
+  (junction (at 160.02 121.92) (diameter 0) (color 0 0 0 0)
+    (uuid 7d6f0a3e-2e83-470e-a504-03d3c8164b2c)
   )
-  (junction (at 127 95.25) (diameter 0) (color 0 0 0 0)
-    (uuid 7907df2b-00ab-46a1-942e-3263c53756be)
+  (junction (at 149.86 129.54) (diameter 0) (color 0 0 0 0)
+    (uuid 7d9885bb-34b0-4578-b89f-426295ddd21e)
   )
-  (junction (at 91.44 87.63) (diameter 0) (color 0 0 0 0)
-    (uuid 7a310b6d-e42b-48ae-85c1-628df1df8728)
+  (junction (at 175.26 83.82) (diameter 0) (color 0 0 0 0)
+    (uuid 80f67730-7052-4752-8bd6-f4ce9d86a679)
   )
-  (junction (at 127 113.03) (diameter 0) (color 0 0 0 0)
-    (uuid 7adf3498-8c74-456d-9d26-4bc261d5bf93)
+  (junction (at 149.86 53.34) (diameter 0) (color 0 0 0 0)
+    (uuid 814b40d3-2923-433c-a8cb-4d319628ba1e)
   )
-  (junction (at 68.58 69.85) (diameter 0) (color 0 0 0 0)
-    (uuid 7cc17d1e-99f7-4acd-bd68-16e03aa66b75)
+  (junction (at 185.42 60.96) (diameter 0) (color 0 0 0 0)
+    (uuid 84116226-07ac-4756-a842-63b7eb4f77d8)
   )
-  (junction (at 81.28 59.69) (diameter 0) (color 0 0 0 0)
-    (uuid 819be1ed-a6e0-41ae-a01f-29463927a829)
+  (junction (at 185.42 91.44) (diameter 0) (color 0 0 0 0)
+    (uuid 851f6a79-3321-4244-8fa7-d321dde5d07b)
   )
-  (junction (at 160.02 105.41) (diameter 0) (color 0 0 0 0)
-    (uuid 81fc4945-c642-42c8-ae2f-be815f620700)
+  (junction (at 149.86 114.3) (diameter 0) (color 0 0 0 0)
+    (uuid 85a020fa-548a-4e32-ab3a-3e6d7f538118)
   )
-  (junction (at 149.86 166.37) (diameter 0) (color 0 0 0 0)
-    (uuid 82476ac3-052d-4983-9765-6173bf350ce6)
+  (junction (at 172.72 137.16) (diameter 0) (color 0 0 0 0)
+    (uuid 871d9aa3-f0ad-4303-9357-4b6d314013dd)
   )
-  (junction (at 160.02 87.63) (diameter 0) (color 0 0 0 0)
-    (uuid 8456bee8-dd86-46af-923e-ffe59ca2792b)
+  (junction (at 109.22 76.2) (diameter 0) (color 0 0 0 0)
+    (uuid 8ec93e09-a0b3-4392-9f7c-5b66194d4a40)
   )
-  (junction (at 137.16 34.29) (diameter 0) (color 0 0 0 0)
-    (uuid 8462bd9a-bf54-4cdf-99d4-9fa55d05c878)
+  (junction (at 149.86 83.82) (diameter 0) (color 0 0 0 0)
+    (uuid 8f599a47-931a-47f9-9e84-d4830e9acdbf)
   )
-  (junction (at 104.14 95.25) (diameter 0) (color 0 0 0 0)
-    (uuid 84c8475f-bf43-4d51-87a7-3aa42dcca436)
+  (junction (at 111.76 99.06) (diameter 0) (color 0 0 0 0)
+    (uuid 927e0924-0397-45ba-9bf9-e6825b9bfbf7)
   )
-  (junction (at 58.42 148.59) (diameter 0) (color 0 0 0 0)
-    (uuid 8610c32e-276a-4d7f-a900-2c7d52c71344)
+  (junction (at 124.46 53.34) (diameter 0) (color 0 0 0 0)
+    (uuid 95692e11-06ec-4976-8fd0-461f86096351)
   )
-  (junction (at 35.56 166.37) (diameter 0) (color 0 0 0 0)
-    (uuid 86b9b114-2623-45f4-8923-0ec497bab84a)
+  (junction (at 198.12 76.2) (diameter 0) (color 0 0 0 0)
+    (uuid 97b936d1-165b-4e47-9e5f-7f41754622fe)
   )
-  (junction (at 137.16 87.63) (diameter 0) (color 0 0 0 0)
-    (uuid 8aed9201-1981-46ab-8f01-788396515c35)
+  (junction (at 111.76 68.58) (diameter 0) (color 0 0 0 0)
+    (uuid 98f13d78-f019-44a0-866c-1b6caa100abb)
   )
-  (junction (at 172.72 130.81) (diameter 0) (color 0 0 0 0)
-    (uuid 8fe3864a-3df5-4864-9d9a-2ba5e063b053)
+  (junction (at 121.92 137.16) (diameter 0) (color 0 0 0 0)
+    (uuid 9f965bb1-6f3e-4258-a93e-ee9278fb2de9)
   )
-  (junction (at 182.88 34.29) (diameter 0) (color 0 0 0 0)
-    (uuid 93fcf49f-030d-4cb7-8086-51afae83d993)
+  (junction (at 160.02 45.72) (diameter 0) (color 0 0 0 0)
+    (uuid a3384030-08aa-4ed1-98ac-25f7ab744b82)
   )
-  (junction (at 58.42 166.37) (diameter 0) (color 0 0 0 0)
-    (uuid 95fc665f-a8cf-4669-bc34-60c5995a2504)
+  (junction (at 175.26 53.34) (diameter 0) (color 0 0 0 0)
+    (uuid a5766200-2624-4f9c-93ca-142e1a9cf34d)
   )
-  (junction (at 58.42 130.81) (diameter 0) (color 0 0 0 0)
-    (uuid 99acfe89-6d01-46d9-b81e-eb82a805df8a)
+  (junction (at 198.12 106.68) (diameter 0) (color 0 0 0 0)
+    (uuid a5a6b31d-ce13-4f30-886c-5a5ab2b38bcd)
   )
-  (junction (at 149.86 95.25) (diameter 0) (color 0 0 0 0)
-    (uuid 9c6b2de2-40b7-45f3-a0a5-61778ca94f01)
+  (junction (at 111.76 114.3) (diameter 0) (color 0 0 0 0)
+    (uuid a5f548f4-a582-49ad-a007-b8912a202039)
   )
-  (junction (at 149.86 41.91) (diameter 0) (color 0 0 0 0)
-    (uuid 9ea7b74a-386a-42e8-907b-1528cd94ee60)
+  (junction (at 172.72 91.44) (diameter 0) (color 0 0 0 0)
+    (uuid a666f28b-19fa-4393-a42c-a64bd93ec0f0)
   )
-  (junction (at 104.14 148.59) (diameter 0) (color 0 0 0 0)
-    (uuid 9ecc14d0-0c54-468b-81e3-9501bf779fad)
+  (junction (at 147.32 60.96) (diameter 0) (color 0 0 0 0)
+    (uuid aaa48771-919b-43e7-807c-89b7a898a503)
   )
-  (junction (at 160.02 140.97) (diameter 0) (color 0 0 0 0)
-    (uuid a0055301-7fef-49c9-bad9-63364a668264)
+  (junction (at 124.46 129.54) (diameter 0) (color 0 0 0 0)
+    (uuid ac967fe3-523d-4ac8-b66a-2a2426e64ea9)
   )
-  (junction (at 104.14 113.03) (diameter 0) (color 0 0 0 0)
-    (uuid a00cea5f-fc12-4c48-b46c-c750d638bcb1)
+  (junction (at 111.76 144.78) (diameter 0) (color 0 0 0 0)
+    (uuid ae6011ef-7b58-43f4-bf62-a86912888b90)
   )
-  (junction (at 114.3 52.07) (diameter 0) (color 0 0 0 0)
-    (uuid a21b6df7-b881-4432-bb88-490c52c1ed69)
+  (junction (at 121.92 76.2) (diameter 0) (color 0 0 0 0)
+    (uuid b198d892-1fd7-4cd4-9f2c-6bc11a9f7b54)
   )
-  (junction (at 58.42 95.25) (diameter 0) (color 0 0 0 0)
-    (uuid a2202b5f-0f4a-4b96-a41a-6c35a75c7bf3)
+  (junction (at 99.06 114.3) (diameter 0) (color 0 0 0 0)
+    (uuid b210dc87-edc8-44f2-9d1f-74a356537ea8)
   )
-  (junction (at 205.74 52.07) (diameter 0) (color 0 0 0 0)
-    (uuid a9e02679-ec2a-447c-8192-732a607bda27)
+  (junction (at 185.42 137.16) (diameter 0) (color 0 0 0 0)
+    (uuid b25a5b61-8cc5-49c5-adf4-e3ebef11e2aa)
   )
-  (junction (at 114.3 123.19) (diameter 0) (color 0 0 0 0)
-    (uuid ab195a84-6217-46c3-965b-77afcfef3771)
+  (junction (at 124.46 99.06) (diameter 0) (color 0 0 0 0)
+    (uuid b3f8c8cf-087e-4b40-906d-1cc9dd34e519)
   )
-  (junction (at 68.58 52.07) (diameter 0) (color 0 0 0 0)
-    (uuid af461d48-fbd0-4896-833c-dfd9ceec26f8)
+  (junction (at 109.22 121.92) (diameter 0) (color 0 0 0 0)
+    (uuid b4f5c62e-0501-405c-b712-f39c548b3c64)
   )
-  (junction (at 81.28 41.91) (diameter 0) (color 0 0 0 0)
-    (uuid b163a9c2-53b5-4f0b-adc1-d9095ca086c3)
+  (junction (at 137.16 53.34) (diameter 0) (color 0 0 0 0)
+    (uuid b51d7a35-f567-4be1-aeb5-dbc2da8a8b99)
   )
-  (junction (at 149.86 59.69) (diameter 0) (color 0 0 0 0)
-    (uuid b20cef83-2c71-47f2-863d-f4c8c6a659c0)
+  (junction (at 124.46 160.02) (diameter 0) (color 0 0 0 0)
+    (uuid b7cb8767-655c-4d83-9476-50a97cb5dd78)
   )
-  (junction (at 127 41.91) (diameter 0) (color 0 0 0 0)
-    (uuid b2b717f8-6865-48cc-aa20-66c8ffb35227)
+  (junction (at 149.86 160.02) (diameter 0) (color 0 0 0 0)
+    (uuid b9ed5814-3873-46c5-b01a-b5a6609da2e6)
   )
-  (junction (at 127 59.69) (diameter 0) (color 0 0 0 0)
-    (uuid b2f01606-d442-4618-a676-24e137e017bb)
+  (junction (at 198.12 60.96) (diameter 0) (color 0 0 0 0)
+    (uuid bbf202b4-99de-4204-9ba5-184541d6f07e)
   )
-  (junction (at 127 130.81) (diameter 0) (color 0 0 0 0)
-    (uuid b7152dcf-4840-493e-ae15-eb2b81caba23)
+  (junction (at 109.22 91.44) (diameter 0) (color 0 0 0 0)
+    (uuid c09b69d3-877e-48ec-b1bd-bff28ac2b46e)
   )
-  (junction (at 58.42 41.91) (diameter 0) (color 0 0 0 0)
-    (uuid b9d0620e-77ce-4038-89ef-acc903b3ef09)
+  (junction (at 121.92 45.72) (diameter 0) (color 0 0 0 0)
+    (uuid c2e70d71-306e-429a-8e07-5ded38e90a5c)
   )
-  (junction (at 205.74 69.85) (diameter 0) (color 0 0 0 0)
-    (uuid bb8afb07-24c1-4c24-9f97-2a9de8e51f79)
+  (junction (at 162.56 160.02) (diameter 0) (color 0 0 0 0)
+    (uuid c58b2da6-fc38-4051-ace2-95d77b1e0393)
   )
-  (junction (at 45.72 52.07) (diameter 0) (color 0 0 0 0)
-    (uuid bc27671c-5989-4ada-b9ab-bfdb69753084)
+  (junction (at 99.06 53.34) (diameter 0) (color 0 0 0 0)
+    (uuid c9389efb-20dc-49e1-a137-1c8e93905686)
   )
-  (junction (at 137.16 69.85) (diameter 0) (color 0 0 0 0)
-    (uuid befc329b-9a46-4088-b48f-e6391c4f7da8)
+  (junction (at 198.12 45.72) (diameter 0) (color 0 0 0 0)
+    (uuid c941a86b-f6b2-4cbb-a8f1-2e2c55101fdc)
   )
-  (junction (at 127 148.59) (diameter 0) (color 0 0 0 0)
-    (uuid c00edb4a-ca82-45f6-98cb-7f823fa80db1)
+  (junction (at 172.72 106.68) (diameter 0) (color 0 0 0 0)
+    (uuid cbfdfc21-51fa-48a7-ae87-b5d62cb4669c)
   )
-  (junction (at 182.88 87.63) (diameter 0) (color 0 0 0 0)
-    (uuid c0be072d-8348-4f65-926f-4e6c1bd97a61)
+  (junction (at 124.46 114.3) (diameter 0) (color 0 0 0 0)
+    (uuid d167d165-9481-428f-bf86-b21a66c1874d)
   )
-  (junction (at 137.16 123.19) (diameter 0) (color 0 0 0 0)
-    (uuid c2b31ba1-61bf-4db6-b29b-8eaed37567c4)
+  (junction (at 147.32 45.72) (diameter 0) (color 0 0 0 0)
+    (uuid d3945822-40a2-494a-b93b-90a0878cd63c)
   )
-  (junction (at 137.16 52.07) (diameter 0) (color 0 0 0 0)
-    (uuid c3d813ec-700c-4f8f-b6a1-9e5ab2dec6bb)
+  (junction (at 185.42 45.72) (diameter 0) (color 0 0 0 0)
+    (uuid d62eeacc-f07b-4513-b3d9-384672e8d619)
   )
-  (junction (at 149.86 77.47) (diameter 0) (color 0 0 0 0)
-    (uuid c467acba-b531-41db-bddf-f2f6923c5c9b)
+  (junction (at 134.62 137.16) (diameter 0) (color 0 0 0 0)
+    (uuid d638d063-6789-4a91-856d-de5c87cabb77)
   )
-  (junction (at 172.72 41.91) (diameter 0) (color 0 0 0 0)
-    (uuid c4dbbff9-b6b8-4ef3-81e5-4258444b01bd)
+  (junction (at 172.72 121.92) (diameter 0) (color 0 0 0 0)
+    (uuid d6e09e21-9470-44ce-8617-22da6322c2d9)
   )
-  (junction (at 137.16 140.97) (diameter 0) (color 0 0 0 0)
-    (uuid c5cefe7f-e1b5-4ece-b407-cf6f2dd2ba1b)
+  (junction (at 109.22 137.16) (diameter 0) (color 0 0 0 0)
+    (uuid d884a53a-d852-4295-85a1-992bd9c7a502)
   )
-  (junction (at 104.14 41.91) (diameter 0) (color 0 0 0 0)
-    (uuid c7194081-1e1e-4df0-8890-da3a9deb1219)
+  (junction (at 134.62 45.72) (diameter 0) (color 0 0 0 0)
+    (uuid daa31038-e851-4494-8e5a-f6803e4925f5)
   )
-  (junction (at 127 77.47) (diameter 0) (color 0 0 0 0)
-    (uuid cafa70b0-832d-4dcf-a242-308098bc53b6)
+  (junction (at 134.62 76.2) (diameter 0) (color 0 0 0 0)
+    (uuid db7cd307-181e-4de0-bd98-1026702d95e0)
   )
-  (junction (at 172.72 113.03) (diameter 0) (color 0 0 0 0)
-    (uuid cb036099-8ea8-466a-aa04-b496697dde40)
+  (junction (at 121.92 121.92) (diameter 0) (color 0 0 0 0)
+    (uuid db7ecc1f-b011-4d3e-bbc4-c0579f9f5f22)
   )
-  (junction (at 149.86 113.03) (diameter 0) (color 0 0 0 0)
-    (uuid cbf487c2-a183-41e8-9d42-4084e07c9bba)
+  (junction (at 160.02 60.96) (diameter 0) (color 0 0 0 0)
+    (uuid dbb8de7e-d23e-44f1-9138-2786e6edb205)
   )
-  (junction (at 104.14 59.69) (diameter 0) (color 0 0 0 0)
-    (uuid d1fa745a-0bb6-481f-992d-6f244ef27b32)
+  (junction (at 147.32 106.68) (diameter 0) (color 0 0 0 0)
+    (uuid dc6b0f17-c534-4c9f-934c-d405819ff629)
   )
-  (junction (at 35.56 113.03) (diameter 0) (color 0 0 0 0)
-    (uuid d4978d99-32b8-48e8-a70b-5e456d6a79c4)
+  (junction (at 124.46 68.58) (diameter 0) (color 0 0 0 0)
+    (uuid dd3502be-0da3-46a9-815c-baac0e549774)
   )
-  (junction (at 45.72 123.19) (diameter 0) (color 0 0 0 0)
-    (uuid d4f1133e-ed5d-4b6f-960c-b657e38192ff)
+  (junction (at 137.16 99.06) (diameter 0) (color 0 0 0 0)
+    (uuid e13e5430-9438-441e-bf1b-eabd9bf3fb25)
   )
-  (junction (at 160.02 34.29) (diameter 0) (color 0 0 0 0)
-    (uuid e059cb21-fcb1-400b-8bf4-c6f1a9f1b2c4)
+  (junction (at 198.12 121.92) (diameter 0) (color 0 0 0 0)
+    (uuid e297d62a-0f92-485d-b23e-96bc537e1d86)
   )
-  (junction (at 104.14 77.47) (diameter 0) (color 0 0 0 0)
-    (uuid e42951f6-da48-4785-b0df-0d5dc011174d)
+  (junction (at 99.06 144.78) (diameter 0) (color 0 0 0 0)
+    (uuid e6c80412-2485-4ab2-8c9c-7303094cb672)
   )
-  (junction (at 68.58 34.29) (diameter 0) (color 0 0 0 0)
-    (uuid e5970159-6bbe-434c-ad09-e92ab6ef1b21)
+  (junction (at 185.42 76.2) (diameter 0) (color 0 0 0 0)
+    (uuid e84b9a70-7b5f-491e-bd02-1d33fef2369c)
   )
-  (junction (at 35.56 148.59) (diameter 0) (color 0 0 0 0)
-    (uuid ea4ab98a-9dff-435a-8690-52855e57035d)
+  (junction (at 149.86 99.06) (diameter 0) (color 0 0 0 0)
+    (uuid e9809bf0-4aa7-4820-84a1-5beaca1f38e4)
   )
-  (junction (at 205.74 87.63) (diameter 0) (color 0 0 0 0)
-    (uuid eacd2c39-b334-41bc-9b34-648a640610f1)
+  (junction (at 99.06 160.02) (diameter 0) (color 0 0 0 0)
+    (uuid e9ab95a4-cfb7-4189-bfcf-4be5768b11a4)
   )
-  (junction (at 91.44 52.07) (diameter 0) (color 0 0 0 0)
-    (uuid ec7b80f1-b977-4151-af52-bf2f7930e641)
+  (junction (at 162.56 99.06) (diameter 0) (color 0 0 0 0)
+    (uuid eb25f4d3-b47e-478d-ad17-533e0f32f177)
   )
-  (junction (at 160.02 123.19) (diameter 0) (color 0 0 0 0)
-    (uuid ec9e22d1-37b5-4f1b-ad67-f60409cef699)
+  (junction (at 99.06 99.06) (diameter 0) (color 0 0 0 0)
+    (uuid edb9ea10-7633-40bc-9d82-ac833f92e625)
   )
-  (junction (at 172.72 77.47) (diameter 0) (color 0 0 0 0)
-    (uuid efe9b8ea-3d51-4bc0-ad93-1d3e1ba92d3e)
+  (junction (at 162.56 53.34) (diameter 0) (color 0 0 0 0)
+    (uuid f01f3bf8-a713-4c3e-a45b-0fa3ebe8569c)
   )
-  (junction (at 114.3 69.85) (diameter 0) (color 0 0 0 0)
-    (uuid f49aa402-01b9-41a2-b670-a213ccc600c6)
+  (junction (at 175.26 114.3) (diameter 0) (color 0 0 0 0)
+    (uuid f2ebb5a0-9b34-4d7e-abb5-613b61c8b295)
   )
-  (junction (at 172.72 59.69) (diameter 0) (color 0 0 0 0)
-    (uuid f7faaa2c-8b9b-4dd8-8064-58ce1b32e644)
+  (junction (at 134.62 121.92) (diameter 0) (color 0 0 0 0)
+    (uuid f37d18b8-8e42-4be3-9495-b0ac6b53970d)
   )
-  (junction (at 182.88 69.85) (diameter 0) (color 0 0 0 0)
-    (uuid f9d383f0-7802-40eb-9069-8ff046cdfd07)
+  (junction (at 185.42 121.92) (diameter 0) (color 0 0 0 0)
+    (uuid f3a29d9b-db8c-4a16-b5a1-bef144733762)
   )
-  (junction (at 149.86 130.81) (diameter 0) (color 0 0 0 0)
-    (uuid fbc00235-654f-4e52-98e4-8e7a7dbbe0db)
+  (junction (at 185.42 106.68) (diameter 0) (color 0 0 0 0)
+    (uuid f3e329b4-9f51-447c-831d-53c6edac9aea)
   )
-  (junction (at 81.28 77.47) (diameter 0) (color 0 0 0 0)
-    (uuid fc0c7743-08d2-4f41-80a3-df4c02926d4b)
+  (junction (at 172.72 45.72) (diameter 0) (color 0 0 0 0)
+    (uuid f82af807-83b2-4190-aaa0-09e28ac98b4e)
   )
-  (junction (at 81.28 148.59) (diameter 0) (color 0 0 0 0)
-    (uuid fc77df65-58b7-4a78-95df-4be106f1bca7)
+  (junction (at 111.76 53.34) (diameter 0) (color 0 0 0 0)
+    (uuid f90624d6-8f91-4c96-b896-6f3c7eb535d3)
   )
-  (junction (at 81.28 113.03) (diameter 0) (color 0 0 0 0)
-    (uuid fd2142d0-1544-4c9b-b068-92cc34ec9c06)
+  (junction (at 109.22 106.68) (diameter 0) (color 0 0 0 0)
+    (uuid f959cfc7-3119-4076-9153-137bec5bc554)
   )
-  (junction (at 35.56 95.25) (diameter 0) (color 0 0 0 0)
-    (uuid fe35d757-400d-445e-a155-ed4c07b7665a)
+  (junction (at 137.16 83.82) (diameter 0) (color 0 0 0 0)
+    (uuid f9a8ce87-9308-4807-9b11-3156a04376da)
   )
-  (junction (at 114.3 34.29) (diameter 0) (color 0 0 0 0)
-    (uuid ff073ce6-3118-43ef-8375-1cfb0e69ba8c)
+  (junction (at 147.32 121.92) (diameter 0) (color 0 0 0 0)
+    (uuid fc58ced6-d35b-48a7-b80f-5810ea2ae5cd)
   )
 
   (no_connect (at 259.08 91.44) (uuid 4303247b-5fe1-4f6a-b2ab-14642e53bb89))
@@ -614,613 +614,613 @@
   (no_connect (at 233.68 91.44) (uuid 8fabd780-47ac-4d37-890f-5ddfe2720bd7))
   (no_connect (at 248.92 91.44) (uuid adcf295a-4b92-4ea1-b1df-382347f38c5b))
 
-  (wire (pts (xy 91.44 52.07) (xy 91.44 69.85))
+  (wire (pts (xy 185.42 121.92) (xy 185.42 137.16))
     (stroke (width 0) (type default))
-    (uuid 02172741-2850-4889-82d4-f606eaca8046)
+    (uuid 059592d4-2772-4ad7-8d9e-9f5edf1a79d1)
   )
-  (wire (pts (xy 19.05 100.33) (xy 22.86 100.33))
+  (wire (pts (xy 185.42 31.75) (xy 185.42 45.72))
     (stroke (width 0) (type default))
-    (uuid 028e8767-86d4-4f6c-a43c-c64a9530d08d)
+    (uuid 059d1475-2875-41d3-a692-143a1ac5f452)
   )
-  (wire (pts (xy 114.3 87.63) (xy 114.3 105.41))
+  (wire (pts (xy 76.2 104.14) (xy 82.55 104.14))
     (stroke (width 0) (type default))
-    (uuid 0312eefc-88c5-49c6-ae37-530c29555528)
+    (uuid 075785a9-ef6b-4c6f-8bb7-faa42c9c90f8)
   )
-  (wire (pts (xy 91.44 69.85) (xy 91.44 87.63))
+  (wire (pts (xy 134.62 45.72) (xy 134.62 60.96))
     (stroke (width 0) (type default))
-    (uuid 046dd0de-f2f2-445a-aaa5-3785b8b5871d)
+    (uuid 0997aba9-c2e6-443a-9cbb-a6a124d30845)
   )
-  (wire (pts (xy 58.42 95.25) (xy 81.28 95.25))
+  (wire (pts (xy 111.76 68.58) (xy 124.46 68.58))
     (stroke (width 0) (type default))
-    (uuid 050dea83-f4c2-46c1-ba7f-99a8081cb2aa)
+    (uuid 0b037589-f0ee-4474-8acc-b4b3cf26f955)
   )
-  (wire (pts (xy 35.56 130.81) (xy 58.42 130.81))
+  (wire (pts (xy 149.86 129.54) (xy 162.56 129.54))
     (stroke (width 0) (type default))
-    (uuid 05e48e90-b923-46b9-a35d-5e6ccbc0fa0e)
+    (uuid 0c50c586-492d-459c-a414-972e2bb06135)
   )
-  (wire (pts (xy 21.59 148.59) (xy 35.56 148.59))
+  (wire (pts (xy 147.32 91.44) (xy 147.32 106.68))
     (stroke (width 0) (type default))
-    (uuid 068368c5-9fec-40b7-851a-d0344d5860a0)
+    (uuid 0daf14d8-3f7c-4a9e-8f90-32177d94e933)
   )
-  (wire (pts (xy 21.59 87.63) (xy 21.59 41.91))
+  (wire (pts (xy 111.76 53.34) (xy 124.46 53.34))
     (stroke (width 0) (type default))
-    (uuid 07a39c7e-90fa-425a-8427-7e8864d53ac5)
+    (uuid 0e4d9f1b-f1eb-4429-8691-fa811e9b34a1)
   )
-  (wire (pts (xy 45.72 19.05) (xy 45.72 34.29))
+  (wire (pts (xy 143.51 34.29) (xy 160.02 34.29))
     (stroke (width 0) (type default))
-    (uuid 0a0da438-0cff-49c5-96e6-5dda74c189e4)
+    (uuid 101062c9-bba6-43b5-bfdb-ed0051cba408)
   )
-  (wire (pts (xy 127 77.47) (xy 149.86 77.47))
+  (wire (pts (xy 137.16 53.34) (xy 149.86 53.34))
     (stroke (width 0) (type default))
-    (uuid 0a18c2a5-2e4d-4cd0-a672-5dbb29ae4d18)
+    (uuid 11d23338-82cf-43c5-8d2e-395ab5e1b6d6)
   )
-  (wire (pts (xy 123.19 22.86) (xy 137.16 22.86))
+  (wire (pts (xy 160.02 60.96) (xy 160.02 76.2))
     (stroke (width 0) (type default))
-    (uuid 0a5c1632-fea5-45a2-99f2-aa2cae75c6d1)
+    (uuid 15e0d554-2606-4c91-9293-6da39353f936)
   )
-  (wire (pts (xy 127 95.25) (xy 149.86 95.25))
+  (wire (pts (xy 172.72 33.02) (xy 172.72 45.72))
     (stroke (width 0) (type default))
-    (uuid 0b5264e0-db59-4a4a-88cf-24fe852992c9)
+    (uuid 1673b9b6-2507-4a57-afe3-83cc07ccb197)
   )
-  (wire (pts (xy 123.19 19.05) (xy 123.19 22.86))
+  (wire (pts (xy 175.26 129.54) (xy 187.96 129.54))
     (stroke (width 0) (type default))
-    (uuid 0d78c40a-bcce-453f-b002-7da36894b87e)
+    (uuid 17312994-2a46-4958-8f8c-41a0c52b24d3)
   )
-  (wire (pts (xy 68.58 34.29) (xy 68.58 52.07))
+  (wire (pts (xy 121.92 121.92) (xy 121.92 137.16))
     (stroke (width 0) (type default))
-    (uuid 0d97d9ab-45e8-47f6-b2df-5045718e1942)
+    (uuid 1a12bf21-b927-4359-8f3e-d37b9de42c21)
   )
-  (wire (pts (xy 68.58 87.63) (xy 68.58 105.41))
+  (wire (pts (xy 82.55 93.98) (xy 82.55 68.58))
     (stroke (width 0) (type default))
-    (uuid 0f3702af-99cd-4b10-8c77-5973f13f8708)
+    (uuid 1dc76cd8-765b-4989-853c-07b0327602a6)
   )
-  (wire (pts (xy 68.58 20.32) (xy 68.58 34.29))
+  (wire (pts (xy 124.46 99.06) (xy 137.16 99.06))
     (stroke (width 0) (type default))
-    (uuid 0f471df3-e2ba-427f-ae49-38879c9ae76d)
+    (uuid 1ec63b35-241c-44c0-89c8-ec62682770c5)
   )
-  (wire (pts (xy 114.3 52.07) (xy 114.3 69.85))
+  (wire (pts (xy 109.22 91.44) (xy 109.22 106.68))
     (stroke (width 0) (type default))
-    (uuid 115966b1-f219-4932-b72c-5250cf338e6c)
+    (uuid 20c88211-6c46-4bcd-88f9-00ece9ac658f)
   )
-  (wire (pts (xy 68.58 69.85) (xy 68.58 87.63))
+  (wire (pts (xy 124.46 129.54) (xy 137.16 129.54))
     (stroke (width 0) (type default))
-    (uuid 1343b163-e1e7-40cd-b010-ee1fa2c0f9ff)
+    (uuid 231e9bff-2bec-497b-9e3c-e8e5eaf53fa5)
   )
-  (wire (pts (xy 81.28 95.25) (xy 104.14 95.25))
+  (wire (pts (xy 76.2 109.22) (xy 80.01 109.22))
     (stroke (width 0) (type default))
-    (uuid 1986e959-e32d-4dd2-a869-358a6ac20d7f)
+    (uuid 234cff35-7b8e-41de-9834-c4c88fd761d9)
   )
-  (wire (pts (xy 172.72 41.91) (xy 195.58 41.91))
+  (wire (pts (xy 160.02 106.68) (xy 160.02 121.92))
     (stroke (width 0) (type default))
-    (uuid 1a9be535-d383-4802-8895-552c086860bb)
+    (uuid 23bce935-427a-4722-b260-920c9192d267)
   )
-  (wire (pts (xy 45.72 87.63) (xy 45.72 105.41))
+  (wire (pts (xy 124.46 53.34) (xy 137.16 53.34))
     (stroke (width 0) (type default))
-    (uuid 1afd29e1-f5a6-4bf1-ac32-5701008f09a4)
+    (uuid 278be519-2729-43cc-bb39-2fcffee6f7f4)
   )
-  (wire (pts (xy 45.72 105.41) (xy 45.72 123.19))
+  (wire (pts (xy 99.06 114.3) (xy 111.76 114.3))
     (stroke (width 0) (type default))
-    (uuid 1b94beb8-1e10-40b2-a0ca-0a684925dd7b)
+    (uuid 29ab452b-b6b0-4531-b87c-5de8aa8755d9)
   )
-  (wire (pts (xy 35.56 113.03) (xy 58.42 113.03))
+  (wire (pts (xy 175.26 68.58) (xy 187.96 68.58))
     (stroke (width 0) (type default))
-    (uuid 1c8ef670-6e25-47a0-9627-44e62b8c045f)
+    (uuid 2a18887a-e5d6-474b-b0fd-4edf5f098304)
   )
-  (wire (pts (xy 172.72 59.69) (xy 195.58 59.69))
+  (wire (pts (xy 111.76 114.3) (xy 124.46 114.3))
     (stroke (width 0) (type default))
-    (uuid 20558865-1fb9-4667-9274-98d7bdcb247a)
+    (uuid 2a9657aa-4312-486f-9873-8f97891dbf86)
   )
-  (wire (pts (xy 22.86 100.33) (xy 22.86 130.81))
+  (wire (pts (xy 147.32 76.2) (xy 147.32 91.44))
     (stroke (width 0) (type default))
-    (uuid 217b66c3-66a9-42c8-914a-7435d9acbb64)
+    (uuid 2fdfcc84-9eb8-4849-a8a0-72bd2b45b4bc)
   )
-  (wire (pts (xy 81.28 113.03) (xy 104.14 113.03))
+  (wire (pts (xy 147.32 137.16) (xy 147.32 152.4))
     (stroke (width 0) (type default))
-    (uuid 22c542d7-a648-4d20-a65a-e350b2872a6a)
+    (uuid 32254a0e-d5aa-493e-9898-7ee848ee26be)
   )
-  (wire (pts (xy 182.88 105.41) (xy 182.88 123.19))
+  (wire (pts (xy 111.76 160.02) (xy 124.46 160.02))
     (stroke (width 0) (type default))
-    (uuid 234c3545-bc47-483b-934a-13d90576a44f)
+    (uuid 32f329ac-580b-4323-afa0-e656268b5c62)
   )
-  (wire (pts (xy 24.13 92.71) (xy 24.13 77.47))
+  (wire (pts (xy 134.62 91.44) (xy 134.62 106.68))
     (stroke (width 0) (type default))
-    (uuid 23ac3ed0-e5cf-4ced-98f6-319e4d191c24)
+    (uuid 33a1a56e-486f-46e1-8948-93ff5b4bd3b4)
   )
-  (wire (pts (xy 113.03 19.05) (xy 45.72 19.05))
+  (wire (pts (xy 160.02 121.92) (xy 160.02 137.16))
     (stroke (width 0) (type default))
-    (uuid 24233776-f94d-4add-89d3-3a2b131c99b2)
+    (uuid 37b5c0e8-2870-40b9-a99c-881c149059c5)
   )
-  (wire (pts (xy 114.3 105.41) (xy 114.3 123.19))
+  (wire (pts (xy 151.13 29.21) (xy 198.12 29.21))
     (stroke (width 0) (type default))
-    (uuid 257c665b-c6ef-4194-86ae-44a53ec4a2f5)
+    (uuid 381fe7ce-4652-43d9-aad5-16b1d6e1bbff)
   )
-  (wire (pts (xy 21.59 41.91) (xy 35.56 41.91))
+  (wire (pts (xy 81.28 91.44) (xy 81.28 53.34))
     (stroke (width 0) (type default))
-    (uuid 28b56f8c-a8a8-4c5c-8ebd-39323a0d74c2)
+    (uuid 395c81dc-e97c-4a24-abb2-7b75c01e6944)
   )
-  (wire (pts (xy 205.74 19.05) (xy 205.74 34.29))
+  (wire (pts (xy 198.12 121.92) (xy 198.12 137.16))
     (stroke (width 0) (type default))
-    (uuid 29486f8a-ae5b-43b0-b3ae-8f84220af6ef)
+    (uuid 3a089ef0-10c5-46d2-8a91-ca3c06215688)
   )
-  (wire (pts (xy 160.02 69.85) (xy 160.02 87.63))
+  (wire (pts (xy 124.46 114.3) (xy 137.16 114.3))
     (stroke (width 0) (type default))
-    (uuid 29c66564-5ab5-4963-963c-283a9eae57d5)
+    (uuid 3dfb580a-e3c6-4179-bff8-50740c9c5e2e)
   )
-  (wire (pts (xy 81.28 77.47) (xy 104.14 77.47))
+  (wire (pts (xy 140.97 29.21) (xy 140.97 35.56))
     (stroke (width 0) (type default))
-    (uuid 2df85319-c475-40ad-8b5b-bd1d5c74c9b8)
+    (uuid 3e0a9752-cb48-4a3d-a876-05a0d8cbf7ee)
   )
-  (wire (pts (xy 19.05 102.87) (xy 21.59 102.87))
+  (wire (pts (xy 135.89 29.21) (xy 135.89 30.48))
     (stroke (width 0) (type default))
-    (uuid 3469b454-dd48-445b-b176-eb87c893a0be)
+    (uuid 44af64de-423c-4051-8d54-56a89d166767)
   )
-  (wire (pts (xy 21.59 102.87) (xy 21.59 148.59))
+  (wire (pts (xy 172.72 91.44) (xy 172.72 106.68))
     (stroke (width 0) (type default))
-    (uuid 350ea3aa-6652-4cc5-904c-89e30d68a715)
+    (uuid 44e9eed4-45c6-4507-bde9-cb34c811aafd)
   )
-  (wire (pts (xy 68.58 123.19) (xy 68.58 140.97))
+  (wire (pts (xy 99.06 53.34) (xy 111.76 53.34))
     (stroke (width 0) (type default))
-    (uuid 356cfcee-06c5-41d5-b637-1303cbb0e7c7)
+    (uuid 45750e4e-f616-4075-bc53-06430b648c65)
   )
-  (wire (pts (xy 81.28 130.81) (xy 104.14 130.81))
+  (wire (pts (xy 185.42 60.96) (xy 185.42 76.2))
     (stroke (width 0) (type default))
-    (uuid 37e51d09-4516-443e-b94e-39773d484699)
+    (uuid 4a46da89-abdb-4484-8d01-20d3012c5a34)
   )
-  (wire (pts (xy 91.44 140.97) (xy 91.44 158.75))
+  (wire (pts (xy 111.76 144.78) (xy 124.46 144.78))
     (stroke (width 0) (type default))
-    (uuid 3acdc85c-bd23-403c-b2d5-a27bc19efcc5)
+    (uuid 4ba35f1c-b1bc-4119-ba6f-797f10afa003)
   )
-  (wire (pts (xy 130.81 19.05) (xy 205.74 19.05))
+  (wire (pts (xy 149.86 160.02) (xy 162.56 160.02))
     (stroke (width 0) (type default))
-    (uuid 3b147723-ef70-4cc9-abb6-0319030d1bc8)
+    (uuid 4dde4c0e-d5ac-4b78-9ae0-f1ab1768bd5b)
   )
-  (wire (pts (xy 81.28 59.69) (xy 104.14 59.69))
+  (wire (pts (xy 185.42 106.68) (xy 185.42 121.92))
     (stroke (width 0) (type default))
-    (uuid 3d6cf9b8-1539-43cd-87d5-1298861668cd)
+    (uuid 4fdf586b-8f94-464e-9e05-ca731768826f)
   )
-  (wire (pts (xy 22.86 59.69) (xy 35.56 59.69))
+  (wire (pts (xy 76.2 93.98) (xy 82.55 93.98))
     (stroke (width 0) (type default))
-    (uuid 3e0d5385-c4f6-4c32-ad1e-9ccbe48bd559)
+    (uuid 517b929a-d893-4eed-9be4-aaee1aaabd7c)
   )
-  (wire (pts (xy 137.16 140.97) (xy 137.16 158.75))
+  (wire (pts (xy 162.56 114.3) (xy 175.26 114.3))
     (stroke (width 0) (type default))
-    (uuid 3fd3cc52-8f9e-4e3b-9e0b-8e91c78ace33)
+    (uuid 519d20c4-7032-48f8-bd5e-c20ff0e493d8)
   )
-  (wire (pts (xy 205.74 34.29) (xy 205.74 52.07))
+  (wire (pts (xy 124.46 68.58) (xy 137.16 68.58))
     (stroke (width 0) (type default))
-    (uuid 41c07e4c-bb05-4346-8b47-59a73e9dbf34)
+    (uuid 525aba4a-1eb3-4bee-9015-185c247f7a14)
   )
-  (wire (pts (xy 68.58 105.41) (xy 68.58 123.19))
+  (wire (pts (xy 83.82 83.82) (xy 99.06 83.82))
     (stroke (width 0) (type default))
-    (uuid 43a7c1dc-08c3-4fb7-9ab2-ffb789633053)
+    (uuid 53ba9b99-6f21-4f16-8a01-a8e4dbb0b593)
   )
-  (wire (pts (xy 19.05 105.41) (xy 20.32 105.41))
+  (wire (pts (xy 148.59 31.75) (xy 185.42 31.75))
     (stroke (width 0) (type default))
-    (uuid 4515c2a4-1a69-4442-a4a4-ea61ed5f6bb7)
+    (uuid 541396a1-1416-4dba-8483-6bef1620a9c0)
   )
-  (wire (pts (xy 160.02 34.29) (xy 160.02 52.07))
+  (wire (pts (xy 135.89 30.48) (xy 121.92 30.48))
     (stroke (width 0) (type default))
-    (uuid 476e502e-32dd-42f1-95d2-38b8b73f0e9d)
+    (uuid 56bdbb09-63cd-41b9-95e2-3bb60d02be14)
   )
-  (wire (pts (xy 91.44 34.29) (xy 91.44 52.07))
+  (wire (pts (xy 99.06 160.02) (xy 111.76 160.02))
     (stroke (width 0) (type default))
-    (uuid 479dd99e-a6af-4df1-9844-f35bc52da24b)
+    (uuid 578c1af1-aa2e-4c1c-9a4e-8dc3f0fc68b2)
   )
-  (wire (pts (xy 114.3 69.85) (xy 114.3 87.63))
+  (wire (pts (xy 149.86 68.58) (xy 162.56 68.58))
     (stroke (width 0) (type default))
-    (uuid 498b2c46-e9d9-4e28-9f66-0ef4eed0be2b)
+    (uuid 58d7407d-e5c4-4db6-91eb-c89e5c4c325f)
   )
-  (wire (pts (xy 58.42 113.03) (xy 81.28 113.03))
+  (wire (pts (xy 160.02 34.29) (xy 160.02 45.72))
     (stroke (width 0) (type default))
-    (uuid 4a5752e1-aeb2-458e-8588-975b12aeb50c)
+    (uuid 5b65aefd-3eca-4a17-a3b9-4aa9268cb13f)
   )
-  (wire (pts (xy 22.86 130.81) (xy 35.56 130.81))
+  (wire (pts (xy 121.92 106.68) (xy 121.92 121.92))
     (stroke (width 0) (type default))
-    (uuid 4e04ba69-c836-4f75-86ca-51a8328c49cc)
+    (uuid 5c08859e-8c0e-4617-ab19-7587007bad9d)
   )
-  (wire (pts (xy 182.88 140.97) (xy 182.88 158.75))
+  (wire (pts (xy 124.46 160.02) (xy 137.16 160.02))
     (stroke (width 0) (type default))
-    (uuid 4ecb0ee4-bfc7-44f2-baad-4c88c530115f)
+    (uuid 5d8664b0-8016-4cfc-a8f5-b76a25a41011)
   )
-  (wire (pts (xy 149.86 59.69) (xy 172.72 59.69))
+  (wire (pts (xy 134.62 121.92) (xy 134.62 137.16))
     (stroke (width 0) (type default))
-    (uuid 50e2da5a-9a72-41ed-b118-3b4945e35e6b)
+    (uuid 5e70f063-1f5d-4731-9aff-17ccf1f812ce)
   )
-  (wire (pts (xy 22.86 90.17) (xy 22.86 59.69))
+  (wire (pts (xy 140.97 35.56) (xy 147.32 35.56))
     (stroke (width 0) (type default))
-    (uuid 52d7f7d6-4e3a-4684-ad45-b93c61386361)
+    (uuid 5f12cb6c-75cc-4d88-a5bb-a9279e6f41b1)
   )
-  (wire (pts (xy 149.86 113.03) (xy 172.72 113.03))
+  (wire (pts (xy 160.02 91.44) (xy 160.02 106.68))
     (stroke (width 0) (type default))
-    (uuid 556ea8c2-29fa-48ec-940a-c8ad373959c0)
+    (uuid 5f5c33ff-f93f-482d-b148-6446a50e9e3d)
   )
-  (wire (pts (xy 104.14 166.37) (xy 127 166.37))
+  (wire (pts (xy 109.22 29.21) (xy 109.22 45.72))
     (stroke (width 0) (type default))
-    (uuid 578ea400-e148-4e9d-9bc7-51404c63c182)
+    (uuid 5ff6cfe0-b60b-44a7-b949-009879ad6391)
   )
-  (wire (pts (xy 172.72 77.47) (xy 195.58 77.47))
+  (wire (pts (xy 109.22 137.16) (xy 109.22 152.4))
     (stroke (width 0) (type default))
-    (uuid 5f30c9dc-1558-471a-98d4-4fcff30e2067)
+    (uuid 63d2362c-c8b7-4fe6-8536-34405bc000b8)
   )
-  (wire (pts (xy 160.02 52.07) (xy 160.02 69.85))
+  (wire (pts (xy 137.16 68.58) (xy 149.86 68.58))
     (stroke (width 0) (type default))
-    (uuid 5faee5a9-0611-4340-97b2-8ef7904b0ca2)
+    (uuid 6430a1a8-4618-46e1-88b1-52c11501cb02)
   )
-  (wire (pts (xy 149.86 77.47) (xy 172.72 77.47))
+  (wire (pts (xy 80.01 160.02) (xy 99.06 160.02))
     (stroke (width 0) (type default))
-    (uuid 600573b7-b852-47be-8194-e41624a5148d)
+    (uuid 64d4830b-a3b9-4b39-9a86-b18e81e552fd)
   )
-  (wire (pts (xy 172.72 95.25) (xy 195.58 95.25))
+  (wire (pts (xy 162.56 83.82) (xy 175.26 83.82))
     (stroke (width 0) (type default))
-    (uuid 605e799e-e069-4858-8d8c-7652ceb6f0ce)
+    (uuid 671ba596-c7f5-409f-9cd3-ce9e694cb24d)
   )
-  (wire (pts (xy 35.56 148.59) (xy 58.42 148.59))
+  (wire (pts (xy 146.05 33.02) (xy 172.72 33.02))
     (stroke (width 0) (type default))
-    (uuid 608aabd2-2291-4aed-aa61-092df135de55)
+    (uuid 6dad8486-4d6e-467d-91d4-0d61703e8c85)
   )
-  (wire (pts (xy 128.27 19.05) (xy 128.27 20.32))
+  (wire (pts (xy 149.86 114.3) (xy 162.56 114.3))
     (stroke (width 0) (type default))
-    (uuid 60e948a7-3d9a-459e-9fb6-d2748263b3b0)
+    (uuid 6db989b6-43b8-4087-8a0d-d73c33b59b01)
   )
-  (wire (pts (xy 205.74 69.85) (xy 205.74 87.63))
+  (wire (pts (xy 134.62 31.75) (xy 134.62 45.72))
     (stroke (width 0) (type default))
-    (uuid 62898d84-c727-42c8-8085-333f4bc5b7b6)
+    (uuid 6fa2d215-d237-4a44-b91a-32f00868a045)
   )
-  (wire (pts (xy 160.02 87.63) (xy 160.02 105.41))
+  (wire (pts (xy 109.22 121.92) (xy 109.22 137.16))
     (stroke (width 0) (type default))
-    (uuid 6b6297ae-6dd4-4e2e-8d53-ab7987fdbbb3)
+    (uuid 726d31aa-4d34-4cec-b1c5-83d1e47df88e)
   )
-  (wire (pts (xy 45.72 69.85) (xy 45.72 87.63))
+  (wire (pts (xy 111.76 129.54) (xy 124.46 129.54))
     (stroke (width 0) (type default))
-    (uuid 6ed6882f-6879-4a20-b104-af08dc0f3800)
+    (uuid 74cbaf4e-0c20-4cc4-a868-ca9c8d94cafa)
   )
-  (wire (pts (xy 182.88 69.85) (xy 182.88 87.63))
+  (wire (pts (xy 81.28 144.78) (xy 99.06 144.78))
     (stroke (width 0) (type default))
-    (uuid 701245a0-aaf7-4cb3-9b93-89a03a6a9fa7)
+    (uuid 7896aa08-37e2-4c1f-80d5-ad65155aaf0b)
   )
-  (wire (pts (xy 120.65 22.86) (xy 114.3 22.86))
+  (wire (pts (xy 76.2 91.44) (xy 81.28 91.44))
     (stroke (width 0) (type default))
-    (uuid 70d1b823-dd04-4468-9310-dadb611b9fe0)
+    (uuid 7f5d1caf-2ed5-43b4-83fe-32f91f813c91)
   )
-  (wire (pts (xy 35.56 95.25) (xy 58.42 95.25))
+  (wire (pts (xy 82.55 68.58) (xy 99.06 68.58))
     (stroke (width 0) (type default))
-    (uuid 72c8ed21-86df-4540-9514-de0fb9eac23f)
+    (uuid 81615bed-dc35-4c38-9a92-eebddec3f6d5)
   )
-  (wire (pts (xy 137.16 52.07) (xy 137.16 69.85))
+  (wire (pts (xy 175.26 144.78) (xy 187.96 144.78))
     (stroke (width 0) (type default))
-    (uuid 754fbb95-77a4-48a9-a598-15c82814c991)
+    (uuid 81babceb-076e-42d7-9e48-4d2b3eb36d41)
   )
-  (wire (pts (xy 104.14 59.69) (xy 127 59.69))
+  (wire (pts (xy 198.12 45.72) (xy 198.12 60.96))
     (stroke (width 0) (type default))
-    (uuid 754fd3b2-8571-425b-aff1-2183f47ba651)
+    (uuid 87169484-aa47-4302-a18d-4b3faf4e87b0)
   )
-  (wire (pts (xy 58.42 59.69) (xy 81.28 59.69))
+  (wire (pts (xy 137.16 129.54) (xy 149.86 129.54))
     (stroke (width 0) (type default))
-    (uuid 77077d25-1012-44e6-9c3c-b59f455d9186)
+    (uuid 889affa7-8774-4346-b96a-47100d649cbc)
   )
-  (wire (pts (xy 149.86 41.91) (xy 172.72 41.91))
+  (wire (pts (xy 134.62 76.2) (xy 134.62 91.44))
     (stroke (width 0) (type default))
-    (uuid 77478413-bbc0-4670-8ee8-a516989c0f74)
+    (uuid 8902e997-fad9-4e60-aa74-fb169d23e9ff)
   )
-  (wire (pts (xy 137.16 87.63) (xy 137.16 105.41))
+  (wire (pts (xy 81.28 53.34) (xy 99.06 53.34))
     (stroke (width 0) (type default))
-    (uuid 77bb9eda-9746-42b6-9e2d-6948919b614a)
+    (uuid 89901f93-86ff-48f7-800e-be35a30e14d2)
   )
-  (wire (pts (xy 58.42 41.91) (xy 81.28 41.91))
+  (wire (pts (xy 162.56 144.78) (xy 175.26 144.78))
     (stroke (width 0) (type default))
-    (uuid 7dba306c-c1fa-4fb4-a52d-4e6922a47e06)
+    (uuid 8a021b53-3507-4d4d-a57e-75d944cb40cb)
   )
-  (wire (pts (xy 137.16 105.41) (xy 137.16 123.19))
+  (wire (pts (xy 109.22 106.68) (xy 109.22 121.92))
     (stroke (width 0) (type default))
-    (uuid 7dbbc09f-520d-4476-8448-866c116c72da)
+    (uuid 8a9633aa-08e6-4c07-aca8-9106e74df548)
   )
-  (wire (pts (xy 127 166.37) (xy 149.86 166.37))
+  (wire (pts (xy 162.56 53.34) (xy 175.26 53.34))
     (stroke (width 0) (type default))
-    (uuid 7f29cfd5-1af5-4a6e-a387-d26d30677203)
+    (uuid 8cbfcd86-1526-4e15-8930-8e2b5357ad7c)
   )
-  (wire (pts (xy 149.86 166.37) (xy 172.72 166.37))
+  (wire (pts (xy 82.55 104.14) (xy 82.55 129.54))
     (stroke (width 0) (type default))
-    (uuid 7f968c18-834d-40e4-952d-7b29dd271bf6)
+    (uuid 8ce14dcf-206d-436b-a3d4-1cd57aaa1ffa)
   )
-  (wire (pts (xy 149.86 148.59) (xy 172.72 148.59))
+  (wire (pts (xy 185.42 91.44) (xy 185.42 106.68))
     (stroke (width 0) (type default))
-    (uuid 7fd5ad3f-af63-4aba-8f1c-37b5f3a382c3)
+    (uuid 8ecfdcdc-b7b2-4f51-9b47-2064ae590375)
   )
-  (wire (pts (xy 160.02 140.97) (xy 160.02 158.75))
+  (wire (pts (xy 185.42 137.16) (xy 185.42 152.4))
     (stroke (width 0) (type default))
-    (uuid 81529801-88d2-44d5-9566-fbcba2526507)
+    (uuid 90237a81-418a-4bd3-b105-bea3ceb6ab61)
   )
-  (wire (pts (xy 58.42 148.59) (xy 81.28 148.59))
+  (wire (pts (xy 198.12 29.21) (xy 198.12 45.72))
     (stroke (width 0) (type default))
-    (uuid 88c663e5-051c-4b59-8e5d-ecb413743796)
+    (uuid 91813afb-f9ce-4a80-a280-4fd97c3d71f8)
   )
-  (wire (pts (xy 182.88 87.63) (xy 182.88 105.41))
+  (wire (pts (xy 99.06 68.58) (xy 111.76 68.58))
     (stroke (width 0) (type default))
-    (uuid 88c88206-c86b-4bc0-a25d-3db2594a1fdd)
+    (uuid 93636540-4159-4846-b7f9-18531d87ffa0)
   )
-  (wire (pts (xy 81.28 41.91) (xy 104.14 41.91))
+  (wire (pts (xy 109.22 45.72) (xy 109.22 60.96))
     (stroke (width 0) (type default))
-    (uuid 89b745ca-05d9-464d-8376-91f23d299237)
+    (uuid 947b40c9-c773-43fd-a94d-26e74798a1ff)
   )
-  (wire (pts (xy 24.13 77.47) (xy 35.56 77.47))
+  (wire (pts (xy 83.82 114.3) (xy 99.06 114.3))
     (stroke (width 0) (type default))
-    (uuid 8c051c85-f7e3-4aee-beb7-f2453eae2450)
+    (uuid 97909b57-90e5-4346-abba-a3c9191ae282)
   )
-  (wire (pts (xy 137.16 34.29) (xy 137.16 52.07))
+  (wire (pts (xy 76.2 99.06) (xy 99.06 99.06))
     (stroke (width 0) (type default))
-    (uuid 8dbfd4f2-f13a-4680-80c4-48e76fcd83dd)
+    (uuid 98be6065-ade1-4e72-9381-4d62ba116acc)
   )
-  (wire (pts (xy 182.88 20.32) (xy 182.88 34.29))
+  (wire (pts (xy 111.76 83.82) (xy 124.46 83.82))
     (stroke (width 0) (type default))
-    (uuid 90008c25-bbd1-4dd1-a707-d9c59fb93cd3)
+    (uuid 99920af6-ec53-4626-9edb-49f55b61a96e)
   )
-  (wire (pts (xy 45.72 140.97) (xy 45.72 158.75))
+  (wire (pts (xy 134.62 106.68) (xy 134.62 121.92))
     (stroke (width 0) (type default))
-    (uuid 9044f161-8e1d-4357-8a2f-3ea74084faf6)
+    (uuid 9a0dd90a-63cf-413d-9887-864d276aedc8)
   )
-  (wire (pts (xy 58.42 166.37) (xy 81.28 166.37))
+  (wire (pts (xy 172.72 76.2) (xy 172.72 91.44))
     (stroke (width 0) (type default))
-    (uuid 91932ca6-6f78-48c3-bd92-38aefc1b29cb)
+    (uuid a1ba4efd-d311-4964-8772-b532f9e79595)
   )
-  (wire (pts (xy 35.56 59.69) (xy 58.42 59.69))
+  (wire (pts (xy 124.46 144.78) (xy 137.16 144.78))
     (stroke (width 0) (type default))
-    (uuid 91cc5276-8d5a-48ff-92d9-3e8eec2e0748)
+    (uuid a251eab0-a377-4a5d-b055-f40dd10b2082)
   )
-  (wire (pts (xy 127 148.59) (xy 149.86 148.59))
+  (wire (pts (xy 137.16 144.78) (xy 149.86 144.78))
     (stroke (width 0) (type default))
-    (uuid 92f7964d-7b77-46c0-83d3-1452d327aa38)
+    (uuid a6edd7e8-889f-4955-8e88-710468ea20bb)
   )
-  (wire (pts (xy 160.02 105.41) (xy 160.02 123.19))
+  (wire (pts (xy 121.92 91.44) (xy 121.92 106.68))
     (stroke (width 0) (type default))
-    (uuid 94b43a12-9fa6-409b-aaab-633612b88e57)
+    (uuid a8cff618-acf6-443a-9d59-21e86af24e11)
   )
-  (wire (pts (xy 104.14 41.91) (xy 127 41.91))
+  (wire (pts (xy 198.12 106.68) (xy 198.12 121.92))
     (stroke (width 0) (type default))
-    (uuid 94cf05ce-194b-44a9-add6-53330ecbe8ff)
+    (uuid aa52df80-47ff-46bd-84d4-b11141736a3d)
   )
-  (wire (pts (xy 91.44 21.59) (xy 91.44 34.29))
+  (wire (pts (xy 109.22 60.96) (xy 109.22 76.2))
     (stroke (width 0) (type default))
-    (uuid 94e0e952-2ca2-4761-8b0e-9fe32dc60a28)
+    (uuid ab5aac78-1261-4bce-8c1e-d6610983ebed)
   )
-  (wire (pts (xy 91.44 87.63) (xy 91.44 105.41))
+  (wire (pts (xy 99.06 99.06) (xy 111.76 99.06))
     (stroke (width 0) (type default))
-    (uuid 98123d66-10f5-443d-aa33-2c906b52df75)
+    (uuid abc004bc-5499-4c61-a7b3-a8e4b5d5cf04)
   )
-  (wire (pts (xy 81.28 148.59) (xy 104.14 148.59))
+  (wire (pts (xy 121.92 30.48) (xy 121.92 45.72))
     (stroke (width 0) (type default))
-    (uuid 98e9cdaf-93c5-4f0c-9107-2c1bdb07934e)
+    (uuid acfa96f4-8578-4433-ba9e-0575f5ded602)
   )
-  (wire (pts (xy 91.44 123.19) (xy 91.44 140.97))
+  (wire (pts (xy 134.62 137.16) (xy 134.62 152.4))
     (stroke (width 0) (type default))
-    (uuid 9bee954d-28cf-4ad8-afba-f7377c580641)
+    (uuid af866be3-50c8-4fab-bc56-6eab455afb77)
   )
-  (wire (pts (xy 91.44 105.41) (xy 91.44 123.19))
+  (wire (pts (xy 198.12 60.96) (xy 198.12 76.2))
     (stroke (width 0) (type default))
-    (uuid 9c65d292-705c-4171-838e-a9da8f729d9a)
+    (uuid af8d6109-74da-4592-a5c8-674865659663)
   )
-  (wire (pts (xy 68.58 140.97) (xy 68.58 158.75))
+  (wire (pts (xy 162.56 129.54) (xy 175.26 129.54))
     (stroke (width 0) (type default))
-    (uuid 9e7fce22-8f47-4893-b9f1-93e2d1fd0640)
+    (uuid b5cdc6af-86d1-4927-8660-7f2e8178b463)
   )
-  (wire (pts (xy 19.05 92.71) (xy 24.13 92.71))
+  (wire (pts (xy 124.46 83.82) (xy 137.16 83.82))
     (stroke (width 0) (type default))
-    (uuid a0893dca-f0d0-4a6e-a744-5e1e192c7b47)
+    (uuid b657d840-3c63-4b4c-8cb1-faa2d8e50b92)
   )
-  (wire (pts (xy 35.56 77.47) (xy 58.42 77.47))
+  (wire (pts (xy 121.92 137.16) (xy 121.92 152.4))
     (stroke (width 0) (type default))
-    (uuid a0a8a67a-046f-4b87-90f8-b936c428e4ab)
+    (uuid b73dd9bd-aa9a-4445-be98-d251a4cbc999)
   )
-  (wire (pts (xy 125.73 21.59) (xy 160.02 21.59))
+  (wire (pts (xy 82.55 129.54) (xy 99.06 129.54))
     (stroke (width 0) (type default))
-    (uuid a132e67a-3a5f-49f1-b6d1-d47762b89ddb)
+    (uuid b762ecbe-9ab5-4035-8d34-90d5ba40c3d6)
   )
-  (wire (pts (xy 137.16 22.86) (xy 137.16 34.29))
+  (wire (pts (xy 137.16 99.06) (xy 149.86 99.06))
     (stroke (width 0) (type default))
-    (uuid a242a265-a173-4e1a-b073-a00033804c28)
+    (uuid b8670d34-f7bf-41a3-b44d-f29a980964ae)
   )
-  (wire (pts (xy 24.13 97.79) (xy 24.13 113.03))
+  (wire (pts (xy 172.72 137.16) (xy 172.72 152.4))
     (stroke (width 0) (type default))
-    (uuid a39d2cc7-773c-4916-b760-576cd3a14673)
+    (uuid ba8839c0-81ef-4efb-bf82-8fe977cf1352)
   )
-  (wire (pts (xy 118.11 19.05) (xy 118.11 21.59))
+  (wire (pts (xy 138.43 29.21) (xy 138.43 31.75))
     (stroke (width 0) (type default))
-    (uuid a48d7594-5ba6-4f22-ae64-5829636eef35)
+    (uuid bb278511-ddd6-4870-b56e-a06f5b8a0a97)
   )
-  (wire (pts (xy 137.16 123.19) (xy 137.16 140.97))
+  (wire (pts (xy 147.32 35.56) (xy 147.32 45.72))
     (stroke (width 0) (type default))
-    (uuid aa972da3-79da-42e2-a424-ba31c8c9a41d)
+    (uuid bc591851-08b5-4b0b-80a3-ae16ea66df5d)
   )
-  (wire (pts (xy 104.14 130.81) (xy 127 130.81))
+  (wire (pts (xy 137.16 114.3) (xy 149.86 114.3))
     (stroke (width 0) (type default))
-    (uuid aaf1e958-93a6-459b-b7e6-30bf9be1d617)
+    (uuid bc7c8930-04d9-4f6f-9419-94b2d332185a)
   )
-  (wire (pts (xy 58.42 130.81) (xy 81.28 130.81))
+  (wire (pts (xy 109.22 76.2) (xy 109.22 91.44))
     (stroke (width 0) (type default))
-    (uuid ad778a2f-d13a-43a7-afa7-f086f5c99017)
+    (uuid c0cda629-1aa7-46a1-ae83-c76b76a47aee)
   )
-  (wire (pts (xy 118.11 21.59) (xy 91.44 21.59))
+  (wire (pts (xy 121.92 76.2) (xy 121.92 91.44))
     (stroke (width 0) (type default))
-    (uuid b1638d0b-9aaf-4856-830e-76317137b34c)
+    (uuid c222f19e-e50f-47c2-81a0-3fff10b14eaa)
   )
-  (wire (pts (xy 19.05 87.63) (xy 21.59 87.63))
+  (wire (pts (xy 83.82 101.6) (xy 83.82 114.3))
     (stroke (width 0) (type default))
-    (uuid b2aa90fe-0d81-4f01-8315-03ae24905764)
+    (uuid c23ac2cc-4c56-4bbc-9414-1f6af674d19a)
   )
-  (wire (pts (xy 205.74 87.63) (xy 205.74 105.41))
+  (wire (pts (xy 147.32 121.92) (xy 147.32 137.16))
     (stroke (width 0) (type default))
-    (uuid b72121bc-80c2-448f-8daa-9e6f8fd0fc42)
+    (uuid c40e0791-ec88-4fee-92b4-ecd2be65ea35)
   )
-  (wire (pts (xy 128.27 20.32) (xy 182.88 20.32))
+  (wire (pts (xy 81.28 106.68) (xy 81.28 144.78))
     (stroke (width 0) (type default))
-    (uuid b837d57c-a3d1-4719-93af-40d8b41d2d1d)
+    (uuid c4e24c3d-18c4-4700-bc3c-10abe9930300)
   )
-  (wire (pts (xy 20.32 166.37) (xy 35.56 166.37))
+  (wire (pts (xy 121.92 45.72) (xy 121.92 60.96))
     (stroke (width 0) (type default))
-    (uuid b8aafaf8-4568-46ae-86ad-0928b49c49fc)
+    (uuid c622903e-5873-4879-ab77-a76042bfeabe)
   )
-  (wire (pts (xy 45.72 123.19) (xy 45.72 140.97))
+  (wire (pts (xy 149.86 144.78) (xy 162.56 144.78))
     (stroke (width 0) (type default))
-    (uuid b8b20642-67ee-4de5-83b4-0645c866f7d7)
+    (uuid c68b4923-0289-4add-bbe6-e090ce983c6e)
   )
-  (wire (pts (xy 127 59.69) (xy 149.86 59.69))
+  (wire (pts (xy 147.32 60.96) (xy 147.32 76.2))
     (stroke (width 0) (type default))
-    (uuid b9cfcfa8-1267-4e0f-920c-d52b3feceb04)
+    (uuid c755b020-1757-403f-b32a-303e88601b73)
   )
-  (wire (pts (xy 115.57 20.32) (xy 68.58 20.32))
+  (wire (pts (xy 83.82 96.52) (xy 83.82 83.82))
     (stroke (width 0) (type default))
-    (uuid bada2a3d-35bd-477d-81b4-aaaa83ea0211)
+    (uuid c772d690-3b27-4ac7-80b0-88c8fb6c1346)
   )
-  (wire (pts (xy 172.72 113.03) (xy 195.58 113.03))
+  (wire (pts (xy 111.76 99.06) (xy 124.46 99.06))
     (stroke (width 0) (type default))
-    (uuid bb19c2c1-3645-4e44-9ce1-33fd8f826efd)
+    (uuid c86ac256-2e4d-4d48-be28-92aa2f41fdf9)
   )
-  (wire (pts (xy 19.05 97.79) (xy 24.13 97.79))
+  (wire (pts (xy 160.02 45.72) (xy 160.02 60.96))
     (stroke (width 0) (type default))
-    (uuid bb45ae22-707c-4854-8127-60024cc18361)
+    (uuid c8fb2cb5-9c37-4406-b876-cad6de599d4b)
   )
-  (wire (pts (xy 127 130.81) (xy 149.86 130.81))
+  (wire (pts (xy 185.42 76.2) (xy 185.42 91.44))
     (stroke (width 0) (type default))
-    (uuid bc5ff628-d401-4577-9967-7859b9ab18a5)
+    (uuid ca27142b-3490-4fa0-944e-bc055e9d6604)
   )
-  (wire (pts (xy 205.74 105.41) (xy 205.74 123.19))
+  (wire (pts (xy 80.01 109.22) (xy 80.01 160.02))
     (stroke (width 0) (type default))
-    (uuid bce18000-b7ab-4d20-ae69-b959081c7af6)
+    (uuid cac5537f-2927-455b-8691-e45147a153db)
   )
-  (wire (pts (xy 45.72 34.29) (xy 45.72 52.07))
+  (wire (pts (xy 162.56 99.06) (xy 175.26 99.06))
     (stroke (width 0) (type default))
-    (uuid c39159cc-d56f-4e6f-8e60-b76f61f3ee70)
+    (uuid cad43e5d-8040-42f9-bc24-9007d733318d)
   )
-  (wire (pts (xy 127 113.03) (xy 149.86 113.03))
+  (wire (pts (xy 137.16 160.02) (xy 149.86 160.02))
     (stroke (width 0) (type default))
-    (uuid c3e57b0a-cc6f-48b6-b22c-8cd64b4e5a65)
+    (uuid cad824a1-3abc-46e3-9d7e-412f734f03a9)
   )
-  (wire (pts (xy 114.3 140.97) (xy 114.3 158.75))
+  (wire (pts (xy 146.05 29.21) (xy 146.05 33.02))
     (stroke (width 0) (type default))
-    (uuid c77531b1-520d-4549-b01c-3e5ac8c682de)
+    (uuid ccff831d-b8a7-4f06-90e1-88b0899f5aca)
   )
-  (wire (pts (xy 19.05 95.25) (xy 35.56 95.25))
+  (wire (pts (xy 149.86 99.06) (xy 162.56 99.06))
     (stroke (width 0) (type default))
-    (uuid c96557fc-a66d-4da6-9e18-ed5734b902ef)
+    (uuid cdb7e616-23af-428e-9c8f-11309bc429cd)
   )
-  (wire (pts (xy 104.14 77.47) (xy 127 77.47))
+  (wire (pts (xy 137.16 83.82) (xy 149.86 83.82))
     (stroke (width 0) (type default))
-    (uuid cb44f483-fe6e-4e07-95b3-f8dc84528311)
+    (uuid cf71f89b-f577-4d3a-9cb5-595de0eec872)
   )
-  (wire (pts (xy 125.73 19.05) (xy 125.73 21.59))
+  (wire (pts (xy 138.43 31.75) (xy 134.62 31.75))
     (stroke (width 0) (type default))
-    (uuid cb549fc0-da07-479c-8fee-4f670fad87a9)
+    (uuid d00884a8-cae5-4a81-b4e3-65b0bb96ad75)
   )
-  (wire (pts (xy 104.14 148.59) (xy 127 148.59))
+  (wire (pts (xy 76.2 106.68) (xy 81.28 106.68))
     (stroke (width 0) (type default))
-    (uuid cbdc0314-e03c-4b98-9d28-f4403bba55b7)
+    (uuid d0b6f211-b797-438e-b231-1366a4c6644c)
   )
-  (wire (pts (xy 120.65 19.05) (xy 120.65 22.86))
+  (wire (pts (xy 175.26 83.82) (xy 187.96 83.82))
     (stroke (width 0) (type default))
-    (uuid cdc136e1-ed12-4202-9113-da5be5dd7df7)
+    (uuid d2428240-eb2e-4498-b9ab-d534e5c43a75)
   )
-  (wire (pts (xy 20.32 105.41) (xy 20.32 166.37))
+  (wire (pts (xy 175.26 114.3) (xy 187.96 114.3))
     (stroke (width 0) (type default))
-    (uuid ce54cf89-07a1-4346-ab21-1d0e0b2b0cfd)
+    (uuid d3306c16-ecc9-4162-952d-d17b3199895f)
   )
-  (wire (pts (xy 137.16 69.85) (xy 137.16 87.63))
+  (wire (pts (xy 149.86 53.34) (xy 162.56 53.34))
     (stroke (width 0) (type default))
-    (uuid d33102e3-452c-470b-bed7-5b6bb853aa64)
+    (uuid d6e17e83-7e65-4a8c-bb93-6b298c27505a)
   )
-  (wire (pts (xy 58.42 77.47) (xy 81.28 77.47))
+  (wire (pts (xy 149.86 83.82) (xy 162.56 83.82))
     (stroke (width 0) (type default))
-    (uuid d3fd8024-acf1-4e60-b0b8-aa1e1111dfdf)
+    (uuid db1d2c20-2fde-4689-9642-e9a62acbfd6d)
   )
-  (wire (pts (xy 127 41.91) (xy 149.86 41.91))
+  (wire (pts (xy 147.32 45.72) (xy 147.32 60.96))
     (stroke (width 0) (type default))
-    (uuid d6b0ee53-68af-4a34-9c9a-b51b4c599b36)
+    (uuid dc33c37a-3cdb-48da-b62b-9ef442d021b5)
   )
-  (wire (pts (xy 115.57 19.05) (xy 115.57 20.32))
+  (wire (pts (xy 172.72 106.68) (xy 172.72 121.92))
     (stroke (width 0) (type default))
-    (uuid d70bddff-9f8c-4554-93c0-c7fe064d7990)
+    (uuid df6f8437-c74c-4155-869a-29ae9aa4d534)
   )
-  (wire (pts (xy 68.58 52.07) (xy 68.58 69.85))
+  (wire (pts (xy 160.02 137.16) (xy 160.02 152.4))
     (stroke (width 0) (type default))
-    (uuid d78d9ba2-12cb-4f47-a6f2-565ec7d16381)
+    (uuid dffe67b6-276b-4e39-ab17-d88aa2d37c43)
   )
-  (wire (pts (xy 114.3 123.19) (xy 114.3 140.97))
+  (wire (pts (xy 133.35 29.21) (xy 109.22 29.21))
     (stroke (width 0) (type default))
-    (uuid d7a44e43-6590-4b1f-8618-b0fefddc747f)
+    (uuid e0d16253-2eed-4c63-93cd-e561d7dbdb01)
   )
-  (wire (pts (xy 182.88 52.07) (xy 182.88 69.85))
+  (wire (pts (xy 175.26 53.34) (xy 187.96 53.34))
     (stroke (width 0) (type default))
-    (uuid d9f31da3-f1be-4c10-aad5-a9e296727312)
+    (uuid e21e50b6-2c7d-4ac6-b6b1-a96242177da5)
   )
-  (wire (pts (xy 182.88 34.29) (xy 182.88 52.07))
+  (wire (pts (xy 134.62 60.96) (xy 134.62 76.2))
     (stroke (width 0) (type default))
-    (uuid dc55ad50-7a02-4958-a3ee-708842d1b7d4)
+    (uuid e3e217a7-a7ab-4569-af96-ce841131000e)
   )
-  (wire (pts (xy 19.05 90.17) (xy 22.86 90.17))
+  (wire (pts (xy 162.56 68.58) (xy 175.26 68.58))
     (stroke (width 0) (type default))
-    (uuid deba6b7f-162c-435a-ba5b-a2afdc17a518)
+    (uuid e4ce7b88-c496-4587-9ca9-5f0d808af3b6)
   )
-  (wire (pts (xy 160.02 21.59) (xy 160.02 34.29))
+  (wire (pts (xy 99.06 129.54) (xy 111.76 129.54))
     (stroke (width 0) (type default))
-    (uuid e2f53895-15ac-44de-b19f-e1f61a1b9316)
+    (uuid e62314bc-d42f-4191-a009-443d198dcc50)
   )
-  (wire (pts (xy 205.74 52.07) (xy 205.74 69.85))
+  (wire (pts (xy 99.06 144.78) (xy 111.76 144.78))
     (stroke (width 0) (type default))
-    (uuid e4df25d4-22ea-4eed-898e-fa631d732c57)
+    (uuid e6a2fac9-688c-4002-8a39-2b93df1d439a)
   )
-  (wire (pts (xy 35.56 166.37) (xy 58.42 166.37))
+  (wire (pts (xy 121.92 60.96) (xy 121.92 76.2))
     (stroke (width 0) (type default))
-    (uuid e59571ec-ca68-49ee-87d0-9f1ab6def4f9)
+    (uuid e6f9e0d0-84d3-460c-8482-59666c74d47e)
   )
-  (wire (pts (xy 104.14 113.03) (xy 127 113.03))
+  (wire (pts (xy 76.2 101.6) (xy 83.82 101.6))
     (stroke (width 0) (type default))
-    (uuid e9434893-803b-465f-8763-13d1702c2477)
+    (uuid e75628db-a58e-402f-bc53-4fe6cbac2b96)
   )
-  (wire (pts (xy 45.72 52.07) (xy 45.72 69.85))
+  (wire (pts (xy 148.59 29.21) (xy 148.59 31.75))
     (stroke (width 0) (type default))
-    (uuid eb78378f-2896-4cb9-8f2c-cd89b834fbb2)
+    (uuid e8af203b-a660-49bd-9b6a-d1e5f67f7139)
   )
-  (wire (pts (xy 172.72 130.81) (xy 195.58 130.81))
+  (wire (pts (xy 143.51 29.21) (xy 143.51 34.29))
     (stroke (width 0) (type default))
-    (uuid ebfcb44d-238a-4c6b-b09f-987621d4f4e7)
+    (uuid e97c0306-5bc5-48be-910d-b490f749dc0e)
   )
-  (wire (pts (xy 104.14 95.25) (xy 127 95.25))
+  (wire (pts (xy 162.56 160.02) (xy 175.26 160.02))
     (stroke (width 0) (type default))
-    (uuid ed22c987-f70f-4fcb-856a-02426761eb2f)
+    (uuid ebd546e9-b831-482b-86f2-982cb17da171)
   )
-  (wire (pts (xy 160.02 123.19) (xy 160.02 140.97))
+  (wire (pts (xy 76.2 96.52) (xy 83.82 96.52))
     (stroke (width 0) (type default))
-    (uuid ede9786b-cadc-46e3-84b2-b78455b24862)
+    (uuid ed79846a-a148-433c-9ea0-ada94e114cc2)
   )
-  (wire (pts (xy 114.3 34.29) (xy 114.3 52.07))
+  (wire (pts (xy 160.02 76.2) (xy 160.02 91.44))
     (stroke (width 0) (type default))
-    (uuid ef063826-8038-485e-ac85-96ea84588546)
+    (uuid ee88a1f9-38ab-4ebf-857e-bcc5c06bc0b9)
   )
-  (wire (pts (xy 81.28 166.37) (xy 104.14 166.37))
+  (wire (pts (xy 172.72 45.72) (xy 172.72 60.96))
     (stroke (width 0) (type default))
-    (uuid f1ea01e7-97bc-49bc-86aa-be88e9f10de0)
+    (uuid efa1327e-3c7f-4986-a580-6d890270a5ec)
   )
-  (wire (pts (xy 114.3 22.86) (xy 114.3 34.29))
+  (wire (pts (xy 185.42 45.72) (xy 185.42 60.96))
     (stroke (width 0) (type default))
-    (uuid f76b04cc-8eac-4aa5-8d0e-ad430322f588)
+    (uuid f06c221b-fc41-4399-9639-4e5b20a689e5)
   )
-  (wire (pts (xy 182.88 123.19) (xy 182.88 140.97))
+  (wire (pts (xy 147.32 106.68) (xy 147.32 121.92))
     (stroke (width 0) (type default))
-    (uuid f8da1e87-12c0-4694-8ee9-6a538658e3d7)
+    (uuid f3af2e1d-6f1d-4d27-b3c7-b96a4e7add27)
   )
-  (wire (pts (xy 149.86 130.81) (xy 172.72 130.81))
+  (wire (pts (xy 99.06 83.82) (xy 111.76 83.82))
     (stroke (width 0) (type default))
-    (uuid f940263c-4241-4a71-945b-54b4cd19e761)
+    (uuid f3de062e-b72f-4184-b00e-11558999ac54)
   )
-  (wire (pts (xy 149.86 95.25) (xy 172.72 95.25))
+  (wire (pts (xy 198.12 76.2) (xy 198.12 106.68))
     (stroke (width 0) (type default))
-    (uuid fa0f6e5a-7046-454e-8bc7-a62972c93ff4)
+    (uuid f5bd31b7-44f2-4a69-9bfa-4cecaa1885b2)
   )
-  (wire (pts (xy 35.56 41.91) (xy 58.42 41.91))
+  (wire (pts (xy 172.72 60.96) (xy 172.72 76.2))
     (stroke (width 0) (type default))
-    (uuid ff1a4363-98a4-477b-99e9-fac1a57cb011)
+    (uuid f7abcf9b-2a0a-4aed-afc0-e029adc1dbb2)
   )
-  (wire (pts (xy 24.13 113.03) (xy 35.56 113.03))
+  (wire (pts (xy 172.72 121.92) (xy 172.72 137.16))
     (stroke (width 0) (type default))
-    (uuid ffae9ce3-42c6-4fb2-8ae5-b25e76ffda4b)
+    (uuid ff0b9481-d097-4270-8f42-52eab714e4f6)
   )
 
   (text "Space bar stabilisers" (at 232.41 80.01 0)
@@ -1228,757 +1228,713 @@
     (uuid 1a6f698f-da54-462f-bf69-17dfec3794c9)
   )
 
-  (symbol (lib_id "Diode:1N4148") (at 172.72 38.1 270) (unit 1)
+  (symbol (lib_id "Diode:1N4148") (at 149.86 49.53 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
-    (uuid 00703402-f12b-4370-b687-1fcb59efa05c)
-    (property "Reference" "D7" (at 167.64 36.83 90)
+    (uuid 04151445-0807-473f-9c7f-0d509963e510)
+    (property "Reference" "D5" (at 154.94 50.8 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "1N4148" (at 162.56 39.37 90)
+    (property "Value" "1N4148" (at 160.02 48.26 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Diode_SMD:D_SOD-123" (at 172.72 38.1 0)
+    (property "Footprint" "Diode_SMD:D_SOD-123" (at 149.86 49.53 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 172.72 38.1 0)
+    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 149.86 49.53 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Device" "D" (at 172.72 38.1 0)
+    (property "Sim.Device" "D" (at 149.86 49.53 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Pins" "1=K 2=A" (at 172.72 38.1 0)
+    (property "Sim.Pins" "1=K 2=A" (at 149.86 49.53 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 7ffe92b5-3faa-4151-a1a6-53e0e73403bc))
-    (pin "2" (uuid 95a76ef9-01dc-486c-95a7-e5b31e0b9077))
+    (pin "1" (uuid 18958a69-7018-491c-9b95-800c01c2c639))
+    (pin "2" (uuid 46907be7-b9da-4b2a-84be-f0b0c449139b))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "D7") (unit 1)
+          (reference "D5") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Switch:SW_Push") (at 200.66 123.19 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid 00997820-4112-4784-b8c1-c9f67654ccb3)
-    (property "Reference" "SW48" (at 200.66 115.57 0)
-      (effects (font (size 1.27 1.27)))
+  (symbol (lib_id "Diode:1N4148") (at 124.46 49.53 90) (unit 1)
+    (in_bom yes) (on_board yes) (dnp no)
+    (uuid 0420666a-00db-4016-b8b3-10201d1dcdda)
+    (property "Reference" "D3" (at 129.54 50.8 90)
+      (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "SW_Push" (at 200.66 118.11 0)
-      (effects (font (size 1.27 1.27)))
+    (property "Value" "1N4148" (at 134.62 48.26 90)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Diode_SMD:D_SOD-123" (at 124.46 49.53 0)
+      (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 200.66 118.11 0)
+    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 124.46 49.53 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 200.66 118.11 0)
+    (property "Sim.Device" "D" (at 124.46 49.53 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 8417bd98-c19d-405e-a9e2-435dc9aef022))
-    (pin "2" (uuid 16b3600a-7558-4b56-8440-4e30a3f70373))
+    (property "Sim.Pins" "1=K 2=A" (at 124.46 49.53 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 38b6fb28-5345-49b1-99cf-340e887ef9fc))
+    (pin "2" (uuid 15d963c6-4732-4b36-baf9-deb582681e66))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "SW48") (unit 1)
+          (reference "D3") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Switch:SW_Push") (at 200.66 105.41 0) (unit 1)
+  (symbol (lib_id "Switch:SW_Push") (at 167.64 121.92 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid 02bb0712-cc0a-4ddc-a851-d17ba498eaa8)
-    (property "Reference" "SW40" (at 200.66 97.79 0)
+    (uuid 0488ee5c-fc08-4d0b-9400-e7c1a2787632)
+    (property "Reference" "SW45" (at 167.64 114.3 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "SW_Push" (at 200.66 100.33 0)
+    (property "Value" "SW_Push" (at 167.64 116.84 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 200.66 100.33 0)
+    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 167.64 116.84 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 200.66 100.33 0)
+    (property "Datasheet" "~" (at 167.64 116.84 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 25d10254-3d9a-447e-96f3-4f938bf0f1ca))
-    (pin "2" (uuid 11db57a4-b5d2-4f00-9118-bdcc0a23a93b))
+    (pin "1" (uuid 463ce714-7b7c-4cea-80ef-1bd2a2691984))
+    (pin "2" (uuid c62d8117-a128-4ea3-83c5-5c2e6e988a61))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "SW40") (unit 1)
+          (reference "SW45") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Diode:1N4148") (at 104.14 144.78 270) (unit 1)
+  (symbol (lib_id "Diode:1N4148") (at 99.06 64.77 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
-    (uuid 03502f84-c00b-488f-8a2b-582448ec8b49)
-    (property "Reference" "D52" (at 99.06 143.51 90)
+    (uuid 056fb87c-8952-4d3f-9b19-12b2b1c084b7)
+    (property "Reference" "D9" (at 104.14 66.04 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "1N4148" (at 93.98 146.05 90)
+    (property "Value" "1N4148" (at 109.22 63.5 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Diode_SMD:D_SOD-123" (at 104.14 144.78 0)
+    (property "Footprint" "Diode_SMD:D_SOD-123" (at 99.06 64.77 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 104.14 144.78 0)
+    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 99.06 64.77 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Device" "D" (at 104.14 144.78 0)
+    (property "Sim.Device" "D" (at 99.06 64.77 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Pins" "1=K 2=A" (at 104.14 144.78 0)
+    (property "Sim.Pins" "1=K 2=A" (at 99.06 64.77 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid ffa4ea7f-7137-45d9-8335-c00cf63dfb92))
-    (pin "2" (uuid 6cb9d9c8-ede5-45c7-acd4-fa4dc6983fe6))
+    (pin "1" (uuid cf3bbba6-4076-45c2-8c96-3bf965a05810))
+    (pin "2" (uuid b5d6f1a9-3ede-44b9-98c0-7cd46644b151))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "D52") (unit 1)
+          (reference "D9") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Diode:1N4148") (at 172.72 73.66 270) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no)
-    (uuid 072f2c74-93e4-47fc-9aff-ca685fc2f964)
-    (property "Reference" "D23" (at 167.64 72.39 90)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "1N4148" (at 162.56 74.93 90)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "Diode_SMD:D_SOD-123" (at 172.72 73.66 0)
-      (effects (font (size 1.27 1.27)) hide)
+  (symbol (lib_id "Switch:SW_Push") (at 180.34 45.72 0) (unit 1)
+    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
+    (uuid 05c6dbc4-daf6-4c29-857b-0140dd94691e)
+    (property "Reference" "SW7" (at 180.34 38.1 0)
+      (effects (font (size 1.27 1.27)))
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 172.72 73.66 0)
-      (effects (font (size 1.27 1.27)) hide)
+    (property "Value" "SW_Push" (at 180.34 40.64 0)
+      (effects (font (size 1.27 1.27)))
     )
-    (property "Sim.Device" "D" (at 172.72 73.66 0)
+    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 180.34 40.64 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Pins" "1=K 2=A" (at 172.72 73.66 0)
+    (property "Datasheet" "~" (at 180.34 40.64 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid ae5b7c85-b27f-48dd-8d79-8cb41f396c7f))
-    (pin "2" (uuid 8e668c9c-0966-4c4e-bfdb-99ff9a97d8b2))
+    (pin "1" (uuid 63e4d960-2f11-4c67-9eb9-e8464228cff8))
+    (pin "2" (uuid 8ffccbd7-9f57-4869-b50c-2c717243addd))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "D23") (unit 1)
+          (reference "SW7") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Diode:1N4148") (at 127 55.88 270) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no)
-    (uuid 0e10329f-8857-405f-bac1-a5ce97f08aad)
-    (property "Reference" "D13" (at 121.92 54.61 90)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "1N4148" (at 116.84 57.15 90)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "Diode_SMD:D_SOD-123" (at 127 55.88 0)
-      (effects (font (size 1.27 1.27)) hide)
+  (symbol (lib_id "Switch:SW_Push") (at 129.54 106.68 0) (unit 1)
+    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
+    (uuid 05d6f603-f320-4a01-94d6-1956e06846f0)
+    (property "Reference" "SW34" (at 129.54 99.06 0)
+      (effects (font (size 1.27 1.27)))
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 127 55.88 0)
-      (effects (font (size 1.27 1.27)) hide)
+    (property "Value" "SW_Push" (at 129.54 101.6 0)
+      (effects (font (size 1.27 1.27)))
     )
-    (property "Sim.Device" "D" (at 127 55.88 0)
+    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 129.54 101.6 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Pins" "1=K 2=A" (at 127 55.88 0)
+    (property "Datasheet" "~" (at 129.54 101.6 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 91aac885-a32c-4256-ad32-9e1dd54f985e))
-    (pin "2" (uuid b613dea8-88be-4ad0-8419-c2f7f2fbfff5))
+    (pin "1" (uuid 17fd0d97-45c0-4be9-8700-ce2d561fcb27))
+    (pin "2" (uuid a1357e95-a401-4e0d-bca8-16422fa918ce))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "D13") (unit 1)
+          (reference "SW34") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Diode:1N4148") (at 172.72 127 270) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no)
-    (uuid 0eea3c0f-154d-4971-9223-a81be56382b2)
-    (property "Reference" "D47" (at 167.64 125.73 90)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "1N4148" (at 162.56 128.27 90)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "Diode_SMD:D_SOD-123" (at 172.72 127 0)
-      (effects (font (size 1.27 1.27)) hide)
+  (symbol (lib_id "Switch:SW_Push") (at 116.84 45.72 0) (unit 1)
+    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
+    (uuid 0ea9c959-7d13-41cc-8b95-a3bf5214d411)
+    (property "Reference" "SW2" (at 116.84 38.1 0)
+      (effects (font (size 1.27 1.27)))
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 172.72 127 0)
-      (effects (font (size 1.27 1.27)) hide)
+    (property "Value" "SW_Push" (at 116.84 40.64 0)
+      (effects (font (size 1.27 1.27)))
     )
-    (property "Sim.Device" "D" (at 172.72 127 0)
+    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 116.84 40.64 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Pins" "1=K 2=A" (at 172.72 127 0)
+    (property "Datasheet" "~" (at 116.84 40.64 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid fe8be915-d1c5-4dd2-9a57-5fa2dd3f4b9c))
-    (pin "2" (uuid 47ff4c12-c8b7-4f96-bbd3-5c7628e2afb5))
+    (pin "1" (uuid ed9fc6c3-263b-46d2-b698-dcaa539aa08d))
+    (pin "2" (uuid 857a58db-0791-4079-a0a5-7a2261d91345))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "D47") (unit 1)
+          (reference "SW2") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Switch:SW_Push") (at 109.22 34.29 0) (unit 1)
+  (symbol (lib_id "Switch:SW_Push") (at 154.94 45.72 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid 0f5d192f-c41f-4b57-8b45-c24ca3b99f3a)
-    (property "Reference" "SW4" (at 109.22 26.67 0)
+    (uuid 1253844f-7183-4232-9f24-053e93f33ee8)
+    (property "Reference" "SW5" (at 154.94 38.1 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "SW_Push" (at 109.22 29.21 0)
+    (property "Value" "SW_Push" (at 154.94 40.64 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 109.22 29.21 0)
+    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 154.94 40.64 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 109.22 29.21 0)
+    (property "Datasheet" "~" (at 154.94 40.64 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 34f2ffc8-537d-49d6-b6e0-af38d7c6d865))
-    (pin "2" (uuid 4cdfd7e4-14fe-40cf-bde7-7dc09d7b26a2))
+    (pin "1" (uuid 06b4ccda-a408-4e60-8da4-645814110624))
+    (pin "2" (uuid 0495ca0b-d13e-4e32-b923-f42b2b68dcfe))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "SW4") (unit 1)
+          (reference "SW5") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Diode:1N4148") (at 149.86 162.56 270) (unit 1)
+  (symbol (lib_id "Diode:1N4148") (at 149.86 80.01 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
-    (uuid 106e7334-79a0-4ee0-9bd3-c05ac4ca804d)
-    (property "Reference" "D61" (at 144.78 161.29 90)
+    (uuid 18046bef-9e40-4f58-be1a-e57c2154b906)
+    (property "Reference" "D21" (at 154.94 81.28 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "1N4148" (at 139.7 163.83 90)
+    (property "Value" "1N4148" (at 160.02 78.74 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Diode_SMD:D_SOD-123" (at 149.86 162.56 0)
+    (property "Footprint" "Diode_SMD:D_SOD-123" (at 149.86 80.01 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 149.86 162.56 0)
+    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 149.86 80.01 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Device" "D" (at 149.86 162.56 0)
+    (property "Sim.Device" "D" (at 149.86 80.01 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Pins" "1=K 2=A" (at 149.86 162.56 0)
+    (property "Sim.Pins" "1=K 2=A" (at 149.86 80.01 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 55a7808d-f15e-47fe-a46f-3a1afa6c56f7))
-    (pin "2" (uuid a242379f-bc57-4580-b84b-fd78282b2cc8))
+    (pin "1" (uuid 40adf52f-53b0-405b-81e2-11555ab7175c))
+    (pin "2" (uuid fb4b658e-3163-4993-809a-f853beaaf69d))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "D61") (unit 1)
+          (reference "D21") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Diode:1N4148") (at 127 127 270) (unit 1)
+  (symbol (lib_id "Diode:1N4148") (at 149.86 95.25 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
-    (uuid 158ed329-1c3f-4644-aabe-86ea833761aa)
-    (property "Reference" "D45" (at 121.92 125.73 90)
+    (uuid 181fdda5-a45f-4107-ad6f-7b0b26a8caf4)
+    (property "Reference" "D29" (at 154.94 96.52 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "1N4148" (at 116.84 128.27 90)
+    (property "Value" "1N4148" (at 160.02 93.98 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Diode_SMD:D_SOD-123" (at 127 127 0)
+    (property "Footprint" "Diode_SMD:D_SOD-123" (at 149.86 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 127 127 0)
+    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 149.86 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Device" "D" (at 127 127 0)
+    (property "Sim.Device" "D" (at 149.86 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Pins" "1=K 2=A" (at 127 127 0)
+    (property "Sim.Pins" "1=K 2=A" (at 149.86 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 8183320f-7f85-4b22-afd1-1c281d6b7c00))
-    (pin "2" (uuid 32924d32-3a9e-4c48-9b37-c220bed67944))
+    (pin "1" (uuid b790f801-f20a-4a3c-9539-8c827bca05f9))
+    (pin "2" (uuid 642ea88f-d544-4bee-ab92-a7b436352f0a))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "D45") (unit 1)
-        )
-      )
-    )
-  )
-
-  (symbol (lib_id "Switch:SW_Push") (at 86.36 69.85 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid 1610e140-d854-4cad-bb97-f99ad8968acd)
-    (property "Reference" "SW19" (at 86.36 62.23 0)
-      (effects (font (size 1.27 1.27)))
-    )
-    (property "Value" "SW_Push" (at 86.36 64.77 0)
-      (effects (font (size 1.27 1.27)))
-    )
-    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 86.36 64.77 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (at 86.36 64.77 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid c10da549-bfb1-422c-b5f9-f377c7852498))
-    (pin "2" (uuid 46755ce7-2bf2-4a45-bb36-dceac8bcd689))
-    (instances
-      (project "xantronix-z32"
-        (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "SW19") (unit 1)
+          (reference "D29") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Switch:SW_Push") (at 40.64 140.97 0) (unit 1)
+  (symbol (lib_id "Switch:SW_Push") (at 129.54 60.96 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid 1ac3c60a-fc64-4c31-b525-903c742a0471)
-    (property "Reference" "SW49" (at 40.64 133.35 0)
+    (uuid 196294c1-afe7-404d-bdc1-53ab04a64e48)
+    (property "Reference" "SW11" (at 129.54 53.34 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "SW_Push" (at 40.64 135.89 0)
+    (property "Value" "SW_Push" (at 129.54 55.88 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.25u_PCB" (at 40.64 135.89 0)
+    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 129.54 55.88 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 40.64 135.89 0)
+    (property "Datasheet" "~" (at 129.54 55.88 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 1a40530b-4134-4355-a7db-c4c058ce2723))
-    (pin "2" (uuid 32935346-b4b0-43fa-b9a4-466320673319))
+    (pin "1" (uuid 7811ab7b-5c67-4f72-8a4c-972eac4ab2d7))
+    (pin "2" (uuid 8268dac8-2bf3-4708-b706-395f5f586b98))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "SW49") (unit 1)
+          (reference "SW11") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Diode:1N4148") (at 104.14 55.88 270) (unit 1)
+  (symbol (lib_id "Diode:1N4148") (at 162.56 64.77 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
-    (uuid 1c276179-1cf4-4680-922b-e7e736415048)
-    (property "Reference" "D12" (at 99.06 54.61 90)
+    (uuid 1a014af1-f04c-43cc-91a9-10a0ca2cad83)
+    (property "Reference" "D14" (at 167.64 66.04 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "1N4148" (at 93.98 57.15 90)
+    (property "Value" "1N4148" (at 172.72 63.5 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Diode_SMD:D_SOD-123" (at 104.14 55.88 0)
+    (property "Footprint" "Diode_SMD:D_SOD-123" (at 162.56 64.77 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 104.14 55.88 0)
+    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 162.56 64.77 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Device" "D" (at 104.14 55.88 0)
+    (property "Sim.Device" "D" (at 162.56 64.77 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Pins" "1=K 2=A" (at 104.14 55.88 0)
+    (property "Sim.Pins" "1=K 2=A" (at 162.56 64.77 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 30fadca4-d189-4129-ac72-67e1beb92cb9))
-    (pin "2" (uuid 8e3f61b0-36ba-4c26-b4b8-5eac748c9965))
+    (pin "1" (uuid a924ba85-5de8-4025-8ef4-9880d4d78cde))
+    (pin "2" (uuid 8a90b168-b3fc-423a-89a5-508b08074d9b))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "D12") (unit 1)
+          (reference "D14") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Diode:1N4148") (at 172.72 55.88 270) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no)
-    (uuid 1fbc8990-d89d-42de-abfb-87272828b11a)
-    (property "Reference" "D15" (at 167.64 54.61 90)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "1N4148" (at 162.56 57.15 90)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "Diode_SMD:D_SOD-123" (at 172.72 55.88 0)
-      (effects (font (size 1.27 1.27)) hide)
+  (symbol (lib_id "Switch:SW_Push") (at 167.64 152.4 0) (unit 1)
+    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
+    (uuid 1e7ade3f-0ffb-4d94-a84f-ede83bb34476)
+    (property "Reference" "SW61" (at 167.64 144.78 0)
+      (effects (font (size 1.27 1.27)))
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 172.72 55.88 0)
-      (effects (font (size 1.27 1.27)) hide)
+    (property "Value" "SW_Push" (at 167.64 147.32 0)
+      (effects (font (size 1.27 1.27)))
     )
-    (property "Sim.Device" "D" (at 172.72 55.88 0)
+    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 167.64 147.32 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Pins" "1=K 2=A" (at 172.72 55.88 0)
+    (property "Datasheet" "~" (at 167.64 147.32 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid e13e2dd2-fa04-4871-9841-67df07ab6b89))
-    (pin "2" (uuid abdcb4af-8031-4941-a152-7b24ec72b520))
+    (pin "1" (uuid 7d7382a6-7615-4890-924f-8c8b03c0b1bd))
+    (pin "2" (uuid 9def6a48-f8d8-40f1-ac70-d308aaf24288))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "D15") (unit 1)
+          (reference "SW61") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Switch:SW_Push") (at 154.94 105.41 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid 1fd37091-ab0d-462a-81a9-282f0e6c3ad6)
-    (property "Reference" "SW38" (at 154.94 97.79 0)
-      (effects (font (size 1.27 1.27)))
+  (symbol (lib_id "Diode:1N4148") (at 187.96 49.53 90) (unit 1)
+    (in_bom yes) (on_board yes) (dnp no)
+    (uuid 22d98d77-9ff4-4441-9f68-5ce4ecf9d3b9)
+    (property "Reference" "D8" (at 193.04 50.8 90)
+      (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "SW_Push" (at 154.94 100.33 0)
-      (effects (font (size 1.27 1.27)))
+    (property "Value" "1N4148" (at 198.12 48.26 90)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Diode_SMD:D_SOD-123" (at 187.96 49.53 0)
+      (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 154.94 100.33 0)
+    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 187.96 49.53 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 154.94 100.33 0)
+    (property "Sim.Device" "D" (at 187.96 49.53 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 8138b4f5-05a0-43ff-a76d-6e52c0a7ba75))
-    (pin "2" (uuid 70427adc-c7d3-4959-89e7-db1c1708d20d))
+    (property "Sim.Pins" "1=K 2=A" (at 187.96 49.53 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid d71028c6-e414-4dfa-951d-fde35122c19d))
+    (pin "2" (uuid e09c3dd9-9144-479d-a831-5e98ed98c39c))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "SW38") (unit 1)
+          (reference "D8") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Switch:SW_Push") (at 177.8 140.97 0) (unit 1)
+  (symbol (lib_id "Switch:SW_Push") (at 142.24 106.68 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid 203cddf9-5d54-468e-b3b1-069ecccfe3af)
-    (property "Reference" "SW55" (at 177.8 133.35 0)
+    (uuid 26fda850-05ae-496a-896c-5d85a57af862)
+    (property "Reference" "SW35" (at 142.24 99.06 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "SW_Push" (at 177.8 135.89 0)
+    (property "Value" "SW_Push" (at 142.24 101.6 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 177.8 135.89 0)
+    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 142.24 101.6 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 177.8 135.89 0)
+    (property "Datasheet" "~" (at 142.24 101.6 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 53d710a6-f8c7-4360-89fe-fb73679bea2e))
-    (pin "2" (uuid 4ff18df8-cd76-4a5c-a4d1-a108c472196f))
+    (pin "1" (uuid a8ecd465-f544-49a6-bbd8-9e92c3f411f9))
+    (pin "2" (uuid 1d145c87-ec20-4b9a-b7c8-435a7d2f33af))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "SW55") (unit 1)
+          (reference "SW35") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Diode:1N4148") (at 104.14 162.56 270) (unit 1)
+  (symbol (lib_id "Diode:1N4148") (at 149.86 156.21 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
-    (uuid 215124f5-5454-40c5-bf50-56964446fcf9)
-    (property "Reference" "D59" (at 99.06 161.29 90)
+    (uuid 27241b96-3864-46f1-b632-a98ae76729de)
+    (property "Reference" "D60" (at 154.94 157.48 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "1N4148" (at 93.98 163.83 90)
+    (property "Value" "1N4148" (at 160.02 154.94 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Diode_SMD:D_SOD-123" (at 104.14 162.56 0)
+    (property "Footprint" "Diode_SMD:D_SOD-123" (at 149.86 156.21 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 104.14 162.56 0)
+    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 149.86 156.21 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Device" "D" (at 104.14 162.56 0)
+    (property "Sim.Device" "D" (at 149.86 156.21 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Pins" "1=K 2=A" (at 104.14 162.56 0)
+    (property "Sim.Pins" "1=K 2=A" (at 149.86 156.21 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 4a7965d4-16b7-4ec5-945c-9a99638644f5))
-    (pin "2" (uuid bb51c3c4-3f00-4dc7-a968-9f60a0b6d6ce))
+    (pin "1" (uuid 952bee80-858d-4016-8e62-420bedc98761))
+    (pin "2" (uuid 1a238b0c-39ef-4eda-aec3-9a21bbc9df0f))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "D59") (unit 1)
+          (reference "D60") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Diode:1N4148") (at 81.28 109.22 270) (unit 1)
+  (symbol (lib_id "Diode:1N4148") (at 137.16 80.01 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
-    (uuid 218f7002-2d7f-4100-8c3d-2ecd52897059)
-    (property "Reference" "D35" (at 76.2 107.95 90)
+    (uuid 29753cd0-0629-4cc6-8ab2-1c77f7f52a40)
+    (property "Reference" "D20" (at 142.24 81.28 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "1N4148" (at 71.12 110.49 90)
+    (property "Value" "1N4148" (at 147.32 78.74 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Diode_SMD:D_SOD-123" (at 81.28 109.22 0)
+    (property "Footprint" "Diode_SMD:D_SOD-123" (at 137.16 80.01 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 81.28 109.22 0)
+    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 137.16 80.01 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Device" "D" (at 81.28 109.22 0)
+    (property "Sim.Device" "D" (at 137.16 80.01 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Pins" "1=K 2=A" (at 81.28 109.22 0)
+    (property "Sim.Pins" "1=K 2=A" (at 137.16 80.01 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid b90cfafe-b077-41ce-9e61-f2214a5c66a9))
-    (pin "2" (uuid b7d4a29f-c39d-4be0-8d42-86561377ea78))
+    (pin "1" (uuid b233c734-d347-423a-a122-7d70a512a990))
+    (pin "2" (uuid bedb493d-8b09-4c06-8657-529a8cc78ecf))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "D35") (unit 1)
+          (reference "D20") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Switch:SW_Push") (at 40.64 123.19 0) (unit 1)
+  (symbol (lib_id "Switch:SW_Push") (at 167.64 106.68 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid 232bffc6-a2b6-42bb-8a92-54ce333e4375)
-    (property "Reference" "SW41" (at 40.64 115.57 0)
+    (uuid 29f0773c-cd8a-4a03-9335-c2747ca05849)
+    (property "Reference" "SW37" (at 167.64 99.06 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "SW_Push" (at 40.64 118.11 0)
+    (property "Value" "SW_Push" (at 167.64 101.6 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 40.64 118.11 0)
+    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 167.64 101.6 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 40.64 118.11 0)
+    (property "Datasheet" "~" (at 167.64 101.6 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 089f7a56-ff32-41c2-8f53-9ce51eded28a))
-    (pin "2" (uuid 33aea93b-2704-47e1-ac08-78bb521bc032))
+    (pin "1" (uuid 820c5e01-2eaa-4970-80c0-37e9cdac7779))
+    (pin "2" (uuid 484c7e2a-58a4-4a03-bfd6-ba4c4991a288))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "SW41") (unit 1)
+          (reference "SW37") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Switch:SW_Push") (at 177.8 87.63 0) (unit 1)
+  (symbol (lib_id "Switch:SW_Push") (at 193.04 45.72 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid 2a4bcb2f-9075-4795-975f-9c4911447fbe)
-    (property "Reference" "SW31" (at 177.8 80.01 0)
+    (uuid 2b925e69-2ee9-4323-a403-750de4bfc921)
+    (property "Reference" "SW8" (at 193.04 38.1 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "SW_Push" (at 177.8 82.55 0)
+    (property "Value" "SW_Push" (at 193.04 40.64 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 177.8 82.55 0)
+    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 193.04 40.64 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 177.8 82.55 0)
+    (property "Datasheet" "~" (at 193.04 40.64 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 046fe80e-e870-417a-ac3a-82a34c1f1fb4))
-    (pin "2" (uuid 0c43c2e5-9153-4e5b-ae00-898ed1205950))
+    (pin "1" (uuid 00c50d43-4d36-48f2-a87f-8a96d3339455))
+    (pin "2" (uuid f027a259-524d-4602-bd49-f7cf187b6b26))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "SW31") (unit 1)
+          (reference "SW8") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Diode:1N4148") (at 35.56 91.44 270) (unit 1)
+  (symbol (lib_id "Diode:1N4148") (at 162.56 80.01 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
-    (uuid 30e3b22d-790f-4cfe-8b73-0619a08feb4f)
-    (property "Reference" "D25" (at 30.48 90.17 90)
+    (uuid 313f6955-846e-482c-bea9-f4797c2daed9)
+    (property "Reference" "D22" (at 167.64 81.28 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "1N4148" (at 25.4 92.71 90)
+    (property "Value" "1N4148" (at 172.72 78.74 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Diode_SMD:D_SOD-123" (at 35.56 91.44 0)
+    (property "Footprint" "Diode_SMD:D_SOD-123" (at 162.56 80.01 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 35.56 91.44 0)
+    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 162.56 80.01 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Device" "D" (at 35.56 91.44 0)
+    (property "Sim.Device" "D" (at 162.56 80.01 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Pins" "1=K 2=A" (at 35.56 91.44 0)
+    (property "Sim.Pins" "1=K 2=A" (at 162.56 80.01 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 5b328859-19aa-4180-a60c-bffdb1dad91f))
-    (pin "2" (uuid fce99c76-b39d-42d6-b884-c93e9831f7a6))
+    (pin "1" (uuid ec5f66c5-f37b-4935-a06c-e6cf2e531cae))
+    (pin "2" (uuid c077cd6b-7af1-4528-baa9-7881887a0655))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "D25") (unit 1)
+          (reference "D22") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Switch:SW_Push") (at 177.8 52.07 0) (unit 1)
+  (symbol (lib_id "Switch:SW_Push") (at 167.64 76.2 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid 31063621-d313-48e0-a149-f997d88cb4d9)
-    (property "Reference" "SW15" (at 177.8 44.45 0)
+    (uuid 3153e61b-c8ea-4705-83a1-5cca43126c63)
+    (property "Reference" "SW22" (at 167.64 68.58 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "SW_Push" (at 177.8 46.99 0)
+    (property "Value" "SW_Push" (at 167.64 71.12 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 177.8 46.99 0)
+    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 167.64 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 177.8 46.99 0)
+    (property "Datasheet" "~" (at 167.64 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 065eda02-24ff-41ae-8b84-5c57ca4db10c))
-    (pin "2" (uuid 75a3f849-bb4e-4d8e-867e-eeb972760d14))
+    (pin "1" (uuid aaac117a-7fa5-4c77-84fb-ddb5bb840474))
+    (pin "2" (uuid 539d9b0a-dae5-4b39-89de-545bf6e7eefa))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "SW15") (unit 1)
+          (reference "SW22") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Switch:SW_Push") (at 86.36 123.19 0) (unit 1)
+  (symbol (lib_id "Switch:SW_Push") (at 142.24 137.16 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid 31bb3b60-6672-40b1-bedf-3143a6f47340)
-    (property "Reference" "SW43" (at 86.36 115.57 0)
+    (uuid 31e3b70a-2bdb-4c8d-ba8c-4408144aa9f5)
+    (property "Reference" "SW51" (at 142.24 129.54 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "SW_Push" (at 86.36 118.11 0)
+    (property "Value" "SW_Push" (at 142.24 132.08 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 86.36 118.11 0)
+    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 142.24 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 86.36 118.11 0)
+    (property "Datasheet" "~" (at 142.24 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 9b8967c0-46e9-4521-97a1-fb7ba58ddf1f))
-    (pin "2" (uuid e5179200-bf23-4ad3-aaeb-d55b7479085e))
+    (pin "1" (uuid e23c30a7-21d2-4502-be97-44db1f945c6c))
+    (pin "2" (uuid d28b7d72-17ab-42d0-8f86-2f10f72fec6f))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "SW43") (unit 1)
+          (reference "SW51") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Diode:1N4148") (at 58.42 144.78 270) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no)
-    (uuid 324a56d6-9167-4809-9886-3cfcc0b8dce4)
-    (property "Reference" "D50" (at 53.34 143.51 90)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "1N4148" (at 48.26 146.05 90)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "Diode_SMD:D_SOD-123" (at 58.42 144.78 0)
-      (effects (font (size 1.27 1.27)) hide)
+  (symbol (lib_id "Switch:SW_Push") (at 180.34 121.92 0) (unit 1)
+    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
+    (uuid 330ceb41-882a-41b8-be1d-ab1d6385689e)
+    (property "Reference" "SW46" (at 180.34 114.3 0)
+      (effects (font (size 1.27 1.27)))
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 58.42 144.78 0)
-      (effects (font (size 1.27 1.27)) hide)
+    (property "Value" "SW_Push" (at 180.34 116.84 0)
+      (effects (font (size 1.27 1.27)))
     )
-    (property "Sim.Device" "D" (at 58.42 144.78 0)
+    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 180.34 116.84 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Pins" "1=K 2=A" (at 58.42 144.78 0)
+    (property "Datasheet" "~" (at 180.34 116.84 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid dd8e7577-cb3c-4d55-b57e-3ab7da49f078))
-    (pin "2" (uuid d92c0233-7bfb-4fe0-ae82-d909f37dd710))
+    (pin "1" (uuid 91c3b29b-fb52-43bd-9ffc-d5ffa6d6935b))
+    (pin "2" (uuid 979aced5-6114-413e-81fa-459e8865f48c))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "D50") (unit 1)
+          (reference "SW46") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Switch:SW_Push") (at 63.5 87.63 0) (unit 1)
+  (symbol (lib_id "Switch:SW_Push") (at 116.84 60.96 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid 3257b422-d8f6-4442-8a0b-6ededf40da0a)
-    (property "Reference" "SW26" (at 63.5 80.01 0)
+    (uuid 339e8116-41df-4f72-a009-962503a97fe7)
+    (property "Reference" "SW10" (at 116.84 53.34 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "SW_Push" (at 63.5 82.55 0)
+    (property "Value" "SW_Push" (at 116.84 55.88 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.25u_PCB" (at 63.5 82.55 0)
+    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 116.84 55.88 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 63.5 82.55 0)
+    (property "Datasheet" "~" (at 116.84 55.88 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 33bfc7f7-2b38-4e6a-a132-19afccbf136d))
-    (pin "2" (uuid badde963-79f3-491a-9fef-40b9f510cf5c))
+    (pin "1" (uuid a32cacac-5fed-419e-a98f-c89d67a1e369))
+    (pin "2" (uuid 29cf578e-6c8a-4e49-b8a1-2c10dbe6f14d))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "SW26") (unit 1)
+          (reference "SW10") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Diode:1N4148") (at 35.56 144.78 270) (unit 1)
+  (symbol (lib_id "Diode:1N4148") (at 111.76 140.97 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
-    (uuid 38edf39b-e986-48f9-b533-d008d16dda37)
-    (property "Reference" "D49" (at 30.48 143.51 90)
+    (uuid 365b1c86-91f9-4ca4-8449-0ea8080d414c)
+    (property "Reference" "D49" (at 116.84 142.24 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "1N4148" (at 25.4 146.05 90)
+    (property "Value" "1N4148" (at 121.92 139.7 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Diode_SMD:D_SOD-123" (at 35.56 144.78 0)
+    (property "Footprint" "Diode_SMD:D_SOD-123" (at 111.76 140.97 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 35.56 144.78 0)
+    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 111.76 140.97 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Device" "D" (at 35.56 144.78 0)
+    (property "Sim.Device" "D" (at 111.76 140.97 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Pins" "1=K 2=A" (at 35.56 144.78 0)
+    (property "Sim.Pins" "1=K 2=A" (at 111.76 140.97 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 4e746dd7-2838-4c15-853f-81a336a35501))
-    (pin "2" (uuid bd44d7a3-0f24-4b51-abec-250672ff9da4))
+    (pin "1" (uuid d0154e16-0c4a-4b21-87a5-d29c48cad799))
+    (pin "2" (uuid 5af9590d-b4ae-4c66-b2c5-bbb39fb7d09f))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
@@ -1988,2501 +1944,2551 @@
     )
   )
 
-  (symbol (lib_id "Diode:1N4148") (at 81.28 38.1 270) (unit 1)
+  (symbol (lib_id "Diode:1N4148") (at 137.16 125.73 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
-    (uuid 390af9bf-e239-4cb1-9983-cab447082edc)
-    (property "Reference" "D3" (at 76.2 36.83 90)
+    (uuid 38f72305-c8fc-4a5b-94bd-5c44ac16d04d)
+    (property "Reference" "D43" (at 142.24 127 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "1N4148" (at 71.12 39.37 90)
+    (property "Value" "1N4148" (at 147.32 124.46 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Diode_SMD:D_SOD-123" (at 81.28 38.1 0)
+    (property "Footprint" "Diode_SMD:D_SOD-123" (at 137.16 125.73 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 81.28 38.1 0)
+    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 137.16 125.73 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Device" "D" (at 81.28 38.1 0)
+    (property "Sim.Device" "D" (at 137.16 125.73 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Pins" "1=K 2=A" (at 81.28 38.1 0)
+    (property "Sim.Pins" "1=K 2=A" (at 137.16 125.73 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid aeb9eff2-d226-4e9d-b1bf-1ffe4480ebd0))
-    (pin "2" (uuid 79f397fa-30b1-4936-aa0e-8d7c0a45ec44))
+    (pin "1" (uuid ea549f73-e8ca-499a-a721-fe890d5af64d))
+    (pin "2" (uuid 9cec2a0b-e1a5-4ec6-91ac-53c22d9c3421))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "D3") (unit 1)
+          (reference "D43") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Diode:1N4148") (at 81.28 162.56 270) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no)
-    (uuid 3aa162e9-dc9d-4976-a0f1-c99e84e60cc9)
-    (property "Reference" "D58" (at 76.2 161.29 90)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "1N4148" (at 71.12 163.83 90)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "Diode_SMD:D_SOD-123" (at 81.28 162.56 0)
-      (effects (font (size 1.27 1.27)) hide)
+  (symbol (lib_id "Switch:SW_Push") (at 154.94 60.96 0) (unit 1)
+    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
+    (uuid 3a31fca7-b12c-4b5d-aa51-ffedf95827f9)
+    (property "Reference" "SW13" (at 154.94 53.34 0)
+      (effects (font (size 1.27 1.27)))
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 81.28 162.56 0)
-      (effects (font (size 1.27 1.27)) hide)
+    (property "Value" "SW_Push" (at 154.94 55.88 0)
+      (effects (font (size 1.27 1.27)))
     )
-    (property "Sim.Device" "D" (at 81.28 162.56 0)
+    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 154.94 55.88 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Pins" "1=K 2=A" (at 81.28 162.56 0)
+    (property "Datasheet" "~" (at 154.94 55.88 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 0dcde0bf-d9cf-4538-880a-20da170c21f9))
-    (pin "2" (uuid cfd36fd4-2ffc-4930-8a22-8e2e54a573a5))
+    (pin "1" (uuid e5dc4ef5-ad04-4351-a2e0-ab5c12684a4c))
+    (pin "2" (uuid 655b684e-ce87-44cd-8af0-52cd73767697))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "D58") (unit 1)
+          (reference "SW13") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Switch:SW_Push") (at 40.64 105.41 0) (unit 1)
+  (symbol (lib_id "Switch:SW_Push") (at 116.84 121.92 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid 3af66a99-1cae-4b75-a4b2-eca4274ce819)
-    (property "Reference" "SW33" (at 40.64 97.79 0)
+    (uuid 3c1e70b2-0a1d-4c8d-9d44-8cb4aa82e65d)
+    (property "Reference" "SW41" (at 116.84 114.3 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "SW_Push" (at 40.64 100.33 0)
+    (property "Value" "SW_Push" (at 116.84 116.84 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 40.64 100.33 0)
+    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.25u_PCB" (at 116.84 116.84 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 40.64 100.33 0)
+    (property "Datasheet" "~" (at 116.84 116.84 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 8f58321c-3874-45ee-a938-99a89d8998b6))
-    (pin "2" (uuid 2ebf167e-fdaf-45b7-b0f0-8b6e5a22aacd))
+    (pin "1" (uuid 71ccfcc4-3126-4664-b87e-c0b0a95780cb))
+    (pin "2" (uuid 62deee1f-5fcc-4833-956f-8f13986b3107))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "SW33") (unit 1)
+          (reference "SW41") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Diode:1N4148") (at 104.14 38.1 270) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no)
-    (uuid 3bec0c1a-3bf6-49c1-8d5b-2f9557d5c6ac)
-    (property "Reference" "D4" (at 99.06 36.83 90)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "1N4148" (at 93.98 39.37 90)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "Diode_SMD:D_SOD-123" (at 104.14 38.1 0)
-      (effects (font (size 1.27 1.27)) hide)
+  (symbol (lib_id "Switch:SW_Push") (at 154.94 91.44 0) (unit 1)
+    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
+    (uuid 403a22b3-6bd3-441a-a301-33eee452364b)
+    (property "Reference" "SW29" (at 154.94 83.82 0)
+      (effects (font (size 1.27 1.27)))
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 104.14 38.1 0)
-      (effects (font (size 1.27 1.27)) hide)
+    (property "Value" "SW_Push" (at 154.94 86.36 0)
+      (effects (font (size 1.27 1.27)))
     )
-    (property "Sim.Device" "D" (at 104.14 38.1 0)
+    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 154.94 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Pins" "1=K 2=A" (at 104.14 38.1 0)
+    (property "Datasheet" "~" (at 154.94 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 3d6e8dbf-46d9-419c-bbc9-5c8d7e79837f))
-    (pin "2" (uuid 3df160a3-2831-41c5-87bd-dedb07d0f183))
+    (pin "1" (uuid b99fd0d2-2baf-4a98-b133-2b24f03428b7))
+    (pin "2" (uuid 246fc4ef-610e-4c0c-9b7a-b414de1fb1f4))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "D4") (unit 1)
+          (reference "SW29") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Switch:SW_Push") (at 154.94 69.85 0) (unit 1)
+  (symbol (lib_id "Switch:SW_Push") (at 154.94 137.16 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid 3cf46e9e-7507-48f6-9bd6-24957b52476d)
-    (property "Reference" "SW22" (at 154.94 62.23 0)
+    (uuid 40e20354-aaa9-4ad1-8f12-9a4f25b60d5e)
+    (property "Reference" "SW52" (at 154.94 129.54 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "SW_Push" (at 154.94 64.77 0)
+    (property "Value" "SW_Push" (at 154.94 132.08 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 154.94 64.77 0)
+    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 154.94 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 154.94 64.77 0)
+    (property "Datasheet" "~" (at 154.94 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 71026409-fabb-4eac-a3c7-ae75e9bff648))
-    (pin "2" (uuid fc10acb0-bdaa-4551-9aa2-ddb7b4d62633))
+    (pin "1" (uuid 3073f3fb-b5d5-4441-80c8-3306606ad30f))
+    (pin "2" (uuid 4c4c803d-6097-4933-91e2-11360616952d))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "SW22") (unit 1)
+          (reference "SW52") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Diode:1N4148") (at 81.28 55.88 270) (unit 1)
+  (symbol (lib_id "Connector:Conn_01x08_Socket") (at 71.12 99.06 0) (mirror y) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
-    (uuid 3d0e8f57-72fe-4242-86a0-671550efecc7)
-    (property "Reference" "D11" (at 76.2 54.61 90)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "1N4148" (at 71.12 57.15 90)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "Diode_SMD:D_SOD-123" (at 81.28 55.88 0)
-      (effects (font (size 1.27 1.27)) hide)
+    (uuid 414f5e6b-4487-4c46-9567-a94f44838678)
+    (property "Reference" "J1" (at 73.66 86.36 0)
+      (effects (font (size 1.27 1.27)))
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 81.28 55.88 0)
-      (effects (font (size 1.27 1.27)) hide)
+    (property "Value" "Conn_01x08_Socket" (at 76.2 78.74 90)
+      (effects (font (size 1.27 1.27)))
     )
-    (property "Sim.Device" "D" (at 81.28 55.88 0)
+    (property "Footprint" "Connector_PinSocket_2.54mm:PinSocket_1x08_P2.54mm_Horizontal" (at 71.12 99.06 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Pins" "1=K 2=A" (at 81.28 55.88 0)
+    (property "Datasheet" "~" (at 71.12 99.06 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 27ba667f-32d3-44f0-89f8-91ad611b7098))
-    (pin "2" (uuid 168ab668-e359-42ef-95d7-1e0b63fa2b9b))
+    (pin "1" (uuid 58381720-a48b-480d-a84a-3e7d61eaab46))
+    (pin "2" (uuid df107dc1-db49-4a27-a7ca-2624901d3046))
+    (pin "3" (uuid 7db41168-aa4a-4738-abe4-cee550158131))
+    (pin "4" (uuid 32c28779-dd4e-43e3-85f1-02b1cef65627))
+    (pin "5" (uuid c3da3812-8142-4d66-b928-bac2b59843e7))
+    (pin "6" (uuid 2a17a9bd-7638-45d2-a957-1805fd73c383))
+    (pin "7" (uuid 05af0a80-27a5-4893-a0e9-1d422307aefe))
+    (pin "8" (uuid ade5a413-2343-4721-9112-d4555a3f2487))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "D11") (unit 1)
+          (reference "J1") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Switch:SW_Push") (at 40.64 158.75 0) (unit 1)
+  (symbol (lib_id "Switch:SW_Push") (at 116.84 137.16 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid 3ea817f6-51e2-4468-8a2a-2e90c6aa7cf5)
-    (property "Reference" "SW56" (at 40.64 151.13 0)
+    (uuid 419cc5ff-879d-406a-a760-8161d78c81dc)
+    (property "Reference" "SW49" (at 116.84 129.54 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "SW_Push" (at 40.64 153.67 0)
+    (property "Value" "SW_Push" (at 116.84 132.08 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 40.64 153.67 0)
+    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 116.84 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 40.64 153.67 0)
+    (property "Datasheet" "~" (at 116.84 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 556ee757-0d87-47de-9ad1-cc63c9d7c202))
-    (pin "2" (uuid caa360e8-3ec2-401d-8ed8-0357f06270a6))
+    (pin "1" (uuid 0393db19-f816-48b0-925f-f354d50b35c5))
+    (pin "2" (uuid e434d818-c93e-407e-bce7-fd98d0d28319))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "SW56") (unit 1)
+          (reference "SW49") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Connector:Conn_01x08_Socket") (at 13.97 95.25 0) (mirror y) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no)
-    (uuid 414f5e6b-4487-4c46-9567-a94f44838678)
-    (property "Reference" "J1" (at 16.51 82.55 0)
+  (symbol (lib_id "Switch:SW_Push") (at 104.14 60.96 0) (unit 1)
+    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
+    (uuid 41bf90b8-d46a-45c4-91b4-96f01b47fb16)
+    (property "Reference" "SW9" (at 104.14 53.34 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "Conn_01x08_Socket" (at 19.05 74.93 90)
+    (property "Value" "SW_Push" (at 104.14 55.88 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "Connector_PinSocket_2.54mm:PinSocket_1x08_P2.54mm_Horizontal" (at 13.97 95.25 0)
+    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.75u_PCB" (at 104.14 55.88 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 13.97 95.25 0)
+    (property "Datasheet" "~" (at 104.14 55.88 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 58381720-a48b-480d-a84a-3e7d61eaab46))
-    (pin "2" (uuid df107dc1-db49-4a27-a7ca-2624901d3046))
-    (pin "3" (uuid 7db41168-aa4a-4738-abe4-cee550158131))
-    (pin "4" (uuid 32c28779-dd4e-43e3-85f1-02b1cef65627))
-    (pin "5" (uuid c3da3812-8142-4d66-b928-bac2b59843e7))
-    (pin "6" (uuid 2a17a9bd-7638-45d2-a957-1805fd73c383))
-    (pin "7" (uuid 05af0a80-27a5-4893-a0e9-1d422307aefe))
-    (pin "8" (uuid ade5a413-2343-4721-9112-d4555a3f2487))
+    (pin "1" (uuid fd43b17b-a295-4b24-8ecb-0264623c2f39))
+    (pin "2" (uuid 6dfe8bea-c0ff-4346-8dc8-dd5b66675f67))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "J1") (unit 1)
+          (reference "SW9") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Switch:SW_Push") (at 154.94 140.97 0) (unit 1)
+  (symbol (lib_id "Switch:SW_Push") (at 116.84 106.68 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid 43d29f27-d902-43ef-9248-5b9cefff86f5)
-    (property "Reference" "SW54" (at 154.94 133.35 0)
+    (uuid 46d3c37c-cac6-4270-8a43-0d9cec0373b0)
+    (property "Reference" "SW33" (at 116.84 99.06 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "SW_Push" (at 154.94 135.89 0)
+    (property "Value" "SW_Push" (at 116.84 101.6 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 154.94 135.89 0)
+    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 116.84 101.6 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 154.94 135.89 0)
+    (property "Datasheet" "~" (at 116.84 101.6 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid f8e8fdba-8a5f-459a-8047-3461c9626095))
-    (pin "2" (uuid 8463d416-1008-48e2-96be-8979edebc233))
+    (pin "1" (uuid d6444139-015b-4db6-b4fb-cb1f4a1c277c))
+    (pin "2" (uuid a7d0df5a-ca93-4c6c-ac3e-5419e27e2618))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "SW54") (unit 1)
+          (reference "SW33") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Diode:1N4148") (at 149.86 109.22 270) (unit 1)
+  (symbol (lib_id "Diode:1N4148") (at 99.06 156.21 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
-    (uuid 46fd2d88-1e0a-45e0-bc5c-43bf19ff60b8)
-    (property "Reference" "D38" (at 144.78 107.95 90)
+    (uuid 47a3a39a-affd-42dc-9425-03b5117c0ede)
+    (property "Reference" "D56" (at 104.14 157.48 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "1N4148" (at 139.7 110.49 90)
+    (property "Value" "1N4148" (at 109.22 154.94 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Diode_SMD:D_SOD-123" (at 149.86 109.22 0)
+    (property "Footprint" "Diode_SMD:D_SOD-123" (at 99.06 156.21 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 149.86 109.22 0)
+    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 99.06 156.21 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Device" "D" (at 149.86 109.22 0)
+    (property "Sim.Device" "D" (at 99.06 156.21 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Pins" "1=K 2=A" (at 149.86 109.22 0)
+    (property "Sim.Pins" "1=K 2=A" (at 99.06 156.21 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 2ba5e8a9-18cf-434a-a11f-f21b6a705416))
-    (pin "2" (uuid ba9c0d14-46f2-452e-a372-cdf051dbc8f8))
+    (pin "1" (uuid 4bd2760d-415b-4b56-9bfe-0b44c4875446))
+    (pin "2" (uuid d172b8c6-24e8-45e2-8b39-65682c2a2e94))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "D38") (unit 1)
+          (reference "D56") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Diode:1N4148") (at 35.56 38.1 270) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no)
-    (uuid 4acb1923-779f-40e6-9aae-90db6bac254d)
-    (property "Reference" "D1" (at 30.48 36.83 90)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "1N4148" (at 25.4 39.37 90)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "Diode_SMD:D_SOD-123" (at 35.56 38.1 0)
-      (effects (font (size 1.27 1.27)) hide)
+  (symbol (lib_id "Switch:SW_Push") (at 154.94 121.92 0) (unit 1)
+    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
+    (uuid 47f08870-2ce8-4aac-8b63-59c1ef74eb88)
+    (property "Reference" "SW44" (at 154.94 114.3 0)
+      (effects (font (size 1.27 1.27)))
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 35.56 38.1 0)
-      (effects (font (size 1.27 1.27)) hide)
+    (property "Value" "SW_Push" (at 154.94 116.84 0)
+      (effects (font (size 1.27 1.27)))
     )
-    (property "Sim.Device" "D" (at 35.56 38.1 0)
+    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 154.94 116.84 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Pins" "1=K 2=A" (at 35.56 38.1 0)
+    (property "Datasheet" "~" (at 154.94 116.84 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid e54e0739-64bd-4d7b-a3ce-9e9e277d726e))
-    (pin "2" (uuid a19e18f4-653a-49c7-8be6-0c1fb4ef4b15))
+    (pin "1" (uuid d3a2a4be-3f65-4ed1-a2e1-1545d4555abb))
+    (pin "2" (uuid 5230c5eb-1a93-4ead-a49d-a7038216ae5b))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "D1") (unit 1)
+          (reference "SW44") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Diode:1N4148") (at 149.86 127 270) (unit 1)
+  (symbol (lib_id "Diode:1N4148") (at 149.86 110.49 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
-    (uuid 4daa19b2-b33b-4ebe-9d17-cbb4e0ec6849)
-    (property "Reference" "D46" (at 144.78 125.73 90)
+    (uuid 4978438d-42b2-4ecb-a223-df7cadd81ee6)
+    (property "Reference" "D36" (at 154.94 111.76 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "1N4148" (at 139.7 128.27 90)
+    (property "Value" "1N4148" (at 160.02 109.22 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Diode_SMD:D_SOD-123" (at 149.86 127 0)
+    (property "Footprint" "Diode_SMD:D_SOD-123" (at 149.86 110.49 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 149.86 127 0)
+    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 149.86 110.49 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Device" "D" (at 149.86 127 0)
+    (property "Sim.Device" "D" (at 149.86 110.49 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Pins" "1=K 2=A" (at 149.86 127 0)
+    (property "Sim.Pins" "1=K 2=A" (at 149.86 110.49 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid ee197974-3377-4d8d-835f-2679e1ab8bfb))
-    (pin "2" (uuid 3ad4050e-5bb6-488a-bbf6-fdfe1f123a51))
+    (pin "1" (uuid 9278112c-ea13-4798-99a4-3a51c61679ab))
+    (pin "2" (uuid d42a6348-4fda-466b-ac0c-3bac565a0a11))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "D46") (unit 1)
+          (reference "D36") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Switch:SW_Push") (at 132.08 140.97 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid 4f36469a-154b-4cf1-9106-421bebfbe45e)
-    (property "Reference" "SW53" (at 132.08 133.35 0)
-      (effects (font (size 1.27 1.27)))
+  (symbol (lib_id "Diode:1N4148") (at 99.06 49.53 90) (unit 1)
+    (in_bom yes) (on_board yes) (dnp no)
+    (uuid 4acb1923-779f-40e6-9aae-90db6bac254d)
+    (property "Reference" "D1" (at 104.14 50.8 90)
+      (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "SW_Push" (at 132.08 135.89 0)
-      (effects (font (size 1.27 1.27)))
+    (property "Value" "1N4148" (at 109.22 48.26 90)
+      (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 132.08 135.89 0)
+    (property "Footprint" "Diode_SMD:D_SOD-123" (at 99.06 49.53 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 132.08 135.89 0)
+    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 99.06 49.53 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 9ceb2a5f-804f-4093-a196-69001248a7de))
-    (pin "2" (uuid 548b22c9-f662-43bd-8eec-c1fb769b9b11))
-    (instances
-      (project "xantronix-z32"
-        (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "SW53") (unit 1)
-        )
-      )
-    )
-  )
-
-  (symbol (lib_id "Switch:SW_Push") (at 63.5 158.75 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid 4fafeb0c-5360-40c8-a32c-2b55f2fad38d)
-    (property "Reference" "SW57" (at 63.5 151.13 0)
-      (effects (font (size 1.27 1.27)))
-    )
-    (property "Value" "SW_Push" (at 63.5 153.67 0)
-      (effects (font (size 1.27 1.27)))
-    )
-    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 63.5 153.67 0)
+    (property "Sim.Device" "D" (at 99.06 49.53 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 63.5 153.67 0)
+    (property "Sim.Pins" "1=K 2=A" (at 99.06 49.53 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 3f94957f-34db-4a5a-88f3-e22be8a6f277))
-    (pin "2" (uuid a0b69622-81ec-4447-a3ba-fb5f44d4b8fd))
+    (pin "1" (uuid bc72e2e2-3a63-4d29-912e-d26b226dd8c3))
+    (pin "2" (uuid 43512918-ec5c-4175-bc76-a168d04a1109))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "SW57") (unit 1)
+          (reference "D1") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Switch:SW_Push") (at 132.08 69.85 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid 525f78ea-85cb-4483-b815-6eed6d00cc76)
-    (property "Reference" "SW21" (at 132.08 62.23 0)
-      (effects (font (size 1.27 1.27)))
+  (symbol (lib_id "Diode:1N4148") (at 99.06 110.49 90) (unit 1)
+    (in_bom yes) (on_board yes) (dnp no)
+    (uuid 4bab00e1-2d5d-4413-a0b6-01c6c4965b6b)
+    (property "Reference" "D32" (at 104.14 111.76 90)
+      (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "SW_Push" (at 132.08 64.77 0)
-      (effects (font (size 1.27 1.27)))
+    (property "Value" "1N4148" (at 109.22 109.22 90)
+      (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 132.08 64.77 0)
+    (property "Footprint" "Diode_SMD:D_SOD-123" (at 99.06 110.49 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 132.08 64.77 0)
+    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 99.06 110.49 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 0a6bb563-a5e4-4c8b-adde-0ded689e7ee4))
-    (pin "2" (uuid f7540995-e108-488e-ae5e-c8a46338fb22))
+    (property "Sim.Device" "D" (at 99.06 110.49 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Sim.Pins" "1=K 2=A" (at 99.06 110.49 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 75edb0c5-3a28-414d-8573-3a122bc185c8))
+    (pin "2" (uuid ad92efe6-7182-44cc-aa66-b0edb5bbaa3c))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "SW21") (unit 1)
+          (reference "D32") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Switch:SW_Push") (at 132.08 87.63 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid 53c52244-99d8-46a3-a793-8aca97d2cc31)
-    (property "Reference" "SW29" (at 132.08 80.01 0)
-      (effects (font (size 1.27 1.27)))
+  (symbol (lib_id "Diode:1N4148") (at 175.26 80.01 90) (unit 1)
+    (in_bom yes) (on_board yes) (dnp no)
+    (uuid 4c72ee9e-a0fc-4635-9c0a-25bd36ef860b)
+    (property "Reference" "D23" (at 180.34 81.28 90)
+      (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "SW_Push" (at 132.08 82.55 0)
-      (effects (font (size 1.27 1.27)))
+    (property "Value" "1N4148" (at 185.42 78.74 90)
+      (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 132.08 82.55 0)
+    (property "Footprint" "Diode_SMD:D_SOD-123" (at 175.26 80.01 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 132.08 82.55 0)
+    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 175.26 80.01 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 8b26ca3e-6a78-4b13-bfd7-b27fb925eed2))
-    (pin "2" (uuid ff356d51-211e-4c54-ad3c-7ad7cecf8ff1))
+    (property "Sim.Device" "D" (at 175.26 80.01 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Sim.Pins" "1=K 2=A" (at 175.26 80.01 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 25b1eec1-7efd-43a8-9966-7e2c884bfe2e))
+    (pin "2" (uuid aa776f54-399b-4540-9f65-033f1008a8cf))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "SW29") (unit 1)
+          (reference "D23") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Switch:SW_Push") (at 86.36 87.63 0) (unit 1)
+  (symbol (lib_id "Switch:SW_Push") (at 180.34 152.4 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid 580209c0-81a3-4b19-a136-db4fe075bf06)
-    (property "Reference" "SW27" (at 86.36 80.01 0)
+    (uuid 4e3fcb84-d92f-4e3f-8c66-c773b77fd38f)
+    (property "Reference" "SW62" (at 180.34 144.78 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "SW_Push" (at 86.36 82.55 0)
+    (property "Value" "SW_Push" (at 180.34 147.32 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 86.36 82.55 0)
+    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 180.34 147.32 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 86.36 82.55 0)
+    (property "Datasheet" "~" (at 180.34 147.32 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid e63e0bcc-7646-42ab-9941-384688b8b9e7))
-    (pin "2" (uuid 63c7aa2d-a15a-43c0-9289-b4e9ea3e53f1))
+    (pin "1" (uuid 2fb7d649-968c-4e7f-adfd-6400eb752098))
+    (pin "2" (uuid 522445d1-e311-4c28-97e9-4289edd888b8))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "SW27") (unit 1)
+          (reference "SW62") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Switch:SW_Push") (at 254 91.44 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid 588bef79-1bc3-4dc1-b83d-38785b9b2f6f)
-    (property "Reference" "SW64" (at 254 83.82 0)
-      (effects (font (size 1.27 1.27)))
+  (symbol (lib_id "Diode:1N4148") (at 111.76 125.73 90) (unit 1)
+    (in_bom yes) (on_board yes) (dnp no)
+    (uuid 4f4399ee-0af6-4065-b0e4-d62186ffc327)
+    (property "Reference" "D41" (at 116.84 127 90)
+      (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "SW_Push" (at 254 86.36 0)
-      (effects (font (size 1.27 1.27)))
+    (property "Value" "1N4148" (at 121.92 124.46 90)
+      (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 254 86.36 0)
+    (property "Footprint" "Diode_SMD:D_SOD-123" (at 111.76 125.73 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 254 86.36 0)
+    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 111.76 125.73 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 79b00f32-0c1d-4023-ae97-d75bf8fd5b92))
-    (pin "2" (uuid 7630fb2f-71c8-4a5c-afd0-d764362a8876))
+    (property "Sim.Device" "D" (at 111.76 125.73 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Sim.Pins" "1=K 2=A" (at 111.76 125.73 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 7e0edada-5121-4647-ada7-6304c318667a))
+    (pin "2" (uuid fa7ac73d-3d20-4f39-a158-da69342dcb47))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "SW64") (unit 1)
+          (reference "D41") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Diode:1N4148") (at 127 109.22 270) (unit 1)
+  (symbol (lib_id "Diode:1N4148") (at 149.86 125.73 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
-    (uuid 5ac02523-35d4-467f-805a-71db2340c320)
-    (property "Reference" "D37" (at 121.92 107.95 90)
+    (uuid 4f7a9883-d3f2-48d1-ba1c-4cd704d6400b)
+    (property "Reference" "D44" (at 154.94 127 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "1N4148" (at 116.84 110.49 90)
+    (property "Value" "1N4148" (at 160.02 124.46 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Diode_SMD:D_SOD-123" (at 127 109.22 0)
+    (property "Footprint" "Diode_SMD:D_SOD-123" (at 149.86 125.73 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 127 109.22 0)
+    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 149.86 125.73 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Device" "D" (at 127 109.22 0)
+    (property "Sim.Device" "D" (at 149.86 125.73 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Pins" "1=K 2=A" (at 127 109.22 0)
+    (property "Sim.Pins" "1=K 2=A" (at 149.86 125.73 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 02607de9-976e-431f-b26f-c37be085c6f9))
-    (pin "2" (uuid 07443920-255d-4cf9-b511-b9045d779029))
+    (pin "1" (uuid 2ae2a3c1-be36-447b-ab11-e66e8b794b33))
+    (pin "2" (uuid 84fea877-7b40-4e7b-b2a4-e9861f57ffad))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "D37") (unit 1)
+          (reference "D44") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Diode:1N4148") (at 104.14 109.22 270) (unit 1)
+  (symbol (lib_id "Diode:1N4148") (at 187.96 140.97 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
-    (uuid 5bd3d315-43f0-4ab8-92b2-61affd61589c)
-    (property "Reference" "D36" (at 99.06 107.95 90)
+    (uuid 54a24f0d-8f44-48e2-a7b5-79e63c0f2119)
+    (property "Reference" "D55" (at 193.04 142.24 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "1N4148" (at 93.98 110.49 90)
+    (property "Value" "1N4148" (at 198.12 139.7 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Diode_SMD:D_SOD-123" (at 104.14 109.22 0)
+    (property "Footprint" "Diode_SMD:D_SOD-123" (at 187.96 140.97 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 104.14 109.22 0)
+    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 187.96 140.97 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Device" "D" (at 104.14 109.22 0)
+    (property "Sim.Device" "D" (at 187.96 140.97 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Pins" "1=K 2=A" (at 104.14 109.22 0)
+    (property "Sim.Pins" "1=K 2=A" (at 187.96 140.97 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid dc9ec2b0-4de8-4f11-a3c6-5b066246204d))
-    (pin "2" (uuid bce0e99f-5376-4050-bff1-ceb08ae730a1))
+    (pin "1" (uuid d58c48a9-91d0-44a8-8d8e-38ec1ee8aab5))
+    (pin "2" (uuid 4701c328-8854-4cc2-af15-bb923bb03411))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "D36") (unit 1)
+          (reference "D55") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Diode:1N4148") (at 58.42 38.1 270) (unit 1)
+  (symbol (lib_id "Diode:1N4148") (at 162.56 95.25 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
-    (uuid 5be27ebc-88f1-4d9d-943b-e6687b071050)
-    (property "Reference" "D2" (at 53.34 36.83 90)
+    (uuid 5737e3d0-a743-48ac-8bc5-5567d28004cb)
+    (property "Reference" "D30" (at 167.64 96.52 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "1N4148" (at 48.26 39.37 90)
+    (property "Value" "1N4148" (at 172.72 93.98 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Diode_SMD:D_SOD-123" (at 58.42 38.1 0)
+    (property "Footprint" "Diode_SMD:D_SOD-123" (at 162.56 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 58.42 38.1 0)
+    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 162.56 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Device" "D" (at 58.42 38.1 0)
+    (property "Sim.Device" "D" (at 162.56 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Pins" "1=K 2=A" (at 58.42 38.1 0)
+    (property "Sim.Pins" "1=K 2=A" (at 162.56 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 4613c02e-ef04-4087-8435-06ce8c001211))
-    (pin "2" (uuid d839e3fd-dffc-4190-a51f-95196f4370c0))
+    (pin "1" (uuid d989a486-5ed6-4951-964d-24220e3ae56e))
+    (pin "2" (uuid 344c241e-4c09-4afd-84f9-395203f36a5d))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "D2") (unit 1)
+          (reference "D30") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Switch:SW_Push") (at 40.64 69.85 0) (unit 1)
+  (symbol (lib_id "Switch:SW_Push") (at 129.54 45.72 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid 5d25de8d-38bb-4cf0-8ae1-39a46997b3c0)
-    (property "Reference" "SW17" (at 40.64 62.23 0)
+    (uuid 57b9cdb2-871a-4a20-bddd-2256c28ee9a3)
+    (property "Reference" "SW3" (at 129.54 38.1 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "SW_Push" (at 40.64 64.77 0)
+    (property "Value" "SW_Push" (at 129.54 40.64 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.75u_PCB" (at 40.64 64.77 0)
+    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 129.54 40.64 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 40.64 64.77 0)
+    (property "Datasheet" "~" (at 129.54 40.64 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 8bdef1a7-af66-48c6-9c40-260cc3b93fde))
-    (pin "2" (uuid bdc4ed56-8bfd-4b42-8a9c-6243cd3786ab))
+    (pin "1" (uuid f530d9ac-aeab-4844-a7f2-ebcf21fd1d4f))
+    (pin "2" (uuid 43ff424b-d36e-49df-a066-ecaee1d77626))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "SW17") (unit 1)
+          (reference "SW3") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Switch:SW_Push") (at 132.08 52.07 0) (unit 1)
+  (symbol (lib_id "Switch:SW_Push") (at 254 91.44 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid 5e68b751-652c-46bb-94d5-7804332131c2)
-    (property "Reference" "SW13" (at 132.08 44.45 0)
+    (uuid 588bef79-1bc3-4dc1-b83d-38785b9b2f6f)
+    (property "Reference" "SW64" (at 254 83.82 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "SW_Push" (at 132.08 46.99 0)
+    (property "Value" "SW_Push" (at 254 86.36 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 132.08 46.99 0)
+    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 254 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 132.08 46.99 0)
+    (property "Datasheet" "~" (at 254 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 0e94e59d-48e5-46b9-a55e-f731d96b0231))
-    (pin "2" (uuid 6eb40db7-8bdf-403d-9f2d-73b9cf19f8bc))
+    (pin "1" (uuid 79b00f32-0c1d-4023-ae97-d75bf8fd5b92))
+    (pin "2" (uuid 7630fb2f-71c8-4a5c-afd0-d764362a8876))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "SW13") (unit 1)
+          (reference "SW64") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Diode:1N4148") (at 195.58 55.88 270) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no)
-    (uuid 5f5ebe5f-218b-462c-89b8-f4294a8805ad)
-    (property "Reference" "D16" (at 190.5 54.61 90)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "1N4148" (at 185.42 57.15 90)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "Diode_SMD:D_SOD-123" (at 195.58 55.88 0)
-      (effects (font (size 1.27 1.27)) hide)
+  (symbol (lib_id "Switch:SW_Push") (at 129.54 152.4 0) (unit 1)
+    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
+    (uuid 58c2141c-4cca-4aee-8742-fc3408642ffd)
+    (property "Reference" "SW58" (at 129.54 144.78 0)
+      (effects (font (size 1.27 1.27)))
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 195.58 55.88 0)
-      (effects (font (size 1.27 1.27)) hide)
+    (property "Value" "SW_Push" (at 129.54 147.32 0)
+      (effects (font (size 1.27 1.27)))
     )
-    (property "Sim.Device" "D" (at 195.58 55.88 0)
+    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 129.54 147.32 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Pins" "1=K 2=A" (at 195.58 55.88 0)
+    (property "Datasheet" "~" (at 129.54 147.32 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 448f620e-67c5-433f-88ea-f251b95a5a11))
-    (pin "2" (uuid 5adc0dd0-1831-4224-8b4b-46fd753d5390))
+    (pin "1" (uuid 713378e0-0c51-4b2a-aaf1-f9144731bb29))
+    (pin "2" (uuid 4237fe61-7d28-43fb-800a-25f3f2b16d3b))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "D16") (unit 1)
+          (reference "SW58") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Diode:1N4148") (at 149.86 55.88 270) (unit 1)
+  (symbol (lib_id "Diode:1N4148") (at 162.56 110.49 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
-    (uuid 61b8042d-136a-43e7-a500-bc57d3881634)
-    (property "Reference" "D14" (at 144.78 54.61 90)
+    (uuid 5bdce1bd-c531-4cb5-bf77-5d3d02912405)
+    (property "Reference" "D37" (at 167.64 111.76 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "1N4148" (at 139.7 57.15 90)
+    (property "Value" "1N4148" (at 172.72 109.22 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Diode_SMD:D_SOD-123" (at 149.86 55.88 0)
+    (property "Footprint" "Diode_SMD:D_SOD-123" (at 162.56 110.49 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 149.86 55.88 0)
+    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 162.56 110.49 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Device" "D" (at 149.86 55.88 0)
+    (property "Sim.Device" "D" (at 162.56 110.49 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Pins" "1=K 2=A" (at 149.86 55.88 0)
+    (property "Sim.Pins" "1=K 2=A" (at 162.56 110.49 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 5649dc09-b8ce-4ebb-a2ee-dbfd2fc36f13))
-    (pin "2" (uuid 721a6b96-ba3a-4b23-ba06-f3e135e54890))
+    (pin "1" (uuid 8d485dea-5dd8-429d-804b-407523f35828))
+    (pin "2" (uuid d217f2ff-4682-44b8-9c3f-c3d0457fc237))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "D14") (unit 1)
+          (reference "D37") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Switch:SW_Push") (at 132.08 158.75 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid 62616e1f-c8cd-4413-8c05-18ca43455cd8)
-    (property "Reference" "SW60" (at 132.08 151.13 0)
-      (effects (font (size 1.27 1.27)))
+  (symbol (lib_id "Diode:1N4148") (at 99.06 95.25 90) (unit 1)
+    (in_bom yes) (on_board yes) (dnp no)
+    (uuid 5c061352-3153-40a1-9b2c-bc11b41b3de4)
+    (property "Reference" "D25" (at 104.14 96.52 90)
+      (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "SW_Push" (at 132.08 153.67 0)
-      (effects (font (size 1.27 1.27)))
+    (property "Value" "1N4148" (at 109.22 93.98 90)
+      (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 132.08 153.67 0)
+    (property "Footprint" "Diode_SMD:D_SOD-123" (at 99.06 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 132.08 153.67 0)
+    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 99.06 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid eb5a54cd-0c17-44ef-9364-ffaadf6cb9ac))
-    (pin "2" (uuid b00053b2-8048-459d-84fb-b0af64c4faa6))
+    (property "Sim.Device" "D" (at 99.06 95.25 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Sim.Pins" "1=K 2=A" (at 99.06 95.25 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 2824974f-f842-48bd-aac7-fbbef23d6212))
+    (pin "2" (uuid cde64330-5606-4253-8e5b-ef750377051b))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "SW60") (unit 1)
+          (reference "D25") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Diode:1N4148") (at 195.58 73.66 270) (unit 1)
+  (symbol (lib_id "Diode:1N4148") (at 124.46 110.49 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
-    (uuid 635ac940-23d9-47d9-b570-c76d26b6dd80)
-    (property "Reference" "D24" (at 190.5 72.39 90)
+    (uuid 5c851c5f-8fa4-46fb-93fc-ca9dacc87a22)
+    (property "Reference" "D34" (at 129.54 111.76 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "1N4148" (at 185.42 74.93 90)
+    (property "Value" "1N4148" (at 134.62 109.22 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Diode_SMD:D_SOD-123" (at 195.58 73.66 0)
+    (property "Footprint" "Diode_SMD:D_SOD-123" (at 124.46 110.49 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 195.58 73.66 0)
+    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 124.46 110.49 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Device" "D" (at 195.58 73.66 0)
+    (property "Sim.Device" "D" (at 124.46 110.49 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Pins" "1=K 2=A" (at 195.58 73.66 0)
+    (property "Sim.Pins" "1=K 2=A" (at 124.46 110.49 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid dcd31a57-f7d7-4483-b53d-c3ba9d0fc3d7))
-    (pin "2" (uuid af12ef85-4ca5-4d21-8545-41ef77a3bf11))
+    (pin "1" (uuid 5f166d76-5a97-4c2b-8daf-9108fec4dfe3))
+    (pin "2" (uuid a1749df2-28d0-4236-8534-37f090f79e42))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "D24") (unit 1)
+          (reference "D34") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Switch:SW_Push") (at 86.36 105.41 0) (unit 1)
+  (symbol (lib_id "Switch:SW_Push") (at 180.34 106.68 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid 63b7c575-44fd-415b-8b42-24f2e6b527a1)
-    (property "Reference" "SW35" (at 86.36 97.79 0)
+    (uuid 5e868f74-6685-4c48-a770-f5e84305daec)
+    (property "Reference" "SW38" (at 180.34 99.06 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "SW_Push" (at 86.36 100.33 0)
+    (property "Value" "SW_Push" (at 180.34 101.6 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 86.36 100.33 0)
+    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 180.34 101.6 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 86.36 100.33 0)
+    (property "Datasheet" "~" (at 180.34 101.6 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 7e371db3-e1a7-4241-9b86-725d78e189a0))
-    (pin "2" (uuid 08d1a678-b95b-466e-9d01-c0f2138a1888))
+    (pin "1" (uuid e1407f6f-565b-4d70-9c00-6c5c32d93a5d))
+    (pin "2" (uuid 2b49d354-95ea-4483-be98-9e7e2a7f1a71))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "SW35") (unit 1)
+          (reference "SW38") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Diode:1N4148") (at 58.42 55.88 270) (unit 1)
+  (symbol (lib_id "Diode:1N4148") (at 111.76 95.25 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
-    (uuid 68d9086a-766b-4add-aa8e-90a36ca77802)
-    (property "Reference" "D10" (at 53.34 54.61 90)
+    (uuid 631b33a8-d043-400d-8f51-8a738e923336)
+    (property "Reference" "D26" (at 116.84 96.52 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "1N4148" (at 48.26 57.15 90)
+    (property "Value" "1N4148" (at 121.92 93.98 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Diode_SMD:D_SOD-123" (at 58.42 55.88 0)
+    (property "Footprint" "Diode_SMD:D_SOD-123" (at 111.76 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 58.42 55.88 0)
+    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 111.76 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Device" "D" (at 58.42 55.88 0)
+    (property "Sim.Device" "D" (at 111.76 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Pins" "1=K 2=A" (at 58.42 55.88 0)
+    (property "Sim.Pins" "1=K 2=A" (at 111.76 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid d5e9469e-9cef-4d7c-99f3-bb7cbf6856e7))
-    (pin "2" (uuid 5e3d6ec5-f328-4ec4-9001-91544a91a765))
+    (pin "1" (uuid 93f95909-d802-4579-a125-9063e5c31002))
+    (pin "2" (uuid 583580a8-ff79-4c3f-a55e-0210d16b6d76))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "D10") (unit 1)
+          (reference "D26") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Diode:1N4148") (at 35.56 127 270) (unit 1)
+  (symbol (lib_id "Diode:1N4148") (at 137.16 110.49 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
-    (uuid 68e37679-760f-46da-913b-27cbcddb5ee6)
-    (property "Reference" "D41" (at 30.48 125.73 90)
+    (uuid 6513af38-89bc-4f19-8415-62ba29e6b996)
+    (property "Reference" "D35" (at 142.24 111.76 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "1N4148" (at 25.4 128.27 90)
+    (property "Value" "1N4148" (at 147.32 109.22 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Diode_SMD:D_SOD-123" (at 35.56 127 0)
+    (property "Footprint" "Diode_SMD:D_SOD-123" (at 137.16 110.49 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 35.56 127 0)
+    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 137.16 110.49 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Device" "D" (at 35.56 127 0)
+    (property "Sim.Device" "D" (at 137.16 110.49 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Pins" "1=K 2=A" (at 35.56 127 0)
+    (property "Sim.Pins" "1=K 2=A" (at 137.16 110.49 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 3770d1cd-9b0a-4a7e-bbf9-3bdab74a08ad))
-    (pin "2" (uuid ae556578-0f4e-40e2-9e9e-26aed849f7f2))
+    (pin "1" (uuid ca6a4e04-da4f-48b8-81d9-edf997a0751d))
+    (pin "2" (uuid a6fd7715-58ba-49d2-8dc8-9edf8e54ece0))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "D41") (unit 1)
+          (reference "D35") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Switch:SW_Push") (at 109.22 158.75 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid 698cd2e5-fa6d-4a27-9110-5eeedd87c7d1)
-    (property "Reference" "SW59" (at 109.22 151.13 0)
-      (effects (font (size 1.27 1.27)))
+  (symbol (lib_id "Diode:1N4148") (at 162.56 140.97 90) (unit 1)
+    (in_bom yes) (on_board yes) (dnp no)
+    (uuid 677e938f-b76a-49b6-8377-50a1b2d8898e)
+    (property "Reference" "D53" (at 167.64 142.24 90)
+      (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "SW_Push" (at 109.22 153.67 0)
-      (effects (font (size 1.27 1.27)))
+    (property "Value" "1N4148" (at 172.72 139.7 90)
+      (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 109.22 153.67 0)
+    (property "Footprint" "Diode_SMD:D_SOD-123" (at 162.56 140.97 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 109.22 153.67 0)
+    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 162.56 140.97 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 5a251818-e85f-4484-94b3-84af258989f5))
-    (pin "2" (uuid 5a8028b8-5951-4485-bf82-52f775fe57e5))
-    (instances
-      (project "xantronix-z32"
-        (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "SW59") (unit 1)
-        )
-      )
-    )
-  )
-
-  (symbol (lib_id "Switch:SW_Push") (at 132.08 105.41 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid 6a7aa636-e32b-4609-95df-048e58aa6352)
-    (property "Reference" "SW37" (at 132.08 97.79 0)
-      (effects (font (size 1.27 1.27)))
-    )
-    (property "Value" "SW_Push" (at 132.08 100.33 0)
-      (effects (font (size 1.27 1.27)))
-    )
-    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 132.08 100.33 0)
+    (property "Sim.Device" "D" (at 162.56 140.97 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 132.08 100.33 0)
+    (property "Sim.Pins" "1=K 2=A" (at 162.56 140.97 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 48414794-6de8-42bc-853f-ce9a5ca0dc24))
-    (pin "2" (uuid c6912f0e-aa32-48e8-9a47-81ee410ed924))
+    (pin "1" (uuid 285a5dd1-968b-4ef2-b5df-6725cf66c25f))
+    (pin "2" (uuid 23b6511e-30ad-4b49-bf53-40840f254db9))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "SW37") (unit 1)
+          (reference "D53") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Switch:SW_Push") (at 132.08 34.29 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid 6f025a7c-8e60-48d0-b8b7-aa528cdd8f8f)
-    (property "Reference" "SW5" (at 132.08 26.67 0)
-      (effects (font (size 1.27 1.27)))
+  (symbol (lib_id "Diode:1N4148") (at 99.06 80.01 90) (unit 1)
+    (in_bom yes) (on_board yes) (dnp no)
+    (uuid 69524dcf-107f-46a2-b8e9-12c0e473b454)
+    (property "Reference" "D17" (at 104.14 81.28 90)
+      (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "SW_Push" (at 132.08 29.21 0)
-      (effects (font (size 1.27 1.27)))
+    (property "Value" "1N4148" (at 109.22 78.74 90)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Diode_SMD:D_SOD-123" (at 99.06 80.01 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 99.06 80.01 0)
+      (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 132.08 29.21 0)
+    (property "Sim.Device" "D" (at 99.06 80.01 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 132.08 29.21 0)
+    (property "Sim.Pins" "1=K 2=A" (at 99.06 80.01 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 728606d2-bbba-4eca-bbbe-1cb90d8b77a8))
-    (pin "2" (uuid e1e9c063-3463-4749-9f6d-101e5bd81522))
+    (pin "1" (uuid 5fc5047b-0f8a-4489-b768-c9ddf4996ec3))
+    (pin "2" (uuid f73fc10a-fad3-4066-bde5-d3f5762dba3c))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "SW5") (unit 1)
+          (reference "D17") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Diode:1N4148") (at 149.86 91.44 270) (unit 1)
+  (symbol (lib_id "Diode:1N4148") (at 149.86 64.77 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
-    (uuid 72197019-16cc-479e-b461-3a47722be1af)
-    (property "Reference" "D30" (at 144.78 90.17 90)
+    (uuid 6de8d931-e38a-4a4a-b711-2ecec491b810)
+    (property "Reference" "D13" (at 154.94 66.04 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "1N4148" (at 139.7 92.71 90)
+    (property "Value" "1N4148" (at 160.02 63.5 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Diode_SMD:D_SOD-123" (at 149.86 91.44 0)
+    (property "Footprint" "Diode_SMD:D_SOD-123" (at 149.86 64.77 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 149.86 91.44 0)
+    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 149.86 64.77 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Device" "D" (at 149.86 91.44 0)
+    (property "Sim.Device" "D" (at 149.86 64.77 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Pins" "1=K 2=A" (at 149.86 91.44 0)
+    (property "Sim.Pins" "1=K 2=A" (at 149.86 64.77 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 2e690ddc-14ff-42be-838c-af721cd92b12))
-    (pin "2" (uuid 811ec758-cf9b-413a-a8b6-602c283cc5e7))
+    (pin "1" (uuid a638f1ed-ee3f-4f9f-9c84-82932099cb3c))
+    (pin "2" (uuid 75ef1543-3a38-49d3-83f7-f93b375bab0e))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "D30") (unit 1)
+          (reference "D13") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Switch:SW_Push") (at 63.5 34.29 0) (unit 1)
+  (symbol (lib_id "Switch:SW_Push") (at 142.24 91.44 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid 722cbd63-0049-404c-94d8-c4bff75ecf66)
-    (property "Reference" "SW2" (at 63.5 26.67 0)
+    (uuid 720e2271-0a6b-40ee-befd-2cd3f682d50d)
+    (property "Reference" "SW28" (at 142.24 83.82 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "SW_Push" (at 63.5 29.21 0)
+    (property "Value" "SW_Push" (at 142.24 86.36 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 63.5 29.21 0)
+    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 142.24 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 63.5 29.21 0)
+    (property "Datasheet" "~" (at 142.24 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 74b85bd0-5c75-4da1-af1e-17dd076b1d1f))
-    (pin "2" (uuid 34732b67-e2b2-4cdc-908e-3e65ded5ffb8))
+    (pin "1" (uuid 33f1e736-9544-49bb-9b02-fdac567dfc4a))
+    (pin "2" (uuid 37b4e358-20a2-4678-8ef4-4d4df6f22828))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "SW2") (unit 1)
+          (reference "SW28") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Diode:1N4148") (at 127 162.56 270) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no)
-    (uuid 775685ff-9c6d-4598-abbb-8375a1941e8d)
-    (property "Reference" "D60" (at 121.92 161.29 90)
-      (effects (font (size 1.27 1.27)) (justify left))
+  (symbol (lib_id "Switch:SW_Push") (at 193.04 137.16 0) (unit 1)
+    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
+    (uuid 73272eda-b015-46d9-a1a1-dbbaa977eb5f)
+    (property "Reference" "SW55" (at 193.04 129.54 0)
+      (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "1N4148" (at 116.84 163.83 90)
-      (effects (font (size 1.27 1.27)) (justify left))
+    (property "Value" "SW_Push" (at 193.04 132.08 0)
+      (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "Diode_SMD:D_SOD-123" (at 127 162.56 0)
+    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 193.04 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 127 162.56 0)
+    (property "Datasheet" "~" (at 193.04 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Device" "D" (at 127 162.56 0)
+    (pin "1" (uuid fcaca2fd-019a-4313-a2a8-6680b9640165))
+    (pin "2" (uuid 91d6dc75-8968-4271-9f41-d9eeea511408))
+    (instances
+      (project "xantronix-z32"
+        (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
+          (reference "SW55") (unit 1)
+        )
+      )
+    )
+  )
+
+  (symbol (lib_id "Switch:SW_Push") (at 142.24 76.2 0) (unit 1)
+    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
+    (uuid 748af136-b543-4a91-a075-02c17dd4e555)
+    (property "Reference" "SW20" (at 142.24 68.58 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Value" "SW_Push" (at 142.24 71.12 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 142.24 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Pins" "1=K 2=A" (at 127 162.56 0)
+    (property "Datasheet" "~" (at 142.24 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 630ea5b2-a36a-4515-8b74-c178208c010a))
-    (pin "2" (uuid 07a91e90-9952-421a-87d7-e8732f69dd7f))
+    (pin "1" (uuid f25be263-0672-4777-91ec-98b3f99251da))
+    (pin "2" (uuid 28a5c529-23c3-4525-98ae-d6f7b3989adb))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "D60") (unit 1)
+          (reference "SW20") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Switch:SW_Push") (at 63.5 69.85 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid 78b01cd8-2b96-4366-ae95-9fd9e7c2bb82)
-    (property "Reference" "SW18" (at 63.5 62.23 0)
-      (effects (font (size 1.27 1.27)))
+  (symbol (lib_id "Diode:1N4148") (at 162.56 156.21 90) (unit 1)
+    (in_bom yes) (on_board yes) (dnp no)
+    (uuid 79f880c2-39c3-41e1-a615-1a0f2c2c6c49)
+    (property "Reference" "D61" (at 167.64 157.48 90)
+      (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "SW_Push" (at 63.5 64.77 0)
-      (effects (font (size 1.27 1.27)))
+    (property "Value" "1N4148" (at 172.72 154.94 90)
+      (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 63.5 64.77 0)
+    (property "Footprint" "Diode_SMD:D_SOD-123" (at 162.56 156.21 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 63.5 64.77 0)
+    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 162.56 156.21 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 7aa70873-d6b0-40ce-8f24-00d6e84cbf84))
-    (pin "2" (uuid b991f105-e11d-43e8-99d7-0ba2edb4b96a))
+    (property "Sim.Device" "D" (at 162.56 156.21 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Sim.Pins" "1=K 2=A" (at 162.56 156.21 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid e4833d9f-6f54-4500-937b-2e9755d0c6cc))
+    (pin "2" (uuid 2fceeb9e-09d7-4164-9705-4b055efc44cb))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "SW18") (unit 1)
+          (reference "D61") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Switch:SW_Push") (at 154.94 123.19 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid 7e13fe0a-493e-4d1d-8d60-2b05dd71f696)
-    (property "Reference" "SW46" (at 154.94 115.57 0)
-      (effects (font (size 1.27 1.27)))
+  (symbol (lib_id "Diode:1N4148") (at 111.76 49.53 90) (unit 1)
+    (in_bom yes) (on_board yes) (dnp no)
+    (uuid 7bdcbe8a-4a48-4ca9-958b-17bc38d31d5f)
+    (property "Reference" "D2" (at 116.84 50.8 90)
+      (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "SW_Push" (at 154.94 118.11 0)
-      (effects (font (size 1.27 1.27)))
+    (property "Value" "1N4148" (at 121.92 48.26 90)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Diode_SMD:D_SOD-123" (at 111.76 49.53 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 111.76 49.53 0)
+      (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 154.94 118.11 0)
+    (property "Sim.Device" "D" (at 111.76 49.53 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 154.94 118.11 0)
+    (property "Sim.Pins" "1=K 2=A" (at 111.76 49.53 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid e152fda4-b456-4522-a494-477011e25ec2))
-    (pin "2" (uuid 8ac2cd0d-a51c-4a86-a3ce-6764a37d0403))
+    (pin "1" (uuid fd19b5ed-8843-422a-9e51-7b223ded48d2))
+    (pin "2" (uuid 63808440-e814-481f-9224-ed895e17c53b))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "SW46") (unit 1)
+          (reference "D2") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Diode:1N4148") (at 81.28 144.78 270) (unit 1)
+  (symbol (lib_id "Diode:1N4148") (at 187.96 64.77 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
-    (uuid 7f2cec7e-c470-475d-80ec-d1ae4520cec3)
-    (property "Reference" "D51" (at 76.2 143.51 90)
+    (uuid 7e86451c-aadf-4fec-b580-ad83be680213)
+    (property "Reference" "D16" (at 193.04 66.04 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "1N4148" (at 71.12 146.05 90)
+    (property "Value" "1N4148" (at 198.12 63.5 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Diode_SMD:D_SOD-123" (at 81.28 144.78 0)
+    (property "Footprint" "Diode_SMD:D_SOD-123" (at 187.96 64.77 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 81.28 144.78 0)
+    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 187.96 64.77 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Device" "D" (at 81.28 144.78 0)
+    (property "Sim.Device" "D" (at 187.96 64.77 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Pins" "1=K 2=A" (at 81.28 144.78 0)
+    (property "Sim.Pins" "1=K 2=A" (at 187.96 64.77 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid a5a38a6a-028a-4b5a-aef0-bd846f18fac7))
-    (pin "2" (uuid b803591d-8069-42d0-9ab3-b470354089d2))
+    (pin "1" (uuid 7cee3ef5-8b56-4996-a7c7-5668777c7bc1))
+    (pin "2" (uuid c8a815a5-ac7f-41c4-b85a-227180d951a9))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "D51") (unit 1)
+          (reference "D16") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Diode:1N4148") (at 172.72 162.56 270) (unit 1)
+  (symbol (lib_id "Diode:1N4148") (at 137.16 95.25 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
-    (uuid 83fe7dc9-c750-4634-8763-4b1e3b13a04e)
-    (property "Reference" "D62" (at 167.64 161.29 90)
+    (uuid 7f2e8098-f089-454b-9a88-be2466bfe7d6)
+    (property "Reference" "D28" (at 142.24 96.52 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "1N4148" (at 162.56 163.83 90)
+    (property "Value" "1N4148" (at 147.32 93.98 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Diode_SMD:D_SOD-123" (at 172.72 162.56 0)
+    (property "Footprint" "Diode_SMD:D_SOD-123" (at 137.16 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 172.72 162.56 0)
+    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 137.16 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Device" "D" (at 172.72 162.56 0)
+    (property "Sim.Device" "D" (at 137.16 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Pins" "1=K 2=A" (at 172.72 162.56 0)
+    (property "Sim.Pins" "1=K 2=A" (at 137.16 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 2cca22a8-1cc1-4a68-bfa8-63c7ee450f25))
-    (pin "2" (uuid 809f1cf8-11d7-48f2-a21c-b9663ff1d474))
+    (pin "1" (uuid 0a7be3de-9759-49b3-ae49-60a6c2543874))
+    (pin "2" (uuid d25a655c-2720-43e2-b4ee-c432f4628b0b))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "D62") (unit 1)
+          (reference "D28") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Switch:SW_Push") (at 109.22 87.63 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid 863aa541-5bce-4855-8092-11a31871b7dc)
-    (property "Reference" "SW28" (at 109.22 80.01 0)
-      (effects (font (size 1.27 1.27)))
+  (symbol (lib_id "Diode:1N4148") (at 124.46 95.25 90) (unit 1)
+    (in_bom yes) (on_board yes) (dnp no)
+    (uuid 824c637b-dc84-43d9-90d1-ef47a27eead5)
+    (property "Reference" "D27" (at 129.54 96.52 90)
+      (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "SW_Push" (at 109.22 82.55 0)
-      (effects (font (size 1.27 1.27)))
+    (property "Value" "1N4148" (at 134.62 93.98 90)
+      (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 109.22 82.55 0)
+    (property "Footprint" "Diode_SMD:D_SOD-123" (at 124.46 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 109.22 82.55 0)
+    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 124.46 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 49049b01-e463-42ec-a676-00e3ec056d81))
-    (pin "2" (uuid da527da9-ad25-4377-aed1-9acd170d09e0))
+    (property "Sim.Device" "D" (at 124.46 95.25 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Sim.Pins" "1=K 2=A" (at 124.46 95.25 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 48b6da25-aead-4ad8-9031-b74d4b5a6f09))
+    (pin "2" (uuid a7a8403d-b438-4d40-9087-a627106b48b7))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "SW28") (unit 1)
+          (reference "D27") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Switch:SW_Push") (at 177.8 123.19 0) (unit 1)
+  (symbol (lib_id "Switch:SW_Push") (at 193.04 60.96 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid 88598707-986d-472e-9465-caaaf71b8e12)
-    (property "Reference" "SW47" (at 177.8 115.57 0)
+    (uuid 82b89cb2-98c1-4fbd-a48a-3114ae7a6a3c)
+    (property "Reference" "SW16" (at 193.04 53.34 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "SW_Push" (at 177.8 118.11 0)
+    (property "Value" "SW_Push" (at 193.04 55.88 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 177.8 118.11 0)
+    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 193.04 55.88 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 177.8 118.11 0)
+    (property "Datasheet" "~" (at 193.04 55.88 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 7f39feaf-a36d-4676-a024-ac8a6f73af31))
-    (pin "2" (uuid 74bb7997-555f-4c67-aa17-b118c7caf28b))
+    (pin "1" (uuid c9cbf436-671e-4e4c-8303-2b3a3ebcb84e))
+    (pin "2" (uuid 42096aed-676a-4cac-bcfe-5502f40111f1))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "SW47") (unit 1)
+          (reference "SW16") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Diode:1N4148") (at 195.58 91.44 270) (unit 1)
+  (symbol (lib_id "Diode:1N4148") (at 175.26 156.21 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
-    (uuid 8ce008a2-8b21-4720-81f1-f5a92bf532ae)
-    (property "Reference" "D32" (at 190.5 90.17 90)
+    (uuid 83689cf2-9853-476e-8360-f88d63878043)
+    (property "Reference" "D62" (at 180.34 157.48 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "1N4148" (at 185.42 92.71 90)
+    (property "Value" "1N4148" (at 185.42 154.94 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Diode_SMD:D_SOD-123" (at 195.58 91.44 0)
+    (property "Footprint" "Diode_SMD:D_SOD-123" (at 175.26 156.21 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 195.58 91.44 0)
+    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 175.26 156.21 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Device" "D" (at 195.58 91.44 0)
+    (property "Sim.Device" "D" (at 175.26 156.21 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Pins" "1=K 2=A" (at 195.58 91.44 0)
+    (property "Sim.Pins" "1=K 2=A" (at 175.26 156.21 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 838c12bc-f166-4f1b-93ad-481b7b34ec28))
-    (pin "2" (uuid 8fd16f6a-0bfb-419a-a86c-5b0b0a53fe9c))
+    (pin "1" (uuid 30e2ad1d-2997-444a-9f1b-35a817cfae95))
+    (pin "2" (uuid 4e63ce33-4a0d-4a1f-82c2-b0d09f77b79b))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "D32") (unit 1)
+          (reference "D62") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Switch:SW_Push") (at 63.5 123.19 0) (unit 1)
+  (symbol (lib_id "Switch:SW_Push") (at 193.04 106.68 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid 8d01b77e-79bc-4bfb-8322-4e49bb11768d)
-    (property "Reference" "SW42" (at 63.5 115.57 0)
+    (uuid 851bf40d-2439-4374-84f7-bf723570f928)
+    (property "Reference" "SW39" (at 193.04 99.06 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "SW_Push" (at 63.5 118.11 0)
+    (property "Value" "SW_Push" (at 193.04 101.6 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 63.5 118.11 0)
+    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 193.04 101.6 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 63.5 118.11 0)
+    (property "Datasheet" "~" (at 193.04 101.6 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 7d58cee6-66cc-479c-a6a5-a436ab0ffd0a))
-    (pin "2" (uuid 168102c9-9abb-4d17-83f1-0cc3158882cc))
+    (pin "1" (uuid 015dcfca-fd9f-4bfb-bddd-54dad66ec2e0))
+    (pin "2" (uuid 33ec8b9b-cfcd-4364-b2d2-86cdb943f4ea))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "SW42") (unit 1)
+          (reference "SW39") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Switch:SW_Push") (at 63.5 105.41 0) (unit 1)
+  (symbol (lib_id "Switch:SW_Push") (at 142.24 45.72 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid 8d496179-4b29-45bb-bc55-6a12488778b5)
-    (property "Reference" "SW34" (at 63.5 97.79 0)
+    (uuid 8d997587-7593-45cf-82e7-844d6d4af7ad)
+    (property "Reference" "SW4" (at 142.24 38.1 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "SW_Push" (at 63.5 100.33 0)
+    (property "Value" "SW_Push" (at 142.24 40.64 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.25u_PCB" (at 63.5 100.33 0)
+    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 142.24 40.64 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 63.5 100.33 0)
+    (property "Datasheet" "~" (at 142.24 40.64 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 8bcc3f17-bb16-462b-b039-3c10f40b921c))
-    (pin "2" (uuid 66573eb1-7449-4937-98d8-c9d3c4d0f078))
+    (pin "1" (uuid 8668061a-54fa-4e1a-9aa7-93e9f941687e))
+    (pin "2" (uuid 45e34051-7c52-4f61-8537-cc4fe27a03a9))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "SW34") (unit 1)
+          (reference "SW4") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Diode:1N4148") (at 35.56 162.56 270) (unit 1)
+  (symbol (lib_id "Diode:1N4148") (at 111.76 80.01 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
-    (uuid 932bd5bf-2bc6-4d7c-bbc1-5e0a48fdc68c)
-    (property "Reference" "D56" (at 30.48 161.29 90)
+    (uuid 9119e94c-f042-40a4-87fb-100a66c4f571)
+    (property "Reference" "D18" (at 116.84 81.28 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "1N4148" (at 25.4 163.83 90)
+    (property "Value" "1N4148" (at 121.92 78.74 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Diode_SMD:D_SOD-123" (at 35.56 162.56 0)
+    (property "Footprint" "Diode_SMD:D_SOD-123" (at 111.76 80.01 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 35.56 162.56 0)
+    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 111.76 80.01 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Device" "D" (at 35.56 162.56 0)
+    (property "Sim.Device" "D" (at 111.76 80.01 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Pins" "1=K 2=A" (at 35.56 162.56 0)
+    (property "Sim.Pins" "1=K 2=A" (at 111.76 80.01 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid a5aca4b6-6bd9-434d-b916-5e668b760948))
-    (pin "2" (uuid fce09acc-b9ae-4eea-a9a5-2e40b6e69b37))
+    (pin "1" (uuid 1515209c-cc60-4475-bb92-f173427d2898))
+    (pin "2" (uuid 349cb269-8e1f-43fa-9c73-ff40e0a60320))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "D56") (unit 1)
+          (reference "D18") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Diode:1N4148") (at 58.42 127 270) (unit 1)
+  (symbol (lib_id "Diode:1N4148") (at 187.96 125.73 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
-    (uuid 950c0abf-e0c0-4c84-a13d-0efd81d7eb44)
-    (property "Reference" "D42" (at 53.34 125.73 90)
+    (uuid 947f8f66-c061-4742-91f3-b722faabf557)
+    (property "Reference" "D47" (at 193.04 127 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "1N4148" (at 48.26 128.27 90)
+    (property "Value" "1N4148" (at 198.12 124.46 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Diode_SMD:D_SOD-123" (at 58.42 127 0)
+    (property "Footprint" "Diode_SMD:D_SOD-123" (at 187.96 125.73 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 58.42 127 0)
+    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 187.96 125.73 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Device" "D" (at 58.42 127 0)
+    (property "Sim.Device" "D" (at 187.96 125.73 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Pins" "1=K 2=A" (at 58.42 127 0)
+    (property "Sim.Pins" "1=K 2=A" (at 187.96 125.73 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 4dc23d1a-881f-419e-a6c3-c288143f9d22))
-    (pin "2" (uuid 74188529-4c26-42dc-bed8-263fc087b027))
+    (pin "1" (uuid 8ab7372e-521d-4ee1-a613-abd8a38888c1))
+    (pin "2" (uuid e5ed4c54-5625-4fa2-bd72-b76f2b2c13ac))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "D42") (unit 1)
+          (reference "D47") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Diode:1N4148") (at 149.86 144.78 270) (unit 1)
+  (symbol (lib_id "Diode:1N4148") (at 124.46 156.21 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
-    (uuid 990b2aa2-469f-451a-921e-6f585235cb9c)
-    (property "Reference" "D54" (at 144.78 143.51 90)
+    (uuid 94fd6531-ee70-417c-9637-07ab88fbdd1e)
+    (property "Reference" "D58" (at 129.54 157.48 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "1N4148" (at 139.7 146.05 90)
+    (property "Value" "1N4148" (at 134.62 154.94 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Diode_SMD:D_SOD-123" (at 149.86 144.78 0)
+    (property "Footprint" "Diode_SMD:D_SOD-123" (at 124.46 156.21 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 149.86 144.78 0)
+    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 124.46 156.21 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Device" "D" (at 149.86 144.78 0)
+    (property "Sim.Device" "D" (at 124.46 156.21 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Pins" "1=K 2=A" (at 149.86 144.78 0)
+    (property "Sim.Pins" "1=K 2=A" (at 124.46 156.21 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 71938a8c-6f1e-459d-8ab3-735c4c3ceef5))
-    (pin "2" (uuid 314ad442-3cff-43ea-a43c-efec70db9f71))
+    (pin "1" (uuid ef6cf494-0d17-4e53-aac5-e70eecd2397a))
+    (pin "2" (uuid 6bd80832-34b7-46e9-9b27-2bbfafe82234))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "D54") (unit 1)
+          (reference "D58") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Switch:SW_Push") (at 177.8 34.29 0) (unit 1)
+  (symbol (lib_id "Switch:SW_Push") (at 142.24 152.4 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid a086fc03-9b65-4fd4-be35-c16092a84063)
-    (property "Reference" "SW7" (at 177.8 26.67 0)
+    (uuid 98ec9a9e-31b2-4873-8cae-ccafd4d39bd1)
+    (property "Reference" "SW59" (at 142.24 144.78 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "SW_Push" (at 177.8 29.21 0)
+    (property "Value" "SW_Push" (at 142.24 147.32 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 177.8 29.21 0)
+    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 142.24 147.32 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 177.8 29.21 0)
+    (property "Datasheet" "~" (at 142.24 147.32 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 531e9c0e-84f4-452e-81f3-5b05767b573f))
-    (pin "2" (uuid f245d310-a75c-4e84-add9-fc880c21cded))
+    (pin "1" (uuid b186be14-f05f-4d0d-bc01-08301771c4ea))
+    (pin "2" (uuid 003b3e5b-7527-468f-acac-7bda644a6166))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "SW7") (unit 1)
+          (reference "SW59") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Switch:SW_Push") (at 86.36 140.97 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid a0df2262-f209-4aed-aeab-0b741e16fd5b)
-    (property "Reference" "SW51" (at 86.36 133.35 0)
-      (effects (font (size 1.27 1.27)))
+  (symbol (lib_id "Diode:1N4148") (at 187.96 110.49 90) (unit 1)
+    (in_bom yes) (on_board yes) (dnp no)
+    (uuid 98f56fc2-e4e4-4b24-be47-421b73dd0e3b)
+    (property "Reference" "D39" (at 193.04 111.76 90)
+      (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "SW_Push" (at 86.36 135.89 0)
-      (effects (font (size 1.27 1.27)))
+    (property "Value" "1N4148" (at 198.12 109.22 90)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Diode_SMD:D_SOD-123" (at 187.96 110.49 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 187.96 110.49 0)
+      (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 86.36 135.89 0)
+    (property "Sim.Device" "D" (at 187.96 110.49 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 86.36 135.89 0)
+    (property "Sim.Pins" "1=K 2=A" (at 187.96 110.49 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 92ea8f6b-b73d-454b-86d0-e6a186b61c97))
-    (pin "2" (uuid 73578054-5b5a-40e6-a5ee-1a4886096017))
+    (pin "1" (uuid 61e4706d-77e5-4c5d-b63b-7219c5292e9d))
+    (pin "2" (uuid d3eb6348-de5f-4fa7-9486-4b30e9108fb1))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "SW51") (unit 1)
+          (reference "D39") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Switch:SW_Push") (at 86.36 52.07 0) (unit 1)
+  (symbol (lib_id "Switch:SW_Push") (at 116.84 76.2 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid a3883511-72b7-4b68-979b-50b08f15697a)
-    (property "Reference" "SW11" (at 86.36 44.45 0)
+    (uuid 9e903890-7968-4134-88dc-04b94404eafe)
+    (property "Reference" "SW18" (at 116.84 68.58 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "SW_Push" (at 86.36 46.99 0)
+    (property "Value" "SW_Push" (at 116.84 71.12 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 86.36 46.99 0)
+    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.25u_PCB" (at 116.84 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 86.36 46.99 0)
+    (property "Datasheet" "~" (at 116.84 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 96b1c030-90ce-47db-877d-2017a8ed3ce4))
-    (pin "2" (uuid 3ec9c19b-614f-46d0-88b2-d32bdd0ff5fc))
+    (pin "1" (uuid 265b3003-5f68-4b75-a1d4-4e1b4d3192dd))
+    (pin "2" (uuid e14f66b6-f36e-4385-bf7d-67f226140255))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "SW11") (unit 1)
+          (reference "SW18") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Diode:1N4148") (at 195.58 109.22 270) (unit 1)
+  (symbol (lib_id "Diode:1N4148") (at 175.26 49.53 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
-    (uuid a8dfca84-6623-4dd1-a479-45d23ed60030)
-    (property "Reference" "D40" (at 190.5 107.95 90)
+    (uuid 9fe37ff2-ccfb-497f-a4ff-adb7f18d12a7)
+    (property "Reference" "D7" (at 180.34 50.8 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "1N4148" (at 185.42 110.49 90)
+    (property "Value" "1N4148" (at 185.42 48.26 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Diode_SMD:D_SOD-123" (at 195.58 109.22 0)
+    (property "Footprint" "Diode_SMD:D_SOD-123" (at 175.26 49.53 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 195.58 109.22 0)
+    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 175.26 49.53 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Device" "D" (at 195.58 109.22 0)
+    (property "Sim.Device" "D" (at 175.26 49.53 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Pins" "1=K 2=A" (at 195.58 109.22 0)
+    (property "Sim.Pins" "1=K 2=A" (at 175.26 49.53 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 0e2d0120-1c47-4c59-affb-0686dfa8e9e1))
-    (pin "2" (uuid 0feb2167-34c3-4d3a-850a-2633b7224df7))
+    (pin "1" (uuid 4a61a632-bb9b-4295-8ab9-606bf49b12bc))
+    (pin "2" (uuid 434fc39e-bd04-47ef-a885-2a3116cadf6c))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "D40") (unit 1)
+          (reference "D7") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Diode:1N4148") (at 35.56 55.88 270) (unit 1)
+  (symbol (lib_id "Diode:1N4148") (at 175.26 110.49 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
-    (uuid ab443403-c0bf-46a2-9e19-ab754ababe09)
-    (property "Reference" "D9" (at 30.48 54.61 90)
+    (uuid a03da3dd-890f-4bd6-9fd9-86ae1b9e6a51)
+    (property "Reference" "D38" (at 180.34 111.76 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "1N4148" (at 25.4 57.15 90)
+    (property "Value" "1N4148" (at 185.42 109.22 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Diode_SMD:D_SOD-123" (at 35.56 55.88 0)
+    (property "Footprint" "Diode_SMD:D_SOD-123" (at 175.26 110.49 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 35.56 55.88 0)
+    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 175.26 110.49 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Device" "D" (at 35.56 55.88 0)
+    (property "Sim.Device" "D" (at 175.26 110.49 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Pins" "1=K 2=A" (at 35.56 55.88 0)
+    (property "Sim.Pins" "1=K 2=A" (at 175.26 110.49 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 058b70fe-d382-46f6-8285-4c2003a0e99d))
-    (pin "2" (uuid 2ca91eff-b897-4ae7-8ffb-a7d1e5a90481))
+    (pin "1" (uuid bf5bac9f-275a-4f10-88a6-2018a8cbecdf))
+    (pin "2" (uuid a208a232-5991-4a43-94f3-bf99946852b9))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "D9") (unit 1)
+          (reference "D38") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Diode:1N4148") (at 104.14 73.66 270) (unit 1)
+  (symbol (lib_id "Diode:1N4148") (at 124.46 140.97 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
-    (uuid adebafea-3c3f-4aaa-a8d7-1a33fea7f290)
-    (property "Reference" "D20" (at 99.06 72.39 90)
+    (uuid a458ea56-ae87-4620-bc9e-8457d3c7c573)
+    (property "Reference" "D50" (at 129.54 142.24 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "1N4148" (at 93.98 74.93 90)
+    (property "Value" "1N4148" (at 134.62 139.7 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Diode_SMD:D_SOD-123" (at 104.14 73.66 0)
+    (property "Footprint" "Diode_SMD:D_SOD-123" (at 124.46 140.97 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 104.14 73.66 0)
+    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 124.46 140.97 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Device" "D" (at 104.14 73.66 0)
+    (property "Sim.Device" "D" (at 124.46 140.97 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Pins" "1=K 2=A" (at 104.14 73.66 0)
+    (property "Sim.Pins" "1=K 2=A" (at 124.46 140.97 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 4492a0cc-ee4b-423b-be8a-318195d721d0))
-    (pin "2" (uuid 7c969ce6-a10f-42e9-bea2-02daf3990fe5))
+    (pin "1" (uuid 5c7cb15d-62e2-465b-9fe6-66a71c2d1d28))
+    (pin "2" (uuid 4c568655-4239-44ce-b58c-ded0583e0f52))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "D20") (unit 1)
+          (reference "D50") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Diode:1N4148") (at 35.56 109.22 270) (unit 1)
+  (symbol (lib_id "Diode:1N4148") (at 124.46 64.77 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
-    (uuid ae0ae86d-03be-43ac-b332-a3f1441a8f55)
-    (property "Reference" "D33" (at 30.48 107.95 90)
+    (uuid a61a20ee-8281-404e-bfde-796660176b8d)
+    (property "Reference" "D11" (at 129.54 66.04 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "1N4148" (at 25.4 110.49 90)
+    (property "Value" "1N4148" (at 134.62 63.5 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Diode_SMD:D_SOD-123" (at 35.56 109.22 0)
+    (property "Footprint" "Diode_SMD:D_SOD-123" (at 124.46 64.77 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 35.56 109.22 0)
+    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 124.46 64.77 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Device" "D" (at 35.56 109.22 0)
+    (property "Sim.Device" "D" (at 124.46 64.77 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Pins" "1=K 2=A" (at 35.56 109.22 0)
+    (property "Sim.Pins" "1=K 2=A" (at 124.46 64.77 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 61af3199-b950-407b-ace0-eed71c3e5eea))
-    (pin "2" (uuid 82143f8a-defd-46bf-9a94-a00b93b6fe0c))
+    (pin "1" (uuid 859b6995-0419-4f33-b8c4-0d3489c0c5bb))
+    (pin "2" (uuid b3b82fd2-90c0-4579-9e89-a952b03741fc))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "D33") (unit 1)
+          (reference "D11") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Switch:SW_Push") (at 200.66 87.63 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid afd53d0d-8465-4028-bd37-c56b69171861)
-    (property "Reference" "SW32" (at 200.66 80.01 0)
-      (effects (font (size 1.27 1.27)))
+  (symbol (lib_id "Diode:1N4148") (at 149.86 140.97 90) (unit 1)
+    (in_bom yes) (on_board yes) (dnp no)
+    (uuid a67775d6-390c-46f4-909d-d84b4ef25c24)
+    (property "Reference" "D52" (at 154.94 142.24 90)
+      (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "SW_Push" (at 200.66 82.55 0)
-      (effects (font (size 1.27 1.27)))
+    (property "Value" "1N4148" (at 160.02 139.7 90)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Diode_SMD:D_SOD-123" (at 149.86 140.97 0)
+      (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 200.66 82.55 0)
+    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 149.86 140.97 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 200.66 82.55 0)
+    (property "Sim.Device" "D" (at 149.86 140.97 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 5f64f849-9ab2-425c-9a20-d8aa11b4f2f8))
-    (pin "2" (uuid 878de4c0-1815-4961-a846-5bdc7ea066e4))
+    (property "Sim.Pins" "1=K 2=A" (at 149.86 140.97 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 4ad8180a-1dae-4049-baa4-a5f3e371314f))
+    (pin "2" (uuid 062edcbd-cd4b-4731-99c9-9018e130d9b9))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "SW32") (unit 1)
+          (reference "D52") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Diode:1N4148") (at 58.42 162.56 270) (unit 1)
+  (symbol (lib_id "Diode:1N4148") (at 162.56 125.73 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
-    (uuid b04b7ea9-c2f1-4c3f-a693-af29c6f98e67)
-    (property "Reference" "D57" (at 53.34 161.29 90)
+    (uuid a82dca72-9bab-4299-9be5-5c7001742fb9)
+    (property "Reference" "D45" (at 167.64 127 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "1N4148" (at 48.26 163.83 90)
+    (property "Value" "1N4148" (at 172.72 124.46 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Diode_SMD:D_SOD-123" (at 58.42 162.56 0)
+    (property "Footprint" "Diode_SMD:D_SOD-123" (at 162.56 125.73 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 58.42 162.56 0)
+    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 162.56 125.73 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Device" "D" (at 58.42 162.56 0)
+    (property "Sim.Device" "D" (at 162.56 125.73 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Pins" "1=K 2=A" (at 58.42 162.56 0)
+    (property "Sim.Pins" "1=K 2=A" (at 162.56 125.73 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid a566f41d-17fc-442b-a20f-57198882fd03))
-    (pin "2" (uuid 41d0b47b-1736-46c7-9936-a6c2092b65bc))
+    (pin "1" (uuid 553adfbf-eabb-467f-a086-c25bebb2ed28))
+    (pin "2" (uuid 079c0af3-64a9-494c-a737-ff14c8302ab1))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "D57") (unit 1)
+          (reference "D45") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Connector:Conn_01x08_Socket") (at 120.65 13.97 90) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no)
-    (uuid b14e5b38-c5e1-4b26-bec8-ab8bec19e312)
-    (property "Reference" "J2" (at 133.35 15.24 90)
+  (symbol (lib_id "Switch:SW_Push") (at 154.94 152.4 0) (unit 1)
+    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
+    (uuid ab32895c-cd3b-4a30-8de1-e6146316953a)
+    (property "Reference" "SW60" (at 154.94 144.78 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "Conn_01x08_Socket" (at 140.97 17.78 90)
+    (property "Value" "SW_Push" (at 154.94 147.32 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "Connector_PinSocket_2.54mm:PinSocket_1x08_P2.54mm_Horizontal" (at 120.65 13.97 0)
+    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 154.94 147.32 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 120.65 13.97 0)
+    (property "Datasheet" "~" (at 154.94 147.32 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid f840f911-3586-4c54-9cec-31dc8a40a07c))
-    (pin "2" (uuid 79d9679c-c832-4dae-93aa-966e6f9e6a5b))
-    (pin "3" (uuid b3f5be76-1c1b-4ed3-bae2-e43c4e61fd58))
-    (pin "4" (uuid e7960946-7025-4a85-be4b-a7f03778a9da))
-    (pin "5" (uuid bbc8fb77-c490-4798-9987-9aca30f0ad60))
-    (pin "6" (uuid 778b79f3-c517-41fd-a075-1a18932838b6))
-    (pin "7" (uuid 57f6afc0-ddfc-4a24-995d-27526fe37841))
-    (pin "8" (uuid ee951103-f263-491b-8e2b-dfc4f6c2f9e8))
+    (pin "1" (uuid 2c81d3b5-e4eb-40d9-8b8b-0988e31ce115))
+    (pin "2" (uuid 68b639a4-126d-492e-9eb6-04b2f1ca5157))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "J2") (unit 1)
+          (reference "SW60") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Switch:SW_Push") (at 109.22 123.19 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid b150266a-54b4-4adf-84af-c439387d4f4e)
-    (property "Reference" "SW44" (at 109.22 115.57 0)
-      (effects (font (size 1.27 1.27)))
+  (symbol (lib_id "Diode:1N4148") (at 137.16 64.77 90) (unit 1)
+    (in_bom yes) (on_board yes) (dnp no)
+    (uuid b01b8e94-17fe-4a0b-b347-7be6a451130e)
+    (property "Reference" "D12" (at 142.24 66.04 90)
+      (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "SW_Push" (at 109.22 118.11 0)
-      (effects (font (size 1.27 1.27)))
+    (property "Value" "1N4148" (at 147.32 63.5 90)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Diode_SMD:D_SOD-123" (at 137.16 64.77 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 137.16 64.77 0)
+      (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 109.22 118.11 0)
+    (property "Sim.Device" "D" (at 137.16 64.77 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 109.22 118.11 0)
+    (property "Sim.Pins" "1=K 2=A" (at 137.16 64.77 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 4de433f6-07fc-4597-a4ed-c33618f1793d))
-    (pin "2" (uuid 8e0a6493-8c7a-4028-9066-495c642dceec))
+    (pin "1" (uuid 584b32ad-bf31-4755-9612-50e71f9722c5))
+    (pin "2" (uuid 5e7c39b7-54d7-4b8c-b9f1-d1c9d2f51c2b))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "SW44") (unit 1)
+          (reference "D12") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Diode:1N4148") (at 172.72 109.22 270) (unit 1)
+  (symbol (lib_id "Diode:1N4148") (at 137.16 140.97 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
-    (uuid b512093c-2816-4252-9e6d-0e1a5169cf65)
-    (property "Reference" "D39" (at 167.64 107.95 90)
+    (uuid b03fe2fc-a6ae-4228-b110-29caf0c49e70)
+    (property "Reference" "D51" (at 142.24 142.24 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "1N4148" (at 162.56 110.49 90)
+    (property "Value" "1N4148" (at 147.32 139.7 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Diode_SMD:D_SOD-123" (at 172.72 109.22 0)
+    (property "Footprint" "Diode_SMD:D_SOD-123" (at 137.16 140.97 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 172.72 109.22 0)
+    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 137.16 140.97 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Device" "D" (at 172.72 109.22 0)
+    (property "Sim.Device" "D" (at 137.16 140.97 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Pins" "1=K 2=A" (at 172.72 109.22 0)
+    (property "Sim.Pins" "1=K 2=A" (at 137.16 140.97 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 8ddff2c4-c217-4203-973f-6de42c9e89e0))
-    (pin "2" (uuid fecf0f3c-28d7-47de-a0fd-9dc624cc3fec))
+    (pin "1" (uuid 1276ce4f-cafa-47e1-b77c-2f335b19e312))
+    (pin "2" (uuid 4f648302-8f8b-455a-87ca-df5870ae226b))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "D39") (unit 1)
+          (reference "D51") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Diode:1N4148") (at 127 144.78 270) (unit 1)
+  (symbol (lib_id "Diode:1N4148") (at 99.06 140.97 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
-    (uuid b5a6ebf1-912e-4308-a01b-fe25ac4ba072)
-    (property "Reference" "D53" (at 121.92 143.51 90)
+    (uuid b093f74d-3434-4a1c-bf8f-6183bc68e4ca)
+    (property "Reference" "D48" (at 104.14 142.24 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "1N4148" (at 116.84 146.05 90)
+    (property "Value" "1N4148" (at 109.22 139.7 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Diode_SMD:D_SOD-123" (at 127 144.78 0)
+    (property "Footprint" "Diode_SMD:D_SOD-123" (at 99.06 140.97 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 127 144.78 0)
+    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 99.06 140.97 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Device" "D" (at 127 144.78 0)
+    (property "Sim.Device" "D" (at 99.06 140.97 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Pins" "1=K 2=A" (at 127 144.78 0)
+    (property "Sim.Pins" "1=K 2=A" (at 99.06 140.97 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 3f1772a7-0b36-42b5-a86e-b09ce8e75c80))
-    (pin "2" (uuid fc9e9578-95db-4ba0-9f56-bc2977bf7a79))
+    (pin "1" (uuid 69b6bc2d-85e2-4f1e-880c-68431987f6ea))
+    (pin "2" (uuid 7a4a599b-9758-4297-8294-d0023e6cad26))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "D53") (unit 1)
+          (reference "D48") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Diode:1N4148") (at 127 91.44 270) (unit 1)
+  (symbol (lib_id "Connector:Conn_01x08_Socket") (at 140.97 24.13 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
-    (uuid b5cd210f-9798-440b-bdfc-0dfb6b9110c3)
-    (property "Reference" "D29" (at 121.92 90.17 90)
-      (effects (font (size 1.27 1.27)) (justify left))
+    (uuid b14e5b38-c5e1-4b26-bec8-ab8bec19e312)
+    (property "Reference" "J2" (at 133.35 19.05 90)
+      (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "1N4148" (at 116.84 92.71 90)
-      (effects (font (size 1.27 1.27)) (justify left))
+    (property "Value" "Conn_01x08_Socket" (at 142.24 21.59 90)
+      (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "Diode_SMD:D_SOD-123" (at 127 91.44 0)
+    (property "Footprint" "Connector_PinSocket_2.54mm:PinSocket_1x08_P2.54mm_Horizontal" (at 140.97 24.13 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 127 91.44 0)
+    (property "Datasheet" "~" (at 140.97 24.13 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Device" "D" (at 127 91.44 0)
+    (pin "1" (uuid f840f911-3586-4c54-9cec-31dc8a40a07c))
+    (pin "2" (uuid 79d9679c-c832-4dae-93aa-966e6f9e6a5b))
+    (pin "3" (uuid b3f5be76-1c1b-4ed3-bae2-e43c4e61fd58))
+    (pin "4" (uuid e7960946-7025-4a85-be4b-a7f03778a9da))
+    (pin "5" (uuid bbc8fb77-c490-4798-9987-9aca30f0ad60))
+    (pin "6" (uuid 778b79f3-c517-41fd-a075-1a18932838b6))
+    (pin "7" (uuid 57f6afc0-ddfc-4a24-995d-27526fe37841))
+    (pin "8" (uuid ee951103-f263-491b-8e2b-dfc4f6c2f9e8))
+    (instances
+      (project "xantronix-z32"
+        (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
+          (reference "J2") (unit 1)
+        )
+      )
+    )
+  )
+
+  (symbol (lib_id "Switch:SW_Push") (at 193.04 76.2 0) (unit 1)
+    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
+    (uuid b6752ca5-6428-4e1a-a772-05cb44d23bc7)
+    (property "Reference" "SW24" (at 193.04 68.58 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Value" "SW_Push" (at 193.04 71.12 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 193.04 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Pins" "1=K 2=A" (at 127 91.44 0)
+    (property "Datasheet" "~" (at 193.04 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 08b04062-a865-4f82-a8e2-ff11c8fc8746))
-    (pin "2" (uuid 81fe7a24-01fe-4617-b046-a28f7da7dfa5))
+    (pin "1" (uuid 121d3a5e-5c7a-43fd-8c63-2cf9109a1005))
+    (pin "2" (uuid cbb32b4d-aec5-454e-af17-cb4ba409150c))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "D29") (unit 1)
+          (reference "SW24") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Switch:SW_Push") (at 86.36 158.75 0) (unit 1)
+  (symbol (lib_id "Switch:SW_Push") (at 142.24 121.92 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid b8f30f5d-817c-4096-887a-8615c8302be7)
-    (property "Reference" "SW58" (at 86.36 151.13 0)
+    (uuid b709237e-27eb-4613-b85f-2c7f18c83220)
+    (property "Reference" "SW43" (at 142.24 114.3 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "SW_Push" (at 86.36 153.67 0)
+    (property "Value" "SW_Push" (at 142.24 116.84 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 86.36 153.67 0)
+    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 142.24 116.84 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 86.36 153.67 0)
+    (property "Datasheet" "~" (at 142.24 116.84 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 9a0b773b-ae94-4b03-916e-8213bf740642))
-    (pin "2" (uuid a0d0865f-1dab-4252-b456-7931b2619016))
+    (pin "1" (uuid 7bdaf07e-b2d8-41ef-95fe-926959dfa222))
+    (pin "2" (uuid d75e4630-e0b3-4d96-bae2-c366f51d5e6e))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "SW58") (unit 1)
+          (reference "SW43") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Diode:1N4148") (at 127 38.1 270) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no)
-    (uuid b9f087c5-ffd9-4d6a-8dd2-5c528a8a82ff)
-    (property "Reference" "D5" (at 121.92 36.83 90)
-      (effects (font (size 1.27 1.27)) (justify left))
+  (symbol (lib_id "Switch:SW_Push") (at 104.14 106.68 0) (unit 1)
+    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
+    (uuid baed0053-f464-4f66-9d48-db131a091a15)
+    (property "Reference" "SW32" (at 104.14 99.06 0)
+      (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "1N4148" (at 116.84 39.37 90)
-      (effects (font (size 1.27 1.27)) (justify left))
+    (property "Value" "SW_Push" (at 104.14 101.6 0)
+      (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "Diode_SMD:D_SOD-123" (at 127 38.1 0)
+    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 104.14 101.6 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 127 38.1 0)
+    (property "Datasheet" "~" (at 104.14 101.6 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Device" "D" (at 127 38.1 0)
+    (pin "1" (uuid 6a081563-62da-446b-bd0c-e129ccc0c594))
+    (pin "2" (uuid d483f3a4-72e3-42c7-b3c4-b493f205913f))
+    (instances
+      (project "xantronix-z32"
+        (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
+          (reference "SW32") (unit 1)
+        )
+      )
+    )
+  )
+
+  (symbol (lib_id "Switch:SW_Push") (at 129.54 91.44 0) (unit 1)
+    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
+    (uuid bb93e82b-f405-4fdc-a95d-00a5968d486b)
+    (property "Reference" "SW27" (at 129.54 83.82 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Value" "SW_Push" (at 129.54 86.36 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 129.54 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Pins" "1=K 2=A" (at 127 38.1 0)
+    (property "Datasheet" "~" (at 129.54 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid e58cef45-f7e5-4e10-b31c-e7252b194223))
-    (pin "2" (uuid 90fd3abd-6cb5-4dfd-bff4-1f80425a4a2d))
+    (pin "1" (uuid d6438d33-1f98-4466-8010-01423bd72e20))
+    (pin "2" (uuid f5fb3739-c870-4403-8465-daff30fc50c6))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "D5") (unit 1)
+          (reference "SW27") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Diode:1N4148") (at 58.42 91.44 270) (unit 1)
+  (symbol (lib_id "Diode:1N4148") (at 175.26 125.73 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
-    (uuid bb47617c-0fe0-4107-85f6-8277f3ddaa64)
-    (property "Reference" "D26" (at 53.34 90.17 90)
+    (uuid c2287a58-6e2a-4343-94f0-839e8e8d4bf9)
+    (property "Reference" "D46" (at 180.34 127 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "1N4148" (at 48.26 92.71 90)
+    (property "Value" "1N4148" (at 185.42 124.46 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Diode_SMD:D_SOD-123" (at 58.42 91.44 0)
+    (property "Footprint" "Diode_SMD:D_SOD-123" (at 175.26 125.73 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 58.42 91.44 0)
+    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 175.26 125.73 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Device" "D" (at 58.42 91.44 0)
+    (property "Sim.Device" "D" (at 175.26 125.73 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Pins" "1=K 2=A" (at 58.42 91.44 0)
+    (property "Sim.Pins" "1=K 2=A" (at 175.26 125.73 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 01b89196-2b3b-4f36-b520-d656a2d42d9b))
-    (pin "2" (uuid 9e05ffb2-2565-4229-965e-7449d89fc167))
+    (pin "1" (uuid b2f787a6-fc17-4251-bab6-647a2f15fa70))
+    (pin "2" (uuid 667001ca-013a-445c-9dac-70e23f5633f6))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "D26") (unit 1)
+          (reference "D46") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Switch:SW_Push") (at 40.64 87.63 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid bb5ca01c-fc8b-4d30-a0c8-370eea6d521a)
-    (property "Reference" "SW25" (at 40.64 80.01 0)
-      (effects (font (size 1.27 1.27)))
+  (symbol (lib_id "Diode:1N4148") (at 175.26 140.97 90) (unit 1)
+    (in_bom yes) (on_board yes) (dnp no)
+    (uuid c2bb8cfc-5bf2-401a-9935-47aaa6519d17)
+    (property "Reference" "D54" (at 180.34 142.24 90)
+      (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "SW_Push" (at 40.64 82.55 0)
-      (effects (font (size 1.27 1.27)))
+    (property "Value" "1N4148" (at 185.42 139.7 90)
+      (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.75u_PCB" (at 40.64 82.55 0)
+    (property "Footprint" "Diode_SMD:D_SOD-123" (at 175.26 140.97 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 40.64 82.55 0)
+    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 175.26 140.97 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid d30ccc7d-e5ff-4eb6-a9b4-f577847b7738))
-    (pin "2" (uuid a7291aae-5cd7-481f-a2bf-7a1e30436e33))
+    (property "Sim.Device" "D" (at 175.26 140.97 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Sim.Pins" "1=K 2=A" (at 175.26 140.97 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 3d948dea-08fc-4944-916f-23d623f95c61))
+    (pin "2" (uuid d2934f89-d92e-497b-975b-0cf659e58a3e))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "SW25") (unit 1)
+          (reference "D54") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Switch:SW_Push") (at 40.64 52.07 0) (unit 1)
+  (symbol (lib_id "Switch:SW_Push") (at 154.94 76.2 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid c0ddd1e7-2424-4937-a313-6c91b8ba40de)
-    (property "Reference" "SW9" (at 40.64 44.45 0)
+    (uuid c2ed0e55-e7ca-451a-9eb7-76a77b9e7711)
+    (property "Reference" "SW21" (at 154.94 68.58 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "SW_Push" (at 40.64 46.99 0)
+    (property "Value" "SW_Push" (at 154.94 71.12 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 40.64 46.99 0)
+    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 154.94 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 40.64 46.99 0)
+    (property "Datasheet" "~" (at 154.94 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 42e402de-6ed5-4ae6-8208-a6c044f1b06e))
-    (pin "2" (uuid d9451234-91f1-4e46-a63e-fe10fc24a443))
+    (pin "1" (uuid 0107c36a-28ff-4c5d-a13d-fc2cd01894f2))
+    (pin "2" (uuid 3535d6c7-3ea7-459c-ad4f-783590d5db52))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "SW9") (unit 1)
+          (reference "SW21") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Switch:SW_Push") (at 109.22 140.97 0) (unit 1)
+  (symbol (lib_id "Switch:SW_Push") (at 167.64 60.96 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid c22441b9-97c5-4d44-b4c5-2db8cf50626d)
-    (property "Reference" "SW52" (at 109.22 133.35 0)
+    (uuid c395cb45-14f0-4205-ab3a-4ff15c7ab0c6)
+    (property "Reference" "SW14" (at 167.64 53.34 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "SW_Push" (at 109.22 135.89 0)
+    (property "Value" "SW_Push" (at 167.64 55.88 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 109.22 135.89 0)
+    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 167.64 55.88 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 109.22 135.89 0)
+    (property "Datasheet" "~" (at 167.64 55.88 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid b9838563-c15b-4757-b5f3-43ab572734f1))
-    (pin "2" (uuid aad35f26-798a-4198-b32b-895336fce64b))
+    (pin "1" (uuid 368e9d26-36cc-469e-a86e-4ac23482e32e))
+    (pin "2" (uuid 20f0bee0-67b2-4c9a-99f6-d67c6a0995a6))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "SW52") (unit 1)
+          (reference "SW14") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Switch:SW_Push") (at 154.94 158.75 0) (unit 1)
+  (symbol (lib_id "Switch:SW_Push") (at 180.34 91.44 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid c2742b7e-afae-4012-8356-adb74663d8e9)
-    (property "Reference" "SW61" (at 154.94 151.13 0)
+    (uuid c3d72692-ab11-40c7-a981-70c1f17ae289)
+    (property "Reference" "SW31" (at 180.34 83.82 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "SW_Push" (at 154.94 153.67 0)
+    (property "Value" "SW_Push" (at 180.34 86.36 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 154.94 153.67 0)
+    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 180.34 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 154.94 153.67 0)
+    (property "Datasheet" "~" (at 180.34 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 500f8c10-2989-4283-9c92-16a2968c3c29))
-    (pin "2" (uuid 873f0557-184f-4ec3-b821-1d4606fbbbc9))
+    (pin "1" (uuid a69ee728-5a8d-4b09-bd80-e040e1b3f37b))
+    (pin "2" (uuid bb8f6aa4-0e48-488d-a8f5-3ac36053deca))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "SW61") (unit 1)
+          (reference "SW31") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Switch:SW_Push") (at 154.94 87.63 0) (unit 1)
+  (symbol (lib_id "Switch:SW_Push") (at 116.84 152.4 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid c32f8b44-8c14-4546-9e37-f296758a59fb)
-    (property "Reference" "SW30" (at 154.94 80.01 0)
+    (uuid c45bb3a7-317b-40b1-bd65-109c2d35b917)
+    (property "Reference" "SW57" (at 116.84 144.78 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "SW_Push" (at 154.94 82.55 0)
+    (property "Value" "SW_Push" (at 116.84 147.32 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 154.94 82.55 0)
+    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 116.84 147.32 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 154.94 82.55 0)
+    (property "Datasheet" "~" (at 116.84 147.32 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 614c5ddb-8ba5-435a-9249-8e9b6ac1875e))
-    (pin "2" (uuid b076185d-3e67-4aa3-83af-1bb1fbf331da))
+    (pin "1" (uuid ba2fbf48-5ab6-42be-ab5c-85eb9fd88a9f))
+    (pin "2" (uuid a08d2cd2-d146-4020-b7c6-cb68e6973ec7))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "SW30") (unit 1)
+          (reference "SW57") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Diode:1N4148") (at 195.58 38.1 270) (unit 1)
+  (symbol (lib_id "Diode:1N4148") (at 137.16 156.21 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
-    (uuid c48ab5a7-f0c1-4235-ba4e-b85c5c848929)
-    (property "Reference" "D8" (at 190.5 36.83 90)
+    (uuid c52a8c28-511a-4533-822a-a7d6a29a1f36)
+    (property "Reference" "D59" (at 142.24 157.48 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "1N4148" (at 185.42 39.37 90)
+    (property "Value" "1N4148" (at 147.32 154.94 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Diode_SMD:D_SOD-123" (at 195.58 38.1 0)
+    (property "Footprint" "Diode_SMD:D_SOD-123" (at 137.16 156.21 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 195.58 38.1 0)
+    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 137.16 156.21 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Device" "D" (at 195.58 38.1 0)
+    (property "Sim.Device" "D" (at 137.16 156.21 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Pins" "1=K 2=A" (at 195.58 38.1 0)
+    (property "Sim.Pins" "1=K 2=A" (at 137.16 156.21 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 73279323-b2d2-4d33-af24-b99c91943690))
-    (pin "2" (uuid ea17fce8-d335-4f24-85e1-7997057ea261))
+    (pin "1" (uuid b6a1d747-5319-435f-8dec-2e6b6ae9eed1))
+    (pin "2" (uuid 9a709ac3-b4c8-438e-9268-6e10157c3950))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "D8") (unit 1)
+          (reference "D59") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Switch:SW_Push") (at 132.08 123.19 0) (unit 1)
+  (symbol (lib_id "Switch:SW_Push") (at 167.64 45.72 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid c53c57b6-040c-4509-afcd-ac3814d75aa5)
-    (property "Reference" "SW45" (at 132.08 115.57 0)
+    (uuid caab852b-3488-44c7-b572-57600b824e30)
+    (property "Reference" "SW6" (at 167.64 38.1 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "SW_Push" (at 132.08 118.11 0)
+    (property "Value" "SW_Push" (at 167.64 40.64 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 132.08 118.11 0)
+    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 167.64 40.64 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 132.08 118.11 0)
+    (property "Datasheet" "~" (at 167.64 40.64 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid e22eea8c-8f2c-43bb-8d73-832dbc4adfef))
-    (pin "2" (uuid 56703b0e-b4be-4baf-ab12-a116cdb6a7b4))
+    (pin "1" (uuid c2c44d87-6d38-46ef-8dbb-8efd44d035bf))
+    (pin "2" (uuid 70dbfe87-b6a9-4141-9ef2-751104d5b0c1))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "SW45") (unit 1)
+          (reference "SW6") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Diode:1N4148") (at 35.56 73.66 270) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no)
-    (uuid c7f146eb-e7de-4fd3-9ef6-5a950923aed2)
-    (property "Reference" "D17" (at 30.48 72.39 90)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "1N4148" (at 25.4 74.93 90)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "Diode_SMD:D_SOD-123" (at 35.56 73.66 0)
-      (effects (font (size 1.27 1.27)) hide)
+  (symbol (lib_id "Switch:SW_Push") (at 180.34 137.16 0) (unit 1)
+    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
+    (uuid cacec6bd-a2af-4d16-9a24-063ed221e6c5)
+    (property "Reference" "SW54" (at 180.34 129.54 0)
+      (effects (font (size 1.27 1.27)))
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 35.56 73.66 0)
-      (effects (font (size 1.27 1.27)) hide)
+    (property "Value" "SW_Push" (at 180.34 132.08 0)
+      (effects (font (size 1.27 1.27)))
     )
-    (property "Sim.Device" "D" (at 35.56 73.66 0)
+    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 180.34 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Pins" "1=K 2=A" (at 35.56 73.66 0)
+    (property "Datasheet" "~" (at 180.34 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid e9428e8c-d2a5-490b-ab79-a5fef57dd5a1))
-    (pin "2" (uuid eda5b843-6ca5-427c-8798-87cef954223f))
+    (pin "1" (uuid 122b772f-b7d7-4bf3-af2c-5d8ff70c2b14))
+    (pin "2" (uuid a1eb2f75-ab8f-40f8-bb5c-b278548d6474))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "D17") (unit 1)
+          (reference "SW54") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Switch:SW_Push") (at 177.8 69.85 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid c9b0db19-e9a1-4572-b67a-906ff145f290)
-    (property "Reference" "SW23" (at 177.8 62.23 0)
-      (effects (font (size 1.27 1.27)))
+  (symbol (lib_id "Diode:1N4148") (at 137.16 49.53 90) (unit 1)
+    (in_bom yes) (on_board yes) (dnp no)
+    (uuid cce3e395-07bc-4d33-9e8a-e501d2858cac)
+    (property "Reference" "D4" (at 142.24 50.8 90)
+      (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "SW_Push" (at 177.8 64.77 0)
-      (effects (font (size 1.27 1.27)))
+    (property "Value" "1N4148" (at 147.32 48.26 90)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Diode_SMD:D_SOD-123" (at 137.16 49.53 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 137.16 49.53 0)
+      (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 177.8 64.77 0)
+    (property "Sim.Device" "D" (at 137.16 49.53 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 177.8 64.77 0)
+    (property "Sim.Pins" "1=K 2=A" (at 137.16 49.53 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid bdbb8f29-894f-416b-a583-8fcc00e9e277))
-    (pin "2" (uuid 2ea34c1c-8546-4ffc-8a6b-be6d6058f74d))
+    (pin "1" (uuid 7b1f4e26-035b-4a1a-9c45-bdcadff5ba59))
+    (pin "2" (uuid 42e8fdbf-f62b-4dea-8def-7c5a748aa8a2))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "SW23") (unit 1)
+          (reference "D4") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Diode:1N4148") (at 104.14 127 270) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no)
-    (uuid ca546886-4d59-44b9-99d6-0678deca045a)
-    (property "Reference" "D44" (at 99.06 125.73 90)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "1N4148" (at 93.98 128.27 90)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "Diode_SMD:D_SOD-123" (at 104.14 127 0)
-      (effects (font (size 1.27 1.27)) hide)
+  (symbol (lib_id "Switch:SW_Push") (at 104.14 91.44 0) (unit 1)
+    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
+    (uuid ced96de0-056e-47c5-b41f-131429d6ca9b)
+    (property "Reference" "SW25" (at 104.14 83.82 0)
+      (effects (font (size 1.27 1.27)))
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 104.14 127 0)
-      (effects (font (size 1.27 1.27)) hide)
+    (property "Value" "SW_Push" (at 104.14 86.36 0)
+      (effects (font (size 1.27 1.27)))
     )
-    (property "Sim.Device" "D" (at 104.14 127 0)
+    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.25u_PCB" (at 104.14 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Pins" "1=K 2=A" (at 104.14 127 0)
+    (property "Datasheet" "~" (at 104.14 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 397b99f6-ab57-4a20-bf17-05f659f7e0f1))
-    (pin "2" (uuid 67f73d03-8f1d-40c4-86a6-eeb772cc6c09))
+    (pin "1" (uuid e0639a35-f953-4de0-9f80-81baa4f08755))
+    (pin "2" (uuid 68ea367e-e270-48a8-8527-24a379a79aa0))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "D44") (unit 1)
+          (reference "SW25") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Switch:SW_Push") (at 154.94 34.29 0) (unit 1)
+  (symbol (lib_id "Switch:SW_Push") (at 104.14 76.2 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid d054aae8-7274-45d8-8444-8823c85a2c61)
-    (property "Reference" "SW6" (at 154.94 26.67 0)
+    (uuid d17c26c2-abfa-4826-930a-c0200af47e5c)
+    (property "Reference" "SW17" (at 104.14 68.58 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "SW_Push" (at 154.94 29.21 0)
+    (property "Value" "SW_Push" (at 104.14 71.12 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 154.94 29.21 0)
+    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 104.14 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 154.94 29.21 0)
+    (property "Datasheet" "~" (at 104.14 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 240c0e93-03e1-4924-902e-eb3e3881ea9f))
-    (pin "2" (uuid a73060ee-d676-494b-ad4c-10a23c8a75d8))
+    (pin "1" (uuid 048fe5a6-8307-4a77-a41b-4c846265cf60))
+    (pin "2" (uuid b6a078fc-b3f2-42c6-9285-cc8dab7f068a))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "SW6") (unit 1)
+          (reference "SW17") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Switch:SW_Push") (at 200.66 69.85 0) (unit 1)
+  (symbol (lib_id "Switch:SW_Push") (at 116.84 91.44 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid d22f7904-94c7-4339-b6f7-ec2e273cce55)
-    (property "Reference" "SW24" (at 200.66 62.23 0)
+    (uuid d2dcbac1-343c-4de3-9097-e36bdf799165)
+    (property "Reference" "SW26" (at 116.84 83.82 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "SW_Push" (at 200.66 64.77 0)
+    (property "Value" "SW_Push" (at 116.84 86.36 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 200.66 64.77 0)
+    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 116.84 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 200.66 64.77 0)
+    (property "Datasheet" "~" (at 116.84 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid ff839b89-f003-461f-bee3-14f8cf5ee03f))
-    (pin "2" (uuid 0c367767-a2c6-42f7-bd7a-77baf22b8be4))
+    (pin "1" (uuid ae5bf843-a03f-466b-a285-34dc5a108a4c))
+    (pin "2" (uuid c3ec5143-efb1-4c8e-b802-50abbec65a78))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "SW24") (unit 1)
+          (reference "SW26") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Diode:1N4148") (at 149.86 38.1 270) (unit 1)
+  (symbol (lib_id "Diode:1N4148") (at 124.46 125.73 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
-    (uuid d334ef21-20c8-44c0-92ed-8127294c42e9)
-    (property "Reference" "D6" (at 144.78 36.83 90)
+    (uuid d7525d47-5d24-47f5-9dcb-c57665736b47)
+    (property "Reference" "D42" (at 129.54 127 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "1N4148" (at 139.7 39.37 90)
+    (property "Value" "1N4148" (at 134.62 124.46 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Diode_SMD:D_SOD-123" (at 149.86 38.1 0)
+    (property "Footprint" "Diode_SMD:D_SOD-123" (at 124.46 125.73 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 149.86 38.1 0)
+    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 124.46 125.73 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Device" "D" (at 149.86 38.1 0)
+    (property "Sim.Device" "D" (at 124.46 125.73 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Pins" "1=K 2=A" (at 149.86 38.1 0)
+    (property "Sim.Pins" "1=K 2=A" (at 124.46 125.73 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 8e05b093-d684-4523-b38a-6ae9309b5cb8))
-    (pin "2" (uuid 0c84de20-9bba-487a-9ca6-a0f32aa3071b))
+    (pin "1" (uuid 2fb6a9d3-dfb1-4351-8533-3a3952d66a90))
+    (pin "2" (uuid ffc5a76b-0fe0-459a-83a0-a0f2ee8af6b5))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "D6") (unit 1)
+          (reference "D42") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Diode:1N4148") (at 172.72 144.78 270) (unit 1)
+  (symbol (lib_id "Diode:1N4148") (at 124.46 80.01 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
-    (uuid d3f94644-5edb-47d4-9f54-0c25e67ed3d8)
-    (property "Reference" "D55" (at 167.64 143.51 90)
+    (uuid d78915f1-8534-40ab-bbe4-be45fb3de565)
+    (property "Reference" "D19" (at 129.54 81.28 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "1N4148" (at 162.56 146.05 90)
+    (property "Value" "1N4148" (at 134.62 78.74 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Diode_SMD:D_SOD-123" (at 172.72 144.78 0)
+    (property "Footprint" "Diode_SMD:D_SOD-123" (at 124.46 80.01 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 172.72 144.78 0)
+    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 124.46 80.01 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Device" "D" (at 172.72 144.78 0)
+    (property "Sim.Device" "D" (at 124.46 80.01 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Pins" "1=K 2=A" (at 172.72 144.78 0)
+    (property "Sim.Pins" "1=K 2=A" (at 124.46 80.01 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 5ee69301-d735-4cb6-8da9-20b9812e10dc))
-    (pin "2" (uuid 330ab468-4aab-4776-9148-8b86c2a3527f))
+    (pin "1" (uuid b2122970-40f0-470f-8d12-f895269314a8))
+    (pin "2" (uuid 7ad1d8e4-8265-4386-8aa5-e926847f4a52))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "D55") (unit 1)
+          (reference "D19") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Diode:1N4148") (at 81.28 127 270) (unit 1)
+  (symbol (lib_id "Diode:1N4148") (at 175.26 95.25 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
-    (uuid d4861e79-c3bf-4d8e-a4c2-1faffb75c11a)
-    (property "Reference" "D43" (at 76.2 125.73 90)
+    (uuid d91c025e-4ca4-400c-8753-11d7aae35b12)
+    (property "Reference" "D31" (at 180.34 96.52 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "1N4148" (at 71.12 128.27 90)
+    (property "Value" "1N4148" (at 185.42 93.98 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Diode_SMD:D_SOD-123" (at 81.28 127 0)
+    (property "Footprint" "Diode_SMD:D_SOD-123" (at 175.26 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 81.28 127 0)
+    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 175.26 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Device" "D" (at 81.28 127 0)
+    (property "Sim.Device" "D" (at 175.26 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Pins" "1=K 2=A" (at 81.28 127 0)
+    (property "Sim.Pins" "1=K 2=A" (at 175.26 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 6bdfd438-ef46-496d-b962-ad3cb0f9feef))
-    (pin "2" (uuid f47db76d-8089-4fae-8285-f15764aa8e07))
+    (pin "1" (uuid eb390a97-57fa-4b99-8ff6-b65bd5da87f6))
+    (pin "2" (uuid afb7dc71-8c71-4b03-99cc-87218030b7b2))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "D43") (unit 1)
+          (reference "D31") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Diode:1N4148") (at 58.42 73.66 270) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no)
-    (uuid d493f114-ef94-4098-9fc8-b3e1767ef0ab)
-    (property "Reference" "D18" (at 53.34 72.39 90)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "1N4148" (at 48.26 74.93 90)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "Diode_SMD:D_SOD-123" (at 58.42 73.66 0)
-      (effects (font (size 1.27 1.27)) hide)
+  (symbol (lib_id "Switch:SW_Push") (at 104.14 121.92 0) (unit 1)
+    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
+    (uuid d9b38236-426d-43c9-9877-14be994b5e1e)
+    (property "Reference" "SW40" (at 104.14 114.3 0)
+      (effects (font (size 1.27 1.27)))
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 58.42 73.66 0)
-      (effects (font (size 1.27 1.27)) hide)
+    (property "Value" "SW_Push" (at 104.14 116.84 0)
+      (effects (font (size 1.27 1.27)))
     )
-    (property "Sim.Device" "D" (at 58.42 73.66 0)
+    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.75u_PCB" (at 104.14 116.84 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Pins" "1=K 2=A" (at 58.42 73.66 0)
+    (property "Datasheet" "~" (at 104.14 116.84 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid b48b8b60-f3c0-45f8-9c13-d7056b025377))
-    (pin "2" (uuid 5c71e39e-c47d-4881-8ead-7cdb8495487d))
+    (pin "1" (uuid e93fece8-8357-41dc-b029-639c3dbee6e9))
+    (pin "2" (uuid d3245027-26a2-476b-ab35-ca62c9e78a69))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "D18") (unit 1)
+          (reference "SW40") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Diode:1N4148") (at 58.42 109.22 270) (unit 1)
+  (symbol (lib_id "Diode:1N4148") (at 162.56 49.53 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
-    (uuid d797d643-c12d-416e-b62b-4f23e748e813)
-    (property "Reference" "D34" (at 53.34 107.95 90)
+    (uuid da7dbfd1-6094-4c8c-998d-109154e530a6)
+    (property "Reference" "D6" (at 167.64 50.8 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "1N4148" (at 48.26 110.49 90)
+    (property "Value" "1N4148" (at 172.72 48.26 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Diode_SMD:D_SOD-123" (at 58.42 109.22 0)
+    (property "Footprint" "Diode_SMD:D_SOD-123" (at 162.56 49.53 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 58.42 109.22 0)
+    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 162.56 49.53 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Device" "D" (at 58.42 109.22 0)
+    (property "Sim.Device" "D" (at 162.56 49.53 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Pins" "1=K 2=A" (at 58.42 109.22 0)
+    (property "Sim.Pins" "1=K 2=A" (at 162.56 49.53 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 34f99a2b-e8bd-422c-8f81-3ac017a5ebe1))
-    (pin "2" (uuid ca3fd0be-ccbc-43d6-9c70-7e2ad20801d0))
+    (pin "1" (uuid 939fb09a-7378-4927-9fa0-104071574848))
+    (pin "2" (uuid 7aa04ae8-235b-478b-8d58-9171163a6dd0))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "D34") (unit 1)
+          (reference "D6") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Switch:SW_Push") (at 200.66 34.29 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid dd13baa2-690a-4d15-8899-a39a9aa27394)
-    (property "Reference" "SW8" (at 200.66 26.67 0)
-      (effects (font (size 1.27 1.27)))
+  (symbol (lib_id "Diode:1N4148") (at 111.76 64.77 90) (unit 1)
+    (in_bom yes) (on_board yes) (dnp no)
+    (uuid dbfcc61b-a63f-42de-b8a2-00b65cb73fa3)
+    (property "Reference" "D10" (at 116.84 66.04 90)
+      (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "SW_Push" (at 200.66 29.21 0)
-      (effects (font (size 1.27 1.27)))
+    (property "Value" "1N4148" (at 121.92 63.5 90)
+      (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 200.66 29.21 0)
+    (property "Footprint" "Diode_SMD:D_SOD-123" (at 111.76 64.77 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 200.66 29.21 0)
+    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 111.76 64.77 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid f4784bb4-5dfe-4e8a-9c3e-d598c242497a))
-    (pin "2" (uuid 3e1efa6b-c082-483e-b9fc-5909fbfdb3b5))
+    (property "Sim.Device" "D" (at 111.76 64.77 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Sim.Pins" "1=K 2=A" (at 111.76 64.77 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 632c219a-0d26-40ca-b330-a9d6f899dc2d))
+    (pin "2" (uuid b906a97e-9072-4be7-b19c-2da1be8e9fcd))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "SW8") (unit 1)
+          (reference "D10") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Switch:SW_Push") (at 63.5 140.97 0) (unit 1)
+  (symbol (lib_id "Switch:SW_Push") (at 180.34 76.2 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid dea6b2f7-bfaf-4459-bc9b-ec6265a250a6)
-    (property "Reference" "SW50" (at 63.5 133.35 0)
+    (uuid dd5fe8ac-f424-4618-80be-059a11b3b3e2)
+    (property "Reference" "SW23" (at 180.34 68.58 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "SW_Push" (at 63.5 135.89 0)
+    (property "Value" "SW_Push" (at 180.34 71.12 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 63.5 135.89 0)
+    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 180.34 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 63.5 135.89 0)
+    (property "Datasheet" "~" (at 180.34 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 0e7649ed-d89e-408a-9341-d369e8fecac6))
-    (pin "2" (uuid 420f71ea-3409-48cc-9498-3c701ecb6113))
+    (pin "1" (uuid 883d94c9-366d-4467-82d3-ebab052d19bd))
+    (pin "2" (uuid 8e1188bb-a8a0-43f2-94f6-5b300b0cf541))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "SW50") (unit 1)
+          (reference "SW23") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Diode:1N4148") (at 104.14 91.44 270) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no)
-    (uuid df18a2d3-928e-445b-ae26-26fa7a5b3ee0)
-    (property "Reference" "D28" (at 99.06 90.17 90)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "1N4148" (at 93.98 92.71 90)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "Diode_SMD:D_SOD-123" (at 104.14 91.44 0)
-      (effects (font (size 1.27 1.27)) hide)
+  (symbol (lib_id "Switch:SW_Push") (at 129.54 76.2 0) (unit 1)
+    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
+    (uuid e00fae27-8bca-4817-91f1-a5849fc03048)
+    (property "Reference" "SW19" (at 129.54 68.58 0)
+      (effects (font (size 1.27 1.27)))
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 104.14 91.44 0)
-      (effects (font (size 1.27 1.27)) hide)
+    (property "Value" "SW_Push" (at 129.54 71.12 0)
+      (effects (font (size 1.27 1.27)))
     )
-    (property "Sim.Device" "D" (at 104.14 91.44 0)
+    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 129.54 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Pins" "1=K 2=A" (at 104.14 91.44 0)
+    (property "Datasheet" "~" (at 129.54 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid b6aff9f2-295b-4be4-8899-974a7ece7817))
-    (pin "2" (uuid 3ec6e3f3-3b0a-4556-a8dd-980b87deca62))
+    (pin "1" (uuid de7d8658-c399-47da-aa68-b18c1a360751))
+    (pin "2" (uuid 34dca049-a20a-4db9-af76-fd8ce57afb6b))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "D28") (unit 1)
+          (reference "SW19") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Switch:SW_Push") (at 63.5 52.07 0) (unit 1)
+  (symbol (lib_id "Switch:SW_Push") (at 129.54 137.16 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid e139d123-71d6-4e24-a415-f2ae39c8df80)
-    (property "Reference" "SW10" (at 63.5 44.45 0)
+    (uuid e0213e79-6e5b-4edc-b73a-af0e9b76853f)
+    (property "Reference" "SW50" (at 129.54 129.54 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "SW_Push" (at 63.5 46.99 0)
+    (property "Value" "SW_Push" (at 129.54 132.08 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 63.5 46.99 0)
+    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 129.54 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 63.5 46.99 0)
+    (property "Datasheet" "~" (at 129.54 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 81b3db60-46ac-4bfa-988a-d1629bfb7cea))
-    (pin "2" (uuid 9bfdc8e5-d628-4aec-829b-e3086d50f6db))
+    (pin "1" (uuid 25641491-9914-44bf-8db2-c58e01cb1159))
+    (pin "2" (uuid 5724d61a-6d8d-46bc-b80c-74ba02040d7f))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "SW10") (unit 1)
+          (reference "SW50") (unit 1)
         )
       )
     )
@@ -4514,81 +4520,55 @@
     )
   )
 
-  (symbol (lib_id "Diode:1N4148") (at 172.72 91.44 270) (unit 1)
+  (symbol (lib_id "Diode:1N4148") (at 187.96 80.01 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
-    (uuid e559ebb4-6da4-4715-9592-deb119267ca1)
-    (property "Reference" "D31" (at 167.64 90.17 90)
+    (uuid e64d51c4-14cd-4614-a81c-628d1a9f97ee)
+    (property "Reference" "D24" (at 193.04 81.28 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "1N4148" (at 162.56 92.71 90)
+    (property "Value" "1N4148" (at 198.12 78.74 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Diode_SMD:D_SOD-123" (at 172.72 91.44 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 172.72 91.44 0)
+    (property "Footprint" "Diode_SMD:D_SOD-123" (at 187.96 80.01 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Device" "D" (at 172.72 91.44 0)
+    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 187.96 80.01 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Pins" "1=K 2=A" (at 172.72 91.44 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 5cbda210-bba1-436d-8668-ed2ada5d2d10))
-    (pin "2" (uuid 5a9a5d11-1a2f-44f2-978e-a77fce191a77))
-    (instances
-      (project "xantronix-z32"
-        (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "D31") (unit 1)
-        )
-      )
-    )
-  )
-
-  (symbol (lib_id "Switch:SW_Push") (at 109.22 105.41 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid e686b0ec-4adb-446a-9822-f1cf464105e1)
-    (property "Reference" "SW36" (at 109.22 97.79 0)
-      (effects (font (size 1.27 1.27)))
-    )
-    (property "Value" "SW_Push" (at 109.22 100.33 0)
-      (effects (font (size 1.27 1.27)))
-    )
-    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 109.22 100.33 0)
+    (property "Sim.Device" "D" (at 187.96 80.01 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 109.22 100.33 0)
+    (property "Sim.Pins" "1=K 2=A" (at 187.96 80.01 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid a6a54d84-fa51-4cd1-b021-067c70a4ac91))
-    (pin "2" (uuid ce245410-1264-4d8a-aea4-e33299ebd3fb))
+    (pin "1" (uuid 8f7d0334-df7f-430f-92b7-7abe95d0242c))
+    (pin "2" (uuid 20b57381-bf50-43e7-8288-ec80477a40c1))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "SW36") (unit 1)
+          (reference "D24") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Switch:SW_Push") (at 40.64 34.29 0) (unit 1)
+  (symbol (lib_id "Switch:SW_Push") (at 104.14 45.72 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
     (uuid e76b9ee1-537d-4bb2-9fff-78ac2d601e07)
-    (property "Reference" "SW1" (at 40.64 26.67 0)
+    (property "Reference" "SW1" (at 104.14 38.1 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "SW_Push" (at 40.64 29.21 0)
+    (property "Value" "SW_Push" (at 104.14 40.64 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.25u_PCB" (at 40.64 29.21 0)
+    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.25u_PCB" (at 104.14 40.64 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 40.64 29.21 0)
+    (property "Datasheet" "~" (at 104.14 40.64 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 4f43967e-a523-4a14-9350-54f2692b9328))
-    (pin "2" (uuid 05062599-fa90-478d-8ad9-8b385e19f6ab))
+    (pin "1" (uuid 40e3e7ab-2c80-4a92-967f-9169011abb95))
+    (pin "2" (uuid d8aefe2c-5431-4ff5-8684-2b8c7bfb2c36))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
@@ -4598,343 +4578,363 @@
     )
   )
 
-  (symbol (lib_id "Switch:SW_Push") (at 177.8 158.75 0) (unit 1)
+  (symbol (lib_id "Switch:SW_Push") (at 167.64 137.16 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid ea1a6a1f-8ef9-4aa2-9027-14c3157340d6)
-    (property "Reference" "SW62" (at 177.8 151.13 0)
+    (uuid e818bc00-1e8f-44e3-b9f4-0bae43ab4fb8)
+    (property "Reference" "SW53" (at 167.64 129.54 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "SW_Push" (at 177.8 153.67 0)
+    (property "Value" "SW_Push" (at 167.64 132.08 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 177.8 153.67 0)
+    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 167.64 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 177.8 153.67 0)
+    (property "Datasheet" "~" (at 167.64 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 67347244-24cc-4c3d-8549-13a7b35241be))
-    (pin "2" (uuid 18e68dcc-5dec-4aaf-a200-5ff5fb69516d))
+    (pin "1" (uuid a992a958-d443-4aa1-8e9a-2bdce9929c6a))
+    (pin "2" (uuid b8a394ab-2955-4fd7-8a71-da89115b1d19))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "SW62") (unit 1)
+          (reference "SW53") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Diode:1N4148") (at 149.86 73.66 270) (unit 1)
+  (symbol (lib_id "Diode:1N4148") (at 111.76 110.49 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
-    (uuid ea3abc4f-c5ef-478a-86ea-099d3abb5190)
-    (property "Reference" "D22" (at 144.78 72.39 90)
+    (uuid e820e00b-cc28-4c9d-bc6c-ddc968b2a710)
+    (property "Reference" "D33" (at 116.84 111.76 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "1N4148" (at 139.7 74.93 90)
+    (property "Value" "1N4148" (at 121.92 109.22 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Diode_SMD:D_SOD-123" (at 149.86 73.66 0)
+    (property "Footprint" "Diode_SMD:D_SOD-123" (at 111.76 110.49 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 149.86 73.66 0)
+    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 111.76 110.49 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Device" "D" (at 149.86 73.66 0)
+    (property "Sim.Device" "D" (at 111.76 110.49 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Pins" "1=K 2=A" (at 149.86 73.66 0)
+    (property "Sim.Pins" "1=K 2=A" (at 111.76 110.49 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 162d7a1b-8d7d-407a-9671-12c190a24ca7))
-    (pin "2" (uuid eb861f9f-cfb0-4f8c-b1c3-71d66bcac30e))
+    (pin "1" (uuid bf48cb34-30ac-4669-a2c6-ba802736fb92))
+    (pin "2" (uuid 46bd08a1-0c19-47ab-ba14-f131092505ff))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "D22") (unit 1)
+          (reference "D33") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Switch:SW_Push") (at 86.36 34.29 0) (unit 1)
+  (symbol (lib_id "Switch:SW_Push") (at 180.34 60.96 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid ef09ed9e-f925-4cad-a3a4-aa1b018e5321)
-    (property "Reference" "SW3" (at 86.36 26.67 0)
+    (uuid eb0f5624-a761-459b-a3c2-bb95c8029e2d)
+    (property "Reference" "SW15" (at 180.34 53.34 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "SW_Push" (at 86.36 29.21 0)
+    (property "Value" "SW_Push" (at 180.34 55.88 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 86.36 29.21 0)
+    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 180.34 55.88 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 86.36 29.21 0)
+    (property "Datasheet" "~" (at 180.34 55.88 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 32965f65-6033-4b32-9bfe-cdca3d516751))
-    (pin "2" (uuid e665dfce-4fd7-473d-b440-9ec88ebb2200))
+    (pin "1" (uuid 76ff41a2-e6ef-4133-9d29-b2a11729fb45))
+    (pin "2" (uuid 42cf4389-cfff-4add-90bc-e889c1fedfb9))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "SW3") (unit 1)
+          (reference "SW15") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Diode:1N4148") (at 81.28 91.44 270) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no)
-    (uuid f3558dee-265f-4dda-967c-4ec21906f1a3)
-    (property "Reference" "D27" (at 76.2 90.17 90)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "1N4148" (at 71.12 92.71 90)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "Diode_SMD:D_SOD-123" (at 81.28 91.44 0)
-      (effects (font (size 1.27 1.27)) hide)
+  (symbol (lib_id "Switch:SW_Push") (at 104.14 137.16 0) (unit 1)
+    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
+    (uuid eb33cfec-66cd-494a-96cd-eaa33828e08f)
+    (property "Reference" "SW48" (at 104.14 129.54 0)
+      (effects (font (size 1.27 1.27)))
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 81.28 91.44 0)
-      (effects (font (size 1.27 1.27)) hide)
+    (property "Value" "SW_Push" (at 104.14 132.08 0)
+      (effects (font (size 1.27 1.27)))
     )
-    (property "Sim.Device" "D" (at 81.28 91.44 0)
+    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 104.14 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Pins" "1=K 2=A" (at 81.28 91.44 0)
+    (property "Datasheet" "~" (at 104.14 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 811f94bd-6d0f-4d30-989a-3984528ffe7f))
-    (pin "2" (uuid 651a19a1-8cd5-49ed-8d6e-08beb7a62eae))
+    (pin "1" (uuid e027d781-a990-44cd-9e10-b2f37829be72))
+    (pin "2" (uuid e26b5a20-3494-45b8-9e24-a58a3b956eb4))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "D27") (unit 1)
+          (reference "SW48") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Diode:1N4148") (at 127 73.66 270) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no)
-    (uuid f3856cea-4d81-4780-8975-eb87575eba6c)
-    (property "Reference" "D21" (at 121.92 72.39 90)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "1N4148" (at 116.84 74.93 90)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "Diode_SMD:D_SOD-123" (at 127 73.66 0)
-      (effects (font (size 1.27 1.27)) hide)
+  (symbol (lib_id "Switch:SW_Push") (at 129.54 121.92 0) (unit 1)
+    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
+    (uuid ebac2496-a9b9-4865-be80-d480b42256ae)
+    (property "Reference" "SW42" (at 129.54 114.3 0)
+      (effects (font (size 1.27 1.27)))
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 127 73.66 0)
-      (effects (font (size 1.27 1.27)) hide)
+    (property "Value" "SW_Push" (at 129.54 116.84 0)
+      (effects (font (size 1.27 1.27)))
     )
-    (property "Sim.Device" "D" (at 127 73.66 0)
+    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 129.54 116.84 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Pins" "1=K 2=A" (at 127 73.66 0)
+    (property "Datasheet" "~" (at 129.54 116.84 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid f904957a-d931-476a-8030-97d6b42e69d5))
-    (pin "2" (uuid 923fde32-0f0d-4040-9d3e-bf7cf2efc9a4))
+    (pin "1" (uuid a9c5de7e-5a5e-443a-84fb-61e0f2eb3287))
+    (pin "2" (uuid d0b25c0a-7baf-4287-a4d0-8318002764b7))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "D21") (unit 1)
+          (reference "SW42") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Switch:SW_Push") (at 200.66 52.07 0) (unit 1)
+  (symbol (lib_id "Switch:SW_Push") (at 167.64 91.44 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid f3a91f22-9a79-4402-9c89-174fb2d8ce83)
-    (property "Reference" "SW16" (at 200.66 44.45 0)
+    (uuid ec0d1f8a-200f-47a2-9b02-204e111ef3f3)
+    (property "Reference" "SW30" (at 167.64 83.82 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "SW_Push" (at 200.66 46.99 0)
+    (property "Value" "SW_Push" (at 167.64 86.36 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 200.66 46.99 0)
+    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 167.64 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 200.66 46.99 0)
+    (property "Datasheet" "~" (at 167.64 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 503a7079-a066-4c69-8ab2-4b2b2bbf6d5b))
-    (pin "2" (uuid a15afda8-4357-4416-a15b-0d11327bba30))
+    (pin "1" (uuid 8ec19120-cc85-4a88-80da-fd7a11a1efa3))
+    (pin "2" (uuid e866941f-a967-47a4-b5ea-dca20d146891))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "SW16") (unit 1)
+          (reference "SW30") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Switch:SW_Push") (at 154.94 52.07 0) (unit 1)
+  (symbol (lib_id "Switch:SW_Push") (at 193.04 121.92 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid f6a9d339-1270-4579-9c56-1eb5103f9250)
-    (property "Reference" "SW14" (at 154.94 44.45 0)
+    (uuid ee230526-07fb-4ca1-a80f-07b85a14a5bd)
+    (property "Reference" "SW47" (at 193.04 114.3 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "SW_Push" (at 154.94 46.99 0)
+    (property "Value" "SW_Push" (at 193.04 116.84 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 154.94 46.99 0)
+    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 193.04 116.84 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 154.94 46.99 0)
+    (property "Datasheet" "~" (at 193.04 116.84 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 780f4801-402a-41e2-b578-1e4e2fca781e))
-    (pin "2" (uuid 7fe1559e-6034-425b-97dc-c69f6778ba7f))
+    (pin "1" (uuid d80b17e8-f6c9-48e0-9f8e-6c8e71ec9738))
+    (pin "2" (uuid 4a813b78-f8b8-4e9f-ae10-a57bd03d0298))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "SW14") (unit 1)
+          (reference "SW47") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Switch:SW_Push") (at 109.22 52.07 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid f7dc83b8-f0e4-42c0-8dd1-ef6db1f0e396)
-    (property "Reference" "SW12" (at 109.22 44.45 0)
-      (effects (font (size 1.27 1.27)))
+  (symbol (lib_id "Diode:1N4148") (at 175.26 64.77 90) (unit 1)
+    (in_bom yes) (on_board yes) (dnp no)
+    (uuid f3201d70-390a-4648-a915-26d43a1d9f16)
+    (property "Reference" "D15" (at 180.34 66.04 90)
+      (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "SW_Push" (at 109.22 46.99 0)
-      (effects (font (size 1.27 1.27)))
+    (property "Value" "1N4148" (at 185.42 63.5 90)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Diode_SMD:D_SOD-123" (at 175.26 64.77 0)
+      (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 109.22 46.99 0)
+    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 175.26 64.77 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 109.22 46.99 0)
+    (property "Sim.Device" "D" (at 175.26 64.77 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 4975f720-7613-4f69-aa8f-5ad6206b68f9))
-    (pin "2" (uuid cea5d010-a373-441f-b72d-7c44a7c68bb9))
+    (property "Sim.Pins" "1=K 2=A" (at 175.26 64.77 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 5485e78d-d253-4a38-a7be-b87f3512e045))
+    (pin "2" (uuid 58310456-34d7-4f52-aabd-c0d4d39d5ab1))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "SW12") (unit 1)
+          (reference "D15") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Diode:1N4148") (at 81.28 73.66 270) (unit 1)
+  (symbol (lib_id "Diode:1N4148") (at 111.76 156.21 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
-    (uuid f955ac7a-219b-4ceb-8a0c-258f1600814b)
-    (property "Reference" "D19" (at 76.2 72.39 90)
+    (uuid f538a370-228c-4422-b03b-04f37a22f3b6)
+    (property "Reference" "D57" (at 116.84 157.48 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "1N4148" (at 71.12 74.93 90)
+    (property "Value" "1N4148" (at 121.92 154.94 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Diode_SMD:D_SOD-123" (at 81.28 73.66 0)
+    (property "Footprint" "Diode_SMD:D_SOD-123" (at 111.76 156.21 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 81.28 73.66 0)
+    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 111.76 156.21 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Device" "D" (at 81.28 73.66 0)
+    (property "Sim.Device" "D" (at 111.76 156.21 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Pins" "1=K 2=A" (at 81.28 73.66 0)
+    (property "Sim.Pins" "1=K 2=A" (at 111.76 156.21 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 7ef64247-9e54-46b2-8aca-8c40bcc00e50))
-    (pin "2" (uuid e19e8d14-fda3-4904-b4be-42ffe20dd6fd))
+    (pin "1" (uuid f45fc372-5670-4942-b73b-e982fce999c9))
+    (pin "2" (uuid a6edc72b-cf72-480a-8bc6-c756eafe19fa))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "D19") (unit 1)
+          (reference "D57") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Switch:SW_Push") (at 177.8 105.41 0) (unit 1)
+  (symbol (lib_id "Switch:SW_Push") (at 104.14 152.4 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid fbad6430-ddca-4d01-94bd-06efde5263c4)
-    (property "Reference" "SW39" (at 177.8 97.79 0)
+    (uuid f6aedb53-1c01-40a1-b653-d686e96b9c7a)
+    (property "Reference" "SW56" (at 104.14 144.78 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "SW_Push" (at 177.8 100.33 0)
+    (property "Value" "SW_Push" (at 104.14 147.32 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 177.8 100.33 0)
+    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 104.14 147.32 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 177.8 100.33 0)
+    (property "Datasheet" "~" (at 104.14 147.32 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid bd04fbb8-bd0b-4228-8665-90947961c3e2))
-    (pin "2" (uuid f5c3b470-376d-4a8b-ab90-1c800e2f60cb))
+    (pin "1" (uuid 803c9a22-5820-4c2d-bfe4-efa80c1c68a5))
+    (pin "2" (uuid 93c1138f-5f4a-4c78-9808-8992ba540756))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "SW39") (unit 1)
+          (reference "SW56") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Switch:SW_Push") (at 109.22 69.85 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid fd7031ae-9a15-4c99-a16c-9f29eda042a9)
-    (property "Reference" "SW20" (at 109.22 62.23 0)
-      (effects (font (size 1.27 1.27)))
+  (symbol (lib_id "Diode:1N4148") (at 99.06 125.73 90) (unit 1)
+    (in_bom yes) (on_board yes) (dnp no)
+    (uuid f713cb9c-5545-4614-b68b-67e36091bda8)
+    (property "Reference" "D40" (at 104.14 127 90)
+      (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "SW_Push" (at 109.22 64.77 0)
-      (effects (font (size 1.27 1.27)))
+    (property "Value" "1N4148" (at 109.22 124.46 90)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Diode_SMD:D_SOD-123" (at 99.06 125.73 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 99.06 125.73 0)
+      (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 109.22 64.77 0)
+    (property "Sim.Device" "D" (at 99.06 125.73 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 109.22 64.77 0)
+    (property "Sim.Pins" "1=K 2=A" (at 99.06 125.73 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid ca1d355d-e1dc-4e8a-adf5-d851df98ea3c))
-    (pin "2" (uuid 06e74a74-3101-4d9b-9604-e2bca9b00137))
+    (pin "1" (uuid 45d5c1a7-3e2a-4847-b5eb-02cd6be6c5cf))
+    (pin "2" (uuid 0fdce58f-08ca-4cca-af95-4868f4d179b4))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "SW20") (unit 1)
+          (reference "D40") (unit 1)
         )
       )
     )
   )
 
-  (symbol (lib_id "Diode:1N4148") (at 195.58 127 270) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no)
-    (uuid febb8583-7d31-4b2a-8fe5-dacea832e0d7)
-    (property "Reference" "D48" (at 190.5 125.73 90)
-      (effects (font (size 1.27 1.27)) (justify left))
+  (symbol (lib_id "Switch:SW_Push") (at 154.94 106.68 0) (unit 1)
+    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
+    (uuid fa0b1f24-9f7d-4004-aa9a-6c18cbb714d6)
+    (property "Reference" "SW36" (at 154.94 99.06 0)
+      (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "1N4148" (at 185.42 128.27 90)
-      (effects (font (size 1.27 1.27)) (justify left))
+    (property "Value" "SW_Push" (at 154.94 101.6 0)
+      (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "Diode_SMD:D_SOD-123" (at 195.58 127 0)
+    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 154.94 101.6 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 195.58 127 0)
+    (property "Datasheet" "~" (at 154.94 101.6 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Device" "D" (at 195.58 127 0)
+    (pin "1" (uuid 9ead927f-22bc-4744-9a98-3b41f27f8b67))
+    (pin "2" (uuid 2bf30932-b463-46d9-8ad9-cb94bbf0b2a7))
+    (instances
+      (project "xantronix-z32"
+        (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
+          (reference "SW36") (unit 1)
+        )
+      )
+    )
+  )
+
+  (symbol (lib_id "Switch:SW_Push") (at 142.24 60.96 0) (unit 1)
+    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
+    (uuid fa4d60bb-f63b-4700-a3cc-b34e3ff2f6a7)
+    (property "Reference" "SW12" (at 142.24 53.34 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Value" "SW_Push" (at 142.24 55.88 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (at 142.24 55.88 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Sim.Pins" "1=K 2=A" (at 195.58 127 0)
+    (property "Datasheet" "~" (at 142.24 55.88 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid cc356310-427c-4694-a569-04f97da82cb2))
-    (pin "2" (uuid b78d1ed3-0803-405a-b48d-a1889bd238fc))
+    (pin "1" (uuid 97f78fc4-4939-4e4c-80be-804be1543230))
+    (pin "2" (uuid 003259ec-18e2-4a5c-9d87-6da888b29334))
     (instances
       (project "xantronix-z32"
         (path "/7e0b8286-ce3e-4907-8bbf-6ee4116c37d5"
-          (reference "D48") (unit 1)
+          (reference "SW12") (unit 1)
         )
       )
     )
author	XANTRONIX Development	2023-09-06 13:11:02 -0400
committer	XANTRONIX Development	2023-09-06 13:11:22 -0400
commit	0a0f5618cd882dc47d92558146059de4e6bd0c54 (patch)
tree	941e1969190daadc42d1c593b69b4c1ed8683797 /pcb
parent	32177e8f0aa81bfbad003f3aed6c12d2d3a66fd1 (diff)
download	xantronix-z32-0a0f5618cd882dc47d92558146059de4e6bd0c54.tar.gz xantronix-z32-0a0f5618cd882dc47d92558146059de4e6bd0c54.tar.bz2 xantronix-z32-0a0f5618cd882dc47d92558146059de4e6bd0c54.zip