diff --git a/hardware/pcb/tomu-fpga.kicad_pcb b/hardware/pcb/tomu-fpga.kicad_pcb
index 8323656..592392a 100644
--- a/hardware/pcb/tomu-fpga.kicad_pcb
+++ b/hardware/pcb/tomu-fpga.kicad_pcb
@@ -1,4 +1,4 @@
-(kicad_pcb (version 20171130) (host pcbnew "(5.0.1)-3")
+(kicad_pcb (version 20171130) (host pcbnew "(5.0.0)")
 
   (general
     (thickness 0.6)
@@ -181,7 +181,211 @@
     (add_net "Net-(U5-PadE3)")
   )
 
-  (module tomu-fpga:SON50P300X200X60-9N (layer B.Cu) (tedit 5BE1AA13) (tstamp 5BE56439)
+  (module tomu-fpga:Texas_X2SON-4_1x1mm_P0.65mm (layer B.Cu) (tedit 5BED15FC) (tstamp 5BE174C5)
+    (at 19 19.7 180)
+    (descr "X2SON 5 pin 1x1mm package (Reference Datasheet: http://www.ti.com/lit/ds/sbvs193d/sbvs193d.pdf Reference part: TPS383x) [StepUp generated footprint]")
+    (tags X2SON)
+    (path /5BFAB7F1)
+    (attr smd)
+    (fp_text reference U3 (at 0 1.5 180) (layer B.SilkS) hide
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text value LDO-X2SON-2.5V (at 0 -1.5 180) (layer B.Fab)
+      (effects (font (size 0.1 0.1) (thickness 0.025)) (justify mirror))
+    )
+    (fp_line (start -0.5 -0.63) (end 0.5 -0.63) (layer B.SilkS) (width 0.12))
+    (fp_line (start -0.66 0.63) (end 0.5 0.63) (layer B.SilkS) (width 0.12))
+    (fp_line (start -0.91 -0.75) (end -0.91 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 0.91 -0.75) (end -0.91 -0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 0.91 0.75) (end 0.91 -0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -0.91 0.75) (end 0.91 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 0.5 0.5) (end 0.5 -0.5) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.25 0.5) (end 0.5 0.5) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.5 0.25) (end -0.25 0.5) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.5 -0.5) (end -0.5 0.25) (layer B.Fab) (width 0.1))
+    (fp_line (start 0.5 -0.5) (end -0.5 -0.5) (layer B.Fab) (width 0.1))
+    (fp_text user %R (at 0 0 180) (layer B.Fab)
+      (effects (font (size 0.2 0.2) (thickness 0.04)) (justify mirror))
+    )
+    (pad 5 smd rect (at 0 0 135) (size 0.58 0.58) (layers B.Cu B.Paste B.Mask)
+      (net 1 GND) (solder_mask_margin -0.05) (solder_paste_margin -0.065) (solder_paste_margin_ratio -0.00000001))
+    (pad "" smd custom (at -0.43 -0.325 180) (size 0.148492 0.148492) (layers B.Paste)
+      (options (clearance outline) (anchor circle))
+      (primitives
+        (gr_poly (pts
+           (xy 0.18 -0.075) (xy 0.18 -0.105) (xy -0.22 -0.105) (xy -0.22 0.105) (xy 0 0.105)
+) (width 0))
+      ))
+    (pad "" smd custom (at 0.43 -0.325 180) (size 0.148492 0.148492) (layers B.Paste)
+      (options (clearance outline) (anchor circle))
+      (primitives
+        (gr_poly (pts
+           (xy 0 0.105) (xy -0.18 -0.075) (xy -0.18 -0.105) (xy 0.22 -0.105) (xy 0.22 0.105)
+) (width 0))
+      ))
+    (pad "" smd custom (at 0.43 0.325 180) (size 0.148492 0.148492) (layers B.Paste)
+      (options (clearance outline) (anchor circle))
+      (primitives
+        (gr_poly (pts
+           (xy 0.22 0.105) (xy 0.22 -0.105) (xy 0 -0.105) (xy -0.18 0.075) (xy -0.18 0.105)
+) (width 0))
+      ))
+    (pad "" smd custom (at -0.43 0.325 180) (size 0.148492 0.148492) (layers B.Paste)
+      (options (clearance outline) (anchor circle))
+      (primitives
+        (gr_poly (pts
+           (xy 0 -0.105) (xy 0.18 0.075) (xy 0.18 0.105) (xy -0.22 0.105) (xy -0.22 -0.105)
+) (width 0))
+      ))
+    (pad 2 smd custom (at -0.43 -0.325 180) (size 0.148492 0.148492) (layers B.Cu)
+      (net 1 GND) (zone_connect 2)
+      (options (clearance outline) (anchor circle))
+      (primitives
+        (gr_poly (pts
+           (xy 0.23 -0.054289) (xy 0.23 -0.155) (xy -0.23 -0.155) (xy -0.23 0.155) (xy 0.020711 0.155)
+) (width 0))
+      ))
+    (pad 3 smd custom (at 0.43 -0.325 180) (size 0.148492 0.148492) (layers B.Cu)
+      (net 2 +3V3) (zone_connect 2)
+      (options (clearance outline) (anchor circle))
+      (primitives
+        (gr_poly (pts
+           (xy 0.23 -0.155) (xy 0.23 0.155) (xy -0.020711 0.155) (xy -0.23 -0.054289) (xy -0.23 -0.155)
+) (width 0))
+      ))
+    (pad 4 smd custom (at 0.43 0.325 180) (size 0.148492 0.148492) (layers B.Cu)
+      (net 12 +5V) (zone_connect 2)
+      (options (clearance outline) (anchor circle))
+      (primitives
+        (gr_poly (pts
+           (xy -0.23 0.155) (xy 0.23 0.155) (xy 0.23 -0.155) (xy -0.020711 -0.155) (xy -0.23 0.054289)
+) (width 0))
+      ))
+    (pad 1 smd custom (at -0.43 0.325 180) (size 0.148492 0.148492) (layers B.Cu)
+      (net 20 +2V5) (zone_connect 2)
+      (options (clearance outline) (anchor circle))
+      (primitives
+        (gr_poly (pts
+           (xy 0.23 0.155) (xy -0.23 0.155) (xy -0.23 -0.155) (xy 0.020711 -0.155) (xy 0.23 0.054289)
+) (width 0))
+      ))
+    (pad "" smd custom (at -0.43 -0.325 180) (size 0.148492 0.148492) (layers B.Mask)
+      (options (clearance outline) (anchor circle))
+      (primitives
+        (gr_poly (pts
+           (xy 0.18 -0.105) (xy 0.18 -0.075) (xy 0 0.105) (xy 0.18 -0.075) (xy 0 0.105)
+           (xy -0.18 0.105) (xy -0.18 -0.105)) (width 0))
+      ))
+    (pad "" smd custom (at 0.43 -0.325 180) (size 0.148492 0.148492) (layers B.Mask)
+      (options (clearance outline) (anchor circle))
+      (primitives
+        (gr_poly (pts
+           (xy -0.18 -0.105) (xy -0.18 -0.075) (xy 0 0.105) (xy -0.18 -0.075) (xy 0 0.105)
+           (xy 0.18 0.105) (xy 0.18 -0.105)) (width 0))
+      ))
+    (pad "" smd custom (at 0.43 0.325 180) (size 0.148492 0.148492) (layers B.Mask)
+      (options (clearance outline) (anchor circle))
+      (primitives
+        (gr_poly (pts
+           (xy -0.18 0.105) (xy -0.18 0.075) (xy 0 -0.105) (xy -0.18 0.075) (xy 0 -0.105)
+           (xy 0.18 -0.105) (xy 0.18 0.105)) (width 0))
+      ))
+    (pad "" smd custom (at -0.43 0.325 180) (size 0.148492 0.148492) (layers B.Mask)
+      (options (clearance outline) (anchor circle))
+      (primitives
+        (gr_poly (pts
+           (xy 0.18 0.105) (xy 0.18 0.075) (xy 0 -0.105) (xy 0.18 0.075) (xy 0 -0.105)
+           (xy -0.18 -0.105) (xy -0.18 0.105)) (width 0))
+      ))
+    (model ${KIPRJMOD}/tomu-fpga.pretty/Texas_S-PVSON-N8.step
+      (at (xyz 0 0 0))
+      (scale (xyz 0.3 0.3 0.3))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module tomu-fpga:iCE40UP5K-UWG30 (layer B.Cu) (tedit 5BED1564) (tstamp 5BE22E2B)
+    (at 24.4 21.9)
+    (path /5C122A3A)
+    (fp_text reference U5 (at 0 -1.5) (layer B.Fab)
+      (effects (font (size 0.127 0.127) (thickness 0.03175)) (justify mirror))
+    )
+    (fp_text value ICE40UP5K-UWG30 (at 0 1.5) (layer B.Fab)
+      (effects (font (size 0.1 0.1) (thickness 0.025)) (justify mirror))
+    )
+    (fp_line (start -1.1 1.3) (end -1.1 -1.3) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.1 -1.3) (end 1.1 -1.3) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 1.1 -1.3) (end 1.1 1.3) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 1.1 1.3) (end -1.1 1.3) (layer B.CrtYd) (width 0.05))
+    (fp_circle (center -1.125 1.325) (end -1.075 1.325) (layer B.CrtYd) (width 0.1))
+    (pad D5 smd circle (at 0.8 -0.2) (size 0.2 0.2) (layers B.Cu B.Paste B.Mask)
+      (net 23 /TOUCH_2))
+    (pad D4 smd circle (at 0.4 -0.2) (size 0.2 0.2) (layers B.Cu B.Paste B.Mask)
+      (net 20 +2V5))
+    (pad C5 smd circle (at 0.8 0.2) (size 0.2 0.2) (layers B.Cu B.Paste B.Mask)
+      (net 26 /LED_G))
+    (pad C4 smd circle (at 0.4 0.2) (size 0.2 0.2) (layers B.Cu B.Paste B.Mask)
+      (net 2 +3V3))
+    (pad F4 smd circle (at 0.4 -1) (size 0.2 0.2) (layers B.Cu B.Paste B.Mask)
+      (net 14 /OSC_IN))
+    (pad E4 smd circle (at 0.4 -0.6) (size 0.2 0.2) (layers B.Cu B.Paste B.Mask)
+      (net 22 /TOUCH_1))
+    (pad E5 smd circle (at 0.8 -0.6) (size 0.2 0.2) (layers B.Cu B.Paste B.Mask)
+      (net 24 /TOUCH_3))
+    (pad F5 smd circle (at 0.8 -1) (size 0.2 0.2) (layers B.Cu B.Paste B.Mask)
+      (net 21 /TOUCH_4))
+    (pad A4 smd circle (at 0.4 1) (size 0.2 0.2) (layers B.Cu B.Paste B.Mask)
+      (net 15 /PU_CTRL_USBP))
+    (pad B4 smd circle (at 0.4 0.6) (size 0.2 0.2) (layers B.Cu B.Paste B.Mask)
+      (net 1 GND))
+    (pad A5 smd circle (at 0.8 1) (size 0.2 0.2) (layers B.Cu B.Paste B.Mask)
+      (net 25 /LED_B))
+    (pad B5 smd circle (at 0.8 0.6) (size 0.2 0.2) (layers B.Cu B.Paste B.Mask)
+      (net 27 /LED_R))
+    (pad F1 smd circle (at -0.8 -1) (size 0.2 0.2) (layers B.Cu B.Paste B.Mask)
+      (net 13 /SPI_MOSI))
+    (pad E1 smd circle (at -0.8 -0.6) (size 0.2 0.2) (layers B.Cu B.Paste B.Mask)
+      (net 3 /SPI_MISO))
+    (pad D1 smd circle (at -0.8 -0.2) (size 0.2 0.2) (layers B.Cu B.Paste B.Mask)
+      (net 5 /SPI_CLK))
+    (pad A1 smd circle (at -0.8 1) (size 0.2 0.2) (layers B.Cu B.Paste B.Mask)
+      (net 11 /ICE_USBP))
+    (pad B1 smd circle (at -0.8 0.6) (size 0.2 0.2) (layers B.Cu B.Paste B.Mask)
+      (net 7 /SPI_IO3))
+    (pad C1 smd circle (at -0.8 0.2) (size 0.2 0.2) (layers B.Cu B.Paste B.Mask)
+      (net 4 /SPI_CS))
+    (pad F2 smd circle (at -0.4 -1) (size 0.2 0.2) (layers B.Cu B.Paste B.Mask)
+      (net 6 /SPI_IO2))
+    (pad E2 smd circle (at -0.4 -0.6) (size 0.2 0.2) (layers B.Cu B.Paste B.Mask)
+      (net 1 GND))
+    (pad D2 smd circle (at -0.4 -0.2) (size 0.2 0.2) (layers B.Cu B.Paste B.Mask)
+      (net 2 +3V3))
+    (pad A2 smd circle (at -0.4 1) (size 0.2 0.2) (layers B.Cu B.Paste B.Mask)
+      (net 10 /ICE_USBN))
+    (pad B2 smd circle (at -0.4 0.6) (size 0.2 0.2) (layers B.Cu B.Paste B.Mask)
+      (net 16 /VCCPLL))
+    (pad C2 smd circle (at -0.4 0.2) (size 0.2 0.2) (layers B.Cu B.Paste B.Mask)
+      (net 18 +1V2))
+    (pad F3 smd circle (at 0 -1) (size 0.2 0.2) (layers B.Cu B.Paste B.Mask)
+      (net 8 /CRESET))
+    (pad E3 smd circle (at 0 -0.6) (size 0.2 0.2) (layers B.Cu B.Paste B.Mask)
+      (net 28 "Net-(U5-PadE3)"))
+    (pad D3 smd circle (at 0 -0.2) (size 0.2 0.2) (layers B.Cu B.Paste B.Mask)
+      (net 9 /CDONE))
+    (pad A3 smd circle (at 0 1) (size 0.2 0.2) (layers B.Cu B.Paste B.Mask)
+      (net 2 +3V3))
+    (pad B3 smd circle (at 0 0.6) (size 0.2 0.2) (layers B.Cu B.Paste B.Mask)
+      (net 17 "Net-(U5-PadB3)"))
+    (pad C3 smd circle (at 0 0.2) (size 0.2 0.2) (layers B.Cu B.Paste B.Mask)
+      (net 19 "Net-(U5-PadC3)"))
+    (model ${KIPRJMOD}/tomu-fpga.pretty/ucBGA-36_2.5x2.5mm_Layout6x6_P0.4mm.step
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module tomu-fpga:SON50P300X200X60-9N (layer B.Cu) (tedit 5BE1A9F2) (tstamp 5BE56439)
     (at 22.75 24.8 180)
     (path /5C1645BF)
     (attr smd)
@@ -191,33 +395,33 @@
     (fp_text value "SPI Flash" (at 0.38 -1.66 180) (layer B.SilkS) hide
       (effects (font (size 0.5 0.5) (thickness 0.1)) (justify mirror))
     )
-    (fp_line (start -1.5 1) (end 1.5 1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 1.5 1) (end 1.5 -1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 1.5 -1) (end -1.5 -1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -1.5 -1) (end -1.5 1) (layer B.CrtYd) (width 0.05))
-    (fp_circle (center -2.3 0.8) (end -2.25 0.8) (layer B.SilkS) (width 0.1))
-    (fp_line (start -2.25 1.25) (end 2.25 1.25) (layer Eco1.User) (width 0.05))
-    (fp_line (start 2.25 1.25) (end 2.25 -1.25) (layer Eco1.User) (width 0.05))
-    (fp_line (start 2.25 -1.25) (end -2.25 -1.25) (layer Eco1.User) (width 0.05))
     (fp_line (start -2.25 -1.25) (end -2.25 1.25) (layer Eco1.User) (width 0.05))
-    (pad 1 smd rect (at -1.42 0.75 180) (size 0.89 0.3) (layers B.Cu B.Paste B.Mask)
-      (net 4 /SPI_CS))
-    (pad 2 smd rect (at -1.42 0.25 180) (size 0.89 0.3) (layers B.Cu B.Paste B.Mask)
-      (net 3 /SPI_MISO))
-    (pad 3 smd rect (at -1.42 -0.25 180) (size 0.89 0.3) (layers B.Cu B.Paste B.Mask)
-      (net 6 /SPI_IO2))
-    (pad 4 smd rect (at -1.42 -0.75 180) (size 0.89 0.3) (layers B.Cu B.Paste B.Mask)
-      (net 1 GND))
-    (pad 5 smd rect (at 1.42 -0.75) (size 0.89 0.3) (layers B.Cu B.Paste B.Mask)
-      (net 13 /SPI_MOSI))
-    (pad 6 smd rect (at 1.42 -0.25) (size 0.89 0.3) (layers B.Cu B.Paste B.Mask)
-      (net 5 /SPI_CLK))
-    (pad 7 smd rect (at 1.42 0.25) (size 0.89 0.3) (layers B.Cu B.Paste B.Mask)
-      (net 7 /SPI_IO3))
+    (fp_line (start 2.25 -1.25) (end -2.25 -1.25) (layer Eco1.User) (width 0.05))
+    (fp_line (start 2.25 1.25) (end 2.25 -1.25) (layer Eco1.User) (width 0.05))
+    (fp_line (start -2.25 1.25) (end 2.25 1.25) (layer Eco1.User) (width 0.05))
+    (fp_circle (center -2.3 0.8) (end -2.25 0.8) (layer B.SilkS) (width 0.1))
+    (fp_line (start -1.5 -1) (end -1.5 1) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 1.5 -1) (end -1.5 -1) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 1.5 1) (end 1.5 -1) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.5 1) (end 1.5 1) (layer B.CrtYd) (width 0.05))
+    (pad 9 smd rect (at 0 0 180) (size 0.2 1.6) (layers B.Cu B.Paste B.Mask))
     (pad 8 smd rect (at 1.42 0.75) (size 0.89 0.3) (layers B.Cu B.Paste B.Mask)
       (net 2 +3V3))
