diff --git a/kezboard-pcb.kicad_pcb b/kezboard-pcb.kicad_pcb
index 36b63d5..28a49b2 100644
--- a/kezboard-pcb.kicad_pcb
+++ b/kezboard-pcb.kicad_pcb
@@ -6,7 +6,7 @@
     (tracks 0)
     (zones 0)
     (modules 353)
-    (nets 217)
+    (nets 215)
   )
 
   (page A3)
@@ -288,25 +288,23 @@
   (net 195 "Net-(J2-PadB5)")
   (net 196 "Net-(J2-PadB2)")
   (net 197 "Net-(J2-PadB11)")
-  (net 198 "Net-(R4-Pad1)")
-  (net 199 "Net-(R5-Pad2)")
-  (net 200 "Net-(R6-Pad2)")
-  (net 201 COL03)
-  (net 202 COL04)
-  (net 203 COL06)
-  (net 204 COL07)
-  (net 205 COL08)
-  (net 206 COL09)
-  (net 207 COL10)
-  (net 208 COL11)
-  (net 209 COL12)
-  (net 210 COL13)
-  (net 211 COL14)
-  (net 212 COL15)
-  (net 213 COL05)
-  (net 214 "Net-(U1-Pad1)")
-  (net 215 "Net-(U1-Pad8)")
-  (net 216 "Net-(U1-Pad42)")
+  (net 198 "Net-(R6-Pad2)")
+  (net 199 COL03)
+  (net 200 COL04)
+  (net 201 COL06)
+  (net 202 COL07)
+  (net 203 COL08)
+  (net 204 COL09)
+  (net 205 COL10)
+  (net 206 COL11)
+  (net 207 COL12)
+  (net 208 COL13)
+  (net 209 COL14)
+  (net 210 COL15)
+  (net 211 COL05)
+  (net 212 "Net-(U1-Pad1)")
+  (net 213 "Net-(U1-Pad8)")
+  (net 214 "Net-(U1-Pad42)")
 
   (net_class Default "Dies ist die voreingestellte Netzklasse."
     (clearance 0.2)
@@ -518,8 +516,6 @@
     (add_net "Net-(J2-PadB3)")
     (add_net "Net-(J2-PadB5)")
     (add_net "Net-(J2-PadB8)")
-    (add_net "Net-(R4-Pad1)")
-    (add_net "Net-(R5-Pad2)")
     (add_net "Net-(R6-Pad2)")
     (add_net "Net-(U1-Pad1)")
     (add_net "Net-(U1-Pad42)")
@@ -10395,7 +10391,7 @@
     (pad 2 smd roundrect (at 1.4875 0 90) (size 1.425 1.75) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.175439)
       (net 188 D+))
     (pad 1 smd roundrect (at -1.4875 0 90) (size 1.425 1.75) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.175439)
-      (net 198 "Net-(R4-Pad1)"))
+      (net 188 D+))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_1206_3216Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -10431,7 +10427,7 @@
     (pad 1 smd roundrect (at -1.4875 0 270) (size 1.425 1.75) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.175439)
       (net 187 D-))
     (pad 2 smd roundrect (at 1.4875 0 270) (size 1.425 1.75) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.175439)
-      (net 199 "Net-(R5-Pad2)"))
+      (net 187 D-))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_1206_3216Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -10467,7 +10463,7 @@
     (pad 1 smd roundrect (at -1.4875 0) (size 1.425 1.75) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.175439)
       (net 1 GND))
     (pad 2 smd roundrect (at 1.4875 0) (size 1.425 1.75) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.175439)
