diff --git a/keymap-drawer/config.yaml b/keymap-drawer/config.yaml
index 79633fe2..8d26b118 100644
--- a/keymap-drawer/config.yaml
+++ b/keymap-drawer/config.yaml
@@ -1,13 +1,21 @@
 # configuration for https://github.com/caksoylar/keymap-drawer
 parse_config:
   raw_binding_map:
-    '&reset': Reset
     '&sys_reset': Reset
     '&bootloader': Boot
     '&swapper': Win Next
     '&caps_word': Caps Wrd
     '&inv_qm': ¿
 
+    '&kp LC(LG(LEFT))': Desk Left
+    '&kp LC(LG(RIGHT))': Desk Right
+    '&kp LC(TAB)': Tab Right
+    '&kp LC(LS(TAB))': Tab Left
+    '&kp LA(F4)': Win Close
+    '&kp LC(F4)': Tab Close
+    '&kp LS(TAB)': Win Prev
+    '&kp LS(INS)': Paste
+
     '&out OUT_USB': Out USB
     '&out OUT_BLE': Out BLE
 
@@ -17,15 +25,15 @@ parse_config:
     '&bt BT_SEL 3': BT 4
     '&bt BT_SEL 4': BT 5
 
-    '&mmv M_UP': M↑
-    '&mmv M_DOWN': M↓
-    '&mmv M_LEFT': M←
-    '&mmv M_RIGHT': M→
+    '&mmv MOVE_UP': M↑
+    '&mmv MOVE_DOWN': M↓
+    '&mmv MOVE_LEFT': M←
+    '&mmv MOVE_RIGHT': M→
 
-    '&mwh S_UP': MW↑
-    '&mwh S_DOWN': MW↓
-    '&mwh S_LEFT': MW←
-    '&mwh S_RIGHT': MW→
+    '&msc SCRL_UP': MW↑
+    '&msc SCRL_DOWN': MW↓
+    '&msc SCRL_LEFT': MW←
+    '&msc SCRL_RIGHT': MW→
 
     '&mkp LCLK': Left Click
     '&mkp RCLK': Right Click
@@ -42,18 +50,10 @@ parse_config:
 
   zmk_keycode_map:
     # custom mappings
-    LC(LG(LEFT)): Desk Left
-    LC(LG(RIGHT)): Desk Right
-    LC(TAB): Tab Right
-    LC(LS(TAB)): Tab Left
-    LA(F4): Win Close
-    LC(F4): Tab Close
     C_VOL_UP: Vol Up
     C_VOL_DN: Vol Down
     C_AL_CALC: Calc
     C_PP: Play Pause
-    LS(TAB): Win Prev
-    LS(INS): Paste
 
     LCTRL: Ctrl
     RCTRL: Ctrl
@@ -91,8 +91,8 @@ parse_config:
     # defaults
     AMPERSAND: '&'
     AMPS: '&'
-    APOS: .
-    APOSTROPHE: <
+    APOS: "'"
+    APOSTROPHE: "'"
     ASTERISK: '*'
     ASTRK: '*'
     AT: '@'