-    (pad 9 smd rect (at 0 0 180) (size 0.2 1.6) (layers B.Cu B.Paste B.Mask))
-    (model ${KISYS3DMOD}/Housings_SON.3dshapes/Texas_S-PVSON-N8.step
+    (pad 7 smd rect (at 1.42 0.25) (size 0.89 0.3) (layers B.Cu B.Paste B.Mask)
+      (net 7 /SPI_IO3))
+    (pad 6 smd rect (at 1.42 -0.25) (size 0.89 0.3) (layers B.Cu B.Paste B.Mask)
+      (net 5 /SPI_CLK))
+    (pad 5 smd rect (at 1.42 -0.75) (size 0.89 0.3) (layers B.Cu B.Paste B.Mask)
+      (net 13 /SPI_MOSI))
+    (pad 4 smd rect (at -1.42 -0.75 180) (size 0.89 0.3) (layers B.Cu B.Paste B.Mask)
+      (net 1 GND))
+    (pad 3 smd rect (at -1.42 -0.25 180) (size 0.89 0.3) (layers B.Cu B.Paste B.Mask)
+      (net 6 /SPI_IO2))
+    (pad 2 smd rect (at -1.42 0.25 180) (size 0.89 0.3) (layers B.Cu B.Paste B.Mask)
+      (net 3 /SPI_MISO))
+    (pad 1 smd rect (at -1.42 0.75 180) (size 0.89 0.3) (layers B.Cu B.Paste B.Mask)
+      (net 4 /SPI_CS))
+    (model ${KIPRJMOD}/tomu-fpga.pretty/Texas_S-PVSON-N8.step
       (at (xyz 0 0 0))
       (scale (xyz 1.1 0.75 0.7))
       (rotate (xyz 0 0 0))
@@ -253,14 +457,14 @@
       (net 2 +3V3))
     (pad "" smd roundrect (at 0.345 0) (size 0.318 0.36) (layers B.Paste) (roundrect_rratio 0.25))
     (pad "" smd roundrect (at -0.345 0) (size 0.318 0.36) (layers B.Paste) (roundrect_rratio 0.25))
-    (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0201_0603Metric.wrl
+    (model ${KIPRJMOD}/tomu-fpga.pretty/C_0201_0603Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
       (rotate (xyz 0 0 0))
     )
   )
 
-  (module tomu-fpga:Texas_X2SON-4_1x1mm_P0.65mm (layer B.Cu) (tedit 5BE17BE6) (tstamp 5BE174A8)
+  (module tomu-fpga:Texas_X2SON-4_1x1mm_P0.65mm (layer B.Cu) (tedit 5BED15FC) (tstamp 5BE174A8)
     (at 18.9 23.7 180)
     (descr "X2SON 5 pin 1x1mm package (Reference Datasheet: http://www.ti.com/lit/ds/sbvs193d/sbvs193d.pdf Reference part: TPS383x) [StepUp generated footprint]")
     (tags X2SON)
@@ -272,70 +476,48 @@
     (fp_text value LDO-X2SON-3.3V (at 0 -1.5 180) (layer B.Fab)
       (effects (font (size 0.1 0.1) (thickness 0.025)) (justify mirror))
     )
+    (fp_line (start -0.5 -0.63) (end 0.5 -0.63) (layer B.SilkS) (width 0.12))
+    (fp_line (start -0.66 0.63) (end 0.5 0.63) (layer B.SilkS) (width 0.12))
+    (fp_line (start -0.91 -0.75) (end -0.91 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 0.91 -0.75) (end -0.91 -0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 0.91 0.75) (end 0.91 -0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -0.91 0.75) (end 0.91 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 0.5 0.5) (end 0.5 -0.5) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.25 0.5) (end 0.5 0.5) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.5 0.25) (end -0.25 0.5) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.5 -0.5) (end -0.5 0.25) (layer B.Fab) (width 0.1))
+    (fp_line (start 0.5 -0.5) (end -0.5 -0.5) (layer B.Fab) (width 0.1))
     (fp_text user %R (at 0 0 180) (layer B.Fab)
       (effects (font (size 0.2 0.2) (thickness 0.04)) (justify mirror))
     )
