diff --git a/keyboards/bajjak/config.h b/keyboards/bajjak/config.h
index b3e3478f1f68..72d296bca4b9 100644
--- a/keyboards/bajjak/config.h
+++ b/keyboards/bajjak/config.h
@@ -43,8 +43,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MOUSEKEY_MAX_SPEED      7
 #define MOUSEKEY_WHEEL_DELAY 0
 
-#define TAPPING_TOGGLE  1
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/bajjak/info.json b/keyboards/bajjak/info.json
index a280cb9ed8d5..37bfafa2621f 100644
--- a/keyboards/bajjak/info.json
+++ b/keyboards/bajjak/info.json
@@ -10,6 +10,9 @@
     },
     "processor": "atmega32u4",
     "bootloader": "halfkay",
+    "tapping": {
+        "toggle": 1
+    },
     "layouts": {
         "LAYOUT_6x7": {
             "layout": [
diff --git a/keyboards/checkerboards/quark_lp/config.h b/keyboards/checkerboards/quark_lp/config.h
index 75345075e758..383ae5c13352 100644
--- a/keyboards/checkerboards/quark_lp/config.h
+++ b/keyboards/checkerboards/quark_lp/config.h
@@ -22,8 +22,6 @@
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define TAPPING_TOGGLE 2
-
 #ifdef RGB_MATRIX_ENABLE
 #define RGB_MATRIX_LED_COUNT 51
 #define RGB_MATRIX_KEYPRESSES // reacts to keypresses
diff --git a/keyboards/checkerboards/quark_lp/info.json b/keyboards/checkerboards/quark_lp/info.json
index 264bddad1292..1dee17b95f14 100644
--- a/keyboards/checkerboards/quark_lp/info.json
+++ b/keyboards/checkerboards/quark_lp/info.json
@@ -21,6 +21,9 @@
     "diode_direction": "COL2ROW",
     "processor": "atmega32u2",
     "bootloader": "atmel-dfu",
+    "tapping": {
+        "toggle": 2
+    },
     "layouts": {
         "LAYOUT_ortho_4x12": {
             "layout": [
diff --git a/keyboards/converter/a1200/mistress1200/config.h b/keyboards/converter/a1200/mistress1200/config.h
index 21ba99e0b7f9..bc137dc1856a 100644
--- a/keyboards/converter/a1200/mistress1200/config.h
+++ b/keyboards/converter/a1200/mistress1200/config.h
@@ -17,8 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define TAPPING_TOGGLE 3
-
 #undef LOCKING_SUPPORT_ENABLE
 #undef LOCKING_RESYNC_ENABLE
 #define LAYER_STATE_8BIT
diff --git a/keyboards/converter/a1200/mistress1200/info.json b/keyboards/converter/a1200/mistress1200/info.json
index c37bdadd617b..28de092b3dec 100644
--- a/keyboards/converter/a1200/mistress1200/info.json
+++ b/keyboards/converter/a1200/mistress1200/info.json
@@ -16,5 +16,8 @@
         "on_state": 0
     },
     "processor": "atmega16u4",
-    "bootloader": "atmel-dfu"
+    "bootloader": "atmel-dfu",
+    "tapping": {
+        "toggle": 3
+    }
 }
diff --git a/keyboards/dumbpad/config.h b/keyboards/dumbpad/config.h
deleted file mode 100644
index 879046ea07ae..000000000000
--- a/keyboards/dumbpad/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
-Copyright 2020 imchipwood
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-/* Reduce tapdance required taps from 5 to 2 */
-#define TAPPING_TOGGLE 2
diff --git a/keyboards/dumbpad/info.json b/keyboards/dumbpad/info.json
index 341a1bcf8b7c..605d90fbb486 100644
--- a/keyboards/dumbpad/info.json
+++ b/keyboards/dumbpad/info.json
@@ -6,5 +6,8 @@
     "usb": {
         "vid": "0xDEAF",
         "pid": "0x0913"
+    },
+    "tapping": {
+        "toggle": 2
     }
 }
diff --git a/keyboards/dumbpad/v1x_oled/config.h b/keyboards/dumbpad/v1x_oled/config.h
deleted file mode 100644
index 1293e859792e..000000000000
--- a/keyboards/dumbpad/v1x_oled/config.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-Copyright 2020 imchipwood
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-/* Reduce tapdance required taps from 5 to 2 */
-#define TAPPING_TOGGLE 2
diff --git a/keyboards/ergodox_ez/config.h b/keyboards/ergodox_ez/config.h
index 2ca718f925af..d60a76d7a527 100644
--- a/keyboards/ergodox_ez/config.h
+++ b/keyboards/ergodox_ez/config.h
@@ -44,8 +44,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MOUSEKEY_WHEEL_MAX_SPEED    MOUSEKEY_MAX_SPEED
 #define MOUSEKEY_WHEEL_TIME_TO_MAX  MOUSEKEY_TIME_TO_MAX
 
-#define TAPPING_TOGGLE  1
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/ergodox_ez/info.json b/keyboards/ergodox_ez/info.json
index 5f465dc29a56..7090733195c8 100644
--- a/keyboards/ergodox_ez/info.json
+++ b/keyboards/ergodox_ez/info.json
@@ -18,6 +18,9 @@
     "processor": "atmega32u4",
     "bootloader": "halfkay",
     "debounce": 30,
+    "tapping": {
+        "toggle": 1
+    },
     "community_layouts": ["ergodox"],
     "layouts": {
         "LAYOUT_ergodox": {
diff --git a/keyboards/fungo/rev1/config.h b/keyboards/fungo/rev1/config.h
index 187a7809bcf0..93ad87fdb2e7 100644
--- a/keyboards/fungo/rev1/config.h
+++ b/keyboards/fungo/rev1/config.h
@@ -31,8 +31,3 @@
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-//지정된 횟수로 눌러야 토글됨
-#define TAPPING_TOGGLE 3
-
-
diff --git a/keyboards/fungo/rev1/info.json b/keyboards/fungo/rev1/info.json
index 2874f3d5e4a3..2cd099e3d580 100644
--- a/keyboards/fungo/rev1/info.json
+++ b/keyboards/fungo/rev1/info.json
@@ -25,6 +25,9 @@
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "debounce": 3,
+  "tapping": {
+    "toggle": 3
+  },
   "layout_aliases": {
     "LAYOUT_fungo_split_num": "LAYOUT"
   },
diff --git a/keyboards/gboards/ergotaco/config.h b/keyboards/gboards/ergotaco/config.h
index 3075809ed333..0ab992eac30b 100644
--- a/keyboards/gboards/ergotaco/config.h
+++ b/keyboards/gboards/ergotaco/config.h
@@ -32,7 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MOUSEKEY_TIME_TO_MAX    60
 #define MOUSEKEY_MAX_SPEED      7
 #define MOUSEKEY_WHEEL_DELAY 0
-#define TAPPING_TOGGLE  1
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/gboards/ergotaco/info.json b/keyboards/gboards/ergotaco/info.json
index 1de1f3ab85d7..80558ad69295 100644
--- a/keyboards/gboards/ergotaco/info.json
+++ b/keyboards/gboards/ergotaco/info.json
@@ -10,6 +10,9 @@
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "tapping": {
+        "toggle": 1
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/gboards/georgi/config.h b/keyboards/gboards/georgi/config.h
index df3b32a34f27..f0785f24bc6e 100644
--- a/keyboards/gboards/georgi/config.h
+++ b/keyboards/gboards/georgi/config.h
@@ -37,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MOUSEKEY_TIME_TO_MAX    60
 #define MOUSEKEY_MAX_SPEED      7
 #define MOUSEKEY_WHEEL_DELAY 0
-#define TAPPING_TOGGLE  2
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/gboards/georgi/info.json b/keyboards/gboards/georgi/info.json
index 0a654eaa4aca..51737f75af8f 100644
--- a/keyboards/gboards/georgi/info.json
+++ b/keyboards/gboards/georgi/info.json
@@ -11,6 +11,9 @@
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "tapping": {
+        "toggle": 2
+    },
     "layout_aliases": {
         "LAYOUT_georgi": "LAYOUT"
     },
diff --git a/keyboards/gboards/gergo/config.h b/keyboards/gboards/gergo/config.h
index bfaacb5ee987..44cb5a4304a4 100644
--- a/keyboards/gboards/gergo/config.h
+++ b/keyboards/gboards/gergo/config.h
@@ -41,7 +41,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MOUSEKEY_TIME_TO_MAX    60
 #define MOUSEKEY_MAX_SPEED      7
 #define MOUSEKEY_WHEEL_DELAY 0
-#define TAPPING_TOGGLE  1
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/gboards/gergo/info.json b/keyboards/gboards/gergo/info.json
index 53711cb27151..65b184366b2d 100644
--- a/keyboards/gboards/gergo/info.json
+++ b/keyboards/gboards/gergo/info.json
@@ -13,6 +13,9 @@
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "tapping": {
+        "toggle": 1
+    },
     "layout_aliases": {
         "LAYOUT_gergo": "LAYOUT"
     },
diff --git a/keyboards/handwired/dactyl/config.h b/keyboards/handwired/dactyl/config.h
index 5bca7dbaa11f..94b407d73587 100644
--- a/keyboards/handwired/dactyl/config.h
+++ b/keyboards/handwired/dactyl/config.h
@@ -37,8 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MOUSEKEY_MAX_SPEED    7
 #define MOUSEKEY_WHEEL_DELAY  0
 
-#define TAPPING_TOGGLE  1
-
 /* key combination for command */
 #define IS_COMMAND() ( \
     get_mods() == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || \
diff --git a/keyboards/handwired/dactyl/info.json b/keyboards/handwired/dactyl/info.json
index 8297e609a1cf..e95c380d9c04 100644
--- a/keyboards/handwired/dactyl/info.json
+++ b/keyboards/handwired/dactyl/info.json
@@ -11,6 +11,9 @@
   "processor": "atmega32u4",
   "bootloader": "halfkay",
   "debounce": 15,
+  "tapping": {
+    "toggle": 1
+  },
   "layouts": {
     "LAYOUT_dactyl": {
       "layout": [
diff --git a/keyboards/handwired/dactyl_rah/config.h b/keyboards/handwired/dactyl_rah/config.h
index e40f6dfc69ef..107d8e166835 100644
--- a/keyboards/handwired/dactyl_rah/config.h
+++ b/keyboards/handwired/dactyl_rah/config.h
@@ -24,9 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MOUSEKEY_MAX_SPEED       7
 #define MOUSEKEY_WHEEL_DELAY 0
 
-/* layer config */
-#define TAPPING_TOGGLE 1
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/handwired/dactyl_rah/info.json b/keyboards/handwired/dactyl_rah/info.json
index 9234536a2323..bfacb99a4b0a 100644
--- a/keyboards/handwired/dactyl_rah/info.json
+++ b/keyboards/handwired/dactyl_rah/info.json
@@ -18,6 +18,9 @@
   },
   "processor": "atmega32u4",
   "bootloader": "caterina",
+  "tapping": {
+    "toggle": 1
+  },
   "layouts": {
     "LAYOUT_6x6": {
       "layout": [
diff --git a/keyboards/handwired/frenchdev/config.h b/keyboards/handwired/frenchdev/config.h
index 6db87376c084..d758c6023943 100644
--- a/keyboards/handwired/frenchdev/config.h
+++ b/keyboards/handwired/frenchdev/config.h
@@ -31,8 +31,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MOUSEKEY_MAX_SPEED      2
 #define MOUSEKEY_WHEEL_DELAY 0
 
-#define TAPPING_TOGGLE  1
-
 /* key combination for command */
 #define IS_COMMAND() ( \
     get_mods() == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || \
diff --git a/keyboards/handwired/frenchdev/info.json b/keyboards/handwired/frenchdev/info.json
index a22b06d41716..8d031b3c42fa 100644
--- a/keyboards/handwired/frenchdev/info.json
+++ b/keyboards/handwired/frenchdev/info.json
@@ -9,6 +9,9 @@
   },
   "processor": "atmega32u4",
   "bootloader": "halfkay",
+  "tapping": {
+    "toggle": 1
+  },
   "layouts": {
     "LAYOUT": {
       "layout": [
diff --git a/keyboards/handwired/jopr/config.h b/keyboards/handwired/jopr/config.h
index 59c7bb3bc034..b629fcc62e13 100644
--- a/keyboards/handwired/jopr/config.h
+++ b/keyboards/handwired/jopr/config.h
@@ -7,7 +7,6 @@
 #define LOCKING_RESYNC_ENABLE
 
 #define NO_ACTION_ONESHOT
-#define TAPPING_TOGGLE 3
 
 #define RGBLIGHT_HUE_STEP 1
 #define RGBLIGHT_SAT_STEP 1
diff --git a/keyboards/handwired/jopr/info.json b/keyboards/handwired/jopr/info.json
index 4da2086cb08b..afe3937d8312 100644
--- a/keyboards/handwired/jopr/info.json
+++ b/keyboards/handwired/jopr/info.json
@@ -21,6 +21,9 @@
   "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
+  "tapping": {
+    "toggle": 3
+  },
   "layouts": {
     "LAYOUT": {
       "layout": [
diff --git a/keyboards/handwired/kbod/config.h b/keyboards/handwired/kbod/config.h
index f95288177271..b9449c4714bf 100644
--- a/keyboards/handwired/kbod/config.h
+++ b/keyboards/handwired/kbod/config.h
@@ -37,5 +37,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-
-#define TAPPING_TOGGLE 2
diff --git a/keyboards/handwired/kbod/info.json b/keyboards/handwired/kbod/info.json
index 6508b3d85969..69005c657900 100644
--- a/keyboards/handwired/kbod/info.json
+++ b/keyboards/handwired/kbod/info.json
@@ -18,6 +18,9 @@
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
+    "tapping": {
+        "toggle": 2
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/handwired/pterodactyl/config.h b/keyboards/handwired/pterodactyl/config.h
index 40aee1e05e60..ff53a1970dbc 100644
--- a/keyboards/handwired/pterodactyl/config.h
+++ b/keyboards/handwired/pterodactyl/config.h
@@ -37,8 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MOUSEKEY_MAX_SPEED    7
 #define MOUSEKEY_WHEEL_DELAY  0
 
-#define TAPPING_TOGGLE  1
-
 /* key combination for command */
 #define IS_COMMAND() ( \
     get_mods() == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || \
diff --git a/keyboards/handwired/pterodactyl/info.json b/keyboards/handwired/pterodactyl/info.json
index 213b7aa53bbf..3598b39b8ded 100644
--- a/keyboards/handwired/pterodactyl/info.json
+++ b/keyboards/handwired/pterodactyl/info.json
@@ -11,6 +11,9 @@
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "debounce": 0,
+  "tapping": {
+    "toggle": 1
+  },
   "layouts": {
     "LAYOUT_pterodactyl": {
       "layout": [
diff --git a/keyboards/handwired/terminus_mini/config.h b/keyboards/handwired/terminus_mini/config.h
index 50ee7eac6133..67fec77018af 100644
--- a/keyboards/handwired/terminus_mini/config.h
+++ b/keyboards/handwired/terminus_mini/config.h
@@ -17,9 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-//define tapping-toggle count
-#define TAPPING_TOGGLE 1
-
 //define maximum duration of hold required to register a tap vs hold default is 200
 #define TAPPING_TERM 150 //reduce time required to register a held key
 
diff --git a/keyboards/handwired/terminus_mini/info.json b/keyboards/handwired/terminus_mini/info.json
index 6948b13edc7b..c59192ac1268 100644
--- a/keyboards/handwired/terminus_mini/info.json
+++ b/keyboards/handwired/terminus_mini/info.json
@@ -15,6 +15,9 @@
   "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "halfkay",
+  "tapping": {
+    "toggle": 1
+  },
   "layouts": {
     "LAYOUT": {
       "layout": [
diff --git a/keyboards/hotdox/config.h b/keyboards/hotdox/config.h
index 5e369b2dbe8d..60d9fe62174f 100644
--- a/keyboards/hotdox/config.h
+++ b/keyboards/hotdox/config.h
@@ -11,8 +11,6 @@
 #define MOUSEKEY_MAX_SPEED      7
 #define MOUSEKEY_WHEEL_DELAY    0
 
-#define TAPPING_TOGGLE  1
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/hotdox/info.json b/keyboards/hotdox/info.json
index 51c0465899a4..8184588e5d70 100644
--- a/keyboards/hotdox/info.json
+++ b/keyboards/hotdox/info.json
@@ -12,6 +12,9 @@
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "tapping": {
+      "toggle": 1
+    },
     "community_layouts": ["ergodox"],
     "layouts": {
     "LAYOUT_ergodox": {
diff --git a/keyboards/input_club/ergodox_infinity/config.h b/keyboards/input_club/ergodox_infinity/config.h
index bc51d6ed4e19..7db6119a1cf0 100644
--- a/keyboards/input_club/ergodox_infinity/config.h
+++ b/keyboards/input_club/ergodox_infinity/config.h
@@ -23,8 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MOUSEKEY_MAX_SPEED      7
 #define MOUSEKEY_WHEEL_DELAY 0
 
-#define TAPPING_TOGGLE  1
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/input_club/ergodox_infinity/info.json b/keyboards/input_club/ergodox_infinity/info.json
index ca6aa92b5d87..e3e0399bed34 100644
--- a/keyboards/input_club/ergodox_infinity/info.json
+++ b/keyboards/input_club/ergodox_infinity/info.json
@@ -17,6 +17,9 @@
     "processor": "MK20DX256",
     "bootloader": "kiibohd",
     "board": "IC_TEENSY_3_1",
+    "tapping": {
+        "toggle": 1
+    },
     "community_layouts": ["ergodox"],
     "layouts": {
         "LAYOUT_ergodox": {
diff --git a/keyboards/nack/config.h b/keyboards/nack/config.h
index 89540a7930f9..219494fc637c 100644
--- a/keyboards/nack/config.h
+++ b/keyboards/nack/config.h
@@ -17,8 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define TAPPING_TOGGLE 2
-
 #ifdef RGB_MATRIX_ENABLE
     #define WS2812_SPI SPID1
     #define WS2812_SPI_MOSI_PAL_MODE 5
diff --git a/keyboards/nack/info.json b/keyboards/nack/info.json
index 827e0fec0e70..99d584443139 100644
--- a/keyboards/nack/info.json
+++ b/keyboards/nack/info.json
@@ -23,6 +23,9 @@
     "processor": "STM32F303",
     "bootloader": "stm32-dfu",
     "board": "QMK_PROTON_C",
+    "tapping": {
+        "toggle": 2
+    },
     "layout_aliases": {
         "LAYOUT": "LAYOUT_ortho_4x13"
     },
diff --git a/keyboards/neopad/config.h b/keyboards/neopad/config.h
deleted file mode 100755
index 6200d5a594ac..000000000000
--- a/keyboards/neopad/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
-Copyright 2021 rookiebwoy
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-/* Reduce tapdance required taps from 5 to 2 */
-#define TAPPING_TOGGLE 2
diff --git a/keyboards/neopad/rev1/info.json b/keyboards/neopad/rev1/info.json
index 8a8f357c96f4..0a0340c06df9 100755
--- a/keyboards/neopad/rev1/info.json
+++ b/keyboards/neopad/rev1/info.json
@@ -21,6 +21,9 @@
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
+    "tapping": {
+        "toggle": 2
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/planck/ez/config.h b/keyboards/planck/ez/config.h
index 1ec2e9febeff..7cfc65d50943 100644
--- a/keyboards/planck/ez/config.h
+++ b/keyboards/planck/ez/config.h
@@ -110,8 +110,6 @@
 #define ENABLE_RGB_MATRIX_SOLID_SPLASH
 #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 
-#define TAPPING_TOGGLE  1
-
 #define MOUSEKEY_INTERVAL           20
 #define MOUSEKEY_DELAY              0
 #define MOUSEKEY_TIME_TO_MAX        60
diff --git a/keyboards/planck/ez/info.json b/keyboards/planck/ez/info.json
index 370a19357f04..0bb9d35ca251 100644
--- a/keyboards/planck/ez/info.json
+++ b/keyboards/planck/ez/info.json
@@ -21,6 +21,9 @@
   },
   "processor": "STM32F303",
   "bootloader": "stm32-dfu",
+  "tapping": {
+    "toggle": 1
+  },
   "community_layouts": ["ortho_4x12", "planck_mit"],
   "layout_aliases": {
     "LAYOUT_planck_grid": "LAYOUT_ortho_4x12",
diff --git a/keyboards/planck/thk/config.h b/keyboards/planck/thk/config.h
index 832fb0789cca..cfb88aa0eb13 100644
--- a/keyboards/planck/thk/config.h
+++ b/keyboards/planck/thk/config.h
@@ -18,8 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define TAPPING_TOGGLE 3
-
 #define DIP_SWITCH_PINS { D0, D1, D4, D6 }
 
 // THK uses D5 for audio
diff --git a/keyboards/planck/thk/info.json b/keyboards/planck/thk/info.json
index e7321ba69720..f62e074e6828 100644
--- a/keyboards/planck/thk/info.json
+++ b/keyboards/planck/thk/info.json
@@ -21,6 +21,9 @@
   },
   "processor": "atmega32a",
   "bootloader": "usbasploader",
+  "tapping": {
+    "toggle": 3
+  },
   "layout_aliases": {
     "LAYOUT_planck_grid": "LAYOUT_ortho_4x12",
     "LAYOUT_planck_mit": "LAYOUT_planck_1x2uC"
diff --git a/keyboards/ymdk/ymd96/config.h b/keyboards/ymdk/ymd96/config.h
index f69fb22fc721..b4ae3850982b 100644
--- a/keyboards/ymdk/ymd96/config.h
+++ b/keyboards/ymdk/ymd96/config.h
@@ -19,8 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define TAPPING_TOGGLE 3
-
 /* RGB underglow */
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/ymdk/ymd96/info.json b/keyboards/ymdk/ymd96/info.json
index ca123a3c521c..6d30a2bab78a 100644
--- a/keyboards/ymdk/ymd96/info.json
+++ b/keyboards/ymdk/ymd96/info.json
@@ -32,6 +32,9 @@
     },
     "processor": "atmega32a",
     "bootloader": "bootloadhid",
+    "tapping": {
+        "toggle": 3
+    },
     "layouts": {
         "LAYOUT_default": {
             "layout": [