diff --git a/hardware/keyboard-classic/Aligner-cherry/aligner-cherry.kicad_pcb b/hardware/keyboard-classic/Aligner-cherry/aligner-cherry.kicad_pcb
index 6b570c4..0787013 100644
--- a/hardware/keyboard-classic/Aligner-cherry/aligner-cherry.kicad_pcb
+++ b/hardware/keyboard-classic/Aligner-cherry/aligner-cherry.kicad_pcb
@@ -1085,6 +1085,42 @@
     (fp_text value "OSI mounting holes" (at -0.32258 11.14044) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
+    (fp_text user %R (at 110.75162 -87.97036) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user OSI (at -109.4232 -88.138) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at -85.03158 5.42544) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user OSI (at -85.28558 -4.17576) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 86.31682 5.65404) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user OSI (at 86.06282 -3.94716) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user OSI (at 0.59182 -97.46996) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 0.84582 -87.86876) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user OSI (at -109.4232 -88.138) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at -109.31398 -87.86876) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user OSI (at 109.6772 -88.138) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 110.75162 -87.97036) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
     (fp_line (start 104.14 -87.63) (end 104.14 -102.87) (layer F.CrtYd) (width 0.12))
     (fp_line (start 104.14 -87.63) (end 114.3 -87.63) (layer F.CrtYd) (width 0.12))
     (fp_line (start 114.3 -102.87) (end 114.3 -87.63) (layer F.CrtYd) (width 0.12))
@@ -1107,39 +1143,6 @@
     (fp_circle (center 0 -92.8624) (end 4.826 -92.8624) (layer Cmts.User) (width 0.15))
     (fp_circle (center -109.22 -92.71) (end -104.394 -92.71) (layer Cmts.User) (width 0.15))
     (fp_circle (center 109.22 -92.71) (end 114.046 -92.71) (layer Cmts.User) (width 0.15))
-    (fp_text user %R (at 110.75162 -87.97036) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text user OSI (at 109.6264 -88.392) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text user %R (at -85.03158 5.42544) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text user OSI (at -85.28558 -4.17576) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text user %R (at 86.31682 5.65404) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text user OSI (at 86.06282 -3.94716) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text user OSI (at 0.45212 -88.22436) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text user %R (at 0.84582 -87.86876) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text user OSI (at -109.4232 -88.138) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text user %R (at -109.31398 -87.86876) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text user %R (at 110.75162 -87.97036) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
     (pad "" np_thru_hole circle (at -85.725 0.635) (size 7.112 7.112) (drill 7.112) (layers *.Cu *.Mask))
     (pad "" np_thru_hole circle (at 85.725 0.635) (size 7.112 7.112) (drill 7.112) (layers *.Cu *.Mask))
     (pad "" np_thru_hole oval (at 0 -95.25) (size 7.112 12.192) (drill oval 7.112 12.192) (layers *.Cu *.Mask))
@@ -1168,7 +1171,7 @@
     )
   )
 
-  (module MountingHole:MountingHole_2.1mm (layer F.Cu) (tedit 5EE9B629) (tstamp 5EE9F9CA)
+  (module MountingHole:MountingHole_2.1mm (layer F.Cu) (tedit 5B924765) (tstamp 5EE9F9CA)
     (at 236.22 177.81016)
     (descr "Mounting Hole 2.1mm, no annular")
     (tags "mounting hole 2.1mm no annular")
@@ -1179,10 +1182,15 @@
     (fp_text value MountingHole_2.1mm (at 0 3.2) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (pad "" np_thru_hole circle (at 0 0) (size 1.6256 1.6256) (drill 1.6256) (layers *.Cu *.Mask))
+    (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 2.1 0) (layer Cmts.User) (width 0.15))
+    (fp_circle (center 0 0) (end 2.35 0) (layer F.CrtYd) (width 0.05))
+    (pad "" np_thru_hole circle (at 0 0) (size 2.1 2.1) (drill 2.1) (layers *.Cu *.Mask))
   )
 
-  (module MountingHole:MountingHole_2.1mm (layer F.Cu) (tedit 5EE9B596) (tstamp 5EE9F998)
+  (module MountingHole:MountingHole_2.1mm (layer F.Cu) (tedit 5B924765) (tstamp 5EE9F998)
     (at 130.31978 177.39868)
     (descr "Mounting Hole 2.1mm, no annular")
     (tags "mounting hole 2.1mm no annular")
@@ -1193,7 +1201,12 @@
     (fp_text value MountingHole_2.1mm (at 0 3.2) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (pad "" np_thru_hole circle (at 0 0) (size 1.6256 1.6256) (drill 1.6256) (layers *.Cu *.Mask))
+    (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 2.1 0) (layer Cmts.User) (width 0.15))
+    (fp_circle (center 0 0) (end 2.35 0) (layer F.CrtYd) (width 0.05))
+    (pad "" np_thru_hole circle (at 0 0) (size 2.1 2.1) (drill 2.1) (layers *.Cu *.Mask))
   )
 
   (module Symbol:OSHW-Logo2_9.8x8mm_SilkScreen (layer F.Cu) (tedit 0) (tstamp 5E0A0419)
@@ -1499,11 +1512,11 @@
     (fp_text value MountingHole_3.5mm (at 0 4.5) (layer F.Fab) hide
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_circle (center 0 0) (end 3.5 0) (layer Cmts.User) (width 0.15))
-    (fp_circle (center 0 0) (end 3.75 0) (layer F.CrtYd) (width 0.05))
     (fp_text user %R (at 0.3 0) (layer F.Fab) hide
       (effects (font (size 1 1) (thickness 0.15)))
     )
+    (fp_circle (center 0 0) (end 3.5 0) (layer Cmts.User) (width 0.15))
+    (fp_circle (center 0 0) (end 3.75 0) (layer F.CrtYd) (width 0.05))
     (pad 1 np_thru_hole circle (at 0 0) (size 3.5 3.5) (drill 3.5) (layers *.Cu *.Mask))
   )
 
@@ -1518,11 +1531,11 @@
     (fp_text value MountingHole_3.5mm (at 0 4.5) (layer F.Fab) hide
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_circle (center 0 0) (end 3.75 0) (layer F.CrtYd) (width 0.05))
-    (fp_circle (center 0 0) (end 3.5 0) (layer Cmts.User) (width 0.15))
     (fp_text user %R (at 0.3 0) (layer F.Fab) hide
       (effects (font (size 1 1) (thickness 0.15)))
     )
+    (fp_circle (center 0 0) (end 3.5 0) (layer Cmts.User) (width 0.15))
+    (fp_circle (center 0 0) (end 3.75 0) (layer F.CrtYd) (width 0.05))
     (pad 1 np_thru_hole circle (at 0 0) (size 3.5 3.5) (drill 3.5) (layers *.Cu *.Mask))
   )
 
@@ -1537,11 +1550,11 @@
     (fp_text value MountingHole_3.5mm (at 0 4.5) (layer F.Fab) hide
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_circle (center 0 0) (end 3.75 0) (layer F.CrtYd) (width 0.05))
-    (fp_circle (center 0 0) (end 3.5 0) (layer Cmts.User) (width 0.15))
     (fp_text user %R (at 0.3 0) (layer F.Fab) hide
       (effects (font (size 1 1) (thickness 0.15)))
     )
+    (fp_circle (center 0 0) (end 3.5 0) (layer Cmts.User) (width 0.15))
+    (fp_circle (center 0 0) (end 3.75 0) (layer F.CrtYd) (width 0.05))
     (pad 1 np_thru_hole circle (at 0 0) (size 3.5 3.5) (drill 3.5) (layers *.Cu *.Mask))
   )
 
