diff --git a/keyboards/40percentclub/tomato/config.h b/keyboards/40percentclub/tomato/config.h
index a083223a1f0..6316165b2fe 100644
--- a/keyboards/40percentclub/tomato/config.h
+++ b/keyboards/40percentclub/tomato/config.h
@@ -27,8 +27,6 @@
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* eliminate lag on space cadet mods */
-#define PERMISSIVE_HOLD
 
 /* setup lighting */
 #define RGB_DI_PIN B5
diff --git a/keyboards/40percentclub/tomato/keymaps/default/config.h b/keyboards/40percentclub/tomato/keymaps/default/config.h
new file mode 100644
index 00000000000..b89ca5c8e01
--- /dev/null
+++ b/keyboards/40percentclub/tomato/keymaps/default/config.h
@@ -0,0 +1,3 @@
+
+/* eliminate lag on space cadet mods */
+#define PERMISSIVE_HOLD
\ No newline at end of file
diff --git a/keyboards/dm9records/ergoinu/config.h b/keyboards/dm9records/ergoinu/config.h
index 113eaf9f760..0aac1b7f5d7 100644
--- a/keyboards/dm9records/ergoinu/config.h
+++ b/keyboards/dm9records/ergoinu/config.h
@@ -30,7 +30,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MANUFACTURER    Dm9Records
 #define PRODUCT         ergoinu
 
-#define TAPPING_FORCE_HOLD
 #define TAPPING_TERM 100
 
 #define USE_SERIAL
diff --git a/keyboards/dm9records/ergoinu/keymaps/default/config.h b/keyboards/dm9records/ergoinu/keymaps/default/config.h
index bb266f25e72..0b1d1496bdb 100644
--- a/keyboards/dm9records/ergoinu/keymaps/default/config.h
+++ b/keyboards/dm9records/ergoinu/keymaps/default/config.h
@@ -22,3 +22,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #define RGBLIGHT_ANIMATIONS
+
+#define TAPPING_FORCE_HOLD
\ No newline at end of file
diff --git a/keyboards/ergodox_ez/config.h b/keyboards/ergodox_ez/config.h
index 9dcfc341e1d..626d633cb6d 100644
--- a/keyboards/ergodox_ez/config.h
+++ b/keyboards/ergodox_ez/config.h
@@ -58,7 +58,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define MATRIX_HAS_GHOST
 
 #define TAPPING_TERM    200
-#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.)
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/ergodox_ez/keymaps/default/config.h b/keyboards/ergodox_ez/keymaps/default/config.h
new file mode 100644
index 00000000000..9e5ca75a8f1
--- /dev/null
+++ b/keyboards/ergodox_ez/keymaps/default/config.h
@@ -0,0 +1,2 @@
+
+#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.)
\ No newline at end of file
diff --git a/keyboards/ergodox_infinity/config.h b/keyboards/ergodox_infinity/config.h
index 357ddf6c514..5701e9513ba 100644
--- a/keyboards/ergodox_infinity/config.h
+++ b/keyboards/ergodox_infinity/config.h
@@ -36,7 +36,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define MATRIX_HAS_GHOST
 
 #define TAPPING_TERM    200
-#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.)
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/ergodox_infinity/keymaps/default/config.h b/keyboards/ergodox_infinity/keymaps/default/config.h
new file mode 100644
index 00000000000..9e5ca75a8f1
--- /dev/null
+++ b/keyboards/ergodox_infinity/keymaps/default/config.h
@@ -0,0 +1,2 @@
+
+#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.)
\ No newline at end of file
diff --git a/keyboards/ergotaco/config.h b/keyboards/ergotaco/config.h
index d415e77dc6a..4442fed8e8a 100644
--- a/keyboards/ergotaco/config.h
+++ b/keyboards/ergotaco/config.h
@@ -46,7 +46,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define MATRIX_HAS_GHOST
 
 #define TAPPING_TERM    200
-#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.)
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/ergotaco/keymaps/default/config.h b/keyboards/ergotaco/keymaps/default/config.h
new file mode 100644
index 00000000000..9e5ca75a8f1
--- /dev/null
+++ b/keyboards/ergotaco/keymaps/default/config.h
@@ -0,0 +1,2 @@
+
+#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.)
\ No newline at end of file
diff --git a/keyboards/gboards/gergoplex/config.h b/keyboards/gboards/gergoplex/config.h
index a6d8d6b1bed..d854d5236d1 100644
--- a/keyboards/gboards/gergoplex/config.h
+++ b/keyboards/gboards/gergoplex/config.h
@@ -43,7 +43,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { F6, F5, F4, F1 }
 #define MATRIX_COL_PINS { B1, B2, B3, D2, D3 }
 #define UNUSED_PINS
-#define IGNORE_MOD_TAP_INTERRUPT
 #define COMBO_ALLOW_ACTION_KEYS
 #define COMBO_VARIABLE_LEN
 