-    (fp_line (start 0.5 -0.5) (end -0.5 -0.5) (layer B.Fab) (width 0.1))
-    (fp_line (start -0.5 -0.5) (end -0.5 0.25) (layer B.Fab) (width 0.1))
-    (fp_line (start -0.5 0.25) (end -0.25 0.5) (layer B.Fab) (width 0.1))
-    (fp_line (start -0.25 0.5) (end 0.5 0.5) (layer B.Fab) (width 0.1))
-    (fp_line (start 0.5 0.5) (end 0.5 -0.5) (layer B.Fab) (width 0.1))
-    (fp_line (start -0.91 0.75) (end 0.91 0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 0.91 0.75) (end 0.91 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 0.91 -0.75) (end -0.91 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -0.91 -0.75) (end -0.91 0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -0.66 0.63) (end 0.5 0.63) (layer B.SilkS) (width 0.12))
-    (fp_line (start -0.5 -0.63) (end 0.5 -0.63) (layer B.SilkS) (width 0.12))
-    (pad "" smd custom (at -0.43 0.325 180) (size 0.148492 0.148492) (layers B.Mask)
+    (pad 5 smd rect (at 0 0 135) (size 0.58 0.58) (layers B.Cu B.Paste B.Mask)
+      (net 1 GND) (solder_mask_margin -0.05) (solder_paste_margin -0.065) (solder_paste_margin_ratio -0.00000001))
+    (pad "" smd custom (at -0.43 -0.325 180) (size 0.148492 0.148492) (layers B.Paste)
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_poly (pts
-           (xy 0.18 0.105) (xy 0.18 0.075) (xy 0 -0.105) (xy 0.18 0.075) (xy 0 -0.105)
-           (xy -0.18 -0.105) (xy -0.18 0.105)) (width 0))
-      ))
-    (pad "" smd custom (at 0.43 0.325 180) (size 0.148492 0.148492) (layers B.Mask)
-      (options (clearance outline) (anchor circle))
-      (primitives
-        (gr_poly (pts
-           (xy -0.18 0.105) (xy -0.18 0.075) (xy 0 -0.105) (xy -0.18 0.075) (xy 0 -0.105)
-           (xy 0.18 -0.105) (xy 0.18 0.105)) (width 0))
-      ))
-    (pad "" smd custom (at 0.43 -0.325 180) (size 0.148492 0.148492) (layers B.Mask)
-      (options (clearance outline) (anchor circle))
-      (primitives
-        (gr_poly (pts
-           (xy -0.18 -0.105) (xy -0.18 -0.075) (xy 0 0.105) (xy -0.18 -0.075) (xy 0 0.105)
-           (xy 0.18 0.105) (xy 0.18 -0.105)) (width 0))
-      ))
-    (pad "" smd custom (at -0.43 -0.325 180) (size 0.148492 0.148492) (layers B.Mask)
-      (options (clearance outline) (anchor circle))
-      (primitives
-        (gr_poly (pts
-           (xy 0.18 -0.105) (xy 0.18 -0.075) (xy 0 0.105) (xy 0.18 -0.075) (xy 0 0.105)
-           (xy -0.18 0.105) (xy -0.18 -0.105)) (width 0))
-      ))
-    (pad 1 smd custom (at -0.43 0.325 180) (size 0.148492 0.148492) (layers B.Cu)
-      (net 2 +3V3) (zone_connect 2)
-      (options (clearance outline) (anchor circle))
-      (primitives
-        (gr_poly (pts
-           (xy 0.23 0.155) (xy -0.23 0.155) (xy -0.23 -0.155) (xy 0.020711 -0.155) (xy 0.23 0.054289)
+           (xy 0.18 -0.075) (xy 0.18 -0.105) (xy -0.22 -0.105) (xy -0.22 0.105) (xy 0 0.105)
 ) (width 0))
       ))
-    (pad 4 smd custom (at 0.43 0.325 180) (size 0.148492 0.148492) (layers B.Cu)
-      (net 12 +5V) (zone_connect 2)
+    (pad "" smd custom (at 0.43 -0.325 180) (size 0.148492 0.148492) (layers B.Paste)
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_poly (pts
-           (xy -0.23 0.155) (xy 0.23 0.155) (xy 0.23 -0.155) (xy -0.020711 -0.155) (xy -0.23 0.054289)
+           (xy 0 0.105) (xy -0.18 -0.075) (xy -0.18 -0.105) (xy 0.22 -0.105) (xy 0.22 0.105)
 ) (width 0))
       ))
-    (pad 3 smd custom (at 0.43 -0.325 180) (size 0.148492 0.148492) (layers B.Cu)
-      (net 18 +1V2) (zone_connect 2)
+    (pad "" smd custom (at 0.43 0.325 180) (size 0.148492 0.148492) (layers B.Paste)
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_poly (pts
-           (xy 0.23 -0.155) (xy 0.23 0.155) (xy -0.020711 0.155) (xy -0.23 -0.054289) (xy -0.23 -0.155)
+           (xy 0.22 0.105) (xy 0.22 -0.105) (xy 0 -0.105) (xy -0.18 0.075) (xy -0.18 0.105)
+) (width 0))
+      ))
+    (pad "" smd custom (at -0.43 0.325 180) (size 0.148492 0.148492) (layers B.Paste)
+      (options (clearance outline) (anchor circle))
+      (primitives
+        (gr_poly (pts
+           (xy 0 -0.105) (xy 0.18 0.075) (xy 0.18 0.105) (xy -0.22 0.105) (xy -0.22 -0.105)
 ) (width 0))
       ))
     (pad 2 smd custom (at -0.43 -0.325 180) (size 0.148492 0.148492) (layers B.Cu)
@@ -346,44 +528,61 @@
            (xy 0.23 -0.054289) (xy 0.23 -0.155) (xy -0.23 -0.155) (xy -0.23 0.155) (xy 0.020711 0.155)
 ) (width 0))
       ))
-    (pad "" smd custom (at -0.43 0.325 180) (size 0.148492 0.148492) (layers B.Paste)
+    (pad 3 smd custom (at 0.43 -0.325 180) (size 0.148492 0.148492) (layers B.Cu)
+      (net 18 +1V2) (zone_connect 2)
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_poly (pts
-           (xy 0 -0.105) (xy 0.18 0.075) (xy 0.18 0.105) (xy -0.22 0.105) (xy -0.22 -0.105)
+           (xy 0.23 -0.155) (xy 0.23 0.155) (xy -0.020711 0.155) (xy -0.23 -0.054289) (xy -0.23 -0.155)
 ) (width 0))
       ))
-    (pad "" smd custom (at 0.43 0.325 180) (size 0.148492 0.148492) (layers B.Paste)
+    (pad 4 smd custom (at 0.43 0.325 180) (size 0.148492 0.148492) (layers B.Cu)
+      (net 12 +5V) (zone_connect 2)
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_poly (pts
-           (xy 0.22 0.105) (xy 0.22 -0.105) (xy 0 -0.105) (xy -0.18 0.075) (xy -0.18 0.105)
+           (xy -0.23 0.155) (xy 0.23 0.155) (xy 0.23 -0.155) (xy -0.020711 -0.155) (xy -0.23 0.054289)
 ) (width 0))
       ))
-    (pad "" smd custom (at 0.43 -0.325 180) (size 0.148492 0.148492) (layers B.Paste)
+    (pad 1 smd custom (at -0.43 0.325 180) (size 0.148492 0.148492) (layers B.Cu)
+      (net 2 +3V3) (zone_connect 2)
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_poly (pts
-           (xy 0 0.105) (xy -0.18 -0.075) (xy -0.18 -0.105) (xy 0.22 -0.105) (xy 0.22 0.105)
+           (xy 0.23 0.155) (xy -0.23 0.155) (xy -0.23 -0.155) (xy 0.020711 -0.155) (xy 0.23 0.054289)
 ) (width 0))
       ))
-    (pad "" smd custom (at -0.43 -0.325 180) (size 0.148492 0.148492) (layers B.Paste)
+    (pad "" smd custom (at -0.43 -0.325 180) (size 0.148492 0.148492) (layers B.Mask)
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_poly (pts
-           (xy 0.18 -0.075) (xy 0.18 -0.105) (xy -0.22 -0.105) (xy -0.22 0.105) (xy 0 0.105)
-) (width 0))
+           (xy 0.18 -0.105) (xy 0.18 -0.075) (xy 0 0.105) (xy 0.18 -0.075) (xy 0 0.105)
+           (xy -0.18 0.105) (xy -0.18 -0.105)) (width 0))
       ))
-    (pad 5 smd rect (at 0 0 135) (size 0.58 0.58) (layers B.Cu B.Paste B.Mask)
-      (net 1 GND) (solder_mask_margin -0.05) (solder_paste_margin -0.065) (solder_paste_margin_ratio -0.00000001))
-    (model ${KISYS3DMOD}/Package_SON.3dshapes/Texas_X2SON-4_1x1mm_P0.65mm.wrl
+    (pad "" smd custom (at 0.43 -0.325 180) (size 0.148492 0.148492) (layers B.Mask)
+      (options (clearance outline) (anchor circle))
+      (primitives
+        (gr_poly (pts
+           (xy -0.18 -0.105) (xy -0.18 -0.075) (xy 0 0.105) (xy -0.18 -0.075) (xy 0 0.105)
+           (xy 0.18 0.105) (xy 0.18 -0.105)) (width 0))
+      ))
+    (pad "" smd custom (at 0.43 0.325 180) (size 0.148492 0.148492) (layers B.Mask)
+      (options (clearance outline) (anchor circle))
+      (primitives
+        (gr_poly (pts
+           (xy -0.18 0.105) (xy -0.18 0.075) (xy 0 -0.105) (xy -0.18 0.075) (xy 0 -0.105)
+           (xy 0.18 -0.105) (xy 0.18 0.105)) (width 0))
+      ))
+    (pad "" smd custom (at -0.43 0.325 180) (size 0.148492 0.148492) (layers B.Mask)
+      (options (clearance outline) (anchor circle))
+      (primitives
+        (gr_poly (pts
+           (xy 0.18 0.105) (xy 0.18 0.075) (xy 0 -0.105) (xy 0.18 0.075) (xy 0 -0.105)
+           (xy -0.18 -0.105) (xy -0.18 0.105)) (width 0))
+      ))
+    (model ${KIPRJMOD}/tomu-fpga.pretty/Texas_S-PVSON-N8.step
       (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-    (model ${KISYS3DMOD}/Housings_SON.3dshapes/Texas_S-PVSON-N8.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 0.3 0.3 0.2))
+      (scale (xyz 0.3 0.3 0.3))
       (rotate (xyz 0 0 0))
     )
   )
@@ -399,88 +598,7 @@
     )
   )
 
