diff --git a/board/water_level.kicad_pcb b/board/water_level.kicad_pcb
index aafe418..0b6e864 100644
--- a/board/water_level.kicad_pcb
+++ b/board/water_level.kicad_pcb
@@ -3,10 +3,10 @@
   (general
     (thickness 1.6)
     (drawings 64)
-    (tracks 174)
+    (tracks 159)
     (zones 0)
-    (modules 20)
-    (nets 32)
+    (modules 18)
+    (nets 31)
   )
 
   (page A4)
@@ -34,7 +34,7 @@
   )
 
   (setup
-    (last_trace_width 0.635)
+    (last_trace_width 0.254)
     (user_trace_width 0.254)
     (user_trace_width 0.635)
     (user_trace_width 1.016)
@@ -101,32 +101,31 @@
   (net 3 SCL)
   (net 4 SDA)
   (net 5 RESET)
-  (net 6 "Net-(R1-Pad2)")
-  (net 7 "Net-(R3-Pad2)")
-  (net 8 "Net-(R4-Pad2)")
-  (net 9 "Net-(R5-Pad2)")
-  (net 10 "Net-(R6-Pad2)")
-  (net 11 "Net-(R7-Pad2)")
-  (net 12 "Net-(R8-Pad2)")
-  (net 13 "Net-(R9-Pad2)")
-  (net 14 "Net-(R10-Pad2)")
-  (net 15 "Net-(U1-Pad8)")
-  (net 16 "Net-(U1-Pad9)")
-  (net 17 "Net-(U1-Pad14)")
-  (net 18 "Net-(U1-Pad15)")
-  (net 19 "Net-(U1-Pad19)")
-  (net 20 /M12.5)
-  (net 21 /M25.0)
-  (net 22 /M37.5)
-  (net 23 /M50.0)
-  (net 24 /M62.5)
-  (net 25 /M75.0)
-  (net 26 /M87.5)
-  (net 27 /M100.0)
-  (net 28 "Net-(D1-Pad1)")
-  (net 29 "Net-(D1-Pad2)")
-  (net 30 LED_gn)
-  (net 31 LED_rd)
+  (net 6 "Net-(R3-Pad2)")
+  (net 7 "Net-(R4-Pad2)")
+  (net 8 "Net-(R5-Pad2)")
+  (net 9 "Net-(R6-Pad2)")
+  (net 10 "Net-(R7-Pad2)")
+  (net 11 "Net-(R8-Pad2)")
+  (net 12 "Net-(R9-Pad2)")
+  (net 13 "Net-(R10-Pad2)")
+  (net 14 "Net-(U1-Pad8)")
+  (net 15 "Net-(U1-Pad9)")
+  (net 16 "Net-(U1-Pad14)")
+  (net 17 "Net-(U1-Pad15)")
+  (net 18 /M12.5)
+  (net 19 /M25.0)
+  (net 20 /M37.5)
+  (net 21 /M50.0)
+  (net 22 /M62.5)
+  (net 23 /M75.0)
+  (net 24 /M87.5)
+  (net 25 /M100.0)
+  (net 26 "Net-(D1-Pad1)")
+  (net 27 "Net-(D1-Pad2)")
+  (net 28 LED_gn)
+  (net 29 LED_rd)
+  (net 30 USR_BTN)
 
   (net_class Default "Dies ist die voreingestellte Netzklasse."
     (clearance 0.2)
@@ -148,7 +147,6 @@
     (add_net LED_rd)
     (add_net "Net-(D1-Pad1)")
     (add_net "Net-(D1-Pad2)")
-    (add_net "Net-(R1-Pad2)")
     (add_net "Net-(R10-Pad2)")
     (add_net "Net-(R3-Pad2)")
     (add_net "Net-(R4-Pad2)")
@@ -159,51 +157,15 @@
     (add_net "Net-(R9-Pad2)")
     (add_net "Net-(U1-Pad14)")
     (add_net "Net-(U1-Pad15)")
-    (add_net "Net-(U1-Pad19)")
     (add_net "Net-(U1-Pad8)")
     (add_net "Net-(U1-Pad9)")
     (add_net RESET)
     (add_net SCL)
     (add_net SDA)
+    (add_net USR_BTN)
     (add_net VCC)
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5EA1F691)
-    (at 40.386 43.561 270)
-    (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
-    (tags resistor)
-    (path /5EA37762)
-    (attr smd)
-    (fp_text reference R2 (at 0 -1.43 90) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 10k (at 0 1.43 90) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text user %R (at 0 0 90) (layer F.Fab)
-      (effects (font (size 0.4 0.4) (thickness 0.06)))
-    )
-    (fp_line (start 1.48 0.73) (end -1.48 0.73) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.48 -0.73) (end 1.48 0.73) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.48 -0.73) (end 1.48 -0.73) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.48 0.73) (end -1.48 -0.73) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -0.162779 0.51) (end 0.162779 0.51) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.162779 -0.51) (end 0.162779 -0.51) (layer F.SilkS) (width 0.12))
-    (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))
-    (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 roundrect (at 0.7875 0 270) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 1 VCC))
-    (pad 1 smd roundrect (at -0.7875 0 270) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 5 RESET))
-    (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
   (module Connector_JST:JST_PH_S4B-PH-SM4-TB_1x04-1MP_P2.00mm_Horizontal (layer F.Cu) (tedit 5B78AD87) (tstamp 5EA1950B)
     (at 31.75 27.94 270)
     (descr "JST PH series connector, S4B-PH-SM4-TB (http://www.jst-mfg.com/product/pdf/eng/ePH.pdf), generated with kicad-footprint-generator")
@@ -399,42 +361,6 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5EA1AE08)
-    (at 50.546 50.292)
-    (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
-    (tags resistor)
-    (path /5EA37243)
-    (attr smd)
-    (fp_text reference R1 (at 0 -1.43) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 330R (at 0 1.43) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (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))
-    (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))
-    (fp_line (start -0.162779 -0.51) (end 0.162779 -0.51) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.162779 0.51) (end 0.162779 0.51) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.48 0.73) (end -1.48 -0.73) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.48 -0.73) (end 1.48 -0.73) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.48 -0.73) (end 1.48 0.73) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.48 0.73) (end -1.48 0.73) (layer F.CrtYd) (width 0.05))
-    (fp_text user %R (at 0 0) (layer F.Fab)
-      (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 5 RESET))
-    (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 6 "Net-(R1-Pad2)"))
-    (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
   (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5EA195A1)
     (at 34.925 66.04 90)
     (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
@@ -461,9 +387,9 @@
       (effects (font (size 0.4 0.4) (thickness 0.06)))
     )
     (pad 1 smd roundrect (at -0.7875 0 90) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 20 /M12.5))
+      (net 18 /M12.5))
     (pad 2 smd roundrect (at 0.7875 0 90) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 7 "Net-(R3-Pad2)"))
+      (net 6 "Net-(R3-Pad2)"))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -497,9 +423,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 roundrect (at 0.7875 0 90) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 8 "Net-(R4-Pad2)"))
+      (net 7 "Net-(R4-Pad2)"))
     (pad 1 smd roundrect (at -0.7875 0 90) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 21 /M25.0))
+      (net 19 /M25.0))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -533,9 +459,9 @@
       (effects (font (size 0.4 0.4) (thickness 0.06)))
     )
     (pad 1 smd roundrect (at -0.7875 0 90) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 22 /M37.5))