diff --git a/keyboards/gboards/gergoplex/keymaps/default/config.h b/keyboards/gboards/gergoplex/keymaps/default/config.h
new file mode 100644
index 00000000000..9d74cd47b02
--- /dev/null
+++ b/keyboards/gboards/gergoplex/keymaps/default/config.h
@@ -0,0 +1,2 @@
+
+#define IGNORE_MOD_TAP_INTERRUPT
\ No newline at end of file
diff --git a/keyboards/georgi/config.h b/keyboards/georgi/config.h
index 5cd2f1620e3..bd1856da1f9 100644
--- a/keyboards/georgi/config.h
+++ b/keyboards/georgi/config.h
@@ -30,7 +30,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define NO_ACTION_FUNCTION
 #define NO_ACTION_ONESHOT
 #define NO_ACTION_MACRO
-#define IGNORE_MOD_TAP_INTERRUPT
 
 /* USB Device descriptor parameter */
 #define VENDOR_ID       0xFEED
@@ -55,7 +54,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define MATRIX_HAS_GHOST
 
 #define TAPPING_TERM    200
-#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.)
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/georgi/keymaps/default/config.h b/keyboards/georgi/keymaps/default/config.h
new file mode 100644
index 00000000000..dad2436dd6d
--- /dev/null
+++ b/keyboards/georgi/keymaps/default/config.h
@@ -0,0 +1 @@
+#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.)
diff --git a/keyboards/gergo/config.h b/keyboards/gergo/config.h
index 9d56c0e24f3..ac2082e9264 100644
--- a/keyboards/gergo/config.h
+++ b/keyboards/gergo/config.h
@@ -58,7 +58,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define MATRIX_HAS_GHOST
 
 #define TAPPING_TERM    200
-#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.)
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/gergo/keymaps/default/config.h b/keyboards/gergo/keymaps/default/config.h
index 6393d46f14b..22f35be02d8 100644
--- a/keyboards/gergo/keymaps/default/config.h
+++ b/keyboards/gergo/keymaps/default/config.h
@@ -1,3 +1,3 @@
 #pragma once
 
-#define IGNORE_MOD_TAP_INTERRUPT
+#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.)
diff --git a/keyboards/handwired/angel/config.h b/keyboards/handwired/angel/config.h
index e2472a1a272..cd8f716cfe0 100644
--- a/keyboards/handwired/angel/config.h
+++ b/keyboards/handwired/angel/config.h
@@ -46,7 +46,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // https://docs.qmk.fm/using-qmk/software-features/tap_hold
 #define TAPPING_TERM 200
-#define IGNORE_MOD_TAP_INTERRUPT
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
diff --git a/keyboards/handwired/angel/keymaps/default/config.h b/keyboards/handwired/angel/keymaps/default/config.h
new file mode 100644
index 00000000000..9d74cd47b02
--- /dev/null
+++ b/keyboards/handwired/angel/keymaps/default/config.h
@@ -0,0 +1,2 @@
+
+#define IGNORE_MOD_TAP_INTERRUPT
\ No newline at end of file
diff --git a/keyboards/handwired/bolek/config.h b/keyboards/handwired/bolek/config.h
index ecf0b0de36d..d700570c2bb 100644
--- a/keyboards/handwired/bolek/config.h
+++ b/keyboards/handwired/bolek/config.h
@@ -146,5 +146,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
 
-#define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/handwired/bolek/keymaps/default/config.h b/keyboards/handwired/bolek/keymaps/default/config.h
new file mode 100644
index 00000000000..f1c4ccf0f80
--- /dev/null
+++ b/keyboards/handwired/bolek/keymaps/default/config.h
@@ -0,0 +1,3 @@
+
+#define PERMISSIVE_HOLD
+#define IGNORE_MOD_TAP_INTERRUPT
\ No newline at end of file
diff --git a/keyboards/handwired/brain/config.h b/keyboards/handwired/brain/config.h
index 2ca3cf1d1e3..339a6d2b6fd 100644
--- a/keyboards/handwired/brain/config.h
+++ b/keyboards/handwired/brain/config.h
@@ -68,8 +68,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* Enables This makes it easier for fast typists to use dual-function keys */
-#define PERMISSIVE_HOLD
 
 /* ws2812 RGB LED */
 #define RGB_DI_PIN D3
diff --git a/keyboards/handwired/brain/keymaps/default/config.h b/keyboards/handwired/brain/keymaps/default/config.h
new file mode 100644
index 00000000000..f630919e9af
--- /dev/null
+++ b/keyboards/handwired/brain/keymaps/default/config.h
@@ -0,0 +1,3 @@
+
+/* Enables This makes it easier for fast typists to use dual-function keys */
+#define PERMISSIVE_HOLD
\ No newline at end of file
diff --git a/keyboards/handwired/concertina/64key/config.h b/keyboards/handwired/concertina/64key/config.h
index 45b5a05ca43..9318402ed25 100644
--- a/keyboards/handwired/concertina/64key/config.h
+++ b/keyboards/handwired/concertina/64key/config.h
@@ -38,4 +38,3 @@
 
 #define DIODE_DIRECTION COL2ROW
 