@@ -1556,11 +1569,11 @@
     (fp_text value MountingHole_3.5mm (at 0 4.5) (layer F.Fab) hide
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_circle (center 0 0) (end 3.75 0) (layer F.CrtYd) (width 0.05))
-    (fp_circle (center 0 0) (end 3.5 0) (layer Cmts.User) (width 0.15))
     (fp_text user %R (at 0.3 0) (layer F.Fab) hide
       (effects (font (size 1 1) (thickness 0.15)))
     )
+    (fp_circle (center 0 0) (end 3.5 0) (layer Cmts.User) (width 0.15))
+    (fp_circle (center 0 0) (end 3.75 0) (layer F.CrtYd) (width 0.05))
     (pad 1 np_thru_hole circle (at 0 0) (size 3.5 3.5) (drill 3.5) (layers *.Cu *.Mask))
   )
 
@@ -1575,11 +1588,11 @@
     (fp_text value MountingHole_3.5mm (at 0 4.5) (layer F.Fab) hide
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_circle (center 0 0) (end 3.75 0) (layer F.CrtYd) (width 0.05))
-    (fp_circle (center 0 0) (end 3.5 0) (layer Cmts.User) (width 0.15))
     (fp_text user %R (at 0.3 0) (layer F.Fab) hide
       (effects (font (size 1 1) (thickness 0.15)))
     )
+    (fp_circle (center 0 0) (end 3.5 0) (layer Cmts.User) (width 0.15))
+    (fp_circle (center 0 0) (end 3.75 0) (layer F.CrtYd) (width 0.05))
     (pad 1 np_thru_hole circle (at 0 0) (size 3.5 3.5) (drill 3.5) (layers *.Cu *.Mask))
   )
 
@@ -1594,11 +1607,11 @@
     (fp_text value MountingHole_3.5mm (at 0 4.5) (layer F.Fab) hide
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_circle (center 0 0) (end 3.75 0) (layer F.CrtYd) (width 0.05))
-    (fp_circle (center 0 0) (end 3.5 0) (layer Cmts.User) (width 0.15))
     (fp_text user %R (at 0.3 0) (layer F.Fab) hide
       (effects (font (size 1 1) (thickness 0.15)))
     )
+    (fp_circle (center 0 0) (end 3.5 0) (layer Cmts.User) (width 0.15))
+    (fp_circle (center 0 0) (end 3.75 0) (layer F.CrtYd) (width 0.05))
     (pad 1 np_thru_hole circle (at 0 0) (size 3.5 3.5) (drill 3.5) (layers *.Cu *.Mask))
   )
 
@@ -1613,11 +1626,11 @@
     (fp_text value MountingHole_3.5mm (at 0 4.5) (layer F.Fab) hide
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_circle (center 0 0) (end 3.75 0) (layer F.CrtYd) (width 0.05))
-    (fp_circle (center 0 0) (end 3.5 0) (layer Cmts.User) (width 0.15))
     (fp_text user %R (at 0.3 0) (layer F.Fab) hide
       (effects (font (size 1 1) (thickness 0.15)))
     )
+    (fp_circle (center 0 0) (end 3.5 0) (layer Cmts.User) (width 0.15))
+    (fp_circle (center 0 0) (end 3.75 0) (layer F.CrtYd) (width 0.05))
     (pad 1 np_thru_hole circle (at 0 0) (size 3.5 3.5) (drill 3.5) (layers *.Cu *.Mask))
   )