Commit 64b10843b9be

Vincent Demeester <vincent@sbr.pm>
2025-11-21 22:07:26
fix(keyboards): Fix QMK keymap rendering with proper character mappings
- Enable correct display of French characters and symbols in keymaps - Show readable characters instead of raw keycode names (HM_GUI_A → A) - Apply keycode mappings during parse to ensure proper visualization Co-Authored-By: Claude <noreply@anthropic.com> Signed-off-by: Vincent Demeester <vincent@sbr.pm>
main
1 parent 70b45f9
Changed files (3)
keyboards
keymap-drawer
config.yaml
generate-keymaps.sh
moonlander.svg
keyboards/keymap-drawer/config.yaml
@@ -643,6 +643,57 @@ parse_config:
     BT_CLR: '$$bt-clear$$'
     BT_NXT: '$$bt-next$$'
     BT_PRV: '$$bt-prev$$'
+    # QMK/Moonlander specific keycodes
+    FR_DQUO: '"'
+    FR_QUOT: "'"
+    FR_GRAVE: "`"
+    FR_CIRC: "^"
+    FR_E_AIGU: "É"
+    FR_E_AIGU_CAPS: "É"
+    FR_E_GRAVE: "È"
+    FR_E_GRAVE_CAPS: "È"
+    FR_A_GRAVE: "À"
+    FR_A_GRAVE_CAPS: "À"
+    US_LDAQ: "«"
+    US_RDAQ: "»"
+    US_BRKP: "¦"
+    NUMWORD: "NUMWORD"
+    VRSN: "VER"
+    LED_LEVEL: "LED"
+    TOGGLE_LAYER_COLOR: "RGB"
+    RM_TOGG: "RGB ⇄"
+    RM_VALU: "RGB +"
+    RM_VALD: "RGB -"
+    RM_HUEU: "HUE +"
+    RM_HUED: "HUE -"
+    # Home row mods (after KC_ prefix removal)
+    HM_GUI_A: "A"
+    HM_ALT_U: "U"
+    HM_SFT_I: "I"
+    HM_CTL_E: "E"
+    HM_HYP_COMM: ","
+    HM_HYP_C: "C"
+    HM_CTL_T: "T"
+    HM_SFT_S: "S"
+    HM_ALT_R: "R"
+    HM_GUI_N: "N"
+    HM_ALT_S: "S"
+    HM_SFT_D: "D"
+    HM_CTL_F: "F"
+    HM_HYP_G: "G"
+    HM_HYP_H: "H"
+    HM_CTL_J: "J"
+    HM_SFT_K: "K"
+    HM_ALT_L: "L"
+    HM_GUI_SCLN: ";"
+    # QMK keypad keys (after KC_ prefix removal)
+    PMNS: "-"
+    PSLS: "/"
+    PAST: "*"
+    PPLS: "+"
+    PDOT: "."
+    PCMM: ","
+    PERC: "%"
   zmk_combos:
     combo_capsword:
       draw_separate: true
@@ -656,5 +707,150 @@ parse_config:
       draw_separate: true
     combo_toggle_mouse:
       draw_separate: true