-#define PERMISSIVE_HOLD
diff --git a/keyboards/handwired/concertina/64key/keymaps/default/config.h b/keyboards/handwired/concertina/64key/keymaps/default/config.h
index 4af423c3a73..7c28437b6a4 100644
--- a/keyboards/handwired/concertina/64key/keymaps/default/config.h
+++ b/keyboards/handwired/concertina/64key/keymaps/default/config.h
@@ -21,3 +21,5 @@
 #define RCPC_KEYS KC_RCTL, KC_TRNS, KC_RBRACKET
 #define LAPO_KEYS KC_LALT, KC_LSFT, KC_LBRACKET
 #define RAPC_KEYS KC_RALT, KC_RSFT, KC_RBRACKET
+
+#define PERMISSIVE_HOLD
\ No newline at end of file
diff --git a/keyboards/handwired/dactyl/config.h b/keyboards/handwired/dactyl/config.h
index 29a008f0c6a..9f44eae68e0 100644
--- a/keyboards/handwired/dactyl/config.h
+++ b/keyboards/handwired/dactyl/config.h
@@ -48,7 +48,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define TAPPING_TOGGLE  1
 
 #define TAPPING_TERM    200
-#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.)
 
 /* key combination for command */
 #define IS_COMMAND() ( \
diff --git a/keyboards/handwired/dactyl/keymaps/default/config.h b/keyboards/handwired/dactyl/keymaps/default/config.h
new file mode 100644
index 00000000000..9e5ca75a8f1
--- /dev/null
+++ b/keyboards/handwired/dactyl/keymaps/default/config.h
@@ -0,0 +1,2 @@
+
+#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.)
\ No newline at end of file
diff --git a/keyboards/handwired/dactyl_manuform/4x5/keymaps/default/config.h b/keyboards/handwired/dactyl_manuform/4x5/keymaps/default/config.h
index 18320c0952a..ead23b46013 100644
--- a/keyboards/handwired/dactyl_manuform/4x5/keymaps/default/config.h
+++ b/keyboards/handwired/dactyl_manuform/4x5/keymaps/default/config.h
@@ -29,3 +29,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define MASTER_RIGHT
 
 #define EE_HANDS
+
+#define PERMISSIVE_HOLD
diff --git a/keyboards/handwired/dactyl_manuform/4x6/keymaps/default/config.h b/keyboards/handwired/dactyl_manuform/4x6/keymaps/default/config.h
index 18320c0952a..ead23b46013 100644
--- a/keyboards/handwired/dactyl_manuform/4x6/keymaps/default/config.h
+++ b/keyboards/handwired/dactyl_manuform/4x6/keymaps/default/config.h
@@ -29,3 +29,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define MASTER_RIGHT
 
 #define EE_HANDS
+
+#define PERMISSIVE_HOLD
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/default/config.h b/keyboards/handwired/dactyl_manuform/5x6/keymaps/default/config.h
index 5a20f9473fe..06922cef756 100644
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/default/config.h
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/default/config.h
@@ -23,3 +23,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define MASTER_RIGHT
 
 //#define EE_HANDS
+
+#define PERMISSIVE_HOLD
diff --git a/keyboards/handwired/dactyl_manuform/5x6_2_5/keymaps/default/config.h b/keyboards/handwired/dactyl_manuform/5x6_2_5/keymaps/default/config.h
index c4fb3742d96..ca5d2621e86 100644
--- a/keyboards/handwired/dactyl_manuform/5x6_2_5/keymaps/default/config.h
+++ b/keyboards/handwired/dactyl_manuform/5x6_2_5/keymaps/default/config.h
@@ -22,3 +22,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define EE_HANDS
 
 #define KINETIC_SPEED
+
+#define PERMISSIVE_HOLD
diff --git a/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/default/config.h b/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/default/config.h
index c4fb3742d96..ca5d2621e86 100644
--- a/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/default/config.h
+++ b/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/default/config.h
@@ -22,3 +22,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define EE_HANDS
 
 #define KINETIC_SPEED
+
+#define PERMISSIVE_HOLD
diff --git a/keyboards/handwired/dactyl_manuform/5x7/keymaps/default/config.h b/keyboards/handwired/dactyl_manuform/5x7/keymaps/default/config.h
index 5a20f9473fe..06922cef756 100644
--- a/keyboards/handwired/dactyl_manuform/5x7/keymaps/default/config.h
+++ b/keyboards/handwired/dactyl_manuform/5x7/keymaps/default/config.h
@@ -23,3 +23,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define MASTER_RIGHT
 
 //#define EE_HANDS
