diff --git a/kezboard-pcb.kicad_pcb b/kezboard-pcb.kicad_pcb
index 8285745..bd01355 100644
--- a/kezboard-pcb.kicad_pcb
+++ b/kezboard-pcb.kicad_pcb
@@ -60,7 +60,7 @@
     (pad_to_mask_clearance 0.051)
     (solder_mask_min_width 0.25)
     (aux_axis_origin 0 0)
-    (visible_elements FFFFFF7F)
+    (visible_elements FFFFF77F)
     (pcbplotparams
       (layerselection 0x010fc_ffffffff)
       (usegerberextensions false)
@@ -3889,8 +3889,8 @@
     )
   )
 
-  (module Diode_SMD:D_SOD-123 (layer F.Cu) (tedit 58645DC7) (tstamp 5F15F155)
-    (at 82.575001 99.245001)
+  (module Diode_SMD:D_SOD-123 (layer F.Cu) (tedit 58645DC7) (tstamp 5F167D02)
+    (at 353.085001 224.975001)
     (descr SOD-123)
     (tags SOD-123)
     (path /5F51BE8C/5F5376E7)
@@ -3933,8 +3933,8 @@
     )
   )
 
-  (module Diode_SMD:D_SOD-123 (layer F.Cu) (tedit 58645DC7) (tstamp 5F15F16E)
-    (at 94.075001 102.595001)
+  (module Diode_SMD:D_SOD-123 (layer F.Cu) (tedit 58645DC7) (tstamp 5F167C72)
+    (at 364.585001 228.325001)
     (descr SOD-123)
     (tags SOD-123)
     (path /5F51BE8C/5F8261D7)
@@ -3977,8 +3977,8 @@
     )
   )
 
-  (module Diode_SMD:D_SOD-123 (layer F.Cu) (tedit 58645DC7) (tstamp 5F15F187)
-    (at 94.075001 99.245001)
+  (module Diode_SMD:D_SOD-123 (layer F.Cu) (tedit 58645DC7) (tstamp 5F167CBA)
+    (at 364.585001 224.975001)
     (descr SOD-123)
     (tags SOD-123)
     (path /5F51BE8C/5F8298D6)
@@ -4021,8 +4021,8 @@
     )
   )
 
-  (module Diode_SMD:D_SOD-123 (layer F.Cu) (tedit 58645DC7) (tstamp 5F15F1A0)
-    (at 88.325001 105.945001)
+  (module Diode_SMD:D_SOD-123 (layer F.Cu) (tedit 58645DC7) (tstamp 5F167AC2)
+    (at 358.835001 231.675001)
     (descr SOD-123)
     (tags SOD-123)
     (path /5F51BE8C/5F82E226)
@@ -4065,8 +4065,8 @@
     )
   )
 
-  (module Diode_SMD:D_SOD-123 (layer F.Cu) (tedit 58645DC7) (tstamp 5F15F1B9)
-    (at 82.575001 105.945001)
+  (module Diode_SMD:D_SOD-123 (layer F.Cu) (tedit 58645DC7) (tstamp 5F167B0A)
+    (at 353.085001 231.675001)
     (descr SOD-123)
     (tags SOD-123)
     (path /5F51BE8C/5F834BBF)
@@ -4109,8 +4109,8 @@
     )
   )
 
-  (module Diode_SMD:D_SOD-123 (layer F.Cu) (tedit 58645DC7) (tstamp 5F15F1D2)
-    (at 88.325001 102.595001)
+  (module Diode_SMD:D_SOD-123 (layer F.Cu) (tedit 58645DC7) (tstamp 5F1679A2)
+    (at 358.835001 228.325001)
     (descr SOD-123)
     (tags SOD-123)
     (path /5F51BE8C/5F841BF8)
@@ -4153,8 +4153,8 @@
     )
   )
 
-  (module Diode_SMD:D_SOD-123 (layer F.Cu) (tedit 58645DC7) (tstamp 5F15F1EB)
-    (at 82.575001 102.595001)
+  (module Diode_SMD:D_SOD-123 (layer F.Cu) (tedit 58645DC7) (tstamp 5F1679EA)
+    (at 353.085001 228.325001)
     (descr SOD-123)
     (tags SOD-123)
     (path /5F51BE8C/5F84AE58)
@@ -4198,7 +4198,7 @@
   )
 
   (module Diode_SMD:D_SOD-123 (layer F.Cu) (tedit 58645DC7) (tstamp 5F15F204)
-    (at 329.565001 88.255001)
+    (at 392.430001 132.705001)
     (descr SOD-123)
     (tags SOD-123)
     (path /5F51BE8C/5F853981)
@@ -4241,8 +4241,8 @@
     )
   )
 
-  (module Diode_SMD:D_SOD-123 (layer F.Cu) (tedit 58645DC7) (tstamp 5F15F21D)
-    (at 88.325001 99.245001)
+  (module Diode_SMD:D_SOD-123 (layer F.Cu) (tedit 58645DC7) (tstamp 5F167D4A)
+    (at 358.835001 224.975001)
     (descr SOD-123)
     (tags SOD-123)
     (path /5F51BE8C/5F85D4B7)
@@ -4286,7 +4286,7 @@
   )
 
   (module Diode_SMD:D_SOD-123 (layer F.Cu) (tedit 58645DC7) (tstamp 5F15F236)
-    (at 334.505001 61.455001)
+    (at 384.81 84.455)
     (descr SOD-123)
     (tags SOD-123)
     (path /5F51BE8C/5F869076)
@@ -4329,8 +4329,8 @@
     )
   )
 
