diff --git a/tests_pcb/sample_atmega32/keyboard_pcb.kicad_pcb b/tests_pcb/sample_atmega32/keyboard_pcb.kicad_pcb
index c598aee..fcb0661 100644
--- a/tests_pcb/sample_atmega32/keyboard_pcb.kicad_pcb
+++ b/tests_pcb/sample_atmega32/keyboard_pcb.kicad_pcb
@@ -98,52 +98,52 @@
   (net 4 /col0)
   (net 5 GND)
   (net 6 VCC)
-  (net 7 "Net-(D_1000-Pad2)")
-  (net 8 "Net-(D_1001-Pad2)")
-  (net 9 "Net-(R104-Pad1)")
-  (net 10 "Net-(R103-Pad2)")
-  (net 11 "Net-(U1-Pad36)")
-  (net 12 /xtal2)
-  (net 13 /xtal1)
-  (net 14 /D-)
-  (net 15 /D+)
-  (net 16 /Du-)
-  (net 17 /Du+)
-  (net 18 /Ucap)
-  (net 19 "Net-(J101-Pad4)")
-  (net 20 "Net-(U1-Pad1)")
-  (net 21 "Net-(U1-Pad9)")
-  (net 22 "Net-(U1-Pad10)")
-  (net 23 "Net-(U1-Pad18)")
-  (net 24 "Net-(U1-Pad19)")
-  (net 25 "Net-(U1-Pad22)")
-  (net 26 "Net-(U1-Pad25)")
-  (net 27 "Net-(U1-Pad26)")
-  (net 28 "Net-(U1-Pad27)")
-  (net 29 "Net-(U1-Pad28)")
-  (net 30 "Net-(U1-Pad29)")
-  (net 31 "Net-(U1-Pad32)")
-  (net 32 "Net-(U1-Pad37)")
-  (net 33 "Net-(U1-Pad38)")
-  (net 34 "Net-(U1-Pad39)")
-  (net 35 "Net-(U1-Pad40)")
-  (net 36 "Net-(U1-Pad41)")
-  (net 37 "Net-(U1-Pad42)")
-  (net 38 "Net-(D_1002-Pad2)")
-  (net 39 "Net-(D_1003-Pad2)")
-  (net 40 "Net-(U1-Pad21)")
-  (net 41 /RGBLED)
-  (net 42 "Net-(D102-Pad2)")
-  (net 43 "Net-(D103-Pad2)")
-  (net 44 "Net-(D103-Pad4)")
-  (net 45 "Net-(D105-Pad2)")
-  (net 46 "Net-(Q101-Pad3)")
-  (net 47 "Net-(D109-Pad1)")
-  (net 48 "Net-(D108-Pad1)")
-  (net 49 "Net-(D107-Pad1)")
-  (net 50 "Net-(D106-Pad1)")
-  (net 51 "Net-(Q101-Pad1)")
-  (net 52 /LED)
+  (net 7 "Net-(U1-Pad36)")
+  (net 8 /xtal2)
+  (net 9 /xtal1)
+  (net 10 /D-)
+  (net 11 /D+)
+  (net 12 /Du-)
+  (net 13 /Du+)
+  (net 14 /Ucap)
+  (net 15 "Net-(U1-Pad1)")
+  (net 16 "Net-(U1-Pad9)")
+  (net 17 "Net-(U1-Pad10)")
+  (net 18 "Net-(U1-Pad18)")
+  (net 19 "Net-(U1-Pad19)")
+  (net 20 "Net-(U1-Pad22)")
+  (net 21 "Net-(U1-Pad25)")
+  (net 22 "Net-(U1-Pad26)")
+  (net 23 "Net-(U1-Pad27)")
+  (net 24 "Net-(U1-Pad28)")
+  (net 25 "Net-(U1-Pad29)")
+  (net 26 "Net-(U1-Pad32)")
+  (net 27 "Net-(U1-Pad37)")
+  (net 28 "Net-(U1-Pad38)")
+  (net 29 "Net-(U1-Pad39)")
+  (net 30 "Net-(U1-Pad40)")
+  (net 31 "Net-(U1-Pad41)")
+  (net 32 "Net-(U1-Pad42)")
+  (net 33 "Net-(U1-Pad21)")
+  (net 34 /RGBLED)
+  (net 35 /LED)
+  (net 36 "Net-(Q1-Pad3)")
+  (net 37 "Net-(D5-Pad1)")
+  (net 38 "Net-(D4-Pad1)")
+  (net 39 "Net-(Q1-Pad1)")
+  (net 40 "Net-(R4-Pad2)")
+  (net 41 "Net-(R3-Pad1)")
+  (net 42 "Net-(D9-Pad1)")
+  (net 43 "Net-(D8-Pad1)")
+  (net 44 "Net-(D2-Pad2)")
+  (net 45 "Net-(D3-Pad4)")
+  (net 46 "Net-(D7-Pad2)")
+  (net 47 "Net-(D3-Pad2)")
+  (net 48 "Net-(D_1-Pad2)")
+  (net 49 "Net-(D_2-Pad2)")
+  (net 50 "Net-(D_3-Pad2)")
+  (net 51 "Net-(D_4-Pad2)")
+  (net 52 "Net-(J1-Pad4)")
 
   (net_class Default "This is the default net class."
     (clearance 0.1524)
@@ -168,23 +168,23 @@
     (add_net /xtal1)
     (add_net /xtal2)
     (add_net GND)
-    (add_net "Net-(D102-Pad2)")
-    (add_net "Net-(D103-Pad2)")
-    (add_net "Net-(D103-Pad4)")
-    (add_net "Net-(D105-Pad2)")
-    (add_net "Net-(D106-Pad1)")
-    (add_net "Net-(D107-Pad1)")
-    (add_net "Net-(D108-Pad1)")
-    (add_net "Net-(D109-Pad1)")
-    (add_net "Net-(D_1000-Pad2)")
-    (add_net "Net-(D_1001-Pad2)")
-    (add_net "Net-(D_1002-Pad2)")
-    (add_net "Net-(D_1003-Pad2)")
-    (add_net "Net-(J101-Pad4)")
-    (add_net "Net-(Q101-Pad1)")
-    (add_net "Net-(Q101-Pad3)")
-    (add_net "Net-(R103-Pad2)")
-    (add_net "Net-(R104-Pad1)")
+    (add_net "Net-(D2-Pad2)")
+    (add_net "Net-(D3-Pad2)")
+    (add_net "Net-(D3-Pad4)")
+    (add_net "Net-(D4-Pad1)")
+    (add_net "Net-(D5-Pad1)")
+    (add_net "Net-(D7-Pad2)")
+    (add_net "Net-(D8-Pad1)")
+    (add_net "Net-(D9-Pad1)")
+    (add_net "Net-(D_1-Pad2)")
+    (add_net "Net-(D_2-Pad2)")
+    (add_net "Net-(D_3-Pad2)")
+    (add_net "Net-(D_4-Pad2)")
+    (add_net "Net-(J1-Pad4)")
+    (add_net "Net-(Q1-Pad1)")
+    (add_net "Net-(Q1-Pad3)")
+    (add_net "Net-(R3-Pad1)")
+    (add_net "Net-(R4-Pad2)")
     (add_net "Net-(U1-Pad1)")
     (add_net "Net-(U1-Pad10)")
     (add_net "Net-(U1-Pad18)")
@@ -214,7 +214,7 @@
     (tags "LED castellated")
     (path /5C76D590)
     (attr smd)
-    (fp_text reference D107 (at 0 1.78 90) (layer B.SilkS)
+    (fp_text reference D5 (at 0 1.78 90) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_text value LED (at 0 -1.78 90) (layer B.Fab)
@@ -238,7 +238,7 @@
     (pad 2 smd roundrect (at 1.425 0 90) (size 1.6 1.65) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.15625)
       (net 6 VCC))
     (pad 1 smd roundrect (at -1.425 0 90) (size 1.6 1.65) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.15625)
-      (net 49 "Net-(D107-Pad1)"))
+      (net 37 "Net-(D5-Pad1)"))
     (model ${KISYS3DMOD}/LED_SMD.3dshapes/LED_1206_3216Metric_Castellated.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -252,7 +252,7 @@
     (tags "LED castellated")
     (path /5C76D484)
     (attr smd)
-    (fp_text reference D106 (at 0 1.78 90) (layer B.SilkS)
+    (fp_text reference D4 (at 0 1.78 90) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_text value LED (at 0 -1.78 90) (layer B.Fab)
@@ -274,7 +274,7 @@
       (effects (font (size 0.8 0.8) (thickness 0.12)) (justify mirror))
     )
     (pad 1 smd roundrect (at -1.425 0 90) (size 1.6 1.65) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.15625)
-      (net 50 "Net-(D106-Pad1)"))
+      (net 38 "Net-(D4-Pad1)"))
     (pad 2 smd roundrect (at 1.425 0 90) (size 1.6 1.65) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.15625)
       (net 6 VCC))
     (model ${KISYS3DMOD}/LED_SMD.3dshapes/LED_1206_3216Metric_Castellated.wrl
@@ -290,7 +290,7 @@
     (tags "LED castellated")
     (path /5C76F8D8)
     (attr smd)
-    (fp_text reference D108 (at 0 1.78 90) (layer B.SilkS)
+    (fp_text reference D8 (at 0 1.78 90) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_text value LED (at 0 -1.78 90) (layer B.Fab)
@@ -314,7 +314,7 @@
     (pad 2 smd roundrect (at 1.425 0 90) (size 1.6 1.65) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.15625)
       (net 6 VCC))
     (pad 1 smd roundrect (at -1.425 0 90) (size 1.6 1.65) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.15625)
-      (net 48 "Net-(D108-Pad1)"))
+      (net 43 "Net-(D8-Pad1)"))
     (model ${KISYS3DMOD}/LED_SMD.3dshapes/LED_1206_3216Metric_Castellated.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -328,7 +328,7 @@
     (tags "LED castellated")
     (path /5C771C04)
     (attr smd)
-    (fp_text reference D109 (at 0 1.78 90) (layer B.SilkS)
+    (fp_text reference D9 (at 0 1.78 90) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_text value LED (at 0 -1.78 90) (layer B.Fab)
@@ -350,7 +350,7 @@
       (effects (font (size 0.8 0.8) (thickness 0.12)) (justify mirror))
     )
     (pad 1 smd roundrect (at -1.425 0 90) (size 1.6 1.65) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.15625)
-      (net 47 "Net-(D109-Pad1)"))
+      (net 42 "Net-(D9-Pad1)"))
     (pad 2 smd roundrect (at 1.425 0 90) (size 1.6 1.65) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.15625)
       (net 6 VCC))
     (model ${KISYS3DMOD}/LED_SMD.3dshapes/LED_1206_3216Metric_Castellated.wrl
@@ -366,7 +366,7 @@
     (tags SOT-23)
     (path /5C76ACFA)
     (attr smd)
-    (fp_text reference Q101 (at 0 2.5) (layer B.SilkS)
+    (fp_text reference Q1 (at 0 2.5) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_text value 2N7002 (at 0 -2.5) (layer B.Fab)
@@ -389,11 +389,11 @@
     (fp_line (start 0.76 1.58) (end -1.4 1.58) (layer B.SilkS) (width 0.12))
     (fp_line (start 0.76 -1.58) (end -0.7 -1.58) (layer B.SilkS) (width 0.12))
     (pad 1 smd rect (at -1 0.95) (size 0.9 0.8) (layers B.Cu B.Paste B.Mask)
-      (net 51 "Net-(Q101-Pad1)"))
+      (net 39 "Net-(Q1-Pad1)"))
     (pad 2 smd rect (at -1 -0.95) (size 0.9 0.8) (layers B.Cu B.Paste B.Mask)
       (net 5 GND))
     (pad 3 smd rect (at 1 0) (size 0.9 0.8) (layers B.Cu B.Paste B.Mask)
-      (net 46 "Net-(Q101-Pad3)"))
+      (net 36 "Net-(Q1-Pad3)"))
     (model ${KISYS3DMOD}/Package_TO_SOT_SMD.3dshapes/SOT-23.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -407,7 +407,7 @@
     (tags resistor)
     (path /5C79762C)
     (attr smd)
-    (fp_text reference R109 (at 0 1.43 90) (layer B.SilkS)
+    (fp_text reference R5 (at 0 1.43 90) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_text value 1K (at 0 -1.43 90) (layer B.Fab)
@@ -427,9 +427,9 @@
       (effects (font (size 0.4 0.4) (thickness 0.06)) (justify mirror))
     )
     (pad 1 smd roundrect (at -0.7875 0 90) (size 0.875 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 51 "Net-(Q101-Pad1)"))
+      (net 39 "Net-(Q1-Pad1)"))
     (pad 2 smd roundrect (at 0.7875 0 90) (size 0.875 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 52 /LED))
+      (net 35 /LED))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -443,7 +443,7 @@
     (tags resistor)
     (path /5C773FDF)
     (attr smd)
-    (fp_text reference R105 (at 0 1.43 90) (layer B.SilkS)
+    (fp_text reference R6 (at 0 1.43 90) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_text value 1K (at 0 -1.43 90) (layer B.Fab)
@@ -463,9 +463,9 @@
     (fp_line (start -0.8 0.4) (end 0.8 0.4) (layer B.Fab) (width 0.1))
     (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.7875 0 90) (size 0.875 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 50 "Net-(D106-Pad1)"))
+      (net 38 "Net-(D4-Pad1)"))
     (pad 1 smd roundrect (at -0.7875 0 90) (size 0.875 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 46 "Net-(Q101-Pad3)"))
+      (net 36 "Net-(Q1-Pad3)"))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -479,7 +479,7 @@
     (tags resistor)
     (path /5C774153)
     (attr smd)
-    (fp_text reference R106 (at 0 1.43 90) (layer B.SilkS)
+    (fp_text reference R7 (at 0 1.43 90) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_text value 1K (at 0 -1.43 90) (layer B.Fab)
@@ -499,9 +499,9 @@
       (effects (font (size 0.4 0.4) (thickness 0.06)) (justify mirror))
     )
     (pad 1 smd roundrect (at -0.7875 0 90) (size 0.875 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 46 "Net-(Q101-Pad3)"))
+      (net 36 "Net-(Q1-Pad3)"))
     (pad 2 smd roundrect (at 0.7875 0 90) (size 0.875 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 49 "Net-(D107-Pad1)"))
+      (net 37 "Net-(D5-Pad1)"))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -515,7 +515,7 @@
     (tags resistor)
     (path /5C77647D)
     (attr smd)
-    (fp_text reference R107 (at 0 1.43 90) (layer B.SilkS)
+    (fp_text reference R8 (at 0 1.43 90) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_text value 1K (at 0 -1.43 90) (layer B.Fab)
@@ -535,9 +535,9 @@
     (fp_line (start -0.8 0.4) (end 0.8 0.4) (layer B.Fab) (width 0.1))
     (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.7875 0 90) (size 0.875 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 48 "Net-(D108-Pad1)"))
+      (net 43 "Net-(D8-Pad1)"))
     (pad 1 smd roundrect (at -0.7875 0 90) (size 0.875 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 46 "Net-(Q101-Pad3)"))