+
+#define PERMISSIVE_HOLD
diff --git a/keyboards/handwired/dactyl_manuform/5x7/keymaps/via/config.h b/keyboards/handwired/dactyl_manuform/5x7/keymaps/via/config.h
index 5a20f9473fe..06922cef756 100644
--- a/keyboards/handwired/dactyl_manuform/5x7/keymaps/via/config.h
+++ b/keyboards/handwired/dactyl_manuform/5x7/keymaps/via/config.h
@@ -23,3 +23,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define MASTER_RIGHT
 
 //#define EE_HANDS
+
+#define PERMISSIVE_HOLD
diff --git a/keyboards/handwired/dactyl_manuform/6x6/keymaps/default/config.h b/keyboards/handwired/dactyl_manuform/6x6/keymaps/default/config.h
index 5a20f9473fe..06922cef756 100644
--- a/keyboards/handwired/dactyl_manuform/6x6/keymaps/default/config.h
+++ b/keyboards/handwired/dactyl_manuform/6x6/keymaps/default/config.h
@@ -23,3 +23,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define MASTER_RIGHT
 
 //#define EE_HANDS
+
+#define PERMISSIVE_HOLD
diff --git a/keyboards/handwired/dactyl_manuform/config.h b/keyboards/handwired/dactyl_manuform/config.h
index 18942f9e5fa..4ea6462e6eb 100644
--- a/keyboards/handwired/dactyl_manuform/config.h
+++ b/keyboards/handwired/dactyl_manuform/config.h
@@ -41,6 +41,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-/* Enables This makes it easier for fast typists to use dual-function keys */
-#define PERMISSIVE_HOLD
diff --git a/keyboards/handwired/dactyl_manuform/dmote/62key/keymaps/default/config.h b/keyboards/handwired/dactyl_manuform/dmote/62key/keymaps/default/config.h
index 2e1d4f8dc37..0b0a5e223a3 100644
--- a/keyboards/handwired/dactyl_manuform/dmote/62key/keymaps/default/config.h
+++ b/keyboards/handwired/dactyl_manuform/dmote/62key/keymaps/default/config.h
@@ -3,3 +3,5 @@
 #define USE_SERIAL
 
 #define EE_HANDS
+
+#define PERMISSIVE_HOLD
diff --git a/keyboards/handwired/dactyl_promicro/config.h b/keyboards/handwired/dactyl_promicro/config.h
index 29547f2533b..f4c12760fb7 100644
--- a/keyboards/handwired/dactyl_promicro/config.h
+++ b/keyboards/handwired/dactyl_promicro/config.h
@@ -56,8 +56,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* Enables This makes it easier for fast typists to use dual-function keys */
-#define PERMISSIVE_HOLD
 
 /* ws2812 RGB LED */
 #define RGB_DI_PIN D3
diff --git a/keyboards/handwired/dactyl_promicro/keymaps/default/config.h b/keyboards/handwired/dactyl_promicro/keymaps/default/config.h
index ce8f3501ada..346a31dd550 100644
--- a/keyboards/handwired/dactyl_promicro/keymaps/default/config.h
+++ b/keyboards/handwired/dactyl_promicro/keymaps/default/config.h
@@ -23,3 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define MASTER_RIGHT
 //#define EE_HANDS
 // Rows are doubled-up
+
+/* Enables This makes it easier for fast typists to use dual-function keys */
+#define PERMISSIVE_HOLD
\ No newline at end of file
diff --git a/keyboards/handwired/dactyl_rah/config.h b/keyboards/handwired/dactyl_rah/config.h
index 2ffe4e8a520..a2c7a4e917e 100644
--- a/keyboards/handwired/dactyl_rah/config.h
+++ b/keyboards/handwired/dactyl_rah/config.h
@@ -56,8 +56,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* Enables This makes it easier for fast typists to use dual-function keys */
-#define PERMISSIVE_HOLD
 
 // Feature disable options
 // These options are also useful to firmware size reduction.
diff --git a/keyboards/handwired/dactyl_rah/keymaps/default/config.h b/keyboards/handwired/dactyl_rah/keymaps/default/config.h
new file mode 100644
index 00000000000..f630919e9af
--- /dev/null
+++ b/keyboards/handwired/dactyl_rah/keymaps/default/config.h
@@ -0,0 +1,3 @@
+
+/* Enables This makes it easier for fast typists to use dual-function keys */
+#define PERMISSIVE_HOLD
\ No newline at end of file
diff --git a/keyboards/handwired/frenchdev/config.h b/keyboards/handwired/frenchdev/config.h
index 7b2fb6e002c..6021c060681 100644
--- a/keyboards/handwired/frenchdev/config.h
+++ b/keyboards/handwired/frenchdev/config.h
@@ -53,7 +53,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define MATRIX_HAS_GHOST
 
 #define TAPPING_TERM    200
-#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.)
 
 /* key combination for command */
 #define IS_COMMAND() ( \