-  (module Diode_SMD:D_SOD-123 (layer F.Cu) (tedit 58645DC7) (tstamp 5F15F24F)
-    (at 82.575001 109.295001)
+  (module Diode_SMD:D_SOD-123 (layer F.Cu) (tedit 58645DC7) (tstamp 5F167D92)
+    (at 353.085001 235.025001)
     (descr SOD-123)
     (tags SOD-123)
     (path /5F51BE8C/5F877D5C)
@@ -4373,8 +4373,8 @@
     )
   )
 
-  (module Diode_SMD:D_SOD-123 (layer F.Cu) (tedit 58645DC7) (tstamp 5F15F268)
-    (at 88.325001 109.295001)
+  (module Diode_SMD:D_SOD-123 (layer F.Cu) (tedit 58645DC7) (tstamp 5F167B52)
+    (at 358.835001 235.025001)
     (descr SOD-123)
     (tags SOD-123)
     (path /5F51BE8C/5F8882DD)
@@ -4417,8 +4417,8 @@
     )
   )
 
-  (module Diode_SMD:D_SOD-123 (layer F.Cu) (tedit 58645DC7) (tstamp 5F15F281)
-    (at 94.075001 109.295001)
+  (module Diode_SMD:D_SOD-123 (layer F.Cu) (tedit 58645DC7) (tstamp 5F167B9A)
+    (at 364.585001 235.025001)
     (descr SOD-123)
     (tags SOD-123)
     (path /5F51BE8C/5F89B207)
@@ -4461,8 +4461,8 @@
     )
   )
 
-  (module Diode_SMD:D_SOD-123 (layer F.Cu) (tedit 58645DC7) (tstamp 5F15F29A)
-    (at 82.575001 112.645001)
+  (module Diode_SMD:D_SOD-123 (layer F.Cu) (tedit 58645DC7) (tstamp 5F167A32)
+    (at 353.085001 238.375001)
     (descr SOD-123)
     (tags SOD-123)
     (path /5F51BE8C/5F51CDF9)
@@ -4505,8 +4505,8 @@
     )
   )
 
-  (module Diode_SMD:D_SOD-123 (layer F.Cu) (tedit 58645DC7) (tstamp 5F15F2B3)
-    (at 88.325001 112.645001)
+  (module Diode_SMD:D_SOD-123 (layer F.Cu) (tedit 58645DC7) (tstamp 5F167BE2)
+    (at 358.835001 238.375001)
     (descr SOD-123)
     (tags SOD-123)
     (path /5F51BE8C/5F551995)
@@ -4549,8 +4549,8 @@
     )
   )
 
-  (module Diode_SMD:D_SOD-123 (layer F.Cu) (tedit 58645DC7) (tstamp 5F15F2CC)
-    (at 94.075001 112.645001)
+  (module Diode_SMD:D_SOD-123 (layer F.Cu) (tedit 58645DC7) (tstamp 5F167A7A)
+    (at 364.585001 238.375001)
     (descr SOD-123)
     (tags SOD-123)
     (path /5F51BE8C/5F8076B6)
@@ -4682,7 +4682,7 @@
   )
 
   (module Diode_SMD:D_SOD-123 (layer F.Cu) (tedit 58645DC7) (tstamp 5F15F317)
-    (at 334.505001 64.805001)
+    (at 389.255 69.215)
     (descr SOD-123)
     (tags SOD-123)
     (path /5F51BE8C/5F82E235)
@@ -4813,8 +4813,8 @@
     )
   )
 
-  (module Diode_SMD:D_SOD-123 (layer F.Cu) (tedit 58645DC7) (tstamp 5F15F362)
-    (at 94.075001 105.945001)
+  (module Diode_SMD:D_SOD-123 (layer F.Cu) (tedit 58645DC7) (tstamp 5F167C2A)
+    (at 364.585001 231.675001)
     (descr SOD-123)
     (tags SOD-123)
     (path /5F51BE8C/5F841C07)
@@ -4901,8 +4901,8 @@
     )
   )
 
-  (module Diode_SMD:D_SOD-123 (layer F.Cu) (tedit 58645DC7) (tstamp 5F15F394)
-    (at 275.055001 139.005001)
+  (module Diode_SMD:D_SOD-123 (layer F.Cu) (tedit 58645DC7) (tstamp 5F167248)
+    (at 313.790001 197.425001)
     (descr SOD-123)
     (tags SOD-123)
     (path /5F51BE8C/5F853990)
@@ -4946,7 +4946,7 @@
   )
 
   (module Diode_SMD:D_SOD-123 (layer F.Cu) (tedit 58645DC7) (tstamp 5F15F3AD)
-    (at 295.255001 118.805001)
+    (at 369.550001 182.305001)
     (descr SOD-123)
     (tags SOD-123)
     (path /5F51BE8C/5F85D4C6)
@@ -5034,7 +5034,7 @@
   )
 
   (module Diode_SMD:D_SOD-123 (layer F.Cu) (tedit 58645DC7) (tstamp 5F15F3DF)
-    (at 333.515001 44.705001)
+    (at 394.335 62.23)
     (descr SOD-123)
     (tags SOD-123)
     (path /5F51BE8C/5F877D6B)
@@ -5078,7 +5078,7 @@
   )
 
   (module Diode_SMD:D_SOD-123 (layer F.Cu) (tedit 58645DC7) (tstamp 5F15F3F8)
-    (at 329.565001 84.905001)
+    (at 392.430001 129.355001)
     (descr SOD-123)
     (tags SOD-123)
     (path /5F51BE8C/5F8882EC)
@@ -5606,7 +5606,7 @@
   )
 
   (module Diode_SMD:D_SOD-123 (layer F.Cu) (tedit 58645DC7) (tstamp 5F15F524)
-    (at 333.515001 41.355001)
+    (at 375.285 72.39)
     (descr SOD-123)
     (tags SOD-123)
     (path /5F51BE8C/5F869094)
@@ -5693,8 +5693,8 @@
     )
   )
 
