diff --git a/hardware/pcb/tomu-fpga.pretty/PinHeader_2x20_P2.54mm_Vertical.kicad_mod b/hardware/pcb/tomu-fpga.pretty/PinHeader_2x20_P2.54mm_Vertical.kicad_mod
index b5041bf..f5e9bbd 100644
--- a/hardware/pcb/tomu-fpga.pretty/PinHeader_2x20_P2.54mm_Vertical.kicad_mod
+++ b/hardware/pcb/tomu-fpga.pretty/PinHeader_2x20_P2.54mm_Vertical.kicad_mod
@@ -1,4 +1,4 @@
-(module PinHeader_2x20_P2.54mm_Vertical (layer F.Cu) (tedit 59FED5CC)
+(module PinHeader_2x20_P2.54mm_Vertical (layer F.Cu) (tedit 5BEA3907)
   (descr "Through hole straight pin header, 2x20, 2.54mm pitch, double rows")
   (tags "Through hole pin header THT 2x20 2.54mm double row")
   (fp_text reference REF** (at 1.27 -2.33) (layer F.SilkS)
@@ -24,52 +24,47 @@
   (fp_line (start -1.8 50.05) (end 4.35 50.05) (layer F.CrtYd) (width 0.05))
   (fp_line (start 4.35 50.05) (end 4.35 -1.8) (layer F.CrtYd) (width 0.05))
   (fp_line (start 4.35 -1.8) (end -1.8 -1.8) (layer F.CrtYd) (width 0.05))
-  (pad 1 thru_hole rect (at 0 0) (size 1.7 1.7) (drill 1.0) (layers *.Cu *.Mask))
-  (pad 2 thru_hole oval (at 2.54 0) (size 1.7 1.7) (drill 1.0) (layers *.Cu *.Mask))
-  (pad 3 thru_hole oval (at 0 2.54) (size 1.7 1.7) (drill 1.0) (layers *.Cu *.Mask))
-  (pad 4 thru_hole oval (at 2.54 2.54) (size 1.7 1.7) (drill 1.0) (layers *.Cu *.Mask))
-  (pad 5 thru_hole oval (at 0 5.08) (size 1.7 1.7) (drill 1.0) (layers *.Cu *.Mask))
-  (pad 6 thru_hole oval (at 2.54 5.08) (size 1.7 1.7) (drill 1.0) (layers *.Cu *.Mask))
-  (pad 7 thru_hole oval (at 0 7.62) (size 1.7 1.7) (drill 1.0) (layers *.Cu *.Mask))
-  (pad 8 thru_hole oval (at 2.54 7.62) (size 1.7 1.7) (drill 1.0) (layers *.Cu *.Mask))
-  (pad 9 thru_hole oval (at 0 10.16) (size 1.7 1.7) (drill 1.0) (layers *.Cu *.Mask))
-  (pad 10 thru_hole oval (at 2.54 10.16) (size 1.7 1.7) (drill 1.0) (layers *.Cu *.Mask))
-  (pad 11 thru_hole oval (at 0 12.7) (size 1.7 1.7) (drill 1.0) (layers *.Cu *.Mask))
-  (pad 12 thru_hole oval (at 2.54 12.7) (size 1.7 1.7) (drill 1.0) (layers *.Cu *.Mask))
-  (pad 13 thru_hole oval (at 0 15.24) (size 1.7 1.7) (drill 1.0) (layers *.Cu *.Mask))
-  (pad 14 thru_hole oval (at 2.54 15.24) (size 1.7 1.7) (drill 1.0) (layers *.Cu *.Mask))
-  (pad 15 thru_hole oval (at 0 17.78) (size 1.7 1.7) (drill 1.0) (layers *.Cu *.Mask))
-  (pad 16 thru_hole oval (at 2.54 17.78) (size 1.7 1.7) (drill 1.0) (layers *.Cu *.Mask))
-  (pad 17 thru_hole oval (at 0 20.32) (size 1.7 1.7) (drill 1.0) (layers *.Cu *.Mask))
-  (pad 18 thru_hole oval (at 2.54 20.32) (size 1.7 1.7) (drill 1.0) (layers *.Cu *.Mask))
-  (pad 19 thru_hole oval (at 0 22.86) (size 1.7 1.7) (drill 1.0) (layers *.Cu *.Mask))
-  (pad 20 thru_hole oval (at 2.54 22.86) (size 1.7 1.7) (drill 1.0) (layers *.Cu *.Mask))
-  (pad 21 thru_hole oval (at 0 25.4) (size 1.7 1.7) (drill 1.0) (layers *.Cu *.Mask))
-  (pad 22 thru_hole oval (at 2.54 25.4) (size 1.7 1.7) (drill 1.0) (layers *.Cu *.Mask))
-  (pad 23 thru_hole oval (at 0 27.94) (size 1.7 1.7) (drill 1.0) (layers *.Cu *.Mask))
-  (pad 24 thru_hole oval (at 2.54 27.94) (size 1.7 1.7) (drill 1.0) (layers *.Cu *.Mask))
-  (pad 25 thru_hole oval (at 0 30.48) (size 1.7 1.7) (drill 1.0) (layers *.Cu *.Mask))
-  (pad 26 thru_hole oval (at 2.54 30.48) (size 1.7 1.7) (drill 1.0) (layers *.Cu *.Mask))
-  (pad 27 thru_hole oval (at 0 33.02) (size 1.7 1.7) (drill 1.0) (layers *.Cu *.Mask))
-  (pad 28 thru_hole oval (at 2.54 33.02) (size 1.7 1.7) (drill 1.0) (layers *.Cu *.Mask))
-  (pad 29 thru_hole oval (at 0 35.56) (size 1.7 1.7) (drill 1.0) (layers *.Cu *.Mask))
-  (pad 30 thru_hole oval (at 2.54 35.56) (size 1.7 1.7) (drill 1.0) (layers *.Cu *.Mask))
-  (pad 31 thru_hole oval (at 0 38.1) (size 1.7 1.7) (drill 1.0) (layers *.Cu *.Mask))
-  (pad 32 thru_hole oval (at 2.54 38.1) (size 1.7 1.7) (drill 1.0) (layers *.Cu *.Mask))
-  (pad 33 thru_hole oval (at 0 40.64) (size 1.7 1.7) (drill 1.0) (layers *.Cu *.Mask))
-  (pad 34 thru_hole oval (at 2.54 40.64) (size 1.7 1.7) (drill 1.0) (layers *.Cu *.Mask))
-  (pad 35 thru_hole oval (at 0 43.18) (size 1.7 1.7) (drill 1.0) (layers *.Cu *.Mask))
-  (pad 36 thru_hole oval (at 2.54 43.18) (size 1.7 1.7) (drill 1.0) (layers *.Cu *.Mask))
-  (pad 37 thru_hole oval (at 0 45.72) (size 1.7 1.7) (drill 1.0) (layers *.Cu *.Mask))
-  (pad 38 thru_hole oval (at 2.54 45.72) (size 1.7 1.7) (drill 1.0) (layers *.Cu *.Mask))
-  (pad 39 thru_hole oval (at 0 48.26) (size 1.7 1.7) (drill 1.0) (layers *.Cu *.Mask))
-  (pad 40 thru_hole oval (at 2.54 48.26) (size 1.7 1.7) (drill 1.0) (layers *.Cu *.Mask))
   (fp_text user %R (at 1.27 24.13 90) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (model ${KISYS3DMOD}/Connector_PinHeader_2.54mm.3dshapes/PinHeader_2x20_P2.54mm_Vertical.wrl
-    (at (xyz 0 0 0))
-    (scale (xyz 1 1 1))
-    (rotate (xyz 0 0 0))
-  )
-)
\ No newline at end of file
+  (pad 1 thru_hole rect (at 0 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 2 thru_hole oval (at 2.54 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 3 thru_hole oval (at 0 2.54) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 4 thru_hole oval (at 2.54 2.54) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 5 thru_hole oval (at 0 5.08) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 6 thru_hole oval (at 2.54 5.08) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 7 thru_hole oval (at 0 7.62) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 8 thru_hole oval (at 2.54 7.62) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 9 thru_hole oval (at 0 10.16) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 10 thru_hole oval (at 2.54 10.16) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 11 thru_hole oval (at 0 12.7) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 12 thru_hole oval (at 2.54 12.7) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 13 thru_hole oval (at 0 15.24) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 14 thru_hole oval (at 2.54 15.24) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 15 thru_hole oval (at 0 17.78) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 16 thru_hole oval (at 2.54 17.78) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 17 thru_hole oval (at 0 20.32) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 18 thru_hole oval (at 2.54 20.32) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 19 thru_hole oval (at 0 22.86) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 20 thru_hole oval (at 2.54 22.86) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 21 thru_hole oval (at 0 25.4) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 22 thru_hole oval (at 2.54 25.4) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 23 thru_hole oval (at 0 27.94) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 24 thru_hole oval (at 2.54 27.94) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 25 thru_hole oval (at 0 30.48) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 26 thru_hole oval (at 2.54 30.48) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 27 thru_hole oval (at 0 33.02) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 28 thru_hole oval (at 2.54 33.02) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 29 thru_hole oval (at 0 35.56) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 30 thru_hole oval (at 2.54 35.56) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 31 thru_hole oval (at 0 38.1) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 32 thru_hole oval (at 2.54 38.1) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 33 thru_hole oval (at 0 40.64) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 34 thru_hole oval (at 2.54 40.64) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 35 thru_hole oval (at 0 43.18) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 36 thru_hole oval (at 2.54 43.18) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 37 thru_hole oval (at 0 45.72) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 38 thru_hole oval (at 2.54 45.72) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 39 thru_hole oval (at 0 48.26) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 40 thru_hole oval (at 2.54 48.26) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+)
diff --git a/hardware/pcb/tomu-fpga.pretty/Pin_Header_Straight_1x06_Pitch2.54mm.kicad_mod b/hardware/pcb/tomu-fpga.pretty/Pin_Header_Straight_1x06_Pitch2.54mm.kicad_mod
index bf6d4a3..d082e82 100644
--- a/hardware/pcb/tomu-fpga.pretty/Pin_Header_Straight_1x06_Pitch2.54mm.kicad_mod
+++ b/hardware/pcb/tomu-fpga.pretty/Pin_Header_Straight_1x06_Pitch2.54mm.kicad_mod
@@ -1,4 +1,4 @@
-(module Pin_Header_Straight_1x06_Pitch2.54mm (layer F.Cu) (tedit 59650532)
+(module Pin_Header_Straight_1x06_Pitch2.54mm (layer F.Cu) (tedit 5BEA3925)
   (descr "Through hole straight pin header, 1x06, 2.54mm pitch, single row")
   (tags "Through hole pin header THT 1x06 2.54mm single row")
   (fp_text reference REF** (at 0 -2.33) (layer F.SilkS)
@@ -22,18 +22,13 @@
   (fp_line (start -1.8 14.5) (end 1.8 14.5) (layer F.CrtYd) (width 0.05))
   (fp_line (start 1.8 14.5) (end 1.8 -1.8) (layer F.CrtYd) (width 0.05))
   (fp_line (start 1.8 -1.8) (end -1.8 -1.8) (layer F.CrtYd) (width 0.05))
-  (pad 1 thru_hole rect (at 0 0) (size 1.7 1.7) (drill 1.0) (layers *.Cu *.Mask))
-  (pad 2 thru_hole oval (at 0 2.54) (size 1.7 1.7) (drill 1.0) (layers *.Cu *.Mask))
-  (pad 3 thru_hole oval (at 0 5.08) (size 1.7 1.7) (drill 1.0) (layers *.Cu *.Mask))
-  (pad 4 thru_hole oval (at 0 7.62) (size 1.7 1.7) (drill 1.0) (layers *.Cu *.Mask))
-  (pad 5 thru_hole oval (at 0 10.16) (size 1.7 1.7) (drill 1.0) (layers *.Cu *.Mask))
-  (pad 6 thru_hole oval (at 0 12.7) (size 1.7 1.7) (drill 1.0) (layers *.Cu *.Mask))
   (fp_text user %R (at 0 6.35 90) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (model ${KISYS3DMOD}/Pin_Headers.3dshapes/Pin_Header_Straight_1x06_Pitch2.54mm.wrl
-    (at (xyz 0 0 0))
-    (scale (xyz 1 1 1))
-    (rotate (xyz 0 0 0))
-  )
-)
\ No newline at end of file
+  (pad 1 thru_hole rect (at 0 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 2 thru_hole oval (at 0 2.54) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 3 thru_hole oval (at 0 5.08) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 4 thru_hole oval (at 0 7.62) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 5 thru_hole oval (at 0 10.16) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+  (pad 6 thru_hole oval (at 0 12.7) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask))
+)