diff --git a/hardware/dscomm-frame.kicad_pcb b/hardware/dscomm-frame.kicad_pcb
index 54f50af..46b1c92 100644
--- a/hardware/dscomm-frame.kicad_pcb
+++ b/hardware/dscomm-frame.kicad_pcb
@@ -183,194 +183,194 @@
     (uvia_drill 0.1)
   )
 
-  (module MountingHole:MountingHole_3.2mm_M3 (layer F.Cu) (tedit 56D1B4CB) (tstamp 5FFC40C9)
-    (at 201 187.75)
-    (descr "Mounting Hole 3.2mm, no annular, M3")
-    (tags "mounting hole 3.2mm no annular m3")
+  (module Elabdev:MountingHole_1.8mm (layer F.Cu) (tedit 5B924765) (tstamp 5FBCCBDE)
+    (at 201.5 197)
+    (descr "Mounting Hole 1.8mm, no annular")
+    (tags "mounting hole 1.8mm no annular")
     (attr virtual)
     (fp_text reference REF** (at 0 -3.2) (layer F.SilkS) hide
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value MountingHole_3.2mm_M3 (at 0 3.2) (layer F.Fab)
+    (fp_text value MountingHole_1.8mm (at 0 3.2) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_circle (center 0 0) (end 3.45 0) (layer F.CrtYd) (width 0.05))
-    (fp_circle (center 0 0) (end 3.2 0) (layer Cmts.User) (width 0.15))
+    (fp_circle (center 0 0) (end 1.85 0) (layer F.CrtYd) (width 0.05))
+    (fp_circle (center 0 0) (end 1.8 0) (layer Cmts.User) (width 0.15))
     (fp_text user %R (at 0.3 0) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (pad 1 np_thru_hole circle (at 0 0) (size 3.2 3.2) (drill 3.2) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 0 0) (size 1.8 1.8) (drill 1.8) (layers *.Cu *.Mask))
   )
 
-  (module MountingHole:MountingHole_3.2mm_M3 (layer F.Cu) (tedit 56D1B4CB) (tstamp 5FFC40BB)
-    (at 78 187.75)
-    (descr "Mounting Hole 3.2mm, no annular, M3")
-    (tags "mounting hole 3.2mm no annular m3")
+  (module Elabdev:MountingHole_1.8mm (layer F.Cu) (tedit 5B924765) (tstamp 5FBCCBC8)
+    (at 201.5 131.5)
+    (descr "Mounting Hole 1.8mm, no annular")
+    (tags "mounting hole 1.8mm no annular")
     (attr virtual)
     (fp_text reference REF** (at 0 -3.2) (layer F.SilkS) hide
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value MountingHole_3.2mm_M3 (at 0 3.2) (layer F.Fab)
+    (fp_text value MountingHole_1.8mm (at 0 3.2) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
+    (fp_circle (center 0 0) (end 1.85 0) (layer F.CrtYd) (width 0.05))
+    (fp_circle (center 0 0) (end 1.8 0) (layer Cmts.User) (width 0.15))
     (fp_text user %R (at 0.3 0) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_circle (center 0 0) (end 3.2 0) (layer Cmts.User) (width 0.15))
-    (fp_circle (center 0 0) (end 3.45 0) (layer F.CrtYd) (width 0.05))
-    (pad 1 np_thru_hole circle (at 0 0) (size 3.2 3.2) (drill 3.2) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 0 0) (size 1.8 1.8) (drill 1.8) (layers *.Cu *.Mask))
   )
 
-  (module MountingHole:MountingHole_3.2mm_M3 (layer F.Cu) (tedit 56D1B4CB) (tstamp 5FFC4060)
-    (at 201 94.25)
-    (descr "Mounting Hole 3.2mm, no annular, M3")
-    (tags "mounting hole 3.2mm no annular m3")
+  (module Elabdev:MountingHole_1.8mm (layer F.Cu) (tedit 5B924765) (tstamp 5FBCBB7E)
+    (at 77.5 197)
+    (descr "Mounting Hole 1.8mm, no annular")
+    (tags "mounting hole 1.8mm no annular")
     (attr virtual)
     (fp_text reference REF** (at 0 -3.2) (layer F.SilkS) hide
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value MountingHole_3.2mm_M3 (at 0 3.2) (layer F.Fab)
+    (fp_text value MountingHole_1.8mm (at 0 3.2) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
+    (fp_circle (center 0 0) (end 1.85 0) (layer F.CrtYd) (width 0.05))
+    (fp_circle (center 0 0) (end 1.8 0) (layer Cmts.User) (width 0.15))
     (fp_text user %R (at 0.3 0) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_circle (center 0 0) (end 3.2 0) (layer Cmts.User) (width 0.15))
-    (fp_circle (center 0 0) (end 3.45 0) (layer F.CrtYd) (width 0.05))
-    (pad 1 np_thru_hole circle (at 0 0) (size 3.2 3.2) (drill 3.2) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 0 0) (size 1.8 1.8) (drill 1.8) (layers *.Cu *.Mask))
   )
 
-  (module MountingHole:MountingHole_3.2mm_M3 (layer F.Cu) (tedit 56D1B4CB) (tstamp 5FFC3DC2)
-    (at 78 94.25)
-    (descr "Mounting Hole 3.2mm, no annular, M3")
-    (tags "mounting hole 3.2mm no annular m3")
+  (module Elabdev:MountingHole_1.8mm (layer F.Cu) (tedit 5B924765) (tstamp 5FBCBB70)
+    (at 77.5 150.5)
+    (descr "Mounting Hole 1.8mm, no annular")
+    (tags "mounting hole 1.8mm no annular")
     (attr virtual)
     (fp_text reference REF** (at 0 -3.2) (layer F.SilkS) hide
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value MountingHole_3.2mm_M3 (at 0 3.2) (layer F.Fab)
+    (fp_text value MountingHole_1.8mm (at 0 3.2) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_circle (center 0 0) (end 3.45 0) (layer F.CrtYd) (width 0.05))
-    (fp_circle (center 0 0) (end 3.2 0) (layer Cmts.User) (width 0.15))
+    (fp_circle (center 0 0) (end 1.85 0) (layer F.CrtYd) (width 0.05))
+    (fp_circle (center 0 0) (end 1.8 0) (layer Cmts.User) (width 0.15))
     (fp_text user %R (at 0.3 0) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (pad 1 np_thru_hole circle (at 0 0) (size 3.2 3.2) (drill 3.2) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 0 0) (size 1.8 1.8) (drill 1.8) (layers *.Cu *.Mask))
   )
 
-  (module MountingHole:MountingHole_2mm (layer F.Cu) (tedit 5B924920) (tstamp 5FBCCBDE)
-    (at 201.5 197)
-    (descr "Mounting Hole 2mm, no annular")
-    (tags "mounting hole 2mm no annular")
+  (module Elabdev:MountingHole_1.8mm (layer F.Cu) (tedit 5B924765) (tstamp 5FBCBB5A)
+    (at 201.5 85)
+    (descr "Mounting Hole 1.8mm, no annular")
+    (tags "mounting hole 1.8mm no annular")
     (attr virtual)
     (fp_text reference REF** (at 0 -3.2) (layer F.SilkS) hide
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value MountingHole_2mm (at 0 3.2) (layer F.Fab)
+    (fp_text value MountingHole_1.8mm (at 0 3.2) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_circle (center 0 0) (end 2.25 0) (layer F.CrtYd) (width 0.05))
-    (fp_circle (center 0 0) (end 2 0) (layer Cmts.User) (width 0.15))
+    (fp_circle (center 0 0) (end 1.85 0) (layer F.CrtYd) (width 0.05))
+    (fp_circle (center 0 0) (end 1.8 0) (layer Cmts.User) (width 0.15))
     (fp_text user %R (at 0.3 0) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (pad "" np_thru_hole circle (at 0 0) (size 2 2) (drill 2) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 0 0) (size 1.8 1.8) (drill 1.8) (layers *.Cu *.Mask))
   )
 
-  (module MountingHole:MountingHole_2mm (layer F.Cu) (tedit 5B924920) (tstamp 5FBCCBC8)
-    (at 201.5 131.5)
-    (descr "Mounting Hole 2mm, no annular")
-    (tags "mounting hole 2mm no annular")
+  (module Elabdev:MountingHole_1.8mm (layer F.Cu) (tedit 5B924765) (tstamp 5FBCBA53)
+    (at 77.5 85)
+    (descr "Mounting Hole 1.8mm, no annular")
+    (tags "mounting hole 1.8mm no annular")
     (attr virtual)
     (fp_text reference REF** (at 0 -3.2) (layer F.SilkS) hide
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value MountingHole_2mm (at 0 3.2) (layer F.Fab)
+    (fp_text value MountingHole_1.8mm (at 0 3.2) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_circle (center 0 0) (end 2.25 0) (layer F.CrtYd) (width 0.05))
-    (fp_circle (center 0 0) (end 2 0) (layer Cmts.User) (width 0.15))
+    (fp_circle (center 0 0) (end 1.85 0) (layer F.CrtYd) (width 0.05))
+    (fp_circle (center 0 0) (end 1.8 0) (layer Cmts.User) (width 0.15))
     (fp_text user %R (at 0.3 0) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (pad "" np_thru_hole circle (at 0 0) (size 2 2) (drill 2) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 0 0) (size 1.8 1.8) (drill 1.8) (layers *.Cu *.Mask))
   )
 
-  (module MountingHole:MountingHole_2mm (layer F.Cu) (tedit 5B924920) (tstamp 5FBCBB7E)
-    (at 77.5 197)
-    (descr "Mounting Hole 2mm, no annular")
-    (tags "mounting hole 2mm no annular")
+  (module MountingHole:MountingHole_3.2mm_M3 (layer F.Cu) (tedit 56D1B4CB) (tstamp 5FFC40C9)
+    (at 201 187.75)
+    (descr "Mounting Hole 3.2mm, no annular, M3")
+    (tags "mounting hole 3.2mm no annular m3")
     (attr virtual)
     (fp_text reference REF** (at 0 -3.2) (layer F.SilkS) hide
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value MountingHole_2mm (at 0 3.2) (layer F.Fab)
+    (fp_text value MountingHole_3.2mm_M3 (at 0 3.2) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_circle (center 0 0) (end 2.25 0) (layer F.CrtYd) (width 0.05))
-    (fp_circle (center 0 0) (end 2 0) (layer Cmts.User) (width 0.15))
+    (fp_circle (center 0 0) (end 3.45 0) (layer F.CrtYd) (width 0.05))
+    (fp_circle (center 0 0) (end 3.2 0) (layer Cmts.User) (width 0.15))
     (fp_text user %R (at 0.3 0) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (pad "" np_thru_hole circle (at 0 0) (size 2 2) (drill 2) (layers *.Cu *.Mask))
+    (pad 1 np_thru_hole circle (at 0 0) (size 3.2 3.2) (drill 3.2) (layers *.Cu *.Mask))
   )
 
-  (module MountingHole:MountingHole_2mm (layer F.Cu) (tedit 5B924920) (tstamp 5FBCBB70)
-    (at 77.5 150.5)
-    (descr "Mounting Hole 2mm, no annular")
-    (tags "mounting hole 2mm no annular")
+  (module MountingHole:MountingHole_3.2mm_M3 (layer F.Cu) (tedit 56D1B4CB) (tstamp 5FFC40BB)
+    (at 78 187.75)
+    (descr "Mounting Hole 3.2mm, no annular, M3")
+    (tags "mounting hole 3.2mm no annular m3")
     (attr virtual)
     (fp_text reference REF** (at 0 -3.2) (layer F.SilkS) hide
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value MountingHole_2mm (at 0 3.2) (layer F.Fab)
+    (fp_text value MountingHole_3.2mm_M3 (at 0 3.2) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_circle (center 0 0) (end 2.25 0) (layer F.CrtYd) (width 0.05))
-    (fp_circle (center 0 0) (end 2 0) (layer Cmts.User) (width 0.15))
     (fp_text user %R (at 0.3 0) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (pad "" np_thru_hole circle (at 0 0) (size 2 2) (drill 2) (layers *.Cu *.Mask))
+    (fp_circle (center 0 0) (end 3.2 0) (layer Cmts.User) (width 0.15))
+    (fp_circle (center 0 0) (end 3.45 0) (layer F.CrtYd) (width 0.05))
+    (pad 1 np_thru_hole circle (at 0 0) (size 3.2 3.2) (drill 3.2) (layers *.Cu *.Mask))
   )
 
-  (module MountingHole:MountingHole_2mm (layer F.Cu) (tedit 5B924920) (tstamp 5FBCBB5A)
-    (at 201.5 85)
-    (descr "Mounting Hole 2mm, no annular")
-    (tags "mounting hole 2mm no annular")
+  (module MountingHole:MountingHole_3.2mm_M3 (layer F.Cu) (tedit 56D1B4CB) (tstamp 5FFC4060)
+    (at 201 94.25)
+    (descr "Mounting Hole 3.2mm, no annular, M3")
+    (tags "mounting hole 3.2mm no annular m3")
     (attr virtual)
     (fp_text reference REF** (at 0 -3.2) (layer F.SilkS) hide
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value MountingHole_2mm (at 0 3.2) (layer F.Fab)
+    (fp_text value MountingHole_3.2mm_M3 (at 0 3.2) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_circle (center 0 0) (end 2.25 0) (layer F.CrtYd) (width 0.05))
-    (fp_circle (center 0 0) (end 2 0) (layer Cmts.User) (width 0.15))
     (fp_text user %R (at 0.3 0) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (pad "" np_thru_hole circle (at 0 0) (size 2 2) (drill 2) (layers *.Cu *.Mask))
+    (fp_circle (center 0 0) (end 3.2 0) (layer Cmts.User) (width 0.15))
+    (fp_circle (center 0 0) (end 3.45 0) (layer F.CrtYd) (width 0.05))
+    (pad 1 np_thru_hole circle (at 0 0) (size 3.2 3.2) (drill 3.2) (layers *.Cu *.Mask))
   )
 
-  (module MountingHole:MountingHole_2mm (layer F.Cu) (tedit 5B924920) (tstamp 5FBCBA53)
-    (at 77.5 85)
-    (descr "Mounting Hole 2mm, no annular")
-    (tags "mounting hole 2mm no annular")
+  (module MountingHole:MountingHole_3.2mm_M3 (layer F.Cu) (tedit 56D1B4CB) (tstamp 5FFC3DC2)
+    (at 78 94.25)
+    (descr "Mounting Hole 3.2mm, no annular, M3")
+    (tags "mounting hole 3.2mm no annular m3")
     (attr virtual)
     (fp_text reference REF** (at 0 -3.2) (layer F.SilkS) hide
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value MountingHole_2mm (at 0 3.2) (layer F.Fab)
+    (fp_text value MountingHole_3.2mm_M3 (at 0 3.2) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_circle (center 0 0) (end 2.25 0) (layer F.CrtYd) (width 0.05))
-    (fp_circle (center 0 0) (end 2 0) (layer Cmts.User) (width 0.15))
+    (fp_circle (center 0 0) (end 3.45 0) (layer F.CrtYd) (width 0.05))
+    (fp_circle (center 0 0) (end 3.2 0) (layer Cmts.User) (width 0.15))
     (fp_text user %R (at 0.3 0) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (pad "" np_thru_hole circle (at 0 0) (size 2 2) (drill 2) (layers *.Cu *.Mask))
+    (pad 1 np_thru_hole circle (at 0 0) (size 3.2 3.2) (drill 3.2) (layers *.Cu *.Mask))
   )
 
   (module Elabdev:Mousetab_45mm_Double (layer F.Cu) (tedit 5FE8CA09) (tstamp 5FE94339)
diff --git a/hardware/modules/elabdev.pretty/MountingHole_1.6mm.kicad_mod b/hardware/modules/elabdev.pretty/MountingHole_1.8mm.kicad_mod
similarity index 52%
rename from hardware/modules/elabdev.pretty/MountingHole_1.6mm.kicad_mod
rename to hardware/modules/elabdev.pretty/MountingHole_1.8mm.kicad_mod
index 25bb50f..946aae0 100644
--- a/hardware/modules/elabdev.pretty/MountingHole_1.6mm.kicad_mod
+++ b/hardware/modules/elabdev.pretty/MountingHole_1.8mm.kicad_mod
@@ -1,17 +1,17 @@
-(module Elabdev:MountingHole_1.6mm (layer F.Cu) (tedit 5B924765)
-  (descr "Mounting Hole 1.6mm, no annular")
-  (tags "mounting hole 1.6mm no annular")
+(module Elabdev:MountingHole_1.8mm (layer F.Cu) (tedit 5B924765)
+  (descr "Mounting Hole 1.8mm, no annular")
+  (tags "mounting hole 1.8mm no annular")
   (attr virtual)
   (fp_text reference REF** (at 0 -3.2) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (fp_text value MountingHole_1.6mm (at 0 3.2) (layer F.Fab)
+  (fp_text value MountingHole_1.8mm (at 0 3.2) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
   (fp_text user %R (at 0.3 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (fp_circle (center 0 0) (end 1.6 0) (layer Cmts.User) (width 0.15))
+  (fp_circle (center 0 0) (end 1.8 0) (layer Cmts.User) (width 0.15))
   (fp_circle (center 0 0) (end 1.85 0) (layer F.CrtYd) (width 0.05))
-  (pad "" np_thru_hole circle (at 0 0) (size 1.6 1.6) (drill 1.6) (layers *.Cu *.Mask))
+  (pad "" np_thru_hole circle (at 0 0) (size 1.8 1.8) (drill 1.8) (layers *.Cu *.Mask))
 )