diff --git a/keyboards/handwired/frenchdev/keymaps/default/config.h b/keyboards/handwired/frenchdev/keymaps/default/config.h
new file mode 100644
index 00000000000..9e5ca75a8f1
--- /dev/null
+++ b/keyboards/handwired/frenchdev/keymaps/default/config.h
@@ -0,0 +1,2 @@
+
+#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.)
\ No newline at end of file
diff --git a/keyboards/handwired/ks63/config.h b/keyboards/handwired/ks63/config.h
index e49d0906783..dbcce772a22 100644
--- a/keyboards/handwired/ks63/config.h
+++ b/keyboards/handwired/ks63/config.h
@@ -55,8 +55,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* Enables This makes it easier for fast typists to use dual-function keys */
-#define PERMISSIVE_HOLD
 
 /*
  * Feature disable options
diff --git a/keyboards/handwired/ks63/keymaps/default/config.h b/keyboards/handwired/ks63/keymaps/default/config.h
new file mode 100644
index 00000000000..f630919e9af
--- /dev/null
+++ b/keyboards/handwired/ks63/keymaps/default/config.h
@@ -0,0 +1,3 @@
+
+/* Enables This makes it easier for fast typists to use dual-function keys */
+#define PERMISSIVE_HOLD
\ No newline at end of file
diff --git a/keyboards/handwired/pterodactyl/config.h b/keyboards/handwired/pterodactyl/config.h
index 9f5f1412b8c..80278a9395f 100644
--- a/keyboards/handwired/pterodactyl/config.h
+++ b/keyboards/handwired/pterodactyl/config.h
@@ -47,7 +47,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define TAPPING_TOGGLE  1
 
-#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.)
 
 /* key combination for command */
 #define IS_COMMAND() ( \
diff --git a/keyboards/handwired/pterodactyl/keymaps/default/config.h b/keyboards/handwired/pterodactyl/keymaps/default/config.h
new file mode 100644
index 00000000000..9e5ca75a8f1
--- /dev/null
+++ b/keyboards/handwired/pterodactyl/keymaps/default/config.h
@@ -0,0 +1,2 @@
+
+#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.)
\ No newline at end of file
diff --git a/keyboards/handwired/xealous/keymaps/default/config.h b/keyboards/handwired/xealous/keymaps/default/config.h
new file mode 100644
index 00000000000..4d7b6390137
--- /dev/null
+++ b/keyboards/handwired/xealous/keymaps/default/config.h
@@ -0,0 +1 @@
+#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/handwired/xealous/rev1/config.h b/keyboards/handwired/xealous/rev1/config.h
index 8bd5b464a4f..ce520b526af 100644
--- a/keyboards/handwired/xealous/rev1/config.h
+++ b/keyboards/handwired/xealous/rev1/config.h
@@ -79,4 +79,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define NO_ACTION_ONESHOT
 #define NO_ACTION_MACRO
 //#define NO_ACTION_FUNCTION
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/helix/pico/config.h b/keyboards/helix/pico/config.h
index b01fd3a0016..9f696281df4 100644
--- a/keyboards/helix/pico/config.h
+++ b/keyboards/helix/pico/config.h
@@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MANUFACTURER    Yushakobo
 #define PRODUCT         HelixPico
 
-#define TAPPING_FORCE_HOLD
 #define TAPPING_TERM 100
 
 /* Use I2C or Serial */
diff --git a/keyboards/helix/pico/keymaps/default/config.h b/keyboards/helix/pico/keymaps/default/config.h
index 0bd76a18b45..efd3e93eb26 100644
--- a/keyboards/helix/pico/keymaps/default/config.h
+++ b/keyboards/helix/pico/keymaps/default/config.h
@@ -40,3 +40,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    //#define RGBLIGHT_EFFECT_RGB_TEST
    //#define RGBLIGHT_EFFECT_ALTERNATING
 #endif
+
+#define TAPPING_FORCE_HOLD
\ No newline at end of file
diff --git a/keyboards/helix/rev2/config.h b/keyboards/helix/rev2/config.h
index 041acee2158..7e73f81768e 100644
--- a/keyboards/helix/rev2/config.h
+++ b/keyboards/helix/rev2/config.h
@@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MANUFACTURER    Yushakobo
 #define PRODUCT         Helix Beta
 
-#define TAPPING_FORCE_HOLD
 #define TAPPING_TERM 100
 
 /* Use I2C or Serial */
diff --git a/keyboards/helix/rev2/keymaps/default/config.h b/keyboards/helix/rev2/keymaps/default/config.h
index b8c1041cdc7..7dfaff7fa7a 100644
--- a/keyboards/helix/rev2/keymaps/default/config.h
+++ b/keyboards/helix/rev2/keymaps/default/config.h
@@ -36,3 +36,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    //#define RGBLIGHT_EFFECT_RGB_TEST
    //#define RGBLIGHT_EFFECT_ALTERNATING
 #endif