diff --git a/keymap-drawer/corneish_zen.svg b/keymap-drawer/corneish_zen.svg
index 6f681d41..543cf2fd 100644
--- a/keymap-drawer/corneish_zen.svg
+++ b/keymap-drawer/corneish_zen.svg
@@ -1,4 +1,4 @@
-<svg width="788" height="2387" viewBox="0 0 788 2387" class="keymap" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="788" height="2371" viewBox="0 0 788 2371" class="keymap" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <style>/* inherit to force styles through use tags */
 svg path {
     fill: inherit;
@@ -102,7 +102,7 @@ path.combo {
 </style>
 <g transform="translate(30, 0)" class="layer-DEF">
 <text x="0" y="28" class="label">DEF:</text>
-<g transform="translate(0, 64)">
+<g transform="translate(0, 56)">
 <g transform="translate(28, 49)" class="key keypos-0">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
 <text x="0" y="0" class="key tap">Q</text>
@@ -332,9 +332,9 @@ path.combo {
 </g>
 </g>
 </g>
-<g transform="translate(30, 339)" class="layer-BRD">
+<g transform="translate(30, 331)" class="layer-BRD">
 <text x="0" y="28" class="label">BRD:</text>
-<g transform="translate(0, 64)">
+<g transform="translate(0, 56)">
 <g transform="translate(28, 49)" class="key keypos-0">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
 <text x="0" y="0" class="key tap">X</text>
@@ -560,7 +560,7 @@ path.combo {
 </g>
 </g>
 </g>
-<g transform="translate(30, 678)" class="layer-GME">
+<g transform="translate(30, 661)" class="layer-GME">
 <text x="0" y="28" class="label">GME:</text>
 <g transform="translate(0, 56)">
 <g transform="translate(28, 49)" class="key keypos-0">
@@ -642,6 +642,7 @@ path.combo {
 <g transform="translate(700, 105)" class="key keypos-19">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
 <text x="0" y="0" class="key tap">GME</text>
+<text x="0" y="24" class="key hold">toggle</text>
 </g>
 <g transform="translate(28, 161)" class="key ghost keypos-20">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key ghost"/>
@@ -706,10 +707,11 @@ path.combo {
 <g transform="translate(560, 205)" class="key ghost keypos-35">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key ghost"/>
 <text x="0" y="0" class="key ghost tap">GME</text>
+<text x="0" y="24" class="key ghost hold">toggle</text>
 </g>
 </g>
 </g>
-<g transform="translate(30, 1009)" class="layer-SYM">
+<g transform="translate(30, 992)" class="layer-SYM">
 <text x="0" y="28" class="label">SYM:</text>
 <g transform="translate(0, 56)">
 <g transform="translate(28, 49)" class="key keypos-0">
@@ -855,7 +857,7 @@ path.combo {
 </g>
 </g>
 </g>
-<g transform="translate(30, 1339)" class="layer-NAV">
+<g transform="translate(30, 1323)" class="layer-NAV">
 <text x="0" y="28" class="label">NAV:</text>
 <g transform="translate(0, 56)">
 <g transform="translate(28, 49)" class="key keypos-0">
@@ -1025,7 +1027,7 @@ path.combo {
 </g>
 </g>
 </g>
-<g transform="translate(30, 1670)" class="layer-FUN">
+<g transform="translate(30, 1653)" class="layer-FUN">
 <text x="0" y="28" class="label">FUN:</text>
 <g transform="translate(0, 56)">
 <g transform="translate(28, 49)" class="key keypos-0">
@@ -1063,14 +1065,17 @@ path.combo {
 <g transform="translate(588, 28)" class="key keypos-7">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
 <text x="0" y="0" class="key tap">DEF</text>
+<text x="0" y="24" class="key hold">toggle</text>
 </g>
 <g transform="translate(644, 35)" class="key keypos-8">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
 <text x="0" y="0" class="key tap">BRD</text>
+<text x="0" y="24" class="key hold">toggle</text>
 </g>
 <g transform="translate(700, 49)" class="key keypos-9">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
 <text x="0" y="0" class="key tap">GME</text>
+<text x="0" y="24" class="key hold">toggle</text>
 </g>
 <g transform="translate(28, 105)" class="key keypos-10">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
@@ -1205,7 +1210,7 @@ path.combo {
 </g>
 </g>
 </g>
-<g transform="translate(30, 2001)" class="layer-MSE">
+<g transform="translate(30, 1984)" class="layer-MSE">
 <text x="0" y="28" class="label">MSE:</text>
 <g transform="translate(0, 56)">
 <g transform="translate(28, 49)" class="key keypos-0">
@@ -1225,33 +1230,23 @@ path.combo {
 </g>
 <g transform="translate(476, 42)" class="key keypos-5">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-0.6em" style="font-size: 78%">&amp;msc</tspan><tspan x="0" dy="1.2em" style="font-size: 78%">SCRL_LEFT</tspan>
-</text>
+<text x="0" y="0" class="key tap">MW←</text>
 </g>
 <g transform="translate(532, 35)" class="key keypos-6">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-0.6em" style="font-size: 78%">&amp;msc</tspan><tspan x="0" dy="1.2em" style="font-size: 78%">SCRL_DOWN</tspan>
-</text>
+<text x="0" y="0" class="key tap">MW↓</text>
 </g>
 <g transform="translate(588, 28)" class="key keypos-7">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-0.6em">&amp;mmv</tspan><tspan x="0" dy="1.2em">MOVE_UP</tspan>
-</text>
+<text x="0" y="0" class="key tap">M↑</text>
 </g>
 <g transform="translate(644, 35)" class="key keypos-8">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-0.6em">&amp;msc</tspan><tspan x="0" dy="1.2em">SCRL_UP</tspan>
-</text>
+<text x="0" y="0" class="key tap">MW↑</text>
 </g>
 <g transform="translate(700, 49)" class="key keypos-9">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-0.6em" style="font-size: 70%">&amp;msc</tspan><tspan x="0" dy="1.2em" style="font-size: 70%">SCRL_RIGHT</tspan>
-</text>
+<text x="0" y="0" class="key tap">MW→</text>
 </g>
 <g transform="translate(28, 105)" class="key keypos-10">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
@@ -1277,21 +1272,15 @@ path.combo {
 </g>
 <g transform="translate(532, 91)" class="key keypos-16">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-0.6em" style="font-size: 78%">&amp;mmv</tspan><tspan x="0" dy="1.2em" style="font-size: 78%">MOVE_LEFT</tspan>
-</text>
+<text x="0" y="0" class="key tap">M←</text>
 </g>
 <g transform="translate(588, 84)" class="key keypos-17">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-0.6em" style="font-size: 78%">&amp;mmv</tspan><tspan x="0" dy="1.2em" style="font-size: 78%">MOVE_DOWN</tspan>
-</text>
+<text x="0" y="0" class="key tap">M↓</text>
 </g>
 <g transform="translate(644, 91)" class="key keypos-18">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-0.6em" style="font-size: 70%">&amp;mmv</tspan><tspan x="0" dy="1.2em" style="font-size: 70%">MOVE_RIGHT</tspan>
-</text>
+<text x="0" y="0" class="key tap">M→</text>
 </g>
 <g transform="translate(700, 105)" class="key keypos-19">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
diff --git a/keymap-drawer/corneish_zen.yaml b/keymap-drawer/corneish_zen.yaml
index a6cefbec..0f467d11 100644
--- a/keymap-drawer/corneish_zen.yaml
+++ b/keymap-drawer/corneish_zen.yaml
@@ -74,7 +74,43 @@ layers:
   - {t: ⌫, h: SYM}
   - {t: ⏎, h: Shift}
   - {t: ⌦, h: Alt}
-  GME: [↹, Q, W, E, R, Y, U, I, O, P, Esc, A, S, D, F, H, J, K, L, GME, Shift, Z, X, C, V, N, M, ',', ., /, Ctrl, Alt, ␣, NAV, ⏎, GME]
+  GME:
+  - ↹
+  - Q
+  - W
+  - E
+  - R
+  - Y
+  - U
+  - I
+  - O
+  - P
+  - Esc
+  - A
+  - S
+  - D
+  - F
+  - H
+  - J
+  - K
+  - L
+  - {t: GME, h: toggle}
+  - Shift
+  - Z
+  - X
+  - C
+  - V
+  - N
+  - M
+  - ','
+  - .
+  - /
+  - Ctrl
+  - Alt
+  - ␣
+  - NAV
+  - ⏎
+  - {t: GME, h: toggle}
   SYM:
   - '!'
   - '@'
@@ -157,9 +193,9 @@ layers:
   - F5
   - Out USB
   - Out BLE
-  - DEF
-  - BRD
-  - GME
+  - {t: DEF, h: toggle}
+  - {t: BRD, h: toggle}
+  - {t: GME, h: toggle}
   - F6
   - F7
   - F8
@@ -192,20 +228,20 @@ layers:
   - ''
   - ''
   - ''
-  - '&msc SCRL_LEFT'
-  - '&msc SCRL_DOWN'
-  - '&mmv MOVE_UP'
-  - '&msc SCRL_UP'
-  - '&msc SCRL_RIGHT'
+  - MW←
+  - MW↓
+  - M↑
+  - MW↑
+  - MW→
   - Ctrl
   - Gui
   - Alt
   - Shift
   - ''
   - ''
-  - '&mmv MOVE_LEFT'
-  - '&mmv MOVE_DOWN'
-  - '&mmv MOVE_RIGHT'
+  - M←
+  - M↓
+  - M→
   - ''
   - ''
   - ''
diff --git a/keymap-drawer/hypergolic.svg b/keymap-drawer/hypergolic.svg
index 399ab55c..04f51caf 100644
--- a/keymap-drawer/hypergolic.svg
+++ b/keymap-drawer/hypergolic.svg
@@ -1,4 +1,4 @@
-<svg width="910" height="2149" viewBox="0 0 910 2149" class="keymap" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="910" height="2133" viewBox="0 0 910 2133" class="keymap" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <style>/* inherit to force styles through use tags */
 svg path {
     fill: inherit;
@@ -102,7 +102,7 @@ path.combo {
 </style>
 <g transform="translate(30, 0)" class="layer-DEF">
 <text x="0" y="28" class="label">DEF:</text>
-<g transform="translate(0, 64)">
+<g transform="translate(0, 56)">
 <g transform="translate(30, 119) rotate(-15.0)" class="key keypos-0">
 <rect rx="6" ry="6" x="-28" y="-26" width="55" height="52" class="key"/>
 <text x="0" y="0" class="key tap">Q</text>
@@ -317,9 +317,9 @@ path.combo {
 </g>
 </g>
 </g>
-<g transform="translate(30, 354)" class="layer-BRD">
+<g transform="translate(30, 346)" class="layer-BRD">
 <text x="0" y="28" class="label">BRD:</text>
-<g transform="translate(0, 64)">
+<g transform="translate(0, 56)">
 <g transform="translate(30, 119) rotate(-15.0)" class="key keypos-0">
 <rect rx="6" ry="6" x="-28" y="-26" width="55" height="52" class="key"/>
 <text x="0" y="0" class="key tap">X</text>
@@ -530,7 +530,7 @@ path.combo {
 </g>
 </g>
 </g>
-<g transform="translate(30, 709)" class="layer-GME">
+<g transform="translate(30, 692)" class="layer-GME">
 <text x="0" y="28" class="label">GME:</text>
 <g transform="translate(0, 56)">
 <g transform="translate(30, 119) rotate(-15.0)" class="key keypos-0">
@@ -612,6 +612,7 @@ path.combo {
 <g transform="translate(799, 173) rotate(15.0)" class="key keypos-19">
 <rect rx="6" ry="6" x="-28" y="-26" width="55" height="52" class="key"/>
 <text x="0" y="0" class="key tap">GME</text>
+<text x="0" y="24" class="key hold">toggle</text>
 </g>
 <g transform="translate(59, 227) rotate(-15.0)" class="key keypos-20">
 <rect rx="6" ry="6" x="-28" y="-26" width="55" height="52" class="key"/>
@@ -671,7 +672,7 @@ path.combo {
 </g>
 </g>
 </g>
-<g transform="translate(30, 1055)" class="layer-SYM">
+<g transform="translate(30, 1038)" class="layer-SYM">
 <text x="0" y="28" class="label">SYM:</text>
 <g transform="translate(0, 56)">
 <g transform="translate(30, 119) rotate(-15.0)" class="key keypos-0">
@@ -809,7 +810,7 @@ path.combo {
 </g>
 </g>
 </g>
-<g transform="translate(30, 1401)" class="layer-NAV">
+<g transform="translate(30, 1384)" class="layer-NAV">
 <text x="0" y="28" class="label">NAV:</text>
 <g transform="translate(0, 56)">
 <g transform="translate(30, 119) rotate(-15.0)" class="key keypos-0">
@@ -971,7 +972,7 @@ path.combo {
 </g>
 </g>
 </g>
-<g transform="translate(30, 1747)" class="layer-FUN">
+<g transform="translate(30, 1730)" class="layer-FUN">
 <text x="0" y="28" class="label">FUN:</text>
 <g transform="translate(0, 56)">
 <g transform="translate(30, 119) rotate(-15.0)" class="key keypos-0">
@@ -1009,14 +1010,17 @@ path.combo {
 <g transform="translate(670, 28)" class="key keypos-7">
 <rect rx="6" ry="6" x="-28" y="-26" width="55" height="52" class="key"/>
 <text x="0" y="0" class="key tap">DEF</text>
+<text x="0" y="24" class="key hold">toggle</text>
 </g>
 <g transform="translate(741, 52) rotate(5.0)" class="key keypos-8">
 <rect rx="6" ry="6" x="-28" y="-26" width="55" height="52" class="key"/>
 <text x="0" y="0" class="key tap">BRD</text>
+<text x="0" y="24" class="key hold">toggle</text>
 </g>
 <g transform="translate(814, 119) rotate(15.0)" class="key keypos-9">
 <rect rx="6" ry="6" x="-28" y="-26" width="55" height="52" class="key"/>
 <text x="0" y="0" class="key tap">GME</text>
+<text x="0" y="24" class="key hold">toggle</text>
 </g>
 <g transform="translate(44, 173) rotate(-15.0)" class="key keypos-10">
 <rect rx="6" ry="6" x="-28" y="-26" width="55" height="52" class="key"/>
diff --git a/keymap-drawer/hypergolic.yaml b/keymap-drawer/hypergolic.yaml
index 586c5817..94eb66e0 100644
--- a/keymap-drawer/hypergolic.yaml
+++ b/keymap-drawer/hypergolic.yaml
@@ -70,7 +70,41 @@ layers:
   - {t: ␣, h: NAV}
   - {t: ⌫, h: SYM}
   - {t: ⏎, h: Shift}
-  GME: [↹, Q, W, E, R, Y, U, I, O, P, Esc, A, S, D, F, H, J, K, L, GME, Shift, Z, X, C, V, N, M, ',', ., /, Alt, ␣, NAV, ⏎]
+  GME:
+  - ↹
+  - Q
+  - W
+  - E
+  - R
+  - Y
+  - U
+  - I
+  - O
+  - P
+  - Esc
+  - A
+  - S
+  - D
+  - F
+  - H
+  - J
+  - K
+  - L
+  - {t: GME, h: toggle}
+  - Shift
+  - Z
+  - X
+  - C
+  - V
+  - N
+  - M
+  - ','
+  - .
+  - /
+  - Alt
+  - ␣
+  - NAV
+  - ⏎
   SYM:
   - '!'
   - '@'
@@ -149,9 +183,9 @@ layers:
   - F5
   - Out USB
   - Out BLE
-  - DEF
-  - BRD
-  - GME
+  - {t: DEF, h: toggle}
+  - {t: BRD, h: toggle}
+  - {t: GME, h: toggle}
   - F6
   - F7
   - F8
diff --git a/keymap-drawer/rommana.svg b/keymap-drawer/rommana.svg
index e8000b8d..146f1e90 100644
--- a/keymap-drawer/rommana.svg
+++ b/keymap-drawer/rommana.svg
@@ -1,4 +1,4 @@
-<svg width="795" height="2373" viewBox="0 0 795 2373" class="keymap" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="795" height="2356" viewBox="0 0 795 2356" class="keymap" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <style>/* inherit to force styles through use tags */
 svg path {
     fill: inherit;
@@ -102,7 +102,7 @@ path.combo {
 </style>
 <g transform="translate(30, 0)" class="layer-DEF">
 <text x="0" y="28" class="label">DEF:</text>
-<g transform="translate(0, 64)">
+<g transform="translate(0, 56)">
 <g transform="translate(30, 93) rotate(-8.0)" class="key keypos-0">
 <rect rx="6" ry="6" x="-28" y="-26" width="55" height="52" class="key"/>
 <text x="0" y="0" class="key tap">Q</text>
@@ -306,9 +306,9 @@ path.combo {
 </g>
 </g>
 </g>
-<g transform="translate(30, 337)" class="layer-BRD">
+<g transform="translate(30, 329)" class="layer-BRD">
 <text x="0" y="28" class="label">BRD:</text>
-<g transform="translate(0, 64)">
+<g transform="translate(0, 56)">
 <g transform="translate(30, 93) rotate(-8.0)" class="key keypos-0">
 <rect rx="6" ry="6" x="-28" y="-26" width="55" height="52" class="key"/>
 <text x="0" y="0" class="key tap">X</text>
@@ -512,7 +512,7 @@ path.combo {
 </g>
 </g>
 </g>
-<g transform="translate(30, 674)" class="layer-GME">
+<g transform="translate(30, 657)" class="layer-GME">
 <text x="0" y="28" class="label">GME:</text>
 <g transform="translate(0, 56)">
 <g transform="translate(30, 93) rotate(-8.0)" class="key keypos-0">
@@ -594,6 +594,7 @@ path.combo {
 <g transform="translate(694, 150) rotate(8.0)" class="key keypos-19">
 <rect rx="6" ry="6" x="-28" y="-26" width="55" height="52" class="key"/>
 <text x="0" y="0" class="key tap">GME</text>
+<text x="0" y="24" class="key hold">toggle</text>
 </g>
 <g transform="translate(101, 161) rotate(-3.0)" class="key keypos-20">
 <rect rx="6" ry="6" x="-28" y="-26" width="55" height="52" class="key"/>
@@ -637,7 +638,7 @@ path.combo {
 </g>
 </g>
 </g>
-<g transform="translate(30, 1003)" class="layer-SYM">
+<g transform="translate(30, 986)" class="layer-SYM">
 <text x="0" y="28" class="label">SYM:</text>
 <g transform="translate(0, 56)">
 <g transform="translate(30, 93) rotate(-8.0)" class="key keypos-0">
@@ -761,7 +762,7 @@ path.combo {
 </g>
 </g>
 </g>
-<g transform="translate(30, 1331)" class="layer-NAV">
+<g transform="translate(30, 1314)" class="layer-NAV">
 <text x="0" y="28" class="label">NAV:</text>
 <g transform="translate(0, 56)">
 <g transform="translate(30, 93) rotate(-8.0)" class="key keypos-0">
@@ -910,7 +911,7 @@ path.combo {
 </g>
 </g>
 </g>
-<g transform="translate(30, 1660)" class="layer-FUN">
+<g transform="translate(30, 1643)" class="layer-FUN">
 <text x="0" y="28" class="label">FUN:</text>
 <g transform="translate(0, 56)">
 <g transform="translate(30, 93) rotate(-8.0)" class="key keypos-0">
@@ -948,14 +949,17 @@ path.combo {
 <g transform="translate(570, 28)" class="key keypos-7">
 <rect rx="6" ry="6" x="-28" y="-26" width="55" height="52" class="key"/>
 <text x="0" y="0" class="key tap">DEF</text>
+<text x="0" y="24" class="key hold">toggle</text>
 </g>
 <g transform="translate(637, 46) rotate(3.0)" class="key keypos-8">
 <rect rx="6" ry="6" x="-28" y="-26" width="55" height="52" class="key"/>
 <text x="0" y="0" class="key tap">BRD</text>
+<text x="0" y="24" class="key hold">toggle</text>
 </g>
 <g transform="translate(702, 93) rotate(8.0)" class="key keypos-9">
 <rect rx="6" ry="6" x="-28" y="-26" width="55" height="52" class="key"/>
 <text x="0" y="0" class="key tap">GME</text>
+<text x="0" y="24" class="key hold">toggle</text>
 </g>
 <g transform="translate(38, 150) rotate(-8.0)" class="key keypos-10">
 <rect rx="6" ry="6" x="-28" y="-26" width="55" height="52" class="key"/>
@@ -1071,7 +1075,7 @@ path.combo {
 </g>
 </g>
 </g>
-<g transform="translate(30, 1988)" class="layer-MSE">
+<g transform="translate(30, 1972)" class="layer-MSE">
 <text x="0" y="28" class="label">MSE:</text>
 <g transform="translate(0, 56)">
 <g transform="translate(30, 93) rotate(-8.0)" class="key keypos-0">
@@ -1091,33 +1095,23 @@ path.combo {
 </g>
 <g transform="translate(449, 71)" class="key keypos-5">
 <rect rx="6" ry="6" x="-28" y="-26" width="55" height="52" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-0.6em" style="font-size: 78%">&amp;msc</tspan><tspan x="0" dy="1.2em" style="font-size: 78%">SCRL_LEFT</tspan>
-</text>
+<text x="0" y="0" class="key tap">MW←</text>
 </g>
 <g transform="translate(510, 42)" class="key keypos-6">
 <rect rx="6" ry="6" x="-28" y="-26" width="55" height="52" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-0.6em" style="font-size: 78%">&amp;msc</tspan><tspan x="0" dy="1.2em" style="font-size: 78%">SCRL_DOWN</tspan>
-</text>
+<text x="0" y="0" class="key tap">MW↓</text>
 </g>
 <g transform="translate(570, 28)" class="key keypos-7">
 <rect rx="6" ry="6" x="-28" y="-26" width="55" height="52" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-0.6em">&amp;mmv</tspan><tspan x="0" dy="1.2em">MOVE_UP</tspan>
-</text>
+<text x="0" y="0" class="key tap">M↑</text>
 </g>
 <g transform="translate(637, 46) rotate(3.0)" class="key keypos-8">
 <rect rx="6" ry="6" x="-28" y="-26" width="55" height="52" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-0.6em">&amp;msc</tspan><tspan x="0" dy="1.2em">SCRL_UP</tspan>
-</text>
+<text x="0" y="0" class="key tap">MW↑</text>
 </g>
 <g transform="translate(702, 93) rotate(8.0)" class="key keypos-9">
 <rect rx="6" ry="6" x="-28" y="-26" width="55" height="52" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-0.6em" style="font-size: 70%">&amp;msc</tspan><tspan x="0" dy="1.2em" style="font-size: 70%">SCRL_RIGHT</tspan>
-</text>
+<text x="0" y="0" class="key tap">MW→</text>
 </g>
 <g transform="translate(38, 150) rotate(-8.0)" class="key keypos-10">
 <rect rx="6" ry="6" x="-28" y="-26" width="55" height="52" class="key"/>
@@ -1143,21 +1137,15 @@ path.combo {
 </g>
 <g transform="translate(510, 100)" class="key keypos-16">
 <rect rx="6" ry="6" x="-28" y="-26" width="55" height="52" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-0.6em" style="font-size: 78%">&amp;mmv</tspan><tspan x="0" dy="1.2em" style="font-size: 78%">MOVE_LEFT</tspan>
-</text>
+<text x="0" y="0" class="key tap">M←</text>
 </g>
 <g transform="translate(570, 86)" class="key keypos-17">
 <rect rx="6" ry="6" x="-28" y="-26" width="55" height="52" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-0.6em" style="font-size: 78%">&amp;mmv</tspan><tspan x="0" dy="1.2em" style="font-size: 78%">MOVE_DOWN</tspan>
-</text>
+<text x="0" y="0" class="key tap">M↓</text>
 </g>
 <g transform="translate(634, 103) rotate(3.0)" class="key keypos-18">
 <rect rx="6" ry="6" x="-28" y="-26" width="55" height="52" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-0.6em" style="font-size: 70%">&amp;mmv</tspan><tspan x="0" dy="1.2em" style="font-size: 70%">MOVE_RIGHT</tspan>
-</text>
+<text x="0" y="0" class="key tap">M→</text>
 </g>
 <g transform="translate(694, 150) rotate(8.0)" class="key keypos-19">
 <rect rx="6" ry="6" x="-28" y="-26" width="55" height="52" class="key"/>
diff --git a/keymap-drawer/rommana.yaml b/keymap-drawer/rommana.yaml
index eade5ae0..7f0f860c 100644
--- a/keymap-drawer/rommana.yaml
+++ b/keymap-drawer/rommana.yaml
@@ -62,7 +62,37 @@ layers:
   - {t: ␣, h: NAV}
   - {t: ⌫, h: SYM}
   - {t: ⏎, h: Shift}
-  GME: [↹, Q, W, E, R, Y, U, I, O, P, Esc, A, S, D, F, H, J, K, L, GME, Z, X, C, M, ',', ., Alt, ␣, NAV, ⏎]
+  GME:
+  - ↹
+  - Q
+  - W
+  - E
+  - R
+  - Y
+  - U
+  - I
+  - O
+  - P
+  - Esc
+  - A
+  - S
+  - D
+  - F
+  - H
+  - J
+  - K
+  - L
+  - {t: GME, h: toggle}
+  - Z
+  - X
+  - C
+  - M
+  - ','
+  - .
+  - Alt
+  - ␣
+  - NAV
+  - ⏎
   SYM:
   - '!'
   - '@'
@@ -133,9 +163,9 @@ layers:
   - F5
   - Out USB
   - Out BLE
-  - DEF
-  - BRD
-  - GME
+  - {t: DEF, h: toggle}
+  - {t: BRD, h: toggle}
+  - {t: GME, h: toggle}
   - F6
   - F7
   - F8
@@ -162,20 +192,20 @@ layers:
   - ''
   - ''
   - ''
-  - '&msc SCRL_LEFT'
-  - '&msc SCRL_DOWN'
-  - '&mmv MOVE_UP'
-  - '&msc SCRL_UP'
-  - '&msc SCRL_RIGHT'
+  - MW←
+  - MW↓
+  - M↑
+  - MW↑
+  - MW→
   - Ctrl
   - Gui
   - Alt
   - Shift
   - ''
   - ''
-  - '&mmv MOVE_LEFT'
-  - '&mmv MOVE_DOWN'
-  - '&mmv MOVE_RIGHT'
+  - M←
+  - M↓
+  - M→
   - ''
   - ''
   - ''