right advances

17 files changed, 10547 insertions, 1148 deletions

diff --git a/pcb/kicad/fp-lib-table b/pcb/kicad/fp-lib-table
deleted file mode 100644
index c29ebf9..0000000
--- a/pcb/kicad/fp-lib-table
+++ /dev/null
@@ -1,5 +0,0 @@
-(fp_lib_table
-  (lib (name Keebio)(type KiCad)(uri ${KIPRJMOD}/Keebio-Parts.pretty)(options "")(descr ""))
-  (lib (name kicad-usb)(type KiCad)(uri ${KIPRJMOD}/kicad-footprints/Connector_USB.pretty)(options "")(descr ""))
-  (lib (name kicad-harwin)(type KiCad)(uri ${KIPRJMOD}/kicad-footprints/Connector_Harwin.pretty)(options "")(descr ""))
-)
diff --git a/pcb/kicad/kbd b/pcb/kicad/kbd
new file mode 160000
+Subproject c82c4c49d425551707eef24522afdc3f8ac3cdf
diff --git a/pcb/kicad/left/fp-lib-table b/pcb/kicad/left/fp-lib-table
new file mode 100644
index 0000000..5102fe8
--- /dev/null
+++ b/pcb/kicad/left/fp-lib-table
@@ -0,0 +1,5 @@
+(fp_lib_table
+  (lib (name Keebio)(type KiCad)(uri ${KIPRJMOD}/../Keebio-Parts.pretty)(options "")(descr ""))
+  (lib (name kicad-usb)(type KiCad)(uri ${KIPRJMOD}/../kicad-footprints/Connector_USB.pretty)(options "")(descr ""))
+  (lib (name kicad-harwin)(type KiCad)(uri ${KIPRJMOD}/../kicad-footprints/Connector_Harwin.pretty)(options "")(descr ""))
+)
diff --git a/pcb/kicad/left-cache.lib b/pcb/kicad/left/left-cache.lib
index a608dc1..a608dc1 100644
--- a/pcb/kicad/left-cache.lib
+++ b/pcb/kicad/left/left-cache.lib
diff --git a/pcb/kicad/left.sch b/pcb/kicad/left/left.bak
index 7cf1b25..7cf1b25 100644
--- a/pcb/kicad/left.sch
+++ b/pcb/kicad/left/left.bak
diff --git a/pcb/kicad/left.kicad_pcb b/pcb/kicad/left/left.kicad_pcb
index 5356f2a..f5cac47 100644
--- a/pcb/kicad/left.kicad_pcb
+++ b/pcb/kicad/left/left.kicad_pcb
@@ -3,10 +3,10 @@
   (general
     (thickness 1.6)
     (drawings 24)
-    (tracks 694)
+    (tracks 695)
     (zones 0)
     (modules 61)
-    (nets 70)
+    (nets 69)
   )
 
   (page A4)
@@ -156,11 +156,10 @@
   (net 62 "Net-(U1-Pad3)")
   (net 63 "Net-(U1-Pad4)")
   (net 64 "Net-(U1-Pad22)")
-  (net 65 "Net-(U1-Pad25)")
-  (net 66 "Net-(U1-Pad26)")
-  (net 67 "Net-(U1-Pad27)")
-  (net 68 "Net-(U1-Pad28)")
-  (net 69 "Net-(U1-Pad29)")
+  (net 65 "Net-(U1-Pad26)")
+  (net 66 "Net-(U1-Pad27)")
+  (net 67 "Net-(U1-Pad28)")
+  (net 68 "Net-(U1-Pad29)")
 
   (net_class Default "Ceci est la Netclass par défaut."
     (clearance 0.2)
@@ -214,7 +213,6 @@
     (add_net "Net-(U1-Pad13)")
     (add_net "Net-(U1-Pad2)")
     (add_net "Net-(U1-Pad22)")
-    (add_net "Net-(U1-Pad25)")
     (add_net "Net-(U1-Pad26)")
     (add_net "Net-(U1-Pad27)")
     (add_net "Net-(U1-Pad28)")
@@ -1812,15 +1810,15 @@
     (pad 30 smd rect (at 4.35 0.25 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
       (net 59 TX))
     (pad 29 smd rect (at 4.35 0.75 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 69 "Net-(U1-Pad29)"))
+      (net 68 "Net-(U1-Pad29)"))
     (pad 28 smd rect (at 4.35 1.25 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 68 "Net-(U1-Pad28)"))
+      (net 67 "Net-(U1-Pad28)"))
     (pad 27 smd rect (at 4.35 1.75 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 67 "Net-(U1-Pad27)"))
+      (net 66 "Net-(U1-Pad27)"))
     (pad 26 smd rect (at 4.35 2.25 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 66 "Net-(U1-Pad26)"))
+      (net 65 "Net-(U1-Pad26)"))
     (pad 25 smd rect (at 4.35 2.75 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 65 "Net-(U1-Pad25)"))
+      (net 1 GND))
     (pad 24 smd rect (at 2.75 4.35 180) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
       (net 10 3.3V))
     (pad 23 smd rect (at 2.25 4.35 180) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
@@ -3132,6 +3130,7 @@
   (segment (start 227.493 64.092) (end 226.245372 62.844372) (width 0.25) (layer F.Cu) (net 1))
   (segment (start 227.493 64.992) (end 227.493 64.092) (width 0.25) (layer F.Cu) (net 1))
   (via (at 230.505 59.69) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 1))
+  (segment (start 232.493 64.992) (end 232.493 63.583) (width 0.25) (layer F.Cu) (net 1))
   (segment (start 222.107 59.207) (end 222.132 59.182) (width 0.25) (layer F.Cu) (net 2))
   (segment (start 222.107 61.28) (end 222.107 59.207) (width 0.25) (layer F.Cu) (net 2))
   (segment (start 222.34 58.974) (end 222.132 59.182) (width 0.25) (layer F.Cu) (net 2))
@@ -4379,60 +4378,61 @@
         (xy 236.040946 61.969) (xy 235.907586 61.769414) (xy 235.616436 61.574873) (xy 235.273001 61.50656) (xy 234.372999 61.50656)
         (xy 234.029564 61.574873) (xy 233.738414 61.769414) (xy 233.543873 62.060564) (xy 233.47556 62.403999) (xy 233.47556 63.001639)
         (xy 233.313518 63.163681) (xy 233.250062 63.206081) (xy 233.207662 63.269537) (xy 233.207661 63.269538) (xy 233.150557 63.355)
-        (xy 233.082087 63.457473) (xy 233.05093 63.614112) (xy 233.023102 63.75401) (xy 233.037991 63.828862) (xy 233.037991 63.858922)
-        (xy 232.865765 63.743843) (xy 232.618 63.69456) (xy 232.368 63.69456) (xy 232.243 63.719424) (xy 232.118 63.69456)
-        (xy 231.868 63.69456) (xy 231.743 63.719424) (xy 231.618 63.69456) (xy 231.368 63.69456) (xy 231.243 63.719424)
-        (xy 231.118 63.69456) (xy 230.868 63.69456) (xy 230.753 63.717435) (xy 230.753 63.056801) (xy 233.694335 60.115467)
-        (xy 233.798572 60.449226) (xy 234.158576 60.880637) (xy 234.65627 61.141442) (xy 234.713961 61.151904) (xy 234.936 61.029915)
-        (xy 234.936 59.687) (xy 235.19 59.687) (xy 235.19 61.029915) (xy 235.412039 61.151904) (xy 235.46973 61.141442)
-        (xy 235.967424 60.880637) (xy 236.327428 60.449226) (xy 236.494934 59.912886) (xy 236.342471 59.687) (xy 235.19 59.687)
-        (xy 234.936 59.687) (xy 234.916 59.687) (xy 234.916 59.433) (xy 234.936 59.433) (xy 234.936 59.413)
-        (xy 235.19 59.413) (xy 235.19 59.433) (xy 236.342471 59.433) (xy 236.494934 59.207114) (xy 236.327428 58.670774)
-        (xy 235.967424 58.239363) (xy 235.706939 58.102862) (xy 236.449822 57.359979) (xy 236.485569 57.44628) (xy 236.77672 57.737431)
-        (xy 237.157126 57.895) (xy 237.568874 57.895) (xy 237.94928 57.737431) (xy 238.240431 57.44628) (xy 238.398 57.065874)
-        (xy 238.398 56.654126) (xy 238.240431 56.27372) (xy 237.94928 55.982569) (xy 237.86298 55.946822) (xy 238.422865 55.386937)
-        (xy 238.628424 55.694577) (xy 239.103092 56.01174) (xy 239.234819 56.037942) (xy 239.366463 56.125904) (xy 239.663 56.184889)
-        (xy 239.959536 56.125904) (xy 239.98 56.11223) (xy 239.98 56.859942) (xy 239.663 56.796887) (xy 239.103091 56.90826)
-        (xy 238.628423 57.225424) (xy 238.31126 57.700092) (xy 238.228 58.118668) (xy 238.228 58.801333) (xy 238.31126 59.219909)
-        (xy 238.628424 59.694577) (xy 239.103092 60.01174) (xy 239.663 60.123113) (xy 239.98 60.060058) (xy 239.980001 104.613971)
-        (xy 226.831561 131.034895) (xy 190.667503 122.525706) (xy 190.612878 122.511004) (xy 190.601911 122.510273) (xy 190.591223 122.507758)
-        (xy 190.534746 122.505795) (xy 152.468139 119.968022) (xy 152.174837 119.928915) (xy 214.850412 119.928915) (xy 214.850412 120.420229)
-        (xy 215.03843 120.874143) (xy 215.385841 121.221554) (xy 215.839755 121.409572) (xy 216.331069 121.409572) (xy 216.784983 121.221554)
-        (xy 217.132394 120.874143) (xy 217.320412 120.420229) (xy 217.320412 119.928915) (xy 217.132394 119.475001) (xy 216.784983 119.12759)
-        (xy 216.331069 118.939572) (xy 215.839755 118.939572) (xy 215.385841 119.12759) (xy 215.03843 119.475001) (xy 214.850412 119.928915)
-        (xy 152.174837 119.928915) (xy 134.853042 117.619343) (xy 193.57 117.619343) (xy 193.57 118.110657) (xy 193.758018 118.564571)
-        (xy 194.105429 118.911982) (xy 194.559343 119.1) (xy 195.050657 119.1) (xy 195.504571 118.911982) (xy 195.851982 118.564571)
-        (xy 195.993847 118.222079) (xy 220.0021 118.222079) (xy 220.0021 119.267921) (xy 220.402326 120.234152) (xy 221.141848 120.973674)
-        (xy 222.108079 121.3739) (xy 223.153921 121.3739) (xy 224.120152 120.973674) (xy 224.382499 120.711327) (xy 225.667267 120.711327)
-        (xy 225.667267 121.312043) (xy 225.897151 121.867031) (xy 226.321921 122.291801) (xy 226.704013 122.450069) (xy 226.711954 122.45801)
-        (xy 227.257754 122.684088) (xy 227.848524 122.684088) (xy 228.394324 122.45801) (xy 228.812061 122.040273) (xy 229.038139 121.494473)
-        (xy 229.038139 120.903703) (xy 228.812061 120.357903) (xy 228.394324 119.940166) (xy 228.132942 119.831898) (xy 228.032613 119.731569)
-        (xy 227.477625 119.501685) (xy 226.876909 119.501685) (xy 226.321921 119.731569) (xy 225.897151 120.156339) (xy 225.667267 120.711327)
-        (xy 224.382499 120.711327) (xy 224.859674 120.234152) (xy 225.2599 119.267921) (xy 225.2599 118.222079) (xy 224.859674 117.255848)
-        (xy 224.120152 116.516326) (xy 223.153921 116.1161) (xy 222.108079 116.1161) (xy 221.141848 116.516326) (xy 220.402326 117.255848)
-        (xy 220.0021 118.222079) (xy 195.993847 118.222079) (xy 196.04 118.110657) (xy 196.04 117.619343) (xy 195.851982 117.165429)
-        (xy 195.504571 116.818018) (xy 195.050657 116.63) (xy 194.559343 116.63) (xy 194.105429 116.818018) (xy 193.758018 117.165429)
-        (xy 193.57 117.619343) (xy 134.853042 117.619343) (xy 115.803036 115.079343) (xy 155.47 115.079343) (xy 155.47 115.570657)
-        (xy 155.658018 116.024571) (xy 156.005429 116.371982) (xy 156.459343 116.56) (xy 156.950657 116.56) (xy 157.404571 116.371982)
-        (xy 157.751982 116.024571) (xy 157.94 115.570657) (xy 157.94 115.079343) (xy 174.52 115.079343) (xy 174.52 115.570657)
-        (xy 174.708018 116.024571) (xy 175.055429 116.371982) (xy 175.509343 116.56) (xy 176.000657 116.56) (xy 176.454571 116.371982)
-        (xy 176.801982 116.024571) (xy 176.99 115.570657) (xy 176.99 115.079343) (xy 176.801982 114.625429) (xy 176.454571 114.278018)
-        (xy 176.000657 114.09) (xy 175.509343 114.09) (xy 175.055429 114.278018) (xy 174.708018 114.625429) (xy 174.52 115.079343)
-        (xy 157.94 115.079343) (xy 157.751982 114.625429) (xy 157.404571 114.278018) (xy 156.950657 114.09) (xy 156.459343 114.09)
-        (xy 156.005429 114.278018) (xy 155.658018 114.625429) (xy 155.47 115.079343) (xy 115.803036 115.079343) (xy 105.46 113.700272)
-        (xy 105.46 108.729343) (xy 107.845 108.729343) (xy 107.845 109.220657) (xy 108.033018 109.674571) (xy 108.380429 110.021982)
-        (xy 108.834343 110.21) (xy 109.325657 110.21) (xy 109.779571 110.021982) (xy 110.126982 109.674571) (xy 110.315 109.220657)
-        (xy 110.315 108.729343) (xy 110.126982 108.275429) (xy 109.779571 107.928018) (xy 109.325657 107.74) (xy 108.834343 107.74)
-        (xy 108.380429 107.928018) (xy 108.033018 108.275429) (xy 107.845 108.729343) (xy 105.46 108.729343) (xy 105.46 89.679343)
-        (xy 107.845 89.679343) (xy 107.845 90.170657) (xy 108.033018 90.624571) (xy 108.380429 90.971982) (xy 108.834343 91.16)
-        (xy 109.325657 91.16) (xy 109.779571 90.971982) (xy 110.126982 90.624571) (xy 110.315 90.170657) (xy 110.315 89.679343)
-        (xy 110.126982 89.225429) (xy 109.779571 88.878018) (xy 109.325657 88.69) (xy 108.834343 88.69) (xy 108.380429 88.878018)
-        (xy 108.033018 89.225429) (xy 107.845 89.679343) (xy 105.46 89.679343) (xy 105.46 70.629343) (xy 107.845 70.629343)
-        (xy 107.845 71.120657) (xy 108.033018 71.574571) (xy 108.380429 71.921982) (xy 108.834343 72.11) (xy 109.325657 72.11)
-        (xy 109.779571 71.921982) (xy 110.126982 71.574571) (xy 110.315 71.120657) (xy 110.315 70.629343) (xy 110.126982 70.175429)
-        (xy 109.779571 69.828018) (xy 109.325657 69.64) (xy 108.834343 69.64) (xy 108.380429 69.828018) (xy 108.033018 70.175429)
-        (xy 107.845 70.629343) (xy 105.46 70.629343) (xy 105.46 57.643719) (xy 143.029958 45.120401) (xy 161.970472 42.595)
-        (xy 180.929535 42.595)
+        (xy 233.082087 63.457473) (xy 233.05093 63.614112) (xy 233.023102 63.75401) (xy 233.037991 63.828862) (xy 233.037991 63.863965)
+        (xy 232.977699 63.803673) (xy 232.74431 63.707) (xy 232.71425 63.707) (xy 232.5555 63.86575) (xy 232.5555 63.870621)
+        (xy 232.365765 63.743843) (xy 232.294397 63.729647) (xy 232.27175 63.707) (xy 232.24169 63.707) (xy 232.221852 63.715217)
+        (xy 232.118 63.69456) (xy 231.868 63.69456) (xy 231.743 63.719424) (xy 231.618 63.69456) (xy 231.368 63.69456)
+        (xy 231.243 63.719424) (xy 231.118 63.69456) (xy 230.868 63.69456) (xy 230.753 63.717435) (xy 230.753 63.056801)
+        (xy 233.694335 60.115467) (xy 233.798572 60.449226) (xy 234.158576 60.880637) (xy 234.65627 61.141442) (xy 234.713961 61.151904)
+        (xy 234.936 61.029915) (xy 234.936 59.687) (xy 235.19 59.687) (xy 235.19 61.029915) (xy 235.412039 61.151904)
+        (xy 235.46973 61.141442) (xy 235.967424 60.880637) (xy 236.327428 60.449226) (xy 236.494934 59.912886) (xy 236.342471 59.687)
+        (xy 235.19 59.687) (xy 234.936 59.687) (xy 234.916 59.687) (xy 234.916 59.433) (xy 234.936 59.433)
+        (xy 234.936 59.413) (xy 235.19 59.413) (xy 235.19 59.433) (xy 236.342471 59.433) (xy 236.494934 59.207114)
+        (xy 236.327428 58.670774) (xy 235.967424 58.239363) (xy 235.706939 58.102862) (xy 236.449822 57.359979) (xy 236.485569 57.44628)
+        (xy 236.77672 57.737431) (xy 237.157126 57.895) (xy 237.568874 57.895) (xy 237.94928 57.737431) (xy 238.240431 57.44628)
+        (xy 238.398 57.065874) (xy 238.398 56.654126) (xy 238.240431 56.27372) (xy 237.94928 55.982569) (xy 237.86298 55.946822)
+        (xy 238.422865 55.386937) (xy 238.628424 55.694577) (xy 239.103092 56.01174) (xy 239.234819 56.037942) (xy 239.366463 56.125904)
+        (xy 239.663 56.184889) (xy 239.959536 56.125904) (xy 239.98 56.11223) (xy 239.98 56.859942) (xy 239.663 56.796887)
+        (xy 239.103091 56.90826) (xy 238.628423 57.225424) (xy 238.31126 57.700092) (xy 238.228 58.118668) (xy 238.228 58.801333)
+        (xy 238.31126 59.219909) (xy 238.628424 59.694577) (xy 239.103092 60.01174) (xy 239.663 60.123113) (xy 239.98 60.060058)
+        (xy 239.980001 104.613971) (xy 226.831561 131.034895) (xy 190.667503 122.525706) (xy 190.612878 122.511004) (xy 190.601911 122.510273)
+        (xy 190.591223 122.507758) (xy 190.534746 122.505795) (xy 152.468139 119.968022) (xy 152.174837 119.928915) (xy 214.850412 119.928915)
+        (xy 214.850412 120.420229) (xy 215.03843 120.874143) (xy 215.385841 121.221554) (xy 215.839755 121.409572) (xy 216.331069 121.409572)
+        (xy 216.784983 121.221554) (xy 217.132394 120.874143) (xy 217.320412 120.420229) (xy 217.320412 119.928915) (xy 217.132394 119.475001)
+        (xy 216.784983 119.12759) (xy 216.331069 118.939572) (xy 215.839755 118.939572) (xy 215.385841 119.12759) (xy 215.03843 119.475001)
+        (xy 214.850412 119.928915) (xy 152.174837 119.928915) (xy 134.853042 117.619343) (xy 193.57 117.619343) (xy 193.57 118.110657)
+        (xy 193.758018 118.564571) (xy 194.105429 118.911982) (xy 194.559343 119.1) (xy 195.050657 119.1) (xy 195.504571 118.911982)
+        (xy 195.851982 118.564571) (xy 195.993847 118.222079) (xy 220.0021 118.222079) (xy 220.0021 119.267921) (xy 220.402326 120.234152)
+        (xy 221.141848 120.973674) (xy 222.108079 121.3739) (xy 223.153921 121.3739) (xy 224.120152 120.973674) (xy 224.382499 120.711327)
+        (xy 225.667267 120.711327) (xy 225.667267 121.312043) (xy 225.897151 121.867031) (xy 226.321921 122.291801) (xy 226.704013 122.450069)
+        (xy 226.711954 122.45801) (xy 227.257754 122.684088) (xy 227.848524 122.684088) (xy 228.394324 122.45801) (xy 228.812061 122.040273)
+        (xy 229.038139 121.494473) (xy 229.038139 120.903703) (xy 228.812061 120.357903) (xy 228.394324 119.940166) (xy 228.132942 119.831898)
+        (xy 228.032613 119.731569) (xy 227.477625 119.501685) (xy 226.876909 119.501685) (xy 226.321921 119.731569) (xy 225.897151 120.156339)
+        (xy 225.667267 120.711327) (xy 224.382499 120.711327) (xy 224.859674 120.234152) (xy 225.2599 119.267921) (xy 225.2599 118.222079)
+        (xy 224.859674 117.255848) (xy 224.120152 116.516326) (xy 223.153921 116.1161) (xy 222.108079 116.1161) (xy 221.141848 116.516326)
+        (xy 220.402326 117.255848) (xy 220.0021 118.222079) (xy 195.993847 118.222079) (xy 196.04 118.110657) (xy 196.04 117.619343)
+        (xy 195.851982 117.165429) (xy 195.504571 116.818018) (xy 195.050657 116.63) (xy 194.559343 116.63) (xy 194.105429 116.818018)
+        (xy 193.758018 117.165429) (xy 193.57 117.619343) (xy 134.853042 117.619343) (xy 115.803036 115.079343) (xy 155.47 115.079343)
+        (xy 155.47 115.570657) (xy 155.658018 116.024571) (xy 156.005429 116.371982) (xy 156.459343 116.56) (xy 156.950657 116.56)
+        (xy 157.404571 116.371982) (xy 157.751982 116.024571) (xy 157.94 115.570657) (xy 157.94 115.079343) (xy 174.52 115.079343)
+        (xy 174.52 115.570657) (xy 174.708018 116.024571) (xy 175.055429 116.371982) (xy 175.509343 116.56) (xy 176.000657 116.56)
+        (xy 176.454571 116.371982) (xy 176.801982 116.024571) (xy 176.99 115.570657) (xy 176.99 115.079343) (xy 176.801982 114.625429)
+        (xy 176.454571 114.278018) (xy 176.000657 114.09) (xy 175.509343 114.09) (xy 175.055429 114.278018) (xy 174.708018 114.625429)
+        (xy 174.52 115.079343) (xy 157.94 115.079343) (xy 157.751982 114.625429) (xy 157.404571 114.278018) (xy 156.950657 114.09)
+        (xy 156.459343 114.09) (xy 156.005429 114.278018) (xy 155.658018 114.625429) (xy 155.47 115.079343) (xy 115.803036 115.079343)
+        (xy 105.46 113.700272) (xy 105.46 108.729343) (xy 107.845 108.729343) (xy 107.845 109.220657) (xy 108.033018 109.674571)
+        (xy 108.380429 110.021982) (xy 108.834343 110.21) (xy 109.325657 110.21) (xy 109.779571 110.021982) (xy 110.126982 109.674571)
+        (xy 110.315 109.220657) (xy 110.315 108.729343) (xy 110.126982 108.275429) (xy 109.779571 107.928018) (xy 109.325657 107.74)
+        (xy 108.834343 107.74) (xy 108.380429 107.928018) (xy 108.033018 108.275429) (xy 107.845 108.729343) (xy 105.46 108.729343)
+        (xy 105.46 89.679343) (xy 107.845 89.679343) (xy 107.845 90.170657) (xy 108.033018 90.624571) (xy 108.380429 90.971982)
+        (xy 108.834343 91.16) (xy 109.325657 91.16) (xy 109.779571 90.971982) (xy 110.126982 90.624571) (xy 110.315 90.170657)
+        (xy 110.315 89.679343) (xy 110.126982 89.225429) (xy 109.779571 88.878018) (xy 109.325657 88.69) (xy 108.834343 88.69)
+        (xy 108.380429 88.878018) (xy 108.033018 89.225429) (xy 107.845 89.679343) (xy 105.46 89.679343) (xy 105.46 70.629343)
+        (xy 107.845 70.629343) (xy 107.845 71.120657) (xy 108.033018 71.574571) (xy 108.380429 71.921982) (xy 108.834343 72.11)
+        (xy 109.325657 72.11) (xy 109.779571 71.921982) (xy 110.126982 71.574571) (xy 110.315 71.120657) (xy 110.315 70.629343)
+        (xy 110.126982 70.175429) (xy 109.779571 69.828018) (xy 109.325657 69.64) (xy 108.834343 69.64) (xy 108.380429 69.828018)
+        (xy 108.033018 70.175429) (xy 107.845 70.629343) (xy 105.46 70.629343) (xy 105.46 57.643719) (xy 143.029958 45.120401)
+        (xy 161.970472 42.595) (xy 180.929535 42.595)
       )
     )
     (filled_polygon
diff --git a/pcb/kicad/left.kicad_pcb-bak b/pcb/kicad/left/left.kicad_pcb-bak
index 567a238..10cfe8c 100644
--- a/pcb/kicad/left.kicad_pcb-bak
+++ b/pcb/kicad/left/left.kicad_pcb-bak
@@ -3,10 +3,10 @@
   (general
     (thickness 1.6)
     (drawings 24)
-    (tracks 694)
+    (tracks 695)
     (zones 0)
     (modules 61)
-    (nets 70)
+    (nets 69)
   )
 
   (page A4)
@@ -156,11 +156,10 @@
   (net 62 "Net-(U1-Pad3)")
   (net 63 "Net-(U1-Pad4)")
   (net 64 "Net-(U1-Pad22)")
-  (net 65 "Net-(U1-Pad25)")
-  (net 66 "Net-(U1-Pad26)")
-  (net 67 "Net-(U1-Pad27)")
-  (net 68 "Net-(U1-Pad28)")
-  (net 69 "Net-(U1-Pad29)")
+  (net 65 "Net-(U1-Pad26)")
+  (net 66 "Net-(U1-Pad27)")
+  (net 67 "Net-(U1-Pad28)")
+  (net 68 "Net-(U1-Pad29)")
 
   (net_class Default "Ceci est la Netclass par défaut."
     (clearance 0.2)
@@ -214,7 +213,6 @@
     (add_net "Net-(U1-Pad13)")
     (add_net "Net-(U1-Pad2)")
     (add_net "Net-(U1-Pad22)")
-    (add_net "Net-(U1-Pad25)")
     (add_net "Net-(U1-Pad26)")
     (add_net "Net-(U1-Pad27)")
     (add_net "Net-(U1-Pad28)")
@@ -240,7 +238,7 @@
     (add_net VBAT)
   )
 
-  (module kicad-usb:Harwin_M20-89012xx_1x12_P2.54mm_Horizontal (layer B.Cu) (tedit 5B154A07) (tstamp 5EDE22E0)
+  (module kicad-harwin:Harwin_M20-89012xx_1x12_P2.54mm_Horizontal (layer B.Cu) (tedit 5B154A07) (tstamp 5EDE22E0)
     (at 243.84 76.835)
     (descr "Harwin Male Horizontal Surface Mount Single Row 2.54mm (0.1 inch) Pitch PCB Connector, M20-89012xx, 12 Pins per row (https://cdn.harwin.com/pdfs/M20-890.pdf), generated with kicad-footprint-generator")
     (tags "connector Harwin M20-890 horizontal")
@@ -434,93 +432,16 @@
     )
   )
 
-  (module Keebio:MX-Alps-Choc-1U-NoLED (layer F.Cu) (tedit 5ED4173D) (tstamp 5ED28737)
-    (at 152.4 53.975)
-    (path /5DF62207)
-    (fp_text reference SW7 (at 0 3.175) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value SW_Push (at 0 -7.9375) (layer Dwgs.User)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start 5 -7) (end 7 -7) (layer Dwgs.User) (width 0.15))
-    (fp_line (start 7 -7) (end 7 -5) (layer Dwgs.User) (width 0.15))
-    (fp_line (start 5 7) (end 7 7) (layer Dwgs.User) (width 0.15))
-    (fp_line (start 7 7) (end 7 5) (layer Dwgs.User) (width 0.15))
-    (fp_line (start -7 5) (end -7 7) (layer Dwgs.User) (width 0.15))
-    (fp_line (start -7 7) (end -5 7) (layer Dwgs.User) (width 0.15))
-    (fp_line (start -5 -7) (end -7 -7) (layer Dwgs.User) (width 0.15))
-    (fp_line (start -7 -7) (end -7 -5) (layer Dwgs.User) (width 0.15))
-    (fp_line (start -9.525 -9.525) (end 9.525 -9.525) (layer Dwgs.User) (width 0.15))
-    (fp_line (start 9.525 -9.525) (end 9.525 9.525) (layer Dwgs.User) (width 0.15))
-    (fp_line (start 9.525 9.525) (end -9.525 9.525) (layer Dwgs.User) (width 0.15))
-    (fp_line (start -9.525 9.525) (end -9.525 -9.525) (layer Dwgs.User) (width 0.15))
-    (pad 1 thru_hole oval (at 2.5 -4.5 86.1) (size 2.831378 2.25) (drill 1.47 (offset 0.290689 0)) (layers *.Cu *.Mask)
-      (net 48 "Net-(D9-Pad2)"))
-    (pad 1 thru_hole circle (at 2.54 -5.08) (size 2.25 2.25) (drill 1.47) (layers *.Cu *.Mask)
-      (net 48 "Net-(D9-Pad2)"))
-    (pad 2 thru_hole oval (at -3.81 -2.54 48.1) (size 4.211556 2.25) (drill 1.47 (offset 0.980778 0)) (layers *.Cu *.Mask)
-      (net 31 COL3))
-    (pad "" np_thru_hole circle (at 0 0) (size 3.9878 3.9878) (drill 3.9878) (layers *.Cu *.Mask))
-    (pad 2 thru_hole circle (at -2.5 -4) (size 2.25 2.25) (drill 1.47) (layers *.Cu *.Mask)
-      (net 31 COL3))
-    (pad "" np_thru_hole circle (at -5.08 0 48.0996) (size 1.75 1.75) (drill 1.75) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at 5.08 0 48.0996) (size 1.75 1.75) (drill 1.75) (layers *.Cu *.Mask))
-    (pad 1 thru_hole circle (at 5 -3.8) (size 2 2) (drill 1.2) (layers *.Cu *.Mask)
-      (net 48 "Net-(D9-Pad2)"))
-    (pad 2 thru_hole circle (at 0 -5.9) (size 2 2) (drill 1.2) (layers *.Cu *.Mask)
-      (net 31 COL3))
-    (pad "" np_thru_hole circle (at -5.5 0 48.1) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at 5.5 0 48.1) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at -5.22 4.2 48.1) (size 1.2 1.2) (drill 1.2) (layers *.Cu *.Mask))
-  )
-
-  (module Keebio:TRRS-PJ-320A-no-Fmask (layer F.Cu) (tedit 5CD25241) (tstamp 5ED44B30)
-    (at 237.363 48.26)
-    (path /5ED45338)
-    (fp_text reference J2 (at 0 5.715) (layer Dwgs.User)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value AudioJack4 (at 0 -5.6) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start 3.05 0) (end -3.05 0) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.05 12.1) (end -3.05 12.1) (layer F.SilkS) (width 0.15))
-    (fp_line (start 3.05 0) (end 3.05 12.1) (layer F.SilkS) (width 0.15))
-    (fp_line (start -3.05 0) (end -3.05 12.1) (layer F.SilkS) (width 0.15))
-    (fp_line (start 2.8 0) (end 2.8 -2) (layer F.SilkS) (width 0.15))
-    (fp_line (start -2.8 0) (end -2.8 -2) (layer F.SilkS) (width 0.15))
-    (fp_line (start 2.8 -2) (end -2.8 -2) (layer F.SilkS) (width 0.15))
-    (pad 1 thru_hole oval (at -2.3 11.3) (size 1 1.4) (drill oval 0.9 1.3) (layers *.Cu F.Mask)
-      (net 1 GND))
-    (pad 2 thru_hole oval (at 2.3 10.2) (size 1 1.4) (drill oval 0.9 1.3) (layers *.Cu F.Mask)
-      (net 2 5V))
-    (pad 3 thru_hole oval (at 2.3 6.2) (size 1 1.4) (drill oval 0.9 1.3) (layers *.Cu F.Mask)
-      (net 59 TX))
-    (pad 4 thru_hole oval (at 2.3 3.2) (size 1 1.4) (drill oval 0.9 1.3) (layers *.Cu F.Mask)
-      (net 60 RX))
-    (pad 3 thru_hole oval (at 2.3 6.2) (size 1.6 2) (drill oval 0.9 1.3) (layers *.Cu B.Mask)
-      (net 59 TX))
-    (pad "" np_thru_hole circle (at 0 1.6) (size 0.8 0.8) (drill 0.8) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at 0 8.6) (size 0.8 0.8) (drill 0.8) (layers *.Cu *.Mask))
-    (pad 4 thru_hole oval (at 2.3 3.2) (size 1.6 2) (drill oval 0.9 1.3) (layers *.Cu B.Mask)
-      (net 60 RX))
-    (pad 2 thru_hole oval (at 2.3 10.2) (size 1.6 2) (drill oval 0.9 1.3) (layers *.Cu B.Mask)
-      (net 2 5V))
-    (pad 1 thru_hole oval (at -2.3 11.3) (size 1.6 2) (drill oval 0.9 1.3) (layers *.Cu B.Mask)
-      (net 1 GND))
-  )
-
-  (module Button_Switch_SMD:SW_SPST_CK_RS282G05A3 (layer F.Cu) (tedit 5ED41E5C) (tstamp 5ED28B0C)
+  (module Button_Switch_SMD:SW_SPST_CK_RS282G05A3 (layer F.Cu) (tedit 5A7A67D2) (tstamp 5ED28B0C)
     (at 230.759 81.534 90)
     (descr https://www.mouser.com/ds/2/60/RS-282G05A-SM_RT-1159762.pdf)
     (tags "SPST button tactile switch")
     (path /5DECE105)
     (attr smd)
-    (fp_text reference SW1 (at 0 -2.6 90) (layer F.Fab) hide
+    (fp_text reference SW1 (at 0 -2.6 90) (layer F.SilkS) hide
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value BOOT (at 0 3 90) (layer F.SilkS)
+    (fp_text value BOOT (at 0 3 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_line (start 3 -1.8) (end 3 1.8) (layer F.Fab) (width 0.1))
@@ -557,45 +478,45 @@
     )
   )
 
-  (module Button_Switch_SMD:SW_SPST_CK_RS282G05A3 (layer F.Cu) (tedit 5ED2E931) (tstamp 5ED28AF1)
+  (module Button_Switch_SMD:SW_SPST_CK_RS282G05A3 (layer F.Cu) (tedit 5A7A67D2) (tstamp 5ED28AF1)
     (at 224.663 81.534 90)
     (descr https://www.mouser.com/ds/2/60/RS-282G05A-SM_RT-1159762.pdf)
     (tags "SPST button tactile switch")
     (path /5DECA090)
     (attr smd)
-    (fp_text reference SW2 (at 0 -2.6 90) (layer F.Fab)
+    (fp_text reference SW2 (at 0 -2.6 90) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value RESET (at 0 3 90) (layer F.SilkS)
+    (fp_text value RESET (at 0 3 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start -4.9 2.05) (end -4.9 -2.05) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 4.9 2.05) (end -4.9 2.05) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 4.9 -2.05) (end 4.9 2.05) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -4.9 -2.05) (end 4.9 -2.05) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 3 -1.8) (end 3 1.8) (layer F.Fab) (width 0.1))
+    (fp_line (start -3 -1.8) (end -3 1.8) (layer F.Fab) (width 0.1))
+    (fp_line (start -3 -1.8) (end 3 -1.8) (layer F.Fab) (width 0.1))
+    (fp_line (start -3 1.8) (end 3 1.8) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.5 -0.8) (end -1.5 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.5 -0.8) (end 1.5 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.5 -0.8) (end 1.5 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.5 0.8) (end 1.5 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start -3.06 1.85) (end -3.06 -1.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.06 1.85) (end -3.06 1.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.06 -1.85) (end 3.06 1.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -3.06 -1.85) (end 3.06 -1.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.75 1) (end -1.75 -1) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.75 1) (end -1.75 1) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.75 -1) (end 1.75 1) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.75 -1) (end 1.75 -1) (layer F.Fab) (width 0.1))
     (fp_text user %R (at 0 -2.6 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start -1.75 -1) (end 1.75 -1) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.75 -1) (end 1.75 1) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.75 1) (end -1.75 1) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.75 1) (end -1.75 -1) (layer F.Fab) (width 0.1))
-    (fp_line (start -3.06 -1.85) (end 3.06 -1.85) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.06 -1.85) (end 3.06 1.85) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.06 1.85) (end -3.06 1.85) (layer F.SilkS) (width 0.12))
-    (fp_line (start -3.06 1.85) (end -3.06 -1.85) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.5 0.8) (end 1.5 0.8) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.5 -0.8) (end 1.5 -0.8) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.5 -0.8) (end 1.5 0.8) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.5 -0.8) (end -1.5 0.8) (layer F.Fab) (width 0.1))
-    (fp_line (start -3 1.8) (end 3 1.8) (layer F.Fab) (width 0.1))
-    (fp_line (start -3 -1.8) (end 3 -1.8) (layer F.Fab) (width 0.1))
-    (fp_line (start -3 -1.8) (end -3 1.8) (layer F.Fab) (width 0.1))
-    (fp_line (start 3 -1.8) (end 3 1.8) (layer F.Fab) (width 0.1))
-    (pad 1 smd rect (at -3.9 0 90) (size 1.5 1.5) (layers F.Cu F.Paste F.Mask)
-      (net 1 GND))
+    (fp_line (start -4.9 -2.05) (end 4.9 -2.05) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 4.9 -2.05) (end 4.9 2.05) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 4.9 2.05) (end -4.9 2.05) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -4.9 2.05) (end -4.9 -2.05) (layer F.CrtYd) (width 0.05))
     (pad 2 smd rect (at 3.9 0 90) (size 1.5 1.5) (layers F.Cu F.Paste F.Mask)
       (net 14 "Net-(C1-Pad2)"))
+    (pad 1 smd rect (at -3.9 0 90) (size 1.5 1.5) (layers F.Cu F.Paste F.Mask)
+      (net 1 GND))
     (model ${KISYS3DMOD}/Button_Switch_SMD.3dshapes/SW_SPST_CK_RS282G05A3.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -603,35 +524,35 @@
     )
   )
 
-  (module Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder (layer F.Cu) (tedit 5ED41E09) (tstamp 5ED28AD6)
+  (module Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder (layer F.Cu) (tedit 5B36C52B) (tstamp 5ED28AD6)
     (at 221.107 59.182)
     (descr "Capacitor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
     (tags "capacitor handsolder")
     (path /5DEC3DF1)
     (attr smd)
-    (fp_text reference C7 (at 0 -1.65) (layer F.Fab) hide
+    (fp_text reference C7 (at 0 -1.65) (layer F.SilkS) hide
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 1µF (at 0 -1.65) (layer F.SilkS)
+    (fp_text value 1µF (at 0 -1.65) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start -1 0.6) (end -1 -0.6) (layer F.Fab) (width 0.1))
-    (fp_line (start -1 -0.6) (end 1 -0.6) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 -0.6) (end 1 0.6) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 0.6) (end -1 0.6) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.261252 -0.71) (end 0.261252 -0.71) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.261252 0.71) (end 0.261252 0.71) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
     (fp_text user %R (at 0 0) (layer F.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)))
     )
-    (pad 1 smd roundrect (at -1.025 0) (size 1.15 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.217391)
-      (net 1 GND))
+    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.261252 0.71) (end 0.261252 0.71) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.261252 -0.71) (end 0.261252 -0.71) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1 0.6) (end -1 0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 -0.6) (end 1 0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 -0.6) (end 1 -0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 0.6) (end -1 -0.6) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 1.025 0) (size 1.15 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.217391)
       (net 2 5V))
+    (pad 1 smd roundrect (at -1.025 0) (size 1.15 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.217391)
+      (net 1 GND))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0805_2012Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -639,16 +560,16 @@
     )
   )
 
-  (module Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder (layer F.Cu) (tedit 5ED41B05) (tstamp 5ED28AC5)
+  (module Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder (layer F.Cu) (tedit 5B36C52B) (tstamp 5ED28AC5)
     (at 225.044 63.246 270)
     (descr "Capacitor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
     (tags "capacitor handsolder")
     (path /5DEC3D7E)
     (attr smd)
-    (fp_text reference C5 (at 0 -1.65 270) (layer F.Fab)
+    (fp_text reference C5 (at 0 -1.65 270) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 100nF (at 0 1.65 270) (layer F.SilkS)
+    (fp_text value 100nF (at 0 1.65 270) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text user %R (at 0 0 270) (layer F.Fab)
@@ -675,7 +596,7 @@
     )
   )
 
-  (module Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder (layer F.Cu) (tedit 5ED41EB2) (tstamp 5ED35814)
+  (module Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder (layer F.Cu) (tedit 5B36C52B) (tstamp 5ED35814)
     (at 222.123 71.12 270)
     (descr "Capacitor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
     (tags "capacitor handsolder")
@@ -684,26 +605,26 @@
     (fp_text reference C4 (at 0 -1.65 270) (layer F.SilkS) hide
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 100nF (at 0 1.65 270) (layer F.SilkS)
+    (fp_text value 100nF (at 0 1.65 270) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start -1 0.6) (end -1 -0.6) (layer F.Fab) (width 0.1))
-    (fp_line (start -1 -0.6) (end 1 -0.6) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 -0.6) (end 1 0.6) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 0.6) (end -1 0.6) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.261252 -0.71) (end 0.261252 -0.71) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.261252 0.71) (end 0.261252 0.71) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
     (fp_text user %R (at 0 0 270) (layer F.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)))
     )
-    (pad 1 smd roundrect (at -1.025 0 270) (size 1.15 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.217391)
-      (net 1 GND))
+    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.261252 0.71) (end 0.261252 0.71) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.261252 -0.71) (end 0.261252 -0.71) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1 0.6) (end -1 0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 -0.6) (end 1 0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 -0.6) (end 1 -0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 0.6) (end -1 -0.6) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 1.025 0 270) (size 1.15 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.217391)
       (net 10 3.3V))
+    (pad 1 smd roundrect (at -1.025 0 270) (size 1.15 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.217391)
+      (net 1 GND))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0805_2012Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -711,16 +632,16 @@
     )
   )
 
-  (module Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder (layer F.Cu) (tedit 5ED41AA3) (tstamp 5ED28AA3)
+  (module Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder (layer F.Cu) (tedit 5B36C52B) (tstamp 5ED28AA3)
     (at 234.315 75.438 90)
     (descr "Capacitor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
     (tags "capacitor handsolder")
     (path /5DEC3CF5)
     (attr smd)
-    (fp_text reference C3 (at 0 -1.65 90) (layer F.Fab)
+    (fp_text reference C3 (at 0 -1.65 90) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 100nF (at 0 1.65 90) (layer F.SilkS)
+    (fp_text value 100nF (at 0 1.65 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text user %R (at 0 0 90) (layer F.Fab)
@@ -747,35 +668,35 @@
     )
   )
 
-  (module Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder (layer F.Cu) (tedit 5ED41AC8) (tstamp 5ED28A92)
+  (module Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder (layer F.Cu) (tedit 5B36C52B) (tstamp 5ED28A92)
     (at 221.107 65.278)
     (descr "Capacitor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
     (tags "capacitor handsolder")
     (path /5DEE73ED)
     (attr smd)
-    (fp_text reference C6 (at 0 -1.65) (layer F.Fab)
+    (fp_text reference C6 (at 0 -1.65) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 1µF (at 0 1.65) (layer F.SilkS)
+    (fp_text value 1µF (at 0 1.65) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start -1 0.6) (end -1 -0.6) (layer F.Fab) (width 0.1))
-    (fp_line (start -1 -0.6) (end 1 -0.6) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 -0.6) (end 1 0.6) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 0.6) (end -1 0.6) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.261252 -0.71) (end 0.261252 -0.71) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.261252 0.71) (end 0.261252 0.71) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
     (fp_text user %R (at 0 0) (layer F.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)))
     )
-    (pad 1 smd roundrect (at -1.025 0) (size 1.15 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.217391)
-      (net 1 GND))
+    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.261252 0.71) (end 0.261252 0.71) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.261252 -0.71) (end 0.261252 -0.71) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1 0.6) (end -1 0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 -0.6) (end 1 0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 -0.6) (end 1 -0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 0.6) (end -1 -0.6) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 1.025 0) (size 1.15 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.217391)
       (net 10 3.3V))
+    (pad 1 smd roundrect (at -1.025 0) (size 1.15 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.217391)
+      (net 1 GND))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0805_2012Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -783,7 +704,7 @@
     )
   )
 
-  (module Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder (layer F.Cu) (tedit 5ED41E7B) (tstamp 5ED28A81)
+  (module Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder (layer F.Cu) (tedit 5B36C52B) (tstamp 5ED28A81)
     (at 220.726 78.613 90)
     (descr "Capacitor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
     (tags "capacitor handsolder")
@@ -792,7 +713,7 @@
     (fp_text reference C1 (at 0 -1.65 90) (layer F.SilkS) hide
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 100nF (at 0 -1.65 90) (layer F.SilkS)
+    (fp_text value 100nF (at 0 -1.65 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text user %R (at 0 0 90) (layer F.Fab)
@@ -819,35 +740,35 @@
     )
   )
 
-  (module Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder (layer F.Cu) (tedit 5ED41A8F) (tstamp 5ED31C93)
+  (module Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder (layer F.Cu) (tedit 5B36C52B) (tstamp 5ED31C93)
     (at 234.823 63.754 90)
     (descr "Capacitor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
     (tags "capacitor handsolder")
     (path /5DEC3C77)
     (attr smd)
-    (fp_text reference C2 (at 0 -1.65 90) (layer F.Fab)
+    (fp_text reference C2 (at 0 -1.65 90) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 100nF (at 0 1.65 90) (layer F.SilkS)
+    (fp_text value 100nF (at 0 1.65 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start -1 0.6) (end -1 -0.6) (layer F.Fab) (width 0.1))
-    (fp_line (start -1 -0.6) (end 1 -0.6) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 -0.6) (end 1 0.6) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 0.6) (end -1 0.6) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.261252 -0.71) (end 0.261252 -0.71) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.261252 0.71) (end 0.261252 0.71) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
     (fp_text user %R (at 0 0 90) (layer F.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)))
     )
-    (pad 1 smd roundrect (at -1.025 0 90) (size 1.15 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.217391)
-      (net 1 GND))
+    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.261252 0.71) (end 0.261252 0.71) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.261252 -0.71) (end 0.261252 -0.71) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1 0.6) (end -1 0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 -0.6) (end 1 0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 -0.6) (end 1 -0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 0.6) (end -1 -0.6) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 1.025 0 90) (size 1.15 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.217391)
       (net 10 3.3V))
+    (pad 1 smd roundrect (at -1.025 0 90) (size 1.15 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.217391)
+      (net 1 GND))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0805_2012Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -855,13 +776,13 @@
     )
   )
 
-  (module Diode_SMD:D_SOD-323_HandSoldering locked (layer F.Cu) (tedit 5ED41480) (tstamp 5ED28A5F)
+  (module Diode_SMD:D_SOD-323_HandSoldering locked (layer F.Cu) (tedit 58641869) (tstamp 5ED28A5F)
     (at 233.75944 101.544927 270)
     (descr SOD-323)
     (tags SOD-323)
     (path /5DFEF7D2)
     (attr smd)
-    (fp_text reference D16 (at 0 -1.85 270) (layer F.Fab)
+    (fp_text reference D16 (at 0 -1.85 270) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value D3.6 (at 0.1 1.9 270) (layer F.Fab)
@@ -898,42 +819,42 @@
     )
   )
 
-  (module Diode_SMD:D_SOD-323_HandSoldering locked (layer F.Cu) (tedit 5ED414E3) (tstamp 5ED28A47)
+  (module Diode_SMD:D_SOD-323_HandSoldering locked (layer F.Cu) (tedit 58641869) (tstamp 5ED28A47)
     (at 233.75944 90.368927 270)
     (descr SOD-323)
     (tags SOD-323)
     (path /5DFEF80A)
     (attr smd)
-    (fp_text reference D14 (at 0 -1.85 270) (layer F.Fab)
+    (fp_text reference D14 (at 0 -1.85 270) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value D1.6 (at 0.1 1.9 270) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
+    (fp_line (start -1.9 -0.85) (end 1.25 -0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.9 0.85) (end 1.25 0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2 -0.95) (end -2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2 -0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 -0.95) (end 2 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.9 -0.7) (end 0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 -0.7) (end 0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 0.7) (end -0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 0.7) (end -0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 -0.35) (end -0.3 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end -0.5 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end 0.2 -0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 -0.35) (end 0.2 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0.35) (end -0.3 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0) (end 0.45 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.9 -0.85) (end -1.9 0.85) (layer F.SilkS) (width 0.12))
     (fp_text user %R (at 0 -1.85 270) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start -1.9 -0.85) (end -1.9 0.85) (layer F.SilkS) (width 0.12))
-    (fp_line (start 0.2 0) (end 0.45 0) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.2 0.35) (end -0.3 0) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.2 -0.35) (end 0.2 0.35) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.3 0) (end 0.2 -0.35) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.3 0) (end -0.5 0) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.3 -0.35) (end -0.3 0.35) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.9 0.7) (end -0.9 -0.7) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.9 0.7) (end -0.9 0.7) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.9 -0.7) (end 0.9 0.7) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.9 -0.7) (end 0.9 -0.7) (layer F.Fab) (width 0.1))
-    (fp_line (start -2 -0.95) (end 2 -0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 2 -0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2 0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2 -0.95) (end -2 0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.9 0.85) (end 1.25 0.85) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.9 -0.85) (end 1.25 -0.85) (layer F.SilkS) (width 0.12))
-    (pad 1 smd rect (at -1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
-      (net 23 ROW1))
     (pad 2 smd rect (at 1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
       (net 39 "Net-(D14-Pad2)"))
+    (pad 1 smd rect (at -1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 23 ROW1))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_SOD-323.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -941,13 +862,13 @@
     )
   )
 
-  (module Diode_SMD:D_SOD-323_HandSoldering locked (layer F.Cu) (tedit 5ED414BA) (tstamp 5ED28A2F)
+  (module Diode_SMD:D_SOD-323_HandSoldering locked (layer F.Cu) (tedit 58641869) (tstamp 5ED28A2F)
     (at 227.66344 107.132927 270)
     (descr SOD-323)
     (tags SOD-323)
     (path /5DF621D6)
     (attr smd)
-    (fp_text reference D12 (at 0 -1.85 270) (layer F.Fab)
+    (fp_text reference D12 (at 0 -1.85 270) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value D4.3 (at 0.1 1.9 270) (layer F.Fab)
@@ -984,42 +905,42 @@
     )
   )
 
-  (module Diode_SMD:D_SOD-323_HandSoldering locked (layer F.Cu) (tedit 5ED4149A) (tstamp 5ED28A17)
+  (module Diode_SMD:D_SOD-323_HandSoldering locked (layer F.Cu) (tedit 58641869) (tstamp 5ED28A17)
     (at 227.66344 101.544927 270)
     (descr SOD-323)
     (tags SOD-323)
     (path /5DF621C8)
     (attr smd)
-    (fp_text reference D11 (at 0 -1.85 270) (layer F.Fab)
+    (fp_text reference D11 (at 0 -1.85 270) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value D3.3 (at 0.1 1.9 270) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
+    (fp_line (start -1.9 -0.85) (end 1.25 -0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.9 0.85) (end 1.25 0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2 -0.95) (end -2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2 -0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 -0.95) (end 2 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.9 -0.7) (end 0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 -0.7) (end 0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 0.7) (end -0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 0.7) (end -0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 -0.35) (end -0.3 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end -0.5 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end 0.2 -0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 -0.35) (end 0.2 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0.35) (end -0.3 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0) (end 0.45 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.9 -0.85) (end -1.9 0.85) (layer F.SilkS) (width 0.12))
     (fp_text user %R (at 0 -1.85 270) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start -1.9 -0.85) (end -1.9 0.85) (layer F.SilkS) (width 0.12))
-    (fp_line (start 0.2 0) (end 0.45 0) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.2 0.35) (end -0.3 0) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.2 -0.35) (end 0.2 0.35) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.3 0) (end 0.2 -0.35) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.3 0) (end -0.5 0) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.3 -0.35) (end -0.3 0.35) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.9 0.7) (end -0.9 -0.7) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.9 0.7) (end -0.9 0.7) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.9 -0.7) (end 0.9 0.7) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.9 -0.7) (end 0.9 -0.7) (layer F.Fab) (width 0.1))
-    (fp_line (start -2 -0.95) (end 2 -0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 2 -0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2 0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2 -0.95) (end -2 0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.9 0.85) (end 1.25 0.85) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.9 -0.85) (end 1.25 -0.85) (layer F.SilkS) (width 0.12))
-    (pad 1 smd rect (at -1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
-      (net 25 ROW3))
     (pad 2 smd rect (at 1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
       (net 58 "Net-(D11-Pad2)"))
+    (pad 1 smd rect (at -1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 25 ROW3))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_SOD-323.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1027,13 +948,13 @@
     )
   )
 
-  (module Diode_SMD:D_SOD-323_HandSoldering locked (layer F.Cu) (tedit 5ED4145E) (tstamp 5ED289FF)
+  (module Diode_SMD:D_SOD-323_HandSoldering locked (layer F.Cu) (tedit 58641869) (tstamp 5ED289FF)
     (at 227.66344 95.956927 270)
     (descr SOD-323)
     (tags SOD-323)
     (path /5DF621F2)
     (attr smd)
-    (fp_text reference D10 (at 0 -1.85 270) (layer F.Fab)
+    (fp_text reference D10 (at 0 -1.85 270) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value D2.3 (at 0.1 1.9 270) (layer F.Fab)
@@ -1070,42 +991,42 @@
     )
   )
 
-  (module Diode_SMD:D_SOD-323_HandSoldering locked (layer F.Cu) (tedit 5ED41510) (tstamp 5ED289E7)
+  (module Diode_SMD:D_SOD-323_HandSoldering locked (layer F.Cu) (tedit 58641869) (tstamp 5ED289E7)
     (at 227.66344 90.368927 270)
     (descr SOD-323)
     (tags SOD-323)
     (path /5DF62200)
     (attr smd)
-    (fp_text reference D9 (at 0 -1.85 270) (layer F.Fab)
+    (fp_text reference D9 (at 0 -1.85 270) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value D1.3 (at 0.1 1.9 270) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
+    (fp_line (start -1.9 -0.85) (end 1.25 -0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.9 0.85) (end 1.25 0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2 -0.95) (end -2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2 -0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 -0.95) (end 2 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.9 -0.7) (end 0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 -0.7) (end 0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 0.7) (end -0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 0.7) (end -0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 -0.35) (end -0.3 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end -0.5 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end 0.2 -0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 -0.35) (end 0.2 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0.35) (end -0.3 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0) (end 0.45 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.9 -0.85) (end -1.9 0.85) (layer F.SilkS) (width 0.12))
     (fp_text user %R (at 0 -1.85 270) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start -1.9 -0.85) (end -1.9 0.85) (layer F.SilkS) (width 0.12))
-    (fp_line (start 0.2 0) (end 0.45 0) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.2 0.35) (end -0.3 0) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.2 -0.35) (end 0.2 0.35) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.3 0) (end 0.2 -0.35) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.3 0) (end -0.5 0) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.3 -0.35) (end -0.3 0.35) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.9 0.7) (end -0.9 -0.7) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.9 0.7) (end -0.9 0.7) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.9 -0.7) (end 0.9 0.7) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.9 -0.7) (end 0.9 -0.7) (layer F.Fab) (width 0.1))
-    (fp_line (start -2 -0.95) (end 2 -0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 2 -0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2 0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2 -0.95) (end -2 0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.9 0.85) (end 1.25 0.85) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.9 -0.85) (end 1.25 -0.85) (layer F.SilkS) (width 0.12))
-    (pad 1 smd rect (at -1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
-      (net 23 ROW1))
     (pad 2 smd rect (at 1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
       (net 48 "Net-(D9-Pad2)"))
+    (pad 1 smd rect (at -1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 23 ROW1))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_SOD-323.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1113,13 +1034,13 @@
     )
   )
 
-  (module Diode_SMD:D_SOD-323_HandSoldering locked (layer F.Cu) (tedit 5ED414AF) (tstamp 5ED289CF)
+  (module Diode_SMD:D_SOD-323_HandSoldering locked (layer F.Cu) (tedit 58641869) (tstamp 5ED289CF)
     (at 223.59944 101.544927 270)
     (descr SOD-323)
     (tags SOD-323)
     (path /5DFE6378)
     (attr smd)
-    (fp_text reference D7 (at 0 -1.85 270) (layer F.Fab)
+    (fp_text reference D7 (at 0 -1.85 270) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value D3.1 (at 0.1 1.9 270) (layer F.Fab)
@@ -1156,42 +1077,42 @@
     )
   )
 
-  (module Diode_SMD:D_SOD-323_HandSoldering locked (layer F.Cu) (tedit 5ED41475) (tstamp 5ED289B7)
+  (module Diode_SMD:D_SOD-323_HandSoldering locked (layer F.Cu) (tedit 58641869) (tstamp 5ED289B7)
     (at 223.59944 95.956927 270)
     (descr SOD-323)
     (tags SOD-323)
     (path /5DFE63A2)
     (attr smd)
-    (fp_text reference D6 (at 0 -1.85 270) (layer F.Fab)
+    (fp_text reference D6 (at 0 -1.85 270) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value D2.1 (at 0.1 1.9 270) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
+    (fp_line (start -1.9 -0.85) (end 1.25 -0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.9 0.85) (end 1.25 0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2 -0.95) (end -2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2 -0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 -0.95) (end 2 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.9 -0.7) (end 0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 -0.7) (end 0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 0.7) (end -0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 0.7) (end -0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 -0.35) (end -0.3 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end -0.5 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end 0.2 -0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 -0.35) (end 0.2 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0.35) (end -0.3 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0) (end 0.45 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.9 -0.85) (end -1.9 0.85) (layer F.SilkS) (width 0.12))
     (fp_text user %R (at 0 -1.85 270) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start -1.9 -0.85) (end -1.9 0.85) (layer F.SilkS) (width 0.12))
-    (fp_line (start 0.2 0) (end 0.45 0) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.2 0.35) (end -0.3 0) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.2 -0.35) (end 0.2 0.35) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.3 0) (end 0.2 -0.35) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.3 0) (end -0.5 0) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.3 -0.35) (end -0.3 0.35) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.9 0.7) (end -0.9 -0.7) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.9 0.7) (end -0.9 0.7) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.9 -0.7) (end 0.9 0.7) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.9 -0.7) (end 0.9 -0.7) (layer F.Fab) (width 0.1))
-    (fp_line (start -2 -0.95) (end 2 -0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 2 -0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2 0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2 -0.95) (end -2 0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.9 0.85) (end 1.25 0.85) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.9 -0.85) (end 1.25 -0.85) (layer F.SilkS) (width 0.12))
-    (pad 1 smd rect (at -1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
-      (net 24 ROW2))
     (pad 2 smd rect (at 1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
       (net 51 "Net-(D6-Pad2)"))
+    (pad 1 smd rect (at -1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 24 ROW2))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_SOD-323.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1199,13 +1120,13 @@
     )
   )
 
-  (module Diode_SMD:D_SOD-323_HandSoldering locked (layer F.Cu) (tedit 5ED41533) (tstamp 5ED2899F)
+  (module Diode_SMD:D_SOD-323_HandSoldering locked (layer F.Cu) (tedit 58641869) (tstamp 5ED2899F)
     (at 223.59944 90.368927 270)
     (descr SOD-323)
     (tags SOD-323)
     (path /5DFE63B0)
     (attr smd)
-    (fp_text reference D5 (at 0 -1.85 270) (layer F.Fab)
+    (fp_text reference D5 (at 0 -1.85 270) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value D1.1 (at 0.1 1.9 270) (layer F.Fab)
@@ -1242,42 +1163,42 @@
     )
   )
 
-  (module Diode_SMD:D_SOD-323_HandSoldering locked (layer F.Cu) (tedit 5ED414CA) (tstamp 5ED28987)
+  (module Diode_SMD:D_SOD-323_HandSoldering locked (layer F.Cu) (tedit 58641869) (tstamp 5ED28987)
     (at 231.72744 107.132927 270)
     (descr SOD-323)
     (tags SOD-323)
     (path /5DFE3E98)
     (attr smd)
-    (fp_text reference D36 (at 0 -1.85 270) (layer F.Fab)
+    (fp_text reference D36 (at 0 -1.85 270) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value D4.5 (at 0.1 1.9 270) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
+    (fp_line (start -1.9 -0.85) (end 1.25 -0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.9 0.85) (end 1.25 0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2 -0.95) (end -2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2 -0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 -0.95) (end 2 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.9 -0.7) (end 0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 -0.7) (end 0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 0.7) (end -0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 0.7) (end -0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 -0.35) (end -0.3 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end -0.5 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end 0.2 -0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 -0.35) (end 0.2 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0.35) (end -0.3 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0) (end 0.45 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.9 -0.85) (end -1.9 0.85) (layer F.SilkS) (width 0.12))
     (fp_text user %R (at 0 -1.85 270) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start -1.9 -0.85) (end -1.9 0.85) (layer F.SilkS) (width 0.12))
-    (fp_line (start 0.2 0) (end 0.45 0) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.2 0.35) (end -0.3 0) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.2 -0.35) (end 0.2 0.35) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.3 0) (end 0.2 -0.35) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.3 0) (end -0.5 0) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.3 -0.35) (end -0.3 0.35) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.9 0.7) (end -0.9 -0.7) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.9 0.7) (end -0.9 0.7) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.9 -0.7) (end 0.9 0.7) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.9 -0.7) (end 0.9 -0.7) (layer F.Fab) (width 0.1))
-    (fp_line (start -2 -0.95) (end 2 -0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 2 -0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2 0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2 -0.95) (end -2 0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.9 0.85) (end 1.25 0.85) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.9 -0.85) (end 1.25 -0.85) (layer F.SilkS) (width 0.12))
-    (pad 1 smd rect (at -1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
-      (net 26 ROW4))
     (pad 2 smd rect (at 1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
       (net 57 "Net-(D36-Pad2)"))
+    (pad 1 smd rect (at -1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 26 ROW4))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_SOD-323.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1285,13 +1206,13 @@
     )
   )
 
-  (module Diode_SMD:D_SOD-323_HandSoldering locked (layer F.Cu) (tedit 5ED41437) (tstamp 5ED2896F)
+  (module Diode_SMD:D_SOD-323_HandSoldering locked (layer F.Cu) (tedit 58641869) (tstamp 5ED2896F)
     (at 233.75944 95.956927 270)
     (descr SOD-323)
     (tags SOD-323)
     (path /5DFEF7FC)
     (attr smd)
-    (fp_text reference D15 (at 0 -1.85 270) (layer F.Fab)
+    (fp_text reference D15 (at 0 -1.85 270) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value D2.6 (at 0.1 1.9 270) (layer F.Fab)
@@ -1328,42 +1249,42 @@
     )
   )
 
-  (module Diode_SMD:D_SOD-323_HandSoldering locked (layer F.Cu) (tedit 5ED41487) (tstamp 5ED32548)
+  (module Diode_SMD:D_SOD-323_HandSoldering locked (layer F.Cu) (tedit 58641869) (tstamp 5ED32548)
     (at 231.72744 101.544927 270)
     (descr SOD-323)
     (tags SOD-323)
     (path /5DFE3E8A)
     (attr smd)
-    (fp_text reference D35 (at 0 -1.85 270) (layer F.Fab)
+    (fp_text reference D35 (at 0 -1.85 270) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value D3.5 (at 0.1 1.9 270) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
+    (fp_line (start -1.9 -0.85) (end 1.25 -0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.9 0.85) (end 1.25 0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2 -0.95) (end -2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2 -0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 -0.95) (end 2 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.9 -0.7) (end 0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 -0.7) (end 0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 0.7) (end -0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 0.7) (end -0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 -0.35) (end -0.3 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end -0.5 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end 0.2 -0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 -0.35) (end 0.2 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0.35) (end -0.3 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0) (end 0.45 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.9 -0.85) (end -1.9 0.85) (layer F.SilkS) (width 0.12))
     (fp_text user %R (at 0 -1.85 270) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start -1.9 -0.85) (end -1.9 0.85) (layer F.SilkS) (width 0.12))
-    (fp_line (start 0.2 0) (end 0.45 0) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.2 0.35) (end -0.3 0) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.2 -0.35) (end 0.2 0.35) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.3 0) (end 0.2 -0.35) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.3 0) (end -0.5 0) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.3 -0.35) (end -0.3 0.35) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.9 0.7) (end -0.9 -0.7) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.9 0.7) (end -0.9 0.7) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.9 -0.7) (end 0.9 0.7) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.9 -0.7) (end 0.9 -0.7) (layer F.Fab) (width 0.1))
-    (fp_line (start -2 -0.95) (end 2 -0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 2 -0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2 0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2 -0.95) (end -2 0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.9 0.85) (end 1.25 0.85) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.9 -0.85) (end 1.25 -0.85) (layer F.SilkS) (width 0.12))
-    (pad 1 smd rect (at -1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
-      (net 25 ROW3))
     (pad 2 smd rect (at 1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
       (net 56 "Net-(D35-Pad2)"))
+    (pad 1 smd rect (at -1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 25 ROW3))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_SOD-323.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1371,13 +1292,13 @@
     )
   )
 
-  (module Diode_SMD:D_SOD-323_HandSoldering locked (layer F.Cu) (tedit 5ED41444) (tstamp 5ED2893F)
+  (module Diode_SMD:D_SOD-323_HandSoldering locked (layer F.Cu) (tedit 58641869) (tstamp 5ED2893F)
     (at 231.72744 95.956927 270)
     (descr SOD-323)
     (tags SOD-323)
     (path /5DFE3EB4)
     (attr smd)
-    (fp_text reference D34 (at 0 -1.85 270) (layer F.Fab)
+    (fp_text reference D34 (at 0 -1.85 270) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value D2.5 (at 0.1 1.9 270) (layer F.Fab)
@@ -1414,42 +1335,42 @@
     )
   )
 
-  (module Diode_SMD:D_SOD-323_HandSoldering locked (layer F.Cu) (tedit 5ED414F0) (tstamp 5ED28927)
+  (module Diode_SMD:D_SOD-323_HandSoldering locked (layer F.Cu) (tedit 58641869) (tstamp 5ED28927)
     (at 231.72744 90.368927 270)
     (descr SOD-323)
     (tags SOD-323)
     (path /5DFE3EC2)
     (attr smd)
-    (fp_text reference D33 (at 0 -1.85 270) (layer F.Fab)
+    (fp_text reference D33 (at 0 -1.85 270) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value D1.5 (at 0.1 1.9 270) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
+    (fp_line (start -1.9 -0.85) (end 1.25 -0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.9 0.85) (end 1.25 0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2 -0.95) (end -2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2 -0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 -0.95) (end 2 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.9 -0.7) (end 0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 -0.7) (end 0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 0.7) (end -0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 0.7) (end -0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 -0.35) (end -0.3 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end -0.5 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end 0.2 -0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 -0.35) (end 0.2 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0.35) (end -0.3 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0) (end 0.45 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.9 -0.85) (end -1.9 0.85) (layer F.SilkS) (width 0.12))
     (fp_text user %R (at 0 -1.85 270) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start -1.9 -0.85) (end -1.9 0.85) (layer F.SilkS) (width 0.12))
-    (fp_line (start 0.2 0) (end 0.45 0) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.2 0.35) (end -0.3 0) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.2 -0.35) (end 0.2 0.35) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.3 0) (end 0.2 -0.35) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.3 0) (end -0.5 0) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.3 -0.35) (end -0.3 0.35) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.9 0.7) (end -0.9 -0.7) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.9 0.7) (end -0.9 0.7) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.9 -0.7) (end 0.9 0.7) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.9 -0.7) (end 0.9 -0.7) (layer F.Fab) (width 0.1))
-    (fp_line (start -2 -0.95) (end 2 -0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 2 -0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2 0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2 -0.95) (end -2 0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.9 0.85) (end 1.25 0.85) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.9 -0.85) (end 1.25 -0.85) (layer F.SilkS) (width 0.12))
-    (pad 1 smd rect (at -1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
-      (net 23 ROW1))
     (pad 2 smd rect (at 1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
       (net 54 "Net-(D33-Pad2)"))
+    (pad 1 smd rect (at -1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 23 ROW1))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_SOD-323.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1457,13 +1378,13 @@
     )
   )
 
-  (module Diode_SMD:D_SOD-323_HandSoldering locked (layer F.Cu) (tedit 5ED414C2) (tstamp 5ED2890F)
+  (module Diode_SMD:D_SOD-323_HandSoldering locked (layer F.Cu) (tedit 58641869) (tstamp 5ED2890F)
     (at 229.69544 107.132927 270)
     (descr SOD-323)
     (tags SOD-323)
     (path /5DFE23DF)
     (attr smd)
-    (fp_text reference D26 (at 0 -1.85 270) (layer F.Fab)
+    (fp_text reference D26 (at 0 -1.85 270) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value D4.4 (at 0.1 1.9 270) (layer F.Fab)
@@ -1500,42 +1421,42 @@
     )
   )
 
-  (module Diode_SMD:D_SOD-323_HandSoldering locked (layer F.Cu) (tedit 5ED41490) (tstamp 5ED288F7)
+  (module Diode_SMD:D_SOD-323_HandSoldering locked (layer F.Cu) (tedit 58641869) (tstamp 5ED288F7)
     (at 229.69544 101.544927 270)
     (descr SOD-323)
     (tags SOD-323)
     (path /5DFE23D1)
     (attr smd)
-    (fp_text reference D25 (at 0 -1.85 270) (layer F.Fab)
+    (fp_text reference D25 (at 0 -1.85 270) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value D3.4 (at 0.1 1.9 270) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
+    (fp_line (start -1.9 -0.85) (end 1.25 -0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.9 0.85) (end 1.25 0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2 -0.95) (end -2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2 -0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 -0.95) (end 2 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.9 -0.7) (end 0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 -0.7) (end 0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 0.7) (end -0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 0.7) (end -0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 -0.35) (end -0.3 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end -0.5 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end 0.2 -0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 -0.35) (end 0.2 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0.35) (end -0.3 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0) (end 0.45 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.9 -0.85) (end -1.9 0.85) (layer F.SilkS) (width 0.12))
     (fp_text user %R (at 0 -1.85 270) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start -1.9 -0.85) (end -1.9 0.85) (layer F.SilkS) (width 0.12))
-    (fp_line (start 0.2 0) (end 0.45 0) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.2 0.35) (end -0.3 0) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.2 -0.35) (end 0.2 0.35) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.3 0) (end 0.2 -0.35) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.3 0) (end -0.5 0) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.3 -0.35) (end -0.3 0.35) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.9 0.7) (end -0.9 -0.7) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.9 0.7) (end -0.9 0.7) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.9 -0.7) (end 0.9 0.7) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.9 -0.7) (end 0.9 -0.7) (layer F.Fab) (width 0.1))
-    (fp_line (start -2 -0.95) (end 2 -0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 2 -0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2 0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2 -0.95) (end -2 0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.9 0.85) (end 1.25 0.85) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.9 -0.85) (end 1.25 -0.85) (layer F.SilkS) (width 0.12))
-    (pad 1 smd rect (at -1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
-      (net 25 ROW3))
     (pad 2 smd rect (at 1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
       (net 47 "Net-(D25-Pad2)"))
+    (pad 1 smd rect (at -1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 25 ROW3))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_SOD-323.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1543,13 +1464,13 @@
     )
   )
 
-  (module Diode_SMD:D_SOD-323_HandSoldering locked (layer F.Cu) (tedit 5ED41451) (tstamp 5ED288DF)
+  (module Diode_SMD:D_SOD-323_HandSoldering locked (layer F.Cu) (tedit 58641869) (tstamp 5ED288DF)
     (at 229.69544 95.956927 270)
     (descr SOD-323)
     (tags SOD-323)
     (path /5DFE23FB)
     (attr smd)
-    (fp_text reference D24 (at 0 -1.85 270) (layer F.Fab)
+    (fp_text reference D24 (at 0 -1.85 270) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value D2.4 (at 0.1 1.9 270) (layer F.Fab)
@@ -1586,42 +1507,42 @@
     )
   )
 
-  (module Diode_SMD:D_SOD-323_HandSoldering locked (layer F.Cu) (tedit 5ED41504) (tstamp 5ED288C7)
+  (module Diode_SMD:D_SOD-323_HandSoldering locked (layer F.Cu) (tedit 58641869) (tstamp 5ED288C7)
     (at 229.69544 90.368927 270)
     (descr SOD-323)
     (tags SOD-323)
     (path /5DFE2409)
     (attr smd)
-    (fp_text reference D23 (at 0 -1.85 270) (layer F.Fab)
+    (fp_text reference D23 (at 0 -1.85 270) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value D1.4 (at 0.1 1.9 270) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
+    (fp_line (start -1.9 -0.85) (end 1.25 -0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.9 0.85) (end 1.25 0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2 -0.95) (end -2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2 -0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 -0.95) (end 2 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.9 -0.7) (end 0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 -0.7) (end 0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 0.7) (end -0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 0.7) (end -0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 -0.35) (end -0.3 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end -0.5 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end 0.2 -0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 -0.35) (end 0.2 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0.35) (end -0.3 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0) (end 0.45 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.9 -0.85) (end -1.9 0.85) (layer F.SilkS) (width 0.12))
     (fp_text user %R (at 0 -1.85 270) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start -1.9 -0.85) (end -1.9 0.85) (layer F.SilkS) (width 0.12))
-    (fp_line (start 0.2 0) (end 0.45 0) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.2 0.35) (end -0.3 0) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.2 -0.35) (end 0.2 0.35) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.3 0) (end 0.2 -0.35) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.3 0) (end -0.5 0) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.3 -0.35) (end -0.3 0.35) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.9 0.7) (end -0.9 -0.7) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.9 0.7) (end -0.9 0.7) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.9 -0.7) (end 0.9 0.7) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.9 -0.7) (end 0.9 -0.7) (layer F.Fab) (width 0.1))
-    (fp_line (start -2 -0.95) (end 2 -0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 2 -0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2 0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2 -0.95) (end -2 0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.9 0.85) (end 1.25 0.85) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.9 -0.85) (end 1.25 -0.85) (layer F.SilkS) (width 0.12))
-    (pad 1 smd rect (at -1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
-      (net 23 ROW1))
     (pad 2 smd rect (at 1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
       (net 45 "Net-(D23-Pad2)"))
+    (pad 1 smd rect (at -1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 23 ROW1))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_SOD-323.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1629,13 +1550,13 @@
     )
   )
 
-  (module Diode_SMD:D_SOD-323_HandSoldering locked (layer F.Cu) (tedit 5ED414A4) (tstamp 5ED288AF)
+  (module Diode_SMD:D_SOD-323_HandSoldering locked (layer F.Cu) (tedit 58641869) (tstamp 5ED288AF)
     (at 225.63144 101.544927 270)
     (descr SOD-323)
     (tags SOD-323)
     (path /5DFE63CB)
     (attr smd)
-    (fp_text reference D21 (at 0 -1.85 270) (layer F.Fab)
+    (fp_text reference D21 (at 0 -1.85 270) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value D3.2 (at 0.1 1.9 270) (layer F.Fab)
@@ -1672,42 +1593,42 @@
     )
   )
 
-  (module Diode_SMD:D_SOD-323_HandSoldering locked (layer F.Cu) (tedit 5ED4146A) (tstamp 5ED28897)
+  (module Diode_SMD:D_SOD-323_HandSoldering locked (layer F.Cu) (tedit 58641869) (tstamp 5ED28897)
     (at 225.63144 95.956927 270)
     (descr SOD-323)
     (tags SOD-323)
     (path /5DFE63F5)
     (attr smd)
-    (fp_text reference D20 (at 0 -1.85 270) (layer F.Fab)
+    (fp_text reference D20 (at 0 -1.85 270) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value D2.2 (at 0.1 1.9 270) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
+    (fp_line (start -1.9 -0.85) (end 1.25 -0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.9 0.85) (end 1.25 0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2 -0.95) (end -2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2 -0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 -0.95) (end 2 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.9 -0.7) (end 0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 -0.7) (end 0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 0.7) (end -0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 0.7) (end -0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 -0.35) (end -0.3 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end -0.5 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end 0.2 -0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 -0.35) (end 0.2 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0.35) (end -0.3 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0) (end 0.45 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.9 -0.85) (end -1.9 0.85) (layer F.SilkS) (width 0.12))
     (fp_text user %R (at 0 -1.85 270) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start -1.9 -0.85) (end -1.9 0.85) (layer F.SilkS) (width 0.12))
-    (fp_line (start 0.2 0) (end 0.45 0) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.2 0.35) (end -0.3 0) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.2 -0.35) (end 0.2 0.35) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.3 0) (end 0.2 -0.35) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.3 0) (end -0.5 0) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.3 -0.35) (end -0.3 0.35) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.9 0.7) (end -0.9 -0.7) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.9 0.7) (end -0.9 0.7) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.9 -0.7) (end 0.9 0.7) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.9 -0.7) (end 0.9 -0.7) (layer F.Fab) (width 0.1))
-    (fp_line (start -2 -0.95) (end 2 -0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 2 -0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2 0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2 -0.95) (end -2 0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.9 0.85) (end 1.25 0.85) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.9 -0.85) (end 1.25 -0.85) (layer F.SilkS) (width 0.12))
-    (pad 1 smd rect (at -1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
-      (net 24 ROW2))
     (pad 2 smd rect (at 1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
       (net 43 "Net-(D20-Pad2)"))
+    (pad 1 smd rect (at -1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 24 ROW2))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_SOD-323.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1715,13 +1636,13 @@
     )
   )
 
-  (module Diode_SMD:D_SOD-323_HandSoldering locked (layer F.Cu) (tedit 5ED41528) (tstamp 5ED2887F)
+  (module Diode_SMD:D_SOD-323_HandSoldering locked (layer F.Cu) (tedit 58641869) (tstamp 5ED2887F)
     (at 225.63144 90.368927 270)
     (descr SOD-323)
     (tags SOD-323)
     (path /5DFE6403)
     (attr smd)
-    (fp_text reference D19 (at 0 -1.85 270) (layer F.Fab)
+    (fp_text reference D19 (at 0 -1.85 270) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value D1.2 (at 0.1 1.9 270) (layer F.Fab)
@@ -1758,42 +1679,42 @@
     )
   )
 
-  (module Diode_SMD:D_SOD-323_HandSoldering locked (layer F.Cu) (tedit 5ED414D1) (tstamp 5ED28867)
+  (module Diode_SMD:D_SOD-323_HandSoldering locked (layer F.Cu) (tedit 58641869) (tstamp 5ED28867)
     (at 233.75944 107.132927 270)
     (descr SOD-323)
     (tags SOD-323)
     (path /5DFEF7E0)
     (attr smd)
-    (fp_text reference D17 (at 0 -1.85 270) (layer F.Fab)
+    (fp_text reference D17 (at 0 -1.85 270) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value D4.6 (at 0.1 1.9 270) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
+    (fp_line (start -1.9 -0.85) (end 1.25 -0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.9 0.85) (end 1.25 0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2 -0.95) (end -2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2 -0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 -0.95) (end 2 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.9 -0.7) (end 0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 -0.7) (end 0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 0.7) (end -0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 0.7) (end -0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 -0.35) (end -0.3 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end -0.5 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end 0.2 -0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 -0.35) (end 0.2 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0.35) (end -0.3 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0) (end 0.45 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.9 -0.85) (end -1.9 0.85) (layer F.SilkS) (width 0.12))
     (fp_text user %R (at 0 -1.85 270) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start -1.9 -0.85) (end -1.9 0.85) (layer F.SilkS) (width 0.12))
-    (fp_line (start 0.2 0) (end 0.45 0) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.2 0.35) (end -0.3 0) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.2 -0.35) (end 0.2 0.35) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.3 0) (end 0.2 -0.35) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.3 0) (end -0.5 0) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.3 -0.35) (end -0.3 0.35) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.9 0.7) (end -0.9 -0.7) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.9 0.7) (end -0.9 0.7) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.9 -0.7) (end 0.9 0.7) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.9 -0.7) (end 0.9 -0.7) (layer F.Fab) (width 0.1))
-    (fp_line (start -2 -0.95) (end 2 -0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 2 -0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2 0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2 -0.95) (end -2 0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.9 0.85) (end 1.25 0.85) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.9 -0.85) (end 1.25 -0.85) (layer F.SilkS) (width 0.12))
-    (pad 1 smd rect (at -1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
-      (net 26 ROW4))
     (pad 2 smd rect (at 1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
       (net 41 "Net-(D17-Pad2)"))
+    (pad 1 smd rect (at -1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 26 ROW4))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_SOD-323.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1801,51 +1722,429 @@
     )
   )
 
-  (module Keebio:MX-Alps-Choc-1U-NoLED (layer F.Cu) (tedit 5ED416E7) (tstamp 5ED2884F)
+  (module Package_QFP:LQFP-48_7x7mm_P0.5mm (layer F.Cu) (tedit 5A5E2375) (tstamp 5ED314BE)
+    (at 229.743 69.342 90)
+    (descr "48 LEAD LQFP 7x7mm (see MICREL LQFP7x7-48LD-PL-1.pdf)")
+    (tags "QFP 0.5")
+    (path /5DEC39DF)
+    (attr smd)
+    (fp_text reference U1 (at 0 0 180) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value STM32 (at 0 6 90) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -3.13 -3.75) (end -3.75 -3.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -3.75 -3.13) (end -3.75 -3.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -3.13 3.75) (end -3.75 3.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -3.75 3.13) (end -3.75 3.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 3.75 -3.13) (end 3.75 -3.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 3.13 -3.75) (end 3.75 -3.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -3.13 3.75) (end -3.13 5.25) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -3.75 3.13) (end -5.25 3.13) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -3.75 -3.13) (end -5.25 -3.13) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -3.13 -3.75) (end -3.13 -5.25) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 3.13 -3.75) (end 3.13 -5.25) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 3.75 -3.13) (end 5.25 -3.13) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 3.75 3.13) (end 5.25 3.13) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -3.56 3.56) (end -3.14 3.56) (layer F.SilkS) (width 0.12))
+    (fp_line (start -3.56 -3.56) (end -3.56 -3.14) (layer F.SilkS) (width 0.12))
+    (fp_line (start -3.56 -3.14) (end -4.94 -3.14) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.56 -3.56) (end 3.14 -3.56) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.56 3.56) (end 3.14 3.56) (layer F.SilkS) (width 0.12))
+    (fp_line (start -3.56 -3.56) (end -3.14 -3.56) (layer F.SilkS) (width 0.12))
+    (fp_line (start -3.56 3.56) (end -3.56 3.14) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.56 3.56) (end 3.56 3.14) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.56 -3.56) (end 3.56 -3.14) (layer F.SilkS) (width 0.12))
+    (fp_line (start -3.13 5.25) (end 3.13 5.25) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -3.13 -5.25) (end 3.13 -5.25) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 5.25 -3.13) (end 5.25 3.13) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -5.25 -3.13) (end -5.25 3.13) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -3.5 -2.5) (end -2.5 -3.5) (layer F.Fab) (width 0.1))
+    (fp_line (start -3.5 3.5) (end -3.5 -2.5) (layer F.Fab) (width 0.1))
+    (fp_line (start 3.5 3.5) (end -3.5 3.5) (layer F.Fab) (width 0.1))
+    (fp_line (start 3.5 -3.5) (end 3.5 3.5) (layer F.Fab) (width 0.1))
+    (fp_line (start -2.5 -3.5) (end 3.5 -3.5) (layer F.Fab) (width 0.1))
+    (fp_text user %R (at 0 0 90) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 3.13 5.25) (end 3.13 3.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 3.75 3.13) (end 3.75 3.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 3.13 3.75) (end 3.75 3.75) (layer F.CrtYd) (width 0.05))
+    (pad 48 smd rect (at -2.75 -4.35 180) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 10 3.3V))
+    (pad 47 smd rect (at -2.25 -4.35 180) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 1 GND))
+    (pad 46 smd rect (at -1.75 -4.35 180) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 36 COL6))
+    (pad 45 smd rect (at -1.25 -4.35 180) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 35 COL5))
+    (pad 44 smd rect (at -0.75 -4.35 180) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 9 "Net-(R1-Pad1)"))
+    (pad 43 smd rect (at -0.25 -4.35 180) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 34 PB7))
+    (pad 42 smd rect (at 0.25 -4.35 180) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 33 PB6))
+    (pad 41 smd rect (at 0.75 -4.35 180) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 32 COL4))
+    (pad 40 smd rect (at 1.25 -4.35 180) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 31 COL3))
+    (pad 39 smd rect (at 1.75 -4.35 180) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 30 COL2))
+    (pad 38 smd rect (at 2.25 -4.35 180) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 29 COL1))
+    (pad 37 smd rect (at 2.75 -4.35 180) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 28 SWDCLK))
+    (pad 36 smd rect (at 4.35 -2.75 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 10 3.3V))
+    (pad 35 smd rect (at 4.35 -2.25 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 1 GND))
+    (pad 34 smd rect (at 4.35 -1.75 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 27 SWDIO))
+    (pad 33 smd rect (at 4.35 -1.25 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 6 D+))
+    (pad 32 smd rect (at 4.35 -0.75 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 5 D-))
+    (pad 31 smd rect (at 4.35 -0.25 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 60 RX))
+    (pad 30 smd rect (at 4.35 0.25 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 59 TX))
+    (pad 29 smd rect (at 4.35 0.75 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 68 "Net-(U1-Pad29)"))
+    (pad 28 smd rect (at 4.35 1.25 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 67 "Net-(U1-Pad28)"))
+    (pad 27 smd rect (at 4.35 1.75 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 66 "Net-(U1-Pad27)"))
+    (pad 26 smd rect (at 4.35 2.25 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 65 "Net-(U1-Pad26)"))
+    (pad 25 smd rect (at 4.35 2.75 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 1 GND))
+    (pad 24 smd rect (at 2.75 4.35 180) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 10 3.3V))
+    (pad 23 smd rect (at 2.25 4.35 180) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 1 GND))
+    (pad 22 smd rect (at 1.75 4.35 180) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 64 "Net-(U1-Pad22)"))
+    (pad 21 smd rect (at 1.25 4.35 180) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 26 ROW4))
+    (pad 20 smd rect (at 0.75 4.35 180) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 25 ROW3))
+    (pad 19 smd rect (at 0.25 4.35 180) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 24 ROW2))
+    (pad 18 smd rect (at -0.25 4.35 180) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 23 ROW1))
+    (pad 17 smd rect (at -0.75 4.35 180) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 22 PA7))
+    (pad 16 smd rect (at -1.25 4.35 180) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 21 PA6))
+    (pad 15 smd rect (at -1.75 4.35 180) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 20 PA5))
+    (pad 14 smd rect (at -2.25 4.35 180) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 19 PA4))
+    (pad 13 smd rect (at -2.75 4.35 180) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 18 "Net-(U1-Pad13)"))
+    (pad 12 smd rect (at -4.35 2.75 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 17 "Net-(U1-Pad12)"))
+    (pad 11 smd rect (at -4.35 2.25 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 16 "Net-(U1-Pad11)"))
+    (pad 10 smd rect (at -4.35 1.75 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 15 "Net-(U1-Pad10)"))
+    (pad 9 smd rect (at -4.35 1.25 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 10 3.3V))
+    (pad 8 smd rect (at -4.35 0.75 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 1 GND))
+    (pad 7 smd rect (at -4.35 0.25 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 14 "Net-(C1-Pad2)"))
+    (pad 6 smd rect (at -4.35 -0.25 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 13 "Net-(U1-Pad6)"))
+    (pad 5 smd rect (at -4.35 -0.75 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 12 "Net-(U1-Pad5)"))
+    (pad 4 smd rect (at -4.35 -1.25 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 63 "Net-(U1-Pad4)"))
+    (pad 3 smd rect (at -4.35 -1.75 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 62 "Net-(U1-Pad3)"))
+    (pad 2 smd rect (at -4.35 -2.25 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 61 "Net-(U1-Pad2)"))
+    (pad 1 smd rect (at -4.35 -2.75 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 11 VBAT))
+    (model ${KISYS3DMOD}/Package_QFP.3dshapes/LQFP-48_7x7mm_P0.5mm.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Package_TO_SOT_SMD:SOT-23 (layer F.Cu) (tedit 5A02FF57) (tstamp 5ED28590)
+    (at 221.107 62.23 180)
+    (descr "SOT-23, Standard")
+    (tags SOT-23)
+    (path /5DED53E7)
+    (attr smd)
+    (fp_text reference U2 (at 2.794 0.127 180) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value LDO (at 0 2.5 180) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 0.76 1.58) (end -0.7 1.58) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.76 -1.58) (end -1.4 -1.58) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.7 1.75) (end -1.7 -1.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.7 1.75) (end -1.7 1.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.7 -1.75) (end 1.7 1.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.7 -1.75) (end 1.7 -1.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 0.76 -1.58) (end 0.76 -0.65) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.76 1.58) (end 0.76 0.65) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.7 1.52) (end 0.7 1.52) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.7 -1.52) (end 0.7 1.52) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.7 -0.95) (end -0.15 -1.52) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.15 -1.52) (end 0.7 -1.52) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.7 -0.95) (end -0.7 1.5) (layer F.Fab) (width 0.1))
+    (fp_text user %R (at 0 0 270) (layer F.Fab)
+      (effects (font (size 0.5 0.5) (thickness 0.075)))
+    )
+    (pad 3 smd rect (at 1 0 180) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
+      (net 1 GND))
+    (pad 2 smd rect (at -1 0.95 180) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
+      (net 2 5V))
+    (pad 1 smd rect (at -1 -0.95 180) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
+      (net 10 3.3V))
+    (model ${KISYS3DMOD}/Package_TO_SOT_SMD.3dshapes/SOT-23.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder (layer F.Cu) (tedit 5B36C52B) (tstamp 5ED2857B)
+    (at 223.13 74.422 180)
+    (descr "Resistor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
+    (tags "resistor handsolder")
+    (path /5DECE7D2)
+    (attr smd)
+    (fp_text reference R1 (at 0 -1.65 180) (layer F.SilkS) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 5.1k (at 0 -1.65 180) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 0 0 180) (layer F.Fab)
+      (effects (font (size 0.5 0.5) (thickness 0.08)))
+    )
+    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.261252 0.71) (end 0.261252 0.71) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.261252 -0.71) (end 0.261252 -0.71) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1 0.6) (end -1 0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 -0.6) (end 1 0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 -0.6) (end 1 -0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 0.6) (end -1 -0.6) (layer F.Fab) (width 0.1))
+    (pad 2 smd roundrect (at 1.025 0 180) (size 1.15 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.217391)
+      (net 1 GND))
+    (pad 1 smd roundrect (at -1.025 0 180) (size 1.15 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.217391)
+      (net 9 "Net-(R1-Pad1)"))
+    (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0805_2012Metric.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder (layer F.Cu) (tedit 5B36C52B) (tstamp 5ED2856A)
+    (at 224.155 58.674 270)
+    (descr "Resistor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
+    (tags "resistor handsolder")
+    (path /5DEDEAE6)
+    (attr smd)
+    (fp_text reference R6 (at 0 -1.65 270) (layer F.SilkS) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 5.1k (at 0 -1.65 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 0 0 270) (layer F.Fab)
+      (effects (font (size 0.5 0.5) (thickness 0.08)))
+    )
+    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.261252 0.71) (end 0.261252 0.71) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.261252 -0.71) (end 0.261252 -0.71) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1 0.6) (end -1 0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 -0.6) (end 1 0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 -0.6) (end 1 -0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 0.6) (end -1 -0.6) (layer F.Fab) (width 0.1))
+    (pad 2 smd roundrect (at 1.025 0 270) (size 1.15 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.217391)
+      (net 1 GND))
+    (pad 1 smd roundrect (at -1.025 0 270) (size 1.15 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.217391)
+      (net 8 "Net-(J1-PadB5)"))
+    (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0805_2012Metric.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder (layer F.Cu) (tedit 5B36C52B) (tstamp 5ED28559)
+    (at 228.727 58.674 270)
+    (descr "Resistor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
+    (tags "resistor handsolder")
+    (path /5DEDEA73)
+    (attr smd)
+    (fp_text reference R7 (at 0 -1.65 270) (layer F.SilkS) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 5.1k (at 0 -1.65 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 0 0 270) (layer F.Fab)
+      (effects (font (size 0.5 0.5) (thickness 0.08)))
+    )
+    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.261252 0.71) (end 0.261252 0.71) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.261252 -0.71) (end 0.261252 -0.71) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1 0.6) (end -1 0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 -0.6) (end 1 0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 -0.6) (end 1 -0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 0.6) (end -1 -0.6) (layer F.Fab) (width 0.1))
+    (pad 2 smd roundrect (at 1.025 0 270) (size 1.15 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.217391)
+      (net 1 GND))
+    (pad 1 smd roundrect (at -1.025 0 270) (size 1.15 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.217391)
+      (net 4 "Net-(J1-PadA5)"))
+    (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0805_2012Metric.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Keebio:MX-Alps-Choc-1U-NoLED (layer F.Cu) (tedit 5C7EAB78) (tstamp 5ED28737)
+    (at 152.4 53.975)
+    (path /5DF62207)
+    (fp_text reference SW7 (at 0 3.175) (layer B.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value SW_Push (at 0 -7.9375) (layer Dwgs.User)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -9.525 9.525) (end -9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 9.525) (end -9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 -9.525) (end 9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 -9.525) (end 9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -7) (end -7 -5) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -5 -7) (end -7 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 7) (end -5 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 5) (end -7 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 7 7) (end 7 5) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 5 7) (end 7 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 7 -7) (end 7 -5) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 5 -7) (end 7 -7) (layer Dwgs.User) (width 0.15))
+    (pad "" np_thru_hole circle (at -5.22 4.2 48.1) (size 1.2 1.2) (drill 1.2) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.5 0 48.1) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.5 0 48.1) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad 2 thru_hole circle (at 0 -5.9) (size 2 2) (drill 1.2) (layers *.Cu *.Mask)
+      (net 31 COL3))
+    (pad 1 thru_hole circle (at 5 -3.8) (size 2 2) (drill 1.2) (layers *.Cu *.Mask)
+      (net 48 "Net-(D9-Pad2)"))
+    (pad "" np_thru_hole circle (at 5.08 0 48.0996) (size 1.75 1.75) (drill 1.75) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.08 0 48.0996) (size 1.75 1.75) (drill 1.75) (layers *.Cu *.Mask))
+    (pad 2 thru_hole circle (at -2.5 -4) (size 2.25 2.25) (drill 1.47) (layers *.Cu *.Mask)
+      (net 31 COL3))
+    (pad "" np_thru_hole circle (at 0 0) (size 3.9878 3.9878) (drill 3.9878) (layers *.Cu *.Mask))
+    (pad 2 thru_hole oval (at -3.81 -2.54 48.1) (size 4.211556 2.25) (drill 1.47 (offset 0.980778 0)) (layers *.Cu *.Mask)
+      (net 31 COL3))
+    (pad 1 thru_hole circle (at 2.54 -5.08) (size 2.25 2.25) (drill 1.47) (layers *.Cu *.Mask)
+      (net 48 "Net-(D9-Pad2)"))
+    (pad 1 thru_hole oval (at 2.5 -4.5 86.1) (size 2.831378 2.25) (drill 1.47 (offset 0.290689 0)) (layers *.Cu *.Mask)
+      (net 48 "Net-(D9-Pad2)"))
+  )
+
+  (module Keebio:TRRS-PJ-320A-no-Fmask (layer F.Cu) (tedit 5CD25241) (tstamp 5ED44B30)
+    (at 237.363 48.26)
+    (path /5ED45338)
+    (fp_text reference J2 (at 0 5.715) (layer Dwgs.User)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value AudioJack4 (at 0 -5.6) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 3.05 0) (end -3.05 0) (layer F.SilkS) (width 0.15))
+    (fp_line (start 3.05 12.1) (end -3.05 12.1) (layer F.SilkS) (width 0.15))
+    (fp_line (start 3.05 0) (end 3.05 12.1) (layer F.SilkS) (width 0.15))
+    (fp_line (start -3.05 0) (end -3.05 12.1) (layer F.SilkS) (width 0.15))
+    (fp_line (start 2.8 0) (end 2.8 -2) (layer F.SilkS) (width 0.15))
+    (fp_line (start -2.8 0) (end -2.8 -2) (layer F.SilkS) (width 0.15))
+    (fp_line (start 2.8 -2) (end -2.8 -2) (layer F.SilkS) (width 0.15))
+    (pad 1 thru_hole oval (at -2.3 11.3) (size 1 1.4) (drill oval 0.9 1.3) (layers *.Cu F.Mask)
+      (net 1 GND))
+    (pad 2 thru_hole oval (at 2.3 10.2) (size 1 1.4) (drill oval 0.9 1.3) (layers *.Cu F.Mask)
+      (net 2 5V))
+    (pad 3 thru_hole oval (at 2.3 6.2) (size 1 1.4) (drill oval 0.9 1.3) (layers *.Cu F.Mask)
+      (net 59 TX))
+    (pad 4 thru_hole oval (at 2.3 3.2) (size 1 1.4) (drill oval 0.9 1.3) (layers *.Cu F.Mask)
+      (net 60 RX))
+    (pad 3 thru_hole oval (at 2.3 6.2) (size 1.6 2) (drill oval 0.9 1.3) (layers *.Cu B.Mask)
+      (net 59 TX))
+    (pad "" np_thru_hole circle (at 0 1.6) (size 0.8 0.8) (drill 0.8) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 0 8.6) (size 0.8 0.8) (drill 0.8) (layers *.Cu *.Mask))
+    (pad 4 thru_hole oval (at 2.3 3.2) (size 1.6 2) (drill oval 0.9 1.3) (layers *.Cu B.Mask)
+      (net 60 RX))
+    (pad 2 thru_hole oval (at 2.3 10.2) (size 1.6 2) (drill oval 0.9 1.3) (layers *.Cu B.Mask)
+      (net 2 5V))
+    (pad 1 thru_hole oval (at -2.3 11.3) (size 1.6 2) (drill oval 0.9 1.3) (layers *.Cu B.Mask)
+      (net 1 GND))
+  )
+
+  (module Keebio:MX-Alps-Choc-1U-NoLED (layer F.Cu) (tedit 5C7EAB78) (tstamp 5ED2884F)
     (at 152.4 92.075)
     (path /5DF621CF)
-    (fp_text reference SW9 (at 0 3.175) (layer F.Fab)
+    (fp_text reference SW9 (at 0 3.175) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value SW_Push (at 0 -7.9375) (layer Dwgs.User)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start 5 -7) (end 7 -7) (layer Dwgs.User) (width 0.15))
-    (fp_line (start 7 -7) (end 7 -5) (layer Dwgs.User) (width 0.15))
-    (fp_line (start 5 7) (end 7 7) (layer Dwgs.User) (width 0.15))
-    (fp_line (start 7 7) (end 7 5) (layer Dwgs.User) (width 0.15))
-    (fp_line (start -7 5) (end -7 7) (layer Dwgs.User) (width 0.15))
-    (fp_line (start -7 7) (end -5 7) (layer Dwgs.User) (width 0.15))
-    (fp_line (start -5 -7) (end -7 -7) (layer Dwgs.User) (width 0.15))
-    (fp_line (start -7 -7) (end -7 -5) (layer Dwgs.User) (width 0.15))
-    (fp_line (start -9.525 -9.525) (end 9.525 -9.525) (layer Dwgs.User) (width 0.15))
-    (fp_line (start 9.525 -9.525) (end 9.525 9.525) (layer Dwgs.User) (width 0.15))
-    (fp_line (start 9.525 9.525) (end -9.525 9.525) (layer Dwgs.User) (width 0.15))
     (fp_line (start -9.525 9.525) (end -9.525 -9.525) (layer Dwgs.User) (width 0.15))
-    (pad 1 thru_hole oval (at 2.5 -4.5 86.1) (size 2.831378 2.25) (drill 1.47 (offset 0.290689 0)) (layers *.Cu *.Mask)
-      (net 58 "Net-(D11-Pad2)"))
-    (pad 1 thru_hole circle (at 2.54 -5.08) (size 2.25 2.25) (drill 1.47) (layers *.Cu *.Mask)
+    (fp_line (start 9.525 9.525) (end -9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 -9.525) (end 9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 -9.525) (end 9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -7) (end -7 -5) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -5 -7) (end -7 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 7) (end -5 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 5) (end -7 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 7 7) (end 7 5) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 5 7) (end 7 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 7 -7) (end 7 -5) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 5 -7) (end 7 -7) (layer Dwgs.User) (width 0.15))
+    (pad "" np_thru_hole circle (at -5.22 4.2 48.1) (size 1.2 1.2) (drill 1.2) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.5 0 48.1) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.5 0 48.1) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad 2 thru_hole circle (at 0 -5.9) (size 2 2) (drill 1.2) (layers *.Cu *.Mask)
+      (net 31 COL3))
+    (pad 1 thru_hole circle (at 5 -3.8) (size 2 2) (drill 1.2) (layers *.Cu *.Mask)
       (net 58 "Net-(D11-Pad2)"))
-    (pad 2 thru_hole oval (at -3.81 -2.54 48.1) (size 4.211556 2.25) (drill 1.47 (offset 0.980778 0)) (layers *.Cu *.Mask)
+    (pad "" np_thru_hole circle (at 5.08 0 48.0996) (size 1.75 1.75) (drill 1.75) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.08 0 48.0996) (size 1.75 1.75) (drill 1.75) (layers *.Cu *.Mask))
+    (pad 2 thru_hole circle (at -2.5 -4) (size 2.25 2.25) (drill 1.47) (layers *.Cu *.Mask)
       (net 31 COL3))
     (pad "" np_thru_hole circle (at 0 0) (size 3.9878 3.9878) (drill 3.9878) (layers *.Cu *.Mask))
-    (pad 2 thru_hole circle (at -2.5 -4) (size 2.25 2.25) (drill 1.47) (layers *.Cu *.Mask)
+    (pad 2 thru_hole oval (at -3.81 -2.54 48.1) (size 4.211556 2.25) (drill 1.47 (offset 0.980778 0)) (layers *.Cu *.Mask)
       (net 31 COL3))
-    (pad "" np_thru_hole circle (at -5.08 0 48.0996) (size 1.75 1.75) (drill 1.75) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at 5.08 0 48.0996) (size 1.75 1.75) (drill 1.75) (layers *.Cu *.Mask))
-    (pad 1 thru_hole circle (at 5 -3.8) (size 2 2) (drill 1.2) (layers *.Cu *.Mask)
+    (pad 1 thru_hole circle (at 2.54 -5.08) (size 2.25 2.25) (drill 1.47) (layers *.Cu *.Mask)
+      (net 58 "Net-(D11-Pad2)"))
+    (pad 1 thru_hole oval (at 2.5 -4.5 86.1) (size 2.831378 2.25) (drill 1.47 (offset 0.290689 0)) (layers *.Cu *.Mask)
       (net 58 "Net-(D11-Pad2)"))
-    (pad 2 thru_hole circle (at 0 -5.9) (size 2 2) (drill 1.2) (layers *.Cu *.Mask)
-      (net 31 COL3))
-    (pad "" np_thru_hole circle (at -5.5 0 48.1) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at 5.5 0 48.1) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at -5.22 4.2 48.1) (size 1.2 1.2) (drill 1.2) (layers *.Cu *.Mask))
   )
 
-  (module Keebio:MX-Alps-Choc-1U-NoLED (layer F.Cu) (tedit 5ED41551) (tstamp 5ED28833)
+  (module Keebio:MX-Alps-Choc-1U-NoLED (layer F.Cu) (tedit 5C7EAB78) (tstamp 5ED28833)
     (at 200.025 113.665)
     (path /5DFE3E9F)
-    (fp_text reference SW34 (at 0 3.175) (layer F.Fab)
+    (fp_text reference SW34 (at 0 3.175) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value SW_Push (at 0 -7.9375) (layer Dwgs.User)
@@ -1883,51 +2182,51 @@
       (net 57 "Net-(D36-Pad2)"))
   )
 
-  (module Keebio:MX-Alps-Choc-1U-NoLED (layer F.Cu) (tedit 5ED416DA) (tstamp 5ED28817)
+  (module Keebio:MX-Alps-Choc-1U-NoLED (layer F.Cu) (tedit 5C7EAB78) (tstamp 5ED28817)
     (at 190.5 92.075)
     (path /5DFE3E91)
-    (fp_text reference SW33 (at 0 3.175) (layer F.Fab)
+    (fp_text reference SW33 (at 0 3.175) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value SW_Push (at 0 -7.9375) (layer Dwgs.User)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start 5 -7) (end 7 -7) (layer Dwgs.User) (width 0.15))
-    (fp_line (start 7 -7) (end 7 -5) (layer Dwgs.User) (width 0.15))
-    (fp_line (start 5 7) (end 7 7) (layer Dwgs.User) (width 0.15))
-    (fp_line (start 7 7) (end 7 5) (layer Dwgs.User) (width 0.15))
-    (fp_line (start -7 5) (end -7 7) (layer Dwgs.User) (width 0.15))
-    (fp_line (start -7 7) (end -5 7) (layer Dwgs.User) (width 0.15))
-    (fp_line (start -5 -7) (end -7 -7) (layer Dwgs.User) (width 0.15))
-    (fp_line (start -7 -7) (end -7 -5) (layer Dwgs.User) (width 0.15))
-    (fp_line (start -9.525 -9.525) (end 9.525 -9.525) (layer Dwgs.User) (width 0.15))
-    (fp_line (start 9.525 -9.525) (end 9.525 9.525) (layer Dwgs.User) (width 0.15))
-    (fp_line (start 9.525 9.525) (end -9.525 9.525) (layer Dwgs.User) (width 0.15))
     (fp_line (start -9.525 9.525) (end -9.525 -9.525) (layer Dwgs.User) (width 0.15))
-    (pad 1 thru_hole oval (at 2.5 -4.5 86.1) (size 2.831378 2.25) (drill 1.47 (offset 0.290689 0)) (layers *.Cu *.Mask)
-      (net 56 "Net-(D35-Pad2)"))
-    (pad 1 thru_hole circle (at 2.54 -5.08) (size 2.25 2.25) (drill 1.47) (layers *.Cu *.Mask)
+    (fp_line (start 9.525 9.525) (end -9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 -9.525) (end 9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 -9.525) (end 9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -7) (end -7 -5) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -5 -7) (end -7 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 7) (end -5 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 5) (end -7 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 7 7) (end 7 5) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 5 7) (end 7 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 7 -7) (end 7 -5) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 5 -7) (end 7 -7) (layer Dwgs.User) (width 0.15))
+    (pad "" np_thru_hole circle (at -5.22 4.2 48.1) (size 1.2 1.2) (drill 1.2) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.5 0 48.1) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.5 0 48.1) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad 2 thru_hole circle (at 0 -5.9) (size 2 2) (drill 1.2) (layers *.Cu *.Mask)
+      (net 35 COL5))
+    (pad 1 thru_hole circle (at 5 -3.8) (size 2 2) (drill 1.2) (layers *.Cu *.Mask)
       (net 56 "Net-(D35-Pad2)"))
-    (pad 2 thru_hole oval (at -3.81 -2.54 48.1) (size 4.211556 2.25) (drill 1.47 (offset 0.980778 0)) (layers *.Cu *.Mask)
+    (pad "" np_thru_hole circle (at 5.08 0 48.0996) (size 1.75 1.75) (drill 1.75) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.08 0 48.0996) (size 1.75 1.75) (drill 1.75) (layers *.Cu *.Mask))
+    (pad 2 thru_hole circle (at -2.5 -4) (size 2.25 2.25) (drill 1.47) (layers *.Cu *.Mask)
       (net 35 COL5))
     (pad "" np_thru_hole circle (at 0 0) (size 3.9878 3.9878) (drill 3.9878) (layers *.Cu *.Mask))
-    (pad 2 thru_hole circle (at -2.5 -4) (size 2.25 2.25) (drill 1.47) (layers *.Cu *.Mask)
+    (pad 2 thru_hole oval (at -3.81 -2.54 48.1) (size 4.211556 2.25) (drill 1.47 (offset 0.980778 0)) (layers *.Cu *.Mask)
       (net 35 COL5))
-    (pad "" np_thru_hole circle (at -5.08 0 48.0996) (size 1.75 1.75) (drill 1.75) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at 5.08 0 48.0996) (size 1.75 1.75) (drill 1.75) (layers *.Cu *.Mask))
-    (pad 1 thru_hole circle (at 5 -3.8) (size 2 2) (drill 1.2) (layers *.Cu *.Mask)
+    (pad 1 thru_hole circle (at 2.54 -5.08) (size 2.25 2.25) (drill 1.47) (layers *.Cu *.Mask)
+      (net 56 "Net-(D35-Pad2)"))
+    (pad 1 thru_hole oval (at 2.5 -4.5 86.1) (size 2.831378 2.25) (drill 1.47 (offset 0.290689 0)) (layers *.Cu *.Mask)
       (net 56 "Net-(D35-Pad2)"))
-    (pad 2 thru_hole circle (at 0 -5.9) (size 2 2) (drill 1.2) (layers *.Cu *.Mask)
-      (net 35 COL5))
-    (pad "" np_thru_hole circle (at -5.5 0 48.1) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at 5.5 0 48.1) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at -5.22 4.2 48.1) (size 1.2 1.2) (drill 1.2) (layers *.Cu *.Mask))
   )
 
-  (module Keebio:MX-Alps-Choc-1U-NoLED (layer F.Cu) (tedit 5ED4171C) (tstamp 5ED287FB)
+  (module Keebio:MX-Alps-Choc-1U-NoLED (layer F.Cu) (tedit 5C7EAB78) (tstamp 5ED287FB)
     (at 190.5 73.025)
     (path /5DFE3EBB)
-    (fp_text reference SW32 (at 0 3.175) (layer F.Fab)
+    (fp_text reference SW32 (at 0 3.175) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value SW_Push (at 0 -7.9375) (layer Dwgs.User)
@@ -1965,51 +2264,51 @@
       (net 55 "Net-(D34-Pad2)"))
   )
 
-  (module Keebio:MX-Alps-Choc-1U-NoLED (layer F.Cu) (tedit 5ED41731) (tstamp 5ED287DF)
+  (module Keebio:MX-Alps-Choc-1U-NoLED (layer F.Cu) (tedit 5C7EAB78) (tstamp 5ED287DF)
     (at 190.5 53.975)
     (path /5DFE3EC9)
-    (fp_text reference SW31 (at 0 3.175) (layer F.Fab)
+    (fp_text reference SW31 (at 0 3.175) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value SW_Push (at 0 -7.9375) (layer Dwgs.User)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start 5 -7) (end 7 -7) (layer Dwgs.User) (width 0.15))
-    (fp_line (start 7 -7) (end 7 -5) (layer Dwgs.User) (width 0.15))
-    (fp_line (start 5 7) (end 7 7) (layer Dwgs.User) (width 0.15))
-    (fp_line (start 7 7) (end 7 5) (layer Dwgs.User) (width 0.15))
-    (fp_line (start -7 5) (end -7 7) (layer Dwgs.User) (width 0.15))
-    (fp_line (start -7 7) (end -5 7) (layer Dwgs.User) (width 0.15))
-    (fp_line (start -5 -7) (end -7 -7) (layer Dwgs.User) (width 0.15))
-    (fp_line (start -7 -7) (end -7 -5) (layer Dwgs.User) (width 0.15))
-    (fp_line (start -9.525 -9.525) (end 9.525 -9.525) (layer Dwgs.User) (width 0.15))
-    (fp_line (start 9.525 -9.525) (end 9.525 9.525) (layer Dwgs.User) (width 0.15))
-    (fp_line (start 9.525 9.525) (end -9.525 9.525) (layer Dwgs.User) (width 0.15))
     (fp_line (start -9.525 9.525) (end -9.525 -9.525) (layer Dwgs.User) (width 0.15))
-    (pad 1 thru_hole oval (at 2.5 -4.5 86.1) (size 2.831378 2.25) (drill 1.47 (offset 0.290689 0)) (layers *.Cu *.Mask)
-      (net 54 "Net-(D33-Pad2)"))
-    (pad 1 thru_hole circle (at 2.54 -5.08) (size 2.25 2.25) (drill 1.47) (layers *.Cu *.Mask)
+    (fp_line (start 9.525 9.525) (end -9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 -9.525) (end 9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 -9.525) (end 9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -7) (end -7 -5) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -5 -7) (end -7 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 7) (end -5 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 5) (end -7 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 7 7) (end 7 5) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 5 7) (end 7 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 7 -7) (end 7 -5) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 5 -7) (end 7 -7) (layer Dwgs.User) (width 0.15))
+    (pad "" np_thru_hole circle (at -5.22 4.2 48.1) (size 1.2 1.2) (drill 1.2) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.5 0 48.1) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.5 0 48.1) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad 2 thru_hole circle (at 0 -5.9) (size 2 2) (drill 1.2) (layers *.Cu *.Mask)
+      (net 35 COL5))
+    (pad 1 thru_hole circle (at 5 -3.8) (size 2 2) (drill 1.2) (layers *.Cu *.Mask)
       (net 54 "Net-(D33-Pad2)"))
-    (pad 2 thru_hole oval (at -3.81 -2.54 48.1) (size 4.211556 2.25) (drill 1.47 (offset 0.980778 0)) (layers *.Cu *.Mask)
+    (pad "" np_thru_hole circle (at 5.08 0 48.0996) (size 1.75 1.75) (drill 1.75) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.08 0 48.0996) (size 1.75 1.75) (drill 1.75) (layers *.Cu *.Mask))
+    (pad 2 thru_hole circle (at -2.5 -4) (size 2.25 2.25) (drill 1.47) (layers *.Cu *.Mask)
       (net 35 COL5))
     (pad "" np_thru_hole circle (at 0 0) (size 3.9878 3.9878) (drill 3.9878) (layers *.Cu *.Mask))
-    (pad 2 thru_hole circle (at -2.5 -4) (size 2.25 2.25) (drill 1.47) (layers *.Cu *.Mask)
+    (pad 2 thru_hole oval (at -3.81 -2.54 48.1) (size 4.211556 2.25) (drill 1.47 (offset 0.980778 0)) (layers *.Cu *.Mask)
       (net 35 COL5))
-    (pad "" np_thru_hole circle (at -5.08 0 48.0996) (size 1.75 1.75) (drill 1.75) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at 5.08 0 48.0996) (size 1.75 1.75) (drill 1.75) (layers *.Cu *.Mask))
-    (pad 1 thru_hole circle (at 5 -3.8) (size 2 2) (drill 1.2) (layers *.Cu *.Mask)
+    (pad 1 thru_hole circle (at 2.54 -5.08) (size 2.25 2.25) (drill 1.47) (layers *.Cu *.Mask)
+      (net 54 "Net-(D33-Pad2)"))
+    (pad 1 thru_hole oval (at 2.5 -4.5 86.1) (size 2.831378 2.25) (drill 1.47 (offset 0.290689 0)) (layers *.Cu *.Mask)
       (net 54 "Net-(D33-Pad2)"))
-    (pad 2 thru_hole circle (at 0 -5.9) (size 2 2) (drill 1.2) (layers *.Cu *.Mask)
-      (net 35 COL5))
-    (pad "" np_thru_hole circle (at -5.5 0 48.1) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at 5.5 0 48.1) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at -5.22 4.2 48.1) (size 1.2 1.2) (drill 1.2) (layers *.Cu *.Mask))
   )
 
-  (module Keebio:MX-Alps-Choc-1U-NoLED (layer F.Cu) (tedit 5ED41558) (tstamp 5ED287C3)
+  (module Keebio:MX-Alps-Choc-1U-NoLED (layer F.Cu) (tedit 5C7EAB78) (tstamp 5ED287C3)
     (at 180.975 111.125)
     (path /5DFE23E6)
-    (fp_text reference SW24 (at 0 3.175) (layer F.Fab)
+    (fp_text reference SW24 (at 0 3.175) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value SW_Push (at 0 -7.9375) (layer Dwgs.User)
@@ -2047,51 +2346,51 @@
       (net 53 "Net-(D26-Pad2)"))
   )
 
-  (module Keebio:MX-Alps-Choc-1U-NoLED (layer F.Cu) (tedit 5ED4174A) (tstamp 5ED287A7)
+  (module Keebio:MX-Alps-Choc-1U-NoLED (layer F.Cu) (tedit 5C7EAB78) (tstamp 5ED287A7)
     (at 114.3 66.675)
     (path /5DFE63B7)
-    (fp_text reference SW3 (at 0 3.175) (layer F.Fab)
+    (fp_text reference SW3 (at 0 3.175) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value SW_Push (at 0 -7.9375) (layer Dwgs.User)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start 5 -7) (end 7 -7) (layer Dwgs.User) (width 0.15))
-    (fp_line (start 7 -7) (end 7 -5) (layer Dwgs.User) (width 0.15))
-    (fp_line (start 5 7) (end 7 7) (layer Dwgs.User) (width 0.15))
-    (fp_line (start 7 7) (end 7 5) (layer Dwgs.User) (width 0.15))
-    (fp_line (start -7 5) (end -7 7) (layer Dwgs.User) (width 0.15))
-    (fp_line (start -7 7) (end -5 7) (layer Dwgs.User) (width 0.15))
-    (fp_line (start -5 -7) (end -7 -7) (layer Dwgs.User) (width 0.15))
-    (fp_line (start -7 -7) (end -7 -5) (layer Dwgs.User) (width 0.15))
-    (fp_line (start -9.525 -9.525) (end 9.525 -9.525) (layer Dwgs.User) (width 0.15))
-    (fp_line (start 9.525 -9.525) (end 9.525 9.525) (layer Dwgs.User) (width 0.15))
-    (fp_line (start 9.525 9.525) (end -9.525 9.525) (layer Dwgs.User) (width 0.15))
     (fp_line (start -9.525 9.525) (end -9.525 -9.525) (layer Dwgs.User) (width 0.15))
-    (pad 1 thru_hole oval (at 2.5 -4.5 86.1) (size 2.831378 2.25) (drill 1.47 (offset 0.290689 0)) (layers *.Cu *.Mask)
-      (net 52 "Net-(D5-Pad2)"))
-    (pad 1 thru_hole circle (at 2.54 -5.08) (size 2.25 2.25) (drill 1.47) (layers *.Cu *.Mask)
+    (fp_line (start 9.525 9.525) (end -9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 -9.525) (end 9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 -9.525) (end 9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -7) (end -7 -5) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -5 -7) (end -7 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 7) (end -5 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 5) (end -7 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 7 7) (end 7 5) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 5 7) (end 7 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 7 -7) (end 7 -5) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 5 -7) (end 7 -7) (layer Dwgs.User) (width 0.15))
+    (pad "" np_thru_hole circle (at -5.22 4.2 48.1) (size 1.2 1.2) (drill 1.2) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.5 0 48.1) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.5 0 48.1) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad 2 thru_hole circle (at 0 -5.9) (size 2 2) (drill 1.2) (layers *.Cu *.Mask)
+      (net 29 COL1))
+    (pad 1 thru_hole circle (at 5 -3.8) (size 2 2) (drill 1.2) (layers *.Cu *.Mask)
       (net 52 "Net-(D5-Pad2)"))
-    (pad 2 thru_hole oval (at -3.81 -2.54 48.1) (size 4.211556 2.25) (drill 1.47 (offset 0.980778 0)) (layers *.Cu *.Mask)
+    (pad "" np_thru_hole circle (at 5.08 0 48.0996) (size 1.75 1.75) (drill 1.75) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.08 0 48.0996) (size 1.75 1.75) (drill 1.75) (layers *.Cu *.Mask))
+    (pad 2 thru_hole circle (at -2.5 -4) (size 2.25 2.25) (drill 1.47) (layers *.Cu *.Mask)
       (net 29 COL1))
     (pad "" np_thru_hole circle (at 0 0) (size 3.9878 3.9878) (drill 3.9878) (layers *.Cu *.Mask))
-    (pad 2 thru_hole circle (at -2.5 -4) (size 2.25 2.25) (drill 1.47) (layers *.Cu *.Mask)
+    (pad 2 thru_hole oval (at -3.81 -2.54 48.1) (size 4.211556 2.25) (drill 1.47 (offset 0.980778 0)) (layers *.Cu *.Mask)
       (net 29 COL1))
-    (pad "" np_thru_hole circle (at -5.08 0 48.0996) (size 1.75 1.75) (drill 1.75) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at 5.08 0 48.0996) (size 1.75 1.75) (drill 1.75) (layers *.Cu *.Mask))
-    (pad 1 thru_hole circle (at 5 -3.8) (size 2 2) (drill 1.2) (layers *.Cu *.Mask)
+    (pad 1 thru_hole circle (at 2.54 -5.08) (size 2.25 2.25) (drill 1.47) (layers *.Cu *.Mask)
+      (net 52 "Net-(D5-Pad2)"))
+    (pad 1 thru_hole oval (at 2.5 -4.5 86.1) (size 2.831378 2.25) (drill 1.47 (offset 0.290689 0)) (layers *.Cu *.Mask)
       (net 52 "Net-(D5-Pad2)"))
-    (pad 2 thru_hole circle (at 0 -5.9) (size 2 2) (drill 1.2) (layers *.Cu *.Mask)
-      (net 29 COL1))
-    (pad "" np_thru_hole circle (at -5.5 0 48.1) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at 5.5 0 48.1) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at -5.22 4.2 48.1) (size 1.2 1.2) (drill 1.2) (layers *.Cu *.Mask))
   )
 
-  (module Keebio:MX-Alps-Choc-1U-NoLED (layer F.Cu) (tedit 5ED416FC) (tstamp 5ED2878B)
+  (module Keebio:MX-Alps-Choc-1U-NoLED (layer F.Cu) (tedit 5C7EAB78) (tstamp 5ED2878B)
     (at 114.3 85.725)
     (path /5DFE63A9)
-    (fp_text reference SW4 (at 0 3.175) (layer F.Fab)
+    (fp_text reference SW4 (at 0 3.175) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value SW_Push (at 0 -7.9375) (layer Dwgs.User)
@@ -2129,51 +2428,51 @@
       (net 51 "Net-(D6-Pad2)"))
   )
 
-  (module Keebio:MX-Alps-Choc-1U-NoLED (layer F.Cu) (tedit 5ED416F3) (tstamp 5ED2876F)
+  (module Keebio:MX-Alps-Choc-1U-NoLED (layer F.Cu) (tedit 5C7EAB78) (tstamp 5ED2876F)
     (at 114.3 104.775)
     (path /5DFE637F)
-    (fp_text reference SW5 (at 0 3.175) (layer F.Fab)
+    (fp_text reference SW5 (at 0 3.175) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value SW_Push (at 0 -7.9375) (layer Dwgs.User)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start 5 -7) (end 7 -7) (layer Dwgs.User) (width 0.15))
-    (fp_line (start 7 -7) (end 7 -5) (layer Dwgs.User) (width 0.15))
-    (fp_line (start 5 7) (end 7 7) (layer Dwgs.User) (width 0.15))
-    (fp_line (start 7 7) (end 7 5) (layer Dwgs.User) (width 0.15))
-    (fp_line (start -7 5) (end -7 7) (layer Dwgs.User) (width 0.15))
-    (fp_line (start -7 7) (end -5 7) (layer Dwgs.User) (width 0.15))
-    (fp_line (start -5 -7) (end -7 -7) (layer Dwgs.User) (width 0.15))
-    (fp_line (start -7 -7) (end -7 -5) (layer Dwgs.User) (width 0.15))
-    (fp_line (start -9.525 -9.525) (end 9.525 -9.525) (layer Dwgs.User) (width 0.15))
-    (fp_line (start 9.525 -9.525) (end 9.525 9.525) (layer Dwgs.User) (width 0.15))
-    (fp_line (start 9.525 9.525) (end -9.525 9.525) (layer Dwgs.User) (width 0.15))
     (fp_line (start -9.525 9.525) (end -9.525 -9.525) (layer Dwgs.User) (width 0.15))
-    (pad 1 thru_hole oval (at 2.5 -4.5 86.1) (size 2.831378 2.25) (drill 1.47 (offset 0.290689 0)) (layers *.Cu *.Mask)
-      (net 50 "Net-(D7-Pad2)"))
-    (pad 1 thru_hole circle (at 2.54 -5.08) (size 2.25 2.25) (drill 1.47) (layers *.Cu *.Mask)
+    (fp_line (start 9.525 9.525) (end -9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 -9.525) (end 9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 -9.525) (end 9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -7) (end -7 -5) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -5 -7) (end -7 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 7) (end -5 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 5) (end -7 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 7 7) (end 7 5) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 5 7) (end 7 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 7 -7) (end 7 -5) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 5 -7) (end 7 -7) (layer Dwgs.User) (width 0.15))
+    (pad "" np_thru_hole circle (at -5.22 4.2 48.1) (size 1.2 1.2) (drill 1.2) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.5 0 48.1) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.5 0 48.1) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad 2 thru_hole circle (at 0 -5.9) (size 2 2) (drill 1.2) (layers *.Cu *.Mask)
+      (net 29 COL1))
+    (pad 1 thru_hole circle (at 5 -3.8) (size 2 2) (drill 1.2) (layers *.Cu *.Mask)
       (net 50 "Net-(D7-Pad2)"))
-    (pad 2 thru_hole oval (at -3.81 -2.54 48.1) (size 4.211556 2.25) (drill 1.47 (offset 0.980778 0)) (layers *.Cu *.Mask)
+    (pad "" np_thru_hole circle (at 5.08 0 48.0996) (size 1.75 1.75) (drill 1.75) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.08 0 48.0996) (size 1.75 1.75) (drill 1.75) (layers *.Cu *.Mask))
+    (pad 2 thru_hole circle (at -2.5 -4) (size 2.25 2.25) (drill 1.47) (layers *.Cu *.Mask)
       (net 29 COL1))
     (pad "" np_thru_hole circle (at 0 0) (size 3.9878 3.9878) (drill 3.9878) (layers *.Cu *.Mask))
-    (pad 2 thru_hole circle (at -2.5 -4) (size 2.25 2.25) (drill 1.47) (layers *.Cu *.Mask)
+    (pad 2 thru_hole oval (at -3.81 -2.54 48.1) (size 4.211556 2.25) (drill 1.47 (offset 0.980778 0)) (layers *.Cu *.Mask)
       (net 29 COL1))
-    (pad "" np_thru_hole circle (at -5.08 0 48.0996) (size 1.75 1.75) (drill 1.75) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at 5.08 0 48.0996) (size 1.75 1.75) (drill 1.75) (layers *.Cu *.Mask))
-    (pad 1 thru_hole circle (at 5 -3.8) (size 2 2) (drill 1.2) (layers *.Cu *.Mask)
+    (pad 1 thru_hole circle (at 2.54 -5.08) (size 2.25 2.25) (drill 1.47) (layers *.Cu *.Mask)
+      (net 50 "Net-(D7-Pad2)"))
+    (pad 1 thru_hole oval (at 2.5 -4.5 86.1) (size 2.831378 2.25) (drill 1.47 (offset 0.290689 0)) (layers *.Cu *.Mask)
       (net 50 "Net-(D7-Pad2)"))
-    (pad 2 thru_hole circle (at 0 -5.9) (size 2 2) (drill 1.2) (layers *.Cu *.Mask)
-      (net 29 COL1))
-    (pad "" np_thru_hole circle (at -5.5 0 48.1) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at 5.5 0 48.1) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at -5.22 4.2 48.1) (size 1.2 1.2) (drill 1.2) (layers *.Cu *.Mask))
   )
 
-  (module Keebio:MX-Alps-Choc-1U-NoLED (layer F.Cu) (tedit 5ED4170E) (tstamp 5ED28753)
+  (module Keebio:MX-Alps-Choc-1U-NoLED (layer F.Cu) (tedit 5C7EAB78) (tstamp 5ED28753)
     (at 152.4 73.025)
     (path /5DF621F9)
-    (fp_text reference SW8 (at 0 3.175) (layer F.Fab)
+    (fp_text reference SW8 (at 0 3.175) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value SW_Push (at 0 -7.9375) (layer Dwgs.User)
@@ -2211,10 +2510,10 @@
       (net 49 "Net-(D10-Pad2)"))
   )
 
-  (module Keebio:MX-Alps-Choc-1U-NoLED (layer F.Cu) (tedit 5ED416E1) (tstamp 5ED2871B)
+  (module Keebio:MX-Alps-Choc-1U-NoLED (layer F.Cu) (tedit 5C7EAB78) (tstamp 5ED2871B)
     (at 171.45 89.535)
     (path /5DFE23D8)
-    (fp_text reference SW23 (at 0 3.175) (layer F.Fab)
+    (fp_text reference SW23 (at 0 3.175) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value SW_Push (at 0 -7.9375) (layer Dwgs.User)
@@ -2252,51 +2551,51 @@
       (net 47 "Net-(D25-Pad2)"))
   )
 
-  (module Keebio:MX-Alps-Choc-1U-NoLED (layer F.Cu) (tedit 5ED41715) (tstamp 5ED286FF)
+  (module Keebio:MX-Alps-Choc-1U-NoLED (layer F.Cu) (tedit 5C7EAB78) (tstamp 5ED286FF)
     (at 171.45 70.485)
     (path /5DFE2402)
-    (fp_text reference SW22 (at 0 3.175) (layer F.Fab)
+    (fp_text reference SW22 (at 0 3.175) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value SW_Push (at 0 -7.9375) (layer Dwgs.User)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start 5 -7) (end 7 -7) (layer Dwgs.User) (width 0.15))
-    (fp_line (start 7 -7) (end 7 -5) (layer Dwgs.User) (width 0.15))
-    (fp_line (start 5 7) (end 7 7) (layer Dwgs.User) (width 0.15))
-    (fp_line (start 7 7) (end 7 5) (layer Dwgs.User) (width 0.15))
-    (fp_line (start -7 5) (end -7 7) (layer Dwgs.User) (width 0.15))
-    (fp_line (start -7 7) (end -5 7) (layer Dwgs.User) (width 0.15))
-    (fp_line (start -5 -7) (end -7 -7) (layer Dwgs.User) (width 0.15))
-    (fp_line (start -7 -7) (end -7 -5) (layer Dwgs.User) (width 0.15))
-    (fp_line (start -9.525 -9.525) (end 9.525 -9.525) (layer Dwgs.User) (width 0.15))
-    (fp_line (start 9.525 -9.525) (end 9.525 9.525) (layer Dwgs.User) (width 0.15))
-    (fp_line (start 9.525 9.525) (end -9.525 9.525) (layer Dwgs.User) (width 0.15))
     (fp_line (start -9.525 9.525) (end -9.525 -9.525) (layer Dwgs.User) (width 0.15))
-    (pad 1 thru_hole oval (at 2.5 -4.5 86.1) (size 2.831378 2.25) (drill 1.47 (offset 0.290689 0)) (layers *.Cu *.Mask)
-      (net 46 "Net-(D24-Pad2)"))
-    (pad 1 thru_hole circle (at 2.54 -5.08) (size 2.25 2.25) (drill 1.47) (layers *.Cu *.Mask)
+    (fp_line (start 9.525 9.525) (end -9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 -9.525) (end 9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 -9.525) (end 9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -7) (end -7 -5) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -5 -7) (end -7 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 7) (end -5 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 5) (end -7 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 7 7) (end 7 5) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 5 7) (end 7 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 7 -7) (end 7 -5) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 5 -7) (end 7 -7) (layer Dwgs.User) (width 0.15))
+    (pad "" np_thru_hole circle (at -5.22 4.2 48.1) (size 1.2 1.2) (drill 1.2) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.5 0 48.1) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.5 0 48.1) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad 2 thru_hole circle (at 0 -5.9) (size 2 2) (drill 1.2) (layers *.Cu *.Mask)
+      (net 32 COL4))
+    (pad 1 thru_hole circle (at 5 -3.8) (size 2 2) (drill 1.2) (layers *.Cu *.Mask)
       (net 46 "Net-(D24-Pad2)"))
-    (pad 2 thru_hole oval (at -3.81 -2.54 48.1) (size 4.211556 2.25) (drill 1.47 (offset 0.980778 0)) (layers *.Cu *.Mask)
+    (pad "" np_thru_hole circle (at 5.08 0 48.0996) (size 1.75 1.75) (drill 1.75) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.08 0 48.0996) (size 1.75 1.75) (drill 1.75) (layers *.Cu *.Mask))
+    (pad 2 thru_hole circle (at -2.5 -4) (size 2.25 2.25) (drill 1.47) (layers *.Cu *.Mask)
       (net 32 COL4))
     (pad "" np_thru_hole circle (at 0 0) (size 3.9878 3.9878) (drill 3.9878) (layers *.Cu *.Mask))
-    (pad 2 thru_hole circle (at -2.5 -4) (size 2.25 2.25) (drill 1.47) (layers *.Cu *.Mask)
+    (pad 2 thru_hole oval (at -3.81 -2.54 48.1) (size 4.211556 2.25) (drill 1.47 (offset 0.980778 0)) (layers *.Cu *.Mask)
       (net 32 COL4))
-    (pad "" np_thru_hole circle (at -5.08 0 48.0996) (size 1.75 1.75) (drill 1.75) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at 5.08 0 48.0996) (size 1.75 1.75) (drill 1.75) (layers *.Cu *.Mask))
-    (pad 1 thru_hole circle (at 5 -3.8) (size 2 2) (drill 1.2) (layers *.Cu *.Mask)
+    (pad 1 thru_hole circle (at 2.54 -5.08) (size 2.25 2.25) (drill 1.47) (layers *.Cu *.Mask)
+      (net 46 "Net-(D24-Pad2)"))
+    (pad 1 thru_hole oval (at 2.5 -4.5 86.1) (size 2.831378 2.25) (drill 1.47 (offset 0.290689 0)) (layers *.Cu *.Mask)
       (net 46 "Net-(D24-Pad2)"))
-    (pad 2 thru_hole circle (at 0 -5.9) (size 2 2) (drill 1.2) (layers *.Cu *.Mask)
-      (net 32 COL4))
-    (pad "" np_thru_hole circle (at -5.5 0 48.1) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at 5.5 0 48.1) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at -5.22 4.2 48.1) (size 1.2 1.2) (drill 1.2) (layers *.Cu *.Mask))
   )
 
-  (module Keebio:MX-Alps-Choc-1U-NoLED (layer F.Cu) (tedit 5ED41737) (tstamp 5ED286E3)
+  (module Keebio:MX-Alps-Choc-1U-NoLED (layer F.Cu) (tedit 5C7EAB78) (tstamp 5ED286E3)
     (at 171.45 51.435)
     (path /5DFE2410)
-    (fp_text reference SW21 (at 0 3.175) (layer F.Fab)
+    (fp_text reference SW21 (at 0 3.175) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value SW_Push (at 0 -7.9375) (layer Dwgs.User)
@@ -2334,51 +2633,51 @@
       (net 45 "Net-(D23-Pad2)"))
   )
 
-  (module Keebio:MX-Alps-Choc-1U-NoLED (layer F.Cu) (tedit 5ED416ED) (tstamp 5ED286C7)
+  (module Keebio:MX-Alps-Choc-1U-NoLED (layer F.Cu) (tedit 5C7EAB78) (tstamp 5ED286C7)
     (at 133.35 102.235)
     (path /5DFE63D2)
-    (fp_text reference SW19 (at 0 3.175) (layer F.Fab)
+    (fp_text reference SW19 (at 0 3.175) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value SW_Push (at 0 -7.9375) (layer Dwgs.User)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start 5 -7) (end 7 -7) (layer Dwgs.User) (width 0.15))
-    (fp_line (start 7 -7) (end 7 -5) (layer Dwgs.User) (width 0.15))
-    (fp_line (start 5 7) (end 7 7) (layer Dwgs.User) (width 0.15))
-    (fp_line (start 7 7) (end 7 5) (layer Dwgs.User) (width 0.15))
-    (fp_line (start -7 5) (end -7 7) (layer Dwgs.User) (width 0.15))
-    (fp_line (start -7 7) (end -5 7) (layer Dwgs.User) (width 0.15))
-    (fp_line (start -5 -7) (end -7 -7) (layer Dwgs.User) (width 0.15))
-    (fp_line (start -7 -7) (end -7 -5) (layer Dwgs.User) (width 0.15))
-    (fp_line (start -9.525 -9.525) (end 9.525 -9.525) (layer Dwgs.User) (width 0.15))
-    (fp_line (start 9.525 -9.525) (end 9.525 9.525) (layer Dwgs.User) (width 0.15))
-    (fp_line (start 9.525 9.525) (end -9.525 9.525) (layer Dwgs.User) (width 0.15))
     (fp_line (start -9.525 9.525) (end -9.525 -9.525) (layer Dwgs.User) (width 0.15))
-    (pad 1 thru_hole oval (at 2.5 -4.5 86.1) (size 2.831378 2.25) (drill 1.47 (offset 0.290689 0)) (layers *.Cu *.Mask)
-      (net 44 "Net-(D21-Pad2)"))
-    (pad 1 thru_hole circle (at 2.54 -5.08) (size 2.25 2.25) (drill 1.47) (layers *.Cu *.Mask)
+    (fp_line (start 9.525 9.525) (end -9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 -9.525) (end 9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 -9.525) (end 9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -7) (end -7 -5) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -5 -7) (end -7 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 7) (end -5 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 5) (end -7 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 7 7) (end 7 5) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 5 7) (end 7 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 7 -7) (end 7 -5) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 5 -7) (end 7 -7) (layer Dwgs.User) (width 0.15))
+    (pad "" np_thru_hole circle (at -5.22 4.2 48.1) (size 1.2 1.2) (drill 1.2) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.5 0 48.1) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.5 0 48.1) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad 2 thru_hole circle (at 0 -5.9) (size 2 2) (drill 1.2) (layers *.Cu *.Mask)
+      (net 30 COL2))
+    (pad 1 thru_hole circle (at 5 -3.8) (size 2 2) (drill 1.2) (layers *.Cu *.Mask)
       (net 44 "Net-(D21-Pad2)"))
-    (pad 2 thru_hole oval (at -3.81 -2.54 48.1) (size 4.211556 2.25) (drill 1.47 (offset 0.980778 0)) (layers *.Cu *.Mask)
+    (pad "" np_thru_hole circle (at 5.08 0 48.0996) (size 1.75 1.75) (drill 1.75) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.08 0 48.0996) (size 1.75 1.75) (drill 1.75) (layers *.Cu *.Mask))
+    (pad 2 thru_hole circle (at -2.5 -4) (size 2.25 2.25) (drill 1.47) (layers *.Cu *.Mask)
       (net 30 COL2))
     (pad "" np_thru_hole circle (at 0 0) (size 3.9878 3.9878) (drill 3.9878) (layers *.Cu *.Mask))
-    (pad 2 thru_hole circle (at -2.5 -4) (size 2.25 2.25) (drill 1.47) (layers *.Cu *.Mask)
+    (pad 2 thru_hole oval (at -3.81 -2.54 48.1) (size 4.211556 2.25) (drill 1.47 (offset 0.980778 0)) (layers *.Cu *.Mask)
       (net 30 COL2))
-    (pad "" np_thru_hole circle (at -5.08 0 48.0996) (size 1.75 1.75) (drill 1.75) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at 5.08 0 48.0996) (size 1.75 1.75) (drill 1.75) (layers *.Cu *.Mask))
-    (pad 1 thru_hole circle (at 5 -3.8) (size 2 2) (drill 1.2) (layers *.Cu *.Mask)
+    (pad 1 thru_hole circle (at 2.54 -5.08) (size 2.25 2.25) (drill 1.47) (layers *.Cu *.Mask)
+      (net 44 "Net-(D21-Pad2)"))
+    (pad 1 thru_hole oval (at 2.5 -4.5 86.1) (size 2.831378 2.25) (drill 1.47 (offset 0.290689 0)) (layers *.Cu *.Mask)
       (net 44 "Net-(D21-Pad2)"))
-    (pad 2 thru_hole circle (at 0 -5.9) (size 2 2) (drill 1.2) (layers *.Cu *.Mask)
-      (net 30 COL2))
-    (pad "" np_thru_hole circle (at -5.5 0 48.1) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at 5.5 0 48.1) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at -5.22 4.2 48.1) (size 1.2 1.2) (drill 1.2) (layers *.Cu *.Mask))
   )
 
-  (module Keebio:MX-Alps-Choc-1U-NoLED (layer F.Cu) (tedit 5ED41703) (tstamp 5ED286AB)
+  (module Keebio:MX-Alps-Choc-1U-NoLED (layer F.Cu) (tedit 5C7EAB78) (tstamp 5ED286AB)
     (at 133.35 83.185)
     (path /5DFE63FC)
-    (fp_text reference SW18 (at 0 3.175) (layer F.Fab)
+    (fp_text reference SW18 (at 0 3.175) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value SW_Push (at 0 -7.9375) (layer Dwgs.User)
@@ -2416,54 +2715,54 @@
       (net 43 "Net-(D20-Pad2)"))
   )
 
-  (module Keebio:MX-Alps-Choc-1U-NoLED (layer F.Cu) (tedit 5ED41744) (tstamp 5ED2868F)
+  (module Keebio:MX-Alps-Choc-1U-NoLED (layer F.Cu) (tedit 5C7EAB78) (tstamp 5ED2868F)
     (at 133.35 64.135)
     (path /5DFE640A)
-    (fp_text reference SW17 (at 0 3.175) (layer F.Fab)
+    (fp_text reference SW17 (at 0 3.175) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value SW_Push (at 0 -7.9375) (layer Dwgs.User)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start 5 -7) (end 7 -7) (layer Dwgs.User) (width 0.15))
-    (fp_line (start 7 -7) (end 7 -5) (layer Dwgs.User) (width 0.15))
-    (fp_line (start 5 7) (end 7 7) (layer Dwgs.User) (width 0.15))
-    (fp_line (start 7 7) (end 7 5) (layer Dwgs.User) (width 0.15))
-    (fp_line (start -7 5) (end -7 7) (layer Dwgs.User) (width 0.15))
-    (fp_line (start -7 7) (end -5 7) (layer Dwgs.User) (width 0.15))
-    (fp_line (start -5 -7) (end -7 -7) (layer Dwgs.User) (width 0.15))
-    (fp_line (start -7 -7) (end -7 -5) (layer Dwgs.User) (width 0.15))
-    (fp_line (start -9.525 -9.525) (end 9.525 -9.525) (layer Dwgs.User) (width 0.15))
-    (fp_line (start 9.525 -9.525) (end 9.525 9.525) (layer Dwgs.User) (width 0.15))
-    (fp_line (start 9.525 9.525) (end -9.525 9.525) (layer Dwgs.User) (width 0.15))
     (fp_line (start -9.525 9.525) (end -9.525 -9.525) (layer Dwgs.User) (width 0.15))
-    (pad 1 thru_hole oval (at 2.5 -4.5 86.1) (size 2.831378 2.25) (drill 1.47 (offset 0.290689 0)) (layers *.Cu *.Mask)
-      (net 42 "Net-(D19-Pad2)"))
-    (pad 1 thru_hole circle (at 2.54 -5.08) (size 2.25 2.25) (drill 1.47) (layers *.Cu *.Mask)
+    (fp_line (start 9.525 9.525) (end -9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 -9.525) (end 9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 -9.525) (end 9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -7) (end -7 -5) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -5 -7) (end -7 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 7) (end -5 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 5) (end -7 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 7 7) (end 7 5) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 5 7) (end 7 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 7 -7) (end 7 -5) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 5 -7) (end 7 -7) (layer Dwgs.User) (width 0.15))
+    (pad "" np_thru_hole circle (at -5.22 4.2 48.1) (size 1.2 1.2) (drill 1.2) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.5 0 48.1) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.5 0 48.1) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad 2 thru_hole circle (at 0 -5.9) (size 2 2) (drill 1.2) (layers *.Cu *.Mask)
+      (net 30 COL2))
+    (pad 1 thru_hole circle (at 5 -3.8) (size 2 2) (drill 1.2) (layers *.Cu *.Mask)
       (net 42 "Net-(D19-Pad2)"))
-    (pad 2 thru_hole oval (at -3.81 -2.54 48.1) (size 4.211556 2.25) (drill 1.47 (offset 0.980778 0)) (layers *.Cu *.Mask)
+    (pad "" np_thru_hole circle (at 5.08 0 48.0996) (size 1.75 1.75) (drill 1.75) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.08 0 48.0996) (size 1.75 1.75) (drill 1.75) (layers *.Cu *.Mask))
+    (pad 2 thru_hole circle (at -2.5 -4) (size 2.25 2.25) (drill 1.47) (layers *.Cu *.Mask)
       (net 30 COL2))
     (pad "" np_thru_hole circle (at 0 0) (size 3.9878 3.9878) (drill 3.9878) (layers *.Cu *.Mask))
-    (pad 2 thru_hole circle (at -2.5 -4) (size 2.25 2.25) (drill 1.47) (layers *.Cu *.Mask)
+    (pad 2 thru_hole oval (at -3.81 -2.54 48.1) (size 4.211556 2.25) (drill 1.47 (offset 0.980778 0)) (layers *.Cu *.Mask)
       (net 30 COL2))
-    (pad "" np_thru_hole circle (at -5.08 0 48.0996) (size 1.75 1.75) (drill 1.75) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at 5.08 0 48.0996) (size 1.75 1.75) (drill 1.75) (layers *.Cu *.Mask))
-    (pad 1 thru_hole circle (at 5 -3.8) (size 2 2) (drill 1.2) (layers *.Cu *.Mask)
+    (pad 1 thru_hole circle (at 2.54 -5.08) (size 2.25 2.25) (drill 1.47) (layers *.Cu *.Mask)
+      (net 42 "Net-(D19-Pad2)"))
+    (pad 1 thru_hole oval (at 2.5 -4.5 86.1) (size 2.831378 2.25) (drill 1.47 (offset 0.290689 0)) (layers *.Cu *.Mask)
       (net 42 "Net-(D19-Pad2)"))
-    (pad 2 thru_hole circle (at 0 -5.9) (size 2 2) (drill 1.2) (layers *.Cu *.Mask)
-      (net 30 COL2))
-    (pad "" np_thru_hole circle (at -5.5 0 48.1) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at 5.5 0 48.1) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at -5.22 4.2 48.1) (size 1.2 1.2) (drill 1.2) (layers *.Cu *.Mask))
   )
 
-  (module Keebio:MX-Alps-Choc-1U-NoLED (layer F.Cu) (tedit 5ED4154A) (tstamp 5ED28673)
+  (module Keebio:MX-Alps-Choc-1U-NoLED (layer F.Cu) (tedit 5C7EAB78) (tstamp 5ED28673)
     (at 222.631 118.745 333.5)
     (path /5DFEF7E7)
-    (fp_text reference SW15 (at 0 3.175 333.5) (layer F.Fab)
+    (fp_text reference SW15 (at 0 3.175 333.5) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value SW_Push (at 0 -7.9375 333.5) (layer Dwgs.User)
+    (fp_text value SW_Push (at 0 -7.937499 333.5) (layer Dwgs.User)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_line (start -9.525 9.525) (end -9.525 -9.525) (layer Dwgs.User) (width 0.15))
@@ -2498,51 +2797,51 @@
       (net 41 "Net-(D17-Pad2)"))
   )
 
-  (module Keebio:MX-Alps-Choc-1U-NoLED (layer F.Cu) (tedit 5ED416D2) (tstamp 5ED28657)
+  (module Keebio:MX-Alps-Choc-1U-NoLED (layer F.Cu) (tedit 5C7EAB78) (tstamp 5ED28657)
     (at 209.55 94.615)
     (path /5DFEF7D9)
-    (fp_text reference SW14 (at 0 3.175) (layer F.Fab)
+    (fp_text reference SW14 (at 0 3.175) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value SW_Push (at 0 -7.9375) (layer Dwgs.User)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start 5 -7) (end 7 -7) (layer Dwgs.User) (width 0.15))
-    (fp_line (start 7 -7) (end 7 -5) (layer Dwgs.User) (width 0.15))
-    (fp_line (start 5 7) (end 7 7) (layer Dwgs.User) (width 0.15))
-    (fp_line (start 7 7) (end 7 5) (layer Dwgs.User) (width 0.15))
-    (fp_line (start -7 5) (end -7 7) (layer Dwgs.User) (width 0.15))
-    (fp_line (start -7 7) (end -5 7) (layer Dwgs.User) (width 0.15))
-    (fp_line (start -5 -7) (end -7 -7) (layer Dwgs.User) (width 0.15))
-    (fp_line (start -7 -7) (end -7 -5) (layer Dwgs.User) (width 0.15))
-    (fp_line (start -9.525 -9.525) (end 9.525 -9.525) (layer Dwgs.User) (width 0.15))
-    (fp_line (start 9.525 -9.525) (end 9.525 9.525) (layer Dwgs.User) (width 0.15))
-    (fp_line (start 9.525 9.525) (end -9.525 9.525) (layer Dwgs.User) (width 0.15))
     (fp_line (start -9.525 9.525) (end -9.525 -9.525) (layer Dwgs.User) (width 0.15))
-    (pad 1 thru_hole oval (at 2.5 -4.5 86.1) (size 2.831378 2.25) (drill 1.47 (offset 0.290689 0)) (layers *.Cu *.Mask)
-      (net 40 "Net-(D16-Pad2)"))
-    (pad 1 thru_hole circle (at 2.54 -5.08) (size 2.25 2.25) (drill 1.47) (layers *.Cu *.Mask)
+    (fp_line (start 9.525 9.525) (end -9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 -9.525) (end 9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 -9.525) (end 9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -7) (end -7 -5) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -5 -7) (end -7 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 7) (end -5 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 5) (end -7 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 7 7) (end 7 5) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 5 7) (end 7 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 7 -7) (end 7 -5) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 5 -7) (end 7 -7) (layer Dwgs.User) (width 0.15))
+    (pad "" np_thru_hole circle (at -5.22 4.2 48.1) (size 1.2 1.2) (drill 1.2) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.5 0 48.1) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.5 0 48.1) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad 2 thru_hole circle (at 0 -5.9) (size 2 2) (drill 1.2) (layers *.Cu *.Mask)
+      (net 36 COL6))
+    (pad 1 thru_hole circle (at 5 -3.8) (size 2 2) (drill 1.2) (layers *.Cu *.Mask)
       (net 40 "Net-(D16-Pad2)"))
-    (pad 2 thru_hole oval (at -3.81 -2.54 48.1) (size 4.211556 2.25) (drill 1.47 (offset 0.980778 0)) (layers *.Cu *.Mask)
+    (pad "" np_thru_hole circle (at 5.08 0 48.0996) (size 1.75 1.75) (drill 1.75) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.08 0 48.0996) (size 1.75 1.75) (drill 1.75) (layers *.Cu *.Mask))
+    (pad 2 thru_hole circle (at -2.5 -4) (size 2.25 2.25) (drill 1.47) (layers *.Cu *.Mask)
       (net 36 COL6))
     (pad "" np_thru_hole circle (at 0 0) (size 3.9878 3.9878) (drill 3.9878) (layers *.Cu *.Mask))
-    (pad 2 thru_hole circle (at -2.5 -4) (size 2.25 2.25) (drill 1.47) (layers *.Cu *.Mask)
+    (pad 2 thru_hole oval (at -3.81 -2.54 48.1) (size 4.211556 2.25) (drill 1.47 (offset 0.980778 0)) (layers *.Cu *.Mask)
       (net 36 COL6))
-    (pad "" np_thru_hole circle (at -5.08 0 48.0996) (size 1.75 1.75) (drill 1.75) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at 5.08 0 48.0996) (size 1.75 1.75) (drill 1.75) (layers *.Cu *.Mask))
-    (pad 1 thru_hole circle (at 5 -3.8) (size 2 2) (drill 1.2) (layers *.Cu *.Mask)
+    (pad 1 thru_hole circle (at 2.54 -5.08) (size 2.25 2.25) (drill 1.47) (layers *.Cu *.Mask)
+      (net 40 "Net-(D16-Pad2)"))
+    (pad 1 thru_hole oval (at 2.5 -4.5 86.1) (size 2.831378 2.25) (drill 1.47 (offset 0.290689 0)) (layers *.Cu *.Mask)
       (net 40 "Net-(D16-Pad2)"))
-    (pad 2 thru_hole circle (at 0 -5.9) (size 2 2) (drill 1.2) (layers *.Cu *.Mask)
-      (net 36 COL6))
-    (pad "" np_thru_hole circle (at -5.5 0 48.1) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at 5.5 0 48.1) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at -5.22 4.2 48.1) (size 1.2 1.2) (drill 1.2) (layers *.Cu *.Mask))
   )
 
-  (module Keebio:MX-Alps-Choc-1U-NoLED (layer F.Cu) (tedit 5ED41729) (tstamp 5ED2863B)
+  (module Keebio:MX-Alps-Choc-1U-NoLED (layer F.Cu) (tedit 5C7EAB78) (tstamp 5ED2863B)
     (at 209.55 56.515)
     (path /5DFEF811)
-    (fp_text reference SW12 (at 0 3.175) (layer F.Fab)
+    (fp_text reference SW12 (at 0 3.175) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value SW_Push (at 0 -7.9375) (layer Dwgs.User)
@@ -2580,51 +2879,51 @@
       (net 39 "Net-(D14-Pad2)"))
   )
 
-  (module Keebio:MX-Alps-Choc-1U-NoLED (layer F.Cu) (tedit 5ED41722) (tstamp 5ED2861F)
+  (module Keebio:MX-Alps-Choc-1U-NoLED (layer F.Cu) (tedit 5C7EAB78) (tstamp 5ED2861F)
     (at 209.55 75.565)
     (path /5DFEF803)
-    (fp_text reference SW13 (at 0 3.175) (layer F.Fab)
+    (fp_text reference SW13 (at 0 3.175) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value SW_Push (at 0 -7.9375) (layer Dwgs.User)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start 5 -7) (end 7 -7) (layer Dwgs.User) (width 0.15))
-    (fp_line (start 7 -7) (end 7 -5) (layer Dwgs.User) (width 0.15))
-    (fp_line (start 5 7) (end 7 7) (layer Dwgs.User) (width 0.15))
-    (fp_line (start 7 7) (end 7 5) (layer Dwgs.User) (width 0.15))
-    (fp_line (start -7 5) (end -7 7) (layer Dwgs.User) (width 0.15))
-    (fp_line (start -7 7) (end -5 7) (layer Dwgs.User) (width 0.15))
-    (fp_line (start -5 -7) (end -7 -7) (layer Dwgs.User) (width 0.15))
-    (fp_line (start -7 -7) (end -7 -5) (layer Dwgs.User) (width 0.15))
-    (fp_line (start -9.525 -9.525) (end 9.525 -9.525) (layer Dwgs.User) (width 0.15))
-    (fp_line (start 9.525 -9.525) (end 9.525 9.525) (layer Dwgs.User) (width 0.15))
-    (fp_line (start 9.525 9.525) (end -9.525 9.525) (layer Dwgs.User) (width 0.15))
     (fp_line (start -9.525 9.525) (end -9.525 -9.525) (layer Dwgs.User) (width 0.15))
-    (pad 1 thru_hole oval (at 2.5 -4.5 86.1) (size 2.831378 2.25) (drill 1.47 (offset 0.290689 0)) (layers *.Cu *.Mask)
-      (net 38 "Net-(D15-Pad2)"))
-    (pad 1 thru_hole circle (at 2.54 -5.08) (size 2.25 2.25) (drill 1.47) (layers *.Cu *.Mask)
+    (fp_line (start 9.525 9.525) (end -9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 -9.525) (end 9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 -9.525) (end 9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -7) (end -7 -5) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -5 -7) (end -7 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 7) (end -5 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 5) (end -7 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 7 7) (end 7 5) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 5 7) (end 7 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 7 -7) (end 7 -5) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 5 -7) (end 7 -7) (layer Dwgs.User) (width 0.15))
+    (pad "" np_thru_hole circle (at -5.22 4.2 48.1) (size 1.2 1.2) (drill 1.2) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.5 0 48.1) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.5 0 48.1) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad 2 thru_hole circle (at 0 -5.9) (size 2 2) (drill 1.2) (layers *.Cu *.Mask)
+      (net 36 COL6))
+    (pad 1 thru_hole circle (at 5 -3.8) (size 2 2) (drill 1.2) (layers *.Cu *.Mask)
       (net 38 "Net-(D15-Pad2)"))
-    (pad 2 thru_hole oval (at -3.81 -2.54 48.1) (size 4.211556 2.25) (drill 1.47 (offset 0.980778 0)) (layers *.Cu *.Mask)
+    (pad "" np_thru_hole circle (at 5.08 0 48.0996) (size 1.75 1.75) (drill 1.75) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.08 0 48.0996) (size 1.75 1.75) (drill 1.75) (layers *.Cu *.Mask))
+    (pad 2 thru_hole circle (at -2.5 -4) (size 2.25 2.25) (drill 1.47) (layers *.Cu *.Mask)
       (net 36 COL6))
     (pad "" np_thru_hole circle (at 0 0) (size 3.9878 3.9878) (drill 3.9878) (layers *.Cu *.Mask))
-    (pad 2 thru_hole circle (at -2.5 -4) (size 2.25 2.25) (drill 1.47) (layers *.Cu *.Mask)
+    (pad 2 thru_hole oval (at -3.81 -2.54 48.1) (size 4.211556 2.25) (drill 1.47 (offset 0.980778 0)) (layers *.Cu *.Mask)
       (net 36 COL6))
-    (pad "" np_thru_hole circle (at -5.08 0 48.0996) (size 1.75 1.75) (drill 1.75) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at 5.08 0 48.0996) (size 1.75 1.75) (drill 1.75) (layers *.Cu *.Mask))
-    (pad 1 thru_hole circle (at 5 -3.8) (size 2 2) (drill 1.2) (layers *.Cu *.Mask)
+    (pad 1 thru_hole circle (at 2.54 -5.08) (size 2.25 2.25) (drill 1.47) (layers *.Cu *.Mask)
+      (net 38 "Net-(D15-Pad2)"))
+    (pad 1 thru_hole oval (at 2.5 -4.5 86.1) (size 2.831378 2.25) (drill 1.47 (offset 0.290689 0)) (layers *.Cu *.Mask)
       (net 38 "Net-(D15-Pad2)"))
-    (pad 2 thru_hole circle (at 0 -5.9) (size 2 2) (drill 1.2) (layers *.Cu *.Mask)
-      (net 36 COL6))
-    (pad "" np_thru_hole circle (at -5.5 0 48.1) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at 5.5 0 48.1) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at -5.22 4.2 48.1) (size 1.2 1.2) (drill 1.2) (layers *.Cu *.Mask))
   )
 
-  (module Keebio:MX-Alps-Choc-1U-NoLED (layer F.Cu) (tedit 5ED416CA) (tstamp 5ED28603)
+  (module Keebio:MX-Alps-Choc-1U-NoLED (layer F.Cu) (tedit 5C7EAB78) (tstamp 5ED28603)
     (at 161.925 111.125)
     (path /5DF621DD)
-    (fp_text reference SW10 (at 0 3.175) (layer F.Fab)
+    (fp_text reference SW10 (at 0 3.175) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value SW_Push (at 0 -7.9375) (layer Dwgs.User)
@@ -2662,307 +2961,6 @@
       (net 37 "Net-(D12-Pad2)"))
   )
 
-  (module Package_QFP:LQFP-48_7x7mm_P0.5mm (layer F.Cu) (tedit 5A5E2375) (tstamp 5ED314BE)
-    (at 229.743 69.342 90)
-    (descr "48 LEAD LQFP 7x7mm (see MICREL LQFP7x7-48LD-PL-1.pdf)")
-    (tags "QFP 0.5")
-    (path /5DEC39DF)
-    (attr smd)
-    (fp_text reference U1 (at 0 0 180) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value STM32 (at 0 6 90) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start 3.13 3.75) (end 3.75 3.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 3.75 3.13) (end 3.75 3.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 3.13 5.25) (end 3.13 3.75) (layer F.CrtYd) (width 0.05))
-    (fp_text user %R (at 0 0 90) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start -2.5 -3.5) (end 3.5 -3.5) (layer F.Fab) (width 0.1))
-    (fp_line (start 3.5 -3.5) (end 3.5 3.5) (layer F.Fab) (width 0.1))
-    (fp_line (start 3.5 3.5) (end -3.5 3.5) (layer F.Fab) (width 0.1))
-    (fp_line (start -3.5 3.5) (end -3.5 -2.5) (layer F.Fab) (width 0.1))
-    (fp_line (start -3.5 -2.5) (end -2.5 -3.5) (layer F.Fab) (width 0.1))
-    (fp_line (start -5.25 -3.13) (end -5.25 3.13) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 5.25 -3.13) (end 5.25 3.13) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -3.13 -5.25) (end 3.13 -5.25) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -3.13 5.25) (end 3.13 5.25) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 3.56 -3.56) (end 3.56 -3.14) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.56 3.56) (end 3.56 3.14) (layer F.SilkS) (width 0.12))
-    (fp_line (start -3.56 3.56) (end -3.56 3.14) (layer F.SilkS) (width 0.12))
-    (fp_line (start -3.56 -3.56) (end -3.14 -3.56) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.56 3.56) (end 3.14 3.56) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.56 -3.56) (end 3.14 -3.56) (layer F.SilkS) (width 0.12))
-    (fp_line (start -3.56 -3.14) (end -4.94 -3.14) (layer F.SilkS) (width 0.12))
-    (fp_line (start -3.56 -3.56) (end -3.56 -3.14) (layer F.SilkS) (width 0.12))
-    (fp_line (start -3.56 3.56) (end -3.14 3.56) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.75 3.13) (end 5.25 3.13) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 3.75 -3.13) (end 5.25 -3.13) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 3.13 -3.75) (end 3.13 -5.25) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -3.13 -3.75) (end -3.13 -5.25) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -3.75 -3.13) (end -5.25 -3.13) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -3.75 3.13) (end -5.25 3.13) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -3.13 3.75) (end -3.13 5.25) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 3.13 -3.75) (end 3.75 -3.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 3.75 -3.13) (end 3.75 -3.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -3.75 3.13) (end -3.75 3.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -3.13 3.75) (end -3.75 3.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -3.75 -3.13) (end -3.75 -3.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -3.13 -3.75) (end -3.75 -3.75) (layer F.CrtYd) (width 0.05))
-    (pad 1 smd rect (at -4.35 -2.75 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 11 VBAT))
-    (pad 2 smd rect (at -4.35 -2.25 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 61 "Net-(U1-Pad2)"))
-    (pad 3 smd rect (at -4.35 -1.75 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 62 "Net-(U1-Pad3)"))
-    (pad 4 smd rect (at -4.35 -1.25 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 63 "Net-(U1-Pad4)"))
-    (pad 5 smd rect (at -4.35 -0.75 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 12 "Net-(U1-Pad5)"))
-    (pad 6 smd rect (at -4.35 -0.25 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 13 "Net-(U1-Pad6)"))
-    (pad 7 smd rect (at -4.35 0.25 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 14 "Net-(C1-Pad2)"))
-    (pad 8 smd rect (at -4.35 0.75 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 1 GND))
-    (pad 9 smd rect (at -4.35 1.25 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 10 3.3V))
-    (pad 10 smd rect (at -4.35 1.75 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 15 "Net-(U1-Pad10)"))
-    (pad 11 smd rect (at -4.35 2.25 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 16 "Net-(U1-Pad11)"))
-    (pad 12 smd rect (at -4.35 2.75 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 17 "Net-(U1-Pad12)"))
-    (pad 13 smd rect (at -2.75 4.35 180) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 18 "Net-(U1-Pad13)"))
-    (pad 14 smd rect (at -2.25 4.35 180) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 19 PA4))
-    (pad 15 smd rect (at -1.75 4.35 180) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 20 PA5))
-    (pad 16 smd rect (at -1.25 4.35 180) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 21 PA6))
-    (pad 17 smd rect (at -0.75 4.35 180) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 22 PA7))
-    (pad 18 smd rect (at -0.25 4.35 180) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 23 ROW1))
-    (pad 19 smd rect (at 0.25 4.35 180) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 24 ROW2))
-    (pad 20 smd rect (at 0.75 4.35 180) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 25 ROW3))
-    (pad 21 smd rect (at 1.25 4.35 180) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 26 ROW4))
-    (pad 22 smd rect (at 1.75 4.35 180) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 64 "Net-(U1-Pad22)"))
-    (pad 23 smd rect (at 2.25 4.35 180) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 1 GND))
-    (pad 24 smd rect (at 2.75 4.35 180) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 10 3.3V))
-    (pad 25 smd rect (at 4.35 2.75 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 65 "Net-(U1-Pad25)"))
-    (pad 26 smd rect (at 4.35 2.25 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 66 "Net-(U1-Pad26)"))
-    (pad 27 smd rect (at 4.35 1.75 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 67 "Net-(U1-Pad27)"))
-    (pad 28 smd rect (at 4.35 1.25 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 68 "Net-(U1-Pad28)"))
-    (pad 29 smd rect (at 4.35 0.75 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 69 "Net-(U1-Pad29)"))
-    (pad 30 smd rect (at 4.35 0.25 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 59 TX))
-    (pad 31 smd rect (at 4.35 -0.25 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 60 RX))
-    (pad 32 smd rect (at 4.35 -0.75 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 5 D-))
-    (pad 33 smd rect (at 4.35 -1.25 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 6 D+))
-    (pad 34 smd rect (at 4.35 -1.75 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 27 SWDIO))
-    (pad 35 smd rect (at 4.35 -2.25 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 1 GND))
-    (pad 36 smd rect (at 4.35 -2.75 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 10 3.3V))
-    (pad 37 smd rect (at 2.75 -4.35 180) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 28 SWDCLK))
-    (pad 38 smd rect (at 2.25 -4.35 180) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 29 COL1))
-    (pad 39 smd rect (at 1.75 -4.35 180) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 30 COL2))
-    (pad 40 smd rect (at 1.25 -4.35 180) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 31 COL3))
-    (pad 41 smd rect (at 0.75 -4.35 180) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 32 COL4))
-    (pad 42 smd rect (at 0.25 -4.35 180) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 33 PB6))
-    (pad 43 smd rect (at -0.25 -4.35 180) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 34 PB7))
-    (pad 44 smd rect (at -0.75 -4.35 180) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 9 "Net-(R1-Pad1)"))
-    (pad 45 smd rect (at -1.25 -4.35 180) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 35 COL5))
-    (pad 46 smd rect (at -1.75 -4.35 180) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 36 COL6))
-    (pad 47 smd rect (at -2.25 -4.35 180) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 1 GND))
-    (pad 48 smd rect (at -2.75 -4.35 180) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 10 3.3V))
-    (model ${KISYS3DMOD}/Package_QFP.3dshapes/LQFP-48_7x7mm_P0.5mm.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Package_TO_SOT_SMD:SOT-23 (layer F.Cu) (tedit 5A02FF57) (tstamp 5ED28590)
-    (at 221.107 62.23 180)
-    (descr "SOT-23, Standard")
-    (tags SOT-23)
-    (path /5DED53E7)
-    (attr smd)
-    (fp_text reference U2 (at 2.794 0.127 180) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value LDO (at 0 2.5 180) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text user %R (at 0 0 270) (layer F.Fab)
-      (effects (font (size 0.5 0.5) (thickness 0.075)))
-    )
-    (fp_line (start -0.7 -0.95) (end -0.7 1.5) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.15 -1.52) (end 0.7 -1.52) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.7 -0.95) (end -0.15 -1.52) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.7 -1.52) (end 0.7 1.52) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.7 1.52) (end 0.7 1.52) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.76 1.58) (end 0.76 0.65) (layer F.SilkS) (width 0.12))
-    (fp_line (start 0.76 -1.58) (end 0.76 -0.65) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.7 -1.75) (end 1.7 -1.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.7 -1.75) (end 1.7 1.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.7 1.75) (end -1.7 1.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.7 1.75) (end -1.7 -1.75) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 0.76 -1.58) (end -1.4 -1.58) (layer F.SilkS) (width 0.12))
-    (fp_line (start 0.76 1.58) (end -0.7 1.58) (layer F.SilkS) (width 0.12))
-    (pad 1 smd rect (at -1 -0.95 180) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
-      (net 10 3.3V))
-    (pad 2 smd rect (at -1 0.95 180) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
-      (net 2 5V))
-    (pad 3 smd rect (at 1 0 180) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
-      (net 1 GND))
-    (model ${KISYS3DMOD}/Package_TO_SOT_SMD.3dshapes/SOT-23.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder (layer F.Cu) (tedit 5ED41E95) (tstamp 5ED2857B)
-    (at 223.13 74.422 180)
-    (descr "Resistor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
-    (tags "resistor handsolder")
-    (path /5DECE7D2)
-    (attr smd)
-    (fp_text reference R1 (at 0 -1.65 180) (layer F.SilkS) hide
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 5.1k (at 0 -1.65 180) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start -1 0.6) (end -1 -0.6) (layer F.Fab) (width 0.1))
-    (fp_line (start -1 -0.6) (end 1 -0.6) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 -0.6) (end 1 0.6) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 0.6) (end -1 0.6) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.261252 -0.71) (end 0.261252 -0.71) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.261252 0.71) (end 0.261252 0.71) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
-    (fp_text user %R (at 0 0 180) (layer F.Fab)
-      (effects (font (size 0.5 0.5) (thickness 0.08)))
-    )
-    (pad 1 smd roundrect (at -1.025 0 180) (size 1.15 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.217391)
-      (net 9 "Net-(R1-Pad1)"))
-    (pad 2 smd roundrect (at 1.025 0 180) (size 1.15 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.217391)
-      (net 1 GND))
-    (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0805_2012Metric.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder (layer F.Cu) (tedit 5ED41E24) (tstamp 5ED2856A)
-    (at 224.155 58.674 270)
-    (descr "Resistor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
-    (tags "resistor handsolder")
-    (path /5DEDEAE6)
-    (attr smd)
-    (fp_text reference R6 (at 0 -1.65 270) (layer F.SilkS) hide
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 5.1k (at 0 -1.65 270) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text user %R (at 0 0 270) (layer F.Fab)
-      (effects (font (size 0.5 0.5) (thickness 0.08)))
-    )
-    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -0.261252 0.71) (end 0.261252 0.71) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.261252 -0.71) (end 0.261252 -0.71) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1 0.6) (end -1 0.6) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 -0.6) (end 1 0.6) (layer F.Fab) (width 0.1))
-    (fp_line (start -1 -0.6) (end 1 -0.6) (layer F.Fab) (width 0.1))
-    (fp_line (start -1 0.6) (end -1 -0.6) (layer F.Fab) (width 0.1))
-    (pad 2 smd roundrect (at 1.025 0 270) (size 1.15 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.217391)
-      (net 1 GND))
-    (pad 1 smd roundrect (at -1.025 0 270) (size 1.15 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.217391)
-      (net 8 "Net-(J1-PadB5)"))
-    (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0805_2012Metric.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder (layer F.Cu) (tedit 5ED41DFA) (tstamp 5ED28559)
-    (at 228.727 58.674 270)
-    (descr "Resistor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
-    (tags "resistor handsolder")
-    (path /5DEDEA73)
-    (attr smd)
-    (fp_text reference R7 (at 0 -1.65 270) (layer F.SilkS) hide
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 5.1k (at 0 -1.65 270) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start -1 0.6) (end -1 -0.6) (layer F.Fab) (width 0.1))
-    (fp_line (start -1 -0.6) (end 1 -0.6) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 -0.6) (end 1 0.6) (layer F.Fab) (width 0.1))
-    (fp_line (start 1 0.6) (end -1 0.6) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.261252 -0.71) (end 0.261252 -0.71) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.261252 0.71) (end 0.261252 0.71) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
-    (fp_text user %R (at 0 0 270) (layer F.Fab)
-      (effects (font (size 0.5 0.5) (thickness 0.08)))
-    )
-    (pad 1 smd roundrect (at -1.025 0 270) (size 1.15 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.217391)
-      (net 4 "Net-(J1-PadA5)"))
-    (pad 2 smd roundrect (at 1.025 0 270) (size 1.15 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.217391)
-      (net 1 GND))
-    (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0805_2012Metric.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
   (module kicad-usb:USB_C_Receptacle_HRO_TYPE-C-31-M-12 (layer F.Cu) (tedit 5D3C0721) (tstamp 5ED2B38F)
     (at 224.79 50.8 180)
     (descr "USB Type-C receptacle for USB 2.0 and PD, http://www.krhro.com/uploads/soft/180320/1-1P320120243.pdf")
@@ -3132,6 +3130,7 @@
   (segment (start 227.493 64.092) (end 226.245372 62.844372) (width 0.25) (layer F.Cu) (net 1))
   (segment (start 227.493 64.992) (end 227.493 64.092) (width 0.25) (layer F.Cu) (net 1))
   (via (at 230.505 59.69) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 1))
+  (segment (start 232.493 64.992) (end 232.493 63.583) (width 0.25) (layer F.Cu) (net 1))
   (segment (start 222.107 59.207) (end 222.132 59.182) (width 0.25) (layer F.Cu) (net 2))
   (segment (start 222.107 61.28) (end 222.107 59.207) (width 0.25) (layer F.Cu) (net 2))
   (segment (start 222.34 58.974) (end 222.132 59.182) (width 0.25) (layer F.Cu) (net 2))
@@ -3786,7 +3785,7 @@
   (segment (start 229.493 62.60559) (end 239.663 52.43559) (width 0.25) (layer F.Cu) (net 60))
   (segment (start 229.493 64.992) (end 229.493 62.60559) (width 0.25) (layer F.Cu) (net 60))
 
-  (zone (net 1) (net_name GND) (layer F.Cu) (tstamp 5EDE8AF5) (hatch edge 0.508)
+  (zone (net 1) (net_name GND) (layer F.Cu) (tstamp 5F013256) (hatch edge 0.508)
     (connect_pads (clearance 0.508))
     (min_thickness 0.254)
     (fill yes (arc_segments 16) (thermal_gap 0.508) (thermal_bridge_width 0.508))
@@ -4379,60 +4378,61 @@
         (xy 236.040946 61.969) (xy 235.907586 61.769414) (xy 235.616436 61.574873) (xy 235.273001 61.50656) (xy 234.372999 61.50656)
         (xy 234.029564 61.574873) (xy 233.738414 61.769414) (xy 233.543873 62.060564) (xy 233.47556 62.403999) (xy 233.47556 63.001639)
         (xy 233.313518 63.163681) (xy 233.250062 63.206081) (xy 233.207662 63.269537) (xy 233.207661 63.269538) (xy 233.150557 63.355)
-        (xy 233.082087 63.457473) (xy 233.05093 63.614112) (xy 233.023102 63.75401) (xy 233.037991 63.828862) (xy 233.037991 63.858922)
-        (xy 232.865765 63.743843) (xy 232.618 63.69456) (xy 232.368 63.69456) (xy 232.243 63.719424) (xy 232.118 63.69456)
-        (xy 231.868 63.69456) (xy 231.743 63.719424) (xy 231.618 63.69456) (xy 231.368 63.69456) (xy 231.243 63.719424)
-        (xy 231.118 63.69456) (xy 230.868 63.69456) (xy 230.753 63.717435) (xy 230.753 63.056801) (xy 233.694335 60.115467)
-        (xy 233.798572 60.449226) (xy 234.158576 60.880637) (xy 234.65627 61.141442) (xy 234.713961 61.151904) (xy 234.936 61.029915)
-        (xy 234.936 59.687) (xy 235.19 59.687) (xy 235.19 61.029915) (xy 235.412039 61.151904) (xy 235.46973 61.141442)
-        (xy 235.967424 60.880637) (xy 236.327428 60.449226) (xy 236.494934 59.912886) (xy 236.342471 59.687) (xy 235.19 59.687)
-        (xy 234.936 59.687) (xy 234.916 59.687) (xy 234.916 59.433) (xy 234.936 59.433) (xy 234.936 59.413)
-        (xy 235.19 59.413) (xy 235.19 59.433) (xy 236.342471 59.433) (xy 236.494934 59.207114) (xy 236.327428 58.670774)
-        (xy 235.967424 58.239363) (xy 235.706939 58.102862) (xy 236.449822 57.359979) (xy 236.485569 57.44628) (xy 236.77672 57.737431)
-        (xy 237.157126 57.895) (xy 237.568874 57.895) (xy 237.94928 57.737431) (xy 238.240431 57.44628) (xy 238.398 57.065874)
-        (xy 238.398 56.654126) (xy 238.240431 56.27372) (xy 237.94928 55.982569) (xy 237.86298 55.946822) (xy 238.422865 55.386937)
-        (xy 238.628424 55.694577) (xy 239.103092 56.01174) (xy 239.234819 56.037942) (xy 239.366463 56.125904) (xy 239.663 56.184889)
-        (xy 239.959536 56.125904) (xy 239.98 56.11223) (xy 239.98 56.859942) (xy 239.663 56.796887) (xy 239.103091 56.90826)
-        (xy 238.628423 57.225424) (xy 238.31126 57.700092) (xy 238.228 58.118668) (xy 238.228 58.801333) (xy 238.31126 59.219909)
-        (xy 238.628424 59.694577) (xy 239.103092 60.01174) (xy 239.663 60.123113) (xy 239.98 60.060058) (xy 239.980001 104.613971)
-        (xy 226.831561 131.034895) (xy 190.667503 122.525706) (xy 190.612878 122.511004) (xy 190.601911 122.510273) (xy 190.591223 122.507758)
-        (xy 190.534746 122.505795) (xy 152.468139 119.968022) (xy 152.174837 119.928915) (xy 214.850412 119.928915) (xy 214.850412 120.420229)
-        (xy 215.03843 120.874143) (xy 215.385841 121.221554) (xy 215.839755 121.409572) (xy 216.331069 121.409572) (xy 216.784983 121.221554)
-        (xy 217.132394 120.874143) (xy 217.320412 120.420229) (xy 217.320412 119.928915) (xy 217.132394 119.475001) (xy 216.784983 119.12759)
-        (xy 216.331069 118.939572) (xy 215.839755 118.939572) (xy 215.385841 119.12759) (xy 215.03843 119.475001) (xy 214.850412 119.928915)
-        (xy 152.174837 119.928915) (xy 134.853042 117.619343) (xy 193.57 117.619343) (xy 193.57 118.110657) (xy 193.758018 118.564571)
-        (xy 194.105429 118.911982) (xy 194.559343 119.1) (xy 195.050657 119.1) (xy 195.504571 118.911982) (xy 195.851982 118.564571)
-        (xy 195.993847 118.222079) (xy 220.0021 118.222079) (xy 220.0021 119.267921) (xy 220.402326 120.234152) (xy 221.141848 120.973674)
-        (xy 222.108079 121.3739) (xy 223.153921 121.3739) (xy 224.120152 120.973674) (xy 224.382499 120.711327) (xy 225.667267 120.711327)
-        (xy 225.667267 121.312043) (xy 225.897151 121.867031) (xy 226.321921 122.291801) (xy 226.704013 122.450069) (xy 226.711954 122.45801)
-        (xy 227.257754 122.684088) (xy 227.848524 122.684088) (xy 228.394324 122.45801) (xy 228.812061 122.040273) (xy 229.038139 121.494473)
-        (xy 229.038139 120.903703) (xy 228.812061 120.357903) (xy 228.394324 119.940166) (xy 228.132942 119.831898) (xy 228.032613 119.731569)
-        (xy 227.477625 119.501685) (xy 226.876909 119.501685) (xy 226.321921 119.731569) (xy 225.897151 120.156339) (xy 225.667267 120.711327)
-        (xy 224.382499 120.711327) (xy 224.859674 120.234152) (xy 225.2599 119.267921) (xy 225.2599 118.222079) (xy 224.859674 117.255848)
-        (xy 224.120152 116.516326) (xy 223.153921 116.1161) (xy 222.108079 116.1161) (xy 221.141848 116.516326) (xy 220.402326 117.255848)
-        (xy 220.0021 118.222079) (xy 195.993847 118.222079) (xy 196.04 118.110657) (xy 196.04 117.619343) (xy 195.851982 117.165429)
-        (xy 195.504571 116.818018) (xy 195.050657 116.63) (xy 194.559343 116.63) (xy 194.105429 116.818018) (xy 193.758018 117.165429)
-        (xy 193.57 117.619343) (xy 134.853042 117.619343) (xy 115.803036 115.079343) (xy 155.47 115.079343) (xy 155.47 115.570657)
-        (xy 155.658018 116.024571) (xy 156.005429 116.371982) (xy 156.459343 116.56) (xy 156.950657 116.56) (xy 157.404571 116.371982)
-        (xy 157.751982 116.024571) (xy 157.94 115.570657) (xy 157.94 115.079343) (xy 174.52 115.079343) (xy 174.52 115.570657)
-        (xy 174.708018 116.024571) (xy 175.055429 116.371982) (xy 175.509343 116.56) (xy 176.000657 116.56) (xy 176.454571 116.371982)
-        (xy 176.801982 116.024571) (xy 176.99 115.570657) (xy 176.99 115.079343) (xy 176.801982 114.625429) (xy 176.454571 114.278018)
-        (xy 176.000657 114.09) (xy 175.509343 114.09) (xy 175.055429 114.278018) (xy 174.708018 114.625429) (xy 174.52 115.079343)
-        (xy 157.94 115.079343) (xy 157.751982 114.625429) (xy 157.404571 114.278018) (xy 156.950657 114.09) (xy 156.459343 114.09)
-        (xy 156.005429 114.278018) (xy 155.658018 114.625429) (xy 155.47 115.079343) (xy 115.803036 115.079343) (xy 105.46 113.700272)
-        (xy 105.46 108.729343) (xy 107.845 108.729343) (xy 107.845 109.220657) (xy 108.033018 109.674571) (xy 108.380429 110.021982)
-        (xy 108.834343 110.21) (xy 109.325657 110.21) (xy 109.779571 110.021982) (xy 110.126982 109.674571) (xy 110.315 109.220657)
-        (xy 110.315 108.729343) (xy 110.126982 108.275429) (xy 109.779571 107.928018) (xy 109.325657 107.74) (xy 108.834343 107.74)
-        (xy 108.380429 107.928018) (xy 108.033018 108.275429) (xy 107.845 108.729343) (xy 105.46 108.729343) (xy 105.46 89.679343)
-        (xy 107.845 89.679343) (xy 107.845 90.170657) (xy 108.033018 90.624571) (xy 108.380429 90.971982) (xy 108.834343 91.16)
-        (xy 109.325657 91.16) (xy 109.779571 90.971982) (xy 110.126982 90.624571) (xy 110.315 90.170657) (xy 110.315 89.679343)
-        (xy 110.126982 89.225429) (xy 109.779571 88.878018) (xy 109.325657 88.69) (xy 108.834343 88.69) (xy 108.380429 88.878018)
-        (xy 108.033018 89.225429) (xy 107.845 89.679343) (xy 105.46 89.679343) (xy 105.46 70.629343) (xy 107.845 70.629343)
-        (xy 107.845 71.120657) (xy 108.033018 71.574571) (xy 108.380429 71.921982) (xy 108.834343 72.11) (xy 109.325657 72.11)
-        (xy 109.779571 71.921982) (xy 110.126982 71.574571) (xy 110.315 71.120657) (xy 110.315 70.629343) (xy 110.126982 70.175429)
-        (xy 109.779571 69.828018) (xy 109.325657 69.64) (xy 108.834343 69.64) (xy 108.380429 69.828018) (xy 108.033018 70.175429)
-        (xy 107.845 70.629343) (xy 105.46 70.629343) (xy 105.46 57.643719) (xy 143.029958 45.120401) (xy 161.970472 42.595)
-        (xy 180.929535 42.595)
+        (xy 233.082087 63.457473) (xy 233.05093 63.614112) (xy 233.023102 63.75401) (xy 233.037991 63.828862) (xy 233.037991 63.863965)
+        (xy 232.977699 63.803673) (xy 232.74431 63.707) (xy 232.71425 63.707) (xy 232.5555 63.86575) (xy 232.5555 63.870621)
+        (xy 232.365765 63.743843) (xy 232.294397 63.729647) (xy 232.27175 63.707) (xy 232.24169 63.707) (xy 232.221852 63.715217)
+        (xy 232.118 63.69456) (xy 231.868 63.69456) (xy 231.743 63.719424) (xy 231.618 63.69456) (xy 231.368 63.69456)
+        (xy 231.243 63.719424) (xy 231.118 63.69456) (xy 230.868 63.69456) (xy 230.753 63.717435) (xy 230.753 63.056801)
+        (xy 233.694335 60.115467) (xy 233.798572 60.449226) (xy 234.158576 60.880637) (xy 234.65627 61.141442) (xy 234.713961 61.151904)
+        (xy 234.936 61.029915) (xy 234.936 59.687) (xy 235.19 59.687) (xy 235.19 61.029915) (xy 235.412039 61.151904)
+        (xy 235.46973 61.141442) (xy 235.967424 60.880637) (xy 236.327428 60.449226) (xy 236.494934 59.912886) (xy 236.342471 59.687)
+        (xy 235.19 59.687) (xy 234.936 59.687) (xy 234.916 59.687) (xy 234.916 59.433) (xy 234.936 59.433)
+        (xy 234.936 59.413) (xy 235.19 59.413) (xy 235.19 59.433) (xy 236.342471 59.433) (xy 236.494934 59.207114)
+        (xy 236.327428 58.670774) (xy 235.967424 58.239363) (xy 235.706939 58.102862) (xy 236.449822 57.359979) (xy 236.485569 57.44628)
+        (xy 236.77672 57.737431) (xy 237.157126 57.895) (xy 237.568874 57.895) (xy 237.94928 57.737431) (xy 238.240431 57.44628)
+        (xy 238.398 57.065874) (xy 238.398 56.654126) (xy 238.240431 56.27372) (xy 237.94928 55.982569) (xy 237.86298 55.946822)
+        (xy 238.422865 55.386937) (xy 238.628424 55.694577) (xy 239.103092 56.01174) (xy 239.234819 56.037942) (xy 239.366463 56.125904)
+        (xy 239.663 56.184889) (xy 239.959536 56.125904) (xy 239.98 56.11223) (xy 239.98 56.859942) (xy 239.663 56.796887)
+        (xy 239.103091 56.90826) (xy 238.628423 57.225424) (xy 238.31126 57.700092) (xy 238.228 58.118668) (xy 238.228 58.801333)
+        (xy 238.31126 59.219909) (xy 238.628424 59.694577) (xy 239.103092 60.01174) (xy 239.663 60.123113) (xy 239.98 60.060058)
+        (xy 239.980001 104.613971) (xy 226.831561 131.034895) (xy 190.667503 122.525706) (xy 190.612878 122.511004) (xy 190.601911 122.510273)
+        (xy 190.591223 122.507758) (xy 190.534746 122.505795) (xy 152.468139 119.968022) (xy 152.174837 119.928915) (xy 214.850412 119.928915)
+        (xy 214.850412 120.420229) (xy 215.03843 120.874143) (xy 215.385841 121.221554) (xy 215.839755 121.409572) (xy 216.331069 121.409572)
+        (xy 216.784983 121.221554) (xy 217.132394 120.874143) (xy 217.320412 120.420229) (xy 217.320412 119.928915) (xy 217.132394 119.475001)
+        (xy 216.784983 119.12759) (xy 216.331069 118.939572) (xy 215.839755 118.939572) (xy 215.385841 119.12759) (xy 215.03843 119.475001)
+        (xy 214.850412 119.928915) (xy 152.174837 119.928915) (xy 134.853042 117.619343) (xy 193.57 117.619343) (xy 193.57 118.110657)
+        (xy 193.758018 118.564571) (xy 194.105429 118.911982) (xy 194.559343 119.1) (xy 195.050657 119.1) (xy 195.504571 118.911982)
+        (xy 195.851982 118.564571) (xy 195.993847 118.222079) (xy 220.0021 118.222079) (xy 220.0021 119.267921) (xy 220.402326 120.234152)
+        (xy 221.141848 120.973674) (xy 222.108079 121.3739) (xy 223.153921 121.3739) (xy 224.120152 120.973674) (xy 224.382499 120.711327)
+        (xy 225.667267 120.711327) (xy 225.667267 121.312043) (xy 225.897151 121.867031) (xy 226.321921 122.291801) (xy 226.704013 122.450069)
+        (xy 226.711954 122.45801) (xy 227.257754 122.684088) (xy 227.848524 122.684088) (xy 228.394324 122.45801) (xy 228.812061 122.040273)
+        (xy 229.038139 121.494473) (xy 229.038139 120.903703) (xy 228.812061 120.357903) (xy 228.394324 119.940166) (xy 228.132942 119.831898)
+        (xy 228.032613 119.731569) (xy 227.477625 119.501685) (xy 226.876909 119.501685) (xy 226.321921 119.731569) (xy 225.897151 120.156339)
+        (xy 225.667267 120.711327) (xy 224.382499 120.711327) (xy 224.859674 120.234152) (xy 225.2599 119.267921) (xy 225.2599 118.222079)
+        (xy 224.859674 117.255848) (xy 224.120152 116.516326) (xy 223.153921 116.1161) (xy 222.108079 116.1161) (xy 221.141848 116.516326)
+        (xy 220.402326 117.255848) (xy 220.0021 118.222079) (xy 195.993847 118.222079) (xy 196.04 118.110657) (xy 196.04 117.619343)
+        (xy 195.851982 117.165429) (xy 195.504571 116.818018) (xy 195.050657 116.63) (xy 194.559343 116.63) (xy 194.105429 116.818018)
+        (xy 193.758018 117.165429) (xy 193.57 117.619343) (xy 134.853042 117.619343) (xy 115.803036 115.079343) (xy 155.47 115.079343)
+        (xy 155.47 115.570657) (xy 155.658018 116.024571) (xy 156.005429 116.371982) (xy 156.459343 116.56) (xy 156.950657 116.56)
+        (xy 157.404571 116.371982) (xy 157.751982 116.024571) (xy 157.94 115.570657) (xy 157.94 115.079343) (xy 174.52 115.079343)
+        (xy 174.52 115.570657) (xy 174.708018 116.024571) (xy 175.055429 116.371982) (xy 175.509343 116.56) (xy 176.000657 116.56)
+        (xy 176.454571 116.371982) (xy 176.801982 116.024571) (xy 176.99 115.570657) (xy 176.99 115.079343) (xy 176.801982 114.625429)
+        (xy 176.454571 114.278018) (xy 176.000657 114.09) (xy 175.509343 114.09) (xy 175.055429 114.278018) (xy 174.708018 114.625429)
+        (xy 174.52 115.079343) (xy 157.94 115.079343) (xy 157.751982 114.625429) (xy 157.404571 114.278018) (xy 156.950657 114.09)
+        (xy 156.459343 114.09) (xy 156.005429 114.278018) (xy 155.658018 114.625429) (xy 155.47 115.079343) (xy 115.803036 115.079343)
+        (xy 105.46 113.700272) (xy 105.46 108.729343) (xy 107.845 108.729343) (xy 107.845 109.220657) (xy 108.033018 109.674571)
+        (xy 108.380429 110.021982) (xy 108.834343 110.21) (xy 109.325657 110.21) (xy 109.779571 110.021982) (xy 110.126982 109.674571)
+        (xy 110.315 109.220657) (xy 110.315 108.729343) (xy 110.126982 108.275429) (xy 109.779571 107.928018) (xy 109.325657 107.74)
+        (xy 108.834343 107.74) (xy 108.380429 107.928018) (xy 108.033018 108.275429) (xy 107.845 108.729343) (xy 105.46 108.729343)
+        (xy 105.46 89.679343) (xy 107.845 89.679343) (xy 107.845 90.170657) (xy 108.033018 90.624571) (xy 108.380429 90.971982)
+        (xy 108.834343 91.16) (xy 109.325657 91.16) (xy 109.779571 90.971982) (xy 110.126982 90.624571) (xy 110.315 90.170657)
+        (xy 110.315 89.679343) (xy 110.126982 89.225429) (xy 109.779571 88.878018) (xy 109.325657 88.69) (xy 108.834343 88.69)
+        (xy 108.380429 88.878018) (xy 108.033018 89.225429) (xy 107.845 89.679343) (xy 105.46 89.679343) (xy 105.46 70.629343)
+        (xy 107.845 70.629343) (xy 107.845 71.120657) (xy 108.033018 71.574571) (xy 108.380429 71.921982) (xy 108.834343 72.11)
+        (xy 109.325657 72.11) (xy 109.779571 71.921982) (xy 110.126982 71.574571) (xy 110.315 71.120657) (xy 110.315 70.629343)
+        (xy 110.126982 70.175429) (xy 109.779571 69.828018) (xy 109.325657 69.64) (xy 108.834343 69.64) (xy 108.380429 69.828018)
+        (xy 108.033018 70.175429) (xy 107.845 70.629343) (xy 105.46 70.629343) (xy 105.46 57.643719) (xy 143.029958 45.120401)
+        (xy 161.970472 42.595) (xy 180.929535 42.595)
       )
     )
     (filled_polygon
@@ -4831,7 +4831,7 @@
       )
     )
   )
-  (zone (net 1) (net_name GND) (layer B.Cu) (tstamp 5EDE8AF2) (hatch edge 0.508)
+  (zone (net 1) (net_name GND) (layer B.Cu) (tstamp 5F013253) (hatch edge 0.508)
     (connect_pads (clearance 0.508))
     (min_thickness 0.254)
     (fill yes (arc_segments 16) (thermal_gap 0.508) (thermal_bridge_width 0.508))
diff --git a/pcb/kicad/left.pro b/pcb/kicad/left/left.pro
index 152769c..152769c 100644
--- a/pcb/kicad/left.pro
+++ b/pcb/kicad/left/left.pro
diff --git a/pcb/kicad/left.bak b/pcb/kicad/left/left.sch
index b6bbcc6..6b289ef 100644
--- a/pcb/kicad/left.bak
+++ b/pcb/kicad/left/left.sch
@@ -1,5 +1,4 @@
 EESchema Schematic File Version 4
-LIBS:keyboard-cache
 EELAYER 26 0
 EELAYER END
 $Descr A4 11693 8268
@@ -1045,7 +1044,7 @@ U 1 1 5EDBCB44
 P 7500 2200
 F 0 "J3" H 7473 2173 50  0000 R CNN
 F 1 "Conn_01x12_Male" H 7473 2082 50  0000 R CNN
-F 2 "kicad-usb:Harwin_M20-89012xx_1x12_P2.54mm_Horizontal" H 7500 2200 50  0001 C CNN
+F 2 "kicad-harwin:Harwin_M20-89012xx_1x12_P2.54mm_Horizontal" H 7500 2200 50  0001 C CNN
 F 3 "~" H 7500 2200 50  0001 C CNN
 	1    7500 2200
 	-1   0    0    -1  
@@ -1077,4 +1076,15 @@ Text GLabel 7300 2400 0    50   Input ~ 0
 PA7
 Text GLabel 6700 3000 2    50   Input ~ 0
 PA5
+$Comp
+L power:GND #PWR?
+U 1 1 5F02320E
+P 5400 3700
+F 0 "#PWR?" H 5400 3450 50  0001 C CNN
+F 1 "GND" V 5405 3572 50  0000 R CNN
+F 2 "" H 5400 3700 50  0001 C CNN
+F 3 "" H 5400 3700 50  0001 C CNN
+	1    5400 3700
+	0    1    1    0   
+$EndComp
 $EndSCHEMATC
diff --git a/pcb/kicad/right/_saved_right.sch b/pcb/kicad/right/_saved_right.sch
new file mode 100644
index 0000000..7de9dc4
--- /dev/null
+++ b/pcb/kicad/right/_saved_right.sch
@@ -0,0 +1,1082 @@
+EESchema Schematic File Version 4
+LIBS:right-cache
+EELAYER 26 0
+EELAYER END
+$Descr A4 11693 8268
+encoding utf-8
+Sheet 1 1
+Title ""
+Date ""
+Rev ""
+Comp ""
+Comment1 ""
+Comment2 ""
+Comment3 ""
+Comment4 ""
+$EndDescr
+$Comp
+L MCU_ST_STM32F0:STM32F072CBTx U1
+U 1 1 5DEC39DF
+P 6100 2700
+F 0 "U1" H 6050 1114 50  0000 C CNN
+F 1 "STM32" H 6050 1023 50  0000 C CNN
+F 2 "Package_QFP:LQFP-48_7x7mm_P0.5mm" H 5500 1300 50  0001 R CNN
+F 3 "http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/DM00090510.pdf" H 6100 2700 50  0001 C CNN
+	1    6100 2700
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:C C2
+U 1 1 5DEC3C77
+P 5700 750
+F 0 "C2" H 5815 796 50  0000 L CNN
+F 1 "100nF" H 5815 705 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 5738 600 50  0001 C CNN
+F 3 "~" H 5700 750 50  0001 C CNN
+	1    5700 750 
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:C C3
+U 1 1 5DEC3CF5
+P 6150 750
+F 0 "C3" H 6265 796 50  0000 L CNN
+F 1 "100nF" H 6265 705 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 6188 600 50  0001 C CNN
+F 3 "~" H 6150 750 50  0001 C CNN
+	1    6150 750 
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:C C4
+U 1 1 5DEC3D3C
+P 6600 750
+F 0 "C4" H 6715 796 50  0000 L CNN
+F 1 "100nF" H 6715 705 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 6638 600 50  0001 C CNN
+F 3 "~" H 6600 750 50  0001 C CNN
+	1    6600 750 
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:C C5
+U 1 1 5DEC3D7E
+P 7100 750
+F 0 "C5" H 7215 796 50  0000 L CNN
+F 1 "100nF" H 7215 705 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 7138 600 50  0001 C CNN
+F 3 "~" H 7100 750 50  0001 C CNN
+	1    7100 750 
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:C C7
+U 1 1 5DEC3DF1
+P 8650 750
+F 0 "C7" H 8765 796 50  0000 L CNN
+F 1 "1µF" H 8765 705 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 8688 600 50  0001 C CNN
+F 3 "~" H 8650 750 50  0001 C CNN
+	1    8650 750 
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:GND #PWR0101
+U 1 1 5DEC3EA3
+P 6000 4550
+F 0 "#PWR0101" H 6000 4300 50  0001 C CNN
+F 1 "GND" H 6005 4377 50  0000 C CNN
+F 2 "" H 6000 4550 50  0001 C CNN
+F 3 "" H 6000 4550 50  0001 C CNN
+	1    6000 4550
+	1    0    0    -1  
+$EndComp
+Connection ~ 6150 600 
+Wire Wire Line
+	5900 4200 5900 4550
+Wire Wire Line
+	5900 4550 6000 4550
+Wire Wire Line
+	6000 4200 6000 4550
+Connection ~ 6000 4550
+Wire Wire Line
+	6100 4200 6100 4550
+Wire Wire Line
+	6100 4550 6000 4550
+Wire Wire Line
+	6200 4200 6200 4550
+Wire Wire Line
+	6200 4550 6100 4550
+Connection ~ 6100 4550
+Connection ~ 6150 900 
+Wire Wire Line
+	6100 1200 6100 1000
+Wire Wire Line
+	6100 1000 6150 1000
+Wire Wire Line
+	6150 1000 6150 900 
+Connection ~ 5700 600 
+Connection ~ 5700 900 
+Wire Wire Line
+	5700 900  6150 900 
+Wire Wire Line
+	5700 600  6150 600 
+Wire Wire Line
+	6000 1200 6000 1100
+Wire Wire Line
+	6000 1100 5700 1100
+Wire Wire Line
+	5700 1100 5700 900 
+Connection ~ 6600 900 
+Connection ~ 7100 900 
+Wire Wire Line
+	6150 900  6600 900 
+Wire Wire Line
+	6150 600  6600 600 
+Wire Wire Line
+	6600 900  7100 900 
+Wire Wire Line
+	6600 600  7100 600 
+Connection ~ 6600 600 
+Wire Wire Line
+	6600 900  6600 1050
+Wire Wire Line
+	6600 1050 6200 1050
+Wire Wire Line
+	6200 1050 6200 1200
+Wire Wire Line
+	6300 1200 7100 1200
+Wire Wire Line
+	7100 1200 7100 900 
+$Comp
+L power:GND #PWR0102
+U 1 1 5DEC9602
+P 4950 600
+F 0 "#PWR0102" H 4950 350 50  0001 C CNN
+F 1 "GND" H 4955 427 50  0000 C CNN
+F 2 "" H 4950 600 50  0001 C CNN
+F 3 "" H 4950 600 50  0001 C CNN
+	1    4950 600 
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:C C1
+U 1 1 5DEC9DB9
+P 5050 1150
+F 0 "C1" H 5165 1196 50  0000 L CNN
+F 1 "100nF" H 5165 1105 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 5088 1000 50  0001 C CNN
+F 3 "~" H 5050 1150 50  0001 C CNN
+	1    5050 1150
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW2
+U 1 1 5DECA090
+P 4450 1200
+F 0 "SW2" V 4404 1348 50  0000 L CNN
+F 1 "RESET" V 4495 1348 50  0000 L CNN
+F 2 "Button_Switch_SMD:SW_SPST_CK_RS282G05A3" H 4450 1400 50  0001 C CNN
+F 3 "" H 4450 1400 50  0001 C CNN
+	1    4450 1200
+	0    1    1    0   
+$EndComp
+$Comp
+L power:GND #PWR0103
+U 1 1 5DECA788
+P 4150 1000
+F 0 "#PWR0103" H 4150 750 50  0001 C CNN
+F 1 "GND" H 4155 827 50  0000 C CNN
+F 2 "" H 4150 1000 50  0001 C CNN
+F 3 "" H 4150 1000 50  0001 C CNN
+	1    4150 1000
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	5400 1400 5050 1400
+Wire Wire Line
+	4450 1000 4150 1000
+Wire Wire Line
+	4450 1400 5050 1400
+Connection ~ 5050 1400
+Wire Wire Line
+	5050 1400 5050 1300
+Wire Wire Line
+	4450 1000 5050 1000
+Connection ~ 4450 1000
+$Comp
+L Switch:SW_Push SW1
+U 1 1 5DECE105
+P 4200 1600
+F 0 "SW1" H 4200 1415 50  0000 C CNN
+F 1 "BOOT" H 4200 1506 50  0000 C CNN
+F 2 "Button_Switch_SMD:SW_SPST_CK_RS282G05A3" H 4200 1800 50  0001 C CNN
+F 3 "" H 4200 1800 50  0001 C CNN
+	1    4200 1600
+	-1   0    0    1   
+$EndComp
+$Comp
+L Device:R R1
+U 1 1 5DECE7D2
+P 4450 1750
+F 0 "R1" H 4520 1796 50  0000 L CNN
+F 1 "5.1k" H 4520 1705 50  0000 L CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" V 4380 1750 50  0001 C CNN
+F 3 "~" H 4450 1750 50  0001 C CNN
+	1    4450 1750
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:GND #PWR0104
+U 1 1 5DECF310
+P 4450 1900
+F 0 "#PWR0104" H 4450 1650 50  0001 C CNN
+F 1 "GND" H 4455 1727 50  0000 C CNN
+F 2 "" H 4450 1900 50  0001 C CNN
+F 3 "" H 4450 1900 50  0001 C CNN
+	1    4450 1900
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	4400 1600 4450 1600
+Wire Wire Line
+	4450 1600 5400 1600
+Connection ~ 4450 1600
+$Comp
+L Regulator_Linear:LM3480-3.3 U2
+U 1 1 5DED53E7
+P 8250 900
+F 0 "U2" H 8250 1050 50  0000 C CNN
+F 1 "LDO" H 8250 1141 50  0000 C CNN
+F 2 "Package_TO_SOT_SMD:SOT-23" H 8250 1125 50  0001 C CIN
+F 3 "http://www.ti.com/lit/ds/symlink/lm3480.pdf" H 8250 900 50  0001 C CNN
+	1    8250 900 
+	-1   0    0    1   
+$EndComp
+$Comp
+L power:GND #PWR0105
+U 1 1 5DEDB000
+P 10750 2400
+F 0 "#PWR0105" H 10750 2150 50  0001 C CNN
+F 1 "GND" H 10755 2227 50  0000 C CNN
+F 2 "" H 10750 2400 50  0001 C CNN
+F 3 "" H 10750 2400 50  0001 C CNN
+	1    10750 2400
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	11050 2400 10750 2400
+Wire Wire Line
+	10150 900  8650 900 
+$Comp
+L Device:R R7
+U 1 1 5DEDEA73
+P 10000 1100
+F 0 "R7" V 9793 1100 50  0000 C CNN
+F 1 "5.1k" V 9884 1100 50  0000 C CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" V 9930 1100 50  0001 C CNN
+F 3 "~" H 10000 1100 50  0001 C CNN
+	1    10000 1100
+	0    1    1    0   
+$EndComp
+$Comp
+L Device:R R6
+U 1 1 5DEDEAE6
+P 9500 1200
+F 0 "R6" V 9707 1200 50  0000 C CNN
+F 1 "5.1k" V 9616 1200 50  0000 C CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" V 9430 1200 50  0001 C CNN
+F 3 "~" H 9500 1200 50  0001 C CNN
+	1    9500 1200
+	0    1    -1   0   
+$EndComp
+Wire Wire Line
+	9650 1200 10150 1200
+Wire Wire Line
+	9850 1100 9350 1100
+Wire Wire Line
+	9350 1100 9350 1200
+$Comp
+L power:GND #PWR0106
+U 1 1 5DEE274F
+P 9250 1200
+F 0 "#PWR0106" H 9250 950 50  0001 C CNN
+F 1 "GND" H 9255 1027 50  0000 C CNN
+F 2 "" H 9250 1200 50  0001 C CNN
+F 3 "" H 9250 1200 50  0001 C CNN
+	1    9250 1200
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	9250 1200 9350 1200
+Connection ~ 9350 1200
+Wire Wire Line
+	10150 1400 10150 1500
+Wire Wire Line
+	10150 1600 10150 1700
+Connection ~ 8650 900 
+Wire Wire Line
+	8650 900  8550 900 
+Wire Wire Line
+	7100 900  7600 900 
+Wire Wire Line
+	4950 600  5700 600 
+$Comp
+L Device:C C6
+U 1 1 5DEE73ED
+P 7600 750
+F 0 "C6" H 7715 796 50  0000 L CNN
+F 1 "1µF" H 7715 705 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 7638 600 50  0001 C CNN
+F 3 "~" H 7600 750 50  0001 C CNN
+	1    7600 750 
+	1    0    0    -1  
+$EndComp
+Connection ~ 7600 900 
+Wire Wire Line
+	7600 900  7950 900 
+Wire Wire Line
+	7600 600  8250 600 
+Connection ~ 8250 600 
+Wire Wire Line
+	8650 600  8250 600 
+Wire Wire Line
+	7100 600  7600 600 
+Connection ~ 7100 600 
+Connection ~ 7600 600 
+Text GLabel 6700 3800 2    50   Input ~ 0
+SWDIO
+Text GLabel 6700 3900 2    50   Input ~ 0
+SWDCLK
+Wire Wire Line
+	4000 1600 4000 900 
+Wire Wire Line
+	4000 900  5700 900 
+Text GLabel 4000 900  0    50   Input ~ 0
+3.3V
+$Comp
+L pspice:DIODE D11
+U 1 1 5DF621C8
+P 950 3350
+F 0 "D11" H 950 3615 50  0000 C CNN
+F 1 "D3.3" H 950 3524 50  0000 C CNN
+F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 950 3350 50  0001 C CNN
+F 3 "~" H 950 3350 50  0001 C CNN
+	1    950  3350
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW9
+U 1 1 5DF621CF
+P 1350 3350
+F 0 "SW9" H 1350 3635 50  0000 C CNN
+F 1 "SW_Push" H 1350 3544 50  0000 C CNN
+F 2 "foostan-kbd:CherryMX_Choc_1u" H 1350 3550 50  0001 C CNN
+F 3 "" H 1350 3550 50  0001 C CNN
+	1    1350 3350
+	1    0    0    -1  
+$EndComp
+$Comp
+L pspice:DIODE D12
+U 1 1 5DF621D6
+P 950 3750
+F 0 "D12" H 950 4015 50  0000 C CNN
+F 1 "D4.3" H 950 3924 50  0000 C CNN
+F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 950 3750 50  0001 C CNN
+F 3 "~" H 950 3750 50  0001 C CNN
+	1    950  3750
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW10
+U 1 1 5DF621DD
+P 1350 3750
+F 0 "SW10" H 1350 4035 50  0000 C CNN
+F 1 "SW_Push" H 1350 3944 50  0000 C CNN
+F 2 "foostan-kbd:CherryMX_Choc_1u" H 1350 3950 50  0001 C CNN
+F 3 "" H 1350 3950 50  0001 C CNN
+	1    1350 3750
+	1    0    0    -1  
+$EndComp
+$Comp
+L pspice:DIODE D10
+U 1 1 5DF621F2
+P 950 2950
+F 0 "D10" H 950 3215 50  0000 C CNN
+F 1 "D2.3" H 950 3124 50  0000 C CNN
+F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 950 2950 50  0001 C CNN
+F 3 "~" H 950 2950 50  0001 C CNN
+	1    950  2950
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW8
+U 1 1 5DF621F9
+P 1350 2950
+F 0 "SW8" H 1350 3235 50  0000 C CNN
+F 1 "SW_Push" H 1350 3144 50  0000 C CNN
+F 2 "foostan-kbd:CherryMX_Choc_1u" H 1350 3150 50  0001 C CNN
+F 3 "" H 1350 3150 50  0001 C CNN
+	1    1350 2950
+	1    0    0    -1  
+$EndComp
+$Comp
+L pspice:DIODE D9
+U 1 1 5DF62200
+P 950 2550
+F 0 "D9" H 950 2815 50  0000 C CNN
+F 1 "D1.3" H 950 2724 50  0000 C CNN
+F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 950 2550 50  0001 C CNN
+F 3 "~" H 950 2550 50  0001 C CNN
+	1    950  2550
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW7
+U 1 1 5DF62207
+P 1350 2550
+F 0 "SW7" H 1350 2835 50  0000 C CNN
+F 1 "SW_Push" H 1350 2744 50  0000 C CNN
+F 2 "foostan-kbd:CherryMX_Choc_1u" H 1350 2750 50  0001 C CNN
+F 3 "" H 1350 2750 50  0001 C CNN
+	1    1350 2550
+	1    0    0    -1  
+$EndComp
+Text GLabel 1550 2550 2    50   Input ~ 0
+COL3
+Text GLabel 750  2950 0    50   Input ~ 0
+ROW2
+Text GLabel 750  3350 0    50   Input ~ 0
+ROW3
+Text GLabel 750  3750 0    50   Input ~ 0
+ROW4
+Text GLabel 750  2550 0    50   Input ~ 0
+ROW1
+Text GLabel 5400 2500 0    50   Input ~ 0
+ROW1
+Text GLabel 5400 2600 0    50   Input ~ 0
+ROW2
+Text GLabel 5400 2700 0    50   Input ~ 0
+ROW3
+Text GLabel 5400 3500 0    50   Input ~ 0
+ROW4
+Wire Wire Line
+	1550 2550 1550 2950
+Wire Wire Line
+	1550 2950 1550 3350
+Connection ~ 1550 2950
+Wire Wire Line
+	1550 3350 1550 3750
+Connection ~ 1550 3350
+$Comp
+L pspice:DIODE D25
+U 1 1 5DFE23D1
+P 2300 3350
+F 0 "D25" H 2300 3615 50  0000 C CNN
+F 1 "D3.4" H 2300 3524 50  0000 C CNN
+F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 2300 3350 50  0001 C CNN
+F 3 "~" H 2300 3350 50  0001 C CNN
+	1    2300 3350
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW23
+U 1 1 5DFE23D8
+P 2700 3350
+F 0 "SW23" H 2700 3635 50  0000 C CNN
+F 1 "SW_Push" H 2700 3544 50  0000 C CNN
+F 2 "foostan-kbd:CherryMX_Choc_1u" H 2700 3550 50  0001 C CNN
+F 3 "" H 2700 3550 50  0001 C CNN
+	1    2700 3350
+	1    0    0    -1  
+$EndComp
+$Comp
+L pspice:DIODE D26
+U 1 1 5DFE23DF
+P 2300 3750
+F 0 "D26" H 2300 4015 50  0000 C CNN
+F 1 "D4.4" H 2300 3924 50  0000 C CNN
+F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 2300 3750 50  0001 C CNN
+F 3 "~" H 2300 3750 50  0001 C CNN
+	1    2300 3750
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW24
+U 1 1 5DFE23E6
+P 2700 3750
+F 0 "SW24" H 2700 4035 50  0000 C CNN
+F 1 "SW_Push" H 2700 3944 50  0000 C CNN
+F 2 "foostan-kbd:CherryMX_Choc_1u" H 2700 3950 50  0001 C CNN
+F 3 "" H 2700 3950 50  0001 C CNN
+	1    2700 3750
+	1    0    0    -1  
+$EndComp
+$Comp
+L pspice:DIODE D24
+U 1 1 5DFE23FB
+P 2300 2950
+F 0 "D24" H 2300 3215 50  0000 C CNN
+F 1 "D2.4" H 2300 3124 50  0000 C CNN
+F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 2300 2950 50  0001 C CNN
+F 3 "~" H 2300 2950 50  0001 C CNN
+	1    2300 2950
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW22
+U 1 1 5DFE2402
+P 2700 2950
+F 0 "SW22" H 2700 3235 50  0000 C CNN
+F 1 "SW_Push" H 2700 3144 50  0000 C CNN
+F 2 "foostan-kbd:CherryMX_Choc_1u" H 2700 3150 50  0001 C CNN
+F 3 "" H 2700 3150 50  0001 C CNN
+	1    2700 2950
+	1    0    0    -1  
+$EndComp
+$Comp
+L pspice:DIODE D23
+U 1 1 5DFE2409
+P 2300 2550
+F 0 "D23" H 2300 2815 50  0000 C CNN
+F 1 "D1.4" H 2300 2724 50  0000 C CNN
+F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 2300 2550 50  0001 C CNN
+F 3 "~" H 2300 2550 50  0001 C CNN
+	1    2300 2550
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW21
+U 1 1 5DFE2410
+P 2700 2550
+F 0 "SW21" H 2700 2835 50  0000 C CNN
+F 1 "SW_Push" H 2700 2744 50  0000 C CNN
+F 2 "foostan-kbd:CherryMX_Choc_1u" H 2700 2750 50  0001 C CNN
+F 3 "" H 2700 2750 50  0001 C CNN
+	1    2700 2550
+	1    0    0    -1  
+$EndComp
+Text GLabel 2900 2550 2    50   Input ~ 0
+COL4
+Text GLabel 2100 2950 0    50   Input ~ 0
+ROW2
+Text GLabel 2100 3350 0    50   Input ~ 0
+ROW3
+Text GLabel 2100 3750 0    50   Input ~ 0
+ROW4
+Text GLabel 2100 2550 0    50   Input ~ 0
+ROW1
+Wire Wire Line
+	2900 2550 2900 2950
+Wire Wire Line
+	2900 2950 2900 3350
+Connection ~ 2900 2950
+Wire Wire Line
+	2900 3350 2900 3750
+Connection ~ 2900 3350
+$Comp
+L pspice:DIODE D35
+U 1 1 5DFE3E8A
+P 3650 3350
+F 0 "D35" H 3650 3615 50  0000 C CNN
+F 1 "D3.5" H 3650 3524 50  0000 C CNN
+F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 3650 3350 50  0001 C CNN
+F 3 "~" H 3650 3350 50  0001 C CNN
+	1    3650 3350
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW33
+U 1 1 5DFE3E91
+P 4050 3350
+F 0 "SW33" H 4050 3635 50  0000 C CNN
+F 1 "SW_Push" H 4050 3544 50  0000 C CNN
+F 2 "foostan-kbd:CherryMX_Choc_1u" H 4050 3550 50  0001 C CNN
+F 3 "" H 4050 3550 50  0001 C CNN
+	1    4050 3350
+	1    0    0    -1  
+$EndComp
+$Comp
+L pspice:DIODE D36
+U 1 1 5DFE3E98
+P 3650 3750
+F 0 "D36" H 3650 4015 50  0000 C CNN
+F 1 "D4.5" H 3650 3924 50  0000 C CNN
+F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 3650 3750 50  0001 C CNN
+F 3 "~" H 3650 3750 50  0001 C CNN
+	1    3650 3750
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW34
+U 1 1 5DFE3E9F
+P 4050 3750
+F 0 "SW34" H 4050 4035 50  0000 C CNN
+F 1 "SW_Push" H 4050 3944 50  0000 C CNN
+F 2 "foostan-kbd:CherryMX_Choc_1u" H 4050 3950 50  0001 C CNN
+F 3 "" H 4050 3950 50  0001 C CNN
+	1    4050 3750
+	1    0    0    -1  
+$EndComp
+$Comp
+L pspice:DIODE D34
+U 1 1 5DFE3EB4
+P 3650 2950
+F 0 "D34" H 3650 3215 50  0000 C CNN
+F 1 "D2.5" H 3650 3124 50  0000 C CNN
+F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 3650 2950 50  0001 C CNN
+F 3 "~" H 3650 2950 50  0001 C CNN
+	1    3650 2950
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW32
+U 1 1 5DFE3EBB
+P 4050 2950
+F 0 "SW32" H 4050 3235 50  0000 C CNN
+F 1 "SW_Push" H 4050 3144 50  0000 C CNN
+F 2 "foostan-kbd:CherryMX_Choc_1u" H 4050 3150 50  0001 C CNN
+F 3 "" H 4050 3150 50  0001 C CNN
+	1    4050 2950
+	1    0    0    -1  
+$EndComp
+$Comp
+L pspice:DIODE D33
+U 1 1 5DFE3EC2
+P 3650 2550
+F 0 "D33" H 3650 2815 50  0000 C CNN
+F 1 "D1.5" H 3650 2724 50  0000 C CNN
+F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 3650 2550 50  0001 C CNN
+F 3 "~" H 3650 2550 50  0001 C CNN
+	1    3650 2550
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW31
+U 1 1 5DFE3EC9
+P 4050 2550
+F 0 "SW31" H 4050 2835 50  0000 C CNN
+F 1 "SW_Push" H 4050 2744 50  0000 C CNN
+F 2 "foostan-kbd:CherryMX_Choc_1u" H 4050 2750 50  0001 C CNN
+F 3 "" H 4050 2750 50  0001 C CNN
+	1    4050 2550
+	1    0    0    -1  
+$EndComp
+Text GLabel 4250 2550 2    50   Input ~ 0
+COL5
+Text GLabel 3450 2950 0    50   Input ~ 0
+ROW2
+Text GLabel 3450 3350 0    50   Input ~ 0
+ROW3
+Text GLabel 3450 3750 0    50   Input ~ 0
+ROW4
+Text GLabel 3450 2550 0    50   Input ~ 0
+ROW1
+Wire Wire Line
+	4250 2550 4250 2950
+Wire Wire Line
+	4250 2950 4250 3350
+Connection ~ 4250 2950
+Wire Wire Line
+	4250 3350 4250 3750
+Connection ~ 4250 3350
+$Comp
+L pspice:DIODE D7
+U 1 1 5DFE6378
+P 950 1650
+F 0 "D7" H 950 1915 50  0000 C CNN
+F 1 "D3.1" H 950 1824 50  0000 C CNN
+F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 950 1650 50  0001 C CNN
+F 3 "~" H 950 1650 50  0001 C CNN
+	1    950  1650
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW5
+U 1 1 5DFE637F
+P 1350 1650
+F 0 "SW5" H 1350 1935 50  0000 C CNN
+F 1 "SW_Push" H 1350 1844 50  0000 C CNN
+F 2 "foostan-kbd:CherryMX_Choc_1u" H 1350 1850 50  0001 C CNN
+F 3 "" H 1350 1850 50  0001 C CNN
+	1    1350 1650
+	1    0    0    -1  
+$EndComp
+$Comp
+L pspice:DIODE D6
+U 1 1 5DFE63A2
+P 950 1250
+F 0 "D6" H 950 1515 50  0000 C CNN
+F 1 "D2.1" H 950 1424 50  0000 C CNN
+F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 950 1250 50  0001 C CNN
+F 3 "~" H 950 1250 50  0001 C CNN
+	1    950  1250
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW4
+U 1 1 5DFE63A9
+P 1350 1250
+F 0 "SW4" H 1350 1535 50  0000 C CNN
+F 1 "SW_Push" H 1350 1444 50  0000 C CNN
+F 2 "foostan-kbd:CherryMX_Choc_1u" H 1350 1450 50  0001 C CNN
+F 3 "" H 1350 1450 50  0001 C CNN
+	1    1350 1250
+	1    0    0    -1  
+$EndComp
+$Comp
+L pspice:DIODE D5
+U 1 1 5DFE63B0
+P 950 850
+F 0 "D5" H 950 1115 50  0000 C CNN
+F 1 "D1.1" H 950 1024 50  0000 C CNN
+F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 950 850 50  0001 C CNN
+F 3 "~" H 950 850 50  0001 C CNN
+	1    950  850 
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW3
+U 1 1 5DFE63B7
+P 1350 850
+F 0 "SW3" H 1350 1135 50  0000 C CNN
+F 1 "SW_Push" H 1350 1044 50  0000 C CNN
+F 2 "foostan-kbd:CherryMX_Choc_1u" H 1350 1050 50  0001 C CNN
+F 3 "" H 1350 1050 50  0001 C CNN
+	1    1350 850 
+	1    0    0    -1  
+$EndComp
+Text GLabel 1550 850  2    50   Input ~ 0
+COL1
+Text GLabel 750  1250 0    50   Input ~ 0
+ROW2
+Text GLabel 750  1650 0    50   Input ~ 0
+ROW3
+Text GLabel 750  850  0    50   Input ~ 0
+ROW1
+Wire Wire Line
+	1550 850  1550 1250
+Wire Wire Line
+	1550 1250 1550 1650
+Connection ~ 1550 1250
+$Comp
+L pspice:DIODE D21
+U 1 1 5DFE63CB
+P 2300 1650
+F 0 "D21" H 2300 1915 50  0000 C CNN
+F 1 "D3.2" H 2300 1824 50  0000 C CNN
+F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 2300 1650 50  0001 C CNN
+F 3 "~" H 2300 1650 50  0001 C CNN
+	1    2300 1650
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW19
+U 1 1 5DFE63D2
+P 2700 1650
+F 0 "SW19" H 2700 1935 50  0000 C CNN
+F 1 "SW_Push" H 2700 1844 50  0000 C CNN
+F 2 "foostan-kbd:CherryMX_Choc_1u" H 2700 1850 50  0001 C CNN
+F 3 "" H 2700 1850 50  0001 C CNN
+	1    2700 1650
+	1    0    0    -1  
+$EndComp
+$Comp
+L pspice:DIODE D20
+U 1 1 5DFE63F5
+P 2300 1250
+F 0 "D20" H 2300 1515 50  0000 C CNN
+F 1 "D2.2" H 2300 1424 50  0000 C CNN
+F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 2300 1250 50  0001 C CNN
+F 3 "~" H 2300 1250 50  0001 C CNN
+	1    2300 1250
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW18
+U 1 1 5DFE63FC
+P 2700 1250
+F 0 "SW18" H 2700 1535 50  0000 C CNN
+F 1 "SW_Push" H 2700 1444 50  0000 C CNN
+F 2 "foostan-kbd:CherryMX_Choc_1u" H 2700 1450 50  0001 C CNN
+F 3 "" H 2700 1450 50  0001 C CNN
+	1    2700 1250
+	1    0    0    -1  
+$EndComp
+$Comp
+L pspice:DIODE D19
+U 1 1 5DFE6403
+P 2300 850
+F 0 "D19" H 2300 1115 50  0000 C CNN
+F 1 "D1.2" H 2300 1024 50  0000 C CNN
+F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 2300 850 50  0001 C CNN
+F 3 "~" H 2300 850 50  0001 C CNN
+	1    2300 850 
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW17
+U 1 1 5DFE640A
+P 2700 850
+F 0 "SW17" H 2700 1135 50  0000 C CNN
+F 1 "SW_Push" H 2700 1044 50  0000 C CNN
+F 2 "foostan-kbd:CherryMX_Choc_1u" H 2700 1050 50  0001 C CNN
+F 3 "" H 2700 1050 50  0001 C CNN
+	1    2700 850 
+	1    0    0    -1  
+$EndComp
+Text GLabel 2900 850  2    50   Input ~ 0
+COL2
+Text GLabel 2100 1250 0    50   Input ~ 0
+ROW2
+Text GLabel 2100 1650 0    50   Input ~ 0
+ROW3
+Text GLabel 2100 850  0    50   Input ~ 0
+ROW1
+Wire Wire Line
+	2900 850  2900 1250
+Wire Wire Line
+	2900 1250 2900 1650
+Connection ~ 2900 1250
+$Comp
+L pspice:DIODE D16
+U 1 1 5DFEF7D2
+P 950 6700
+F 0 "D16" H 950 6965 50  0000 C CNN
+F 1 "D3.6" H 950 6874 50  0000 C CNN
+F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 950 6700 50  0001 C CNN
+F 3 "~" H 950 6700 50  0001 C CNN
+	1    950  6700
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW14
+U 1 1 5DFEF7D9
+P 1350 6700
+F 0 "SW14" H 1350 6985 50  0000 C CNN
+F 1 "SW_Push" H 1350 6894 50  0000 C CNN
+F 2 "foostan-kbd:CherryMX_Choc_1u" H 1350 6900 50  0001 C CNN
+F 3 "" H 1350 6900 50  0001 C CNN
+	1    1350 6700
+	1    0    0    -1  
+$EndComp
+$Comp
+L pspice:DIODE D17
+U 1 1 5DFEF7E0
+P 950 7100
+F 0 "D17" H 950 7365 50  0000 C CNN
+F 1 "D4.6" H 950 7274 50  0000 C CNN
+F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 950 7100 50  0001 C CNN
+F 3 "~" H 950 7100 50  0001 C CNN
+	1    950  7100
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW15
+U 1 1 5DFEF7E7
+P 1350 7100
+F 0 "SW15" H 1350 7385 50  0000 C CNN
+F 1 "SW_Push" H 1350 7294 50  0000 C CNN
+F 2 "foostan-kbd:CherryMX_Choc_1u" H 1350 7300 50  0001 C CNN
+F 3 "" H 1350 7300 50  0001 C CNN
+	1    1350 7100
+	1    0    0    -1  
+$EndComp
+$Comp
+L pspice:DIODE D15
+U 1 1 5DFEF7FC
+P 950 6300
+F 0 "D15" H 950 6565 50  0000 C CNN
+F 1 "D2.6" H 950 6474 50  0000 C CNN
+F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 950 6300 50  0001 C CNN
+F 3 "~" H 950 6300 50  0001 C CNN
+	1    950  6300
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW13
+U 1 1 5DFEF803
+P 1350 6300
+F 0 "SW13" H 1350 6585 50  0000 C CNN
+F 1 "SW_Push" H 1350 6494 50  0000 C CNN
+F 2 "foostan-kbd:CherryMX_Choc_1u" H 1350 6500 50  0001 C CNN
+F 3 "" H 1350 6500 50  0001 C CNN
+	1    1350 6300
+	1    0    0    -1  
+$EndComp
+$Comp
+L pspice:DIODE D14
+U 1 1 5DFEF80A
+P 950 5900
+F 0 "D14" H 950 6165 50  0000 C CNN
+F 1 "D1.6" H 950 6074 50  0000 C CNN
+F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 950 5900 50  0001 C CNN
+F 3 "~" H 950 5900 50  0001 C CNN
+	1    950  5900
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW12
+U 1 1 5DFEF811
+P 1350 5900
+F 0 "SW12" H 1350 6185 50  0000 C CNN
+F 1 "SW_Push" H 1350 6094 50  0000 C CNN
+F 2 "foostan-kbd:CherryMX_Choc_1u" H 1350 6100 50  0001 C CNN
+F 3 "" H 1350 6100 50  0001 C CNN
+	1    1350 5900
+	1    0    0    -1  
+$EndComp
+Text GLabel 1550 5900 2    50   Input ~ 0
+COL6
+Text GLabel 750  6300 0    50   Input ~ 0
+ROW2
+Text GLabel 750  6700 0    50   Input ~ 0
+ROW3
+Text GLabel 750  7100 0    50   Input ~ 0
+ROW4
+Text GLabel 750  5900 0    50   Input ~ 0
+ROW1
+Wire Wire Line
+	1550 5900 1550 6300
+Wire Wire Line
+	1550 6300 1550 6700
+Connection ~ 1550 6300
+Wire Wire Line
+	1550 6700 1550 7100
+Connection ~ 1550 6700
+Text GLabel 6700 4000 2    50   Input ~ 0
+COL1
+Text GLabel 5400 2800 0    50   Input ~ 0
+COL2
+Text GLabel 5400 2900 0    50   Input ~ 0
+COL3
+Text GLabel 5400 3000 0    50   Input ~ 0
+COL4
+Text GLabel 5400 3300 0    50   Input ~ 0
+COL5
+Text GLabel 5400 3400 0    50   Input ~ 0
+COL6
+Text GLabel 9300 900  1    50   Input ~ 0
+5V
+Text GLabel 10150 1500 0    50   Input ~ 0
+D-
+Text GLabel 6700 3600 2    50   Input ~ 0
+D-
+Text GLabel 10150 1700 0    50   Input ~ 0
+D+
+Text GLabel 6700 3700 2    50   Input ~ 0
+D+
+$Comp
+L Connector:USB_C_Receptacle_USB2.0 J1
+U 1 1 5E037A53
+P 10750 1500
+F 0 "J1" H 10320 1441 50  0000 R CNN
+F 1 "USB_C_Receptacle_USB2.0" H 10320 1350 50  0000 R CNN
+F 2 "kicad-usb:USB_C_Receptacle_HRO_TYPE-C-31-M-12" H 10900 1500 50  0001 C CNN
+F 3 "https://www.usb.org/sites/default/files/documents/usb_type-c.zip" H 10900 1500 50  0001 C CNN
+	1    10750 1500
+	-1   0    0    -1  
+$EndComp
+Connection ~ 10750 2400
+Text GLabel 5900 1200 0    50   Input ~ 0
+VBAT
+$Comp
+L power:GND #PWR0107
+U 1 1 5ED2E262
+P 8550 2250
+F 0 "#PWR0107" H 8550 2000 50  0001 C CNN
+F 1 "GND" H 8555 2077 50  0000 C CNN
+F 2 "" H 8550 2250 50  0001 C CNN
+F 3 "" H 8550 2250 50  0001 C CNN
+	1    8550 2250
+	1    0    0    -1  
+$EndComp
+Text GLabel 8550 2150 0    50   Input ~ 0
+5V
+Text GLabel 8550 1950 0    50   Input ~ 0
+TX
+Text GLabel 8550 2050 0    50   Input ~ 0
+RX
+Text GLabel 6700 3400 2    50   Input ~ 0
+TX
+Text GLabel 6700 3500 2    50   Input ~ 0
+RX
+$Comp
+L Connector:Conn_01x04_Female J2
+U 1 1 5ED45338
+P 8750 2150
+F 0 "J2" H 8643 1725 50  0000 C CNN
+F 1 "AudioJack4" H 8643 1816 50  0000 C CNN
+F 2 "keebio:TRRS-PJ-320A-no-Fmask" H 8750 2150 50  0001 C CNN
+F 3 "~" H 8750 2150 50  0001 C CNN
+	1    8750 2150
+	1    0    0    1   
+$EndComp
+Text GLabel 7300 1800 0    50   Input ~ 0
+SWDIO
+Text GLabel 7300 1900 0    50   Input ~ 0
+SWDCLK
+Text GLabel 7300 1700 0    50   Input ~ 0
+3.3V
+$Comp
+L power:GND #PWR0108
+U 1 1 5ED50DF3
+P 7300 2000
+F 0 "#PWR0108" H 7300 1750 50  0001 C CNN
+F 1 "GND" V 7305 1872 50  0000 R CNN
+F 2 "" H 7300 2000 50  0001 C CNN
+F 3 "" H 7300 2000 50  0001 C CNN
+	1    7300 2000
+	0    1    1    0   
+$EndComp
+Text GLabel 6700 2900 2    50   Input ~ 0
+PA4
+Text GLabel 6700 3100 2    50   Input ~ 0
+PA6
+Text GLabel 6700 3200 2    50   Input ~ 0
+PA7
+Text GLabel 5400 3100 0    50   Input ~ 0
+PB6
+Text GLabel 5400 3200 0    50   Input ~ 0
+PB7
+$Comp
+L Connector:Conn_01x12_Male J3
+U 1 1 5EDBCB44
+P 7500 2200
+F 0 "J3" H 7473 2173 50  0000 R CNN
+F 1 "Conn_01x12_Male" H 7473 2082 50  0000 R CNN
+F 2 "kicad-harwin:Harwin_M20-89012xx_1x12_P2.54mm_Horizontal" H 7500 2200 50  0001 C CNN
+F 3 "~" H 7500 2200 50  0001 C CNN
+	1    7500 2200
+	-1   0    0    -1  
+$EndComp
+Text GLabel 7300 2600 0    50   Input ~ 0
+PB6
+Text GLabel 7300 2700 0    50   Input ~ 0
+PB7
+Text GLabel 7300 2800 0    50   Input ~ 0
+5V
+$Comp
+L power:GND #PWR0109
+U 1 1 5EDBE5BA
+P 7300 2500
+F 0 "#PWR0109" H 7300 2250 50  0001 C CNN
+F 1 "GND" V 7305 2372 50  0000 R CNN
+F 2 "" H 7300 2500 50  0001 C CNN
+F 3 "" H 7300 2500 50  0001 C CNN
+	1    7300 2500
+	0    1    1    0   
+$EndComp
+Text GLabel 7300 2100 0    50   Input ~ 0
+PA4
+Text GLabel 7300 2200 0    50   Input ~ 0
+PA5
+Text GLabel 7300 2300 0    50   Input ~ 0
+PA6
+Text GLabel 7300 2400 0    50   Input ~ 0
+PA7
+Text GLabel 6700 3000 2    50   Input ~ 0
+PA5
+Text GLabel 5400 3700 0    50   Input ~ 0
+3.3V
+$EndSCHEMATC
diff --git a/pcb/kicad/right/fp-lib-table b/pcb/kicad/right/fp-lib-table
new file mode 100644
index 0000000..9c70188
--- /dev/null
+++ b/pcb/kicad/right/fp-lib-table
@@ -0,0 +1,6 @@
+(fp_lib_table
+  (lib (name foostan-kbd)(type KiCad)(uri ${KIPRJMOD}/../kbd/kbd.pretty)(options "")(descr ""))
+  (lib (name kicad-usb)(type KiCad)(uri ${KIPRJMOD}/../kicad-footprints/Connector_USB.pretty)(options "")(descr ""))
+  (lib (name kicad-harwin)(type KiCad)(uri ${KIPRJMOD}/../kicad-footprints/Connector_Harwin.pretty)(options "")(descr ""))
+  (lib (name keebio)(type KiCad)(uri ${KIPRJMOD}/../Keebio-Parts.pretty)(options "")(descr ""))
+)
diff --git a/pcb/kicad/right/right-cache.lib b/pcb/kicad/right/right-cache.lib
new file mode 100644
index 0000000..a608dc1
--- /dev/null
+++ b/pcb/kicad/right/right-cache.lib
@@ -0,0 +1,301 @@
+EESchema-LIBRARY Version 2.4
+#encoding utf-8
+#
+# Connector_Conn_01x04_Female
+#
+DEF Connector_Conn_01x04_Female J 0 40 Y N 1 F N
+F0 "J" 0 200 50 H V C CNN
+F1 "Connector_Conn_01x04_Female" 0 -300 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ Connector*:*_1x??_*
+$ENDFPLIST
+DRAW
+A 0 -200 20 901 -901 1 1 6 N 0 -180 0 -220
+A 0 -100 20 901 -901 1 1 6 N 0 -80 0 -120
+A 0 0 20 901 -901 1 1 6 N 0 20 0 -20
+A 0 100 20 901 -901 1 1 6 N 0 120 0 80
+P 2 1 1 6 -50 -200 -20 -200 N
+P 2 1 1 6 -50 -100 -20 -100 N
+P 2 1 1 6 -50 0 -20 0 N
+P 2 1 1 6 -50 100 -20 100 N
+X Pin_1 1 -200 100 150 R 50 50 1 1 P
+X Pin_2 2 -200 0 150 R 50 50 1 1 P
+X Pin_3 3 -200 -100 150 R 50 50 1 1 P
+X Pin_4 4 -200 -200 150 R 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Connector_Conn_01x12_Male
+#
+DEF Connector_Conn_01x12_Male J 0 40 Y N 1 F N
+F0 "J" 0 600 50 H V C CNN
+F1 "Connector_Conn_01x12_Male" 0 -700 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ Connector*:*_1x??_*
+$ENDFPLIST
+DRAW
+S 34 -595 0 -605 1 1 6 F
+S 34 -495 0 -505 1 1 6 F
+S 34 -395 0 -405 1 1 6 F
+S 34 -295 0 -305 1 1 6 F
+S 34 -195 0 -205 1 1 6 F
+S 34 -95 0 -105 1 1 6 F
+S 34 5 0 -5 1 1 6 F
+S 34 105 0 95 1 1 6 F
+S 34 205 0 195 1 1 6 F
+S 34 305 0 295 1 1 6 F
+S 34 405 0 395 1 1 6 F
+S 34 505 0 495 1 1 6 F
+P 2 1 1 6 50 -600 34 -600 N
+P 2 1 1 6 50 -500 34 -500 N
+P 2 1 1 6 50 -400 34 -400 N
+P 2 1 1 6 50 -300 34 -300 N
+P 2 1 1 6 50 -200 34 -200 N
+P 2 1 1 6 50 -100 34 -100 N
+P 2 1 1 6 50 0 34 0 N
+P 2 1 1 6 50 100 34 100 N
+P 2 1 1 6 50 200 34 200 N
+P 2 1 1 6 50 300 34 300 N
+P 2 1 1 6 50 400 34 400 N
+P 2 1 1 6 50 500 34 500 N
+X Pin_1 1 200 500 150 L 50 50 1 1 P
+X Pin_10 10 200 -400 150 L 50 50 1 1 P
+X Pin_11 11 200 -500 150 L 50 50 1 1 P
+X Pin_12 12 200 -600 150 L 50 50 1 1 P
+X Pin_2 2 200 400 150 L 50 50 1 1 P
+X Pin_3 3 200 300 150 L 50 50 1 1 P
+X Pin_4 4 200 200 150 L 50 50 1 1 P
+X Pin_5 5 200 100 150 L 50 50 1 1 P
+X Pin_6 6 200 0 150 L 50 50 1 1 P
+X Pin_7 7 200 -100 150 L 50 50 1 1 P
+X Pin_8 8 200 -200 150 L 50 50 1 1 P
+X Pin_9 9 200 -300 150 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Connector_USB_C_Receptacle_USB2.0
+#
+DEF Connector_USB_C_Receptacle_USB2.0 J 0 40 Y Y 1 F N
+F0 "J" -400 750 50 H V L CNN
+F1 "Connector_USB_C_Receptacle_USB2.0" 750 750 50 H V R CNN
+F2 "" 150 0 50 H I C CNN
+F3 "" 150 0 50 H I C CNN
+$FPLIST
+ USB*C*Receptacle*
+$ENDFPLIST
+DRAW
+A -275 -150 75 -1799 -1 0 1 20 N -350 -150 -200 -150
+A -275 -150 25 -1799 -1 0 1 10 N -300 -150 -250 -150
+A -275 -150 25 -1799 -1 0 1 10 F -300 -150 -250 -150
+A -275 150 25 1 1799 0 1 10 F -250 150 -300 150
+A -275 150 25 1 1799 0 1 10 N -250 150 -300 150
+A -275 150 75 1 1799 0 1 20 N -200 150 -350 150
+C -100 45 25 0 1 10 F
+C 0 -230 50 0 1 0 F
+S -10 -700 10 -660 0 0 0 N
+S 400 -590 360 -610 0 0 0 N
+S 400 -490 360 -510 0 0 0 N
+S 400 -190 360 -210 0 0 0 N
+S 400 -90 360 -110 0 0 0 N
+S 400 10 360 -10 0 0 0 N
+S 400 110 360 90 0 0 0 N
+S 400 310 360 290 0 0 0 N
+S 400 410 360 390 0 0 0 N
+S 400 610 360 590 0 0 0 N
+S -400 700 400 -700 0 1 10 f
+S -300 -150 -250 150 0 1 10 F
+S 75 70 125 120 0 1 10 F
+P 2 0 1 20 -350 -150 -350 150 N
+P 2 0 1 20 -200 150 -200 -150 N
+P 2 0 1 20 0 -230 0 170 N
+P 3 0 1 20 0 -130 -100 -30 -100 20 N
+P 3 0 1 20 0 -80 100 20 100 70 N
+P 4 0 1 10 -50 170 0 270 50 170 -50 170 F
+X GND A1 0 -900 200 U 50 50 1 1 W
+X GND A12 0 -900 200 U 50 50 1 1 P N
+X VBUS A4 600 600 200 L 50 50 1 1 W
+X CC1 A5 600 400 200 L 50 50 1 1 B
+X D+ A6 600 -100 200 L 50 50 1 1 B
+X D- A7 600 100 200 L 50 50 1 1 B
+X SBU1 A8 600 -500 200 L 50 50 1 1 B
+X VBUS A9 600 600 200 L 50 50 1 1 P N
+X GND B1 0 -900 200 U 50 50 1 1 P N
+X GND B12 0 -900 200 U 50 50 1 1 P N
+X VBUS B4 600 600 200 L 50 50 1 1 P N
+X CC2 B5 600 300 200 L 50 50 1 1 B
+X D+ B6 600 -200 200 L 50 50 1 1 B
+X D- B7 600 0 200 L 50 50 1 1 B
+X SBU2 B8 600 -600 200 L 50 50 1 1 B
+X VBUS B9 600 600 200 L 50 50 1 1 P N
+X SHIELD S1 -300 -900 200 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Device_C
+#
+DEF Device_C C 0 10 N Y 1 F N
+F0 "C" 25 100 50 H V L CNN
+F1 "Device_C" 25 -100 50 H V L CNN
+F2 "" 38 -150 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ C_*
+$ENDFPLIST
+DRAW
+P 2 0 1 20 -80 -30 80 -30 N
+P 2 0 1 20 -80 30 80 30 N
+X ~ 1 0 150 110 D 50 50 1 1 P
+X ~ 2 0 -150 110 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Device_R
+#
+DEF Device_R R 0 0 N Y 1 F N
+F0 "R" 80 0 50 V V C CNN
+F1 "Device_R" 0 0 50 V V C CNN
+F2 "" -70 0 50 V I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ R_*
+$ENDFPLIST
+DRAW
+S -40 -100 40 100 0 1 10 N
+X ~ 1 0 150 50 D 50 50 1 1 P
+X ~ 2 0 -150 50 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# MCU_ST_STM32F0_STM32F072CBTx
+#
+DEF MCU_ST_STM32F0_STM32F072CBTx U 0 20 Y Y 1 F N
+F0 "U" -600 1450 50 H V L CNN
+F1 "MCU_ST_STM32F0_STM32F072CBTx" 300 1450 50 H V L CNN
+F2 "Package_QFP:LQFP-48_7x7mm_P0.5mm" -600 -1400 50 H I R CNN
+F3 "" 0 0 50 H I C CNN
+ALIAS STM32F072CBTx
+$FPLIST
+ LQFP*7x7mm*P0.5mm*
+$ENDFPLIST
+DRAW
+S -600 -1400 500 1400 0 1 10 f
+X VBAT 1 -200 1500 100 D 50 50 1 1 W
+X PA0 10 600 200 100 L 50 50 1 1 B
+X PA1 11 600 100 100 L 50 50 1 1 B
+X PA2 12 600 0 100 L 50 50 1 1 B
+X PA3 13 600 -100 100 L 50 50 1 1 B
+X PA4 14 600 -200 100 L 50 50 1 1 B
+X PA5 15 600 -300 100 L 50 50 1 1 B
+X PA6 16 600 -400 100 L 50 50 1 1 B
+X PA7 17 600 -500 100 L 50 50 1 1 B
+X PB0 18 -700 200 100 R 50 50 1 1 B
+X PB1 19 -700 100 100 R 50 50 1 1 B
+X PC13 2 -700 600 100 R 50 50 1 1 B
+X PB2 20 -700 0 100 R 50 50 1 1 B
+X PB10 21 -700 -800 100 R 50 50 1 1 B
+X PB11 22 -700 -900 100 R 50 50 1 1 B
+X VSS 23 -200 -1500 100 U 50 50 1 1 W
+X VDD 24 -100 1500 100 D 50 50 1 1 W
+X PB12 25 -700 -1000 100 R 50 50 1 1 B
+X PB13 26 -700 -1100 100 R 50 50 1 1 B
+X PB14 27 -700 -1200 100 R 50 50 1 1 B
+X PB15 28 -700 -1300 100 R 50 50 1 1 B
+X PA8 29 600 -600 100 L 50 50 1 1 B
+X PC14 3 -700 500 100 R 50 50 1 1 B
+X PA9 30 600 -700 100 L 50 50 1 1 B
+X PA10 31 600 -800 100 L 50 50 1 1 B
+X PA11 32 600 -900 100 L 50 50 1 1 B
+X PA12 33 600 -1000 100 L 50 50 1 1 B
+X PA13 34 600 -1100 100 L 50 50 1 1 B
+X VSS 35 -100 -1500 100 U 50 50 1 1 W
+X VDDIO2 36 200 1500 100 D 50 50 1 1 W
+X PA14 37 600 -1200 100 L 50 50 1 1 B
+X PA15 38 600 -1300 100 L 50 50 1 1 B
+X PB3 39 -700 -100 100 R 50 50 1 1 B
+X PC15 4 -700 400 100 R 50 50 1 1 B
+X PB4 40 -700 -200 100 R 50 50 1 1 B
+X PB5 41 -700 -300 100 R 50 50 1 1 B
+X PB6 42 -700 -400 100 R 50 50 1 1 B
+X PB7 43 -700 -500 100 R 50 50 1 1 B
+X BOOT0 44 -700 1100 100 R 50 50 1 1 I
+X PB8 45 -700 -600 100 R 50 50 1 1 B
+X PB9 46 -700 -700 100 R 50 50 1 1 B
+X VSS 47 0 -1500 100 U 50 50 1 1 W
+X VDD 48 0 1500 100 D 50 50 1 1 W
+X PF0 5 -700 900 100 R 50 50 1 1 I
+X PF1 6 -700 800 100 R 50 50 1 1 I
+X NRST 7 -700 1300 100 R 50 50 1 1 I
+X VSSA 8 100 -1500 100 U 50 50 1 1 W
+X VDDA 9 100 1500 100 D 50 50 1 1 W
+ENDDRAW
+ENDDEF
+#
+# Regulator_Linear_LM3480-3.3
+#
+DEF Regulator_Linear_LM3480-3.3 U 0 10 Y Y 1 F N
+F0 "U" -150 125 50 H V C CNN
+F1 "Regulator_Linear_LM3480-3.3" 0 125 50 H V L CNN
+F2 "Package_TO_SOT_SMD:SOT-23" 0 225 50 H I C CIN
+F3 "" 0 0 50 H I C CNN
+ALIAS LM3480-5.0 LM3480-12 LM3480-15
+$FPLIST
+ SOT?23*
+$ENDFPLIST
+DRAW
+S -200 75 200 -200 0 1 10 f
+X VO 1 300 0 100 L 50 50 1 1 w
+X VI 2 -300 0 100 R 50 50 1 1 W
+X GND 3 0 -300 100 U 50 50 1 1 W
+ENDDRAW
+ENDDEF
+#
+# Switch_SW_Push
+#
+DEF Switch_SW_Push SW 0 40 N N 1 F N
+F0 "SW" 50 100 50 H V L CNN
+F1 "Switch_SW_Push" 0 -60 50 H V C CNN
+F2 "" 0 200 50 H I C CNN
+F3 "" 0 200 50 H I C CNN
+DRAW
+C -80 0 20 0 1 0 N
+C 80 0 20 0 1 0 N
+P 2 0 1 0 0 50 0 120 N
+P 2 0 1 0 100 50 -100 50 N
+X 1 1 -200 0 100 R 50 50 0 1 P
+X 2 2 200 0 100 L 50 50 0 1 P
+ENDDRAW
+ENDDEF
+#
+# power_GND
+#
+DEF power_GND #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -250 50 H I C CNN
+F1 "power_GND" 0 -150 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+DRAW
+P 6 0 1 0 0 0 0 -50 50 -50 0 -100 -50 -50 0 -50 N
+X GND 1 0 0 0 D 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# pspice_DIODE
+#
+DEF pspice_DIODE D 0 40 Y N 1 F N
+F0 "D" 0 150 50 H V C CNN
+F1 "pspice_DIODE" 0 -175 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+DRAW
+P 2 0 1 0 75 100 75 -100 N
+P 3 0 1 0 -75 100 -75 -100 75 0 F
+X K 1 -200 0 150 R 50 50 1 1 I
+X A 2 200 0 150 L 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+#End Library
diff --git a/pcb/kicad/right/right.bak b/pcb/kicad/right/right.bak
new file mode 100644
index 0000000..6b289ef
--- /dev/null
+++ b/pcb/kicad/right/right.bak
@@ -0,0 +1,1090 @@
+EESchema Schematic File Version 4
+EELAYER 26 0
+EELAYER END
+$Descr A4 11693 8268
+encoding utf-8
+Sheet 1 1
+Title ""
+Date ""
+Rev ""
+Comp ""
+Comment1 ""
+Comment2 ""
+Comment3 ""
+Comment4 ""
+$EndDescr
+$Comp
+L MCU_ST_STM32F0:STM32F072CBTx U1
+U 1 1 5DEC39DF
+P 6100 2700
+F 0 "U1" H 6050 1114 50  0000 C CNN
+F 1 "STM32" H 6050 1023 50  0000 C CNN
+F 2 "Package_QFP:LQFP-48_7x7mm_P0.5mm" H 5500 1300 50  0001 R CNN
+F 3 "http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/DM00090510.pdf" H 6100 2700 50  0001 C CNN
+	1    6100 2700
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:C C2
+U 1 1 5DEC3C77
+P 5700 750
+F 0 "C2" H 5815 796 50  0000 L CNN
+F 1 "100nF" H 5815 705 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 5738 600 50  0001 C CNN
+F 3 "~" H 5700 750 50  0001 C CNN
+	1    5700 750 
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:C C3
+U 1 1 5DEC3CF5
+P 6150 750
+F 0 "C3" H 6265 796 50  0000 L CNN
+F 1 "100nF" H 6265 705 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 6188 600 50  0001 C CNN
+F 3 "~" H 6150 750 50  0001 C CNN
+	1    6150 750 
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:C C4
+U 1 1 5DEC3D3C
+P 6600 750
+F 0 "C4" H 6715 796 50  0000 L CNN
+F 1 "100nF" H 6715 705 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 6638 600 50  0001 C CNN
+F 3 "~" H 6600 750 50  0001 C CNN
+	1    6600 750 
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:C C5
+U 1 1 5DEC3D7E
+P 7100 750
+F 0 "C5" H 7215 796 50  0000 L CNN
+F 1 "100nF" H 7215 705 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 7138 600 50  0001 C CNN
+F 3 "~" H 7100 750 50  0001 C CNN
+	1    7100 750 
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:C C7
+U 1 1 5DEC3DF1
+P 8650 750
+F 0 "C7" H 8765 796 50  0000 L CNN
+F 1 "1µF" H 8765 705 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 8688 600 50  0001 C CNN
+F 3 "~" H 8650 750 50  0001 C CNN
+	1    8650 750 
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:GND #PWR0101
+U 1 1 5DEC3EA3
+P 6000 4550
+F 0 "#PWR0101" H 6000 4300 50  0001 C CNN
+F 1 "GND" H 6005 4377 50  0000 C CNN
+F 2 "" H 6000 4550 50  0001 C CNN
+F 3 "" H 6000 4550 50  0001 C CNN
+	1    6000 4550
+	1    0    0    -1  
+$EndComp
+Connection ~ 6150 600 
+Wire Wire Line
+	5900 4200 5900 4550
+Wire Wire Line
+	5900 4550 6000 4550
+Wire Wire Line
+	6000 4200 6000 4550
+Connection ~ 6000 4550
+Wire Wire Line
+	6100 4200 6100 4550
+Wire Wire Line
+	6100 4550 6000 4550
+Wire Wire Line
+	6200 4200 6200 4550
+Wire Wire Line
+	6200 4550 6100 4550
+Connection ~ 6100 4550
+Connection ~ 6150 900 
+Wire Wire Line
+	6100 1200 6100 1000
+Wire Wire Line
+	6100 1000 6150 1000
+Wire Wire Line
+	6150 1000 6150 900 
+Connection ~ 5700 600 
+Connection ~ 5700 900 
+Wire Wire Line
+	5700 900  6150 900 
+Wire Wire Line
+	5700 600  6150 600 
+Wire Wire Line
+	6000 1200 6000 1100
+Wire Wire Line
+	6000 1100 5700 1100
+Wire Wire Line
+	5700 1100 5700 900 
+Connection ~ 6600 900 
+Connection ~ 7100 900 
+Wire Wire Line
+	6150 900  6600 900 
+Wire Wire Line
+	6150 600  6600 600 
+Wire Wire Line
+	6600 900  7100 900 
+Wire Wire Line
+	6600 600  7100 600 
+Connection ~ 6600 600 
+Wire Wire Line
+	6600 900  6600 1050
+Wire Wire Line
+	6600 1050 6200 1050
+Wire Wire Line
+	6200 1050 6200 1200
+Wire Wire Line
+	6300 1200 7100 1200
+Wire Wire Line
+	7100 1200 7100 900 
+$Comp
+L power:GND #PWR0102
+U 1 1 5DEC9602
+P 4950 600
+F 0 "#PWR0102" H 4950 350 50  0001 C CNN
+F 1 "GND" H 4955 427 50  0000 C CNN
+F 2 "" H 4950 600 50  0001 C CNN
+F 3 "" H 4950 600 50  0001 C CNN
+	1    4950 600 
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:C C1
+U 1 1 5DEC9DB9
+P 5050 1150
+F 0 "C1" H 5165 1196 50  0000 L CNN
+F 1 "100nF" H 5165 1105 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 5088 1000 50  0001 C CNN
+F 3 "~" H 5050 1150 50  0001 C CNN
+	1    5050 1150
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW2
+U 1 1 5DECA090
+P 4450 1200
+F 0 "SW2" V 4404 1348 50  0000 L CNN
+F 1 "RESET" V 4495 1348 50  0000 L CNN
+F 2 "Button_Switch_SMD:SW_SPST_CK_RS282G05A3" H 4450 1400 50  0001 C CNN
+F 3 "" H 4450 1400 50  0001 C CNN
+	1    4450 1200
+	0    1    1    0   
+$EndComp
+$Comp
+L power:GND #PWR0103
+U 1 1 5DECA788
+P 4150 1000
+F 0 "#PWR0103" H 4150 750 50  0001 C CNN
+F 1 "GND" H 4155 827 50  0000 C CNN
+F 2 "" H 4150 1000 50  0001 C CNN
+F 3 "" H 4150 1000 50  0001 C CNN
+	1    4150 1000
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	5400 1400 5050 1400
+Wire Wire Line
+	4450 1000 4150 1000
+Wire Wire Line
+	4450 1400 5050 1400
+Connection ~ 5050 1400
+Wire Wire Line
+	5050 1400 5050 1300
+Wire Wire Line
+	4450 1000 5050 1000
+Connection ~ 4450 1000
+$Comp
+L Switch:SW_Push SW1
+U 1 1 5DECE105
+P 4200 1600
+F 0 "SW1" H 4200 1415 50  0000 C CNN
+F 1 "BOOT" H 4200 1506 50  0000 C CNN
+F 2 "Button_Switch_SMD:SW_SPST_CK_RS282G05A3" H 4200 1800 50  0001 C CNN
+F 3 "" H 4200 1800 50  0001 C CNN
+	1    4200 1600
+	-1   0    0    1   
+$EndComp
+$Comp
+L Device:R R1
+U 1 1 5DECE7D2
+P 4450 1750
+F 0 "R1" H 4520 1796 50  0000 L CNN
+F 1 "5.1k" H 4520 1705 50  0000 L CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" V 4380 1750 50  0001 C CNN
+F 3 "~" H 4450 1750 50  0001 C CNN
+	1    4450 1750
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:GND #PWR0104
+U 1 1 5DECF310
+P 4450 1900
+F 0 "#PWR0104" H 4450 1650 50  0001 C CNN
+F 1 "GND" H 4455 1727 50  0000 C CNN
+F 2 "" H 4450 1900 50  0001 C CNN
+F 3 "" H 4450 1900 50  0001 C CNN
+	1    4450 1900
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	4400 1600 4450 1600
+Wire Wire Line
+	4450 1600 5400 1600
+Connection ~ 4450 1600
+$Comp
+L Regulator_Linear:LM3480-3.3 U2
+U 1 1 5DED53E7
+P 8250 900
+F 0 "U2" H 8250 1050 50  0000 C CNN
+F 1 "LDO" H 8250 1141 50  0000 C CNN
+F 2 "Package_TO_SOT_SMD:SOT-23" H 8250 1125 50  0001 C CIN
+F 3 "http://www.ti.com/lit/ds/symlink/lm3480.pdf" H 8250 900 50  0001 C CNN
+	1    8250 900 
+	-1   0    0    1   
+$EndComp
+$Comp
+L power:GND #PWR0105
+U 1 1 5DEDB000
+P 10750 2400
+F 0 "#PWR0105" H 10750 2150 50  0001 C CNN
+F 1 "GND" H 10755 2227 50  0000 C CNN
+F 2 "" H 10750 2400 50  0001 C CNN
+F 3 "" H 10750 2400 50  0001 C CNN
+	1    10750 2400
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	11050 2400 10750 2400
+Wire Wire Line
+	10150 900  8650 900 
+$Comp
+L Device:R R7
+U 1 1 5DEDEA73
+P 10000 1100
+F 0 "R7" V 9793 1100 50  0000 C CNN
+F 1 "5.1k" V 9884 1100 50  0000 C CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" V 9930 1100 50  0001 C CNN
+F 3 "~" H 10000 1100 50  0001 C CNN
+	1    10000 1100
+	0    1    1    0   
+$EndComp
+$Comp
+L Device:R R6
+U 1 1 5DEDEAE6
+P 9500 1200
+F 0 "R6" V 9707 1200 50  0000 C CNN
+F 1 "5.1k" V 9616 1200 50  0000 C CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" V 9430 1200 50  0001 C CNN
+F 3 "~" H 9500 1200 50  0001 C CNN
+	1    9500 1200
+	0    1    -1   0   
+$EndComp
+Wire Wire Line
+	9650 1200 10150 1200
+Wire Wire Line
+	9850 1100 9350 1100
+Wire Wire Line
+	9350 1100 9350 1200
+$Comp
+L power:GND #PWR0106
+U 1 1 5DEE274F
+P 9250 1200
+F 0 "#PWR0106" H 9250 950 50  0001 C CNN
+F 1 "GND" H 9255 1027 50  0000 C CNN
+F 2 "" H 9250 1200 50  0001 C CNN
+F 3 "" H 9250 1200 50  0001 C CNN
+	1    9250 1200
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	9250 1200 9350 1200
+Connection ~ 9350 1200
+Wire Wire Line
+	10150 1400 10150 1500
+Wire Wire Line
+	10150 1600 10150 1700
+Connection ~ 8650 900 
+Wire Wire Line
+	8650 900  8550 900 
+Wire Wire Line
+	7100 900  7600 900 
+Wire Wire Line
+	4950 600  5700 600 
+$Comp
+L Device:C C6
+U 1 1 5DEE73ED
+P 7600 750
+F 0 "C6" H 7715 796 50  0000 L CNN
+F 1 "1µF" H 7715 705 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 7638 600 50  0001 C CNN
+F 3 "~" H 7600 750 50  0001 C CNN
+	1    7600 750 
+	1    0    0    -1  
+$EndComp
+Connection ~ 7600 900 
+Wire Wire Line
+	7600 900  7950 900 
+Wire Wire Line
+	7600 600  8250 600 
+Connection ~ 8250 600 
+Wire Wire Line
+	8650 600  8250 600 
+Wire Wire Line
+	7100 600  7600 600 
+Connection ~ 7100 600 
+Connection ~ 7600 600 
+Text GLabel 6700 3800 2    50   Input ~ 0
+SWDIO
+Text GLabel 6700 3900 2    50   Input ~ 0
+SWDCLK
+Wire Wire Line
+	4000 1600 4000 900 
+Wire Wire Line
+	4000 900  5700 900 
+Text GLabel 4000 900  0    50   Input ~ 0
+3.3V
+$Comp
+L pspice:DIODE D11
+U 1 1 5DF621C8
+P 950 3350
+F 0 "D11" H 950 3615 50  0000 C CNN
+F 1 "D3.3" H 950 3524 50  0000 C CNN
+F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 950 3350 50  0001 C CNN
+F 3 "~" H 950 3350 50  0001 C CNN
+	1    950  3350
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW9
+U 1 1 5DF621CF
+P 1350 3350
+F 0 "SW9" H 1350 3635 50  0000 C CNN
+F 1 "SW_Push" H 1350 3544 50  0000 C CNN
+F 2 "Keebio:MX-Alps-Choc-1U-NoLED" H 1350 3550 50  0001 C CNN
+F 3 "" H 1350 3550 50  0001 C CNN
+	1    1350 3350
+	1    0    0    -1  
+$EndComp
+$Comp
+L pspice:DIODE D12
+U 1 1 5DF621D6
+P 950 3750
+F 0 "D12" H 950 4015 50  0000 C CNN
+F 1 "D4.3" H 950 3924 50  0000 C CNN
+F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 950 3750 50  0001 C CNN
+F 3 "~" H 950 3750 50  0001 C CNN
+	1    950  3750
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW10
+U 1 1 5DF621DD
+P 1350 3750
+F 0 "SW10" H 1350 4035 50  0000 C CNN
+F 1 "SW_Push" H 1350 3944 50  0000 C CNN
+F 2 "Keebio:MX-Alps-Choc-1U-NoLED" H 1350 3950 50  0001 C CNN
+F 3 "" H 1350 3950 50  0001 C CNN
+	1    1350 3750
+	1    0    0    -1  
+$EndComp
+$Comp
+L pspice:DIODE D10
+U 1 1 5DF621F2
+P 950 2950
+F 0 "D10" H 950 3215 50  0000 C CNN
+F 1 "D2.3" H 950 3124 50  0000 C CNN
+F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 950 2950 50  0001 C CNN
+F 3 "~" H 950 2950 50  0001 C CNN
+	1    950  2950
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW8
+U 1 1 5DF621F9
+P 1350 2950
+F 0 "SW8" H 1350 3235 50  0000 C CNN
+F 1 "SW_Push" H 1350 3144 50  0000 C CNN
+F 2 "Keebio:MX-Alps-Choc-1U-NoLED" H 1350 3150 50  0001 C CNN
+F 3 "" H 1350 3150 50  0001 C CNN
+	1    1350 2950
+	1    0    0    -1  
+$EndComp
+$Comp
+L pspice:DIODE D9
+U 1 1 5DF62200
+P 950 2550
+F 0 "D9" H 950 2815 50  0000 C CNN
+F 1 "D1.3" H 950 2724 50  0000 C CNN
+F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 950 2550 50  0001 C CNN
+F 3 "~" H 950 2550 50  0001 C CNN
+	1    950  2550
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW7
+U 1 1 5DF62207
+P 1350 2550
+F 0 "SW7" H 1350 2835 50  0000 C CNN
+F 1 "SW_Push" H 1350 2744 50  0000 C CNN
+F 2 "Keebio:MX-Alps-Choc-1U-NoLED" H 1350 2750 50  0001 C CNN
+F 3 "" H 1350 2750 50  0001 C CNN
+	1    1350 2550
+	1    0    0    -1  
+$EndComp
+Text GLabel 1550 2550 2    50   Input ~ 0
+COL3
+Text GLabel 750  2950 0    50   Input ~ 0
+ROW2
+Text GLabel 750  3350 0    50   Input ~ 0
+ROW3
+Text GLabel 750  3750 0    50   Input ~ 0
+ROW4
+Text GLabel 750  2550 0    50   Input ~ 0
+ROW1
+Text GLabel 5400 2500 0    50   Input ~ 0
+ROW1
+Text GLabel 5400 2600 0    50   Input ~ 0
+ROW2
+Text GLabel 5400 2700 0    50   Input ~ 0
+ROW3
+Text GLabel 5400 3500 0    50   Input ~ 0
+ROW4
+Wire Wire Line
+	1550 2550 1550 2950
+Wire Wire Line
+	1550 2950 1550 3350
+Connection ~ 1550 2950
+Wire Wire Line
+	1550 3350 1550 3750
+Connection ~ 1550 3350
+$Comp
+L pspice:DIODE D25
+U 1 1 5DFE23D1
+P 2300 3350
+F 0 "D25" H 2300 3615 50  0000 C CNN
+F 1 "D3.4" H 2300 3524 50  0000 C CNN
+F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 2300 3350 50  0001 C CNN
+F 3 "~" H 2300 3350 50  0001 C CNN
+	1    2300 3350
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW23
+U 1 1 5DFE23D8
+P 2700 3350
+F 0 "SW23" H 2700 3635 50  0000 C CNN
+F 1 "SW_Push" H 2700 3544 50  0000 C CNN
+F 2 "Keebio:MX-Alps-Choc-1U-NoLED" H 2700 3550 50  0001 C CNN
+F 3 "" H 2700 3550 50  0001 C CNN
+	1    2700 3350
+	1    0    0    -1  
+$EndComp
+$Comp
+L pspice:DIODE D26
+U 1 1 5DFE23DF
+P 2300 3750
+F 0 "D26" H 2300 4015 50  0000 C CNN
+F 1 "D4.4" H 2300 3924 50  0000 C CNN
+F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 2300 3750 50  0001 C CNN
+F 3 "~" H 2300 3750 50  0001 C CNN
+	1    2300 3750
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW24
+U 1 1 5DFE23E6
+P 2700 3750
+F 0 "SW24" H 2700 4035 50  0000 C CNN
+F 1 "SW_Push" H 2700 3944 50  0000 C CNN
+F 2 "Keebio:MX-Alps-Choc-1U-NoLED" H 2700 3950 50  0001 C CNN
+F 3 "" H 2700 3950 50  0001 C CNN
+	1    2700 3750
+	1    0    0    -1  
+$EndComp
+$Comp
+L pspice:DIODE D24
+U 1 1 5DFE23FB
+P 2300 2950
+F 0 "D24" H 2300 3215 50  0000 C CNN
+F 1 "D2.4" H 2300 3124 50  0000 C CNN
+F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 2300 2950 50  0001 C CNN
+F 3 "~" H 2300 2950 50  0001 C CNN
+	1    2300 2950
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW22
+U 1 1 5DFE2402
+P 2700 2950
+F 0 "SW22" H 2700 3235 50  0000 C CNN
+F 1 "SW_Push" H 2700 3144 50  0000 C CNN
+F 2 "Keebio:MX-Alps-Choc-1U-NoLED" H 2700 3150 50  0001 C CNN
+F 3 "" H 2700 3150 50  0001 C CNN
+	1    2700 2950
+	1    0    0    -1  
+$EndComp
+$Comp
+L pspice:DIODE D23
+U 1 1 5DFE2409
+P 2300 2550
+F 0 "D23" H 2300 2815 50  0000 C CNN
+F 1 "D1.4" H 2300 2724 50  0000 C CNN
+F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 2300 2550 50  0001 C CNN
+F 3 "~" H 2300 2550 50  0001 C CNN
+	1    2300 2550
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW21
+U 1 1 5DFE2410
+P 2700 2550
+F 0 "SW21" H 2700 2835 50  0000 C CNN
+F 1 "SW_Push" H 2700 2744 50  0000 C CNN
+F 2 "Keebio:MX-Alps-Choc-1U-NoLED" H 2700 2750 50  0001 C CNN
+F 3 "" H 2700 2750 50  0001 C CNN
+	1    2700 2550
+	1    0    0    -1  
+$EndComp
+Text GLabel 2900 2550 2    50   Input ~ 0
+COL4
+Text GLabel 2100 2950 0    50   Input ~ 0
+ROW2
+Text GLabel 2100 3350 0    50   Input ~ 0
+ROW3
+Text GLabel 2100 3750 0    50   Input ~ 0
+ROW4
+Text GLabel 2100 2550 0    50   Input ~ 0
+ROW1
+Wire Wire Line
+	2900 2550 2900 2950
+Wire Wire Line
+	2900 2950 2900 3350
+Connection ~ 2900 2950
+Wire Wire Line
+	2900 3350 2900 3750
+Connection ~ 2900 3350
+$Comp
+L pspice:DIODE D35
+U 1 1 5DFE3E8A
+P 3650 3350
+F 0 "D35" H 3650 3615 50  0000 C CNN
+F 1 "D3.5" H 3650 3524 50  0000 C CNN
+F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 3650 3350 50  0001 C CNN
+F 3 "~" H 3650 3350 50  0001 C CNN
+	1    3650 3350
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW33
+U 1 1 5DFE3E91
+P 4050 3350
+F 0 "SW33" H 4050 3635 50  0000 C CNN
+F 1 "SW_Push" H 4050 3544 50  0000 C CNN
+F 2 "Keebio:MX-Alps-Choc-1U-NoLED" H 4050 3550 50  0001 C CNN
+F 3 "" H 4050 3550 50  0001 C CNN
+	1    4050 3350
+	1    0    0    -1  
+$EndComp
+$Comp
+L pspice:DIODE D36
+U 1 1 5DFE3E98
+P 3650 3750
+F 0 "D36" H 3650 4015 50  0000 C CNN
+F 1 "D4.5" H 3650 3924 50  0000 C CNN
+F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 3650 3750 50  0001 C CNN
+F 3 "~" H 3650 3750 50  0001 C CNN
+	1    3650 3750
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW34
+U 1 1 5DFE3E9F
+P 4050 3750
+F 0 "SW34" H 4050 4035 50  0000 C CNN
+F 1 "SW_Push" H 4050 3944 50  0000 C CNN
+F 2 "Keebio:MX-Alps-Choc-1U-NoLED" H 4050 3950 50  0001 C CNN
+F 3 "" H 4050 3950 50  0001 C CNN
+	1    4050 3750
+	1    0    0    -1  
+$EndComp
+$Comp
+L pspice:DIODE D34
+U 1 1 5DFE3EB4
+P 3650 2950
+F 0 "D34" H 3650 3215 50  0000 C CNN
+F 1 "D2.5" H 3650 3124 50  0000 C CNN
+F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 3650 2950 50  0001 C CNN
+F 3 "~" H 3650 2950 50  0001 C CNN
+	1    3650 2950
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW32
+U 1 1 5DFE3EBB
+P 4050 2950
+F 0 "SW32" H 4050 3235 50  0000 C CNN
+F 1 "SW_Push" H 4050 3144 50  0000 C CNN
+F 2 "Keebio:MX-Alps-Choc-1U-NoLED" H 4050 3150 50  0001 C CNN
+F 3 "" H 4050 3150 50  0001 C CNN
+	1    4050 2950
+	1    0    0    -1  
+$EndComp
+$Comp
+L pspice:DIODE D33
+U 1 1 5DFE3EC2
+P 3650 2550
+F 0 "D33" H 3650 2815 50  0000 C CNN
+F 1 "D1.5" H 3650 2724 50  0000 C CNN
+F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 3650 2550 50  0001 C CNN
+F 3 "~" H 3650 2550 50  0001 C CNN
+	1    3650 2550
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW31
+U 1 1 5DFE3EC9
+P 4050 2550
+F 0 "SW31" H 4050 2835 50  0000 C CNN
+F 1 "SW_Push" H 4050 2744 50  0000 C CNN
+F 2 "Keebio:MX-Alps-Choc-1U-NoLED" H 4050 2750 50  0001 C CNN
+F 3 "" H 4050 2750 50  0001 C CNN
+	1    4050 2550
+	1    0    0    -1  
+$EndComp
+Text GLabel 4250 2550 2    50   Input ~ 0
+COL5
+Text GLabel 3450 2950 0    50   Input ~ 0
+ROW2
+Text GLabel 3450 3350 0    50   Input ~ 0
+ROW3
+Text GLabel 3450 3750 0    50   Input ~ 0
+ROW4
+Text GLabel 3450 2550 0    50   Input ~ 0
+ROW1
+Wire Wire Line
+	4250 2550 4250 2950
+Wire Wire Line
+	4250 2950 4250 3350
+Connection ~ 4250 2950
+Wire Wire Line
+	4250 3350 4250 3750
+Connection ~ 4250 3350
+$Comp
+L pspice:DIODE D7
+U 1 1 5DFE6378
+P 950 1650
+F 0 "D7" H 950 1915 50  0000 C CNN
+F 1 "D3.1" H 950 1824 50  0000 C CNN
+F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 950 1650 50  0001 C CNN
+F 3 "~" H 950 1650 50  0001 C CNN
+	1    950  1650
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW5
+U 1 1 5DFE637F
+P 1350 1650
+F 0 "SW5" H 1350 1935 50  0000 C CNN
+F 1 "SW_Push" H 1350 1844 50  0000 C CNN
+F 2 "Keebio:MX-Alps-Choc-1U-NoLED" H 1350 1850 50  0001 C CNN
+F 3 "" H 1350 1850 50  0001 C CNN
+	1    1350 1650
+	1    0    0    -1  
+$EndComp
+$Comp
+L pspice:DIODE D6
+U 1 1 5DFE63A2
+P 950 1250
+F 0 "D6" H 950 1515 50  0000 C CNN
+F 1 "D2.1" H 950 1424 50  0000 C CNN
+F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 950 1250 50  0001 C CNN
+F 3 "~" H 950 1250 50  0001 C CNN
+	1    950  1250
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW4
+U 1 1 5DFE63A9
+P 1350 1250
+F 0 "SW4" H 1350 1535 50  0000 C CNN
+F 1 "SW_Push" H 1350 1444 50  0000 C CNN
+F 2 "Keebio:MX-Alps-Choc-1U-NoLED" H 1350 1450 50  0001 C CNN
+F 3 "" H 1350 1450 50  0001 C CNN
+	1    1350 1250
+	1    0    0    -1  
+$EndComp
+$Comp
+L pspice:DIODE D5
+U 1 1 5DFE63B0
+P 950 850
+F 0 "D5" H 950 1115 50  0000 C CNN
+F 1 "D1.1" H 950 1024 50  0000 C CNN
+F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 950 850 50  0001 C CNN
+F 3 "~" H 950 850 50  0001 C CNN
+	1    950  850 
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW3
+U 1 1 5DFE63B7
+P 1350 850
+F 0 "SW3" H 1350 1135 50  0000 C CNN
+F 1 "SW_Push" H 1350 1044 50  0000 C CNN
+F 2 "Keebio:MX-Alps-Choc-1U-NoLED" H 1350 1050 50  0001 C CNN
+F 3 "" H 1350 1050 50  0001 C CNN
+	1    1350 850 
+	1    0    0    -1  
+$EndComp
+Text GLabel 1550 850  2    50   Input ~ 0
+COL1
+Text GLabel 750  1250 0    50   Input ~ 0
+ROW2
+Text GLabel 750  1650 0    50   Input ~ 0
+ROW3
+Text GLabel 750  850  0    50   Input ~ 0
+ROW1
+Wire Wire Line
+	1550 850  1550 1250
+Wire Wire Line
+	1550 1250 1550 1650
+Connection ~ 1550 1250
+$Comp
+L pspice:DIODE D21
+U 1 1 5DFE63CB
+P 2300 1650
+F 0 "D21" H 2300 1915 50  0000 C CNN
+F 1 "D3.2" H 2300 1824 50  0000 C CNN
+F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 2300 1650 50  0001 C CNN
+F 3 "~" H 2300 1650 50  0001 C CNN
+	1    2300 1650
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW19
+U 1 1 5DFE63D2
+P 2700 1650
+F 0 "SW19" H 2700 1935 50  0000 C CNN
+F 1 "SW_Push" H 2700 1844 50  0000 C CNN
+F 2 "Keebio:MX-Alps-Choc-1U-NoLED" H 2700 1850 50  0001 C CNN
+F 3 "" H 2700 1850 50  0001 C CNN
+	1    2700 1650
+	1    0    0    -1  
+$EndComp
+$Comp
+L pspice:DIODE D20
+U 1 1 5DFE63F5
+P 2300 1250
+F 0 "D20" H 2300 1515 50  0000 C CNN
+F 1 "D2.2" H 2300 1424 50  0000 C CNN
+F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 2300 1250 50  0001 C CNN
+F 3 "~" H 2300 1250 50  0001 C CNN
+	1    2300 1250
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW18
+U 1 1 5DFE63FC
+P 2700 1250
+F 0 "SW18" H 2700 1535 50  0000 C CNN
+F 1 "SW_Push" H 2700 1444 50  0000 C CNN
+F 2 "Keebio:MX-Alps-Choc-1U-NoLED" H 2700 1450 50  0001 C CNN
+F 3 "" H 2700 1450 50  0001 C CNN
+	1    2700 1250
+	1    0    0    -1  
+$EndComp
+$Comp
+L pspice:DIODE D19
+U 1 1 5DFE6403
+P 2300 850
+F 0 "D19" H 2300 1115 50  0000 C CNN
+F 1 "D1.2" H 2300 1024 50  0000 C CNN
+F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 2300 850 50  0001 C CNN
+F 3 "~" H 2300 850 50  0001 C CNN
+	1    2300 850 
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW17
+U 1 1 5DFE640A
+P 2700 850
+F 0 "SW17" H 2700 1135 50  0000 C CNN
+F 1 "SW_Push" H 2700 1044 50  0000 C CNN
+F 2 "Keebio:MX-Alps-Choc-1U-NoLED" H 2700 1050 50  0001 C CNN
+F 3 "" H 2700 1050 50  0001 C CNN
+	1    2700 850 
+	1    0    0    -1  
+$EndComp
+Text GLabel 2900 850  2    50   Input ~ 0
+COL2
+Text GLabel 2100 1250 0    50   Input ~ 0
+ROW2
+Text GLabel 2100 1650 0    50   Input ~ 0
+ROW3
+Text GLabel 2100 850  0    50   Input ~ 0
+ROW1
+Wire Wire Line
+	2900 850  2900 1250
+Wire Wire Line
+	2900 1250 2900 1650
+Connection ~ 2900 1250
+$Comp
+L pspice:DIODE D16
+U 1 1 5DFEF7D2
+P 950 6700
+F 0 "D16" H 950 6965 50  0000 C CNN
+F 1 "D3.6" H 950 6874 50  0000 C CNN
+F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 950 6700 50  0001 C CNN
+F 3 "~" H 950 6700 50  0001 C CNN
+	1    950  6700
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW14
+U 1 1 5DFEF7D9
+P 1350 6700
+F 0 "SW14" H 1350 6985 50  0000 C CNN
+F 1 "SW_Push" H 1350 6894 50  0000 C CNN
+F 2 "Keebio:MX-Alps-Choc-1U-NoLED" H 1350 6900 50  0001 C CNN
+F 3 "" H 1350 6900 50  0001 C CNN
+	1    1350 6700
+	1    0    0    -1  
+$EndComp
+$Comp
+L pspice:DIODE D17
+U 1 1 5DFEF7E0
+P 950 7100
+F 0 "D17" H 950 7365 50  0000 C CNN
+F 1 "D4.6" H 950 7274 50  0000 C CNN
+F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 950 7100 50  0001 C CNN
+F 3 "~" H 950 7100 50  0001 C CNN
+	1    950  7100
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW15
+U 1 1 5DFEF7E7
+P 1350 7100
+F 0 "SW15" H 1350 7385 50  0000 C CNN
+F 1 "SW_Push" H 1350 7294 50  0000 C CNN
+F 2 "Keebio:MX-Alps-Choc-1U-NoLED" H 1350 7300 50  0001 C CNN
+F 3 "" H 1350 7300 50  0001 C CNN
+	1    1350 7100
+	1    0    0    -1  
+$EndComp
+$Comp
+L pspice:DIODE D15
+U 1 1 5DFEF7FC
+P 950 6300
+F 0 "D15" H 950 6565 50  0000 C CNN
+F 1 "D2.6" H 950 6474 50  0000 C CNN
+F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 950 6300 50  0001 C CNN
+F 3 "~" H 950 6300 50  0001 C CNN
+	1    950  6300
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW13
+U 1 1 5DFEF803
+P 1350 6300
+F 0 "SW13" H 1350 6585 50  0000 C CNN
+F 1 "SW_Push" H 1350 6494 50  0000 C CNN
+F 2 "Keebio:MX-Alps-Choc-1U-NoLED" H 1350 6500 50  0001 C CNN
+F 3 "" H 1350 6500 50  0001 C CNN
+	1    1350 6300
+	1    0    0    -1  
+$EndComp
+$Comp
+L pspice:DIODE D14
+U 1 1 5DFEF80A
+P 950 5900
+F 0 "D14" H 950 6165 50  0000 C CNN
+F 1 "D1.6" H 950 6074 50  0000 C CNN
+F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 950 5900 50  0001 C CNN
+F 3 "~" H 950 5900 50  0001 C CNN
+	1    950  5900
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW12
+U 1 1 5DFEF811
+P 1350 5900
+F 0 "SW12" H 1350 6185 50  0000 C CNN
+F 1 "SW_Push" H 1350 6094 50  0000 C CNN
+F 2 "Keebio:MX-Alps-Choc-1U-NoLED" H 1350 6100 50  0001 C CNN
+F 3 "" H 1350 6100 50  0001 C CNN
+	1    1350 5900
+	1    0    0    -1  
+$EndComp
+Text GLabel 1550 5900 2    50   Input ~ 0
+COL6
+Text GLabel 750  6300 0    50   Input ~ 0
+ROW2
+Text GLabel 750  6700 0    50   Input ~ 0
+ROW3
+Text GLabel 750  7100 0    50   Input ~ 0
+ROW4
+Text GLabel 750  5900 0    50   Input ~ 0
+ROW1
+Wire Wire Line
+	1550 5900 1550 6300
+Wire Wire Line
+	1550 6300 1550 6700
+Connection ~ 1550 6300
+Wire Wire Line
+	1550 6700 1550 7100
+Connection ~ 1550 6700
+Text GLabel 6700 4000 2    50   Input ~ 0
+COL1
+Text GLabel 5400 2800 0    50   Input ~ 0
+COL2
+Text GLabel 5400 2900 0    50   Input ~ 0
+COL3
+Text GLabel 5400 3000 0    50   Input ~ 0
+COL4
+Text GLabel 5400 3300 0    50   Input ~ 0
+COL5
+Text GLabel 5400 3400 0    50   Input ~ 0
+COL6
+Text GLabel 9300 900  1    50   Input ~ 0
+5V
+Text GLabel 10150 1500 0    50   Input ~ 0
+D-
+Text GLabel 6700 3600 2    50   Input ~ 0
+D-
+Text GLabel 10150 1700 0    50   Input ~ 0
+D+
+Text GLabel 6700 3700 2    50   Input ~ 0
+D+
+$Comp
+L Connector:USB_C_Receptacle_USB2.0 J1
+U 1 1 5E037A53
+P 10750 1500
+F 0 "J1" H 10320 1441 50  0000 R CNN
+F 1 "USB_C_Receptacle_USB2.0" H 10320 1350 50  0000 R CNN
+F 2 "kicad-usb:USB_C_Receptacle_HRO_TYPE-C-31-M-12" H 10900 1500 50  0001 C CNN
+F 3 "https://www.usb.org/sites/default/files/documents/usb_type-c.zip" H 10900 1500 50  0001 C CNN
+	1    10750 1500
+	-1   0    0    -1  
+$EndComp
+Connection ~ 10750 2400
+Text GLabel 5900 1200 0    50   Input ~ 0
+VBAT
+$Comp
+L power:GND #PWR0107
+U 1 1 5ED2E262
+P 8550 2250
+F 0 "#PWR0107" H 8550 2000 50  0001 C CNN
+F 1 "GND" H 8555 2077 50  0000 C CNN
+F 2 "" H 8550 2250 50  0001 C CNN
+F 3 "" H 8550 2250 50  0001 C CNN
+	1    8550 2250
+	1    0    0    -1  
+$EndComp
+Text GLabel 8550 2150 0    50   Input ~ 0
+5V
+Text GLabel 8550 2050 0    50   Input ~ 0
+TX
+Text GLabel 8550 1950 0    50   Input ~ 0
+RX
+Text GLabel 6700 3400 2    50   Input ~ 0
+TX
+Text GLabel 6700 3500 2    50   Input ~ 0
+RX
+$Comp
+L Connector:Conn_01x04_Female J2
+U 1 1 5ED45338
+P 8750 2150
+F 0 "J2" H 8643 1725 50  0000 C CNN
+F 1 "AudioJack4" H 8643 1816 50  0000 C CNN
+F 2 "Keebio:TRRS-PJ-320A-no-Fmask" H 8750 2150 50  0001 C CNN
+F 3 "~" H 8750 2150 50  0001 C CNN
+	1    8750 2150
+	1    0    0    1   
+$EndComp
+Text GLabel 7300 1800 0    50   Input ~ 0
+SWDIO
+Text GLabel 7300 1900 0    50   Input ~ 0
+SWDCLK
+Text GLabel 7300 1700 0    50   Input ~ 0
+3.3V
+$Comp
+L power:GND #PWR0108
+U 1 1 5ED50DF3
+P 7300 2000
+F 0 "#PWR0108" H 7300 1750 50  0001 C CNN
+F 1 "GND" V 7305 1872 50  0000 R CNN
+F 2 "" H 7300 2000 50  0001 C CNN
+F 3 "" H 7300 2000 50  0001 C CNN
+	1    7300 2000
+	0    1    1    0   
+$EndComp
+Text GLabel 6700 2900 2    50   Input ~ 0
+PA4
+Text GLabel 6700 3100 2    50   Input ~ 0
+PA6
+Text GLabel 6700 3200 2    50   Input ~ 0
+PA7
+Text GLabel 5400 3100 0    50   Input ~ 0
+PB6
+Text GLabel 5400 3200 0    50   Input ~ 0
+PB7
+$Comp
+L Connector:Conn_01x12_Male J3
+U 1 1 5EDBCB44
+P 7500 2200
+F 0 "J3" H 7473 2173 50  0000 R CNN
+F 1 "Conn_01x12_Male" H 7473 2082 50  0000 R CNN
+F 2 "kicad-harwin:Harwin_M20-89012xx_1x12_P2.54mm_Horizontal" H 7500 2200 50  0001 C CNN
+F 3 "~" H 7500 2200 50  0001 C CNN
+	1    7500 2200
+	-1   0    0    -1  
+$EndComp
+Text GLabel 7300 2600 0    50   Input ~ 0
+PB6
+Text GLabel 7300 2700 0    50   Input ~ 0
+PB7
+Text GLabel 7300 2800 0    50   Input ~ 0
+5V
+$Comp
+L power:GND #PWR0109
+U 1 1 5EDBE5BA
+P 7300 2500
+F 0 "#PWR0109" H 7300 2250 50  0001 C CNN
+F 1 "GND" V 7305 2372 50  0000 R CNN
+F 2 "" H 7300 2500 50  0001 C CNN
+F 3 "" H 7300 2500 50  0001 C CNN
+	1    7300 2500
+	0    1    1    0   
+$EndComp
+Text GLabel 7300 2100 0    50   Input ~ 0
+PA4
+Text GLabel 7300 2200 0    50   Input ~ 0
+PA5
+Text GLabel 7300 2300 0    50   Input ~ 0
+PA6
+Text GLabel 7300 2400 0    50   Input ~ 0
+PA7
+Text GLabel 6700 3000 2    50   Input ~ 0
+PA5
+$Comp
+L power:GND #PWR?
+U 1 1 5F02320E
+P 5400 3700
+F 0 "#PWR?" H 5400 3450 50  0001 C CNN
+F 1 "GND" V 5405 3572 50  0000 R CNN
+F 2 "" H 5400 3700 50  0001 C CNN
+F 3 "" H 5400 3700 50  0001 C CNN
+	1    5400 3700
+	0    1    1    0   
+$EndComp
+$EndSCHEMATC
diff --git a/pcb/kicad/right/right.kicad_pcb b/pcb/kicad/right/right.kicad_pcb
new file mode 100644
index 0000000..94d76f3
--- /dev/null
+++ b/pcb/kicad/right/right.kicad_pcb
@@ -0,0 +1,2898 @@
+(kicad_pcb (version 20171130) (host pcbnew 5.0.2+dfsg1-1)
+
+  (general
+    (thickness 1.6)
+    (drawings 11)
+    (tracks 0)
+    (zones 0)
+    (modules 61)
+    (nets 69)
+  )
+
+  (page A4)
+  (layers
+    (0 F.Cu signal)
+    (31 B.Cu signal)
+    (32 B.Adhes user)
+    (33 F.Adhes user)
+    (34 B.Paste user)
+    (35 F.Paste user)
+    (36 B.SilkS user)
+    (37 F.SilkS user)
+    (38 B.Mask user)
+    (39 F.Mask user)
+    (40 Dwgs.User user)
+    (41 Cmts.User user)
+    (42 Eco1.User user)
+    (43 Eco2.User user)
+    (44 Edge.Cuts user)
+    (45 Margin user)
+    (46 B.CrtYd user)
+    (47 F.CrtYd user)
+    (48 B.Fab user)
+    (49 F.Fab user)
+  )
+
+  (setup
+    (last_trace_width 0.25)
+    (trace_clearance 0.2)
+    (zone_clearance 0.508)
+    (zone_45_only no)
+    (trace_min 0.2)
+    (segment_width 0.2)
+    (edge_width 0.15)
+    (via_size 0.8)
+    (via_drill 0.4)
+    (via_min_size 0.4)
+    (via_min_drill 0.3)
+    (uvia_size 0.3)
+    (uvia_drill 0.1)
+    (uvias_allowed no)
+    (uvia_min_size 0.2)
+    (uvia_min_drill 0.1)
+    (pcb_text_width 0.3)
+    (pcb_text_size 1.5 1.5)
+    (mod_edge_width 0.15)
+    (mod_text_size 1 1)
+    (mod_text_width 0.15)
+    (pad_size 1.524 1.524)
+    (pad_drill 0.762)
+    (pad_to_mask_clearance 0.051)
+    (solder_mask_min_width 0.25)
+    (aux_axis_origin 0 0)
+    (visible_elements FFFFFF7F)
+    (pcbplotparams
+      (layerselection 0x010fc_ffffffff)
+      (usegerberextensions false)
+      (usegerberattributes false)
+      (usegerberadvancedattributes false)
+      (creategerberjobfile false)
+      (excludeedgelayer true)
+      (linewidth 0.100000)
+      (plotframeref false)
+      (viasonmask false)
+      (mode 1)
+      (useauxorigin false)
+      (hpglpennumber 1)
+      (hpglpenspeed 20)
+      (hpglpendiameter 15.000000)
+      (psnegative false)
+      (psa4output false)
+      (plotreference true)
+      (plotvalue true)
+      (plotinvisibletext false)
+      (padsonsilk false)
+      (subtractmaskfromsilk false)
+      (outputformat 1)
+      (mirror false)
+      (drillshape 1)
+      (scaleselection 1)
+      (outputdirectory ""))
+  )
+
+  (net 0 "")
+  (net 1 GND)
+  (net 2 D+)
+  (net 3 "Net-(J1-PadB5)")
+  (net 4 "Net-(J1-PadA8)")
+  (net 5 D-)
+  (net 6 "Net-(J1-PadA5)")
+  (net 7 "Net-(J1-PadB8)")
+  (net 8 5V)
+  (net 9 3.3V)
+  (net 10 SWDIO)
+  (net 11 SWDCLK)
+  (net 12 PA4)
+  (net 13 PA5)
+  (net 14 PA6)
+  (net 15 PA7)
+  (net 16 PB6)
+  (net 17 PB7)
+  (net 18 TX)
+  (net 19 RX)
+  (net 20 "Net-(D26-Pad2)")
+  (net 21 COL4)
+  (net 22 "Net-(D36-Pad2)")
+  (net 23 COL5)
+  (net 24 "Net-(D35-Pad2)")
+  (net 25 "Net-(D34-Pad2)")
+  (net 26 "Net-(D33-Pad2)")
+  (net 27 "Net-(D25-Pad2)")
+  (net 28 "Net-(D24-Pad2)")
+  (net 29 "Net-(D23-Pad2)")
+  (net 30 "Net-(D21-Pad2)")
+  (net 31 COL2)
+  (net 32 "Net-(D20-Pad2)")
+  (net 33 "Net-(D19-Pad2)")
+  (net 34 "Net-(D16-Pad2)")
+  (net 35 COL6)
+  (net 36 "Net-(D14-Pad2)")
+  (net 37 "Net-(D12-Pad2)")
+  (net 38 COL3)
+  (net 39 "Net-(D11-Pad2)")
+  (net 40 "Net-(D10-Pad2)")
+  (net 41 "Net-(D15-Pad2)")
+  (net 42 "Net-(D9-Pad2)")
+  (net 43 "Net-(D7-Pad2)")
+  (net 44 COL1)
+  (net 45 "Net-(D6-Pad2)")
+  (net 46 "Net-(D5-Pad2)")
+  (net 47 "Net-(D17-Pad2)")
+  (net 48 "Net-(R1-Pad1)")
+  (net 49 VBAT)
+  (net 50 "Net-(U1-Pad2)")
+  (net 51 "Net-(U1-Pad3)")
+  (net 52 "Net-(U1-Pad4)")
+  (net 53 "Net-(U1-Pad5)")
+  (net 54 "Net-(U1-Pad6)")
+  (net 55 "Net-(C1-Pad2)")
+  (net 56 "Net-(U1-Pad10)")
+  (net 57 "Net-(U1-Pad11)")
+  (net 58 "Net-(U1-Pad12)")
+  (net 59 "Net-(U1-Pad13)")
+  (net 60 ROW1)
+  (net 61 ROW2)
+  (net 62 ROW3)
+  (net 63 ROW4)
+  (net 64 "Net-(U1-Pad22)")
+  (net 65 "Net-(U1-Pad26)")
+  (net 66 "Net-(U1-Pad27)")
+  (net 67 "Net-(U1-Pad28)")
+  (net 68 "Net-(U1-Pad29)")
+
+  (net_class Default "Ceci est la Netclass par défaut."
+    (clearance 0.2)
+    (trace_width 0.25)
+    (via_dia 0.8)
+    (via_drill 0.4)
+    (uvia_dia 0.3)
+    (uvia_drill 0.1)
+    (add_net 3.3V)
+    (add_net 5V)
+    (add_net COL1)
+    (add_net COL2)
+    (add_net COL3)
+    (add_net COL4)
+    (add_net COL5)
+    (add_net COL6)
+    (add_net D+)
+    (add_net D-)
+    (add_net GND)
+    (add_net "Net-(C1-Pad2)")
+    (add_net "Net-(D10-Pad2)")
+    (add_net "Net-(D11-Pad2)")
+    (add_net "Net-(D12-Pad2)")
+    (add_net "Net-(D14-Pad2)")
+    (add_net "Net-(D15-Pad2)")
+    (add_net "Net-(D16-Pad2)")
+    (add_net "Net-(D17-Pad2)")
+    (add_net "Net-(D19-Pad2)")
+    (add_net "Net-(D20-Pad2)")
+    (add_net "Net-(D21-Pad2)")
+    (add_net "Net-(D23-Pad2)")
+    (add_net "Net-(D24-Pad2)")
+    (add_net "Net-(D25-Pad2)")
+    (add_net "Net-(D26-Pad2)")
+    (add_net "Net-(D33-Pad2)")
+    (add_net "Net-(D34-Pad2)")
+    (add_net "Net-(D35-Pad2)")
+    (add_net "Net-(D36-Pad2)")
+    (add_net "Net-(D5-Pad2)")
+    (add_net "Net-(D6-Pad2)")
+    (add_net "Net-(D7-Pad2)")
+    (add_net "Net-(D9-Pad2)")
+    (add_net "Net-(J1-PadA5)")
+    (add_net "Net-(J1-PadA8)")
+    (add_net "Net-(J1-PadB5)")
+    (add_net "Net-(J1-PadB8)")
+    (add_net "Net-(R1-Pad1)")
+    (add_net "Net-(U1-Pad10)")
+    (add_net "Net-(U1-Pad11)")
+    (add_net "Net-(U1-Pad12)")
+    (add_net "Net-(U1-Pad13)")
+    (add_net "Net-(U1-Pad2)")
+    (add_net "Net-(U1-Pad22)")
+    (add_net "Net-(U1-Pad26)")
+    (add_net "Net-(U1-Pad27)")
+    (add_net "Net-(U1-Pad28)")
+    (add_net "Net-(U1-Pad29)")
+    (add_net "Net-(U1-Pad3)")
+    (add_net "Net-(U1-Pad4)")
+    (add_net "Net-(U1-Pad5)")
+    (add_net "Net-(U1-Pad6)")
+    (add_net PA4)
+    (add_net PA5)
+    (add_net PA6)
+    (add_net PA7)
+    (add_net PB6)
+    (add_net PB7)
+    (add_net ROW1)
+    (add_net ROW2)
+    (add_net ROW3)
+    (add_net ROW4)
+    (add_net RX)
+    (add_net SWDCLK)
+    (add_net SWDIO)
+    (add_net TX)
+    (add_net VBAT)
+  )
+
+  (module Button_Switch_SMD:SW_SPST_CK_RS282G05A3 (layer F.Cu) (tedit 5A7A67D2) (tstamp 5F026358)
+    (at 98.905001 73.910001)
+    (descr https://www.mouser.com/ds/2/60/RS-282G05A-SM_RT-1159762.pdf)
+    (tags "SPST button tactile switch")
+    (path /5DECA090)
+    (attr smd)
+    (fp_text reference SW2 (at 0 -2.6) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value RESET (at 0 3) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 3 -1.8) (end 3 1.8) (layer F.Fab) (width 0.1))
+    (fp_line (start -3 -1.8) (end -3 1.8) (layer F.Fab) (width 0.1))
+    (fp_line (start -3 -1.8) (end 3 -1.8) (layer F.Fab) (width 0.1))
+    (fp_line (start -3 1.8) (end 3 1.8) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.5 -0.8) (end -1.5 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.5 -0.8) (end 1.5 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.5 -0.8) (end 1.5 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.5 0.8) (end 1.5 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start -3.06 1.85) (end -3.06 -1.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.06 1.85) (end -3.06 1.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.06 -1.85) (end 3.06 1.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -3.06 -1.85) (end 3.06 -1.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.75 1) (end -1.75 -1) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.75 1) (end -1.75 1) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.75 -1) (end 1.75 1) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.75 -1) (end 1.75 -1) (layer F.Fab) (width 0.1))
+    (fp_text user %R (at 0 -2.6) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -4.9 -2.05) (end 4.9 -2.05) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 4.9 -2.05) (end 4.9 2.05) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 4.9 2.05) (end -4.9 2.05) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -4.9 2.05) (end -4.9 -2.05) (layer F.CrtYd) (width 0.05))
+    (pad 2 smd rect (at 3.9 0) (size 1.5 1.5) (layers F.Cu F.Paste F.Mask)
+      (net 55 "Net-(C1-Pad2)"))
+    (pad 1 smd rect (at -3.9 0) (size 1.5 1.5) (layers F.Cu F.Paste F.Mask)
+      (net 1 GND))
+    (model ${KISYS3DMOD}/Button_Switch_SMD.3dshapes/SW_SPST_CK_RS282G05A3.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Button_Switch_SMD:SW_SPST_CK_RS282G05A3 (layer F.Cu) (tedit 5A7A67D2) (tstamp 5F02633D)
+    (at 99.695 86.36)
+    (descr https://www.mouser.com/ds/2/60/RS-282G05A-SM_RT-1159762.pdf)
+    (tags "SPST button tactile switch")
+    (path /5DECE105)
+    (attr smd)
+    (fp_text reference SW1 (at 0 -2.6) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value BOOT (at 0 3) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -4.9 2.05) (end -4.9 -2.05) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 4.9 2.05) (end -4.9 2.05) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 4.9 -2.05) (end 4.9 2.05) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -4.9 -2.05) (end 4.9 -2.05) (layer F.CrtYd) (width 0.05))
+    (fp_text user %R (at 0 -2.6) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -1.75 -1) (end 1.75 -1) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.75 -1) (end 1.75 1) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.75 1) (end -1.75 1) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.75 1) (end -1.75 -1) (layer F.Fab) (width 0.1))
+    (fp_line (start -3.06 -1.85) (end 3.06 -1.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.06 -1.85) (end 3.06 1.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.06 1.85) (end -3.06 1.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -3.06 1.85) (end -3.06 -1.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.5 0.8) (end 1.5 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.5 -0.8) (end 1.5 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.5 -0.8) (end 1.5 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.5 -0.8) (end -1.5 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start -3 1.8) (end 3 1.8) (layer F.Fab) (width 0.1))
+    (fp_line (start -3 -1.8) (end 3 -1.8) (layer F.Fab) (width 0.1))
+    (fp_line (start -3 -1.8) (end -3 1.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 3 -1.8) (end 3 1.8) (layer F.Fab) (width 0.1))
+    (pad 1 smd rect (at -3.9 0) (size 1.5 1.5) (layers F.Cu F.Paste F.Mask)
+      (net 48 "Net-(R1-Pad1)"))
+    (pad 2 smd rect (at 3.9 0) (size 1.5 1.5) (layers F.Cu F.Paste F.Mask)
+      (net 9 3.3V))
+    (model ${KISYS3DMOD}/Button_Switch_SMD.3dshapes/SW_SPST_CK_RS282G05A3.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder (layer F.Cu) (tedit 5B36C52B) (tstamp 5F026322)
+    (at 98.425 80.01)
+    (descr "Capacitor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
+    (tags "capacitor handsolder")
+    (path /5DEC9DB9)
+    (attr smd)
+    (fp_text reference C1 (at 0 -1.65) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 100nF (at 0 1.65) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -1 0.6) (end -1 -0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 -0.6) (end 1 -0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 -0.6) (end 1 0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 0.6) (end -1 0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.261252 -0.71) (end 0.261252 -0.71) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.261252 0.71) (end 0.261252 0.71) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_text user %R (at 0 0) (layer F.Fab)
+      (effects (font (size 0.5 0.5) (thickness 0.08)))
+    )
+    (pad 1 smd roundrect (at -1.025 0) (size 1.15 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.217391)
+      (net 1 GND))
+    (pad 2 smd roundrect (at 1.025 0) (size 1.15 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.217391)
+      (net 55 "Net-(C1-Pad2)"))
+    (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0805_2012Metric.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder (layer F.Cu) (tedit 5B36C52B) (tstamp 5F026311)
+    (at 78.74 55.245)
+    (descr "Capacitor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
+    (tags "capacitor handsolder")
+    (path /5DEC3C77)
+    (attr smd)
+    (fp_text reference C2 (at 0 -1.65) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 100nF (at 0 1.65) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 0 0) (layer F.Fab)
+      (effects (font (size 0.5 0.5) (thickness 0.08)))
+    )
+    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.261252 0.71) (end 0.261252 0.71) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.261252 -0.71) (end 0.261252 -0.71) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1 0.6) (end -1 0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 -0.6) (end 1 0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 -0.6) (end 1 -0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 0.6) (end -1 -0.6) (layer F.Fab) (width 0.1))
+    (pad 2 smd roundrect (at 1.025 0) (size 1.15 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.217391)
+      (net 9 3.3V))
+    (pad 1 smd roundrect (at -1.025 0) (size 1.15 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.217391)
+      (net 1 GND))
+    (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0805_2012Metric.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder (layer F.Cu) (tedit 5B36C52B) (tstamp 5F026300)
+    (at 78.74 60.325)
+    (descr "Capacitor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
+    (tags "capacitor handsolder")
+    (path /5DEC3CF5)
+    (attr smd)
+    (fp_text reference C3 (at 0 -1.65) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 100nF (at 0 1.65) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -1 0.6) (end -1 -0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 -0.6) (end 1 -0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 -0.6) (end 1 0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 0.6) (end -1 0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.261252 -0.71) (end 0.261252 -0.71) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.261252 0.71) (end 0.261252 0.71) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_text user %R (at 0 0) (layer F.Fab)
+      (effects (font (size 0.5 0.5) (thickness 0.08)))
+    )
+    (pad 1 smd roundrect (at -1.025 0) (size 1.15 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.217391)
+      (net 1 GND))
+    (pad 2 smd roundrect (at 1.025 0) (size 1.15 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.217391)
+      (net 9 3.3V))
+    (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0805_2012Metric.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder (layer F.Cu) (tedit 5B36C52B) (tstamp 5F0262EF)
+    (at 78.74 65.405)
+    (descr "Capacitor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
+    (tags "capacitor handsolder")
+    (path /5DEC3D3C)
+    (attr smd)
+    (fp_text reference C4 (at 0 -1.65) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 100nF (at 0 1.65) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 0 0) (layer F.Fab)
+      (effects (font (size 0.5 0.5) (thickness 0.08)))
+    )
+    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.261252 0.71) (end 0.261252 0.71) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.261252 -0.71) (end 0.261252 -0.71) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1 0.6) (end -1 0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 -0.6) (end 1 0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 -0.6) (end 1 -0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 0.6) (end -1 -0.6) (layer F.Fab) (width 0.1))
+    (pad 2 smd roundrect (at 1.025 0) (size 1.15 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.217391)
+      (net 9 3.3V))
+    (pad 1 smd roundrect (at -1.025 0) (size 1.15 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.217391)
+      (net 1 GND))
+    (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0805_2012Metric.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder (layer F.Cu) (tedit 5B36C52B) (tstamp 5F0262DE)
+    (at 78.74 70.485)
+    (descr "Capacitor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
+    (tags "capacitor handsolder")
+    (path /5DEC3D7E)
+    (attr smd)
+    (fp_text reference C5 (at 0 -1.65) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 100nF (at 0 1.65) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -1 0.6) (end -1 -0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 -0.6) (end 1 -0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 -0.6) (end 1 0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 0.6) (end -1 0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.261252 -0.71) (end 0.261252 -0.71) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.261252 0.71) (end 0.261252 0.71) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_text user %R (at 0 0) (layer F.Fab)
+      (effects (font (size 0.5 0.5) (thickness 0.08)))
+    )
+    (pad 1 smd roundrect (at -1.025 0) (size 1.15 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.217391)
+      (net 1 GND))
+    (pad 2 smd roundrect (at 1.025 0) (size 1.15 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.217391)
+      (net 9 3.3V))
+    (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0805_2012Metric.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder (layer F.Cu) (tedit 5B36C52B) (tstamp 5F0262CD)
+    (at 162.306 81.28)
+    (descr "Capacitor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
+    (tags "capacitor handsolder")
+    (path /5DEE73ED)
+    (attr smd)
+    (fp_text reference C6 (at 0 -1.65) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 1µF (at 0 1.65) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 0 0) (layer F.Fab)
+      (effects (font (size 0.5 0.5) (thickness 0.08)))
+    )
+    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.261252 0.71) (end 0.261252 0.71) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.261252 -0.71) (end 0.261252 -0.71) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1 0.6) (end -1 0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 -0.6) (end 1 0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 -0.6) (end 1 -0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 0.6) (end -1 -0.6) (layer F.Fab) (width 0.1))
+    (pad 2 smd roundrect (at 1.025 0) (size 1.15 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.217391)
+      (net 9 3.3V))
+    (pad 1 smd roundrect (at -1.025 0) (size 1.15 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.217391)
+      (net 1 GND))
+    (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0805_2012Metric.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder (layer F.Cu) (tedit 5B36C52B) (tstamp 5F0262BC)
+    (at 162.306 75.184)
+    (descr "Capacitor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
+    (tags "capacitor handsolder")
+    (path /5DEC3DF1)
+    (attr smd)
+    (fp_text reference C7 (at 0 -1.65) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 1µF (at 0 1.65) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -1 0.6) (end -1 -0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 -0.6) (end 1 -0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 -0.6) (end 1 0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 0.6) (end -1 0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.261252 -0.71) (end 0.261252 -0.71) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.261252 0.71) (end 0.261252 0.71) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_text user %R (at 0 0) (layer F.Fab)
+      (effects (font (size 0.5 0.5) (thickness 0.08)))
+    )
+    (pad 1 smd roundrect (at -1.025 0) (size 1.15 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.217391)
+      (net 1 GND))
+    (pad 2 smd roundrect (at 1.025 0) (size 1.15 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.217391)
+      (net 8 5V))
+    (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0805_2012Metric.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Diode_SMD:D_SOD-323_HandSoldering (layer F.Cu) (tedit 58641869) (tstamp 5F0262AB)
+    (at 149.86 122.936 270)
+    (descr SOD-323)
+    (tags SOD-323)
+    (path /5DFEF7E0)
+    (attr smd)
+    (fp_text reference D17 (at 0 -1.85 270) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value D4.6 (at 0.1 1.9 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -1.9 -0.85) (end 1.25 -0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.9 0.85) (end 1.25 0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2 -0.95) (end -2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2 -0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 -0.95) (end 2 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.9 -0.7) (end 0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 -0.7) (end 0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 0.7) (end -0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 0.7) (end -0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 -0.35) (end -0.3 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end -0.5 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end 0.2 -0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 -0.35) (end 0.2 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0.35) (end -0.3 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0) (end 0.45 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.9 -0.85) (end -1.9 0.85) (layer F.SilkS) (width 0.12))
+    (fp_text user %R (at 0 -1.85 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 2 smd rect (at 1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 47 "Net-(D17-Pad2)"))
+    (pad 1 smd rect (at -1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 63 ROW4))
+    (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_SOD-323.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Diode_SMD:D_SOD-323_HandSoldering (layer F.Cu) (tedit 58641869) (tstamp 5F026293)
+    (at 149.733 111.76 270)
+    (descr SOD-323)
+    (tags SOD-323)
+    (path /5DFEF7FC)
+    (attr smd)
+    (fp_text reference D15 (at 0 -1.85 270) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value D2.6 (at 0.1 1.9 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 0 -1.85 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -1.9 -0.85) (end -1.9 0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.2 0) (end 0.45 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0.35) (end -0.3 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 -0.35) (end 0.2 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end 0.2 -0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end -0.5 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 -0.35) (end -0.3 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 0.7) (end -0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 0.7) (end -0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 -0.7) (end 0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 -0.7) (end 0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -2 -0.95) (end 2 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2 -0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 -0.95) (end -2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.9 0.85) (end 1.25 0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.9 -0.85) (end 1.25 -0.85) (layer F.SilkS) (width 0.12))
+    (pad 1 smd rect (at -1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 61 ROW2))
+    (pad 2 smd rect (at 1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 41 "Net-(D15-Pad2)"))
+    (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_SOD-323.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Diode_SMD:D_SOD-323_HandSoldering (layer F.Cu) (tedit 58641869) (tstamp 5F02627B)
+    (at 149.733 106.172 270)
+    (descr SOD-323)
+    (tags SOD-323)
+    (path /5DFEF80A)
+    (attr smd)
+    (fp_text reference D14 (at 0 -1.85 270) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value D1.6 (at 0.1 1.9 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -1.9 -0.85) (end 1.25 -0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.9 0.85) (end 1.25 0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2 -0.95) (end -2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2 -0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 -0.95) (end 2 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.9 -0.7) (end 0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 -0.7) (end 0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 0.7) (end -0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 0.7) (end -0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 -0.35) (end -0.3 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end -0.5 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end 0.2 -0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 -0.35) (end 0.2 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0.35) (end -0.3 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0) (end 0.45 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.9 -0.85) (end -1.9 0.85) (layer F.SilkS) (width 0.12))
+    (fp_text user %R (at 0 -1.85 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 2 smd rect (at 1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 36 "Net-(D14-Pad2)"))
+    (pad 1 smd rect (at -1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 60 ROW1))
+    (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_SOD-323.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Diode_SMD:D_SOD-323_HandSoldering (layer F.Cu) (tedit 58641869) (tstamp 5F026263)
+    (at 155.829 122.936 270)
+    (descr SOD-323)
+    (tags SOD-323)
+    (path /5DF621D6)
+    (attr smd)
+    (fp_text reference D12 (at 0 -1.85 270) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value D4.3 (at 0.1 1.9 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 0 -1.85 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -1.9 -0.85) (end -1.9 0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.2 0) (end 0.45 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0.35) (end -0.3 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 -0.35) (end 0.2 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end 0.2 -0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end -0.5 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 -0.35) (end -0.3 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 0.7) (end -0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 0.7) (end -0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 -0.7) (end 0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 -0.7) (end 0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -2 -0.95) (end 2 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2 -0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 -0.95) (end -2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.9 0.85) (end 1.25 0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.9 -0.85) (end 1.25 -0.85) (layer F.SilkS) (width 0.12))
+    (pad 1 smd rect (at -1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 63 ROW4))
+    (pad 2 smd rect (at 1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 37 "Net-(D12-Pad2)"))
+    (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_SOD-323.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Diode_SMD:D_SOD-323_HandSoldering (layer F.Cu) (tedit 58641869) (tstamp 5F02624B)
+    (at 155.829 117.348 270)
+    (descr SOD-323)
+    (tags SOD-323)
+    (path /5DF621C8)
+    (attr smd)
+    (fp_text reference D11 (at 0 -1.85 270) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value D3.3 (at 0.1 1.9 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -1.9 -0.85) (end 1.25 -0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.9 0.85) (end 1.25 0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2 -0.95) (end -2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2 -0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 -0.95) (end 2 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.9 -0.7) (end 0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 -0.7) (end 0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 0.7) (end -0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 0.7) (end -0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 -0.35) (end -0.3 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end -0.5 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end 0.2 -0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 -0.35) (end 0.2 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0.35) (end -0.3 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0) (end 0.45 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.9 -0.85) (end -1.9 0.85) (layer F.SilkS) (width 0.12))
+    (fp_text user %R (at 0 -1.85 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 2 smd rect (at 1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 39 "Net-(D11-Pad2)"))
+    (pad 1 smd rect (at -1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 62 ROW3))
+    (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_SOD-323.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Diode_SMD:D_SOD-323_HandSoldering (layer F.Cu) (tedit 58641869) (tstamp 5F026233)
+    (at 155.829 111.76 270)
+    (descr SOD-323)
+    (tags SOD-323)
+    (path /5DF621F2)
+    (attr smd)
+    (fp_text reference D10 (at 0 -1.85 270) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value D2.3 (at 0.1 1.9 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 0 -1.85 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -1.9 -0.85) (end -1.9 0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.2 0) (end 0.45 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0.35) (end -0.3 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 -0.35) (end 0.2 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end 0.2 -0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end -0.5 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 -0.35) (end -0.3 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 0.7) (end -0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 0.7) (end -0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 -0.7) (end 0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 -0.7) (end 0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -2 -0.95) (end 2 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2 -0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 -0.95) (end -2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.9 0.85) (end 1.25 0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.9 -0.85) (end 1.25 -0.85) (layer F.SilkS) (width 0.12))
+    (pad 1 smd rect (at -1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 61 ROW2))
+    (pad 2 smd rect (at 1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 40 "Net-(D10-Pad2)"))
+    (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_SOD-323.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Diode_SMD:D_SOD-323_HandSoldering (layer F.Cu) (tedit 58641869) (tstamp 5F02621B)
+    (at 155.829 106.172 270)
+    (descr SOD-323)
+    (tags SOD-323)
+    (path /5DF62200)
+    (attr smd)
+    (fp_text reference D9 (at 0 -1.85 270) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value D1.3 (at 0.1 1.9 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -1.9 -0.85) (end 1.25 -0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.9 0.85) (end 1.25 0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2 -0.95) (end -2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2 -0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 -0.95) (end 2 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.9 -0.7) (end 0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 -0.7) (end 0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 0.7) (end -0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 0.7) (end -0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 -0.35) (end -0.3 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end -0.5 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end 0.2 -0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 -0.35) (end 0.2 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0.35) (end -0.3 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0) (end 0.45 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.9 -0.85) (end -1.9 0.85) (layer F.SilkS) (width 0.12))
+    (fp_text user %R (at 0 -1.85 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 2 smd rect (at 1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 42 "Net-(D9-Pad2)"))
+    (pad 1 smd rect (at -1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 60 ROW1))
+    (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_SOD-323.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Diode_SMD:D_SOD-323_HandSoldering (layer F.Cu) (tedit 58641869) (tstamp 5F026203)
+    (at 159.893 117.348 270)
+    (descr SOD-323)
+    (tags SOD-323)
+    (path /5DFE6378)
+    (attr smd)
+    (fp_text reference D7 (at 0 -1.85 270) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value D3.1 (at 0.1 1.9 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 0 -1.85 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -1.9 -0.85) (end -1.9 0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.2 0) (end 0.45 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0.35) (end -0.3 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 -0.35) (end 0.2 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end 0.2 -0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end -0.5 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 -0.35) (end -0.3 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 0.7) (end -0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 0.7) (end -0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 -0.7) (end 0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 -0.7) (end 0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -2 -0.95) (end 2 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2 -0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 -0.95) (end -2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.9 0.85) (end 1.25 0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.9 -0.85) (end 1.25 -0.85) (layer F.SilkS) (width 0.12))
+    (pad 1 smd rect (at -1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 62 ROW3))
+    (pad 2 smd rect (at 1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 43 "Net-(D7-Pad2)"))
+    (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_SOD-323.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Diode_SMD:D_SOD-323_HandSoldering (layer F.Cu) (tedit 58641869) (tstamp 5F0261EB)
+    (at 159.893 111.76 270)
+    (descr SOD-323)
+    (tags SOD-323)
+    (path /5DFE63A2)
+    (attr smd)
+    (fp_text reference D6 (at 0 -1.85 270) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value D2.1 (at 0.1 1.9 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -1.9 -0.85) (end 1.25 -0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.9 0.85) (end 1.25 0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2 -0.95) (end -2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2 -0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 -0.95) (end 2 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.9 -0.7) (end 0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 -0.7) (end 0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 0.7) (end -0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 0.7) (end -0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 -0.35) (end -0.3 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end -0.5 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end 0.2 -0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 -0.35) (end 0.2 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0.35) (end -0.3 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0) (end 0.45 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.9 -0.85) (end -1.9 0.85) (layer F.SilkS) (width 0.12))
+    (fp_text user %R (at 0 -1.85 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 2 smd rect (at 1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 45 "Net-(D6-Pad2)"))
+    (pad 1 smd rect (at -1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 61 ROW2))
+    (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_SOD-323.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Diode_SMD:D_SOD-323_HandSoldering (layer F.Cu) (tedit 58641869) (tstamp 5F02A06A)
+    (at 159.893 106.172 270)
+    (descr SOD-323)
+    (tags SOD-323)
+    (path /5DFE63B0)
+    (attr smd)
+    (fp_text reference D5 (at 0 -1.85 270) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value D1.1 (at 0.1 1.9 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 0 -1.85 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -1.9 -0.85) (end -1.9 0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.2 0) (end 0.45 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0.35) (end -0.3 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 -0.35) (end 0.2 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end 0.2 -0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end -0.5 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 -0.35) (end -0.3 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 0.7) (end -0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 0.7) (end -0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 -0.7) (end 0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 -0.7) (end 0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -2 -0.95) (end 2 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2 -0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 -0.95) (end -2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.9 0.85) (end 1.25 0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.9 -0.85) (end 1.25 -0.85) (layer F.SilkS) (width 0.12))
+    (pad 1 smd rect (at -1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 60 ROW1))
+    (pad 2 smd rect (at 1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 46 "Net-(D5-Pad2)"))
+    (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_SOD-323.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Diode_SMD:D_SOD-323_HandSoldering (layer F.Cu) (tedit 58641869) (tstamp 5F0261BB)
+    (at 149.733 117.348 270)
+    (descr SOD-323)
+    (tags SOD-323)
+    (path /5DFEF7D2)
+    (attr smd)
+    (fp_text reference D16 (at 0 -1.85 270) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value D3.6 (at 0.1 1.9 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -1.9 -0.85) (end 1.25 -0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.9 0.85) (end 1.25 0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2 -0.95) (end -2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2 -0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 -0.95) (end 2 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.9 -0.7) (end 0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 -0.7) (end 0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 0.7) (end -0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 0.7) (end -0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 -0.35) (end -0.3 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end -0.5 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end 0.2 -0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 -0.35) (end 0.2 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0.35) (end -0.3 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0) (end 0.45 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.9 -0.85) (end -1.9 0.85) (layer F.SilkS) (width 0.12))
+    (fp_text user %R (at 0 -1.85 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 2 smd rect (at 1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 34 "Net-(D16-Pad2)"))
+    (pad 1 smd rect (at -1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 62 ROW3))
+    (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_SOD-323.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Diode_SMD:D_SOD-323_HandSoldering (layer F.Cu) (tedit 58641869) (tstamp 5F0261A3)
+    (at 157.861 111.76 270)
+    (descr SOD-323)
+    (tags SOD-323)
+    (path /5DFE63F5)
+    (attr smd)
+    (fp_text reference D20 (at 0 -1.85 270) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value D2.2 (at 0.1 1.9 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 0 -1.85 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -1.9 -0.85) (end -1.9 0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.2 0) (end 0.45 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0.35) (end -0.3 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 -0.35) (end 0.2 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end 0.2 -0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end -0.5 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 -0.35) (end -0.3 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 0.7) (end -0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 0.7) (end -0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 -0.7) (end 0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 -0.7) (end 0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -2 -0.95) (end 2 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2 -0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 -0.95) (end -2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.9 0.85) (end 1.25 0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.9 -0.85) (end 1.25 -0.85) (layer F.SilkS) (width 0.12))
+    (pad 1 smd rect (at -1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 61 ROW2))
+    (pad 2 smd rect (at 1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 32 "Net-(D20-Pad2)"))
+    (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_SOD-323.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Diode_SMD:D_SOD-323_HandSoldering (layer F.Cu) (tedit 58641869) (tstamp 5F02618B)
+    (at 151.892 122.936 270)
+    (descr SOD-323)
+    (tags SOD-323)
+    (path /5DFE3E98)
+    (attr smd)
+    (fp_text reference D36 (at 0 -1.85 270) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value D4.5 (at 0.1 1.9 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -1.9 -0.85) (end 1.25 -0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.9 0.85) (end 1.25 0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2 -0.95) (end -2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2 -0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 -0.95) (end 2 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.9 -0.7) (end 0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 -0.7) (end 0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 0.7) (end -0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 0.7) (end -0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 -0.35) (end -0.3 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end -0.5 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end 0.2 -0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 -0.35) (end 0.2 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0.35) (end -0.3 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0) (end 0.45 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.9 -0.85) (end -1.9 0.85) (layer F.SilkS) (width 0.12))
+    (fp_text user %R (at 0 -1.85 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 2 smd rect (at 1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 22 "Net-(D36-Pad2)"))
+    (pad 1 smd rect (at -1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 63 ROW4))
+    (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_SOD-323.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Diode_SMD:D_SOD-323_HandSoldering (layer F.Cu) (tedit 58641869) (tstamp 5F026173)
+    (at 151.765 111.76 270)
+    (descr SOD-323)
+    (tags SOD-323)
+    (path /5DFE3EB4)
+    (attr smd)
+    (fp_text reference D34 (at 0 -1.85 270) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value D2.5 (at 0.1 1.9 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 0 -1.85 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -1.9 -0.85) (end -1.9 0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.2 0) (end 0.45 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0.35) (end -0.3 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 -0.35) (end 0.2 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end 0.2 -0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end -0.5 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 -0.35) (end -0.3 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 0.7) (end -0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 0.7) (end -0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 -0.7) (end 0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 -0.7) (end 0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -2 -0.95) (end 2 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2 -0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 -0.95) (end -2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.9 0.85) (end 1.25 0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.9 -0.85) (end 1.25 -0.85) (layer F.SilkS) (width 0.12))
+    (pad 1 smd rect (at -1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 61 ROW2))
+    (pad 2 smd rect (at 1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 25 "Net-(D34-Pad2)"))
+    (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_SOD-323.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Diode_SMD:D_SOD-323_HandSoldering (layer F.Cu) (tedit 58641869) (tstamp 5F02615B)
+    (at 151.765 106.172 270)
+    (descr SOD-323)
+    (tags SOD-323)
+    (path /5DFE3EC2)
+    (attr smd)
+    (fp_text reference D33 (at 0 -1.85 270) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value D1.5 (at 0.1 1.9 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -1.9 -0.85) (end 1.25 -0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.9 0.85) (end 1.25 0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2 -0.95) (end -2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2 -0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 -0.95) (end 2 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.9 -0.7) (end 0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 -0.7) (end 0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 0.7) (end -0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 0.7) (end -0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 -0.35) (end -0.3 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end -0.5 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end 0.2 -0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 -0.35) (end 0.2 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0.35) (end -0.3 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0) (end 0.45 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.9 -0.85) (end -1.9 0.85) (layer F.SilkS) (width 0.12))
+    (fp_text user %R (at 0 -1.85 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 2 smd rect (at 1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 26 "Net-(D33-Pad2)"))
+    (pad 1 smd rect (at -1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 60 ROW1))
+    (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_SOD-323.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Diode_SMD:D_SOD-323_HandSoldering (layer F.Cu) (tedit 58641869) (tstamp 5F026143)
+    (at 153.797 122.936 270)
+    (descr SOD-323)
+    (tags SOD-323)
+    (path /5DFE23DF)
+    (attr smd)
+    (fp_text reference D26 (at 0 -1.85 270) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value D4.4 (at 0.1 1.9 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 0 -1.85 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -1.9 -0.85) (end -1.9 0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.2 0) (end 0.45 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0.35) (end -0.3 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 -0.35) (end 0.2 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end 0.2 -0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end -0.5 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 -0.35) (end -0.3 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 0.7) (end -0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 0.7) (end -0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 -0.7) (end 0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 -0.7) (end 0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -2 -0.95) (end 2 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2 -0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 -0.95) (end -2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.9 0.85) (end 1.25 0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.9 -0.85) (end 1.25 -0.85) (layer F.SilkS) (width 0.12))
+    (pad 1 smd rect (at -1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 63 ROW4))
+    (pad 2 smd rect (at 1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 20 "Net-(D26-Pad2)"))
+    (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_SOD-323.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Diode_SMD:D_SOD-323_HandSoldering (layer F.Cu) (tedit 58641869) (tstamp 5F02612B)
+    (at 153.797 117.348 270)
+    (descr SOD-323)
+    (tags SOD-323)
+    (path /5DFE23D1)
+    (attr smd)
+    (fp_text reference D25 (at 0 -1.85 270) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value D3.4 (at 0.1 1.9 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -1.9 -0.85) (end 1.25 -0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.9 0.85) (end 1.25 0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2 -0.95) (end -2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2 -0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 -0.95) (end 2 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.9 -0.7) (end 0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 -0.7) (end 0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 0.7) (end -0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 0.7) (end -0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 -0.35) (end -0.3 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end -0.5 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end 0.2 -0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 -0.35) (end 0.2 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0.35) (end -0.3 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0) (end 0.45 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.9 -0.85) (end -1.9 0.85) (layer F.SilkS) (width 0.12))
+    (fp_text user %R (at 0 -1.85 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 2 smd rect (at 1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 27 "Net-(D25-Pad2)"))
+    (pad 1 smd rect (at -1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 62 ROW3))
+    (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_SOD-323.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Diode_SMD:D_SOD-323_HandSoldering (layer F.Cu) (tedit 58641869) (tstamp 5F026113)
+    (at 153.797 111.76 270)
+    (descr SOD-323)
+    (tags SOD-323)
+    (path /5DFE23FB)
+    (attr smd)
+    (fp_text reference D24 (at 0 -1.85 270) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value D2.4 (at 0.1 1.9 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 0 -1.85 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -1.9 -0.85) (end -1.9 0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.2 0) (end 0.45 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0.35) (end -0.3 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 -0.35) (end 0.2 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end 0.2 -0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end -0.5 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 -0.35) (end -0.3 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 0.7) (end -0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 0.7) (end -0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 -0.7) (end 0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 -0.7) (end 0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -2 -0.95) (end 2 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2 -0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 -0.95) (end -2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.9 0.85) (end 1.25 0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.9 -0.85) (end 1.25 -0.85) (layer F.SilkS) (width 0.12))
+    (pad 1 smd rect (at -1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 61 ROW2))
+    (pad 2 smd rect (at 1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 28 "Net-(D24-Pad2)"))
+    (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_SOD-323.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Diode_SMD:D_SOD-323_HandSoldering (layer F.Cu) (tedit 58641869) (tstamp 5F0260FB)
+    (at 153.797 106.172 270)
+    (descr SOD-323)
+    (tags SOD-323)
+    (path /5DFE2409)
+    (attr smd)
+    (fp_text reference D23 (at 0 -1.85 270) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value D1.4 (at 0.1 1.9 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -1.9 -0.85) (end 1.25 -0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.9 0.85) (end 1.25 0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2 -0.95) (end -2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2 -0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 -0.95) (end 2 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.9 -0.7) (end 0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 -0.7) (end 0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 0.7) (end -0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 0.7) (end -0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 -0.35) (end -0.3 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end -0.5 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end 0.2 -0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 -0.35) (end 0.2 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0.35) (end -0.3 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0) (end 0.45 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.9 -0.85) (end -1.9 0.85) (layer F.SilkS) (width 0.12))
+    (fp_text user %R (at 0 -1.85 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 2 smd rect (at 1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 29 "Net-(D23-Pad2)"))
+    (pad 1 smd rect (at -1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 60 ROW1))
+    (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_SOD-323.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Diode_SMD:D_SOD-323_HandSoldering (layer F.Cu) (tedit 58641869) (tstamp 5F0260E3)
+    (at 157.861 117.348 270)
+    (descr SOD-323)
+    (tags SOD-323)
+    (path /5DFE63CB)
+    (attr smd)
+    (fp_text reference D21 (at 0 -1.85 270) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value D3.2 (at 0.1 1.9 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 0 -1.85 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -1.9 -0.85) (end -1.9 0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.2 0) (end 0.45 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0.35) (end -0.3 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 -0.35) (end 0.2 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end 0.2 -0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end -0.5 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 -0.35) (end -0.3 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 0.7) (end -0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 0.7) (end -0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 -0.7) (end 0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 -0.7) (end 0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -2 -0.95) (end 2 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2 -0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 -0.95) (end -2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.9 0.85) (end 1.25 0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.9 -0.85) (end 1.25 -0.85) (layer F.SilkS) (width 0.12))
+    (pad 1 smd rect (at -1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 62 ROW3))
+    (pad 2 smd rect (at 1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 30 "Net-(D21-Pad2)"))
+    (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_SOD-323.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Diode_SMD:D_SOD-323_HandSoldering (layer F.Cu) (tedit 58641869) (tstamp 5F0260CB)
+    (at 157.861 106.172 270)
+    (descr SOD-323)
+    (tags SOD-323)
+    (path /5DFE6403)
+    (attr smd)
+    (fp_text reference D19 (at 0 -1.85 270) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value D1.2 (at 0.1 1.9 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -1.9 -0.85) (end 1.25 -0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.9 0.85) (end 1.25 0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2 -0.95) (end -2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2 -0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 -0.95) (end 2 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.9 -0.7) (end 0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 -0.7) (end 0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 0.7) (end -0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 0.7) (end -0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 -0.35) (end -0.3 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end -0.5 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end 0.2 -0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 -0.35) (end 0.2 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0.35) (end -0.3 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0) (end 0.45 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.9 -0.85) (end -1.9 0.85) (layer F.SilkS) (width 0.12))
+    (fp_text user %R (at 0 -1.85 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 2 smd rect (at 1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 33 "Net-(D19-Pad2)"))
+    (pad 1 smd rect (at -1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 60 ROW1))
+    (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_SOD-323.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Diode_SMD:D_SOD-323_HandSoldering (layer F.Cu) (tedit 58641869) (tstamp 5F0260B3)
+    (at 151.765 117.348 270)
+    (descr SOD-323)
+    (tags SOD-323)
+    (path /5DFE3E8A)
+    (attr smd)
+    (fp_text reference D35 (at 0 -1.85 270) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value D3.5 (at 0.1 1.9 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 0 -1.85 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -1.9 -0.85) (end -1.9 0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.2 0) (end 0.45 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0.35) (end -0.3 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 -0.35) (end 0.2 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end 0.2 -0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end -0.5 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 -0.35) (end -0.3 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 0.7) (end -0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 0.7) (end -0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 -0.7) (end 0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 -0.7) (end 0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -2 -0.95) (end 2 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2 -0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 -0.95) (end -2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.9 0.85) (end 1.25 0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.9 -0.85) (end 1.25 -0.85) (layer F.SilkS) (width 0.12))
+    (pad 1 smd rect (at -1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 62 ROW3))
+    (pad 2 smd rect (at 1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 24 "Net-(D35-Pad2)"))
+    (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_SOD-323.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Package_QFP:LQFP-48_7x7mm_P0.5mm (layer F.Cu) (tedit 5A5E2375) (tstamp 5F02609B)
+    (at 153.67 85.344)
+    (descr "48 LEAD LQFP 7x7mm (see MICREL LQFP7x7-48LD-PL-1.pdf)")
+    (tags "QFP 0.5")
+    (path /5DEC39DF)
+    (attr smd)
+    (fp_text reference U1 (at 0 -6) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value STM32 (at 0 6) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 3.13 3.75) (end 3.75 3.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 3.75 3.13) (end 3.75 3.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 3.13 5.25) (end 3.13 3.75) (layer F.CrtYd) (width 0.05))
+    (fp_text user %R (at 0 0) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -2.5 -3.5) (end 3.5 -3.5) (layer F.Fab) (width 0.1))
+    (fp_line (start 3.5 -3.5) (end 3.5 3.5) (layer F.Fab) (width 0.1))
+    (fp_line (start 3.5 3.5) (end -3.5 3.5) (layer F.Fab) (width 0.1))
+    (fp_line (start -3.5 3.5) (end -3.5 -2.5) (layer F.Fab) (width 0.1))
+    (fp_line (start -3.5 -2.5) (end -2.5 -3.5) (layer F.Fab) (width 0.1))
+    (fp_line (start -5.25 -3.13) (end -5.25 3.13) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 5.25 -3.13) (end 5.25 3.13) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -3.13 -5.25) (end 3.13 -5.25) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -3.13 5.25) (end 3.13 5.25) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 3.56 -3.56) (end 3.56 -3.14) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.56 3.56) (end 3.56 3.14) (layer F.SilkS) (width 0.12))
+    (fp_line (start -3.56 3.56) (end -3.56 3.14) (layer F.SilkS) (width 0.12))
+    (fp_line (start -3.56 -3.56) (end -3.14 -3.56) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.56 3.56) (end 3.14 3.56) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.56 -3.56) (end 3.14 -3.56) (layer F.SilkS) (width 0.12))
+    (fp_line (start -3.56 -3.14) (end -4.94 -3.14) (layer F.SilkS) (width 0.12))
+    (fp_line (start -3.56 -3.56) (end -3.56 -3.14) (layer F.SilkS) (width 0.12))
+    (fp_line (start -3.56 3.56) (end -3.14 3.56) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.75 3.13) (end 5.25 3.13) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 3.75 -3.13) (end 5.25 -3.13) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 3.13 -3.75) (end 3.13 -5.25) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -3.13 -3.75) (end -3.13 -5.25) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -3.75 -3.13) (end -5.25 -3.13) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -3.75 3.13) (end -5.25 3.13) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -3.13 3.75) (end -3.13 5.25) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 3.13 -3.75) (end 3.75 -3.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 3.75 -3.13) (end 3.75 -3.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -3.75 3.13) (end -3.75 3.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -3.13 3.75) (end -3.75 3.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -3.75 -3.13) (end -3.75 -3.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -3.13 -3.75) (end -3.75 -3.75) (layer F.CrtYd) (width 0.05))
+    (pad 1 smd rect (at -4.35 -2.75) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 49 VBAT))
+    (pad 2 smd rect (at -4.35 -2.25) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 50 "Net-(U1-Pad2)"))
+    (pad 3 smd rect (at -4.35 -1.75) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 51 "Net-(U1-Pad3)"))
+    (pad 4 smd rect (at -4.35 -1.25) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 52 "Net-(U1-Pad4)"))
+    (pad 5 smd rect (at -4.35 -0.75) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 53 "Net-(U1-Pad5)"))
+    (pad 6 smd rect (at -4.35 -0.25) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 54 "Net-(U1-Pad6)"))
+    (pad 7 smd rect (at -4.35 0.25) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 55 "Net-(C1-Pad2)"))
+    (pad 8 smd rect (at -4.35 0.75) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 1 GND))
+    (pad 9 smd rect (at -4.35 1.25) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 9 3.3V))
+    (pad 10 smd rect (at -4.35 1.75) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 56 "Net-(U1-Pad10)"))
+    (pad 11 smd rect (at -4.35 2.25) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 57 "Net-(U1-Pad11)"))
+    (pad 12 smd rect (at -4.35 2.75) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 58 "Net-(U1-Pad12)"))
+    (pad 13 smd rect (at -2.75 4.35 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 59 "Net-(U1-Pad13)"))
+    (pad 14 smd rect (at -2.25 4.35 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 12 PA4))
+    (pad 15 smd rect (at -1.75 4.35 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 13 PA5))
+    (pad 16 smd rect (at -1.25 4.35 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 14 PA6))
+    (pad 17 smd rect (at -0.75 4.35 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 15 PA7))
+    (pad 18 smd rect (at -0.25 4.35 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 60 ROW1))
+    (pad 19 smd rect (at 0.25 4.35 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 61 ROW2))
+    (pad 20 smd rect (at 0.75 4.35 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 62 ROW3))
+    (pad 21 smd rect (at 1.25 4.35 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 63 ROW4))
+    (pad 22 smd rect (at 1.75 4.35 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 64 "Net-(U1-Pad22)"))
+    (pad 23 smd rect (at 2.25 4.35 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 1 GND))
+    (pad 24 smd rect (at 2.75 4.35 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 9 3.3V))
+    (pad 25 smd rect (at 4.35 2.75) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 9 3.3V))
+    (pad 26 smd rect (at 4.35 2.25) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 65 "Net-(U1-Pad26)"))
+    (pad 27 smd rect (at 4.35 1.75) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 66 "Net-(U1-Pad27)"))
+    (pad 28 smd rect (at 4.35 1.25) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 67 "Net-(U1-Pad28)"))
+    (pad 29 smd rect (at 4.35 0.75) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 68 "Net-(U1-Pad29)"))
+    (pad 30 smd rect (at 4.35 0.25) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 18 TX))
+    (pad 31 smd rect (at 4.35 -0.25) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 19 RX))
+    (pad 32 smd rect (at 4.35 -0.75) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 5 D-))
+    (pad 33 smd rect (at 4.35 -1.25) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 2 D+))
+    (pad 34 smd rect (at 4.35 -1.75) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 10 SWDIO))
+    (pad 35 smd rect (at 4.35 -2.25) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 1 GND))
+    (pad 36 smd rect (at 4.35 -2.75) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 9 3.3V))
+    (pad 37 smd rect (at 2.75 -4.35 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 11 SWDCLK))
+    (pad 38 smd rect (at 2.25 -4.35 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 44 COL1))
+    (pad 39 smd rect (at 1.75 -4.35 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 31 COL2))
+    (pad 40 smd rect (at 1.25 -4.35 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 38 COL3))
+    (pad 41 smd rect (at 0.75 -4.35 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 21 COL4))
+    (pad 42 smd rect (at 0.25 -4.35 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 16 PB6))
+    (pad 43 smd rect (at -0.25 -4.35 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 17 PB7))
+    (pad 44 smd rect (at -0.75 -4.35 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 48 "Net-(R1-Pad1)"))
+    (pad 45 smd rect (at -1.25 -4.35 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 23 COL5))
+    (pad 46 smd rect (at -1.75 -4.35 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 35 COL6))
+    (pad 47 smd rect (at -2.25 -4.35 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 1 GND))
+    (pad 48 smd rect (at -2.75 -4.35 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 9 3.3V))
+    (model ${KISYS3DMOD}/Package_QFP.3dshapes/LQFP-48_7x7mm_P0.5mm.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Package_TO_SOT_SMD:SOT-23 (layer F.Cu) (tedit 5A02FF57) (tstamp 5F026044)
+    (at 162.306 78.232 180)
+    (descr "SOT-23, Standard")
+    (tags SOT-23)
+    (path /5DED53E7)
+    (attr smd)
+    (fp_text reference U2 (at 0 -2.5 180) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value LDO (at 0 2.5 180) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 0 0 270) (layer F.Fab)
+      (effects (font (size 0.5 0.5) (thickness 0.075)))
+    )
+    (fp_line (start -0.7 -0.95) (end -0.7 1.5) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.15 -1.52) (end 0.7 -1.52) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.7 -0.95) (end -0.15 -1.52) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.7 -1.52) (end 0.7 1.52) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.7 1.52) (end 0.7 1.52) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.76 1.58) (end 0.76 0.65) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.76 -1.58) (end 0.76 -0.65) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.7 -1.75) (end 1.7 -1.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.7 -1.75) (end 1.7 1.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.7 1.75) (end -1.7 1.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.7 1.75) (end -1.7 -1.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 0.76 -1.58) (end -1.4 -1.58) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.76 1.58) (end -0.7 1.58) (layer F.SilkS) (width 0.12))
+    (pad 1 smd rect (at -1 -0.95 180) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
+      (net 9 3.3V))
+    (pad 2 smd rect (at -1 0.95 180) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
+      (net 8 5V))
+    (pad 3 smd rect (at 1 0 180) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
+      (net 1 GND))
+    (model ${KISYS3DMOD}/Package_TO_SOT_SMD.3dshapes/SOT-23.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder (layer F.Cu) (tedit 5B36C52B) (tstamp 5F02602F)
+    (at 159.258 74.676 270)
+    (descr "Resistor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
+    (tags "resistor handsolder")
+    (path /5DEDEA73)
+    (attr smd)
+    (fp_text reference R7 (at 0 -1.65 270) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 5.1k (at 0 1.65 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -1 0.6) (end -1 -0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 -0.6) (end 1 -0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 -0.6) (end 1 0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 0.6) (end -1 0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.261252 -0.71) (end 0.261252 -0.71) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.261252 0.71) (end 0.261252 0.71) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_text user %R (at 0 0 270) (layer F.Fab)
+      (effects (font (size 0.5 0.5) (thickness 0.08)))
+    )
+    (pad 1 smd roundrect (at -1.025 0 270) (size 1.15 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.217391)
+      (net 6 "Net-(J1-PadA5)"))
+    (pad 2 smd roundrect (at 1.025 0 270) (size 1.15 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.217391)
+      (net 1 GND))
+    (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0805_2012Metric.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder (layer F.Cu) (tedit 5B36C52B) (tstamp 5F02601E)
+    (at 154.686 74.676 270)
+    (descr "Resistor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
+    (tags "resistor handsolder")
+    (path /5DEDEAE6)
+    (attr smd)
+    (fp_text reference R6 (at 0 -1.65 270) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 5.1k (at 0 1.65 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 0 0 270) (layer F.Fab)
+      (effects (font (size 0.5 0.5) (thickness 0.08)))
+    )
+    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.261252 0.71) (end 0.261252 0.71) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.261252 -0.71) (end 0.261252 -0.71) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1 0.6) (end -1 0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 -0.6) (end 1 0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 -0.6) (end 1 -0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 0.6) (end -1 -0.6) (layer F.Fab) (width 0.1))
+    (pad 2 smd roundrect (at 1.025 0 270) (size 1.15 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.217391)
+      (net 1 GND))
+    (pad 1 smd roundrect (at -1.025 0 270) (size 1.15 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.217391)
+      (net 3 "Net-(J1-PadB5)"))
+    (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0805_2012Metric.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder (layer F.Cu) (tedit 5B36C52B) (tstamp 5F02600D)
+    (at 95.885 92.075)
+    (descr "Resistor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
+    (tags "resistor handsolder")
+    (path /5DECE7D2)
+    (attr smd)
+    (fp_text reference R1 (at 0 -1.65) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 5.1k (at 0 1.65) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -1 0.6) (end -1 -0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 -0.6) (end 1 -0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 -0.6) (end 1 0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 0.6) (end -1 0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.261252 -0.71) (end 0.261252 -0.71) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.261252 0.71) (end 0.261252 0.71) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_text user %R (at 0 0) (layer F.Fab)
+      (effects (font (size 0.5 0.5) (thickness 0.08)))
+    )
+    (pad 1 smd roundrect (at -1.025 0) (size 1.15 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.217391)
+      (net 48 "Net-(R1-Pad1)"))
+    (pad 2 smd roundrect (at 1.025 0) (size 1.15 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.217391)
+      (net 1 GND))
+    (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0805_2012Metric.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module foostan-kbd:CherryMX_Choc_1u (layer F.Cu) (tedit 5C66D612) (tstamp 5F028DAB)
+    (at 161.544 134.62 26.5)
+    (path /5DFEF7E7)
+    (fp_text reference SW15 (at 4.6 6 26.5) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value SW_Push (at -0.5 6 26.5) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 7 7) (end 7 6) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 6 7) (end 7 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -7) (end -6 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -6) (end -7 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 9.525) (end -9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 9.525) (end -9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 -9.525) (end 9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 -9.525) (end 9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (pad "" np_thru_hole circle (at -5.22 4.2 26.5) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.22 4.2 26.5) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.08 0 26.5) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.08 0 26.5) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad 1 thru_hole circle (at -3.81 -2.54 76.5) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 47 "Net-(D17-Pad2)"))
+    (pad 2 thru_hole circle (at 2.54 -5.08 26.5) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 35 COL6))
+    (pad 2 thru_hole circle (at 0 -5.9 116.5) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 35 COL6))
+    (pad "" np_thru_hole circle (at 5.5 0 116.5) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.5 0 116.5) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 0 0 116.5) (size 4 4) (drill 4) (layers *.Cu *.Mask))
+    (pad 1 thru_hole circle (at 5.1 -3.9 336.5) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 47 "Net-(D17-Pad2)"))
+  )
+
+  (module foostan-kbd:CherryMX_Choc_1u (layer F.Cu) (tedit 5C66D612) (tstamp 5F029325)
+    (at 269.24 82.55)
+    (path /5DFE63B7)
+    (fp_text reference SW3 (at 4.6 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value SW_Push (at -0.5 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -9.525 -9.525) (end 9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 -9.525) (end 9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 9.525) (end -9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 9.525) (end -9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -6) (end -7 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -7) (end -6 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 6 7) (end 7 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 7 7) (end 7 6) (layer Dwgs.User) (width 0.15))
+    (pad 1 thru_hole circle (at 5.1 -3.9 310) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 46 "Net-(D5-Pad2)"))
+    (pad "" np_thru_hole circle (at 0 0 90) (size 4 4) (drill 4) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad 2 thru_hole circle (at 0 -5.9 90) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 44 COL1))
+    (pad 2 thru_hole circle (at 2.54 -5.08) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 44 COL1))
+    (pad 1 thru_hole circle (at -3.81 -2.54 50) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 46 "Net-(D5-Pad2)"))
+    (pad "" np_thru_hole circle (at 5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+  )
+
+  (module foostan-kbd:CherryMX_Choc_1u (layer F.Cu) (tedit 5C66D612) (tstamp 5F029367)
+    (at 269.24 101.6)
+    (path /5DFE63A9)
+    (fp_text reference SW4 (at 4.6 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value SW_Push (at -0.5 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 7 7) (end 7 6) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 6 7) (end 7 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -7) (end -6 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -6) (end -7 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 9.525) (end -9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 9.525) (end -9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 -9.525) (end 9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 -9.525) (end 9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (pad "" np_thru_hole circle (at -5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad 1 thru_hole circle (at -3.81 -2.54 50) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 45 "Net-(D6-Pad2)"))
+    (pad 2 thru_hole circle (at 2.54 -5.08) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 44 COL1))
+    (pad 2 thru_hole circle (at 0 -5.9 90) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 44 COL1))
+    (pad "" np_thru_hole circle (at 5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 0 0 90) (size 4 4) (drill 4) (layers *.Cu *.Mask))
+    (pad 1 thru_hole circle (at 5.1 -3.9 310) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 45 "Net-(D6-Pad2)"))
+  )
+
+  (module foostan-kbd:CherryMX_Choc_1u (layer F.Cu) (tedit 5C66D612) (tstamp 5F0293A9)
+    (at 269.24 120.65)
+    (path /5DFE637F)
+    (fp_text reference SW5 (at 4.6 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value SW_Push (at -0.5 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -9.525 -9.525) (end 9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 -9.525) (end 9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 9.525) (end -9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 9.525) (end -9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -6) (end -7 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -7) (end -6 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 6 7) (end 7 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 7 7) (end 7 6) (layer Dwgs.User) (width 0.15))
+    (pad 1 thru_hole circle (at 5.1 -3.9 310) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 43 "Net-(D7-Pad2)"))
+    (pad "" np_thru_hole circle (at 0 0 90) (size 4 4) (drill 4) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad 2 thru_hole circle (at 0 -5.9 90) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 44 COL1))
+    (pad 2 thru_hole circle (at 2.54 -5.08) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 44 COL1))
+    (pad 1 thru_hole circle (at -3.81 -2.54 50) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 43 "Net-(D7-Pad2)"))
+    (pad "" np_thru_hole circle (at 5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+  )
+
+  (module foostan-kbd:CherryMX_Choc_1u (layer F.Cu) (tedit 5C66D612) (tstamp 5F025FA0)
+    (at 231.14 69.85)
+    (path /5DF62207)
+    (fp_text reference SW7 (at 4.6 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value SW_Push (at -0.5 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 7 7) (end 7 6) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 6 7) (end 7 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -7) (end -6 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -6) (end -7 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 9.525) (end -9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 9.525) (end -9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 -9.525) (end 9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 -9.525) (end 9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (pad "" np_thru_hole circle (at -5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad 1 thru_hole circle (at -3.81 -2.54 50) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 42 "Net-(D9-Pad2)"))
+    (pad 2 thru_hole circle (at 2.54 -5.08) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 38 COL3))
+    (pad 2 thru_hole circle (at 0 -5.9 90) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 38 COL3))
+    (pad "" np_thru_hole circle (at 5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 0 0 90) (size 4 4) (drill 4) (layers *.Cu *.Mask))
+    (pad 1 thru_hole circle (at 5.1 -3.9 310) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 42 "Net-(D9-Pad2)"))
+  )
+
+  (module foostan-kbd:CherryMX_Choc_1u (layer F.Cu) (tedit 5C66D612) (tstamp 5F025F89)
+    (at 173.99 91.44)
+    (path /5DFEF803)
+    (fp_text reference SW13 (at 4.6 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value SW_Push (at -0.5 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -9.525 -9.525) (end 9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 -9.525) (end 9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 9.525) (end -9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 9.525) (end -9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -6) (end -7 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -7) (end -6 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 6 7) (end 7 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 7 7) (end 7 6) (layer Dwgs.User) (width 0.15))
+    (pad 1 thru_hole circle (at 5.1 -3.9 310) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 41 "Net-(D15-Pad2)"))
+    (pad "" np_thru_hole circle (at 0 0 90) (size 4 4) (drill 4) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad 2 thru_hole circle (at 0 -5.9 90) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 35 COL6))
+    (pad 2 thru_hole circle (at 2.54 -5.08) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 35 COL6))
+    (pad 1 thru_hole circle (at -3.81 -2.54 50) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 41 "Net-(D15-Pad2)"))
+    (pad "" np_thru_hole circle (at 5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+  )
+
+  (module foostan-kbd:CherryMX_Choc_1u (layer F.Cu) (tedit 5C66D612) (tstamp 5F025F72)
+    (at 231.14 88.9)
+    (path /5DF621F9)
+    (fp_text reference SW8 (at 4.6 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value SW_Push (at -0.5 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 7 7) (end 7 6) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 6 7) (end 7 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -7) (end -6 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -6) (end -7 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 9.525) (end -9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 9.525) (end -9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 -9.525) (end 9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 -9.525) (end 9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (pad "" np_thru_hole circle (at -5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad 1 thru_hole circle (at -3.81 -2.54 50) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 40 "Net-(D10-Pad2)"))
+    (pad 2 thru_hole circle (at 2.54 -5.08) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 38 COL3))
+    (pad 2 thru_hole circle (at 0 -5.9 90) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 38 COL3))
+    (pad "" np_thru_hole circle (at 5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 0 0 90) (size 4 4) (drill 4) (layers *.Cu *.Mask))
+    (pad 1 thru_hole circle (at 5.1 -3.9 310) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 40 "Net-(D10-Pad2)"))
+  )
+
+  (module foostan-kbd:CherryMX_Choc_1u (layer F.Cu) (tedit 5C66D612) (tstamp 5F028EF5)
+    (at 231.14 107.95)
+    (path /5DF621CF)
+    (fp_text reference SW9 (at 4.6 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value SW_Push (at -0.5 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -9.525 -9.525) (end 9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 -9.525) (end 9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 9.525) (end -9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 9.525) (end -9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -6) (end -7 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -7) (end -6 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 6 7) (end 7 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 7 7) (end 7 6) (layer Dwgs.User) (width 0.15))
+    (pad 1 thru_hole circle (at 5.1 -3.9 310) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 39 "Net-(D11-Pad2)"))
+    (pad "" np_thru_hole circle (at 0 0 90) (size 4 4) (drill 4) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad 2 thru_hole circle (at 0 -5.9 90) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 38 COL3))
+    (pad 2 thru_hole circle (at 2.54 -5.08) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 38 COL3))
+    (pad 1 thru_hole circle (at -3.81 -2.54 50) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 39 "Net-(D11-Pad2)"))
+    (pad "" np_thru_hole circle (at 5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+  )
+
+  (module foostan-kbd:CherryMX_Choc_1u (layer F.Cu) (tedit 5C66D612) (tstamp 5F028E2F)
+    (at 222.25 127)
+    (path /5DF621DD)
+    (fp_text reference SW10 (at 4.6 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value SW_Push (at -0.5 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 7 7) (end 7 6) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 6 7) (end 7 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -7) (end -6 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -6) (end -7 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 9.525) (end -9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 9.525) (end -9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 -9.525) (end 9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 -9.525) (end 9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (pad "" np_thru_hole circle (at -5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad 1 thru_hole circle (at -3.81 -2.54 50) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 37 "Net-(D12-Pad2)"))
+    (pad 2 thru_hole circle (at 2.54 -5.08) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 38 COL3))
+    (pad 2 thru_hole circle (at 0 -5.9 90) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 38 COL3))
+    (pad "" np_thru_hole circle (at 5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 0 0 90) (size 4 4) (drill 4) (layers *.Cu *.Mask))
+    (pad 1 thru_hole circle (at 5.1 -3.9 310) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 37 "Net-(D12-Pad2)"))
+  )
+
+  (module foostan-kbd:CherryMX_Choc_1u (layer F.Cu) (tedit 5C66D612) (tstamp 5F025F2D)
+    (at 173.99 72.39)
+    (path /5DFEF811)
+    (fp_text reference SW12 (at 4.6 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value SW_Push (at -0.5 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -9.525 -9.525) (end 9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 -9.525) (end 9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 9.525) (end -9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 9.525) (end -9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -6) (end -7 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -7) (end -6 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 6 7) (end 7 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 7 7) (end 7 6) (layer Dwgs.User) (width 0.15))
+    (pad 1 thru_hole circle (at 5.1 -3.9 310) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 36 "Net-(D14-Pad2)"))
+    (pad "" np_thru_hole circle (at 0 0 90) (size 4 4) (drill 4) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad 2 thru_hole circle (at 0 -5.9 90) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 35 COL6))
+    (pad 2 thru_hole circle (at 2.54 -5.08) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 35 COL6))
+    (pad 1 thru_hole circle (at -3.81 -2.54 50) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 36 "Net-(D14-Pad2)"))
+    (pad "" np_thru_hole circle (at 5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+  )
+
+  (module foostan-kbd:CherryMX_Choc_1u (layer F.Cu) (tedit 5C66D612) (tstamp 5F028DED)
+    (at 173.99 110.49)
+    (path /5DFEF7D9)
+    (fp_text reference SW14 (at 4.6 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value SW_Push (at -0.5 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 7 7) (end 7 6) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 6 7) (end 7 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -7) (end -6 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -6) (end -7 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 9.525) (end -9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 9.525) (end -9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 -9.525) (end 9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 -9.525) (end 9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (pad "" np_thru_hole circle (at -5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad 1 thru_hole circle (at -3.81 -2.54 50) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 34 "Net-(D16-Pad2)"))
+    (pad 2 thru_hole circle (at 2.54 -5.08) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 35 COL6))
+    (pad 2 thru_hole circle (at 0 -5.9 90) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 35 COL6))
+    (pad "" np_thru_hole circle (at 5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 0 0 90) (size 4 4) (drill 4) (layers *.Cu *.Mask))
+    (pad 1 thru_hole circle (at 5.1 -3.9 310) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 34 "Net-(D16-Pad2)"))
+  )
+
+  (module foostan-kbd:CherryMX_Choc_1u (layer F.Cu) (tedit 5C66D612) (tstamp 5F025EFF)
+    (at 250.19 80.01)
+    (path /5DFE640A)
+    (fp_text reference SW17 (at 4.6 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value SW_Push (at -0.5 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -9.525 -9.525) (end 9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 -9.525) (end 9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 9.525) (end -9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 9.525) (end -9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -6) (end -7 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -7) (end -6 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 6 7) (end 7 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 7 7) (end 7 6) (layer Dwgs.User) (width 0.15))
+    (pad 1 thru_hole circle (at 5.1 -3.9 310) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 33 "Net-(D19-Pad2)"))
+    (pad "" np_thru_hole circle (at 0 0 90) (size 4 4) (drill 4) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad 2 thru_hole circle (at 0 -5.9 90) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 31 COL2))
+    (pad 2 thru_hole circle (at 2.54 -5.08) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 31 COL2))
+    (pad 1 thru_hole circle (at -3.81 -2.54 50) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 33 "Net-(D19-Pad2)"))
+    (pad "" np_thru_hole circle (at 5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+  )
+
+  (module foostan-kbd:CherryMX_Choc_1u (layer F.Cu) (tedit 5C66D612) (tstamp 5F025EE8)
+    (at 250.19 99.06)
+    (path /5DFE63FC)
+    (fp_text reference SW18 (at 4.6 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value SW_Push (at -0.5 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 7 7) (end 7 6) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 6 7) (end 7 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -7) (end -6 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -6) (end -7 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 9.525) (end -9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 9.525) (end -9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 -9.525) (end 9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 -9.525) (end 9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (pad "" np_thru_hole circle (at -5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad 1 thru_hole circle (at -3.81 -2.54 50) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 32 "Net-(D20-Pad2)"))
+    (pad 2 thru_hole circle (at 2.54 -5.08) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 31 COL2))
+    (pad 2 thru_hole circle (at 0 -5.9 90) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 31 COL2))
+    (pad "" np_thru_hole circle (at 5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 0 0 90) (size 4 4) (drill 4) (layers *.Cu *.Mask))
+    (pad 1 thru_hole circle (at 5.1 -3.9 310) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 32 "Net-(D20-Pad2)"))
+  )
+
+  (module foostan-kbd:CherryMX_Choc_1u (layer F.Cu) (tedit 5C66D612) (tstamp 5F028E71)
+    (at 250.19 118.11)
+    (path /5DFE63D2)
+    (fp_text reference SW19 (at 4.6 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value SW_Push (at -0.5 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -9.525 -9.525) (end 9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 -9.525) (end 9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 9.525) (end -9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 9.525) (end -9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -6) (end -7 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -7) (end -6 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 6 7) (end 7 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 7 7) (end 7 6) (layer Dwgs.User) (width 0.15))
+    (pad 1 thru_hole circle (at 5.1 -3.9 310) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 30 "Net-(D21-Pad2)"))
+    (pad "" np_thru_hole circle (at 0 0 90) (size 4 4) (drill 4) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad 2 thru_hole circle (at 0 -5.9 90) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 31 COL2))
+    (pad 2 thru_hole circle (at 2.54 -5.08) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 31 COL2))
+    (pad 1 thru_hole circle (at -3.81 -2.54 50) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 30 "Net-(D21-Pad2)"))
+    (pad "" np_thru_hole circle (at 5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+  )
+
+  (module foostan-kbd:CherryMX_Choc_1u (layer F.Cu) (tedit 5C66D612) (tstamp 5F025EBA)
+    (at 212.09 67.31)
+    (path /5DFE2410)
+    (fp_text reference SW21 (at 4.6 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value SW_Push (at -0.5 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 7 7) (end 7 6) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 6 7) (end 7 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -7) (end -6 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -6) (end -7 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 9.525) (end -9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 9.525) (end -9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 -9.525) (end 9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 -9.525) (end 9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (pad "" np_thru_hole circle (at -5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad 1 thru_hole circle (at -3.81 -2.54 50) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 29 "Net-(D23-Pad2)"))
+    (pad 2 thru_hole circle (at 2.54 -5.08) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 21 COL4))
+    (pad 2 thru_hole circle (at 0 -5.9 90) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 21 COL4))
+    (pad "" np_thru_hole circle (at 5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 0 0 90) (size 4 4) (drill 4) (layers *.Cu *.Mask))
+    (pad 1 thru_hole circle (at 5.1 -3.9 310) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 29 "Net-(D23-Pad2)"))
+  )
+
+  (module foostan-kbd:CherryMX_Choc_1u (layer F.Cu) (tedit 5C66D612) (tstamp 5F025EA3)
+    (at 212.09 86.36)
+    (path /5DFE2402)
+    (fp_text reference SW22 (at 4.6 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value SW_Push (at -0.5 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -9.525 -9.525) (end 9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 -9.525) (end 9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 9.525) (end -9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 9.525) (end -9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -6) (end -7 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -7) (end -6 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 6 7) (end 7 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 7 7) (end 7 6) (layer Dwgs.User) (width 0.15))
+    (pad 1 thru_hole circle (at 5.1 -3.9 310) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 28 "Net-(D24-Pad2)"))
+    (pad "" np_thru_hole circle (at 0 0 90) (size 4 4) (drill 4) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad 2 thru_hole circle (at 0 -5.9 90) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 21 COL4))
+    (pad 2 thru_hole circle (at 2.54 -5.08) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 21 COL4))
+    (pad 1 thru_hole circle (at -3.81 -2.54 50) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 28 "Net-(D24-Pad2)"))
+    (pad "" np_thru_hole circle (at 5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+  )
+
+  (module foostan-kbd:CherryMX_Choc_1u (layer F.Cu) (tedit 5C66D612) (tstamp 5F0290F2)
+    (at 212.09 105.41)
+    (path /5DFE23D8)
+    (fp_text reference SW23 (at 4.6 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value SW_Push (at -0.5 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 7 7) (end 7 6) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 6 7) (end 7 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -7) (end -6 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -6) (end -7 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 9.525) (end -9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 9.525) (end -9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 -9.525) (end 9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 -9.525) (end 9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (pad "" np_thru_hole circle (at -5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad 1 thru_hole circle (at -3.81 -2.54 50) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 27 "Net-(D25-Pad2)"))
+    (pad 2 thru_hole circle (at 2.54 -5.08) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 21 COL4))
+    (pad 2 thru_hole circle (at 0 -5.9 90) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 21 COL4))
+    (pad "" np_thru_hole circle (at 5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 0 0 90) (size 4 4) (drill 4) (layers *.Cu *.Mask))
+    (pad 1 thru_hole circle (at 5.1 -3.9 310) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 27 "Net-(D25-Pad2)"))
+  )
+
+  (module foostan-kbd:CherryMX_Choc_1u (layer F.Cu) (tedit 5C66D612) (tstamp 5F025E75)
+    (at 193.04 69.85)
+    (path /5DFE3EC9)
+    (fp_text reference SW31 (at 4.6 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value SW_Push (at -0.5 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -9.525 -9.525) (end 9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 -9.525) (end 9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 9.525) (end -9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 9.525) (end -9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -6) (end -7 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -7) (end -6 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 6 7) (end 7 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 7 7) (end 7 6) (layer Dwgs.User) (width 0.15))
+    (pad 1 thru_hole circle (at 5.1 -3.9 310) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 26 "Net-(D33-Pad2)"))
+    (pad "" np_thru_hole circle (at 0 0 90) (size 4 4) (drill 4) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad 2 thru_hole circle (at 0 -5.9 90) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 23 COL5))
+    (pad 2 thru_hole circle (at 2.54 -5.08) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 23 COL5))
+    (pad 1 thru_hole circle (at -3.81 -2.54 50) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 26 "Net-(D33-Pad2)"))
+    (pad "" np_thru_hole circle (at 5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+  )
+
+  (module foostan-kbd:CherryMX_Choc_1u (layer F.Cu) (tedit 5C66D612) (tstamp 5F025E5E)
+    (at 193.04 88.9)
+    (path /5DFE3EBB)
+    (fp_text reference SW32 (at 4.6 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value SW_Push (at -0.5 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 7 7) (end 7 6) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 6 7) (end 7 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -7) (end -6 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -6) (end -7 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 9.525) (end -9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 9.525) (end -9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 -9.525) (end 9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 -9.525) (end 9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (pad "" np_thru_hole circle (at -5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad 1 thru_hole circle (at -3.81 -2.54 50) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 25 "Net-(D34-Pad2)"))
+    (pad 2 thru_hole circle (at 2.54 -5.08) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 23 COL5))
+    (pad 2 thru_hole circle (at 0 -5.9 90) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 23 COL5))
+    (pad "" np_thru_hole circle (at 5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 0 0 90) (size 4 4) (drill 4) (layers *.Cu *.Mask))
+    (pad 1 thru_hole circle (at 5.1 -3.9 310) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 25 "Net-(D34-Pad2)"))
+  )
+
+  (module foostan-kbd:CherryMX_Choc_1u (layer F.Cu) (tedit 5C66D612) (tstamp 5F028F37)
+    (at 193.04 107.95)
+    (path /5DFE3E91)
+    (fp_text reference SW33 (at 4.6 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value SW_Push (at -0.5 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -9.525 -9.525) (end 9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 -9.525) (end 9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 9.525) (end -9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 9.525) (end -9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -6) (end -7 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -7) (end -6 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 6 7) (end 7 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 7 7) (end 7 6) (layer Dwgs.User) (width 0.15))
+    (pad 1 thru_hole circle (at 5.1 -3.9 310) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 24 "Net-(D35-Pad2)"))
+    (pad "" np_thru_hole circle (at 0 0 90) (size 4 4) (drill 4) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad 2 thru_hole circle (at 0 -5.9 90) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 23 COL5))
+    (pad 2 thru_hole circle (at 2.54 -5.08) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 23 COL5))
+    (pad 1 thru_hole circle (at -3.81 -2.54 50) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 24 "Net-(D35-Pad2)"))
+    (pad "" np_thru_hole circle (at 5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+  )
+
+  (module foostan-kbd:CherryMX_Choc_1u (layer F.Cu) (tedit 5C66D612) (tstamp 5F028F79)
+    (at 184.15 129.54)
+    (path /5DFE3E9F)
+    (fp_text reference SW34 (at 4.6 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value SW_Push (at -0.5 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 7 7) (end 7 6) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 6 7) (end 7 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -7) (end -6 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -6) (end -7 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 9.525) (end -9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 9.525) (end -9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 -9.525) (end 9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 -9.525) (end 9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (pad "" np_thru_hole circle (at -5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad 1 thru_hole circle (at -3.81 -2.54 50) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 22 "Net-(D36-Pad2)"))
+    (pad 2 thru_hole circle (at 2.54 -5.08) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 23 COL5))
+    (pad 2 thru_hole circle (at 0 -5.9 90) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 23 COL5))
+    (pad "" np_thru_hole circle (at 5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 0 0 90) (size 4 4) (drill 4) (layers *.Cu *.Mask))
+    (pad 1 thru_hole circle (at 5.1 -3.9 310) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 22 "Net-(D36-Pad2)"))
+  )
+
+  (module foostan-kbd:CherryMX_Choc_1u (layer F.Cu) (tedit 5C66D612) (tstamp 5F028FBB)
+    (at 203.2 127)
+    (path /5DFE23E6)
+    (fp_text reference SW24 (at 4.6 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value SW_Push (at -0.5 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -9.525 -9.525) (end 9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 -9.525) (end 9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 9.525) (end -9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 9.525) (end -9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -6) (end -7 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -7) (end -6 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 6 7) (end 7 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 7 7) (end 7 6) (layer Dwgs.User) (width 0.15))
+    (pad 1 thru_hole circle (at 5.1 -3.9 310) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 20 "Net-(D26-Pad2)"))
+    (pad "" np_thru_hole circle (at 0 0 90) (size 4 4) (drill 4) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad 2 thru_hole circle (at 0 -5.9 90) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 21 COL4))
+    (pad 2 thru_hole circle (at 2.54 -5.08) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 21 COL4))
+    (pad 1 thru_hole circle (at -3.81 -2.54 50) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 20 "Net-(D26-Pad2)"))
+    (pad "" np_thru_hole circle (at 5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+  )
+
+  (module keebio:TRRS-PJ-320A-no-Fmask (layer F.Cu) (tedit 5CD25241) (tstamp 5F025E02)
+    (at 146.177 64.135)
+    (path /5ED45338)
+    (fp_text reference J2 (at 0 14.2) (layer Dwgs.User)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value AudioJack4 (at 0 -5.6) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 2.8 -2) (end -2.8 -2) (layer F.SilkS) (width 0.15))
+    (fp_line (start -2.8 0) (end -2.8 -2) (layer F.SilkS) (width 0.15))
+    (fp_line (start 2.8 0) (end 2.8 -2) (layer F.SilkS) (width 0.15))
+    (fp_line (start -3.05 0) (end -3.05 12.1) (layer F.SilkS) (width 0.15))
+    (fp_line (start 3.05 0) (end 3.05 12.1) (layer F.SilkS) (width 0.15))
+    (fp_line (start 3.05 12.1) (end -3.05 12.1) (layer F.SilkS) (width 0.15))
+    (fp_line (start 3.05 0) (end -3.05 0) (layer F.SilkS) (width 0.15))
+    (pad 1 thru_hole oval (at -2.3 11.3) (size 1.6 2) (drill oval 0.9 1.3) (layers *.Cu B.Mask)
+      (net 1 GND))
+    (pad 2 thru_hole oval (at 2.3 10.2) (size 1.6 2) (drill oval 0.9 1.3) (layers *.Cu B.Mask)
+      (net 8 5V))
+    (pad 4 thru_hole oval (at 2.3 3.2) (size 1.6 2) (drill oval 0.9 1.3) (layers *.Cu B.Mask)
+      (net 18 TX))
+    (pad "" np_thru_hole circle (at 0 8.6) (size 0.8 0.8) (drill 0.8) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 0 1.6) (size 0.8 0.8) (drill 0.8) (layers *.Cu *.Mask))
+    (pad 3 thru_hole oval (at 2.3 6.2) (size 1.6 2) (drill oval 0.9 1.3) (layers *.Cu B.Mask)
+      (net 19 RX))
+    (pad 4 thru_hole oval (at 2.3 3.2) (size 1 1.4) (drill oval 0.9 1.3) (layers *.Cu F.Mask)
+      (net 18 TX))
+    (pad 3 thru_hole oval (at 2.3 6.2) (size 1 1.4) (drill oval 0.9 1.3) (layers *.Cu F.Mask)
+      (net 19 RX))
+    (pad 2 thru_hole oval (at 2.3 10.2) (size 1 1.4) (drill oval 0.9 1.3) (layers *.Cu F.Mask)
+      (net 8 5V))
+    (pad 1 thru_hole oval (at -2.3 11.3) (size 1 1.4) (drill oval 0.9 1.3) (layers *.Cu F.Mask)
+      (net 1 GND))
+  )
+
+  (module kicad-harwin:Harwin_M20-89012xx_1x12_P2.54mm_Horizontal (layer B.Cu) (tedit 5B154A07) (tstamp 5F027472)
+    (at 112.522 140.208 180)
+    (descr "Harwin Male Horizontal Surface Mount Single Row 2.54mm (0.1 inch) Pitch PCB Connector, M20-89012xx, 12 Pins per row (https://cdn.harwin.com/pdfs/M20-890.pdf), generated with kicad-footprint-generator")
+    (tags "connector Harwin M20-890 horizontal")
+    (path /5EDBCB44)
+    (attr smd)
+    (fp_text reference J3 (at -0.48 16.44 180) (layer B.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text value Conn_01x12_Male (at -0.48 -16.44 180) (layer B.Fab)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_line (start -1.725 14.29) (end -6.425 14.29) (layer B.Fab) (width 0.1))
+    (fp_line (start -6.425 14.29) (end -6.425 13.65) (layer B.Fab) (width 0.1))
+    (fp_line (start -6.425 13.65) (end -1.725 13.65) (layer B.Fab) (width 0.1))
+    (fp_line (start 0.775 14.29) (end 6.775 14.29) (layer B.Fab) (width 0.1))
+    (fp_line (start 6.775 14.29) (end 6.775 13.65) (layer B.Fab) (width 0.1))
+    (fp_line (start 6.775 13.65) (end 0.775 13.65) (layer B.Fab) (width 0.1))
+    (fp_line (start -1.725 11.75) (end -6.425 11.75) (layer B.Fab) (width 0.1))
+    (fp_line (start -6.425 11.75) (end -6.425 11.11) (layer B.Fab) (width 0.1))
+    (fp_line (start -6.425 11.11) (end -1.725 11.11) (layer B.Fab) (width 0.1))
+    (fp_line (start 0.775 11.75) (end 6.775 11.75) (layer B.Fab) (width 0.1))
+    (fp_line (start 6.775 11.75) (end 6.775 11.11) (layer B.Fab) (width 0.1))
+    (fp_line (start 6.775 11.11) (end 0.775 11.11) (layer B.Fab) (width 0.1))
+    (fp_line (start -1.725 9.21) (end -6.425 9.21) (layer B.Fab) (width 0.1))
+    (fp_line (start -6.425 9.21) (end -6.425 8.57) (layer B.Fab) (width 0.1))
+    (fp_line (start -6.425 8.57) (end -1.725 8.57) (layer B.Fab) (width 0.1))
+    (fp_line (start 0.775 9.21) (end 6.775 9.21) (layer B.Fab) (width 0.1))
+    (fp_line (start 6.775 9.21) (end 6.775 8.57) (layer B.Fab) (width 0.1))
+    (fp_line (start 6.775 8.57) (end 0.775 8.57) (layer B.Fab) (width 0.1))
+    (fp_line (start -1.725 6.67) (end -6.425 6.67) (layer B.Fab) (width 0.1))
+    (fp_line (start -6.425 6.67) (end -6.425 6.03) (layer B.Fab) (width 0.1))
+    (fp_line (start -6.425 6.03) (end -1.725 6.03) (layer B.Fab) (width 0.1))
+    (fp_line (start 0.775 6.67) (end 6.775 6.67) (layer B.Fab) (width 0.1))
+    (fp_line (start 6.775 6.67) (end 6.775 6.03) (layer B.Fab) (width 0.1))
+    (fp_line (start 6.775 6.03) (end 0.775 6.03) (layer B.Fab) (width 0.1))
+    (fp_line (start -1.725 4.13) (end -6.425 4.13) (layer B.Fab) (width 0.1))
+    (fp_line (start -6.425 4.13) (end -6.425 3.49) (layer B.Fab) (width 0.1))
+    (fp_line (start -6.425 3.49) (end -1.725 3.49) (layer B.Fab) (width 0.1))
+    (fp_line (start 0.775 4.13) (end 6.775 4.13) (layer B.Fab) (width 0.1))
+    (fp_line (start 6.775 4.13) (end 6.775 3.49) (layer B.Fab) (width 0.1))
+    (fp_line (start 6.775 3.49) (end 0.775 3.49) (layer B.Fab) (width 0.1))
+    (fp_line (start -1.725 1.59) (end -6.425 1.59) (layer B.Fab) (width 0.1))
+    (fp_line (start -6.425 1.59) (end -6.425 0.95) (layer B.Fab) (width 0.1))
+    (fp_line (start -6.425 0.95) (end -1.725 0.95) (layer B.Fab) (width 0.1))
+    (fp_line (start 0.775 1.59) (end 6.775 1.59) (layer B.Fab) (width 0.1))
+    (fp_line (start 6.775 1.59) (end 6.775 0.95) (layer B.Fab) (width 0.1))
+    (fp_line (start 6.775 0.95) (end 0.775 0.95) (layer B.Fab) (width 0.1))
+    (fp_line (start -1.725 -0.95) (end -6.425 -0.95) (layer B.Fab) (width 0.1))
+    (fp_line (start -6.425 -0.95) (end -6.425 -1.59) (layer B.Fab) (width 0.1))
+    (fp_line (start -6.425 -1.59) (end -1.725 -1.59) (layer B.Fab) (width 0.1))
+    (fp_line (start 0.775 -0.95) (end 6.775 -0.95) (layer B.Fab) (width 0.1))
+    (fp_line (start 6.775 -0.95) (end 6.775 -1.59) (layer B.Fab) (width 0.1))
+    (fp_line (start 6.775 -1.59) (end 0.775 -1.59) (layer B.Fab) (width 0.1))
+    (fp_line (start -1.725 -3.49) (end -6.425 -3.49) (layer B.Fab) (width 0.1))
+    (fp_line (start -6.425 -3.49) (end -6.425 -4.13) (layer B.Fab) (width 0.1))
+    (fp_line (start -6.425 -4.13) (end -1.725 -4.13) (layer B.Fab) (width 0.1))
+    (fp_line (start 0.775 -3.49) (end 6.775 -3.49) (layer B.Fab) (width 0.1))
+    (fp_line (start 6.775 -3.49) (end 6.775 -4.13) (layer B.Fab) (width 0.1))
+    (fp_line (start 6.775 -4.13) (end 0.775 -4.13) (layer B.Fab) (width 0.1))
+    (fp_line (start -1.725 -6.03) (end -6.425 -6.03) (layer B.Fab) (width 0.1))
+    (fp_line (start -6.425 -6.03) (end -6.425 -6.67) (layer B.Fab) (width 0.1))
+    (fp_line (start -6.425 -6.67) (end -1.725 -6.67) (layer B.Fab) (width 0.1))
+    (fp_line (start 0.775 -6.03) (end 6.775 -6.03) (layer B.Fab) (width 0.1))
+    (fp_line (start 6.775 -6.03) (end 6.775 -6.67) (layer B.Fab) (width 0.1))
+    (fp_line (start 6.775 -6.67) (end 0.775 -6.67) (layer B.Fab) (width 0.1))
+    (fp_line (start -1.725 -8.57) (end -6.425 -8.57) (layer B.Fab) (width 0.1))
+    (fp_line (start -6.425 -8.57) (end -6.425 -9.21) (layer B.Fab) (width 0.1))
+    (fp_line (start -6.425 -9.21) (end -1.725 -9.21) (layer B.Fab) (width 0.1))
+    (fp_line (start 0.775 -8.57) (end 6.775 -8.57) (layer B.Fab) (width 0.1))
+    (fp_line (start 6.775 -8.57) (end 6.775 -9.21) (layer B.Fab) (width 0.1))
+    (fp_line (start 6.775 -9.21) (end 0.775 -9.21) (layer B.Fab) (width 0.1))
+    (fp_line (start -1.725 -11.11) (end -6.425 -11.11) (layer B.Fab) (width 0.1))
+    (fp_line (start -6.425 -11.11) (end -6.425 -11.75) (layer B.Fab) (width 0.1))
+    (fp_line (start -6.425 -11.75) (end -1.725 -11.75) (layer B.Fab) (width 0.1))
+    (fp_line (start 0.775 -11.11) (end 6.775 -11.11) (layer B.Fab) (width 0.1))
+    (fp_line (start 6.775 -11.11) (end 6.775 -11.75) (layer B.Fab) (width 0.1))
+    (fp_line (start 6.775 -11.75) (end 0.775 -11.75) (layer B.Fab) (width 0.1))
+    (fp_line (start -1.725 -13.65) (end -6.425 -13.65) (layer B.Fab) (width 0.1))
+    (fp_line (start -6.425 -13.65) (end -6.425 -14.29) (layer B.Fab) (width 0.1))
+    (fp_line (start -6.425 -14.29) (end -1.725 -14.29) (layer B.Fab) (width 0.1))
+    (fp_line (start 0.775 -13.65) (end 6.775 -13.65) (layer B.Fab) (width 0.1))
+    (fp_line (start 6.775 -13.65) (end 6.775 -14.29) (layer B.Fab) (width 0.1))
+    (fp_line (start 6.775 -14.29) (end 0.775 -14.29) (layer B.Fab) (width 0.1))
+    (fp_line (start -1.725 14.84) (end -1.325 15.24) (layer B.Fab) (width 0.1))
+    (fp_line (start -1.325 15.24) (end 0.775 15.24) (layer B.Fab) (width 0.1))
+    (fp_line (start 0.775 15.24) (end 0.775 -15.24) (layer B.Fab) (width 0.1))
+    (fp_line (start 0.775 -15.24) (end -1.725 -15.24) (layer B.Fab) (width 0.1))
+    (fp_line (start -1.725 -15.24) (end -1.725 14.84) (layer B.Fab) (width 0.1))
+    (fp_line (start -1.845 15.36) (end 0.895 15.36) (layer B.SilkS) (width 0.12))
+    (fp_line (start 0.895 15.36) (end 0.895 -15.36) (layer B.SilkS) (width 0.12))
+    (fp_line (start 0.895 -15.36) (end -1.845 -15.36) (layer B.SilkS) (width 0.12))
+    (fp_line (start -1.845 -15.36) (end -1.845 15.36) (layer B.SilkS) (width 0.12))
+    (fp_line (start -3.955 14.41) (end -1.845 14.41) (layer B.SilkS) (width 0.12))
+    (fp_line (start -3.955 13.53) (end -1.845 13.53) (layer B.SilkS) (width 0.12))
+    (fp_line (start 0.895 14.41) (end 6.895 14.41) (layer B.SilkS) (width 0.12))
+    (fp_line (start 6.895 14.41) (end 6.895 13.53) (layer B.SilkS) (width 0.12))
+    (fp_line (start 6.895 13.53) (end 0.895 13.53) (layer B.SilkS) (width 0.12))
+    (fp_line (start -3.955 11.87) (end -1.845 11.87) (layer B.SilkS) (width 0.12))
+    (fp_line (start -3.955 10.99) (end -1.845 10.99) (layer B.SilkS) (width 0.12))
+    (fp_line (start 0.895 11.87) (end 6.895 11.87) (layer B.SilkS) (width 0.12))
+    (fp_line (start 6.895 11.87) (end 6.895 10.99) (layer B.SilkS) (width 0.12))
+    (fp_line (start 6.895 10.99) (end 0.895 10.99) (layer B.SilkS) (width 0.12))
+    (fp_line (start -3.955 9.33) (end -1.845 9.33) (layer B.SilkS) (width 0.12))
+    (fp_line (start -3.955 8.45) (end -1.845 8.45) (layer B.SilkS) (width 0.12))
+    (fp_line (start 0.895 9.33) (end 6.895 9.33) (layer B.SilkS) (width 0.12))
+    (fp_line (start 6.895 9.33) (end 6.895 8.45) (layer B.SilkS) (width 0.12))
+    (fp_line (start 6.895 8.45) (end 0.895 8.45) (layer B.SilkS) (width 0.12))
+    (fp_line (start -3.955 6.79) (end -1.845 6.79) (layer B.SilkS) (width 0.12))
+    (fp_line (start -3.955 5.91) (end -1.845 5.91) (layer B.SilkS) (width 0.12))
+    (fp_line (start 0.895 6.79) (end 6.895 6.79) (layer B.SilkS) (width 0.12))
+    (fp_line (start 6.895 6.79) (end 6.895 5.91) (layer B.SilkS) (width 0.12))
+    (fp_line (start 6.895 5.91) (end 0.895 5.91) (layer B.SilkS) (width 0.12))
+    (fp_line (start -3.955 4.25) (end -1.845 4.25) (layer B.SilkS) (width 0.12))
+    (fp_line (start -3.955 3.37) (end -1.845 3.37) (layer B.SilkS) (width 0.12))
+    (fp_line (start 0.895 4.25) (end 6.895 4.25) (layer B.SilkS) (width 0.12))
+    (fp_line (start 6.895 4.25) (end 6.895 3.37) (layer B.SilkS) (width 0.12))
+    (fp_line (start 6.895 3.37) (end 0.895 3.37) (layer B.SilkS) (width 0.12))
+    (fp_line (start -3.955 1.71) (end -1.845 1.71) (layer B.SilkS) (width 0.12))
+    (fp_line (start -3.955 0.83) (end -1.845 0.83) (layer B.SilkS) (width 0.12))
+    (fp_line (start 0.895 1.71) (end 6.895 1.71) (layer B.SilkS) (width 0.12))
+    (fp_line (start 6.895 1.71) (end 6.895 0.83) (layer B.SilkS) (width 0.12))
+    (fp_line (start 6.895 0.83) (end 0.895 0.83) (layer B.SilkS) (width 0.12))
+    (fp_line (start -3.955 -0.83) (end -1.845 -0.83) (layer B.SilkS) (width 0.12))
+    (fp_line (start -3.955 -1.71) (end -1.845 -1.71) (layer B.SilkS) (width 0.12))
+    (fp_line (start 0.895 -0.83) (end 6.895 -0.83) (layer B.SilkS) (width 0.12))
+    (fp_line (start 6.895 -0.83) (end 6.895 -1.71) (layer B.SilkS) (width 0.12))
+    (fp_line (start 6.895 -1.71) (end 0.895 -1.71) (layer B.SilkS) (width 0.12))
+    (fp_line (start -3.955 -3.37) (end -1.845 -3.37) (layer B.SilkS) (width 0.12))
+    (fp_line (start -3.955 -4.25) (end -1.845 -4.25) (layer B.SilkS) (width 0.12))
+    (fp_line (start 0.895 -3.37) (end 6.895 -3.37) (layer B.SilkS) (width 0.12))
+    (fp_line (start 6.895 -3.37) (end 6.895 -4.25) (layer B.SilkS) (width 0.12))
+    (fp_line (start 6.895 -4.25) (end 0.895 -4.25) (layer B.SilkS) (width 0.12))
+    (fp_line (start -3.955 -5.91) (end -1.845 -5.91) (layer B.SilkS) (width 0.12))
+    (fp_line (start -3.955 -6.79) (end -1.845 -6.79) (layer B.SilkS) (width 0.12))
+    (fp_line (start 0.895 -5.91) (end 6.895 -5.91) (layer B.SilkS) (width 0.12))
+    (fp_line (start 6.895 -5.91) (end 6.895 -6.79) (layer B.SilkS) (width 0.12))
+    (fp_line (start 6.895 -6.79) (end 0.895 -6.79) (layer B.SilkS) (width 0.12))
+    (fp_line (start -3.955 -8.45) (end -1.845 -8.45) (layer B.SilkS) (width 0.12))
+    (fp_line (start -3.955 -9.33) (end -1.845 -9.33) (layer B.SilkS) (width 0.12))
+    (fp_line (start 0.895 -8.45) (end 6.895 -8.45) (layer B.SilkS) (width 0.12))
+    (fp_line (start 6.895 -8.45) (end 6.895 -9.33) (layer B.SilkS) (width 0.12))
+    (fp_line (start 6.895 -9.33) (end 0.895 -9.33) (layer B.SilkS) (width 0.12))
+    (fp_line (start -3.955 -10.99) (end -1.845 -10.99) (layer B.SilkS) (width 0.12))
+    (fp_line (start -3.955 -11.87) (end -1.845 -11.87) (layer B.SilkS) (width 0.12))
+    (fp_line (start 0.895 -10.99) (end 6.895 -10.99) (layer B.SilkS) (width 0.12))
+    (fp_line (start 6.895 -10.99) (end 6.895 -11.87) (layer B.SilkS) (width 0.12))
+    (fp_line (start 6.895 -11.87) (end 0.895 -11.87) (layer B.SilkS) (width 0.12))
+    (fp_line (start -3.955 -13.53) (end -1.845 -13.53) (layer B.SilkS) (width 0.12))
+    (fp_line (start -3.955 -14.41) (end -1.845 -14.41) (layer B.SilkS) (width 0.12))
+    (fp_line (start 0.895 -13.53) (end 6.895 -13.53) (layer B.SilkS) (width 0.12))
+    (fp_line (start 6.895 -13.53) (end 6.895 -14.41) (layer B.SilkS) (width 0.12))
+    (fp_line (start 6.895 -14.41) (end 0.895 -14.41) (layer B.SilkS) (width 0.12))
+    (fp_line (start -7.095 13.97) (end -7.095 14.79) (layer B.SilkS) (width 0.12))
+    (fp_line (start -7.095 14.79) (end -5.525 14.79) (layer B.SilkS) (width 0.12))
+    (fp_line (start -7.28 15.74) (end 7.28 15.74) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 7.28 15.74) (end 7.28 -15.74) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 7.28 -15.74) (end -7.28 -15.74) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -7.28 -15.74) (end -7.28 15.74) (layer B.CrtYd) (width 0.05))
+    (fp_text user %R (at -0.48 0 90) (layer B.Fab)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (pad 1 smd rect (at -5.525 13.97 180) (size 2.5 1) (layers B.Cu B.Paste B.Mask)
+      (net 9 3.3V))
+    (pad 2 smd rect (at -5.525 11.43 180) (size 2.5 1) (layers B.Cu B.Paste B.Mask)
+      (net 10 SWDIO))
+    (pad 3 smd rect (at -5.525 8.89 180) (size 2.5 1) (layers B.Cu B.Paste B.Mask)
+      (net 11 SWDCLK))
+    (pad 4 smd rect (at -5.525 6.35 180) (size 2.5 1) (layers B.Cu B.Paste B.Mask)
+      (net 1 GND))
+    (pad 5 smd rect (at -5.525 3.81 180) (size 2.5 1) (layers B.Cu B.Paste B.Mask)
+      (net 12 PA4))
+    (pad 6 smd rect (at -5.525 1.27 180) (size 2.5 1) (layers B.Cu B.Paste B.Mask)
+      (net 13 PA5))
+    (pad 7 smd rect (at -5.525 -1.27 180) (size 2.5 1) (layers B.Cu B.Paste B.Mask)
+      (net 14 PA6))
+    (pad 8 smd rect (at -5.525 -3.81 180) (size 2.5 1) (layers B.Cu B.Paste B.Mask)
+      (net 15 PA7))
+    (pad 9 smd rect (at -5.525 -6.35 180) (size 2.5 1) (layers B.Cu B.Paste B.Mask)
+      (net 1 GND))
+    (pad 10 smd rect (at -5.525 -8.89 180) (size 2.5 1) (layers B.Cu B.Paste B.Mask)
+      (net 16 PB6))
+    (pad 11 smd rect (at -5.525 -11.43 180) (size 2.5 1) (layers B.Cu B.Paste B.Mask)
+      (net 17 PB7))
+    (pad 12 smd rect (at -5.525 -13.97 180) (size 2.5 1) (layers B.Cu B.Paste B.Mask)
+      (net 8 5V))
+    (pad "" smd rect (at 3.895 13.97 180) (size 6 0.76) (layers B.SilkS))
+    (model ${KISYS3DMOD}/Connector_Harwin.3dshapes/Harwin_M20-89012xx_1x12_P2.54mm_Horizontal.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module kicad-usb:USB_C_Receptacle_HRO_TYPE-C-31-M-12 (layer F.Cu) (tedit 5D3C0721) (tstamp 5F025D48)
+    (at 158.75 66.675 180)
+    (descr "USB Type-C receptacle for USB 2.0 and PD, http://www.krhro.com/uploads/soft/180320/1-1P320120243.pdf")
+    (tags "usb usb-c 2.0 pd")
+    (path /5E037A53)
+    (attr smd)
+    (fp_text reference J1 (at 0 -5.645 180) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value USB_C_Receptacle_USB2.0 (at 0 5.1 180) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -4.7 2) (end -4.7 3.9) (layer F.SilkS) (width 0.12))
+    (fp_line (start -4.7 -1.9) (end -4.7 0.1) (layer F.SilkS) (width 0.12))
+    (fp_line (start 4.7 2) (end 4.7 3.9) (layer F.SilkS) (width 0.12))
+    (fp_line (start 4.7 -1.9) (end 4.7 0.1) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.32 -5.27) (end 5.32 4.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -5.32 -5.27) (end -5.32 4.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -5.32 4.15) (end 5.32 4.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -5.32 -5.27) (end 5.32 -5.27) (layer F.CrtYd) (width 0.05))
+    (fp_text user %R (at 0 0 180) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 4.47 -3.65) (end 4.47 3.65) (layer F.Fab) (width 0.1))
+    (fp_line (start -4.47 3.65) (end 4.47 3.65) (layer F.Fab) (width 0.1))
+    (fp_line (start -4.47 -3.65) (end -4.47 3.65) (layer F.Fab) (width 0.1))
+    (fp_line (start -4.47 -3.65) (end 4.47 -3.65) (layer F.Fab) (width 0.1))
+    (fp_line (start -4.7 3.9) (end 4.7 3.9) (layer F.SilkS) (width 0.12))
+    (pad S1 thru_hole oval (at 4.32 1.05 180) (size 1 1.6) (drill oval 0.6 1.2) (layers *.Cu *.Mask)
+      (net 1 GND))
+    (pad "" np_thru_hole circle (at 2.89 -2.6 180) (size 0.65 0.65) (drill 0.65) (layers *.Cu *.Mask))
+    (pad S1 thru_hole oval (at -4.32 1.05 180) (size 1 1.6) (drill oval 0.6 1.2) (layers *.Cu *.Mask)
+      (net 1 GND))
+    (pad "" np_thru_hole circle (at -2.89 -2.6 180) (size 0.65 0.65) (drill 0.65) (layers *.Cu *.Mask))
+    (pad S1 thru_hole oval (at -4.32 -3.13 180) (size 1 2.1) (drill oval 0.6 1.7) (layers *.Cu *.Mask)
+      (net 1 GND))
+    (pad S1 thru_hole oval (at 4.32 -3.13 180) (size 1 2.1) (drill oval 0.6 1.7) (layers *.Cu *.Mask)
+      (net 1 GND))
+    (pad A6 smd rect (at -0.25 -4.045 180) (size 0.3 1.45) (layers F.Cu F.Paste F.Mask)
+      (net 2 D+))
+    (pad B5 smd rect (at 1.75 -4.045 180) (size 0.3 1.45) (layers F.Cu F.Paste F.Mask)
+      (net 3 "Net-(J1-PadB5)"))
+    (pad A8 smd rect (at 1.25 -4.045 180) (size 0.3 1.45) (layers F.Cu F.Paste F.Mask)
+      (net 4 "Net-(J1-PadA8)"))
+    (pad B6 smd rect (at 0.75 -4.045 180) (size 0.3 1.45) (layers F.Cu F.Paste F.Mask)
+      (net 2 D+))
+    (pad A7 smd rect (at 0.25 -4.045 180) (size 0.3 1.45) (layers F.Cu F.Paste F.Mask)
+      (net 5 D-))
+    (pad B7 smd rect (at -0.75 -4.045 180) (size 0.3 1.45) (layers F.Cu F.Paste F.Mask)
+      (net 5 D-))
+    (pad A5 smd rect (at -1.25 -4.045 180) (size 0.3 1.45) (layers F.Cu F.Paste F.Mask)
+      (net 6 "Net-(J1-PadA5)"))
+    (pad B8 smd rect (at -1.75 -4.045 180) (size 0.3 1.45) (layers F.Cu F.Paste F.Mask)
+      (net 7 "Net-(J1-PadB8)"))
+    (pad A12 smd rect (at 3.25 -4.045 180) (size 0.6 1.45) (layers F.Cu F.Paste F.Mask)
+      (net 1 GND))
+    (pad B4 smd rect (at 2.45 -4.045 180) (size 0.6 1.45) (layers F.Cu F.Paste F.Mask)
+      (net 8 5V))
+    (pad A4 smd rect (at -2.45 -4.045 180) (size 0.6 1.45) (layers F.Cu F.Paste F.Mask)
+      (net 8 5V))
+    (pad A1 smd rect (at -3.25 -4.045 180) (size 0.6 1.45) (layers F.Cu F.Paste F.Mask)
+      (net 1 GND))
+    (pad B12 smd rect (at -3.25 -4.045 180) (size 0.6 1.45) (layers F.Cu F.Paste F.Mask)
+      (net 1 GND))
+    (pad B9 smd rect (at -2.45 -4.045 180) (size 0.6 1.45) (layers F.Cu F.Paste F.Mask)
+      (net 8 5V))
+    (pad A9 smd rect (at 2.45 -4.045 180) (size 0.6 1.45) (layers F.Cu F.Paste F.Mask)
+      (net 8 5V))
+    (pad B1 smd rect (at 3.25 -4.045 180) (size 0.6 1.45) (layers F.Cu F.Paste F.Mask)
+      (net 1 GND))
+    (model ${KISYS3DMOD}/Connector_USB.3dshapes/USB_C_Receptacle_HRO_TYPE-C-31-M-12.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (gr_line (start 142.875 62.865) (end 142.875 119.38) (layer Edge.Cuts) (width 0.15))
+  (gr_line (start 164.465 62.865) (end 142.875 62.865) (layer Edge.Cuts) (width 0.15))
+  (gr_line (start 156.845 147.955) (end 142.875 119.38) (layer Edge.Cuts) (width 0.2))
+  (gr_line (start 193.675 139.065) (end 156.845 147.955) (layer Edge.Cuts) (width 0.2))
+  (gr_line (start 231.775 136.525) (end 193.675 139.065) (layer Edge.Cuts) (width 0.2))
+  (gr_line (start 278.765 130.175) (end 231.775 136.525) (layer Edge.Cuts) (width 0.2))
+  (gr_line (start 278.765 73.025) (end 278.765 130.175) (layer Edge.Cuts) (width 0.2))
+  (gr_line (start 240.665 60.325) (end 278.765 73.025) (layer Edge.Cuts) (width 0.2))
+  (gr_line (start 221.615 57.785) (end 240.665 60.325) (layer Edge.Cuts) (width 0.2))
+  (gr_line (start 202.565 57.785) (end 221.615 57.785) (layer Edge.Cuts) (width 0.2))
+  (gr_line (start 164.465 62.865) (end 202.565 57.785) (layer Edge.Cuts) (width 0.2))
+
+)
diff --git a/pcb/kicad/right/right.kicad_pcb-bak b/pcb/kicad/right/right.kicad_pcb-bak
new file mode 100644
index 0000000..f199151
--- /dev/null
+++ b/pcb/kicad/right/right.kicad_pcb-bak
@@ -0,0 +1,2898 @@
+(kicad_pcb (version 20171130) (host pcbnew 5.0.2+dfsg1-1)
+
+  (general
+    (thickness 1.6)
+    (drawings 11)
+    (tracks 0)
+    (zones 0)
+    (modules 61)
+    (nets 69)
+  )
+
+  (page A4)
+  (layers
+    (0 F.Cu signal)
+    (31 B.Cu signal)
+    (32 B.Adhes user)
+    (33 F.Adhes user)
+    (34 B.Paste user)
+    (35 F.Paste user)
+    (36 B.SilkS user)
+    (37 F.SilkS user)
+    (38 B.Mask user)
+    (39 F.Mask user)
+    (40 Dwgs.User user)
+    (41 Cmts.User user)
+    (42 Eco1.User user)
+    (43 Eco2.User user)
+    (44 Edge.Cuts user)
+    (45 Margin user)
+    (46 B.CrtYd user)
+    (47 F.CrtYd user)
+    (48 B.Fab user)
+    (49 F.Fab user)
+  )
+
+  (setup
+    (last_trace_width 0.25)
+    (trace_clearance 0.2)
+    (zone_clearance 0.508)
+    (zone_45_only no)
+    (trace_min 0.2)
+    (segment_width 0.2)
+    (edge_width 0.15)
+    (via_size 0.8)
+    (via_drill 0.4)
+    (via_min_size 0.4)
+    (via_min_drill 0.3)
+    (uvia_size 0.3)
+    (uvia_drill 0.1)
+    (uvias_allowed no)
+    (uvia_min_size 0.2)
+    (uvia_min_drill 0.1)
+    (pcb_text_width 0.3)
+    (pcb_text_size 1.5 1.5)
+    (mod_edge_width 0.15)
+    (mod_text_size 1 1)
+    (mod_text_width 0.15)
+    (pad_size 1.524 1.524)
+    (pad_drill 0.762)
+    (pad_to_mask_clearance 0.051)
+    (solder_mask_min_width 0.25)
+    (aux_axis_origin 0 0)
+    (visible_elements FFFFFF7F)
+    (pcbplotparams
+      (layerselection 0x010fc_ffffffff)
+      (usegerberextensions false)
+      (usegerberattributes false)
+      (usegerberadvancedattributes false)
+      (creategerberjobfile false)
+      (excludeedgelayer true)
+      (linewidth 0.100000)
+      (plotframeref false)
+      (viasonmask false)
+      (mode 1)
+      (useauxorigin false)
+      (hpglpennumber 1)
+      (hpglpenspeed 20)
+      (hpglpendiameter 15.000000)
+      (psnegative false)
+      (psa4output false)
+      (plotreference true)
+      (plotvalue true)
+      (plotinvisibletext false)
+      (padsonsilk false)
+      (subtractmaskfromsilk false)
+      (outputformat 1)
+      (mirror false)
+      (drillshape 1)
+      (scaleselection 1)
+      (outputdirectory ""))
+  )
+
+  (net 0 "")
+  (net 1 GND)
+  (net 2 D+)
+  (net 3 "Net-(J1-PadB5)")
+  (net 4 "Net-(J1-PadA8)")
+  (net 5 D-)
+  (net 6 "Net-(J1-PadA5)")
+  (net 7 "Net-(J1-PadB8)")
+  (net 8 5V)
+  (net 9 3.3V)
+  (net 10 SWDIO)
+  (net 11 SWDCLK)
+  (net 12 PA4)
+  (net 13 PA5)
+  (net 14 PA6)
+  (net 15 PA7)
+  (net 16 PB6)
+  (net 17 PB7)
+  (net 18 TX)
+  (net 19 RX)
+  (net 20 "Net-(D26-Pad2)")
+  (net 21 COL4)
+  (net 22 "Net-(D36-Pad2)")
+  (net 23 COL5)
+  (net 24 "Net-(D35-Pad2)")
+  (net 25 "Net-(D34-Pad2)")
+  (net 26 "Net-(D33-Pad2)")
+  (net 27 "Net-(D25-Pad2)")
+  (net 28 "Net-(D24-Pad2)")
+  (net 29 "Net-(D23-Pad2)")
+  (net 30 "Net-(D21-Pad2)")
+  (net 31 COL2)
+  (net 32 "Net-(D20-Pad2)")
+  (net 33 "Net-(D19-Pad2)")
+  (net 34 "Net-(D16-Pad2)")
+  (net 35 COL6)
+  (net 36 "Net-(D14-Pad2)")
+  (net 37 "Net-(D12-Pad2)")
+  (net 38 COL3)
+  (net 39 "Net-(D11-Pad2)")
+  (net 40 "Net-(D10-Pad2)")
+  (net 41 "Net-(D15-Pad2)")
+  (net 42 "Net-(D9-Pad2)")
+  (net 43 "Net-(D7-Pad2)")
+  (net 44 COL1)
+  (net 45 "Net-(D6-Pad2)")
+  (net 46 "Net-(D5-Pad2)")
+  (net 47 "Net-(D17-Pad2)")
+  (net 48 "Net-(R1-Pad1)")
+  (net 49 VBAT)
+  (net 50 "Net-(U1-Pad2)")
+  (net 51 "Net-(U1-Pad3)")
+  (net 52 "Net-(U1-Pad4)")
+  (net 53 "Net-(U1-Pad5)")
+  (net 54 "Net-(U1-Pad6)")
+  (net 55 "Net-(C1-Pad2)")
+  (net 56 "Net-(U1-Pad10)")
+  (net 57 "Net-(U1-Pad11)")
+  (net 58 "Net-(U1-Pad12)")
+  (net 59 "Net-(U1-Pad13)")
+  (net 60 ROW1)
+  (net 61 ROW2)
+  (net 62 ROW3)
+  (net 63 ROW4)
+  (net 64 "Net-(U1-Pad22)")
+  (net 65 "Net-(U1-Pad26)")
+  (net 66 "Net-(U1-Pad27)")
+  (net 67 "Net-(U1-Pad28)")
+  (net 68 "Net-(U1-Pad29)")
+
+  (net_class Default "Ceci est la Netclass par défaut."
+    (clearance 0.2)
+    (trace_width 0.25)
+    (via_dia 0.8)
+    (via_drill 0.4)
+    (uvia_dia 0.3)
+    (uvia_drill 0.1)
+    (add_net 3.3V)
+    (add_net 5V)
+    (add_net COL1)
+    (add_net COL2)
+    (add_net COL3)
+    (add_net COL4)
+    (add_net COL5)
+    (add_net COL6)
+    (add_net D+)
+    (add_net D-)
+    (add_net GND)
+    (add_net "Net-(C1-Pad2)")
+    (add_net "Net-(D10-Pad2)")
+    (add_net "Net-(D11-Pad2)")
+    (add_net "Net-(D12-Pad2)")
+    (add_net "Net-(D14-Pad2)")
+    (add_net "Net-(D15-Pad2)")
+    (add_net "Net-(D16-Pad2)")
+    (add_net "Net-(D17-Pad2)")
+    (add_net "Net-(D19-Pad2)")
+    (add_net "Net-(D20-Pad2)")
+    (add_net "Net-(D21-Pad2)")
+    (add_net "Net-(D23-Pad2)")
+    (add_net "Net-(D24-Pad2)")
+    (add_net "Net-(D25-Pad2)")
+    (add_net "Net-(D26-Pad2)")
+    (add_net "Net-(D33-Pad2)")
+    (add_net "Net-(D34-Pad2)")
+    (add_net "Net-(D35-Pad2)")
+    (add_net "Net-(D36-Pad2)")
+    (add_net "Net-(D5-Pad2)")
+    (add_net "Net-(D6-Pad2)")
+    (add_net "Net-(D7-Pad2)")
+    (add_net "Net-(D9-Pad2)")
+    (add_net "Net-(J1-PadA5)")
+    (add_net "Net-(J1-PadA8)")
+    (add_net "Net-(J1-PadB5)")
+    (add_net "Net-(J1-PadB8)")
+    (add_net "Net-(R1-Pad1)")
+    (add_net "Net-(U1-Pad10)")
+    (add_net "Net-(U1-Pad11)")
+    (add_net "Net-(U1-Pad12)")
+    (add_net "Net-(U1-Pad13)")
+    (add_net "Net-(U1-Pad2)")
+    (add_net "Net-(U1-Pad22)")
+    (add_net "Net-(U1-Pad26)")
+    (add_net "Net-(U1-Pad27)")
+    (add_net "Net-(U1-Pad28)")
+    (add_net "Net-(U1-Pad29)")
+    (add_net "Net-(U1-Pad3)")
+    (add_net "Net-(U1-Pad4)")
+    (add_net "Net-(U1-Pad5)")
+    (add_net "Net-(U1-Pad6)")
+    (add_net PA4)
+    (add_net PA5)
+    (add_net PA6)
+    (add_net PA7)
+    (add_net PB6)
+    (add_net PB7)
+    (add_net ROW1)
+    (add_net ROW2)
+    (add_net ROW3)
+    (add_net ROW4)
+    (add_net RX)
+    (add_net SWDCLK)
+    (add_net SWDIO)
+    (add_net TX)
+    (add_net VBAT)
+  )
+
+  (module Button_Switch_SMD:SW_SPST_CK_RS282G05A3 (layer F.Cu) (tedit 5A7A67D2) (tstamp 5F026358)
+    (at 98.905001 73.910001)
+    (descr https://www.mouser.com/ds/2/60/RS-282G05A-SM_RT-1159762.pdf)
+    (tags "SPST button tactile switch")
+    (path /5DECA090)
+    (attr smd)
+    (fp_text reference SW2 (at 0 -2.6) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value RESET (at 0 3) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 3 -1.8) (end 3 1.8) (layer F.Fab) (width 0.1))
+    (fp_line (start -3 -1.8) (end -3 1.8) (layer F.Fab) (width 0.1))
+    (fp_line (start -3 -1.8) (end 3 -1.8) (layer F.Fab) (width 0.1))
+    (fp_line (start -3 1.8) (end 3 1.8) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.5 -0.8) (end -1.5 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.5 -0.8) (end 1.5 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.5 -0.8) (end 1.5 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.5 0.8) (end 1.5 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start -3.06 1.85) (end -3.06 -1.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.06 1.85) (end -3.06 1.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.06 -1.85) (end 3.06 1.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -3.06 -1.85) (end 3.06 -1.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.75 1) (end -1.75 -1) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.75 1) (end -1.75 1) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.75 -1) (end 1.75 1) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.75 -1) (end 1.75 -1) (layer F.Fab) (width 0.1))
+    (fp_text user %R (at 0 -2.6) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -4.9 -2.05) (end 4.9 -2.05) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 4.9 -2.05) (end 4.9 2.05) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 4.9 2.05) (end -4.9 2.05) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -4.9 2.05) (end -4.9 -2.05) (layer F.CrtYd) (width 0.05))
+    (pad 2 smd rect (at 3.9 0) (size 1.5 1.5) (layers F.Cu F.Paste F.Mask)
+      (net 55 "Net-(C1-Pad2)"))
+    (pad 1 smd rect (at -3.9 0) (size 1.5 1.5) (layers F.Cu F.Paste F.Mask)
+      (net 1 GND))
+    (model ${KISYS3DMOD}/Button_Switch_SMD.3dshapes/SW_SPST_CK_RS282G05A3.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Button_Switch_SMD:SW_SPST_CK_RS282G05A3 (layer F.Cu) (tedit 5A7A67D2) (tstamp 5F02633D)
+    (at 99.695 86.36)
+    (descr https://www.mouser.com/ds/2/60/RS-282G05A-SM_RT-1159762.pdf)
+    (tags "SPST button tactile switch")
+    (path /5DECE105)
+    (attr smd)
+    (fp_text reference SW1 (at 0 -2.6) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value BOOT (at 0 3) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -4.9 2.05) (end -4.9 -2.05) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 4.9 2.05) (end -4.9 2.05) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 4.9 -2.05) (end 4.9 2.05) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -4.9 -2.05) (end 4.9 -2.05) (layer F.CrtYd) (width 0.05))
+    (fp_text user %R (at 0 -2.6) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -1.75 -1) (end 1.75 -1) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.75 -1) (end 1.75 1) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.75 1) (end -1.75 1) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.75 1) (end -1.75 -1) (layer F.Fab) (width 0.1))
+    (fp_line (start -3.06 -1.85) (end 3.06 -1.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.06 -1.85) (end 3.06 1.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.06 1.85) (end -3.06 1.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -3.06 1.85) (end -3.06 -1.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.5 0.8) (end 1.5 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.5 -0.8) (end 1.5 -0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.5 -0.8) (end 1.5 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.5 -0.8) (end -1.5 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start -3 1.8) (end 3 1.8) (layer F.Fab) (width 0.1))
+    (fp_line (start -3 -1.8) (end 3 -1.8) (layer F.Fab) (width 0.1))
+    (fp_line (start -3 -1.8) (end -3 1.8) (layer F.Fab) (width 0.1))
+    (fp_line (start 3 -1.8) (end 3 1.8) (layer F.Fab) (width 0.1))
+    (pad 1 smd rect (at -3.9 0) (size 1.5 1.5) (layers F.Cu F.Paste F.Mask)
+      (net 48 "Net-(R1-Pad1)"))
+    (pad 2 smd rect (at 3.9 0) (size 1.5 1.5) (layers F.Cu F.Paste F.Mask)
+      (net 9 3.3V))
+    (model ${KISYS3DMOD}/Button_Switch_SMD.3dshapes/SW_SPST_CK_RS282G05A3.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder (layer F.Cu) (tedit 5B36C52B) (tstamp 5F026322)
+    (at 98.425 80.01)
+    (descr "Capacitor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
+    (tags "capacitor handsolder")
+    (path /5DEC9DB9)
+    (attr smd)
+    (fp_text reference C1 (at 0 -1.65) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 100nF (at 0 1.65) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -1 0.6) (end -1 -0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 -0.6) (end 1 -0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 -0.6) (end 1 0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 0.6) (end -1 0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.261252 -0.71) (end 0.261252 -0.71) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.261252 0.71) (end 0.261252 0.71) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_text user %R (at 0 0) (layer F.Fab)
+      (effects (font (size 0.5 0.5) (thickness 0.08)))
+    )
+    (pad 1 smd roundrect (at -1.025 0) (size 1.15 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.217391)
+      (net 1 GND))
+    (pad 2 smd roundrect (at 1.025 0) (size 1.15 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.217391)
+      (net 55 "Net-(C1-Pad2)"))
+    (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0805_2012Metric.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder (layer F.Cu) (tedit 5B36C52B) (tstamp 5F026311)
+    (at 78.74 55.245)
+    (descr "Capacitor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
+    (tags "capacitor handsolder")
+    (path /5DEC3C77)
+    (attr smd)
+    (fp_text reference C2 (at 0 -1.65) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 100nF (at 0 1.65) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 0 0) (layer F.Fab)
+      (effects (font (size 0.5 0.5) (thickness 0.08)))
+    )
+    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.261252 0.71) (end 0.261252 0.71) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.261252 -0.71) (end 0.261252 -0.71) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1 0.6) (end -1 0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 -0.6) (end 1 0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 -0.6) (end 1 -0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 0.6) (end -1 -0.6) (layer F.Fab) (width 0.1))
+    (pad 2 smd roundrect (at 1.025 0) (size 1.15 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.217391)
+      (net 9 3.3V))
+    (pad 1 smd roundrect (at -1.025 0) (size 1.15 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.217391)
+      (net 1 GND))
+    (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0805_2012Metric.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder (layer F.Cu) (tedit 5B36C52B) (tstamp 5F026300)
+    (at 78.74 60.325)
+    (descr "Capacitor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
+    (tags "capacitor handsolder")
+    (path /5DEC3CF5)
+    (attr smd)
+    (fp_text reference C3 (at 0 -1.65) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 100nF (at 0 1.65) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -1 0.6) (end -1 -0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 -0.6) (end 1 -0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 -0.6) (end 1 0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 0.6) (end -1 0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.261252 -0.71) (end 0.261252 -0.71) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.261252 0.71) (end 0.261252 0.71) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_text user %R (at 0 0) (layer F.Fab)
+      (effects (font (size 0.5 0.5) (thickness 0.08)))
+    )
+    (pad 1 smd roundrect (at -1.025 0) (size 1.15 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.217391)
+      (net 1 GND))
+    (pad 2 smd roundrect (at 1.025 0) (size 1.15 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.217391)
+      (net 9 3.3V))
+    (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0805_2012Metric.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder (layer F.Cu) (tedit 5B36C52B) (tstamp 5F0262EF)
+    (at 78.74 65.405)
+    (descr "Capacitor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
+    (tags "capacitor handsolder")
+    (path /5DEC3D3C)
+    (attr smd)
+    (fp_text reference C4 (at 0 -1.65) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 100nF (at 0 1.65) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 0 0) (layer F.Fab)
+      (effects (font (size 0.5 0.5) (thickness 0.08)))
+    )
+    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.261252 0.71) (end 0.261252 0.71) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.261252 -0.71) (end 0.261252 -0.71) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1 0.6) (end -1 0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 -0.6) (end 1 0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 -0.6) (end 1 -0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 0.6) (end -1 -0.6) (layer F.Fab) (width 0.1))
+    (pad 2 smd roundrect (at 1.025 0) (size 1.15 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.217391)
+      (net 9 3.3V))
+    (pad 1 smd roundrect (at -1.025 0) (size 1.15 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.217391)
+      (net 1 GND))
+    (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0805_2012Metric.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder (layer F.Cu) (tedit 5B36C52B) (tstamp 5F0262DE)
+    (at 78.74 70.485)
+    (descr "Capacitor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
+    (tags "capacitor handsolder")
+    (path /5DEC3D7E)
+    (attr smd)
+    (fp_text reference C5 (at 0 -1.65) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 100nF (at 0 1.65) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -1 0.6) (end -1 -0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 -0.6) (end 1 -0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 -0.6) (end 1 0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 0.6) (end -1 0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.261252 -0.71) (end 0.261252 -0.71) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.261252 0.71) (end 0.261252 0.71) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_text user %R (at 0 0) (layer F.Fab)
+      (effects (font (size 0.5 0.5) (thickness 0.08)))
+    )
+    (pad 1 smd roundrect (at -1.025 0) (size 1.15 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.217391)
+      (net 1 GND))
+    (pad 2 smd roundrect (at 1.025 0) (size 1.15 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.217391)
+      (net 9 3.3V))
+    (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0805_2012Metric.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder (layer F.Cu) (tedit 5B36C52B) (tstamp 5F0262CD)
+    (at 162.306 81.28)
+    (descr "Capacitor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
+    (tags "capacitor handsolder")
+    (path /5DEE73ED)
+    (attr smd)
+    (fp_text reference C6 (at 0 -1.65) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 1µF (at 0 1.65) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 0 0) (layer F.Fab)
+      (effects (font (size 0.5 0.5) (thickness 0.08)))
+    )
+    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.261252 0.71) (end 0.261252 0.71) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.261252 -0.71) (end 0.261252 -0.71) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1 0.6) (end -1 0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 -0.6) (end 1 0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 -0.6) (end 1 -0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 0.6) (end -1 -0.6) (layer F.Fab) (width 0.1))
+    (pad 2 smd roundrect (at 1.025 0) (size 1.15 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.217391)
+      (net 9 3.3V))
+    (pad 1 smd roundrect (at -1.025 0) (size 1.15 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.217391)
+      (net 1 GND))
+    (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0805_2012Metric.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder (layer F.Cu) (tedit 5B36C52B) (tstamp 5F0262BC)
+    (at 162.306 75.184)
+    (descr "Capacitor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
+    (tags "capacitor handsolder")
+    (path /5DEC3DF1)
+    (attr smd)
+    (fp_text reference C7 (at 0 -1.65) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 1µF (at 0 1.65) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -1 0.6) (end -1 -0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 -0.6) (end 1 -0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 -0.6) (end 1 0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 0.6) (end -1 0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.261252 -0.71) (end 0.261252 -0.71) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.261252 0.71) (end 0.261252 0.71) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_text user %R (at 0 0) (layer F.Fab)
+      (effects (font (size 0.5 0.5) (thickness 0.08)))
+    )
+    (pad 1 smd roundrect (at -1.025 0) (size 1.15 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.217391)
+      (net 1 GND))
+    (pad 2 smd roundrect (at 1.025 0) (size 1.15 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.217391)
+      (net 8 5V))
+    (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0805_2012Metric.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Diode_SMD:D_SOD-323_HandSoldering (layer F.Cu) (tedit 58641869) (tstamp 5F0262AB)
+    (at 149.86 122.936 270)
+    (descr SOD-323)
+    (tags SOD-323)
+    (path /5DFEF7E0)
+    (attr smd)
+    (fp_text reference D17 (at 0 -1.85 270) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value D4.6 (at 0.1 1.9 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -1.9 -0.85) (end 1.25 -0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.9 0.85) (end 1.25 0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2 -0.95) (end -2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2 -0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 -0.95) (end 2 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.9 -0.7) (end 0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 -0.7) (end 0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 0.7) (end -0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 0.7) (end -0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 -0.35) (end -0.3 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end -0.5 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end 0.2 -0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 -0.35) (end 0.2 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0.35) (end -0.3 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0) (end 0.45 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.9 -0.85) (end -1.9 0.85) (layer F.SilkS) (width 0.12))
+    (fp_text user %R (at 0 -1.85 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 2 smd rect (at 1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 47 "Net-(D17-Pad2)"))
+    (pad 1 smd rect (at -1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 63 ROW4))
+    (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_SOD-323.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Diode_SMD:D_SOD-323_HandSoldering (layer F.Cu) (tedit 58641869) (tstamp 5F026293)
+    (at 149.733 111.76 270)
+    (descr SOD-323)
+    (tags SOD-323)
+    (path /5DFEF7FC)
+    (attr smd)
+    (fp_text reference D15 (at 0 -1.85 270) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value D2.6 (at 0.1 1.9 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 0 -1.85 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -1.9 -0.85) (end -1.9 0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.2 0) (end 0.45 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0.35) (end -0.3 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 -0.35) (end 0.2 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end 0.2 -0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end -0.5 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 -0.35) (end -0.3 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 0.7) (end -0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 0.7) (end -0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 -0.7) (end 0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 -0.7) (end 0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -2 -0.95) (end 2 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2 -0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 -0.95) (end -2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.9 0.85) (end 1.25 0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.9 -0.85) (end 1.25 -0.85) (layer F.SilkS) (width 0.12))
+    (pad 1 smd rect (at -1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 61 ROW2))
+    (pad 2 smd rect (at 1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 41 "Net-(D15-Pad2)"))
+    (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_SOD-323.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Diode_SMD:D_SOD-323_HandSoldering (layer F.Cu) (tedit 58641869) (tstamp 5F02627B)
+    (at 149.733 106.172 270)
+    (descr SOD-323)
+    (tags SOD-323)
+    (path /5DFEF80A)
+    (attr smd)
+    (fp_text reference D14 (at 0 -1.85 270) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value D1.6 (at 0.1 1.9 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -1.9 -0.85) (end 1.25 -0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.9 0.85) (end 1.25 0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2 -0.95) (end -2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2 -0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 -0.95) (end 2 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.9 -0.7) (end 0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 -0.7) (end 0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 0.7) (end -0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 0.7) (end -0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 -0.35) (end -0.3 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end -0.5 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end 0.2 -0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 -0.35) (end 0.2 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0.35) (end -0.3 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0) (end 0.45 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.9 -0.85) (end -1.9 0.85) (layer F.SilkS) (width 0.12))
+    (fp_text user %R (at 0 -1.85 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 2 smd rect (at 1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 36 "Net-(D14-Pad2)"))
+    (pad 1 smd rect (at -1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 60 ROW1))
+    (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_SOD-323.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Diode_SMD:D_SOD-323_HandSoldering (layer F.Cu) (tedit 58641869) (tstamp 5F026263)
+    (at 155.829 122.936 270)
+    (descr SOD-323)
+    (tags SOD-323)
+    (path /5DF621D6)
+    (attr smd)
+    (fp_text reference D12 (at 0 -1.85 270) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value D4.3 (at 0.1 1.9 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 0 -1.85 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -1.9 -0.85) (end -1.9 0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.2 0) (end 0.45 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0.35) (end -0.3 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 -0.35) (end 0.2 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end 0.2 -0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end -0.5 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 -0.35) (end -0.3 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 0.7) (end -0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 0.7) (end -0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 -0.7) (end 0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 -0.7) (end 0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -2 -0.95) (end 2 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2 -0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 -0.95) (end -2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.9 0.85) (end 1.25 0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.9 -0.85) (end 1.25 -0.85) (layer F.SilkS) (width 0.12))
+    (pad 1 smd rect (at -1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 63 ROW4))
+    (pad 2 smd rect (at 1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 37 "Net-(D12-Pad2)"))
+    (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_SOD-323.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Diode_SMD:D_SOD-323_HandSoldering (layer F.Cu) (tedit 58641869) (tstamp 5F02624B)
+    (at 155.829 117.348 270)
+    (descr SOD-323)
+    (tags SOD-323)
+    (path /5DF621C8)
+    (attr smd)
+    (fp_text reference D11 (at 0 -1.85 270) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value D3.3 (at 0.1 1.9 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -1.9 -0.85) (end 1.25 -0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.9 0.85) (end 1.25 0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2 -0.95) (end -2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2 -0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 -0.95) (end 2 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.9 -0.7) (end 0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 -0.7) (end 0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 0.7) (end -0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 0.7) (end -0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 -0.35) (end -0.3 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end -0.5 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end 0.2 -0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 -0.35) (end 0.2 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0.35) (end -0.3 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0) (end 0.45 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.9 -0.85) (end -1.9 0.85) (layer F.SilkS) (width 0.12))
+    (fp_text user %R (at 0 -1.85 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 2 smd rect (at 1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 39 "Net-(D11-Pad2)"))
+    (pad 1 smd rect (at -1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 62 ROW3))
+    (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_SOD-323.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Diode_SMD:D_SOD-323_HandSoldering (layer F.Cu) (tedit 58641869) (tstamp 5F026233)
+    (at 155.829 111.76 270)
+    (descr SOD-323)
+    (tags SOD-323)
+    (path /5DF621F2)
+    (attr smd)
+    (fp_text reference D10 (at 0 -1.85 270) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value D2.3 (at 0.1 1.9 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 0 -1.85 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -1.9 -0.85) (end -1.9 0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.2 0) (end 0.45 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0.35) (end -0.3 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 -0.35) (end 0.2 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end 0.2 -0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end -0.5 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 -0.35) (end -0.3 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 0.7) (end -0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 0.7) (end -0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 -0.7) (end 0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 -0.7) (end 0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -2 -0.95) (end 2 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2 -0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 -0.95) (end -2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.9 0.85) (end 1.25 0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.9 -0.85) (end 1.25 -0.85) (layer F.SilkS) (width 0.12))
+    (pad 1 smd rect (at -1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 61 ROW2))
+    (pad 2 smd rect (at 1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 40 "Net-(D10-Pad2)"))
+    (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_SOD-323.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Diode_SMD:D_SOD-323_HandSoldering (layer F.Cu) (tedit 58641869) (tstamp 5F02621B)
+    (at 155.829 106.172 270)
+    (descr SOD-323)
+    (tags SOD-323)
+    (path /5DF62200)
+    (attr smd)
+    (fp_text reference D9 (at 0 -1.85 270) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value D1.3 (at 0.1 1.9 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -1.9 -0.85) (end 1.25 -0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.9 0.85) (end 1.25 0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2 -0.95) (end -2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2 -0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 -0.95) (end 2 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.9 -0.7) (end 0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 -0.7) (end 0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 0.7) (end -0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 0.7) (end -0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 -0.35) (end -0.3 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end -0.5 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end 0.2 -0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 -0.35) (end 0.2 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0.35) (end -0.3 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0) (end 0.45 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.9 -0.85) (end -1.9 0.85) (layer F.SilkS) (width 0.12))
+    (fp_text user %R (at 0 -1.85 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 2 smd rect (at 1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 42 "Net-(D9-Pad2)"))
+    (pad 1 smd rect (at -1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 60 ROW1))
+    (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_SOD-323.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Diode_SMD:D_SOD-323_HandSoldering (layer F.Cu) (tedit 58641869) (tstamp 5F026203)
+    (at 159.893 117.348 270)
+    (descr SOD-323)
+    (tags SOD-323)
+    (path /5DFE6378)
+    (attr smd)
+    (fp_text reference D7 (at 0 -1.85 270) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value D3.1 (at 0.1 1.9 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 0 -1.85 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -1.9 -0.85) (end -1.9 0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.2 0) (end 0.45 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0.35) (end -0.3 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 -0.35) (end 0.2 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end 0.2 -0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end -0.5 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 -0.35) (end -0.3 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 0.7) (end -0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 0.7) (end -0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 -0.7) (end 0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 -0.7) (end 0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -2 -0.95) (end 2 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2 -0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 -0.95) (end -2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.9 0.85) (end 1.25 0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.9 -0.85) (end 1.25 -0.85) (layer F.SilkS) (width 0.12))
+    (pad 1 smd rect (at -1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 62 ROW3))
+    (pad 2 smd rect (at 1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 43 "Net-(D7-Pad2)"))
+    (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_SOD-323.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Diode_SMD:D_SOD-323_HandSoldering (layer F.Cu) (tedit 58641869) (tstamp 5F0261EB)
+    (at 159.893 111.76 270)
+    (descr SOD-323)
+    (tags SOD-323)
+    (path /5DFE63A2)
+    (attr smd)
+    (fp_text reference D6 (at 0 -1.85 270) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value D2.1 (at 0.1 1.9 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -1.9 -0.85) (end 1.25 -0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.9 0.85) (end 1.25 0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2 -0.95) (end -2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2 -0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 -0.95) (end 2 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.9 -0.7) (end 0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 -0.7) (end 0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 0.7) (end -0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 0.7) (end -0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 -0.35) (end -0.3 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end -0.5 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end 0.2 -0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 -0.35) (end 0.2 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0.35) (end -0.3 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0) (end 0.45 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.9 -0.85) (end -1.9 0.85) (layer F.SilkS) (width 0.12))
+    (fp_text user %R (at 0 -1.85 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 2 smd rect (at 1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 45 "Net-(D6-Pad2)"))
+    (pad 1 smd rect (at -1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 61 ROW2))
+    (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_SOD-323.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Diode_SMD:D_SOD-323_HandSoldering (layer F.Cu) (tedit 58641869) (tstamp 5F02A06A)
+    (at 159.893 106.172 270)
+    (descr SOD-323)
+    (tags SOD-323)
+    (path /5DFE63B0)
+    (attr smd)
+    (fp_text reference D5 (at 0 -1.85 270) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value D1.1 (at 0.1 1.9 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 0 -1.85 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -1.9 -0.85) (end -1.9 0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.2 0) (end 0.45 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0.35) (end -0.3 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 -0.35) (end 0.2 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end 0.2 -0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end -0.5 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 -0.35) (end -0.3 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 0.7) (end -0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 0.7) (end -0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 -0.7) (end 0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 -0.7) (end 0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -2 -0.95) (end 2 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2 -0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 -0.95) (end -2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.9 0.85) (end 1.25 0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.9 -0.85) (end 1.25 -0.85) (layer F.SilkS) (width 0.12))
+    (pad 1 smd rect (at -1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 60 ROW1))
+    (pad 2 smd rect (at 1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 46 "Net-(D5-Pad2)"))
+    (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_SOD-323.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Diode_SMD:D_SOD-323_HandSoldering (layer F.Cu) (tedit 58641869) (tstamp 5F0261BB)
+    (at 149.733 117.348 270)
+    (descr SOD-323)
+    (tags SOD-323)
+    (path /5DFEF7D2)
+    (attr smd)
+    (fp_text reference D16 (at 0 -1.85 270) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value D3.6 (at 0.1 1.9 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -1.9 -0.85) (end 1.25 -0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.9 0.85) (end 1.25 0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2 -0.95) (end -2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2 -0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 -0.95) (end 2 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.9 -0.7) (end 0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 -0.7) (end 0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 0.7) (end -0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 0.7) (end -0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 -0.35) (end -0.3 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end -0.5 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end 0.2 -0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 -0.35) (end 0.2 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0.35) (end -0.3 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0) (end 0.45 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.9 -0.85) (end -1.9 0.85) (layer F.SilkS) (width 0.12))
+    (fp_text user %R (at 0 -1.85 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 2 smd rect (at 1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 34 "Net-(D16-Pad2)"))
+    (pad 1 smd rect (at -1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 62 ROW3))
+    (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_SOD-323.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Diode_SMD:D_SOD-323_HandSoldering (layer F.Cu) (tedit 58641869) (tstamp 5F0261A3)
+    (at 157.861 111.76 270)
+    (descr SOD-323)
+    (tags SOD-323)
+    (path /5DFE63F5)
+    (attr smd)
+    (fp_text reference D20 (at 0 -1.85 270) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value D2.2 (at 0.1 1.9 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 0 -1.85 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -1.9 -0.85) (end -1.9 0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.2 0) (end 0.45 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0.35) (end -0.3 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 -0.35) (end 0.2 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end 0.2 -0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end -0.5 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 -0.35) (end -0.3 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 0.7) (end -0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 0.7) (end -0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 -0.7) (end 0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 -0.7) (end 0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -2 -0.95) (end 2 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2 -0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 -0.95) (end -2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.9 0.85) (end 1.25 0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.9 -0.85) (end 1.25 -0.85) (layer F.SilkS) (width 0.12))
+    (pad 1 smd rect (at -1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 61 ROW2))
+    (pad 2 smd rect (at 1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 32 "Net-(D20-Pad2)"))
+    (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_SOD-323.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Diode_SMD:D_SOD-323_HandSoldering (layer F.Cu) (tedit 58641869) (tstamp 5F02618B)
+    (at 151.892 122.936 270)
+    (descr SOD-323)
+    (tags SOD-323)
+    (path /5DFE3E98)
+    (attr smd)
+    (fp_text reference D36 (at 0 -1.85 270) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value D4.5 (at 0.1 1.9 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -1.9 -0.85) (end 1.25 -0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.9 0.85) (end 1.25 0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2 -0.95) (end -2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2 -0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 -0.95) (end 2 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.9 -0.7) (end 0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 -0.7) (end 0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 0.7) (end -0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 0.7) (end -0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 -0.35) (end -0.3 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end -0.5 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end 0.2 -0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 -0.35) (end 0.2 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0.35) (end -0.3 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0) (end 0.45 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.9 -0.85) (end -1.9 0.85) (layer F.SilkS) (width 0.12))
+    (fp_text user %R (at 0 -1.85 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 2 smd rect (at 1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 22 "Net-(D36-Pad2)"))
+    (pad 1 smd rect (at -1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 63 ROW4))
+    (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_SOD-323.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Diode_SMD:D_SOD-323_HandSoldering (layer F.Cu) (tedit 58641869) (tstamp 5F026173)
+    (at 151.765 111.76 270)
+    (descr SOD-323)
+    (tags SOD-323)
+    (path /5DFE3EB4)
+    (attr smd)
+    (fp_text reference D34 (at 0 -1.85 270) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value D2.5 (at 0.1 1.9 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 0 -1.85 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -1.9 -0.85) (end -1.9 0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.2 0) (end 0.45 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0.35) (end -0.3 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 -0.35) (end 0.2 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end 0.2 -0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end -0.5 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 -0.35) (end -0.3 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 0.7) (end -0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 0.7) (end -0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 -0.7) (end 0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 -0.7) (end 0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -2 -0.95) (end 2 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2 -0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 -0.95) (end -2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.9 0.85) (end 1.25 0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.9 -0.85) (end 1.25 -0.85) (layer F.SilkS) (width 0.12))
+    (pad 1 smd rect (at -1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 61 ROW2))
+    (pad 2 smd rect (at 1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 25 "Net-(D34-Pad2)"))
+    (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_SOD-323.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Diode_SMD:D_SOD-323_HandSoldering (layer F.Cu) (tedit 58641869) (tstamp 5F02615B)
+    (at 151.765 106.172 270)
+    (descr SOD-323)
+    (tags SOD-323)
+    (path /5DFE3EC2)
+    (attr smd)
+    (fp_text reference D33 (at 0 -1.85 270) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value D1.5 (at 0.1 1.9 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -1.9 -0.85) (end 1.25 -0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.9 0.85) (end 1.25 0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2 -0.95) (end -2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2 -0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 -0.95) (end 2 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.9 -0.7) (end 0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 -0.7) (end 0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 0.7) (end -0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 0.7) (end -0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 -0.35) (end -0.3 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end -0.5 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end 0.2 -0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 -0.35) (end 0.2 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0.35) (end -0.3 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0) (end 0.45 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.9 -0.85) (end -1.9 0.85) (layer F.SilkS) (width 0.12))
+    (fp_text user %R (at 0 -1.85 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 2 smd rect (at 1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 26 "Net-(D33-Pad2)"))
+    (pad 1 smd rect (at -1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 60 ROW1))
+    (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_SOD-323.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Diode_SMD:D_SOD-323_HandSoldering (layer F.Cu) (tedit 58641869) (tstamp 5F026143)
+    (at 153.797 122.936 270)
+    (descr SOD-323)
+    (tags SOD-323)
+    (path /5DFE23DF)
+    (attr smd)
+    (fp_text reference D26 (at 0 -1.85 270) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value D4.4 (at 0.1 1.9 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 0 -1.85 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -1.9 -0.85) (end -1.9 0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.2 0) (end 0.45 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0.35) (end -0.3 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 -0.35) (end 0.2 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end 0.2 -0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end -0.5 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 -0.35) (end -0.3 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 0.7) (end -0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 0.7) (end -0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 -0.7) (end 0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 -0.7) (end 0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -2 -0.95) (end 2 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2 -0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 -0.95) (end -2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.9 0.85) (end 1.25 0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.9 -0.85) (end 1.25 -0.85) (layer F.SilkS) (width 0.12))
+    (pad 1 smd rect (at -1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 63 ROW4))
+    (pad 2 smd rect (at 1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 20 "Net-(D26-Pad2)"))
+    (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_SOD-323.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Diode_SMD:D_SOD-323_HandSoldering (layer F.Cu) (tedit 58641869) (tstamp 5F02612B)
+    (at 153.797 117.348 270)
+    (descr SOD-323)
+    (tags SOD-323)
+    (path /5DFE23D1)
+    (attr smd)
+    (fp_text reference D25 (at 0 -1.85 270) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value D3.4 (at 0.1 1.9 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -1.9 -0.85) (end 1.25 -0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.9 0.85) (end 1.25 0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2 -0.95) (end -2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2 -0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 -0.95) (end 2 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.9 -0.7) (end 0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 -0.7) (end 0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 0.7) (end -0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 0.7) (end -0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 -0.35) (end -0.3 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end -0.5 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end 0.2 -0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 -0.35) (end 0.2 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0.35) (end -0.3 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0) (end 0.45 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.9 -0.85) (end -1.9 0.85) (layer F.SilkS) (width 0.12))
+    (fp_text user %R (at 0 -1.85 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 2 smd rect (at 1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 27 "Net-(D25-Pad2)"))
+    (pad 1 smd rect (at -1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 62 ROW3))
+    (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_SOD-323.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Diode_SMD:D_SOD-323_HandSoldering (layer F.Cu) (tedit 58641869) (tstamp 5F026113)
+    (at 153.797 111.76 270)
+    (descr SOD-323)
+    (tags SOD-323)
+    (path /5DFE23FB)
+    (attr smd)
+    (fp_text reference D24 (at 0 -1.85 270) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value D2.4 (at 0.1 1.9 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 0 -1.85 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -1.9 -0.85) (end -1.9 0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.2 0) (end 0.45 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0.35) (end -0.3 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 -0.35) (end 0.2 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end 0.2 -0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end -0.5 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 -0.35) (end -0.3 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 0.7) (end -0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 0.7) (end -0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 -0.7) (end 0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 -0.7) (end 0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -2 -0.95) (end 2 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2 -0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 -0.95) (end -2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.9 0.85) (end 1.25 0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.9 -0.85) (end 1.25 -0.85) (layer F.SilkS) (width 0.12))
+    (pad 1 smd rect (at -1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 61 ROW2))
+    (pad 2 smd rect (at 1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 28 "Net-(D24-Pad2)"))
+    (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_SOD-323.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Diode_SMD:D_SOD-323_HandSoldering (layer F.Cu) (tedit 58641869) (tstamp 5F0260FB)
+    (at 153.797 106.172 270)
+    (descr SOD-323)
+    (tags SOD-323)
+    (path /5DFE2409)
+    (attr smd)
+    (fp_text reference D23 (at 0 -1.85 270) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value D1.4 (at 0.1 1.9 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -1.9 -0.85) (end 1.25 -0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.9 0.85) (end 1.25 0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2 -0.95) (end -2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2 -0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 -0.95) (end 2 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.9 -0.7) (end 0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 -0.7) (end 0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 0.7) (end -0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 0.7) (end -0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 -0.35) (end -0.3 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end -0.5 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end 0.2 -0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 -0.35) (end 0.2 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0.35) (end -0.3 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0) (end 0.45 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.9 -0.85) (end -1.9 0.85) (layer F.SilkS) (width 0.12))
+    (fp_text user %R (at 0 -1.85 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 2 smd rect (at 1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 29 "Net-(D23-Pad2)"))
+    (pad 1 smd rect (at -1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 60 ROW1))
+    (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_SOD-323.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Diode_SMD:D_SOD-323_HandSoldering (layer F.Cu) (tedit 58641869) (tstamp 5F0260E3)
+    (at 157.861 117.348 270)
+    (descr SOD-323)
+    (tags SOD-323)
+    (path /5DFE63CB)
+    (attr smd)
+    (fp_text reference D21 (at 0 -1.85 270) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value D3.2 (at 0.1 1.9 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 0 -1.85 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -1.9 -0.85) (end -1.9 0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.2 0) (end 0.45 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0.35) (end -0.3 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 -0.35) (end 0.2 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end 0.2 -0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end -0.5 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 -0.35) (end -0.3 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 0.7) (end -0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 0.7) (end -0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 -0.7) (end 0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 -0.7) (end 0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -2 -0.95) (end 2 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2 -0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 -0.95) (end -2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.9 0.85) (end 1.25 0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.9 -0.85) (end 1.25 -0.85) (layer F.SilkS) (width 0.12))
+    (pad 1 smd rect (at -1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 62 ROW3))
+    (pad 2 smd rect (at 1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 30 "Net-(D21-Pad2)"))
+    (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_SOD-323.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Diode_SMD:D_SOD-323_HandSoldering (layer F.Cu) (tedit 58641869) (tstamp 5F0260CB)
+    (at 157.861 106.172 270)
+    (descr SOD-323)
+    (tags SOD-323)
+    (path /5DFE6403)
+    (attr smd)
+    (fp_text reference D19 (at 0 -1.85 270) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value D1.2 (at 0.1 1.9 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -1.9 -0.85) (end 1.25 -0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.9 0.85) (end 1.25 0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2 -0.95) (end -2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2 -0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 -0.95) (end 2 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.9 -0.7) (end 0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 -0.7) (end 0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 0.7) (end -0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 0.7) (end -0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 -0.35) (end -0.3 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end -0.5 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end 0.2 -0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 -0.35) (end 0.2 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0.35) (end -0.3 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0) (end 0.45 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.9 -0.85) (end -1.9 0.85) (layer F.SilkS) (width 0.12))
+    (fp_text user %R (at 0 -1.85 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 2 smd rect (at 1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 33 "Net-(D19-Pad2)"))
+    (pad 1 smd rect (at -1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 60 ROW1))
+    (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_SOD-323.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Diode_SMD:D_SOD-323_HandSoldering (layer F.Cu) (tedit 58641869) (tstamp 5F0260B3)
+    (at 151.765 117.348 270)
+    (descr SOD-323)
+    (tags SOD-323)
+    (path /5DFE3E8A)
+    (attr smd)
+    (fp_text reference D35 (at 0 -1.85 270) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value D3.5 (at 0.1 1.9 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 0 -1.85 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -1.9 -0.85) (end -1.9 0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.2 0) (end 0.45 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 0.35) (end -0.3 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.2 -0.35) (end 0.2 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end 0.2 -0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 0) (end -0.5 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.3 -0.35) (end -0.3 0.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 0.7) (end -0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 0.7) (end -0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.9 -0.7) (end 0.9 0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.9 -0.7) (end 0.9 -0.7) (layer F.Fab) (width 0.1))
+    (fp_line (start -2 -0.95) (end 2 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2 -0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 0.95) (end 2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2 -0.95) (end -2 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.9 0.85) (end 1.25 0.85) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.9 -0.85) (end 1.25 -0.85) (layer F.SilkS) (width 0.12))
+    (pad 1 smd rect (at -1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 62 ROW3))
+    (pad 2 smd rect (at 1.25 0 270) (size 1 1) (layers F.Cu F.Paste F.Mask)
+      (net 24 "Net-(D35-Pad2)"))
+    (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_SOD-323.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Package_QFP:LQFP-48_7x7mm_P0.5mm (layer F.Cu) (tedit 5A5E2375) (tstamp 5F02609B)
+    (at 71.755 80.645)
+    (descr "48 LEAD LQFP 7x7mm (see MICREL LQFP7x7-48LD-PL-1.pdf)")
+    (tags "QFP 0.5")
+    (path /5DEC39DF)
+    (attr smd)
+    (fp_text reference U1 (at 0 -6) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value STM32 (at 0 6) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 3.13 3.75) (end 3.75 3.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 3.75 3.13) (end 3.75 3.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 3.13 5.25) (end 3.13 3.75) (layer F.CrtYd) (width 0.05))
+    (fp_text user %R (at 0 0) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -2.5 -3.5) (end 3.5 -3.5) (layer F.Fab) (width 0.1))
+    (fp_line (start 3.5 -3.5) (end 3.5 3.5) (layer F.Fab) (width 0.1))
+    (fp_line (start 3.5 3.5) (end -3.5 3.5) (layer F.Fab) (width 0.1))
+    (fp_line (start -3.5 3.5) (end -3.5 -2.5) (layer F.Fab) (width 0.1))
+    (fp_line (start -3.5 -2.5) (end -2.5 -3.5) (layer F.Fab) (width 0.1))
+    (fp_line (start -5.25 -3.13) (end -5.25 3.13) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 5.25 -3.13) (end 5.25 3.13) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -3.13 -5.25) (end 3.13 -5.25) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -3.13 5.25) (end 3.13 5.25) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 3.56 -3.56) (end 3.56 -3.14) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.56 3.56) (end 3.56 3.14) (layer F.SilkS) (width 0.12))
+    (fp_line (start -3.56 3.56) (end -3.56 3.14) (layer F.SilkS) (width 0.12))
+    (fp_line (start -3.56 -3.56) (end -3.14 -3.56) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.56 3.56) (end 3.14 3.56) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.56 -3.56) (end 3.14 -3.56) (layer F.SilkS) (width 0.12))
+    (fp_line (start -3.56 -3.14) (end -4.94 -3.14) (layer F.SilkS) (width 0.12))
+    (fp_line (start -3.56 -3.56) (end -3.56 -3.14) (layer F.SilkS) (width 0.12))
+    (fp_line (start -3.56 3.56) (end -3.14 3.56) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.75 3.13) (end 5.25 3.13) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 3.75 -3.13) (end 5.25 -3.13) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 3.13 -3.75) (end 3.13 -5.25) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -3.13 -3.75) (end -3.13 -5.25) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -3.75 -3.13) (end -5.25 -3.13) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -3.75 3.13) (end -5.25 3.13) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -3.13 3.75) (end -3.13 5.25) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 3.13 -3.75) (end 3.75 -3.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 3.75 -3.13) (end 3.75 -3.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -3.75 3.13) (end -3.75 3.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -3.13 3.75) (end -3.75 3.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -3.75 -3.13) (end -3.75 -3.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -3.13 -3.75) (end -3.75 -3.75) (layer F.CrtYd) (width 0.05))
+    (pad 1 smd rect (at -4.35 -2.75) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 49 VBAT))
+    (pad 2 smd rect (at -4.35 -2.25) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 50 "Net-(U1-Pad2)"))
+    (pad 3 smd rect (at -4.35 -1.75) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 51 "Net-(U1-Pad3)"))
+    (pad 4 smd rect (at -4.35 -1.25) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 52 "Net-(U1-Pad4)"))
+    (pad 5 smd rect (at -4.35 -0.75) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 53 "Net-(U1-Pad5)"))
+    (pad 6 smd rect (at -4.35 -0.25) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 54 "Net-(U1-Pad6)"))
+    (pad 7 smd rect (at -4.35 0.25) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 55 "Net-(C1-Pad2)"))
+    (pad 8 smd rect (at -4.35 0.75) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 1 GND))
+    (pad 9 smd rect (at -4.35 1.25) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 9 3.3V))
+    (pad 10 smd rect (at -4.35 1.75) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 56 "Net-(U1-Pad10)"))
+    (pad 11 smd rect (at -4.35 2.25) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 57 "Net-(U1-Pad11)"))
+    (pad 12 smd rect (at -4.35 2.75) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 58 "Net-(U1-Pad12)"))
+    (pad 13 smd rect (at -2.75 4.35 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 59 "Net-(U1-Pad13)"))
+    (pad 14 smd rect (at -2.25 4.35 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 12 PA4))
+    (pad 15 smd rect (at -1.75 4.35 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 13 PA5))
+    (pad 16 smd rect (at -1.25 4.35 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 14 PA6))
+    (pad 17 smd rect (at -0.75 4.35 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 15 PA7))
+    (pad 18 smd rect (at -0.25 4.35 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 60 ROW1))
+    (pad 19 smd rect (at 0.25 4.35 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 61 ROW2))
+    (pad 20 smd rect (at 0.75 4.35 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 62 ROW3))
+    (pad 21 smd rect (at 1.25 4.35 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 63 ROW4))
+    (pad 22 smd rect (at 1.75 4.35 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 64 "Net-(U1-Pad22)"))
+    (pad 23 smd rect (at 2.25 4.35 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 1 GND))
+    (pad 24 smd rect (at 2.75 4.35 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 9 3.3V))
+    (pad 25 smd rect (at 4.35 2.75) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 9 3.3V))
+    (pad 26 smd rect (at 4.35 2.25) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 65 "Net-(U1-Pad26)"))
+    (pad 27 smd rect (at 4.35 1.75) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 66 "Net-(U1-Pad27)"))
+    (pad 28 smd rect (at 4.35 1.25) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 67 "Net-(U1-Pad28)"))
+    (pad 29 smd rect (at 4.35 0.75) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 68 "Net-(U1-Pad29)"))
+    (pad 30 smd rect (at 4.35 0.25) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 18 TX))
+    (pad 31 smd rect (at 4.35 -0.25) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 19 RX))
+    (pad 32 smd rect (at 4.35 -0.75) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 5 D-))
+    (pad 33 smd rect (at 4.35 -1.25) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 2 D+))
+    (pad 34 smd rect (at 4.35 -1.75) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 10 SWDIO))
+    (pad 35 smd rect (at 4.35 -2.25) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 1 GND))
+    (pad 36 smd rect (at 4.35 -2.75) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 9 3.3V))
+    (pad 37 smd rect (at 2.75 -4.35 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 11 SWDCLK))
+    (pad 38 smd rect (at 2.25 -4.35 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 44 COL1))
+    (pad 39 smd rect (at 1.75 -4.35 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 31 COL2))
+    (pad 40 smd rect (at 1.25 -4.35 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 38 COL3))
+    (pad 41 smd rect (at 0.75 -4.35 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 21 COL4))
+    (pad 42 smd rect (at 0.25 -4.35 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 16 PB6))
+    (pad 43 smd rect (at -0.25 -4.35 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 17 PB7))
+    (pad 44 smd rect (at -0.75 -4.35 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 48 "Net-(R1-Pad1)"))
+    (pad 45 smd rect (at -1.25 -4.35 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 23 COL5))
+    (pad 46 smd rect (at -1.75 -4.35 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 35 COL6))
+    (pad 47 smd rect (at -2.25 -4.35 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 1 GND))
+    (pad 48 smd rect (at -2.75 -4.35 90) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+      (net 9 3.3V))
+    (model ${KISYS3DMOD}/Package_QFP.3dshapes/LQFP-48_7x7mm_P0.5mm.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Package_TO_SOT_SMD:SOT-23 (layer F.Cu) (tedit 5A02FF57) (tstamp 5F026044)
+    (at 162.306 78.232 180)
+    (descr "SOT-23, Standard")
+    (tags SOT-23)
+    (path /5DED53E7)
+    (attr smd)
+    (fp_text reference U2 (at 0 -2.5 180) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value LDO (at 0 2.5 180) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 0 0 270) (layer F.Fab)
+      (effects (font (size 0.5 0.5) (thickness 0.075)))
+    )
+    (fp_line (start -0.7 -0.95) (end -0.7 1.5) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.15 -1.52) (end 0.7 -1.52) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.7 -0.95) (end -0.15 -1.52) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.7 -1.52) (end 0.7 1.52) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.7 1.52) (end 0.7 1.52) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.76 1.58) (end 0.76 0.65) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.76 -1.58) (end 0.76 -0.65) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.7 -1.75) (end 1.7 -1.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.7 -1.75) (end 1.7 1.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.7 1.75) (end -1.7 1.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.7 1.75) (end -1.7 -1.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 0.76 -1.58) (end -1.4 -1.58) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.76 1.58) (end -0.7 1.58) (layer F.SilkS) (width 0.12))
+    (pad 1 smd rect (at -1 -0.95 180) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
+      (net 9 3.3V))
+    (pad 2 smd rect (at -1 0.95 180) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
+      (net 8 5V))
+    (pad 3 smd rect (at 1 0 180) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
+      (net 1 GND))
+    (model ${KISYS3DMOD}/Package_TO_SOT_SMD.3dshapes/SOT-23.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder (layer F.Cu) (tedit 5B36C52B) (tstamp 5F02602F)
+    (at 159.258 74.676 270)
+    (descr "Resistor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
+    (tags "resistor handsolder")
+    (path /5DEDEA73)
+    (attr smd)
+    (fp_text reference R7 (at 0 -1.65 270) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 5.1k (at 0 1.65 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -1 0.6) (end -1 -0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 -0.6) (end 1 -0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 -0.6) (end 1 0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 0.6) (end -1 0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.261252 -0.71) (end 0.261252 -0.71) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.261252 0.71) (end 0.261252 0.71) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_text user %R (at 0 0 270) (layer F.Fab)
+      (effects (font (size 0.5 0.5) (thickness 0.08)))
+    )
+    (pad 1 smd roundrect (at -1.025 0 270) (size 1.15 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.217391)
+      (net 6 "Net-(J1-PadA5)"))
+    (pad 2 smd roundrect (at 1.025 0 270) (size 1.15 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.217391)
+      (net 1 GND))
+    (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0805_2012Metric.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder (layer F.Cu) (tedit 5B36C52B) (tstamp 5F02601E)
+    (at 154.686 74.676 270)
+    (descr "Resistor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
+    (tags "resistor handsolder")
+    (path /5DEDEAE6)
+    (attr smd)
+    (fp_text reference R6 (at 0 -1.65 270) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 5.1k (at 0 1.65 270) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 0 0 270) (layer F.Fab)
+      (effects (font (size 0.5 0.5) (thickness 0.08)))
+    )
+    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.261252 0.71) (end 0.261252 0.71) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.261252 -0.71) (end 0.261252 -0.71) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1 0.6) (end -1 0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 -0.6) (end 1 0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 -0.6) (end 1 -0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 0.6) (end -1 -0.6) (layer F.Fab) (width 0.1))
+    (pad 2 smd roundrect (at 1.025 0 270) (size 1.15 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.217391)
+      (net 1 GND))
+    (pad 1 smd roundrect (at -1.025 0 270) (size 1.15 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.217391)
+      (net 3 "Net-(J1-PadB5)"))
+    (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0805_2012Metric.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder (layer F.Cu) (tedit 5B36C52B) (tstamp 5F02600D)
+    (at 95.885 92.075)
+    (descr "Resistor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
+    (tags "resistor handsolder")
+    (path /5DECE7D2)
+    (attr smd)
+    (fp_text reference R1 (at 0 -1.65) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 5.1k (at 0 1.65) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -1 0.6) (end -1 -0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 -0.6) (end 1 -0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 -0.6) (end 1 0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start 1 0.6) (end -1 0.6) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.261252 -0.71) (end 0.261252 -0.71) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.261252 0.71) (end 0.261252 0.71) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer F.CrtYd) (width 0.05))
+    (fp_text user %R (at 0 0) (layer F.Fab)
+      (effects (font (size 0.5 0.5) (thickness 0.08)))
+    )
+    (pad 1 smd roundrect (at -1.025 0) (size 1.15 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.217391)
+      (net 48 "Net-(R1-Pad1)"))
+    (pad 2 smd roundrect (at 1.025 0) (size 1.15 1.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.217391)
+      (net 1 GND))
+    (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0805_2012Metric.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module foostan-kbd:CherryMX_Choc_1u (layer F.Cu) (tedit 5C66D612) (tstamp 5F028DAB)
+    (at 161.544 134.62 26.5)
+    (path /5DFEF7E7)
+    (fp_text reference SW15 (at 4.6 6 26.5) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value SW_Push (at -0.5 6 26.5) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 7 7) (end 7 6) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 6 7) (end 7 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -7) (end -6 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -6) (end -7 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 9.525) (end -9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 9.525) (end -9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 -9.525) (end 9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 -9.525) (end 9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (pad "" np_thru_hole circle (at -5.22 4.2 26.5) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.22 4.2 26.5) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.08 0 26.5) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.08 0 26.5) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad 1 thru_hole circle (at -3.81 -2.54 76.5) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 47 "Net-(D17-Pad2)"))
+    (pad 2 thru_hole circle (at 2.54 -5.08 26.5) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 35 COL6))
+    (pad 2 thru_hole circle (at 0 -5.9 116.5) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 35 COL6))
+    (pad "" np_thru_hole circle (at 5.5 0 116.5) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.5 0 116.5) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 0 0 116.5) (size 4 4) (drill 4) (layers *.Cu *.Mask))
+    (pad 1 thru_hole circle (at 5.1 -3.9 336.5) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 47 "Net-(D17-Pad2)"))
+  )
+
+  (module foostan-kbd:CherryMX_Choc_1u (layer F.Cu) (tedit 5C66D612) (tstamp 5F029325)
+    (at 269.24 82.55)
+    (path /5DFE63B7)
+    (fp_text reference SW3 (at 4.6 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value SW_Push (at -0.5 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -9.525 -9.525) (end 9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 -9.525) (end 9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 9.525) (end -9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 9.525) (end -9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -6) (end -7 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -7) (end -6 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 6 7) (end 7 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 7 7) (end 7 6) (layer Dwgs.User) (width 0.15))
+    (pad 1 thru_hole circle (at 5.1 -3.9 310) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 46 "Net-(D5-Pad2)"))
+    (pad "" np_thru_hole circle (at 0 0 90) (size 4 4) (drill 4) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad 2 thru_hole circle (at 0 -5.9 90) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 44 COL1))
+    (pad 2 thru_hole circle (at 2.54 -5.08) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 44 COL1))
+    (pad 1 thru_hole circle (at -3.81 -2.54 50) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 46 "Net-(D5-Pad2)"))
+    (pad "" np_thru_hole circle (at 5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+  )
+
+  (module foostan-kbd:CherryMX_Choc_1u (layer F.Cu) (tedit 5C66D612) (tstamp 5F029367)
+    (at 269.24 101.6)
+    (path /5DFE63A9)
+    (fp_text reference SW4 (at 4.6 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value SW_Push (at -0.5 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 7 7) (end 7 6) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 6 7) (end 7 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -7) (end -6 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -6) (end -7 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 9.525) (end -9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 9.525) (end -9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 -9.525) (end 9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 -9.525) (end 9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (pad "" np_thru_hole circle (at -5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad 1 thru_hole circle (at -3.81 -2.54 50) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 45 "Net-(D6-Pad2)"))
+    (pad 2 thru_hole circle (at 2.54 -5.08) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 44 COL1))
+    (pad 2 thru_hole circle (at 0 -5.9 90) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 44 COL1))
+    (pad "" np_thru_hole circle (at 5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 0 0 90) (size 4 4) (drill 4) (layers *.Cu *.Mask))
+    (pad 1 thru_hole circle (at 5.1 -3.9 310) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 45 "Net-(D6-Pad2)"))
+  )
+
+  (module foostan-kbd:CherryMX_Choc_1u (layer F.Cu) (tedit 5C66D612) (tstamp 5F0293A9)
+    (at 269.24 120.65)
+    (path /5DFE637F)
+    (fp_text reference SW5 (at 4.6 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value SW_Push (at -0.5 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -9.525 -9.525) (end 9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 -9.525) (end 9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 9.525) (end -9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 9.525) (end -9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -6) (end -7 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -7) (end -6 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 6 7) (end 7 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 7 7) (end 7 6) (layer Dwgs.User) (width 0.15))
+    (pad 1 thru_hole circle (at 5.1 -3.9 310) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 43 "Net-(D7-Pad2)"))
+    (pad "" np_thru_hole circle (at 0 0 90) (size 4 4) (drill 4) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad 2 thru_hole circle (at 0 -5.9 90) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 44 COL1))
+    (pad 2 thru_hole circle (at 2.54 -5.08) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 44 COL1))
+    (pad 1 thru_hole circle (at -3.81 -2.54 50) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 43 "Net-(D7-Pad2)"))
+    (pad "" np_thru_hole circle (at 5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+  )
+
+  (module foostan-kbd:CherryMX_Choc_1u (layer F.Cu) (tedit 5C66D612) (tstamp 5F025FA0)
+    (at 231.14 69.85)
+    (path /5DF62207)
+    (fp_text reference SW7 (at 4.6 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value SW_Push (at -0.5 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 7 7) (end 7 6) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 6 7) (end 7 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -7) (end -6 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -6) (end -7 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 9.525) (end -9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 9.525) (end -9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 -9.525) (end 9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 -9.525) (end 9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (pad "" np_thru_hole circle (at -5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad 1 thru_hole circle (at -3.81 -2.54 50) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 42 "Net-(D9-Pad2)"))
+    (pad 2 thru_hole circle (at 2.54 -5.08) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 38 COL3))
+    (pad 2 thru_hole circle (at 0 -5.9 90) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 38 COL3))
+    (pad "" np_thru_hole circle (at 5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 0 0 90) (size 4 4) (drill 4) (layers *.Cu *.Mask))
+    (pad 1 thru_hole circle (at 5.1 -3.9 310) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 42 "Net-(D9-Pad2)"))
+  )
+
+  (module foostan-kbd:CherryMX_Choc_1u (layer F.Cu) (tedit 5C66D612) (tstamp 5F025F89)
+    (at 173.99 91.44)
+    (path /5DFEF803)
+    (fp_text reference SW13 (at 4.6 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value SW_Push (at -0.5 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -9.525 -9.525) (end 9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 -9.525) (end 9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 9.525) (end -9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 9.525) (end -9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -6) (end -7 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -7) (end -6 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 6 7) (end 7 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 7 7) (end 7 6) (layer Dwgs.User) (width 0.15))
+    (pad 1 thru_hole circle (at 5.1 -3.9 310) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 41 "Net-(D15-Pad2)"))
+    (pad "" np_thru_hole circle (at 0 0 90) (size 4 4) (drill 4) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad 2 thru_hole circle (at 0 -5.9 90) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 35 COL6))
+    (pad 2 thru_hole circle (at 2.54 -5.08) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 35 COL6))
+    (pad 1 thru_hole circle (at -3.81 -2.54 50) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 41 "Net-(D15-Pad2)"))
+    (pad "" np_thru_hole circle (at 5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+  )
+
+  (module foostan-kbd:CherryMX_Choc_1u (layer F.Cu) (tedit 5C66D612) (tstamp 5F025F72)
+    (at 231.14 88.9)
+    (path /5DF621F9)
+    (fp_text reference SW8 (at 4.6 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value SW_Push (at -0.5 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 7 7) (end 7 6) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 6 7) (end 7 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -7) (end -6 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -6) (end -7 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 9.525) (end -9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 9.525) (end -9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 -9.525) (end 9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 -9.525) (end 9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (pad "" np_thru_hole circle (at -5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad 1 thru_hole circle (at -3.81 -2.54 50) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 40 "Net-(D10-Pad2)"))
+    (pad 2 thru_hole circle (at 2.54 -5.08) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 38 COL3))
+    (pad 2 thru_hole circle (at 0 -5.9 90) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 38 COL3))
+    (pad "" np_thru_hole circle (at 5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 0 0 90) (size 4 4) (drill 4) (layers *.Cu *.Mask))
+    (pad 1 thru_hole circle (at 5.1 -3.9 310) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 40 "Net-(D10-Pad2)"))
+  )
+
+  (module foostan-kbd:CherryMX_Choc_1u (layer F.Cu) (tedit 5C66D612) (tstamp 5F028EF5)
+    (at 231.14 107.95)
+    (path /5DF621CF)
+    (fp_text reference SW9 (at 4.6 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value SW_Push (at -0.5 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -9.525 -9.525) (end 9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 -9.525) (end 9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 9.525) (end -9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 9.525) (end -9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -6) (end -7 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -7) (end -6 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 6 7) (end 7 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 7 7) (end 7 6) (layer Dwgs.User) (width 0.15))
+    (pad 1 thru_hole circle (at 5.1 -3.9 310) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 39 "Net-(D11-Pad2)"))
+    (pad "" np_thru_hole circle (at 0 0 90) (size 4 4) (drill 4) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad 2 thru_hole circle (at 0 -5.9 90) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 38 COL3))
+    (pad 2 thru_hole circle (at 2.54 -5.08) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 38 COL3))
+    (pad 1 thru_hole circle (at -3.81 -2.54 50) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 39 "Net-(D11-Pad2)"))
+    (pad "" np_thru_hole circle (at 5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+  )
+
+  (module foostan-kbd:CherryMX_Choc_1u (layer F.Cu) (tedit 5C66D612) (tstamp 5F028E2F)
+    (at 222.25 127)
+    (path /5DF621DD)
+    (fp_text reference SW10 (at 4.6 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value SW_Push (at -0.5 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 7 7) (end 7 6) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 6 7) (end 7 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -7) (end -6 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -6) (end -7 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 9.525) (end -9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 9.525) (end -9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 -9.525) (end 9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 -9.525) (end 9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (pad "" np_thru_hole circle (at -5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad 1 thru_hole circle (at -3.81 -2.54 50) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 37 "Net-(D12-Pad2)"))
+    (pad 2 thru_hole circle (at 2.54 -5.08) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 38 COL3))
+    (pad 2 thru_hole circle (at 0 -5.9 90) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 38 COL3))
+    (pad "" np_thru_hole circle (at 5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 0 0 90) (size 4 4) (drill 4) (layers *.Cu *.Mask))
+    (pad 1 thru_hole circle (at 5.1 -3.9 310) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 37 "Net-(D12-Pad2)"))
+  )
+
+  (module foostan-kbd:CherryMX_Choc_1u (layer F.Cu) (tedit 5C66D612) (tstamp 5F025F2D)
+    (at 173.99 72.39)
+    (path /5DFEF811)
+    (fp_text reference SW12 (at 4.6 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value SW_Push (at -0.5 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -9.525 -9.525) (end 9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 -9.525) (end 9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 9.525) (end -9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 9.525) (end -9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -6) (end -7 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -7) (end -6 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 6 7) (end 7 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 7 7) (end 7 6) (layer Dwgs.User) (width 0.15))
+    (pad 1 thru_hole circle (at 5.1 -3.9 310) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 36 "Net-(D14-Pad2)"))
+    (pad "" np_thru_hole circle (at 0 0 90) (size 4 4) (drill 4) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad 2 thru_hole circle (at 0 -5.9 90) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 35 COL6))
+    (pad 2 thru_hole circle (at 2.54 -5.08) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 35 COL6))
+    (pad 1 thru_hole circle (at -3.81 -2.54 50) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 36 "Net-(D14-Pad2)"))
+    (pad "" np_thru_hole circle (at 5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+  )
+
+  (module foostan-kbd:CherryMX_Choc_1u (layer F.Cu) (tedit 5C66D612) (tstamp 5F028DED)
+    (at 173.99 110.49)
+    (path /5DFEF7D9)
+    (fp_text reference SW14 (at 4.6 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value SW_Push (at -0.5 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 7 7) (end 7 6) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 6 7) (end 7 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -7) (end -6 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -6) (end -7 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 9.525) (end -9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 9.525) (end -9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 -9.525) (end 9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 -9.525) (end 9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (pad "" np_thru_hole circle (at -5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad 1 thru_hole circle (at -3.81 -2.54 50) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 34 "Net-(D16-Pad2)"))
+    (pad 2 thru_hole circle (at 2.54 -5.08) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 35 COL6))
+    (pad 2 thru_hole circle (at 0 -5.9 90) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 35 COL6))
+    (pad "" np_thru_hole circle (at 5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 0 0 90) (size 4 4) (drill 4) (layers *.Cu *.Mask))
+    (pad 1 thru_hole circle (at 5.1 -3.9 310) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 34 "Net-(D16-Pad2)"))
+  )
+
+  (module foostan-kbd:CherryMX_Choc_1u (layer F.Cu) (tedit 5C66D612) (tstamp 5F025EFF)
+    (at 250.19 80.01)
+    (path /5DFE640A)
+    (fp_text reference SW17 (at 4.6 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value SW_Push (at -0.5 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -9.525 -9.525) (end 9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 -9.525) (end 9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 9.525) (end -9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 9.525) (end -9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -6) (end -7 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -7) (end -6 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 6 7) (end 7 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 7 7) (end 7 6) (layer Dwgs.User) (width 0.15))
+    (pad 1 thru_hole circle (at 5.1 -3.9 310) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 33 "Net-(D19-Pad2)"))
+    (pad "" np_thru_hole circle (at 0 0 90) (size 4 4) (drill 4) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad 2 thru_hole circle (at 0 -5.9 90) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 31 COL2))
+    (pad 2 thru_hole circle (at 2.54 -5.08) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 31 COL2))
+    (pad 1 thru_hole circle (at -3.81 -2.54 50) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 33 "Net-(D19-Pad2)"))
+    (pad "" np_thru_hole circle (at 5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+  )
+
+  (module foostan-kbd:CherryMX_Choc_1u (layer F.Cu) (tedit 5C66D612) (tstamp 5F025EE8)
+    (at 250.19 99.06)
+    (path /5DFE63FC)
+    (fp_text reference SW18 (at 4.6 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value SW_Push (at -0.5 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 7 7) (end 7 6) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 6 7) (end 7 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -7) (end -6 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -6) (end -7 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 9.525) (end -9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 9.525) (end -9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 -9.525) (end 9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 -9.525) (end 9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (pad "" np_thru_hole circle (at -5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad 1 thru_hole circle (at -3.81 -2.54 50) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 32 "Net-(D20-Pad2)"))
+    (pad 2 thru_hole circle (at 2.54 -5.08) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 31 COL2))
+    (pad 2 thru_hole circle (at 0 -5.9 90) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 31 COL2))
+    (pad "" np_thru_hole circle (at 5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 0 0 90) (size 4 4) (drill 4) (layers *.Cu *.Mask))
+    (pad 1 thru_hole circle (at 5.1 -3.9 310) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 32 "Net-(D20-Pad2)"))
+  )
+
+  (module foostan-kbd:CherryMX_Choc_1u (layer F.Cu) (tedit 5C66D612) (tstamp 5F028E71)
+    (at 250.19 118.11)
+    (path /5DFE63D2)
+    (fp_text reference SW19 (at 4.6 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value SW_Push (at -0.5 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -9.525 -9.525) (end 9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 -9.525) (end 9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 9.525) (end -9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 9.525) (end -9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -6) (end -7 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -7) (end -6 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 6 7) (end 7 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 7 7) (end 7 6) (layer Dwgs.User) (width 0.15))
+    (pad 1 thru_hole circle (at 5.1 -3.9 310) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 30 "Net-(D21-Pad2)"))
+    (pad "" np_thru_hole circle (at 0 0 90) (size 4 4) (drill 4) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad 2 thru_hole circle (at 0 -5.9 90) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 31 COL2))
+    (pad 2 thru_hole circle (at 2.54 -5.08) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 31 COL2))
+    (pad 1 thru_hole circle (at -3.81 -2.54 50) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 30 "Net-(D21-Pad2)"))
+    (pad "" np_thru_hole circle (at 5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+  )
+
+  (module foostan-kbd:CherryMX_Choc_1u (layer F.Cu) (tedit 5C66D612) (tstamp 5F025EBA)
+    (at 212.09 67.31)
+    (path /5DFE2410)
+    (fp_text reference SW21 (at 4.6 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value SW_Push (at -0.5 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 7 7) (end 7 6) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 6 7) (end 7 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -7) (end -6 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -6) (end -7 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 9.525) (end -9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 9.525) (end -9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 -9.525) (end 9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 -9.525) (end 9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (pad "" np_thru_hole circle (at -5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad 1 thru_hole circle (at -3.81 -2.54 50) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 29 "Net-(D23-Pad2)"))
+    (pad 2 thru_hole circle (at 2.54 -5.08) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 21 COL4))
+    (pad 2 thru_hole circle (at 0 -5.9 90) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 21 COL4))
+    (pad "" np_thru_hole circle (at 5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 0 0 90) (size 4 4) (drill 4) (layers *.Cu *.Mask))
+    (pad 1 thru_hole circle (at 5.1 -3.9 310) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 29 "Net-(D23-Pad2)"))
+  )
+
+  (module foostan-kbd:CherryMX_Choc_1u (layer F.Cu) (tedit 5C66D612) (tstamp 5F025EA3)
+    (at 212.09 86.36)
+    (path /5DFE2402)
+    (fp_text reference SW22 (at 4.6 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value SW_Push (at -0.5 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -9.525 -9.525) (end 9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 -9.525) (end 9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 9.525) (end -9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 9.525) (end -9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -6) (end -7 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -7) (end -6 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 6 7) (end 7 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 7 7) (end 7 6) (layer Dwgs.User) (width 0.15))
+    (pad 1 thru_hole circle (at 5.1 -3.9 310) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 28 "Net-(D24-Pad2)"))
+    (pad "" np_thru_hole circle (at 0 0 90) (size 4 4) (drill 4) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad 2 thru_hole circle (at 0 -5.9 90) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 21 COL4))
+    (pad 2 thru_hole circle (at 2.54 -5.08) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 21 COL4))
+    (pad 1 thru_hole circle (at -3.81 -2.54 50) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 28 "Net-(D24-Pad2)"))
+    (pad "" np_thru_hole circle (at 5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+  )
+
+  (module foostan-kbd:CherryMX_Choc_1u (layer F.Cu) (tedit 5C66D612) (tstamp 5F0290F2)
+    (at 212.09 105.41)
+    (path /5DFE23D8)
+    (fp_text reference SW23 (at 4.6 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value SW_Push (at -0.5 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 7 7) (end 7 6) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 6 7) (end 7 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -7) (end -6 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -6) (end -7 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 9.525) (end -9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 9.525) (end -9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 -9.525) (end 9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 -9.525) (end 9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (pad "" np_thru_hole circle (at -5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad 1 thru_hole circle (at -3.81 -2.54 50) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 27 "Net-(D25-Pad2)"))
+    (pad 2 thru_hole circle (at 2.54 -5.08) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 21 COL4))
+    (pad 2 thru_hole circle (at 0 -5.9 90) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 21 COL4))
+    (pad "" np_thru_hole circle (at 5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 0 0 90) (size 4 4) (drill 4) (layers *.Cu *.Mask))
+    (pad 1 thru_hole circle (at 5.1 -3.9 310) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 27 "Net-(D25-Pad2)"))
+  )
+
+  (module foostan-kbd:CherryMX_Choc_1u (layer F.Cu) (tedit 5C66D612) (tstamp 5F025E75)
+    (at 193.04 69.85)
+    (path /5DFE3EC9)
+    (fp_text reference SW31 (at 4.6 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value SW_Push (at -0.5 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -9.525 -9.525) (end 9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 -9.525) (end 9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 9.525) (end -9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 9.525) (end -9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -6) (end -7 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -7) (end -6 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 6 7) (end 7 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 7 7) (end 7 6) (layer Dwgs.User) (width 0.15))
+    (pad 1 thru_hole circle (at 5.1 -3.9 310) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 26 "Net-(D33-Pad2)"))
+    (pad "" np_thru_hole circle (at 0 0 90) (size 4 4) (drill 4) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad 2 thru_hole circle (at 0 -5.9 90) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 23 COL5))
+    (pad 2 thru_hole circle (at 2.54 -5.08) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 23 COL5))
+    (pad 1 thru_hole circle (at -3.81 -2.54 50) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 26 "Net-(D33-Pad2)"))
+    (pad "" np_thru_hole circle (at 5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+  )
+
+  (module foostan-kbd:CherryMX_Choc_1u (layer F.Cu) (tedit 5C66D612) (tstamp 5F025E5E)
+    (at 193.04 88.9)
+    (path /5DFE3EBB)
+    (fp_text reference SW32 (at 4.6 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value SW_Push (at -0.5 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 7 7) (end 7 6) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 6 7) (end 7 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -7) (end -6 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -6) (end -7 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 9.525) (end -9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 9.525) (end -9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 -9.525) (end 9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 -9.525) (end 9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (pad "" np_thru_hole circle (at -5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad 1 thru_hole circle (at -3.81 -2.54 50) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 25 "Net-(D34-Pad2)"))
+    (pad 2 thru_hole circle (at 2.54 -5.08) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 23 COL5))
+    (pad 2 thru_hole circle (at 0 -5.9 90) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 23 COL5))
+    (pad "" np_thru_hole circle (at 5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 0 0 90) (size 4 4) (drill 4) (layers *.Cu *.Mask))
+    (pad 1 thru_hole circle (at 5.1 -3.9 310) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 25 "Net-(D34-Pad2)"))
+  )
+
+  (module foostan-kbd:CherryMX_Choc_1u (layer F.Cu) (tedit 5C66D612) (tstamp 5F028F37)
+    (at 193.04 107.95)
+    (path /5DFE3E91)
+    (fp_text reference SW33 (at 4.6 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value SW_Push (at -0.5 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -9.525 -9.525) (end 9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 -9.525) (end 9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 9.525) (end -9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 9.525) (end -9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -6) (end -7 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -7) (end -6 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 6 7) (end 7 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 7 7) (end 7 6) (layer Dwgs.User) (width 0.15))
+    (pad 1 thru_hole circle (at 5.1 -3.9 310) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 24 "Net-(D35-Pad2)"))
+    (pad "" np_thru_hole circle (at 0 0 90) (size 4 4) (drill 4) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad 2 thru_hole circle (at 0 -5.9 90) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 23 COL5))
+    (pad 2 thru_hole circle (at 2.54 -5.08) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 23 COL5))
+    (pad 1 thru_hole circle (at -3.81 -2.54 50) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 24 "Net-(D35-Pad2)"))
+    (pad "" np_thru_hole circle (at 5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+  )
+
+  (module foostan-kbd:CherryMX_Choc_1u (layer F.Cu) (tedit 5C66D612) (tstamp 5F028F79)
+    (at 184.15 129.54)
+    (path /5DFE3E9F)
+    (fp_text reference SW34 (at 4.6 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value SW_Push (at -0.5 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 7 7) (end 7 6) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 6 7) (end 7 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -7) (end -6 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -6) (end -7 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 9.525) (end -9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 9.525) (end -9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 -9.525) (end 9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 -9.525) (end 9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (pad "" np_thru_hole circle (at -5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad 1 thru_hole circle (at -3.81 -2.54 50) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 22 "Net-(D36-Pad2)"))
+    (pad 2 thru_hole circle (at 2.54 -5.08) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 23 COL5))
+    (pad 2 thru_hole circle (at 0 -5.9 90) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 23 COL5))
+    (pad "" np_thru_hole circle (at 5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 0 0 90) (size 4 4) (drill 4) (layers *.Cu *.Mask))
+    (pad 1 thru_hole circle (at 5.1 -3.9 310) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 22 "Net-(D36-Pad2)"))
+  )
+
+  (module foostan-kbd:CherryMX_Choc_1u (layer F.Cu) (tedit 5C66D612) (tstamp 5F028FBB)
+    (at 203.2 127)
+    (path /5DFE23E6)
+    (fp_text reference SW24 (at 4.6 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value SW_Push (at -0.5 6) (layer Dwgs.User) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -9.525 -9.525) (end 9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 -9.525) (end 9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 9.525 9.525) (end -9.525 9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.525 9.525) (end -9.525 -9.525) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -6) (end -7 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -7 -7) (end -6 -7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 6 7) (end 7 7) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 7 7) (end 7 6) (layer Dwgs.User) (width 0.15))
+    (pad 1 thru_hole circle (at 5.1 -3.9 310) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 20 "Net-(D26-Pad2)"))
+    (pad "" np_thru_hole circle (at 0 0 90) (size 4 4) (drill 4) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.5 0 90) (size 1.9 1.9) (drill 1.9) (layers *.Cu *.Mask))
+    (pad 2 thru_hole circle (at 0 -5.9 90) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 21 COL4))
+    (pad 2 thru_hole circle (at 2.54 -5.08) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 21 COL4))
+    (pad 1 thru_hole circle (at -3.81 -2.54 50) (size 2.2 2.2) (drill 1.2) (layers *.Cu F.SilkS B.Mask)
+      (net 20 "Net-(D26-Pad2)"))
+    (pad "" np_thru_hole circle (at 5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.08 0) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -5.22 4.2) (size 1 1) (drill 1) (layers *.Cu *.Mask))
+  )
+
+  (module keebio:TRRS-PJ-320A-no-Fmask (layer F.Cu) (tedit 5CD25241) (tstamp 5F025E02)
+    (at 146.177 64.135)
+    (path /5ED45338)
+    (fp_text reference J2 (at 0 14.2) (layer Dwgs.User)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value AudioJack4 (at 0 -5.6) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 2.8 -2) (end -2.8 -2) (layer F.SilkS) (width 0.15))
+    (fp_line (start -2.8 0) (end -2.8 -2) (layer F.SilkS) (width 0.15))
+    (fp_line (start 2.8 0) (end 2.8 -2) (layer F.SilkS) (width 0.15))
+    (fp_line (start -3.05 0) (end -3.05 12.1) (layer F.SilkS) (width 0.15))
+    (fp_line (start 3.05 0) (end 3.05 12.1) (layer F.SilkS) (width 0.15))
+    (fp_line (start 3.05 12.1) (end -3.05 12.1) (layer F.SilkS) (width 0.15))
+    (fp_line (start 3.05 0) (end -3.05 0) (layer F.SilkS) (width 0.15))
+    (pad 1 thru_hole oval (at -2.3 11.3) (size 1.6 2) (drill oval 0.9 1.3) (layers *.Cu B.Mask)
+      (net 1 GND))
+    (pad 2 thru_hole oval (at 2.3 10.2) (size 1.6 2) (drill oval 0.9 1.3) (layers *.Cu B.Mask)
+      (net 8 5V))
+    (pad 4 thru_hole oval (at 2.3 3.2) (size 1.6 2) (drill oval 0.9 1.3) (layers *.Cu B.Mask)
+      (net 18 TX))
+    (pad "" np_thru_hole circle (at 0 8.6) (size 0.8 0.8) (drill 0.8) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 0 1.6) (size 0.8 0.8) (drill 0.8) (layers *.Cu *.Mask))
+    (pad 3 thru_hole oval (at 2.3 6.2) (size 1.6 2) (drill oval 0.9 1.3) (layers *.Cu B.Mask)
+      (net 19 RX))
+    (pad 4 thru_hole oval (at 2.3 3.2) (size 1 1.4) (drill oval 0.9 1.3) (layers *.Cu F.Mask)
+      (net 18 TX))
+    (pad 3 thru_hole oval (at 2.3 6.2) (size 1 1.4) (drill oval 0.9 1.3) (layers *.Cu F.Mask)
+      (net 19 RX))
+    (pad 2 thru_hole oval (at 2.3 10.2) (size 1 1.4) (drill oval 0.9 1.3) (layers *.Cu F.Mask)
+      (net 8 5V))
+    (pad 1 thru_hole oval (at -2.3 11.3) (size 1 1.4) (drill oval 0.9 1.3) (layers *.Cu F.Mask)
+      (net 1 GND))
+  )
+
+  (module kicad-harwin:Harwin_M20-89012xx_1x12_P2.54mm_Horizontal (layer B.Cu) (tedit 5B154A07) (tstamp 5F027472)
+    (at 50.165 64.77 180)
+    (descr "Harwin Male Horizontal Surface Mount Single Row 2.54mm (0.1 inch) Pitch PCB Connector, M20-89012xx, 12 Pins per row (https://cdn.harwin.com/pdfs/M20-890.pdf), generated with kicad-footprint-generator")
+    (tags "connector Harwin M20-890 horizontal")
+    (path /5EDBCB44)
+    (attr smd)
+    (fp_text reference J3 (at -0.48 16.44 180) (layer B.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text value Conn_01x12_Male (at -0.48 -16.44 180) (layer B.Fab)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_line (start -1.725 14.29) (end -6.425 14.29) (layer B.Fab) (width 0.1))
+    (fp_line (start -6.425 14.29) (end -6.425 13.65) (layer B.Fab) (width 0.1))
+    (fp_line (start -6.425 13.65) (end -1.725 13.65) (layer B.Fab) (width 0.1))
+    (fp_line (start 0.775 14.29) (end 6.775 14.29) (layer B.Fab) (width 0.1))
+    (fp_line (start 6.775 14.29) (end 6.775 13.65) (layer B.Fab) (width 0.1))
+    (fp_line (start 6.775 13.65) (end 0.775 13.65) (layer B.Fab) (width 0.1))
+    (fp_line (start -1.725 11.75) (end -6.425 11.75) (layer B.Fab) (width 0.1))
+    (fp_line (start -6.425 11.75) (end -6.425 11.11) (layer B.Fab) (width 0.1))
+    (fp_line (start -6.425 11.11) (end -1.725 11.11) (layer B.Fab) (width 0.1))
+    (fp_line (start 0.775 11.75) (end 6.775 11.75) (layer B.Fab) (width 0.1))
+    (fp_line (start 6.775 11.75) (end 6.775 11.11) (layer B.Fab) (width 0.1))
+    (fp_line (start 6.775 11.11) (end 0.775 11.11) (layer B.Fab) (width 0.1))
+    (fp_line (start -1.725 9.21) (end -6.425 9.21) (layer B.Fab) (width 0.1))
+    (fp_line (start -6.425 9.21) (end -6.425 8.57) (layer B.Fab) (width 0.1))
+    (fp_line (start -6.425 8.57) (end -1.725 8.57) (layer B.Fab) (width 0.1))
+    (fp_line (start 0.775 9.21) (end 6.775 9.21) (layer B.Fab) (width 0.1))
+    (fp_line (start 6.775 9.21) (end 6.775 8.57) (layer B.Fab) (width 0.1))
+    (fp_line (start 6.775 8.57) (end 0.775 8.57) (layer B.Fab) (width 0.1))
+    (fp_line (start -1.725 6.67) (end -6.425 6.67) (layer B.Fab) (width 0.1))
+    (fp_line (start -6.425 6.67) (end -6.425 6.03) (layer B.Fab) (width 0.1))
+    (fp_line (start -6.425 6.03) (end -1.725 6.03) (layer B.Fab) (width 0.1))
+    (fp_line (start 0.775 6.67) (end 6.775 6.67) (layer B.Fab) (width 0.1))
+    (fp_line (start 6.775 6.67) (end 6.775 6.03) (layer B.Fab) (width 0.1))
+    (fp_line (start 6.775 6.03) (end 0.775 6.03) (layer B.Fab) (width 0.1))
+    (fp_line (start -1.725 4.13) (end -6.425 4.13) (layer B.Fab) (width 0.1))
+    (fp_line (start -6.425 4.13) (end -6.425 3.49) (layer B.Fab) (width 0.1))
+    (fp_line (start -6.425 3.49) (end -1.725 3.49) (layer B.Fab) (width 0.1))
+    (fp_line (start 0.775 4.13) (end 6.775 4.13) (layer B.Fab) (width 0.1))
+    (fp_line (start 6.775 4.13) (end 6.775 3.49) (layer B.Fab) (width 0.1))
+    (fp_line (start 6.775 3.49) (end 0.775 3.49) (layer B.Fab) (width 0.1))
+    (fp_line (start -1.725 1.59) (end -6.425 1.59) (layer B.Fab) (width 0.1))
+    (fp_line (start -6.425 1.59) (end -6.425 0.95) (layer B.Fab) (width 0.1))
+    (fp_line (start -6.425 0.95) (end -1.725 0.95) (layer B.Fab) (width 0.1))
+    (fp_line (start 0.775 1.59) (end 6.775 1.59) (layer B.Fab) (width 0.1))
+    (fp_line (start 6.775 1.59) (end 6.775 0.95) (layer B.Fab) (width 0.1))
+    (fp_line (start 6.775 0.95) (end 0.775 0.95) (layer B.Fab) (width 0.1))
+    (fp_line (start -1.725 -0.95) (end -6.425 -0.95) (layer B.Fab) (width 0.1))
+    (fp_line (start -6.425 -0.95) (end -6.425 -1.59) (layer B.Fab) (width 0.1))
+    (fp_line (start -6.425 -1.59) (end -1.725 -1.59) (layer B.Fab) (width 0.1))
+    (fp_line (start 0.775 -0.95) (end 6.775 -0.95) (layer B.Fab) (width 0.1))
+    (fp_line (start 6.775 -0.95) (end 6.775 -1.59) (layer B.Fab) (width 0.1))
+    (fp_line (start 6.775 -1.59) (end 0.775 -1.59) (layer B.Fab) (width 0.1))
+    (fp_line (start -1.725 -3.49) (end -6.425 -3.49) (layer B.Fab) (width 0.1))
+    (fp_line (start -6.425 -3.49) (end -6.425 -4.13) (layer B.Fab) (width 0.1))
+    (fp_line (start -6.425 -4.13) (end -1.725 -4.13) (layer B.Fab) (width 0.1))
+    (fp_line (start 0.775 -3.49) (end 6.775 -3.49) (layer B.Fab) (width 0.1))
+    (fp_line (start 6.775 -3.49) (end 6.775 -4.13) (layer B.Fab) (width 0.1))
+    (fp_line (start 6.775 -4.13) (end 0.775 -4.13) (layer B.Fab) (width 0.1))
+    (fp_line (start -1.725 -6.03) (end -6.425 -6.03) (layer B.Fab) (width 0.1))
+    (fp_line (start -6.425 -6.03) (end -6.425 -6.67) (layer B.Fab) (width 0.1))
+    (fp_line (start -6.425 -6.67) (end -1.725 -6.67) (layer B.Fab) (width 0.1))
+    (fp_line (start 0.775 -6.03) (end 6.775 -6.03) (layer B.Fab) (width 0.1))
+    (fp_line (start 6.775 -6.03) (end 6.775 -6.67) (layer B.Fab) (width 0.1))
+    (fp_line (start 6.775 -6.67) (end 0.775 -6.67) (layer B.Fab) (width 0.1))
+    (fp_line (start -1.725 -8.57) (end -6.425 -8.57) (layer B.Fab) (width 0.1))
+    (fp_line (start -6.425 -8.57) (end -6.425 -9.21) (layer B.Fab) (width 0.1))
+    (fp_line (start -6.425 -9.21) (end -1.725 -9.21) (layer B.Fab) (width 0.1))
+    (fp_line (start 0.775 -8.57) (end 6.775 -8.57) (layer B.Fab) (width 0.1))
+    (fp_line (start 6.775 -8.57) (end 6.775 -9.21) (layer B.Fab) (width 0.1))
+    (fp_line (start 6.775 -9.21) (end 0.775 -9.21) (layer B.Fab) (width 0.1))
+    (fp_line (start -1.725 -11.11) (end -6.425 -11.11) (layer B.Fab) (width 0.1))
+    (fp_line (start -6.425 -11.11) (end -6.425 -11.75) (layer B.Fab) (width 0.1))
+    (fp_line (start -6.425 -11.75) (end -1.725 -11.75) (layer B.Fab) (width 0.1))
+    (fp_line (start 0.775 -11.11) (end 6.775 -11.11) (layer B.Fab) (width 0.1))
+    (fp_line (start 6.775 -11.11) (end 6.775 -11.75) (layer B.Fab) (width 0.1))
+    (fp_line (start 6.775 -11.75) (end 0.775 -11.75) (layer B.Fab) (width 0.1))
+    (fp_line (start -1.725 -13.65) (end -6.425 -13.65) (layer B.Fab) (width 0.1))
+    (fp_line (start -6.425 -13.65) (end -6.425 -14.29) (layer B.Fab) (width 0.1))
+    (fp_line (start -6.425 -14.29) (end -1.725 -14.29) (layer B.Fab) (width 0.1))
+    (fp_line (start 0.775 -13.65) (end 6.775 -13.65) (layer B.Fab) (width 0.1))
+    (fp_line (start 6.775 -13.65) (end 6.775 -14.29) (layer B.Fab) (width 0.1))
+    (fp_line (start 6.775 -14.29) (end 0.775 -14.29) (layer B.Fab) (width 0.1))
+    (fp_line (start -1.725 14.84) (end -1.325 15.24) (layer B.Fab) (width 0.1))
+    (fp_line (start -1.325 15.24) (end 0.775 15.24) (layer B.Fab) (width 0.1))
+    (fp_line (start 0.775 15.24) (end 0.775 -15.24) (layer B.Fab) (width 0.1))
+    (fp_line (start 0.775 -15.24) (end -1.725 -15.24) (layer B.Fab) (width 0.1))
+    (fp_line (start -1.725 -15.24) (end -1.725 14.84) (layer B.Fab) (width 0.1))
+    (fp_line (start -1.845 15.36) (end 0.895 15.36) (layer B.SilkS) (width 0.12))
+    (fp_line (start 0.895 15.36) (end 0.895 -15.36) (layer B.SilkS) (width 0.12))
+    (fp_line (start 0.895 -15.36) (end -1.845 -15.36) (layer B.SilkS) (width 0.12))
+    (fp_line (start -1.845 -15.36) (end -1.845 15.36) (layer B.SilkS) (width 0.12))
+    (fp_line (start -3.955 14.41) (end -1.845 14.41) (layer B.SilkS) (width 0.12))
+    (fp_line (start -3.955 13.53) (end -1.845 13.53) (layer B.SilkS) (width 0.12))
+    (fp_line (start 0.895 14.41) (end 6.895 14.41) (layer B.SilkS) (width 0.12))
+    (fp_line (start 6.895 14.41) (end 6.895 13.53) (layer B.SilkS) (width 0.12))
+    (fp_line (start 6.895 13.53) (end 0.895 13.53) (layer B.SilkS) (width 0.12))
+    (fp_line (start -3.955 11.87) (end -1.845 11.87) (layer B.SilkS) (width 0.12))
+    (fp_line (start -3.955 10.99) (end -1.845 10.99) (layer B.SilkS) (width 0.12))
+    (fp_line (start 0.895 11.87) (end 6.895 11.87) (layer B.SilkS) (width 0.12))
+    (fp_line (start 6.895 11.87) (end 6.895 10.99) (layer B.SilkS) (width 0.12))
+    (fp_line (start 6.895 10.99) (end 0.895 10.99) (layer B.SilkS) (width 0.12))
+    (fp_line (start -3.955 9.33) (end -1.845 9.33) (layer B.SilkS) (width 0.12))
+    (fp_line (start -3.955 8.45) (end -1.845 8.45) (layer B.SilkS) (width 0.12))
+    (fp_line (start 0.895 9.33) (end 6.895 9.33) (layer B.SilkS) (width 0.12))
+    (fp_line (start 6.895 9.33) (end 6.895 8.45) (layer B.SilkS) (width 0.12))
+    (fp_line (start 6.895 8.45) (end 0.895 8.45) (layer B.SilkS) (width 0.12))
+    (fp_line (start -3.955 6.79) (end -1.845 6.79) (layer B.SilkS) (width 0.12))
+    (fp_line (start -3.955 5.91) (end -1.845 5.91) (layer B.SilkS) (width 0.12))
+    (fp_line (start 0.895 6.79) (end 6.895 6.79) (layer B.SilkS) (width 0.12))
+    (fp_line (start 6.895 6.79) (end 6.895 5.91) (layer B.SilkS) (width 0.12))
+    (fp_line (start 6.895 5.91) (end 0.895 5.91) (layer B.SilkS) (width 0.12))
+    (fp_line (start -3.955 4.25) (end -1.845 4.25) (layer B.SilkS) (width 0.12))
+    (fp_line (start -3.955 3.37) (end -1.845 3.37) (layer B.SilkS) (width 0.12))
+    (fp_line (start 0.895 4.25) (end 6.895 4.25) (layer B.SilkS) (width 0.12))
+    (fp_line (start 6.895 4.25) (end 6.895 3.37) (layer B.SilkS) (width 0.12))
+    (fp_line (start 6.895 3.37) (end 0.895 3.37) (layer B.SilkS) (width 0.12))
+    (fp_line (start -3.955 1.71) (end -1.845 1.71) (layer B.SilkS) (width 0.12))
+    (fp_line (start -3.955 0.83) (end -1.845 0.83) (layer B.SilkS) (width 0.12))
+    (fp_line (start 0.895 1.71) (end 6.895 1.71) (layer B.SilkS) (width 0.12))
+    (fp_line (start 6.895 1.71) (end 6.895 0.83) (layer B.SilkS) (width 0.12))
+    (fp_line (start 6.895 0.83) (end 0.895 0.83) (layer B.SilkS) (width 0.12))
+    (fp_line (start -3.955 -0.83) (end -1.845 -0.83) (layer B.SilkS) (width 0.12))
+    (fp_line (start -3.955 -1.71) (end -1.845 -1.71) (layer B.SilkS) (width 0.12))
+    (fp_line (start 0.895 -0.83) (end 6.895 -0.83) (layer B.SilkS) (width 0.12))
+    (fp_line (start 6.895 -0.83) (end 6.895 -1.71) (layer B.SilkS) (width 0.12))
+    (fp_line (start 6.895 -1.71) (end 0.895 -1.71) (layer B.SilkS) (width 0.12))
+    (fp_line (start -3.955 -3.37) (end -1.845 -3.37) (layer B.SilkS) (width 0.12))
+    (fp_line (start -3.955 -4.25) (end -1.845 -4.25) (layer B.SilkS) (width 0.12))
+    (fp_line (start 0.895 -3.37) (end 6.895 -3.37) (layer B.SilkS) (width 0.12))
+    (fp_line (start 6.895 -3.37) (end 6.895 -4.25) (layer B.SilkS) (width 0.12))
+    (fp_line (start 6.895 -4.25) (end 0.895 -4.25) (layer B.SilkS) (width 0.12))
+    (fp_line (start -3.955 -5.91) (end -1.845 -5.91) (layer B.SilkS) (width 0.12))
+    (fp_line (start -3.955 -6.79) (end -1.845 -6.79) (layer B.SilkS) (width 0.12))
+    (fp_line (start 0.895 -5.91) (end 6.895 -5.91) (layer B.SilkS) (width 0.12))
+    (fp_line (start 6.895 -5.91) (end 6.895 -6.79) (layer B.SilkS) (width 0.12))
+    (fp_line (start 6.895 -6.79) (end 0.895 -6.79) (layer B.SilkS) (width 0.12))
+    (fp_line (start -3.955 -8.45) (end -1.845 -8.45) (layer B.SilkS) (width 0.12))
+    (fp_line (start -3.955 -9.33) (end -1.845 -9.33) (layer B.SilkS) (width 0.12))
+    (fp_line (start 0.895 -8.45) (end 6.895 -8.45) (layer B.SilkS) (width 0.12))
+    (fp_line (start 6.895 -8.45) (end 6.895 -9.33) (layer B.SilkS) (width 0.12))
+    (fp_line (start 6.895 -9.33) (end 0.895 -9.33) (layer B.SilkS) (width 0.12))
+    (fp_line (start -3.955 -10.99) (end -1.845 -10.99) (layer B.SilkS) (width 0.12))
+    (fp_line (start -3.955 -11.87) (end -1.845 -11.87) (layer B.SilkS) (width 0.12))
+    (fp_line (start 0.895 -10.99) (end 6.895 -10.99) (layer B.SilkS) (width 0.12))
+    (fp_line (start 6.895 -10.99) (end 6.895 -11.87) (layer B.SilkS) (width 0.12))
+    (fp_line (start 6.895 -11.87) (end 0.895 -11.87) (layer B.SilkS) (width 0.12))
+    (fp_line (start -3.955 -13.53) (end -1.845 -13.53) (layer B.SilkS) (width 0.12))
+    (fp_line (start -3.955 -14.41) (end -1.845 -14.41) (layer B.SilkS) (width 0.12))
+    (fp_line (start 0.895 -13.53) (end 6.895 -13.53) (layer B.SilkS) (width 0.12))
+    (fp_line (start 6.895 -13.53) (end 6.895 -14.41) (layer B.SilkS) (width 0.12))
+    (fp_line (start 6.895 -14.41) (end 0.895 -14.41) (layer B.SilkS) (width 0.12))
+    (fp_line (start -7.095 13.97) (end -7.095 14.79) (layer B.SilkS) (width 0.12))
+    (fp_line (start -7.095 14.79) (end -5.525 14.79) (layer B.SilkS) (width 0.12))
+    (fp_line (start -7.28 15.74) (end 7.28 15.74) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 7.28 15.74) (end 7.28 -15.74) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 7.28 -15.74) (end -7.28 -15.74) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -7.28 -15.74) (end -7.28 15.74) (layer B.CrtYd) (width 0.05))
+    (fp_text user %R (at -0.48 0 90) (layer B.Fab)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (pad 1 smd rect (at -5.525 13.97 180) (size 2.5 1) (layers B.Cu B.Paste B.Mask)
+      (net 9 3.3V))
+    (pad 2 smd rect (at -5.525 11.43 180) (size 2.5 1) (layers B.Cu B.Paste B.Mask)
+      (net 10 SWDIO))
+    (pad 3 smd rect (at -5.525 8.89 180) (size 2.5 1) (layers B.Cu B.Paste B.Mask)
+      (net 11 SWDCLK))
+    (pad 4 smd rect (at -5.525 6.35 180) (size 2.5 1) (layers B.Cu B.Paste B.Mask)
+      (net 1 GND))
+    (pad 5 smd rect (at -5.525 3.81 180) (size 2.5 1) (layers B.Cu B.Paste B.Mask)
+      (net 12 PA4))
+    (pad 6 smd rect (at -5.525 1.27 180) (size 2.5 1) (layers B.Cu B.Paste B.Mask)
+      (net 13 PA5))
+    (pad 7 smd rect (at -5.525 -1.27 180) (size 2.5 1) (layers B.Cu B.Paste B.Mask)
+      (net 14 PA6))
+    (pad 8 smd rect (at -5.525 -3.81 180) (size 2.5 1) (layers B.Cu B.Paste B.Mask)
+      (net 15 PA7))
+    (pad 9 smd rect (at -5.525 -6.35 180) (size 2.5 1) (layers B.Cu B.Paste B.Mask)
+      (net 1 GND))
+    (pad 10 smd rect (at -5.525 -8.89 180) (size 2.5 1) (layers B.Cu B.Paste B.Mask)
+      (net 16 PB6))
+    (pad 11 smd rect (at -5.525 -11.43 180) (size 2.5 1) (layers B.Cu B.Paste B.Mask)
+      (net 17 PB7))
+    (pad 12 smd rect (at -5.525 -13.97 180) (size 2.5 1) (layers B.Cu B.Paste B.Mask)
+      (net 8 5V))
+    (pad "" smd rect (at 3.895 13.97 180) (size 6 0.76) (layers B.SilkS))
+    (model ${KISYS3DMOD}/Connector_Harwin.3dshapes/Harwin_M20-89012xx_1x12_P2.54mm_Horizontal.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module kicad-usb:USB_C_Receptacle_HRO_TYPE-C-31-M-12 (layer F.Cu) (tedit 5D3C0721) (tstamp 5F025D48)
+    (at 158.75 66.675 180)
+    (descr "USB Type-C receptacle for USB 2.0 and PD, http://www.krhro.com/uploads/soft/180320/1-1P320120243.pdf")
+    (tags "usb usb-c 2.0 pd")
+    (path /5E037A53)
+    (attr smd)
+    (fp_text reference J1 (at 0 -5.645 180) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value USB_C_Receptacle_USB2.0 (at 0 5.1 180) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -4.7 2) (end -4.7 3.9) (layer F.SilkS) (width 0.12))
+    (fp_line (start -4.7 -1.9) (end -4.7 0.1) (layer F.SilkS) (width 0.12))
+    (fp_line (start 4.7 2) (end 4.7 3.9) (layer F.SilkS) (width 0.12))
+    (fp_line (start 4.7 -1.9) (end 4.7 0.1) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.32 -5.27) (end 5.32 4.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -5.32 -5.27) (end -5.32 4.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -5.32 4.15) (end 5.32 4.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -5.32 -5.27) (end 5.32 -5.27) (layer F.CrtYd) (width 0.05))
+    (fp_text user %R (at 0 0 180) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 4.47 -3.65) (end 4.47 3.65) (layer F.Fab) (width 0.1))
+    (fp_line (start -4.47 3.65) (end 4.47 3.65) (layer F.Fab) (width 0.1))
+    (fp_line (start -4.47 -3.65) (end -4.47 3.65) (layer F.Fab) (width 0.1))
+    (fp_line (start -4.47 -3.65) (end 4.47 -3.65) (layer F.Fab) (width 0.1))
+    (fp_line (start -4.7 3.9) (end 4.7 3.9) (layer F.SilkS) (width 0.12))
+    (pad S1 thru_hole oval (at 4.32 1.05 180) (size 1 1.6) (drill oval 0.6 1.2) (layers *.Cu *.Mask)
+      (net 1 GND))
+    (pad "" np_thru_hole circle (at 2.89 -2.6 180) (size 0.65 0.65) (drill 0.65) (layers *.Cu *.Mask))
+    (pad S1 thru_hole oval (at -4.32 1.05 180) (size 1 1.6) (drill oval 0.6 1.2) (layers *.Cu *.Mask)
+      (net 1 GND))
+    (pad "" np_thru_hole circle (at -2.89 -2.6 180) (size 0.65 0.65) (drill 0.65) (layers *.Cu *.Mask))
+    (pad S1 thru_hole oval (at -4.32 -3.13 180) (size 1 2.1) (drill oval 0.6 1.7) (layers *.Cu *.Mask)
+      (net 1 GND))
+    (pad S1 thru_hole oval (at 4.32 -3.13 180) (size 1 2.1) (drill oval 0.6 1.7) (layers *.Cu *.Mask)
+      (net 1 GND))
+    (pad A6 smd rect (at -0.25 -4.045 180) (size 0.3 1.45) (layers F.Cu F.Paste F.Mask)
+      (net 2 D+))
+    (pad B5 smd rect (at 1.75 -4.045 180) (size 0.3 1.45) (layers F.Cu F.Paste F.Mask)
+      (net 3 "Net-(J1-PadB5)"))
+    (pad A8 smd rect (at 1.25 -4.045 180) (size 0.3 1.45) (layers F.Cu F.Paste F.Mask)
+      (net 4 "Net-(J1-PadA8)"))
+    (pad B6 smd rect (at 0.75 -4.045 180) (size 0.3 1.45) (layers F.Cu F.Paste F.Mask)
+      (net 2 D+))
+    (pad A7 smd rect (at 0.25 -4.045 180) (size 0.3 1.45) (layers F.Cu F.Paste F.Mask)
+      (net 5 D-))
+    (pad B7 smd rect (at -0.75 -4.045 180) (size 0.3 1.45) (layers F.Cu F.Paste F.Mask)
+      (net 5 D-))
+    (pad A5 smd rect (at -1.25 -4.045 180) (size 0.3 1.45) (layers F.Cu F.Paste F.Mask)
+      (net 6 "Net-(J1-PadA5)"))
+    (pad B8 smd rect (at -1.75 -4.045 180) (size 0.3 1.45) (layers F.Cu F.Paste F.Mask)
+      (net 7 "Net-(J1-PadB8)"))
+    (pad A12 smd rect (at 3.25 -4.045 180) (size 0.6 1.45) (layers F.Cu F.Paste F.Mask)
+      (net 1 GND))
+    (pad B4 smd rect (at 2.45 -4.045 180) (size 0.6 1.45) (layers F.Cu F.Paste F.Mask)
+      (net 8 5V))
+    (pad A4 smd rect (at -2.45 -4.045 180) (size 0.6 1.45) (layers F.Cu F.Paste F.Mask)
+      (net 8 5V))
+    (pad A1 smd rect (at -3.25 -4.045 180) (size 0.6 1.45) (layers F.Cu F.Paste F.Mask)
+      (net 1 GND))
+    (pad B12 smd rect (at -3.25 -4.045 180) (size 0.6 1.45) (layers F.Cu F.Paste F.Mask)
+      (net 1 GND))
+    (pad B9 smd rect (at -2.45 -4.045 180) (size 0.6 1.45) (layers F.Cu F.Paste F.Mask)
+      (net 8 5V))
+    (pad A9 smd rect (at 2.45 -4.045 180) (size 0.6 1.45) (layers F.Cu F.Paste F.Mask)
+      (net 8 5V))
+    (pad B1 smd rect (at 3.25 -4.045 180) (size 0.6 1.45) (layers F.Cu F.Paste F.Mask)
+      (net 1 GND))
+    (model ${KISYS3DMOD}/Connector_USB.3dshapes/USB_C_Receptacle_HRO_TYPE-C-31-M-12.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (gr_line (start 142.875 62.865) (end 142.875 119.38) (layer Edge.Cuts) (width 0.15))
+  (gr_line (start 164.465 62.865) (end 142.875 62.865) (layer Edge.Cuts) (width 0.15))
+  (gr_line (start 156.845 147.955) (end 142.875 119.38) (layer Edge.Cuts) (width 0.2))
+  (gr_line (start 193.675 139.065) (end 156.845 147.955) (layer Edge.Cuts) (width 0.2))
+  (gr_line (start 231.775 136.525) (end 193.675 139.065) (layer Edge.Cuts) (width 0.2))
+  (gr_line (start 278.765 130.175) (end 231.775 136.525) (layer Edge.Cuts) (width 0.2))
+  (gr_line (start 278.765 73.025) (end 278.765 130.175) (layer Edge.Cuts) (width 0.2))
+  (gr_line (start 240.665 60.325) (end 278.765 73.025) (layer Edge.Cuts) (width 0.2))
+  (gr_line (start 221.615 57.785) (end 240.665 60.325) (layer Edge.Cuts) (width 0.2))
+  (gr_line (start 202.565 57.785) (end 221.615 57.785) (layer Edge.Cuts) (width 0.2))
+  (gr_line (start 164.465 62.865) (end 202.565 57.785) (layer Edge.Cuts) (width 0.2))
+
+)
diff --git a/pcb/kicad/right/right.pro b/pcb/kicad/right/right.pro
new file mode 100644
index 0000000..152769c
--- /dev/null
+++ b/pcb/kicad/right/right.pro
@@ -0,0 +1,33 @@
+update=22/05/2015 07:44:53
+version=1
+last_client=kicad
+[general]
+version=1
+RootSch=
+BoardNm=
+[pcbnew]
+version=1
+LastNetListRead=
+UseCmpFile=1
+PadDrill=0.600000000000
+PadDrillOvalY=0.600000000000
+PadSizeH=1.500000000000
+PadSizeV=1.500000000000
+PcbTextSizeV=1.500000000000
+PcbTextSizeH=1.500000000000
+PcbTextThickness=0.300000000000
+ModuleTextSizeV=1.000000000000
+ModuleTextSizeH=1.000000000000
+ModuleTextSizeThickness=0.150000000000
+SolderMaskClearance=0.000000000000
+SolderMaskMinWidth=0.000000000000
+DrawSegmentWidth=0.200000000000
+BoardOutlineThickness=0.100000000000
+ModuleOutlineThickness=0.150000000000
+[cvpcb]
+version=1
+NetIExt=net
+[eeschema]
+version=1
+LibDir=
+[eeschema/libraries]
diff --git a/pcb/kicad/right/right.sch b/pcb/kicad/right/right.sch
new file mode 100644
index 0000000..9b3a825
--- /dev/null
+++ b/pcb/kicad/right/right.sch
@@ -0,0 +1,1081 @@
+EESchema Schematic File Version 4
+EELAYER 26 0
+EELAYER END
+$Descr A4 11693 8268
+encoding utf-8
+Sheet 1 1
+Title ""
+Date ""
+Rev ""
+Comp ""
+Comment1 ""
+Comment2 ""
+Comment3 ""
+Comment4 ""
+$EndDescr
+$Comp
+L MCU_ST_STM32F0:STM32F072CBTx U1
+U 1 1 5DEC39DF
+P 6100 2700
+F 0 "U1" H 6050 1114 50  0000 C CNN
+F 1 "STM32" H 6050 1023 50  0000 C CNN
+F 2 "Package_QFP:LQFP-48_7x7mm_P0.5mm" H 5500 1300 50  0001 R CNN
+F 3 "http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/DM00090510.pdf" H 6100 2700 50  0001 C CNN
+	1    6100 2700
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:C C2
+U 1 1 5DEC3C77
+P 5700 750
+F 0 "C2" H 5815 796 50  0000 L CNN
+F 1 "100nF" H 5815 705 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 5738 600 50  0001 C CNN
+F 3 "~" H 5700 750 50  0001 C CNN
+	1    5700 750 
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:C C3
+U 1 1 5DEC3CF5
+P 6150 750
+F 0 "C3" H 6265 796 50  0000 L CNN
+F 1 "100nF" H 6265 705 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 6188 600 50  0001 C CNN
+F 3 "~" H 6150 750 50  0001 C CNN
+	1    6150 750 
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:C C4
+U 1 1 5DEC3D3C
+P 6600 750
+F 0 "C4" H 6715 796 50  0000 L CNN
+F 1 "100nF" H 6715 705 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 6638 600 50  0001 C CNN
+F 3 "~" H 6600 750 50  0001 C CNN
+	1    6600 750 
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:C C5
+U 1 1 5DEC3D7E
+P 7100 750
+F 0 "C5" H 7215 796 50  0000 L CNN
+F 1 "100nF" H 7215 705 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 7138 600 50  0001 C CNN
+F 3 "~" H 7100 750 50  0001 C CNN
+	1    7100 750 
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:C C7
+U 1 1 5DEC3DF1
+P 8650 750
+F 0 "C7" H 8765 796 50  0000 L CNN
+F 1 "1µF" H 8765 705 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 8688 600 50  0001 C CNN
+F 3 "~" H 8650 750 50  0001 C CNN
+	1    8650 750 
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:GND #PWR0101
+U 1 1 5DEC3EA3
+P 6000 4550
+F 0 "#PWR0101" H 6000 4300 50  0001 C CNN
+F 1 "GND" H 6005 4377 50  0000 C CNN
+F 2 "" H 6000 4550 50  0001 C CNN
+F 3 "" H 6000 4550 50  0001 C CNN
+	1    6000 4550
+	1    0    0    -1  
+$EndComp
+Connection ~ 6150 600 
+Wire Wire Line
+	5900 4200 5900 4550
+Wire Wire Line
+	5900 4550 6000 4550
+Wire Wire Line
+	6000 4200 6000 4550
+Connection ~ 6000 4550
+Wire Wire Line
+	6100 4200 6100 4550
+Wire Wire Line
+	6100 4550 6000 4550
+Wire Wire Line
+	6200 4200 6200 4550
+Wire Wire Line
+	6200 4550 6100 4550
+Connection ~ 6100 4550
+Connection ~ 6150 900 
+Wire Wire Line
+	6100 1200 6100 1000
+Wire Wire Line
+	6100 1000 6150 1000
+Wire Wire Line
+	6150 1000 6150 900 
+Connection ~ 5700 600 
+Connection ~ 5700 900 
+Wire Wire Line
+	5700 900  6150 900 
+Wire Wire Line
+	5700 600  6150 600 
+Wire Wire Line
+	6000 1200 6000 1100
+Wire Wire Line
+	6000 1100 5700 1100
+Wire Wire Line
+	5700 1100 5700 900 
+Connection ~ 6600 900 
+Connection ~ 7100 900 
+Wire Wire Line
+	6150 900  6600 900 
+Wire Wire Line
+	6150 600  6600 600 
+Wire Wire Line
+	6600 900  7100 900 
+Wire Wire Line
+	6600 600  7100 600 
+Connection ~ 6600 600 
+Wire Wire Line
+	6600 900  6600 1050
+Wire Wire Line
+	6600 1050 6200 1050
+Wire Wire Line
+	6200 1050 6200 1200
+Wire Wire Line
+	6300 1200 7100 1200
+Wire Wire Line
+	7100 1200 7100 900 
+$Comp
+L power:GND #PWR0102
+U 1 1 5DEC9602
+P 4950 600
+F 0 "#PWR0102" H 4950 350 50  0001 C CNN
+F 1 "GND" H 4955 427 50  0000 C CNN
+F 2 "" H 4950 600 50  0001 C CNN
+F 3 "" H 4950 600 50  0001 C CNN
+	1    4950 600 
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:C C1
+U 1 1 5DEC9DB9
+P 5050 1150
+F 0 "C1" H 5165 1196 50  0000 L CNN
+F 1 "100nF" H 5165 1105 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 5088 1000 50  0001 C CNN
+F 3 "~" H 5050 1150 50  0001 C CNN
+	1    5050 1150
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW2
+U 1 1 5DECA090
+P 4450 1200
+F 0 "SW2" V 4404 1348 50  0000 L CNN
+F 1 "RESET" V 4495 1348 50  0000 L CNN
+F 2 "Button_Switch_SMD:SW_SPST_CK_RS282G05A3" H 4450 1400 50  0001 C CNN
+F 3 "" H 4450 1400 50  0001 C CNN
+	1    4450 1200
+	0    1    1    0   
+$EndComp
+$Comp
+L power:GND #PWR0103
+U 1 1 5DECA788
+P 4150 1000
+F 0 "#PWR0103" H 4150 750 50  0001 C CNN
+F 1 "GND" H 4155 827 50  0000 C CNN
+F 2 "" H 4150 1000 50  0001 C CNN
+F 3 "" H 4150 1000 50  0001 C CNN
+	1    4150 1000
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	5400 1400 5050 1400
+Wire Wire Line
+	4450 1000 4150 1000
+Wire Wire Line
+	4450 1400 5050 1400
+Connection ~ 5050 1400
+Wire Wire Line
+	5050 1400 5050 1300
+Wire Wire Line
+	4450 1000 5050 1000
+Connection ~ 4450 1000
+$Comp
+L Switch:SW_Push SW1
+U 1 1 5DECE105
+P 4200 1600
+F 0 "SW1" H 4200 1415 50  0000 C CNN
+F 1 "BOOT" H 4200 1506 50  0000 C CNN
+F 2 "Button_Switch_SMD:SW_SPST_CK_RS282G05A3" H 4200 1800 50  0001 C CNN
+F 3 "" H 4200 1800 50  0001 C CNN
+	1    4200 1600
+	-1   0    0    1   
+$EndComp
+$Comp
+L Device:R R1
+U 1 1 5DECE7D2
+P 4450 1750
+F 0 "R1" H 4520 1796 50  0000 L CNN
+F 1 "5.1k" H 4520 1705 50  0000 L CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" V 4380 1750 50  0001 C CNN
+F 3 "~" H 4450 1750 50  0001 C CNN
+	1    4450 1750
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:GND #PWR0104
+U 1 1 5DECF310
+P 4450 1900
+F 0 "#PWR0104" H 4450 1650 50  0001 C CNN
+F 1 "GND" H 4455 1727 50  0000 C CNN
+F 2 "" H 4450 1900 50  0001 C CNN
+F 3 "" H 4450 1900 50  0001 C CNN
+	1    4450 1900
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	4400 1600 4450 1600
+Wire Wire Line
+	4450 1600 5400 1600
+Connection ~ 4450 1600
+$Comp
+L Regulator_Linear:LM3480-3.3 U2
+U 1 1 5DED53E7
+P 8250 900
+F 0 "U2" H 8250 1050 50  0000 C CNN
+F 1 "LDO" H 8250 1141 50  0000 C CNN
+F 2 "Package_TO_SOT_SMD:SOT-23" H 8250 1125 50  0001 C CIN
+F 3 "http://www.ti.com/lit/ds/symlink/lm3480.pdf" H 8250 900 50  0001 C CNN
+	1    8250 900 
+	-1   0    0    1   
+$EndComp
+$Comp
+L power:GND #PWR0105
+U 1 1 5DEDB000
+P 10750 2400
+F 0 "#PWR0105" H 10750 2150 50  0001 C CNN
+F 1 "GND" H 10755 2227 50  0000 C CNN
+F 2 "" H 10750 2400 50  0001 C CNN
+F 3 "" H 10750 2400 50  0001 C CNN
+	1    10750 2400
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	11050 2400 10750 2400
+Wire Wire Line
+	10150 900  8650 900 
+$Comp
+L Device:R R7
+U 1 1 5DEDEA73
+P 10000 1100
+F 0 "R7" V 9793 1100 50  0000 C CNN
+F 1 "5.1k" V 9884 1100 50  0000 C CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" V 9930 1100 50  0001 C CNN
+F 3 "~" H 10000 1100 50  0001 C CNN
+	1    10000 1100
+	0    1    1    0   
+$EndComp
+$Comp
+L Device:R R6
+U 1 1 5DEDEAE6
+P 9500 1200
+F 0 "R6" V 9707 1200 50  0000 C CNN
+F 1 "5.1k" V 9616 1200 50  0000 C CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" V 9430 1200 50  0001 C CNN
+F 3 "~" H 9500 1200 50  0001 C CNN
+	1    9500 1200
+	0    1    -1   0   
+$EndComp
+Wire Wire Line
+	9650 1200 10150 1200
+Wire Wire Line
+	9850 1100 9350 1100
+Wire Wire Line
+	9350 1100 9350 1200
+$Comp
+L power:GND #PWR0106
+U 1 1 5DEE274F
+P 9250 1200
+F 0 "#PWR0106" H 9250 950 50  0001 C CNN
+F 1 "GND" H 9255 1027 50  0000 C CNN
+F 2 "" H 9250 1200 50  0001 C CNN
+F 3 "" H 9250 1200 50  0001 C CNN
+	1    9250 1200
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	9250 1200 9350 1200
+Connection ~ 9350 1200
+Wire Wire Line
+	10150 1400 10150 1500
+Wire Wire Line
+	10150 1600 10150 1700
+Connection ~ 8650 900 
+Wire Wire Line
+	8650 900  8550 900 
+Wire Wire Line
+	7100 900  7600 900 
+Wire Wire Line
+	4950 600  5700 600 
+$Comp
+L Device:C C6
+U 1 1 5DEE73ED
+P 7600 750
+F 0 "C6" H 7715 796 50  0000 L CNN
+F 1 "1µF" H 7715 705 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 7638 600 50  0001 C CNN
+F 3 "~" H 7600 750 50  0001 C CNN
+	1    7600 750 
+	1    0    0    -1  
+$EndComp
+Connection ~ 7600 900 
+Wire Wire Line
+	7600 900  7950 900 
+Wire Wire Line
+	7600 600  8250 600 
+Connection ~ 8250 600 
+Wire Wire Line
+	8650 600  8250 600 
+Wire Wire Line
+	7100 600  7600 600 
+Connection ~ 7100 600 
+Connection ~ 7600 600 
+Text GLabel 6700 3800 2    50   Input ~ 0
+SWDIO
+Text GLabel 6700 3900 2    50   Input ~ 0
+SWDCLK
+Wire Wire Line
+	4000 1600 4000 900 
+Wire Wire Line
+	4000 900  5700 900 
+Text GLabel 4000 900  0    50   Input ~ 0
+3.3V
+$Comp
+L pspice:DIODE D11
+U 1 1 5DF621C8
+P 950 3350
+F 0 "D11" H 950 3615 50  0000 C CNN
+F 1 "D3.3" H 950 3524 50  0000 C CNN
+F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 950 3350 50  0001 C CNN
+F 3 "~" H 950 3350 50  0001 C CNN
+	1    950  3350
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW9
+U 1 1 5DF621CF
+P 1350 3350
+F 0 "SW9" H 1350 3635 50  0000 C CNN
+F 1 "SW_Push" H 1350 3544 50  0000 C CNN
+F 2 "foostan-kbd:CherryMX_Choc_1u" H 1350 3550 50  0001 C CNN
+F 3 "" H 1350 3550 50  0001 C CNN
+	1    1350 3350
+	1    0    0    -1  
+$EndComp
+$Comp
+L pspice:DIODE D12
+U 1 1 5DF621D6
+P 950 3750
+F 0 "D12" H 950 4015 50  0000 C CNN
+F 1 "D4.3" H 950 3924 50  0000 C CNN
+F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 950 3750 50  0001 C CNN
+F 3 "~" H 950 3750 50  0001 C CNN
+	1    950  3750
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW10
+U 1 1 5DF621DD
+P 1350 3750
+F 0 "SW10" H 1350 4035 50  0000 C CNN
+F 1 "SW_Push" H 1350 3944 50  0000 C CNN
+F 2 "foostan-kbd:CherryMX_Choc_1u" H 1350 3950 50  0001 C CNN
+F 3 "" H 1350 3950 50  0001 C CNN
+	1    1350 3750
+	1    0    0    -1  
+$EndComp
+$Comp
+L pspice:DIODE D10
+U 1 1 5DF621F2
+P 950 2950
+F 0 "D10" H 950 3215 50  0000 C CNN
+F 1 "D2.3" H 950 3124 50  0000 C CNN
+F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 950 2950 50  0001 C CNN
+F 3 "~" H 950 2950 50  0001 C CNN
+	1    950  2950
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW8
+U 1 1 5DF621F9
+P 1350 2950
+F 0 "SW8" H 1350 3235 50  0000 C CNN
+F 1 "SW_Push" H 1350 3144 50  0000 C CNN
+F 2 "foostan-kbd:CherryMX_Choc_1u" H 1350 3150 50  0001 C CNN
+F 3 "" H 1350 3150 50  0001 C CNN
+	1    1350 2950
+	1    0    0    -1  
+$EndComp
+$Comp
+L pspice:DIODE D9
+U 1 1 5DF62200
+P 950 2550
+F 0 "D9" H 950 2815 50  0000 C CNN
+F 1 "D1.3" H 950 2724 50  0000 C CNN
+F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 950 2550 50  0001 C CNN
+F 3 "~" H 950 2550 50  0001 C CNN
+	1    950  2550
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW7
+U 1 1 5DF62207
+P 1350 2550
+F 0 "SW7" H 1350 2835 50  0000 C CNN
+F 1 "SW_Push" H 1350 2744 50  0000 C CNN
+F 2 "foostan-kbd:CherryMX_Choc_1u" H 1350 2750 50  0001 C CNN
+F 3 "" H 1350 2750 50  0001 C CNN
+	1    1350 2550
+	1    0    0    -1  
+$EndComp
+Text GLabel 1550 2550 2    50   Input ~ 0
+COL3
+Text GLabel 750  2950 0    50   Input ~ 0
+ROW2
+Text GLabel 750  3350 0    50   Input ~ 0
+ROW3
+Text GLabel 750  3750 0    50   Input ~ 0
+ROW4
+Text GLabel 750  2550 0    50   Input ~ 0
+ROW1
+Text GLabel 5400 2500 0    50   Input ~ 0
+ROW1
+Text GLabel 5400 2600 0    50   Input ~ 0
+ROW2
+Text GLabel 5400 2700 0    50   Input ~ 0
+ROW3
+Text GLabel 5400 3500 0    50   Input ~ 0
+ROW4
+Wire Wire Line
+	1550 2550 1550 2950
+Wire Wire Line
+	1550 2950 1550 3350
+Connection ~ 1550 2950
+Wire Wire Line
+	1550 3350 1550 3750
+Connection ~ 1550 3350
+$Comp
+L pspice:DIODE D25
+U 1 1 5DFE23D1
+P 2300 3350
+F 0 "D25" H 2300 3615 50  0000 C CNN
+F 1 "D3.4" H 2300 3524 50  0000 C CNN
+F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 2300 3350 50  0001 C CNN
+F 3 "~" H 2300 3350 50  0001 C CNN
+	1    2300 3350
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW23
+U 1 1 5DFE23D8
+P 2700 3350
+F 0 "SW23" H 2700 3635 50  0000 C CNN
+F 1 "SW_Push" H 2700 3544 50  0000 C CNN
+F 2 "foostan-kbd:CherryMX_Choc_1u" H 2700 3550 50  0001 C CNN
+F 3 "" H 2700 3550 50  0001 C CNN
+	1    2700 3350
+	1    0    0    -1  
+$EndComp
+$Comp
+L pspice:DIODE D26
+U 1 1 5DFE23DF
+P 2300 3750
+F 0 "D26" H 2300 4015 50  0000 C CNN
+F 1 "D4.4" H 2300 3924 50  0000 C CNN
+F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 2300 3750 50  0001 C CNN
+F 3 "~" H 2300 3750 50  0001 C CNN
+	1    2300 3750
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW24
+U 1 1 5DFE23E6
+P 2700 3750
+F 0 "SW24" H 2700 4035 50  0000 C CNN
+F 1 "SW_Push" H 2700 3944 50  0000 C CNN
+F 2 "foostan-kbd:CherryMX_Choc_1u" H 2700 3950 50  0001 C CNN
+F 3 "" H 2700 3950 50  0001 C CNN
+	1    2700 3750
+	1    0    0    -1  
+$EndComp
+$Comp
+L pspice:DIODE D24
+U 1 1 5DFE23FB
+P 2300 2950
+F 0 "D24" H 2300 3215 50  0000 C CNN
+F 1 "D2.4" H 2300 3124 50  0000 C CNN
+F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 2300 2950 50  0001 C CNN
+F 3 "~" H 2300 2950 50  0001 C CNN
+	1    2300 2950
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW22
+U 1 1 5DFE2402
+P 2700 2950
+F 0 "SW22" H 2700 3235 50  0000 C CNN
+F 1 "SW_Push" H 2700 3144 50  0000 C CNN
+F 2 "foostan-kbd:CherryMX_Choc_1u" H 2700 3150 50  0001 C CNN
+F 3 "" H 2700 3150 50  0001 C CNN
+	1    2700 2950
+	1    0    0    -1  
+$EndComp
+$Comp
+L pspice:DIODE D23
+U 1 1 5DFE2409
+P 2300 2550
+F 0 "D23" H 2300 2815 50  0000 C CNN
+F 1 "D1.4" H 2300 2724 50  0000 C CNN
+F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 2300 2550 50  0001 C CNN
+F 3 "~" H 2300 2550 50  0001 C CNN
+	1    2300 2550
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW21
+U 1 1 5DFE2410
+P 2700 2550
+F 0 "SW21" H 2700 2835 50  0000 C CNN
+F 1 "SW_Push" H 2700 2744 50  0000 C CNN
+F 2 "foostan-kbd:CherryMX_Choc_1u" H 2700 2750 50  0001 C CNN
+F 3 "" H 2700 2750 50  0001 C CNN
+	1    2700 2550
+	1    0    0    -1  
+$EndComp
+Text GLabel 2900 2550 2    50   Input ~ 0
+COL4
+Text GLabel 2100 2950 0    50   Input ~ 0
+ROW2
+Text GLabel 2100 3350 0    50   Input ~ 0
+ROW3
+Text GLabel 2100 3750 0    50   Input ~ 0
+ROW4
+Text GLabel 2100 2550 0    50   Input ~ 0
+ROW1
+Wire Wire Line
+	2900 2550 2900 2950
+Wire Wire Line
+	2900 2950 2900 3350
+Connection ~ 2900 2950
+Wire Wire Line
+	2900 3350 2900 3750
+Connection ~ 2900 3350
+$Comp
+L pspice:DIODE D35
+U 1 1 5DFE3E8A
+P 3650 3350
+F 0 "D35" H 3650 3615 50  0000 C CNN
+F 1 "D3.5" H 3650 3524 50  0000 C CNN
+F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 3650 3350 50  0001 C CNN
+F 3 "~" H 3650 3350 50  0001 C CNN
+	1    3650 3350
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW33
+U 1 1 5DFE3E91
+P 4050 3350
+F 0 "SW33" H 4050 3635 50  0000 C CNN
+F 1 "SW_Push" H 4050 3544 50  0000 C CNN
+F 2 "foostan-kbd:CherryMX_Choc_1u" H 4050 3550 50  0001 C CNN
+F 3 "" H 4050 3550 50  0001 C CNN
+	1    4050 3350
+	1    0    0    -1  
+$EndComp
+$Comp
+L pspice:DIODE D36
+U 1 1 5DFE3E98
+P 3650 3750
+F 0 "D36" H 3650 4015 50  0000 C CNN
+F 1 "D4.5" H 3650 3924 50  0000 C CNN
+F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 3650 3750 50  0001 C CNN
+F 3 "~" H 3650 3750 50  0001 C CNN
+	1    3650 3750
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW34
+U 1 1 5DFE3E9F
+P 4050 3750
+F 0 "SW34" H 4050 4035 50  0000 C CNN
+F 1 "SW_Push" H 4050 3944 50  0000 C CNN
+F 2 "foostan-kbd:CherryMX_Choc_1u" H 4050 3950 50  0001 C CNN
+F 3 "" H 4050 3950 50  0001 C CNN
+	1    4050 3750
+	1    0    0    -1  
+$EndComp
+$Comp
+L pspice:DIODE D34
+U 1 1 5DFE3EB4
+P 3650 2950
+F 0 "D34" H 3650 3215 50  0000 C CNN
+F 1 "D2.5" H 3650 3124 50  0000 C CNN
+F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 3650 2950 50  0001 C CNN
+F 3 "~" H 3650 2950 50  0001 C CNN
+	1    3650 2950
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW32
+U 1 1 5DFE3EBB
+P 4050 2950
+F 0 "SW32" H 4050 3235 50  0000 C CNN
+F 1 "SW_Push" H 4050 3144 50  0000 C CNN
+F 2 "foostan-kbd:CherryMX_Choc_1u" H 4050 3150 50  0001 C CNN
+F 3 "" H 4050 3150 50  0001 C CNN
+	1    4050 2950
+	1    0    0    -1  
+$EndComp
+$Comp
+L pspice:DIODE D33
+U 1 1 5DFE3EC2
+P 3650 2550
+F 0 "D33" H 3650 2815 50  0000 C CNN
+F 1 "D1.5" H 3650 2724 50  0000 C CNN
+F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 3650 2550 50  0001 C CNN
+F 3 "~" H 3650 2550 50  0001 C CNN
+	1    3650 2550
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW31
+U 1 1 5DFE3EC9
+P 4050 2550
+F 0 "SW31" H 4050 2835 50  0000 C CNN
+F 1 "SW_Push" H 4050 2744 50  0000 C CNN
+F 2 "foostan-kbd:CherryMX_Choc_1u" H 4050 2750 50  0001 C CNN
+F 3 "" H 4050 2750 50  0001 C CNN
+	1    4050 2550
+	1    0    0    -1  
+$EndComp
+Text GLabel 4250 2550 2    50   Input ~ 0
+COL5
+Text GLabel 3450 2950 0    50   Input ~ 0
+ROW2
+Text GLabel 3450 3350 0    50   Input ~ 0
+ROW3
+Text GLabel 3450 3750 0    50   Input ~ 0
+ROW4
+Text GLabel 3450 2550 0    50   Input ~ 0
+ROW1
+Wire Wire Line
+	4250 2550 4250 2950
+Wire Wire Line
+	4250 2950 4250 3350
+Connection ~ 4250 2950
+Wire Wire Line
+	4250 3350 4250 3750
+Connection ~ 4250 3350
+$Comp
+L pspice:DIODE D7
+U 1 1 5DFE6378
+P 950 1650
+F 0 "D7" H 950 1915 50  0000 C CNN
+F 1 "D3.1" H 950 1824 50  0000 C CNN
+F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 950 1650 50  0001 C CNN
+F 3 "~" H 950 1650 50  0001 C CNN
+	1    950  1650
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW5
+U 1 1 5DFE637F
+P 1350 1650
+F 0 "SW5" H 1350 1935 50  0000 C CNN
+F 1 "SW_Push" H 1350 1844 50  0000 C CNN
+F 2 "foostan-kbd:CherryMX_Choc_1u" H 1350 1850 50  0001 C CNN
+F 3 "" H 1350 1850 50  0001 C CNN
+	1    1350 1650
+	1    0    0    -1  
+$EndComp
+$Comp
+L pspice:DIODE D6
+U 1 1 5DFE63A2
+P 950 1250
+F 0 "D6" H 950 1515 50  0000 C CNN
+F 1 "D2.1" H 950 1424 50  0000 C CNN
+F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 950 1250 50  0001 C CNN
+F 3 "~" H 950 1250 50  0001 C CNN
+	1    950  1250
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW4
+U 1 1 5DFE63A9
+P 1350 1250
+F 0 "SW4" H 1350 1535 50  0000 C CNN
+F 1 "SW_Push" H 1350 1444 50  0000 C CNN
+F 2 "foostan-kbd:CherryMX_Choc_1u" H 1350 1450 50  0001 C CNN
+F 3 "" H 1350 1450 50  0001 C CNN
+	1    1350 1250
+	1    0    0    -1  
+$EndComp
+$Comp
+L pspice:DIODE D5
+U 1 1 5DFE63B0
+P 950 850
+F 0 "D5" H 950 1115 50  0000 C CNN
+F 1 "D1.1" H 950 1024 50  0000 C CNN
+F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 950 850 50  0001 C CNN
+F 3 "~" H 950 850 50  0001 C CNN
+	1    950  850 
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW3
+U 1 1 5DFE63B7
+P 1350 850
+F 0 "SW3" H 1350 1135 50  0000 C CNN
+F 1 "SW_Push" H 1350 1044 50  0000 C CNN
+F 2 "foostan-kbd:CherryMX_Choc_1u" H 1350 1050 50  0001 C CNN
+F 3 "" H 1350 1050 50  0001 C CNN
+	1    1350 850 
+	1    0    0    -1  
+$EndComp
+Text GLabel 1550 850  2    50   Input ~ 0
+COL1
+Text GLabel 750  1250 0    50   Input ~ 0
+ROW2
+Text GLabel 750  1650 0    50   Input ~ 0
+ROW3
+Text GLabel 750  850  0    50   Input ~ 0
+ROW1
+Wire Wire Line
+	1550 850  1550 1250
+Wire Wire Line
+	1550 1250 1550 1650
+Connection ~ 1550 1250
+$Comp
+L pspice:DIODE D21
+U 1 1 5DFE63CB
+P 2300 1650
+F 0 "D21" H 2300 1915 50  0000 C CNN
+F 1 "D3.2" H 2300 1824 50  0000 C CNN
+F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 2300 1650 50  0001 C CNN
+F 3 "~" H 2300 1650 50  0001 C CNN
+	1    2300 1650
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW19
+U 1 1 5DFE63D2
+P 2700 1650
+F 0 "SW19" H 2700 1935 50  0000 C CNN
+F 1 "SW_Push" H 2700 1844 50  0000 C CNN
+F 2 "foostan-kbd:CherryMX_Choc_1u" H 2700 1850 50  0001 C CNN
+F 3 "" H 2700 1850 50  0001 C CNN
+	1    2700 1650
+	1    0    0    -1  
+$EndComp
+$Comp
+L pspice:DIODE D20
+U 1 1 5DFE63F5
+P 2300 1250
+F 0 "D20" H 2300 1515 50  0000 C CNN
+F 1 "D2.2" H 2300 1424 50  0000 C CNN
+F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 2300 1250 50  0001 C CNN
+F 3 "~" H 2300 1250 50  0001 C CNN
+	1    2300 1250
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW18
+U 1 1 5DFE63FC
+P 2700 1250
+F 0 "SW18" H 2700 1535 50  0000 C CNN
+F 1 "SW_Push" H 2700 1444 50  0000 C CNN
+F 2 "foostan-kbd:CherryMX_Choc_1u" H 2700 1450 50  0001 C CNN
+F 3 "" H 2700 1450 50  0001 C CNN
+	1    2700 1250
+	1    0    0    -1  
+$EndComp
+$Comp
+L pspice:DIODE D19
+U 1 1 5DFE6403
+P 2300 850
+F 0 "D19" H 2300 1115 50  0000 C CNN
+F 1 "D1.2" H 2300 1024 50  0000 C CNN
+F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 2300 850 50  0001 C CNN
+F 3 "~" H 2300 850 50  0001 C CNN
+	1    2300 850 
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW17
+U 1 1 5DFE640A
+P 2700 850
+F 0 "SW17" H 2700 1135 50  0000 C CNN
+F 1 "SW_Push" H 2700 1044 50  0000 C CNN
+F 2 "foostan-kbd:CherryMX_Choc_1u" H 2700 1050 50  0001 C CNN
+F 3 "" H 2700 1050 50  0001 C CNN
+	1    2700 850 
+	1    0    0    -1  
+$EndComp
+Text GLabel 2900 850  2    50   Input ~ 0
+COL2
+Text GLabel 2100 1250 0    50   Input ~ 0
+ROW2
+Text GLabel 2100 1650 0    50   Input ~ 0
+ROW3
+Text GLabel 2100 850  0    50   Input ~ 0
+ROW1
+Wire Wire Line
+	2900 850  2900 1250
+Wire Wire Line
+	2900 1250 2900 1650
+Connection ~ 2900 1250
+$Comp
+L pspice:DIODE D16
+U 1 1 5DFEF7D2
+P 950 6700
+F 0 "D16" H 950 6965 50  0000 C CNN
+F 1 "D3.6" H 950 6874 50  0000 C CNN
+F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 950 6700 50  0001 C CNN
+F 3 "~" H 950 6700 50  0001 C CNN
+	1    950  6700
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW14
+U 1 1 5DFEF7D9
+P 1350 6700
+F 0 "SW14" H 1350 6985 50  0000 C CNN
+F 1 "SW_Push" H 1350 6894 50  0000 C CNN
+F 2 "foostan-kbd:CherryMX_Choc_1u" H 1350 6900 50  0001 C CNN
+F 3 "" H 1350 6900 50  0001 C CNN
+	1    1350 6700
+	1    0    0    -1  
+$EndComp
+$Comp
+L pspice:DIODE D17
+U 1 1 5DFEF7E0
+P 950 7100
+F 0 "D17" H 950 7365 50  0000 C CNN
+F 1 "D4.6" H 950 7274 50  0000 C CNN
+F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 950 7100 50  0001 C CNN
+F 3 "~" H 950 7100 50  0001 C CNN
+	1    950  7100
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW15
+U 1 1 5DFEF7E7
+P 1350 7100
+F 0 "SW15" H 1350 7385 50  0000 C CNN
+F 1 "SW_Push" H 1350 7294 50  0000 C CNN
+F 2 "foostan-kbd:CherryMX_Choc_1u" H 1350 7300 50  0001 C CNN
+F 3 "" H 1350 7300 50  0001 C CNN
+	1    1350 7100
+	1    0    0    -1  
+$EndComp
+$Comp
+L pspice:DIODE D15
+U 1 1 5DFEF7FC
+P 950 6300
+F 0 "D15" H 950 6565 50  0000 C CNN
+F 1 "D2.6" H 950 6474 50  0000 C CNN
+F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 950 6300 50  0001 C CNN
+F 3 "~" H 950 6300 50  0001 C CNN
+	1    950  6300
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW13
+U 1 1 5DFEF803
+P 1350 6300
+F 0 "SW13" H 1350 6585 50  0000 C CNN
+F 1 "SW_Push" H 1350 6494 50  0000 C CNN
+F 2 "foostan-kbd:CherryMX_Choc_1u" H 1350 6500 50  0001 C CNN
+F 3 "" H 1350 6500 50  0001 C CNN
+	1    1350 6300
+	1    0    0    -1  
+$EndComp
+$Comp
+L pspice:DIODE D14
+U 1 1 5DFEF80A
+P 950 5900
+F 0 "D14" H 950 6165 50  0000 C CNN
+F 1 "D1.6" H 950 6074 50  0000 C CNN
+F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 950 5900 50  0001 C CNN
+F 3 "~" H 950 5900 50  0001 C CNN
+	1    950  5900
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW12
+U 1 1 5DFEF811
+P 1350 5900
+F 0 "SW12" H 1350 6185 50  0000 C CNN
+F 1 "SW_Push" H 1350 6094 50  0000 C CNN
+F 2 "foostan-kbd:CherryMX_Choc_1u" H 1350 6100 50  0001 C CNN
+F 3 "" H 1350 6100 50  0001 C CNN
+	1    1350 5900
+	1    0    0    -1  
+$EndComp
+Text GLabel 1550 5900 2    50   Input ~ 0
+COL6
+Text GLabel 750  6300 0    50   Input ~ 0
+ROW2
+Text GLabel 750  6700 0    50   Input ~ 0
+ROW3
+Text GLabel 750  7100 0    50   Input ~ 0
+ROW4
+Text GLabel 750  5900 0    50   Input ~ 0
+ROW1
+Wire Wire Line
+	1550 5900 1550 6300
+Wire Wire Line
+	1550 6300 1550 6700
+Connection ~ 1550 6300
+Wire Wire Line
+	1550 6700 1550 7100
+Connection ~ 1550 6700
+Text GLabel 6700 4000 2    50   Input ~ 0
+COL1
+Text GLabel 5400 2800 0    50   Input ~ 0
+COL2
+Text GLabel 5400 2900 0    50   Input ~ 0
+COL3
+Text GLabel 5400 3000 0    50   Input ~ 0
+COL4
+Text GLabel 5400 3300 0    50   Input ~ 0
+COL5
+Text GLabel 5400 3400 0    50   Input ~ 0
+COL6
+Text GLabel 9300 900  1    50   Input ~ 0
+5V
+Text GLabel 10150 1500 0    50   Input ~ 0
+D-
+Text GLabel 6700 3600 2    50   Input ~ 0
+D-
+Text GLabel 10150 1700 0    50   Input ~ 0
+D+
+Text GLabel 6700 3700 2    50   Input ~ 0
+D+
+$Comp
+L Connector:USB_C_Receptacle_USB2.0 J1
+U 1 1 5E037A53
+P 10750 1500
+F 0 "J1" H 10320 1441 50  0000 R CNN
+F 1 "USB_C_Receptacle_USB2.0" H 10320 1350 50  0000 R CNN
+F 2 "kicad-usb:USB_C_Receptacle_HRO_TYPE-C-31-M-12" H 10900 1500 50  0001 C CNN
+F 3 "https://www.usb.org/sites/default/files/documents/usb_type-c.zip" H 10900 1500 50  0001 C CNN
+	1    10750 1500
+	-1   0    0    -1  
+$EndComp
+Connection ~ 10750 2400
+Text GLabel 5900 1200 0    50   Input ~ 0
+VBAT
+$Comp
+L power:GND #PWR0107
+U 1 1 5ED2E262
+P 8550 2250
+F 0 "#PWR0107" H 8550 2000 50  0001 C CNN
+F 1 "GND" H 8555 2077 50  0000 C CNN
+F 2 "" H 8550 2250 50  0001 C CNN
+F 3 "" H 8550 2250 50  0001 C CNN
+	1    8550 2250
+	1    0    0    -1  
+$EndComp
+Text GLabel 8550 2150 0    50   Input ~ 0
+5V
+Text GLabel 8550 1950 0    50   Input ~ 0
+TX
+Text GLabel 8550 2050 0    50   Input ~ 0
+RX
+Text GLabel 6700 3400 2    50   Input ~ 0
+TX
+Text GLabel 6700 3500 2    50   Input ~ 0
+RX
+$Comp
+L Connector:Conn_01x04_Female J2
+U 1 1 5ED45338
+P 8750 2150
+F 0 "J2" H 8643 1725 50  0000 C CNN
+F 1 "AudioJack4" H 8643 1816 50  0000 C CNN
+F 2 "Keebio:TRRS-PJ-320A-no-Fmask" H 8750 2150 50  0001 C CNN
+F 3 "~" H 8750 2150 50  0001 C CNN
+	1    8750 2150
+	1    0    0    1   
+$EndComp
+Text GLabel 7300 1800 0    50   Input ~ 0
+SWDIO
+Text GLabel 7300 1900 0    50   Input ~ 0
+SWDCLK
+Text GLabel 7300 1700 0    50   Input ~ 0
+3.3V
+$Comp
+L power:GND #PWR0108
+U 1 1 5ED50DF3
+P 7300 2000
+F 0 "#PWR0108" H 7300 1750 50  0001 C CNN
+F 1 "GND" V 7305 1872 50  0000 R CNN
+F 2 "" H 7300 2000 50  0001 C CNN
+F 3 "" H 7300 2000 50  0001 C CNN
+	1    7300 2000
+	0    1    1    0   
+$EndComp
+Text GLabel 6700 2900 2    50   Input ~ 0
+PA4
+Text GLabel 6700 3100 2    50   Input ~ 0
+PA6
+Text GLabel 6700 3200 2    50   Input ~ 0
+PA7
+Text GLabel 5400 3100 0    50   Input ~ 0
+PB6
+Text GLabel 5400 3200 0    50   Input ~ 0
+PB7
+$Comp
+L Connector:Conn_01x12_Male J3
+U 1 1 5EDBCB44
+P 7500 2200
+F 0 "J3" H 7473 2173 50  0000 R CNN
+F 1 "Conn_01x12_Male" H 7473 2082 50  0000 R CNN
+F 2 "kicad-harwin:Harwin_M20-89012xx_1x12_P2.54mm_Horizontal" H 7500 2200 50  0001 C CNN
+F 3 "~" H 7500 2200 50  0001 C CNN
+	1    7500 2200
+	-1   0    0    -1  
+$EndComp
+Text GLabel 7300 2600 0    50   Input ~ 0
+PB6
+Text GLabel 7300 2700 0    50   Input ~ 0
+PB7
+Text GLabel 7300 2800 0    50   Input ~ 0
+5V
+$Comp
+L power:GND #PWR0109
+U 1 1 5EDBE5BA
+P 7300 2500
+F 0 "#PWR0109" H 7300 2250 50  0001 C CNN
+F 1 "GND" V 7305 2372 50  0000 R CNN
+F 2 "" H 7300 2500 50  0001 C CNN
+F 3 "" H 7300 2500 50  0001 C CNN
+	1    7300 2500
+	0    1    1    0   
+$EndComp
+Text GLabel 7300 2100 0    50   Input ~ 0
+PA4
+Text GLabel 7300 2200 0    50   Input ~ 0
+PA5
+Text GLabel 7300 2300 0    50   Input ~ 0
+PA6
+Text GLabel 7300 2400 0    50   Input ~ 0
+PA7
+Text GLabel 6700 3000 2    50   Input ~ 0
+PA5
+Text GLabel 5400 3700 0    50   Input ~ 0
+3.3V
+$EndSCHEMATC