-  (module Diode_SMD:D_SOD-123 (layer F.Cu) (tedit 58645DC7) (tstamp 5F15F556)
-    (at 333.515001 48.055001)
+  (module Diode_SMD:D_SOD-123 (layer F.Cu) (tedit 58645DC7) (tstamp 5F166017)
+    (at 394.97 76.2)
     (descr SOD-123)
     (tags SOD-123)
     (path /5F51BE8C/5F8882FB)
@@ -5738,7 +5738,7 @@
   )
 
   (module Diode_SMD:D_SOD-123 (layer F.Cu) (tedit 58645DC7) (tstamp 5F15F56F)
-    (at 333.515001 51.405001)
+    (at 382.27 66.04)
     (descr SOD-123)
     (tags SOD-123)
     (path /5F51BE8C/5F89B225)
@@ -5782,7 +5782,7 @@
   )
 
   (module Diode_SMD:D_SOD-123 (layer F.Cu) (tedit 58645DC7) (tstamp 5F15F588)
-    (at 328.755001 58.205001)
+    (at 379.095 86.995)
     (descr SOD-123)
     (tags SOD-123)
     (path /5F51BE8C/5F5519B3)
@@ -5826,7 +5826,7 @@
   )
 
   (module Diode_SMD:D_SOD-123 (layer F.Cu) (tedit 58645DC7) (tstamp 5F15F5A1)
-    (at 333.515001 54.755001)
+    (at 372.745 66.04)
     (descr SOD-123)
     (tags SOD-123)
     (path /5F51BE8C/5F8155E1)
@@ -5870,7 +5870,7 @@
   )
 
   (module Diode_SMD:D_SOD-123 (layer F.Cu) (tedit 58645DC7) (tstamp 5F15F5BA)
-    (at 334.505001 58.105001)
+    (at 394.335 89.535)
     (descr SOD-123)
     (tags SOD-123)
     (path /5F51BE8C/5F829903)
@@ -5914,7 +5914,7 @@
   )
 
   (module Diode_SMD:D_SOD-123 (layer F.Cu) (tedit 58645DC7) (tstamp 5F15F5D3)
-    (at 328.755001 61.555001)
+    (at 385.445 76.835)
     (descr SOD-123)
     (tags SOD-123)
     (path /5F51BE8C/5F82E253)
@@ -5958,7 +5958,7 @@
   )
 
   (module Diode_SMD:D_SOD-123 (layer F.Cu) (tedit 58645DC7) (tstamp 5F15F5EC)
-    (at 328.755001 64.905001)
+    (at 387.35 93.98)
     (descr SOD-123)
     (tags SOD-123)
     (path /5F51BE8C/5F834BEC)
@@ -6002,7 +6002,7 @@
   )
 
   (module Diode_SMD:D_SOD-123 (layer F.Cu) (tedit 58645DC7) (tstamp 5F15F605)
-    (at 333.515001 38.005001)
+    (at 370.84 86.36)
     (descr SOD-123)
     (tags SOD-123)
     (path /5F51BE8C/5F83AD2E)
@@ -6046,7 +6046,7 @@
   )
 
   (module Diode_SMD:D_SOD-123 (layer F.Cu) (tedit 58645DC7) (tstamp 5F15F61E)
-    (at 328.755001 68.255001)
+    (at 395.605 108.585)
     (descr SOD-123)
     (tags SOD-123)
     (path /5F51BE8C/5F841C25)
@@ -6090,7 +6090,7 @@
   )
 
   (module Diode_SMD:D_SOD-123 (layer F.Cu) (tedit 58645DC7) (tstamp 5F15F637)
-    (at 323.815001 78.405001)
+    (at 386.680001 122.855001)
     (descr SOD-123)
     (tags SOD-123)
     (path /5F51BE8C/5F84AE85)
@@ -6134,7 +6134,7 @@
   )
 
   (module Diode_SMD:D_SOD-123 (layer F.Cu) (tedit 58645DC7) (tstamp 5F15F650)
-    (at 334.505001 68.155001)
+    (at 378.46 77.47)
     (descr SOD-123)
     (tags SOD-123)
     (path /5F51BE8C/5F8539AE)
@@ -6178,7 +6178,7 @@
   )
 
   (module Diode_SMD:D_SOD-123 (layer F.Cu) (tedit 58645DC7) (tstamp 5F15F669)
-    (at 304.775001 98.605001)
+    (at 379.070001 162.105001)
     (descr SOD-123)
     (tags SOD-123)
     (path /5F51BE8C/5F85D4E4)
@@ -6222,7 +6222,7 @@
   )
 
   (module Diode_SMD:D_SOD-123 (layer F.Cu) (tedit 58645DC7) (tstamp 5F15F682)
-    (at 310.525001 98.605001)
+    (at 384.820001 162.105001)
     (descr SOD-123)
     (tags SOD-123)
     (path /5F51BE8C/5F8690A3)
@@ -6266,7 +6266,7 @@
   )
 
   (module Diode_SMD:D_SOD-123 (layer F.Cu) (tedit 58645DC7) (tstamp 5F15F69B)
-    (at 304.775001 101.955001)
+    (at 379.070001 165.455001)
     (descr SOD-123)
     (tags SOD-123)
     (path /5F51BE8C/5F877D89)
@@ -6310,7 +6310,7 @@
   )
 
   (module Diode_SMD:D_SOD-123 (layer F.Cu) (tedit 58645DC7) (tstamp 5F15F6B4)
-    (at 334.505001 71.505001)
+    (at 374.015 99.06)
     (descr SOD-123)
     (tags SOD-123)
     (path /5F51BE8C/5F88830A)
@@ -6354,7 +6354,7 @@
   )
 
   (module Diode_SMD:D_SOD-123 (layer F.Cu) (tedit 58645DC7) (tstamp 5F15F6CD)
-    (at 334.505001 74.855001)
+    (at 386.715 104.14)
     (descr SOD-123)
     (tags SOD-123)
     (path /5F51BE8C/5F89B234)
@@ -6398,7 +6398,7 @@
   )
 
   (module Diode_SMD:D_SOD-123 (layer F.Cu) (tedit 58645DC7) (tstamp 5F15F6E6)
-    (at 329.565001 78.205001)
+    (at 392.430001 122.655001)
     (descr SOD-123)
     (tags SOD-123)
     (path /5F51BE8C/5F51CE26)
@@ -6442,7 +6442,7 @@
   )
 
   (module Diode_SMD:D_SOD-123 (layer F.Cu) (tedit 58645DC7) (tstamp 5F15F6FF)
-    (at 323.815001 81.755001)
+    (at 386.680001 126.205001)
     (descr SOD-123)
     (tags SOD-123)
     (path /5F51BE8C/5F5519C2)
@@ -6486,7 +6486,7 @@
   )
 
   (module Diode_SMD:D_SOD-123 (layer F.Cu) (tedit 58645DC7) (tstamp 5F15F718)
-    (at 328.755001 71.605001)
+    (at 393.065 49.53)
     (descr SOD-123)
     (tags SOD-123)
     (path /5F51BE8C/5F8155F0)
@@ -6662,7 +6662,7 @@
   )
 
   (module Diode_SMD:D_SOD-123 (layer F.Cu) (tedit 58645DC7) (tstamp 5F15F77C)
-    (at 323.815001 88.455001)
+    (at 386.680001 132.905001)
     (descr SOD-123)
     (tags SOD-123)
     (path /5F51BE8C/5F834BFB)
@@ -6706,7 +6706,7 @@
   )
 
   (module Diode_SMD:D_SOD-123 (layer F.Cu) (tedit 58645DC7) (tstamp 5F15F795)
-    (at 329.565001 81.555001)
+    (at 392.430001 126.005001)
     (descr SOD-123)
     (tags SOD-123)
     (path /5F51BE8C/5F83AD3D)
@@ -6750,7 +6750,7 @@
   )
 
   (module Diode_SMD:D_SOD-123 (layer F.Cu) (tedit 58645DC7) (tstamp 5F15F7AE)
-    (at 335.315001 78.205001)
+    (at 398.180001 122.655001)
     (descr SOD-123)
     (tags SOD-123)
     (path /5F51BE8C/5F841C34)
@@ -6794,7 +6794,7 @@
   )
 
   (module Diode_SMD:D_SOD-123 (layer F.Cu) (tedit 58645DC7) (tstamp 5F15F7C7)
-    (at 316.275001 98.605001)
+    (at 390.570001 162.105001)
     (descr SOD-123)
     (tags SOD-123)
     (path /5F51BE8C/5F84AE94)
@@ -6838,7 +6838,7 @@
   )
 
   (module Diode_SMD:D_SOD-123 (layer F.Cu) (tedit 58645DC7) (tstamp 5F15F7E0)
-    (at 304.775001 105.305001)
+    (at 379.070001 168.805001)
     (descr SOD-123)
     (tags SOD-123)
     (path /5F51BE8C/5F8539BD)
@@ -6882,7 +6882,7 @@
   )
 
   (module Diode_SMD:D_SOD-123 (layer F.Cu) (tedit 58645DC7) (tstamp 5F15F7F9)
-    (at 310.525001 101.955001)
+    (at 384.820001 165.455001)
     (descr SOD-123)
     (tags SOD-123)
     (path /5F51BE8C/5F85D4F3)
@@ -7014,7 +7014,7 @@
   )
 
   (module Diode_SMD:D_SOD-123 (layer F.Cu) (tedit 58645DC7) (tstamp 5F15F844)
-    (at 310.525001 105.305001)
+    (at 384.820001 168.805001)
     (descr SOD-123)
     (tags SOD-123)
     (path /5F51BE8C/5F89B243)
@@ -7058,7 +7058,7 @@
   )
 
   (module Diode_SMD:D_SOD-123 (layer F.Cu) (tedit 58645DC7) (tstamp 5F15F85D)
-    (at 323.815001 91.805001)
+    (at 386.680001 136.255001)
     (descr SOD-123)
     (tags SOD-123)
     (path /5F51BE8C/5F51CE35)
@@ -7102,7 +7102,7 @@
   )
 
   (module Diode_SMD:D_SOD-123 (layer F.Cu) (tedit 58645DC7) (tstamp 5F15F876)
-    (at 304.775001 108.655001)
+    (at 379.070001 172.155001)
     (descr SOD-123)
     (tags SOD-123)
     (path /5F51BE8C/5F5519D1)
@@ -7146,7 +7146,7 @@
   )
 
   (module Diode_SMD:D_SOD-123 (layer F.Cu) (tedit 58645DC7) (tstamp 5F15F88F)
-    (at 316.275001 101.955001)
+    (at 390.570001 165.455001)
     (descr SOD-123)
     (tags SOD-123)
     (path /5F51BE8C/5F8155FF)
@@ -7190,7 +7190,7 @@
   )
 
   (module Diode_SMD:D_SOD-123 (layer F.Cu) (tedit 58645DC7) (tstamp 5F15F8A8)
-    (at 295.255001 122.155001)
+    (at 369.550001 185.655001)
     (descr SOD-123)
     (tags SOD-123)
     (path /5F51BE8C/5F829921)
@@ -7233,8 +7233,8 @@
     )
   )
 