+
+#define TAPPING_FORCE_HOLD
\ No newline at end of file
diff --git a/keyboards/hotdox/config.h b/keyboards/hotdox/config.h
index 21d5938faf9..a0284deb5dc 100644
--- a/keyboards/hotdox/config.h
+++ b/keyboards/hotdox/config.h
@@ -27,7 +27,6 @@
 //#define MATRIX_HAS_GHOST
 
 #define TAPPING_TERM    200
-#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.)
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/hotdox/keymaps/default/config.h b/keyboards/hotdox/keymaps/default/config.h
new file mode 100644
index 00000000000..9e5ca75a8f1
--- /dev/null
+++ b/keyboards/hotdox/keymaps/default/config.h
@@ -0,0 +1,2 @@
+
+#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.)
\ No newline at end of file
diff --git a/keyboards/hotdox/keymaps/via/config.h b/keyboards/hotdox/keymaps/via/config.h
index 2c143476a76..6327dceb5ce 100644
--- a/keyboards/hotdox/keymaps/via/config.h
+++ b/keyboards/hotdox/keymaps/via/config.h
@@ -1,4 +1,5 @@
 #pragma once
 
 // place overrides here
-#define DYNAMIC_KEYMAP_LAYER_COUNT 3
\ No newline at end of file
+#define DYNAMIC_KEYMAP_LAYER_COUNT 3
+#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.)
\ No newline at end of file
diff --git a/keyboards/kinesis/kint36/config.h b/keyboards/kinesis/kint36/config.h
index 3738629ea7e..3d9c63bc8ed 100644
--- a/keyboards/kinesis/kint36/config.h
+++ b/keyboards/kinesis/kint36/config.h
@@ -57,7 +57,6 @@
 #undef DEBOUNCE
 #define DEBOUNCE 20
 
-#define IGNORE_MOD_TAP_INTERRUPT
 
 // Reduce input latency by lowering the USB polling interval
 // from its 10ms default to the 1ms minimum that USB 1.x (Full Speed) allows:
diff --git a/keyboards/ktec/ergodone/config.h b/keyboards/ktec/ergodone/config.h
index db626ab8083..65cca12e94a 100644
--- a/keyboards/ktec/ergodone/config.h
+++ b/keyboards/ktec/ergodone/config.h
@@ -26,7 +26,6 @@
 //#define MATRIX_HAS_GHOST
 
 #define TAPPING_TERM    200
-#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.)
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/ktec/ergodone/keymaps/default/config.h b/keyboards/ktec/ergodone/keymaps/default/config.h
new file mode 100644
index 00000000000..9e5ca75a8f1
--- /dev/null
+++ b/keyboards/ktec/ergodone/keymaps/default/config.h
@@ -0,0 +1,2 @@
+
+#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.)
\ No newline at end of file
diff --git a/keyboards/ktec/ergodone/keymaps/via/config.h b/keyboards/ktec/ergodone/keymaps/via/config.h
index fc7744c7632..d0a9df34b5d 100644
--- a/keyboards/ktec/ergodone/keymaps/via/config.h
+++ b/keyboards/ktec/ergodone/keymaps/via/config.h
@@ -15,4 +15,5 @@
   */ 
   //Keymap specific config.h
 #pragma once
-#define DYNAMIC_KEYMAP_LAYER_COUNT 4
\ No newline at end of file
+#define DYNAMIC_KEYMAP_LAYER_COUNT 4
+#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.)
\ No newline at end of file
diff --git a/keyboards/lck75/config.h b/keyboards/lck75/config.h
index 3758afa189c..207b81174b4 100644
--- a/keyboards/lck75/config.h
+++ b/keyboards/lck75/config.h
@@ -83,8 +83,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    undef LOCKING_RESYNC_ENABLE
 #endif
 
-#define IGNORE_MOD_TAP_INTERRUPT
-#define PERMISSIVE_HOLD
 #define TAPPING_TERM 200
 
 #define NO_ACTION_ONESHOT
diff --git a/keyboards/lck75/keymaps/default/config.h b/keyboards/lck75/keymaps/default/config.h
new file mode 100644
index 00000000000..c42e0592a47
--- /dev/null
+++ b/keyboards/lck75/keymaps/default/config.h
@@ -0,0 +1,3 @@
+
+#define IGNORE_MOD_TAP_INTERRUPT
+#define PERMISSIVE_HOLD
\ No newline at end of file
diff --git a/keyboards/lck75/keymaps/via/config.h b/keyboards/lck75/keymaps/via/config.h
new file mode 100644
index 00000000000..c42e0592a47
--- /dev/null
+++ b/keyboards/lck75/keymaps/via/config.h
@@ -0,0 +1,3 @@
+
+#define IGNORE_MOD_TAP_INTERRUPT
+#define PERMISSIVE_HOLD
\ No newline at end of file
diff --git a/keyboards/ramonimbao/chevron/config.h b/keyboards/ramonimbao/chevron/config.h
index ec52ee59541..2c7be50eff1 100644
--- a/keyboards/ramonimbao/chevron/config.h
+++ b/keyboards/ramonimbao/chevron/config.h
@@ -141,9 +141,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
 
