diff --git a/config/corne.keymap b/config/corne.keymap
index d3e0576..2c68377 100644
--- a/config/corne.keymap
+++ b/config/corne.keymap
@@ -130,11 +130,11 @@ ZMK_LAYER(Numbers,
 
 ZMK_LAYER(Mouse,
 // ╭───────────┬───────────┬───────────┬────────────┬────────────╮ ╭───────────┬─────────────┬─────────────┬────────────┬────────────╮
-     XXX         XXX         &mmv_dpi    XXX          XXX            XXX         XXX           XXX           XXX          XXX
+     XXX         XXX         &mwh_tg     &mmv_dpi     XXX            XXX         XXX           XXX           XXX          XXX
 // ├───────────┼───────────┼───────────┼────────────┼────────────┤ ├───────────┼─────────────┼─────────────┼────────────┼────────────┤
      XXX         &mwh_lf     &mwh_up     &mwh_dn      &mwh_rg        &mmv_lf     &mmv_dn       &mmv_up       &mmv_rg      XXX
 // ├───────────┼───────────┼───────────┼────────────┼────────────┤ ├───────────┼─────────────┼─────────────┼────────────┼────────────┤
-     XXX         XXX         XXX         &mwh_tg      XXX            XXX         XXX           XXX           XXX          XXX
+     XXX         XXX         &kp AL      &kp CL       &kp SL         &kp SL      &kp CL        &kp AR        XXX          XXX
 // ╰───────────┴───────────┼───────────┼────────────┼────────────┤ ├───────────┼─────────────┼─────────────┼────────────┴────────────╯
                              &to COL     &mkp_rg      &mkp_lf        XXX         XXX           XXX
 //                         ╰───────────┴────────────┴────────────╯ ╰───────────┴─────────────┴─────────────╯
diff --git a/config/urchin.keymap b/config/urchin.keymap
index 5b0c6f3..2b7a479 100644
--- a/config/urchin.keymap
+++ b/config/urchin.keymap
@@ -133,9 +133,9 @@ ZMK_LAYER(Mouse,
 // ╭───────────┬───────────┬───────────┬────────────┬────────────╮ ╭───────────┬─────────────┬─────────────┬────────────┬────────────╮
      XXX         XXX         &mwh_tg     &mmv_dpi     XXX            XXX         XXX           XXX           XXX          XXX
 // ├───────────┼───────────┼───────────┼────────────┼────────────┤ ├───────────┼─────────────┼─────────────┼────────────┼────────────┤
-     XXX       &hrmw AL MWL &hrmw CL MWU &hrmw SL MWD  &mwh_rg        &mmv_lf     &mmv_dn       &mmv_up       &mmv_rg      XXX
+     XXX         &mwh_lf     &mwh_up     &mwh_dn      &mwh_rg        &mmv_lf     &mmv_dn       &mmv_up       &mmv_rg      XXX
 // ├───────────┼───────────┼───────────┼────────────┼────────────┤ ├───────────┼─────────────┼─────────────┼────────────┼────────────┤
-     XXX         XXX         XXX         XXX          XXX            XXX         XXX           XXX           XXX          XXX
+     XXX         XXX         &kp AL      &kp CL       &kp SL         &kp SL      &kp CL        &kp AR        XXX          XXX
 // ╰───────────┴───────────┴───────────┼────────────┼────────────┤ ├───────────┼─────────────┼─────────────┴────────────┴────────────╯
                                          &mkp_rg      &mkp_lf        XXX         XXX
 //                                     ╰────────────┴────────────╯ ╰───────────┴─────────────╯
diff --git a/images/keymaps/urchin_keymap.svg b/images/keymaps/urchin_keymap.svg
index 7f4fbd5..ac9867a 100644
--- a/images/keymaps/urchin_keymap.svg
+++ b/images/keymaps/urchin_keymap.svg
@@ -1966,17 +1966,14 @@ path.combo {
 <g transform="translate(84, 102)" class="key keypos-11">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
 <use href="#scroll-left" xlink:href="#scroll-left" x="-7" y="-7" height="14" width="13.998173515981735" class="key tap glyph scroll-left"/>
-<text x="0" y="23" class="key hold">ALT</text>
 </g>
 <g transform="translate(140, 84)" class="key keypos-12">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
 <use href="#scroll-up" xlink:href="#scroll-up" x="-7" y="-7" height="14" width="13.998173515981735" class="key tap glyph scroll-up"/>
-<text x="0" y="23" class="key hold">CTRL</text>
 </g>
 <g transform="translate(196, 100)" class="key keypos-13">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
 <use href="#scroll-down" xlink:href="#scroll-down" x="-7" y="-7" height="14" width="13.998173515981735" class="key tap glyph scroll-down"/>
-<text x="0" y="23" class="key hold">SHIFT</text>
 </g>
 <g transform="translate(252, 108)" class="key keypos-14">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
@@ -2009,21 +2006,27 @@ path.combo {
 </g>
 <g transform="translate(140, 140)" class="key keypos-22">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
+<text x="0" y="0" class="key tap">ALT</text>
 </g>
 <g transform="translate(196, 156)" class="key keypos-23">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
+<text x="0" y="0" class="key tap">CTRL</text>
 </g>
 <g transform="translate(252, 164)" class="key keypos-24">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
+<text x="0" y="0" class="key tap">SHIFT</text>
 </g>
 <g transform="translate(420, 164)" class="key keypos-25">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
+<text x="0" y="0" class="key tap">SHIFT</text>
 </g>
 <g transform="translate(476, 156)" class="key keypos-26">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
+<text x="0" y="0" class="key tap">CTRL</text>
 </g>
 <g transform="translate(532, 140)" class="key keypos-27">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
+<text x="0" y="0" class="key tap">RALT</text>
 </g>
 <g transform="translate(588, 158)" class="key keypos-28">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
diff --git a/keymap-drawer/urchin_keymap.yaml b/keymap-drawer/urchin_keymap.yaml
index 5e1deb4..9b2a058 100644
--- a/keymap-drawer/urchin_keymap.yaml
+++ b/keymap-drawer/urchin_keymap.yaml
@@ -315,41 +315,8 @@ layers:
   - {type: held}
   - {t: ▽, type: trans}
   - '0'
-  Mouse:
-  - ''
-  - ''
-  - $$scroll$$
-  - DPI
-  - ''
-  - ''
-  - ''
-  - ''
-  - ''
-  - ''
-  - ''
-  - {t: $$scroll-left$$, h: ALT}
-  - {t: $$scroll-up$$, h: CTRL}
-  - {t: $$scroll-down$$, h: SHIFT}
-  - $$scroll-right$$
-  - $$cursor-left$$
-  - $$cursor-down$$
-  - $$cursor-up$$
-  - $$cursor-right$$
-  - ''
-  - ''
-  - ''
-  - ''
-  - ''
-  - ''
-  - ''
-  - ''
-  - ''
-  - ''
-  - ''
-  - $$material:right_click$$
-  - $$material:left_click$$
-  - ''
-  - ''
+  Mouse: ['', '', $$scroll$$, DPI, '', '', '', '', '', '', '', $$scroll-left$$, $$scroll-up$$, $$scroll-down$$, $$scroll-right$$, $$cursor-left$$, $$cursor-down$$,
+    $$cursor-up$$, $$cursor-right$$, '', '', '', ALT, CTRL, SHIFT, SHIFT, CTRL, RALT, '', '', '$$material:right_click$$', '$$material:left_click$$', '', '']
   Game: ['$$material:keyboard_tab$$', Q, W, E, R, '$$material:left_click$$', $$click-middle$$, '$$material:right_click$$', $$scroll$$, ALT, SHIFT, A, S, D, F, '1',
     '2', '3', '4', '5', CTRL, Z, X, C, V, '6', '7', '8', '9', '0', '$$tabler:space$$', '$$material:keyboard_return$$', ESC, M]
 combos: