diff --git a/hardware/pcb/tomu-fpga.pretty/USB-B.kicad_mod b/hardware/pcb/tomu-fpga.pretty/USB-B.kicad_mod
index 037ed60..b7d144a 100644
--- a/hardware/pcb/tomu-fpga.pretty/USB-B.kicad_mod
+++ b/hardware/pcb/tomu-fpga.pretty/USB-B.kicad_mod
@@ -1,16 +1,31 @@
-(module USB-B (layer F.Cu) (tedit 5BD93620)
-  (fp_text reference REF** (at 3 2) (layer F.SilkS)
+(module USB-B (layer F.Cu) (tedit 5BDAAD31)
+  (solder_mask_margin 0.000001)
+  (solder_paste_margin 0.000001)
+  (clearance 0.000001)
+  (fp_text reference U9 (at 4.6 -4.7 180) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
   )
   (fp_text value USB-B (at -2 2) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (fp_line (start -5.8 8) (end 5.8 8) (layer F.CrtYd) (width 0.3))
-  (fp_line (start 5.8 8) (end 5.8 -3.8) (layer F.CrtYd) (width 0.3))
-  (fp_line (start 5.8 -3.8) (end -5.8 -3.8) (layer F.CrtYd) (width 0.3))
   (fp_line (start -5.8 -3.8) (end -5.8 8) (layer F.CrtYd) (width 0.3))
-  (pad 1 smd rect (at -3.5 3.5 180) (size 2.75 7.41) (layers F.Cu F.Mask))
-  (pad 4 smd rect (at 3.5 3.5 180) (size 2.75 7.41) (layers F.Cu F.Mask))
-  (pad 2 smd rect (at -1 3 180) (size 1.75 6.41) (layers F.Cu F.Mask))
-  (pad 3 smd rect (at 1 3 180) (size 1.75 6.41) (layers F.Cu F.Mask))
+  (fp_line (start 5.8 -3.8) (end -5.8 -3.8) (layer F.CrtYd) (width 0.3))
+  (fp_line (start 5.8 8) (end 5.8 -3.8) (layer F.CrtYd) (width 0.3))
+  (fp_line (start -5.8 8) (end 5.8 8) (layer F.CrtYd) (width 0.3))
+  (pad 1 smd rect (at -3.5 1.3 180) (size 2.75 9.5) (layers F.Cu F.Mask)
+    (solder_mask_margin 0.000001) (solder_paste_margin 0.000001) (clearance 0.000001) (zone_connect 2) (thermal_width 0.000001) (thermal_gap 0.000001))
+  (pad 4 smd rect (at 3.5 1.3 180) (size 2.75 9.5) (layers F.Cu F.Mask)
+    (solder_mask_margin 0.000001) (solder_paste_margin 0.000001) (clearance 0.000001))
+  (pad 3 smd rect (at 1 3 180) (size 1.75 6.41) (layers F.Cu F.Mask)
+    (solder_mask_margin 0.000001) (solder_paste_margin 0.000001) (clearance 0.000001))
+  (pad 2 smd rect (at -1 3 180) (size 1.75 6.41) (layers F.Cu F.Mask)
+    (solder_mask_margin 0.000001) (solder_paste_margin 0.000001) (clearance 0.000001))
+  (pad 1 smd trapezoid (at -3.5 6.7 180) (size 1.375 1.3) (rect_delta 0 1.374 ) (layers F.Cu F.Mask)
+    (solder_mask_margin 0.000001) (solder_paste_margin 0.000001) (clearance 0.000001) (zone_connect 2) (thermal_width 0.000001) (thermal_gap 0.000001))
+  (pad 1 smd rect (at -2.81 6.7 180) (size 1.375 1.3) (layers F.Cu F.Mask)
+    (solder_mask_margin 0.000001) (solder_paste_margin 0.000001) (clearance 0.000001) (zone_connect 2) (thermal_width 0.000001) (thermal_gap 0.000001))
+  (pad 4 smd rect (at 2.8 6.7 180) (size 1.375 1.3) (layers F.Cu F.Mask)
+    (solder_mask_margin 0.000001) (solder_paste_margin 0.000001) (clearance 0.000001) (zone_connect 2) (thermal_width 0.000001) (thermal_gap 0.000001))
+  (pad 4 smd trapezoid (at 3.5 6.7 180) (size 1.375 1.3) (rect_delta 0 1.374 ) (layers F.Cu F.Mask)
+    (solder_mask_margin 0.000001) (solder_paste_margin 0.000001) (clearance 0.000001) (zone_connect 2) (thermal_width 0.000001) (thermal_gap 0.000001))
 )
diff --git a/hardware/pcb/tomu-fpga.pretty/XTAL-2520.kicad_mod b/hardware/pcb/tomu-fpga.pretty/XTAL-2520.kicad_mod
index 4b73c11..cd8d116 100644
--- a/hardware/pcb/tomu-fpga.pretty/XTAL-2520.kicad_mod
+++ b/hardware/pcb/tomu-fpga.pretty/XTAL-2520.kicad_mod
@@ -1,8 +1,8 @@
-(module XTAL-2520 (layer F.Cu) (tedit 5BD93EB1)
-  (fp_text reference REF** (at -0.1 2.3) (layer F.SilkS)
+(module XTAL-2520 (layer F.Cu) (tedit 5BDA984C)
+  (fp_text reference U7 (at -0.4 1.8) (layer F.SilkS)
     (effects (font (size 0.5 0.5) (thickness 0.1)))
   )
-  (fp_text value XTAL-2520 (at 0 1.7) (layer F.Fab)
+  (fp_text value "Crystal Oscillator" (at 0 1.7) (layer F.Fab)
     (effects (font (size 0.2 0.2) (thickness 0.05)))
   )
   (fp_line (start -1.5 -1.3) (end 1.5 -1.3) (layer F.CrtYd) (width 0.03))
@@ -13,7 +13,7 @@
   (pad 2 smd rect (at 0.925 -0.725 180) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask))
   (pad 1 smd rect (at -0.925 -0.725 180) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask))
   (pad 4 smd rect (at -0.925 0.725 180) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask))
-  (pad "" smd circle (at -1.7 -0.8 180) (size 0.3 0.3) (layers F.SilkS))
+  (pad "" smd circle (at -1.5 -1.3 180) (size 0.3 0.3) (layers F.SilkS))
   (model ${KISYS3DMOD}/Oscillators.3dshapes/Oscillator_SMD_TCXO_G158.wrl
     (at (xyz 0 0 0))
     (scale (xyz 0.11 0.18 0.1))