-/* QoL improvements */
-#define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
 
 /* Encoder */
 #define ENCODERS_PAD_A { A0 }
diff --git a/keyboards/ramonimbao/chevron/keymaps/default/config.h b/keyboards/ramonimbao/chevron/keymaps/default/config.h
new file mode 100644
index 00000000000..ea303f448f6
--- /dev/null
+++ b/keyboards/ramonimbao/chevron/keymaps/default/config.h
@@ -0,0 +1,4 @@
+
+/* QoL improvements */
+#define PERMISSIVE_HOLD
+#define IGNORE_MOD_TAP_INTERRUPT
\ No newline at end of file
diff --git a/keyboards/ramonimbao/chevron/keymaps/via/config.h b/keyboards/ramonimbao/chevron/keymaps/via/config.h
new file mode 100644
index 00000000000..ea303f448f6
--- /dev/null
+++ b/keyboards/ramonimbao/chevron/keymaps/via/config.h
@@ -0,0 +1,4 @@
+
+/* QoL improvements */
+#define PERMISSIVE_HOLD
+#define IGNORE_MOD_TAP_INTERRUPT
\ No newline at end of file
diff --git a/keyboards/ramonimbao/herringbone/pro/config.h b/keyboards/ramonimbao/herringbone/pro/config.h
index 25249456f99..8f0200866ca 100644
--- a/keyboards/ramonimbao/herringbone/pro/config.h
+++ b/keyboards/ramonimbao/herringbone/pro/config.h
@@ -64,9 +64,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* Small QoL improvements */
-#define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
 
 /* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
  * This is userful for the Windows task manager shortcut (ctrl+shift+esc).
diff --git a/keyboards/ramonimbao/herringbone/pro/keymaps/default/config.h b/keyboards/ramonimbao/herringbone/pro/keymaps/default/config.h
new file mode 100644
index 00000000000..5aeaa762d19
--- /dev/null
+++ b/keyboards/ramonimbao/herringbone/pro/keymaps/default/config.h
@@ -0,0 +1,4 @@
+
+/* Small QoL improvements */
+#define PERMISSIVE_HOLD
+#define IGNORE_MOD_TAP_INTERRUPT
\ No newline at end of file
diff --git a/keyboards/ramonimbao/herringbone/pro/keymaps/via/config.h b/keyboards/ramonimbao/herringbone/pro/keymaps/via/config.h
new file mode 100644
index 00000000000..5aeaa762d19
--- /dev/null
+++ b/keyboards/ramonimbao/herringbone/pro/keymaps/via/config.h
@@ -0,0 +1,4 @@
+
+/* Small QoL improvements */
+#define PERMISSIVE_HOLD
+#define IGNORE_MOD_TAP_INTERRUPT
\ No newline at end of file
diff --git a/keyboards/ramonimbao/herringbone/v1/config.h b/keyboards/ramonimbao/herringbone/v1/config.h
index 9944cfbd194..122f256ab12 100644
--- a/keyboards/ramonimbao/herringbone/v1/config.h
+++ b/keyboards/ramonimbao/herringbone/v1/config.h
@@ -90,9 +90,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* Small QoL improvements */
-#define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
 
 /* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
  * This is userful for the Windows task manager shortcut (ctrl+shift+esc).
diff --git a/keyboards/ramonimbao/herringbone/v1/keymaps/default/config.h b/keyboards/ramonimbao/herringbone/v1/keymaps/default/config.h
new file mode 100644
index 00000000000..5aeaa762d19
--- /dev/null
+++ b/keyboards/ramonimbao/herringbone/v1/keymaps/default/config.h
@@ -0,0 +1,4 @@
+
+/* Small QoL improvements */
+#define PERMISSIVE_HOLD
+#define IGNORE_MOD_TAP_INTERRUPT
\ No newline at end of file
diff --git a/keyboards/ramonimbao/herringbone/v1/keymaps/via/config.h b/keyboards/ramonimbao/herringbone/v1/keymaps/via/config.h
new file mode 100644
index 00000000000..5aeaa762d19
--- /dev/null
+++ b/keyboards/ramonimbao/herringbone/v1/keymaps/via/config.h
@@ -0,0 +1,4 @@
+
+/* Small QoL improvements */
+#define PERMISSIVE_HOLD
+#define IGNORE_MOD_TAP_INTERRUPT
\ No newline at end of file
diff --git a/keyboards/ramonimbao/squishyfrl/config.h b/keyboards/ramonimbao/squishyfrl/config.h
index 0c1d417b811..2ad101c0f1c 100644
--- a/keyboards/ramonimbao/squishyfrl/config.h
+++ b/keyboards/ramonimbao/squishyfrl/config.h
@@ -152,6 +152,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
 