-  (module tomu-fpga:iCE40UP5K-UWG30 (layer B.Cu) (tedit 5BE17DD4) (tstamp 5BE22E2B)
-    (at 24.4 21.9)
-    (path /5C122A3A)
-    (fp_text reference U5 (at 0 -1.5) (layer B.Fab)
-      (effects (font (size 0.127 0.127) (thickness 0.03175)) (justify mirror))
-    )
-    (fp_text value ICE40UP5K-UWG30 (at 0 1.5) (layer B.Fab)
-      (effects (font (size 0.1 0.1) (thickness 0.025)) (justify mirror))
-    )
-    (fp_circle (center -1.125 1.325) (end -1.075 1.325) (layer B.CrtYd) (width 0.1))
-    (fp_line (start 1.1 1.3) (end -1.1 1.3) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 1.1 -1.3) (end 1.1 1.3) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -1.1 -1.3) (end 1.1 -1.3) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -1.1 1.3) (end -1.1 -1.3) (layer B.CrtYd) (width 0.05))
-    (pad C3 smd circle (at 0 0.2) (size 0.2 0.2) (layers B.Cu B.Paste B.Mask)
-      (net 19 "Net-(U5-PadC3)"))
-    (pad B3 smd circle (at 0 0.6) (size 0.2 0.2) (layers B.Cu B.Paste B.Mask)
-      (net 17 "Net-(U5-PadB3)"))
-    (pad A3 smd circle (at 0 1) (size 0.2 0.2) (layers B.Cu B.Paste B.Mask)
-      (net 2 +3V3))
-    (pad D3 smd circle (at 0 -0.2) (size 0.2 0.2) (layers B.Cu B.Paste B.Mask)
-      (net 9 /CDONE))
-    (pad E3 smd circle (at 0 -0.6) (size 0.2 0.2) (layers B.Cu B.Paste B.Mask)
-      (net 28 "Net-(U5-PadE3)"))
-    (pad F3 smd circle (at 0 -1) (size 0.2 0.2) (layers B.Cu B.Paste B.Mask)
-      (net 8 /CRESET))
-    (pad C2 smd circle (at -0.4 0.2) (size 0.2 0.2) (layers B.Cu B.Paste B.Mask)
-      (net 18 +1V2))
-    (pad B2 smd circle (at -0.4 0.6) (size 0.2 0.2) (layers B.Cu B.Paste B.Mask)
-      (net 16 /VCCPLL))
-    (pad A2 smd circle (at -0.4 1) (size 0.2 0.2) (layers B.Cu B.Paste B.Mask)
-      (net 10 /ICE_USBN))
-    (pad D2 smd circle (at -0.4 -0.2) (size 0.2 0.2) (layers B.Cu B.Paste B.Mask)
-      (net 2 +3V3))
-    (pad E2 smd circle (at -0.4 -0.6) (size 0.2 0.2) (layers B.Cu B.Paste B.Mask)
-      (net 1 GND))
-    (pad F2 smd circle (at -0.4 -1) (size 0.2 0.2) (layers B.Cu B.Paste B.Mask)
-      (net 6 /SPI_IO2))
-    (pad C1 smd circle (at -0.8 0.2) (size 0.2 0.2) (layers B.Cu B.Paste B.Mask)
-      (net 4 /SPI_CS))
-    (pad B1 smd circle (at -0.8 0.6) (size 0.2 0.2) (layers B.Cu B.Paste B.Mask)
-      (net 7 /SPI_IO3))
-    (pad A1 smd circle (at -0.8 1) (size 0.2 0.2) (layers B.Cu B.Paste B.Mask)
-      (net 11 /ICE_USBP))
-    (pad D1 smd circle (at -0.8 -0.2) (size 0.2 0.2) (layers B.Cu B.Paste B.Mask)
-      (net 5 /SPI_CLK))
-    (pad E1 smd circle (at -0.8 -0.6) (size 0.2 0.2) (layers B.Cu B.Paste B.Mask)
-      (net 3 /SPI_MISO))
-    (pad F1 smd circle (at -0.8 -1) (size 0.2 0.2) (layers B.Cu B.Paste B.Mask)
-      (net 13 /SPI_MOSI))
-    (pad B5 smd circle (at 0.8 0.6) (size 0.2 0.2) (layers B.Cu B.Paste B.Mask)
-      (net 27 /LED_R))
-    (pad A5 smd circle (at 0.8 1) (size 0.2 0.2) (layers B.Cu B.Paste B.Mask)
-      (net 25 /LED_B))
-    (pad B4 smd circle (at 0.4 0.6) (size 0.2 0.2) (layers B.Cu B.Paste B.Mask)
-      (net 1 GND))
-    (pad A4 smd circle (at 0.4 1) (size 0.2 0.2) (layers B.Cu B.Paste B.Mask)
-      (net 15 /PU_CTRL_USBP))
-    (pad F5 smd circle (at 0.8 -1) (size 0.2 0.2) (layers B.Cu B.Paste B.Mask)
-      (net 21 /TOUCH_4))
-    (pad E5 smd circle (at 0.8 -0.6) (size 0.2 0.2) (layers B.Cu B.Paste B.Mask)
-      (net 24 /TOUCH_3))
-    (pad E4 smd circle (at 0.4 -0.6) (size 0.2 0.2) (layers B.Cu B.Paste B.Mask)
-      (net 22 /TOUCH_1))
-    (pad F4 smd circle (at 0.4 -1) (size 0.2 0.2) (layers B.Cu B.Paste B.Mask)
-      (net 14 /OSC_IN))
-    (pad C4 smd circle (at 0.4 0.2) (size 0.2 0.2) (layers B.Cu B.Paste B.Mask)
-      (net 2 +3V3))
-    (pad C5 smd circle (at 0.8 0.2) (size 0.2 0.2) (layers B.Cu B.Paste B.Mask)
-      (net 26 /LED_G))
-    (pad D4 smd circle (at 0.4 -0.2) (size 0.2 0.2) (layers B.Cu B.Paste B.Mask)
-      (net 20 +2V5))
-    (pad D5 smd circle (at 0.8 -0.2) (size 0.2 0.2) (layers B.Cu B.Paste B.Mask)
-      (net 23 /TOUCH_2))
-    (model ${KISYS3DMOD}/Package_BGA.3dshapes/ucBGA-36_2.5x2.5mm_Layout6x6_P0.4mm.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 0.8 1 0.5))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module tomu-fpga:LED-RGB-5DS-UHD1110-FKA (layer B.Cu) (tedit 5BE2E647) (tstamp 5BE1755F)
+  (module tomu-fpga:LED-RGB-5DS-UHD1110-FKA (layer B.Cu) (tedit 5BE17391) (tstamp 5BE1755F)
     (at 26.47 21.88 90)
     (path /5BD90F18)
     (attr smd)
@@ -494,7 +612,7 @@
     (fp_line (start 0.6 -0.6) (end -0.6 -0.6) (layer B.CrtYd) (width 0.03))
     (fp_line (start 0.6 0.6) (end 0.6 -0.6) (layer B.CrtYd) (width 0.03))
     (fp_line (start -0.6 0.6) (end 0.6 0.6) (layer B.CrtYd) (width 0.03))
-    (pad "" smd circle (at -0.65 0.65 270) (size 0.2 0.2) (layers Eco1.User))
+    (pad "" smd circle (at -0.65 0.65 270) (size 0.2 0.2) (layers B.SilkS))
     (pad 4 smd rect (at 0.3 -0.3 90) (size 0.4 0.4) (layers B.Cu B.Paste B.Mask)
       (net 2 +3V3))
     (pad 3 smd rect (at -0.3 -0.3 90) (size 0.4 0.4) (layers B.Cu B.Paste B.Mask)
@@ -503,7 +621,7 @@
       (net 26 /LED_G))
     (pad 1 smd rect (at -0.3 0.3 90) (size 0.4 0.4) (layers B.Cu B.Paste B.Mask)
       (net 25 /LED_B))
-    (model ${KISYS3DMOD}/LEDs.3dshapes/LED_WS2812B-PLCC4.wrl
+    (model ${KIPRJMOD}/tomu-fpga.pretty/LED_WS2812B-PLCC4.wrl
       (offset (xyz 0 0 -0.03))
       (scale (xyz 0.07000000000000001 0.07000000000000001 0.05))
       (rotate (xyz 0 0 0))
@@ -603,7 +721,7 @@
       (net 12 +5V))
     (pad "" smd roundrect (at 0.345 0 270) (size 0.318 0.36) (layers B.Paste) (roundrect_rratio 0.25))
     (pad "" smd roundrect (at -0.345 0 270) (size 0.318 0.36) (layers B.Paste) (roundrect_rratio 0.25))
-    (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0201_0603Metric.wrl
+    (model ${KIPRJMOD}/tomu-fpga.pretty/C_0201_0603Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
       (rotate (xyz 0 0 0))
@@ -639,7 +757,7 @@
       (net 2 +3V3))
     (pad "" smd roundrect (at 0.345 0) (size 0.318 0.36) (layers B.Paste) (roundrect_rratio 0.25))
     (pad "" smd roundrect (at -0.345 0) (size 0.318 0.36) (layers B.Paste) (roundrect_rratio 0.25))
-    (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0201_0603Metric.wrl
+    (model ${KIPRJMOD}/tomu-fpga.pretty/C_0201_0603Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
       (rotate (xyz 0 0 0))
@@ -675,7 +793,7 @@
       (net 1 GND))
     (pad "" smd roundrect (at 0.345 0 180) (size 0.318 0.36) (layers B.Paste) (roundrect_rratio 0.25))
     (pad "" smd roundrect (at -0.345 0 180) (size 0.318 0.36) (layers B.Paste) (roundrect_rratio 0.25))
-    (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0201_0603Metric.wrl
+    (model ${KIPRJMOD}/tomu-fpga.pretty/C_0201_0603Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
       (rotate (xyz 0 0 0))
@@ -711,7 +829,7 @@
       (net 2 +3V3))
     (pad "" smd roundrect (at 0.345 0) (size 0.318 0.36) (layers B.Paste) (roundrect_rratio 0.25))
     (pad "" smd roundrect (at -0.345 0) (size 0.318 0.36) (layers B.Paste) (roundrect_rratio 0.25))
-    (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0201_0603Metric.wrl
+    (model ${KIPRJMOD}/tomu-fpga.pretty/C_0201_0603Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
       (rotate (xyz 0 0 0))
@@ -747,7 +865,7 @@
       (net 12 +5V))
     (pad "" smd roundrect (at 0.345 0 270) (size 0.318 0.36) (layers B.Paste) (roundrect_rratio 0.25))
     (pad "" smd roundrect (at -0.345 0 270) (size 0.318 0.36) (layers B.Paste) (roundrect_rratio 0.25))
-    (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0201_0603Metric.wrl
+    (model ${KIPRJMOD}/tomu-fpga.pretty/C_0201_0603Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
       (rotate (xyz 0 0 0))
@@ -783,7 +901,7 @@
       (net 18 +1V2))
     (pad "" smd roundrect (at 0.345 0 90) (size 0.318 0.36) (layers B.Paste) (roundrect_rratio 0.25))
     (pad "" smd roundrect (at -0.345 0 90) (size 0.318 0.36) (layers B.Paste) (roundrect_rratio 0.25))
-    (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0201_0603Metric.wrl
+    (model ${KIPRJMOD}/tomu-fpga.pretty/C_0201_0603Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
       (rotate (xyz 0 0 0))
@@ -819,7 +937,7 @@
       (net 18 +1V2))
     (pad "" smd roundrect (at 0.345 0 90) (size 0.318 0.36) (layers B.Paste) (roundrect_rratio 0.25))
     (pad "" smd roundrect (at -0.345 0 90) (size 0.318 0.36) (layers B.Paste) (roundrect_rratio 0.25))
-    (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0201_0603Metric.wrl
+    (model ${KIPRJMOD}/tomu-fpga.pretty/C_0201_0603Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
       (rotate (xyz 0 0 0))
@@ -855,7 +973,7 @@
       (net 16 /VCCPLL))
     (pad "" smd roundrect (at 0.345 0 270) (size 0.318 0.36) (layers B.Paste) (roundrect_rratio 0.25))
     (pad "" smd roundrect (at -0.345 0 270) (size 0.318 0.36) (layers B.Paste) (roundrect_rratio 0.25))
-    (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0201_0603Metric.wrl
+    (model ${KIPRJMOD}/tomu-fpga.pretty/C_0201_0603Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
       (rotate (xyz 0 0 0))
@@ -891,7 +1009,7 @@
       (net 18 +1V2))
     (pad "" smd roundrect (at 0.345 0 90) (size 0.318 0.36) (layers B.Paste) (roundrect_rratio 0.25))
     (pad "" smd roundrect (at -0.345 0 90) (size 0.318 0.36) (layers B.Paste) (roundrect_rratio 0.25))
-    (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0201_0603Metric.wrl
+    (model ${KIPRJMOD}/tomu-fpga.pretty/C_0201_0603Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
       (rotate (xyz 0 0 0))
@@ -927,7 +1045,7 @@
       (net 20 +2V5))
     (pad "" smd roundrect (at 0.345 0) (size 0.318 0.36) (layers B.Paste) (roundrect_rratio 0.25))
     (pad "" smd roundrect (at -0.345 0) (size 0.318 0.36) (layers B.Paste) (roundrect_rratio 0.25))
-    (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0201_0603Metric.wrl
+    (model ${KIPRJMOD}/tomu-fpga.pretty/C_0201_0603Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
       (rotate (xyz 0 0 0))
@@ -963,7 +1081,7 @@
       (net 2 +3V3))
     (pad "" smd roundrect (at 0.345 0) (size 0.318 0.36) (layers B.Paste) (roundrect_rratio 0.25))
     (pad "" smd roundrect (at -0.345 0) (size 0.318 0.36) (layers B.Paste) (roundrect_rratio 0.25))
-    (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0201_0603Metric.wrl
+    (model ${KIPRJMOD}/tomu-fpga.pretty/C_0201_0603Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
       (rotate (xyz 0 0 0))
@@ -999,7 +1117,7 @@
       (net 20 +2V5))
     (pad "" smd roundrect (at 0.345 0) (size 0.318 0.36) (layers B.Paste) (roundrect_rratio 0.25))
     (pad "" smd roundrect (at -0.345 0) (size 0.318 0.36) (layers B.Paste) (roundrect_rratio 0.25))
-    (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0201_0603Metric.wrl
+    (model ${KIPRJMOD}/tomu-fpga.pretty/C_0201_0603Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
       (rotate (xyz 0 0 0))
@@ -1035,7 +1153,7 @@
       (net 12 +5V))
     (pad "" smd roundrect (at 0.345 0 90) (size 0.318 0.36) (layers B.Paste) (roundrect_rratio 0.25))
     (pad "" smd roundrect (at -0.345 0 90) (size 0.318 0.36) (layers B.Paste) (roundrect_rratio 0.25))
-    (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0201_0603Metric.wrl
+    (model ${KIPRJMOD}/tomu-fpga.pretty/C_0201_0603Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
       (rotate (xyz 0 0 0))
@@ -1071,7 +1189,7 @@
       (net 20 +2V5))
     (pad "" smd roundrect (at 0.345 0) (size 0.318 0.36) (layers B.Paste) (roundrect_rratio 0.25))
     (pad "" smd roundrect (at -0.345 0) (size 0.318 0.36) (layers B.Paste) (roundrect_rratio 0.25))
-    (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0201_0603Metric.wrl
+    (model ${KIPRJMOD}/tomu-fpga.pretty/C_0201_0603Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
       (rotate (xyz 0 0 0))
@@ -1107,7 +1225,7 @@
       (net 12 +5V))
     (pad "" smd roundrect (at 0.345 0 270) (size 0.318 0.36) (layers B.Paste) (roundrect_rratio 0.25))
     (pad "" smd roundrect (at -0.345 0 270) (size 0.318 0.36) (layers B.Paste) (roundrect_rratio 0.25))
-    (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0201_0603Metric.wrl
+    (model ${KIPRJMOD}/tomu-fpga.pretty/C_0201_0603Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
       (rotate (xyz 0 0 0))
@@ -1143,7 +1261,7 @@
       (net 2 +3V3))
     (pad "" smd roundrect (at 0.345 0 90) (size 0.318 0.36) (layers B.Paste) (roundrect_rratio 0.25))
     (pad "" smd roundrect (at -0.345 0 90) (size 0.318 0.36) (layers B.Paste) (roundrect_rratio 0.25))
-    (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0201_0603Metric.wrl
+    (model ${KIPRJMOD}/tomu-fpga.pretty/C_0201_0603Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
       (rotate (xyz 0 0 0))
@@ -1179,7 +1297,7 @@
       (net 2 +3V3))
     (pad "" smd roundrect (at 0.345 0 270) (size 0.318 0.36) (layers B.Paste) (roundrect_rratio 0.25))
     (pad "" smd roundrect (at -0.345 0 270) (size 0.318 0.36) (layers B.Paste) (roundrect_rratio 0.25))
-    (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0201_0603Metric.wrl
+    (model ${KIPRJMOD}/tomu-fpga.pretty/C_0201_0603Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
       (rotate (xyz 0 0 0))
@@ -1215,7 +1333,7 @@
       (net 2 +3V3))
     (pad "" smd roundrect (at 0.345 0 270) (size 0.318 0.36) (layers B.Paste) (roundrect_rratio 0.25))
     (pad "" smd roundrect (at -0.345 0 270) (size 0.318 0.36) (layers B.Paste) (roundrect_rratio 0.25))
-    (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0201_0603Metric.wrl
+    (model ${KIPRJMOD}/tomu-fpga.pretty/C_0201_0603Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
       (rotate (xyz 0 0 0))
@@ -1251,7 +1369,7 @@
       (net 2 +3V3))
     (pad "" smd roundrect (at 0.345 0 270) (size 0.318 0.36) (layers B.Paste) (roundrect_rratio 0.25))
     (pad "" smd roundrect (at -0.345 0 270) (size 0.318 0.36) (layers B.Paste) (roundrect_rratio 0.25))
-    (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0201_0603Metric.wrl
+    (model ${KIPRJMOD}/tomu-fpga.pretty/C_0201_0603Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
       (rotate (xyz 0 0 0))
@@ -1287,7 +1405,7 @@
       (net 18 +1V2))
     (pad "" smd roundrect (at 0.345 0 270) (size 0.318 0.36) (layers B.Paste) (roundrect_rratio 0.25))
     (pad "" smd roundrect (at -0.345 0 270) (size 0.318 0.36) (layers B.Paste) (roundrect_rratio 0.25))
-    (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0201_0603Metric.wrl
+    (model ${KIPRJMOD}/tomu-fpga.pretty/C_0201_0603Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
       (rotate (xyz 0 0 0))
@@ -1323,7 +1441,7 @@
       (net 2 +3V3))
     (pad "" smd roundrect (at 0.345 0 270) (size 0.318 0.36) (layers B.Paste) (roundrect_rratio 0.25))
     (pad "" smd roundrect (at -0.345 0 270) (size 0.318 0.36) (layers B.Paste) (roundrect_rratio 0.25))
-    (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0201_0603Metric.wrl
+    (model ${KIPRJMOD}/tomu-fpga.pretty/C_0201_0603Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
       (rotate (xyz 0 0 0))
@@ -1359,7 +1477,7 @@
       (net 20 +2V5))
     (pad "" smd roundrect (at 0.345 0 270) (size 0.318 0.36) (layers B.Paste) (roundrect_rratio 0.25))
     (pad "" smd roundrect (at -0.345 0 270) (size 0.318 0.36) (layers B.Paste) (roundrect_rratio 0.25))
-    (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0201_0603Metric.wrl
+    (model ${KIPRJMOD}/tomu-fpga.pretty/C_0201_0603Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
       (rotate (xyz 0 0 0))
@@ -1395,7 +1513,7 @@
       (net 2 +3V3))
     (pad "" smd roundrect (at 0.345 0) (size 0.318 0.36) (layers B.Paste) (roundrect_rratio 0.25))
     (pad "" smd roundrect (at -0.345 0) (size 0.318 0.36) (layers B.Paste) (roundrect_rratio 0.25))
-    (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0201_0603Metric.wrl
+    (model ${KIPRJMOD}/tomu-fpga.pretty/C_0201_0603Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
       (rotate (xyz 0 0 0))
@@ -1431,7 +1549,7 @@
       (net 2 +3V3))
     (pad "" smd roundrect (at 0.345 0) (size 0.318 0.36) (layers B.Paste) (roundrect_rratio 0.25))
     (pad "" smd roundrect (at -0.345 0) (size 0.318 0.36) (layers B.Paste) (roundrect_rratio 0.25))
-    (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0201_0603Metric.wrl
+    (model ${KIPRJMOD}/tomu-fpga.pretty/C_0201_0603Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
       (rotate (xyz 0 0 0))
@@ -1467,7 +1585,7 @@
       (net 10 /ICE_USBN))
     (pad "" smd roundrect (at 0.345 0 90) (size 0.318 0.36) (layers B.Paste) (roundrect_rratio 0.25))
     (pad "" smd roundrect (at -0.345 0 90) (size 0.318 0.36) (layers B.Paste) (roundrect_rratio 0.25))
-    (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl
+    (model ${KIPRJMOD}/tomu-fpga.pretty/R_0201_0603Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
       (rotate (xyz 0 0 0))
@@ -1503,7 +1621,7 @@
       (net 8 /CRESET))
     (pad "" smd roundrect (at 0.345 0 270) (size 0.318 0.36) (layers B.Paste) (roundrect_rratio 0.25))
     (pad "" smd roundrect (at -0.345 0 270) (size 0.318 0.36) (layers B.Paste) (roundrect_rratio 0.25))
-    (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl
+    (model ${KIPRJMOD}/tomu-fpga.pretty/R_0201_0603Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
       (rotate (xyz 0 0 0))
@@ -1539,7 +1657,7 @@
       (net 4 /SPI_CS))
     (pad "" smd roundrect (at 0.345 0) (size 0.318 0.36) (layers B.Paste) (roundrect_rratio 0.25))
     (pad "" smd roundrect (at -0.345 0) (size 0.318 0.36) (layers B.Paste) (roundrect_rratio 0.25))
-    (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl
+    (model ${KIPRJMOD}/tomu-fpga.pretty/R_0201_0603Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
       (rotate (xyz 0 0 0))
@@ -1575,7 +1693,7 @@
       (net 11 /ICE_USBP))
     (pad "" smd roundrect (at 0.345 0 90) (size 0.318 0.36) (layers B.Paste) (roundrect_rratio 0.25))
     (pad "" smd roundrect (at -0.345 0 90) (size 0.318 0.36) (layers B.Paste) (roundrect_rratio 0.25))
-    (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl
+    (model ${KIPRJMOD}/tomu-fpga.pretty/R_0201_0603Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
       (rotate (xyz 0 0 0))
@@ -1611,14 +1729,14 @@
       (net 15 /PU_CTRL_USBP))
     (pad "" smd roundrect (at 0.345 0 90) (size 0.318 0.36) (layers B.Paste) (roundrect_rratio 0.25))
     (pad "" smd roundrect (at -0.345 0 90) (size 0.318 0.36) (layers B.Paste) (roundrect_rratio 0.25))
-    (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl
+    (model ${KIPRJMOD}/tomu-fpga.pretty/R_0201_0603Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
       (rotate (xyz 0 0 0))
     )
   )
 
-  (module tomu-fpga:Texas_X2SON-4_1x1mm_P0.65mm (layer B.Cu) (tedit 5BE17BE6) (tstamp 5BE174E3)
+  (module tomu-fpga:Texas_X2SON-4_1x1mm_P0.65mm (layer B.Cu) (tedit 5BED15FC) (tstamp 5BE174E3)
     (at 19 18.2 180)
     (descr "X2SON 5 pin 1x1mm package (Reference Datasheet: http://www.ti.com/lit/ds/sbvs193d/sbvs193d.pdf Reference part: TPS383x) [StepUp generated footprint]")
     (tags X2SON)
@@ -1630,70 +1748,48 @@
     (fp_text value LDO-X2SON-1.2V (at 0 -1.5 180) (layer B.Fab)
       (effects (font (size 0.1 0.1) (thickness 0.025)) (justify mirror))
     )
+    (fp_line (start -0.5 -0.63) (end 0.5 -0.63) (layer B.SilkS) (width 0.12))
+    (fp_line (start -0.66 0.63) (end 0.5 0.63) (layer B.SilkS) (width 0.12))
+    (fp_line (start -0.91 -0.75) (end -0.91 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 0.91 -0.75) (end -0.91 -0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 0.91 0.75) (end 0.91 -0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -0.91 0.75) (end 0.91 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 0.5 0.5) (end 0.5 -0.5) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.25 0.5) (end 0.5 0.5) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.5 0.25) (end -0.25 0.5) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.5 -0.5) (end -0.5 0.25) (layer B.Fab) (width 0.1))
+    (fp_line (start 0.5 -0.5) (end -0.5 -0.5) (layer B.Fab) (width 0.1))
     (fp_text user %R (at 0 0 180) (layer B.Fab)
       (effects (font (size 0.2 0.2) (thickness 0.04)) (justify mirror))
     )
-    (fp_line (start 0.5 -0.5) (end -0.5 -0.5) (layer B.Fab) (width 0.1))
-    (fp_line (start -0.5 -0.5) (end -0.5 0.25) (layer B.Fab) (width 0.1))
-    (fp_line (start -0.5 0.25) (end -0.25 0.5) (layer B.Fab) (width 0.1))
-    (fp_line (start -0.25 0.5) (end 0.5 0.5) (layer B.Fab) (width 0.1))
-    (fp_line (start 0.5 0.5) (end 0.5 -0.5) (layer B.Fab) (width 0.1))
-    (fp_line (start -0.91 0.75) (end 0.91 0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 0.91 0.75) (end 0.91 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 0.91 -0.75) (end -0.91 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -0.91 -0.75) (end -0.91 0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -0.66 0.63) (end 0.5 0.63) (layer B.SilkS) (width 0.12))
-    (fp_line (start -0.5 -0.63) (end 0.5 -0.63) (layer B.SilkS) (width 0.12))
-    (pad "" smd custom (at -0.43 0.325 180) (size 0.148492 0.148492) (layers B.Mask)
+    (pad 5 smd rect (at 0 0 135) (size 0.58 0.58) (layers B.Cu B.Paste B.Mask)
+      (net 1 GND) (solder_mask_margin -0.05) (solder_paste_margin -0.065) (solder_paste_margin_ratio -0.00000001))
+    (pad "" smd custom (at -0.43 -0.325 180) (size 0.148492 0.148492) (layers B.Paste)
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_poly (pts
-           (xy 0.18 0.105) (xy 0.18 0.075) (xy 0 -0.105) (xy 0.18 0.075) (xy 0 -0.105)
-           (xy -0.18 -0.105) (xy -0.18 0.105)) (width 0))
-      ))
-    (pad "" smd custom (at 0.43 0.325 180) (size 0.148492 0.148492) (layers B.Mask)
-      (options (clearance outline) (anchor circle))
-      (primitives
-        (gr_poly (pts
-           (xy -0.18 0.105) (xy -0.18 0.075) (xy 0 -0.105) (xy -0.18 0.075) (xy 0 -0.105)
-           (xy 0.18 -0.105) (xy 0.18 0.105)) (width 0))
-      ))
-    (pad "" smd custom (at 0.43 -0.325 180) (size 0.148492 0.148492) (layers B.Mask)
-      (options (clearance outline) (anchor circle))
-      (primitives
-        (gr_poly (pts
-           (xy -0.18 -0.105) (xy -0.18 -0.075) (xy 0 0.105) (xy -0.18 -0.075) (xy 0 0.105)
-           (xy 0.18 0.105) (xy 0.18 -0.105)) (width 0))
-      ))
-    (pad "" smd custom (at -0.43 -0.325 180) (size 0.148492 0.148492) (layers B.Mask)
-      (options (clearance outline) (anchor circle))
-      (primitives
-        (gr_poly (pts
-           (xy 0.18 -0.105) (xy 0.18 -0.075) (xy 0 0.105) (xy 0.18 -0.075) (xy 0 0.105)
-           (xy -0.18 0.105) (xy -0.18 -0.105)) (width 0))
-      ))
-    (pad 1 smd custom (at -0.43 0.325 180) (size 0.148492 0.148492) (layers B.Cu)
-      (net 18 +1V2) (zone_connect 2)
-      (options (clearance outline) (anchor circle))
-      (primitives
-        (gr_poly (pts
-           (xy 0.23 0.155) (xy -0.23 0.155) (xy -0.23 -0.155) (xy 0.020711 -0.155) (xy 0.23 0.054289)
+           (xy 0.18 -0.075) (xy 0.18 -0.105) (xy -0.22 -0.105) (xy -0.22 0.105) (xy 0 0.105)
 ) (width 0))
       ))
-    (pad 4 smd custom (at 0.43 0.325 180) (size 0.148492 0.148492) (layers B.Cu)
-      (net 12 +5V) (zone_connect 2)
+    (pad "" smd custom (at 0.43 -0.325 180) (size 0.148492 0.148492) (layers B.Paste)
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_poly (pts
-           (xy -0.23 0.155) (xy 0.23 0.155) (xy 0.23 -0.155) (xy -0.020711 -0.155) (xy -0.23 0.054289)
+           (xy 0 0.105) (xy -0.18 -0.075) (xy -0.18 -0.105) (xy 0.22 -0.105) (xy 0.22 0.105)
 ) (width 0))
       ))
-    (pad 3 smd custom (at 0.43 -0.325 180) (size 0.148492 0.148492) (layers B.Cu)
-      (net 12 +5V) (zone_connect 2)
+    (pad "" smd custom (at 0.43 0.325 180) (size 0.148492 0.148492) (layers B.Paste)
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_poly (pts
-           (xy 0.23 -0.155) (xy 0.23 0.155) (xy -0.020711 0.155) (xy -0.23 -0.054289) (xy -0.23 -0.155)
+           (xy 0.22 0.105) (xy 0.22 -0.105) (xy 0 -0.105) (xy -0.18 0.075) (xy -0.18 0.105)
+) (width 0))
+      ))
+    (pad "" smd custom (at -0.43 0.325 180) (size 0.148492 0.148492) (layers B.Paste)
+      (options (clearance outline) (anchor circle))
+      (primitives
+        (gr_poly (pts
+           (xy 0 -0.105) (xy 0.18 0.075) (xy 0.18 0.105) (xy -0.22 0.105) (xy -0.22 -0.105)
 ) (width 0))
       ))
     (pad 2 smd custom (at -0.43 -0.325 180) (size 0.148492 0.148492) (layers B.Cu)
@@ -1704,49 +1800,66 @@
            (xy 0.23 -0.054289) (xy 0.23 -0.155) (xy -0.23 -0.155) (xy -0.23 0.155) (xy 0.020711 0.155)
 ) (width 0))
       ))
-    (pad "" smd custom (at -0.43 0.325 180) (size 0.148492 0.148492) (layers B.Paste)
+    (pad 3 smd custom (at 0.43 -0.325 180) (size 0.148492 0.148492) (layers B.Cu)
+      (net 12 +5V) (zone_connect 2)
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_poly (pts
-           (xy 0 -0.105) (xy 0.18 0.075) (xy 0.18 0.105) (xy -0.22 0.105) (xy -0.22 -0.105)
+           (xy 0.23 -0.155) (xy 0.23 0.155) (xy -0.020711 0.155) (xy -0.23 -0.054289) (xy -0.23 -0.155)
 ) (width 0))
       ))
-    (pad "" smd custom (at 0.43 0.325 180) (size 0.148492 0.148492) (layers B.Paste)
+    (pad 4 smd custom (at 0.43 0.325 180) (size 0.148492 0.148492) (layers B.Cu)
+      (net 12 +5V) (zone_connect 2)
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_poly (pts
-           (xy 0.22 0.105) (xy 0.22 -0.105) (xy 0 -0.105) (xy -0.18 0.075) (xy -0.18 0.105)
+           (xy -0.23 0.155) (xy 0.23 0.155) (xy 0.23 -0.155) (xy -0.020711 -0.155) (xy -0.23 0.054289)
 ) (width 0))
       ))
-    (pad "" smd custom (at 0.43 -0.325 180) (size 0.148492 0.148492) (layers B.Paste)
+    (pad 1 smd custom (at -0.43 0.325 180) (size 0.148492 0.148492) (layers B.Cu)
+      (net 18 +1V2) (zone_connect 2)
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_poly (pts
-           (xy 0 0.105) (xy -0.18 -0.075) (xy -0.18 -0.105) (xy 0.22 -0.105) (xy 0.22 0.105)
+           (xy 0.23 0.155) (xy -0.23 0.155) (xy -0.23 -0.155) (xy 0.020711 -0.155) (xy 0.23 0.054289)
 ) (width 0))
       ))
-    (pad "" smd custom (at -0.43 -0.325 180) (size 0.148492 0.148492) (layers B.Paste)
+    (pad "" smd custom (at -0.43 -0.325 180) (size 0.148492 0.148492) (layers B.Mask)
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_poly (pts
-           (xy 0.18 -0.075) (xy 0.18 -0.105) (xy -0.22 -0.105) (xy -0.22 0.105) (xy 0 0.105)
-) (width 0))
+           (xy 0.18 -0.105) (xy 0.18 -0.075) (xy 0 0.105) (xy 0.18 -0.075) (xy 0 0.105)
+           (xy -0.18 0.105) (xy -0.18 -0.105)) (width 0))
       ))
-    (pad 5 smd rect (at 0 0 135) (size 0.58 0.58) (layers B.Cu B.Paste B.Mask)
-      (net 1 GND) (solder_mask_margin -0.05) (solder_paste_margin -0.065) (solder_paste_margin_ratio -0.00000001))
-    (model ${KISYS3DMOD}/Package_SON.3dshapes/Texas_X2SON-4_1x1mm_P0.65mm.wrl
+    (pad "" smd custom (at 0.43 -0.325 180) (size 0.148492 0.148492) (layers B.Mask)
+      (options (clearance outline) (anchor circle))
+      (primitives
+        (gr_poly (pts
+           (xy -0.18 -0.105) (xy -0.18 -0.075) (xy 0 0.105) (xy -0.18 -0.075) (xy 0 0.105)
+           (xy 0.18 0.105) (xy 0.18 -0.105)) (width 0))
+      ))
+    (pad "" smd custom (at 0.43 0.325 180) (size 0.148492 0.148492) (layers B.Mask)
+      (options (clearance outline) (anchor circle))
+      (primitives
+        (gr_poly (pts
+           (xy -0.18 0.105) (xy -0.18 0.075) (xy 0 -0.105) (xy -0.18 0.075) (xy 0 -0.105)
+           (xy 0.18 -0.105) (xy 0.18 0.105)) (width 0))
+      ))
+    (pad "" smd custom (at -0.43 0.325 180) (size 0.148492 0.148492) (layers B.Mask)
+      (options (clearance outline) (anchor circle))
+      (primitives
+        (gr_poly (pts
+           (xy 0.18 0.105) (xy 0.18 0.075) (xy 0 -0.105) (xy 0.18 0.075) (xy 0 -0.105)
+           (xy -0.18 -0.105) (xy -0.18 0.105)) (width 0))
+      ))
+    (model ${KIPRJMOD}/tomu-fpga.pretty/Texas_S-PVSON-N8.step
       (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-    (model ${KISYS3DMOD}/Housings_SON.3dshapes/Texas_S-PVSON-N8.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 0.3 0.3 0.2))
+      (scale (xyz 0.3 0.3 0.3))
       (rotate (xyz 0 0 0))
     )
   )
 
-  (module tomu-fpga:Texas_X2SON-4_1x1mm_P0.65mm (layer B.Cu) (tedit 5BE17BE6) (tstamp 5BE174E2)
+  (module tomu-fpga:Texas_X2SON-4_1x1mm_P0.65mm (layer B.Cu) (tedit 5BED15FC) (tstamp 5BE174E2)
     (at 18.9 25.2 180)
     (descr "X2SON 5 pin 1x1mm package (Reference Datasheet: http://www.ti.com/lit/ds/sbvs193d/sbvs193d.pdf Reference part: TPS383x) [StepUp generated footprint]")
     (tags X2SON)
@@ -1758,47 +1871,73 @@
     (fp_text value LDO-X2SON-1.2V (at 0 -1.5 180) (layer B.Fab)
       (effects (font (size 0.1 0.1) (thickness 0.025)) (justify mirror))
     )
+    (fp_line (start -0.5 -0.63) (end 0.5 -0.63) (layer B.SilkS) (width 0.12))
+    (fp_line (start -0.66 0.63) (end 0.5 0.63) (layer B.SilkS) (width 0.12))
+    (fp_line (start -0.91 -0.75) (end -0.91 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 0.91 -0.75) (end -0.91 -0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 0.91 0.75) (end 0.91 -0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -0.91 0.75) (end 0.91 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 0.5 0.5) (end 0.5 -0.5) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.25 0.5) (end 0.5 0.5) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.5 0.25) (end -0.25 0.5) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.5 -0.5) (end -0.5 0.25) (layer B.Fab) (width 0.1))
+    (fp_line (start 0.5 -0.5) (end -0.5 -0.5) (layer B.Fab) (width 0.1))
     (fp_text user %R (at 0 0 180) (layer B.Fab)
       (effects (font (size 0.2 0.2) (thickness 0.04)) (justify mirror))
     )
-    (fp_line (start 0.5 -0.5) (end -0.5 -0.5) (layer B.Fab) (width 0.1))
-    (fp_line (start -0.5 -0.5) (end -0.5 0.25) (layer B.Fab) (width 0.1))
-    (fp_line (start -0.5 0.25) (end -0.25 0.5) (layer B.Fab) (width 0.1))
-    (fp_line (start -0.25 0.5) (end 0.5 0.5) (layer B.Fab) (width 0.1))
-    (fp_line (start 0.5 0.5) (end 0.5 -0.5) (layer B.Fab) (width 0.1))
-    (fp_line (start -0.91 0.75) (end 0.91 0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 0.91 0.75) (end 0.91 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 0.91 -0.75) (end -0.91 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -0.91 -0.75) (end -0.91 0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -0.66 0.63) (end 0.5 0.63) (layer B.SilkS) (width 0.12))
-    (fp_line (start -0.5 -0.63) (end 0.5 -0.63) (layer B.SilkS) (width 0.12))
-    (pad "" smd custom (at -0.43 0.325 180) (size 0.148492 0.148492) (layers B.Mask)
+    (pad 5 smd rect (at 0 0 135) (size 0.58 0.58) (layers B.Cu B.Paste B.Mask)
+      (net 1 GND) (solder_mask_margin -0.05) (solder_paste_margin -0.065) (solder_paste_margin_ratio -0.00000001))
+    (pad "" smd custom (at -0.43 -0.325 180) (size 0.148492 0.148492) (layers B.Paste)
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_poly (pts
-           (xy 0.18 0.105) (xy 0.18 0.075) (xy 0 -0.105) (xy 0.18 0.075) (xy 0 -0.105)
-           (xy -0.18 -0.105) (xy -0.18 0.105)) (width 0))
+           (xy 0.18 -0.075) (xy 0.18 -0.105) (xy -0.22 -0.105) (xy -0.22 0.105) (xy 0 0.105)
+) (width 0))
       ))
-    (pad "" smd custom (at 0.43 0.325 180) (size 0.148492 0.148492) (layers B.Mask)
+    (pad "" smd custom (at 0.43 -0.325 180) (size 0.148492 0.148492) (layers B.Paste)
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_poly (pts
-           (xy -0.18 0.105) (xy -0.18 0.075) (xy 0 -0.105) (xy -0.18 0.075) (xy 0 -0.105)
-           (xy 0.18 -0.105) (xy 0.18 0.105)) (width 0))
+           (xy 0 0.105) (xy -0.18 -0.075) (xy -0.18 -0.105) (xy 0.22 -0.105) (xy 0.22 0.105)
+) (width 0))
       ))
-    (pad "" smd custom (at 0.43 -0.325 180) (size 0.148492 0.148492) (layers B.Mask)
+    (pad "" smd custom (at 0.43 0.325 180) (size 0.148492 0.148492) (layers B.Paste)
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_poly (pts
-           (xy -0.18 -0.105) (xy -0.18 -0.075) (xy 0 0.105) (xy -0.18 -0.075) (xy 0 0.105)
-           (xy 0.18 0.105) (xy 0.18 -0.105)) (width 0))
+           (xy 0.22 0.105) (xy 0.22 -0.105) (xy 0 -0.105) (xy -0.18 0.075) (xy -0.18 0.105)
+) (width 0))
       ))
-    (pad "" smd custom (at -0.43 -0.325 180) (size 0.148492 0.148492) (layers B.Mask)
+    (pad "" smd custom (at -0.43 0.325 180) (size 0.148492 0.148492) (layers B.Paste)
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_poly (pts
-           (xy 0.18 -0.105) (xy 0.18 -0.075) (xy 0 0.105) (xy 0.18 -0.075) (xy 0 0.105)
-           (xy -0.18 0.105) (xy -0.18 -0.105)) (width 0))
+           (xy 0 -0.105) (xy 0.18 0.075) (xy 0.18 0.105) (xy -0.22 0.105) (xy -0.22 -0.105)
+) (width 0))
+      ))
+    (pad 2 smd custom (at -0.43 -0.325 180) (size 0.148492 0.148492) (layers B.Cu)
+      (net 1 GND) (zone_connect 2)
+      (options (clearance outline) (anchor circle))
+      (primitives
+        (gr_poly (pts
+           (xy 0.23 -0.054289) (xy 0.23 -0.155) (xy -0.23 -0.155) (xy -0.23 0.155) (xy 0.020711 0.155)
+) (width 0))
+      ))
+    (pad 3 smd custom (at 0.43 -0.325 180) (size 0.148492 0.148492) (layers B.Cu)
+      (net 12 +5V) (zone_connect 2)
+      (options (clearance outline) (anchor circle))
+      (primitives
+        (gr_poly (pts
+           (xy 0.23 -0.155) (xy 0.23 0.155) (xy -0.020711 0.155) (xy -0.23 -0.054289) (xy -0.23 -0.155)
+) (width 0))
+      ))
+    (pad 4 smd custom (at 0.43 0.325 180) (size 0.148492 0.148492) (layers B.Cu)
+      (net 12 +5V) (zone_connect 2)
+      (options (clearance outline) (anchor circle))
+      (primitives
+        (gr_poly (pts
+           (xy -0.23 0.155) (xy 0.23 0.155) (xy 0.23 -0.155) (xy -0.020711 -0.155) (xy -0.23 0.054289)
+) (width 0))
       ))
     (pad 1 smd custom (at -0.43 0.325 180) (size 0.148492 0.148492) (layers B.Cu)
       (net 16 /VCCPLL) (zone_connect 2)
@@ -1808,111 +1947,12 @@
            (xy 0.23 0.155) (xy -0.23 0.155) (xy -0.23 -0.155) (xy 0.020711 -0.155) (xy 0.23 0.054289)
 ) (width 0))
       ))
-    (pad 4 smd custom (at 0.43 0.325 180) (size 0.148492 0.148492) (layers B.Cu)
-      (net 12 +5V) (zone_connect 2)
+    (pad "" smd custom (at -0.43 -0.325 180) (size 0.148492 0.148492) (layers B.Mask)
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_poly (pts
-           (xy -0.23 0.155) (xy 0.23 0.155) (xy 0.23 -0.155) (xy -0.020711 -0.155) (xy -0.23 0.054289)
-) (width 0))
-      ))
-    (pad 3 smd custom (at 0.43 -0.325 180) (size 0.148492 0.148492) (layers B.Cu)
-      (net 12 +5V) (zone_connect 2)
-      (options (clearance outline) (anchor circle))
-      (primitives
-        (gr_poly (pts
-           (xy 0.23 -0.155) (xy 0.23 0.155) (xy -0.020711 0.155) (xy -0.23 -0.054289) (xy -0.23 -0.155)
-) (width 0))
-      ))
-    (pad 2 smd custom (at -0.43 -0.325 180) (size 0.148492 0.148492) (layers B.Cu)
-      (net 1 GND) (zone_connect 2)
-      (options (clearance outline) (anchor circle))
-      (primitives
-        (gr_poly (pts
-           (xy 0.23 -0.054289) (xy 0.23 -0.155) (xy -0.23 -0.155) (xy -0.23 0.155) (xy 0.020711 0.155)
-) (width 0))
-      ))
-    (pad "" smd custom (at -0.43 0.325 180) (size 0.148492 0.148492) (layers B.Paste)
-      (options (clearance outline) (anchor circle))
-      (primitives
-        (gr_poly (pts
-           (xy 0 -0.105) (xy 0.18 0.075) (xy 0.18 0.105) (xy -0.22 0.105) (xy -0.22 -0.105)
-) (width 0))
-      ))
-    (pad "" smd custom (at 0.43 0.325 180) (size 0.148492 0.148492) (layers B.Paste)
-      (options (clearance outline) (anchor circle))
-      (primitives
-        (gr_poly (pts
-           (xy 0.22 0.105) (xy 0.22 -0.105) (xy 0 -0.105) (xy -0.18 0.075) (xy -0.18 0.105)
-) (width 0))
-      ))
-    (pad "" smd custom (at 0.43 -0.325 180) (size 0.148492 0.148492) (layers B.Paste)
-      (options (clearance outline) (anchor circle))
-      (primitives
-        (gr_poly (pts
-           (xy 0 0.105) (xy -0.18 -0.075) (xy -0.18 -0.105) (xy 0.22 -0.105) (xy 0.22 0.105)
-) (width 0))
-      ))
-    (pad "" smd custom (at -0.43 -0.325 180) (size 0.148492 0.148492) (layers B.Paste)
-      (options (clearance outline) (anchor circle))
-      (primitives
-        (gr_poly (pts
-           (xy 0.18 -0.075) (xy 0.18 -0.105) (xy -0.22 -0.105) (xy -0.22 0.105) (xy 0 0.105)
-) (width 0))
-      ))
-    (pad 5 smd rect (at 0 0 135) (size 0.58 0.58) (layers B.Cu B.Paste B.Mask)
-      (net 1 GND) (solder_mask_margin -0.05) (solder_paste_margin -0.065) (solder_paste_margin_ratio -0.00000001))
-    (model ${KISYS3DMOD}/Package_SON.3dshapes/Texas_X2SON-4_1x1mm_P0.65mm.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-    (model ${KISYS3DMOD}/Housings_SON.3dshapes/Texas_S-PVSON-N8.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 0.3 0.3 0.2))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module tomu-fpga:Texas_X2SON-4_1x1mm_P0.65mm (layer B.Cu) (tedit 5BE17BE6) (tstamp 5BE174C5)
-    (at 19 19.7 180)
-    (descr "X2SON 5 pin 1x1mm package (Reference Datasheet: http://www.ti.com/lit/ds/sbvs193d/sbvs193d.pdf Reference part: TPS383x) [StepUp generated footprint]")
-    (tags X2SON)
-    (path /5BFAB7F1)
-    (attr smd)
-    (fp_text reference U3 (at 0 1.5 180) (layer B.SilkS) hide
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_text value LDO-X2SON-2.5V (at 0 -1.5 180) (layer B.Fab)
-      (effects (font (size 0.1 0.1) (thickness 0.025)) (justify mirror))
-    )
-    (fp_text user %R (at 0 0 180) (layer B.Fab)
-      (effects (font (size 0.2 0.2) (thickness 0.04)) (justify mirror))
-    )
-    (fp_line (start 0.5 -0.5) (end -0.5 -0.5) (layer B.Fab) (width 0.1))
-    (fp_line (start -0.5 -0.5) (end -0.5 0.25) (layer B.Fab) (width 0.1))
-    (fp_line (start -0.5 0.25) (end -0.25 0.5) (layer B.Fab) (width 0.1))
-    (fp_line (start -0.25 0.5) (end 0.5 0.5) (layer B.Fab) (width 0.1))
-    (fp_line (start 0.5 0.5) (end 0.5 -0.5) (layer B.Fab) (width 0.1))
-    (fp_line (start -0.91 0.75) (end 0.91 0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 0.91 0.75) (end 0.91 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 0.91 -0.75) (end -0.91 -0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -0.91 -0.75) (end -0.91 0.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -0.66 0.63) (end 0.5 0.63) (layer B.SilkS) (width 0.12))
-    (fp_line (start -0.5 -0.63) (end 0.5 -0.63) (layer B.SilkS) (width 0.12))
-    (pad "" smd custom (at -0.43 0.325 180) (size 0.148492 0.148492) (layers B.Mask)
-      (options (clearance outline) (anchor circle))
-      (primitives
-        (gr_poly (pts
-           (xy 0.18 0.105) (xy 0.18 0.075) (xy 0 -0.105) (xy 0.18 0.075) (xy 0 -0.105)
-           (xy -0.18 -0.105) (xy -0.18 0.105)) (width 0))
-      ))
-    (pad "" smd custom (at 0.43 0.325 180) (size 0.148492 0.148492) (layers B.Mask)
-      (options (clearance outline) (anchor circle))
-      (primitives
-        (gr_poly (pts
-           (xy -0.18 0.105) (xy -0.18 0.075) (xy 0 -0.105) (xy -0.18 0.075) (xy 0 -0.105)
-           (xy 0.18 -0.105) (xy 0.18 0.105)) (width 0))
+           (xy 0.18 -0.105) (xy 0.18 -0.075) (xy 0 0.105) (xy 0.18 -0.075) (xy 0 0.105)
+           (xy -0.18 0.105) (xy -0.18 -0.105)) (width 0))
       ))
     (pad "" smd custom (at 0.43 -0.325 180) (size 0.148492 0.148492) (layers B.Mask)
       (options (clearance outline) (anchor circle))
@@ -1921,83 +1961,23 @@
            (xy -0.18 -0.105) (xy -0.18 -0.075) (xy 0 0.105) (xy -0.18 -0.075) (xy 0 0.105)
            (xy 0.18 0.105) (xy 0.18 -0.105)) (width 0))
       ))
