diff --git a/Makefile b/Makefile
index 9cc1be5..2db62a0 100644
--- a/Makefile
+++ b/Makefile
@@ -9,6 +9,7 @@ format:
 
 clean:
 	qmk clean
+	rm -rf ~/qmk_firmware/keyboards/dztech/dz60rgb_wkl/keymaps/haunt98
 	rm -rf dztech_dz60rgb_wkl_v2_1_haunt98.bin
 
 dztech_dz60rgb_wkl:
diff --git a/README.md b/README.md
index 23acc5f..4d6a940 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@ make dztech_dz60rgb_wkl
 Currently firmware size:
 
 ```txt
-* The firmware size is fine - 16080/26624 (60%, 10544 bytes free)
+* The firmware size is fine - 14812/26624 (55%, 11812 bytes free)
 ```
 
 ## Install
diff --git a/dztech_dz60rgb_wkl/keymaps/haunt98/keymap.c b/dztech_dz60rgb_wkl/keymaps/haunt98/keymap.c
index 0ad4b2e..be12cff 100644
--- a/dztech_dz60rgb_wkl/keymaps/haunt98/keymap.c
+++ b/dztech_dz60rgb_wkl/keymaps/haunt98/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         XXXXXXX, MO(2), _______, _______, _______, _______, XXXXXXX),
     [2] = LAYOUT_60_tsangan_hhkb(
         QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, RGB_HUD, RGB_HUI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        KC_CAPS, RGB_HUD, RGB_HUI, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, KC_END, KC_PGDN, _______, _______, _______,
         XXXXXXX, _______, _______, _______, RGB_TOG, RGB_MOD, XXXXXXX)};
diff --git a/dztech_dz60rgb_wkl/keymaps/haunt98/rules.mk b/dztech_dz60rgb_wkl/keymaps/haunt98/rules.mk
index 5b13c14..52aab11 100644
--- a/dztech_dz60rgb_wkl/keymaps/haunt98/rules.mk
+++ b/dztech_dz60rgb_wkl/keymaps/haunt98/rules.mk
@@ -1,5 +1,5 @@
 # VIA
-VIA_ENABLE = yes
+VIA_ENABLE = no
 
 # Optimize
 LTO_ENABLE = yes
@@ -11,6 +11,7 @@ EXTRAKEY_ENABLE = yes
 
 SPACE_CADET_ENABLE = no
 MAGIC_ENABLE = no
+NKRO_ENABLE = no
 
 # Feature
 BOOTMAGIC_ENABLE = yes
diff --git a/dztech_dz60rgb_wkl/keymaps_json/haunt98/keymap.json b/dztech_dz60rgb_wkl/keymaps_json/haunt98/keymap.json
index 129f34c..e028247 100644
--- a/dztech_dz60rgb_wkl/keymaps_json/haunt98/keymap.json
+++ b/dztech_dz60rgb_wkl/keymaps_json/haunt98/keymap.json
@@ -4,7 +4,7 @@
     "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", "KC_LSFT", "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_N", "KC_M", "KC_COMM", "KC_DOT", "KC_SLSH", "KC_RSFT", "MO(1)", "KC_NO", "KC_LALT", "KC_LGUI", "KC_SPC", "KC_RGUI", "KC_RALT", "KC_NO"],
         ["KC_TRNS", "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_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_UP", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_VOLD", "KC_VOLU", "KC_MUTE", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_LEFT", "KC_RGHT", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_DOWN", "KC_TRNS", "KC_TRNS", "KC_NO", "MO(2)", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_NO"],
-        ["QK_BOOT", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "RGB_HUD", "RGB_HUI", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_CAPS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_HOME", "KC_PGUP", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_END", "KC_PGDN", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_NO", "KC_TRNS", "KC_TRNS", "KC_TRNS", "RGB_TOG", "RGB_MOD", "KC_NO"]
+        ["QK_BOOT", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_CAPS", "RGB_HUD", "RGB_HUI", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_HOME", "KC_PGUP", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_END", "KC_PGDN", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_NO", "KC_TRNS", "KC_TRNS", "KC_TRNS", "RGB_TOG", "RGB_MOD", "KC_NO"]
     ],
     "layout": "LAYOUT_60_tsangan_hhkb"
 }
\ No newline at end of file