+      (net 20 /M37.5))
     (pad 2 smd roundrect (at 0.7875 0 90) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 9 "Net-(R5-Pad2)"))
+      (net 8 "Net-(R5-Pad2)"))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -569,9 +495,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 roundrect (at 0.7875 0 90) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 10 "Net-(R6-Pad2)"))
+      (net 9 "Net-(R6-Pad2)"))
     (pad 1 smd roundrect (at -0.7875 0 90) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 23 /M50.0))
+      (net 21 /M50.0))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -605,9 +531,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 roundrect (at 0.7875 0 90) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 11 "Net-(R7-Pad2)"))
+      (net 10 "Net-(R7-Pad2)"))
     (pad 1 smd roundrect (at -0.7875 0 90) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 24 /M62.5))
+      (net 22 /M62.5))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -641,9 +567,9 @@
       (effects (font (size 0.4 0.4) (thickness 0.06)))
     )
     (pad 1 smd roundrect (at -0.7875 0 90) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 25 /M75.0))
+      (net 23 /M75.0))
     (pad 2 smd roundrect (at 0.7875 0 90) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 12 "Net-(R8-Pad2)"))
+      (net 11 "Net-(R8-Pad2)"))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -677,9 +603,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 roundrect (at 0.7875 0 90) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 13 "Net-(R9-Pad2)"))
+      (net 12 "Net-(R9-Pad2)"))
     (pad 1 smd roundrect (at -0.7875 0 90) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 26 /M87.5))
+      (net 24 /M87.5))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -713,9 +639,9 @@
       (effects (font (size 0.4 0.4) (thickness 0.06)))
     )
     (pad 1 smd roundrect (at -0.7875 0 90) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 27 /M100.0))
+      (net 25 /M100.0))
     (pad 2 smd roundrect (at 0.7875 0 90) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 14 "Net-(R10-Pad2)"))
+      (net 13 "Net-(R10-Pad2)"))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -732,7 +658,7 @@
     (fp_text reference SW1 (at 0 -4.05 90) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value SW_RESET (at 0 4.15 90) (layer F.Fab)
+    (fp_text value SW_USER (at 0 4.15 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text user %R (at 0 -4.05 90) (layer F.Fab)
@@ -756,13 +682,13 @@
     (fp_line (start -3.23 3.23) (end 3.23 3.23) (layer F.SilkS) (width 0.12))
     (fp_circle (center 0 0) (end 1.75 -0.05) (layer F.Fab) (width 0.1))
     (pad 2 smd rect (at -3.975 2.25 90) (size 1.55 1.3) (layers F.Cu F.Paste F.Mask)
-      (net 6 "Net-(R1-Pad2)"))
+      (net 30 USR_BTN))
     (pad 1 smd rect (at -3.975 -2.25 90) (size 1.55 1.3) (layers F.Cu F.Paste F.Mask)
       (net 2 GND))
     (pad 1 smd rect (at 3.975 -2.25 90) (size 1.55 1.3) (layers F.Cu F.Paste F.Mask)
       (net 2 GND))
     (pad 2 smd rect (at 3.975 2.25 90) (size 1.55 1.3) (layers F.Cu F.Paste F.Mask)
-      (net 6 "Net-(R1-Pad2)"))
+      (net 30 USR_BTN))
     (model ${KISYS3DMOD}/Button_Switch_SMD.3dshapes/SW_PUSH_6mm_H9.5mm.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -806,33 +732,33 @@
     (pad 1 smd roundrect (at -4.65 -5.715 90) (size 2.05 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 1 VCC))
     (pad 2 smd roundrect (at -4.65 -4.445 90) (size 2.05 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 7 "Net-(R3-Pad2)"))
+      (net 6 "Net-(R3-Pad2)"))
     (pad 3 smd roundrect (at -4.65 -3.175 90) (size 2.05 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 8 "Net-(R4-Pad2)"))
+      (net 7 "Net-(R4-Pad2)"))
     (pad 4 smd roundrect (at -4.65 -1.905 90) (size 2.05 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 9 "Net-(R5-Pad2)"))
+      (net 8 "Net-(R5-Pad2)"))
     (pad 5 smd roundrect (at -4.65 -0.635 90) (size 2.05 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 10 "Net-(R6-Pad2)"))
+      (net 9 "Net-(R6-Pad2)"))
     (pad 6 smd roundrect (at -4.65 0.635 90) (size 2.05 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 14 "Net-(R10-Pad2)"))
+      (net 13 "Net-(R10-Pad2)"))
     (pad 7 smd roundrect (at -4.65 1.905 90) (size 2.05 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 13 "Net-(R9-Pad2)"))
+      (net 12 "Net-(R9-Pad2)"))
     (pad 8 smd roundrect (at -4.65 3.175 90) (size 2.05 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 15 "Net-(U1-Pad8)"))
+      (net 14 "Net-(U1-Pad8)"))
     (pad 9 smd roundrect (at -4.65 4.445 90) (size 2.05 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 16 "Net-(U1-Pad9)"))
+      (net 15 "Net-(U1-Pad9)"))
     (pad 10 smd roundrect (at -4.65 5.715 90) (size 2.05 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 12 "Net-(R8-Pad2)"))
+      (net 11 "Net-(R8-Pad2)"))
     (pad 11 smd roundrect (at 4.65 5.715 90) (size 2.05 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 11 "Net-(R7-Pad2)"))
+      (net 10 "Net-(R7-Pad2)"))
     (pad 12 smd roundrect (at 4.65 4.445 90) (size 2.05 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 30 LED_gn))
+      (net 28 LED_gn))
     (pad 13 smd roundrect (at 4.65 3.175 90) (size 2.05 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 31 LED_rd))
+      (net 29 LED_rd))
     (pad 14 smd roundrect (at 4.65 1.905 90) (size 2.05 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 17 "Net-(U1-Pad14)"))
+      (net 16 "Net-(U1-Pad14)"))
     (pad 15 smd roundrect (at 4.65 0.635 90) (size 2.05 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 18 "Net-(U1-Pad15)"))
+      (net 17 "Net-(U1-Pad15)"))
     (pad 16 smd roundrect (at 4.65 -0.635 90) (size 2.05 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 5 RESET))
     (pad 17 smd roundrect (at 4.65 -1.905 90) (size 2.05 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
@@ -840,7 +766,7 @@
     (pad 18 smd roundrect (at 4.65 -3.175 90) (size 2.05 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 3 SCL))
     (pad 19 smd roundrect (at 4.65 -4.445 90) (size 2.05 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 19 "Net-(U1-Pad19)"))
+      (net 30 USR_BTN))
     (pad 20 smd roundrect (at 4.65 -5.715 90) (size 2.05 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 2 GND))
     (model ${KISYS3DMOD}/Package_SO.3dshapes/SOIC-20W_7.5x12.8mm_P1.27mm.wrl
@@ -879,9 +805,9 @@
     (fp_line (start 0.76 -1.58) (end -1.4 -1.58) (layer F.SilkS) (width 0.12))
     (fp_line (start 0.76 1.58) (end -0.7 1.58) (layer F.SilkS) (width 0.12))
     (pad 1 smd rect (at -1 -0.95 270) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
-      (net 28 "Net-(D1-Pad1)"))
+      (net 26 "Net-(D1-Pad1)"))
     (pad 2 smd rect (at -1 0.95 270) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
-      (net 29 "Net-(D1-Pad2)"))
+      (net 27 "Net-(D1-Pad2)"))
     (pad 3 smd rect (at 1 0 270) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
       (net 2 GND))
     (model ${KISYS3DMOD}/Package_TO_SOT_SMD.3dshapes/SOT-23.wrl
@@ -917,9 +843,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 roundrect (at 0.7875 0 270) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 30 LED_gn))
+      (net 28 LED_gn))
     (pad 1 smd roundrect (at -0.7875 0 270) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 29 "Net-(D1-Pad2)"))
