From bd7a64d1627c3f51aae649e17d9274ca4dcc497d Mon Sep 17 00:00:00 2001
From: caksoylar <caksoylar@users.noreply.github.com>
Date: Wed, 3 Jan 2024 12:25:17 -0800
Subject: [PATCH] Wait until key release to start alt-tab timer

---
 config/3x5.dtsi                 |   3 +-
 keymap-drawer/corneish_zen.svg  | 159 +-------------------------------
 keymap-drawer/corneish_zen.yaml |  48 +---------
 keymap-drawer/hypergolic.svg    |   7 +-
 keymap-drawer/hypergolic.yaml   |   4 +-
 keymap-drawer/rommana.svg       | 141 +---------------------------
 keymap-drawer/rommana.yaml      |  42 +--------
 7 files changed, 17 insertions(+), 387 deletions(-)

diff --git a/config/3x5.dtsi b/config/3x5.dtsi
index c5faa51b..b0b1f28f 100644
--- a/config/3x5.dtsi
+++ b/config/3x5.dtsi
@@ -184,7 +184,8 @@
             tap-ms = <10>;
             bindings = <&macro_press &kp LALT>    // leave ALT down to keep menu up
                      , <&macro_tap &kp TAB>       // open the menu
-                     , <&macro_tap &sk_at RALT>   // this will release ALT after a timeout
+                     , <&macro_pause_for_release> // wait until key release
+                     , <&macro_tap &sk_at RALT>   // start timer to release ALT after timeout
                      , <&macro_release &kp LALT>; // now release the initial hold
         )
     };