+      (net 36 "Net-(Q1-Pad3)"))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -551,7 +551,7 @@
     (tags resistor)
     (path /5C7787A5)
     (attr smd)
-    (fp_text reference R108 (at 0 1.43 90) (layer B.SilkS)
+    (fp_text reference R9 (at 0 1.43 90) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_text value 1K (at 0 -1.43 90) (layer B.Fab)
@@ -571,9 +571,9 @@
     (fp_line (start -0.8 0.4) (end 0.8 0.4) (layer B.Fab) (width 0.1))
     (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.7875 0 90) (size 0.875 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 47 "Net-(D109-Pad1)"))
+      (net 42 "Net-(D9-Pad1)"))
     (pad 1 smd roundrect (at -0.7875 0 90) (size 0.875 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 46 "Net-(Q101-Pad3)"))
+      (net 36 "Net-(Q1-Pad3)"))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -587,7 +587,7 @@
     (tags "LED RGB NeoPixel")
     (path /5C74B3EC)
     (attr smd)
-    (fp_text reference D105 (at 0 3.5 180) (layer B.SilkS)
+    (fp_text reference D7 (at 0 3.5 180) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_text value WS2812B (at 0 -4 180) (layer B.Fab)
@@ -615,9 +615,9 @@
     (pad 1 smd rect (at -2.45 1.6 180) (size 1.5 1) (layers B.Cu B.Paste B.Mask)
       (net 6 VCC))
     (pad 2 smd rect (at -2.45 -1.6 180) (size 1.5 1) (layers B.Cu B.Paste B.Mask)
-      (net 45 "Net-(D105-Pad2)"))
+      (net 46 "Net-(D7-Pad2)"))
     (pad 4 smd rect (at 2.45 1.6 180) (size 1.5 1) (layers B.Cu B.Paste B.Mask)
-      (net 43 "Net-(D103-Pad2)"))
+      (net 47 "Net-(D3-Pad2)"))
     (pad 3 smd rect (at 2.45 -1.6 180) (size 1.5 1) (layers B.Cu B.Paste B.Mask)
       (net 5 GND))
     (model ${KISYS3DMOD}/LED_SMD.3dshapes/LED_WS2812B_PLCC4_5.0x5.0mm_P3.2mm.wrl
@@ -633,7 +633,7 @@
     (tags "LED RGB NeoPixel")
     (path /5C74B2C6)
     (attr smd)
-    (fp_text reference D104 (at 0 3.5 180) (layer B.SilkS)
+    (fp_text reference D6 (at 0 3.5 180) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_text value WS2812B (at 0 -4 180) (layer B.Fab)
@@ -661,9 +661,9 @@
     (pad 3 smd rect (at 2.45 -1.6 180) (size 1.5 1) (layers B.Cu B.Paste B.Mask)
       (net 5 GND))
     (pad 4 smd rect (at 2.45 1.6 180) (size 1.5 1) (layers B.Cu B.Paste B.Mask)
-      (net 42 "Net-(D102-Pad2)"))
+      (net 44 "Net-(D2-Pad2)"))
     (pad 2 smd rect (at -2.45 -1.6 180) (size 1.5 1) (layers B.Cu B.Paste B.Mask)
-      (net 44 "Net-(D103-Pad4)"))
+      (net 45 "Net-(D3-Pad4)"))
     (pad 1 smd rect (at -2.45 1.6 180) (size 1.5 1) (layers B.Cu B.Paste B.Mask)
       (net 6 VCC))
     (model ${KISYS3DMOD}/LED_SMD.3dshapes/LED_WS2812B_PLCC4_5.0x5.0mm_P3.2mm.wrl
@@ -679,7 +679,7 @@
     (tags "LED RGB NeoPixel")
     (path /5C74B1D9)
     (attr smd)
-    (fp_text reference D103 (at 0 3.5 180) (layer B.SilkS)
+    (fp_text reference D3 (at 0 3.5 180) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_text value WS2812B (at 0 -4 180) (layer B.Fab)
@@ -707,9 +707,9 @@
     (pad 1 smd rect (at -2.45 1.6 180) (size 1.5 1) (layers B.Cu B.Paste B.Mask)
       (net 6 VCC))
     (pad 2 smd rect (at -2.45 -1.6 180) (size 1.5 1) (layers B.Cu B.Paste B.Mask)
-      (net 43 "Net-(D103-Pad2)"))
+      (net 47 "Net-(D3-Pad2)"))
     (pad 4 smd rect (at 2.45 1.6 180) (size 1.5 1) (layers B.Cu B.Paste B.Mask)
-      (net 44 "Net-(D103-Pad4)"))
+      (net 45 "Net-(D3-Pad4)"))
     (pad 3 smd rect (at 2.45 -1.6 180) (size 1.5 1) (layers B.Cu B.Paste B.Mask)
       (net 5 GND))
     (model ${KISYS3DMOD}/LED_SMD.3dshapes/LED_WS2812B_PLCC4_5.0x5.0mm_P3.2mm.wrl
@@ -725,7 +725,7 @@
     (tags "LED RGB NeoPixel")
     (path /5C74B12B)
     (attr smd)
-    (fp_text reference D102 (at 0 3.5 180) (layer B.SilkS)
+    (fp_text reference D2 (at 0 3.5 180) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_text value WS2812B (at 0 -4 180) (layer B.Fab)
@@ -753,9 +753,9 @@
     (pad 3 smd rect (at 2.45 -1.6 180) (size 1.5 1) (layers B.Cu B.Paste B.Mask)
       (net 5 GND))
     (pad 4 smd rect (at 2.45 1.6 180) (size 1.5 1) (layers B.Cu B.Paste B.Mask)
-      (net 41 /RGBLED))
+      (net 34 /RGBLED))
     (pad 2 smd rect (at -2.45 -1.6 180) (size 1.5 1) (layers B.Cu B.Paste B.Mask)
-      (net 42 "Net-(D102-Pad2)"))
+      (net 44 "Net-(D2-Pad2)"))
     (pad 1 smd rect (at -2.45 1.6 180) (size 1.5 1) (layers B.Cu B.Paste B.Mask)
       (net 6 VCC))
     (model ${KISYS3DMOD}/LED_SMD.3dshapes/LED_WS2812B_PLCC4_5.0x5.0mm_P3.2mm.wrl
@@ -771,7 +771,7 @@
     (tags capacitor)
     (path /5B92F482)
     (attr smd)
-    (fp_text reference C107 (at 0 -1.43 180) (layer F.SilkS)
+    (fp_text reference C7 (at 0 -1.43 180) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value 0.1u (at 0 1.43 180) (layer F.Fab)
@@ -807,7 +807,7 @@
     (tags capacitor)
     (path /5B92F1FC)
     (attr smd)
-    (fp_text reference C106 (at 0 -1.43) (layer F.SilkS)
+    (fp_text reference C6 (at 0 -1.43) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value 0.1u (at 0 1.43) (layer F.Fab)
@@ -843,7 +843,7 @@
     (tags capacitor)
     (path /5B92EF85)
     (attr smd)
-    (fp_text reference C105 (at 0 -1.43 270) (layer F.SilkS)
+    (fp_text reference C4 (at 0 -1.43 270) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value 0.1u (at 0 1.43 270) (layer F.Fab)
@@ -879,7 +879,7 @@
     (tags capacitor)
     (path /5B92ED0B)
     (attr smd)
-    (fp_text reference C104 (at 0 -1.43 90) (layer F.SilkS)
+    (fp_text reference C3 (at 0 -1.43 90) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value 0.1u (at 0 1.43 90) (layer F.Fab)
@@ -915,7 +915,7 @@
     (tags capacitor)
     (path /5B860D38)
     (attr smd)
-    (fp_text reference C103 (at 0 -1.43) (layer F.SilkS)
+    (fp_text reference C5 (at 0 -1.43) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value 1u (at 0 1.43) (layer F.Fab)
@@ -937,7 +937,7 @@
     (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 5 GND))
     (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 18 /Ucap))
+      (net 14 /Ucap))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -951,7 +951,7 @@
     (tags capacitor)
     (path /5B5AA610)
     (attr smd)
-    (fp_text reference C102 (at 0 -1.43) (layer F.SilkS)
+    (fp_text reference C2 (at 0 -1.43) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value 22p (at 0 1.43) (layer F.Fab)
@@ -971,7 +971,7 @@
       (effects (font (size 0.4 0.4) (thickness 0.06)))
     )
     (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 12 /xtal2))
+      (net 8 /xtal2))
     (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 5 GND))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl
@@ -987,7 +987,7 @@
     (tags capacitor)
     (path /5B5AA89D)
     (attr smd)
-    (fp_text reference C101 (at 0 -1.43 180) (layer F.SilkS)
+    (fp_text reference C1 (at 0 -1.43 180) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value 22p (at 0 1.43 180) (layer F.Fab)
@@ -1009,7 +1009,7 @@
     (pad 2 smd roundrect (at 0.7875 0 180) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 5 GND))
     (pad 1 smd roundrect (at -0.7875 0 180) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 13 /xtal1))
+      (net 9 /xtal1))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1023,7 +1023,7 @@
     (tags capacitor)
     (path /5B92F70F)
     (attr smd)
-    (fp_text reference C108 (at 0 -1.43) (layer F.SilkS)
+    (fp_text reference C8 (at 0 -1.43) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value 4.7u (at 0 1.43) (layer F.Fab)
@@ -1059,7 +1059,7 @@
     (tags SOT-143)
     (path /5C72172F)
     (attr smd)
-    (fp_text reference D101 (at 0.02 -2.38 180) (layer F.SilkS)
+    (fp_text reference D1 (at 0.02 -2.38 180) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value PRTR5V0U2X (at -0.28 2.48 180) (layer F.Fab)
@@ -1082,9 +1082,9 @@
     (pad 1 smd rect (at -1.1 -0.77 90) (size 1.2 1.4) (layers F.Cu F.Paste F.Mask)
       (net 5 GND))
     (pad 2 smd rect (at -1.1 0.95 90) (size 1 1.4) (layers F.Cu F.Paste F.Mask)
-      (net 17 /Du+))
+      (net 13 /Du+))
     (pad 3 smd rect (at 1.1 0.95 90) (size 1 1.4) (layers F.Cu F.Paste F.Mask)
-      (net 16 /Du-))
+      (net 12 /Du-))
     (pad 4 smd rect (at 1.1 -0.95 90) (size 1 1.4) (layers F.Cu F.Paste F.Mask)
       (net 6 VCC))
     (model ${KISYS3DMOD}/Package_TO_SOT_SMD.3dshapes/SOT-143.wrl
@@ -1099,7 +1099,7 @@
     (descr "Cherry MX keyswitch, MX1A, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "cherry mx keyswitch MX1A 1.00u PCB")
     (path /5C746BFB)
-    (fp_text reference K_1002 (at -2.54 -2.794) (layer F.SilkS)
+    (fp_text reference K_3 (at -2.54 -2.794) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value KEYSW (at -2.54 12.954) (layer F.Fab)
@@ -1127,7 +1127,7 @@
     (pad 1 thru_hole circle (at 0 0) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
       (net 3 /col1))
     (pad 2 thru_hole circle (at -6.35 2.54) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-      (net 38 "Net-(D_1002-Pad2)"))
+      (net 50 "Net-(D_3-Pad2)"))
     (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))
@@ -1144,7 +1144,7 @@
     (tags "SPST Button Switch")
     (path /5BB36E8A)
     (attr smd)
-    (fp_text reference SW101 (at 0 -3.6) (layer F.SilkS)
+    (fp_text reference SW1 (at 0 -3.6) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value SW_Push (at 0 3.6) (layer F.Fab)
@@ -1209,9 +1209,9 @@
     (pad 1 smd rect (at 3.1 -1.85) (size 1.8 1.1) (layers F.Cu F.Paste F.Mask)
       (net 5 GND))
     (pad 2 smd rect (at -3.1 1.85) (size 1.8 1.1) (layers F.Cu F.Paste F.Mask)
-      (net 9 "Net-(R104-Pad1)"))
+      (net 41 "Net-(R3-Pad1)"))
     (pad 2 smd rect (at 3.1 1.85) (size 1.8 1.1) (layers F.Cu F.Paste F.Mask)
-      (net 9 "Net-(R104-Pad1)"))
+      (net 41 "Net-(R3-Pad1)"))
     (model ${KISYS3DMOD}/Button_Switch_SMD.3dshapes/SW_SPST_SKQG_WithoutStem.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1225,7 +1225,7 @@
     (tags SOD-123)
     (path /5C746C02)
     (attr smd)
-    (fp_text reference D_1002 (at 0 2 270) (layer B.SilkS)
+    (fp_text reference D_3 (at 0 2 270) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_text value D (at 0 -2.1 270) (layer B.Fab)
@@ -1255,7 +1255,7 @@
     (pad 1 smd rect (at -1.65 0 270) (size 0.9 1.2) (layers B.Cu B.Paste B.Mask)
       (net 2 /row1))
     (pad 2 smd rect (at 1.65 0 270) (size 0.9 1.2) (layers B.Cu B.Paste B.Mask)
-      (net 38 "Net-(D_1002-Pad2)"))
+      (net 50 "Net-(D_3-Pad2)"))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_SOD-123.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1268,7 +1268,7 @@
     (descr "Cherry MX keyswitch, MX1A, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "cherry mx keyswitch MX1A 1.00u PCB")
     (path /5C746C0A)
-    (fp_text reference K_1003 (at -2.54 -2.794) (layer F.SilkS)
+    (fp_text reference K_4 (at -2.54 -2.794) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value KEYSW (at -2.54 12.954) (layer F.Fab)
@@ -1297,7 +1297,7 @@
     (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 39 "Net-(D_1003-Pad2)"))
+      (net 51 "Net-(D_4-Pad2)"))
     (pad 1 thru_hole circle (at 0 0) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
       (net 3 /col1))
     (model ${KISYS3DMOD}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX1A_1.00u_PCB.wrl
@@ -1312,7 +1312,7 @@
     (descr "Cherry MX keyswitch, MX1A, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "cherry mx keyswitch MX1A 1.00u PCB")
     (path /5AA598B3)
-    (fp_text reference K_1001 (at -2.54 -2.794) (layer F.SilkS)
+    (fp_text reference K_1 (at -2.54 -2.794) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value KEYSW (at -2.54 12.954) (layer F.Fab)
@@ -1341,7 +1341,7 @@
     (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 8 "Net-(D_1001-Pad2)"))
+      (net 48 "Net-(D_1-Pad2)"))
     (pad 1 thru_hole circle (at 0 0) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
       (net 4 /col0))
     (model ${KISYS3DMOD}/Button_Switch_Keyboard.3dshapes/SW_Cherry_MX1A_1.00u_PCB.wrl
@@ -1356,7 +1356,7 @@
     (descr "Cherry MX keyswitch, MX1A, 1.00u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
     (tags "cherry mx keyswitch MX1A 1.00u PCB")
     (path /5AA59B0B)
-    (fp_text reference K_1000 (at -2.54 -2.794) (layer F.SilkS)
+    (fp_text reference K_2 (at -2.54 -2.794) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value KEYSW (at -2.54 12.954) (layer F.Fab)
@@ -1384,7 +1384,7 @@
     (pad 1 thru_hole circle (at 0 0) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
       (net 4 /col0))
     (pad 2 thru_hole circle (at -6.35 2.54) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
-      (net 7 "Net-(D_1000-Pad2)"))
+      (net 49 "Net-(D_2-Pad2)"))
     (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))
@@ -1401,7 +1401,7 @@
     (tags "SMD SMT crystal")
     (path /5B4FFE79)
     (attr smd)
-    (fp_text reference X101 (at 0 -2.45 90) (layer F.SilkS)
+    (fp_text reference X1 (at 0 -2.45 90) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value Crystal (at 0 2.45 90) (layer F.Fab)
@@ -1422,11 +1422,11 @@
     (fp_line (start 2.1 1.7) (end 2.1 -1.7) (layer F.CrtYd) (width 0.05))
     (fp_line (start 2.1 -1.7) (end -2.1 -1.7) (layer F.CrtYd) (width 0.05))
     (pad 1 smd rect (at -1.1 0.85 90) (size 1.4 1.2) (layers F.Cu F.Paste F.Mask)
-      (net 13 /xtal1))
+      (net 9 /xtal1))
     (pad 2 smd rect (at 1.1 0.85 90) (size 1.4 1.2) (layers F.Cu F.Paste F.Mask)
       (net 5 GND))
     (pad 3 smd rect (at 1.1 -0.85 90) (size 1.4 1.2) (layers F.Cu F.Paste F.Mask)
-      (net 12 /xtal2))
+      (net 8 /xtal2))
     (pad 4 smd rect (at -1.1 -0.85 90) (size 1.4 1.2) (layers F.Cu F.Paste F.Mask)
       (net 5 GND))
     (model ${KISYS3DMOD}/Crystal.3dshapes/Crystal_SMD_3225-4Pin_3.2x2.5mm.wrl
@@ -1442,7 +1442,7 @@
     (tags SOD-123)
     (path /5C746C11)
     (attr smd)
-    (fp_text reference D_1003 (at 0 2 270) (layer B.SilkS)
+    (fp_text reference D_4 (at 0 2 270) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_text value D (at 0 -2.1 270) (layer B.Fab)
@@ -1470,7 +1470,7 @@
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (pad 2 smd rect (at 1.65 0 270) (size 0.9 1.2) (layers B.Cu B.Paste B.Mask)
-      (net 39 "Net-(D_1003-Pad2)"))
+      (net 51 "Net-(D_4-Pad2)"))
     (pad 1 smd rect (at -1.65 0 270) (size 0.9 1.2) (layers B.Cu B.Paste B.Mask)
       (net 1 /row0))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_SOD-123.wrl
@@ -1486,7 +1486,7 @@
     (tags SOD-123)
     (path /5AA598BA)
     (attr smd)
-    (fp_text reference D_1001 (at 0 -1.905 270) (layer B.SilkS)
+    (fp_text reference D_1 (at 0 -1.905 270) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_text value D (at 0 -2.1 270) (layer B.Fab)
@@ -1514,7 +1514,7 @@
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (pad 2 smd rect (at 1.65 0 270) (size 0.9 1.2) (layers B.Cu B.Paste B.Mask)
-      (net 8 "Net-(D_1001-Pad2)"))
+      (net 48 "Net-(D_1-Pad2)"))
     (pad 1 smd rect (at -1.65 0 270) (size 0.9 1.2) (layers B.Cu B.Paste B.Mask)
       (net 2 /row1))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_SOD-123.wrl
@@ -1530,7 +1530,7 @@
     (tags SOD-123)
     (path /5AA59B12)
     (attr smd)
-    (fp_text reference D_1000 (at 0 -1.905 270) (layer B.SilkS)
+    (fp_text reference D_2 (at 0 -1.905 270) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_text value D (at 0 -2.1 270) (layer B.Fab)
@@ -1560,7 +1560,7 @@
     (pad 1 smd rect (at -1.65 0 270) (size 0.9 1.2) (layers B.Cu B.Paste B.Mask)
       (net 1 /row0))
     (pad 2 smd rect (at 1.65 0 270) (size 0.9 1.2) (layers B.Cu B.Paste B.Mask)
-      (net 7 "Net-(D_1000-Pad2)"))
+      (net 49 "Net-(D_2-Pad2)"))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_SOD-123.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1574,7 +1574,7 @@
     (tags "usb micro receptacle")
     (path /5B6855D1)
     (attr smd)
-    (fp_text reference J101 (at 0 -3.5 180) (layer F.SilkS)
+    (fp_text reference J1 (at 0 -3.5 180) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value USB_A (at 0 5.6 180) (layer F.Fab)
@@ -1629,11 +1629,11 @@
     (pad 5 smd rect (at 1.3 -1.9 180) (size 0.45 1.3) (layers F.Cu F.Paste F.Mask)
       (net 5 GND))
     (pad 4 smd rect (at 0.65 -1.9 180) (size 0.45 1.3) (layers F.Cu F.Paste F.Mask)
-      (net 19 "Net-(J101-Pad4)"))
+      (net 52 "Net-(J1-Pad4)"))
     (pad 3 smd rect (at 0 -1.9 180) (size 0.45 1.3) (layers F.Cu F.Paste F.Mask)
-      (net 17 /Du+))
+      (net 13 /Du+))
     (pad 2 smd rect (at -0.65 -1.9 180) (size 0.45 1.3) (layers F.Cu F.Paste F.Mask)
-      (net 16 /Du-))
+      (net 12 /Du-))
     (pad 1 smd rect (at -1.3 -1.9 180) (size 0.45 1.3) (layers F.Cu F.Paste F.Mask)
       (net 6 VCC))
     (model ${KISYS3DMOD}/Connectors_USB.3dshapes/USB_Micro-B_Wuerth-629105150521_CircularHoles.wrl
@@ -1649,7 +1649,7 @@
     (tags resistor)
     (path /5BB3732A)
     (attr smd)
-    (fp_text reference R104 (at 0 -1.65 180) (layer F.SilkS)
+    (fp_text reference R3 (at 0 -1.65 180) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value 10k (at 0 1.65 180) (layer F.Fab)
@@ -1671,7 +1671,7 @@
     (pad 2 smd rect (at 0.875 0 180) (size 0.67 1) (layers F.Cu F.Paste F.Mask)
       (net 6 VCC))
     (pad 1 smd rect (at -0.875 0 180) (size 0.67 1) (layers F.Cu F.Paste F.Mask)
-      (net 9 "Net-(R104-Pad1)"))
+      (net 41 "Net-(R3-Pad1)"))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1685,7 +1685,7 @@
     (tags resistor)
     (path /5B7710FD)
     (attr smd)
-    (fp_text reference R101 (at 0 -1.65 270) (layer F.SilkS)
+    (fp_text reference R1 (at 0 -1.65 270) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value 22 (at 0 1.65 270) (layer F.Fab)
@@ -1705,9 +1705,9 @@
       (effects (font (size 0.5 0.5) (thickness 0.08)))
     )
     (pad 1 smd rect (at -0.875 0 270) (size 0.67 1) (layers F.Cu F.Paste F.Mask)
-      (net 15 /D+))
+      (net 11 /D+))
     (pad 2 smd rect (at 0.875 0 270) (size 0.67 1) (layers F.Cu F.Paste F.Mask)
-      (net 17 /Du+))
+      (net 13 /Du+))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1721,7 +1721,7 @@
     (tags resistor)
     (path /5B771434)
     (attr smd)
-    (fp_text reference R102 (at 0 -1.65 270) (layer F.SilkS)
+    (fp_text reference R2 (at 0 -1.65 270) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value 22 (at 0 1.65 270) (layer F.Fab)
@@ -1741,9 +1741,9 @@
     (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
     (pad 2 smd rect (at 0.875 0 270) (size 0.67 1) (layers F.Cu F.Paste F.Mask)
-      (net 16 /Du-))
+      (net 12 /Du-))
     (pad 1 smd rect (at -0.875 0 270) (size 0.67 1) (layers F.Cu F.Paste F.Mask)
-      (net 14 /D-))
+      (net 10 /D-))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1757,7 +1757,7 @@
     (tags resistor)
     (path /5B92CAB7)
     (attr smd)
-    (fp_text reference R103 (at 0 -1.65 180) (layer F.SilkS)
+    (fp_text reference R4 (at 0 -1.65 180) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value 10k (at 0 1.65 180) (layer F.Fab)
@@ -1779,7 +1779,7 @@
     (pad 1 smd rect (at -0.875 0 180) (size 0.67 1) (layers F.Cu F.Paste F.Mask)
       (net 5 GND))
     (pad 2 smd rect (at 0.875 0 180) (size 0.67 1) (layers F.Cu F.Paste F.Mask)
-      (net 10 "Net-(R103-Pad2)"))
+      (net 40 "Net-(R4-Pad2)"))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1821,89 +1821,89 @@
     (fp_line (start 5.175 -5.175) (end 4.5 -5.175) (layer F.SilkS) (width 0.15))
     (fp_line (start -5.175 -4.6) (end -6.45 -4.6) (layer F.SilkS) (width 0.15))
     (pad 1 smd rect (at -5.7 -4 270) (size 1.5 0.55) (layers F.Cu F.Paste F.Mask)
-      (net 20 "Net-(U1-Pad1)"))
+      (net 15 "Net-(U1-Pad1)"))
     (pad 2 smd rect (at -5.7 -3.2 270) (size 1.5 0.55) (layers F.Cu F.Paste F.Mask)
       (net 6 VCC))
     (pad 3 smd rect (at -5.7 -2.4 270) (size 1.5 0.55) (layers F.Cu F.Paste F.Mask)
-      (net 14 /D-))
+      (net 10 /D-))
     (pad 4 smd rect (at -5.7 -1.6 270) (size 1.5 0.55) (layers F.Cu F.Paste F.Mask)
-      (net 15 /D+))
+      (net 11 /D+))
     (pad 5 smd rect (at -5.7 -0.8 270) (size 1.5 0.55) (layers F.Cu F.Paste F.Mask)
       (net 5 GND))
     (pad 6 smd rect (at -5.7 0 270) (size 1.5 0.55) (layers F.Cu F.Paste F.Mask)
-      (net 18 /Ucap))
+      (net 14 /Ucap))
     (pad 7 smd rect (at -5.7 0.8 270) (size 1.5 0.55) (layers F.Cu F.Paste F.Mask)
       (net 6 VCC))
     (pad 8 smd rect (at -5.7 1.6 270) (size 1.5 0.55) (layers F.Cu F.Paste F.Mask)
       (net 1 /row0))
     (pad 9 smd rect (at -5.7 2.4 270) (size 1.5 0.55) (layers F.Cu F.Paste F.Mask)
-      (net 21 "Net-(U1-Pad9)"))
+      (net 16 "Net-(U1-Pad9)"))
     (pad 10 smd rect (at -5.7 3.2 270) (size 1.5 0.55) (layers F.Cu F.Paste F.Mask)
-      (net 22 "Net-(U1-Pad10)"))
+      (net 17 "Net-(U1-Pad10)"))
     (pad 11 smd rect (at -5.7 4 270) (size 1.5 0.55) (layers F.Cu F.Paste F.Mask)
       (net 2 /row1))
     (pad 12 smd rect (at -4 5.7) (size 1.5 0.55) (layers F.Cu F.Paste F.Mask)
-      (net 52 /LED))
+      (net 35 /LED))
     (pad 13 smd rect (at -3.2 5.7) (size 1.5 0.55) (layers F.Cu F.Paste F.Mask)
-      (net 9 "Net-(R104-Pad1)"))
+      (net 41 "Net-(R3-Pad1)"))
     (pad 14 smd rect (at -2.4 5.7) (size 1.5 0.55) (layers F.Cu F.Paste F.Mask)
       (net 6 VCC))
     (pad 15 smd rect (at -1.6 5.7) (size 1.5 0.55) (layers F.Cu F.Paste F.Mask)
       (net 5 GND))
     (pad 16 smd rect (at -0.8 5.7) (size 1.5 0.55) (layers F.Cu F.Paste F.Mask)
-      (net 12 /xtal2))
+      (net 8 /xtal2))
     (pad 17 smd rect (at 0 5.7) (size 1.5 0.55) (layers F.Cu F.Paste F.Mask)
-      (net 13 /xtal1))
+      (net 9 /xtal1))
     (pad 18 smd rect (at 0.8 5.7) (size 1.5 0.55) (layers F.Cu F.Paste F.Mask)
-      (net 23 "Net-(U1-Pad18)"))
+      (net 18 "Net-(U1-Pad18)"))
     (pad 19 smd rect (at 1.6 5.7) (size 1.5 0.55) (layers F.Cu F.Paste F.Mask)
-      (net 24 "Net-(U1-Pad19)"))
+      (net 19 "Net-(U1-Pad19)"))
     (pad 20 smd rect (at 2.4 5.7) (size 1.5 0.55) (layers F.Cu F.Paste F.Mask)
-      (net 41 /RGBLED))
+      (net 34 /RGBLED))
     (pad 21 smd rect (at 3.2 5.7) (size 1.5 0.55) (layers F.Cu F.Paste F.Mask)
-      (net 40 "Net-(U1-Pad21)"))
+      (net 33 "Net-(U1-Pad21)"))
     (pad 22 smd rect (at 4 5.7) (size 1.5 0.55) (layers F.Cu F.Paste F.Mask)
-      (net 25 "Net-(U1-Pad22)"))
+      (net 20 "Net-(U1-Pad22)"))
     (pad 23 smd rect (at 5.7 4 270) (size 1.5 0.55) (layers F.Cu F.Paste F.Mask)
       (net 5 GND))
     (pad 24 smd rect (at 5.7 3.2 270) (size 1.5 0.55) (layers F.Cu F.Paste F.Mask)
       (net 6 VCC))
     (pad 25 smd rect (at 5.7 2.4 270) (size 1.5 0.55) (layers F.Cu F.Paste F.Mask)
-      (net 26 "Net-(U1-Pad25)"))
+      (net 21 "Net-(U1-Pad25)"))
     (pad 26 smd rect (at 5.7 1.6 270) (size 1.5 0.55) (layers F.Cu F.Paste F.Mask)
-      (net 27 "Net-(U1-Pad26)"))
+      (net 22 "Net-(U1-Pad26)"))
     (pad 27 smd rect (at 5.7 0.8 270) (size 1.5 0.55) (layers F.Cu F.Paste F.Mask)
-      (net 28 "Net-(U1-Pad27)"))
+      (net 23 "Net-(U1-Pad27)"))
     (pad 28 smd rect (at 5.7 0 270) (size 1.5 0.55) (layers F.Cu F.Paste F.Mask)
-      (net 29 "Net-(U1-Pad28)"))
+      (net 24 "Net-(U1-Pad28)"))
     (pad 29 smd rect (at 5.7 -0.8 270) (size 1.5 0.55) (layers F.Cu F.Paste F.Mask)
-      (net 30 "Net-(U1-Pad29)"))
+      (net 25 "Net-(U1-Pad29)"))
     (pad 30 smd rect (at 5.7 -1.6 270) (size 1.5 0.55) (layers F.Cu F.Paste F.Mask)
       (net 4 /col0))
     (pad 31 smd rect (at 5.7 -2.4 270) (size 1.5 0.55) (layers F.Cu F.Paste F.Mask)
       (net 3 /col1))
     (pad 32 smd rect (at 5.7 -3.2 270) (size 1.5 0.55) (layers F.Cu F.Paste F.Mask)
-      (net 31 "Net-(U1-Pad32)"))
+      (net 26 "Net-(U1-Pad32)"))
     (pad 33 smd rect (at 5.7 -4 270) (size 1.5 0.55) (layers F.Cu F.Paste F.Mask)
-      (net 10 "Net-(R103-Pad2)"))
+      (net 40 "Net-(R4-Pad2)"))
     (pad 34 smd rect (at 4 -5.7) (size 1.5 0.55) (layers F.Cu F.Paste F.Mask)
       (net 6 VCC))
     (pad 35 smd rect (at 3.2 -5.7) (size 1.5 0.55) (layers F.Cu F.Paste F.Mask)
       (net 5 GND))
     (pad 36 smd rect (at 2.4 -5.7) (size 1.5 0.55) (layers F.Cu F.Paste F.Mask)
-      (net 11 "Net-(U1-Pad36)"))
+      (net 7 "Net-(U1-Pad36)"))
     (pad 37 smd rect (at 1.6 -5.7) (size 1.5 0.55) (layers F.Cu F.Paste F.Mask)
-      (net 32 "Net-(U1-Pad37)"))
+      (net 27 "Net-(U1-Pad37)"))
     (pad 38 smd rect (at 0.8 -5.7) (size 1.5 0.55) (layers F.Cu F.Paste F.Mask)
-      (net 33 "Net-(U1-Pad38)"))
+      (net 28 "Net-(U1-Pad38)"))
     (pad 39 smd rect (at 0 -5.7) (size 1.5 0.55) (layers F.Cu F.Paste F.Mask)
-      (net 34 "Net-(U1-Pad39)"))
+      (net 29 "Net-(U1-Pad39)"))
     (pad 40 smd rect (at -0.8 -5.7) (size 1.5 0.55) (layers F.Cu F.Paste F.Mask)
-      (net 35 "Net-(U1-Pad40)"))
+      (net 30 "Net-(U1-Pad40)"))
     (pad 41 smd rect (at -1.6 -5.7) (size 1.5 0.55) (layers F.Cu F.Paste F.Mask)
-      (net 36 "Net-(U1-Pad41)"))
+      (net 31 "Net-(U1-Pad41)"))
     (pad 42 smd rect (at -2.4 -5.7) (size 1.5 0.55) (layers F.Cu F.Paste F.Mask)
-      (net 37 "Net-(U1-Pad42)"))
+      (net 32 "Net-(U1-Pad42)"))
     (pad 43 smd rect (at -3.2 -5.7) (size 1.5 0.55) (layers F.Cu F.Paste F.Mask)
       (net 5 GND))
     (pad 44 smd rect (at -4 -5.7) (size 1.5 0.55) (layers F.Cu F.Paste F.Mask)
@@ -2149,125 +2149,125 @@
   (segment (start 40.2375 100.5) (end 39.1425 101.595) (width 0.1524) (layer F.Cu) (net 6))
   (segment (start 33.015 100.325) (end 33.015 100.17) (width 0.1524) (layer B.Cu) (net 6))
   (segment (start 34.285 101.595) (end 33.015 100.325) (width 0.1524) (layer B.Cu) (net 6))
-  (segment (start 36.825 128.01) (end 36.825 130.17) (width 0.1524) (layer B.Cu) (net 7) (status 30))
-  (segment (start 36.825 111.12) (end 36.825 108.325) (width 0.1524) (layer B.Cu) (net 8) (status 30))
-  (segment (start 61.61 101.595) (end 61.665 101.54) (width 0.1524) (layer F.Cu) (net 9) (status 30))
-  (segment (start 58.02 100.96) (end 58.655 101.595) (width 0.1524) (layer F.Cu) (net 9) (status 10))
-  (via (at 39.365 89.53) (size 0.6858) (drill 0.3302) (layers F.Cu B.Cu) (net 9))
-  (segment (start 39.335 89.5) (end 39.365 89.53) (width 0.1524) (layer F.Cu) (net 9))
-  (segment (start 37.35 89.5) (end 39.335 89.5) (width 0.1524) (layer F.Cu) (net 9) (status 10))
-  (via (at 59.685 101.595) (size 0.6858) (drill 0.3302) (layers F.Cu B.Cu) (net 9))
-  (segment (start 58.655 101.595) (end 59.685 101.595) (width 0.1524) (layer F.Cu) (net 9))
-  (segment (start 59.685 101.595) (end 61.61 101.595) (width 0.1524) (layer F.Cu) (net 9) (status 20))
-  (segment (start 59.05 102.23) (end 59.685 101.595) (width 0.1524) (layer B.Cu) (net 9))
-  (segment (start 52.531778 102.23) (end 59.05 102.23) (width 0.1524) (layer B.Cu) (net 9))
-  (segment (start 45.08 94.778222) (end 52.531778 102.23) (width 0.1524) (layer B.Cu) (net 9))
-  (segment (start 39.365 89.53) (end 39.966501 88.928499) (width 0.1524) (layer B.Cu) (net 9))
-  (segment (start 45.08 91.435) (end 45.08 94.778222) (width 0.1524) (layer B.Cu) (net 9))
-  (segment (start 39.966501 88.928499) (end 42.573499 88.928499) (width 0.1524) (layer B.Cu) (net 9))
-  (segment (start 42.573499 88.928499) (end 45.08 91.435) (width 0.1524) (layer B.Cu) (net 9))
-  (segment (start 61.665 101.54) (end 67.865 101.54) (width 0.1524) (layer F.Cu) (net 9) (tstamp 5C930A47) (status 30))
-  (segment (start 47.05 100.75) (end 47.1 100.8) (width 0.1524) (layer F.Cu) (net 10) (status 30))
-  (segment (start 47.05 98.4) (end 47.05 100.75) (width 0.1524) (layer F.Cu) (net 10) (status 30))
-  (segment (start 32.8 88.9575) (end 32.8625 88.895) (width 0.1524) (layer F.Cu) (net 12) (status 30))
-  (segment (start 32.8 91.5) (end 32.8 90.165) (width 0.1524) (layer F.Cu) (net 12) (status 10))
-  (segment (start 32.8 90.165) (end 32.8 88.9575) (width 0.1524) (layer F.Cu) (net 12) (status 20))
-  (segment (start 37.35 91.9) (end 36.401 91.9) (width 0.1524) (layer F.Cu) (net 12) (status 10))
-  (segment (start 35.174 90.165) (end 32.8 90.165) (width 0.1524) (layer F.Cu) (net 12))
-  (segment (start 36.401 91.9) (end 36.19 91.689) (width 0.1524) (layer F.Cu) (net 12))
-  (segment (start 36.19 91.689) (end 36.19 91.181) (width 0.1524) (layer F.Cu) (net 12))
-  (segment (start 36.19 91.181) (end 35.174 90.165) (width 0.1524) (layer F.Cu) (net 12))
-  (segment (start 35.195 93.7) (end 34.5 93.7) (width 0.1524) (layer F.Cu) (net 13) (status 20))
-  (segment (start 36.19 92.705) (end 35.195 93.7) (width 0.1524) (layer F.Cu) (net 13))
-  (segment (start 37.345 92.705) (end 36.19 92.705) (width 0.1524) (layer F.Cu) (net 13) (status 10))
-  (segment (start 37.35 92.7) (end 37.345 92.705) (width 0.1524) (layer F.Cu) (net 13) (status 30))
-  (segment (start 34.5 95.8175) (end 34.4375 95.88) (width 0.1524) (layer F.Cu) (net 13) (status 30))
-  (segment (start 34.5 93.7) (end 34.5 95.8175) (width 0.1524) (layer F.Cu) (net 13) (status 30))
-  (segment (start 53.081 84.196) (end 53.081 84.845) (width 0.1524) (layer F.Cu) (net 14) (status 20))
-  (segment (start 45.45 84.715) (end 46.604 83.561) (width 0.1524) (layer F.Cu) (net 14))
-  (segment (start 45.45 87) (end 45.45 84.715) (width 0.1524) (layer F.Cu) (net 14) (status 10))
-  (segment (start 46.604 83.561) (end 52.446 83.561) (width 0.1524) (layer F.Cu) (net 14))
-  (segment (start 52.446 83.561) (end 53.081 84.196) (width 0.1524) (layer F.Cu) (net 14))
-  (segment (start 56.383 83.688) (end 56.383 84.845) (width 0.1524) (layer F.Cu) (net 15) (status 20))
-  (segment (start 44.65 87) (end 44.65 84.88) (width 0.1524) (layer F.Cu) (net 15) (status 10))
-  (segment (start 55.875 83.18) (end 56.383 83.688) (width 0.1524) (layer F.Cu) (net 15))
-  (segment (start 44.65 84.88) (end 46.35 83.18) (width 0.1524) (layer F.Cu) (net 15))
-  (segment (start 46.35 83.18) (end 55.875 83.18) (width 0.1524) (layer F.Cu) (net 15))
-  (segment (start 53.97 90.455) (end 53.94 90.485) (width 0.1524) (layer F.Cu) (net 16) (status 30))
-  (segment (start 53.94 90.485) (end 54.14 90.485) (width 0.1524) (layer F.Cu) (net 16) (status 30))
-  (segment (start 53.081 86.595) (end 53.97 87.484) (width 0.1524) (layer F.Cu) (net 16) (status 10))
-  (via (at 59.685 91.435) (size 0.6858) (drill 0.3302) (layers F.Cu B.Cu) (net 16))
-  (segment (start 61.7674 91.435) (end 59.685 91.435) (width 0.1524) (layer F.Cu) (net 16))
-  (segment (start 64.78 88.4224) (end 61.7674 91.435) (width 0.1524) (layer F.Cu) (net 16))
-  (segment (start 64.78 87.62) (end 64.78 88.4224) (width 0.1524) (layer F.Cu) (net 16) (status 10))
-  (via (at 53.97 88.895) (size 0.6858) (drill 0.3302) (layers F.Cu B.Cu) (net 16))
-  (segment (start 53.97 87.484) (end 53.97 88.895) (width 0.1524) (layer F.Cu) (net 16))
-  (segment (start 53.97 88.895) (end 53.97 90.455) (width 0.1524) (layer F.Cu) (net 16) (status 20))
-  (segment (start 53.97 90.315) (end 53.97 88.895) (width 0.1524) (layer B.Cu) (net 16))
-  (segment (start 55.09 91.435) (end 53.97 90.315) (width 0.1524) (layer B.Cu) (net 16))
-  (segment (start 59.685 91.435) (end 55.09 91.435) (width 0.1524) (layer B.Cu) (net 16))
-  (segment (start 56.383 90.442) (end 56.34 90.485) (width 0.1524) (layer F.Cu) (net 17) (status 30))
-  (segment (start 56.383 86.595) (end 56.383 90.442) (width 0.1524) (layer F.Cu) (net 17) (status 30))
-  (segment (start 62.0674 90.485) (end 56.34 90.485) (width 0.1524) (layer F.Cu) (net 17) (status 20))
-  (segment (start 64.13 88.4224) (end 62.0674 90.485) (width 0.1524) (layer F.Cu) (net 17))
-  (segment (start 64.13 87.62) (end 64.13 88.4224) (width 0.1524) (layer F.Cu) (net 17) (status 10))
-  (segment (start 38.095 84.9274) (end 38.095 84.45) (width 0.1524) (layer F.Cu) (net 18) (status 20))
-  (segment (start 43.05 87) (end 43.05 86.0976) (width 0.1524) (layer F.Cu) (net 18) (status 10))
-  (segment (start 38.5066 85.339) (end 38.095 84.9274) (width 0.1524) (layer F.Cu) (net 18))
-  (segment (start 43.05 86.0976) (end 42.2914 85.339) (width 0.1524) (layer F.Cu) (net 18))
-  (segment (start 42.2914 85.339) (end 38.5066 85.339) (width 0.1524) (layer F.Cu) (net 18))
-  (segment (start 55.875 108.325) (end 55.875 111.12) (width 0.1524) (layer B.Cu) (net 38) (status 30))
-  (segment (start 55.875 128.01) (end 55.875 130.17) (width 0.1524) (layer B.Cu) (net 39) (status 30))
-  (segment (start 37.35 95.1) (end 36.4476 95.1) (width 0.1524) (layer F.Cu) (net 41))
-  (segment (start 33.015 139.845067) (end 33.015 140.33) (width 0.1524) (layer F.Cu) (net 41))
-  (segment (start 33.357899 139.987101) (end 33.015 140.33) (width 0.1524) (layer B.Cu) (net 41))
-  (segment (start 36.4476 95.1) (end 33.015 98.5326) (width 0.1524) (layer F.Cu) (net 41))
-  (segment (start 38.185 136.825) (end 36.52 136.825) (width 0.1524) (layer B.Cu) (net 41))
-  (segment (start 36.52 136.825) (end 33.357899 139.987101) (width 0.1524) (layer B.Cu) (net 41))
-  (segment (start 33.015 98.5326) (end 33.015 139.845067) (width 0.1524) (layer F.Cu) (net 41))
-  (via (at 33.015 140.33) (size 0.6858) (drill 0.3302) (layers F.Cu B.Cu) (net 41))
-  (segment (start 51.735 140.025) (end 43.085 140.025) (width 0.1524) (layer B.Cu) (net 42))
-  (segment (start 54.935 136.825) (end 51.735 140.025) (width 0.1524) (layer B.Cu) (net 42))
-  (segment (start 57.235 136.825) (end 54.935 136.825) (width 0.1524) (layer B.Cu) (net 42))
-  (segment (start 49.195 120.975) (end 43.085 120.975) (width 0.1524) (layer B.Cu) (net 43))
-  (segment (start 52.395 117.775) (end 49.195 120.975) (width 0.1524) (layer B.Cu) (net 43))
-  (segment (start 57.235 117.775) (end 52.395 117.775) (width 0.1524) (layer B.Cu) (net 43))
-  (segment (start 56.51 123.185) (end 57.78 124.455) (width 0.1524) (layer B.Cu) (net 44))
-  (segment (start 60.32 135.885) (end 60.32 137.5576) (width 0.1524) (layer B.Cu) (net 44))
-  (segment (start 60.32 137.5576) (end 62.135 139.3726) (width 0.1524) (layer B.Cu) (net 44))
-  (segment (start 38.185 118.4274) (end 42.9426 123.185) (width 0.1524) (layer B.Cu) (net 44))
-  (segment (start 38.185 117.775) (end 38.185 118.4274) (width 0.1524) (layer B.Cu) (net 44))
-  (segment (start 57.78 124.455) (end 57.78 126.36) (width 0.1524) (layer B.Cu) (net 44))
-  (segment (start 42.9426 123.185) (end 56.51 123.185) (width 0.1524) (layer B.Cu) (net 44))
-  (segment (start 57.78 126.36) (end 62.225 130.805) (width 0.1524) (layer B.Cu) (net 44))
-  (segment (start 62.135 139.3726) (end 62.135 140.025) (width 0.1524) (layer B.Cu) (net 44))
-  (segment (start 62.225 133.98) (end 60.32 135.885) (width 0.1524) (layer B.Cu) (net 44))
-  (segment (start 62.225 130.805) (end 62.225 133.98) (width 0.1524) (layer B.Cu) (net 44))
-  (segment (start 35.285 94.61) (end 35.285 104.5575) (width 0.1524) (layer B.Cu) (net 46))
-  (segment (start 34.4375 116.14) (end 34.4375 105.405) (width 0.1524) (layer B.Cu) (net 46))
-  (segment (start 33.59 116.9875) (end 34.4375 116.14) (width 0.1524) (layer B.Cu) (net 46))
-  (segment (start 33.015 116.9875) (end 33.59 116.9875) (width 0.1524) (layer B.Cu) (net 46))
-  (segment (start 35.285 104.5575) (end 34.4375 105.405) (width 0.1524) (layer B.Cu) (net 46))
-  (segment (start 34.4375 105.405) (end 33.015 106.8275) (width 0.1524) (layer B.Cu) (net 46))
-  (segment (start 34.4375 125.725) (end 33.015 127.1475) (width 0.1524) (layer B.Cu) (net 46))
-  (segment (start 34.4375 116.14) (end 34.4375 125.725) (width 0.1524) (layer B.Cu) (net 46))
-  (segment (start 34.4375 134.7675) (end 33.015 136.19) (width 0.1524) (layer B.Cu) (net 46))
-  (segment (start 34.4375 125.725) (end 34.4375 134.7675) (width 0.1524) (layer B.Cu) (net 46))
-  (segment (start 33.015 103.02) (end 33.015 105.2525) (width 0.1524) (layer B.Cu) (net 47))
-  (segment (start 33.015 113.18) (end 33.015 115.4125) (width 0.1524) (layer B.Cu) (net 48))
-  (segment (start 33.015 123.34) (end 33.015 125.5725) (width 0.1524) (layer B.Cu) (net 49))
-  (segment (start 33.015 132.23) (end 33.015 134.615) (width 0.1524) (layer B.Cu) (net 50))
-  (segment (start 31.745 94.61) (end 32.695 95.56) (width 0.1524) (layer B.Cu) (net 51))
-  (segment (start 32.695 95.56) (end 33.285 95.56) (width 0.1524) (layer B.Cu) (net 51))
-  (segment (start 31.745 91.5875) (end 31.745 94.61) (width 0.1524) (layer B.Cu) (net 51))
-  (segment (start 33.65 89.6825) (end 31.745 91.5875) (width 0.1524) (layer B.Cu) (net 51))
-  (segment (start 37.04519 88.7) (end 36.63 88.7) (width 0.1524) (layer F.Cu) (net 52))
-  (segment (start 36.63 88.7) (end 35.897899 87.967899) (width 0.1524) (layer F.Cu) (net 52))
-  (via (at 35.555 87.625) (size 0.6858) (drill 0.3302) (layers F.Cu B.Cu) (net 52))
-  (segment (start 35.897899 87.967899) (end 35.555 87.625) (width 0.1524) (layer F.Cu) (net 52))
-  (segment (start 34.92 87.625) (end 35.555 87.625) (width 0.1524) (layer B.Cu) (net 52))
-  (segment (start 34.1325 87.625) (end 34.92 87.625) (width 0.1524) (layer B.Cu) (net 52))
-  (segment (start 33.65 88.1075) (end 34.1325 87.625) (width 0.1524) (layer B.Cu) (net 52))
+  (segment (start 36.825 128.01) (end 36.825 130.17) (width 0.1524) (layer B.Cu) (net 49) (status 30))
+  (segment (start 36.825 111.12) (end 36.825 108.325) (width 0.1524) (layer B.Cu) (net 48) (status 30))
+  (segment (start 61.61 101.595) (end 61.665 101.54) (width 0.1524) (layer F.Cu) (net 41) (status 30))
+  (segment (start 58.02 100.96) (end 58.655 101.595) (width 0.1524) (layer F.Cu) (net 41) (status 10))
+  (via (at 39.365 89.53) (size 0.6858) (drill 0.3302) (layers F.Cu B.Cu) (net 41))
+  (segment (start 39.335 89.5) (end 39.365 89.53) (width 0.1524) (layer F.Cu) (net 41))
+  (segment (start 37.35 89.5) (end 39.335 89.5) (width 0.1524) (layer F.Cu) (net 41) (status 10))
+  (via (at 59.685 101.595) (size 0.6858) (drill 0.3302) (layers F.Cu B.Cu) (net 41))
+  (segment (start 58.655 101.595) (end 59.685 101.595) (width 0.1524) (layer F.Cu) (net 41))
+  (segment (start 59.685 101.595) (end 61.61 101.595) (width 0.1524) (layer F.Cu) (net 41) (status 20))
+  (segment (start 59.05 102.23) (end 59.685 101.595) (width 0.1524) (layer B.Cu) (net 41))
+  (segment (start 52.531778 102.23) (end 59.05 102.23) (width 0.1524) (layer B.Cu) (net 41))
+  (segment (start 45.08 94.778222) (end 52.531778 102.23) (width 0.1524) (layer B.Cu) (net 41))
+  (segment (start 39.365 89.53) (end 39.966501 88.928499) (width 0.1524) (layer B.Cu) (net 41))
+  (segment (start 45.08 91.435) (end 45.08 94.778222) (width 0.1524) (layer B.Cu) (net 41))
+  (segment (start 39.966501 88.928499) (end 42.573499 88.928499) (width 0.1524) (layer B.Cu) (net 41))
+  (segment (start 42.573499 88.928499) (end 45.08 91.435) (width 0.1524) (layer B.Cu) (net 41))
+  (segment (start 61.665 101.54) (end 67.865 101.54) (width 0.1524) (layer F.Cu) (net 41) (tstamp 5C930A47) (status 30))
+  (segment (start 47.05 100.75) (end 47.1 100.8) (width 0.1524) (layer F.Cu) (net 40) (status 30))
+  (segment (start 47.05 98.4) (end 47.05 100.75) (width 0.1524) (layer F.Cu) (net 40) (status 30))
+  (segment (start 32.8 88.9575) (end 32.8625 88.895) (width 0.1524) (layer F.Cu) (net 8) (status 30))
+  (segment (start 32.8 91.5) (end 32.8 90.165) (width 0.1524) (layer F.Cu) (net 8) (status 10))
+  (segment (start 32.8 90.165) (end 32.8 88.9575) (width 0.1524) (layer F.Cu) (net 8) (status 20))
+  (segment (start 37.35 91.9) (end 36.401 91.9) (width 0.1524) (layer F.Cu) (net 8) (status 10))
+  (segment (start 35.174 90.165) (end 32.8 90.165) (width 0.1524) (layer F.Cu) (net 8))
+  (segment (start 36.401 91.9) (end 36.19 91.689) (width 0.1524) (layer F.Cu) (net 8))
+  (segment (start 36.19 91.689) (end 36.19 91.181) (width 0.1524) (layer F.Cu) (net 8))
+  (segment (start 36.19 91.181) (end 35.174 90.165) (width 0.1524) (layer F.Cu) (net 8))
+  (segment (start 35.195 93.7) (end 34.5 93.7) (width 0.1524) (layer F.Cu) (net 9) (status 20))
+  (segment (start 36.19 92.705) (end 35.195 93.7) (width 0.1524) (layer F.Cu) (net 9))
+  (segment (start 37.345 92.705) (end 36.19 92.705) (width 0.1524) (layer F.Cu) (net 9) (status 10))
+  (segment (start 37.35 92.7) (end 37.345 92.705) (width 0.1524) (layer F.Cu) (net 9) (status 30))
+  (segment (start 34.5 95.8175) (end 34.4375 95.88) (width 0.1524) (layer F.Cu) (net 9) (status 30))
+  (segment (start 34.5 93.7) (end 34.5 95.8175) (width 0.1524) (layer F.Cu) (net 9) (status 30))
+  (segment (start 53.081 84.196) (end 53.081 84.845) (width 0.1524) (layer F.Cu) (net 10) (status 20))
+  (segment (start 45.45 84.715) (end 46.604 83.561) (width 0.1524) (layer F.Cu) (net 10))
+  (segment (start 45.45 87) (end 45.45 84.715) (width 0.1524) (layer F.Cu) (net 10) (status 10))
+  (segment (start 46.604 83.561) (end 52.446 83.561) (width 0.1524) (layer F.Cu) (net 10))
+  (segment (start 52.446 83.561) (end 53.081 84.196) (width 0.1524) (layer F.Cu) (net 10))
+  (segment (start 56.383 83.688) (end 56.383 84.845) (width 0.1524) (layer F.Cu) (net 11) (status 20))
+  (segment (start 44.65 87) (end 44.65 84.88) (width 0.1524) (layer F.Cu) (net 11) (status 10))
+  (segment (start 55.875 83.18) (end 56.383 83.688) (width 0.1524) (layer F.Cu) (net 11))
+  (segment (start 44.65 84.88) (end 46.35 83.18) (width 0.1524) (layer F.Cu) (net 11))
+  (segment (start 46.35 83.18) (end 55.875 83.18) (width 0.1524) (layer F.Cu) (net 11))
+  (segment (start 53.97 90.455) (end 53.94 90.485) (width 0.1524) (layer F.Cu) (net 12) (status 30))
+  (segment (start 53.94 90.485) (end 54.14 90.485) (width 0.1524) (layer F.Cu) (net 12) (status 30))
+  (segment (start 53.081 86.595) (end 53.97 87.484) (width 0.1524) (layer F.Cu) (net 12) (status 10))
+  (via (at 59.685 91.435) (size 0.6858) (drill 0.3302) (layers F.Cu B.Cu) (net 12))
+  (segment (start 61.7674 91.435) (end 59.685 91.435) (width 0.1524) (layer F.Cu) (net 12))
+  (segment (start 64.78 88.4224) (end 61.7674 91.435) (width 0.1524) (layer F.Cu) (net 12))
+  (segment (start 64.78 87.62) (end 64.78 88.4224) (width 0.1524) (layer F.Cu) (net 12) (status 10))
+  (via (at 53.97 88.895) (size 0.6858) (drill 0.3302) (layers F.Cu B.Cu) (net 12))
+  (segment (start 53.97 87.484) (end 53.97 88.895) (width 0.1524) (layer F.Cu) (net 12))
+  (segment (start 53.97 88.895) (end 53.97 90.455) (width 0.1524) (layer F.Cu) (net 12) (status 20))
+  (segment (start 53.97 90.315) (end 53.97 88.895) (width 0.1524) (layer B.Cu) (net 12))
+  (segment (start 55.09 91.435) (end 53.97 90.315) (width 0.1524) (layer B.Cu) (net 12))
+  (segment (start 59.685 91.435) (end 55.09 91.435) (width 0.1524) (layer B.Cu) (net 12))
+  (segment (start 56.383 90.442) (end 56.34 90.485) (width 0.1524) (layer F.Cu) (net 13) (status 30))
+  (segment (start 56.383 86.595) (end 56.383 90.442) (width 0.1524) (layer F.Cu) (net 13) (status 30))
+  (segment (start 62.0674 90.485) (end 56.34 90.485) (width 0.1524) (layer F.Cu) (net 13) (status 20))
+  (segment (start 64.13 88.4224) (end 62.0674 90.485) (width 0.1524) (layer F.Cu) (net 13))
+  (segment (start 64.13 87.62) (end 64.13 88.4224) (width 0.1524) (layer F.Cu) (net 13) (status 10))
+  (segment (start 38.095 84.9274) (end 38.095 84.45) (width 0.1524) (layer F.Cu) (net 14) (status 20))
+  (segment (start 43.05 87) (end 43.05 86.0976) (width 0.1524) (layer F.Cu) (net 14) (status 10))
+  (segment (start 38.5066 85.339) (end 38.095 84.9274) (width 0.1524) (layer F.Cu) (net 14))
+  (segment (start 43.05 86.0976) (end 42.2914 85.339) (width 0.1524) (layer F.Cu) (net 14))
+  (segment (start 42.2914 85.339) (end 38.5066 85.339) (width 0.1524) (layer F.Cu) (net 14))
+  (segment (start 55.875 108.325) (end 55.875 111.12) (width 0.1524) (layer B.Cu) (net 50) (status 30))
+  (segment (start 55.875 128.01) (end 55.875 130.17) (width 0.1524) (layer B.Cu) (net 51) (status 30))
+  (segment (start 37.35 95.1) (end 36.4476 95.1) (width 0.1524) (layer F.Cu) (net 34))
+  (segment (start 33.015 139.845067) (end 33.015 140.33) (width 0.1524) (layer F.Cu) (net 34))
+  (segment (start 33.357899 139.987101) (end 33.015 140.33) (width 0.1524) (layer B.Cu) (net 34))
+  (segment (start 36.4476 95.1) (end 33.015 98.5326) (width 0.1524) (layer F.Cu) (net 34))
+  (segment (start 38.185 136.825) (end 36.52 136.825) (width 0.1524) (layer B.Cu) (net 34))
+  (segment (start 36.52 136.825) (end 33.357899 139.987101) (width 0.1524) (layer B.Cu) (net 34))
+  (segment (start 33.015 98.5326) (end 33.015 139.845067) (width 0.1524) (layer F.Cu) (net 34))
+  (via (at 33.015 140.33) (size 0.6858) (drill 0.3302) (layers F.Cu B.Cu) (net 34))
+  (segment (start 51.735 140.025) (end 43.085 140.025) (width 0.1524) (layer B.Cu) (net 44))
+  (segment (start 54.935 136.825) (end 51.735 140.025) (width 0.1524) (layer B.Cu) (net 44))
+  (segment (start 57.235 136.825) (end 54.935 136.825) (width 0.1524) (layer B.Cu) (net 44))
+  (segment (start 49.195 120.975) (end 43.085 120.975) (width 0.1524) (layer B.Cu) (net 47))
+  (segment (start 52.395 117.775) (end 49.195 120.975) (width 0.1524) (layer B.Cu) (net 47))
+  (segment (start 57.235 117.775) (end 52.395 117.775) (width 0.1524) (layer B.Cu) (net 47))
+  (segment (start 56.51 123.185) (end 57.78 124.455) (width 0.1524) (layer B.Cu) (net 45))
+  (segment (start 60.32 135.885) (end 60.32 137.5576) (width 0.1524) (layer B.Cu) (net 45))
+  (segment (start 60.32 137.5576) (end 62.135 139.3726) (width 0.1524) (layer B.Cu) (net 45))
+  (segment (start 38.185 118.4274) (end 42.9426 123.185) (width 0.1524) (layer B.Cu) (net 45))
+  (segment (start 38.185 117.775) (end 38.185 118.4274) (width 0.1524) (layer B.Cu) (net 45))
+  (segment (start 57.78 124.455) (end 57.78 126.36) (width 0.1524) (layer B.Cu) (net 45))
+  (segment (start 42.9426 123.185) (end 56.51 123.185) (width 0.1524) (layer B.Cu) (net 45))
+  (segment (start 57.78 126.36) (end 62.225 130.805) (width 0.1524) (layer B.Cu) (net 45))
+  (segment (start 62.135 139.3726) (end 62.135 140.025) (width 0.1524) (layer B.Cu) (net 45))
+  (segment (start 62.225 133.98) (end 60.32 135.885) (width 0.1524) (layer B.Cu) (net 45))
+  (segment (start 62.225 130.805) (end 62.225 133.98) (width 0.1524) (layer B.Cu) (net 45))
+  (segment (start 35.285 94.61) (end 35.285 104.5575) (width 0.1524) (layer B.Cu) (net 36))
+  (segment (start 34.4375 116.14) (end 34.4375 105.405) (width 0.1524) (layer B.Cu) (net 36))
+  (segment (start 33.59 116.9875) (end 34.4375 116.14) (width 0.1524) (layer B.Cu) (net 36))
+  (segment (start 33.015 116.9875) (end 33.59 116.9875) (width 0.1524) (layer B.Cu) (net 36))
+  (segment (start 35.285 104.5575) (end 34.4375 105.405) (width 0.1524) (layer B.Cu) (net 36))
+  (segment (start 34.4375 105.405) (end 33.015 106.8275) (width 0.1524) (layer B.Cu) (net 36))
+  (segment (start 34.4375 125.725) (end 33.015 127.1475) (width 0.1524) (layer B.Cu) (net 36))
+  (segment (start 34.4375 116.14) (end 34.4375 125.725) (width 0.1524) (layer B.Cu) (net 36))
+  (segment (start 34.4375 134.7675) (end 33.015 136.19) (width 0.1524) (layer B.Cu) (net 36))
+  (segment (start 34.4375 125.725) (end 34.4375 134.7675) (width 0.1524) (layer B.Cu) (net 36))
+  (segment (start 33.015 103.02) (end 33.015 105.2525) (width 0.1524) (layer B.Cu) (net 42))
+  (segment (start 33.015 113.18) (end 33.015 115.4125) (width 0.1524) (layer B.Cu) (net 43))
+  (segment (start 33.015 123.34) (end 33.015 125.5725) (width 0.1524) (layer B.Cu) (net 37))
+  (segment (start 33.015 132.23) (end 33.015 134.615) (width 0.1524) (layer B.Cu) (net 38))
+  (segment (start 31.745 94.61) (end 32.695 95.56) (width 0.1524) (layer B.Cu) (net 39))
+  (segment (start 32.695 95.56) (end 33.285 95.56) (width 0.1524) (layer B.Cu) (net 39))
+  (segment (start 31.745 91.5875) (end 31.745 94.61) (width 0.1524) (layer B.Cu) (net 39))
+  (segment (start 33.65 89.6825) (end 31.745 91.5875) (width 0.1524) (layer B.Cu) (net 39))
+  (segment (start 37.04519 88.7) (end 36.63 88.7) (width 0.1524) (layer F.Cu) (net 35))
+  (segment (start 36.63 88.7) (end 35.897899 87.967899) (width 0.1524) (layer F.Cu) (net 35))
+  (via (at 35.555 87.625) (size 0.6858) (drill 0.3302) (layers F.Cu B.Cu) (net 35))
+  (segment (start 35.897899 87.967899) (end 35.555 87.625) (width 0.1524) (layer F.Cu) (net 35))
+  (segment (start 34.92 87.625) (end 35.555 87.625) (width 0.1524) (layer B.Cu) (net 35))
+  (segment (start 34.1325 87.625) (end 34.92 87.625) (width 0.1524) (layer B.Cu) (net 35))
+  (segment (start 33.65 88.1075) (end 34.1325 87.625) (width 0.1524) (layer B.Cu) (net 35))
 
   (zone (net 5) (net_name GND) (layer F.Cu) (tstamp 5C930939) (hatch edge 0.508)
     (connect_pads (clearance 0.508))
diff --git a/tests_pcb/sample_atmega32/keyboard_pcb.sch b/tests_pcb/sample_atmega32/keyboard_pcb.sch
index e940b18..86870da 100644
--- a/tests_pcb/sample_atmega32/keyboard_pcb.sch
+++ b/tests_pcb/sample_atmega32/keyboard_pcb.sch
@@ -20,10 +20,10 @@ row1
 Text Label 3400 2950 0    60   ~ 0
 col0
 $Comp
-L Switch:SW_Push K_1001
+L Switch:SW_Push K_1
 U 1 1 5AA598B3
 P 3000 3400
-F 0 "K_1001" H 2950 3400 60  0000 C CNN
+F 0 "K_1" H 2950 3400 60  0000 C CNN
 F 1 "KEYSW" H 3000 3300 60  0001 C CNN
 F 2 "Button_Switch_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 3000 3400 60  0001 C CNN
 F 3 "" H 3000 3400 60  0000 C CNN
@@ -31,10 +31,10 @@ F 3 "" H 3000 3400 60  0000 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L Device:D D_1001
+L Device:D D_1
 U 1 1 5AA598BA
 P 2650 3550
-F 0 "D_1001" V 2500 3500 60  0000 C CNN
+F 0 "D_1" V 2500 3500 60  0000 C CNN
 F 1 "D" V 2800 3500 60  0001 C CNN
 F 2 "Diode_SMD:D_SOD-123" H 2650 3550 60  0001 C CNN
 F 3 "1N4148WTPMSCT-ND" V 2650 3550 60  0000 C CNN
@@ -44,10 +44,10 @@ $EndComp
 Wire Wire Line
 	2400 3700 2650 3700
 $Comp
-L Switch:SW_Push K_1000
+L Switch:SW_Push K_2
 U 1 1 5AA59B0B
 P 3000 3850
-F 0 "K_1000" H 2950 3850 60  0000 C CNN
+F 0 "K_2" H 2950 3850 60  0000 C CNN
 F 1 "KEYSW" H 3000 3750 60  0001 C CNN
 F 2 "Button_Switch_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 3000 3850 60  0001 C CNN
 F 3 "" H 3000 3850 60  0000 C CNN
@@ -55,10 +55,10 @@ F 3 "" H 3000 3850 60  0000 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L Device:D D_1000
+L Device:D D_2
 U 1 1 5AA59B12
 P 2650 4000
-F 0 "D_1000" V 2500 3950 60  0000 C CNN
+F 0 "D_2" V 2500 3950 60  0000 C CNN
 F 1 "D" V 2800 3950 60  0001 C CNN
 F 2 "Diode_SMD:D_SOD-123" H 2650 4000 60  0001 C CNN
 F 3 "1N4148WTPMSCT-ND" V 2650 4000 60  0000 C CNN
@@ -80,10 +80,10 @@ col0
 Text Notes 1950 4900 0    197  ~ 0
 Controller
 $Comp
-L Device:Crystal_GND24 X101
+L Device:Crystal_GND24 X1
 U 1 1 5B4FFE79
 P 1300 5350
-F 0 "X101" H 1491 5403 60  0000 L CNN
+F 0 "X1" H 1491 5403 60  0000 L CNN
 F 1 "Crystal" H 1491 5297 60  0000 L CNN
 F 2 "Crystal:Crystal_SMD_3225-4Pin_3.2x2.5mm" H 1300 5350 60  0001 C CNN
 F 3 "1923-1291-1-ND " H 1300 5350 60  0001 C CNN
@@ -91,10 +91,10 @@ F 3 "1923-1291-1-ND " H 1300 5350 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C C102
+L Device:C C2
 U 1 1 5B5AA610
 P 1650 5550
-F 0 "C102" H 1765 5596 50  0000 L CNN
+F 0 "C2" H 1765 5596 50  0000 L CNN
 F 1 "22p" H 1765 5505 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0603_1608Metric" H 1688 5400 50  0001 C CNN
 F 3 "399-7775-1-ND" H 1650 5550 50  0001 C CNN
@@ -102,10 +102,10 @@ F 3 "399-7775-1-ND" H 1650 5550 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C C101
+L Device:C C1
 U 1 1 5B5AA89D
 P 1000 5550
-F 0 "C101" H 1115 5596 50  0000 L CNN
+F 0 "C1" H 1115 5596 50  0000 L CNN
 F 1 "22p" H 1115 5505 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0603_1608Metric" H 1038 5400 50  0001 C CNN
 F 3 "399-7775-1-ND" H 1000 5550 50  0001 C CNN
@@ -120,10 +120,10 @@ Wire Wire Line
 Wire Wire Line
 	1300 5700 1000 5700
 $Comp
-L Connector:USB_B_Micro J101
+L Connector:USB_B_Micro J1
 U 1 1 5B6855D1
 P 1150 8600
-F 0 "J101" H 1205 9067 50  0000 C CNN
+F 0 "J1" H 1205 9067 50  0000 C CNN
 F 1 "USB_A" H 1205 8976 50  0000 C CNN
 F 2 "Connectors_USB:USB_Micro-B_Wuerth-629105150521_CircularHoles" H 1300 8550 50  0001 C CNN
 F 3 "609-4613-1-ND" H 1300 8550 50  0001 C CNN
@@ -131,10 +131,10 @@ F 3 "609-4613-1-ND" H 1300 8550 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:R R101
+L Device:R R1
 U 1 1 5B7710FD
 P 2300 8600
-F 0 "R101" V 2093 8600 50  0000 C CNN
+F 0 "R1" V 2093 8600 50  0000 C CNN
 F 1 "22" V 2184 8600 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric" V 2230 8600 50  0001 C CNN
 F 3 "RMCF0603JT22R0CT-ND" H 2300 8600 50  0001 C CNN
@@ -142,10 +142,10 @@ F 3 "RMCF0603JT22R0CT-ND" H 2300 8600 50  0001 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L Device:R R102
+L Device:R R2
 U 1 1 5B771434
 P 2300 8700
-F 0 "R102" V 2093 8700 50  0000 C CNN
+F 0 "R2" V 2093 8700 50  0000 C CNN
 F 1 "22" V 2184 8700 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric" V 2230 8700 50  0001 C CNN
 F 3 "RMCF0603JT22R0CT-ND" H 2300 8700 50  0001 C CNN
@@ -153,10 +153,10 @@ F 3 "RMCF0603JT22R0CT-ND" H 2300 8700 50  0001 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L Device:C C103
+L Device:C C5
 U 1 1 5B860D38
 P 2750 9050
-F 0 "C103" H 2865 9096 50  0000 L CNN
+F 0 "C5" H 2865 9096 50  0000 L CNN
 F 1 "1u" H 2865 9005 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0603_1608Metric" H 2788 8900 50  0001 C CNN
 F 3 "1276-1235-1-ND" H 2750 9050 50  0001 C CNN
@@ -166,10 +166,10 @@ $EndComp
 Wire Wire Line
 	4200 9700 4550 9700
 $Comp
-L Device:R R103
+L Device:R R4
 U 1 1 5B92CAB7
 P 4700 9700
-F 0 "R103" V 4493 9700 50  0000 C CNN
+F 0 "R4" V 4493 9700 50  0000 C CNN
 F 1 "10k" V 4584 9700 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric" V 4630 9700 50  0001 C CNN
 F 3 "RMCF0603JG10K0CT-ND" H 4700 9700 50  0001 C CNN
@@ -177,10 +177,10 @@ F 3 "RMCF0603JG10K0CT-ND" H 4700 9700 50  0001 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L power:GND #PWR0105
+L power:GND #PWR013
 U 1 1 5B92D2E7
 P 4850 9700
-F 0 "#PWR0105" H 4850 9450 50  0001 C CNN
+F 0 "#PWR013" H 4850 9450 50  0001 C CNN
 F 1 "GND" V 4855 9572 50  0000 R CNN
 F 2 "" H 4850 9700 50  0001 C CNN
 F 3 "" H 4850 9700 50  0001 C CNN
@@ -188,10 +188,10 @@ F 3 "" H 4850 9700 50  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L Device:C C104
+L Device:C C3
 U 1 1 5B92ED0B
 P 2450 5500
-F 0 "C104" H 2565 5546 50  0000 L CNN
+F 0 "C3" H 2565 5546 50  0000 L CNN
 F 1 "0.1u" H 2565 5455 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0603_1608Metric" H 2488 5350 50  0001 C CNN
 F 3 "1276-1511-1-ND" H 2450 5500 50  0001 C CNN
@@ -199,10 +199,10 @@ F 3 "1276-1511-1-ND" H 2450 5500 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C C105
+L Device:C C4
 U 1 1 5B92EF85
 P 2750 5500
-F 0 "C105" H 2865 5546 50  0000 L CNN
+F 0 "C4" H 2865 5546 50  0000 L CNN
 F 1 "0.1u" H 2865 5455 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0603_1608Metric" H 2788 5350 50  0001 C CNN
 F 3 "1276-1511-1-ND" H 2750 5500 50  0001 C CNN
@@ -210,10 +210,10 @@ F 3 "1276-1511-1-ND" H 2750 5500 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C C106
+L Device:C C6
 U 1 1 5B92F1FC
 P 3050 5500
-F 0 "C106" H 3165 5546 50  0000 L CNN
+F 0 "C6" H 3165 5546 50  0000 L CNN
 F 1 "0.1u" H 3165 5455 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0603_1608Metric" H 3088 5350 50  0001 C CNN
 F 3 "1276-1511-1-ND" H 3050 5500 50  0001 C CNN
@@ -221,10 +221,10 @@ F 3 "1276-1511-1-ND" H 3050 5500 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C C107
+L Device:C C7
 U 1 1 5B92F482
 P 3350 5500
-F 0 "C107" H 3465 5546 50  0000 L CNN
+F 0 "C7" H 3465 5546 50  0000 L CNN
 F 1 "0.1u" H 3465 5455 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0603_1608Metric" H 3388 5350 50  0001 C CNN
 F 3 "1276-1511-1-ND" H 3350 5500 50  0001 C CNN
@@ -232,10 +232,10 @@ F 3 "1276-1511-1-ND" H 3350 5500 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C C108
+L Device:C C8
 U 1 1 5B92F70F
 P 3650 5500
-F 0 "C108" H 3765 5546 50  0000 L CNN
+F 0 "C8" H 3765 5546 50  0000 L CNN
 F 1 "4.7u" H 3765 5455 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0603_1608Metric" H 3688 5350 50  0001 C CNN
 F 3 "1276-6684-1-ND" H 3650 5500 50  0001 C CNN
@@ -243,10 +243,10 @@ F 3 "1276-6684-1-ND" H 3650 5500 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:VCC #PWR0107
+L power:VCC #PWR05
 U 1 1 5BB36550
 P 2050 7050
-F 0 "#PWR0107" H 2050 6900 50  0001 C CNN
+F 0 "#PWR05" H 2050 6900 50  0001 C CNN
 F 1 "VCC" V 2068 7177 50  0000 L CNN
 F 2 "" H 2050 7050 50  0001 C CNN
 F 3 "" H 2050 7050 50  0001 C CNN
@@ -254,10 +254,10 @@ F 3 "" H 2050 7050 50  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L power:GND #PWR0108
+L power:GND #PWR06
 U 1 1 5BB36A29
 P 2050 7500
-F 0 "#PWR0108" H 2050 7250 50  0001 C CNN
+F 0 "#PWR06" H 2050 7250 50  0001 C CNN
 F 1 "GND" V 2055 7372 50  0000 R CNN
 F 2 "" H 2050 7500 50  0001 C CNN
 F 3 "" H 2050 7500 50  0001 C CNN
@@ -265,10 +265,10 @@ F 3 "" H 2050 7500 50  0001 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L Switch:SW_Push SW101
+L Switch:SW_Push SW1
 U 1 1 5BB36E8A
 P 2350 7600
-F 0 "SW101" H 2350 7925 50  0000 C CNN
+F 0 "SW1" H 2350 7925 50  0000 C CNN
 F 1 "SW_Push" H 2350 7834 50  0000 C CNN
 F 2 "Button_Switch_SMD:SW_SPST_SKQG_WithoutStem" H 2350 7800 50  0001 C CNN
 F 3 "450-1804-ND " H 2350 7800 50  0001 C CNN
@@ -276,10 +276,10 @@ F 3 "450-1804-ND " H 2350 7800 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:R R104
+L Device:R R3
 U 1 1 5BB3732A
 P 2350 7050
-F 0 "R104" V 2143 7050 50  0000 C CNN
+F 0 "R3" V 2143 7050 50  0000 C CNN
 F 1 "10k" V 2234 7050 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric" V 2280 7050 50  0001 C CNN
 F 3 "RMCF0603JG10K0CT-ND" H 2350 7050 50  0001 C CNN
@@ -289,10 +289,10 @@ $EndComp
 Wire Wire Line
 	2150 7500 2050 7500
 $Comp
-L power:GND #PWR0119
+L power:GND #PWR01
 U 1 1 5BC192AB
 P 1100 9000
-F 0 "#PWR0119" H 1100 8750 50  0001 C CNN
+F 0 "#PWR01" H 1100 8750 50  0001 C CNN
 F 1 "GND" H 1105 8827 50  0000 C CNN
 F 2 "" H 1100 9000 50  0001 C CNN
 F 3 "" H 1100 9000 50  0001 C CNN
@@ -300,10 +300,10 @@ F 3 "" H 1100 9000 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR0103
+L power:GND #PWR010
 U 1 1 5BC19AC1
 P 2750 9200
-F 0 "#PWR0103" H 2750 8950 50  0001 C CNN
+F 0 "#PWR010" H 2750 8950 50  0001 C CNN
 F 1 "GND" H 2755 9027 50  0000 C CNN
 F 2 "" H 2750 9200 50  0001 C CNN
 F 3 "" H 2750 9200 50  0001 C CNN
@@ -319,10 +319,10 @@ Wire Wire Line
 Text Label 4500 2950 0    60   ~ 0
 col1
 $Comp
-L power:VCC #PWR0101
+L power:VCC #PWR07
 U 1 1 5B4FFBC4
 P 2450 5250
-F 0 "#PWR0101" H 2450 5100 50  0001 C CNN
+F 0 "#PWR07" H 2450 5100 50  0001 C CNN
 F 1 "VCC" H 2467 5423 50  0000 C CNN
 F 2 "" H 2450 5250 50  0001 C CNN
 F 3 "" H 2450 5250 50  0001 C CNN
@@ -358,10 +358,10 @@ Connection ~ 2450 5650
 Wire Wire Line
 	2450 5650 2450 5750
 $Comp
-L power:GND #PWR0106
+L power:GND #PWR08
 U 1 1 5B92E6C0
 P 2450 5750
-F 0 "#PWR0106" H 2450 5500 50  0001 C CNN
+F 0 "#PWR08" H 2450 5500 50  0001 C CNN
 F 1 "GND" H 2455 5577 50  0000 C CNN
 F 2 "" H 2450 5750 50  0001 C CNN
 F 3 "" H 2450 5750 50  0001 C CNN
@@ -385,10 +385,10 @@ xtal2
 Wire Wire Line
 	1300 5700 1650 5700
 $Comp
-L power:GND #PWR0102
+L power:GND #PWR02
 U 1 1 5BEBCF61
 P 1300 5800
-F 0 "#PWR0102" H 1300 5550 50  0001 C CNN
+F 0 "#PWR02" H 1300 5550 50  0001 C CNN
 F 1 "GND" H 1305 5627 50  0000 C CNN
 F 2 "" H 1300 5800 50  0001 C CNN
 F 3 "" H 1300 5800 50  0001 C CNN
@@ -398,10 +398,10 @@ $EndComp
 Wire Wire Line
 	2050 7050 2200 7050
 $Comp
-L power:GND #PWR0114
+L power:GND #PWR012
 U 1 1 5BECACF6
 P 3900 10900
-F 0 "#PWR0114" H 3900 10650 50  0001 C CNN
+F 0 "#PWR012" H 3900 10650 50  0001 C CNN
 F 1 "GND" H 3905 10727 50  0000 C CNN
 F 2 "" H 3900 10900 50  0001 C CNN
 F 3 "" H 3900 10900 50  0001 C CNN
@@ -484,10 +484,10 @@ NoConn ~ 4200 10200
 NoConn ~ 4200 10300
 NoConn ~ 4200 10400
 $Comp
-L Switch:SW_Push K_1002
+L Switch:SW_Push K_3
 U 1 1 5C746BFB
 P 4100 3400
-F 0 "K_1002" H 4050 3400 60  0000 C CNN
+F 0 "K_3" H 4050 3400 60  0000 C CNN
 F 1 "KEYSW" H 4100 3300 60  0001 C CNN
 F 2 "Button_Switch_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 4100 3400 60  0001 C CNN
 F 3 "" H 4100 3400 60  0000 C CNN
@@ -495,10 +495,10 @@ F 3 "" H 4100 3400 60  0000 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L Device:D D_1002
+L Device:D D_3
 U 1 1 5C746C02
 P 3750 3550
-F 0 "D_1002" V 3600 3500 60  0000 C CNN
+F 0 "D_3" V 3600 3500 60  0000 C CNN
 F 1 "D" V 3900 3500 60  0001 C CNN
 F 2 "Diode_SMD:D_SOD-123" H 3750 3550 60  0001 C CNN
 F 3 "1N4148WTPMSCT-ND" V 3750 3550 60  0000 C CNN
@@ -506,10 +506,10 @@ F 3 "1N4148WTPMSCT-ND" V 3750 3550 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L Switch:SW_Push K_1003
+L Switch:SW_Push K_4
 U 1 1 5C746C0A
 P 4100 3850
-F 0 "K_1003" H 4050 3850 60  0000 C CNN
+F 0 "K_4" H 4050 3850 60  0000 C CNN
 F 1 "KEYSW" H 4100 3750 60  0001 C CNN
 F 2 "Button_Switch_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 4100 3850 60  0001 C CNN
 F 3 "" H 4100 3850 60  0000 C CNN
@@ -517,10 +517,10 @@ F 3 "" H 4100 3850 60  0000 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L Device:D D_1003
+L Device:D D_4
 U 1 1 5C746C11
 P 3750 4000
-F 0 "D_1003" V 3600 3950 60  0000 C CNN
+F 0 "D_4" V 3600 3950 60  0000 C CNN
 F 1 "D" V 3900 3950 60  0001 C CNN
 F 2 "Diode_SMD:D_SOD-123" H 3750 4000 60  0001 C CNN
 F 3 "1N4148WTPMSCT-ND" V 3750 4000 60  0000 C CNN
@@ -549,10 +549,10 @@ Wire Wire Line
 	3600 10900 3900 10900
 Connection ~ 3600 10900
 $Comp
-L power:PWR_FLAG #FLG0101
+L power:PWR_FLAG #FLG01
 U 1 1 5C7521E0
 P 2500 6400
-F 0 "#FLG0101" H 2500 6475 50  0001 C CNN
+F 0 "#FLG01" H 2500 6475 50  0001 C CNN
 F 1 "PWR_FLAG" H 2500 6574 50  0000 C CNN
 F 2 "" H 2500 6400 50  0001 C CNN
 F 3 "~" H 2500 6400 50  0001 C CNN
@@ -560,10 +560,10 @@ F 3 "~" H 2500 6400 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:VCC #PWR0104
+L power:VCC #PWR09
 U 1 1 5C752551
 P 2500 6400
-F 0 "#PWR0104" H 2500 6250 50  0001 C CNN
+F 0 "#PWR09" H 2500 6250 50  0001 C CNN
 F 1 "VCC" V 2518 6527 50  0000 L CNN
 F 2 "" H 2500 6400 50  0001 C CNN
 F 3 "" H 2500 6400 50  0001 C CNN
@@ -572,10 +572,10 @@ F 3 "" H 2500 6400 50  0001 C CNN
 $EndComp
 NoConn ~ 4200 9100
 $Comp
-L power:VCC #PWR0109
+L power:VCC #PWR011
 U 1 1 5C71534D
 P 3150 7300
-F 0 "#PWR0109" H 3150 7150 50  0001 C CNN
+F 0 "#PWR011" H 3150 7150 50  0001 C CNN
 F 1 "VCC" V 3168 7427 50  0000 L CNN
 F 2 "" H 3150 7300 50  0001 C CNN
 F 3 "" H 3150 7300 50  0001 C CNN
@@ -596,10 +596,10 @@ Wire Wire Line
 Wire Wire Line
 	2150 8700 2000 8700
 $Comp
-L Power_Protection:PRTR5V0U2X D101
+L Power_Protection:PRTR5V0U2X D1
 U 1 1 5C72172F
 P 1850 9700
-F 0 "D101" H 2391 9746 50  0000 L CNN
+F 0 "D1" H 2391 9746 50  0000 L CNN
 F 1 "PRTR5V0U2X" H 2391 9655 50  0000 L CNN
 F 2 "Package_TO_SOT_SMD:SOT-143" H 1910 9700 50  0001 C CNN
 F 3 "https://assets.nexperia.com/documents/data-sheet/PRTR5V0U2X.pdf" H 1910 9700 50  0001 C CNN
@@ -632,10 +632,10 @@ Wire Wire Line
 	1850 8400 3000 8400
 Connection ~ 1850 8400
 $Comp
-L power:GND #PWR0110
+L power:GND #PWR04
 U 1 1 5C72CE56
 P 1850 10200
-F 0 "#PWR0110" H 1850 9950 50  0001 C CNN
+F 0 "#PWR04" H 1850 9950 50  0001 C CNN
 F 1 "GND" H 1855 10027 50  0000 C CNN
 F 2 "" H 1850 10200 50  0001 C CNN
 F 3 "" H 1850 10200 50  0001 C CNN
@@ -643,10 +643,10 @@ F 3 "" H 1850 10200 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:VCC #PWR0111
+L power:VCC #PWR03
 U 1 1 5C72D53C
 P 1850 8400
-F 0 "#PWR0111" H 1850 8250 50  0001 C CNN
+F 0 "#PWR03" H 1850 8250 50  0001 C CNN
 F 1 "VCC" H 1867 8573 50  0000 C CNN
 F 2 "" H 1850 8400 50  0001 C CNN
 F 3 "" H 1850 8400 50  0001 C CNN
@@ -662,10 +662,10 @@ Wire Wire Line
 	4500 2950 4500 3400
 Connection ~ 4500 3400
 $Comp
-L LED:WS2812B D102
+L LED:WS2812B D2
 U 1 1 5C74B12B
 P 6550 3450
-F 0 "D102" H 6891 3496 50  0000 L CNN
+F 0 "D2" H 6891 3496 50  0000 L CNN
 F 1 "WS2812B" H 6891 3405 50  0000 L CNN
 F 2 "LED_SMD:LED_WS2812B_PLCC4_5.0x5.0mm_P3.2mm" H 6600 3150 50  0001 L TNN
 F 3 "https://cdn-shop.adafruit.com/datasheets/WS2812B.pdf" H 6650 3075 50  0001 L TNN
@@ -673,10 +673,10 @@ F 3 "https://cdn-shop.adafruit.com/datasheets/WS2812B.pdf" H 6650 3075 50  0001
 	1    0    0    -1  
 $EndComp
 $Comp
-L LED:WS2812B D103
+L LED:WS2812B D3
 U 1 1 5C74B1D9
 P 6550 4300
-F 0 "D103" H 6891 4346 50  0000 L CNN
+F 0 "D3" H 6891 4346 50  0000 L CNN
 F 1 "WS2812B" H 6891 4255 50  0000 L CNN
 F 2 "LED_SMD:LED_WS2812B_PLCC4_5.0x5.0mm_P3.2mm" H 6600 4000 50  0001 L TNN
 F 3 "https://cdn-shop.adafruit.com/datasheets/WS2812B.pdf" H 6650 3925 50  0001 L TNN
@@ -684,10 +684,10 @@ F 3 "https://cdn-shop.adafruit.com/datasheets/WS2812B.pdf" H 6650 3925 50  0001
 	1    0    0    -1  
 $EndComp
 $Comp
-L LED:WS2812B D104
+L LED:WS2812B D4
 U 1 1 5C74B2C6
 P 7700 3450
-F 0 "D104" H 8041 3496 50  0000 L CNN
+F 0 "D4" H 8041 3496 50  0000 L CNN
 F 1 "WS2812B" H 8041 3405 50  0000 L CNN
 F 2 "LED_SMD:LED_WS2812B_PLCC4_5.0x5.0mm_P3.2mm" H 7750 3150 50  0001 L TNN
 F 3 "https://cdn-shop.adafruit.com/datasheets/WS2812B.pdf" H 7800 3075 50  0001 L TNN
@@ -695,10 +695,10 @@ F 3 "https://cdn-shop.adafruit.com/datasheets/WS2812B.pdf" H 7800 3075 50  0001
 	1    0    0    -1  
 $EndComp
 $Comp
-L LED:WS2812B D105
+L LED:WS2812B D5
 U 1 1 5C74B3EC
 P 7700 4300
-F 0 "D105" H 8041 4346 50  0000 L CNN
+F 0 "D5" H 8041 4346 50  0000 L CNN
 F 1 "WS2812B" H 8041 4255 50  0000 L CNN
 F 2 "LED_SMD:LED_WS2812B_PLCC4_5.0x5.0mm_P3.2mm" H 7750 4000 50  0001 L TNN
 F 3 "https://cdn-shop.adafruit.com/datasheets/WS2812B.pdf" H 7800 3925 50  0001 L TNN
@@ -720,10 +720,10 @@ Connection ~ 6550 4000
 Wire Wire Line
 	6550 4600 7700 4600
 $Comp
-L power:VCC #PWR0112
+L power:VCC #PWR014
 U 1 1 5C75B033
 P 5800 3150
-F 0 "#PWR0112" H 5800 3000 50  0001 C CNN
+F 0 "#PWR014" H 5800 3000 50  0001 C CNN
 F 1 "VCC" V 5818 3277 50  0000 L CNN
 F 2 "" H 5800 3150 50  0001 C CNN
 F 3 "" H 5800 3150 50  0001 C CNN
@@ -731,10 +731,10 @@ F 3 "" H 5800 3150 50  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L power:VCC #PWR0113
+L power:VCC #PWR015
 U 1 1 5C75B103
 P 5800 4000
-F 0 "#PWR0113" H 5800 3850 50  0001 C CNN
+F 0 "#PWR015" H 5800 3850 50  0001 C CNN
 F 1 "VCC" V 5818 4127 50  0000 L CNN
 F 2 "" H 5800 4000 50  0001 C CNN
 F 3 "" H 5800 4000 50  0001 C CNN
@@ -742,10 +742,10 @@ F 3 "" H 5800 4000 50  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L power:GND #PWR0115
+L power:GND #PWR016
 U 1 1 5C75B292
 P 8550 3750
-F 0 "#PWR0115" H 8550 3500 50  0001 C CNN
+F 0 "#PWR016" H 8550 3500 50  0001 C CNN
 F 1 "GND" V 8555 3622 50  0000 R CNN
 F 2 "" H 8550 3750 50  0001 C CNN
 F 3 "" H 8550 3750 50  0001 C CNN
@@ -753,10 +753,10 @@ F 3 "" H 8550 3750 50  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L power:GND #PWR0116
+L power:GND #PWR017
 U 1 1 5C75B328
 P 8550 4600
-F 0 "#PWR0116" H 8550 4350 50  0001 C CNN
+F 0 "#PWR017" H 8550 4350 50  0001 C CNN
 F 1 "GND" V 8555 4472 50  0000 R CNN
 F 2 "" H 8550 4600 50  0001 C CNN
 F 3 "" H 8550 4600 50  0001 C CNN
@@ -789,179 +789,179 @@ Text Label 4200 9000 0    50   ~ 0
 RGBLED
 NoConn ~ 8000 4300
 $Comp
-L Transistor_FET:2N7002 Q101
+L Transistor_FET:2N7002 Q1
 U 1 1 5C76ACFA
-P 7400 6150
-F 0 "Q101" H 7605 6196 50  0000 L CNN
-F 1 "2N7002" H 7605 6105 50  0000 L CNN
-F 2 "Package_TO_SOT_SMD:SOT-23" H 7600 6075 50  0001 L CIN
-F 3 "https://www.fairchildsemi.com/datasheets/2N/2N7002.pdf" H 7400 6150 50  0001 L CNN
-	1    7400 6150
+P 11450 4600
+F 0 "Q1" H 11655 4646 50  0000 L CNN
+F 1 "2N7002" H 11655 4555 50  0000 L CNN
+F 2 "Package_TO_SOT_SMD:SOT-23" H 11650 4525 50  0001 L CIN
+F 3 "https://www.fairchildsemi.com/datasheets/2N/2N7002.pdf" H 11450 4600 50  0001 L CNN
+	1    11450 4600
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR0118
+L power:GND #PWR019
 U 1 1 5C76B038
-P 7500 6350
-F 0 "#PWR0118" H 7500 6100 50  0001 C CNN
-F 1 "GND" H 7505 6177 50  0000 C CNN
-F 2 "" H 7500 6350 50  0001 C CNN
-F 3 "" H 7500 6350 50  0001 C CNN
-	1    7500 6350
+P 11550 4800
+F 0 "#PWR019" H 11550 4550 50  0001 C CNN
+F 1 "GND" H 11555 4627 50  0000 C CNN
+F 2 "" H 11550 4800 50  0001 C CNN
+F 3 "" H 11550 4800 50  0001 C CNN
+	1    11550 4800
 	1    0    0    -1  
 $EndComp
-Text Label 5850 6150 2    50   ~ 0
+Text Label 9900 4600 2    50   ~ 0
 LED
 $Comp
-L Device:LED D106
+L Device:LED D6
 U 1 1 5C76D484
-P 7350 5150
-F 0 "D106" H 7342 4895 50  0000 C CNN
-F 1 "LED" H 7342 4986 50  0000 C CNN
-F 2 "LED_SMD:LED_1206_3216Metric_Castellated" H 7350 5150 50  0001 C CNN
-F 3 "~" H 7350 5150 50  0001 C CNN
-	1    7350 5150
+P 11400 3600
+F 0 "D6" H 11392 3345 50  0000 C CNN
+F 1 "LED" H 11392 3436 50  0000 C CNN
+F 2 "LED_SMD:LED_1206_3216Metric_Castellated" H 11400 3600 50  0001 C CNN
+F 3 "~" H 11400 3600 50  0001 C CNN
+	1    11400 3600
 	-1   0    0    1   
 $EndComp
 $Comp
-L Device:LED D107
+L Device:LED D7
 U 1 1 5C76D590
-P 7350 5550
-F 0 "D107" H 7342 5295 50  0000 C CNN
-F 1 "LED" H 7342 5386 50  0000 C CNN
-F 2 "LED_SMD:LED_1206_3216Metric_Castellated" H 7350 5550 50  0001 C CNN
-F 3 "~" H 7350 5550 50  0001 C CNN
-	1    7350 5550
+P 11400 4000
+F 0 "D7" H 11392 3745 50  0000 C CNN
+F 1 "LED" H 11392 3836 50  0000 C CNN
+F 2 "LED_SMD:LED_1206_3216Metric_Castellated" H 11400 4000 50  0001 C CNN
+F 3 "~" H 11400 4000 50  0001 C CNN
+	1    11400 4000
 	-1   0    0    1   
 $EndComp
 $Comp
-L Device:LED D108
+L Device:LED D8
 U 1 1 5C76F8D8
-P 8250 5150
-F 0 "D108" H 8242 4895 50  0000 C CNN
-F 1 "LED" H 8242 4986 50  0000 C CNN
-F 2 "LED_SMD:LED_1206_3216Metric_Castellated" H 8250 5150 50  0001 C CNN
-F 3 "~" H 8250 5150 50  0001 C CNN
-	1    8250 5150
+P 12300 3600
+F 0 "D8" H 12292 3345 50  0000 C CNN
+F 1 "LED" H 12292 3436 50  0000 C CNN
+F 2 "LED_SMD:LED_1206_3216Metric_Castellated" H 12300 3600 50  0001 C CNN
+F 3 "~" H 12300 3600 50  0001 C CNN
+	1    12300 3600
 	-1   0    0    1   
 $EndComp
 $Comp
-L Device:LED D109
+L Device:LED D9
 U 1 1 5C771C04
-P 8250 5550
-F 0 "D109" H 8242 5295 50  0000 C CNN
-F 1 "LED" H 8242 5386 50  0000 C CNN
-F 2 "LED_SMD:LED_1206_3216Metric_Castellated" H 8250 5550 50  0001 C CNN
-F 3 "~" H 8250 5550 50  0001 C CNN
-	1    8250 5550
+P 12300 4000
+F 0 "D9" H 12292 3745 50  0000 C CNN
+F 1 "LED" H 12292 3836 50  0000 C CNN
+F 2 "LED_SMD:LED_1206_3216Metric_Castellated" H 12300 4000 50  0001 C CNN
+F 3 "~" H 12300 4000 50  0001 C CNN
+	1    12300 4000
 	-1   0    0    1   
 $EndComp
 $Comp
-L Device:R R105
+L Device:R R6
 U 1 1 5C773FDF
-P 7650 5150
-F 0 "R105" V 7443 5150 50  0000 C CNN
-F 1 "1K" V 7534 5150 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 7580 5150 50  0001 C CNN
-F 3 "~" H 7650 5150 50  0001 C CNN
-	1    7650 5150
+P 11700 3600
+F 0 "R6" V 11493 3600 50  0000 C CNN
+F 1 "1K" V 11584 3600 50  0000 C CNN
+F 2 "Resistor_SMD:R_0603_1608Metric" V 11630 3600 50  0001 C CNN
+F 3 "~" H 11700 3600 50  0001 C CNN
+	1    11700 3600
 	0    1    1    0   
 $EndComp
 $Comp
-L Device:R R106
+L Device:R R7
 U 1 1 5C774153
-P 7650 5550
-F 0 "R106" V 7443 5550 50  0000 C CNN
-F 1 "1K" V 7534 5550 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 7580 5550 50  0001 C CNN
-F 3 "~" H 7650 5550 50  0001 C CNN
-	1    7650 5550
+P 11700 4000
+F 0 "R7" V 11493 4000 50  0000 C CNN
+F 1 "1K" V 11584 4000 50  0000 C CNN
+F 2 "Resistor_SMD:R_0603_1608Metric" V 11630 4000 50  0001 C CNN
+F 3 "~" H 11700 4000 50  0001 C CNN
+	1    11700 4000
 	0    1    1    0   
 $EndComp
 $Comp
-L Device:R R107
+L Device:R R8
 U 1 1 5C77647D
-P 8550 5150
-F 0 "R107" V 8343 5150 50  0000 C CNN
-F 1 "1K" V 8434 5150 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 8480 5150 50  0001 C CNN
-F 3 "~" H 8550 5150 50  0001 C CNN
-	1    8550 5150
+P 12600 3600
+F 0 "R8" V 12393 3600 50  0000 C CNN
+F 1 "1K" V 12484 3600 50  0000 C CNN
+F 2 "Resistor_SMD:R_0603_1608Metric" V 12530 3600 50  0001 C CNN
+F 3 "~" H 12600 3600 50  0001 C CNN
+	1    12600 3600
 	0    1    1    0   
 $EndComp
 $Comp
-L Device:R R108
+L Device:R R9
 U 1 1 5C7787A5
-P 8550 5550
-F 0 "R108" V 8343 5550 50  0000 C CNN
-F 1 "1K" V 8434 5550 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 8480 5550 50  0001 C CNN
-F 3 "~" H 8550 5550 50  0001 C CNN
-	1    8550 5550
+P 12600 4000
+F 0 "R9" V 12393 4000 50  0000 C CNN
+F 1 "1K" V 12484 4000 50  0000 C CNN
+F 2 "Resistor_SMD:R_0603_1608Metric" V 12530 4000 50  0001 C CNN
+F 3 "~" H 12600 4000 50  0001 C CNN
+	1    12600 4000
 	0    1    1    0   
 $EndComp
 Wire Wire Line
-	7800 5150 7800 5550
+	11850 3600 11850 4000
 Wire Wire Line
-	7800 5550 7800 5700
-Connection ~ 7800 5550
+	11850 4000 11850 4150
+Connection ~ 11850 4000
 Wire Wire Line
-	8700 5150 8700 5550
-Connection ~ 8700 5550
+	12750 3600 12750 4000
+Connection ~ 12750 4000
 Wire Wire Line
-	8700 5550 8700 5700
+	12750 4000 12750 4150
 Wire Wire Line
-	8100 5550 8100 5150
+	12150 4000 12150 3600
 Wire Wire Line
-	8100 4950 8100 5150
-Connection ~ 8100 5150
+	12150 3400 12150 3600
+Connection ~ 12150 3600
 Wire Wire Line
-	7200 4950 7200 5150
+	11250 3400 11250 3600
 Wire Wire Line
-	7200 5550 7200 5150
-Connection ~ 7200 5150
+	11250 4000 11250 3600
+Connection ~ 11250 3600
 $Comp
-L power:VCC #PWR0117
+L power:VCC #PWR018
 U 1 1 5C79168E
-P 7200 4950
-F 0 "#PWR0117" H 7200 4800 50  0001 C CNN
-F 1 "VCC" H 7217 5123 50  0000 C CNN
-F 2 "" H 7200 4950 50  0001 C CNN
-F 3 "" H 7200 4950 50  0001 C CNN
-	1    7200 4950
+P 11250 3400
+F 0 "#PWR018" H 11250 3250 50  0001 C CNN
+F 1 "VCC" H 11267 3573 50  0000 C CNN
+F 2 "" H 11250 3400 50  0001 C CNN
+F 3 "" H 11250 3400 50  0001 C CNN
+	1    11250 3400
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:VCC #PWR0120
+L power:VCC #PWR020
 U 1 1 5C791722
-P 8100 4950
-F 0 "#PWR0120" H 8100 4800 50  0001 C CNN
-F 1 "VCC" H 8117 5123 50  0000 C CNN
-F 2 "" H 8100 4950 50  0001 C CNN
-F 3 "" H 8100 4950 50  0001 C CNN
-	1    8100 4950
+P 12150 3400
+F 0 "#PWR020" H 12150 3250 50  0001 C CNN
+F 1 "VCC" H 12167 3573 50  0000 C CNN
+F 2 "" H 12150 3400 50  0001 C CNN
+F 3 "" H 12150 3400 50  0001 C CNN
+	1    12150 3400
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	8700 5700 7800 5700
+	12750 4150 11850 4150
 Wire Wire Line
-	7800 5700 7500 5700
+	11850 4150 11550 4150
 Wire Wire Line
-	7500 5700 7500 5950
-Connection ~ 7800 5700
+	11550 4150 11550 4400
+Connection ~ 11850 4150
 $Comp
-L Device:R R109
+L Device:R R5
 U 1 1 5C79762C
-P 7050 6150
-F 0 "R109" V 6843 6150 50  0000 C CNN
-F 1 "1K" V 6934 6150 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 6980 6150 50  0001 C CNN
-F 3 "~" H 7050 6150 50  0001 C CNN
-	1    7050 6150
+P 11100 4600
+F 0 "R5" V 10893 4600 50  0000 C CNN
+F 1 "1K" V 10984 4600 50  0000 C CNN
+F 2 "Resistor_SMD:R_0603_1608Metric" V 11030 4600 50  0001 C CNN
+F 3 "~" H 11100 4600 50  0001 C CNN
+	1    11100 4600
 	0    1    1    0   
 $EndComp
 Wire Wire Line
-	6900 6150 5850 6150
+	10950 4600 9900 4600
 Text Label 4200 8300 0    50   ~ 0
 LED
 $EndSCHEMATC