84 files changed, 66 insertions, 125 deletions

diff --git a/keyboards/hadron/ver3/info.json b/keyboards/hadron/ver3/keyboard.json
index 02a75d59eb..02a75d59eb 100644
--- a/keyboards/hadron/ver3/info.json
+++ b/keyboards/hadron/ver3/keyboard.json
diff --git a/keyboards/halfcliff/info.json b/keyboards/halfcliff/keyboard.json
index 1f60537b24..1f60537b24 100644
--- a/keyboards/halfcliff/info.json
+++ b/keyboards/halfcliff/keyboard.json
diff --git a/keyboards/handwired/108key_trackpoint/info.json b/keyboards/handwired/108key_trackpoint/keyboard.json
index 396b4c33cb..396b4c33cb 100644
--- a/keyboards/handwired/108key_trackpoint/info.json
+++ b/keyboards/handwired/108key_trackpoint/keyboard.json
diff --git a/keyboards/handwired/42/info.json b/keyboards/handwired/42/keyboard.json
index d68dcd1ec2..d68dcd1ec2 100644
--- a/keyboards/handwired/42/info.json
+++ b/keyboards/handwired/42/keyboard.json
diff --git a/keyboards/handwired/aball/info.json b/keyboards/handwired/aball/keyboard.json
index 6ab686c518..6ab686c518 100644
--- a/keyboards/handwired/aball/info.json
+++ b/keyboards/handwired/aball/keyboard.json
diff --git a/keyboards/handwired/alcor_dactyl/info.json b/keyboards/handwired/alcor_dactyl/keyboard.json
index 65f1f804aa..65f1f804aa 100644
--- a/keyboards/handwired/alcor_dactyl/info.json
+++ b/keyboards/handwired/alcor_dactyl/keyboard.json
diff --git a/keyboards/handwired/battleship_gamepad/info.json b/keyboards/handwired/battleship_gamepad/keyboard.json
index 3b4010ce40..3b4010ce40 100644
--- a/keyboards/handwired/battleship_gamepad/info.json
+++ b/keyboards/handwired/battleship_gamepad/keyboard.json
diff --git a/keyboards/handwired/bdn9_ble/info.json b/keyboards/handwired/bdn9_ble/keyboard.json
index 76d9e42f83..76d9e42f83 100644
--- a/keyboards/handwired/bdn9_ble/info.json
+++ b/keyboards/handwired/bdn9_ble/keyboard.json
diff --git a/keyboards/handwired/cyberstar/info.json b/keyboards/handwired/cyberstar/keyboard.json
index 344c576462..344c576462 100644
--- a/keyboards/handwired/cyberstar/info.json
+++ b/keyboards/handwired/cyberstar/keyboard.json
diff --git a/keyboards/handwired/d48/info.json b/keyboards/handwired/d48/keyboard.json
index e5ee61093e..e5ee61093e 100644
--- a/keyboards/handwired/d48/info.json
+++ b/keyboards/handwired/d48/keyboard.json
diff --git a/keyboards/handwired/dactyl/info.json b/keyboards/handwired/dactyl/keyboard.json
index 339119e6fd..339119e6fd 100644
--- a/keyboards/handwired/dactyl/info.json
+++ b/keyboards/handwired/dactyl/keyboard.json
diff --git a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/info.json b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/keyboard.json
index 9ab62df237..9ab62df237 100644
--- a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/info.json
+++ b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/keyboard.json
diff --git a/keyboards/handwired/datahand/info.json b/keyboards/handwired/datahand/keyboard.json
index 96e49388dc..96e49388dc 100644
--- a/keyboards/handwired/datahand/info.json
+++ b/keyboards/handwired/datahand/keyboard.json
diff --git a/keyboards/handwired/dqz11n1g/info.json b/keyboards/handwired/dqz11n1g/keyboard.json
index 4e45a5a920..4e45a5a920 100644
--- a/keyboards/handwired/dqz11n1g/info.json
+++ b/keyboards/handwired/dqz11n1g/keyboard.json
diff --git a/keyboards/handwired/frenchdev/info.json b/keyboards/handwired/frenchdev/keyboard.json
index ab811888a9..ab811888a9 100644
--- a/keyboards/handwired/frenchdev/info.json
+++ b/keyboards/handwired/frenchdev/keyboard.json
diff --git a/keyboards/handwired/fruity60/info.json b/keyboards/handwired/fruity60/keyboard.json
index 4984f3fc03..4984f3fc03 100644
--- a/keyboards/handwired/fruity60/info.json
+++ b/keyboards/handwired/fruity60/keyboard.json
diff --git a/keyboards/handwired/jankrp2040dactyl/info.json b/keyboards/handwired/jankrp2040dactyl/keyboard.json
index c4543b5d12..c4543b5d12 100644
--- a/keyboards/handwired/jankrp2040dactyl/info.json
+++ b/keyboards/handwired/jankrp2040dactyl/keyboard.json
diff --git a/keyboards/handwired/lagrange/info.json b/keyboards/handwired/lagrange/keyboard.json
index d7ad47355a..d7ad47355a 100644
--- a/keyboards/handwired/lagrange/info.json
+++ b/keyboards/handwired/lagrange/keyboard.json
diff --git a/keyboards/handwired/m40/5x5_macropad/info.json b/keyboards/handwired/m40/5x5_macropad/keyboard.json
index b4bc53afc5..b4bc53afc5 100644
--- a/keyboards/handwired/m40/5x5_macropad/info.json
+++ b/keyboards/handwired/m40/5x5_macropad/keyboard.json
diff --git a/keyboards/handwired/macroboard/f411/info.json b/keyboards/handwired/macroboard/f411/keyboard.json
index 0f6d7077a3..0f6d7077a3 100644
--- a/keyboards/handwired/macroboard/f411/info.json
+++ b/keyboards/handwired/macroboard/f411/keyboard.json
diff --git a/keyboards/handwired/meck_tkl/blackpill_f401/info.json b/keyboards/handwired/meck_tkl/blackpill_f401/info.json
deleted file mode 100644
index eeaa9c392b..0000000000
--- a/keyboards/handwired/meck_tkl/blackpill_f401/info.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "matrix_pins": {
-        "cols": ["B4", "B5", "B6", "B7", "B8", "B9", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A0", "B10"],
-        "rows": ["B15", "A8", "A9", "B14", "A15", "B3"]
-    },
-    "diode_direction": "COL2ROW",
-    "indicators": {
-        "caps_lock": "C13",
-        "on_state": 0
-    },
-    "processor": "STM32F401",
-    "bootloader": "stm32-dfu",
-    "board": "BLACKPILL_STM32_F401"
-}
diff --git a/keyboards/handwired/meck_tkl/info.json b/keyboards/handwired/meck_tkl/blackpill_f401/keyboard.json
index 5147d96ee0..4a9e2a5380 100644
--- a/keyboards/handwired/meck_tkl/info.json
+++ b/keyboards/handwired/meck_tkl/blackpill_f401/keyboard.json
@@ -6,7 +6,10 @@
     "usb": {
         "vid": "0x474B",
         "pid": "0x0001",
-        "device_version": "0.0.1"
+        "device_version": "0.0.1",
+        "shared_endpoint": {
+            "keyboard": true
+        }
     },
     "features": {
         "bootmagic": true,
@@ -15,6 +18,24 @@
         "console": true,
         "nkro": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "matrix_pins": {
+        "cols": ["B4", "B5", "B6", "B7", "B8", "B9", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A0", "B10"],
+        "rows": ["B15", "A8", "A9", "B14", "A15", "B3"]
+    },
+    "diode_direction": "COL2ROW",
+    "indicators": {
+        "caps_lock": "C13",
+        "on_state": 0
+    },
+    "processor": "STM32F401",
+    "bootloader": "stm32-dfu",
+    "board": "BLACKPILL_STM32_F401",
     "layouts": {
         "LAYOUT_tkl_ansi": {
             "layout": [
diff --git a/keyboards/handwired/meck_tkl/blackpill_f401/rules.mk b/keyboards/handwired/meck_tkl/blackpill_f401/rules.mk
deleted file mode 100644
index b5f27c93ea..0000000000
--- a/keyboards/handwired/meck_tkl/blackpill_f401/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-KEYBOARD_SHARED_EP = yes
diff --git a/keyboards/handwired/meck_tkl/config.h b/keyboards/handwired/meck_tkl/config.h
deleted file mode 100644
index 30221cc216..0000000000
--- a/keyboards/handwired/meck_tkl/config.h
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright 2021 Gabriel Kim (@gabrielkim13)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/handwired/onekey/blackpill_f401/info.json b/keyboards/handwired/onekey/blackpill_f401/keyboard.json
index 69a7ea87a7..29e2f3f17d 100644
--- a/keyboards/handwired/onekey/blackpill_f401/info.json
+++ b/keyboards/handwired/onekey/blackpill_f401/keyboard.json
@@ -1,6 +1,11 @@
 {
     "keyboard_name": "Onekey Blackpill STM32F401",
     "development_board": "blackpill_f401",
+    "usb": {
+        "shared_endpoint": {
+            "keyboard": true
+        }
+    },
     "matrix_pins": {
         "cols": ["B0"],
         "rows": ["A7"]
diff --git a/keyboards/handwired/onekey/blackpill_f401/rules.mk b/keyboards/handwired/onekey/blackpill_f401/rules.mk
deleted file mode 100644
index 1071cf62ee..0000000000
--- a/keyboards/handwired/onekey/blackpill_f401/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-KEYBOARD_SHARED_EP = yes
diff --git a/keyboards/handwired/onekey/blackpill_f401_tinyuf2/info.json b/keyboards/handwired/onekey/blackpill_f401_tinyuf2/keyboard.json
index ed9435c740..413bf7a7f3 100644
--- a/keyboards/handwired/onekey/blackpill_f401_tinyuf2/info.json
+++ b/keyboards/handwired/onekey/blackpill_f401_tinyuf2/keyboard.json
@@ -2,6 +2,11 @@
     "keyboard_name": "Onekey Blackpill STM32F401 TinyUF2",
     "development_board": "blackpill_f401",
     "bootloader": "tinyuf2",
+    "usb": {
+        "shared_endpoint": {
+            "keyboard": true
+        }
+    },
     "matrix_pins": {
         "cols": ["B0"],
         "rows": ["A7"]
diff --git a/keyboards/handwired/onekey/blackpill_f401_tinyuf2/rules.mk b/keyboards/handwired/onekey/blackpill_f401_tinyuf2/rules.mk
deleted file mode 100755
index 1071cf62ee..0000000000
--- a/keyboards/handwired/onekey/blackpill_f401_tinyuf2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-KEYBOARD_SHARED_EP = yes
diff --git a/keyboards/handwired/onekey/blackpill_f411/info.json b/keyboards/handwired/onekey/blackpill_f411/keyboard.json
index 5ee8ec3d5e..077fee4b3b 100644
--- a/keyboards/handwired/onekey/blackpill_f411/info.json
+++ b/keyboards/handwired/onekey/blackpill_f411/keyboard.json
@@ -1,6 +1,11 @@
 {
     "keyboard_name": "Onekey Blackpill STM32F411",
     "development_board": "blackpill_f411",
+    "usb": {
+        "shared_endpoint": {
+            "keyboard": true
+        }
+    },
     "matrix_pins": {
         "cols": ["B0"],
         "rows": ["A7"]
diff --git a/keyboards/handwired/onekey/blackpill_f411/rules.mk b/keyboards/handwired/onekey/blackpill_f411/rules.mk
deleted file mode 100644
index 1071cf62ee..0000000000
--- a/keyboards/handwired/onekey/blackpill_f411/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-KEYBOARD_SHARED_EP = yes
diff --git a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/info.json b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/keyboard.json
index 8e8b52080a..e37bf6f54d 100644
--- a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/info.json
+++ b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/keyboard.json
@@ -2,6 +2,11 @@
     "keyboard_name": "Onekey Blackpill STM32F411 TinyUF2",
     "development_board": "blackpill_f411",
     "bootloader": "tinyuf2",
+    "usb": {
+        "shared_endpoint": {
+            "keyboard": true
+        }
+    },
     "matrix_pins": {
         "cols": ["B0"],
         "rows": ["A7"]
diff --git a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/rules.mk b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/rules.mk
deleted file mode 100755
index 1071cf62ee..0000000000
--- a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-KEYBOARD_SHARED_EP = yes
diff --git a/keyboards/handwired/onekey/bluepill_f103c6/info.json b/keyboards/handwired/onekey/bluepill_f103c6/keyboard.json
index 4267222cfc..4267222cfc 100644
--- a/keyboards/handwired/onekey/bluepill_f103c6/info.json
+++ b/keyboards/handwired/onekey/bluepill_f103c6/keyboard.json
diff --git a/keyboards/handwired/onekey/evb_wb32f3g71/info.json b/keyboards/handwired/onekey/evb_wb32f3g71/keyboard.json
index dfb57df2b3..dfb57df2b3 100644
--- a/keyboards/handwired/onekey/evb_wb32f3g71/info.json
+++ b/keyboards/handwired/onekey/evb_wb32f3g71/keyboard.json
diff --git a/keyboards/handwired/onekey/evb_wb32fq95/info.json b/keyboards/handwired/onekey/evb_wb32fq95/keyboard.json
index 8a94f5e8b1..8a94f5e8b1 100644
--- a/keyboards/handwired/onekey/evb_wb32fq95/info.json
+++ b/keyboards/handwired/onekey/evb_wb32fq95/keyboard.json
diff --git a/keyboards/handwired/onekey/sipeed_longan_nano/info.json b/keyboards/handwired/onekey/sipeed_longan_nano/keyboard.json
index 28aa8a2fdc..28aa8a2fdc 100644
--- a/keyboards/handwired/onekey/sipeed_longan_nano/info.json
+++ b/keyboards/handwired/onekey/sipeed_longan_nano/keyboard.json
diff --git a/keyboards/handwired/onekey/teensy_lc/info.json b/keyboards/handwired/onekey/teensy_lc/keyboard.json
index a81b90fa8a..a81b90fa8a 100644
--- a/keyboards/handwired/onekey/teensy_lc/info.json
+++ b/keyboards/handwired/onekey/teensy_lc/keyboard.json
diff --git a/keyboards/handwired/ortho_brass/info.json b/keyboards/handwired/ortho_brass/keyboard.json
index 5cd01b1f6d..5cd01b1f6d 100644
--- a/keyboards/handwired/ortho_brass/info.json
+++ b/keyboards/handwired/ortho_brass/keyboard.json
diff --git a/keyboards/handwired/owlet60/info.json b/keyboards/handwired/owlet60/keyboard.json
index 8108f51985..8108f51985 100644
--- a/keyboards/handwired/owlet60/info.json
+++ b/keyboards/handwired/owlet60/keyboard.json
diff --git a/keyboards/handwired/pill60/blackpill_f401/info.json b/keyboards/handwired/pill60/blackpill_f401/keyboard.json
index 8d85a2e930..9b3530b958 100644
--- a/keyboards/handwired/pill60/blackpill_f401/info.json
+++ b/keyboards/handwired/pill60/blackpill_f401/keyboard.json
@@ -1,4 +1,9 @@
 {
+    "usb": {
+        "shared_endpoint": {
+            "keyboard": true
+        }
+    },
     "matrix_pins": {
         "cols": ["A8", "B2", "B1", "B15", "A10", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0"],
         "rows": ["B4", "B3", "A15", "B13", "B5"]
diff --git a/keyboards/handwired/pill60/blackpill_f401/rules.mk b/keyboards/handwired/pill60/blackpill_f401/rules.mk
deleted file mode 100644
index 3d2bfceea9..0000000000
--- a/keyboards/handwired/pill60/blackpill_f401/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-KEYBOARD_SHARED_EP       = yes
diff --git a/keyboards/handwired/pill60/blackpill_f411/info.json b/keyboards/handwired/pill60/blackpill_f411/keyboard.json
index 4e0935f79c..1961d616dd 100644
--- a/keyboards/handwired/pill60/blackpill_f411/info.json
+++ b/keyboards/handwired/pill60/blackpill_f411/keyboard.json
@@ -1,4 +1,9 @@
 {
+    "usb": {
+        "shared_endpoint": {
+            "keyboard": true
+        }
+    },
     "matrix_pins": {
         "cols": ["A8", "B2", "B1", "B15", "A10", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0"],
         "rows": ["B4", "B3", "A15", "B13", "B5"]
diff --git a/keyboards/handwired/pill60/blackpill_f411/rules.mk b/keyboards/handwired/pill60/blackpill_f411/rules.mk
deleted file mode 100644
index b5f27c93ea..0000000000
--- a/keyboards/handwired/pill60/blackpill_f411/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-KEYBOARD_SHARED_EP = yes
diff --git a/keyboards/handwired/prkl30/feather/info.json b/keyboards/handwired/prkl30/feather/keyboard.json
index a89fe9ec57..721107e064 100644
--- a/keyboards/handwired/prkl30/feather/info.json
+++ b/keyboards/handwired/prkl30/feather/keyboard.json
@@ -1,4 +1,14 @@
 {
+    "features": {
+        "bluetooth": true,
+        "bootmagic": true,
+        "command": true,
+        "console": true,
+        "encoder": true,
+        "extrakey": false,
+        "mousekey": false,
+        "nkro": true
+    },
     "rgblight": {
         "saturation_steps": 8,
         "brightness_steps": 8,
diff --git a/keyboards/handwired/prkl30/feather/rules.mk b/keyboards/handwired/prkl30/feather/rules.mk
index aaab95b9e0..3437a35bdf 100644
--- a/keyboards/handwired/prkl30/feather/rules.mk
+++ b/keyboards/handwired/prkl30/feather/rules.mk
@@ -1,18 +1,2 @@
 # Processor frequency
 F_CPU = 8000000
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-ENCODER_ENABLE = yes
-MOUSEKEY_ENABLE  = no       # Mouse keys
-EXTRAKEY_ENABLE  = no       # Audio control and System control
-CONSOLE_ENABLE  = yes       # Console for debug
-COMMAND_ENABLE  = yes       # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE  = no
-AUDIO_ENABLE  = no          # This can be enabled if a speaker is connected to the expansion port. Not compatible with RGBLIGHT below
-RGBLIGHT_ENABLE  = no       # This can be enabled if a ws2812 strip is connected to the expansion port.
-
-BLUETOOTH_ENABLE = yes
diff --git a/keyboards/handwired/promethium/info.json b/keyboards/handwired/promethium/keyboard.json
index 6ee1ed8ca1..6ee1ed8ca1 100644
--- a/keyboards/handwired/promethium/info.json
+++ b/keyboards/handwired/promethium/keyboard.json
diff --git a/keyboards/handwired/pterodactyl/info.json b/keyboards/handwired/pterodactyl/keyboard.json
index fac20aeebe..fac20aeebe 100644
--- a/keyboards/handwired/pterodactyl/info.json
+++ b/keyboards/handwired/pterodactyl/keyboard.json
diff --git a/keyboards/handwired/riblee_split/info.json b/keyboards/handwired/riblee_split/keyboard.json
index 49b5ca3a54..49b5ca3a54 100644
--- a/keyboards/handwired/riblee_split/info.json
+++ b/keyboards/handwired/riblee_split/keyboard.json
diff --git a/keyboards/handwired/slash/info.json b/keyboards/handwired/slash/keyboard.json
index 4fd99ebeee..4fd99ebeee 100644
--- a/keyboards/handwired/slash/info.json
+++ b/keyboards/handwired/slash/keyboard.json
diff --git a/keyboards/handwired/split65/stm32/info.json b/keyboards/handwired/split65/stm32/keyboard.json
index d49339da02..d49339da02 100644
--- a/keyboards/handwired/split65/stm32/info.json
+++ b/keyboards/handwired/split65/stm32/keyboard.json
diff --git a/keyboards/handwired/trackpoint/info.json b/keyboards/handwired/trackpoint/keyboard.json
index 94ed022878..94ed022878 100644
--- a/keyboards/handwired/trackpoint/info.json
+++ b/keyboards/handwired/trackpoint/keyboard.json
diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/info.json b/keyboards/handwired/tractyl_manuform/4x6_right/keyboard.json
index 825c59ac72..825c59ac72 100644
--- a/keyboards/handwired/tractyl_manuform/4x6_right/info.json
+++ b/keyboards/handwired/tractyl_manuform/4x6_right/keyboard.json
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/f303/keyboard.json
index 0bcc02fd74..0bcc02fd74 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f303/keyboard.json
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/f411/keyboard.json
index 3821f0380f..3821f0380f 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/keyboard.json
diff --git a/keyboards/handwired/twadlee/tp69/info.json b/keyboards/handwired/twadlee/tp69/keyboard.json
index 27e0325f92..27e0325f92 100644
--- a/keyboards/handwired/twadlee/tp69/info.json
+++ b/keyboards/handwired/twadlee/tp69/keyboard.json
diff --git a/keyboards/handwired/uthol/rev3/info.json b/keyboards/handwired/uthol/rev3/keyboard.json
index a90e7a4a89..9b1a476b87 100644
--- a/keyboards/handwired/uthol/rev3/info.json
+++ b/keyboards/handwired/uthol/rev3/keyboard.json
@@ -1,7 +1,10 @@
 {
     "keyboard_name": "UtholThree",
     "usb": {
-        "device_version": "0.0.3"
+        "device_version": "0.0.3",
+        "shared_endpoint": {
+            "keyboard": true
+        }
     },
     "rgblight": {
         "led_count": 39,
diff --git a/keyboards/handwired/uthol/rev3/rules.mk b/keyboards/handwired/uthol/rev3/rules.mk
deleted file mode 100644
index 1071cf62ee..0000000000
--- a/keyboards/handwired/uthol/rev3/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-KEYBOARD_SHARED_EP = yes
diff --git a/keyboards/handwired/wulkan/info.json b/keyboards/handwired/wulkan/keyboard.json
index b6823af539..b6823af539 100644
--- a/keyboards/handwired/wulkan/info.json
+++ b/keyboards/handwired/wulkan/keyboard.json
diff --git a/keyboards/hardwareabstraction/handwire/info.json b/keyboards/hardwareabstraction/handwire/keyboard.json
index 5e0ec6f11e..5e0ec6f11e 100644
--- a/keyboards/hardwareabstraction/handwire/info.json
+++ b/keyboards/hardwareabstraction/handwire/keyboard.json
diff --git a/keyboards/hazel/bad_wings/info.json b/keyboards/hazel/bad_wings/keyboard.json
index fef514c539..fef514c539 100644
--- a/keyboards/hazel/bad_wings/info.json
+++ b/keyboards/hazel/bad_wings/keyboard.json
diff --git a/keyboards/hhkb/ansi/32u2/info.json b/keyboards/hhkb/ansi/32u2/keyboard.json
index dd190d18ee..dd190d18ee 100644
--- a/keyboards/hhkb/ansi/32u2/info.json
+++ b/keyboards/hhkb/ansi/32u2/keyboard.json
diff --git a/keyboards/hhkb/jp/info.json b/keyboards/hhkb/jp/keyboard.json
index d745f21d20..d745f21d20 100644
--- a/keyboards/hhkb/jp/info.json
+++ b/keyboards/hhkb/jp/keyboard.json
diff --git a/keyboards/hhkb/yang/info.json b/keyboards/hhkb/yang/keyboard.json
index a5725d6afa..a5725d6afa 100644
--- a/keyboards/hhkb/yang/info.json
+++ b/keyboards/hhkb/yang/keyboard.json
diff --git a/keyboards/hillside/46/0_1/info.json b/keyboards/hillside/46/0_1/keyboard.json
index 7cb7150f3f..7cb7150f3f 100644
--- a/keyboards/hillside/46/0_1/info.json
+++ b/keyboards/hillside/46/0_1/keyboard.json
diff --git a/keyboards/hillside/46/0_1/rules.mk b/keyboards/hillside/46/0_1/rules.mk
deleted file mode 100644
index 89c84d8be9..0000000000
--- a/keyboards/hillside/46/0_1/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-# If you add a haptic board,
-# enable it and set its driver here or in your keymap folder
-# The Pimoroni board's driver is DRV2605L 
-# HAPTIC_ENABLE = yes        # Enable haptic driver
-# HAPTIC_DRIVER = drv2605l
diff --git a/keyboards/hillside/48/0_1/info.json b/keyboards/hillside/48/0_1/keyboard.json
index b640bc0cbf..b640bc0cbf 100644
--- a/keyboards/hillside/48/0_1/info.json
+++ b/keyboards/hillside/48/0_1/keyboard.json
diff --git a/keyboards/hillside/48/0_1/rules.mk b/keyboards/hillside/48/0_1/rules.mk
deleted file mode 100644
index 89c84d8be9..0000000000
--- a/keyboards/hillside/48/0_1/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-# If you add a haptic board,
-# enable it and set its driver here or in your keymap folder
-# The Pimoroni board's driver is DRV2605L 
-# HAPTIC_ENABLE = yes        # Enable haptic driver
-# HAPTIC_DRIVER = drv2605l
diff --git a/keyboards/hillside/52/0_1/info.json b/keyboards/hillside/52/0_1/keyboard.json
index 0949fa9bb8..0949fa9bb8 100644
--- a/keyboards/hillside/52/0_1/info.json
+++ b/keyboards/hillside/52/0_1/keyboard.json
diff --git a/keyboards/hillside/52/0_1/rules.mk b/keyboards/hillside/52/0_1/rules.mk
deleted file mode 100644
index 89c84d8be9..0000000000
--- a/keyboards/hillside/52/0_1/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-# If you add a haptic board,
-# enable it and set its driver here or in your keymap folder
-# The Pimoroni board's driver is DRV2605L 
-# HAPTIC_ENABLE = yes        # Enable haptic driver
-# HAPTIC_DRIVER = drv2605l
diff --git a/keyboards/hineybush/hbcp/info.json b/keyboards/hineybush/hbcp/keyboard.json
index ab36bfaea0..ab36bfaea0 100644
--- a/keyboards/hineybush/hbcp/info.json
+++ b/keyboards/hineybush/hbcp/keyboard.json
diff --git a/keyboards/horrortroll/handwired_k552/info.json b/keyboards/horrortroll/handwired_k552/keyboard.json
index 6bbfa86e12..6bbfa86e12 100644
--- a/keyboards/horrortroll/handwired_k552/info.json
+++ b/keyboards/horrortroll/handwired_k552/keyboard.json
diff --git a/keyboards/horrortroll/lemon40/info.json b/keyboards/horrortroll/lemon40/keyboard.json
index 6303fb70bb..6303fb70bb 100644
--- a/keyboards/horrortroll/lemon40/info.json
+++ b/keyboards/horrortroll/lemon40/keyboard.json
diff --git a/keyboards/horrortroll/nyx/rev1/info.json b/keyboards/horrortroll/nyx/rev1/keyboard.json
index f3b859de0a..f3b859de0a 100644
--- a/keyboards/horrortroll/nyx/rev1/info.json
+++ b/keyboards/horrortroll/nyx/rev1/keyboard.json
diff --git a/keyboards/hotdox/info.json b/keyboards/hotdox/keyboard.json
index 5d2c3ec5ac..5d2c3ec5ac 100644
--- a/keyboards/hotdox/info.json
+++ b/keyboards/hotdox/keyboard.json
diff --git a/keyboards/hs60/v1/info.json b/keyboards/hs60/v1/keyboard.json
index 63fef23384..63fef23384 100644
--- a/keyboards/hs60/v1/info.json
+++ b/keyboards/hs60/v1/keyboard.json
diff --git a/keyboards/hs60/v2/ansi/info.json b/keyboards/hs60/v2/ansi/keyboard.json
index e0781ef54b..e0781ef54b 100644
--- a/keyboards/hs60/v2/ansi/info.json
+++ b/keyboards/hs60/v2/ansi/keyboard.json
diff --git a/keyboards/hs60/v2/hhkb/info.json b/keyboards/hs60/v2/hhkb/keyboard.json
index d9bc040e23..d9bc040e23 100644
--- a/keyboards/hs60/v2/hhkb/info.json
+++ b/keyboards/hs60/v2/hhkb/keyboard.json
diff --git a/keyboards/hs60/v2/iso/info.json b/keyboards/hs60/v2/iso/keyboard.json
index a51dac05fa..a51dac05fa 100644
--- a/keyboards/hs60/v2/iso/info.json
+++ b/keyboards/hs60/v2/iso/keyboard.json
diff --git a/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/info.json b/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/keyboard.json
index 0f67e6606d..0f67e6606d 100644
--- a/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/info.json
+++ b/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/keyboard.json
diff --git a/keyboards/ingrained/info.json b/keyboards/ingrained/keyboard.json
index ec6422fb0f..ec6422fb0f 100644
--- a/keyboards/ingrained/info.json
+++ b/keyboards/ingrained/keyboard.json
diff --git a/keyboards/inland/kb83/info.json b/keyboards/inland/kb83/keyboard.json
index 31ca8f1bda..31ca8f1bda 100644
--- a/keyboards/inland/kb83/info.json
+++ b/keyboards/inland/kb83/keyboard.json
diff --git a/keyboards/inland/kb83/rgb_matrix_kb.inc b/keyboards/inland/kb83/rgb_matrix_kb.inc
deleted file mode 100644
index 56e2bd31cb..0000000000
--- a/keyboards/inland/kb83/rgb_matrix_kb.inc
+++ /dev/null
@@ -1,51 +0,0 @@
-// !!! DO NOT ADD #pragma once !!! //
-
-// Step 1.
-// Declare custom effects using the RGB_MATRIX_EFFECT macro
-// (note the lack of semicolon after the macro!)
-
-RGB_MATRIX_EFFECT(turn_off_rgb)
-RGB_MATRIX_EFFECT(kb_reset_rgb)
-
-// Step 2.
-// Define effects inside the `RGB_MATRIX_CUSTOM_EFFECT_IMPLS` ifdef block
-
-#ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-
-// e.g: A simple effect, self-contained within a single method
-static bool turn_off_rgb(effect_params_t *params) {
-  RGB_MATRIX_USE_LIMITS(led_min, led_max);
-  for (uint8_t i = led_min; i < led_max; i++) {
-    rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
-  }
-  return rgb_matrix_check_finished_leds(led_max);
-}
-
-// e.g: A more complex effect, relying on external methods and state, with
-// dedicated init and run methods
-static uint8_t some_global_state;
-static void kb_reset_rgb_init(effect_params_t* params) {
-  some_global_state = 0;
-}
-static bool kb_reset_rgb_run(effect_params_t* params) {
-  RGB_MATRIX_USE_LIMITS(led_min, led_max);
-  some_global_state++;
-  if(some_global_state&0x01){
-      for (uint8_t i = led_min; i < led_max; i++)
-        rgb_matrix_set_color(i, 0, 0, 0);
-  }
-  else{
-      for (uint8_t i = led_min; i < led_max; i++) 
-        rgb_matrix_set_color(i, 0xc0, 0xc0, 0xc0);
-  }
-  if(some_global_state>=7)
-    rgb_matrix_init();
-  return rgb_matrix_check_finished_leds(led_max);
-}
-
-static bool kb_reset_rgb(effect_params_t* params) {
-  if (params->init) kb_reset_rgb_init(params);
-  return kb_reset_rgb_run(params);
-}
-
-#endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
diff --git a/keyboards/inland/kb83/rules.mk b/keyboards/inland/kb83/rules.mk
deleted file mode 100644
index 2bdd4fd92e..0000000000
--- a/keyboards/inland/kb83/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-#RGB_MATRIX_CUSTOM_USER = yes
diff --git a/keyboards/input_club/ergodox_infinity/info.json b/keyboards/input_club/ergodox_infinity/keyboard.json
index 6f47d72685..6f47d72685 100644
--- a/keyboards/input_club/ergodox_infinity/info.json
+++ b/keyboards/input_club/ergodox_infinity/keyboard.json