-      (net 200 "Net-(R6-Pad2)"))
+      (net 198 "Net-(R6-Pad2)"))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_1206_3216Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -10640,7 +10636,7 @@
     (pad 1 thru_hole circle (at 0 0 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
       (net 11 "Net-(D5-Pad2)"))
     (pad 2 thru_hole circle (at -6.35 2.54 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-      (net 201 COL03))
+      (net 199 COL03))
     (pad "" np_thru_hole circle (at -2.54 5.08 180) (size 4 4) (drill 4) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at -7.62 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 2.54 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
@@ -10685,7 +10681,7 @@
     (pad "" np_thru_hole circle (at -7.62 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at -2.54 5.08 180) (size 4 4) (drill 4) (layers *.Cu *.Mask))
     (pad 2 thru_hole circle (at -6.35 2.54 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-      (net 202 COL04))
+      (net 200 COL04))
     (pad 1 thru_hole circle (at 0 0 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
       (net 12 "Net-(D6-Pad2)"))
     (model ${KISYS3DMOD}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl
@@ -10728,7 +10724,7 @@
     (pad 1 thru_hole circle (at 0 0 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
       (net 13 "Net-(D7-Pad2)"))
     (pad 2 thru_hole circle (at -6.35 2.54 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-      (net 203 COL06))
+      (net 201 COL06))
     (pad "" np_thru_hole circle (at -2.54 5.08 180) (size 4 4) (drill 4) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at -7.62 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 2.54 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
@@ -10773,7 +10769,7 @@
     (pad "" np_thru_hole circle (at -7.62 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at -2.54 5.08 180) (size 4 4) (drill 4) (layers *.Cu *.Mask))
     (pad 2 thru_hole circle (at -6.35 2.54 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-      (net 204 COL07))
+      (net 202 COL07))
     (pad 1 thru_hole circle (at 0 0 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
       (net 14 "Net-(D8-Pad2)"))
     (model ${KISYS3DMOD}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl
@@ -10816,7 +10812,7 @@
     (pad 1 thru_hole circle (at 0 0 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
       (net 15 "Net-(D9-Pad2)"))
     (pad 2 thru_hole circle (at -6.35 2.54 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-      (net 205 COL08))
+      (net 203 COL08))
     (pad "" np_thru_hole circle (at -2.54 5.08 180) (size 4 4) (drill 4) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at -7.62 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 2.54 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
@@ -10860,7 +10856,7 @@
     (pad 1 thru_hole circle (at 0 0 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
       (net 16 "Net-(D10-Pad2)"))
     (pad 2 thru_hole circle (at -6.35 2.54 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-      (net 206 COL09))
+      (net 204 COL09))
     (pad "" np_thru_hole circle (at -2.54 5.08 180) (size 4 4) (drill 4) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at -7.62 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 2.54 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
@@ -10905,7 +10901,7 @@
     (pad "" np_thru_hole circle (at -7.62 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at -2.54 5.08 180) (size 4 4) (drill 4) (layers *.Cu *.Mask))
     (pad 2 thru_hole circle (at -6.35 2.54 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-      (net 207 COL10))
+      (net 205 COL10))
     (pad 1 thru_hole circle (at 0 0 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
       (net 17 "Net-(D11-Pad2)"))
     (model ${KISYS3DMOD}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl
@@ -10948,7 +10944,7 @@
     (pad 1 thru_hole circle (at 0 0 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
       (net 18 "Net-(D12-Pad2)"))
     (pad 2 thru_hole circle (at -6.35 2.54 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-      (net 208 COL11))
+      (net 206 COL11))
     (pad "" np_thru_hole circle (at -2.54 5.08 180) (size 4 4) (drill 4) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at -7.62 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 2.54 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
@@ -10992,7 +10988,7 @@
     (pad 1 thru_hole circle (at 0 0 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
       (net 19 "Net-(D13-Pad2)"))
     (pad 2 thru_hole circle (at -6.35 2.54 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-      (net 209 COL12))
+      (net 207 COL12))
     (pad "" np_thru_hole circle (at -2.54 5.08 180) (size 4 4) (drill 4) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at -7.62 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 2.54 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
@@ -11036,7 +11032,7 @@
     (pad 1 thru_hole circle (at 0 0 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
       (net 20 "Net-(D14-Pad2)"))
     (pad 2 thru_hole circle (at -6.35 2.54 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-      (net 210 COL13))
+      (net 208 COL13))
     (pad "" np_thru_hole circle (at -2.54 5.08 180) (size 4 4) (drill 4) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at -7.62 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 2.54 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
@@ -11081,7 +11077,7 @@
     (pad "" np_thru_hole circle (at -7.62 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at -2.54 5.08 180) (size 4 4) (drill 4) (layers *.Cu *.Mask))
     (pad 2 thru_hole circle (at -6.35 2.54 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-      (net 211 COL14))
+      (net 209 COL14))
     (pad 1 thru_hole circle (at 0 0 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
       (net 21 "Net-(D15-Pad2)"))
     (model ${KISYS3DMOD}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl
@@ -11124,7 +11120,7 @@
     (pad 1 thru_hole circle (at 0 0 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
       (net 22 "Net-(D16-Pad2)"))
     (pad 2 thru_hole circle (at -6.35 2.54 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-      (net 212 COL15))
+      (net 210 COL15))
     (pad "" np_thru_hole circle (at -2.54 5.08 180) (size 4 4) (drill 4) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at -7.62 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 2.54 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
@@ -11301,7 +11297,7 @@
     (pad "" np_thru_hole circle (at -7.62 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at -2.54 5.08 180) (size 4 4) (drill 4) (layers *.Cu *.Mask))
     (pad 2 thru_hole circle (at -6.35 2.54 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-      (net 201 COL03))
+      (net 199 COL03))
     (pad 1 thru_hole circle (at 0 0 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
       (net 27 "Net-(D20-Pad2)"))
     (model ${KISYS3DMOD}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl
@@ -11345,7 +11341,7 @@
     (pad "" np_thru_hole circle (at -7.62 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at -2.54 5.08 180) (size 4 4) (drill 4) (layers *.Cu *.Mask))
     (pad 2 thru_hole circle (at -6.35 2.54 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-      (net 202 COL04))
+      (net 200 COL04))
     (pad 1 thru_hole circle (at 0 0 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
       (net 28 "Net-(D21-Pad2)"))
     (model ${KISYS3DMOD}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl
@@ -11388,7 +11384,7 @@
     (pad 1 thru_hole circle (at 0 0 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
       (net 29 "Net-(D22-Pad2)"))
     (pad 2 thru_hole circle (at -6.35 2.54 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-      (net 213 COL05))
+      (net 211 COL05))
     (pad "" np_thru_hole circle (at -2.54 5.08 180) (size 4 4) (drill 4) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at -7.62 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 2.54 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
@@ -11433,7 +11429,7 @@
     (pad "" np_thru_hole circle (at -7.62 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at -2.54 5.08 180) (size 4 4) (drill 4) (layers *.Cu *.Mask))
     (pad 2 thru_hole circle (at -6.35 2.54 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-      (net 203 COL06))
+      (net 201 COL06))
     (pad 1 thru_hole circle (at 0 0 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
       (net 30 "Net-(D23-Pad2)"))
     (model ${KISYS3DMOD}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl
@@ -11476,7 +11472,7 @@
     (pad 1 thru_hole circle (at 0 0 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
       (net 31 "Net-(D24-Pad2)"))
     (pad 2 thru_hole circle (at -6.35 2.54 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-      (net 204 COL07))
+      (net 202 COL07))
     (pad "" np_thru_hole circle (at -2.54 5.08 180) (size 4 4) (drill 4) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at -7.62 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 2.54 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
@@ -11521,7 +11517,7 @@
     (pad "" np_thru_hole circle (at -7.62 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at -2.54 5.08 180) (size 4 4) (drill 4) (layers *.Cu *.Mask))
     (pad 2 thru_hole circle (at -6.35 2.54 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-      (net 205 COL08))
+      (net 203 COL08))
     (pad 1 thru_hole circle (at 0 0 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
       (net 32 "Net-(D25-Pad2)"))
     (model ${KISYS3DMOD}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl
@@ -11564,7 +11560,7 @@
     (pad 1 thru_hole circle (at 0 0 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
       (net 33 "Net-(D26-Pad2)"))
     (pad 2 thru_hole circle (at -6.35 2.54 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-      (net 206 COL09))
+      (net 204 COL09))
     (pad "" np_thru_hole circle (at -2.54 5.08 180) (size 4 4) (drill 4) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at -7.62 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 2.54 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
@@ -11609,7 +11605,7 @@
     (pad "" np_thru_hole circle (at -7.62 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at -2.54 5.08 180) (size 4 4) (drill 4) (layers *.Cu *.Mask))
     (pad 2 thru_hole circle (at -6.35 2.54 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-      (net 207 COL10))
+      (net 205 COL10))
     (pad 1 thru_hole circle (at 0 0 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
       (net 34 "Net-(D27-Pad2)"))
     (model ${KISYS3DMOD}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl
@@ -11652,7 +11648,7 @@
     (pad 1 thru_hole circle (at 0 0 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
       (net 35 "Net-(D28-Pad2)"))
     (pad 2 thru_hole circle (at -6.35 2.54 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-      (net 208 COL11))
+      (net 206 COL11))
     (pad "" np_thru_hole circle (at -2.54 5.08 180) (size 4 4) (drill 4) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at -7.62 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 2.54 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
@@ -11697,7 +11693,7 @@
     (pad "" np_thru_hole circle (at -7.62 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at -2.54 5.08 180) (size 4 4) (drill 4) (layers *.Cu *.Mask))
     (pad 2 thru_hole circle (at -6.35 2.54 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-      (net 209 COL12))
+      (net 207 COL12))
     (pad 1 thru_hole circle (at 0 0 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
       (net 36 "Net-(D29-Pad2)"))
     (model ${KISYS3DMOD}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl
@@ -11740,7 +11736,7 @@
     (pad 1 thru_hole circle (at 0 0 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
       (net 37 "Net-(D30-Pad2)"))
     (pad 2 thru_hole circle (at -6.35 2.54 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-      (net 211 COL14))
+      (net 209 COL14))
     (pad "" np_thru_hole circle (at -2.54 5.08 180) (size 4 4) (drill 4) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at -7.62 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 2.54 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
@@ -11789,7 +11785,7 @@
     (pad "" np_thru_hole circle (at -7.62 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at -2.54 5.08 180) (size 4 4) (drill 4) (layers *.Cu *.Mask))
     (pad 2 thru_hole circle (at -6.35 2.54 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-      (net 212 COL15))
+      (net 210 COL15))
     (pad 1 thru_hole circle (at 0 0 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
       (net 38 "Net-(D31-Pad2)"))
     (model ${KISYS3DMOD}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl
@@ -11920,7 +11916,7 @@
     (pad 1 thru_hole circle (at 0 0 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
       (net 42 "Net-(D34-Pad2)"))
     (pad 2 thru_hole circle (at -6.35 2.54 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-      (net 201 COL03))
+      (net 199 COL03))
     (pad "" np_thru_hole circle (at -2.54 5.08 180) (size 4 4) (drill 4) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at -7.62 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 2.54 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
@@ -11964,7 +11960,7 @@
     (pad 1 thru_hole circle (at 0 0 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
       (net 43 "Net-(D35-Pad2)"))
     (pad 2 thru_hole circle (at -6.35 2.54 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-      (net 202 COL04))
+      (net 200 COL04))
     (pad "" np_thru_hole circle (at -2.54 5.08 180) (size 4 4) (drill 4) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at -7.62 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 2.54 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
@@ -12009,7 +12005,7 @@
     (pad "" np_thru_hole circle (at -7.62 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at -2.54 5.08 180) (size 4 4) (drill 4) (layers *.Cu *.Mask))
     (pad 2 thru_hole circle (at -6.35 2.54 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-      (net 213 COL05))
+      (net 211 COL05))
     (pad 1 thru_hole circle (at 0 0 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
       (net 44 "Net-(D36-Pad2)"))
     (model ${KISYS3DMOD}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl
@@ -12053,7 +12049,7 @@
     (pad "" np_thru_hole circle (at -7.62 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at -2.54 5.08 180) (size 4 4) (drill 4) (layers *.Cu *.Mask))
     (pad 2 thru_hole circle (at -6.35 2.54 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-      (net 203 COL06))
+      (net 201 COL06))
     (pad 1 thru_hole circle (at 0 0 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
       (net 45 "Net-(D37-Pad2)"))
     (model ${KISYS3DMOD}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl
@@ -12097,7 +12093,7 @@
     (pad "" np_thru_hole circle (at -7.62 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at -2.54 5.08 180) (size 4 4) (drill 4) (layers *.Cu *.Mask))
     (pad 2 thru_hole circle (at -6.35 2.54 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-      (net 204 COL07))
+      (net 202 COL07))
     (pad 1 thru_hole circle (at 0 0 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
       (net 46 "Net-(D38-Pad2)"))
     (model ${KISYS3DMOD}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl
@@ -12140,7 +12136,7 @@
     (pad 1 thru_hole circle (at 0 0 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
       (net 47 "Net-(D39-Pad2)"))
     (pad 2 thru_hole circle (at -6.35 2.54 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-      (net 205 COL08))
+      (net 203 COL08))
     (pad "" np_thru_hole circle (at -2.54 5.08 180) (size 4 4) (drill 4) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at -7.62 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 2.54 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
@@ -12185,7 +12181,7 @@
     (pad "" np_thru_hole circle (at -7.62 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at -2.54 5.08 180) (size 4 4) (drill 4) (layers *.Cu *.Mask))
     (pad 2 thru_hole circle (at -6.35 2.54 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-      (net 206 COL09))
+      (net 204 COL09))
     (pad 1 thru_hole circle (at 0 0 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
       (net 48 "Net-(D40-Pad2)"))
     (model ${KISYS3DMOD}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl
@@ -12228,7 +12224,7 @@
     (pad 1 thru_hole circle (at 0 0 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
       (net 49 "Net-(D41-Pad2)"))
     (pad 2 thru_hole circle (at -6.35 2.54 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-      (net 207 COL10))
+      (net 205 COL10))
     (pad "" np_thru_hole circle (at -2.54 5.08 180) (size 4 4) (drill 4) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at -7.62 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 2.54 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
@@ -12273,7 +12269,7 @@
     (pad "" np_thru_hole circle (at -7.62 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at -2.54 5.08 180) (size 4 4) (drill 4) (layers *.Cu *.Mask))
     (pad 2 thru_hole circle (at -6.35 2.54 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-      (net 208 COL11))
+      (net 206 COL11))
     (pad 1 thru_hole circle (at 0 0 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
       (net 50 "Net-(D42-Pad2)"))
     (model ${KISYS3DMOD}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl
@@ -12316,7 +12312,7 @@
     (pad 1 thru_hole circle (at 0 0 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
       (net 51 "Net-(D43-Pad2)"))
     (pad 2 thru_hole circle (at -6.35 2.54 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-      (net 209 COL12))
+      (net 207 COL12))
     (pad "" np_thru_hole circle (at -2.54 5.08 180) (size 4 4) (drill 4) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at -7.62 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 2.54 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
@@ -12361,7 +12357,7 @@
     (pad "" np_thru_hole circle (at -7.62 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at -2.54 5.08 180) (size 4 4) (drill 4) (layers *.Cu *.Mask))
     (pad 2 thru_hole circle (at -6.35 2.54 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-      (net 210 COL13))
+      (net 208 COL13))
     (pad 1 thru_hole circle (at 0 0 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
       (net 52 "Net-(D44-Pad2)"))
     (model ${KISYS3DMOD}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl
@@ -12404,7 +12400,7 @@
     (pad 1 thru_hole circle (at 0 0 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
       (net 53 "Net-(D45-Pad2)"))
     (pad 2 thru_hole circle (at -6.35 2.54 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-      (net 212 COL15))
+      (net 210 COL15))
     (pad "" np_thru_hole circle (at -2.54 5.08 180) (size 4 4) (drill 4) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at -7.62 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 2.54 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
@@ -12537,7 +12533,7 @@
     (pad "" np_thru_hole circle (at -7.62 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at -2.54 5.08 180) (size 4 4) (drill 4) (layers *.Cu *.Mask))
     (pad 2 thru_hole circle (at -6.35 2.54 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-      (net 201 COL03))
+      (net 199 COL03))
     (pad 1 thru_hole circle (at 0 0 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
       (net 57 "Net-(D48-Pad2)"))
     (model ${KISYS3DMOD}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl
@@ -12581,7 +12577,7 @@
     (pad "" np_thru_hole circle (at -7.62 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at -2.54 5.08 180) (size 4 4) (drill 4) (layers *.Cu *.Mask))
     (pad 2 thru_hole circle (at -6.35 2.54 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-      (net 202 COL04))
+      (net 200 COL04))
     (pad 1 thru_hole circle (at 0 0 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
       (net 58 "Net-(D49-Pad2)"))
     (model ${KISYS3DMOD}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl
@@ -12624,7 +12620,7 @@
     (pad 1 thru_hole circle (at 0 0 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
       (net 59 "Net-(D50-Pad2)"))
     (pad 2 thru_hole circle (at -6.35 2.54 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-      (net 213 COL05))
+      (net 211 COL05))
     (pad "" np_thru_hole circle (at -2.54 5.08 180) (size 4 4) (drill 4) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at -7.62 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 2.54 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
@@ -12668,7 +12664,7 @@
     (pad 1 thru_hole circle (at 0 0 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
       (net 60 "Net-(D51-Pad2)"))
     (pad 2 thru_hole circle (at -6.35 2.54 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-      (net 203 COL06))
+      (net 201 COL06))
     (pad "" np_thru_hole circle (at -2.54 5.08 180) (size 4 4) (drill 4) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at -7.62 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 2.54 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
@@ -12712,7 +12708,7 @@
     (pad 1 thru_hole circle (at 0 0 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
       (net 61 "Net-(D52-Pad2)"))
     (pad 2 thru_hole circle (at -6.35 2.54 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-      (net 204 COL07))
+      (net 202 COL07))
     (pad "" np_thru_hole circle (at -2.54 5.08 180) (size 4 4) (drill 4) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at -7.62 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 2.54 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
@@ -12757,7 +12753,7 @@
     (pad "" np_thru_hole circle (at -7.62 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at -2.54 5.08 180) (size 4 4) (drill 4) (layers *.Cu *.Mask))
     (pad 2 thru_hole circle (at -6.35 2.54 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-      (net 205 COL08))
+      (net 203 COL08))
     (pad 1 thru_hole circle (at 0 0 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
       (net 62 "Net-(D53-Pad2)"))
     (model ${KISYS3DMOD}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl
@@ -12800,7 +12796,7 @@
     (pad 1 thru_hole circle (at 0 0 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
       (net 63 "Net-(D54-Pad2)"))
     (pad 2 thru_hole circle (at -6.35 2.54 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-      (net 206 COL09))
+      (net 204 COL09))
     (pad "" np_thru_hole circle (at -2.54 5.08 180) (size 4 4) (drill 4) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at -7.62 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 2.54 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
@@ -12845,7 +12841,7 @@
     (pad "" np_thru_hole circle (at -7.62 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at -2.54 5.08 180) (size 4 4) (drill 4) (layers *.Cu *.Mask))
     (pad 2 thru_hole circle (at -6.35 2.54 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-      (net 207 COL10))
+      (net 205 COL10))
     (pad 1 thru_hole circle (at 0 0 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
       (net 64 "Net-(D55-Pad2)"))
     (model ${KISYS3DMOD}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl
@@ -12888,7 +12884,7 @@
     (pad 1 thru_hole circle (at 0 0 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
       (net 65 "Net-(D56-Pad2)"))
     (pad 2 thru_hole circle (at -6.35 2.54 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-      (net 208 COL11))
+      (net 206 COL11))
     (pad "" np_thru_hole circle (at -2.54 5.08 180) (size 4 4) (drill 4) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at -7.62 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 2.54 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
@@ -12932,7 +12928,7 @@
     (pad 1 thru_hole circle (at 0 0 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
       (net 66 "Net-(D57-Pad2)"))
     (pad 2 thru_hole circle (at -6.35 2.54 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-      (net 209 COL12))
+      (net 207 COL12))
     (pad "" np_thru_hole circle (at -2.54 5.08 180) (size 4 4) (drill 4) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at -7.62 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 2.54 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
@@ -12976,7 +12972,7 @@
     (pad 1 thru_hole circle (at 0 0 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
       (net 67 "Net-(D58-Pad2)"))
     (pad 2 thru_hole circle (at -6.35 2.54 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-      (net 210 COL13))
+      (net 208 COL13))
     (pad "" np_thru_hole circle (at -2.54 5.08 180) (size 4 4) (drill 4) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at -7.62 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 2.54 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
@@ -13022,7 +13018,7 @@
     (pad 1 thru_hole circle (at 0 0 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
       (net 68 "Net-(D59-Pad2)"))
     (pad 2 thru_hole circle (at -6.35 2.54 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-      (net 211 COL14))
+      (net 209 COL14))
     (pad "" np_thru_hole circle (at -2.54 5.08 180) (size 4 4) (drill 4) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at -7.62 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 2.54 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
@@ -13071,7 +13067,7 @@
     (pad "" np_thru_hole circle (at -7.62 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at -2.54 5.08 180) (size 4 4) (drill 4) (layers *.Cu *.Mask))
     (pad 2 thru_hole circle (at -6.35 2.54 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-      (net 212 COL15))
+      (net 210 COL15))
     (pad 1 thru_hole circle (at 0 0 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
       (net 69 "Net-(D60-Pad2)"))
     (model ${KISYS3DMOD}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl
@@ -13246,7 +13242,7 @@
     (pad 1 thru_hole circle (at 0 0 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
       (net 74 "Net-(D64-Pad2)"))
     (pad 2 thru_hole circle (at -6.35 2.54 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-      (net 201 COL03))
+      (net 199 COL03))
     (pad "" np_thru_hole circle (at -2.54 5.08 180) (size 4 4) (drill 4) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at -7.62 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 2.54 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
@@ -13291,7 +13287,7 @@
     (pad "" np_thru_hole circle (at -7.62 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at -2.54 5.08 180) (size 4 4) (drill 4) (layers *.Cu *.Mask))
     (pad 2 thru_hole circle (at -6.35 2.54 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-      (net 202 COL04))
+      (net 200 COL04))
     (pad 1 thru_hole circle (at 0 0 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
       (net 75 "Net-(D65-Pad2)"))
     (model ${KISYS3DMOD}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl
@@ -13335,7 +13331,7 @@
     (pad "" np_thru_hole circle (at -7.62 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at -2.54 5.08 180) (size 4 4) (drill 4) (layers *.Cu *.Mask))
     (pad 2 thru_hole circle (at -6.35 2.54 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-      (net 213 COL05))
+      (net 211 COL05))
     (pad 1 thru_hole circle (at 0 0 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
       (net 76 "Net-(D66-Pad2)"))
     (model ${KISYS3DMOD}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl
@@ -13379,7 +13375,7 @@
     (pad "" np_thru_hole circle (at -7.62 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at -2.54 5.08 180) (size 4 4) (drill 4) (layers *.Cu *.Mask))
     (pad 2 thru_hole circle (at -6.35 2.54 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-      (net 203 COL06))
+      (net 201 COL06))
     (pad 1 thru_hole circle (at 0 0 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
       (net 77 "Net-(D67-Pad2)"))
     (model ${KISYS3DMOD}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl
@@ -13423,7 +13419,7 @@
     (pad "" np_thru_hole circle (at -7.62 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at -2.54 5.08 180) (size 4 4) (drill 4) (layers *.Cu *.Mask))
     (pad 2 thru_hole circle (at -6.35 2.54 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-      (net 204 COL07))
+      (net 202 COL07))
     (pad 1 thru_hole circle (at 0 0 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
       (net 78 "Net-(D68-Pad2)"))
     (model ${KISYS3DMOD}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl
@@ -13466,7 +13462,7 @@
     (pad 1 thru_hole circle (at 0 0 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
       (net 79 "Net-(D69-Pad2)"))
     (pad 2 thru_hole circle (at -6.35 2.54 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-      (net 205 COL08))
+      (net 203 COL08))
     (pad "" np_thru_hole circle (at -2.54 5.08 180) (size 4 4) (drill 4) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at -7.62 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 2.54 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
@@ -13511,7 +13507,7 @@
     (pad "" np_thru_hole circle (at -7.62 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at -2.54 5.08 180) (size 4 4) (drill 4) (layers *.Cu *.Mask))
     (pad 2 thru_hole circle (at -6.35 2.54 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-      (net 206 COL09))
+      (net 204 COL09))
     (pad 1 thru_hole circle (at 0 0 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
       (net 80 "Net-(D70-Pad2)"))
     (model ${KISYS3DMOD}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl
@@ -13554,7 +13550,7 @@
     (pad 1 thru_hole circle (at 0 0 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
       (net 81 "Net-(D71-Pad2)"))
     (pad 2 thru_hole circle (at -6.35 2.54 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-      (net 207 COL10))
+      (net 205 COL10))
     (pad "" np_thru_hole circle (at -2.54 5.08 180) (size 4 4) (drill 4) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at -7.62 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 2.54 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
@@ -13599,7 +13595,7 @@
     (pad "" np_thru_hole circle (at -7.62 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at -2.54 5.08 180) (size 4 4) (drill 4) (layers *.Cu *.Mask))
     (pad 2 thru_hole circle (at -6.35 2.54 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-      (net 208 COL11))
+      (net 206 COL11))
     (pad 1 thru_hole circle (at 0 0 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
       (net 82 "Net-(D72-Pad2)"))
     (model ${KISYS3DMOD}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl
@@ -13643,7 +13639,7 @@
     (pad "" np_thru_hole circle (at -7.62 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at -2.54 5.08 180) (size 4 4) (drill 4) (layers *.Cu *.Mask))
     (pad 2 thru_hole circle (at -6.35 2.54 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-      (net 210 COL13))
+      (net 208 COL13))
     (pad 1 thru_hole circle (at 0 0 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
       (net 83 "Net-(D73-Pad2)"))
     (model ${KISYS3DMOD}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.75u_PCB.wrl
@@ -13686,7 +13682,7 @@
     (pad 1 thru_hole circle (at 0 0 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
       (net 84 "Net-(D74-Pad2)"))
     (pad 2 thru_hole circle (at -6.35 2.54 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-      (net 211 COL14))
+      (net 209 COL14))
     (pad "" np_thru_hole circle (at -2.54 5.08 180) (size 4 4) (drill 4) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at -7.62 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 2.54 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
@@ -13730,7 +13726,7 @@
     (pad 1 thru_hole circle (at 0 0 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
       (net 85 "Net-(D75-Pad2)"))
     (pad 2 thru_hole circle (at -6.35 2.54 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-      (net 212 COL15))
+      (net 210 COL15))
     (pad "" np_thru_hole circle (at -2.54 5.08 180) (size 4 4) (drill 4) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at -7.62 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 2.54 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
@@ -13863,7 +13859,7 @@
     (pad "" np_thru_hole circle (at -7.62 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at -2.54 5.08 180) (size 4 4) (drill 4) (layers *.Cu *.Mask))
     (pad 2 thru_hole circle (at -6.35 2.54 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-      (net 201 COL03))
+      (net 199 COL03))
     (pad 1 thru_hole circle (at 0 0 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
       (net 89 "Net-(D78-Pad2)"))
     (model ${KISYS3DMOD}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.25u_PCB.wrl
@@ -13906,7 +13902,7 @@
     (pad 1 thru_hole circle (at 0 0 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
       (net 90 "Net-(D79-Pad2)"))
     (pad 2 thru_hole circle (at -6.35 2.54 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-      (net 204 COL07))
+      (net 202 COL07))
     (pad "" np_thru_hole circle (at -2.54 5.08 180) (size 4 4) (drill 4) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at -7.62 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 2.54 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
@@ -13954,7 +13950,7 @@
     (pad 1 thru_hole circle (at 0 0 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
       (net 91 "Net-(D80-Pad2)"))
     (pad 2 thru_hole circle (at -6.35 2.54 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-      (net 207 COL10))
+      (net 205 COL10))
     (pad "" np_thru_hole circle (at -2.54 5.08 180) (size 4 4) (drill 4) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at -7.62 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 2.54 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
@@ -13998,7 +13994,7 @@
     (pad 1 thru_hole circle (at 0 0 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
       (net 92 "Net-(D81-Pad2)"))
     (pad 2 thru_hole circle (at -6.35 2.54 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-      (net 209 COL12))
+      (net 207 COL12))
     (pad "" np_thru_hole circle (at -2.54 5.08 180) (size 4 4) (drill 4) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at -7.62 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 2.54 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
@@ -14043,7 +14039,7 @@
     (pad "" np_thru_hole circle (at -7.62 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at -2.54 5.08 180) (size 4 4) (drill 4) (layers *.Cu *.Mask))
     (pad 2 thru_hole circle (at -6.35 2.54 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-      (net 210 COL13))
+      (net 208 COL13))
     (pad 1 thru_hole circle (at 0 0 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
       (net 93 "Net-(D82-Pad2)"))
     (model ${KISYS3DMOD}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl
@@ -14087,7 +14083,7 @@
     (pad "" np_thru_hole circle (at -7.62 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at -2.54 5.08 180) (size 4 4) (drill 4) (layers *.Cu *.Mask))
     (pad 2 thru_hole circle (at -6.35 2.54 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-      (net 211 COL14))
+      (net 209 COL14))
     (pad 1 thru_hole circle (at 0 0 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
       (net 94 "Net-(D83-Pad2)"))
     (model ${KISYS3DMOD}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX_1.00u_PCB.wrl
@@ -14130,7 +14126,7 @@
     (pad 1 thru_hole circle (at 0 0 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
       (net 95 "Net-(D84-Pad2)"))
     (pad 2 thru_hole circle (at -6.35 2.54 180) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-      (net 212 COL15))
+      (net 210 COL15))
     (pad "" np_thru_hole circle (at -2.54 5.08 180) (size 4 4) (drill 4) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at -7.62 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 2.54 5.08 180) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
@@ -14175,13 +14171,13 @@
     (fp_line (start 5.175 5.175) (end 4.5 5.175) (layer B.SilkS) (width 0.15))
     (fp_line (start -5.175 4.6) (end -6.45 4.6) (layer B.SilkS) (width 0.15))
     (pad 1 smd rect (at -5.7 4 180) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask)
-      (net 214 "Net-(U1-Pad1)"))
+      (net 212 "Net-(U1-Pad1)"))
     (pad 2 smd rect (at -5.7 3.2 180) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask)
       (net 2 +5V))
     (pad 3 smd rect (at -5.7 2.4 180) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask)
-      (net 199 "Net-(R5-Pad2)"))
+      (net 187 D-))
     (pad 4 smd rect (at -5.7 1.6 180) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask)
-      (net 198 "Net-(R4-Pad1)"))
+      (net 188 D+))
     (pad 5 smd rect (at -5.7 0.8 180) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask)
       (net 1 GND))
     (pad 6 smd rect (at -5.7 0 180) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask)
@@ -14189,7 +14185,7 @@
     (pad 7 smd rect (at -5.7 -0.8 180) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask)
       (net 2 +5V))
     (pad 8 smd rect (at -5.7 -1.6 180) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask)
-      (net 215 "Net-(U1-Pad8)"))
+      (net 213 "Net-(U1-Pad8)"))
     (pad 9 smd rect (at -5.7 -2.4 180) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask)
       (net 182 COL00))
     (pad 10 smd rect (at -5.7 -3.2 180) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask)
@@ -14209,37 +14205,37 @@
     (pad 17 smd rect (at 0 -5.7 90) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask)
       (net 3 "Net-(C7-Pad1)"))
     (pad 18 smd rect (at 0.8 -5.7 90) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask)
-      (net 201 COL03))
+      (net 199 COL03))
     (pad 19 smd rect (at 1.6 -5.7 90) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask)
-      (net 202 COL04))
+      (net 200 COL04))
     (pad 20 smd rect (at 2.4 -5.7 90) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask)
-      (net 213 COL05))
+      (net 211 COL05))
     (pad 21 smd rect (at 3.2 -5.7 90) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask)
-      (net 203 COL06))
+      (net 201 COL06))
     (pad 22 smd rect (at 4 -5.7 90) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask)
-      (net 204 COL07))
+      (net 202 COL07))
     (pad 23 smd rect (at 5.7 -4 180) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask)
       (net 1 GND))
     (pad 24 smd rect (at 5.7 -3.2 180) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask)
       (net 2 +5V))
     (pad 25 smd rect (at 5.7 -2.4 180) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask)
-      (net 205 COL08))
+      (net 203 COL08))
     (pad 26 smd rect (at 5.7 -1.6 180) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask)
-      (net 206 COL09))
+      (net 204 COL09))
     (pad 27 smd rect (at 5.7 -0.8 180) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask)
-      (net 207 COL10))
+      (net 205 COL10))
     (pad 28 smd rect (at 5.7 0 180) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask)
-      (net 208 COL11))
+      (net 206 COL11))
     (pad 29 smd rect (at 5.7 0.8 180) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask)
-      (net 209 COL12))
+      (net 207 COL12))
     (pad 30 smd rect (at 5.7 1.6 180) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask)
-      (net 210 COL13))
+      (net 208 COL13))
     (pad 31 smd rect (at 5.7 2.4 180) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask)
-      (net 211 COL14))
+      (net 209 COL14))
     (pad 32 smd rect (at 5.7 3.2 180) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask)
-      (net 212 COL15))
+      (net 210 COL15))
     (pad 33 smd rect (at 5.7 4 180) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask)
-      (net 200 "Net-(R6-Pad2)"))
+      (net 198 "Net-(R6-Pad2)"))
     (pad 34 smd rect (at 4 5.7 90) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask)
       (net 2 +5V))
     (pad 35 smd rect (at 3.2 5.7 90) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask)
@@ -14257,7 +14253,7 @@
     (pad 41 smd rect (at -1.6 5.7 90) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask)
       (net 7 ROW0))
     (pad 42 smd rect (at -2.4 5.7 90) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask)
-      (net 216 "Net-(U1-Pad42)"))
+      (net 214 "Net-(U1-Pad42)"))
     (pad 43 smd rect (at -3.2 5.7 90) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask)
       (net 1 GND))
     (pad 44 smd rect (at -4 5.7 90) (size 1.5 0.55) (layers B.Cu B.Paste B.Mask)