-  (module Diode_SMD:D_SOD-123 (layer F.Cu) (tedit 58645DC7) (tstamp 5F15F8C1)
-    (at 275.055001 142.355001)
+  (module Diode_SMD:D_SOD-123 (layer F.Cu) (tedit 58645DC7) (tstamp 5F167290)
+    (at 313.790001 200.775001)
     (descr SOD-123)
     (tags SOD-123)
     (path /5F51BE8C/5F82E271)
@@ -7278,7 +7278,7 @@
   )
 
   (module Diode_SMD:D_SOD-123 (layer F.Cu) (tedit 58645DC7) (tstamp 5F15F8DA)
-    (at 304.775001 112.005001)
+    (at 379.070001 175.505001)
     (descr SOD-123)
     (tags SOD-123)
     (path /5F51BE8C/5F84AEA3)
@@ -7322,7 +7322,7 @@
   )
 
   (module Diode_SMD:D_SOD-123 (layer F.Cu) (tedit 58645DC7) (tstamp 5F15F8F3)
-    (at 335.315001 81.555001)
+    (at 398.180001 126.005001)
     (descr SOD-123)
     (tags SOD-123)
     (path /5F51BE8C/5F8690C1)
@@ -7454,7 +7454,7 @@
   )
 
   (module Diode_SMD:D_SOD-123 (layer F.Cu) (tedit 58645DC7) (tstamp 5F15F93E)
-    (at 323.815001 95.155001)
+    (at 386.680001 139.605001)
     (descr SOD-123)
     (tags SOD-123)
     (path /5F51BE8C/5F51CE44)
@@ -7498,7 +7498,7 @@
   )
 
   (module Diode_SMD:D_SOD-123 (layer F.Cu) (tedit 58645DC7) (tstamp 5F15F957)
-    (at 323.815001 85.105001)
+    (at 386.680001 129.555001)
     (descr SOD-123)
     (tags SOD-123)
     (path /5F51BE8C/5F5519E0)
@@ -10964,7 +10964,7 @@
     )
   )
 
