diff --git a/ulx3s.kicad_pcb b/ulx3s.kicad_pcb
index 51ff9cf..64370ad 100644
--- a/ulx3s.kicad_pcb
+++ b/ulx3s.kicad_pcb
@@ -1,9 +1,9 @@
-(kicad_pcb (version 20171130) (host pcbnew 5.0.0-rc2-dev-unknown+dfsg1+20180318-2)
+(kicad_pcb (version 20171130) (host pcbnew 5.0.0-rc2-dev-unknown+dfsg1+20180318-3)
 
   (general
     (thickness 1.6)
     (drawings 484)
-    (tracks 4899)
+    (tracks 4898)
     (zones 0)
     (modules 208)
     (nets 317)
@@ -753,114 +753,6 @@
     (uvia_drill 0.1)
   )
 
-  (module L_1008_1210:L_1008_1210 (layer B.Cu) (tedit 5B019496) (tstamp 5B3925FB)
-    (at 156.33 74.755 180)
-    (descr "Inductor SMD 1008-1210 (2520-3225 Metric), square (rectangular) end terminal")
-    (tags inductor)
-    (path /58D51CAD/5A73CDB3)
-    (attr smd)
-    (fp_text reference L3 (at 3.16 -0.018 180) (layer B.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_text value 2.2uH (at 0 -2.5 180) (layer B.Fab)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_text user %R (at 0 0 180) (layer B.Fab)
-      (effects (font (size 0.8 0.8) (thickness 0.12)) (justify mirror))
-    )
-    (fp_line (start 2.29 -1.6) (end -2.29 -1.6) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 2.29 1.6) (end 2.29 -1.6) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -2.29 1.6) (end 2.29 1.6) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -2.29 -1.6) (end -2.29 1.6) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -0.2 -1.4) (end 0.2 -1.4) (layer B.SilkS) (width 0.12))
-    (fp_line (start -0.2 1.4) (end 0.2 1.4) (layer B.SilkS) (width 0.12))
-    (fp_line (start 1.6 -1.25) (end -1.6 -1.25) (layer B.Fab) (width 0.1))
-    (fp_line (start 1.6 1.25) (end 1.6 -1.25) (layer B.Fab) (width 0.1))
-    (fp_line (start -1.6 1.25) (end 1.6 1.25) (layer B.Fab) (width 0.1))
-    (fp_line (start -1.6 -1.25) (end -1.6 1.25) (layer B.Fab) (width 0.1))
-    (pad 2 smd rect (at 1.27 0 180) (size 1.5 2.7) (layers B.Cu B.Paste B.Mask)
-      (net 158 /power/P3V3))
-    (pad 1 smd rect (at -1.27 0 180) (size 1.5 2.7) (layers B.Cu B.Paste B.Mask)
-      (net 161 /power/L3))
-    (model ${KISYS3DMOD}/Inductor_SMD.3dshapes/L_1210_3225Metric.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module L_1008_1210:L_1008_1210 (layer B.Cu) (tedit 5B019496) (tstamp 5B3925EB)
-    (at 104.895 88.725)
-    (descr "Inductor SMD 1008-1210 (2520-3225 Metric), square (rectangular) end terminal")
-    (tags inductor)
-    (path /58D51CAD/58D67BD8)
-    (attr smd)
-    (fp_text reference L2 (at -3.16 0.018) (layer B.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_text value 2.2uH (at 0 -2.5) (layer B.Fab)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_text user %R (at 0 0) (layer B.Fab)
-      (effects (font (size 0.8 0.8) (thickness 0.12)) (justify mirror))
-    )
-    (fp_line (start 2.29 -1.6) (end -2.29 -1.6) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 2.29 1.6) (end 2.29 -1.6) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -2.29 1.6) (end 2.29 1.6) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -2.29 -1.6) (end -2.29 1.6) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -0.2 -1.4) (end 0.2 -1.4) (layer B.SilkS) (width 0.12))
-    (fp_line (start -0.2 1.4) (end 0.2 1.4) (layer B.SilkS) (width 0.12))
-    (fp_line (start 1.6 -1.25) (end -1.6 -1.25) (layer B.Fab) (width 0.1))
-    (fp_line (start 1.6 1.25) (end 1.6 -1.25) (layer B.Fab) (width 0.1))
-    (fp_line (start -1.6 1.25) (end 1.6 1.25) (layer B.Fab) (width 0.1))
-    (fp_line (start -1.6 -1.25) (end -1.6 1.25) (layer B.Fab) (width 0.1))
-    (pad 2 smd rect (at 1.27 0) (size 1.5 2.7) (layers B.Cu B.Paste B.Mask)
-      (net 159 /power/P2V5))
-    (pad 1 smd rect (at -1.27 0) (size 1.5 2.7) (layers B.Cu B.Paste B.Mask)
-      (net 162 /power/L2))
-    (model ${KISYS3DMOD}/Inductor_SMD.3dshapes/L_1210_3225Metric.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module L_1008_1210:L_1008_1210 (layer B.Cu) (tedit 5B019496) (tstamp 5B3925DB)
-    (at 158.87 88.09 180)
-    (descr "Inductor SMD 1008-1210 (2520-3225 Metric), square (rectangular) end terminal")
-    (tags inductor)
-    (path /58D51CAD/5A73C9EB)
-    (attr smd)
-    (fp_text reference L1 (at 0 2.5 180) (layer B.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_text value 2.2uH (at 0 -2.5 180) (layer B.Fab)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_text user %R (at 0 0 180) (layer B.Fab)
-      (effects (font (size 0.8 0.8) (thickness 0.12)) (justify mirror))
-    )
-    (fp_line (start 2.29 -1.6) (end -2.29 -1.6) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 2.29 1.6) (end 2.29 -1.6) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -2.29 1.6) (end 2.29 1.6) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -2.29 -1.6) (end -2.29 1.6) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -0.2 -1.4) (end 0.2 -1.4) (layer B.SilkS) (width 0.12))
-    (fp_line (start -0.2 1.4) (end 0.2 1.4) (layer B.SilkS) (width 0.12))
-    (fp_line (start 1.6 -1.25) (end -1.6 -1.25) (layer B.Fab) (width 0.1))
-    (fp_line (start 1.6 1.25) (end 1.6 -1.25) (layer B.Fab) (width 0.1))
-    (fp_line (start -1.6 1.25) (end 1.6 1.25) (layer B.Fab) (width 0.1))
-    (fp_line (start -1.6 -1.25) (end -1.6 1.25) (layer B.Fab) (width 0.1))
-    (pad 2 smd rect (at 1.27 0 180) (size 1.5 2.7) (layers B.Cu B.Paste B.Mask)
-      (net 171 /power/P1V1))
-    (pad 1 smd rect (at -1.27 0 180) (size 1.5 2.7) (layers B.Cu B.Paste B.Mask)
-      (net 160 /power/L1))
-    (model ${KISYS3DMOD}/Inductor_SMD.3dshapes/L_1210_3225Metric.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
   (module Socket_Strips:Socket_Strip_Angled_2x20 (layer F.Cu) (tedit 5A2B354F) (tstamp 58E6BE3D)
     (at 97.91 62.69 270)
     (descr "Through hole socket strip")
@@ -4387,7 +4279,7 @@
     (tags capacitor)
     (path /58D51CAD/58D84952)
     (attr smd)
-    (fp_text reference C14 (at 0.907 7.859 270) (layer B.SilkS)
+    (fp_text reference C14 (at 0.78 7.859 270) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_text value 100nF (at 0 -1.65 270) (layer B.Fab)
@@ -6169,7 +6061,7 @@
     (tags diode)
     (path /58D51CAD/58D7CBDC)
     (attr smd)
-    (fp_text reference D11 (at -2.431 0.269 180) (layer B.SilkS)
+    (fp_text reference D11 (at -2.431 0.015 180) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_text value RED (at 0 -1.85 90) (layer B.Fab)
@@ -6356,7 +6248,7 @@
     (fp_text reference R41 (at 0 1.539 90) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 1k (at 0 1.65 90) (layer F.Fab)
+    (fp_text value 1.2k (at 0 1.65 90) (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))
@@ -6392,7 +6284,7 @@
     (fp_text reference R42 (at 0 -1.65 90) (layer F.SilkS) hide
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 1k (at 0 1.65 90) (layer F.Fab)
+    (fp_text value 1.2k (at 0 1.65 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text user %R (at 0 0 90) (layer F.Fab)
@@ -6428,7 +6320,7 @@
     (fp_text reference R43 (at 0 -1.65 90) (layer F.SilkS) hide
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 1k (at 0 1.65 90) (layer F.Fab)
+    (fp_text value 1.2k (at 0 1.65 90) (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))
@@ -6464,7 +6356,7 @@
     (fp_text reference R44 (at 0 -1.65 90) (layer F.SilkS) hide
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 1k (at 0 1.65 90) (layer F.Fab)
+    (fp_text value 1.2k (at 0 1.65 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text user %R (at 0 0 90) (layer F.Fab)
@@ -6500,7 +6392,7 @@
     (fp_text reference R45 (at 0 -1.65 90) (layer F.SilkS) hide
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 1k (at 0 1.65 90) (layer F.Fab)
+    (fp_text value 1.2k (at 0 1.65 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text user %R (at 0 0 90) (layer F.Fab)
@@ -6536,7 +6428,7 @@
     (fp_text reference R46 (at 0 -1.65 90) (layer F.SilkS) hide
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 1k (at 0 1.65 90) (layer F.Fab)
+    (fp_text value 1.2k (at 0 1.65 90) (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))
@@ -6572,7 +6464,7 @@
     (fp_text reference R47 (at 0 -1.65 90) (layer F.SilkS) hide
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 1k (at 0 1.65 90) (layer F.Fab)
+    (fp_text value 1.2k (at 0 1.65 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text user %R (at 0 0 90) (layer F.Fab)
@@ -6608,7 +6500,7 @@
     (fp_text reference R48 (at 0 -1.31 90) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 1k (at 0 1.65 90) (layer F.Fab)
+    (fp_text value 1.2k (at 0 1.65 90) (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))
@@ -6644,7 +6536,7 @@
     (fp_text reference R36 (at 0.018 1.255 90) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 1k (at 0 1.65 270) (layer F.Fab)
+    (fp_text value 1.2k (at 0 1.65 270) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text user %R (at 0 0 270) (layer F.Fab)
@@ -6680,7 +6572,7 @@
     (fp_text reference R37 (at 0 1.539 90) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 1k (at 0 1.65 90) (layer F.Fab)
+    (fp_text value 1.2k (at 0 1.65 90) (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))
@@ -6716,7 +6608,7 @@
     (fp_text reference R62 (at 0.018 1.382 270) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 1k (at 0 1.65 270) (layer F.Fab)
+    (fp_text value 1.2k (at 0 1.65 270) (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))
@@ -7050,7 +6942,7 @@
     (tags SOD-323)
     (path /58D6BF46/59C133D8)
     (attr smd)
-    (fp_text reference D20 (at -0.015 -1.669) (layer B.SilkS)
+    (fp_text reference D20 (at -0.015 4.173) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_text value 3.6V (at 0.1 -1.9 180) (layer B.Fab)
@@ -7139,7 +7031,7 @@
     (fp_text reference D23 (at 0 -3.538) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value BAT54W (at 0.1 -1.9) (layer B.Fab)
+    (fp_text value 1N4148 (at 0.1 -1.9) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_line (start -1.9 0.85) (end 1.25 0.85) (layer B.SilkS) (width 0.12))
@@ -7182,7 +7074,7 @@
     (fp_text reference D24 (at 0 2.903 180) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value BAT54W (at 0.1 -1.9 180) (layer B.Fab)
+    (fp_text value 1N4148 (at 0.1 -1.9 180) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_line (start -1.9 0.85) (end 1.25 0.85) (layer B.SilkS) (width 0.12))
@@ -7225,7 +7117,7 @@
     (fp_text reference D25 (at -0.018 3.698 270) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value BAT54W (at 0.1 -1.9 90) (layer B.Fab)
+    (fp_text value 1N4148 (at 0.1 -1.9 90) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_text user %R (at 0 1.85 90) (layer B.Fab)
@@ -7268,7 +7160,7 @@
     (fp_text reference D26 (at 0.018 -3.063 90) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value BAT54W (at 0.1 -1.9 270) (layer B.Fab)
+    (fp_text value 1N4148 (at 0.1 -1.9 270) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_text user %R (at 0 1.85 270) (layer B.Fab)
@@ -7433,7 +7325,7 @@
     (tags "Diode SMA (DO-214AC) Handsoldering")
     (path /58D6BF46/58D6C83C)
     (attr smd)
-    (fp_text reference D9 (at 0.366 -2.413 180) (layer B.SilkS)
+    (fp_text reference D9 (at 1.001 -2.558 180) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_text value STPS2L30AF (at 0.762 -2.286 180) (layer B.Fab) hide
@@ -7655,7 +7547,7 @@
     (tags resistor)
     (path /58D6547C/595B9C2F)
     (attr smd)
-    (fp_text reference R51 (at 2.779 0.236 180) (layer B.SilkS)
+    (fp_text reference R51 (at 2.779 0 180) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_text value 150 (at 0 -1.65 180) (layer B.Fab)
@@ -7766,7 +7658,7 @@
     (fp_text reference R54 (at 0 -2.522) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 1.5k (at 0 -1.65) (layer B.Fab)
+    (fp_text value 1.2k (at 0 -1.65) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_text user %R (at 0 0) (layer B.Fab)
@@ -7799,7 +7691,7 @@
     (tags resistor)
     (path /58D6BF46/59DFFFBE)
     (attr virtual)
-    (fp_text reference R56 (at 5.273 0.015 90) (layer B.SilkS)
+    (fp_text reference R56 (at 2.733 0.015 90) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_text value 0 (at 0 -1.65 90) (layer B.Fab)
@@ -7977,7 +7869,7 @@
     (fp_text reference R61 (at -0.008 -1.444 180) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 470 (at 0 -1.65 180) (layer B.Fab)
+    (fp_text value 680 (at 0 -1.65 180) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
@@ -8265,7 +8157,7 @@
     (fp_text reference R40 (at 0.015 -2.522) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 1.5k (at 0 -1.65) (layer B.Fab)
+    (fp_text value 1.2k (at 0 -1.65) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
@@ -8292,52 +8184,16 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B06E8D2)
-    (at 125.596 85.06 180)
-    (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 /58D82BD0/58D90500)
-    (attr smd)
-    (fp_text reference R14 (at 2.779 0 180) (layer B.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_text value 1.2k (at 0 -1.65 180) (layer B.Fab)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_text user %R (at 0 0 180) (layer B.Fab)
-      (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
-    )
-    (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -1.46 -0.75) (end -1.46 0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -0.22 -0.51) (end 0.22 -0.51) (layer B.SilkS) (width 0.12))
-    (fp_line (start -0.22 0.51) (end 0.22 0.51) (layer B.SilkS) (width 0.12))
-    (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))
-    (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 rect (at 0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 31 /analog/AUDIO_L))
-    (pad 1 smd rect (at -0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 107 AUDIO_L0))
-    (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 B.Cu) (tedit 59FE48B8) (tstamp 5B06E8E2)
-    (at 125.596 83.536 180)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B20C606)
+    (at 134.74 97.615 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 /58D82BD0/58D904D5)
+    (path /58D913EC/59DEB568)
     (attr smd)
-    (fp_text reference R15 (at 2.779 0 180) (layer B.SilkS)
+    (fp_text reference R55 (at -2.776 0.112 270) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 680 (at 0 -1.65 180) (layer B.Fab)
+    (fp_text value 15k (at 0 -1.65 270) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
@@ -8350,13 +8206,13 @@
     (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
     (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
     (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_text user %R (at 0 0 180) (layer B.Fab)
+    (fp_text user %R (at 0 0 270) (layer B.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
     )
-    (pad 1 smd rect (at -0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 106 AUDIO_L1))
-    (pad 2 smd rect (at 0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 31 /analog/AUDIO_L))
+    (pad 1 smd rect (at -0.875 0 270) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 89 /flash/FPGA_DONE))
+    (pad 2 smd rect (at 0.875 0 270) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 157 PROG_DONE))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -8364,121 +8220,103 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B06E8F2)
-    (at 125.596 82.012 180)
-    (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 /58D82BD0/58D904AE)
+  (module SM8:SM8 (layer B.Cu) (tedit 5A0C2F78) (tstamp 5B17ED8A)
+    (at 144.68 65.8015 90)
+    (descr "TI SM8 SOIC-8 150 mil")
+    (tags "SOIC-8 1.27 150 mil SOT96-1")
+    (path /58D686D9/5B01C6B5)
     (attr smd)
-    (fp_text reference R16 (at 2.779 0 180) (layer B.SilkS)
+    (fp_text reference U11 (at 3.3475 -0.019 -180) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 330 (at 0 -1.65 180) (layer B.Fab)
+    (fp_text value PCA9306D (at 4.318 -5.588 -180) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (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))
-    (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))
-    (fp_line (start -0.22 0.51) (end 0.22 0.51) (layer B.SilkS) (width 0.12))
-    (fp_line (start -0.22 -0.51) (end 0.22 -0.51) (layer B.SilkS) (width 0.12))
-    (fp_line (start -1.46 -0.75) (end -1.46 0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_text user %R (at 0 0 180) (layer B.Fab)
-      (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
-    )
-    (pad 1 smd rect (at -0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 105 AUDIO_L2))
-    (pad 2 smd rect (at 0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 31 /analog/AUDIO_L))
-    (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
+    (fp_circle (center -2.286 -0.9525) (end -2.2225 -0.889) (layer B.SilkS) (width 0.15))
+    (fp_line (start 2.54 -1.778) (end -2.54 -1.778) (layer B.SilkS) (width 0.15))
+    (fp_line (start -2.54 -1.27) (end 2.54 -1.27) (layer B.SilkS) (width 0.15))
+    (fp_line (start -2.45 -0.95) (end -2.45 1.95) (layer B.Fab) (width 0.15))
+    (fp_line (start -2.45 1.95) (end 2.45 1.95) (layer B.Fab) (width 0.15))
+    (fp_line (start 2.45 1.95) (end 2.45 -1.95) (layer B.Fab) (width 0.15))
+    (fp_line (start 2.45 -1.95) (end -1.45 -1.95) (layer B.Fab) (width 0.15))
+    (fp_line (start -1.45 -1.95) (end -2.45 -0.95) (layer B.Fab) (width 0.15))
+    (fp_line (start -2.75 -3.75) (end 2.75 -3.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -2.75 3.75) (end 2.75 3.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -2.75 -3.75) (end -2.75 3.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 2.75 -3.75) (end 2.75 3.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -2.575 -2.075) (end -2.525 -2.075) (layer B.SilkS) (width 0.15))
+    (fp_line (start -2.575 2.075) (end -2.43 2.075) (layer B.SilkS) (width 0.15))
+    (fp_line (start 2.575 2.075) (end 2.43 2.075) (layer B.SilkS) (width 0.15))
+    (fp_line (start 2.575 -2.075) (end 2.43 -2.075) (layer B.SilkS) (width 0.15))
+    (fp_line (start -2.575 -2.075) (end -2.575 2.075) (layer B.SilkS) (width 0.15))
+    (fp_line (start 2.575 -2.075) (end 2.575 2.075) (layer B.SilkS) (width 0.15))
+    (fp_line (start -2.525 -2.075) (end -2.525 -3.475) (layer B.SilkS) (width 0.15))
+    (pad 1 smd rect (at -1.905 -2.7) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
+      (net 1 GND))
+    (pad 2 smd oval (at -0.635 -2.7) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
+      (net 5 +3V3))
+    (pad 3 smd oval (at 0.635 -2.7) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
+      (net 262 FPDI_SCL))
+    (pad 4 smd oval (at 1.905 -2.7) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
+      (net 261 FPDI_SDA))
+    (pad 5 smd oval (at 1.905 2.7) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
+      (net 33 GPDI_SDA))
+    (pad 6 smd oval (at 0.635 2.7) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
+      (net 34 GPDI_SCL))
+    (pad 7 smd oval (at -0.635 2.7) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
+      (net 35 /gpdi/VREF2))
+    (pad 8 smd oval (at -1.905 2.7) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
+      (net 35 /gpdi/VREF2))
+    (model ${KISYS3DMOD}/Package_SO.3dshapes/SOIC-8_3.9x4.9mm_P1.27mm.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
+      (rotate (xyz 0 0 -90))
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B06E902)
-    (at 125.596 80.47 180)
-    (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 /58D82BD0/58D90455)
+  (module Capacitor_SMD:C_0805_2012Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B1118A2)
+    (at 179.078 91.918 270)
+    (descr "Capacitor SMD 0805 (2012 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 capacitor)
+    (path /58D51CAD/5B09EC4B)
     (attr smd)
-    (fp_text reference R17 (at 2.779 -0.018 180) (layer B.SilkS)
+    (fp_text reference C55 (at 0 -1.524 270) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 150 (at 0 -1.65 180) (layer B.Fab)
+    (fp_text value 22uF (at 0 -1.85 270) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text user %R (at 0 0 180) (layer B.Fab)
-      (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
-    )
-    (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -1.46 -0.75) (end -1.46 0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -0.22 -0.51) (end 0.22 -0.51) (layer B.SilkS) (width 0.12))
-    (fp_line (start -0.22 0.51) (end 0.22 0.51) (layer B.SilkS) (width 0.12))
-    (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))
-    (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 rect (at 0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 31 /analog/AUDIO_L))
-    (pad 1 smd rect (at -0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 104 AUDIO_L3))
-    (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 B.Cu) (tedit 59FE48B8) (tstamp 5B06E912)
-    (at 130.422 74.773 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")
-    (tags resistor)
-    (path /58D82BD0/58D907DC)
-    (attr smd)
-    (fp_text reference R18 (at -2.794 0.015 90) (layer B.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_text value 1.2k (at 0 -1.65 90) (layer B.Fab)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_text user %R (at 0 0 90) (layer B.Fab)
+    (fp_line (start -1 -0.6) (end -1 0.6) (layer B.Fab) (width 0.1))
+    (fp_line (start -1 0.6) (end 1 0.6) (layer B.Fab) (width 0.1))
+    (fp_line (start 1 0.6) (end 1 -0.6) (layer B.Fab) (width 0.1))
+    (fp_line (start 1 -0.6) (end -1 -0.6) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.15 0.71) (end 0.15 0.71) (layer B.SilkS) (width 0.12))
+    (fp_line (start -0.15 -0.71) (end 0.15 -0.71) (layer B.SilkS) (width 0.12))
+    (fp_line (start -1.69 -1) (end -1.69 1) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.69 1) (end 1.69 1) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 1.69 1) (end 1.69 -1) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 1.69 -1) (end -1.69 -1) (layer B.CrtYd) (width 0.05))
+    (fp_text user %R (at 0 0 270) (layer B.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
     )
-    (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -1.46 -0.75) (end -1.46 0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -0.22 -0.51) (end 0.22 -0.51) (layer B.SilkS) (width 0.12))
-    (fp_line (start -0.22 0.51) (end 0.22 0.51) (layer B.SilkS) (width 0.12))
-    (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))
-    (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 rect (at 0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 32 /analog/AUDIO_R))
-    (pad 1 smd rect (at -0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 111 AUDIO_R0))
-    (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
+    (pad 1 smd rect (at -0.955 0 270) (size 0.97 1.5) (layers B.Cu B.Paste B.Mask)
+      (net 316 /power/RTCVDD))
+    (pad 2 smd rect (at 0.955 0 270) (size 0.97 1.5) (layers B.Cu B.Paste B.Mask)
+      (net 1 GND))
+    (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0805_2012Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
       (rotate (xyz 0 0 0))
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B06E922)
-    (at 131.961 74.773 90)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B1118B3)
+    (at 177.3 91.918 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")
     (tags resistor)
-    (path /58D82BD0/58D907D6)
+    (path /58D51CAD/5B0A7AE1)
     (attr smd)
-    (fp_text reference R19 (at -2.794 0 90) (layer B.SilkS)
+    (fp_text reference R65 (at 2.794 0 90) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_text value 680 (at 0 -1.65 90) (layer B.Fab)
@@ -8498,9 +8336,9 @@
       (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
     )
     (pad 1 smd rect (at -0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 110 AUDIO_R1))
+      (net 5 +3V3))
     (pad 2 smd rect (at 0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 32 /analog/AUDIO_R))
+      (net 316 /power/RTCVDD))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -8508,19 +8346,127 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B06E932)
-    (at 133.485 74.773 90)
+  (module L_1008_1210:L_1008_1210 (layer B.Cu) (tedit 5B019496) (tstamp 5B191548)
+    (at 158.87 88.09 180)
+    (descr "Inductor SMD 1008-1210 (2520-3225 Metric), square (rectangular) end terminal")
+    (tags inductor)
+    (path /58D51CAD/5A73C9EB)
+    (attr smd)
+    (fp_text reference L1 (at 0 2.5 180) (layer B.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text value 2.2uH (at 0 -2.5 180) (layer B.Fab)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_line (start -1.6 -1.25) (end -1.6 1.25) (layer B.Fab) (width 0.1))
+    (fp_line (start -1.6 1.25) (end 1.6 1.25) (layer B.Fab) (width 0.1))
+    (fp_line (start 1.6 1.25) (end 1.6 -1.25) (layer B.Fab) (width 0.1))
+    (fp_line (start 1.6 -1.25) (end -1.6 -1.25) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.2 1.4) (end 0.2 1.4) (layer B.SilkS) (width 0.12))
+    (fp_line (start -0.2 -1.4) (end 0.2 -1.4) (layer B.SilkS) (width 0.12))
+    (fp_line (start -2.29 -1.6) (end -2.29 1.6) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -2.29 1.6) (end 2.29 1.6) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 2.29 1.6) (end 2.29 -1.6) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 2.29 -1.6) (end -2.29 -1.6) (layer B.CrtYd) (width 0.05))
+    (fp_text user %R (at 0 0 180) (layer B.Fab)
+      (effects (font (size 0.8 0.8) (thickness 0.12)) (justify mirror))
+    )
+    (pad 1 smd rect (at -1.27 0 180) (size 1.5 2.7) (layers B.Cu B.Paste B.Mask)
+      (net 160 /power/L1))
+    (pad 2 smd rect (at 1.27 0 180) (size 1.5 2.7) (layers B.Cu B.Paste B.Mask)
+      (net 171 /power/P1V1))
+    (model ${KISYS3DMOD}/Inductor_SMD.3dshapes/L_1210_3225Metric.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module L_1008_1210:L_1008_1210 (layer B.Cu) (tedit 5B019496) (tstamp 5B191558)
+    (at 104.895 88.725)
+    (descr "Inductor SMD 1008-1210 (2520-3225 Metric), square (rectangular) end terminal")
+    (tags inductor)
+    (path /58D51CAD/58D67BD8)
+    (attr smd)
+    (fp_text reference L2 (at -3.2235 0.018) (layer B.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text value 2.2uH (at 0 -2.5) (layer B.Fab)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_line (start -1.6 -1.25) (end -1.6 1.25) (layer B.Fab) (width 0.1))
+    (fp_line (start -1.6 1.25) (end 1.6 1.25) (layer B.Fab) (width 0.1))
+    (fp_line (start 1.6 1.25) (end 1.6 -1.25) (layer B.Fab) (width 0.1))
+    (fp_line (start 1.6 -1.25) (end -1.6 -1.25) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.2 1.4) (end 0.2 1.4) (layer B.SilkS) (width 0.12))
+    (fp_line (start -0.2 -1.4) (end 0.2 -1.4) (layer B.SilkS) (width 0.12))
+    (fp_line (start -2.29 -1.6) (end -2.29 1.6) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -2.29 1.6) (end 2.29 1.6) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 2.29 1.6) (end 2.29 -1.6) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 2.29 -1.6) (end -2.29 -1.6) (layer B.CrtYd) (width 0.05))
+    (fp_text user %R (at 0 0) (layer B.Fab)
+      (effects (font (size 0.8 0.8) (thickness 0.12)) (justify mirror))
+    )
+    (pad 1 smd rect (at -1.27 0) (size 1.5 2.7) (layers B.Cu B.Paste B.Mask)
+      (net 162 /power/L2))
+    (pad 2 smd rect (at 1.27 0) (size 1.5 2.7) (layers B.Cu B.Paste B.Mask)
+      (net 159 /power/P2V5))
+    (model ${KISYS3DMOD}/Inductor_SMD.3dshapes/L_1210_3225Metric.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module L_1008_1210:L_1008_1210 (layer B.Cu) (tedit 5B019496) (tstamp 5B191568)
+    (at 156.33 74.755 180)
+    (descr "Inductor SMD 1008-1210 (2520-3225 Metric), square (rectangular) end terminal")
+    (tags inductor)
+    (path /58D51CAD/5A73CDB3)
+    (attr smd)
+    (fp_text reference L3 (at 3.287 -0.018 180) (layer B.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text value 2.2uH (at 0 -2.5 180) (layer B.Fab)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text user %R (at 0 0 180) (layer B.Fab)
+      (effects (font (size 0.8 0.8) (thickness 0.12)) (justify mirror))
+    )
+    (fp_line (start 2.29 -1.6) (end -2.29 -1.6) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 2.29 1.6) (end 2.29 -1.6) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -2.29 1.6) (end 2.29 1.6) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -2.29 -1.6) (end -2.29 1.6) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -0.2 -1.4) (end 0.2 -1.4) (layer B.SilkS) (width 0.12))
+    (fp_line (start -0.2 1.4) (end 0.2 1.4) (layer B.SilkS) (width 0.12))
+    (fp_line (start 1.6 -1.25) (end -1.6 -1.25) (layer B.Fab) (width 0.1))
+    (fp_line (start 1.6 1.25) (end 1.6 -1.25) (layer B.Fab) (width 0.1))
+    (fp_line (start -1.6 1.25) (end 1.6 1.25) (layer B.Fab) (width 0.1))
+    (fp_line (start -1.6 -1.25) (end -1.6 1.25) (layer B.Fab) (width 0.1))
+    (pad 2 smd rect (at 1.27 0 180) (size 1.5 2.7) (layers B.Cu B.Paste B.Mask)
+      (net 158 /power/P3V3))
+    (pad 1 smd rect (at -1.27 0 180) (size 1.5 2.7) (layers B.Cu B.Paste B.Mask)
+      (net 161 /power/L3))
+    (model ${KISYS3DMOD}/Inductor_SMD.3dshapes/L_1210_3225Metric.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B191578)
+    (at 170.3 82.375)
     (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 /58D82BD0/58D907D0)
+    (path /58D51CAD/58D67C1D)
     (attr smd)
-    (fp_text reference R20 (at -2.794 0 90) (layer B.SilkS)
+    (fp_text reference R1 (at 2.301 0.018) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 330 (at 0 -1.65 90) (layer B.Fab)
+    (fp_text value 15k (at 0 -1.65) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text user %R (at 0 0 90) (layer B.Fab)
+    (fp_text user %R (at 0 0) (layer B.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
     )
     (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
@@ -8533,10 +8479,10 @@
     (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))
     (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
-    (pad 2 smd rect (at 0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 32 /analog/AUDIO_R))
-    (pad 1 smd rect (at -0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 109 AUDIO_R2))
+    (pad 2 smd rect (at 0.875 0) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 14 /power/PWREN))
+    (pad 1 smd rect (at -0.875 0) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 25 /power/WAKE))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -8544,35 +8490,35 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B06E942)
-    (at 135.009 74.773 90)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B191588)
+    (at 172.84 79.835 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")
     (tags resistor)
-    (path /58D82BD0/58D907CA)
+    (path /58D51CAD/58D7BDD9)
     (attr smd)
-    (fp_text reference R21 (at -2.794 0 90) (layer B.SilkS)
+    (fp_text reference R2 (at 0 1.285 90) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 150 (at 0 -1.65 90) (layer B.Fab)
+    (fp_text value 47k (at 0 -1.65 90) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (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))
-    (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))
-    (fp_line (start -0.22 0.51) (end 0.22 0.51) (layer B.SilkS) (width 0.12))
-    (fp_line (start -0.22 -0.51) (end 0.22 -0.51) (layer B.SilkS) (width 0.12))
-    (fp_line (start -1.46 -0.75) (end -1.46 0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
     (fp_text user %R (at 0 0 90) (layer B.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
     )
-    (pad 1 smd rect (at -0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 108 AUDIO_R3))
+    (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.46 -0.75) (end -1.46 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -0.22 -0.51) (end 0.22 -0.51) (layer B.SilkS) (width 0.12))
+    (fp_line (start -0.22 0.51) (end 0.22 0.51) (layer B.SilkS) (width 0.12))
+    (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))
+    (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 rect (at 0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 32 /analog/AUDIO_R))
+      (net 1 GND))
+    (pad 1 smd rect (at -0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 14 /power/PWREN))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -8580,16 +8526,16 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B06E935)
-    (at 113.785 84.28 270)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B191598)
+    (at 162.045 70.31 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")
     (tags resistor)
-    (path /58D6547C/58D6605D)
+    (path /58D51CAD/58E810CC)
     (attr smd)
-    (fp_text reference R7 (at -5.697 0.493 270) (layer B.SilkS)
+    (fp_text reference R3 (at -1.415 -1.763) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 150 (at 0 -1.65 270) (layer B.Fab)
+    (fp_text value 4.7k (at 0 -1.65 90) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
@@ -8602,13 +8548,13 @@
     (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
     (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
     (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_text user %R (at 0 0 270) (layer B.Fab)
+    (fp_text user %R (at 0 0 90) (layer B.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
     )
-    (pad 1 smd rect (at -0.875 0 270) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 5 +3V3))
-    (pad 2 smd rect (at 0.875 0 270) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 130 /blinkey/BTNPUL))
+    (pad 1 smd rect (at -0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 2 +5V))
+    (pad 2 smd rect (at 0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 156 /power/PWRBTn))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -8616,35 +8562,35 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B06E945)
-    (at 152.139 103.076 180)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B1915A8)
+    (at 176.015 80.47 180)
     (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 /58D51CAD/591E4865)
+    (path /58D51CAD/58D7CBD5)
     (attr smd)
-    (fp_text reference R10 (at 0 1.65 180) (layer B.SilkS)
+    (fp_text reference R4 (at -5.476 0.236 180) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 150 (at 0 -1.65 180) (layer B.Fab)
+    (fp_text value 4.7k (at 0 -1.65 180) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
+    (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))
+    (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))
+    (fp_line (start -0.22 0.51) (end 0.22 0.51) (layer B.SilkS) (width 0.12))
+    (fp_line (start -0.22 -0.51) (end 0.22 -0.51) (layer B.SilkS) (width 0.12))
+    (fp_line (start -1.46 -0.75) (end -1.46 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
     (fp_text user %R (at 0 0 180) (layer B.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
     )
-    (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -1.46 -0.75) (end -1.46 0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -0.22 -0.51) (end 0.22 -0.51) (layer B.SilkS) (width 0.12))
-    (fp_line (start -0.22 0.51) (end 0.22 0.51) (layer B.SilkS) (width 0.12))
-    (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))
-    (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 rect (at 0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 124 FTDI_nSLEEP))
     (pad 1 smd rect (at -0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 133 /power/FTDI_nSUSPEND))
+      (net 26 /power/HOLD))
+    (pad 2 smd rect (at 0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 14 /power/PWREN))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -8652,16 +8598,16 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B06E955)
-    (at 163.315 96.345 180)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B1915B8)
+    (at 174.11 76.025 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 /58D6547C/591B5493)
+    (path /58D51CAD/58D85B68)
     (attr smd)
-    (fp_text reference R39 (at 0.035 1.345 180) (layer B.SilkS)
+    (fp_text reference R5 (at 0.272 7.986 270) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 150 (at 0 -1.65 180) (layer B.Fab)
+    (fp_text value 4.7M (at 0 -1.65 270) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
@@ -8674,13 +8620,13 @@
     (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
     (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
     (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_text user %R (at 0 0 180) (layer B.Fab)
+    (fp_text user %R (at 0 0 270) (layer B.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
     )
-    (pad 1 smd rect (at -0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 5 +3V3))
-    (pad 2 smd rect (at 0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 131 /blinkey/BTNPUR))
+    (pad 1 smd rect (at -0.875 0 270) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 24 /power/SHUT))
+    (pad 2 smd rect (at 0.875 0 270) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 1 GND))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -8688,7 +8634,7 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B06ECAD)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B1915C8)
     (at 178.555 84.915 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)
@@ -8697,7 +8643,7 @@
     (fp_text reference R6 (at 2.304 -0.015 270) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 1k (at 0 -1.65 270) (layer B.Fab)
+    (fp_text value 1.2k (at 0 -1.65 270) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_text user %R (at 0 0 270) (layer B.Fab)
@@ -8724,35 +8670,35 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B06ECBD)
-    (at 112.896 88.344 90)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B1915D8)
+    (at 113.785 84.28 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 /58D913EC/58EC15E1)
+    (path /58D6547C/58D6605D)
     (attr smd)
-    (fp_text reference R29 (at 7.348 -0.366 90) (layer B.SilkS)
+    (fp_text reference R7 (at -5.316 0.239 270) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 1k (at 0 -1.65 90) (layer B.Fab)
+    (fp_text value 150 (at 0 -1.65 270) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (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))
-    (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))
-    (fp_line (start -0.22 0.51) (end 0.22 0.51) (layer B.SilkS) (width 0.12))
-    (fp_line (start -0.22 -0.51) (end 0.22 -0.51) (layer B.SilkS) (width 0.12))
-    (fp_line (start -1.46 -0.75) (end -1.46 0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_text user %R (at 0 0 90) (layer B.Fab)
+    (fp_text user %R (at 0 0 270) (layer B.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
     )
-    (pad 1 smd rect (at -0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+    (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.46 -0.75) (end -1.46 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -0.22 -0.51) (end 0.22 -0.51) (layer B.SilkS) (width 0.12))
+    (fp_line (start -0.22 0.51) (end 0.22 0.51) (layer B.SilkS) (width 0.12))
+    (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))
+    (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 rect (at 0.875 0 270) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 130 /blinkey/BTNPUL))
+    (pad 1 smd rect (at -0.875 0 270) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
       (net 5 +3V3))
-    (pad 2 smd rect (at 0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 86 /flash/FLASH_SCK))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -8760,16 +8706,16 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B06E21A)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B1915E8)
     (at 170.935 79.835 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")
     (tags resistor)
     (path /58D51CAD/58D8111E)
     (attr smd)
-    (fp_text reference R8 (at -0.018 -3.541 90) (layer B.SilkS)
+    (fp_text reference R8 (at 0.109 -3.541 90) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 1k (at 0 -1.65 90) (layer B.Fab)
+    (fp_text value 1.2k (at 0 -1.65 90) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
@@ -8796,35 +8742,35 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B06E2E1)
-    (at 102.99 102.06 180)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B0D6FDC)
+    (at 128.39 109.68 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 /58D6D447/58FD4C5D)
+    (path /58D6BF46/58EB9CB5)
     (attr smd)
-    (fp_text reference R35 (at 2.779 -0.018 180) (layer B.SilkS)
+    (fp_text reference R9 (at 1.542 -1.666) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 470 (at 0 -1.65 180) (layer B.Fab)
+    (fp_text value 15k (at 0 -1.65 270) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (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))
-    (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))
-    (fp_line (start -0.22 0.51) (end 0.22 0.51) (layer B.SilkS) (width 0.12))
-    (fp_line (start -0.22 -0.51) (end 0.22 -0.51) (layer B.SilkS) (width 0.12))
-    (fp_line (start -1.46 -0.75) (end -1.46 0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_text user %R (at 0 0 180) (layer B.Fab)
+    (fp_text user %R (at 0 0 270) (layer B.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
     )
-    (pad 1 smd rect (at -0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 94 WIFI_EN))
-    (pad 2 smd rect (at 0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 175 /wifi/WIFIEN))
+    (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.46 -0.75) (end -1.46 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -0.22 -0.51) (end 0.22 -0.51) (layer B.SilkS) (width 0.12))
+    (fp_line (start -0.22 0.51) (end 0.22 0.51) (layer B.SilkS) (width 0.12))
+    (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))
+    (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 rect (at 0.875 0 270) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 176 FT2V5))
+    (pad 1 smd rect (at -0.875 0 270) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 42 nRESET))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -8832,35 +8778,35 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B15C373)
-    (at 114.42 88.344 90)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B191608)
+    (at 152.139 103.076 180)
     (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 /58D913EC/58EC4E85)
+    (path /58D51CAD/591E4865)
     (attr smd)
-    (fp_text reference R12 (at 7.348 -0.493 270) (layer B.SilkS)
+    (fp_text reference R10 (at 0 1.65 180) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 10k (at 0 -1.65 90) (layer B.Fab)
+    (fp_text value 150 (at 0 -1.65 180) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (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))
-    (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))
-    (fp_line (start -0.22 0.51) (end 0.22 0.51) (layer B.SilkS) (width 0.12))
-    (fp_line (start -0.22 -0.51) (end 0.22 -0.51) (layer B.SilkS) (width 0.12))
-    (fp_line (start -1.46 -0.75) (end -1.46 0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_text user %R (at 0 0 90) (layer B.Fab)
+    (fp_text user %R (at 0 0 180) (layer B.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
     )
-    (pad 1 smd rect (at -0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 5 +3V3))
-    (pad 2 smd rect (at 0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 83 /flash/FLASH_nHOLD))
+    (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.46 -0.75) (end -1.46 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -0.22 -0.51) (end 0.22 -0.51) (layer B.SilkS) (width 0.12))
+    (fp_line (start -0.22 0.51) (end 0.22 0.51) (layer B.SilkS) (width 0.12))
+    (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))
+    (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 rect (at 0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 124 FTDI_nSLEEP))
+    (pad 1 smd rect (at -0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 133 /power/FTDI_nSUSPEND))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -8868,19 +8814,19 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B20C4B6)
-    (at 170.3 82.375)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B191618)
+    (at 119.5 80.47 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 /58D51CAD/58D67C1D)
+    (path /58D913EC/58EC4E77)
     (attr smd)
-    (fp_text reference R1 (at -2.525 0.272) (layer B.SilkS)
+    (fp_text reference R11 (at -2.776 -0.015 270) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 15k (at 0 -1.65) (layer B.Fab)
+    (fp_text value 12k (at 0 -1.65 270) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text user %R (at 0 0) (layer B.Fab)
+    (fp_text user %R (at 0 0 270) (layer B.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
     )
     (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
@@ -8893,10 +8839,10 @@
     (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))
     (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
-    (pad 2 smd rect (at 0.875 0) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 14 /power/PWREN))
-    (pad 1 smd rect (at -0.875 0) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 25 /power/WAKE))
+    (pad 2 smd rect (at 0.875 0 270) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 82 /flash/FLASH_nWP))
+    (pad 1 smd rect (at -0.875 0 270) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 5 +3V3))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -8904,16 +8850,16 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B20C4C6)
-    (at 172.84 79.835 90)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B191628)
+    (at 114.42 88.344 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")
     (tags resistor)
-    (path /58D51CAD/58D7BDD9)
+    (path /58D913EC/58EC4E85)
     (attr smd)
-    (fp_text reference R2 (at -2.304 0.015 90) (layer B.SilkS)
+    (fp_text reference R12 (at 6.967 -0.1755 90) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 47k (at 0 -1.65 90) (layer B.Fab)
+    (fp_text value 12k (at 0 -1.65 90) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
@@ -8930,9 +8876,9 @@
       (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
     )
     (pad 1 smd rect (at -0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 14 /power/PWREN))
+      (net 5 +3V3))
     (pad 2 smd rect (at 0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 1 GND))
+      (net 83 /flash/FLASH_nHOLD))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -8940,19 +8886,19 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B20C4D6)
-    (at 162.045 70.31 90)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B191935)
+    (at 176.015 78.565 180)
     (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 /58D51CAD/58E810CC)
+    (path /58D51CAD/58DA1F4D)
     (attr smd)
-    (fp_text reference R3 (at -1.415 -1.763 180) (layer B.SilkS)
+    (fp_text reference R13 (at -5.603 -0.145 180) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 4.7k (at 0 -1.65 90) (layer B.Fab)
+    (fp_text value 15k (at 0 -1.65 180) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text user %R (at 0 0 90) (layer B.Fab)
+    (fp_text user %R (at 0 0 180) (layer B.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
     )
     (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
@@ -8965,10 +8911,10 @@
     (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))
     (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
-    (pad 2 smd rect (at 0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 156 /power/PWRBTn))
-    (pad 1 smd rect (at -0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 2 +5V))
+    (pad 2 smd rect (at 0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 1 GND))
+    (pad 1 smd rect (at -0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 30 SHUTDOWN))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -8976,16 +8922,16 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B20C4E6)
-    (at 176.015 80.47 180)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B191648)
+    (at 125.596 85.06 180)
     (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 /58D51CAD/58D7CBD5)
+    (path /58D82BD0/58D90500)
     (attr smd)
-    (fp_text reference R4 (at -5.222 -0.018 180) (layer B.SilkS)
+    (fp_text reference R14 (at 2.779 0 180) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 4.7k (at 0 -1.65 180) (layer B.Fab)
+    (fp_text value 1.2k (at 0 -1.65 180) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_text user %R (at 0 0 180) (layer B.Fab)
@@ -9002,9 +8948,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 rect (at 0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 14 /power/PWREN))
+      (net 31 /analog/AUDIO_L))
     (pad 1 smd rect (at -0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 26 /power/HOLD))
+      (net 107 AUDIO_L0))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -9012,16 +8958,16 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B20C4F6)
-    (at 174.11 76.025 270)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B191658)
+    (at 125.596 83.536 180)
     (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 /58D51CAD/58D85B68)
+    (path /58D82BD0/58D904D5)
     (attr smd)
-    (fp_text reference R5 (at 1.034 7.986 270) (layer B.SilkS)
+    (fp_text reference R15 (at 2.779 0 180) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 4.7M (at 0 -1.65 270) (layer B.Fab)
+    (fp_text value 680 (at 0 -1.65 180) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
@@ -9034,13 +8980,13 @@
     (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
     (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
     (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_text user %R (at 0 0 270) (layer B.Fab)
+    (fp_text user %R (at 0 0 180) (layer B.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
     )
-    (pad 1 smd rect (at -0.875 0 270) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 24 /power/SHUT))
-    (pad 2 smd rect (at 0.875 0 270) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 1 GND))
+    (pad 1 smd rect (at -0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 106 AUDIO_L1))
+    (pad 2 smd rect (at 0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 31 /analog/AUDIO_L))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -9048,19 +8994,19 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B20C506)
-    (at 128.39 109.68 270)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B191668)
+    (at 125.596 82.012 180)
     (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 /58D6BF46/58EB9CB5)
+    (path /58D82BD0/58D904AE)
     (attr smd)
-    (fp_text reference R9 (at -6.586 -0.015 90) (layer B.SilkS)
+    (fp_text reference R16 (at 2.779 0 180) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 15k (at 0 -1.65 270) (layer B.Fab)
+    (fp_text value 330 (at 0 -1.65 180) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text user %R (at 0 0 270) (layer B.Fab)
+    (fp_text user %R (at 0 0 180) (layer B.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
     )
     (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
@@ -9073,10 +9019,10 @@
     (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))
     (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
-    (pad 2 smd rect (at 0.875 0 270) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 176 FT2V5))
-    (pad 1 smd rect (at -0.875 0 270) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 42 nRESET))
+    (pad 2 smd rect (at 0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 31 /analog/AUDIO_L))
+    (pad 1 smd rect (at -0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 105 AUDIO_L2))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -9084,16 +9030,16 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B20C516)
-    (at 119.5 80.47 270)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B191678)
+    (at 125.596 80.47 180)
     (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 /58D913EC/58EC4E77)
+    (path /58D82BD0/58D90455)
     (attr smd)
-    (fp_text reference R11 (at -2.903 -0.015 270) (layer B.SilkS)
+    (fp_text reference R17 (at 2.779 -0.018 180) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 10k (at 0 -1.65 270) (layer B.Fab)
+    (fp_text value 150 (at 0 -1.65 180) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
@@ -9106,13 +9052,13 @@
     (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
     (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
     (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_text user %R (at 0 0 270) (layer B.Fab)
+    (fp_text user %R (at 0 0 180) (layer B.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
     )
-    (pad 1 smd rect (at -0.875 0 270) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 5 +3V3))
-    (pad 2 smd rect (at 0.875 0 270) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 82 /flash/FLASH_nWP))
+    (pad 1 smd rect (at -0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 104 AUDIO_L3))
+    (pad 2 smd rect (at 0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 31 /analog/AUDIO_L))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -9120,35 +9066,107 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B20C526)
-    (at 176.015 78.565 180)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B191688)
+    (at 130.422 74.773 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")
     (tags resistor)
-    (path /58D51CAD/58DA1F4D)
+    (path /58D82BD0/58D907DC)
     (attr smd)
-    (fp_text reference R13 (at -5.603 -0.018 180) (layer B.SilkS)
+    (fp_text reference R18 (at -2.794 0.015 90) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 15k (at 0 -1.65 180) (layer B.Fab)
+    (fp_text value 1.2k (at 0 -1.65 90) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (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))
-    (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))
-    (fp_line (start -0.22 0.51) (end 0.22 0.51) (layer B.SilkS) (width 0.12))
-    (fp_line (start -0.22 -0.51) (end 0.22 -0.51) (layer B.SilkS) (width 0.12))
-    (fp_line (start -1.46 -0.75) (end -1.46 0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_text user %R (at 0 0 90) (layer B.Fab)
+      (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
+    )
+    (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
     (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.46 -0.75) (end -1.46 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -0.22 -0.51) (end 0.22 -0.51) (layer B.SilkS) (width 0.12))
+    (fp_line (start -0.22 0.51) (end 0.22 0.51) (layer B.SilkS) (width 0.12))
+    (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))
+    (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 rect (at 0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 32 /analog/AUDIO_R))
+    (pad 1 smd rect (at -0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 111 AUDIO_R0))
+    (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 B.Cu) (tedit 59FE48B8) (tstamp 5B191698)
+    (at 131.961 74.773 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")
+    (tags resistor)
+    (path /58D82BD0/58D907D6)
+    (attr smd)
+    (fp_text reference R19 (at -2.794 0 90) (layer B.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text value 680 (at 0 -1.65 90) (layer B.Fab)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text user %R (at 0 0 90) (layer B.Fab)
+      (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
+    )
     (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_text user %R (at 0 0 180) (layer B.Fab)
+    (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.46 -0.75) (end -1.46 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -0.22 -0.51) (end 0.22 -0.51) (layer B.SilkS) (width 0.12))
+    (fp_line (start -0.22 0.51) (end 0.22 0.51) (layer B.SilkS) (width 0.12))
+    (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))
+    (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 rect (at 0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 32 /analog/AUDIO_R))
+    (pad 1 smd rect (at -0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 110 AUDIO_R1))
+    (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 B.Cu) (tedit 59FE48B8) (tstamp 5B1916A8)
+    (at 133.485 74.773 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")
+    (tags resistor)
+    (path /58D82BD0/58D907D0)
+    (attr smd)
+    (fp_text reference R20 (at -2.794 0 90) (layer B.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text value 330 (at 0 -1.65 90) (layer B.Fab)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text user %R (at 0 0 90) (layer B.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
     )
-    (pad 1 smd rect (at -0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 30 SHUTDOWN))
-    (pad 2 smd rect (at 0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 1 GND))
+    (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.46 -0.75) (end -1.46 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -0.22 -0.51) (end 0.22 -0.51) (layer B.SilkS) (width 0.12))
+    (fp_line (start -0.22 0.51) (end 0.22 0.51) (layer B.SilkS) (width 0.12))
+    (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))
+    (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 rect (at 0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 32 /analog/AUDIO_R))
+    (pad 1 smd rect (at -0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 109 AUDIO_R2))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -9156,16 +9174,16 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B20C536)
-    (at 140.0255 65.23 90)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B1916B8)
+    (at 135.009 74.773 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")
     (tags resistor)
-    (path /58D686D9/58D92D93)
+    (path /58D82BD0/58D907CA)
     (attr smd)
-    (fp_text reference R22 (at -1.542 -1.4605 270) (layer B.SilkS)
+    (fp_text reference R21 (at -2.794 0.127 90) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 2.2k (at 0 -1.65 90) (layer B.Fab)
+    (fp_text value 150 (at 0 -1.65 90) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
@@ -9182,9 +9200,9 @@
       (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
     )
     (pad 1 smd rect (at -0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 5 +3V3))
+      (net 108 AUDIO_R3))
     (pad 2 smd rect (at 0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 261 FPDI_SDA))
+      (net 32 /analog/AUDIO_R))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -9192,35 +9210,35 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B20C546)
-    (at 140.597 70.201 270)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B1916C8)
+    (at 140.0255 65.23 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")
     (tags resistor)
-    (path /58D686D9/58D92CF9)
+    (path /58D686D9/58D92D93)
     (attr smd)
-    (fp_text reference R23 (at 2.794 -0.0635 270) (layer B.SilkS)
+    (fp_text reference R22 (at -1.415 -1.3335 90) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 2.2k (at 0 -1.65 270) (layer B.Fab)
+    (fp_text value 3.3k (at 0 -1.65 90) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text user %R (at 0 0 270) (layer B.Fab)
+    (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))
+    (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))
+    (fp_line (start -0.22 0.51) (end 0.22 0.51) (layer B.SilkS) (width 0.12))
+    (fp_line (start -0.22 -0.51) (end 0.22 -0.51) (layer B.SilkS) (width 0.12))
+    (fp_line (start -1.46 -0.75) (end -1.46 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
+    (fp_text user %R (at 0 0 90) (layer B.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
     )
-    (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -1.46 -0.75) (end -1.46 0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -0.22 -0.51) (end 0.22 -0.51) (layer B.SilkS) (width 0.12))
-    (fp_line (start -0.22 0.51) (end 0.22 0.51) (layer B.SilkS) (width 0.12))
-    (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))
-    (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 rect (at 0.875 0 270) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 262 FPDI_SCL))
-    (pad 1 smd rect (at -0.875 0 270) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+    (pad 1 smd rect (at -0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
       (net 5 +3V3))
+    (pad 2 smd rect (at 0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 261 FPDI_SDA))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -9228,19 +9246,19 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B20C556)
-    (at 150.615 66.772 90)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B1916D8)
+    (at 140.597 70.201 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 /58D686D9/58D92136)
+    (path /58D686D9/58D92CF9)
     (attr smd)
-    (fp_text reference R24 (at 0 -1.255 90) (layer B.SilkS)
+    (fp_text reference R23 (at 2.794 0 270) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 100k (at 0 -1.65 90) (layer B.Fab)
+    (fp_text value 3.3k (at 0 -1.65 270) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text user %R (at 0 0 90) (layer B.Fab)
+    (fp_text user %R (at 0 0 270) (layer B.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
     )
     (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
@@ -9253,10 +9271,10 @@
     (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))
     (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
-    (pad 2 smd rect (at 0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 35 /gpdi/VREF2))
-    (pad 1 smd rect (at -0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 2 +5V))
+    (pad 2 smd rect (at 0.875 0 270) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 262 FPDI_SCL))
+    (pad 1 smd rect (at -0.875 0 270) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 5 +3V3))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -9264,16 +9282,16 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B20C566)
-    (at 149.175 72.215 180)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B1916E8)
+    (at 150.615 66.772 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")
     (tags resistor)
-    (path /58D686D9/58D921DD)
+    (path /58D686D9/58D92136)
     (attr smd)
-    (fp_text reference R25 (at 0.069 -1.288 180) (layer B.SilkS)
+    (fp_text reference R24 (at 0 -1.382 90) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 4.7k (at 0 -1.65 180) (layer B.Fab)
+    (fp_text value 100k (at 0 -1.65 90) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
@@ -9286,13 +9304,49 @@
     (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
     (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
     (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_text user %R (at 0 0 180) (layer B.Fab)
+    (fp_text user %R (at 0 0 90) (layer B.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
     )
-    (pad 1 smd rect (at -0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+    (pad 1 smd rect (at -0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
       (net 2 +5V))
+    (pad 2 smd rect (at 0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 35 /gpdi/VREF2))
+    (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 B.Cu) (tedit 59FE48B8) (tstamp 5B1916F8)
+    (at 149.175 72.487 180)
+    (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 /58D686D9/58D921DD)
+    (attr smd)
+    (fp_text reference R25 (at 2.863 -0.381 180) (layer B.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text value 4.7k (at 0 -1.65 180) (layer B.Fab)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text user %R (at 0 0 180) (layer B.Fab)
+      (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
+    )
+    (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.46 -0.75) (end -1.46 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -0.22 -0.51) (end 0.22 -0.51) (layer B.SilkS) (width 0.12))
+    (fp_line (start -0.22 0.51) (end 0.22 0.51) (layer B.SilkS) (width 0.12))
+    (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))
+    (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 rect (at 0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
       (net 34 GPDI_SCL))
+    (pad 1 smd rect (at -0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 2 +5V))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -9300,13 +9354,13 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5AFF1455)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B191708)
     (at 149.487 69.693 180)
     (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 /58D686D9/58D92237)
     (attr smd)
-    (fp_text reference R26 (at 0 -1.3335 180) (layer B.SilkS)
+    (fp_text reference R26 (at 0.127 -1.397 180) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_text value 4.7k (at 0 -1.65 180) (layer B.Fab)
@@ -9336,7 +9390,7 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B20C586)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B191718)
     (at 129.025 96.175 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")
     (tags resistor)
@@ -9345,7 +9399,7 @@
     (fp_text reference R27 (at 2.86 0.015 90) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 10k (at 0 -1.65 90) (layer B.Fab)
+    (fp_text value 12k (at 0 -1.65 90) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_text user %R (at 0 0 90) (layer B.Fab)
@@ -9372,16 +9426,16 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B20C596)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B191728)
     (at 117.595 80.47 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 /58D913EC/58EC0F8E)
     (attr smd)
-    (fp_text reference R28 (at -2.903 -0.015 270) (layer B.SilkS)
+    (fp_text reference R28 (at -2.776 -0.015 270) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 10k (at 0 -1.65 270) (layer B.Fab)
+    (fp_text value 12k (at 0 -1.65 270) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
@@ -9408,35 +9462,71 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B20C5A6)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B191738)
+    (at 112.896 88.344 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")
+    (tags resistor)
+    (path /58D913EC/58EC15E1)
+    (attr smd)
+    (fp_text reference R29 (at 6.967 -0.239 90) (layer B.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text value 1.2k (at 0 -1.65 90) (layer B.Fab)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (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))
+    (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))
+    (fp_line (start -0.22 0.51) (end 0.22 0.51) (layer B.SilkS) (width 0.12))
+    (fp_line (start -0.22 -0.51) (end 0.22 -0.51) (layer B.SilkS) (width 0.12))
+    (fp_line (start -1.46 -0.75) (end -1.46 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
+    (fp_text user %R (at 0 0 90) (layer B.Fab)
+      (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
+    )
+    (pad 1 smd rect (at -0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 5 +3V3))
+    (pad 2 smd rect (at 0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 86 /flash/FLASH_SCK))
+    (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 B.Cu) (tedit 59FE48B8) (tstamp 5B191748)
     (at 115.69 80.47 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 /58D913EC/58EC1C84)
     (attr smd)
-    (fp_text reference R30 (at -2.903 -0.015 270) (layer B.SilkS)
+    (fp_text reference R30 (at -2.776 -0.015 270) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_text value 4.7k (at 0 -1.65 270) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
+    (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))
+    (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))
+    (fp_line (start -0.22 0.51) (end 0.22 0.51) (layer B.SilkS) (width 0.12))
+    (fp_line (start -0.22 -0.51) (end 0.22 -0.51) (layer B.SilkS) (width 0.12))
+    (fp_line (start -1.46 -0.75) (end -1.46 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
     (fp_text user %R (at 0 0 270) (layer B.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
     )
-    (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -1.46 -0.75) (end -1.46 0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -0.22 -0.51) (end 0.22 -0.51) (layer B.SilkS) (width 0.12))
-    (fp_line (start -0.22 0.51) (end 0.22 0.51) (layer B.SilkS) (width 0.12))
-    (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))
-    (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 rect (at 0.875 0 270) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 87 /flash/FLASH_nCS))
     (pad 1 smd rect (at -0.875 0 270) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
       (net 5 +3V3))
+    (pad 2 smd rect (at 0.875 0 270) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 87 /flash/FLASH_nCS))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -9444,7 +9534,7 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B20C5B6)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B191758)
     (at 143.63 98.25 180)
     (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)
@@ -9453,7 +9543,7 @@
     (fp_text reference R31 (at 0 1.65 180) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 10k (at 0 -1.65 180) (layer B.Fab)
+    (fp_text value 12k (at 0 -1.65 180) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_text user %R (at 0 0 180) (layer B.Fab)
@@ -9480,7 +9570,7 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B20C5C6)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B191768)
     (at 132.835 97.615 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")
     (tags resistor)
@@ -9489,7 +9579,7 @@
     (fp_text reference R32 (at 2.776 0.015 90) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 10k (at 0 -1.65 90) (layer B.Fab)
+    (fp_text value 12k (at 0 -1.65 90) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
@@ -9516,7 +9606,7 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B20C5D6)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B191778)
     (at 130.93 97.615 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")
     (tags resistor)
@@ -9525,7 +9615,7 @@
     (fp_text reference R33 (at 2.776 0.015 90) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 10k (at 0 -1.65 90) (layer B.Fab)
+    (fp_text value 12k (at 0 -1.65 90) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_text user %R (at 0 0 90) (layer B.Fab)
@@ -9552,121 +9642,13 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B20C5E6)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B191788)
     (at 102.99 103.6)
     (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 /58D6D447/58ED6C6D)
     (attr smd)
-    (fp_text reference R34 (at -2.779 0.129) (layer B.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_text value 15k (at 0 -1.65) (layer B.Fab)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_text user %R (at 0 0) (layer B.Fab)
-      (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
-    )
-    (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -1.46 -0.75) (end -1.46 0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -0.22 -0.51) (end 0.22 -0.51) (layer B.SilkS) (width 0.12))
-    (fp_line (start -0.22 0.51) (end 0.22 0.51) (layer B.SilkS) (width 0.12))
-    (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))
-    (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 rect (at 0.875 0) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 94 WIFI_EN))
-    (pad 1 smd rect (at -0.875 0) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 5 +3V3))
-    (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 B.Cu) (tedit 59FE48B8) (tstamp 5B20C5F6)
-    (at 103.498 98.758 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")
-    (tags resistor)
-    (path /58DA7327/590C5D62)
-    (attr smd)
-    (fp_text reference R38 (at -3.447 1.412 90) (layer B.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_text value 0.47 (at 0 -1.65 90) (layer B.Fab)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (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))
-    (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))
-    (fp_line (start -0.22 0.51) (end 0.22 0.51) (layer B.SilkS) (width 0.12))
-    (fp_line (start -0.22 -0.51) (end 0.22 -0.51) (layer B.SilkS) (width 0.12))
-    (fp_line (start -1.46 -0.75) (end -1.46 0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_text user %R (at 0 0 90) (layer B.Fab)
-      (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
-    )
-    (pad 1 smd rect (at -0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 127 /sdcard/SD3V3))
-    (pad 2 smd rect (at 0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 5 +3V3))
-    (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 B.Cu) (tedit 59FE48B8) (tstamp 5B20C606)
-    (at 134.74 97.615 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 /58D913EC/59DEB568)
-    (attr smd)
-    (fp_text reference R55 (at -2.776 0.112 270) (layer B.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_text value 15k (at 0 -1.65 270) (layer B.Fab)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (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))
-    (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))
-    (fp_line (start -0.22 0.51) (end 0.22 0.51) (layer B.SilkS) (width 0.12))
-    (fp_line (start -0.22 -0.51) (end 0.22 -0.51) (layer B.SilkS) (width 0.12))
-    (fp_line (start -1.46 -0.75) (end -1.46 0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_text user %R (at 0 0 270) (layer B.Fab)
-      (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
-    )
-    (pad 1 smd rect (at -0.875 0 270) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 89 /flash/FPGA_DONE))
-    (pad 2 smd rect (at 0.875 0 270) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 157 PROG_DONE))
-    (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 B.Cu) (tedit 59FE48B8) (tstamp 5B20C616)
-    (at 167.506 67.135)
-    (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 /58D6BF46/5A71E38F)
-    (attr smd)
-    (fp_text reference R63 (at 0.015 -2.649) (layer B.SilkS)
+    (fp_text reference R34 (at -2.779 0.002) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_text value 15k (at 0 -1.65) (layer B.Fab)
@@ -9686,9 +9668,9 @@
       (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
     )
     (pad 1 smd rect (at -0.875 0) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 237 "Net-(D23-Pad2)"))
+      (net 5 +3V3))
     (pad 2 smd rect (at 0.875 0) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 132 USB_FPGA_D+))
+      (net 94 WIFI_EN))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -9696,16 +9678,16 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B20C626)
-    (at 173.6 67.12 180)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B191798)
+    (at 102.99 102.06 180)
     (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 /58D6BF46/5A71E566)
+    (path /58D6D447/58FD4C5D)
     (attr smd)
-    (fp_text reference R64 (at 0 2.634 180) (layer B.SilkS)
+    (fp_text reference R35 (at 2.779 -0.018 180) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 15k (at 0 -1.65 180) (layer B.Fab)
+    (fp_text value 680 (at 0 -1.65 180) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_text user %R (at 0 0 180) (layer B.Fab)
@@ -9722,9 +9704,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 rect (at 0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 151 USB_FPGA_D-))
+      (net 175 /wifi/WIFIEN))
     (pad 1 smd rect (at -0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 239 "Net-(D25-Pad2)"))
+      (net 94 WIFI_EN))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -9732,35 +9714,35 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B20C636)
-    (at 154.86 95.64)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B1917A8)
+    (at 103.498 98.758 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")
     (tags resistor)
-    (path /58D51CAD/58D5A193)
+    (path /58DA7327/590C5D62)
     (attr smd)
-    (fp_text reference RA1 (at 0 -1.309) (layer B.SilkS)
+    (fp_text reference R38 (at -3.447 1.4755 90) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 15k (at 0 -1.65) (layer B.Fab)
+    (fp_text value 0.47 (at 0 -1.65 90) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text user %R (at 0 0) (layer B.Fab)
-      (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
-    )
-    (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -1.46 -0.75) (end -1.46 0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -0.22 -0.51) (end 0.22 -0.51) (layer B.SilkS) (width 0.12))
-    (fp_line (start -0.22 0.51) (end 0.22 0.51) (layer B.SilkS) (width 0.12))
-    (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))
-    (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 rect (at 0.875 0) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 12 /power/FB1))
-    (pad 1 smd rect (at -0.875 0) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 171 /power/P1V1))
+    (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))
+    (fp_line (start 0.8 -0.4) (end -0.8 -0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.22 0.51) (end 0.22 0.51) (layer B.SilkS) (width 0.12))
+    (fp_line (start -0.22 -0.51) (end 0.22 -0.51) (layer B.SilkS) (width 0.12))
+    (fp_line (start -1.46 -0.75) (end -1.46 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
+    (fp_text user %R (at 0 0 90) (layer B.Fab)
+      (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
+    )
+    (pad 1 smd rect (at -0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 127 /sdcard/SD3V3))
+    (pad 2 smd rect (at 0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 5 +3V3))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -9768,35 +9750,35 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B20C646)
-    (at 109.34 82.375 180)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B1917B8)
+    (at 163.315 96.345 180)
     (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 /58D51CAD/58D67BE4)
+    (path /58D6547C/591B5493)
     (attr smd)
-    (fp_text reference RA2 (at 0 5.062 180) (layer B.SilkS)
+    (fp_text reference R39 (at 0 1.65 180) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 15k (at 0 -1.65 180) (layer B.Fab)
+    (fp_text value 150 (at 0 -1.65 180) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
+    (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))
+    (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))
+    (fp_line (start -0.22 0.51) (end 0.22 0.51) (layer B.SilkS) (width 0.12))
+    (fp_line (start -0.22 -0.51) (end 0.22 -0.51) (layer B.SilkS) (width 0.12))
+    (fp_line (start -1.46 -0.75) (end -1.46 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
     (fp_text user %R (at 0 0 180) (layer B.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
     )
-    (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -1.46 -0.75) (end -1.46 0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -0.22 -0.51) (end 0.22 -0.51) (layer B.SilkS) (width 0.12))
-    (fp_line (start -0.22 0.51) (end 0.22 0.51) (layer B.SilkS) (width 0.12))
-    (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))
-    (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 rect (at 0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 16 /power/FB2))
     (pad 1 smd rect (at -0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 159 /power/P2V5))
+      (net 5 +3V3))
+    (pad 2 smd rect (at 0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 131 /blinkey/BTNPUR))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -9804,16 +9786,16 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B20C656)
-    (at 152.52 81.105)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B1917C8)
+    (at 167.506 67.135)
     (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 /58D51CAD/58D62970)
+    (path /58D6BF46/5A71E38F)
     (attr smd)
-    (fp_text reference RA3 (at -3.287 -0.109) (layer B.SilkS)
+    (fp_text reference R63 (at 0 1.65) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 15k (at 0 -1.65) (layer B.Fab)
+    (fp_text value 12k (at 0 -1.65) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_text user %R (at 0 0) (layer B.Fab)
@@ -9830,9 +9812,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 rect (at 0.875 0) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 15 /power/FB3))
+      (net 132 USB_FPGA_D+))
     (pad 1 smd rect (at -0.875 0) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 158 /power/P3V3))
+      (net 237 "Net-(D23-Pad2)"))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -9840,16 +9822,16 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B20C666)
-    (at 158.235 91.9 270)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B1917D8)
+    (at 173.6 67.12 180)
     (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 /58D51CAD/58D5A1E5)
+    (path /58D6BF46/5A71E566)
     (attr smd)
-    (fp_text reference RB1 (at 2.812 0.493 270) (layer B.SilkS)
+    (fp_text reference R64 (at 0 2.634 180) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 18k (at 0 -1.65 270) (layer B.Fab)
+    (fp_text value 12k (at 0 -1.65 180) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
@@ -9862,13 +9844,13 @@
     (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
     (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
     (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_text user %R (at 0 0 270) (layer B.Fab)
+    (fp_text user %R (at 0 0 180) (layer B.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
     )
-    (pad 1 smd rect (at -0.875 0 270) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 1 GND))
-    (pad 2 smd rect (at 0.875 0 270) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 12 /power/FB1))
+    (pad 1 smd rect (at -0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 239 "Net-(D25-Pad2)"))
+    (pad 2 smd rect (at 0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 151 USB_FPGA_D-))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -9876,16 +9858,16 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B20C676)
-    (at 106.165 84.915 90)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B1917E8)
+    (at 154.86 95.64)
     (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 /58D51CAD/58D67BEA)
+    (path /58D51CAD/58D5A193)
     (attr smd)
-    (fp_text reference RB2 (at 2.903 0.015 90) (layer B.SilkS)
+    (fp_text reference RA1 (at 0 -1.309) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 4.7k (at 0 -1.65 90) (layer B.Fab)
+    (fp_text value 15k (at 0 -1.65) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
@@ -9898,13 +9880,13 @@
     (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
     (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
     (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_text user %R (at 0 0 90) (layer B.Fab)
+    (fp_text user %R (at 0 0) (layer B.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
     )
-    (pad 1 smd rect (at -0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 1 GND))
-    (pad 2 smd rect (at 0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 16 /power/FB2))
+    (pad 1 smd rect (at -0.875 0) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 171 /power/P1V1))
+    (pad 2 smd rect (at 0.875 0) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 12 /power/FB1))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -9912,16 +9894,16 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B20C686)
-    (at 155.695 78.565 270)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B1917F8)
+    (at 109.34 82.375 180)
     (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 /58D51CAD/58D62976)
+    (path /58D51CAD/58D67BE4)
     (attr smd)
-    (fp_text reference RB3 (at 2.939 0.62 270) (layer B.SilkS)
+    (fp_text reference RA2 (at -0.015 5.062 180) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 3.3k (at 0 -1.65 270) (layer B.Fab)
+    (fp_text value 15k (at 0 -1.65 180) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
@@ -9934,13 +9916,13 @@
     (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
     (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
     (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_text user %R (at 0 0 270) (layer B.Fab)
+    (fp_text user %R (at 0 0 180) (layer B.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
     )
-    (pad 1 smd rect (at -0.875 0 270) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 1 GND))
-    (pad 2 smd rect (at 0.875 0 270) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 15 /power/FB3))
+    (pad 1 smd rect (at -0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 159 /power/P2V5))
+    (pad 2 smd rect (at 0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 16 /power/FB2))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -9948,106 +9930,88 @@
     )
   )
 
-  (module SM8:SM8 (layer B.Cu) (tedit 5A0C2F78) (tstamp 5B17ED8A)
-    (at 144.68 65.8015 90)
-    (descr "TI SM8 SOIC-8 150 mil")
-    (tags "SOIC-8 1.27 150 mil SOT96-1")
-    (path /58D686D9/5B01C6B5)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B191808)
+    (at 152.52 81.105)
+    (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 /58D51CAD/58D62970)
     (attr smd)
-    (fp_text reference U11 (at 3.3475 -0.019 -180) (layer B.SilkS)
+    (fp_text reference RA3 (at -3.16 0.018) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value PCA9306D (at 4.318 -5.588 -180) (layer B.Fab)
+    (fp_text value 15k (at 0 -1.65) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_circle (center -2.286 -0.9525) (end -2.2225 -0.889) (layer B.SilkS) (width 0.15))
-    (fp_line (start 2.54 -1.778) (end -2.54 -1.778) (layer B.SilkS) (width 0.15))
-    (fp_line (start -2.54 -1.27) (end 2.54 -1.27) (layer B.SilkS) (width 0.15))
-    (fp_line (start -2.45 -0.95) (end -2.45 1.95) (layer B.Fab) (width 0.15))
-    (fp_line (start -2.45 1.95) (end 2.45 1.95) (layer B.Fab) (width 0.15))
-    (fp_line (start 2.45 1.95) (end 2.45 -1.95) (layer B.Fab) (width 0.15))
-    (fp_line (start 2.45 -1.95) (end -1.45 -1.95) (layer B.Fab) (width 0.15))
-    (fp_line (start -1.45 -1.95) (end -2.45 -0.95) (layer B.Fab) (width 0.15))
-    (fp_line (start -2.75 -3.75) (end 2.75 -3.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -2.75 3.75) (end 2.75 3.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -2.75 -3.75) (end -2.75 3.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 2.75 -3.75) (end 2.75 3.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -2.575 -2.075) (end -2.525 -2.075) (layer B.SilkS) (width 0.15))
-    (fp_line (start -2.575 2.075) (end -2.43 2.075) (layer B.SilkS) (width 0.15))
-    (fp_line (start 2.575 2.075) (end 2.43 2.075) (layer B.SilkS) (width 0.15))
-    (fp_line (start 2.575 -2.075) (end 2.43 -2.075) (layer B.SilkS) (width 0.15))
-    (fp_line (start -2.575 -2.075) (end -2.575 2.075) (layer B.SilkS) (width 0.15))
-    (fp_line (start 2.575 -2.075) (end 2.575 2.075) (layer B.SilkS) (width 0.15))
-    (fp_line (start -2.525 -2.075) (end -2.525 -3.475) (layer B.SilkS) (width 0.15))
-    (pad 1 smd rect (at -1.905 -2.7) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
-      (net 1 GND))
-    (pad 2 smd oval (at -0.635 -2.7) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
-      (net 5 +3V3))
-    (pad 3 smd oval (at 0.635 -2.7) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
-      (net 262 FPDI_SCL))
-    (pad 4 smd oval (at 1.905 -2.7) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
-      (net 261 FPDI_SDA))
-    (pad 5 smd oval (at 1.905 2.7) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
-      (net 33 GPDI_SDA))
-    (pad 6 smd oval (at 0.635 2.7) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
-      (net 34 GPDI_SCL))
-    (pad 7 smd oval (at -0.635 2.7) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
-      (net 35 /gpdi/VREF2))
-    (pad 8 smd oval (at -1.905 2.7) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
-      (net 35 /gpdi/VREF2))
-    (model ${KISYS3DMOD}/Package_SO.3dshapes/SOIC-8_3.9x4.9mm_P1.27mm.wrl
+    (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))
+    (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))
+    (fp_line (start -0.22 0.51) (end 0.22 0.51) (layer B.SilkS) (width 0.12))
+    (fp_line (start -0.22 -0.51) (end 0.22 -0.51) (layer B.SilkS) (width 0.12))
+    (fp_line (start -1.46 -0.75) (end -1.46 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
+    (fp_text user %R (at 0 0) (layer B.Fab)
+      (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
+    )
+    (pad 1 smd rect (at -0.875 0) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 158 /power/P3V3))
+    (pad 2 smd rect (at 0.875 0) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 15 /power/FB3))
+    (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 -90))
+      (rotate (xyz 0 0 0))
     )
   )
 
-  (module Capacitor_SMD:C_0805_2012Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B1118A2)
-    (at 179.078 91.918 270)
-    (descr "Capacitor SMD 0805 (2012 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 capacitor)
-    (path /58D51CAD/5B09EC4B)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B191818)
+    (at 158.235 91.9 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 /58D51CAD/58D5A1E5)
     (attr smd)
-    (fp_text reference C55 (at 0 -1.524 270) (layer B.SilkS)
+    (fp_text reference RB1 (at 2.812 0.62 270) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 22uF (at 0 -1.85 270) (layer B.Fab)
+    (fp_text value 18k (at 0 -1.65 270) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_line (start -1 -0.6) (end -1 0.6) (layer B.Fab) (width 0.1))
-    (fp_line (start -1 0.6) (end 1 0.6) (layer B.Fab) (width 0.1))
-    (fp_line (start 1 0.6) (end 1 -0.6) (layer B.Fab) (width 0.1))
-    (fp_line (start 1 -0.6) (end -1 -0.6) (layer B.Fab) (width 0.1))
-    (fp_line (start -0.15 0.71) (end 0.15 0.71) (layer B.SilkS) (width 0.12))
-    (fp_line (start -0.15 -0.71) (end 0.15 -0.71) (layer B.SilkS) (width 0.12))
-    (fp_line (start -1.69 -1) (end -1.69 1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -1.69 1) (end 1.69 1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 1.69 1) (end 1.69 -1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 1.69 -1) (end -1.69 -1) (layer B.CrtYd) (width 0.05))
     (fp_text user %R (at 0 0 270) (layer B.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
     )
-    (pad 1 smd rect (at -0.955 0 270) (size 0.97 1.5) (layers B.Cu B.Paste B.Mask)
-      (net 316 /power/RTCVDD))
-    (pad 2 smd rect (at 0.955 0 270) (size 0.97 1.5) (layers B.Cu B.Paste B.Mask)
+    (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.46 -0.75) (end -1.46 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -0.22 -0.51) (end 0.22 -0.51) (layer B.SilkS) (width 0.12))
+    (fp_line (start -0.22 0.51) (end 0.22 0.51) (layer B.SilkS) (width 0.12))
+    (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))
+    (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 rect (at 0.875 0 270) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 12 /power/FB1))
+    (pad 1 smd rect (at -0.875 0 270) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
       (net 1 GND))
-    (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0805_2012Metric.wrl
+    (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 B.Cu) (tedit 59FE48B8) (tstamp 5B1118B3)
-    (at 177.3 91.918 90)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B191828)
+    (at 106.165 84.915 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")
     (tags resistor)
-    (path /58D51CAD/5B0A7AE1)
+    (path /58D51CAD/58D67BEA)
     (attr smd)
-    (fp_text reference R65 (at 2.794 0 90) (layer B.SilkS)
+    (fp_text reference RB2 (at 2.903 0.015 90) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 1k (at 0 -1.65 90) (layer B.Fab)
+    (fp_text value 4.7k (at 0 -1.65 90) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
@@ -10064,9 +10028,45 @@
       (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
     )
     (pad 1 smd rect (at -0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 5 +3V3))
+      (net 1 GND))
     (pad 2 smd rect (at 0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 316 /power/RTCVDD))
+      (net 16 /power/FB2))
+    (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 B.Cu) (tedit 59FE48B8) (tstamp 5B191838)
+    (at 155.695 78.565 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 /58D51CAD/58D62976)
+    (attr smd)
+    (fp_text reference RB3 (at 2.812 0.366 270) (layer B.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text value 3.3k (at 0 -1.65 270) (layer B.Fab)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text user %R (at 0 0 270) (layer B.Fab)
+      (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
+    )
+    (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.46 -0.75) (end -1.46 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -0.22 -0.51) (end 0.22 -0.51) (layer B.SilkS) (width 0.12))
+    (fp_line (start -0.22 0.51) (end 0.22 0.51) (layer B.SilkS) (width 0.12))
+    (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))
+    (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 rect (at 0.875 0 270) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 15 /power/FB3))
+    (pad 1 smd rect (at -0.875 0 270) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 1 GND))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -10087,7 +10087,7 @@
     (effects (font (size 1 1) (thickness 0.25)) (justify mirror))
   )
   (gr_line (start 104.148 100.808) (end 103.513 100.3) (layer B.SilkS) (width 0.2))
-  (gr_line (start 169.426 71.471) (end 165.997 71.471) (layer B.SilkS) (width 0.2))
+  (gr_line (start 169.426 70.709) (end 165.997 70.709) (layer B.SilkS) (width 0.2))
   (gr_text FLASH (at 124.468 87.092) (layer B.SilkS) (tstamp 5AFEEC89)
     (effects (font (size 1.5 1.5) (thickness 0.3)) (justify mirror))
   )
@@ -12217,6 +12217,7 @@
   (segment (start 154.032999 63.189999) (end 154.6305 63.7875) (width 0.19) (layer F.Cu) (net 261))
   (segment (start 154.6305 63.7875) (end 154.6305 65.340342) (width 0.19) (layer F.Cu) (net 261))
   (segment (start 154.6305 65.340342) (end 154.595842 65.375) (width 0.19) (layer F.Cu) (net 261))
+  (segment (start 157.205 72.487) (end 157.996 72.487) (width 0.3) (layer B.Cu) (net 264))
   (segment (start 148.471 69.693) (end 149.995 71.217) (width 0.3) (layer In1.Cu) (net 264))
   (segment (start 149.995 71.217) (end 156.726 71.217) (width 0.3) (layer In1.Cu) (net 264))
   (segment (start 140.978 69.693) (end 148.471 69.693) (width 0.3) (layer In1.Cu) (net 264))
@@ -12227,7 +12228,6 @@
   (segment (start 157.796001 72.287001) (end 157.996 72.487) (width 0.3) (layer In1.Cu) (net 264))
   (segment (start 132.596 71.725) (end 132.596 73.376) (width 0.3) (layer In1.Cu) (net 264))
   (via (at 157.996 72.487) (size 0.4) (drill 0.2) (layers F.Cu B.Cu) (net 264))
-  (segment (start 157.205 72.487) (end 157.996 72.487) (width 0.3) (layer B.Cu) (net 264))
   (segment (start 169.31704 69.886487) (end 169.517039 69.686488) (width 0.3) (layer B.Cu) (net 314))
   (segment (start 168.141 71.062527) (end 169.31704 69.886487) (width 0.3) (layer B.Cu) (net 314))
   (segment (start 168.141 73.485) (end 168.141 71.062527) (width 0.3) (layer B.Cu) (net 314))
@@ -12500,7 +12500,6 @@
   (segment (start 147.546 70.312) (end 147.546 71.498498) (width 0.19) (layer F.Cu) (net 34))
   (segment (start 147.546 71.498498) (end 147.582 71.534498) (width 0.19) (layer F.Cu) (net 34))
   (via (at 147.582 71.534498) (size 0.4) (drill 0.2) (layers F.Cu B.Cu) (net 34))
-  (segment (start 148.075 72.215) (end 148.075 71.961) (width 0.19) (layer B.Cu) (net 34))
   (segment (start 150.615 65.672) (end 150.615 64.3844) (width 0.3) (layer B.Cu) (net 35))
   (segment (start 150.615 64.3844) (end 150.5896 64.359) (width 0.3) (layer B.Cu) (net 35))
   (segment (start 147.38 66.4365) (end 149.8505 66.4365) (width 0.3) (layer B.Cu) (net 35))
@@ -15708,10 +15707,10 @@
   (segment (start 134.88 86.2) (end 135.28 86.2) (width 0.3) (layer F.Cu) (net 264))
   (segment (start 137.676 84.2) (end 138.08 84.2) (width 0.3) (layer F.Cu) (net 264))
   (segment (start 137.28 84.2) (end 137.676 84.2) (width 0.3) (layer F.Cu) (net 264))
-  (segment (start 177.3 91.043) (end 178.998 91.043) (width 0.3) (layer B.Cu) (net 316))
-  (segment (start 178.998 91.043) (end 179.078 90.963) (width 0.3) (layer B.Cu) (net 316))
   (segment (start 175.395 90.615) (end 176.872 90.615) (width 0.3) (layer B.Cu) (net 316))
   (segment (start 176.872 90.615) (end 177.3 91.043) (width 0.3) (layer B.Cu) (net 316))
+  (segment (start 177.3 91.043) (end 178.998 91.043) (width 0.3) (layer B.Cu) (net 316))
+  (segment (start 178.998 91.043) (end 179.078 90.963) (width 0.3) (layer B.Cu) (net 316))
 
   (zone (net 1) (net_name GND) (layer B.Cu) (tstamp 0) (hatch edge 0.508)
     (connect_pads (clearance 0.254))
@@ -17467,98 +17466,99 @@
         (xy 145.984997 72.094571) (xy 146.073449 72.308113) (xy 146.236887 72.471551) (xy 146.450429 72.560003) (xy 146.681565 72.560003)
         (xy 146.895107 72.471551) (xy 147.058545 72.308113) (xy 147.111465 72.180353) (xy 147.133618 72.291725) (xy 147.144568 72.308113)
         (xy 147.238824 72.449177) (xy 147.278571 72.475735) (xy 147.339267 72.536431) (xy 147.365824 72.576176) (xy 147.523275 72.681382)
-        (xy 147.576536 72.691976) (xy 147.576536 72.715) (xy 147.606106 72.863659) (xy 147.690314 72.989686) (xy 147.816341 73.073894)
-        (xy 147.965 73.103464) (xy 148.635 73.103464) (xy 148.783659 73.073894) (xy 148.909686 72.989686) (xy 148.993894 72.863659)
-        (xy 149.023464 72.715) (xy 149.023464 71.715) (xy 148.993894 71.566341) (xy 148.909686 71.440314) (xy 148.783659 71.356106)
-        (xy 148.635 71.326536) (xy 148.124729 71.326536) (xy 148.074548 71.205388) (xy 148.058 71.18884) (xy 148.058 70.504894)
-        (xy 148.128341 70.551894) (xy 148.277 70.581464) (xy 148.947 70.581464) (xy 149.095659 70.551894) (xy 149.221686 70.467686)
-        (xy 149.305894 70.341659) (xy 149.335464 70.193) (xy 149.335464 69.427625) (xy 149.405779 69.3985) (xy 149.638536 69.3985)
-        (xy 149.638536 70.193) (xy 149.668106 70.341659) (xy 149.718 70.416332) (xy 149.718001 71.326536) (xy 149.715 71.326536)
-        (xy 149.566341 71.356106) (xy 149.440314 71.440314) (xy 149.356106 71.566341) (xy 149.326536 71.715) (xy 149.326536 72.715)
-        (xy 149.356106 72.863659) (xy 149.440314 72.989686) (xy 149.566341 73.073894) (xy 149.715 73.103464) (xy 150.385 73.103464)
-        (xy 150.533659 73.073894) (xy 150.659686 72.989686) (xy 150.743894 72.863659) (xy 150.773464 72.715) (xy 150.773464 72.101153)
-        (xy 150.78 72.068294) (xy 150.78 72.068291) (xy 150.790401 72.016001) (xy 150.78 71.963711) (xy 150.78 70.564954)
-        (xy 150.845659 70.551894) (xy 150.971686 70.467686) (xy 150.973793 70.464532) (xy 151.573073 70.464532) (xy 151.671736 70.731387)
-        (xy 152.281461 70.957908) (xy 152.93146 70.933856) (xy 153.420264 70.731387) (xy 153.518927 70.464532) (xy 152.546 69.491605)
-        (xy 151.573073 70.464532) (xy 150.973793 70.464532) (xy 151.055894 70.341659) (xy 151.085464 70.193) (xy 151.085464 70.086921)
-        (xy 151.126613 70.186264) (xy 151.393468 70.284927) (xy 152.366395 69.312) (xy 152.352253 69.297858) (xy 152.531858 69.118253)
-        (xy 152.546 69.132395) (xy 152.560143 69.118253) (xy 152.739748 69.297858) (xy 152.725605 69.312) (xy 153.698532 70.284927)
-        (xy 153.782001 70.254067) (xy 153.782 70.963658) (xy 153.771599 71.015949) (xy 153.782 71.068239) (xy 153.782 71.068242)
-        (xy 153.81281 71.223134) (xy 153.930171 71.398778) (xy 153.974505 71.428401) (xy 154.449137 71.903033) (xy 154.478758 71.947365)
-        (xy 154.491681 71.956) (xy 154.459289 71.956) (xy 154.406999 71.945599) (xy 154.354709 71.956) (xy 154.354706 71.956)
-        (xy 154.199814 71.98681) (xy 154.117164 72.042035) (xy 153.96889 72.103452) (xy 153.805452 72.26689) (xy 153.717 72.480432)
-        (xy 153.717 72.711568) (xy 153.805452 72.92511) (xy 153.96889 73.088548) (xy 154.048481 73.121516) (xy 154.035314 73.130314)
-        (xy 153.951106 73.256341) (xy 153.921536 73.405) (xy 153.921536 73.874) (xy 151.959835 73.874) (xy 151.948686 73.857314)
-        (xy 151.822659 73.773106) (xy 151.674 73.743536) (xy 150.704 73.743536) (xy 150.555341 73.773106) (xy 150.429314 73.857314)
-        (xy 150.372661 73.942102) (xy 150.302327 73.772301) (xy 150.123698 73.593673) (xy 149.890309 73.497) (xy 149.56475 73.497)
-        (xy 149.406 73.65575) (xy 149.406 74.755) (xy 149.426 74.755) (xy 149.426 75.009) (xy 149.406 75.009)
-        (xy 149.406 76.10825) (xy 149.56475 76.267) (xy 149.890309 76.267) (xy 150.123698 76.170327) (xy 150.302327 75.991699)
-        (xy 150.372661 75.821898) (xy 150.389001 75.846352) (xy 150.389 76.33) (xy 149.385233 76.33) (xy 149.128251 76.381117)
-        (xy 148.861156 76.559584) (xy 148.823341 76.567106) (xy 148.697314 76.651314) (xy 148.613106 76.777341) (xy 148.583536 76.926)
-        (xy 148.583536 77.161757) (xy 148.573741 77.211) (xy 148.583536 77.260243) (xy 148.583536 77.771) (xy 148.613106 77.919659)
-        (xy 148.697314 78.045686) (xy 148.823341 78.129894) (xy 148.972 78.159464) (xy 149.972 78.159464) (xy 150.120659 78.129894)
-        (xy 150.177372 78.092) (xy 150.389 78.092) (xy 150.389001 79.113229) (xy 150.389 79.113234) (xy 150.389001 80.848664)
-        (xy 150.321757 80.803733) (xy 150.202804 80.780072) (xy 150.182299 80.759567) (xy 150.108221 80.728883) (xy 150.108221 80.722438)
-        (xy 150.019769 80.508896) (xy 149.856331 80.345458) (xy 149.642789 80.257006) (xy 149.411653 80.257006) (xy 149.198111 80.345458)
-        (xy 149.099746 80.443823) (xy 149.025222 80.369299) (xy 148.81168 80.280847) (xy 148.580544 80.280847) (xy 148.520909 80.305548)
-        (xy 148.504363 80.289002) (xy 148.290821 80.20055) (xy 148.059685 80.20055) (xy 147.846143 80.289002) (xy 147.73303 80.402115)
-        (xy 147.572743 80.402115) (xy 147.359201 80.490567) (xy 147.342653 80.507115) (xy 145.28346 80.507115) (xy 145.23658 80.49779)
-        (xy 145.180747 80.508896) (xy 145.050855 80.534733) (xy 144.893404 80.639938) (xy 144.866844 80.679688) (xy 144.795613 80.750919)
-        (xy 144.772209 80.750919) (xy 144.614346 80.816308) (xy 144.614346 79.942357) (xy 144.721912 79.942357) (xy 144.935454 79.853905)
-        (xy 145.085543 79.703816) (xy 145.900406 79.703816) (xy 145.900406 79.934952) (xy 145.988858 80.148494) (xy 146.152296 80.311932)
-        (xy 146.365838 80.400384) (xy 146.596974 80.400384) (xy 146.810516 80.311932) (xy 146.973954 80.148494) (xy 147.062406 79.934952)
-        (xy 147.062406 79.703816) (xy 146.973954 79.490274) (xy 146.810516 79.326836) (xy 146.596974 79.238384) (xy 146.365838 79.238384)
-        (xy 146.152296 79.326836) (xy 145.988858 79.490274) (xy 145.900406 79.703816) (xy 145.085543 79.703816) (xy 145.098892 79.690467)
-        (xy 145.187344 79.476925) (xy 145.187344 79.453521) (xy 145.590847 79.050018) (xy 147.370129 79.050018) (xy 147.387387 79.136781)
-        (xy 147.387387 79.22526) (xy 147.421246 79.307003) (xy 147.438504 79.393766) (xy 147.487651 79.46732) (xy 147.521511 79.549065)
-        (xy 147.76934 79.796894) (xy 147.769343 79.796895) (xy 147.807552 79.835104) (xy 147.856704 79.908665) (xy 148.14812 80.103383)
-        (xy 148.405102 80.1545) (xy 148.405107 80.1545) (xy 148.491868 80.171758) (xy 148.57863 80.1545) (xy 149.558767 80.1545)
-        (xy 149.815749 80.103383) (xy 149.844063 80.084464) (xy 149.972 80.084464) (xy 150.120659 80.054894) (xy 150.246686 79.970686)
-        (xy 150.330894 79.844659) (xy 150.360464 79.696) (xy 150.360464 79.322743) (xy 150.370259 79.2735) (xy 150.360464 79.224257)
-        (xy 150.360464 78.851) (xy 150.330894 78.702341) (xy 150.246686 78.576314) (xy 150.120659 78.492106) (xy 149.972 78.462536)
-        (xy 149.844063 78.462536) (xy 149.815749 78.443617) (xy 149.558767 78.3925) (xy 148.856792 78.3925) (xy 148.767434 78.303142)
-        (xy 148.685689 78.269282) (xy 148.612135 78.220135) (xy 148.525372 78.202877) (xy 148.443629 78.169018) (xy 148.35515 78.169018)
-        (xy 148.268387 78.15176) (xy 148.181624 78.169018) (xy 148.093145 78.169018) (xy 148.011402 78.202877) (xy 147.924639 78.220135)
-        (xy 147.851084 78.269282) (xy 147.76934 78.303142) (xy 147.706776 78.365706) (xy 147.633222 78.414853) (xy 147.584075 78.488407)
-        (xy 147.521511 78.550971) (xy 147.487651 78.632715) (xy 147.438504 78.70627) (xy 147.421246 78.793033) (xy 147.387387 78.874776)
-        (xy 147.387387 78.963255) (xy 147.370129 79.050018) (xy 145.590847 79.050018) (xy 147.743433 76.897434) (xy 147.783177 76.870878)
-        (xy 147.888382 76.713427) (xy 147.915214 76.578534) (xy 147.925325 76.527701) (xy 147.916 76.480821) (xy 147.916 75.16775)
-        (xy 148.159 75.16775) (xy 148.159 75.75831) (xy 148.255673 75.991699) (xy 148.434302 76.170327) (xy 148.667691 76.267)
-        (xy 148.99325 76.267) (xy 149.152 76.10825) (xy 149.152 75.009) (xy 148.31775 75.009) (xy 148.159 75.16775)
-        (xy 147.916 75.16775) (xy 147.916 74.80488) (xy 147.925325 74.758) (xy 147.888382 74.572274) (xy 147.837837 74.496628)
-        (xy 147.783177 74.414823) (xy 147.743433 74.388267) (xy 147.360856 74.00569) (xy 148.159 74.00569) (xy 148.159 74.59625)
-        (xy 148.31775 74.755) (xy 149.152 74.755) (xy 149.152 73.65575) (xy 148.99325 73.497) (xy 148.667691 73.497)
-        (xy 148.434302 73.593673) (xy 148.255673 73.772301) (xy 148.159 74.00569) (xy 147.360856 74.00569) (xy 144.381 71.025836)
-        (xy 144.381 70.760417) (xy 144.388659 70.758894) (xy 144.514686 70.674686) (xy 144.598894 70.548659) (xy 144.628464 70.4)
-        (xy 144.628464 69.4) (xy 144.598894 69.251341) (xy 144.514686 69.125314) (xy 144.388659 69.041106) (xy 144.24 69.011536)
-        (xy 143.57 69.011536) (xy 143.421341 69.041106) (xy 143.295314 69.125314) (xy 143.211106 69.251341) (xy 143.181536 69.4)
-        (xy 143.181536 70.4) (xy 143.211106 70.548659) (xy 143.295314 70.674686) (xy 143.421341 70.758894) (xy 143.429 70.760418)
-        (xy 143.429 71.17612) (xy 143.419675 71.223) (xy 143.446218 71.356439) (xy 143.456618 71.408725) (xy 143.561823 71.566177)
-        (xy 143.601573 71.592737) (xy 146.964001 74.955167) (xy 146.964001 75.126894) (xy 146.794236 75.126894) (xy 146.580694 75.215346)
-        (xy 146.564146 75.231894) (xy 145.145587 75.231894) (xy 145.098708 75.222569) (xy 145.051829 75.231894) (xy 144.912983 75.259512)
-        (xy 144.755532 75.364717) (xy 144.728974 75.404464) (xy 144.289879 75.843559) (xy 144.289879 75.701732) (xy 144.201427 75.48819)
-        (xy 144.037989 75.324752) (xy 143.824447 75.2363) (xy 143.667001 75.2363) (xy 143.667001 74.641652) (xy 143.84711 74.567048)
-        (xy 144.010548 74.40361) (xy 144.099 74.190068) (xy 144.099 73.958932) (xy 144.010548 73.74539) (xy 143.84711 73.581952)
-        (xy 143.633568 73.4935) (xy 143.402432 73.4935) (xy 143.18889 73.581952) (xy 143.025452 73.74539) (xy 142.964343 73.89292)
-        (xy 142.929537 73.80889) (xy 142.766099 73.645452) (xy 142.552557 73.557) (xy 142.321421 73.557) (xy 142.107879 73.645452)
-        (xy 141.944441 73.80889) (xy 141.855989 74.022432) (xy 141.855989 74.253568) (xy 141.944441 74.46711) (xy 141.96099 74.483659)
-        (xy 141.960989 75.885845) (xy 140.504978 77.341858) (xy 140.504978 76.76275) (xy 140.821164 76.446565) (xy 140.860911 76.420007)
-        (xy 140.871159 76.404669) (xy 140.926544 76.42761) (xy 141.15768 76.42761) (xy 141.371222 76.339158) (xy 141.53466 76.17572)
-        (xy 141.623112 75.962178) (xy 141.623112 75.731042) (xy 141.53466 75.5175) (xy 141.518112 75.500952) (xy 141.518112 72.455992)
-        (xy 141.527437 72.409112) (xy 141.490494 72.223386) (xy 141.385289 72.065935) (xy 141.300337 72.009172) (xy 141.090628 71.799464)
-        (xy 141.097 71.799464) (xy 141.245659 71.769894) (xy 141.371686 71.685686) (xy 141.455894 71.559659) (xy 141.485464 71.411)
-        (xy 141.485464 70.741) (xy 141.455894 70.592341) (xy 141.371686 70.466314) (xy 141.245659 70.382106) (xy 141.097 70.352536)
-        (xy 140.097 70.352536) (xy 140.057 70.360492) (xy 140.057 70.041508) (xy 140.097 70.049464) (xy 141.097 70.049464)
-        (xy 141.245659 70.019894) (xy 141.371686 69.935686) (xy 141.455894 69.809659) (xy 141.485464 69.661) (xy 141.485464 68.991)
-        (xy 141.455894 68.842341) (xy 141.371686 68.716314) (xy 141.259718 68.6415) (xy 141.69425 68.6415) (xy 141.853 68.48275)
-        (xy 141.853 67.8335) (xy 142.107 67.8335) (xy 142.107 68.48275) (xy 142.26575 68.6415) (xy 142.881309 68.6415)
-        (xy 143.114698 68.544827) (xy 143.293327 68.366199) (xy 143.39 68.13281) (xy 143.39 67.99225) (xy 143.23125 67.8335)
-        (xy 142.107 67.8335) (xy 141.853 67.8335) (xy 141.833 67.8335) (xy 141.833 67.5795) (xy 141.853 67.5795)
-        (xy 141.853 67.5595) (xy 142.107 67.5595) (xy 142.107 67.5795) (xy 143.23125 67.5795) (xy 143.39 67.42075)
-        (xy 143.39 67.28019) (xy 143.293327 67.046801) (xy 143.114698 66.868173) (xy 143.013582 66.826289) (xy 143.096487 66.702213)
-        (xy 143.149341 66.4365) (xy 143.096487 66.170787) (xy 142.945973 65.945527) (xy 142.730421 65.8015) (xy 142.945973 65.657473)
-        (xy 142.955978 65.6425) (xy 144.016086 65.6425) (xy 144.062966 65.651825) (xy 144.109846 65.6425) (xy 144.248692 65.614882)
-        (xy 144.406143 65.509677) (xy 144.432703 65.469927) (xy 144.434197 65.468433) (xy 146.251834 63.650798) (xy 146.259533 63.650798)
+        (xy 147.576536 72.691976) (xy 147.576536 72.987) (xy 147.606106 73.135659) (xy 147.690314 73.261686) (xy 147.816341 73.345894)
+        (xy 147.965 73.375464) (xy 148.635 73.375464) (xy 148.783659 73.345894) (xy 148.909686 73.261686) (xy 148.993894 73.135659)
+        (xy 149.023464 72.987) (xy 149.023464 71.987) (xy 148.993894 71.838341) (xy 148.909686 71.712314) (xy 148.783659 71.628106)
+        (xy 148.635 71.598536) (xy 148.389312 71.598536) (xy 148.260726 71.512618) (xy 148.163 71.493179) (xy 148.163 71.41893)
+        (xy 148.074548 71.205388) (xy 148.058 71.18884) (xy 148.058 70.504894) (xy 148.128341 70.551894) (xy 148.277 70.581464)
+        (xy 148.947 70.581464) (xy 149.095659 70.551894) (xy 149.221686 70.467686) (xy 149.305894 70.341659) (xy 149.335464 70.193)
+        (xy 149.335464 69.427625) (xy 149.405779 69.3985) (xy 149.638536 69.3985) (xy 149.638536 70.193) (xy 149.668106 70.341659)
+        (xy 149.718 70.416332) (xy 149.718001 71.598536) (xy 149.715 71.598536) (xy 149.566341 71.628106) (xy 149.440314 71.712314)
+        (xy 149.356106 71.838341) (xy 149.326536 71.987) (xy 149.326536 72.987) (xy 149.356106 73.135659) (xy 149.440314 73.261686)
+        (xy 149.566341 73.345894) (xy 149.715 73.375464) (xy 150.385 73.375464) (xy 150.533659 73.345894) (xy 150.659686 73.261686)
+        (xy 150.743894 73.135659) (xy 150.773464 72.987) (xy 150.773464 72.101153) (xy 150.78 72.068294) (xy 150.78 72.068291)
+        (xy 150.790401 72.016001) (xy 150.78 71.963711) (xy 150.78 70.564954) (xy 150.845659 70.551894) (xy 150.971686 70.467686)
+        (xy 150.973793 70.464532) (xy 151.573073 70.464532) (xy 151.671736 70.731387) (xy 152.281461 70.957908) (xy 152.93146 70.933856)
+        (xy 153.420264 70.731387) (xy 153.518927 70.464532) (xy 152.546 69.491605) (xy 151.573073 70.464532) (xy 150.973793 70.464532)
+        (xy 151.055894 70.341659) (xy 151.085464 70.193) (xy 151.085464 70.086921) (xy 151.126613 70.186264) (xy 151.393468 70.284927)
+        (xy 152.366395 69.312) (xy 152.352253 69.297858) (xy 152.531858 69.118253) (xy 152.546 69.132395) (xy 152.560143 69.118253)
+        (xy 152.739748 69.297858) (xy 152.725605 69.312) (xy 153.698532 70.284927) (xy 153.782001 70.254067) (xy 153.782 70.963658)
+        (xy 153.771599 71.015949) (xy 153.782 71.068239) (xy 153.782 71.068242) (xy 153.81281 71.223134) (xy 153.930171 71.398778)
+        (xy 153.974505 71.428401) (xy 154.449137 71.903033) (xy 154.478758 71.947365) (xy 154.491681 71.956) (xy 154.459289 71.956)
+        (xy 154.406999 71.945599) (xy 154.354709 71.956) (xy 154.354706 71.956) (xy 154.199814 71.98681) (xy 154.117164 72.042035)
+        (xy 153.96889 72.103452) (xy 153.805452 72.26689) (xy 153.717 72.480432) (xy 153.717 72.711568) (xy 153.805452 72.92511)
+        (xy 153.96889 73.088548) (xy 154.048481 73.121516) (xy 154.035314 73.130314) (xy 153.951106 73.256341) (xy 153.921536 73.405)
+        (xy 153.921536 73.874) (xy 151.959835 73.874) (xy 151.948686 73.857314) (xy 151.822659 73.773106) (xy 151.674 73.743536)
+        (xy 150.704 73.743536) (xy 150.555341 73.773106) (xy 150.429314 73.857314) (xy 150.372661 73.942102) (xy 150.302327 73.772301)
+        (xy 150.123698 73.593673) (xy 149.890309 73.497) (xy 149.56475 73.497) (xy 149.406 73.65575) (xy 149.406 74.755)
+        (xy 149.426 74.755) (xy 149.426 75.009) (xy 149.406 75.009) (xy 149.406 76.10825) (xy 149.56475 76.267)
+        (xy 149.890309 76.267) (xy 150.123698 76.170327) (xy 150.302327 75.991699) (xy 150.372661 75.821898) (xy 150.389001 75.846352)
+        (xy 150.389 76.33) (xy 149.385233 76.33) (xy 149.128251 76.381117) (xy 148.861156 76.559584) (xy 148.823341 76.567106)
+        (xy 148.697314 76.651314) (xy 148.613106 76.777341) (xy 148.583536 76.926) (xy 148.583536 77.161757) (xy 148.573741 77.211)
+        (xy 148.583536 77.260243) (xy 148.583536 77.771) (xy 148.613106 77.919659) (xy 148.697314 78.045686) (xy 148.823341 78.129894)
+        (xy 148.972 78.159464) (xy 149.972 78.159464) (xy 150.120659 78.129894) (xy 150.177372 78.092) (xy 150.389 78.092)
+        (xy 150.389001 79.113229) (xy 150.389 79.113234) (xy 150.389001 80.848664) (xy 150.321757 80.803733) (xy 150.202804 80.780072)
+        (xy 150.182299 80.759567) (xy 150.108221 80.728883) (xy 150.108221 80.722438) (xy 150.019769 80.508896) (xy 149.856331 80.345458)
+        (xy 149.642789 80.257006) (xy 149.411653 80.257006) (xy 149.198111 80.345458) (xy 149.099746 80.443823) (xy 149.025222 80.369299)
+        (xy 148.81168 80.280847) (xy 148.580544 80.280847) (xy 148.520909 80.305548) (xy 148.504363 80.289002) (xy 148.290821 80.20055)
+        (xy 148.059685 80.20055) (xy 147.846143 80.289002) (xy 147.73303 80.402115) (xy 147.572743 80.402115) (xy 147.359201 80.490567)
+        (xy 147.342653 80.507115) (xy 145.28346 80.507115) (xy 145.23658 80.49779) (xy 145.180747 80.508896) (xy 145.050855 80.534733)
+        (xy 144.893404 80.639938) (xy 144.866844 80.679688) (xy 144.795613 80.750919) (xy 144.772209 80.750919) (xy 144.614346 80.816308)
+        (xy 144.614346 79.942357) (xy 144.721912 79.942357) (xy 144.935454 79.853905) (xy 145.085543 79.703816) (xy 145.900406 79.703816)
+        (xy 145.900406 79.934952) (xy 145.988858 80.148494) (xy 146.152296 80.311932) (xy 146.365838 80.400384) (xy 146.596974 80.400384)
+        (xy 146.810516 80.311932) (xy 146.973954 80.148494) (xy 147.062406 79.934952) (xy 147.062406 79.703816) (xy 146.973954 79.490274)
+        (xy 146.810516 79.326836) (xy 146.596974 79.238384) (xy 146.365838 79.238384) (xy 146.152296 79.326836) (xy 145.988858 79.490274)
+        (xy 145.900406 79.703816) (xy 145.085543 79.703816) (xy 145.098892 79.690467) (xy 145.187344 79.476925) (xy 145.187344 79.453521)
+        (xy 145.590847 79.050018) (xy 147.370129 79.050018) (xy 147.387387 79.136781) (xy 147.387387 79.22526) (xy 147.421246 79.307003)
+        (xy 147.438504 79.393766) (xy 147.487651 79.46732) (xy 147.521511 79.549065) (xy 147.76934 79.796894) (xy 147.769343 79.796895)
+        (xy 147.807552 79.835104) (xy 147.856704 79.908665) (xy 148.14812 80.103383) (xy 148.405102 80.1545) (xy 148.405107 80.1545)
+        (xy 148.491868 80.171758) (xy 148.57863 80.1545) (xy 149.558767 80.1545) (xy 149.815749 80.103383) (xy 149.844063 80.084464)
+        (xy 149.972 80.084464) (xy 150.120659 80.054894) (xy 150.246686 79.970686) (xy 150.330894 79.844659) (xy 150.360464 79.696)
+        (xy 150.360464 79.322743) (xy 150.370259 79.2735) (xy 150.360464 79.224257) (xy 150.360464 78.851) (xy 150.330894 78.702341)
+        (xy 150.246686 78.576314) (xy 150.120659 78.492106) (xy 149.972 78.462536) (xy 149.844063 78.462536) (xy 149.815749 78.443617)
+        (xy 149.558767 78.3925) (xy 148.856792 78.3925) (xy 148.767434 78.303142) (xy 148.685689 78.269282) (xy 148.612135 78.220135)
+        (xy 148.525372 78.202877) (xy 148.443629 78.169018) (xy 148.35515 78.169018) (xy 148.268387 78.15176) (xy 148.181624 78.169018)
+        (xy 148.093145 78.169018) (xy 148.011402 78.202877) (xy 147.924639 78.220135) (xy 147.851084 78.269282) (xy 147.76934 78.303142)
+        (xy 147.706776 78.365706) (xy 147.633222 78.414853) (xy 147.584075 78.488407) (xy 147.521511 78.550971) (xy 147.487651 78.632715)
+        (xy 147.438504 78.70627) (xy 147.421246 78.793033) (xy 147.387387 78.874776) (xy 147.387387 78.963255) (xy 147.370129 79.050018)
+        (xy 145.590847 79.050018) (xy 147.743433 76.897434) (xy 147.783177 76.870878) (xy 147.888382 76.713427) (xy 147.915214 76.578534)
+        (xy 147.925325 76.527701) (xy 147.916 76.480821) (xy 147.916 75.16775) (xy 148.159 75.16775) (xy 148.159 75.75831)
+        (xy 148.255673 75.991699) (xy 148.434302 76.170327) (xy 148.667691 76.267) (xy 148.99325 76.267) (xy 149.152 76.10825)
+        (xy 149.152 75.009) (xy 148.31775 75.009) (xy 148.159 75.16775) (xy 147.916 75.16775) (xy 147.916 74.80488)
+        (xy 147.925325 74.758) (xy 147.888382 74.572274) (xy 147.837837 74.496628) (xy 147.783177 74.414823) (xy 147.743433 74.388267)
+        (xy 147.360856 74.00569) (xy 148.159 74.00569) (xy 148.159 74.59625) (xy 148.31775 74.755) (xy 149.152 74.755)
+        (xy 149.152 73.65575) (xy 148.99325 73.497) (xy 148.667691 73.497) (xy 148.434302 73.593673) (xy 148.255673 73.772301)
+        (xy 148.159 74.00569) (xy 147.360856 74.00569) (xy 144.381 71.025836) (xy 144.381 70.760417) (xy 144.388659 70.758894)
+        (xy 144.514686 70.674686) (xy 144.598894 70.548659) (xy 144.628464 70.4) (xy 144.628464 69.4) (xy 144.598894 69.251341)
+        (xy 144.514686 69.125314) (xy 144.388659 69.041106) (xy 144.24 69.011536) (xy 143.57 69.011536) (xy 143.421341 69.041106)
+        (xy 143.295314 69.125314) (xy 143.211106 69.251341) (xy 143.181536 69.4) (xy 143.181536 70.4) (xy 143.211106 70.548659)
+        (xy 143.295314 70.674686) (xy 143.421341 70.758894) (xy 143.429 70.760418) (xy 143.429 71.17612) (xy 143.419675 71.223)
+        (xy 143.446218 71.356439) (xy 143.456618 71.408725) (xy 143.561823 71.566177) (xy 143.601573 71.592737) (xy 146.964001 74.955167)
+        (xy 146.964001 75.126894) (xy 146.794236 75.126894) (xy 146.580694 75.215346) (xy 146.564146 75.231894) (xy 145.145587 75.231894)
+        (xy 145.098708 75.222569) (xy 145.051829 75.231894) (xy 144.912983 75.259512) (xy 144.755532 75.364717) (xy 144.728974 75.404464)
+        (xy 144.289879 75.843559) (xy 144.289879 75.701732) (xy 144.201427 75.48819) (xy 144.037989 75.324752) (xy 143.824447 75.2363)
+        (xy 143.667001 75.2363) (xy 143.667001 74.641652) (xy 143.84711 74.567048) (xy 144.010548 74.40361) (xy 144.099 74.190068)
+        (xy 144.099 73.958932) (xy 144.010548 73.74539) (xy 143.84711 73.581952) (xy 143.633568 73.4935) (xy 143.402432 73.4935)
+        (xy 143.18889 73.581952) (xy 143.025452 73.74539) (xy 142.964343 73.89292) (xy 142.929537 73.80889) (xy 142.766099 73.645452)
+        (xy 142.552557 73.557) (xy 142.321421 73.557) (xy 142.107879 73.645452) (xy 141.944441 73.80889) (xy 141.855989 74.022432)
+        (xy 141.855989 74.253568) (xy 141.944441 74.46711) (xy 141.96099 74.483659) (xy 141.960989 75.885845) (xy 140.504978 77.341858)
+        (xy 140.504978 76.76275) (xy 140.821164 76.446565) (xy 140.860911 76.420007) (xy 140.871159 76.404669) (xy 140.926544 76.42761)
+        (xy 141.15768 76.42761) (xy 141.371222 76.339158) (xy 141.53466 76.17572) (xy 141.623112 75.962178) (xy 141.623112 75.731042)
+        (xy 141.53466 75.5175) (xy 141.518112 75.500952) (xy 141.518112 72.455992) (xy 141.527437 72.409112) (xy 141.490494 72.223386)
+        (xy 141.385289 72.065935) (xy 141.300337 72.009172) (xy 141.090628 71.799464) (xy 141.097 71.799464) (xy 141.245659 71.769894)
+        (xy 141.371686 71.685686) (xy 141.455894 71.559659) (xy 141.485464 71.411) (xy 141.485464 70.741) (xy 141.455894 70.592341)
+        (xy 141.371686 70.466314) (xy 141.245659 70.382106) (xy 141.097 70.352536) (xy 140.097 70.352536) (xy 140.057 70.360492)
+        (xy 140.057 70.041508) (xy 140.097 70.049464) (xy 141.097 70.049464) (xy 141.245659 70.019894) (xy 141.371686 69.935686)
+        (xy 141.455894 69.809659) (xy 141.485464 69.661) (xy 141.485464 68.991) (xy 141.455894 68.842341) (xy 141.371686 68.716314)
+        (xy 141.259718 68.6415) (xy 141.69425 68.6415) (xy 141.853 68.48275) (xy 141.853 67.8335) (xy 142.107 67.8335)
+        (xy 142.107 68.48275) (xy 142.26575 68.6415) (xy 142.881309 68.6415) (xy 143.114698 68.544827) (xy 143.293327 68.366199)
+        (xy 143.39 68.13281) (xy 143.39 67.99225) (xy 143.23125 67.8335) (xy 142.107 67.8335) (xy 141.853 67.8335)
+        (xy 141.833 67.8335) (xy 141.833 67.5795) (xy 141.853 67.5795) (xy 141.853 67.5595) (xy 142.107 67.5595)
+        (xy 142.107 67.5795) (xy 143.23125 67.5795) (xy 143.39 67.42075) (xy 143.39 67.28019) (xy 143.293327 67.046801)
+        (xy 143.114698 66.868173) (xy 143.013582 66.826289) (xy 143.096487 66.702213) (xy 143.149341 66.4365) (xy 143.096487 66.170787)
+        (xy 142.945973 65.945527) (xy 142.730421 65.8015) (xy 142.945973 65.657473) (xy 142.955978 65.6425) (xy 144.016086 65.6425)
+        (xy 144.062966 65.651825) (xy 144.109846 65.6425) (xy 144.248692 65.614882) (xy 144.406143 65.509677) (xy 144.432703 65.469927)
+        (xy 144.434197 65.468433) (xy 146.251834 63.650798) (xy 146.259533 63.650798)
       )
     )
     (filled_polygon
diff --git a/ulx3s.kicad_pcb-bak b/ulx3s.kicad_pcb-bak
index 39bbbc4..21a6442 100644
--- a/ulx3s.kicad_pcb-bak
+++ b/ulx3s.kicad_pcb-bak
@@ -1,9 +1,9 @@
-(kicad_pcb (version 20171130) (host pcbnew 5.0.0-rc2-dev-unknown+dfsg1+20180318-2)
+(kicad_pcb (version 20171130) (host pcbnew 5.0.0-rc2-dev-unknown+dfsg1+20180318-3)
 
   (general
     (thickness 1.6)
     (drawings 484)
-    (tracks 4899)
+    (tracks 4898)
     (zones 0)
     (modules 208)
     (nets 317)
@@ -11,9 +11,9 @@
 
   (page A4)
   (layers
-    (0 F.Cu signal)
-    (1 In1.Cu signal)
-    (2 In2.Cu signal)
+    (0 F.Cu signal hide)
+    (1 In1.Cu signal hide)
+    (2 In2.Cu signal hide)
     (31 B.Cu signal)
     (32 B.Adhes user)
     (33 F.Adhes user)
@@ -62,9 +62,9 @@
     (pad_to_mask_clearance 0.05)
     (aux_axis_origin 94.1 112.22)
     (grid_origin 93.48 113)
-    (visible_elements 7FFFFFFF)
+    (visible_elements 7FFFFDFF)
     (pcbplotparams
-      (layerselection 0x310fc_ffffffff)
+      (layerselection 0x010fc_ffffffff)
       (usegerberextensions true)
       (usegerberattributes false)
       (usegerberadvancedattributes false)
@@ -753,114 +753,6 @@
     (uvia_drill 0.1)
   )
 
-  (module L_1008_1210:L_1008_1210 (layer B.Cu) (tedit 5B019496) (tstamp 5B3925FB)
-    (at 156.33 74.755 180)
-    (descr "Inductor SMD 1008-1210 (2520-3225 Metric), square (rectangular) end terminal")
-    (tags inductor)
-    (path /58D51CAD/5A73CDB3)
-    (attr smd)
-    (fp_text reference L3 (at 3.16 -0.018 180) (layer B.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_text value 2.2uH (at 0 -2.5 180) (layer B.Fab)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_text user %R (at 0 0 180) (layer B.Fab)
-      (effects (font (size 0.8 0.8) (thickness 0.12)) (justify mirror))
-    )
-    (fp_line (start 2.29 -1.6) (end -2.29 -1.6) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 2.29 1.6) (end 2.29 -1.6) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -2.29 1.6) (end 2.29 1.6) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -2.29 -1.6) (end -2.29 1.6) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -0.2 -1.4) (end 0.2 -1.4) (layer B.SilkS) (width 0.12))
-    (fp_line (start -0.2 1.4) (end 0.2 1.4) (layer B.SilkS) (width 0.12))
-    (fp_line (start 1.6 -1.25) (end -1.6 -1.25) (layer B.Fab) (width 0.1))
-    (fp_line (start 1.6 1.25) (end 1.6 -1.25) (layer B.Fab) (width 0.1))
-    (fp_line (start -1.6 1.25) (end 1.6 1.25) (layer B.Fab) (width 0.1))
-    (fp_line (start -1.6 -1.25) (end -1.6 1.25) (layer B.Fab) (width 0.1))
-    (pad 2 smd rect (at 1.27 0 180) (size 1.5 2.7) (layers B.Cu B.Paste B.Mask)
-      (net 158 /power/P3V3))
-    (pad 1 smd rect (at -1.27 0 180) (size 1.5 2.7) (layers B.Cu B.Paste B.Mask)
-      (net 161 /power/L3))
-    (model ${KISYS3DMOD}/Inductor_SMD.3dshapes/L_1210_3225Metric.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module L_1008_1210:L_1008_1210 (layer B.Cu) (tedit 5B019496) (tstamp 5B3925EB)
-    (at 104.895 88.725)
-    (descr "Inductor SMD 1008-1210 (2520-3225 Metric), square (rectangular) end terminal")
-    (tags inductor)
-    (path /58D51CAD/58D67BD8)
-    (attr smd)
-    (fp_text reference L2 (at -3.16 0.018) (layer B.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_text value 2.2uH (at 0 -2.5) (layer B.Fab)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_text user %R (at 0 0) (layer B.Fab)
-      (effects (font (size 0.8 0.8) (thickness 0.12)) (justify mirror))
-    )
-    (fp_line (start 2.29 -1.6) (end -2.29 -1.6) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 2.29 1.6) (end 2.29 -1.6) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -2.29 1.6) (end 2.29 1.6) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -2.29 -1.6) (end -2.29 1.6) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -0.2 -1.4) (end 0.2 -1.4) (layer B.SilkS) (width 0.12))
-    (fp_line (start -0.2 1.4) (end 0.2 1.4) (layer B.SilkS) (width 0.12))
-    (fp_line (start 1.6 -1.25) (end -1.6 -1.25) (layer B.Fab) (width 0.1))
-    (fp_line (start 1.6 1.25) (end 1.6 -1.25) (layer B.Fab) (width 0.1))
-    (fp_line (start -1.6 1.25) (end 1.6 1.25) (layer B.Fab) (width 0.1))
-    (fp_line (start -1.6 -1.25) (end -1.6 1.25) (layer B.Fab) (width 0.1))
-    (pad 2 smd rect (at 1.27 0) (size 1.5 2.7) (layers B.Cu B.Paste B.Mask)
-      (net 159 /power/P2V5))
-    (pad 1 smd rect (at -1.27 0) (size 1.5 2.7) (layers B.Cu B.Paste B.Mask)
-      (net 162 /power/L2))
-    (model ${KISYS3DMOD}/Inductor_SMD.3dshapes/L_1210_3225Metric.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module L_1008_1210:L_1008_1210 (layer B.Cu) (tedit 5B019496) (tstamp 5B3925DB)
-    (at 158.87 88.09 180)
-    (descr "Inductor SMD 1008-1210 (2520-3225 Metric), square (rectangular) end terminal")
-    (tags inductor)
-    (path /58D51CAD/5A73C9EB)
-    (attr smd)
-    (fp_text reference L1 (at 0 2.5 180) (layer B.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_text value 2.2uH (at 0 -2.5 180) (layer B.Fab)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_text user %R (at 0 0 180) (layer B.Fab)
-      (effects (font (size 0.8 0.8) (thickness 0.12)) (justify mirror))
-    )
-    (fp_line (start 2.29 -1.6) (end -2.29 -1.6) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 2.29 1.6) (end 2.29 -1.6) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -2.29 1.6) (end 2.29 1.6) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -2.29 -1.6) (end -2.29 1.6) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -0.2 -1.4) (end 0.2 -1.4) (layer B.SilkS) (width 0.12))
-    (fp_line (start -0.2 1.4) (end 0.2 1.4) (layer B.SilkS) (width 0.12))
-    (fp_line (start 1.6 -1.25) (end -1.6 -1.25) (layer B.Fab) (width 0.1))
-    (fp_line (start 1.6 1.25) (end 1.6 -1.25) (layer B.Fab) (width 0.1))
-    (fp_line (start -1.6 1.25) (end 1.6 1.25) (layer B.Fab) (width 0.1))
-    (fp_line (start -1.6 -1.25) (end -1.6 1.25) (layer B.Fab) (width 0.1))
-    (pad 2 smd rect (at 1.27 0 180) (size 1.5 2.7) (layers B.Cu B.Paste B.Mask)
-      (net 171 /power/P1V1))
-    (pad 1 smd rect (at -1.27 0 180) (size 1.5 2.7) (layers B.Cu B.Paste B.Mask)
-      (net 160 /power/L1))
-    (model ${KISYS3DMOD}/Inductor_SMD.3dshapes/L_1210_3225Metric.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
   (module Socket_Strips:Socket_Strip_Angled_2x20 (layer F.Cu) (tedit 5A2B354F) (tstamp 58E6BE3D)
     (at 97.91 62.69 270)
     (descr "Through hole socket strip")
@@ -4387,7 +4279,7 @@
     (tags capacitor)
     (path /58D51CAD/58D84952)
     (attr smd)
-    (fp_text reference C14 (at 0.907 7.859 270) (layer B.SilkS)
+    (fp_text reference C14 (at 0.78 7.859 270) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_text value 100nF (at 0 -1.65 270) (layer B.Fab)
@@ -6169,7 +6061,7 @@
     (tags diode)
     (path /58D51CAD/58D7CBDC)
     (attr smd)
-    (fp_text reference D11 (at -2.431 0.269 180) (layer B.SilkS)
+    (fp_text reference D11 (at -2.431 0.015 180) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_text value RED (at 0 -1.85 90) (layer B.Fab)
@@ -6356,7 +6248,7 @@
     (fp_text reference R41 (at 0 1.539 90) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 1k (at 0 1.65 90) (layer F.Fab)
+    (fp_text value 1.2k (at 0 1.65 90) (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))
@@ -6392,7 +6284,7 @@
     (fp_text reference R42 (at 0 -1.65 90) (layer F.SilkS) hide
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 1k (at 0 1.65 90) (layer F.Fab)
+    (fp_text value 1.2k (at 0 1.65 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text user %R (at 0 0 90) (layer F.Fab)
@@ -6428,7 +6320,7 @@
     (fp_text reference R43 (at 0 -1.65 90) (layer F.SilkS) hide
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 1k (at 0 1.65 90) (layer F.Fab)
+    (fp_text value 1.2k (at 0 1.65 90) (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))
@@ -6464,7 +6356,7 @@
     (fp_text reference R44 (at 0 -1.65 90) (layer F.SilkS) hide
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 1k (at 0 1.65 90) (layer F.Fab)
+    (fp_text value 1.2k (at 0 1.65 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text user %R (at 0 0 90) (layer F.Fab)
@@ -6500,7 +6392,7 @@
     (fp_text reference R45 (at 0 -1.65 90) (layer F.SilkS) hide
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 1k (at 0 1.65 90) (layer F.Fab)
+    (fp_text value 1.2k (at 0 1.65 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text user %R (at 0 0 90) (layer F.Fab)
@@ -6536,7 +6428,7 @@
     (fp_text reference R46 (at 0 -1.65 90) (layer F.SilkS) hide
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 1k (at 0 1.65 90) (layer F.Fab)
+    (fp_text value 1.2k (at 0 1.65 90) (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))
@@ -6572,7 +6464,7 @@
     (fp_text reference R47 (at 0 -1.65 90) (layer F.SilkS) hide
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 1k (at 0 1.65 90) (layer F.Fab)
+    (fp_text value 1.2k (at 0 1.65 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text user %R (at 0 0 90) (layer F.Fab)
@@ -6608,7 +6500,7 @@
     (fp_text reference R48 (at 0 -1.31 90) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 1k (at 0 1.65 90) (layer F.Fab)
+    (fp_text value 1.2k (at 0 1.65 90) (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))
@@ -6644,7 +6536,7 @@
     (fp_text reference R36 (at 0.018 1.255 90) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 1k (at 0 1.65 270) (layer F.Fab)
+    (fp_text value 1.2k (at 0 1.65 270) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text user %R (at 0 0 270) (layer F.Fab)
@@ -6680,7 +6572,7 @@
     (fp_text reference R37 (at 0 1.539 90) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 1k (at 0 1.65 90) (layer F.Fab)
+    (fp_text value 1.2k (at 0 1.65 90) (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))
@@ -6716,7 +6608,7 @@
     (fp_text reference R62 (at 0.018 1.382 270) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 1k (at 0 1.65 270) (layer F.Fab)
+    (fp_text value 1.2k (at 0 1.65 270) (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))
@@ -7050,7 +6942,7 @@
     (tags SOD-323)
     (path /58D6BF46/59C133D8)
     (attr smd)
-    (fp_text reference D20 (at -0.015 -1.669) (layer B.SilkS)
+    (fp_text reference D20 (at -0.015 4.173) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_text value 3.6V (at 0.1 -1.9 180) (layer B.Fab)
@@ -7139,7 +7031,7 @@
     (fp_text reference D23 (at 0 -3.538) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value BAT54W (at 0.1 -1.9) (layer B.Fab)
+    (fp_text value 1N4148 (at 0.1 -1.9) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_line (start -1.9 0.85) (end 1.25 0.85) (layer B.SilkS) (width 0.12))
@@ -7182,7 +7074,7 @@
     (fp_text reference D24 (at 0 2.903 180) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value BAT54W (at 0.1 -1.9 180) (layer B.Fab)
+    (fp_text value 1N4148 (at 0.1 -1.9 180) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_line (start -1.9 0.85) (end 1.25 0.85) (layer B.SilkS) (width 0.12))
@@ -7225,7 +7117,7 @@
     (fp_text reference D25 (at -0.018 3.698 270) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value BAT54W (at 0.1 -1.9 90) (layer B.Fab)
+    (fp_text value 1N4148 (at 0.1 -1.9 90) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_text user %R (at 0 1.85 90) (layer B.Fab)
@@ -7268,7 +7160,7 @@
     (fp_text reference D26 (at 0.018 -3.063 90) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value BAT54W (at 0.1 -1.9 270) (layer B.Fab)
+    (fp_text value 1N4148 (at 0.1 -1.9 270) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_text user %R (at 0 1.85 270) (layer B.Fab)
@@ -7433,7 +7325,7 @@
     (tags "Diode SMA (DO-214AC) Handsoldering")
     (path /58D6BF46/58D6C83C)
     (attr smd)
-    (fp_text reference D9 (at 0.366 -2.413 180) (layer B.SilkS)
+    (fp_text reference D9 (at 1.001 -2.558 180) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_text value STPS2L30AF (at 0.762 -2.286 180) (layer B.Fab) hide
@@ -7655,7 +7547,7 @@
     (tags resistor)
     (path /58D6547C/595B9C2F)
     (attr smd)
-    (fp_text reference R51 (at 2.779 0.236 180) (layer B.SilkS)
+    (fp_text reference R51 (at 2.779 0 180) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_text value 150 (at 0 -1.65 180) (layer B.Fab)
@@ -7766,7 +7658,7 @@
     (fp_text reference R54 (at 0 -2.522) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 1.5k (at 0 -1.65) (layer B.Fab)
+    (fp_text value 1.2k (at 0 -1.65) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_text user %R (at 0 0) (layer B.Fab)
@@ -7799,7 +7691,7 @@
     (tags resistor)
     (path /58D6BF46/59DFFFBE)
     (attr virtual)
-    (fp_text reference R56 (at 5.273 0.015 90) (layer B.SilkS)
+    (fp_text reference R56 (at 2.733 0.015 90) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_text value 0 (at 0 -1.65 90) (layer B.Fab)
@@ -7977,7 +7869,7 @@
     (fp_text reference R61 (at -0.008 -1.444 180) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 470 (at 0 -1.65 180) (layer B.Fab)
+    (fp_text value 680 (at 0 -1.65 180) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
@@ -8265,7 +8157,7 @@
     (fp_text reference R40 (at 0.015 -2.522) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 1.5k (at 0 -1.65) (layer B.Fab)
+    (fp_text value 1.2k (at 0 -1.65) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
@@ -8292,52 +8184,16 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B06E8D2)
-    (at 125.596 85.06 180)
-    (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 /58D82BD0/58D90500)
-    (attr smd)
-    (fp_text reference R14 (at 2.779 0 180) (layer B.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_text value 1.2k (at 0 -1.65 180) (layer B.Fab)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_text user %R (at 0 0 180) (layer B.Fab)
-      (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
-    )
-    (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -1.46 -0.75) (end -1.46 0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -0.22 -0.51) (end 0.22 -0.51) (layer B.SilkS) (width 0.12))
-    (fp_line (start -0.22 0.51) (end 0.22 0.51) (layer B.SilkS) (width 0.12))
-    (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))
-    (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 rect (at 0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 31 /analog/AUDIO_L))
-    (pad 1 smd rect (at -0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 107 AUDIO_L0))
-    (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 B.Cu) (tedit 59FE48B8) (tstamp 5B06E8E2)
-    (at 125.596 83.536 180)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B20C606)
+    (at 134.74 97.615 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 /58D82BD0/58D904D5)
+    (path /58D913EC/59DEB568)
     (attr smd)
-    (fp_text reference R15 (at 2.779 0 180) (layer B.SilkS)
+    (fp_text reference R55 (at -2.776 0.112 270) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 680 (at 0 -1.65 180) (layer B.Fab)
+    (fp_text value 15k (at 0 -1.65 270) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
@@ -8350,13 +8206,13 @@
     (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
     (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
     (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_text user %R (at 0 0 180) (layer B.Fab)
+    (fp_text user %R (at 0 0 270) (layer B.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
     )
-    (pad 1 smd rect (at -0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 106 AUDIO_L1))
-    (pad 2 smd rect (at 0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 31 /analog/AUDIO_L))
+    (pad 1 smd rect (at -0.875 0 270) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 89 /flash/FPGA_DONE))
+    (pad 2 smd rect (at 0.875 0 270) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 157 PROG_DONE))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -8364,121 +8220,103 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B06E8F2)
-    (at 125.596 82.012 180)
-    (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 /58D82BD0/58D904AE)
+  (module SM8:SM8 (layer B.Cu) (tedit 5A0C2F78) (tstamp 5B17ED8A)
+    (at 144.68 65.8015 90)
+    (descr "TI SM8 SOIC-8 150 mil")
+    (tags "SOIC-8 1.27 150 mil SOT96-1")
+    (path /58D686D9/5B01C6B5)
     (attr smd)
-    (fp_text reference R16 (at 2.779 0 180) (layer B.SilkS)
+    (fp_text reference U11 (at 3.3475 -0.019 -180) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 330 (at 0 -1.65 180) (layer B.Fab)
+    (fp_text value PCA9306D (at 4.318 -5.588 -180) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (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))
-    (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))
-    (fp_line (start -0.22 0.51) (end 0.22 0.51) (layer B.SilkS) (width 0.12))
-    (fp_line (start -0.22 -0.51) (end 0.22 -0.51) (layer B.SilkS) (width 0.12))
-    (fp_line (start -1.46 -0.75) (end -1.46 0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_text user %R (at 0 0 180) (layer B.Fab)
-      (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
-    )
-    (pad 1 smd rect (at -0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 105 AUDIO_L2))
-    (pad 2 smd rect (at 0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 31 /analog/AUDIO_L))
-    (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
+    (fp_circle (center -2.286 -0.9525) (end -2.2225 -0.889) (layer B.SilkS) (width 0.15))
+    (fp_line (start 2.54 -1.778) (end -2.54 -1.778) (layer B.SilkS) (width 0.15))
+    (fp_line (start -2.54 -1.27) (end 2.54 -1.27) (layer B.SilkS) (width 0.15))
+    (fp_line (start -2.45 -0.95) (end -2.45 1.95) (layer B.Fab) (width 0.15))
+    (fp_line (start -2.45 1.95) (end 2.45 1.95) (layer B.Fab) (width 0.15))
+    (fp_line (start 2.45 1.95) (end 2.45 -1.95) (layer B.Fab) (width 0.15))
+    (fp_line (start 2.45 -1.95) (end -1.45 -1.95) (layer B.Fab) (width 0.15))
+    (fp_line (start -1.45 -1.95) (end -2.45 -0.95) (layer B.Fab) (width 0.15))
+    (fp_line (start -2.75 -3.75) (end 2.75 -3.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -2.75 3.75) (end 2.75 3.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -2.75 -3.75) (end -2.75 3.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 2.75 -3.75) (end 2.75 3.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -2.575 -2.075) (end -2.525 -2.075) (layer B.SilkS) (width 0.15))
+    (fp_line (start -2.575 2.075) (end -2.43 2.075) (layer B.SilkS) (width 0.15))
+    (fp_line (start 2.575 2.075) (end 2.43 2.075) (layer B.SilkS) (width 0.15))
+    (fp_line (start 2.575 -2.075) (end 2.43 -2.075) (layer B.SilkS) (width 0.15))
+    (fp_line (start -2.575 -2.075) (end -2.575 2.075) (layer B.SilkS) (width 0.15))
+    (fp_line (start 2.575 -2.075) (end 2.575 2.075) (layer B.SilkS) (width 0.15))
+    (fp_line (start -2.525 -2.075) (end -2.525 -3.475) (layer B.SilkS) (width 0.15))
+    (pad 1 smd rect (at -1.905 -2.7) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
+      (net 1 GND))
+    (pad 2 smd oval (at -0.635 -2.7) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
+      (net 5 +3V3))
+    (pad 3 smd oval (at 0.635 -2.7) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
+      (net 262 FPDI_SCL))
+    (pad 4 smd oval (at 1.905 -2.7) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
+      (net 261 FPDI_SDA))
+    (pad 5 smd oval (at 1.905 2.7) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
+      (net 33 GPDI_SDA))
+    (pad 6 smd oval (at 0.635 2.7) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
+      (net 34 GPDI_SCL))
+    (pad 7 smd oval (at -0.635 2.7) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
+      (net 35 /gpdi/VREF2))
+    (pad 8 smd oval (at -1.905 2.7) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
+      (net 35 /gpdi/VREF2))
+    (model ${KISYS3DMOD}/Package_SO.3dshapes/SOIC-8_3.9x4.9mm_P1.27mm.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
+      (rotate (xyz 0 0 -90))
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B06E902)
-    (at 125.596 80.47 180)
-    (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 /58D82BD0/58D90455)
+  (module Capacitor_SMD:C_0805_2012Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B1118A2)
+    (at 179.078 91.918 270)
+    (descr "Capacitor SMD 0805 (2012 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 capacitor)
+    (path /58D51CAD/5B09EC4B)
     (attr smd)
-    (fp_text reference R17 (at 2.779 -0.018 180) (layer B.SilkS)
+    (fp_text reference C55 (at 0 -1.524 270) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 150 (at 0 -1.65 180) (layer B.Fab)
+    (fp_text value 22uF (at 0 -1.85 270) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text user %R (at 0 0 180) (layer B.Fab)
-      (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
-    )
-    (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -1.46 -0.75) (end -1.46 0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -0.22 -0.51) (end 0.22 -0.51) (layer B.SilkS) (width 0.12))
-    (fp_line (start -0.22 0.51) (end 0.22 0.51) (layer B.SilkS) (width 0.12))
-    (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))
-    (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 rect (at 0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 31 /analog/AUDIO_L))
-    (pad 1 smd rect (at -0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 104 AUDIO_L3))
-    (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 B.Cu) (tedit 59FE48B8) (tstamp 5B06E912)
-    (at 130.422 74.773 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")
-    (tags resistor)
-    (path /58D82BD0/58D907DC)
-    (attr smd)
-    (fp_text reference R18 (at -2.794 0.015 90) (layer B.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_text value 1.2k (at 0 -1.65 90) (layer B.Fab)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_text user %R (at 0 0 90) (layer B.Fab)
+    (fp_line (start -1 -0.6) (end -1 0.6) (layer B.Fab) (width 0.1))
+    (fp_line (start -1 0.6) (end 1 0.6) (layer B.Fab) (width 0.1))
+    (fp_line (start 1 0.6) (end 1 -0.6) (layer B.Fab) (width 0.1))
+    (fp_line (start 1 -0.6) (end -1 -0.6) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.15 0.71) (end 0.15 0.71) (layer B.SilkS) (width 0.12))
+    (fp_line (start -0.15 -0.71) (end 0.15 -0.71) (layer B.SilkS) (width 0.12))
+    (fp_line (start -1.69 -1) (end -1.69 1) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.69 1) (end 1.69 1) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 1.69 1) (end 1.69 -1) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 1.69 -1) (end -1.69 -1) (layer B.CrtYd) (width 0.05))
+    (fp_text user %R (at 0 0 270) (layer B.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
     )
-    (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -1.46 -0.75) (end -1.46 0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -0.22 -0.51) (end 0.22 -0.51) (layer B.SilkS) (width 0.12))
-    (fp_line (start -0.22 0.51) (end 0.22 0.51) (layer B.SilkS) (width 0.12))
-    (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))
-    (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 rect (at 0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 32 /analog/AUDIO_R))
-    (pad 1 smd rect (at -0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 111 AUDIO_R0))
-    (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
+    (pad 1 smd rect (at -0.955 0 270) (size 0.97 1.5) (layers B.Cu B.Paste B.Mask)
+      (net 316 /power/RTCVDD))
+    (pad 2 smd rect (at 0.955 0 270) (size 0.97 1.5) (layers B.Cu B.Paste B.Mask)
+      (net 1 GND))
+    (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0805_2012Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
       (rotate (xyz 0 0 0))
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B06E922)
-    (at 131.961 74.773 90)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B1118B3)
+    (at 177.3 91.918 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")
     (tags resistor)
-    (path /58D82BD0/58D907D6)
+    (path /58D51CAD/5B0A7AE1)
     (attr smd)
-    (fp_text reference R19 (at -2.794 0 90) (layer B.SilkS)
+    (fp_text reference R65 (at 2.794 0 90) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_text value 680 (at 0 -1.65 90) (layer B.Fab)
@@ -8498,9 +8336,9 @@
       (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
     )
     (pad 1 smd rect (at -0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 110 AUDIO_R1))
+      (net 5 +3V3))
     (pad 2 smd rect (at 0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 32 /analog/AUDIO_R))
+      (net 316 /power/RTCVDD))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -8508,19 +8346,127 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B06E932)
-    (at 133.485 74.773 90)
+  (module L_1008_1210:L_1008_1210 (layer B.Cu) (tedit 5B019496) (tstamp 5B191548)
+    (at 158.87 88.09 180)
+    (descr "Inductor SMD 1008-1210 (2520-3225 Metric), square (rectangular) end terminal")
+    (tags inductor)
+    (path /58D51CAD/5A73C9EB)
+    (attr smd)
+    (fp_text reference L1 (at 0 2.5 180) (layer B.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text value 2.2uH (at 0 -2.5 180) (layer B.Fab)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_line (start -1.6 -1.25) (end -1.6 1.25) (layer B.Fab) (width 0.1))
+    (fp_line (start -1.6 1.25) (end 1.6 1.25) (layer B.Fab) (width 0.1))
+    (fp_line (start 1.6 1.25) (end 1.6 -1.25) (layer B.Fab) (width 0.1))
+    (fp_line (start 1.6 -1.25) (end -1.6 -1.25) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.2 1.4) (end 0.2 1.4) (layer B.SilkS) (width 0.12))
+    (fp_line (start -0.2 -1.4) (end 0.2 -1.4) (layer B.SilkS) (width 0.12))
+    (fp_line (start -2.29 -1.6) (end -2.29 1.6) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -2.29 1.6) (end 2.29 1.6) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 2.29 1.6) (end 2.29 -1.6) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 2.29 -1.6) (end -2.29 -1.6) (layer B.CrtYd) (width 0.05))
+    (fp_text user %R (at 0 0 180) (layer B.Fab)
+      (effects (font (size 0.8 0.8) (thickness 0.12)) (justify mirror))
+    )
+    (pad 1 smd rect (at -1.27 0 180) (size 1.5 2.7) (layers B.Cu B.Paste B.Mask)
+      (net 160 /power/L1))
+    (pad 2 smd rect (at 1.27 0 180) (size 1.5 2.7) (layers B.Cu B.Paste B.Mask)
+      (net 171 /power/P1V1))
+    (model ${KISYS3DMOD}/Inductor_SMD.3dshapes/L_1210_3225Metric.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module L_1008_1210:L_1008_1210 (layer B.Cu) (tedit 5B019496) (tstamp 5B191558)
+    (at 104.895 88.725)
+    (descr "Inductor SMD 1008-1210 (2520-3225 Metric), square (rectangular) end terminal")
+    (tags inductor)
+    (path /58D51CAD/58D67BD8)
+    (attr smd)
+    (fp_text reference L2 (at -3.2235 0.018) (layer B.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text value 2.2uH (at 0 -2.5) (layer B.Fab)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_line (start -1.6 -1.25) (end -1.6 1.25) (layer B.Fab) (width 0.1))
+    (fp_line (start -1.6 1.25) (end 1.6 1.25) (layer B.Fab) (width 0.1))
+    (fp_line (start 1.6 1.25) (end 1.6 -1.25) (layer B.Fab) (width 0.1))
+    (fp_line (start 1.6 -1.25) (end -1.6 -1.25) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.2 1.4) (end 0.2 1.4) (layer B.SilkS) (width 0.12))
+    (fp_line (start -0.2 -1.4) (end 0.2 -1.4) (layer B.SilkS) (width 0.12))
+    (fp_line (start -2.29 -1.6) (end -2.29 1.6) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -2.29 1.6) (end 2.29 1.6) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 2.29 1.6) (end 2.29 -1.6) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 2.29 -1.6) (end -2.29 -1.6) (layer B.CrtYd) (width 0.05))
+    (fp_text user %R (at 0 0) (layer B.Fab)
+      (effects (font (size 0.8 0.8) (thickness 0.12)) (justify mirror))
+    )
+    (pad 1 smd rect (at -1.27 0) (size 1.5 2.7) (layers B.Cu B.Paste B.Mask)
+      (net 162 /power/L2))
+    (pad 2 smd rect (at 1.27 0) (size 1.5 2.7) (layers B.Cu B.Paste B.Mask)
+      (net 159 /power/P2V5))
+    (model ${KISYS3DMOD}/Inductor_SMD.3dshapes/L_1210_3225Metric.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module L_1008_1210:L_1008_1210 (layer B.Cu) (tedit 5B019496) (tstamp 5B191568)
+    (at 156.33 74.755 180)
+    (descr "Inductor SMD 1008-1210 (2520-3225 Metric), square (rectangular) end terminal")
+    (tags inductor)
+    (path /58D51CAD/5A73CDB3)
+    (attr smd)
+    (fp_text reference L3 (at 3.287 -0.018 180) (layer B.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text value 2.2uH (at 0 -2.5 180) (layer B.Fab)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text user %R (at 0 0 180) (layer B.Fab)
+      (effects (font (size 0.8 0.8) (thickness 0.12)) (justify mirror))
+    )
+    (fp_line (start 2.29 -1.6) (end -2.29 -1.6) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 2.29 1.6) (end 2.29 -1.6) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -2.29 1.6) (end 2.29 1.6) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -2.29 -1.6) (end -2.29 1.6) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -0.2 -1.4) (end 0.2 -1.4) (layer B.SilkS) (width 0.12))
+    (fp_line (start -0.2 1.4) (end 0.2 1.4) (layer B.SilkS) (width 0.12))
+    (fp_line (start 1.6 -1.25) (end -1.6 -1.25) (layer B.Fab) (width 0.1))
+    (fp_line (start 1.6 1.25) (end 1.6 -1.25) (layer B.Fab) (width 0.1))
+    (fp_line (start -1.6 1.25) (end 1.6 1.25) (layer B.Fab) (width 0.1))
+    (fp_line (start -1.6 -1.25) (end -1.6 1.25) (layer B.Fab) (width 0.1))
+    (pad 2 smd rect (at 1.27 0 180) (size 1.5 2.7) (layers B.Cu B.Paste B.Mask)
+      (net 158 /power/P3V3))
+    (pad 1 smd rect (at -1.27 0 180) (size 1.5 2.7) (layers B.Cu B.Paste B.Mask)
+      (net 161 /power/L3))
+    (model ${KISYS3DMOD}/Inductor_SMD.3dshapes/L_1210_3225Metric.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B191578)
+    (at 170.3 82.375)
     (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 /58D82BD0/58D907D0)
+    (path /58D51CAD/58D67C1D)
     (attr smd)
-    (fp_text reference R20 (at -2.794 0 90) (layer B.SilkS)
+    (fp_text reference R1 (at 2.301 0.018) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 330 (at 0 -1.65 90) (layer B.Fab)
+    (fp_text value 15k (at 0 -1.65) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text user %R (at 0 0 90) (layer B.Fab)
+    (fp_text user %R (at 0 0) (layer B.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
     )
     (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
@@ -8533,10 +8479,10 @@
     (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))
     (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
-    (pad 2 smd rect (at 0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 32 /analog/AUDIO_R))
-    (pad 1 smd rect (at -0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 109 AUDIO_R2))
+    (pad 2 smd rect (at 0.875 0) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 14 /power/PWREN))
+    (pad 1 smd rect (at -0.875 0) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 25 /power/WAKE))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -8544,35 +8490,35 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B06E942)
-    (at 135.009 74.773 90)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B191588)
+    (at 172.84 79.835 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")
     (tags resistor)
-    (path /58D82BD0/58D907CA)
+    (path /58D51CAD/58D7BDD9)
     (attr smd)
-    (fp_text reference R21 (at -2.794 0 90) (layer B.SilkS)
+    (fp_text reference R2 (at 0 1.285 90) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 150 (at 0 -1.65 90) (layer B.Fab)
+    (fp_text value 47k (at 0 -1.65 90) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (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))
-    (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))
-    (fp_line (start -0.22 0.51) (end 0.22 0.51) (layer B.SilkS) (width 0.12))
-    (fp_line (start -0.22 -0.51) (end 0.22 -0.51) (layer B.SilkS) (width 0.12))
-    (fp_line (start -1.46 -0.75) (end -1.46 0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
     (fp_text user %R (at 0 0 90) (layer B.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
     )
-    (pad 1 smd rect (at -0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 108 AUDIO_R3))
+    (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.46 -0.75) (end -1.46 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -0.22 -0.51) (end 0.22 -0.51) (layer B.SilkS) (width 0.12))
+    (fp_line (start -0.22 0.51) (end 0.22 0.51) (layer B.SilkS) (width 0.12))
+    (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))
+    (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 rect (at 0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 32 /analog/AUDIO_R))
+      (net 1 GND))
+    (pad 1 smd rect (at -0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 14 /power/PWREN))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -8580,16 +8526,16 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B06E935)
-    (at 113.785 84.28 270)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B191598)
+    (at 162.045 70.31 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")
     (tags resistor)
-    (path /58D6547C/58D6605D)
+    (path /58D51CAD/58E810CC)
     (attr smd)
-    (fp_text reference R7 (at -5.697 0.493 270) (layer B.SilkS)
+    (fp_text reference R3 (at -1.415 -1.763) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 150 (at 0 -1.65 270) (layer B.Fab)
+    (fp_text value 4.7k (at 0 -1.65 90) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
@@ -8602,13 +8548,13 @@
     (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
     (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
     (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_text user %R (at 0 0 270) (layer B.Fab)
+    (fp_text user %R (at 0 0 90) (layer B.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
     )
-    (pad 1 smd rect (at -0.875 0 270) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 5 +3V3))
-    (pad 2 smd rect (at 0.875 0 270) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 130 /blinkey/BTNPUL))
+    (pad 1 smd rect (at -0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 2 +5V))
+    (pad 2 smd rect (at 0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 156 /power/PWRBTn))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -8616,35 +8562,35 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B06E945)
-    (at 152.139 103.076 180)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B1915A8)
+    (at 176.015 80.47 180)
     (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 /58D51CAD/591E4865)
+    (path /58D51CAD/58D7CBD5)
     (attr smd)
-    (fp_text reference R10 (at 0 1.65 180) (layer B.SilkS)
+    (fp_text reference R4 (at -5.476 0.236 180) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 150 (at 0 -1.65 180) (layer B.Fab)
+    (fp_text value 4.7k (at 0 -1.65 180) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
+    (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))
+    (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))
+    (fp_line (start -0.22 0.51) (end 0.22 0.51) (layer B.SilkS) (width 0.12))
+    (fp_line (start -0.22 -0.51) (end 0.22 -0.51) (layer B.SilkS) (width 0.12))
+    (fp_line (start -1.46 -0.75) (end -1.46 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
     (fp_text user %R (at 0 0 180) (layer B.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
     )
-    (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -1.46 -0.75) (end -1.46 0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -0.22 -0.51) (end 0.22 -0.51) (layer B.SilkS) (width 0.12))
-    (fp_line (start -0.22 0.51) (end 0.22 0.51) (layer B.SilkS) (width 0.12))
-    (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))
-    (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 rect (at 0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 124 FTDI_nSLEEP))
     (pad 1 smd rect (at -0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 133 /power/FTDI_nSUSPEND))
+      (net 26 /power/HOLD))
+    (pad 2 smd rect (at 0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 14 /power/PWREN))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -8652,16 +8598,16 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B06E955)
-    (at 163.315 96.345 180)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B1915B8)
+    (at 174.11 76.025 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 /58D6547C/591B5493)
+    (path /58D51CAD/58D85B68)
     (attr smd)
-    (fp_text reference R39 (at 0.035 1.345 180) (layer B.SilkS)
+    (fp_text reference R5 (at 0.272 7.986 270) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 150 (at 0 -1.65 180) (layer B.Fab)
+    (fp_text value 4.7M (at 0 -1.65 270) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
@@ -8674,13 +8620,13 @@
     (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
     (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
     (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_text user %R (at 0 0 180) (layer B.Fab)
+    (fp_text user %R (at 0 0 270) (layer B.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
     )
-    (pad 1 smd rect (at -0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 5 +3V3))
-    (pad 2 smd rect (at 0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 131 /blinkey/BTNPUR))
+    (pad 1 smd rect (at -0.875 0 270) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 24 /power/SHUT))
+    (pad 2 smd rect (at 0.875 0 270) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 1 GND))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -8688,7 +8634,7 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B06ECAD)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B1915C8)
     (at 178.555 84.915 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)
@@ -8697,7 +8643,7 @@
     (fp_text reference R6 (at 2.304 -0.015 270) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 1k (at 0 -1.65 270) (layer B.Fab)
+    (fp_text value 1.2k (at 0 -1.65 270) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_text user %R (at 0 0 270) (layer B.Fab)
@@ -8724,35 +8670,35 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B06ECBD)
-    (at 112.896 88.344 90)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B1915D8)
+    (at 113.785 84.28 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 /58D913EC/58EC15E1)
+    (path /58D6547C/58D6605D)
     (attr smd)
-    (fp_text reference R29 (at 7.348 -0.366 90) (layer B.SilkS)
+    (fp_text reference R7 (at -5.316 0.239 270) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 1k (at 0 -1.65 90) (layer B.Fab)
+    (fp_text value 150 (at 0 -1.65 270) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (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))
-    (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))
-    (fp_line (start -0.22 0.51) (end 0.22 0.51) (layer B.SilkS) (width 0.12))
-    (fp_line (start -0.22 -0.51) (end 0.22 -0.51) (layer B.SilkS) (width 0.12))
-    (fp_line (start -1.46 -0.75) (end -1.46 0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_text user %R (at 0 0 90) (layer B.Fab)
+    (fp_text user %R (at 0 0 270) (layer B.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
     )
-    (pad 1 smd rect (at -0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+    (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.46 -0.75) (end -1.46 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -0.22 -0.51) (end 0.22 -0.51) (layer B.SilkS) (width 0.12))
+    (fp_line (start -0.22 0.51) (end 0.22 0.51) (layer B.SilkS) (width 0.12))
+    (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))
+    (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 rect (at 0.875 0 270) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 130 /blinkey/BTNPUL))
+    (pad 1 smd rect (at -0.875 0 270) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
       (net 5 +3V3))
-    (pad 2 smd rect (at 0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 86 /flash/FLASH_SCK))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -8760,16 +8706,16 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B06E21A)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B1915E8)
     (at 170.935 79.835 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")
     (tags resistor)
     (path /58D51CAD/58D8111E)
     (attr smd)
-    (fp_text reference R8 (at -0.018 -3.541 90) (layer B.SilkS)
+    (fp_text reference R8 (at 0.109 -3.541 90) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 1k (at 0 -1.65 90) (layer B.Fab)
+    (fp_text value 1.2k (at 0 -1.65 90) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
@@ -8796,35 +8742,35 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B06E2E1)
-    (at 102.99 102.06 180)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B0D6FDC)
+    (at 128.39 109.68 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 /58D6D447/58FD4C5D)
+    (path /58D6BF46/58EB9CB5)
     (attr smd)
-    (fp_text reference R35 (at 2.779 -0.018 180) (layer B.SilkS)
+    (fp_text reference R9 (at 1.542 -1.666) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 470 (at 0 -1.65 180) (layer B.Fab)
+    (fp_text value 15k (at 0 -1.65 270) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (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))
-    (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))
-    (fp_line (start -0.22 0.51) (end 0.22 0.51) (layer B.SilkS) (width 0.12))
-    (fp_line (start -0.22 -0.51) (end 0.22 -0.51) (layer B.SilkS) (width 0.12))
-    (fp_line (start -1.46 -0.75) (end -1.46 0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_text user %R (at 0 0 180) (layer B.Fab)
+    (fp_text user %R (at 0 0 270) (layer B.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
     )
-    (pad 1 smd rect (at -0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 94 WIFI_EN))
-    (pad 2 smd rect (at 0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 175 /wifi/WIFIEN))
+    (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.46 -0.75) (end -1.46 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -0.22 -0.51) (end 0.22 -0.51) (layer B.SilkS) (width 0.12))
+    (fp_line (start -0.22 0.51) (end 0.22 0.51) (layer B.SilkS) (width 0.12))
+    (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))
+    (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 rect (at 0.875 0 270) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 176 FT2V5))
+    (pad 1 smd rect (at -0.875 0 270) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 42 nRESET))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -8832,35 +8778,35 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B15C373)
-    (at 114.42 88.344 90)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B191608)
+    (at 152.139 103.076 180)
     (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 /58D913EC/58EC4E85)
+    (path /58D51CAD/591E4865)
     (attr smd)
-    (fp_text reference R12 (at 7.348 -0.493 270) (layer B.SilkS)
+    (fp_text reference R10 (at 0 1.65 180) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 10k (at 0 -1.65 90) (layer B.Fab)
+    (fp_text value 150 (at 0 -1.65 180) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (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))
-    (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))
-    (fp_line (start -0.22 0.51) (end 0.22 0.51) (layer B.SilkS) (width 0.12))
-    (fp_line (start -0.22 -0.51) (end 0.22 -0.51) (layer B.SilkS) (width 0.12))
-    (fp_line (start -1.46 -0.75) (end -1.46 0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_text user %R (at 0 0 90) (layer B.Fab)
+    (fp_text user %R (at 0 0 180) (layer B.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
     )
-    (pad 1 smd rect (at -0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 5 +3V3))
-    (pad 2 smd rect (at 0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 83 /flash/FLASH_nHOLD))
+    (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.46 -0.75) (end -1.46 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -0.22 -0.51) (end 0.22 -0.51) (layer B.SilkS) (width 0.12))
+    (fp_line (start -0.22 0.51) (end 0.22 0.51) (layer B.SilkS) (width 0.12))
+    (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))
+    (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 rect (at 0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 124 FTDI_nSLEEP))
+    (pad 1 smd rect (at -0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 133 /power/FTDI_nSUSPEND))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -8868,19 +8814,19 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B20C4B6)
-    (at 170.3 82.375)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B191618)
+    (at 119.5 80.47 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 /58D51CAD/58D67C1D)
+    (path /58D913EC/58EC4E77)
     (attr smd)
-    (fp_text reference R1 (at -2.525 0.272) (layer B.SilkS)
+    (fp_text reference R11 (at -2.776 -0.015 270) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 15k (at 0 -1.65) (layer B.Fab)
+    (fp_text value 12k (at 0 -1.65 270) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text user %R (at 0 0) (layer B.Fab)
+    (fp_text user %R (at 0 0 270) (layer B.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
     )
     (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
@@ -8893,10 +8839,10 @@
     (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))
     (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
-    (pad 2 smd rect (at 0.875 0) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 14 /power/PWREN))
-    (pad 1 smd rect (at -0.875 0) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 25 /power/WAKE))
+    (pad 2 smd rect (at 0.875 0 270) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 82 /flash/FLASH_nWP))
+    (pad 1 smd rect (at -0.875 0 270) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 5 +3V3))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -8904,16 +8850,16 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B20C4C6)
-    (at 172.84 79.835 90)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B191628)
+    (at 114.42 88.344 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")
     (tags resistor)
-    (path /58D51CAD/58D7BDD9)
+    (path /58D913EC/58EC4E85)
     (attr smd)
-    (fp_text reference R2 (at -2.304 0.015 90) (layer B.SilkS)
+    (fp_text reference R12 (at 6.967 -0.1755 90) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 47k (at 0 -1.65 90) (layer B.Fab)
+    (fp_text value 12k (at 0 -1.65 90) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
@@ -8930,9 +8876,9 @@
       (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
     )
     (pad 1 smd rect (at -0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 14 /power/PWREN))
+      (net 5 +3V3))
     (pad 2 smd rect (at 0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 1 GND))
+      (net 83 /flash/FLASH_nHOLD))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -8940,19 +8886,19 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B20C4D6)
-    (at 162.045 70.31 90)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B191935)
+    (at 176.015 78.565 180)
     (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 /58D51CAD/58E810CC)
+    (path /58D51CAD/58DA1F4D)
     (attr smd)
-    (fp_text reference R3 (at -1.415 -1.763 180) (layer B.SilkS)
+    (fp_text reference R13 (at -5.603 -0.145 180) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 4.7k (at 0 -1.65 90) (layer B.Fab)
+    (fp_text value 15k (at 0 -1.65 180) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text user %R (at 0 0 90) (layer B.Fab)
+    (fp_text user %R (at 0 0 180) (layer B.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
     )
     (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
@@ -8965,10 +8911,10 @@
     (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))
     (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
-    (pad 2 smd rect (at 0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 156 /power/PWRBTn))
-    (pad 1 smd rect (at -0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 2 +5V))
+    (pad 2 smd rect (at 0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 1 GND))
+    (pad 1 smd rect (at -0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 30 SHUTDOWN))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -8976,16 +8922,16 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B20C4E6)
-    (at 176.015 80.47 180)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B191648)
+    (at 125.596 85.06 180)
     (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 /58D51CAD/58D7CBD5)
+    (path /58D82BD0/58D90500)
     (attr smd)
-    (fp_text reference R4 (at -5.222 -0.018 180) (layer B.SilkS)
+    (fp_text reference R14 (at 2.779 0 180) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 4.7k (at 0 -1.65 180) (layer B.Fab)
+    (fp_text value 1.2k (at 0 -1.65 180) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_text user %R (at 0 0 180) (layer B.Fab)
@@ -9002,9 +8948,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 rect (at 0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 14 /power/PWREN))
+      (net 31 /analog/AUDIO_L))
     (pad 1 smd rect (at -0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 26 /power/HOLD))
+      (net 107 AUDIO_L0))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -9012,16 +8958,16 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B20C4F6)
-    (at 174.11 76.025 270)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B191658)
+    (at 125.596 83.536 180)
     (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 /58D51CAD/58D85B68)
+    (path /58D82BD0/58D904D5)
     (attr smd)
-    (fp_text reference R5 (at 1.034 7.986 270) (layer B.SilkS)
+    (fp_text reference R15 (at 2.779 0 180) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 4.7M (at 0 -1.65 270) (layer B.Fab)
+    (fp_text value 680 (at 0 -1.65 180) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
@@ -9034,13 +8980,13 @@
     (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
     (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
     (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_text user %R (at 0 0 270) (layer B.Fab)
+    (fp_text user %R (at 0 0 180) (layer B.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
     )
-    (pad 1 smd rect (at -0.875 0 270) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 24 /power/SHUT))
-    (pad 2 smd rect (at 0.875 0 270) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 1 GND))
+    (pad 1 smd rect (at -0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 106 AUDIO_L1))
+    (pad 2 smd rect (at 0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 31 /analog/AUDIO_L))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -9048,19 +8994,19 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B20C506)
-    (at 128.39 109.68 270)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B191668)
+    (at 125.596 82.012 180)
     (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 /58D6BF46/58EB9CB5)
+    (path /58D82BD0/58D904AE)
     (attr smd)
-    (fp_text reference R9 (at -6.586 -0.015 90) (layer B.SilkS)
+    (fp_text reference R16 (at 2.779 0 180) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 15k (at 0 -1.65 270) (layer B.Fab)
+    (fp_text value 330 (at 0 -1.65 180) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text user %R (at 0 0 270) (layer B.Fab)
+    (fp_text user %R (at 0 0 180) (layer B.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
     )
     (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
@@ -9073,10 +9019,10 @@
     (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))
     (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
-    (pad 2 smd rect (at 0.875 0 270) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 176 FT2V5))
-    (pad 1 smd rect (at -0.875 0 270) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 42 nRESET))
+    (pad 2 smd rect (at 0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 31 /analog/AUDIO_L))
+    (pad 1 smd rect (at -0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 105 AUDIO_L2))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -9084,16 +9030,16 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B20C516)
-    (at 119.5 80.47 270)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B191678)
+    (at 125.596 80.47 180)
     (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 /58D913EC/58EC4E77)
+    (path /58D82BD0/58D90455)
     (attr smd)
-    (fp_text reference R11 (at -2.903 -0.015 270) (layer B.SilkS)
+    (fp_text reference R17 (at 2.779 -0.018 180) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 10k (at 0 -1.65 270) (layer B.Fab)
+    (fp_text value 150 (at 0 -1.65 180) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
@@ -9106,13 +9052,13 @@
     (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
     (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
     (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_text user %R (at 0 0 270) (layer B.Fab)
+    (fp_text user %R (at 0 0 180) (layer B.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
     )
-    (pad 1 smd rect (at -0.875 0 270) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 5 +3V3))
-    (pad 2 smd rect (at 0.875 0 270) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 82 /flash/FLASH_nWP))
+    (pad 1 smd rect (at -0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 104 AUDIO_L3))
+    (pad 2 smd rect (at 0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 31 /analog/AUDIO_L))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -9120,35 +9066,107 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B20C526)
-    (at 176.015 78.565 180)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B191688)
+    (at 130.422 74.773 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")
     (tags resistor)
-    (path /58D51CAD/58DA1F4D)
+    (path /58D82BD0/58D907DC)
     (attr smd)
-    (fp_text reference R13 (at -5.603 -0.018 180) (layer B.SilkS)
+    (fp_text reference R18 (at -2.794 0.015 90) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 15k (at 0 -1.65 180) (layer B.Fab)
+    (fp_text value 1.2k (at 0 -1.65 90) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (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))
-    (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))
-    (fp_line (start -0.22 0.51) (end 0.22 0.51) (layer B.SilkS) (width 0.12))
-    (fp_line (start -0.22 -0.51) (end 0.22 -0.51) (layer B.SilkS) (width 0.12))
-    (fp_line (start -1.46 -0.75) (end -1.46 0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_text user %R (at 0 0 90) (layer B.Fab)
+      (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
+    )
+    (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
     (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.46 -0.75) (end -1.46 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -0.22 -0.51) (end 0.22 -0.51) (layer B.SilkS) (width 0.12))
+    (fp_line (start -0.22 0.51) (end 0.22 0.51) (layer B.SilkS) (width 0.12))
+    (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))
+    (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 rect (at 0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 32 /analog/AUDIO_R))
+    (pad 1 smd rect (at -0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 111 AUDIO_R0))
+    (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 B.Cu) (tedit 59FE48B8) (tstamp 5B191698)
+    (at 131.961 74.773 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")
+    (tags resistor)
+    (path /58D82BD0/58D907D6)
+    (attr smd)
+    (fp_text reference R19 (at -2.794 0 90) (layer B.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text value 680 (at 0 -1.65 90) (layer B.Fab)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text user %R (at 0 0 90) (layer B.Fab)
+      (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
+    )
     (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_text user %R (at 0 0 180) (layer B.Fab)
+    (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.46 -0.75) (end -1.46 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -0.22 -0.51) (end 0.22 -0.51) (layer B.SilkS) (width 0.12))
+    (fp_line (start -0.22 0.51) (end 0.22 0.51) (layer B.SilkS) (width 0.12))
+    (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))
+    (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 rect (at 0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 32 /analog/AUDIO_R))
+    (pad 1 smd rect (at -0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 110 AUDIO_R1))
+    (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 B.Cu) (tedit 59FE48B8) (tstamp 5B1916A8)
+    (at 133.485 74.773 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")
+    (tags resistor)
+    (path /58D82BD0/58D907D0)
+    (attr smd)
+    (fp_text reference R20 (at -2.794 0 90) (layer B.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text value 330 (at 0 -1.65 90) (layer B.Fab)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text user %R (at 0 0 90) (layer B.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
     )
-    (pad 1 smd rect (at -0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 30 SHUTDOWN))
-    (pad 2 smd rect (at 0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 1 GND))
+    (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.46 -0.75) (end -1.46 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -0.22 -0.51) (end 0.22 -0.51) (layer B.SilkS) (width 0.12))
+    (fp_line (start -0.22 0.51) (end 0.22 0.51) (layer B.SilkS) (width 0.12))
+    (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))
+    (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 rect (at 0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 32 /analog/AUDIO_R))
+    (pad 1 smd rect (at -0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 109 AUDIO_R2))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -9156,16 +9174,16 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B20C536)
-    (at 140.0255 65.23 90)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B1916B8)
+    (at 135.009 74.773 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")
     (tags resistor)
-    (path /58D686D9/58D92D93)
+    (path /58D82BD0/58D907CA)
     (attr smd)
-    (fp_text reference R22 (at -1.542 -1.4605 270) (layer B.SilkS)
+    (fp_text reference R21 (at -2.794 0.127 90) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 2.2k (at 0 -1.65 90) (layer B.Fab)
+    (fp_text value 150 (at 0 -1.65 90) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
@@ -9182,9 +9200,9 @@
       (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
     )
     (pad 1 smd rect (at -0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 5 +3V3))
+      (net 108 AUDIO_R3))
     (pad 2 smd rect (at 0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 261 FPDI_SDA))
+      (net 32 /analog/AUDIO_R))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -9192,35 +9210,35 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B20C546)
-    (at 140.597 70.201 270)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B1916C8)
+    (at 140.0255 65.23 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")
     (tags resistor)
-    (path /58D686D9/58D92CF9)
+    (path /58D686D9/58D92D93)
     (attr smd)
-    (fp_text reference R23 (at 2.794 -0.0635 270) (layer B.SilkS)
+    (fp_text reference R22 (at -1.415 -1.3335 90) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 2.2k (at 0 -1.65 270) (layer B.Fab)
+    (fp_text value 3.3k (at 0 -1.65 90) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text user %R (at 0 0 270) (layer B.Fab)
+    (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))
+    (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))
+    (fp_line (start -0.22 0.51) (end 0.22 0.51) (layer B.SilkS) (width 0.12))
+    (fp_line (start -0.22 -0.51) (end 0.22 -0.51) (layer B.SilkS) (width 0.12))
+    (fp_line (start -1.46 -0.75) (end -1.46 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
+    (fp_text user %R (at 0 0 90) (layer B.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
     )
-    (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -1.46 -0.75) (end -1.46 0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -0.22 -0.51) (end 0.22 -0.51) (layer B.SilkS) (width 0.12))
-    (fp_line (start -0.22 0.51) (end 0.22 0.51) (layer B.SilkS) (width 0.12))
-    (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))
-    (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 rect (at 0.875 0 270) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 262 FPDI_SCL))
-    (pad 1 smd rect (at -0.875 0 270) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+    (pad 1 smd rect (at -0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
       (net 5 +3V3))
+    (pad 2 smd rect (at 0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 261 FPDI_SDA))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -9228,19 +9246,19 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B20C556)
-    (at 150.615 66.772 90)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B1916D8)
+    (at 140.597 70.201 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 /58D686D9/58D92136)
+    (path /58D686D9/58D92CF9)
     (attr smd)
-    (fp_text reference R24 (at 0 -1.255 90) (layer B.SilkS)
+    (fp_text reference R23 (at 2.794 0 270) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 100k (at 0 -1.65 90) (layer B.Fab)
+    (fp_text value 3.3k (at 0 -1.65 270) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text user %R (at 0 0 90) (layer B.Fab)
+    (fp_text user %R (at 0 0 270) (layer B.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
     )
     (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
@@ -9253,10 +9271,10 @@
     (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))
     (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
-    (pad 2 smd rect (at 0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 35 /gpdi/VREF2))
-    (pad 1 smd rect (at -0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 2 +5V))
+    (pad 2 smd rect (at 0.875 0 270) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 262 FPDI_SCL))
+    (pad 1 smd rect (at -0.875 0 270) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 5 +3V3))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -9264,16 +9282,16 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B20C566)
-    (at 149.175 72.215 180)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B1916E8)
+    (at 150.615 66.772 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")
     (tags resistor)
-    (path /58D686D9/58D921DD)
+    (path /58D686D9/58D92136)
     (attr smd)
-    (fp_text reference R25 (at 0.069 -1.288 180) (layer B.SilkS)
+    (fp_text reference R24 (at 0 -1.382 90) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 4.7k (at 0 -1.65 180) (layer B.Fab)
+    (fp_text value 100k (at 0 -1.65 90) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
@@ -9286,13 +9304,49 @@
     (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
     (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
     (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_text user %R (at 0 0 180) (layer B.Fab)
+    (fp_text user %R (at 0 0 90) (layer B.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
     )
-    (pad 1 smd rect (at -0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+    (pad 1 smd rect (at -0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
       (net 2 +5V))
+    (pad 2 smd rect (at 0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 35 /gpdi/VREF2))
+    (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 B.Cu) (tedit 59FE48B8) (tstamp 5B1916F8)
+    (at 149.175 72.487 180)
+    (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 /58D686D9/58D921DD)
+    (attr smd)
+    (fp_text reference R25 (at 2.863 -0.381 180) (layer B.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text value 4.7k (at 0 -1.65 180) (layer B.Fab)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text user %R (at 0 0 180) (layer B.Fab)
+      (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
+    )
+    (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.46 -0.75) (end -1.46 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -0.22 -0.51) (end 0.22 -0.51) (layer B.SilkS) (width 0.12))
+    (fp_line (start -0.22 0.51) (end 0.22 0.51) (layer B.SilkS) (width 0.12))
+    (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))
+    (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 rect (at 0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
       (net 34 GPDI_SCL))
+    (pad 1 smd rect (at -0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 2 +5V))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -9300,13 +9354,13 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5AFF1455)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B191708)
     (at 149.487 69.693 180)
     (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 /58D686D9/58D92237)
     (attr smd)
-    (fp_text reference R26 (at 0 -1.3335 180) (layer B.SilkS)
+    (fp_text reference R26 (at 0.127 -1.397 180) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_text value 4.7k (at 0 -1.65 180) (layer B.Fab)
@@ -9336,7 +9390,7 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B20C586)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B191718)
     (at 129.025 96.175 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")
     (tags resistor)
@@ -9345,7 +9399,7 @@
     (fp_text reference R27 (at 2.86 0.015 90) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 10k (at 0 -1.65 90) (layer B.Fab)
+    (fp_text value 12k (at 0 -1.65 90) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_text user %R (at 0 0 90) (layer B.Fab)
@@ -9372,16 +9426,16 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B20C596)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B191728)
     (at 117.595 80.47 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 /58D913EC/58EC0F8E)
     (attr smd)
-    (fp_text reference R28 (at -2.903 -0.015 270) (layer B.SilkS)
+    (fp_text reference R28 (at -2.776 -0.015 270) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 10k (at 0 -1.65 270) (layer B.Fab)
+    (fp_text value 12k (at 0 -1.65 270) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
@@ -9408,35 +9462,71 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B20C5A6)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B191738)
+    (at 112.896 88.344 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")
+    (tags resistor)
+    (path /58D913EC/58EC15E1)
+    (attr smd)
+    (fp_text reference R29 (at 6.967 -0.239 90) (layer B.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text value 1.2k (at 0 -1.65 90) (layer B.Fab)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (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))
+    (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))
+    (fp_line (start -0.22 0.51) (end 0.22 0.51) (layer B.SilkS) (width 0.12))
+    (fp_line (start -0.22 -0.51) (end 0.22 -0.51) (layer B.SilkS) (width 0.12))
+    (fp_line (start -1.46 -0.75) (end -1.46 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
+    (fp_text user %R (at 0 0 90) (layer B.Fab)
+      (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
+    )
+    (pad 1 smd rect (at -0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 5 +3V3))
+    (pad 2 smd rect (at 0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 86 /flash/FLASH_SCK))
+    (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 B.Cu) (tedit 59FE48B8) (tstamp 5B191748)
     (at 115.69 80.47 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 /58D913EC/58EC1C84)
     (attr smd)
-    (fp_text reference R30 (at -2.903 -0.015 270) (layer B.SilkS)
+    (fp_text reference R30 (at -2.776 -0.015 270) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_text value 4.7k (at 0 -1.65 270) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
+    (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))
+    (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))
+    (fp_line (start -0.22 0.51) (end 0.22 0.51) (layer B.SilkS) (width 0.12))
+    (fp_line (start -0.22 -0.51) (end 0.22 -0.51) (layer B.SilkS) (width 0.12))
+    (fp_line (start -1.46 -0.75) (end -1.46 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
     (fp_text user %R (at 0 0 270) (layer B.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
     )
-    (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -1.46 -0.75) (end -1.46 0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -0.22 -0.51) (end 0.22 -0.51) (layer B.SilkS) (width 0.12))
-    (fp_line (start -0.22 0.51) (end 0.22 0.51) (layer B.SilkS) (width 0.12))
-    (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))
-    (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 rect (at 0.875 0 270) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 87 /flash/FLASH_nCS))
     (pad 1 smd rect (at -0.875 0 270) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
       (net 5 +3V3))
+    (pad 2 smd rect (at 0.875 0 270) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 87 /flash/FLASH_nCS))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -9444,7 +9534,7 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B20C5B6)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B191758)
     (at 143.63 98.25 180)
     (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)
@@ -9453,7 +9543,7 @@
     (fp_text reference R31 (at 0 1.65 180) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 10k (at 0 -1.65 180) (layer B.Fab)
+    (fp_text value 12k (at 0 -1.65 180) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_text user %R (at 0 0 180) (layer B.Fab)
@@ -9480,7 +9570,7 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B20C5C6)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B191768)
     (at 132.835 97.615 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")
     (tags resistor)
@@ -9489,7 +9579,7 @@
     (fp_text reference R32 (at 2.776 0.015 90) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 10k (at 0 -1.65 90) (layer B.Fab)
+    (fp_text value 12k (at 0 -1.65 90) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
@@ -9516,7 +9606,7 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B20C5D6)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B191778)
     (at 130.93 97.615 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")
     (tags resistor)
@@ -9525,7 +9615,7 @@
     (fp_text reference R33 (at 2.776 0.015 90) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 10k (at 0 -1.65 90) (layer B.Fab)
+    (fp_text value 12k (at 0 -1.65 90) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_text user %R (at 0 0 90) (layer B.Fab)
@@ -9552,121 +9642,13 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B20C5E6)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B191788)
     (at 102.99 103.6)
     (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 /58D6D447/58ED6C6D)
     (attr smd)
-    (fp_text reference R34 (at -2.779 0.129) (layer B.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_text value 15k (at 0 -1.65) (layer B.Fab)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_text user %R (at 0 0) (layer B.Fab)
-      (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
-    )
-    (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -1.46 -0.75) (end -1.46 0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -0.22 -0.51) (end 0.22 -0.51) (layer B.SilkS) (width 0.12))
-    (fp_line (start -0.22 0.51) (end 0.22 0.51) (layer B.SilkS) (width 0.12))
-    (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))
-    (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 rect (at 0.875 0) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 94 WIFI_EN))
-    (pad 1 smd rect (at -0.875 0) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 5 +3V3))
-    (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 B.Cu) (tedit 59FE48B8) (tstamp 5B20C5F6)
-    (at 103.498 98.758 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")
-    (tags resistor)
-    (path /58DA7327/590C5D62)
-    (attr smd)
-    (fp_text reference R38 (at -3.447 1.412 90) (layer B.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_text value 0.47 (at 0 -1.65 90) (layer B.Fab)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (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))
-    (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))
-    (fp_line (start -0.22 0.51) (end 0.22 0.51) (layer B.SilkS) (width 0.12))
-    (fp_line (start -0.22 -0.51) (end 0.22 -0.51) (layer B.SilkS) (width 0.12))
-    (fp_line (start -1.46 -0.75) (end -1.46 0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_text user %R (at 0 0 90) (layer B.Fab)
-      (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
-    )
-    (pad 1 smd rect (at -0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 127 /sdcard/SD3V3))
-    (pad 2 smd rect (at 0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 5 +3V3))
-    (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 B.Cu) (tedit 59FE48B8) (tstamp 5B20C606)
-    (at 134.74 97.615 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 /58D913EC/59DEB568)
-    (attr smd)
-    (fp_text reference R55 (at -2.776 0.112 270) (layer B.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_text value 15k (at 0 -1.65 270) (layer B.Fab)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (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))
-    (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))
-    (fp_line (start -0.22 0.51) (end 0.22 0.51) (layer B.SilkS) (width 0.12))
-    (fp_line (start -0.22 -0.51) (end 0.22 -0.51) (layer B.SilkS) (width 0.12))
-    (fp_line (start -1.46 -0.75) (end -1.46 0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_text user %R (at 0 0 270) (layer B.Fab)
-      (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
-    )
-    (pad 1 smd rect (at -0.875 0 270) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 89 /flash/FPGA_DONE))
-    (pad 2 smd rect (at 0.875 0 270) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 157 PROG_DONE))
-    (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 B.Cu) (tedit 59FE48B8) (tstamp 5B20C616)
-    (at 167.506 67.135)
-    (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 /58D6BF46/5A71E38F)
-    (attr smd)
-    (fp_text reference R63 (at 0.015 -2.649) (layer B.SilkS)
+    (fp_text reference R34 (at -2.779 0.002) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_text value 15k (at 0 -1.65) (layer B.Fab)
@@ -9686,9 +9668,9 @@
       (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
     )
     (pad 1 smd rect (at -0.875 0) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 237 "Net-(D23-Pad2)"))
+      (net 5 +3V3))
     (pad 2 smd rect (at 0.875 0) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 132 USB_FPGA_D+))
+      (net 94 WIFI_EN))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -9696,16 +9678,16 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B20C626)
-    (at 173.6 67.12 180)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B191798)
+    (at 102.99 102.06 180)
     (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 /58D6BF46/5A71E566)
+    (path /58D6D447/58FD4C5D)
     (attr smd)
-    (fp_text reference R64 (at 0 2.634 180) (layer B.SilkS)
+    (fp_text reference R35 (at 2.779 -0.018 180) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 15k (at 0 -1.65 180) (layer B.Fab)
+    (fp_text value 680 (at 0 -1.65 180) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_text user %R (at 0 0 180) (layer B.Fab)
@@ -9722,9 +9704,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 rect (at 0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 151 USB_FPGA_D-))
+      (net 175 /wifi/WIFIEN))
     (pad 1 smd rect (at -0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 239 "Net-(D25-Pad2)"))
+      (net 94 WIFI_EN))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -9732,35 +9714,35 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B20C636)
-    (at 154.86 95.64)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B1917A8)
+    (at 103.498 98.758 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")
     (tags resistor)
-    (path /58D51CAD/58D5A193)
+    (path /58DA7327/590C5D62)
     (attr smd)
-    (fp_text reference RA1 (at 0 -1.309) (layer B.SilkS)
+    (fp_text reference R38 (at -3.447 1.4755 90) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 15k (at 0 -1.65) (layer B.Fab)
+    (fp_text value 0.47 (at 0 -1.65 90) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text user %R (at 0 0) (layer B.Fab)
-      (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
-    )
-    (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -1.46 -0.75) (end -1.46 0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -0.22 -0.51) (end 0.22 -0.51) (layer B.SilkS) (width 0.12))
-    (fp_line (start -0.22 0.51) (end 0.22 0.51) (layer B.SilkS) (width 0.12))
-    (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))
-    (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 rect (at 0.875 0) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 12 /power/FB1))
-    (pad 1 smd rect (at -0.875 0) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 171 /power/P1V1))
+    (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))
+    (fp_line (start 0.8 -0.4) (end -0.8 -0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.22 0.51) (end 0.22 0.51) (layer B.SilkS) (width 0.12))
+    (fp_line (start -0.22 -0.51) (end 0.22 -0.51) (layer B.SilkS) (width 0.12))
+    (fp_line (start -1.46 -0.75) (end -1.46 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
+    (fp_text user %R (at 0 0 90) (layer B.Fab)
+      (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
+    )
+    (pad 1 smd rect (at -0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 127 /sdcard/SD3V3))
+    (pad 2 smd rect (at 0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 5 +3V3))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -9768,35 +9750,35 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B20C646)
-    (at 109.34 82.375 180)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B1917B8)
+    (at 163.315 96.345 180)
     (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 /58D51CAD/58D67BE4)
+    (path /58D6547C/591B5493)
     (attr smd)
-    (fp_text reference RA2 (at 0 5.062 180) (layer B.SilkS)
+    (fp_text reference R39 (at 0 1.65 180) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 15k (at 0 -1.65 180) (layer B.Fab)
+    (fp_text value 150 (at 0 -1.65 180) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
+    (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))
+    (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))
+    (fp_line (start -0.22 0.51) (end 0.22 0.51) (layer B.SilkS) (width 0.12))
+    (fp_line (start -0.22 -0.51) (end 0.22 -0.51) (layer B.SilkS) (width 0.12))
+    (fp_line (start -1.46 -0.75) (end -1.46 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
     (fp_text user %R (at 0 0 180) (layer B.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
     )
-    (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -1.46 -0.75) (end -1.46 0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -0.22 -0.51) (end 0.22 -0.51) (layer B.SilkS) (width 0.12))
-    (fp_line (start -0.22 0.51) (end 0.22 0.51) (layer B.SilkS) (width 0.12))
-    (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))
-    (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 rect (at 0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 16 /power/FB2))
     (pad 1 smd rect (at -0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 159 /power/P2V5))
+      (net 5 +3V3))
+    (pad 2 smd rect (at 0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 131 /blinkey/BTNPUR))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -9804,16 +9786,16 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B20C656)
-    (at 152.52 81.105)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B1917C8)
+    (at 167.506 67.135)
     (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 /58D51CAD/58D62970)
+    (path /58D6BF46/5A71E38F)
     (attr smd)
-    (fp_text reference RA3 (at -3.287 -0.109) (layer B.SilkS)
+    (fp_text reference R63 (at 0 1.65) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 15k (at 0 -1.65) (layer B.Fab)
+    (fp_text value 12k (at 0 -1.65) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_text user %R (at 0 0) (layer B.Fab)
@@ -9830,9 +9812,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 rect (at 0.875 0) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 15 /power/FB3))
+      (net 132 USB_FPGA_D+))
     (pad 1 smd rect (at -0.875 0) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 158 /power/P3V3))
+      (net 237 "Net-(D23-Pad2)"))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -9840,16 +9822,16 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B20C666)
-    (at 158.235 91.9 270)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B1917D8)
+    (at 173.6 67.12 180)
     (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 /58D51CAD/58D5A1E5)
+    (path /58D6BF46/5A71E566)
     (attr smd)
-    (fp_text reference RB1 (at 2.812 0.493 270) (layer B.SilkS)
+    (fp_text reference R64 (at 0 2.634 180) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 18k (at 0 -1.65 270) (layer B.Fab)
+    (fp_text value 12k (at 0 -1.65 180) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
@@ -9862,13 +9844,13 @@
     (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
     (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
     (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_text user %R (at 0 0 270) (layer B.Fab)
+    (fp_text user %R (at 0 0 180) (layer B.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
     )
-    (pad 1 smd rect (at -0.875 0 270) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 1 GND))
-    (pad 2 smd rect (at 0.875 0 270) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 12 /power/FB1))
+    (pad 1 smd rect (at -0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 239 "Net-(D25-Pad2)"))
+    (pad 2 smd rect (at 0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 151 USB_FPGA_D-))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -9876,16 +9858,16 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B20C676)
-    (at 106.165 84.915 90)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B1917E8)
+    (at 154.86 95.64)
     (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 /58D51CAD/58D67BEA)
+    (path /58D51CAD/58D5A193)
     (attr smd)
-    (fp_text reference RB2 (at 2.903 0.015 90) (layer B.SilkS)
+    (fp_text reference RA1 (at 0 -1.309) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 4.7k (at 0 -1.65 90) (layer B.Fab)
+    (fp_text value 15k (at 0 -1.65) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
@@ -9898,13 +9880,13 @@
     (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
     (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
     (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_text user %R (at 0 0 90) (layer B.Fab)
+    (fp_text user %R (at 0 0) (layer B.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
     )
-    (pad 1 smd rect (at -0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 1 GND))
-    (pad 2 smd rect (at 0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 16 /power/FB2))
+    (pad 1 smd rect (at -0.875 0) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 171 /power/P1V1))
+    (pad 2 smd rect (at 0.875 0) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 12 /power/FB1))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -9912,16 +9894,16 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B20C686)
-    (at 155.695 78.565 270)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B1917F8)
+    (at 109.34 82.375 180)
     (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 /58D51CAD/58D62976)
+    (path /58D51CAD/58D67BE4)
     (attr smd)
-    (fp_text reference RB3 (at 2.939 0.62 270) (layer B.SilkS)
+    (fp_text reference RA2 (at -0.015 5.062 180) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 3.3k (at 0 -1.65 270) (layer B.Fab)
+    (fp_text value 15k (at 0 -1.65 180) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
@@ -9934,13 +9916,13 @@
     (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
     (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
     (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_text user %R (at 0 0 270) (layer B.Fab)
+    (fp_text user %R (at 0 0 180) (layer B.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
     )
-    (pad 1 smd rect (at -0.875 0 270) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 1 GND))
-    (pad 2 smd rect (at 0.875 0 270) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 15 /power/FB3))
+    (pad 1 smd rect (at -0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 159 /power/P2V5))
+    (pad 2 smd rect (at 0.875 0 180) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 16 /power/FB2))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -9948,106 +9930,88 @@
     )
   )
 
-  (module SM8:SM8 (layer B.Cu) (tedit 5A0C2F78) (tstamp 5B17ED8A)
-    (at 144.68 65.8015 90)
-    (descr "TI SM8 SOIC-8 150 mil")
-    (tags "SOIC-8 1.27 150 mil SOT96-1")
-    (path /58D686D9/5B01C6B5)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B191808)
+    (at 152.52 81.105)
+    (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 /58D51CAD/58D62970)
     (attr smd)
-    (fp_text reference U11 (at 3.3475 -0.019 -180) (layer B.SilkS)
+    (fp_text reference RA3 (at -3.16 0.018) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value PCA9306D (at 4.318 -5.588 -180) (layer B.Fab)
+    (fp_text value 15k (at 0 -1.65) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_circle (center -2.286 -0.9525) (end -2.2225 -0.889) (layer B.SilkS) (width 0.15))
-    (fp_line (start 2.54 -1.778) (end -2.54 -1.778) (layer B.SilkS) (width 0.15))
-    (fp_line (start -2.54 -1.27) (end 2.54 -1.27) (layer B.SilkS) (width 0.15))
-    (fp_line (start -2.45 -0.95) (end -2.45 1.95) (layer B.Fab) (width 0.15))
-    (fp_line (start -2.45 1.95) (end 2.45 1.95) (layer B.Fab) (width 0.15))
-    (fp_line (start 2.45 1.95) (end 2.45 -1.95) (layer B.Fab) (width 0.15))
-    (fp_line (start 2.45 -1.95) (end -1.45 -1.95) (layer B.Fab) (width 0.15))
-    (fp_line (start -1.45 -1.95) (end -2.45 -0.95) (layer B.Fab) (width 0.15))
-    (fp_line (start -2.75 -3.75) (end 2.75 -3.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -2.75 3.75) (end 2.75 3.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -2.75 -3.75) (end -2.75 3.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 2.75 -3.75) (end 2.75 3.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -2.575 -2.075) (end -2.525 -2.075) (layer B.SilkS) (width 0.15))
-    (fp_line (start -2.575 2.075) (end -2.43 2.075) (layer B.SilkS) (width 0.15))
-    (fp_line (start 2.575 2.075) (end 2.43 2.075) (layer B.SilkS) (width 0.15))
-    (fp_line (start 2.575 -2.075) (end 2.43 -2.075) (layer B.SilkS) (width 0.15))
-    (fp_line (start -2.575 -2.075) (end -2.575 2.075) (layer B.SilkS) (width 0.15))
-    (fp_line (start 2.575 -2.075) (end 2.575 2.075) (layer B.SilkS) (width 0.15))
-    (fp_line (start -2.525 -2.075) (end -2.525 -3.475) (layer B.SilkS) (width 0.15))
-    (pad 1 smd rect (at -1.905 -2.7) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
-      (net 1 GND))
-    (pad 2 smd oval (at -0.635 -2.7) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
-      (net 5 +3V3))
-    (pad 3 smd oval (at 0.635 -2.7) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
-      (net 262 FPDI_SCL))
-    (pad 4 smd oval (at 1.905 -2.7) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
-      (net 261 FPDI_SDA))
-    (pad 5 smd oval (at 1.905 2.7) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
-      (net 33 GPDI_SDA))
-    (pad 6 smd oval (at 0.635 2.7) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
-      (net 34 GPDI_SCL))
-    (pad 7 smd oval (at -0.635 2.7) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
-      (net 35 /gpdi/VREF2))
-    (pad 8 smd oval (at -1.905 2.7) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
-      (net 35 /gpdi/VREF2))
-    (model ${KISYS3DMOD}/Package_SO.3dshapes/SOIC-8_3.9x4.9mm_P1.27mm.wrl
+    (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))
+    (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))
+    (fp_line (start -0.22 0.51) (end 0.22 0.51) (layer B.SilkS) (width 0.12))
+    (fp_line (start -0.22 -0.51) (end 0.22 -0.51) (layer B.SilkS) (width 0.12))
+    (fp_line (start -1.46 -0.75) (end -1.46 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
+    (fp_text user %R (at 0 0) (layer B.Fab)
+      (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
+    )
+    (pad 1 smd rect (at -0.875 0) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 158 /power/P3V3))
+    (pad 2 smd rect (at 0.875 0) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 15 /power/FB3))
+    (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 -90))
+      (rotate (xyz 0 0 0))
     )
   )
 
-  (module Capacitor_SMD:C_0805_2012Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B1118A2)
-    (at 179.078 91.918 270)
-    (descr "Capacitor SMD 0805 (2012 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 capacitor)
-    (path /58D51CAD/5B09EC4B)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B191818)
+    (at 158.235 91.9 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 /58D51CAD/58D5A1E5)
     (attr smd)
-    (fp_text reference C55 (at 0 -1.524 270) (layer B.SilkS)
+    (fp_text reference RB1 (at 2.812 0.62 270) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 22uF (at 0 -1.85 270) (layer B.Fab)
+    (fp_text value 18k (at 0 -1.65 270) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_line (start -1 -0.6) (end -1 0.6) (layer B.Fab) (width 0.1))
-    (fp_line (start -1 0.6) (end 1 0.6) (layer B.Fab) (width 0.1))
-    (fp_line (start 1 0.6) (end 1 -0.6) (layer B.Fab) (width 0.1))
-    (fp_line (start 1 -0.6) (end -1 -0.6) (layer B.Fab) (width 0.1))
-    (fp_line (start -0.15 0.71) (end 0.15 0.71) (layer B.SilkS) (width 0.12))
-    (fp_line (start -0.15 -0.71) (end 0.15 -0.71) (layer B.SilkS) (width 0.12))
-    (fp_line (start -1.69 -1) (end -1.69 1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -1.69 1) (end 1.69 1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 1.69 1) (end 1.69 -1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 1.69 -1) (end -1.69 -1) (layer B.CrtYd) (width 0.05))
     (fp_text user %R (at 0 0 270) (layer B.Fab)
       (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
     )
-    (pad 1 smd rect (at -0.955 0 270) (size 0.97 1.5) (layers B.Cu B.Paste B.Mask)
-      (net 316 /power/RTCVDD))
-    (pad 2 smd rect (at 0.955 0 270) (size 0.97 1.5) (layers B.Cu B.Paste B.Mask)
+    (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.46 -0.75) (end -1.46 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -0.22 -0.51) (end 0.22 -0.51) (layer B.SilkS) (width 0.12))
+    (fp_line (start -0.22 0.51) (end 0.22 0.51) (layer B.SilkS) (width 0.12))
+    (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))
+    (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 rect (at 0.875 0 270) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 12 /power/FB1))
+    (pad 1 smd rect (at -0.875 0 270) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
       (net 1 GND))
-    (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0805_2012Metric.wrl
+    (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 B.Cu) (tedit 59FE48B8) (tstamp 5B1118B3)
-    (at 177.3 91.918 90)
+  (module Resistor_SMD:R_0603_1608Metric (layer B.Cu) (tedit 59FE48B8) (tstamp 5B191828)
+    (at 106.165 84.915 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")
     (tags resistor)
-    (path /58D51CAD/5B0A7AE1)
+    (path /58D51CAD/58D67BEA)
     (attr smd)
-    (fp_text reference R65 (at 2.794 0 90) (layer B.SilkS)
+    (fp_text reference RB2 (at 2.903 0.015 90) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 1k (at 0 -1.65 90) (layer B.Fab)
+    (fp_text value 4.7k (at 0 -1.65 90) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
@@ -10064,9 +10028,45 @@
       (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
     )
     (pad 1 smd rect (at -0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 5 +3V3))
+      (net 1 GND))
     (pad 2 smd rect (at 0.875 0 90) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
-      (net 316 /power/RTCVDD))
+      (net 16 /power/FB2))
+    (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 B.Cu) (tedit 59FE48B8) (tstamp 5B191838)
+    (at 155.695 78.565 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 /58D51CAD/58D62976)
+    (attr smd)
+    (fp_text reference RB3 (at 2.812 0.366 270) (layer B.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text value 3.3k (at 0 -1.65 270) (layer B.Fab)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text user %R (at 0 0 270) (layer B.Fab)
+      (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
+    )
+    (fp_line (start 1.46 -0.75) (end -1.46 -0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 1.46 0.75) (end 1.46 -0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.46 0.75) (end 1.46 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.46 -0.75) (end -1.46 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -0.22 -0.51) (end 0.22 -0.51) (layer B.SilkS) (width 0.12))
+    (fp_line (start -0.22 0.51) (end 0.22 0.51) (layer B.SilkS) (width 0.12))
+    (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))
+    (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 rect (at 0.875 0 270) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 15 /power/FB3))
+    (pad 1 smd rect (at -0.875 0 270) (size 0.67 1) (layers B.Cu B.Paste B.Mask)
+      (net 1 GND))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -10087,7 +10087,7 @@
     (effects (font (size 1 1) (thickness 0.25)) (justify mirror))
   )
   (gr_line (start 104.148 100.808) (end 103.513 100.3) (layer B.SilkS) (width 0.2))
-  (gr_line (start 169.426 71.471) (end 165.997 71.471) (layer B.SilkS) (width 0.2))
+  (gr_line (start 169.426 70.709) (end 165.997 70.709) (layer B.SilkS) (width 0.2))
   (gr_text FLASH (at 124.468 87.092) (layer B.SilkS) (tstamp 5AFEEC89)
     (effects (font (size 1.5 1.5) (thickness 0.3)) (justify mirror))
   )
@@ -12217,6 +12217,7 @@
   (segment (start 154.032999 63.189999) (end 154.6305 63.7875) (width 0.19) (layer F.Cu) (net 261))
   (segment (start 154.6305 63.7875) (end 154.6305 65.340342) (width 0.19) (layer F.Cu) (net 261))
   (segment (start 154.6305 65.340342) (end 154.595842 65.375) (width 0.19) (layer F.Cu) (net 261))
+  (segment (start 157.205 72.487) (end 157.996 72.487) (width 0.3) (layer B.Cu) (net 264))
   (segment (start 148.471 69.693) (end 149.995 71.217) (width 0.3) (layer In1.Cu) (net 264))
   (segment (start 149.995 71.217) (end 156.726 71.217) (width 0.3) (layer In1.Cu) (net 264))
   (segment (start 140.978 69.693) (end 148.471 69.693) (width 0.3) (layer In1.Cu) (net 264))
@@ -12227,7 +12228,6 @@
   (segment (start 157.796001 72.287001) (end 157.996 72.487) (width 0.3) (layer In1.Cu) (net 264))
   (segment (start 132.596 71.725) (end 132.596 73.376) (width 0.3) (layer In1.Cu) (net 264))
   (via (at 157.996 72.487) (size 0.4) (drill 0.2) (layers F.Cu B.Cu) (net 264))
-  (segment (start 157.205 72.487) (end 157.996 72.487) (width 0.3) (layer B.Cu) (net 264))
   (segment (start 169.31704 69.886487) (end 169.517039 69.686488) (width 0.3) (layer B.Cu) (net 314))
   (segment (start 168.141 71.062527) (end 169.31704 69.886487) (width 0.3) (layer B.Cu) (net 314))
   (segment (start 168.141 73.485) (end 168.141 71.062527) (width 0.3) (layer B.Cu) (net 314))
@@ -12500,7 +12500,6 @@
   (segment (start 147.546 70.312) (end 147.546 71.498498) (width 0.19) (layer F.Cu) (net 34))
   (segment (start 147.546 71.498498) (end 147.582 71.534498) (width 0.19) (layer F.Cu) (net 34))
   (via (at 147.582 71.534498) (size 0.4) (drill 0.2) (layers F.Cu B.Cu) (net 34))
-  (segment (start 148.075 72.215) (end 148.075 71.961) (width 0.19) (layer B.Cu) (net 34))
   (segment (start 150.615 65.672) (end 150.615 64.3844) (width 0.3) (layer B.Cu) (net 35))
   (segment (start 150.615 64.3844) (end 150.5896 64.359) (width 0.3) (layer B.Cu) (net 35))
   (segment (start 147.38 66.4365) (end 149.8505 66.4365) (width 0.3) (layer B.Cu) (net 35))
@@ -15708,10 +15707,10 @@
   (segment (start 134.88 86.2) (end 135.28 86.2) (width 0.3) (layer F.Cu) (net 264))
   (segment (start 137.676 84.2) (end 138.08 84.2) (width 0.3) (layer F.Cu) (net 264))
   (segment (start 137.28 84.2) (end 137.676 84.2) (width 0.3) (layer F.Cu) (net 264))
-  (segment (start 177.3 91.043) (end 178.998 91.043) (width 0.3) (layer B.Cu) (net 316))
-  (segment (start 178.998 91.043) (end 179.078 90.963) (width 0.3) (layer B.Cu) (net 316))
   (segment (start 175.395 90.615) (end 176.872 90.615) (width 0.3) (layer B.Cu) (net 316))
   (segment (start 176.872 90.615) (end 177.3 91.043) (width 0.3) (layer B.Cu) (net 316))
+  (segment (start 177.3 91.043) (end 178.998 91.043) (width 0.3) (layer B.Cu) (net 316))
+  (segment (start 178.998 91.043) (end 179.078 90.963) (width 0.3) (layer B.Cu) (net 316))
 
   (zone (net 1) (net_name GND) (layer B.Cu) (tstamp 0) (hatch edge 0.508)
     (connect_pads (clearance 0.254))
@@ -17467,98 +17466,99 @@
         (xy 145.984997 72.094571) (xy 146.073449 72.308113) (xy 146.236887 72.471551) (xy 146.450429 72.560003) (xy 146.681565 72.560003)
         (xy 146.895107 72.471551) (xy 147.058545 72.308113) (xy 147.111465 72.180353) (xy 147.133618 72.291725) (xy 147.144568 72.308113)
         (xy 147.238824 72.449177) (xy 147.278571 72.475735) (xy 147.339267 72.536431) (xy 147.365824 72.576176) (xy 147.523275 72.681382)
-        (xy 147.576536 72.691976) (xy 147.576536 72.715) (xy 147.606106 72.863659) (xy 147.690314 72.989686) (xy 147.816341 73.073894)
-        (xy 147.965 73.103464) (xy 148.635 73.103464) (xy 148.783659 73.073894) (xy 148.909686 72.989686) (xy 148.993894 72.863659)
-        (xy 149.023464 72.715) (xy 149.023464 71.715) (xy 148.993894 71.566341) (xy 148.909686 71.440314) (xy 148.783659 71.356106)
-        (xy 148.635 71.326536) (xy 148.124729 71.326536) (xy 148.074548 71.205388) (xy 148.058 71.18884) (xy 148.058 70.504894)
-        (xy 148.128341 70.551894) (xy 148.277 70.581464) (xy 148.947 70.581464) (xy 149.095659 70.551894) (xy 149.221686 70.467686)
-        (xy 149.305894 70.341659) (xy 149.335464 70.193) (xy 149.335464 69.427625) (xy 149.405779 69.3985) (xy 149.638536 69.3985)
-        (xy 149.638536 70.193) (xy 149.668106 70.341659) (xy 149.718 70.416332) (xy 149.718001 71.326536) (xy 149.715 71.326536)
-        (xy 149.566341 71.356106) (xy 149.440314 71.440314) (xy 149.356106 71.566341) (xy 149.326536 71.715) (xy 149.326536 72.715)
-        (xy 149.356106 72.863659) (xy 149.440314 72.989686) (xy 149.566341 73.073894) (xy 149.715 73.103464) (xy 150.385 73.103464)
-        (xy 150.533659 73.073894) (xy 150.659686 72.989686) (xy 150.743894 72.863659) (xy 150.773464 72.715) (xy 150.773464 72.101153)
-        (xy 150.78 72.068294) (xy 150.78 72.068291) (xy 150.790401 72.016001) (xy 150.78 71.963711) (xy 150.78 70.564954)
-        (xy 150.845659 70.551894) (xy 150.971686 70.467686) (xy 150.973793 70.464532) (xy 151.573073 70.464532) (xy 151.671736 70.731387)
-        (xy 152.281461 70.957908) (xy 152.93146 70.933856) (xy 153.420264 70.731387) (xy 153.518927 70.464532) (xy 152.546 69.491605)
-        (xy 151.573073 70.464532) (xy 150.973793 70.464532) (xy 151.055894 70.341659) (xy 151.085464 70.193) (xy 151.085464 70.086921)
-        (xy 151.126613 70.186264) (xy 151.393468 70.284927) (xy 152.366395 69.312) (xy 152.352253 69.297858) (xy 152.531858 69.118253)
-        (xy 152.546 69.132395) (xy 152.560143 69.118253) (xy 152.739748 69.297858) (xy 152.725605 69.312) (xy 153.698532 70.284927)
-        (xy 153.782001 70.254067) (xy 153.782 70.963658) (xy 153.771599 71.015949) (xy 153.782 71.068239) (xy 153.782 71.068242)
-        (xy 153.81281 71.223134) (xy 153.930171 71.398778) (xy 153.974505 71.428401) (xy 154.449137 71.903033) (xy 154.478758 71.947365)
-        (xy 154.491681 71.956) (xy 154.459289 71.956) (xy 154.406999 71.945599) (xy 154.354709 71.956) (xy 154.354706 71.956)
-        (xy 154.199814 71.98681) (xy 154.117164 72.042035) (xy 153.96889 72.103452) (xy 153.805452 72.26689) (xy 153.717 72.480432)
-        (xy 153.717 72.711568) (xy 153.805452 72.92511) (xy 153.96889 73.088548) (xy 154.048481 73.121516) (xy 154.035314 73.130314)
-        (xy 153.951106 73.256341) (xy 153.921536 73.405) (xy 153.921536 73.874) (xy 151.959835 73.874) (xy 151.948686 73.857314)
-        (xy 151.822659 73.773106) (xy 151.674 73.743536) (xy 150.704 73.743536) (xy 150.555341 73.773106) (xy 150.429314 73.857314)
-        (xy 150.372661 73.942102) (xy 150.302327 73.772301) (xy 150.123698 73.593673) (xy 149.890309 73.497) (xy 149.56475 73.497)
-        (xy 149.406 73.65575) (xy 149.406 74.755) (xy 149.426 74.755) (xy 149.426 75.009) (xy 149.406 75.009)
-        (xy 149.406 76.10825) (xy 149.56475 76.267) (xy 149.890309 76.267) (xy 150.123698 76.170327) (xy 150.302327 75.991699)
-        (xy 150.372661 75.821898) (xy 150.389001 75.846352) (xy 150.389 76.33) (xy 149.385233 76.33) (xy 149.128251 76.381117)
-        (xy 148.861156 76.559584) (xy 148.823341 76.567106) (xy 148.697314 76.651314) (xy 148.613106 76.777341) (xy 148.583536 76.926)
-        (xy 148.583536 77.161757) (xy 148.573741 77.211) (xy 148.583536 77.260243) (xy 148.583536 77.771) (xy 148.613106 77.919659)
-        (xy 148.697314 78.045686) (xy 148.823341 78.129894) (xy 148.972 78.159464) (xy 149.972 78.159464) (xy 150.120659 78.129894)
-        (xy 150.177372 78.092) (xy 150.389 78.092) (xy 150.389001 79.113229) (xy 150.389 79.113234) (xy 150.389001 80.848664)
-        (xy 150.321757 80.803733) (xy 150.202804 80.780072) (xy 150.182299 80.759567) (xy 150.108221 80.728883) (xy 150.108221 80.722438)
-        (xy 150.019769 80.508896) (xy 149.856331 80.345458) (xy 149.642789 80.257006) (xy 149.411653 80.257006) (xy 149.198111 80.345458)
-        (xy 149.099746 80.443823) (xy 149.025222 80.369299) (xy 148.81168 80.280847) (xy 148.580544 80.280847) (xy 148.520909 80.305548)
-        (xy 148.504363 80.289002) (xy 148.290821 80.20055) (xy 148.059685 80.20055) (xy 147.846143 80.289002) (xy 147.73303 80.402115)
-        (xy 147.572743 80.402115) (xy 147.359201 80.490567) (xy 147.342653 80.507115) (xy 145.28346 80.507115) (xy 145.23658 80.49779)
-        (xy 145.180747 80.508896) (xy 145.050855 80.534733) (xy 144.893404 80.639938) (xy 144.866844 80.679688) (xy 144.795613 80.750919)
-        (xy 144.772209 80.750919) (xy 144.614346 80.816308) (xy 144.614346 79.942357) (xy 144.721912 79.942357) (xy 144.935454 79.853905)
-        (xy 145.085543 79.703816) (xy 145.900406 79.703816) (xy 145.900406 79.934952) (xy 145.988858 80.148494) (xy 146.152296 80.311932)
-        (xy 146.365838 80.400384) (xy 146.596974 80.400384) (xy 146.810516 80.311932) (xy 146.973954 80.148494) (xy 147.062406 79.934952)
-        (xy 147.062406 79.703816) (xy 146.973954 79.490274) (xy 146.810516 79.326836) (xy 146.596974 79.238384) (xy 146.365838 79.238384)
-        (xy 146.152296 79.326836) (xy 145.988858 79.490274) (xy 145.900406 79.703816) (xy 145.085543 79.703816) (xy 145.098892 79.690467)
-        (xy 145.187344 79.476925) (xy 145.187344 79.453521) (xy 145.590847 79.050018) (xy 147.370129 79.050018) (xy 147.387387 79.136781)
-        (xy 147.387387 79.22526) (xy 147.421246 79.307003) (xy 147.438504 79.393766) (xy 147.487651 79.46732) (xy 147.521511 79.549065)
-        (xy 147.76934 79.796894) (xy 147.769343 79.796895) (xy 147.807552 79.835104) (xy 147.856704 79.908665) (xy 148.14812 80.103383)
-        (xy 148.405102 80.1545) (xy 148.405107 80.1545) (xy 148.491868 80.171758) (xy 148.57863 80.1545) (xy 149.558767 80.1545)
-        (xy 149.815749 80.103383) (xy 149.844063 80.084464) (xy 149.972 80.084464) (xy 150.120659 80.054894) (xy 150.246686 79.970686)
-        (xy 150.330894 79.844659) (xy 150.360464 79.696) (xy 150.360464 79.322743) (xy 150.370259 79.2735) (xy 150.360464 79.224257)
-        (xy 150.360464 78.851) (xy 150.330894 78.702341) (xy 150.246686 78.576314) (xy 150.120659 78.492106) (xy 149.972 78.462536)
-        (xy 149.844063 78.462536) (xy 149.815749 78.443617) (xy 149.558767 78.3925) (xy 148.856792 78.3925) (xy 148.767434 78.303142)
-        (xy 148.685689 78.269282) (xy 148.612135 78.220135) (xy 148.525372 78.202877) (xy 148.443629 78.169018) (xy 148.35515 78.169018)
-        (xy 148.268387 78.15176) (xy 148.181624 78.169018) (xy 148.093145 78.169018) (xy 148.011402 78.202877) (xy 147.924639 78.220135)
-        (xy 147.851084 78.269282) (xy 147.76934 78.303142) (xy 147.706776 78.365706) (xy 147.633222 78.414853) (xy 147.584075 78.488407)
-        (xy 147.521511 78.550971) (xy 147.487651 78.632715) (xy 147.438504 78.70627) (xy 147.421246 78.793033) (xy 147.387387 78.874776)
-        (xy 147.387387 78.963255) (xy 147.370129 79.050018) (xy 145.590847 79.050018) (xy 147.743433 76.897434) (xy 147.783177 76.870878)
-        (xy 147.888382 76.713427) (xy 147.915214 76.578534) (xy 147.925325 76.527701) (xy 147.916 76.480821) (xy 147.916 75.16775)
-        (xy 148.159 75.16775) (xy 148.159 75.75831) (xy 148.255673 75.991699) (xy 148.434302 76.170327) (xy 148.667691 76.267)
-        (xy 148.99325 76.267) (xy 149.152 76.10825) (xy 149.152 75.009) (xy 148.31775 75.009) (xy 148.159 75.16775)
-        (xy 147.916 75.16775) (xy 147.916 74.80488) (xy 147.925325 74.758) (xy 147.888382 74.572274) (xy 147.837837 74.496628)
-        (xy 147.783177 74.414823) (xy 147.743433 74.388267) (xy 147.360856 74.00569) (xy 148.159 74.00569) (xy 148.159 74.59625)
-        (xy 148.31775 74.755) (xy 149.152 74.755) (xy 149.152 73.65575) (xy 148.99325 73.497) (xy 148.667691 73.497)
-        (xy 148.434302 73.593673) (xy 148.255673 73.772301) (xy 148.159 74.00569) (xy 147.360856 74.00569) (xy 144.381 71.025836)
-        (xy 144.381 70.760417) (xy 144.388659 70.758894) (xy 144.514686 70.674686) (xy 144.598894 70.548659) (xy 144.628464 70.4)
-        (xy 144.628464 69.4) (xy 144.598894 69.251341) (xy 144.514686 69.125314) (xy 144.388659 69.041106) (xy 144.24 69.011536)
-        (xy 143.57 69.011536) (xy 143.421341 69.041106) (xy 143.295314 69.125314) (xy 143.211106 69.251341) (xy 143.181536 69.4)
-        (xy 143.181536 70.4) (xy 143.211106 70.548659) (xy 143.295314 70.674686) (xy 143.421341 70.758894) (xy 143.429 70.760418)
-        (xy 143.429 71.17612) (xy 143.419675 71.223) (xy 143.446218 71.356439) (xy 143.456618 71.408725) (xy 143.561823 71.566177)
-        (xy 143.601573 71.592737) (xy 146.964001 74.955167) (xy 146.964001 75.126894) (xy 146.794236 75.126894) (xy 146.580694 75.215346)
-        (xy 146.564146 75.231894) (xy 145.145587 75.231894) (xy 145.098708 75.222569) (xy 145.051829 75.231894) (xy 144.912983 75.259512)
-        (xy 144.755532 75.364717) (xy 144.728974 75.404464) (xy 144.289879 75.843559) (xy 144.289879 75.701732) (xy 144.201427 75.48819)
-        (xy 144.037989 75.324752) (xy 143.824447 75.2363) (xy 143.667001 75.2363) (xy 143.667001 74.641652) (xy 143.84711 74.567048)
-        (xy 144.010548 74.40361) (xy 144.099 74.190068) (xy 144.099 73.958932) (xy 144.010548 73.74539) (xy 143.84711 73.581952)
-        (xy 143.633568 73.4935) (xy 143.402432 73.4935) (xy 143.18889 73.581952) (xy 143.025452 73.74539) (xy 142.964343 73.89292)
-        (xy 142.929537 73.80889) (xy 142.766099 73.645452) (xy 142.552557 73.557) (xy 142.321421 73.557) (xy 142.107879 73.645452)
-        (xy 141.944441 73.80889) (xy 141.855989 74.022432) (xy 141.855989 74.253568) (xy 141.944441 74.46711) (xy 141.96099 74.483659)
-        (xy 141.960989 75.885845) (xy 140.504978 77.341858) (xy 140.504978 76.76275) (xy 140.821164 76.446565) (xy 140.860911 76.420007)
-        (xy 140.871159 76.404669) (xy 140.926544 76.42761) (xy 141.15768 76.42761) (xy 141.371222 76.339158) (xy 141.53466 76.17572)
-        (xy 141.623112 75.962178) (xy 141.623112 75.731042) (xy 141.53466 75.5175) (xy 141.518112 75.500952) (xy 141.518112 72.455992)
-        (xy 141.527437 72.409112) (xy 141.490494 72.223386) (xy 141.385289 72.065935) (xy 141.300337 72.009172) (xy 141.090628 71.799464)
-        (xy 141.097 71.799464) (xy 141.245659 71.769894) (xy 141.371686 71.685686) (xy 141.455894 71.559659) (xy 141.485464 71.411)
-        (xy 141.485464 70.741) (xy 141.455894 70.592341) (xy 141.371686 70.466314) (xy 141.245659 70.382106) (xy 141.097 70.352536)
-        (xy 140.097 70.352536) (xy 140.057 70.360492) (xy 140.057 70.041508) (xy 140.097 70.049464) (xy 141.097 70.049464)
-        (xy 141.245659 70.019894) (xy 141.371686 69.935686) (xy 141.455894 69.809659) (xy 141.485464 69.661) (xy 141.485464 68.991)
-        (xy 141.455894 68.842341) (xy 141.371686 68.716314) (xy 141.259718 68.6415) (xy 141.69425 68.6415) (xy 141.853 68.48275)
-        (xy 141.853 67.8335) (xy 142.107 67.8335) (xy 142.107 68.48275) (xy 142.26575 68.6415) (xy 142.881309 68.6415)
-        (xy 143.114698 68.544827) (xy 143.293327 68.366199) (xy 143.39 68.13281) (xy 143.39 67.99225) (xy 143.23125 67.8335)
-        (xy 142.107 67.8335) (xy 141.853 67.8335) (xy 141.833 67.8335) (xy 141.833 67.5795) (xy 141.853 67.5795)
-        (xy 141.853 67.5595) (xy 142.107 67.5595) (xy 142.107 67.5795) (xy 143.23125 67.5795) (xy 143.39 67.42075)
-        (xy 143.39 67.28019) (xy 143.293327 67.046801) (xy 143.114698 66.868173) (xy 143.013582 66.826289) (xy 143.096487 66.702213)
-        (xy 143.149341 66.4365) (xy 143.096487 66.170787) (xy 142.945973 65.945527) (xy 142.730421 65.8015) (xy 142.945973 65.657473)
-        (xy 142.955978 65.6425) (xy 144.016086 65.6425) (xy 144.062966 65.651825) (xy 144.109846 65.6425) (xy 144.248692 65.614882)
-        (xy 144.406143 65.509677) (xy 144.432703 65.469927) (xy 144.434197 65.468433) (xy 146.251834 63.650798) (xy 146.259533 63.650798)
+        (xy 147.576536 72.691976) (xy 147.576536 72.987) (xy 147.606106 73.135659) (xy 147.690314 73.261686) (xy 147.816341 73.345894)
+        (xy 147.965 73.375464) (xy 148.635 73.375464) (xy 148.783659 73.345894) (xy 148.909686 73.261686) (xy 148.993894 73.135659)
+        (xy 149.023464 72.987) (xy 149.023464 71.987) (xy 148.993894 71.838341) (xy 148.909686 71.712314) (xy 148.783659 71.628106)
+        (xy 148.635 71.598536) (xy 148.389312 71.598536) (xy 148.260726 71.512618) (xy 148.163 71.493179) (xy 148.163 71.41893)
+        (xy 148.074548 71.205388) (xy 148.058 71.18884) (xy 148.058 70.504894) (xy 148.128341 70.551894) (xy 148.277 70.581464)
+        (xy 148.947 70.581464) (xy 149.095659 70.551894) (xy 149.221686 70.467686) (xy 149.305894 70.341659) (xy 149.335464 70.193)
+        (xy 149.335464 69.427625) (xy 149.405779 69.3985) (xy 149.638536 69.3985) (xy 149.638536 70.193) (xy 149.668106 70.341659)
+        (xy 149.718 70.416332) (xy 149.718001 71.598536) (xy 149.715 71.598536) (xy 149.566341 71.628106) (xy 149.440314 71.712314)
+        (xy 149.356106 71.838341) (xy 149.326536 71.987) (xy 149.326536 72.987) (xy 149.356106 73.135659) (xy 149.440314 73.261686)
+        (xy 149.566341 73.345894) (xy 149.715 73.375464) (xy 150.385 73.375464) (xy 150.533659 73.345894) (xy 150.659686 73.261686)
+        (xy 150.743894 73.135659) (xy 150.773464 72.987) (xy 150.773464 72.101153) (xy 150.78 72.068294) (xy 150.78 72.068291)
+        (xy 150.790401 72.016001) (xy 150.78 71.963711) (xy 150.78 70.564954) (xy 150.845659 70.551894) (xy 150.971686 70.467686)
+        (xy 150.973793 70.464532) (xy 151.573073 70.464532) (xy 151.671736 70.731387) (xy 152.281461 70.957908) (xy 152.93146 70.933856)
+        (xy 153.420264 70.731387) (xy 153.518927 70.464532) (xy 152.546 69.491605) (xy 151.573073 70.464532) (xy 150.973793 70.464532)
+        (xy 151.055894 70.341659) (xy 151.085464 70.193) (xy 151.085464 70.086921) (xy 151.126613 70.186264) (xy 151.393468 70.284927)
+        (xy 152.366395 69.312) (xy 152.352253 69.297858) (xy 152.531858 69.118253) (xy 152.546 69.132395) (xy 152.560143 69.118253)
+        (xy 152.739748 69.297858) (xy 152.725605 69.312) (xy 153.698532 70.284927) (xy 153.782001 70.254067) (xy 153.782 70.963658)
+        (xy 153.771599 71.015949) (xy 153.782 71.068239) (xy 153.782 71.068242) (xy 153.81281 71.223134) (xy 153.930171 71.398778)
+        (xy 153.974505 71.428401) (xy 154.449137 71.903033) (xy 154.478758 71.947365) (xy 154.491681 71.956) (xy 154.459289 71.956)
+        (xy 154.406999 71.945599) (xy 154.354709 71.956) (xy 154.354706 71.956) (xy 154.199814 71.98681) (xy 154.117164 72.042035)
+        (xy 153.96889 72.103452) (xy 153.805452 72.26689) (xy 153.717 72.480432) (xy 153.717 72.711568) (xy 153.805452 72.92511)
+        (xy 153.96889 73.088548) (xy 154.048481 73.121516) (xy 154.035314 73.130314) (xy 153.951106 73.256341) (xy 153.921536 73.405)
+        (xy 153.921536 73.874) (xy 151.959835 73.874) (xy 151.948686 73.857314) (xy 151.822659 73.773106) (xy 151.674 73.743536)
+        (xy 150.704 73.743536) (xy 150.555341 73.773106) (xy 150.429314 73.857314) (xy 150.372661 73.942102) (xy 150.302327 73.772301)
+        (xy 150.123698 73.593673) (xy 149.890309 73.497) (xy 149.56475 73.497) (xy 149.406 73.65575) (xy 149.406 74.755)
+        (xy 149.426 74.755) (xy 149.426 75.009) (xy 149.406 75.009) (xy 149.406 76.10825) (xy 149.56475 76.267)
+        (xy 149.890309 76.267) (xy 150.123698 76.170327) (xy 150.302327 75.991699) (xy 150.372661 75.821898) (xy 150.389001 75.846352)
+        (xy 150.389 76.33) (xy 149.385233 76.33) (xy 149.128251 76.381117) (xy 148.861156 76.559584) (xy 148.823341 76.567106)
+        (xy 148.697314 76.651314) (xy 148.613106 76.777341) (xy 148.583536 76.926) (xy 148.583536 77.161757) (xy 148.573741 77.211)
+        (xy 148.583536 77.260243) (xy 148.583536 77.771) (xy 148.613106 77.919659) (xy 148.697314 78.045686) (xy 148.823341 78.129894)
+        (xy 148.972 78.159464) (xy 149.972 78.159464) (xy 150.120659 78.129894) (xy 150.177372 78.092) (xy 150.389 78.092)
+        (xy 150.389001 79.113229) (xy 150.389 79.113234) (xy 150.389001 80.848664) (xy 150.321757 80.803733) (xy 150.202804 80.780072)
+        (xy 150.182299 80.759567) (xy 150.108221 80.728883) (xy 150.108221 80.722438) (xy 150.019769 80.508896) (xy 149.856331 80.345458)
+        (xy 149.642789 80.257006) (xy 149.411653 80.257006) (xy 149.198111 80.345458) (xy 149.099746 80.443823) (xy 149.025222 80.369299)
+        (xy 148.81168 80.280847) (xy 148.580544 80.280847) (xy 148.520909 80.305548) (xy 148.504363 80.289002) (xy 148.290821 80.20055)
+        (xy 148.059685 80.20055) (xy 147.846143 80.289002) (xy 147.73303 80.402115) (xy 147.572743 80.402115) (xy 147.359201 80.490567)
+        (xy 147.342653 80.507115) (xy 145.28346 80.507115) (xy 145.23658 80.49779) (xy 145.180747 80.508896) (xy 145.050855 80.534733)
+        (xy 144.893404 80.639938) (xy 144.866844 80.679688) (xy 144.795613 80.750919) (xy 144.772209 80.750919) (xy 144.614346 80.816308)
+        (xy 144.614346 79.942357) (xy 144.721912 79.942357) (xy 144.935454 79.853905) (xy 145.085543 79.703816) (xy 145.900406 79.703816)
+        (xy 145.900406 79.934952) (xy 145.988858 80.148494) (xy 146.152296 80.311932) (xy 146.365838 80.400384) (xy 146.596974 80.400384)
+        (xy 146.810516 80.311932) (xy 146.973954 80.148494) (xy 147.062406 79.934952) (xy 147.062406 79.703816) (xy 146.973954 79.490274)
+        (xy 146.810516 79.326836) (xy 146.596974 79.238384) (xy 146.365838 79.238384) (xy 146.152296 79.326836) (xy 145.988858 79.490274)
+        (xy 145.900406 79.703816) (xy 145.085543 79.703816) (xy 145.098892 79.690467) (xy 145.187344 79.476925) (xy 145.187344 79.453521)
+        (xy 145.590847 79.050018) (xy 147.370129 79.050018) (xy 147.387387 79.136781) (xy 147.387387 79.22526) (xy 147.421246 79.307003)
+        (xy 147.438504 79.393766) (xy 147.487651 79.46732) (xy 147.521511 79.549065) (xy 147.76934 79.796894) (xy 147.769343 79.796895)
+        (xy 147.807552 79.835104) (xy 147.856704 79.908665) (xy 148.14812 80.103383) (xy 148.405102 80.1545) (xy 148.405107 80.1545)
+        (xy 148.491868 80.171758) (xy 148.57863 80.1545) (xy 149.558767 80.1545) (xy 149.815749 80.103383) (xy 149.844063 80.084464)
+        (xy 149.972 80.084464) (xy 150.120659 80.054894) (xy 150.246686 79.970686) (xy 150.330894 79.844659) (xy 150.360464 79.696)
+        (xy 150.360464 79.322743) (xy 150.370259 79.2735) (xy 150.360464 79.224257) (xy 150.360464 78.851) (xy 150.330894 78.702341)
+        (xy 150.246686 78.576314) (xy 150.120659 78.492106) (xy 149.972 78.462536) (xy 149.844063 78.462536) (xy 149.815749 78.443617)
+        (xy 149.558767 78.3925) (xy 148.856792 78.3925) (xy 148.767434 78.303142) (xy 148.685689 78.269282) (xy 148.612135 78.220135)
+        (xy 148.525372 78.202877) (xy 148.443629 78.169018) (xy 148.35515 78.169018) (xy 148.268387 78.15176) (xy 148.181624 78.169018)
+        (xy 148.093145 78.169018) (xy 148.011402 78.202877) (xy 147.924639 78.220135) (xy 147.851084 78.269282) (xy 147.76934 78.303142)
+        (xy 147.706776 78.365706) (xy 147.633222 78.414853) (xy 147.584075 78.488407) (xy 147.521511 78.550971) (xy 147.487651 78.632715)
+        (xy 147.438504 78.70627) (xy 147.421246 78.793033) (xy 147.387387 78.874776) (xy 147.387387 78.963255) (xy 147.370129 79.050018)
+        (xy 145.590847 79.050018) (xy 147.743433 76.897434) (xy 147.783177 76.870878) (xy 147.888382 76.713427) (xy 147.915214 76.578534)
+        (xy 147.925325 76.527701) (xy 147.916 76.480821) (xy 147.916 75.16775) (xy 148.159 75.16775) (xy 148.159 75.75831)
+        (xy 148.255673 75.991699) (xy 148.434302 76.170327) (xy 148.667691 76.267) (xy 148.99325 76.267) (xy 149.152 76.10825)
+        (xy 149.152 75.009) (xy 148.31775 75.009) (xy 148.159 75.16775) (xy 147.916 75.16775) (xy 147.916 74.80488)
+        (xy 147.925325 74.758) (xy 147.888382 74.572274) (xy 147.837837 74.496628) (xy 147.783177 74.414823) (xy 147.743433 74.388267)
+        (xy 147.360856 74.00569) (xy 148.159 74.00569) (xy 148.159 74.59625) (xy 148.31775 74.755) (xy 149.152 74.755)
+        (xy 149.152 73.65575) (xy 148.99325 73.497) (xy 148.667691 73.497) (xy 148.434302 73.593673) (xy 148.255673 73.772301)
+        (xy 148.159 74.00569) (xy 147.360856 74.00569) (xy 144.381 71.025836) (xy 144.381 70.760417) (xy 144.388659 70.758894)
+        (xy 144.514686 70.674686) (xy 144.598894 70.548659) (xy 144.628464 70.4) (xy 144.628464 69.4) (xy 144.598894 69.251341)
+        (xy 144.514686 69.125314) (xy 144.388659 69.041106) (xy 144.24 69.011536) (xy 143.57 69.011536) (xy 143.421341 69.041106)
+        (xy 143.295314 69.125314) (xy 143.211106 69.251341) (xy 143.181536 69.4) (xy 143.181536 70.4) (xy 143.211106 70.548659)
+        (xy 143.295314 70.674686) (xy 143.421341 70.758894) (xy 143.429 70.760418) (xy 143.429 71.17612) (xy 143.419675 71.223)
+        (xy 143.446218 71.356439) (xy 143.456618 71.408725) (xy 143.561823 71.566177) (xy 143.601573 71.592737) (xy 146.964001 74.955167)
+        (xy 146.964001 75.126894) (xy 146.794236 75.126894) (xy 146.580694 75.215346) (xy 146.564146 75.231894) (xy 145.145587 75.231894)
+        (xy 145.098708 75.222569) (xy 145.051829 75.231894) (xy 144.912983 75.259512) (xy 144.755532 75.364717) (xy 144.728974 75.404464)
+        (xy 144.289879 75.843559) (xy 144.289879 75.701732) (xy 144.201427 75.48819) (xy 144.037989 75.324752) (xy 143.824447 75.2363)
+        (xy 143.667001 75.2363) (xy 143.667001 74.641652) (xy 143.84711 74.567048) (xy 144.010548 74.40361) (xy 144.099 74.190068)
+        (xy 144.099 73.958932) (xy 144.010548 73.74539) (xy 143.84711 73.581952) (xy 143.633568 73.4935) (xy 143.402432 73.4935)
+        (xy 143.18889 73.581952) (xy 143.025452 73.74539) (xy 142.964343 73.89292) (xy 142.929537 73.80889) (xy 142.766099 73.645452)
+        (xy 142.552557 73.557) (xy 142.321421 73.557) (xy 142.107879 73.645452) (xy 141.944441 73.80889) (xy 141.855989 74.022432)
+        (xy 141.855989 74.253568) (xy 141.944441 74.46711) (xy 141.96099 74.483659) (xy 141.960989 75.885845) (xy 140.504978 77.341858)
+        (xy 140.504978 76.76275) (xy 140.821164 76.446565) (xy 140.860911 76.420007) (xy 140.871159 76.404669) (xy 140.926544 76.42761)
+        (xy 141.15768 76.42761) (xy 141.371222 76.339158) (xy 141.53466 76.17572) (xy 141.623112 75.962178) (xy 141.623112 75.731042)
+        (xy 141.53466 75.5175) (xy 141.518112 75.500952) (xy 141.518112 72.455992) (xy 141.527437 72.409112) (xy 141.490494 72.223386)
+        (xy 141.385289 72.065935) (xy 141.300337 72.009172) (xy 141.090628 71.799464) (xy 141.097 71.799464) (xy 141.245659 71.769894)
+        (xy 141.371686 71.685686) (xy 141.455894 71.559659) (xy 141.485464 71.411) (xy 141.485464 70.741) (xy 141.455894 70.592341)
+        (xy 141.371686 70.466314) (xy 141.245659 70.382106) (xy 141.097 70.352536) (xy 140.097 70.352536) (xy 140.057 70.360492)
+        (xy 140.057 70.041508) (xy 140.097 70.049464) (xy 141.097 70.049464) (xy 141.245659 70.019894) (xy 141.371686 69.935686)
+        (xy 141.455894 69.809659) (xy 141.485464 69.661) (xy 141.485464 68.991) (xy 141.455894 68.842341) (xy 141.371686 68.716314)
+        (xy 141.259718 68.6415) (xy 141.69425 68.6415) (xy 141.853 68.48275) (xy 141.853 67.8335) (xy 142.107 67.8335)
+        (xy 142.107 68.48275) (xy 142.26575 68.6415) (xy 142.881309 68.6415) (xy 143.114698 68.544827) (xy 143.293327 68.366199)
+        (xy 143.39 68.13281) (xy 143.39 67.99225) (xy 143.23125 67.8335) (xy 142.107 67.8335) (xy 141.853 67.8335)
+        (xy 141.833 67.8335) (xy 141.833 67.5795) (xy 141.853 67.5795) (xy 141.853 67.5595) (xy 142.107 67.5595)
+        (xy 142.107 67.5795) (xy 143.23125 67.5795) (xy 143.39 67.42075) (xy 143.39 67.28019) (xy 143.293327 67.046801)
+        (xy 143.114698 66.868173) (xy 143.013582 66.826289) (xy 143.096487 66.702213) (xy 143.149341 66.4365) (xy 143.096487 66.170787)
+        (xy 142.945973 65.945527) (xy 142.730421 65.8015) (xy 142.945973 65.657473) (xy 142.955978 65.6425) (xy 144.016086 65.6425)
+        (xy 144.062966 65.651825) (xy 144.109846 65.6425) (xy 144.248692 65.614882) (xy 144.406143 65.509677) (xy 144.432703 65.469927)
+        (xy 144.434197 65.468433) (xy 146.251834 63.650798) (xy 146.259533 63.650798)
       )
     )
     (filled_polygon