+      (net 27 "Net-(D1-Pad2)"))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -953,9 +879,9 @@
       (effects (font (size 0.4 0.4) (thickness 0.06)))
     )
     (pad 1 smd roundrect (at -0.7875 0 270) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 28 "Net-(D1-Pad1)"))
+      (net 26 "Net-(D1-Pad1)"))
     (pad 2 smd roundrect (at 0.7875 0 270) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 31 LED_rd))
+      (net 29 LED_rd))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1138,15 +1064,6 @@
   (gr_line (start 25.4 76.2) (end 30.48 76.2) (layer Edge.Cuts) (width 0.05))
   (gr_line (start 25.4 20.32) (end 25.4 76.2) (layer Edge.Cuts) (width 0.05))
 
-  (segment (start 53 184) (end 28 184) (width 3) (layer F.Cu) (net 21))
-  (segment (start 28 180) (end 38.694 180) (width 3) (layer F.Cu) (net 22))
-  (segment (start 53 176) (end 28 176) (width 3) (layer F.Cu) (net 23))
-  (segment (start 28 172) (end 53 172) (width 3) (layer F.Cu) (net 24))
-  (segment (start 28 168) (end 53 168) (width 3) (layer F.Cu) (net 25) (tstamp 5EA1E85C))
-  (segment (start 28 164) (end 53 164) (width 3) (layer F.Cu) (net 26) (tstamp 5EA1E85C))
-  (segment (start 28 160) (end 53 160) (width 3) (layer F.Cu) (net 27) (tstamp 5EA1E85C))
-  (segment (start 34.925 187.96) (end 34.925 187.96) (width 0.254) (layer F.Cu) (net 20) (tstamp 5EA1E8D2))
-  (via (at 34.925 187.96) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 20))
   (segment (start 48.41 36.195) (end 44.958 36.195) (width 0.635) (layer F.Cu) (net 1))
   (segment (start 44.958 36.195) (end 44.069 37.084) (width 0.635) (layer F.Cu) (net 1))
   (segment (start 34.036 59.641) (end 35.56 61.165) (width 0.635) (layer F.Cu) (net 1))
@@ -1168,9 +1085,6 @@
   (via (at 33.274 54.102) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 1))
   (segment (start 33.274 56.642) (end 34.036 57.404) (width 0.635) (layer F.Cu) (net 1))
   (segment (start 33.274 54.102) (end 33.274 56.642) (width 0.635) (layer F.Cu) (net 1))
-  (segment (start 40.087 45.085) (end 40.386 44.786) (width 0.254) (layer F.Cu) (net 1))
-  (segment (start 40.386 44.786) (end 40.386 44.3485) (width 0.254) (layer F.Cu) (net 1))
-  (segment (start 37.465 45.085) (end 40.087 45.085) (width 0.254) (layer F.Cu) (net 1))
   (segment (start 34.6 24.94) (end 36.35 24.94) (width 1.016) (layer F.Cu) (net 1))
   (segment (start 36.35 24.94) (end 46.68 24.94) (width 1.016) (layer F.Cu) (net 1))
   (segment (start 34.036 59.82) (end 34.036 59.641) (width 0.635) (layer F.Cu) (net 1))
@@ -1205,113 +1119,110 @@
   (segment (start 48.43 28.94) (end 46.68 28.94) (width 0.254) (layer F.Cu) (net 4))
   (segment (start 49.022 29.532) (end 48.43 28.94) (width 0.254) (layer F.Cu) (net 4))
   (segment (start 49.022 34.036) (end 49.022 29.532) (width 0.254) (layer F.Cu) (net 4))