-  (module Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB (layer F.Cu) (tedit 5A02FE24) (tstamp 5F160095)
+  (module Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB (layer F.Cu) (tedit 5A02FE24) (tstamp 5F165F83)
     (at 316.865 42.545)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
@@ -11008,7 +11008,7 @@
     )
   )
 
-  (module Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB (layer F.Cu) (tedit 5A02FE24) (tstamp 5F1600AF)
+  (module Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB (layer F.Cu) (tedit 5A02FE24) (tstamp 5F166093)
     (at 335.915 42.545)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
@@ -11053,7 +11053,7 @@
   )
 
   (module Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB (layer F.Cu) (tedit 5A02FE24) (tstamp 5F1600C9)
-    (at 323.080001 41.350001)
+    (at 50.165 61.595)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (path /5F51BE8C/5F8076BC)
@@ -11097,7 +11097,7 @@
   )
 
   (module Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB (layer F.Cu) (tedit 5A02FE24) (tstamp 5F1600E3)
-    (at 199.260001 163.190001)
+    (at 69.215 61.595)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (path /5F51BE8C/5F8261EC)
@@ -11141,7 +11141,7 @@
   )
 
   (module Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB (layer F.Cu) (tedit 5A02FE24) (tstamp 5F1600FD)
-    (at 179.060001 183.390001)
+    (at 88.265 61.595)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (path /5F51BE8C/5F8298EB)
@@ -11185,7 +11185,7 @@
   )
 
   (module Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB (layer F.Cu) (tedit 5A02FE24) (tstamp 5F160117)
-    (at 204.020001 122.790001)
+    (at 107.315 61.595)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (path /5F51BE8C/5F82E23B)
@@ -11229,7 +11229,7 @@
   )
 
   (module Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB (layer F.Cu) (tedit 5A02FE24) (tstamp 5F160131)
-    (at 158.860001 163.190001)
+    (at 126.365 61.595)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (path /5F51BE8C/5F834BD4)
@@ -11273,7 +11273,7 @@
   )
 
   (module Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB (layer F.Cu) (tedit 5A02FE24) (tstamp 5F16014B)
-    (at 282.680001 41.350001)
+    (at 145.415 61.595)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (path /5F51BE8C/5F83AD16)
@@ -11317,7 +11317,7 @@
   )
 
   (module Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB (layer F.Cu) (tedit 5A02FE24) (tstamp 5F160165)
-    (at 183.820001 142.990001)
+    (at 164.465 61.595)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (path /5F51BE8C/5F841C0D)
@@ -11361,7 +11361,7 @@
   )
 
   (module Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB (layer F.Cu) (tedit 5A02FE24) (tstamp 5F16017F)
-    (at 252.780001 81.750001)
+    (at 183.515 61.595)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (path /5F51BE8C/5F84AE6D)
@@ -11405,7 +11405,7 @@
   )
 
   (module Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB (layer F.Cu) (tedit 5A02FE24) (tstamp 5F160199)
-    (at 233.740001 101.950001)
+    (at 202.565 61.595)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (path /5F51BE8C/5F853996)
@@ -11449,7 +11449,7 @@
   )
 
   (module Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB (layer F.Cu) (tedit 5A02FE24) (tstamp 5F1601B3)
-    (at 277.920001 61.550001)
+    (at 221.615 61.595)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (path /5F51BE8C/5F85D4CC)
@@ -11493,7 +11493,7 @@
   )
 
   (module Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB (layer F.Cu) (tedit 5A02FE24) (tstamp 5F1601CD)
-    (at 158.860001 183.390001)
+    (at 240.665 61.595)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (path /5F51BE8C/5F86908B)
@@ -11537,7 +11537,7 @@
   )
 
   (module Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB (layer F.Cu) (tedit 5A02FE24) (tstamp 5F1601E7)
-    (at 179.060001 163.190001)
+    (at 259.715 61.595)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (path /5F51BE8C/5F877D71)
@@ -11581,7 +11581,7 @@
   )
 
   (module Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB (layer F.Cu) (tedit 5A02FE24) (tstamp 5F160201)
-    (at 193.340001 102.590001)
+    (at 278.765 61.595)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (path /5F51BE8C/5F8882F2)
@@ -11625,7 +11625,7 @@
   )
 
   (module Button_Switch_Keyboard:SW_Cherry_MX_2.00u_PCB (layer F.Cu) (tedit 5A02FE24) (tstamp 5F16021F)
-    (at 187.595001 41.350001)
+    (at 307.34 61.595)
     (descr "Cherry MX keyswitch, 2.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 2.00u PCB")
     (path /5F51BE8C/5F51CE0E)
@@ -11635,36 +11635,36 @@
     (fp_text value MX1A-G1NA (at -2.54 12.954) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
+    (fp_line (start -9.525 12.065) (end -9.525 -1.905) (layer F.SilkS) (width 0.12))
+    (fp_line (start 4.445 12.065) (end -9.525 12.065) (layer F.SilkS) (width 0.12))
+    (fp_line (start 4.445 -1.905) (end 4.445 12.065) (layer F.SilkS) (width 0.12))
+    (fp_line (start -9.525 -1.905) (end 4.445 -1.905) (layer F.SilkS) (width 0.12))
+    (fp_line (start -21.59 14.605) (end -21.59 -4.445) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 16.51 14.605) (end -21.59 14.605) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 16.51 -4.445) (end 16.51 14.605) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -21.59 -4.445) (end 16.51 -4.445) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.14 -1.52) (end 4.06 -1.52) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 4.06 -1.52) (end 4.06 11.68) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 4.06 11.68) (end -9.14 11.68) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -9.14 11.68) (end -9.14 -1.52) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -8.89 11.43) (end -8.89 -1.27) (layer F.Fab) (width 0.1))
+    (fp_line (start 3.81 11.43) (end -8.89 11.43) (layer F.Fab) (width 0.1))
+    (fp_line (start 3.81 -1.27) (end 3.81 11.43) (layer F.Fab) (width 0.1))
+    (fp_line (start -8.89 -1.27) (end 3.81 -1.27) (layer F.Fab) (width 0.1))
     (fp_text user %R (at -2.54 -2.794) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start -8.89 -1.27) (end 3.81 -1.27) (layer F.Fab) (width 0.1))