diff --git a/keymap-drawer/corneish_zen.svg b/keymap-drawer/corneish_zen.svg
index e074797c..4343ccb7 100644
--- a/keymap-drawer/corneish_zen.svg
+++ b/keymap-drawer/corneish_zen.svg
@@ -1,4 +1,4 @@
-<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">
+<svg width="788" height="2040" viewBox="0 0 788 2040" 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;
@@ -206,7 +206,6 @@ path.combo {
 <g transform="translate(196, 147)" class="key keypos-23">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
 <text x="0" y="0" class="key tap">D</text>
-<text x="0" y="24" class="key hold">MSE</text>
 </g>
 <g transform="translate(252, 154)" class="key ghost keypos-24">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key ghost"/>
@@ -330,10 +329,6 @@ path.combo {
 <rect rx="6" ry="6" x="602" y="130" width="28" height="26" class="combo"/>
 <text x="616" y="144" class="combo tap">/</text>
 </g>
-<g class="combo combopos-15">
-<rect rx="6" ry="6" x="248" y="206" width="28" height="26" class="combo"/>
-<text x="262" y="219" class="combo tap">MSE</text>
-</g>
 </g>
 </g>
 <g transform="translate(30, 331)" class="layer-BRD">
@@ -441,7 +436,6 @@ path.combo {
 <g transform="translate(196, 147)" class="key keypos-23">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
 <text x="0" y="0" class="key tap">G</text>
-<text x="0" y="24" class="key hold">MSE</text>
 </g>
 <g transform="translate(252, 154)" class="key ghost keypos-24">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key ghost"/>
@@ -562,10 +556,6 @@ path.combo {
 <rect rx="6" ry="6" x="602" y="130" width="28" height="26" class="combo"/>
 <text x="616" y="144" class="combo tap">/</text>
 </g>
-<g class="combo combopos-15">
-<rect rx="6" ry="6" x="248" y="206" width="28" height="26" class="combo"/>
-<text x="262" y="219" class="combo tap">MSE</text>
-</g>
 </g>
 </g>
 <g transform="translate(30, 661)" class="layer-GME">
@@ -997,15 +987,10 @@ path.combo {
 </g>
 <g transform="translate(84, 147)" class="key keypos-21">
 <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">Win</tspan><tspan x="0" dy="1.2em">Prev</tspan>
-</text>
 </g>
 <g transform="translate(140, 140)" class="key keypos-22">
 <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">Win</tspan><tspan x="0" dy="1.2em">Next</tspan>
-</text>
+<text x="0" y="0" class="key tap"><tspan style="font-size: 64%">&amp;alt_tabber</tspan></text>
 </g>
 <g transform="translate(196, 147)" class="key keypos-23">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
@@ -1244,144 +1229,4 @@ path.combo {
 </g>
 </g>
 </g>
-<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">
-<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-</g>
-<g transform="translate(84, 35)" class="key keypos-1">
-<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-</g>
-<g transform="translate(140, 28)" class="key keypos-2">
-<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-</g>
-<g transform="translate(196, 35)" class="key keypos-3">
-<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-</g>
-<g transform="translate(252, 42)" class="key keypos-4">
-<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-</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">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">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">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">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">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"/>
-<text x="0" y="0" class="key tap">Ctrl</text>
-</g>
-<g transform="translate(84, 91)" class="key keypos-11">
-<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">Gui</text>
-</g>
-<g transform="translate(140, 84)" class="key keypos-12">
-<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">Alt</text>
-</g>
-<g transform="translate(196, 91)" class="key keypos-13">
-<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">Shift</text>
-</g>
-<g transform="translate(252, 98)" class="key keypos-14">
-<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-</g>
-<g transform="translate(476, 98)" class="key keypos-15">
-<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-</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">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">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">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"/>
-</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"/>
-</g>
-<g transform="translate(84, 147)" class="key keypos-21">
-<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-</g>
-<g transform="translate(140, 140)" class="key keypos-22">
-<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-</g>
-<g transform="translate(196, 147)" class="key held keypos-23">
-<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key held"/>
-</g>
-<g transform="translate(252, 154)" class="key ghost keypos-24">
-<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key ghost"/>
-</g>
-<g transform="translate(476, 154)" class="key ghost keypos-25">
-<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key ghost"/>
-</g>
-<g transform="translate(532, 147)" class="key keypos-26">
-<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">Back</tspan><tspan x="0" dy="1.2em">Click</tspan>
-</text>
-</g>
-<g transform="translate(588, 140)" class="key keypos-27">
-<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">Middle</tspan><tspan x="0" dy="1.2em">Click</tspan>
-</text>
-</g>
-<g transform="translate(644, 147)" class="key keypos-28">
-<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">Forward</tspan><tspan x="0" dy="1.2em">Click</tspan>
-</text>
-</g>
-<g transform="translate(700, 161)" class="key ghost keypos-29">
-<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key ghost"/>
-</g>
-<g transform="translate(168, 205)" class="key ghost keypos-30">
-<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key ghost"/>
-</g>
-<g transform="translate(230, 213) rotate(15.0)" class="key keypos-31">
-<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-</g>
-<g transform="translate(295, 224) rotate(30.0)" class="key keypos-32">
-<rect rx="6" ry="6" x="-26" y="-40" width="52" height="80" class="key"/>
-</g>
-<g transform="translate(433, 224) rotate(-30.0)" class="key keypos-33">
-<rect rx="6" ry="6" x="-26" y="-40" width="52" height="80" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-0.6em">Left</tspan><tspan x="0" dy="1.2em">Click</tspan>
-</text>
-</g>
-<g transform="translate(498, 213) rotate(-15.0)" class="key keypos-34">
-<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">Right</tspan><tspan x="0" dy="1.2em">Click</tspan>
-</text>
-</g>
-<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"/>
-</g>
-</g>
-</g>
 </svg>
diff --git a/keymap-drawer/corneish_zen.yaml b/keymap-drawer/corneish_zen.yaml
index 9ed54423..0d706a9e 100644
--- a/keymap-drawer/corneish_zen.yaml
+++ b/keymap-drawer/corneish_zen.yaml
@@ -24,7 +24,7 @@ layers:
   - Z
   - X
   - C
-  - {t: D, h: MSE}
+  - D
   - V
   - J
   - H
@@ -61,7 +61,7 @@ layers:
   - ''
   - W
   - M
-  - {t: G, h: MSE}
+  - G
   - ''
   - ''
   - D
@@ -170,8 +170,8 @@ layers:
   - →
   - End
   - ''
-  - Win Prev
-  - Win Next
+  - ''
+  - '&alt_tabber'
   - Paste
   - ⏯
   - ''
@@ -222,43 +222,6 @@ layers:
   - {type: held}
   - Boot
   - ''
-  MSE:
-  - ''
-  - ''
-  - ''
-  - ''
-  - ''
-  - MW←
-  - MW↓
-  - M↑
-  - MW↑
-  - MW→
-  - Ctrl
-  - Gui
-  - Alt
-  - Shift
-  - ''
-  - ''
-  - M←
-  - M↓
-  - M→
-  - ''
-  - ''
-  - ''
-  - ''
-  - {type: held}
-  - ''
-  - ''
-  - Back Click
-  - Middle Click
-  - Forward Click
-  - ''
-  - ''
-  - ''
-  - ''
-  - Left Click
-  - Right Click
-  - ''
 combos:
 - p: [2, 3]
   k: J
@@ -327,6 +290,3 @@ combos:
   k: BT CLR
   l: [FUN]
   a: bottom
-- p: [31, 32]
-  k: MSE
-  l: [DEF, BRD]
diff --git a/keymap-drawer/hypergolic.svg b/keymap-drawer/hypergolic.svg
index b5de313c..a2abd2fa 100644
--- a/keymap-drawer/hypergolic.svg
+++ b/keymap-drawer/hypergolic.svg
@@ -950,15 +950,10 @@ path.combo {
 </g>
 <g transform="translate(112, 163) rotate(-5.0)" class="key keypos-21">
 <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">Win</tspan><tspan x="0" dy="1.2em">Prev</tspan>
-</text>
 </g>
 <g transform="translate(173, 140)" class="key keypos-22">
 <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">Win</tspan><tspan x="0" dy="1.2em">Next</tspan>
-</text>
+<text x="0" y="0" class="key tap"><tspan style="font-size: 64%">&amp;alt_tabber</tspan></text>
 </g>
 <g transform="translate(232, 161)" class="key keypos-23">
 <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 ff78c7ee..93c13b8e 100644
--- a/keymap-drawer/hypergolic.yaml
+++ b/keymap-drawer/hypergolic.yaml
@@ -162,8 +162,8 @@ layers:
   - →
   - End
   - ''
-  - Win Prev
-  - Win Next
+  - ''
+  - '&alt_tabber'
   - Paste
   - ⏯
   - ''
diff --git a/keymap-drawer/rommana.svg b/keymap-drawer/rommana.svg
index 1783ee6c..d8dd26cb 100644
--- a/keymap-drawer/rommana.svg
+++ b/keymap-drawer/rommana.svg
@@ -1,4 +1,4 @@
-<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">
+<svg width="795" height="2028" viewBox="0 0 795 2028" 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;
@@ -202,7 +202,6 @@ path.combo {
 <g transform="translate(222, 158)" class="key keypos-22">
 <rect rx="6" ry="6" x="-28" y="-26" width="55" height="52" class="key"/>
 <text x="0" y="0" class="key tap">D</text>
-<text x="0" y="24" class="key hold">MSE</text>
 </g>
 <g transform="translate(510, 158)" class="key keypos-23">
 <rect rx="6" ry="6" x="-28" y="-26" width="55" height="52" class="key"/>
@@ -304,10 +303,6 @@ path.combo {
 <rect rx="6" ry="6" x="587" y="139" width="28" height="26" class="combo"/>
 <text x="601" y="152" class="combo tap">/</text>
 </g>
-<g class="combo combopos-15">
-<rect rx="6" ry="6" x="253" y="224" width="28" height="26" class="combo"/>
-<text x="267" y="237" class="combo tap">MSE</text>
-</g>
 </g>
 </g>
 <g transform="translate(30, 329)" class="layer-BRD">
@@ -412,7 +407,6 @@ path.combo {
 <g transform="translate(222, 158)" class="key keypos-22">
 <rect rx="6" ry="6" x="-28" y="-26" width="55" height="52" class="key"/>
 <text x="0" y="0" class="key tap">G</text>
-<text x="0" y="24" class="key hold">MSE</text>
 </g>
 <g transform="translate(510, 158)" class="key keypos-23">
 <rect rx="6" ry="6" x="-28" y="-26" width="55" height="52" class="key"/>
@@ -514,10 +508,6 @@ path.combo {
 <rect rx="6" ry="6" x="587" y="139" width="28" height="26" class="combo"/>
 <text x="601" y="152" class="combo tap">/</text>
 </g>
-<g class="combo combopos-15">
-<rect rx="6" ry="6" x="253" y="224" width="28" height="26" class="combo"/>
-<text x="267" y="237" class="combo tap">MSE</text>
-</g>
 </g>
 </g>
 <g transform="translate(30, 657)" class="layer-GME">
@@ -899,15 +889,10 @@ path.combo {
 </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"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-0.6em">Win</tspan><tspan x="0" dy="1.2em">Prev</tspan>
-</text>
 </g>
 <g transform="translate(161, 143)" class="key keypos-21">
 <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">Win</tspan><tspan x="0" dy="1.2em">Next</tspan>
-</text>
+<text x="0" y="0" class="key tap"><tspan style="font-size: 64%">&amp;alt_tabber</tspan></text>
 </g>
 <g transform="translate(222, 158)" class="key keypos-22">
 <rect rx="6" ry="6" x="-28" y="-26" width="55" height="52" class="key"/>
@@ -1109,126 +1094,4 @@ path.combo {
 </g>
 </g>
 </g>
-<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">
-<rect rx="6" ry="6" x="-28" y="-26" width="55" height="52" class="key"/>
-</g>
-<g transform="translate(95, 46) rotate(-3.0)" class="key keypos-1">
-<rect rx="6" ry="6" x="-28" y="-26" width="55" height="52" class="key"/>
-</g>
-<g transform="translate(161, 28)" class="key keypos-2">
-<rect rx="6" ry="6" x="-28" y="-26" width="55" height="52" class="key"/>
-</g>
-<g transform="translate(222, 42)" class="key keypos-3">
-<rect rx="6" ry="6" x="-28" y="-26" width="55" height="52" class="key"/>
-</g>
-<g transform="translate(283, 71)" class="key keypos-4">
-<rect rx="6" ry="6" x="-28" y="-26" width="55" height="52" class="key"/>
-</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">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">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">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">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">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"/>
-<text x="0" y="0" class="key tap">Ctrl</text>
-</g>
-<g transform="translate(98, 103) rotate(-3.0)" class="key keypos-11">
-<rect rx="6" ry="6" x="-28" y="-26" width="55" height="52" class="key"/>
-<text x="0" y="0" class="key tap">Gui</text>
-</g>
-<g transform="translate(161, 86)" class="key keypos-12">
-<rect rx="6" ry="6" x="-28" y="-26" width="55" height="52" class="key"/>
-<text x="0" y="0" class="key tap">Alt</text>
-</g>
-<g transform="translate(222, 100)" class="key keypos-13">
-<rect rx="6" ry="6" x="-28" y="-26" width="55" height="52" class="key"/>
-<text x="0" y="0" class="key tap">Shift</text>
-</g>
-<g transform="translate(283, 129)" class="key keypos-14">
-<rect rx="6" ry="6" x="-28" y="-26" width="55" height="52" class="key"/>
-</g>
-<g transform="translate(449, 129)" class="key keypos-15">
-<rect rx="6" ry="6" x="-28" y="-26" width="55" height="52" class="key"/>
-</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">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">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">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"/>
-</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"/>
-</g>
-<g transform="translate(161, 143)" class="key keypos-21">
-<rect rx="6" ry="6" x="-28" y="-26" width="55" height="52" class="key"/>
-</g>
-<g transform="translate(222, 158)" class="key held keypos-22">
-<rect rx="6" ry="6" x="-28" y="-26" width="55" height="52" class="key held"/>
-</g>
-<g transform="translate(510, 158)" class="key keypos-23">
-<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">Back</tspan><tspan x="0" dy="1.2em">Click</tspan>
-</text>
-</g>
-<g transform="translate(570, 143)" class="key keypos-24">
-<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">Middle</tspan><tspan x="0" dy="1.2em">Click</tspan>
-</text>
-</g>
-<g transform="translate(631, 161) rotate(3.0)" class="key keypos-25">
-<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">Forward</tspan><tspan x="0" dy="1.2em">Click</tspan>
-</text>
-</g>
-<g transform="translate(237, 230)" class="key keypos-26">
-<rect rx="6" ry="6" x="-28" y="-26" width="55" height="52" class="key"/>
-</g>
-<g transform="translate(298, 245)" class="key keypos-27">
-<rect rx="6" ry="6" x="-28" y="-26" width="55" height="52" class="key"/>
-</g>
-<g transform="translate(433, 245)" class="key keypos-28">
-<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">Left</tspan><tspan x="0" dy="1.2em">Click</tspan>
-</text>
-</g>
-<g transform="translate(494, 230)" class="key keypos-29">
-<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">Right</tspan><tspan x="0" dy="1.2em">Click</tspan>
-</text>
-</g>
-</g>
-</g>
 </svg>
diff --git a/keymap-drawer/rommana.yaml b/keymap-drawer/rommana.yaml
index 6a060eb5..2d277ed1 100644
--- a/keymap-drawer/rommana.yaml
+++ b/keymap-drawer/rommana.yaml
@@ -23,7 +23,7 @@ layers:
   - {t: O, h: Ctrl}
   - X
   - C
-  - {t: D, h: MSE}
+  - D
   - H
   - ','
   - .
@@ -54,7 +54,7 @@ layers:
   - {t: A, h: Ctrl}
   - W
   - M
-  - {t: G, h: MSE}
+  - G
   - D
   - ','
   - .
@@ -145,8 +145,8 @@ layers:
   - ↓
   - →
   - End
-  - Win Prev
-  - Win Next
+  - ''
+  - '&alt_tabber'
   - Paste
   - ⌦
   - ⏮️
@@ -186,37 +186,6 @@ layers:
   - {type: held}
   - {type: held}
   - Boot
-  MSE:
-  - ''
-  - ''
-  - ''
-  - ''
-  - ''
-  - MW←
-  - MW↓
-  - M↑
-  - MW↑
-  - MW→
-  - Ctrl
-  - Gui
-  - Alt
-  - Shift
-  - ''
-  - ''
-  - M←
-  - M↓
-  - M→
-  - ''
-  - ''
-  - ''
-  - {type: held}
-  - Back Click
-  - Middle Click
-  - Forward Click
-  - ''
-  - ''
-  - Left Click
-  - Right Click
 combos:
 - p: [2, 3]
   k: J
@@ -285,6 +254,3 @@ combos:
   k: BT CLR
   l: [FUN]
   a: bottom
-- p: [26, 27]
-  k: MSE
-  l: [DEF, BRD]