-    (pad "" smd custom (at -0.43 -0.325 180) (size 0.148492 0.148492) (layers B.Mask)
+    (pad "" smd custom (at 0.43 0.325 180) (size 0.148492 0.148492) (layers B.Mask)
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_poly (pts
-           (xy 0.18 -0.105) (xy 0.18 -0.075) (xy 0 0.105) (xy 0.18 -0.075) (xy 0 0.105)
-           (xy -0.18 0.105) (xy -0.18 -0.105)) (width 0))
+           (xy -0.18 0.105) (xy -0.18 0.075) (xy 0 -0.105) (xy -0.18 0.075) (xy 0 -0.105)
+           (xy 0.18 -0.105) (xy 0.18 0.105)) (width 0))
       ))
-    (pad 1 smd custom (at -0.43 0.325 180) (size 0.148492 0.148492) (layers B.Cu)
-      (net 20 +2V5) (zone_connect 2)
+    (pad "" smd custom (at -0.43 0.325 180) (size 0.148492 0.148492) (layers B.Mask)
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_poly (pts
-           (xy 0.23 0.155) (xy -0.23 0.155) (xy -0.23 -0.155) (xy 0.020711 -0.155) (xy 0.23 0.054289)
-) (width 0))
+           (xy 0.18 0.105) (xy 0.18 0.075) (xy 0 -0.105) (xy 0.18 0.075) (xy 0 -0.105)
+           (xy -0.18 -0.105) (xy -0.18 0.105)) (width 0))
       ))