-    (fp_line (start 3.81 -1.27) (end 3.81 11.43) (layer F.Fab) (width 0.1))
-    (fp_line (start 3.81 11.43) (end -8.89 11.43) (layer F.Fab) (width 0.1))
-    (fp_line (start -8.89 11.43) (end -8.89 -1.27) (layer F.Fab) (width 0.1))
-    (fp_line (start -9.14 11.68) (end -9.14 -1.52) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 4.06 11.68) (end -9.14 11.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 4.06 -1.52) (end 4.06 11.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -9.14 -1.52) (end 4.06 -1.52) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -21.59 -4.445) (end 16.51 -4.445) (layer Dwgs.User) (width 0.15))
-    (fp_line (start 16.51 -4.445) (end 16.51 14.605) (layer Dwgs.User) (width 0.15))
-    (fp_line (start 16.51 14.605) (end -21.59 14.605) (layer Dwgs.User) (width 0.15))
-    (fp_line (start -21.59 14.605) (end -21.59 -4.445) (layer Dwgs.User) (width 0.15))
-    (fp_line (start -9.525 -1.905) (end 4.445 -1.905) (layer F.SilkS) (width 0.12))
-    (fp_line (start 4.445 -1.905) (end 4.445 12.065) (layer F.SilkS) (width 0.12))
-    (fp_line (start 4.445 12.065) (end -9.525 12.065) (layer F.SilkS) (width 0.12))
-    (fp_line (start -9.525 12.065) (end -9.525 -1.905) (layer F.SilkS) (width 0.12))
-    (pad 1 thru_hole circle (at 0 0) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-      (net 37 "Net-(D30-Pad2)"))
+    (pad "" np_thru_hole circle (at 9.36 -1.92) (size 3.05 3.05) (drill 3.05) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -14.44 -1.92) (size 3.05 3.05) (drill 3.05) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -14.44 13.32) (size 4 4) (drill 4) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 9.36 13.32) (size 4 4) (drill 4) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers *.Cu *.Mask))
     (pad 2 thru_hole circle (at -6.35 2.54) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
       (net 211 COL14))