-/* QoL improvements */
-#define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/ramonimbao/squishyfrl/keymaps/default/config.h b/keyboards/ramonimbao/squishyfrl/keymaps/default/config.h
new file mode 100644
index 00000000000..ea303f448f6
--- /dev/null
+++ b/keyboards/ramonimbao/squishyfrl/keymaps/default/config.h
@@ -0,0 +1,4 @@
+
+/* QoL improvements */
+#define PERMISSIVE_HOLD
+#define IGNORE_MOD_TAP_INTERRUPT
\ No newline at end of file
diff --git a/keyboards/ramonimbao/squishyfrl/keymaps/via/config.h b/keyboards/ramonimbao/squishyfrl/keymaps/via/config.h
index c7cec8a9d77..d92ac00f517 100644
--- a/keyboards/ramonimbao/squishyfrl/keymaps/via/config.h
+++ b/keyboards/ramonimbao/squishyfrl/keymaps/via/config.h
@@ -18,3 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #define DYNAMIC_KEYMAP_LAYER_COUNT 2
+
+/* QoL improvements */
+#define PERMISSIVE_HOLD
+#define IGNORE_MOD_TAP_INTERRUPT
\ No newline at end of file
diff --git a/keyboards/ramonimbao/squishytkl/config.h b/keyboards/ramonimbao/squishytkl/config.h
index 3e0812bb12b..b638cc547f0 100644
--- a/keyboards/ramonimbao/squishytkl/config.h
+++ b/keyboards/ramonimbao/squishytkl/config.h
@@ -152,9 +152,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
 
-/* QoL improvements */
-#define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
 
 /* Rotary encoder */
 #define ENCODERS_PAD_A { B6 }
diff --git a/keyboards/ramonimbao/squishytkl/keymaps/default/config.h b/keyboards/ramonimbao/squishytkl/keymaps/default/config.h
new file mode 100644
index 00000000000..ea303f448f6
--- /dev/null
+++ b/keyboards/ramonimbao/squishytkl/keymaps/default/config.h
@@ -0,0 +1,4 @@
+
+/* QoL improvements */
+#define PERMISSIVE_HOLD
+#define IGNORE_MOD_TAP_INTERRUPT
\ No newline at end of file
diff --git a/keyboards/ramonimbao/squishytkl/keymaps/via/config.h b/keyboards/ramonimbao/squishytkl/keymaps/via/config.h
index 884fbd48714..3509cc37a71 100644
--- a/keyboards/ramonimbao/squishytkl/keymaps/via/config.h
+++ b/keyboards/ramonimbao/squishytkl/keymaps/via/config.h
@@ -23,3 +23,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // I'd like that option though. Below also works.
 // #define DYNAMIC_KEYMAP_LAYER_COUNT 2
 // #define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 2047
+
+/* QoL improvements */
+#define PERMISSIVE_HOLD
+#define IGNORE_MOD_TAP_INTERRUPT
\ No newline at end of file
diff --git a/keyboards/zinc/keymaps/default/config.h b/keyboards/zinc/keymaps/default/config.h
index 2185dc9ebe4..724cffae2b2 100644
--- a/keyboards/zinc/keymaps/default/config.h
+++ b/keyboards/zinc/keymaps/default/config.h
@@ -34,3 +34,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    //#define RGBLIGHT_EFFECT_RGB_TEST
    //#define RGBLIGHT_EFFECT_ALTERNATING
 #endif
+
+#define TAPPING_FORCE_HOLD
diff --git a/keyboards/zinc/keymaps/via/config.h b/keyboards/zinc/keymaps/via/config.h
index 233977feaf3..6f7bac1f51b 100644
--- a/keyboards/zinc/keymaps/via/config.h
+++ b/keyboards/zinc/keymaps/via/config.h
@@ -39,3 +39,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //    #define RGBLIGHT_EFFECT_RGB_TEST
 //    #define RGBLIGHT_EFFECT_ALTERNATING
 #endif
+
+#define TAPPING_FORCE_HOLD
diff --git a/keyboards/zinc/rev1/config.h b/keyboards/zinc/rev1/config.h
index a0bc34ece4a..ab5e2b7c779 100644
--- a/keyboards/zinc/rev1/config.h
+++ b/keyboards/zinc/rev1/config.h
@@ -24,7 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MANUFACTURER    25KEYS
 #define PRODUCT         zinc rev.1
 
-#define TAPPING_FORCE_HOLD
 #define TAPPING_TERM 100
 
 /* Use I2C or Serial */
diff --git a/keyboards/zinc/reva/config.h b/keyboards/zinc/reva/config.h
index 378fd9e6d9f..384a6a619ea 100644
--- a/keyboards/zinc/reva/config.h
+++ b/keyboards/zinc/reva/config.h
@@ -24,7 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MANUFACTURER    25KEYS
 #define PRODUCT         zinc rev.A
 
-#define TAPPING_FORCE_HOLD
 #define TAPPING_TERM 100
 
 /* Use I2C or Serial */