diff --git a/hardware/common/unikbd.pretty/Futaba_2u_Cherry_aligner.kicad_mod b/hardware/common/unikbd.pretty/Futaba_2u_Cherry_aligner.kicad_mod
index fd523da..80a7723 100644
--- a/hardware/common/unikbd.pretty/Futaba_2u_Cherry_aligner.kicad_mod
+++ b/hardware/common/unikbd.pretty/Futaba_2u_Cherry_aligner.kicad_mod
@@ -1,4 +1,4 @@
-(module Futaba_2u_Cherry_aligner (layer F.Cu) (tedit 5F24D769)
+(module Futaba_2u_Cherry_aligner (layer F.Cu) (tedit 5F37FAE4)
   (fp_text reference REF** (at 0 0.4746) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
   )
@@ -11,14 +11,14 @@
   (fp_line (start -8.6106 -7.0612) (end -8.6106 -1.9812) (layer Edge.Cuts) (width 0.12))
   (fp_circle (center 0 -0.0508) (end 7.8232 -0.0508) (layer Edge.Cuts) (width 0.12))
   (fp_line (start -18.8468 -7.0612) (end -8.6106 -7.0612) (layer Edge.Cuts) (width 0.12))
-  (fp_line (start -18.8468 1.8288) (end -18.8468 6.9088) (layer Edge.Cuts) (width 0.12))
+  (fp_line (start -18.8468 1.8796) (end -18.8468 6.9596) (layer Edge.Cuts) (width 0.12))
   (fp_line (start -18.8468 -1.9812) (end -8.6106 -1.9812) (layer Edge.Cuts) (width 0.12))
   (fp_line (start -18.8468 1.8796) (end -8.6106 1.8796) (layer Edge.Cuts) (width 0.12))
   (fp_line (start -18.8468 -7.0612) (end -18.8468 -1.9812) (layer Edge.Cuts) (width 0.12))
   (fp_line (start -18.8468 6.9596) (end -8.6106 6.9596) (layer Edge.Cuts) (width 0.12))
   (fp_line (start 8.6106 -7.0612) (end 19.0246 -7.0612) (layer Edge.Cuts) (width 0.12))
   (fp_line (start 19.0246 -7.0612) (end 19.0246 -1.9812) (layer Edge.Cuts) (width 0.12))
-  (fp_line (start 19.0246 1.8288) (end 19.0246 6.9088) (layer Edge.Cuts) (width 0.12))
+  (fp_line (start 19.0246 1.8796) (end 19.0246 6.9596) (layer Edge.Cuts) (width 0.12))
   (fp_line (start 8.6106 -1.9812) (end 19.0246 -1.9812) (layer Edge.Cuts) (width 0.12))
   (fp_line (start 8.6106 1.8796) (end 19.0246 1.8796) (layer Edge.Cuts) (width 0.12))
   (fp_line (start 8.6106 6.9596) (end 19.0246 6.9596) (layer Edge.Cuts) (width 0.12))
diff --git a/hardware/common/unikbd.pretty/Key_MX.kicad_mod b/hardware/common/unikbd.pretty/Key_MX.kicad_mod
index 2ea7561..6456993 100644
--- a/hardware/common/unikbd.pretty/Key_MX.kicad_mod
+++ b/hardware/common/unikbd.pretty/Key_MX.kicad_mod
@@ -1,24 +1,26 @@
-(module Key_MX (layer F.Cu) (tedit 5F230890)
+(module Key_MX (layer F.Cu) (tedit 5F39E16B)
   (fp_text reference SW_** (at -5.7912 -8.6106) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
   )
   (fp_text value Key_MX (at -5.334 8.6614) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (fp_line (start 1.27 -5.08) (end 0.7366 -4.6736) (layer F.Cu) (width 0.3048))
-  (fp_line (start 1.651 -5.08) (end 1.27 -5.08) (layer F.Cu) (width 0.3048))
-  (fp_line (start -2.54 1.27) (end 0 3.81) (layer F.Cu) (width 0.3048))
-  (fp_line (start -2.54 0) (end -2.54 1.27) (layer F.Cu) (width 0.3048))
-  (fp_line (start -3.81 -2.54) (end -2.54 0) (layer F.Cu) (width 0.3048))
-  (fp_line (start -7.874 -7.874) (end 7.874 -7.874) (layer F.CrtYd) (width 0.12))
-  (fp_line (start 7.874 -7.874) (end 7.874 7.874) (layer F.CrtYd) (width 0.12))
-  (fp_line (start 7.874 7.874) (end -7.874 7.874) (layer F.CrtYd) (width 0.12))
   (fp_line (start -7.874 7.874) (end -7.874 -7.874) (layer F.CrtYd) (width 0.12))
+  (fp_line (start 7.874 7.874) (end -7.874 7.874) (layer F.CrtYd) (width 0.12))
+  (fp_line (start 7.874 -7.874) (end 7.874 7.874) (layer F.CrtYd) (width 0.12))
+  (fp_line (start -7.874 -7.874) (end 7.874 -7.874) (layer F.CrtYd) (width 0.12))
+  (fp_line (start -3.81 -2.54) (end -2.54 0) (layer F.Cu) (width 0.3048))
+  (fp_line (start -2.54 0) (end -2.54 1.27) (layer F.Cu) (width 0.3048))
+  (fp_line (start -2.54 1.27) (end 0 3.81) (layer F.Cu) (width 0.3048))
+  (fp_line (start 1.651 -5.08) (end 1.27 -5.08) (layer F.Cu) (width 0.3048))
+  (fp_line (start 1.27 -5.08) (end 0.7366 -4.6736) (layer F.Cu) (width 0.3048))
   (pad 4 thru_hole circle (at -3.81 -2.5146) (size 2.2352 2.2352) (drill 1.5748) (layers *.Cu *.Mask))
   (pad "" np_thru_hole circle (at 0 0.0254) (size 3.9878 3.9878) (drill 3.9878) (layers *.Cu *.Mask)
     (solder_mask_margin 0.0762))
-  (pad "" np_thru_hole circle (at 5.08 0.0254) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
-  (pad "" np_thru_hole circle (at -5.08 0.0254) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
+  (pad "" np_thru_hole circle (at 5.08 0.0254) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask)
+    (solder_mask_margin 0.0762))
+  (pad "" np_thru_hole circle (at -5.08 0.0254) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask)
+    (solder_mask_margin 0.0762))
   (pad 3 thru_hole circle (at 2.54 -5.0546) (size 2.2352 2.2352) (drill 1.5748) (layers *.Cu *.Mask))
   (pad 1 thru_hole circle (at 0 -4.0513) (size 2.2352 2.2352) (drill 1.397) (layers *.Cu *.Mask))
   (pad 2 thru_hole circle (at 0 3.9497) (size 2.2352 2.2352) (drill 1.397) (layers *.Cu *.Mask))
diff --git a/hardware/common/unikbd.pretty/Key_MX_2u.kicad_mod b/hardware/common/unikbd.pretty/Key_MX_2u.kicad_mod
index 592d86b..1ca1eb5 100644
--- a/hardware/common/unikbd.pretty/Key_MX_2u.kicad_mod
+++ b/hardware/common/unikbd.pretty/Key_MX_2u.kicad_mod
@@ -1,31 +1,33 @@
-(module Key_MX_2u (layer F.Cu) (tedit 5F2308BB)
+(module Key_MX_2u (layer F.Cu) (tedit 5F39E180)
   (fp_text reference REF** (at -5.969 -8.763) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
   )
   (fp_text value Key_MX_2u (at 0 -0.5) (layer F.Fab) hide
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (fp_line (start -3.81 -2.54) (end -2.54 0) (layer F.Cu) (width 0.3048))
-  (fp_line (start -7.874 -7.874) (end 7.874 -7.874) (layer F.CrtYd) (width 0.12))
-  (fp_line (start 7.874 -7.874) (end 7.874 7.874) (layer F.CrtYd) (width 0.12))
-  (fp_line (start 1.651 -5.08) (end 1.27 -5.08) (layer F.Cu) (width 0.3048))
-  (fp_line (start -2.54 1.27) (end 0 3.81) (layer F.Cu) (width 0.3048))
-  (fp_line (start 1.27 -5.08) (end 0.7366 -4.6736) (layer F.Cu) (width 0.3048))
-  (fp_line (start 7.874 7.874) (end -7.874 7.874) (layer F.CrtYd) (width 0.12))
-  (fp_line (start -7.874 7.874) (end -7.874 -7.874) (layer F.CrtYd) (width 0.12))
   (fp_line (start -2.54 0) (end -2.54 1.27) (layer F.Cu) (width 0.3048))
+  (fp_line (start -7.874 7.874) (end -7.874 -7.874) (layer F.CrtYd) (width 0.12))
+  (fp_line (start 7.874 7.874) (end -7.874 7.874) (layer F.CrtYd) (width 0.12))
+  (fp_line (start 1.27 -5.08) (end 0.7366 -4.6736) (layer F.Cu) (width 0.3048))
+  (fp_line (start -2.54 1.27) (end 0 3.81) (layer F.Cu) (width 0.3048))
+  (fp_line (start 1.651 -5.08) (end 1.27 -5.08) (layer F.Cu) (width 0.3048))
+  (fp_line (start 7.874 -7.874) (end 7.874 7.874) (layer F.CrtYd) (width 0.12))
+  (fp_line (start -7.874 -7.874) (end 7.874 -7.874) (layer F.CrtYd) (width 0.12))
+  (fp_line (start -3.81 -2.54) (end -2.54 0) (layer F.Cu) (width 0.3048))
   (pad "" np_thru_hole circle (at 11.938 8.2804) (size 3.9878 3.9878) (drill 3.9878) (layers *.Cu *.Mask))
   (pad "" np_thru_hole circle (at -11.938 -6.9596) (size 3.048 3.048) (drill 3.048) (layers *.Cu *.Mask))
   (pad "" np_thru_hole circle (at -11.938 8.2804) (size 3.9878 3.9878) (drill 3.9878) (layers *.Cu *.Mask))
   (pad "" np_thru_hole circle (at 11.938 -6.9596) (size 3.048 3.048) (drill 3.048) (layers *.Cu *.Mask))
-  (pad "" np_thru_hole circle (at -5.08 0.0254) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
+  (pad "" np_thru_hole circle (at -5.08 0.0254) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask)
+    (solder_mask_margin 0.0762))
   (pad 3 thru_hole circle (at 2.54 -5.0546) (size 2.2352 2.2352) (drill 1.5748) (layers *.Cu *.Mask))
   (pad 1 thru_hole circle (at 0 -4.0513) (size 2.2352 2.2352) (drill 1.397) (layers *.Cu *.Mask))
   (pad 2 thru_hole circle (at 0 3.9497) (size 2.2352 2.2352) (drill 1.397) (layers *.Cu *.Mask))
   (pad 4 thru_hole circle (at -3.81 -2.5146) (size 2.2352 2.2352) (drill 1.5748) (layers *.Cu *.Mask))
   (pad "" np_thru_hole circle (at 0 0.0254) (size 3.9878 3.9878) (drill 3.9878) (layers *.Cu *.Mask)
     (solder_mask_margin 0.0762))
-  (pad "" np_thru_hole circle (at 5.08 0.0254) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
+  (pad "" np_thru_hole circle (at 5.08 0.0254) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask)
+    (solder_mask_margin 0.0762))
   (pad "" np_thru_hole oval (at -11.938 -0.0508) (size 5 2) (drill oval 5 2) (layers *.Cu *.Mask))
   (pad "" np_thru_hole oval (at 11.938 -0.0508) (size 5 2) (drill oval 5 2) (layers *.Cu *.Mask))
 )
diff --git a/hardware/common/unikbd.pretty/Key_MX_LED.kicad_mod b/hardware/common/unikbd.pretty/Key_MX_LED.kicad_mod
index 093f8fd..01b60c4 100644
--- a/hardware/common/unikbd.pretty/Key_MX_LED.kicad_mod
+++ b/hardware/common/unikbd.pretty/Key_MX_LED.kicad_mod
@@ -1,29 +1,31 @@
-(module Key_MX_LED (layer F.Cu) (tedit 5F2308D8)
+(module Key_MX_LED (layer F.Cu) (tedit 5F39E195)
   (fp_text reference SW_** (at -5.7912 -8.6106) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
   )
   (fp_text value Key_MX (at -5.334 8.6614) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (fp_line (start 1.27 -5.08) (end 0.7366 -4.6736) (layer F.Cu) (width 0.3048))
-  (fp_line (start 1.651 -5.08) (end 1.27 -5.08) (layer F.Cu) (width 0.3048))
-  (fp_line (start -2.54 1.27) (end 0 3.81) (layer F.Cu) (width 0.3048))
-  (fp_line (start -2.54 0) (end -2.54 1.27) (layer F.Cu) (width 0.3048))
-  (fp_line (start -3.81 -2.54) (end -2.54 0) (layer F.Cu) (width 0.3048))
-  (fp_line (start -7.874 -7.874) (end 7.874 -7.874) (layer F.CrtYd) (width 0.12))
-  (fp_line (start 7.874 -7.874) (end 7.874 7.874) (layer F.CrtYd) (width 0.12))
-  (fp_line (start 7.874 7.874) (end -7.874 7.874) (layer F.CrtYd) (width 0.12))
-  (fp_line (start -7.874 7.874) (end -7.874 -7.874) (layer F.CrtYd) (width 0.12))
-  (fp_line (start -0.889 7.239) (end 0.635 7.239) (layer F.SilkS) (width 0.1016))
-  (fp_poly (pts (xy 0.127 7.239) (xy -0.381 7.493) (xy -0.381 6.985)) (layer F.SilkS) (width 0.1))
   (fp_line (start 0.127 6.858) (end 0.127 7.62) (layer F.SilkS) (width 0.12))
+  (fp_poly (pts (xy 0.127 7.239) (xy -0.381 7.493) (xy -0.381 6.985)) (layer F.SilkS) (width 0.1))
+  (fp_line (start -0.889 7.239) (end 0.635 7.239) (layer F.SilkS) (width 0.1016))
+  (fp_line (start -7.874 7.874) (end -7.874 -7.874) (layer F.CrtYd) (width 0.12))
+  (fp_line (start 7.874 7.874) (end -7.874 7.874) (layer F.CrtYd) (width 0.12))
+  (fp_line (start 7.874 -7.874) (end 7.874 7.874) (layer F.CrtYd) (width 0.12))
+  (fp_line (start -7.874 -7.874) (end 7.874 -7.874) (layer F.CrtYd) (width 0.12))
+  (fp_line (start -3.81 -2.54) (end -2.54 0) (layer F.Cu) (width 0.3048))
+  (fp_line (start -2.54 0) (end -2.54 1.27) (layer F.Cu) (width 0.3048))
+  (fp_line (start -2.54 1.27) (end 0 3.81) (layer F.Cu) (width 0.3048))
+  (fp_line (start 1.651 -5.08) (end 1.27 -5.08) (layer F.Cu) (width 0.3048))
+  (fp_line (start 1.27 -5.08) (end 0.7366 -4.6736) (layer F.Cu) (width 0.3048))
   (pad 3 thru_hole circle (at -1.27 5.1181) (size 1.27 1.27) (drill 1.0668) (layers *.Cu *.Mask))
   (pad 4 thru_hole circle (at 1.27 5.1181) (size 1.27 1.27) (drill 1.0668) (layers *.Cu *.Mask))
   (pad 2 thru_hole circle (at 0 3.937) (size 1.651 1.651) (drill 1.397) (layers *.Cu *.Mask))
   (pad 1 thru_hole circle (at 0 -4.0513) (size 2.2352 2.2352) (drill 1.397) (layers *.Cu *.Mask))
   (pad 6 thru_hole circle (at 2.54 -5.0546) (size 2.2352 2.2352) (drill 1.5748) (layers *.Cu *.Mask))
-  (pad "" np_thru_hole circle (at -5.08 0.0254) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
-  (pad "" np_thru_hole circle (at 5.08 0.0254) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
+  (pad "" np_thru_hole circle (at -5.08 0.0254) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask)
+    (solder_mask_margin 0.0762))
+  (pad "" np_thru_hole circle (at 5.08 0.0254) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask)
+    (solder_mask_margin 0.0762))
   (pad "" np_thru_hole circle (at 0 0.0254) (size 3.9878 3.9878) (drill 3.9878) (layers *.Cu *.Mask)
     (solder_mask_margin 0.0762))
   (pad 5 thru_hole circle (at -3.81 -2.5146) (size 2.2352 2.2352) (drill 1.5748) (layers *.Cu *.Mask))
diff --git a/hardware/common/unikbd.pretty/Key_MX_Spacebar_5.25.kicad_mod b/hardware/common/unikbd.pretty/Key_MX_Spacebar_5.25.kicad_mod
index 42775c9..90f450e 100644
--- a/hardware/common/unikbd.pretty/Key_MX_Spacebar_5.25.kicad_mod
+++ b/hardware/common/unikbd.pretty/Key_MX_Spacebar_5.25.kicad_mod
@@ -1,24 +1,26 @@
-(module Key_MX_Spacebar_5.25 (layer F.Cu) (tedit 5F2308E8)
+(module Key_MX_Spacebar_5.25 (layer F.Cu) (tedit 5F39E1B9)
   (fp_text reference SW_** (at -5.7912 -8.5852) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
   )
   (fp_text value Key_MX (at -5.334 8.6868) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (fp_line (start -7.874 7.8994) (end -7.874 -7.8486) (layer F.CrtYd) (width 0.12))
-  (fp_line (start 7.874 7.8994) (end -7.874 7.8994) (layer F.CrtYd) (width 0.12))
-  (fp_line (start 7.874 -7.8486) (end 7.874 7.8994) (layer F.CrtYd) (width 0.12))
-  (fp_line (start -7.874 -7.8486) (end 7.874 -7.8486) (layer F.CrtYd) (width 0.12))
-  (fp_line (start -3.81 -2.5146) (end -2.54 0.0254) (layer F.Cu) (width 0.3048))
-  (fp_line (start -2.54 0.0254) (end -2.54 1.2954) (layer F.Cu) (width 0.3048))
-  (fp_line (start -2.54 1.2954) (end 0 3.8354) (layer F.Cu) (width 0.3048))
-  (fp_line (start 1.651 -5.0546) (end 1.27 -5.0546) (layer F.Cu) (width 0.3048))
   (fp_line (start 1.27 -5.0546) (end 0.7366 -4.6482) (layer F.Cu) (width 0.3048))
+  (fp_line (start 1.651 -5.0546) (end 1.27 -5.0546) (layer F.Cu) (width 0.3048))
+  (fp_line (start -2.54 1.2954) (end 0 3.8354) (layer F.Cu) (width 0.3048))
+  (fp_line (start -2.54 0.0254) (end -2.54 1.2954) (layer F.Cu) (width 0.3048))
+  (fp_line (start -3.81 -2.5146) (end -2.54 0.0254) (layer F.Cu) (width 0.3048))
+  (fp_line (start -7.874 -7.8486) (end 7.874 -7.8486) (layer F.CrtYd) (width 0.12))
+  (fp_line (start 7.874 -7.8486) (end 7.874 7.8994) (layer F.CrtYd) (width 0.12))
+  (fp_line (start 7.874 7.8994) (end -7.874 7.8994) (layer F.CrtYd) (width 0.12))
+  (fp_line (start -7.874 7.8994) (end -7.874 -7.8486) (layer F.CrtYd) (width 0.12))
   (pad 4 thru_hole circle (at -3.81 -2.5146) (size 2.2352 2.2352) (drill 1.5748) (layers *.Cu *.Mask))
   (pad "" np_thru_hole circle (at 0 0.0254) (size 3.9878 3.9878) (drill 3.9878) (layers *.Cu *.Mask)
     (solder_mask_margin 0.0762))
-  (pad "" np_thru_hole circle (at 5.08 0.0254) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
-  (pad "" np_thru_hole circle (at -5.08 0.0254) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask))
+  (pad "" np_thru_hole circle (at 5.08 0.0254) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask)
+    (solder_mask_margin 0.0762))
+  (pad "" np_thru_hole circle (at -5.08 0.0254) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu *.Mask)
+    (solder_mask_margin 0.0762))
   (pad 3 thru_hole circle (at 2.54 -5.0546) (size 2.2352 2.2352) (drill 1.5748) (layers *.Cu *.Mask))
   (pad 1 thru_hole circle (at 0 -4.0513) (size 2.2352 2.2352) (drill 1.397) (layers *.Cu *.Mask))
   (pad 2 thru_hole circle (at 0 3.9497) (size 2.2352 2.2352) (drill 1.397) (layers *.Cu *.Mask))