diff --git a/.gitignore b/.gitignore
index af8dc56..c236665 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,6 @@
 
 # VSCode
 .vscode
+
+# QMK
+dztech_dz60rgb_wkl_v2_1_haunt98.bin
diff --git a/README.md b/README.md
index 8eb0afc..88f8154 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ If success, firmware file is `dztech_dz60rgb_wkl_v2_1_haunt98.bin`
 Currently firmware size:
 
 ```txt
-* The firmware size is fine - 22846/26624 (85%, 3778 bytes free)
+* The firmware size is fine - 21280/26624 (79%, 5344 bytes free)
 ```
 
 Put keyboard into bootloader mode:
@@ -41,11 +41,12 @@ Do
 
 Don't
 
+- [Magic Keycodes](https://github.com/qmk/qmk_firmware/blob/master/docs/keycodes_magic.md)
 - [Command](https://github.com/qmk/qmk_firmware/blob/master/docs/feature_command.md)
+- [Mod-Tap](https://github.com/qmk/qmk_firmware/blob/master/docs/mod_tap.md)
 - [Mouse keys](https://github.com/qmk/qmk_firmware/blob/master/docs/feature_mouse_keys.md)
 - [Space Cadet: The Future, Built In](https://github.com/qmk/qmk_firmware/blob/master/docs/feature_space_cadet.md)
 - [One Shot Keys](https://github.com/qmk/qmk_firmware/blob/master/docs/one_shot_keys.md)
-- [Magic Keycodes](https://github.com/qmk/qmk_firmware/blob/master/docs/keycodes_magic.md)
 
 Build/Optimize
 
diff --git a/keymaps/haunt98/config.h b/keymaps/haunt98/config.h
index 2f66b97..b33d80a 100644
--- a/keymaps/haunt98/config.h
+++ b/keymaps/haunt98/config.h
@@ -1,4 +1,8 @@
 // VIA
 #define DYNAMIC_KEYMAP_LAYER_COUNT 3
 
+// Optimize
 #define NO_ACTION_ONESHOT
+#define NO_ACTION_TAPPING
+
+#define LAYER_STATE_8BIT
diff --git a/keymaps/haunt98/info.json b/keymaps/haunt98/info.json
new file mode 100644
index 0000000..1cab749
--- /dev/null
+++ b/keymaps/haunt98/info.json
@@ -0,0 +1,3 @@
+{
+  "debounce": 5
+}
diff --git a/keymaps/haunt98/rules.mk b/keymaps/haunt98/rules.mk
index 194e9e8..5b13c14 100644
--- a/keymaps/haunt98/rules.mk
+++ b/keymaps/haunt98/rules.mk
@@ -1,5 +1,7 @@
+# VIA
 VIA_ENABLE = yes
 
+# Optimize
 LTO_ENABLE = yes
 
 CONSOLE_ENABLE = no
@@ -9,3 +11,6 @@ EXTRAKEY_ENABLE = yes
 
 SPACE_CADET_ENABLE = no
 MAGIC_ENABLE = no
+
+# Feature
+BOOTMAGIC_ENABLE = yes