+  qmk_remove_keycode_prefix: ["KC_", "QK_", "OS_"]
+  qmk_keycode_map:
+    # Custom French keycodes (US International layout) - with and without prefix
+    "FR_DQUO": '"'
+    "DQUO": '"'
+    "FR_QUOT": "'"
+    "QUOT": "'"
+    "FR_GRAVE": "`"
+    "GRAVE": "`"
+    "FR_CIRC": "^"
+    "CIRC": "^"
+    "FR_E_AIGU": "É"
+    "E_AIGU": "É"
+    "FR_E_AIGU_CAPS": "É"
+    "E_AIGU_CAPS": "É"
+    "FR_E_GRAVE": "È"
+    "E_GRAVE": "È"
+    "FR_E_GRAVE_CAPS": "È"
+    "E_GRAVE_CAPS": "È"
+    "FR_A_GRAVE": "À"
+    "A_GRAVE": "À"
+    "FR_A_GRAVE_CAPS": "À"
+    "A_GRAVE_CAPS": "À"
+    # US International keycodes - with and without prefix
+    "US_LDAQ": "«"
+    "LDAQ": "«"
+    "US_RDAQ": "»"
+    "RDAQ": "»"
+    "US_BRKP": "¦"
+    "BRKP": "¦"
+    # Keypad keycodes (already removed KC_ prefix)
+    "PMNS": "-"
+    "PSLS": "/"
+    "PAST": "*"
+    "PPLS": "+"
+    "PDOT": "."
+    "PCMM": ","
+    # Custom macros and special functions
+    "VRSN": "VER"
+    "NUMWORD": "NUMWORD"
+    # Home row mods - show base letter
+    "HM_GUI_A": "A"
+    "HM_ALT_U": "U"
+    "HM_SFT_I": "I"
+    "HM_CTL_E": "E"
+    "HM_HYP_COMM": ","
+    "HM_HYP_C": "C"
+    "HM_CTL_T": "T"
+    "HM_SFT_S": "S"
+    "HM_ALT_R": "R"
+    "HM_GUI_N": "N"
+    "HM_ALT_S": "S"
+    "HM_SFT_D": "D"
+    "HM_CTL_F": "F"
+    "HM_HYP_G": "G"
+    "HM_HYP_H": "H"
+    "HM_CTL_J": "J"
+    "HM_SFT_K": "K"
+    "HM_ALT_L": "L"
+    "HM_GUI_SCLN": ";"
+    # Layer switching
+    "TO(BEPO)": "→ Bépo"
+    "TO(ERGL)": "→ ErgoL"
+    "TO(QWER)": "→ QWERTY"
+    "TG(MOUS)": "⇄ Mouse"
+    # One shot mods
+    "OS_LSFT": "⇪ Shift"
+    "OS_LGUI": "⇪ GUI"
+    "OS_LALT": "⇪ Alt"
+    "OS_LCTL": "⇪ Ctrl"
+    "OS_HYPR": "⇪ Hyper"
+    # ZSA-specific
+    "LED_LEVEL": "LED"
+    "TOGGLE_LAYER_COLOR": "RGB"
+    "RM_TOGG": "RGB ⇄"
+    "RM_VALU": "RGB +"
+    "RM_VALD": "RGB -"
+    "RM_HUEU": "HUE +"
+    "RM_HUED": "HUE -"
+    # QMK standard (extend existing mappings)
+    "XXXXXXX": ""
+    "NO": ""
+    "TRNS": "▽"
+    "BOOT": "RESET"
+    "EE_CLR": "EE CLR"
+    # Mouse keys
+    "MS_UP": "$$cursor-up$$"
+    "MS_DOWN": "$$cursor-down$$"
+    "MS_LEFT": "$$cursor-left$$"
+    "MS_RGHT": "$$cursor-right$$"
+    "MS_BTN1": "$$material:left_click$$"
+    "MS_BTN2": "$$material:right_click$$"
+    "MS_BTN3": "$$click-middle$$"
+    "MS_WHLU": "$$scroll-up$$"
+    "MS_WHLD": "$$scroll-down$$"
+    "MS_WHLL": "$$scroll-left$$"
+    "MS_WHLR": "$$scroll-right$$"
+    # Media keys
+    "MPRV": "$$tabler:player-track-prev$$"
+    "MNXT": "$$tabler:player-track-next$$"
+    "MPLY": "$$play-pause$$"
+    "MUTE": "MUTE"
+    "VOLD": "VOL-"
+    "VOLU": "VOL+"
+    # Navigation
+    "PGUP": "PAGE UP"
+    "PGDN": "PAGE DOWN"
+    # Leader key
+    "LEAD": "LEADER"
+    # Repeat keys
+    "REP": "REPEAT"
+    "AREP": "ALT REPEAT"
+    # Additional standard keycodes that may appear after KC_ removal
+    "DLR": "$"
+    "LPRN": "("
+    "RPRN": ")"
+    "AT": "@"
+    "PLUS": "+"
+    "PERC": "%"
+    "CIRC": "^"
+    "GRV": "`"
+    "LABK": "<"
+    "RABK": ">"
+    "PMNS": "-"
+    "PIPE": "|"
+    "LCBR": "{"
+    "RCBR": "}"
+    "EXLM": "!"
+    "PSLS": "/"
+    "EQL": "="
+    "AMPR": "&"
+    "HASH": "#"
+    "SCLN": ";"
+    "TILD": "~"
+    "LBRC": "["
+    "RBRC": "]"
+    "COLN": ":"
+    "COMM": ","
+    "PPLS": "+"
+    "PCMM": ","
+    "PDOT": "."
+    "TAB": "⇥"
+    "BSPC": "⌫"
+    "ENT": "↵"
+    "SPC": "␣"
keyboards/generate-keymaps.sh
@@ -83,7 +83,7 @@ generate_moonlander() {
 	fi
 
 	# Parse QMK JSON and draw SVG
-	keymap parse -c 14 -q "$qmk_json" |
+	keymap -c "$config_yaml" parse -c 14 -q "$qmk_json" |
 		keymap -c "$config_yaml" draw - >"$output_svg"
 
 	log_success "Generated: $output_svg"
keyboards/moonlander.svg
@@ -1,4 +1,109 @@
 <svg width="1012" height="3640" viewBox="0 0 1012 3640" class="keymap" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<defs>/* start glyphs */
+<svg id="click-middle">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -960 1120 1120">
+    <path fill="#fff" d="m738.2-366.06-41.73-77.07q29-47.38 22.98-102.18-6-54.8-46.31-95.1Q626.47-687.1 560-687.1t-113.14 46.67q-40.3 40.3-46.31 95.11-6.01 54.8 22.98 102.18l-41.72 77.07q-64.35-71.42-62.23-166.88 2.13-95.46 70.71-164.04Q461.01-767.7 560-767.7q99 0 169.7 70.72 68.6 68.58 70.72 164.04 2.12 95.46-62.23 166.88zM615.85 10.83H504.14V-231L362-159.58l198-367.7 197.99 367.7L615.86-231Z"/>
+</svg>
+
+</svg>
+<svg id="cursor-down">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 71.63 71.64">
+    <path d="m24.1 59.94 11.71 11.7 11.7-11.7H35.8Z" style="color:#000;fill:#fff;stroke-width:.7;stroke-linecap:round;-inkscape-stroke:none"/>
+    <path d="m46.57 53.66-13.9-13.9-4.06 12.27-9.75-32.5 32.5 9.75-12.26 4.06 13.89 13.9z" style="fill:#fff;fill-opacity:1;stroke-width:.0812514"/>
+</svg>
+
+</svg>
+<svg id="cursor-left">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 71.63 71.64">
+    <path d="M11.69 24.12 0 35.82l11.7 11.7v-11.7z" style="color:#000;fill:#fff;stroke-width:.7;stroke-linecap:round;-inkscape-stroke:none"/>
+    <path d="m46.57 53.66-13.9-13.9-4.06 12.27-9.75-32.5 32.5 9.75-12.26 4.06 13.89 13.9z" style="fill:#fff;fill-opacity:1;stroke-width:.0812514"/>
+</svg>
+
+</svg>
+<svg id="cursor-right">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 71.63 71.64">
+    <path d="m59.94 47.52 11.69-11.7-11.7-11.7v11.7z" style="color:#000;fill:#fff;stroke-width:.7;stroke-linecap:round;-inkscape-stroke:none"/>
+    <path d="m46.57 53.66-13.9-13.9-4.06 12.27-9.75-32.5 32.5 9.75-12.26 4.06 13.89 13.9z" style="fill:#fff;fill-opacity:1;stroke-width:.0812514"/>
+</svg>
+
+</svg>
+<svg id="cursor-up">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 71.63 71.64">
+    <path d="M47.5 11.69 35.82 0l-11.7 11.69H35.8z" style="color:#000;fill:#fff;stroke-width:.7;stroke-linecap:round;-inkscape-stroke:none"/>
+    <path d="m46.57 53.66-13.9-13.9-4.06 12.27-9.75-32.5 32.5 9.75-12.26 4.06 13.89 13.9z" style="fill:#fff;fill-opacity:1;stroke-width:.0812514"/>
+</svg>
+
+</svg>
+<svg id="material:left_click">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -960 960 960"><path d="M468-240q-96-5-162-74t-66-166q0-100 70-170t170-70q97 0 166 66t74 163l-63-20q-11-64-60-106.5T480-660q-75 0-127.5 52.5T300-480q0 67 42.5 116.5T449-303l19 63ZM821-60 650-231 600-80 480-480l400 120-151 50 171 171-79 79Z"/></svg>
+</svg>
+<svg id="material:right_click">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -960 960 960"><path d="m492-240 19-63q64-11 106.5-60.5T660-480q0-75-52.5-127.5T480-660q-68 0-117 42.5T303-511l-63 20q5-97 74-163t166-66q100 0 170 70t70 170q0 97-66 166t-162 74ZM139-60l-79-79 171-171-151-50 400-120L360-80l-50-151L139-60Z"/></svg>
+</svg>
+<svg id="play-pause">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 26" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" class="icon icon-tabler icon-tabler-player-play">
+    <path fill="#fff" stroke="none" d="M11.02 4v16a1 1 0 0 0 1.52.85l13-8a1 1 0 0 0 0-1.7l-13-8a1 1 0 0 0-1.52.85Z" style="fill:#fff;fill-opacity:1"/>
+    <path fill="#fff" stroke="none" d="M1.6 3h2.72c.82 0 1.48.65 1.48 1.45V19.5c0 .8-.66 1.44-1.48 1.44h-2.7c-.82 0-1.48-.65-1.48-1.44V4.45C.14 3.65.8 3 1.61 3Z" style="fill:#fff;fill-opacity:1;stroke:none;stroke-width:0;stroke-dasharray:none"/>
+</svg>
+
+</svg>
+<svg id="scroll-down">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 76.64 76.65">
+    <path d="M51.85 38.32a13.53 13.53 0 0 1-13.53 13.53 13.53 13.53 0 0 1-13.53-13.53 13.53 13.53 0 0 1 13.53-13.53 13.53 13.53 0 0 1 13.53 13.53z" style="fill:#fff;stroke-width:.30994;stroke-linecap:round"/>
+    <path d="m21.6 59.94 16.72 16.71 16.71-16.7H38.32Z" style="color:#000;fill:#fff;stroke-linecap:round;-inkscape-stroke:none"/>
+</svg>
+
+</svg>
+<svg id="scroll-left">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 76.64 76.65">
+    <path d="M51.85 38.32a13.53 13.53 0 0 1-13.53 13.53 13.53 13.53 0 0 1-13.53-13.53 13.53 13.53 0 0 1 13.53-13.53 13.53 13.53 0 0 1 13.53 13.53z" style="fill:#fff;stroke-width:.30994;stroke-linecap:round"/>
+    <path d="M16.7 21.61 0 38.32l16.71 16.72V38.32Z" style="color:#000;fill:#fff;stroke-linecap:round;-inkscape-stroke:none"/>
+</svg>
+
+</svg>
+<svg id="scroll-right">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 76.64 76.65">
+    <path d="M51.85 38.32a13.53 13.53 0 0 1-13.53 13.53 13.53 13.53 0 0 1-13.53-13.53 13.53 13.53 0 0 1 13.53-13.53 13.53 13.53 0 0 1 13.53 13.53z" style="fill:#fff;stroke-width:.30994;stroke-linecap:round"/>
+    <path d="m59.94 55.04 16.7-16.72-16.7-16.7v16.7z" style="color:#000;fill:#fff;stroke-linecap:round;-inkscape-stroke:none"/>
+</svg>
+
+</svg>
+<svg id="scroll-up">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 76.64 76.65">
+    <path d="M51.85 38.32a13.53 13.53 0 0 1-13.53 13.53 13.53 13.53 0 0 1-13.53-13.53 13.53 13.53 0 0 1 13.53-13.53 13.53 13.53 0 0 1 13.53 13.53z" style="fill:#fff;stroke-width:.30994;stroke-linecap:round"/>
+    <path d="M55.03 16.7 38.32 0 21.6 16.7h16.7z" style="color:#000;fill:#fff;stroke-linecap:round;-inkscape-stroke:none"/>
+</svg>
+
+</svg>
+<svg id="tabler:player-track-next">
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+ 
+ 
+  viewBox="0 0 24 24"
+  fill="currentColor"
+  class="icon icon-tabler icons-tabler-filled icon-tabler-player-track-next"
+>
+  <path stroke="none" d="M0 0h24v24H0z" fill="none"/>
+  <path d="M2 5v14c0 .86 1.012 1.318 1.659 .753l8 -7a1 1 0 0 0 0 -1.506l-8 -7c-.647 -.565 -1.659 -.106 -1.659 .753z" />
+  <path d="M13 5v14c0 .86 1.012 1.318 1.659 .753l8 -7a1 1 0 0 0 0 -1.506l-8 -7c-.647 -.565 -1.659 -.106 -1.659 .753z" />
+</svg>
+</svg>
+<svg id="tabler:player-track-prev">
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+ 
+ 
+  viewBox="0 0 24 24"
+  fill="currentColor"
+  class="icon icon-tabler icons-tabler-filled icon-tabler-player-track-prev"
+>
+  <path stroke="none" d="M0 0h24v24H0z" fill="none"/>
+  <path d="M20.341 4.247l-8 7a1 1 0 0 0 0 1.506l8 7c.647 .565 1.659 .106 1.659 -.753v-14c0 -.86 -1.012 -1.318 -1.659 -.753z" />
+  <path d="M9.341 4.247l-8 7a1 1 0 0 0 0 1.506l8 7c.647 .565 1.659 .106 1.659 -.753v-14c0 -.86 -1.012 -1.318 -1.659 -.753z" />
+</svg>
+</svg>
+</defs>/* end glyphs */
 <style>/* inherit to force styles through use tags */
 svg path {
     fill: inherit;
@@ -251,21 +356,15 @@ path.combo {
 </g>
 <g transform="translate(84, 49)" class="key keypos-1">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-0.6em">FR</tspan><tspan x="0" dy="1.2em">DQUO</tspan>
-</text>
+<text x="0" y="0" class="key tap">&quot;</text>
 </g>
 <g transform="translate(140, 35)" class="key keypos-2">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-0.6em">US</tspan><tspan x="0" dy="1.2em">LDAQ</tspan>
-</text>
+<text x="0" y="0" class="key tap">«</text>
 </g>
 <g transform="translate(196, 28)" class="key keypos-3">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-0.6em">US</tspan><tspan x="0" dy="1.2em">RDAQ</tspan>
-</text>
+<text x="0" y="0" class="key tap">»</text>
 </g>
 <g transform="translate(252, 35)" class="key keypos-4">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
@@ -291,15 +390,15 @@ path.combo {
 </g>
 <g transform="translate(756, 28)" class="key keypos-10">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">PMNS</text>
+<text x="0" y="0" class="key tap">-</text>
 </g>
 <g transform="translate(812, 35)" class="key keypos-11">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">PSLS</text>
+<text x="0" y="0" class="key tap">/</text>
 </g>
 <g transform="translate(868, 49)" class="key keypos-12">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">PAST</text>
+<text x="0" y="0" class="key tap">*</text>
 </g>
 <g transform="translate(924, 49)" class="key keypos-13">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
@@ -307,7 +406,7 @@ path.combo {
 </g>
 <g transform="translate(28, 105)" class="key keypos-14">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">TAB</text>
+<text x="0" y="0" class="key tap">⇥</text>
 </g>
 <g transform="translate(84, 105)" class="key keypos-15">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
@@ -315,9 +414,7 @@ path.combo {
 </g>
 <g transform="translate(140, 91)" class="key keypos-16">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-1.2em">FR</tspan><tspan x="0" dy="1.2em">E</tspan><tspan x="0" dy="1.2em">AIGU</tspan>
-</text>
+<text x="0" y="0" class="key tap">É</text>
 </g>
 <g transform="translate(196, 84)" class="key keypos-17">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
@@ -329,9 +426,7 @@ path.combo {
 </g>
 <g transform="translate(308, 98)" class="key keypos-19">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-1.2em">FR</tspan><tspan x="0" dy="1.2em">E</tspan><tspan x="0" dy="1.2em">GRAVE</tspan>
-</text>
+<text x="0" y="0" class="key tap">È</text>
 </g>
 <g transform="translate(364, 98)" class="key keypos-20">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
@@ -369,33 +464,23 @@ path.combo {
 </g>
 <g transform="translate(84, 161)" class="key keypos-29">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-1.2em">HM</tspan><tspan x="0" dy="1.2em">GUI</tspan><tspan x="0" dy="1.2em">A</tspan>
-</text>
+<text x="0" y="0" class="key tap">A</text>
 </g>
 <g transform="translate(140, 147)" class="key keypos-30">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-1.2em">HM</tspan><tspan x="0" dy="1.2em">ALT</tspan><tspan x="0" dy="1.2em">U</tspan>
-</text>
+<text x="0" y="0" class="key tap">U</text>
 </g>
 <g transform="translate(196, 140)" class="key keypos-31">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-1.2em">HM</tspan><tspan x="0" dy="1.2em">SFT</tspan><tspan x="0" dy="1.2em">I</tspan>
-</text>
+<text x="0" y="0" class="key tap">I</text>
 </g>
 <g transform="translate(252, 147)" class="key keypos-32">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-1.2em">HM</tspan><tspan x="0" dy="1.2em">CTL</tspan><tspan x="0" dy="1.2em">E</tspan>
-</text>
+<text x="0" y="0" class="key tap">E</text>
 </g>
 <g transform="translate(308, 154)" class="key keypos-33">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-1.2em">HM</tspan><tspan x="0" dy="1.2em">HYP</tspan><tspan x="0" dy="1.2em">COMM</tspan>
-</text>
+<text x="0" y="0" class="key tap">,</text>
 </g>
 <g transform="translate(364, 154)" class="key keypos-34">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
@@ -405,33 +490,23 @@ path.combo {
 </g>
 <g transform="translate(644, 154)" class="key keypos-36">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-1.2em">HM</tspan><tspan x="0" dy="1.2em">HYP</tspan><tspan x="0" dy="1.2em">C</tspan>
-</text>
+<text x="0" y="0" class="key tap">C</text>
 </g>
 <g transform="translate(700, 147)" class="key keypos-37">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-1.2em">HM</tspan><tspan x="0" dy="1.2em">CTL</tspan><tspan x="0" dy="1.2em">T</tspan>
-</text>
+<text x="0" y="0" class="key tap">T</text>
 </g>
 <g transform="translate(756, 140)" class="key keypos-38">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-1.2em">HM</tspan><tspan x="0" dy="1.2em">SFT</tspan><tspan x="0" dy="1.2em">S</tspan>
-</text>
+<text x="0" y="0" class="key tap">S</text>
 </g>
 <g transform="translate(812, 147)" class="key keypos-39">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-1.2em">HM</tspan><tspan x="0" dy="1.2em">ALT</tspan><tspan x="0" dy="1.2em">R</tspan>
-</text>
+<text x="0" y="0" class="key tap">R</text>
 </g>
 <g transform="translate(868, 161)" class="key keypos-40">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-1.2em">HM</tspan><tspan x="0" dy="1.2em">GUI</tspan><tspan x="0" dy="1.2em">N</tspan>
-</text>
+<text x="0" y="0" class="key tap">N</text>
 </g>
 <g transform="translate(924, 161)" class="key keypos-41">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
@@ -445,9 +520,7 @@ path.combo {
 </g>
 <g transform="translate(84, 217)" class="key keypos-43">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-1.2em">FR</tspan><tspan x="0" dy="1.2em">A</tspan><tspan x="0" dy="1.2em">GRAVE</tspan>
-</text>
+<text x="0" y="0" class="key tap">À</text>
 </g>
 <g transform="translate(140, 203)" class="key keypos-44">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
@@ -459,7 +532,7 @@ path.combo {
 </g>
 <g transform="translate(252, 203)" class="key keypos-46">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">.</text>
+<text x="0" y="0" class="key tap">DOT</text>
 </g>
 <g transform="translate(308, 210)" class="key keypos-47">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
@@ -467,9 +540,7 @@ path.combo {
 </g>
 <g transform="translate(644, 210)" class="key keypos-48">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-0.6em">FR</tspan><tspan x="0" dy="1.2em">QUOT</tspan>
-</text>
+<text x="0" y="0" class="key tap">&#x27;</text>
 </g>
 <g transform="translate(700, 203)" class="key keypos-49">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
@@ -511,14 +582,12 @@ path.combo {
 </g>
 <g transform="translate(336, 280)" class="key keypos-59">
 <rect rx="6" ry="6" x="-53" y="-25" width="106" height="50" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-0.6em">QK</tspan><tspan x="0" dy="1.2em">REP</tspan>
-</text>
+<text x="0" y="0" class="key tap">REPEAT</text>
 </g>
 <g transform="translate(616, 280)" class="key keypos-60">
 <rect rx="6" ry="6" x="-53" y="-25" width="106" height="50" class="key"/>
 <text x="0" y="0" class="key tap">
-<tspan x="0" dy="-0.6em">QK</tspan><tspan x="0" dy="1.2em">AREP</tspan>
+<tspan x="0" dy="-0.6em">ALT</tspan><tspan x="0" dy="1.2em">REPEAT</tspan>
 </text>
 </g>
 <g transform="translate(700, 259)" class="key keypos-61">
@@ -558,7 +627,7 @@ path.combo {
 <g transform="translate(588, 350)" class="key keypos-70">
 <rect rx="6" ry="6" x="-25" y="-39" width="50" height="78" class="key"/>
 <text x="0" y="0" class="key tap">
-<tspan x="0" dy="-0.6em">OS</tspan><tspan x="0" dy="1.2em">LSFT</tspan>
+<tspan x="0" dy="-0.6em">⇪</tspan><tspan x="0" dy="1.2em">Shift</tspan>
 </text>
 </g>
 <g transform="translate(644, 350)" class="key keypos-71">
@@ -624,11 +693,11 @@ path.combo {
 </g>
 <g transform="translate(924, 49)" class="key keypos-13">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">-</text>
+<text x="0" y="0" class="key tap">MINS</text>
 </g>
 <g transform="translate(28, 105)" class="key keypos-14">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">TAB</text>
+<text x="0" y="0" class="key tap">⇥</text>
 </g>
 <g transform="translate(84, 105)" class="key keypos-15">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
@@ -686,33 +755,23 @@ path.combo {
 </g>
 <g transform="translate(84, 161)" class="key keypos-29">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-1.2em">HM</tspan><tspan x="0" dy="1.2em">GUI</tspan><tspan x="0" dy="1.2em">A</tspan>
-</text>
+<text x="0" y="0" class="key tap">A</text>
 </g>
 <g transform="translate(140, 147)" class="key keypos-30">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-1.2em">HM</tspan><tspan x="0" dy="1.2em">ALT</tspan><tspan x="0" dy="1.2em">S</tspan>
-</text>
+<text x="0" y="0" class="key tap">S</text>
 </g>
 <g transform="translate(196, 140)" class="key keypos-31">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-1.2em">HM</tspan><tspan x="0" dy="1.2em">SFT</tspan><tspan x="0" dy="1.2em">D</tspan>
-</text>
+<text x="0" y="0" class="key tap">D</text>
 </g>
 <g transform="translate(252, 147)" class="key keypos-32">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-1.2em">HM</tspan><tspan x="0" dy="1.2em">CTL</tspan><tspan x="0" dy="1.2em">F</tspan>
-</text>
+<text x="0" y="0" class="key tap">F</text>
 </g>
 <g transform="translate(308, 154)" class="key keypos-33">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-1.2em">HM</tspan><tspan x="0" dy="1.2em">HYP</tspan><tspan x="0" dy="1.2em">G</tspan>
-</text>
+<text x="0" y="0" class="key tap">G</text>
 </g>
 <g transform="translate(364, 154)" class="key keypos-34">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
@@ -722,33 +781,23 @@ path.combo {
 </g>
 <g transform="translate(644, 154)" class="key keypos-36">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-1.2em">HM</tspan><tspan x="0" dy="1.2em">HYP</tspan><tspan x="0" dy="1.2em">H</tspan>
-</text>
+<text x="0" y="0" class="key tap">H</text>
 </g>
 <g transform="translate(700, 147)" class="key keypos-37">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-1.2em">HM</tspan><tspan x="0" dy="1.2em">CTL</tspan><tspan x="0" dy="1.2em">J</tspan>
-</text>
+<text x="0" y="0" class="key tap">J</text>
 </g>
 <g transform="translate(756, 140)" class="key keypos-38">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-1.2em">HM</tspan><tspan x="0" dy="1.2em">SFT</tspan><tspan x="0" dy="1.2em">K</tspan>
-</text>
+<text x="0" y="0" class="key tap">K</text>
 </g>
 <g transform="translate(812, 147)" class="key keypos-39">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-1.2em">HM</tspan><tspan x="0" dy="1.2em">ALT</tspan><tspan x="0" dy="1.2em">L</tspan>
-</text>
+<text x="0" y="0" class="key tap">L</text>
 </g>
 <g transform="translate(868, 161)" class="key keypos-40">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-1.2em">HM</tspan><tspan x="0" dy="1.2em">GUI</tspan><tspan x="0" dy="1.2em">SCLN</tspan>
-</text>
+<text x="0" y="0" class="key tap">;</text>
 </g>
 <g transform="translate(924, 161)" class="key keypos-41">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
@@ -792,11 +841,11 @@ path.combo {
 </g>
 <g transform="translate(812, 203)" class="key keypos-51">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">.</text>
+<text x="0" y="0" class="key tap">DOT</text>
 </g>
 <g transform="translate(868, 217)" class="key keypos-52">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">/</text>
+<text x="0" y="0" class="key tap">SLSH</text>
 </g>
 <g transform="translate(924, 217)" class="key keypos-53">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
@@ -820,14 +869,12 @@ path.combo {
 </g>
 <g transform="translate(336, 280)" class="key keypos-59">
 <rect rx="6" ry="6" x="-53" y="-25" width="106" height="50" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-0.6em">QK</tspan><tspan x="0" dy="1.2em">REP</tspan>
-</text>
+<text x="0" y="0" class="key tap">REPEAT</text>
 </g>
 <g transform="translate(616, 280)" class="key keypos-60">
 <rect rx="6" ry="6" x="-53" y="-25" width="106" height="50" class="key"/>
 <text x="0" y="0" class="key tap">
-<tspan x="0" dy="-0.6em">QK</tspan><tspan x="0" dy="1.2em">AREP</tspan>
+<tspan x="0" dy="-0.6em">ALT</tspan><tspan x="0" dy="1.2em">REPEAT</tspan>
 </text>
 </g>
 <g transform="translate(700, 259)" class="key keypos-61">
@@ -867,7 +914,7 @@ path.combo {
 <g transform="translate(588, 350)" class="key keypos-70">
 <rect rx="6" ry="6" x="-25" y="-39" width="50" height="78" class="key"/>
 <text x="0" y="0" class="key tap">
-<tspan x="0" dy="-0.6em">OS</tspan><tspan x="0" dy="1.2em">LSFT</tspan>
+<tspan x="0" dy="-0.6em">⇪</tspan><tspan x="0" dy="1.2em">Shift</tspan>
 </text>
 </g>
 <g transform="translate(644, 350)" class="key keypos-71">
@@ -933,11 +980,11 @@ path.combo {
 </g>
 <g transform="translate(924, 49)" class="key keypos-13">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">-</text>
+<text x="0" y="0" class="key tap">MINS</text>
 </g>
 <g transform="translate(28, 105)" class="key keypos-14">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">TAB</text>
+<text x="0" y="0" class="key tap">⇥</text>
 </g>
 <g transform="translate(84, 105)" class="key keypos-15">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
@@ -995,33 +1042,23 @@ path.combo {
 </g>
 <g transform="translate(84, 161)" class="key keypos-29">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-1.2em">HM</tspan><tspan x="0" dy="1.2em">GUI</tspan><tspan x="0" dy="1.2em">A</tspan>
-</text>
+<text x="0" y="0" class="key tap">A</text>
 </g>
 <g transform="translate(140, 147)" class="key keypos-30">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-1.2em">HM</tspan><tspan x="0" dy="1.2em">ALT</tspan><tspan x="0" dy="1.2em">S</tspan>
-</text>
+<text x="0" y="0" class="key tap">S</text>
 </g>
 <g transform="translate(196, 140)" class="key keypos-31">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-1.2em">HM</tspan><tspan x="0" dy="1.2em">SFT</tspan><tspan x="0" dy="1.2em">D</tspan>
-</text>
+<text x="0" y="0" class="key tap">D</text>
 </g>
 <g transform="translate(252, 147)" class="key keypos-32">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-1.2em">HM</tspan><tspan x="0" dy="1.2em">CTL</tspan><tspan x="0" dy="1.2em">F</tspan>
-</text>
+<text x="0" y="0" class="key tap">F</text>
 </g>
 <g transform="translate(308, 154)" class="key keypos-33">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-1.2em">HM</tspan><tspan x="0" dy="1.2em">HYP</tspan><tspan x="0" dy="1.2em">G</tspan>
-</text>
+<text x="0" y="0" class="key tap">G</text>
 </g>
 <g transform="translate(364, 154)" class="key keypos-34">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
@@ -1031,33 +1068,23 @@ path.combo {
 </g>
 <g transform="translate(644, 154)" class="key keypos-36">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-1.2em">HM</tspan><tspan x="0" dy="1.2em">HYP</tspan><tspan x="0" dy="1.2em">H</tspan>
-</text>
+<text x="0" y="0" class="key tap">H</text>
 </g>
 <g transform="translate(700, 147)" class="key keypos-37">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-1.2em">HM</tspan><tspan x="0" dy="1.2em">CTL</tspan><tspan x="0" dy="1.2em">J</tspan>
-</text>
+<text x="0" y="0" class="key tap">J</text>
 </g>
 <g transform="translate(756, 140)" class="key keypos-38">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-1.2em">HM</tspan><tspan x="0" dy="1.2em">SFT</tspan><tspan x="0" dy="1.2em">K</tspan>
-</text>
+<text x="0" y="0" class="key tap">K</text>
 </g>
 <g transform="translate(812, 147)" class="key keypos-39">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-1.2em">HM</tspan><tspan x="0" dy="1.2em">ALT</tspan><tspan x="0" dy="1.2em">L</tspan>
-</text>
+<text x="0" y="0" class="key tap">L</text>
 </g>
 <g transform="translate(868, 161)" class="key keypos-40">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-1.2em">HM</tspan><tspan x="0" dy="1.2em">GUI</tspan><tspan x="0" dy="1.2em">SCLN</tspan>
-</text>
+<text x="0" y="0" class="key tap">;</text>
 </g>
 <g transform="translate(924, 161)" class="key keypos-41">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
@@ -1101,11 +1128,11 @@ path.combo {
 </g>
 <g transform="translate(812, 203)" class="key keypos-51">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">.</text>
+<text x="0" y="0" class="key tap">DOT</text>
 </g>
 <g transform="translate(868, 217)" class="key keypos-52">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">/</text>
+<text x="0" y="0" class="key tap">SLSH</text>
 </g>
 <g transform="translate(924, 217)" class="key keypos-53">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
@@ -1129,14 +1156,12 @@ path.combo {
 </g>
 <g transform="translate(336, 280)" class="key keypos-59">
 <rect rx="6" ry="6" x="-53" y="-25" width="106" height="50" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-0.6em">QK</tspan><tspan x="0" dy="1.2em">REP</tspan>
-</text>
+<text x="0" y="0" class="key tap">REPEAT</text>
 </g>
 <g transform="translate(616, 280)" class="key keypos-60">
 <rect rx="6" ry="6" x="-53" y="-25" width="106" height="50" class="key"/>
 <text x="0" y="0" class="key tap">
-<tspan x="0" dy="-0.6em">QK</tspan><tspan x="0" dy="1.2em">AREP</tspan>
+<tspan x="0" dy="-0.6em">ALT</tspan><tspan x="0" dy="1.2em">REPEAT</tspan>
 </text>
 </g>
 <g transform="translate(700, 259)" class="key keypos-61">
@@ -1176,7 +1201,7 @@ path.combo {
 <g transform="translate(588, 350)" class="key keypos-70">
 <rect rx="6" ry="6" x="-25" y="-39" width="50" height="78" class="key"/>
 <text x="0" y="0" class="key tap">
-<tspan x="0" dy="-0.6em">OS</tspan><tspan x="0" dy="1.2em">LSFT</tspan>
+<tspan x="0" dy="-0.6em">⇪</tspan><tspan x="0" dy="1.2em">Shift</tspan>
 </text>
 </g>
 <g transform="translate(644, 350)" class="key keypos-71">
@@ -1192,7 +1217,7 @@ path.combo {
 <g transform="translate(0, 56)">
 <g transform="translate(28, 49)" class="key keypos-0">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">VRSN</text>
+<text x="0" y="0" class="key tap">VER</text>
 </g>
 <g transform="translate(84, 49)" class="key trans keypos-1">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key trans"/>
@@ -1246,13 +1271,11 @@ path.combo {
 </g>
 <g transform="translate(28, 105)" class="key keypos-14">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">\</text>
+<text x="0" y="0" class="key tap">BSLS</text>
 </g>
 <g transform="translate(84, 105)" class="key keypos-15">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-0.6em">FR</tspan><tspan x="0" dy="1.2em">GRAVE</tspan>
-</text>
+<text x="0" y="0" class="key tap">`</text>
 </g>
 <g transform="translate(140, 91)" class="key keypos-16">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
@@ -1264,7 +1287,7 @@ path.combo {
 </g>
 <g transform="translate(252, 91)" class="key keypos-18">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">PMNS</text>
+<text x="0" y="0" class="key tap">-</text>
 </g>
 <g transform="translate(308, 98)" class="key keypos-19">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
@@ -1294,9 +1317,7 @@ path.combo {
 </g>
 <g transform="translate(868, 105)" 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">
-<tspan x="0" dy="-0.6em">FR</tspan><tspan x="0" dy="1.2em">CIRC</tspan>
-</text>
+<text x="0" y="0" class="key tap">^</text>
 </g>
 <g transform="translate(924, 105)" class="key keypos-27">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
@@ -1310,11 +1331,11 @@ path.combo {
 </g>
 <g transform="translate(140, 147)" class="key keypos-30">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">PAST</text>
+<text x="0" y="0" class="key tap">*</text>
 </g>
 <g transform="translate(196, 140)" class="key keypos-31">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">PSLS</text>
+<text x="0" y="0" class="key tap">/</text>
 </g>
 <g transform="translate(252, 147)" class="key keypos-32">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
@@ -1348,9 +1369,7 @@ path.combo {
 </g>
 <g transform="translate(868, 161)" class="key keypos-40">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-0.6em">FR</tspan><tspan x="0" dy="1.2em">DQUO</tspan>
-</text>
+<text x="0" y="0" class="key tap">&quot;</text>
 </g>
 <g transform="translate(924, 161)" class="key keypos-41">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
@@ -1392,13 +1411,11 @@ path.combo {
 </g>
 <g transform="translate(812, 203)" class="key keypos-51">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">.</text>
+<text x="0" y="0" class="key tap">DOT</text>
 </g>
 <g transform="translate(868, 217)" class="key keypos-52">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-0.6em">FR</tspan><tspan x="0" dy="1.2em">QUOT</tspan>
-</text>
+<text x="0" y="0" class="key tap">&#x27;</text>
 </g>
 <g transform="translate(924, 217)" class="key keypos-53">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
@@ -1422,13 +1439,13 @@ path.combo {
 <g transform="translate(336, 280)" class="key keypos-59">
 <rect rx="6" ry="6" x="-53" y="-25" width="106" height="50" class="key"/>
 <text x="0" y="0" class="key tap">
-<tspan x="0" dy="-0.6em">RM</tspan><tspan x="0" dy="1.2em">VALU</tspan>
+<tspan x="0" dy="-0.6em">RGB</tspan><tspan x="0" dy="1.2em">+</tspan>
 </text>
 </g>
 <g transform="translate(616, 280)" class="key keypos-60">
 <rect rx="6" ry="6" x="-53" y="-25" width="106" height="50" class="key"/>
 <text x="0" y="0" class="key tap">
-<tspan x="0" dy="-0.6em">RM</tspan><tspan x="0" dy="1.2em">TOGG</tspan>
+<tspan x="0" dy="-0.6em">RGB</tspan><tspan x="0" dy="1.2em">⇄</tspan>
 </text>
 </g>
 <g transform="translate(700, 259)" class="key trans keypos-61">
@@ -1450,26 +1467,24 @@ path.combo {
 <g transform="translate(308, 350)" class="key keypos-66">
 <rect rx="6" ry="6" x="-25" y="-39" width="50" height="78" class="key"/>
 <text x="0" y="0" class="key tap">
-<tspan x="0" dy="-0.6em">RM</tspan><tspan x="0" dy="1.2em">HUED</tspan>
+<tspan x="0" dy="-0.6em">HUE</tspan><tspan x="0" dy="1.2em">-</tspan>
 </text>
 </g>
 <g transform="translate(364, 350)" class="key keypos-67">
 <rect rx="6" ry="6" x="-25" y="-39" width="50" height="78" class="key"/>
 <text x="0" y="0" class="key tap">
-<tspan x="0" dy="-0.6em">RM</tspan><tspan x="0" dy="1.2em">VALD</tspan>
+<tspan x="0" dy="-0.6em">RGB</tspan><tspan x="0" dy="1.2em">-</tspan>
 </text>
 </g>
 <g transform="translate(420, 350)" class="key keypos-68">
 <rect rx="6" ry="6" x="-25" y="-39" width="50" height="78" class="key"/>
 <text x="0" y="0" class="key tap">
-<tspan x="0" dy="-0.6em">RM</tspan><tspan x="0" dy="1.2em">HUEU</tspan>
+<tspan x="0" dy="-0.6em">HUE</tspan><tspan x="0" dy="1.2em">+</tspan>
 </text>
 </g>
 <g transform="translate(532, 350)" class="key keypos-69">
 <rect rx="6" ry="6" x="-25" y="-39" width="50" height="78" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-1.2em">TOGGLE</tspan><tspan x="0" dy="1.2em">LAYER</tspan><tspan x="0" dy="1.2em">COLOR</tspan>
-</text>
+<text x="0" y="0" class="key tap">RGB</text>
 </g>
 <g transform="translate(588, 350)" class="key trans keypos-70">
 <rect rx="6" ry="6" x="-25" y="-39" width="50" height="78" class="key trans"/>
@@ -1486,7 +1501,7 @@ path.combo {
 <g transform="translate(0, 56)">
 <g transform="translate(28, 49)" class="key keypos-0">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">VRSN</text>
+<text x="0" y="0" class="key tap">VER</text>
 </g>
 <g transform="translate(84, 49)" class="key trans keypos-1">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key trans"/>
@@ -1590,11 +1605,11 @@ path.combo {
 </g>
 <g transform="translate(868, 105)" 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">PAST</text>
+<text x="0" y="0" class="key tap">*</text>
 </g>
 <g transform="translate(924, 105)" 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">PSLS</text>
+<text x="0" y="0" class="key tap">/</text>
 </g>
 <g transform="translate(28, 161)" class="key trans keypos-28">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key trans"/>
@@ -1646,11 +1661,11 @@ path.combo {
 </g>
 <g transform="translate(868, 161)" class="key keypos-40">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">PMNS</text>
+<text x="0" y="0" class="key tap">-</text>
 </g>
 <g transform="translate(924, 161)" class="key keypos-41">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">PPLS</text>
+<text x="0" y="0" class="key tap">+</text>
 </g>
 <g transform="translate(28, 217)" class="key trans keypos-42">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key trans"/>
@@ -1694,11 +1709,11 @@ path.combo {
 </g>
 <g transform="translate(868, 217)" class="key keypos-52">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">PDOT</text>
+<text x="0" y="0" class="key tap">.</text>
 </g>
 <g transform="translate(924, 217)" class="key keypos-53">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">PCMM</text>
+<text x="0" y="0" class="key tap">,</text>
 </g>
 <g transform="translate(28, 273)" class="key keypos-54">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
@@ -1781,7 +1796,7 @@ path.combo {
 <g transform="translate(0, 56)">
 <g transform="translate(28, 49)" class="key keypos-0">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">VRSN</text>
+<text x="0" y="0" class="key tap">VER</text>
 </g>
 <g transform="translate(84, 49)" class="key trans keypos-1">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key trans"/>
@@ -1833,9 +1848,7 @@ path.combo {
 </g>
 <g transform="translate(924, 49)" class="key keypos-13">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-0.6em">QK</tspan><tspan x="0" dy="1.2em">BOOT</tspan>
-</text>
+<text x="0" y="0" class="key tap">RESET</text>
 </g>
 <g transform="translate(28, 105)" class="key trans keypos-14">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key trans"/>
@@ -1887,7 +1900,9 @@ path.combo {
 </g>
 <g transform="translate(868, 105)" 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">PGUP</text>
+<text x="0" y="0" class="key tap">
+<tspan x="0" dy="-0.6em">PAGE</tspan><tspan x="0" dy="1.2em">UP</tspan>
+</text>
 </g>
 <g transform="translate(924, 105)" class="key trans keypos-27">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key trans"/>
@@ -1903,15 +1918,15 @@ path.combo {
 </g>
 <g transform="translate(140, 147)" class="key keypos-30">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">MPRV</text>
+<use href="#tabler:player-track-prev" xlink:href="#tabler:player-track-prev" x="-7" y="-7" height="14" width="14.0" class="key tap glyph tabler:player-track-prev"/>
 </g>
 <g transform="translate(196, 140)" class="key keypos-31">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">MPLY</text>
+<use href="#play-pause" xlink:href="#play-pause" x="-6" y="-7" height="14" width="12.923076923076923" class="key tap glyph play-pause"/>
 </g>
 <g transform="translate(252, 147)" class="key keypos-32">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">MNXT</text>
+<use href="#tabler:player-track-next" xlink:href="#tabler:player-track-next" x="-7" y="-7" height="14" width="14.0" class="key tap glyph tabler:player-track-next"/>
 </g>
 <g transform="translate(308, 154)" class="key trans keypos-33">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key trans"/>
@@ -1943,7 +1958,9 @@ path.combo {
 </g>
 <g transform="translate(868, 161)" class="key keypos-40">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">PGDN</text>
+<text x="0" y="0" class="key tap">
+<tspan x="0" dy="-0.6em">PAGE</tspan><tspan x="0" dy="1.2em">DOWN</tspan>
+</text>
 </g>
 <g transform="translate(924, 161)" class="key trans keypos-41">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key trans"/>
@@ -2021,11 +2038,11 @@ path.combo {
 </g>
 <g transform="translate(336, 280)" class="key keypos-59">
 <rect rx="6" ry="6" x="-53" y="-25" width="106" height="50" class="key"/>
-<text x="0" y="0" class="key tap">VOLD</text>
+<text x="0" y="0" class="key tap">VOL-</text>
 </g>
 <g transform="translate(616, 280)" class="key keypos-60">
 <rect rx="6" ry="6" x="-53" y="-25" width="106" height="50" class="key"/>
-<text x="0" y="0" class="key tap">VOLU</text>
+<text x="0" y="0" class="key tap">VOL+</text>
 </g>
 <g transform="translate(700, 259)" class="key trans keypos-61">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key trans"/>
@@ -2078,9 +2095,7 @@ path.combo {
 <g transform="translate(0, 56)">
 <g transform="translate(28, 49)" class="key keypos-0">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-0.6em">LED</tspan><tspan x="0" dy="1.2em">LEVEL</tspan>
-</text>
+<text x="0" y="0" class="key tap">LED</text>
 </g>
 <g transform="translate(84, 49)" class="key trans keypos-1">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key trans"/>
@@ -2132,9 +2147,7 @@ path.combo {
 </g>
 <g transform="translate(924, 49)" class="key keypos-13">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-0.6em">QK</tspan><tspan x="0" dy="1.2em">BOOT</tspan>
-</text>
+<text x="0" y="0" class="key tap">RESET</text>
 </g>
 <g transform="translate(28, 105)" class="key trans keypos-14">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key trans"/>
@@ -2178,9 +2191,7 @@ path.combo {
 </g>
 <g transform="translate(756, 84)" 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">
-<tspan x="0" dy="-0.6em">MS</tspan><tspan x="0" dy="1.2em">UP</tspan>
-</text>
+<use href="#cursor-up" xlink:href="#cursor-up" x="-7" y="-7" height="14" width="13.998045784477945" class="key tap glyph cursor-up"/>
 </g>
 <g transform="translate(812, 91)" class="key trans keypos-25">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key trans"/>
@@ -2200,27 +2211,19 @@ path.combo {
 </g>
 <g transform="translate(84, 161)" class="key keypos-29">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-0.6em">MS</tspan><tspan x="0" dy="1.2em">WHLL</tspan>
-</text>
+<use href="#scroll-left" xlink:href="#scroll-left" x="-7" y="-7" height="14" width="13.998173515981735" class="key tap glyph scroll-left"/>
 </g>
 <g transform="translate(140, 147)" class="key keypos-30">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-0.6em">MS</tspan><tspan x="0" dy="1.2em">WHLU</tspan>
-</text>
+<use href="#scroll-up" xlink:href="#scroll-up" x="-7" y="-7" height="14" width="13.998173515981735" class="key tap glyph scroll-up"/>
 </g>
 <g transform="translate(196, 140)" class="key keypos-31">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-0.6em">MS</tspan><tspan x="0" dy="1.2em">WHLD</tspan>
-</text>
+<use href="#scroll-down" xlink:href="#scroll-down" x="-7" y="-7" height="14" width="13.998173515981735" class="key tap glyph scroll-down"/>
 </g>
 <g transform="translate(252, 147)" class="key keypos-32">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-0.6em">MS</tspan><tspan x="0" dy="1.2em">WHLR</tspan>
-</text>
+<use href="#scroll-right" xlink:href="#scroll-right" x="-7" y="-7" height="14" width="13.998173515981735" class="key tap glyph scroll-right"/>
 </g>
 <g transform="translate(308, 154)" class="key trans keypos-33">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key trans"/>
@@ -2240,21 +2243,15 @@ path.combo {
 </g>
 <g transform="translate(700, 147)" class="key keypos-37">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-0.6em">MS</tspan><tspan x="0" dy="1.2em">LEFT</tspan>
-</text>
+<use href="#cursor-left" xlink:href="#cursor-left" x="-7" y="-7" height="14" width="13.998045784477945" class="key tap glyph cursor-left"/>
 </g>
 <g transform="translate(756, 140)" class="key keypos-38">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-0.6em">MS</tspan><tspan x="0" dy="1.2em">DOWN</tspan>
-</text>
+<use href="#cursor-down" xlink:href="#cursor-down" x="-7" y="-7" height="14" width="13.998045784477945" class="key tap glyph cursor-down"/>
 </g>
 <g transform="translate(812, 147)" class="key keypos-39">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-0.6em">MS</tspan><tspan x="0" dy="1.2em">RGHT</tspan>
-</text>
+<use href="#cursor-right" xlink:href="#cursor-right" x="-7" y="-7" height="14" width="13.998045784477945" class="key tap glyph cursor-right"/>
 </g>
 <g transform="translate(868, 161)" class="key trans keypos-40">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key trans"/>
@@ -2336,11 +2333,11 @@ path.combo {
 </g>
 <g transform="translate(336, 280)" class="key keypos-59">
 <rect rx="6" ry="6" x="-53" y="-25" width="106" height="50" class="key"/>
-<text x="0" y="0" class="key tap">VOLD</text>
+<text x="0" y="0" class="key tap">VOL-</text>
 </g>
 <g transform="translate(616, 280)" class="key keypos-60">
 <rect rx="6" ry="6" x="-53" y="-25" width="106" height="50" class="key"/>
-<text x="0" y="0" class="key tap">VOLU</text>
+<text x="0" y="0" class="key tap">VOL+</text>
 </g>
 <g transform="translate(700, 259)" class="key trans keypos-61">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key trans"/>
@@ -2364,15 +2361,11 @@ path.combo {
 </g>
 <g transform="translate(308, 350)" class="key keypos-66">
 <rect rx="6" ry="6" x="-25" y="-39" width="50" height="78" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-0.6em">MS</tspan><tspan x="0" dy="1.2em">BTN1</tspan>
-</text>
+<use href="#material:left_click" xlink:href="#material:left_click" x="-7" y="-7" height="14" width="14.0" class="key tap glyph material:left_click"/>
 </g>
 <g transform="translate(364, 350)" class="key keypos-67">
 <rect rx="6" ry="6" x="-25" y="-39" width="50" height="78" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-0.6em">MS</tspan><tspan x="0" dy="1.2em">BTN3</tspan>
-</text>
+<use href="#click-middle" xlink:href="#click-middle" x="-7" y="-7" height="14" width="14.0" class="key tap glyph click-middle"/>
 </g>
 <g transform="translate(420, 350)" class="key trans keypos-68">
 <rect rx="6" ry="6" x="-25" y="-39" width="50" height="78" class="key trans"/>
@@ -2384,15 +2377,11 @@ path.combo {
 </g>
 <g transform="translate(588, 350)" class="key keypos-70">
 <rect rx="6" ry="6" x="-25" y="-39" width="50" height="78" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-0.6em">MS</tspan><tspan x="0" dy="1.2em">BTN3</tspan>
-</text>
+<use href="#click-middle" xlink:href="#click-middle" x="-7" y="-7" height="14" width="14.0" class="key tap glyph click-middle"/>
 </g>
 <g transform="translate(644, 350)" class="key keypos-71">
 <rect rx="6" ry="6" x="-25" y="-39" width="50" height="78" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-0.6em">MS</tspan><tspan x="0" dy="1.2em">BTN2</tspan>
-</text>
+<use href="#material:right_click" xlink:href="#material:right_click" x="-7" y="-7" height="14" width="14.0" class="key tap glyph material:right_click"/>
 </g>
 </g>
 </g>
@@ -2401,9 +2390,7 @@ path.combo {
 <g transform="translate(0, 56)">
 <g transform="translate(28, 49)" class="key keypos-0">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-0.6em">LED</tspan><tspan x="0" dy="1.2em">LEVEL</tspan>
-</text>
+<text x="0" y="0" class="key tap">LED</text>
 </g>
 <g transform="translate(84, 49)" class="key trans keypos-1">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key trans"/>
@@ -2455,9 +2442,7 @@ path.combo {
 </g>
 <g transform="translate(924, 49)" class="key keypos-13">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-0.6em">QK</tspan><tspan x="0" dy="1.2em">BOOT</tspan>
-</text>
+<text x="0" y="0" class="key tap">RESET</text>
 </g>
 <g transform="translate(28, 105)" class="key trans keypos-14">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key trans"/>
@@ -2501,9 +2486,7 @@ path.combo {
 </g>
 <g transform="translate(756, 84)" 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">
-<tspan x="0" dy="-0.6em">MS</tspan><tspan x="0" dy="1.2em">UP</tspan>
-</text>
+<use href="#cursor-up" xlink:href="#cursor-up" x="-7" y="-7" height="14" width="13.998045784477945" class="key tap glyph cursor-up"/>
 </g>
 <g transform="translate(812, 91)" class="key trans keypos-25">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key trans"/>
@@ -2524,31 +2507,31 @@ path.combo {
 <g transform="translate(84, 161)" class="key keypos-29">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
 <text x="0" y="0" class="key tap">
-<tspan x="0" dy="-0.6em">OS</tspan><tspan x="0" dy="1.2em">LGUI</tspan>
+<tspan x="0" dy="-0.6em">⇪</tspan><tspan x="0" dy="1.2em">GUI</tspan>
 </text>
 </g>
 <g transform="translate(140, 147)" class="key keypos-30">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
 <text x="0" y="0" class="key tap">
-<tspan x="0" dy="-0.6em">OS</tspan><tspan x="0" dy="1.2em">LALT</tspan>
+<tspan x="0" dy="-0.6em">⇪</tspan><tspan x="0" dy="1.2em">Alt</tspan>
 </text>
 </g>
 <g transform="translate(196, 140)" class="key keypos-31">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
 <text x="0" y="0" class="key tap">
-<tspan x="0" dy="-0.6em">OS</tspan><tspan x="0" dy="1.2em">LSFT</tspan>
+<tspan x="0" dy="-0.6em">⇪</tspan><tspan x="0" dy="1.2em">Shift</tspan>
 </text>
 </g>
 <g transform="translate(252, 147)" class="key keypos-32">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
 <text x="0" y="0" class="key tap">
-<tspan x="0" dy="-0.6em">OS</tspan><tspan x="0" dy="1.2em">LCTL</tspan>
+<tspan x="0" dy="-0.6em">⇪</tspan><tspan x="0" dy="1.2em">Ctrl</tspan>
 </text>
 </g>
 <g transform="translate(308, 154)" class="key keypos-33">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
 <text x="0" y="0" class="key tap">
-<tspan x="0" dy="-0.6em">OS</tspan><tspan x="0" dy="1.2em">HYPR</tspan>
+<tspan x="0" dy="-0.6em">⇪</tspan><tspan x="0" dy="1.2em">Hyper</tspan>
 </text>
 </g>
 <g transform="translate(364, 154)" class="key trans keypos-34">
@@ -2566,25 +2549,25 @@ path.combo {
 <g transform="translate(700, 147)" class="key keypos-37">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
 <text x="0" y="0" class="key tap">
-<tspan x="0" dy="-0.6em">OS</tspan><tspan x="0" dy="1.2em">LCTL</tspan>
+<tspan x="0" dy="-0.6em">⇪</tspan><tspan x="0" dy="1.2em">Ctrl</tspan>
 </text>
 </g>
 <g transform="translate(756, 140)" class="key keypos-38">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
 <text x="0" y="0" class="key tap">
-<tspan x="0" dy="-0.6em">OS</tspan><tspan x="0" dy="1.2em">LSFT</tspan>
+<tspan x="0" dy="-0.6em">⇪</tspan><tspan x="0" dy="1.2em">Shift</tspan>
 </text>
 </g>
 <g transform="translate(812, 147)" class="key keypos-39">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
 <text x="0" y="0" class="key tap">
-<tspan x="0" dy="-0.6em">OS</tspan><tspan x="0" dy="1.2em">LALT</tspan>
+<tspan x="0" dy="-0.6em">⇪</tspan><tspan x="0" dy="1.2em">Alt</tspan>
 </text>
 </g>
 <g transform="translate(868, 161)" class="key keypos-40">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
 <text x="0" y="0" class="key tap">
-<tspan x="0" dy="-0.6em">OS</tspan><tspan x="0" dy="1.2em">LGUI</tspan>
+<tspan x="0" dy="-0.6em">⇪</tspan><tspan x="0" dy="1.2em">GUI</tspan>
 </text>
 </g>
 <g transform="translate(924, 161)" class="key trans keypos-41">
@@ -2663,11 +2646,11 @@ path.combo {
 </g>
 <g transform="translate(336, 280)" class="key keypos-59">
 <rect rx="6" ry="6" x="-53" y="-25" width="106" height="50" class="key"/>
-<text x="0" y="0" class="key tap">VOLD</text>
+<text x="0" y="0" class="key tap">VOL-</text>
 </g>
 <g transform="translate(616, 280)" class="key keypos-60">
 <rect rx="6" ry="6" x="-53" y="-25" width="106" height="50" class="key"/>
-<text x="0" y="0" class="key tap">VOLU</text>
+<text x="0" y="0" class="key tap">VOL+</text>
 </g>
 <g transform="translate(700, 259)" class="key trans keypos-61">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key trans"/>
@@ -2691,15 +2674,11 @@ path.combo {
 </g>
 <g transform="translate(308, 350)" class="key keypos-66">
 <rect rx="6" ry="6" x="-25" y="-39" width="50" height="78" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-0.6em">MS</tspan><tspan x="0" dy="1.2em">BTN1</tspan>
-</text>
+<use href="#material:left_click" xlink:href="#material:left_click" x="-7" y="-7" height="14" width="14.0" class="key tap glyph material:left_click"/>
 </g>
 <g transform="translate(364, 350)" class="key keypos-67">
 <rect rx="6" ry="6" x="-25" y="-39" width="50" height="78" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-0.6em">MS</tspan><tspan x="0" dy="1.2em">BTN3</tspan>
-</text>
+<use href="#click-middle" xlink:href="#click-middle" x="-7" y="-7" height="14" width="14.0" class="key tap glyph click-middle"/>
 </g>
 <g transform="translate(420, 350)" class="key trans keypos-68">
 <rect rx="6" ry="6" x="-25" y="-39" width="50" height="78" class="key trans"/>
@@ -2711,15 +2690,11 @@ path.combo {
 </g>
 <g transform="translate(588, 350)" class="key keypos-70">
 <rect rx="6" ry="6" x="-25" y="-39" width="50" height="78" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-0.6em">MS</tspan><tspan x="0" dy="1.2em">BTN3</tspan>
-</text>
+<use href="#click-middle" xlink:href="#click-middle" x="-7" y="-7" height="14" width="14.0" class="key tap glyph click-middle"/>
 </g>
 <g transform="translate(644, 350)" class="key keypos-71">
 <rect rx="6" ry="6" x="-25" y="-39" width="50" height="78" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-0.6em">MS</tspan><tspan x="0" dy="1.2em">BTN2</tspan>
-</text>
+<use href="#material:right_click" xlink:href="#material:right_click" x="-7" y="-7" height="14" width="14.0" class="key tap glyph material:right_click"/>
 </g>
 </g>
 </g>