From 9c44390141367076b1374444a9d80ca335fe8e16 Mon Sep 17 00:00:00 2001
From: Hau Nguyen <hauvipapro@gmail.com>
Date: Thu, 17 Aug 2023 18:02:04 +0700
Subject: [PATCH] chore: re-draw

---
 dztech_dz60rgb_wkl/asciiart/haunt98.txt       |   4 +-
 .../caksoylar_keymap_drawer/config.yaml       |   4 +
 .../caksoylar_keymap_drawer/keymap.svg        |  57 ++--
 .../caksoylar_keymap_drawer/keymap.yaml       | 134 ++++-----
 .../keymaps_json/haunt98/keymap.json          | 270 +-----------------
 5 files changed, 112 insertions(+), 357 deletions(-)

diff --git a/dztech_dz60rgb_wkl/asciiart/haunt98.txt b/dztech_dz60rgb_wkl/asciiart/haunt98.txt
index c1aae77..dcf8049 100644
--- a/dztech_dz60rgb_wkl/asciiart/haunt98.txt
+++ b/dztech_dz60rgb_wkl/asciiart/haunt98.txt
@@ -13,7 +13,7 @@
 +-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+
 |  `    |  F1   |  F2   |  F3   |  F4   |  F5   |  F6   |  F7   |  F8   |  F9   | F10   | F11   | F12   |       | TG(2) |
 +-------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+-------+
-|           |       |       |       |       |       |       |       |       |       |       |  UP   |       |           |
+|           |       |       |       |       |       |       |       |       |       |       |  UP   |       |   DEL     |
 +-----------+-+-----+-+-----+-+-----+-+-----+-+-----+-+-----+-+-----+-+-----+-+-----+-+-----+-+-----+-+-----+-----------+
 |             |       |       |       |       |       |       |       |       |       | LEFT  | RGHT  |                 |
 +-------------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---------+-------+
@@ -27,7 +27,7 @@
 +-------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+-------+
 |           | BRMD  | BRMU  |       |       |       |       |       |       |       |       |       |       |           |
 +-----------+-+-----+-+-----+-+-----+-+-----+-+-----+-+-----+-+-----+-+-----+-+-----+-+-----+-+-----+-+-----+-----------+
-|    CAPS     | VOLD  | VOLU  | MUTE  |       |       |       |       | HOME  | PGUP  |       |       |                 |
+|  CAPSLOCK   | VOLD  | VOLU  | MUTE  |       |       |       |       | HOME  | PGUP  |       |       |                 |
 +-------------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---------+-------+
 |                 | RGBH  | RGBS  | RGBV  |       |       |       |       | END   | PGDN  |       |             |  L3   |
 +-----------+-----+-+-----+-----+-+-------+-------+-------+-------+-------+-------+-----+-+-------+-+-------+---+-------+
diff --git a/dztech_dz60rgb_wkl/caksoylar_keymap_drawer/config.yaml b/dztech_dz60rgb_wkl/caksoylar_keymap_drawer/config.yaml
index 1670c25..2b045d4 100644
--- a/dztech_dz60rgb_wkl/caksoylar_keymap_drawer/config.yaml
+++ b/dztech_dz60rgb_wkl/caksoylar_keymap_drawer/config.yaml
@@ -55,6 +55,10 @@ parse_config:
       "TD(TD_SAFE_BOOT)": "BOOT",
       "CTL_T(KC_ESC)":
         { "t": "ESC", "h": "$$mdi:apple-keyboard-control$$", "type": "esc" },
+      "MO(LAYER_COMMON)": "L1",
+      "MO(LAYER_RECOVERY)": "L3",
+      "TG(LAYER_RARELY)": "TG2",
+      "TO(LAYER_QWERTY)": "TO0",
       # Basic
       "KC_H": { "t": "H", "type": "vim" },
       "KC_J": { "t": "J", "type": "vim" },
diff --git a/dztech_dz60rgb_wkl/caksoylar_keymap_drawer/keymap.svg b/dztech_dz60rgb_wkl/caksoylar_keymap_drawer/keymap.svg
index 7ce00c2..f0e2a9e 100644
--- a/dztech_dz60rgb_wkl/caksoylar_keymap_drawer/keymap.svg
+++ b/dztech_dz60rgb_wkl/caksoylar_keymap_drawer/keymap.svg
@@ -1,47 +1,47 @@
 <svg width="960.0" height="1480.0" viewBox="0 0 960.0 1480.0" class="keymap" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <defs>/* start glyphs */
-<svg id="mdi:apple-keyboard-shift">
-<svg xmlns="http://www.w3.org/2000/svg" id="mdi-apple-keyboard-shift" viewBox="0 0 24 24"><path d="M15,18V12H17.17L12,6.83L6.83,12H9V18H15M12,4L22,14H17V20H7V14H2L12,4Z" /></svg>
-</svg>
-<svg id="mdi:keyboard-space">
-<svg xmlns="http://www.w3.org/2000/svg" id="mdi-keyboard-space" viewBox="0 0 24 24"><path d="M3 15H5V19H19V15H21V19C21 20.1 20.1 21 19 21H5C3.9 21 3 20.1 3 19V15Z" /></svg>
-</svg>
-<svg id="mdi:arrow-left">
-<svg xmlns="http://www.w3.org/2000/svg" id="mdi-arrow-left" viewBox="0 0 24 24"><path d="M20,11V13H8L13.5,18.5L12.08,19.92L4.16,12L12.08,4.08L13.5,5.5L8,11H20Z" /></svg>
-</svg>
 <svg id="mdi:apple-keyboard-option">
 <svg xmlns="http://www.w3.org/2000/svg" id="mdi-apple-keyboard-option" viewBox="0 0 24 24"><path d="M3,4H9.11L16.15,18H21V20H14.88L7.84,6H3V4M14,4H21V6H14V4Z" /></svg>
 </svg>
-<svg id="mdi:arrow-right">
-<svg xmlns="http://www.w3.org/2000/svg" id="mdi-arrow-right" viewBox="0 0 24 24"><path d="M4,11V13H16L10.5,18.5L11.92,19.92L19.84,12L11.92,4.08L10.5,5.5L16,11H4Z" /></svg>
-</svg>
-<svg id="mdi:keyboard-backspace">
-<svg xmlns="http://www.w3.org/2000/svg" id="mdi-keyboard-backspace" viewBox="0 0 24 24"><path d="M21,11H6.83L10.41,7.41L9,6L3,12L9,18L10.41,16.58L6.83,13H21V11Z" /></svg>
-</svg>
 <svg id="mdi:apple-keyboard-caps">
 <svg xmlns="http://www.w3.org/2000/svg" id="mdi-apple-keyboard-caps" viewBox="0 0 24 24"><path d="M15,14V8H17.17L12,2.83L6.83,8H9V14H15M12,0L22,10H17V16H7V10H2L12,0M7,18H17V24H7V18M15,20H9V22H15V20Z" /></svg>
 </svg>
-<svg id="mdi:transfer">
-<svg xmlns="http://www.w3.org/2000/svg" id="mdi-transfer" viewBox="0 0 24 24"><path d="M8 4A2 2 0 0 0 6 6V10H8V6H16V9H13.5L17 12.5L20.5 9H18V6A2 2 0 0 0 16 4H8M3 12V14H11V12H3M3 15V17H11V15H3M13 15V17H21V15H13M3 18V20H11V18H3M13 18V20H21V18H13Z" /></svg>
-</svg>
-<svg id="mdi:keyboard-return">
-<svg xmlns="http://www.w3.org/2000/svg" id="mdi-keyboard-return" viewBox="0 0 24 24"><path d="M19,7V11H5.83L9.41,7.41L8,6L2,12L8,18L9.41,16.58L5.83,13H21V7H19Z" /></svg>
+<svg id="mdi:arrow-up">
+<svg xmlns="http://www.w3.org/2000/svg" id="mdi-arrow-up" viewBox="0 0 24 24"><path d="M13,20H11V8L5.5,13.5L4.08,12.08L12,4.16L19.92,12.08L18.5,13.5L13,8V20Z" /></svg>
 </svg>
 <svg id="mdi:keyboard-tab">
 <svg xmlns="http://www.w3.org/2000/svg" id="mdi-keyboard-tab" viewBox="0 0 24 24"><path d="M20,18H22V6H20M11.59,7.41L15.17,11H1V13H15.17L11.59,16.58L13,18L19,12L13,6L11.59,7.41Z" /></svg>
 </svg>
-<svg id="mdi:arrow-down">
-<svg xmlns="http://www.w3.org/2000/svg" id="mdi-arrow-down" viewBox="0 0 24 24"><path d="M11,4H13V16L18.5,10.5L19.92,11.92L12,19.84L4.08,11.92L5.5,10.5L11,16V4Z" /></svg>
+<svg id="mdi:keyboard-space">
+<svg xmlns="http://www.w3.org/2000/svg" id="mdi-keyboard-space" viewBox="0 0 24 24"><path d="M3 15H5V19H19V15H21V19C21 20.1 20.1 21 19 21H5C3.9 21 3 20.1 3 19V15Z" /></svg>
+</svg>
+<svg id="mdi:apple-keyboard-shift">
+<svg xmlns="http://www.w3.org/2000/svg" id="mdi-apple-keyboard-shift" viewBox="0 0 24 24"><path d="M15,18V12H17.17L12,6.83L6.83,12H9V18H15M12,4L22,14H17V20H7V14H2L12,4Z" /></svg>
+</svg>
+<svg id="mdi:arrow-left">
+<svg xmlns="http://www.w3.org/2000/svg" id="mdi-arrow-left" viewBox="0 0 24 24"><path d="M20,11V13H8L13.5,18.5L12.08,19.92L4.16,12L12.08,4.08L13.5,5.5L8,11H20Z" /></svg>
+</svg>
+<svg id="mdi:keyboard-backspace">
+<svg xmlns="http://www.w3.org/2000/svg" id="mdi-keyboard-backspace" viewBox="0 0 24 24"><path d="M21,11H6.83L10.41,7.41L9,6L3,12L9,18L10.41,16.58L6.83,13H21V11Z" /></svg>
+</svg>
+<svg id="mdi:arrow-right">
+<svg xmlns="http://www.w3.org/2000/svg" id="mdi-arrow-right" viewBox="0 0 24 24"><path d="M4,11V13H16L10.5,18.5L11.92,19.92L19.84,12L11.92,4.08L10.5,5.5L16,11H4Z" /></svg>
 </svg>
 <svg id="mdi:apple-keyboard-control">
 <svg xmlns="http://www.w3.org/2000/svg" id="mdi-apple-keyboard-control" viewBox="0 0 24 24"><path d="M19.78,11.78L18.36,13.19L12,6.83L5.64,13.19L4.22,11.78L12,4L19.78,11.78Z" /></svg>
 </svg>
-<svg id="mdi:arrow-up">
-<svg xmlns="http://www.w3.org/2000/svg" id="mdi-arrow-up" viewBox="0 0 24 24"><path d="M13,20H11V8L5.5,13.5L4.08,12.08L12,4.16L19.92,12.08L18.5,13.5L13,8V20Z" /></svg>
+<svg id="mdi:keyboard-return">
+<svg xmlns="http://www.w3.org/2000/svg" id="mdi-keyboard-return" viewBox="0 0 24 24"><path d="M19,7V11H5.83L9.41,7.41L8,6L2,12L8,18L9.41,16.58L5.83,13H21V7H19Z" /></svg>
 </svg>
 <svg id="mdi:apple-keyboard-command">
 <svg xmlns="http://www.w3.org/2000/svg" id="mdi-apple-keyboard-command" viewBox="0 0 24 24"><path d="M6,2A4,4 0 0,1 10,6V8H14V6A4,4 0 0,1 18,2A4,4 0 0,1 22,6A4,4 0 0,1 18,10H16V14H18A4,4 0 0,1 22,18A4,4 0 0,1 18,22A4,4 0 0,1 14,18V16H10V18A4,4 0 0,1 6,22A4,4 0 0,1 2,18A4,4 0 0,1 6,14H8V10H6A4,4 0 0,1 2,6A4,4 0 0,1 6,2M16,18A2,2 0 0,0 18,20A2,2 0 0,0 20,18A2,2 0 0,0 18,16H16V18M14,10H10V14H14V10M6,16A2,2 0 0,0 4,18A2,2 0 0,0 6,20A2,2 0 0,0 8,18V16H6M8,6A2,2 0 0,0 6,4A2,2 0 0,0 4,6A2,2 0 0,0 6,8H8V6M18,8A2,2 0 0,0 20,6A2,2 0 0,0 18,4A2,2 0 0,0 16,6V8H18Z" /></svg>
 </svg>
+<svg id="mdi:transfer">
+<svg xmlns="http://www.w3.org/2000/svg" id="mdi-transfer" viewBox="0 0 24 24"><path d="M8 4A2 2 0 0 0 6 6V10H8V6H16V9H13.5L17 12.5L20.5 9H18V6A2 2 0 0 0 16 4H8M3 12V14H11V12H3M3 15V17H11V15H3M13 15V17H21V15H13M3 18V20H11V18H3M13 18V20H21V18H13Z" /></svg>
+</svg>
+<svg id="mdi:arrow-down">
+<svg xmlns="http://www.w3.org/2000/svg" id="mdi-arrow-down" viewBox="0 0 24 24"><path d="M11,4H13V16L18.5,10.5L19.92,11.92L12,19.84L4.08,11.92L5.5,10.5L11,16V4Z" /></svg>
+</svg>
 </defs>/* end glyphs */
 <style>/* Colors https://materialui.co/colors */
 svg path {
@@ -243,7 +243,7 @@ rect.esc, rect.vim {
 <text x="780.0" y="442.0" class="tap">F12</text>
 <rect rx="6.0" ry="6.0" x="812.0" y="414.0" width="56.0" height="56.0" class="key"/>
 <rect rx="6.0" ry="6.0" x="872.0" y="414.0" width="56.0" height="56.0" class="key"/>
-<text x="900.0" y="442.0" class="tap">TG(2)</text>
+<text x="900.0" y="442.0" class="tap">TG2</text>
 <rect rx="6.0" ry="6.0" x="32.0" y="474.0" width="86.0" height="56.0" class="key"/>
 <rect rx="6.0" ry="6.0" x="122.0" y="474.0" width="56.0" height="56.0" class="key"/>
 <rect rx="6.0" ry="6.0" x="182.0" y="474.0" width="56.0" height="56.0" class="key"/>
@@ -259,6 +259,7 @@ rect.esc, rect.vim {
 <use href="#mdi:arrow-up" xlink:href="#mdi:arrow-up" x="741.0" y="493.0" height="18" width="18.0" class="tap glyph mdi:arrow-up"/>
 <rect rx="6.0" ry="6.0" x="782.0" y="474.0" width="56.0" height="56.0" class="key"/>
 <rect rx="6.0" ry="6.0" x="842.0" y="474.0" width="86.0" height="56.0" class="key"/>
+<text x="885.0" y="502.0" class="tap">DEL</text>
 <rect rx="6.0" ry="6.0" x="32.0" y="534.0" width="101.0" height="56.0" class="key"/>
 <rect rx="6.0" ry="6.0" x="137.0" y="534.0" width="56.0" height="56.0" class="key"/>
 <rect rx="6.0" ry="6.0" x="197.0" y="534.0" width="56.0" height="56.0" class="key"/>
@@ -289,7 +290,7 @@ rect.esc, rect.vim {
 <use href="#mdi:arrow-down" xlink:href="#mdi:arrow-down" x="726.0" y="613.0" height="18" width="18.0" class="tap glyph mdi:arrow-down"/>
 <rect rx="6.0" ry="6.0" x="767.0" y="594.0" width="101.0" height="56.0" class="trans key"/>
 <use href="#mdi:transfer" xlink:href="#mdi:transfer" x="808.5" y="613.0" height="18" width="18.0" class="trans tap glyph mdi:transfer"/>
-<rect rx="6.0" ry="6.0" x="872.0" y="594.0" width="56.0" height="56.0" class="held key"/>
+<rect rx="6.0" ry="6.0" x="872.0" y="594.0" width="56.0" height="56.0" class="key"/>
 <rect rx="6.0" ry="6.0" x="32.0" y="654.0" width="86.0" height="56.0" class="key"/>
 <rect rx="6.0" ry="6.0" x="122.0" y="654.0" width="56.0" height="56.0" class="key"/>
 <rect rx="6.0" ry="6.0" x="182.0" y="654.0" width="86.0" height="56.0" class="key"/>
@@ -315,7 +316,7 @@ rect.esc, rect.vim {
 <rect rx="6.0" ry="6.0" x="752.0" y="770.0" width="56.0" height="56.0" class="key"/>
 <rect rx="6.0" ry="6.0" x="812.0" y="770.0" width="56.0" height="56.0" class="key"/>
 <rect rx="6.0" ry="6.0" x="872.0" y="770.0" width="56.0" height="56.0" class="key"/>
-<text x="900.0" y="798.0" class="tap">TO(0)</text>
+<text x="900.0" y="798.0" class="tap">TO0</text>
 <rect rx="6.0" ry="6.0" x="32.0" y="830.0" width="86.0" height="56.0" class="key"/>
 <rect rx="6.0" ry="6.0" x="122.0" y="830.0" width="56.0" height="56.0" class="key"/>
 <text x="150.0" y="858.0" class="tap">BRMD</text>
@@ -446,7 +447,7 @@ rect.esc, rect.vim {
 <rect rx="6.0" ry="6.0" x="647.0" y="1306.0" width="56.0" height="56.0" class="key"/>
 <rect rx="6.0" ry="6.0" x="707.0" y="1306.0" width="56.0" height="56.0" class="key"/>
 <rect rx="6.0" ry="6.0" x="767.0" y="1306.0" width="101.0" height="56.0" class="key"/>
-<rect rx="6.0" ry="6.0" x="872.0" y="1306.0" width="56.0" height="56.0" class="held key"/>
+<rect rx="6.0" ry="6.0" x="872.0" y="1306.0" width="56.0" height="56.0" class="key"/>
 <rect rx="6.0" ry="6.0" x="32.0" y="1366.0" width="86.0" height="56.0" class="key"/>
 <rect rx="6.0" ry="6.0" x="122.0" y="1366.0" width="56.0" height="56.0" class="key"/>
 <rect rx="6.0" ry="6.0" x="182.0" y="1366.0" width="86.0" height="56.0" class="key"/>
diff --git a/dztech_dz60rgb_wkl/caksoylar_keymap_drawer/keymap.yaml b/dztech_dz60rgb_wkl/caksoylar_keymap_drawer/keymap.yaml
index 2cbee81..e77ca6e 100644
--- a/dztech_dz60rgb_wkl/caksoylar_keymap_drawer/keymap.yaml
+++ b/dztech_dz60rgb_wkl/caksoylar_keymap_drawer/keymap.yaml
@@ -79,7 +79,7 @@ layers:
     - F11
     - F12
     - ""
-    - TG(2)
+    - TG2
     - ""
     - ""
     - ""
@@ -93,7 +93,7 @@ layers:
     - ""
     - $$mdi:arrow-up$$
     - ""
-    - ""
+    - DEL
     - ""
     - ""
     - ""
@@ -119,7 +119,7 @@ layers:
     - ""
     - $$mdi:arrow-down$$
     - { t: "$$mdi:transfer$$", type: trans }
-    - { type: held }
+    - ""
     - ""
     - ""
     - ""
@@ -142,7 +142,7 @@ layers:
     - ""
     - ""
     - ""
-    - TO(0)
+    - TO0
     - ""
     - BRMD
     - BRMU
@@ -191,65 +191,67 @@ layers:
     - RGB MOD
     - ""
   L3:
-    - BOOT
-    - EE CLR
-    - ""
-    - ""
-    - ""
-    - ""
-    - ""
-    - ""
-    - ""
-    - ""
-    - ""
-    - ""
-    - ""
-    - ""
-    - ""
-    - ""
-    - ""
-    - ""
-    - ""
-    - ""
-    - ""
-    - ""
-    - ""
-    - ""
-    - ""
-    - ""
-    - ""
-    - ""
-    - ""
-    - ""
-    - ""
-    - ""
-    - ""
-    - ""
-    - ""
-    - ""
-    - ""
-    - ""
-    - ""
-    - ""
-    - ""
-    - ""
-    - ""
-    - ""
-    - ""
-    - ""
-    - ""
-    - ""
-    - ""
-    - ""
-    - ""
-    - ""
-    - ""
-    - ""
-    - { type: held }
-    - ""
-    - ""
-    - ""
-    - ""
-    - ""
-    - ""
-    - ""
+    [
+      BOOT,
+      EE CLR,
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+    ]
diff --git a/dztech_dz60rgb_wkl/keymaps_json/haunt98/keymap.json b/dztech_dz60rgb_wkl/keymaps_json/haunt98/keymap.json
index a8d1643..e4a701f 100644
--- a/dztech_dz60rgb_wkl/keymaps_json/haunt98/keymap.json
+++ b/dztech_dz60rgb_wkl/keymaps_json/haunt98/keymap.json
@@ -1,263 +1,11 @@
 {
-  "keyboard": "dztech/dz60rgb_wkl/v2_1",
-  "keymap": "haunt98",
-  "layers": [
-    [
-      "QK_GESC",
-      "KC_1",
-      "KC_2",
-      "KC_3",
-      "KC_4",
-      "KC_5",
-      "KC_6",
-      "KC_7",
-      "KC_8",
-      "KC_9",
-      "KC_0",
-      "KC_MINS",
-      "KC_EQL",
-      "KC_BSLS",
-      "KC_GRV",
-      "KC_TAB",
-      "KC_Q",
-      "KC_W",
-      "KC_E",
-      "KC_R",
-      "KC_T",
-      "KC_Y",
-      "KC_U",
-      "KC_I",
-      "KC_O",
-      "KC_P",
-      "KC_LBRC",
-      "KC_RBRC",
-      "KC_BSPC",
-      "CTL_T(KC_ESC)",
-      "KC_A",
-      "KC_S",
-      "KC_D",
-      "KC_F",
-      "KC_G",
-      "KC_H",
-      "KC_J",
-      "KC_K",
-      "KC_L",
-      "KC_SCLN",
-      "KC_QUOT",
-      "KC_ENT",
-      "SC_LSPO",
-      "KC_Z",
-      "KC_X",
-      "KC_C",
-      "KC_V",
-      "KC_B",
-      "KC_N",
-      "KC_M",
-      "KC_COMM",
-      "KC_DOT",
-      "KC_SLSH",
-      "SC_RSPC",
-      "MO(LAYER_COMMON)",
-      "KC_NO",
-      "KC_LOPT",
-      "KC_LCMD",
-      "KC_SPC",
-      "KC_RCMD",
-      "KC_ROPT",
-      "KC_NO"
+    "keyboard": "dztech/dz60rgb_wkl/v2_1",
+    "keymap": "haunt98",
+    "layers": [
+        ["QK_GESC", "KC_1", "KC_2", "KC_3", "KC_4", "KC_5", "KC_6", "KC_7", "KC_8", "KC_9", "KC_0", "KC_MINS", "KC_EQL", "KC_BSLS", "KC_GRV", "KC_TAB", "KC_Q", "KC_W", "KC_E", "KC_R", "KC_T", "KC_Y", "KC_U", "KC_I", "KC_O", "KC_P", "KC_LBRC", "KC_RBRC", "KC_BSPC", "CTL_T(KC_ESC)", "KC_A", "KC_S", "KC_D", "KC_F", "KC_G", "KC_H", "KC_J", "KC_K", "KC_L", "KC_SCLN", "KC_QUOT", "KC_ENT", "SC_LSPO", "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_N", "KC_M", "KC_COMM", "KC_DOT", "KC_SLSH", "SC_RSPC", "MO(LAYER_COMMON)", "KC_NO", "KC_LOPT", "KC_LCMD", "KC_SPC", "KC_RCMD", "KC_ROPT", "KC_NO"],
+        ["KC_GRV", "KC_F1", "KC_F2", "KC_F3", "KC_F4", "KC_F5", "KC_F6", "KC_F7", "KC_F8", "KC_F9", "KC_F10", "KC_F11", "KC_F12", "KC_NO", "TG(LAYER_RARELY)", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_UP", "KC_NO", "KC_DEL", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_LEFT", "KC_RGHT", "KC_NO", "KC_TRNS", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_DOWN", "KC_TRNS", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO"],
+        ["KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "TO(LAYER_QWERTY)", "KC_NO", "KC_BRMD", "KC_BRMU", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_CAPS", "KC_VOLD", "KC_VOLU", "KC_MUTE", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_HOME", "KC_PGUP", "KC_NO", "KC_NO", "KC_NO", "KC_TRNS", "RGB_HUI", "RGB_SAI", "RGB_VAI", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_END", "KC_PGDN", "KC_NO", "KC_TRNS", "MO(LAYER_RECOVERY)", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "RGB_TOG", "RGB_MOD", "KC_NO"],
+        ["TD(TD_SAFE_BOOT)", "EE_CLR", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO"]
     ],
-    [
-      "KC_GRV",
-      "KC_F1",
-      "KC_F2",
-      "KC_F3",
-      "KC_F4",
-      "KC_F5",
-      "KC_F6",
-      "KC_F7",
-      "KC_F8",
-      "KC_F9",
-      "KC_F10",
-      "KC_F11",
-      "KC_F12",
-      "KC_NO",
-      "TG(LAYER_RARELY)",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_UP",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_LEFT",
-      "KC_RGHT",
-      "KC_NO",
-      "KC_TRNS",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_DOWN",
-      "KC_TRNS",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO"
-    ],
-    [
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "TO(LAYER_QWERTY)",
-      "KC_NO",
-      "KC_BRMD",
-      "KC_BRMU",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_CAPS",
-      "KC_VOLD",
-      "KC_VOLU",
-      "KC_MUTE",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_HOME",
-      "KC_PGUP",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_TRNS",
-      "RGB_HUI",
-      "RGB_SAI",
-      "RGB_VAI",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_END",
-      "KC_PGDN",
-      "KC_NO",
-      "KC_TRNS",
-      "MO(LAYER_RECOVERY)",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "RGB_TOG",
-      "RGB_MOD",
-      "KC_NO"
-    ],
-    [
-      "TD(TD_SAFE_BOOT)",
-      "EE_CLR",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO",
-      "KC_NO"
-    ]
-  ],
-  "layout": "LAYOUT_60_tsangan_hhkb"
-}
+    "layout": "LAYOUT_60_tsangan_hhkb"
+}
\ No newline at end of file