-  (segment (start 40.64 51.865) (end 40.64 50.598148) (width 0.254) (layer F.Cu) (net 5))
-  (segment (start 37.465 42.545) (end 34.036 45.974) (width 0.254) (layer F.Cu) (net 5))
-  (segment (start 34.036 45.974) (end 34.036 52.832) (width 0.254) (layer F.Cu) (net 5))
-  (segment (start 34.036 52.832) (end 35.306 54.102) (width 0.254) (layer F.Cu) (net 5))
-  (segment (start 40.64 52.89) (end 40.64 51.865) (width 0.254) (layer F.Cu) (net 5))
-  (segment (start 39.428 54.102) (end 40.64 52.89) (width 0.254) (layer F.Cu) (net 5))
-  (segment (start 35.306 54.102) (end 39.428 54.102) (width 0.254) (layer F.Cu) (net 5))
-  (segment (start 40.946148 50.292) (end 42.418 50.292) (width 0.254) (layer F.Cu) (net 5))
-  (segment (start 40.64 50.598148) (end 40.946148 50.292) (width 0.254) (layer F.Cu) (net 5))
-  (segment (start 49.7585 50.292) (end 42.418 50.292) (width 0.254) (layer F.Cu) (net 5))
-  (segment (start 42.418 50.292) (end 42.261734 50.292) (width 0.254) (layer F.Cu) (net 5))
-  (segment (start 40.1575 42.545) (end 40.386 42.7735) (width 0.254) (layer F.Cu) (net 5))
-  (segment (start 37.465 42.545) (end 40.1575 42.545) (width 0.254) (layer F.Cu) (net 5))
-  (segment (start 51.145 38.57) (end 51.145 46.52) (width 0.254) (layer F.Cu) (net 6))
-  (segment (start 51.3335 46.7085) (end 51.145 46.52) (width 0.254) (layer F.Cu) (net 6))
-  (segment (start 51.3335 50.292) (end 51.3335 46.7085) (width 0.254) (layer F.Cu) (net 6))
-  (segment (start 34.925 66.8275) (end 34.925 72.39) (width 0.254) (layer F.Cu) (net 20))
-  (via (at 34.925 72.39) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 20))
-  (segment (start 34.925 72.39) (end 34.925 187.96) (width 0.254) (layer B.Cu) (net 20))
-  (segment (start 34.925 187.96) (end 34.925 187.96) (width 0.254) (layer F.Cu) (net 20) (tstamp 5EA1E8DA))
-  (via (at 34.925 187.96) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 20))
-  (segment (start 34.925 187.96) (end 27.94 187.96) (width 3) (layer F.Cu) (net 20))
-  (segment (start 34.925 187.96) (end 52.96 187.96) (width 3) (layer F.Cu) (net 20))
-  (segment (start 35.4 65.2525) (end 34.925 65.2525) (width 0.254) (layer F.Cu) (net 7))
-  (segment (start 36.83 63.8225) (end 35.4 65.2525) (width 0.254) (layer F.Cu) (net 7))
-  (segment (start 36.83 61.165) (end 36.83 63.8225) (width 0.254) (layer F.Cu) (net 7))
-  (segment (start 37.8 61.465) (end 37.8 64.054) (width 0.254) (layer F.Cu) (net 8))
-  (segment (start 38.1 61.165) (end 37.8 61.465) (width 0.254) (layer F.Cu) (net 8))
-  (segment (start 36.83 65.024) (end 36.83 68.4275) (width 0.254) (layer F.Cu) (net 8))
-  (segment (start 37.8 64.054) (end 36.83 65.024) (width 0.254) (layer F.Cu) (net 8))
-  (segment (start 36.83 70.0025) (end 36.83 72.39) (width 0.254) (layer F.Cu) (net 21))
-  (via (at 36.83 72.39) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 21))
-  (segment (start 36.83 72.39) (end 36.83 183.896) (width 0.254) (layer B.Cu) (net 21))
-  (segment (start 38.735 66.8275) (end 38.735 72.39) (width 0.254) (layer F.Cu) (net 22))
-  (via (at 38.735 72.39) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 22))
-  (segment (start 38.735 72.39) (end 38.735 179.959) (width 0.254) (layer B.Cu) (net 22))
-  (segment (start 39.21 65.2525) (end 38.735 65.2525) (width 0.254) (layer F.Cu) (net 9))
-  (segment (start 39.37 65.0925) (end 39.21 65.2525) (width 0.254) (layer F.Cu) (net 9))
-  (segment (start 39.37 61.165) (end 39.37 65.0925) (width 0.254) (layer F.Cu) (net 9))
-  (segment (start 40.64 61.165) (end 40.64 68.4275) (width 0.254) (layer F.Cu) (net 10))
-  (segment (start 40.64 70.0025) (end 40.64 70.44) (width 0.254) (layer F.Cu) (net 23))
-  (segment (start 40.64 70.44) (end 40.64 72.39) (width 0.254) (layer F.Cu) (net 23))
-  (via (at 40.64 72.39) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 23))
-  (segment (start 40.64 72.39) (end 40.64 176.022) (width 0.254) (layer B.Cu) (net 23))
-  (segment (start 46.99 51.865) (end 46.99 57.912) (width 0.254) (layer F.Cu) (net 11))
-  (segment (start 48.26 59.182) (end 48.26 68.4275) (width 0.254) (layer F.Cu) (net 11))
-  (segment (start 46.99 57.912) (end 48.26 59.182) (width 0.254) (layer F.Cu) (net 11))
-  (segment (start 48.26 70.0025) (end 48.26 72.39) (width 0.254) (layer F.Cu) (net 24))
-  (via (at 48.26 72.39) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 24))
-  (segment (start 46.99 61.165) (end 46.99 64.008) (width 0.254) (layer F.Cu) (net 12))
-  (segment (start 46.355 64.643) (end 46.355 65.2525) (width 0.254) (layer F.Cu) (net 12))
-  (segment (start 46.99 64.008) (end 46.355 64.643) (width 0.254) (layer F.Cu) (net 12))
-  (segment (start 44.45 65.278) (end 44.45 68.4275) (width 0.254) (layer F.Cu) (net 13))
-  (segment (start 43.18 61.165) (end 43.18 64.008) (width 0.254) (layer F.Cu) (net 13))
-  (segment (start 43.18 64.008) (end 44.45 65.278) (width 0.254) (layer F.Cu) (net 13))
-  (segment (start 44.45 70.0025) (end 44.45 70.44) (width 0.254) (layer F.Cu) (net 26))
-  (segment (start 44.45 70.0025) (end 44.45 72.39) (width 0.254) (layer F.Cu) (net 26))
-  (via (at 44.45 72.39) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 26))
-  (segment (start 42.545 64.643) (end 42.545 65.2525) (width 0.254) (layer F.Cu) (net 14))
-  (segment (start 41.91 61.165) (end 41.91 64.008) (width 0.254) (layer F.Cu) (net 14))
-  (segment (start 41.91 64.008) (end 42.545 64.643) (width 0.254) (layer F.Cu) (net 14))
-  (segment (start 36.83 183.896) (end 36.83 183.896) (width 0.254) (layer B.Cu) (net 21) (tstamp 5EA1EAC9))
-  (via (at 36.83 183.896) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 21))
-  (segment (start 38.694 180) (end 53 180) (width 3) (layer F.Cu) (net 22) (tstamp 5EA1EACB))
-  (via (at 38.694 180) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 22))
-  (segment (start 40.64 176.022) (end 40.64 176.022) (width 0.254) (layer B.Cu) (net 23) (tstamp 5EA1EACD))
-  (via (at 40.64 176.022) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 23))
-  (segment (start 48.26 72.39) (end 48.26 171.958) (width 0.254) (layer B.Cu) (net 24))
-  (segment (start 48.26 171.958) (end 48.26 171.958) (width 0.254) (layer B.Cu) (net 24) (tstamp 5EA1EACF))
-  (via (at 48.26 171.958) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 24))
-  (via (at 46.355 72.39) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 25))
-  (segment (start 46.355 66.8275) (end 46.355 72.39) (width 0.254) (layer F.Cu) (net 25))
-  (segment (start 46.355 72.39) (end 46.355 167.767) (width 0.254) (layer B.Cu) (net 25))
-  (segment (start 46.355 167.767) (end 46.355 167.767) (width 0.254) (layer B.Cu) (net 25) (tstamp 5EA1EAD1))
-  (via (at 46.355 167.767) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 25))
-  (segment (start 44.45 72.39) (end 44.45 164.084) (width 0.254) (layer B.Cu) (net 26))
-  (segment (start 44.45 164.084) (end 44.45 164.084) (width 0.254) (layer B.Cu) (net 26) (tstamp 5EA1EAD3))
-  (via (at 44.45 164.084) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 26))
-  (via (at 42.545 72.39) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 27))
-  (segment (start 42.545 66.8275) (end 42.545 72.39) (width 0.254) (layer F.Cu) (net 27))
-  (segment (start 42.545 72.39) (end 42.545 160.147) (width 0.254) (layer B.Cu) (net 27))
-  (segment (start 42.545 160.147) (end 42.545 160.147) (width 0.254) (layer B.Cu) (net 27) (tstamp 5EA1EAD5))
-  (via (at 42.545 160.147) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 27))
-  (segment (start 41.6155 21.3105) (end 41.59 21.336) (width 0.254) (layer F.Cu) (net 28))
-  (segment (start 43.434 21.3105) (end 41.6155 21.3105) (width 0.254) (layer F.Cu) (net 28))
-  (segment (start 39.6645 21.3105) (end 39.69 21.336) (width 0.254) (layer F.Cu) (net 29))
-  (segment (start 37.846 21.3105) (end 39.6645 21.3105) (width 0.254) (layer F.Cu) (net 29))
-  (segment (start 37.846 22.8855) (end 36.6015 22.8855) (width 0.254) (layer F.Cu) (net 30))
-  (via (at 36.449 22.733) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 30))
-  (segment (start 36.6015 22.8855) (end 36.449 22.733) (width 0.254) (layer F.Cu) (net 30))
-  (segment (start 36.449 22.733) (end 45.72 32.004) (width 0.254) (layer B.Cu) (net 30))
-  (segment (start 45.72 32.004) (end 47.117 33.401) (width 0.254) (layer B.Cu) (net 30))
-  (segment (start 47.117 33.401) (end 48.26 34.544) (width 0.254) (layer B.Cu) (net 30))
-  (segment (start 48.26 34.544) (end 48.26 53.213) (width 0.254) (layer B.Cu) (net 30))
-  (via (at 45.72 55.753) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 30))
-  (segment (start 48.26 53.213) (end 45.72 55.753) (width 0.254) (layer B.Cu) (net 30))
-  (segment (start 45.72 55.753) (end 45.72 51.865) (width 0.254) (layer F.Cu) (net 30))
-  (via (at 45.593 57.404) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 31))
-  (segment (start 44.45 51.865) (end 44.45 56.261) (width 0.254) (layer F.Cu) (net 31))
-  (segment (start 44.45 56.261) (end 45.593 57.404) (width 0.254) (layer F.Cu) (net 31))
-  (segment (start 46.158685 57.404) (end 49.276 54.286685) (width 0.254) (layer B.Cu) (net 31))
-  (segment (start 45.593 57.404) (end 46.158685 57.404) (width 0.254) (layer B.Cu) (net 31))
-  (segment (start 49.276 54.286685) (end 49.276 26.035) (width 0.254) (layer B.Cu) (net 31))
-  (via (at 46.228 22.987) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 31))
-  (segment (start 49.276 26.035) (end 46.228 22.987) (width 0.254) (layer B.Cu) (net 31))
-  (segment (start 43.5355 22.987) (end 43.434 22.8855) (width 0.254) (layer F.Cu) (net 31))
-  (segment (start 46.228 22.987) (end 43.5355 22.987) (width 0.254) (layer F.Cu) (net 31))
+  (segment (start 40.64 50.84) (end 42.545 48.935) (width 0.254) (layer F.Cu) (net 5))
+  (segment (start 40.64 51.865) (end 40.64 50.84) (width 0.254) (layer F.Cu) (net 5))
+  (via (at 42.545 48.935) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 5))
+  (segment (start 51.145 38.57) (end 51.145 46.52) (width 0.254) (layer F.Cu) (net 30))
+  (segment (start 35.4 65.2525) (end 34.925 65.2525) (width 0.254) (layer F.Cu) (net 6))
+  (segment (start 36.83 63.8225) (end 35.4 65.2525) (width 0.254) (layer F.Cu) (net 6))
+  (segment (start 36.83 61.165) (end 36.83 63.8225) (width 0.254) (layer F.Cu) (net 6))
+  (segment (start 37.8 61.465) (end 37.8 64.054) (width 0.254) (layer F.Cu) (net 7))
+  (segment (start 38.1 61.165) (end 37.8 61.465) (width 0.254) (layer F.Cu) (net 7))
+  (segment (start 36.83 65.024) (end 36.83 68.4275) (width 0.254) (layer F.Cu) (net 7))
+  (segment (start 37.8 64.054) (end 36.83 65.024) (width 0.254) (layer F.Cu) (net 7))
+  (segment (start 39.21 65.2525) (end 38.735 65.2525) (width 0.254) (layer F.Cu) (net 8))
+  (segment (start 39.37 65.0925) (end 39.21 65.2525) (width 0.254) (layer F.Cu) (net 8))
+  (segment (start 39.37 61.165) (end 39.37 65.0925) (width 0.254) (layer F.Cu) (net 8))
+  (segment (start 40.64 61.165) (end 40.64 68.4275) (width 0.254) (layer F.Cu) (net 9))
+  (segment (start 46.99 51.865) (end 46.99 57.912) (width 0.254) (layer F.Cu) (net 10))
+  (segment (start 48.26 59.182) (end 48.26 68.4275) (width 0.254) (layer F.Cu) (net 10))
+  (segment (start 46.99 57.912) (end 48.26 59.182) (width 0.254) (layer F.Cu) (net 10))
+  (segment (start 46.99 61.165) (end 46.99 64.008) (width 0.254) (layer F.Cu) (net 11))
+  (segment (start 46.355 64.643) (end 46.355 65.2525) (width 0.254) (layer F.Cu) (net 11))
+  (segment (start 46.99 64.008) (end 46.355 64.643) (width 0.254) (layer F.Cu) (net 11))
+  (segment (start 44.45 65.278) (end 44.45 68.4275) (width 0.254) (layer F.Cu) (net 12))
+  (segment (start 43.18 61.165) (end 43.18 64.008) (width 0.254) (layer F.Cu) (net 12))
+  (segment (start 43.18 64.008) (end 44.45 65.278) (width 0.254) (layer F.Cu) (net 12))
+  (segment (start 42.545 64.643) (end 42.545 65.2525) (width 0.254) (layer F.Cu) (net 13))
+  (segment (start 41.91 61.165) (end 41.91 64.008) (width 0.254) (layer F.Cu) (net 13))
+  (segment (start 41.91 64.008) (end 42.545 64.643) (width 0.254) (layer F.Cu) (net 13))
+  (segment (start 34.925 187.96) (end 34.925 187.96) (width 0.254) (layer F.Cu) (net 18) (tstamp 5EA1E8D2))
+  (via (at 34.925 187.96) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 18))
+  (segment (start 34.925 66.8275) (end 34.925 72.39) (width 0.254) (layer F.Cu) (net 18))
+  (via (at 34.925 72.39) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 18))
+  (segment (start 34.925 72.39) (end 34.925 187.96) (width 0.254) (layer B.Cu) (net 18))
+  (segment (start 34.925 187.96) (end 34.925 187.96) (width 0.254) (layer F.Cu) (net 18) (tstamp 5EA1E8DA))
+  (via (at 34.925 187.96) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 18))
+  (segment (start 34.925 187.96) (end 27.94 187.96) (width 3) (layer F.Cu) (net 18))
+  (segment (start 34.925 187.96) (end 52.96 187.96) (width 3) (layer F.Cu) (net 18))
+  (segment (start 53 184) (end 28 184) (width 3) (layer F.Cu) (net 19))
+  (segment (start 36.83 70.0025) (end 36.83 72.39) (width 0.254) (layer F.Cu) (net 19))
+  (via (at 36.83 72.39) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 19))
+  (segment (start 36.83 72.39) (end 36.83 183.896) (width 0.254) (layer B.Cu) (net 19))
+  (segment (start 36.83 183.896) (end 36.83 183.896) (width 0.254) (layer B.Cu) (net 19) (tstamp 5EA1EAC9))
+  (via (at 36.83 183.896) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 19))
+  (segment (start 28 180) (end 38.694 180) (width 3) (layer F.Cu) (net 20))
+  (segment (start 38.735 66.8275) (end 38.735 72.39) (width 0.254) (layer F.Cu) (net 20))
+  (via (at 38.735 72.39) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 20))
+  (segment (start 38.735 72.39) (end 38.735 179.959) (width 0.254) (layer B.Cu) (net 20))
+  (segment (start 38.694 180) (end 53 180) (width 3) (layer F.Cu) (net 20) (tstamp 5EA1EACB))
+  (via (at 38.694 180) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 20))
+  (segment (start 53 176) (end 28 176) (width 3) (layer F.Cu) (net 21))
+  (segment (start 40.64 70.0025) (end 40.64 70.44) (width 0.254) (layer F.Cu) (net 21))
+  (segment (start 40.64 70.44) (end 40.64 72.39) (width 0.254) (layer F.Cu) (net 21))
+  (via (at 40.64 72.39) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 21))
+  (segment (start 40.64 72.39) (end 40.64 176.022) (width 0.254) (layer B.Cu) (net 21))
+  (segment (start 40.64 176.022) (end 40.64 176.022) (width 0.254) (layer B.Cu) (net 21) (tstamp 5EA1EACD))
+  (via (at 40.64 176.022) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 21))
+  (segment (start 28 172) (end 53 172) (width 3) (layer F.Cu) (net 22))
+  (segment (start 48.26 70.0025) (end 48.26 72.39) (width 0.254) (layer F.Cu) (net 22))
+  (via (at 48.26 72.39) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 22))
+  (segment (start 48.26 72.39) (end 48.26 171.958) (width 0.254) (layer B.Cu) (net 22))
+  (segment (start 48.26 171.958) (end 48.26 171.958) (width 0.254) (layer B.Cu) (net 22) (tstamp 5EA1EACF))
+  (via (at 48.26 171.958) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 22))
+  (segment (start 28 168) (end 53 168) (width 3) (layer F.Cu) (net 23) (tstamp 5EA1E85C))
+  (via (at 46.355 72.39) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 23))
+  (segment (start 46.355 66.8275) (end 46.355 72.39) (width 0.254) (layer F.Cu) (net 23))
+  (segment (start 46.355 72.39) (end 46.355 167.767) (width 0.254) (layer B.Cu) (net 23))
+  (segment (start 46.355 167.767) (end 46.355 167.767) (width 0.254) (layer B.Cu) (net 23) (tstamp 5EA1EAD1))
+  (via (at 46.355 167.767) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 23))
+  (segment (start 28 164) (end 53 164) (width 3) (layer F.Cu) (net 24) (tstamp 5EA1E85C))
+  (segment (start 44.45 70.0025) (end 44.45 70.44) (width 0.254) (layer F.Cu) (net 24))
+  (segment (start 44.45 70.0025) (end 44.45 72.39) (width 0.254) (layer F.Cu) (net 24))
+  (via (at 44.45 72.39) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 24))
+  (segment (start 44.45 72.39) (end 44.45 164.084) (width 0.254) (layer B.Cu) (net 24))
+  (segment (start 44.45 164.084) (end 44.45 164.084) (width 0.254) (layer B.Cu) (net 24) (tstamp 5EA1EAD3))
+  (via (at 44.45 164.084) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 24))
+  (segment (start 28 160) (end 53 160) (width 3) (layer F.Cu) (net 25) (tstamp 5EA1E85C))
+  (via (at 42.545 72.39) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 25))
+  (segment (start 42.545 66.8275) (end 42.545 72.39) (width 0.254) (layer F.Cu) (net 25))
+  (segment (start 42.545 72.39) (end 42.545 160.147) (width 0.254) (layer B.Cu) (net 25))
+  (segment (start 42.545 160.147) (end 42.545 160.147) (width 0.254) (layer B.Cu) (net 25) (tstamp 5EA1EAD5))
+  (via (at 42.545 160.147) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 25))
+  (segment (start 41.6155 21.3105) (end 41.59 21.336) (width 0.254) (layer F.Cu) (net 26))
+  (segment (start 43.434 21.3105) (end 41.6155 21.3105) (width 0.254) (layer F.Cu) (net 26))
+  (segment (start 39.6645 21.3105) (end 39.69 21.336) (width 0.254) (layer F.Cu) (net 27))
+  (segment (start 37.846 21.3105) (end 39.6645 21.3105) (width 0.254) (layer F.Cu) (net 27))
+  (segment (start 37.846 22.8855) (end 36.6015 22.8855) (width 0.254) (layer F.Cu) (net 28))
+  (via (at 36.449 22.733) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 28))
+  (segment (start 36.6015 22.8855) (end 36.449 22.733) (width 0.254) (layer F.Cu) (net 28))
+  (segment (start 36.449 22.733) (end 45.72 32.004) (width 0.254) (layer B.Cu) (net 28))
+  (segment (start 45.72 32.004) (end 47.117 33.401) (width 0.254) (layer B.Cu) (net 28))
+  (segment (start 47.117 33.401) (end 48.26 34.544) (width 0.254) (layer B.Cu) (net 28))
+  (segment (start 48.26 34.544) (end 48.26 53.213) (width 0.254) (layer B.Cu) (net 28))
+  (via (at 45.72 55.753) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 28))
+  (segment (start 48.26 53.213) (end 45.72 55.753) (width 0.254) (layer B.Cu) (net 28))
+  (segment (start 45.72 55.753) (end 45.72 51.865) (width 0.254) (layer F.Cu) (net 28))
+  (via (at 45.593 57.404) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 29))
+  (segment (start 44.45 51.865) (end 44.45 56.261) (width 0.254) (layer F.Cu) (net 29))
+  (segment (start 44.45 56.261) (end 45.593 57.404) (width 0.254) (layer F.Cu) (net 29))
+  (segment (start 46.158685 57.404) (end 49.276 54.286685) (width 0.254) (layer B.Cu) (net 29))
+  (segment (start 45.593 57.404) (end 46.158685 57.404) (width 0.254) (layer B.Cu) (net 29))
+  (segment (start 49.276 54.286685) (end 49.276 26.035) (width 0.254) (layer B.Cu) (net 29))
+  (via (at 46.228 22.987) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 29))
+  (segment (start 49.276 26.035) (end 46.228 22.987) (width 0.254) (layer B.Cu) (net 29))
+  (segment (start 43.5355 22.987) (end 43.434 22.8855) (width 0.254) (layer F.Cu) (net 29))
+  (segment (start 46.228 22.987) (end 43.5355 22.987) (width 0.254) (layer F.Cu) (net 29))
 
   (zone (net 2) (net_name GND) (layer F.Cu) (tstamp 5EA2550B) (hatch edge 0.508)
     (connect_pads (clearance 0.254))
diff --git a/board/water_level.kicad_pcb-bak b/board/water_level.kicad_pcb-bak
index 75bc7b5..aafe418 100644
--- a/board/water_level.kicad_pcb-bak
+++ b/board/water_level.kicad_pcb-bak
@@ -2,7 +2,7 @@
 
   (general
     (thickness 1.6)
-    (drawings 63)
+    (drawings 64)
     (tracks 174)
     (zones 0)
     (modules 20)
@@ -92,7 +92,7 @@
       (mirror false)
       (drillshape 0)
       (scaleselection 1)
-      (outputdirectory ""))
+      (outputdirectory "/home/moritz/Projekte/water_level/"))
   )
 
   (net 0 "")