-    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at 9.36 13.32) (size 4 4) (drill 4) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at -14.44 13.32) (size 4 4) (drill 4) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at -14.44 -1.92) (size 3.05 3.05) (drill 3.05) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at 9.36 -1.92) (size 3.05 3.05) (drill 3.05) (layers *.Cu *.Mask))
+    (pad 1 thru_hole circle (at 0 0) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
+      (net 37 "Net-(D30-Pad2)"))
     (model ${KISYS3DMOD}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_2.00u_PCB.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -11673,7 +11673,7 @@
   )
 
   (module Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB (layer F.Cu) (tedit 5A02FE24) (tstamp 5F160239)
-    (at 138.660001 183.390001)
+    (at 335.915 61.595)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (path /5F51BE8C/5F5519AA)
@@ -11717,7 +11717,7 @@
   )
 
   (module Button_Switch_Keyboard:SW_Cherry_MX_1.50u_PCB (layer F.Cu) (tedit 5A02FE24) (tstamp 5F160253)
-    (at 62.622501 121.640001)
+    (at 54.9275 80.645)
     (descr "Cherry MX keyswitch, 1.50u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.50u PCB")
     (path /5F51BE8C/5F80ABB7)
@@ -11727,32 +11727,32 @@
     (fp_text value MX1A-G1NA (at -2.54 12.954) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
+    (fp_line (start -9.525 12.065) (end -9.525 -1.905) (layer F.SilkS) (width 0.12))
+    (fp_line (start 4.445 12.065) (end -9.525 12.065) (layer F.SilkS) (width 0.12))
+    (fp_line (start 4.445 -1.905) (end 4.445 12.065) (layer F.SilkS) (width 0.12))
+    (fp_line (start -9.525 -1.905) (end 4.445 -1.905) (layer F.SilkS) (width 0.12))
+    (fp_line (start -16.8275 14.605) (end -16.8275 -4.445) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 11.7475 14.605) (end -16.8275 14.605) (layer Dwgs.User) (width 0.15))
+    (fp_line (start 11.7475 -4.445) (end 11.7475 14.605) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -16.8275 -4.445) (end 11.7475 -4.445) (layer Dwgs.User) (width 0.15))
+    (fp_line (start -9.14 -1.52) (end 4.06 -1.52) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 4.06 -1.52) (end 4.06 11.68) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 4.06 11.68) (end -9.14 11.68) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -9.14 11.68) (end -9.14 -1.52) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -8.89 11.43) (end -8.89 -1.27) (layer F.Fab) (width 0.1))
+    (fp_line (start 3.81 11.43) (end -8.89 11.43) (layer F.Fab) (width 0.1))
+    (fp_line (start 3.81 -1.27) (end 3.81 11.43) (layer F.Fab) (width 0.1))
+    (fp_line (start -8.89 -1.27) (end 3.81 -1.27) (layer F.Fab) (width 0.1))
     (fp_text user %R (at -2.54 -2.794) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start -8.89 -1.27) (end 3.81 -1.27) (layer F.Fab) (width 0.1))
-    (fp_line (start 3.81 -1.27) (end 3.81 11.43) (layer F.Fab) (width 0.1))
-    (fp_line (start 3.81 11.43) (end -8.89 11.43) (layer F.Fab) (width 0.1))
-    (fp_line (start -8.89 11.43) (end -8.89 -1.27) (layer F.Fab) (width 0.1))
-    (fp_line (start -9.14 11.68) (end -9.14 -1.52) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 4.06 11.68) (end -9.14 11.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 4.06 -1.52) (end 4.06 11.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -9.14 -1.52) (end 4.06 -1.52) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -16.8275 -4.445) (end 11.7475 -4.445) (layer Dwgs.User) (width 0.15))
-    (fp_line (start 11.7475 -4.445) (end 11.7475 14.605) (layer Dwgs.User) (width 0.15))
-    (fp_line (start 11.7475 14.605) (end -16.8275 14.605) (layer Dwgs.User) (width 0.15))
-    (fp_line (start -16.8275 14.605) (end -16.8275 -4.445) (layer Dwgs.User) (width 0.15))
-    (fp_line (start -9.525 -1.905) (end 4.445 -1.905) (layer F.SilkS) (width 0.12))
-    (fp_line (start 4.445 -1.905) (end 4.445 12.065) (layer F.SilkS) (width 0.12))
-    (fp_line (start 4.445 12.065) (end -9.525 12.065) (layer F.SilkS) (width 0.12))
-    (fp_line (start -9.525 12.065) (end -9.525 -1.905) (layer F.SilkS) (width 0.12))
-    (pad 1 thru_hole circle (at 0 0) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-      (net 39 "Net-(D32-Pad2)"))
+    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers *.Cu *.Mask))
     (pad 2 thru_hole circle (at -6.35 2.54) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
       (net 182 COL00))