-    (pad 4 smd custom (at 0.43 0.325 180) (size 0.148492 0.148492) (layers B.Cu)
-      (net 12 +5V) (zone_connect 2)
-      (options (clearance outline) (anchor circle))
-      (primitives
-        (gr_poly (pts
-           (xy -0.23 0.155) (xy 0.23 0.155) (xy 0.23 -0.155) (xy -0.020711 -0.155) (xy -0.23 0.054289)
-) (width 0))
-      ))
-    (pad 3 smd custom (at 0.43 -0.325 180) (size 0.148492 0.148492) (layers B.Cu)
-      (net 2 +3V3) (zone_connect 2)
-      (options (clearance outline) (anchor circle))
-      (primitives
-        (gr_poly (pts
-           (xy 0.23 -0.155) (xy 0.23 0.155) (xy -0.020711 0.155) (xy -0.23 -0.054289) (xy -0.23 -0.155)
-) (width 0))
-      ))
-    (pad 2 smd custom (at -0.43 -0.325 180) (size 0.148492 0.148492) (layers B.Cu)
-      (net 1 GND) (zone_connect 2)
-      (options (clearance outline) (anchor circle))
-      (primitives
-        (gr_poly (pts
-           (xy 0.23 -0.054289) (xy 0.23 -0.155) (xy -0.23 -0.155) (xy -0.23 0.155) (xy 0.020711 0.155)
-) (width 0))
-      ))
-    (pad "" smd custom (at -0.43 0.325 180) (size 0.148492 0.148492) (layers B.Paste)
-      (options (clearance outline) (anchor circle))
-      (primitives
-        (gr_poly (pts
-           (xy 0 -0.105) (xy 0.18 0.075) (xy 0.18 0.105) (xy -0.22 0.105) (xy -0.22 -0.105)
-) (width 0))
-      ))
-    (pad "" smd custom (at 0.43 0.325 180) (size 0.148492 0.148492) (layers B.Paste)
-      (options (clearance outline) (anchor circle))
-      (primitives
-        (gr_poly (pts
-           (xy 0.22 0.105) (xy 0.22 -0.105) (xy 0 -0.105) (xy -0.18 0.075) (xy -0.18 0.105)
-) (width 0))
-      ))
-    (pad "" smd custom (at 0.43 -0.325 180) (size 0.148492 0.148492) (layers B.Paste)
-      (options (clearance outline) (anchor circle))
-      (primitives
-        (gr_poly (pts
-           (xy 0 0.105) (xy -0.18 -0.075) (xy -0.18 -0.105) (xy 0.22 -0.105) (xy 0.22 0.105)
-) (width 0))
-      ))
-    (pad "" smd custom (at -0.43 -0.325 180) (size 0.148492 0.148492) (layers B.Paste)
-      (options (clearance outline) (anchor circle))
-      (primitives
-        (gr_poly (pts
-           (xy 0.18 -0.075) (xy 0.18 -0.105) (xy -0.22 -0.105) (xy -0.22 0.105) (xy 0 0.105)
-) (width 0))
-      ))
-    (pad 5 smd rect (at 0 0 135) (size 0.58 0.58) (layers B.Cu B.Paste B.Mask)
-      (net 1 GND) (solder_mask_margin -0.05) (solder_paste_margin -0.065) (solder_paste_margin_ratio -0.00000001))
-    (model ${KISYS3DMOD}/Package_SON.3dshapes/Texas_X2SON-4_1x1mm_P0.65mm.wrl
+    (model ${KIPRJMOD}/tomu-fpga.pretty/Texas_S-PVSON-N8.step
       (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-    (model ${KISYS3DMOD}/Housings_SON.3dshapes/Texas_S-PVSON-N8.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 0.3 0.3 0.2))
+      (scale (xyz 0.3 0.3 0.3))
       (rotate (xyz 0 0 0))
     )
   )
@@ -2139,7 +2119,7 @@
       (net 1 GND))
     (pad 3 smd rect (at 0.925 -0.725 90) (size 0.9 0.8) (layers B.Cu B.Paste B.Mask)
       (net 14 /OSC_IN))
-    (model ${KISYS3DMOD}/Oscillators.3dshapes/Oscillator_SMD_TCXO_G158.wrl
+    (model ${KIPRJMOD}/tomu-fpga.pretty/Oscillator_SMD_TCXO_G158.wrl
       (at (xyz 0 0 0))
       (scale (xyz 0.11 0.18 0.1))
       (rotate (xyz 0 0 0))