@@ -1035,6 +1035,9 @@
     )
   )
 
+  (gr_text JLCJLCJLCJLC (at 53.086 61.468 90) (layer F.SilkS)
+    (effects (font (size 1.5 1.5) (thickness 0.3)))
+  )
   (gr_text "Water Level Detector 2-30mm\n(c) Moritz Martinius\nmoritz@admiralackbar.de\nr1" (at 40 115) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
   )
diff --git a/board/water_level.net b/board/water_level.net
index 6e4a1e1..91460ff 100644
--- a/board/water_level.net
+++ b/board/water_level.net
@@ -1,7 +1,7 @@
 (export (version D)
   (design
-    (source /home/moritz/Projekte/water_level/water_level.sch)
-    (date "Do 23 Apr 2020 18:36:17 CEST")
+    (source /home/moritz/Projekte/water_level/board/water_level.sch)
+    (date "So 10 Mai 2020 11:34:49 CEST")
     (tool "Eeschema 5.1.5")
     (sheet (number 1) (name /) (tstamps /)
       (title_block
@@ -61,32 +61,14 @@
       (sheetpath (names /) (tstamps /))
       (tstamp 5EA2D9A9))
     (comp (ref SW1)
-      (value SW_RESET)
-      (footprint Button_Switch_SMD:SW_Push_1P1T_NO_6x6mm_H9.5mm)
+      (value SW_USER)
+      (footprint Button_Switch_SMD:SW_Push_1P1T_NO_6x6mm_H9.5m)
       (datasheet https://docs.rs-online.com/ea14/0900766b81527507.pdf)
       (fields
         (field (name Source) https://de.rs-online.com/web/p/tastschalter/4791491/))
       (libsource (lib Switch) (part SW_Push) (description "Push button switch, generic, two pins"))
       (sheetpath (names /) (tstamps /))
       (tstamp 5EA35658))
-    (comp (ref R1)
-      (value 330R)
-      (footprint Resistor_SMD:R_0603_1608Metric)
-      (datasheet https://docs.rs-online.com/236a/0900766b80d98afc.pdf)
-      (fields
-        (field (name Source) https://de.rs-online.com/web/p/smd-widerstande/6790226/))
-      (libsource (lib Device) (part R) (description Resistor))
-      (sheetpath (names /) (tstamps /))
-      (tstamp 5EA37243))
-    (comp (ref R2)
-      (value 10k)
-      (footprint Resistor_SMD:R_0603_1608Metric)
-      (datasheet https://docs.rs-online.com/236a/0900766b80d98afc.pdf)
-      (fields
-        (field (name Source) https://de.rs-online.com/web/p/smd-widerstande/6789667/))
-      (libsource (lib Device) (part R) (description Resistor))
-      (sheetpath (names /) (tstamps /))
-      (tstamp 5EA37762))
     (comp (ref J3)
       (value uPDI)
       (footprint Connector_PinHeader_2.54mm:PinHeader_1x03_P2.54mm_Horizontal)
@@ -370,106 +352,101 @@
     (library (logical Switch)
       (uri /usr/share/kicad/library/Switch.lib)))
   (nets
-    (net (code 1) (name "Net-(R6-Pad2)")
-      (node (ref U1) (pin 5))
-      (node (ref R6) (pin 2)))
-    (net (code 2) (name "Net-(R9-Pad2)")
-      (node (ref U1) (pin 7))
-      (node (ref R9) (pin 2)))
-    (net (code 3) (name "Net-(R10-Pad2)")
-      (node (ref R10) (pin 2))
-      (node (ref U1) (pin 6)))
-    (net (code 4) (name "Net-(R3-Pad2)")
-      (node (ref R3) (pin 2))
-      (node (ref U1) (pin 2)))
-    (net (code 5) (name "Net-(R4-Pad2)")
+    (net (code 1) (name "Net-(R9-Pad2)")
+      (node (ref R9) (pin 2))
+      (node (ref U1) (pin 7)))
+    (net (code 2) (name "Net-(R4-Pad2)")
       (node (ref R4) (pin 2))
       (node (ref U1) (pin 3)))
-    (net (code 6) (name "Net-(R5-Pad2)")
+    (net (code 3) (name "Net-(R5-Pad2)")
       (node (ref R5) (pin 2))
       (node (ref U1) (pin 4)))
-    (net (code 7) (name "Net-(R8-Pad2)")
-      (node (ref R8) (pin 2))
-      (node (ref U1) (pin 10)))
-    (net (code 8) (name "Net-(R7-Pad2)")
+    (net (code 4) (name "Net-(R6-Pad2)")
+      (node (ref R6) (pin 2))
+      (node (ref U1) (pin 5)))
+    (net (code 5) (name "Net-(R7-Pad2)")
       (node (ref U1) (pin 11))
       (node (ref R7) (pin 2)))
-    (net (code 9) (name "Net-(U1-Pad14)")
+    (net (code 6) (name "Net-(R8-Pad2)")
+      (node (ref U1) (pin 10))
+      (node (ref R8) (pin 2)))
+    (net (code 7) (name "Net-(R10-Pad2)")
+      (node (ref U1) (pin 6))
+      (node (ref R10) (pin 2)))
+    (net (code 8) (name "Net-(U1-Pad14)")
       (node (ref U1) (pin 14)))
-    (net (code 10) (name "Net-(U1-Pad15)")
+    (net (code 9) (name "Net-(U1-Pad15)")
       (node (ref U1) (pin 15)))
-    (net (code 11) (name VCC)
-      (node (ref R2) (pin 2))
-      (node (ref C2) (pin 1))
-      (node (ref J2) (pin 4))
-      (node (ref J1) (pin 1))
-      (node (ref U1) (pin 1))
-      (node (ref J3) (pin 1))
-      (node (ref C1) (pin 1)))
-    (net (code 12) (name GND)
+    (net (code 10) (name RESET)
+      (node (ref U1) (pin 16))
+      (node (ref J3) (pin 2)))
+    (net (code 11) (name GND)
       (node (ref U1) (pin 20))
       (node (ref J1) (pin 2))
-      (node (ref C2) (pin 2))
       (node (ref J2) (pin 3))
-      (node (ref SW1) (pin 1))
       (node (ref C1) (pin 2))
-      (node (ref J3) (pin 3))
-      (node (ref D1) (pin 3)))
-    (net (code 13) (name "Net-(U1-Pad9)")
-      (node (ref U1) (pin 9)))
-    (net (code 14) (name "Net-(U1-Pad8)")
-      (node (ref U1) (pin 8)))
-    (net (code 15) (name LED_gn)
-      (node (ref R11) (pin 2))
-      (node (ref U1) (pin 12)))
-    (net (code 16) (name LED_rd)
-      (node (ref U1) (pin 13))
-      (node (ref R12) (pin 2)))
-    (net (code 17) (name "Net-(D1-Pad1)")
-      (node (ref D1) (pin 1))
-      (node (ref R12) (pin 1)))
-    (net (code 18) (name "Net-(D1-Pad2)")
+      (node (ref C2) (pin 2))
+      (node (ref SW1) (pin 1))
+      (node (ref D1) (pin 3))
+      (node (ref J3) (pin 3)))
+    (net (code 12) (name VCC)
+      (node (ref J1) (pin 1))
+      (node (ref J2) (pin 4))
+      (node (ref J3) (pin 1))
+      (node (ref C2) (pin 1))
+      (node (ref C1) (pin 1))
+      (node (ref U1) (pin 1)))
+    (net (code 13) (name "Net-(R3-Pad2)")
+      (node (ref U1) (pin 2))
+      (node (ref R3) (pin 2)))
+    (net (code 14) (name LED_rd)
+      (node (ref R12) (pin 2))
+      (node (ref U1) (pin 13)))
+    (net (code 15) (name "Net-(D1-Pad2)")
       (node (ref D1) (pin 2))
       (node (ref R11) (pin 1)))
-    (net (code 19) (name "Net-(U1-Pad19)")
+    (net (code 16) (name "Net-(D1-Pad1)")
+      (node (ref R12) (pin 1))
+      (node (ref D1) (pin 1)))
+    (net (code 17) (name LED_gn)
+      (node (ref U1) (pin 12))
+      (node (ref R11) (pin 2)))
+    (net (code 18) (name USR_BTN)
+      (node (ref SW1) (pin 2))
       (node (ref U1) (pin 19)))
-    (net (code 20) (name /M12.5)
+    (net (code 19) (name /M12.5)
       (node (ref R3) (pin 1))
       (node (ref TP1) (pin 1)))
-    (net (code 21) (name "Net-(R1-Pad2)")
-      (node (ref SW1) (pin 2))
-      (node (ref R1) (pin 2)))
-    (net (code 22) (name /M25.0)
+    (net (code 20) (name /M25.0)
       (node (ref TP2) (pin 1))
       (node (ref R4) (pin 1)))
-    (net (code 23) (name /M37.5)
+    (net (code 21) (name /M37.5)
       (node (ref R5) (pin 1))
       (node (ref TP3) (pin 1)))
-    (net (code 24) (name /M50.0)
-      (node (ref R6) (pin 1))
-      (node (ref TP4) (pin 1)))
-    (net (code 25) (name /M62.5)
-      (node (ref R7) (pin 1))
-      (node (ref TP5) (pin 1)))
-    (net (code 26) (name /M75.0)
-      (node (ref TP6) (pin 1))
-      (node (ref R8) (pin 1)))
-    (net (code 27) (name /M87.5)
+    (net (code 22) (name /M50.0)
+      (node (ref TP4) (pin 1))
+      (node (ref R6) (pin 1)))
+    (net (code 23) (name /M62.5)
+      (node (ref TP5) (pin 1))
+      (node (ref R7) (pin 1)))
+    (net (code 24) (name /M75.0)
+      (node (ref R8) (pin 1))
+      (node (ref TP6) (pin 1)))
+    (net (code 25) (name /M87.5)
       (node (ref R9) (pin 1))
       (node (ref TP7) (pin 1)))
-    (net (code 28) (name /M100.0)
-      (node (ref TP8) (pin 1))
-      (node (ref R10) (pin 1)))
+    (net (code 26) (name /M100.0)
+      (node (ref R10) (pin 1))
+      (node (ref TP8) (pin 1)))
+    (net (code 27) (name "Net-(U1-Pad9)")
+      (node (ref U1) (pin 9)))
+    (net (code 28) (name "Net-(U1-Pad8)")
+      (node (ref U1) (pin 8)))
     (net (code 29) (name SDA)
-      (node (ref J1) (pin 3))
       (node (ref U1) (pin 17))
+      (node (ref J1) (pin 3))
       (node (ref J2) (pin 2)))
     (net (code 30) (name SCL)
-      (node (ref J2) (pin 1))
       (node (ref J1) (pin 4))
-      (node (ref U1) (pin 18)))
-    (net (code 31) (name RESET)
-      (node (ref R1) (pin 1))
-      (node (ref J3) (pin 2))
-      (node (ref R2) (pin 1))
-      (node (ref U1) (pin 16)))))
\ No newline at end of file
+      (node (ref J2) (pin 1))
+      (node (ref U1) (pin 18)))))
\ No newline at end of file
diff --git a/board/water_level.sch b/board/water_level.sch
index 716fc36..425f4a2 100644
--- a/board/water_level.sch
+++ b/board/water_level.sch
@@ -214,8 +214,8 @@ L Switch:SW_Push SW1
 U 1 1 5EA35658
 P 5050 1800
 F 0 "SW1" H 5050 2085 50  0000 C CNN
-F 1 "SW_RESET" H 5050 1994 50  0000 C CNN
-F 2 "Button_Switch_SMD:SW_Push_1P1T_NO_6x6mm_H9.5mm" H 5050 2000 50  0001 C CNN
+F 1 "SW_USER" H 5050 1994 50  0000 C CNN
+F 2 "Button_Switch_SMD:SW_Push_1P1T_NO_6x6mm_H9.5m" H 5050 2000 50  0001 C CNN
 F 3 "https://docs.rs-online.com/ea14/0900766b81527507.pdf" H 5050 2000 50  0001 C CNN
 F 4 "https://de.rs-online.com/web/p/tastschalter/4791491/" H 5050 1800 50  0001 C CNN "Source"
 	1    5050 1800
diff --git a/board/water_level.sch-bak b/board/water_level.sch-bak
index ce05897..716fc36 100644
--- a/board/water_level.sch-bak
+++ b/board/water_level.sch-bak
@@ -236,55 +236,9 @@ Wire Wire Line
 	4600 1950 4600 1800
 Wire Wire Line
 	4600 1800 4850 1800
-$Comp
-L Device:R R1
-U 1 1 5EA37243
-P 5600 1800
-F 0 "R1" V 5393 1800 50  0000 C CNN
-F 1 "330R" V 5484 1800 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 5530 1800 50  0001 C CNN
-F 3 "https://docs.rs-online.com/236a/0900766b80d98afc.pdf" H 5600 1800 50  0001 C CNN
-F 4 "https://de.rs-online.com/web/p/smd-widerstande/6790226/" V 5600 1800 50  0001 C CNN "Source"
-	1    5600 1800
-	0    1    1    0   
-$EndComp
-$Comp
-L Device:R R2
-U 1 1 5EA37762
-P 6100 1450
-F 0 "R2" H 6030 1404 50  0000 R CNN
-F 1 "10k" H 6030 1495 50  0000 R CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 6030 1450 50  0001 C CNN
-F 3 "https://docs.rs-online.com/236a/0900766b80d98afc.pdf" H 6100 1450 50  0001 C CNN
-F 4 "https://de.rs-online.com/web/p/smd-widerstande/6789667/" H 6100 1450 50  0001 C CNN "Source"
-	1    6100 1450
-	-1   0    0    1   
-$EndComp
-Wire Wire Line
-	5750 1800 6100 1800
-Wire Wire Line
-	6100 1800 6100 1600
 Wire Wire Line
 	5250 1800 5450 1800
 $Comp
-L power:VCC #PWR0108
-U 1 1 5EA38C71
-P 6100 1150
-F 0 "#PWR0108" H 6100 1000 50  0001 C CNN
-F 1 "VCC" H 6117 1323 50  0000 C CNN
-F 2 "" H 6100 1150 50  0001 C CNN
-F 3 "" H 6100 1150 50  0001 C CNN
-	1    6100 1150
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	6100 1150 6100 1300
-Wire Wire Line
-	6100 1800 6350 1800
-Connection ~ 6100 1800
-Text GLabel 6350 1800 2    50   Input ~ 0
-RESET
-$Comp
 L Connector:Conn_01x03_Male J3
 U 1 1 5EA3FD12
 P 8050 1900
@@ -563,7 +517,6 @@ Text Label 6750 4250 0    50   ~ 0
 M87.5
 Text Label 6750 4350 0    50   ~ 0
 M100.0
-NoConn ~ 5950 3250
 NoConn ~ 5950 4050
 NoConn ~ 5950 4150
 Wire Wire Line
@@ -637,4 +590,10 @@ Wire Wire Line
 	9850 3650 10000 3650
 Wire Wire Line
 	10000 3650 10000 3750
+Wire Wire Line
+	5950 3250 6300 3250
+Text GLabel 6300 3250 2    50   Input ~ 0
+USR_BTN
+Text GLabel 5450 1800 2    50   Input ~ 0
+USR_BTN
 $EndSCHEMATC