-    (pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
+    (pad 1 thru_hole circle (at 0 0) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
+      (net 39 "Net-(D32-Pad2)"))
     (model ${KISYS3DMOD}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.50u_PCB.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -11761,7 +11761,7 @@
   )
 
   (module Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB (layer F.Cu) (tedit 5A02FE24) (tstamp 5F16026D)
-    (at 257.720001 61.550001)
+    (at 78.74 80.645)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (path /5F51BE8C/5F8298FA)
@@ -11805,7 +11805,7 @@
   )
 
   (module Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB (layer F.Cu) (tedit 5A02FE24) (tstamp 5F160287)
-    (at 213.540001 101.950001)
+    (at 97.79 80.645)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (path /5F51BE8C/5F82E24A)
@@ -11849,7 +11849,7 @@
   )
 
   (module Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB (layer F.Cu) (tedit 5A02FE24) (tstamp 5F1602A1)
-    (at 232.580001 81.750001)
+    (at 116.84 80.645)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (path /5F51BE8C/5F834BE3)
@@ -11892,8 +11892,8 @@
     )
   )
 
-  (module Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB (layer F.Cu) (tedit 5A02FE24) (tstamp 5F1602BB)
-    (at 163.620001 142.990001)
+  (module Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB (layer F.Cu) (tedit 5A02FE24) (tstamp 5F165AC3)
+    (at 135.89 80.645)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (path /5F51BE8C/5F83AD25)
@@ -11937,7 +11937,7 @@
   )
 
   (module Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB (layer F.Cu) (tedit 5A02FE24) (tstamp 5F1602D5)
-    (at 183.820001 122.790001)
+    (at 154.94 80.645)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (path /5F51BE8C/5F841C1C)
@@ -11981,7 +11981,7 @@
   )
 
   (module Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB (layer F.Cu) (tedit 5A02FE24) (tstamp 5F1602EF)
-    (at 262.480001 41.350001)
+    (at 173.99 80.645)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (path /5F51BE8C/5F84AE7C)
@@ -12025,7 +12025,7 @@
   )
 
   (module Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB (layer F.Cu) (tedit 5A02FE24) (tstamp 5F160309)
-    (at 118.460001 183.390001)
+    (at 193.04 80.645)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (path /5F51BE8C/5F8539A5)
@@ -12069,7 +12069,7 @@
   )
 
   (module Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB (layer F.Cu) (tedit 5A02FE24) (tstamp 5F160323)
-    (at 244.420001 142.350001)
+    (at 212.09 80.645)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (path /5F51BE8C/5F85D4DB)
@@ -12113,7 +12113,7 @@
   )
 
   (module Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB (layer F.Cu) (tedit 5A02FE24) (tstamp 5F16033D)
-    (at 138.660001 163.190001)
+    (at 231.14 80.645)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (path /5F51BE8C/5F86909A)
@@ -12157,7 +12157,7 @@
   )
 
   (module Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB (layer F.Cu) (tedit 5A02FE24) (tstamp 5F160357)
-    (at 217.320001 61.550001)
+    (at 250.19 80.645)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (path /5F51BE8C/5F877D80)
@@ -12201,7 +12201,7 @@
   )
 
   (module Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB (layer F.Cu) (tedit 5A02FE24) (tstamp 5F160371)
-    (at 98.260001 162.040001)
+    (at 269.24 80.645)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (path /5F51BE8C/5F888301)
@@ -12245,7 +12245,7 @@
   )
 
   (module Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB (layer F.Cu) (tedit 5A02FE24) (tstamp 5F16038B)
-    (at 173.140001 102.590001)
+    (at 288.29 80.645)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (path /5F51BE8C/5F89B22B)
@@ -12289,7 +12289,7 @@
   )
 
   (module Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB (layer F.Cu) (tedit 5A02FE24) (tstamp 5F1603A5)
-    (at 112.540001 102.590001)
+    (at 335.915 80.645)
     (descr "Cherry MX keyswitch, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.00u PCB")
     (path /5F51BE8C/5F5519B9)
@@ -12332,7 +12332,7 @@
     )
   )
 
-  (module Button_Switch_Keyboard:SW_Cherry_MX_1.75u_PCB (layer F.Cu) (tedit 5A02FE24) (tstamp 5F1603BF)
+  (module Button_Switch_Keyboard:SW_Cherry_MX_1.75u_PCB (layer F.Cu) (tedit 5A02FE24) (tstamp 5F167F3E)
     (at 94.723751 62.190001)
     (descr "Cherry MX keyswitch, 1.75u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "Cherry MX keyswitch 1.75u PCB")