Data-Driven Keyboard Conversions: B (#23425)

Converts configuration definitions and rules to data-driven where applicable. Renames `info.json` to `keyboard.json` in instances where `rules.mk` can be safely deleted. Affects: - `bacca70` - `baguette` - `baion_808` - `bajjak` - `bandominedoni` - `bantam44` - `barleycorn_smd` - `barracuda` - `basekeys/slice/rev1` - `basekeys/slice/rev1_rgb` - `basekeys/trifecta` - `basketweave` - `bastardkb/dilemma/4x6_4` - `bbrfkr/dynamis` - `bear_face` - `beatervan` - `bemeier/bmek` - `biacco42/ergo42` - `biacco42/meishi` - `biacco42/meishi2` - `binepad/bn003` - `binepad/bn009/r1` - `binepad/bnr1` - `bioi/g60` - `bioi/g60ble` - `bioi/morgan65` - `bioi/s65` - `blackplum` - `blank/blank01` - `blank_tehnologii/manibus` - `blockey` - `bluebell/swoop` - `boardrun/bizarre` - `boardrun/classic` - `boardsource/equals/48` - `boardsource/equals/60` - `boardwalk` - `bop` - `boston` - `boston_meetup/2019` - `box75` - `bpiphany/four_banger` - `bpiphany/frosty_flake` - `bpiphany/ghost_squid` - `bpiphany/hid_liber` - `bpiphany/kitten_paw` - `bpiphany/tiger_lily` - `bpiphany/unloved_bastard` - `bt66tech/bt66tech60` - `bubble75/hotswap` - `budgy` - `buildakb/potato65` - `buildakb/potato65hs` - `buildakb/potato65s` - `buzzard`
author: James Young <18669334+noroadsleft@users.noreply.github.com> 2024-04-11 14:21:32 -0700
committer: GitHub <noreply@github.com> 2024-04-11 14:21:32 -0700
commit: cb81913d18fd567cb2dbadcd9a5c5c767f75ba60 (patch)
tree: 35e62d69a2b1e79d41bff00d074057da46b60d10 /keyboards
parent: a532d1cc5a785da3d73812330aad95555efb81fa (diff)
133 files changed, 645 insertions, 1274 deletions
diff --git a/keyboards/bacca70/config.h b/keyboards/bacca70/config.h
deleted file mode 100644
index 0c56f57b20..0000000000
--- a/keyboards/bacca70/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
-Copyright 2022 keebnewb
-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
-/* 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/bacca70/keyboard.json b/keyboards/bacca70/keyboard.json
index c192fb0eb2..8d4483bc6f 100644
--- a/keyboards/bacca70/keyboard.json
+++ b/keyboards/bacca70/keyboard.json
@@ -16,6 +16,12 @@
        "mousekey": false,
        "nkro": true
    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
    "matrix_pins": {
        "cols": ["A0", "A1", "A2", "B12", "B13", "B14", "B15", "A8"],
        "rows": ["A3", "A4", "A5", "A6", "A7", "B0", "B1", "B2", "B10", "B11", "A9", "A10"]
diff --git a/keyboards/baguette/config.h b/keyboards/baguette/config.h
deleted file mode 100644
index 3005d1bcfb..0000000000
--- a/keyboards/baguette/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2018 Yiancar
-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
-/* 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
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-/* disable debug print */
-//#define NO_DEBUG
-/* disable print */
-//#define NO_PRINT
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/baguette/keyboard.json b/keyboards/baguette/keyboard.json
index f6797dd939..001757f861 100644
--- a/keyboards/baguette/keyboard.json
+++ b/keyboards/baguette/keyboard.json
@@ -17,6 +17,12 @@
    "mousekey": true,
    "nkro": false
  },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
  "matrix_pins": {
    "cols": ["B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "B0", "D0", "D1", "D2", "D3", "D5", "D4"],
    "rows": ["B3", "B2", "B1", "E6", "D6"]
diff --git a/keyboards/baion_808/info.json b/keyboards/baion_808/info.json
index d8834ec066..c770a65e25 100755
--- a/keyboards/baion_808/info.json
+++ b/keyboards/baion_808/info.json
@@ -8,6 +8,12 @@
        "pid": "0x4238",
        "device_version": "0.0.1"
    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true
+    },
    "matrix_pins": {
        "cols": ["A1", "B9", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "B2", "B10", "B11", "B12", "B13", "B14", "B15", "A8"],
        "rows": ["A2", "A14", "A15", "B3", "B4", "B5"]
@@ -20,6 +26,7 @@
    },
    "processor": "STM32F072",
    "bootloader": "stm32-dfu",
+    "community_layouts": ["tkl_ansi", "tkl_ansi_tsangan", "tkl_ansi_split_bs_rshift", "tkl_ansi_tsangan_split_bs_rshift", "tkl_iso", "tkl_iso_split_bs_rshift", "tkl_iso_tsangan", "tkl_iso_tsangan_split_bs_rshift"],
    "layouts": {
        "LAYOUT_all": {
            "layout": [
diff --git a/keyboards/baion_808/rules.mk b/keyboards/baion_808/rules.mk
index 11c4a00e5a..0ab54aaaf7 100644
--- a/keyboards/baion_808/rules.mk
+++ b/keyboards/baion_808/rules.mk
@@ -1,17 +1,2 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-LAYOUTS = tkl_ansi tkl_ansi_tsangan tkl_ansi_split_bs_rshift tkl_ansi_tsangan_split_bs_rshift tkl_iso tkl_iso_split_bs_rshift tkl_iso_tsangan tkl_iso_tsangan_split_bs_rshift
diff --git a/keyboards/bajjak/config.h b/keyboards/bajjak/config.h
index 72d296bca4..455588fb08 100644
--- a/keyboards/bajjak/config.h
+++ b/keyboards/bajjak/config.h
@@ -43,11 +43,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MOUSEKEY_MAX_SPEED      7
 #define MOUSEKEY_WHEEL_DELAY 0
-/* 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
 /* key combination for command */
 #define IS_COMMAND() ( \
    get_mods() == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || \
diff --git a/keyboards/bajjak/info.json b/keyboards/bajjak/info.json
index bf090bb7d6..a4ab7298ee 100644
--- a/keyboards/bajjak/info.json
+++ b/keyboards/bajjak/info.json
@@ -8,6 +8,21 @@
        "pid": "0x0002",
        "device_version": "0.0.1"
    },
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true,
+        "unicode": true,
+        "swap_hands": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
    "processor": "atmega32u4",
    "bootloader": "halfkay",
    "tapping": {
diff --git a/keyboards/bajjak/rules.mk b/keyboards/bajjak/rules.mk
index 21db4112e0..08caba6edc 100644
--- a/keyboards/bajjak/rules.mk
+++ b/keyboards/bajjak/rules.mk
@@ -3,22 +3,7 @@
 # details), include the following define:
 OPT_DEFS += -DLEFT_LEDS
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
 CUSTOM_MATRIX = lite        # Custom matrix file for the BAJJAK
-UNICODE_ENABLE = yes        # Unicode
-SWAP_HANDS_ENABLE = yes     # Allow swapping hands of keyboard
 # Disable unsupported hardware
 BACKLIGHT_SUPPORTED = no
diff --git a/keyboards/bandominedoni/info.json b/keyboards/bandominedoni/keyboard.json
index deea0f3e5e..c253da0c83 100644
--- a/keyboards/bandominedoni/info.json
+++ b/keyboards/bandominedoni/keyboard.json
@@ -8,6 +8,16 @@
        "pid": "0xF4B5",
        "device_version": "0.0.1"
    },
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": true,
+        "midi": true,
+        "encoder": true
+    },
+    "build": {
+        "lto": true
+    },
    "rgb_matrix": {
        "driver": "ws2812",
        "max_brightness": 50,
@@ -19,6 +29,7 @@
    },
    "diode_direction": "COL2ROW",
    "split": {
+        "enabled": true,
        "soft_serial_pin": "D2",
        "encoder": {
            "right": {
diff --git a/keyboards/bandominedoni/rules.mk b/keyboards/bandominedoni/rules.mk
deleted file mode 100644
index c32d761f10..0000000000
--- a/keyboards/bandominedoni/rules.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-MIDI_ENABLE = yes           # MIDI support
-ENCODER_ENABLE = yes        # encoder on mute button
-SPLIT_KEYBOARD = yes        # Enables split keyboard support
-RGB_MATRIX_ENABLE = no      # Use RGB matrix (Don't enable this when RGBLIGHT_ENABLE is used.)
-LTO_ENABLE = yes
diff --git a/keyboards/bantam44/config.h b/keyboards/bantam44/config.h
deleted file mode 100644
index b9449c4714..0000000000
--- a/keyboards/bantam44/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-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
-/* 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
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-/* disable debug print */
-//#define NO_DEBUG
-/* disable print */
-//#define NO_PRINT
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/bantam44/keyboard.json b/keyboards/bantam44/keyboard.json
index 2a884c2524..ac534af6a9 100644
--- a/keyboards/bantam44/keyboard.json
+++ b/keyboards/bantam44/keyboard.json
@@ -16,6 +16,12 @@
    "mousekey": true,
    "nkro": false
  },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
  "matrix_pins": {
    "cols": ["B0", "B1", "B2", "B3", "B7", "D0", "B6", "F7", "F6", "F5", "F4", "F1"],
    "rows": ["F0", "D6", "D4", "D5"]
diff --git a/keyboards/barleycorn_smd/config.h b/keyboards/barleycorn_smd/config.h
index 06c67798c0..e64c243aad 100644
--- a/keyboards/barleycorn_smd/config.h
+++ b/keyboards/barleycorn_smd/config.h
@@ -41,11 +41,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
-/* 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
 /*
 * Feature disable options
 *  These options are also useful to firmware size reduction.
diff --git a/keyboards/barleycorn_smd/info.json b/keyboards/barleycorn_smd/info.json
index b4aef08b62..cc269296d7 100644
--- a/keyboards/barleycorn_smd/info.json
+++ b/keyboards/barleycorn_smd/info.json
@@ -8,6 +8,18 @@
        "device_version": "0.0.1",
        "max_power": 400
    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "rgblight": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
    "indicators": {
        "caps_lock": "B2",
        "num_lock": "B3"
diff --git a/keyboards/barleycorn_smd/rules.mk b/keyboards/barleycorn_smd/rules.mk
index 69ecebae2a..c04c3c92ed 100644
--- a/keyboards/barleycorn_smd/rules.mk
+++ b/keyboards/barleycorn_smd/rules.mk
@@ -1,16 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
 CUSTOM_MATRIX = lite
 SRC += matrix.c
diff --git a/keyboards/barracuda/config.h b/keyboards/barracuda/config.h
deleted file mode 100644
index 5dd1c8d063..0000000000
--- a/keyboards/barracuda/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2021 knaruo
- *
- * 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
-/* 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/barracuda/keyboard.json b/keyboards/barracuda/keyboard.json
index 56cf8f08bb..6e606e11ea 100644
--- a/keyboards/barracuda/keyboard.json
+++ b/keyboards/barracuda/keyboard.json
@@ -16,6 +16,12 @@
        "mousekey": true,
        "nkro": true
    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
    "matrix_pins": {
        "cols": ["D4", "D5", "D6", "B0", "B1", "B2"],
        "rows": ["C4", "C5", "C6", "D1", "D2", "D3"]
diff --git a/keyboards/basekeys/slice/rev1/config.h b/keyboards/basekeys/slice/rev1/config.h
index c1008da9b8..aecd34737d 100644
--- a/keyboards/basekeys/slice/rev1/config.h
+++ b/keyboards/basekeys/slice/rev1/config.h
@@ -21,8 +21,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define EE_HANDS
 #define MASTER_LEFT
 //#define MASTER_RIGHT
-/* 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/basekeys/slice/rev1/info.json b/keyboards/basekeys/slice/rev1/keyboard.json
index 6b97d0c9ec..c341597ee6 100644
--- a/keyboards/basekeys/slice/rev1/info.json
+++ b/keyboards/basekeys/slice/rev1/keyboard.json
@@ -8,12 +8,24 @@
        "pid": "0xEC17",
        "device_version": "0.0.2"
    },
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": false
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
    "matrix_pins": {
        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "B5"],
        "rows": ["D4", "C6", "D7", "E6", "B4"]
    },
    "diode_direction": "COL2ROW",
    "split": {
+        "enabled": true,
        "soft_serial_pin": "D2"
    },
    "processor": "atmega32u4",
diff --git a/keyboards/basekeys/slice/rev1/rules.mk b/keyboards/basekeys/slice/rev1/rules.mk
deleted file mode 100644
index 992af66fa2..0000000000
--- a/keyboards/basekeys/slice/rev1/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# this is split keyboard.
-SPLIT_KEYBOARD = yes
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no       # Mouse keys
-EXTRAKEY_ENABLE = no       # Audio control and System control
-CONSOLE_ENABLE = no        # Console for debug
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
diff --git a/keyboards/basekeys/slice/rev1_rgb/config.h b/keyboards/basekeys/slice/rev1_rgb/config.h
index 8a0c1946c1..2594d39f2a 100644
--- a/keyboards/basekeys/slice/rev1_rgb/config.h
+++ b/keyboards/basekeys/slice/rev1_rgb/config.h
@@ -21,9 +21,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MASTER_LEFT
 //#define MASTER_RIGHT
-/* 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
 #define OLED_FONT_H "keyboards/basekeys/slice/slice_font.c"
diff --git a/keyboards/basekeys/slice/rev1_rgb/info.json b/keyboards/basekeys/slice/rev1_rgb/keyboard.json
index faec5a9953..a666f26661 100644
--- a/keyboards/basekeys/slice/rev1_rgb/info.json
+++ b/keyboards/basekeys/slice/rev1_rgb/keyboard.json
@@ -8,12 +8,29 @@
        "pid": "0xEC15",
        "device_version": "0.0.2"
    },
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": false,
+        "rgblight": true,
+        "oled": true
+    },
+    "build": {
+        "lto": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
    "matrix_pins": {
        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "B5"],
        "rows": ["D4", "C6", "D7", "E6", "B4"]
    },
    "diode_direction": "COL2ROW",
    "split": {
+        "enabled": true,
        "soft_serial_pin": "D2"
    },
    "ws2812": {
diff --git a/keyboards/basekeys/slice/rev1_rgb/rules.mk b/keyboards/basekeys/slice/rev1_rgb/rules.mk
deleted file mode 100644
index 1e24ec177f..0000000000
--- a/keyboards/basekeys/slice/rev1_rgb/rules.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# this is split keyboard.
-SPLIT_KEYBOARD = yes
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no       # Mouse keys
-EXTRAKEY_ENABLE = no       # Audio control and System control
-CONSOLE_ENABLE = no        # Console for debug
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-OLED_ENABLE = yes
-LTO_ENABLE = yes
diff --git a/keyboards/basekeys/trifecta/config.h b/keyboards/basekeys/trifecta/config.h
deleted file mode 100644
index 584a6e4bfc..0000000000
--- a/keyboards/basekeys/trifecta/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2020 Swiftrax and Basekeys.com
- *
- * 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
-/* 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/basekeys/trifecta/keyboard.json b/keyboards/basekeys/trifecta/keyboard.json
index 8777b1ffa9..8660156f64 100644
--- a/keyboards/basekeys/trifecta/keyboard.json
+++ b/keyboards/basekeys/trifecta/keyboard.json
@@ -18,6 +18,12 @@
        "nkro": false,
        "rgblight": true
    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
    "matrix_pins": {
        "cols": ["F0", "F1", "F4", "F5", "D1", "B2", "D0", "B3"],
        "rows": ["B0", "B7", "F7", "B1", "B6", "C6", "C7", "B5", "F6", "D2"]
@@ -54,6 +60,7 @@
        }
    },
    "rgb_matrix": {
+        "driver": "ws2812",
        "sat_steps": 8,
        "val_steps": 8,
        "speed_steps": 10,
@@ -102,7 +109,89 @@
            "multisplash": true,
            "solid_splash": true,
            "solid_multisplash": true
-        }
+        },
+        "layout": [
+            {"x": 218, "y": 7, "flags": 2},
+            {"x": 214, "y": 45, "flags": 2},
+            {"x": 180, "y": 47, "flags": 2},
+            {"x": 147, "y": 50, "flags": 2},
+            {"x": 94, "y": 62, "flags": 2},
+            {"x": 37, "y": 51, "flags": 2},
+            {"x": 4, "y": 8, "flags": 2},
+            {"x": 36, "y": 15, "flags": 2},
+            {"x": 62, "y": 18, "flags": 2},
+            {"x": 78, "y": 5, "flags": 2},
+            {"x": 119, "y": 7, "flags": 2},
+            {"x": 145, "y": 16, "flags": 2},
+            {"x": 166, "y": 3, "flags": 2},
+            {"x": 200, "y": 16, "flags": 2},
+            {"matrix": [0, 7], "x": 185, "y": 11, "flags": 4},
+            {"matrix": [2, 7], "x": 191, "y": 22, "flags": 4},
+            {"matrix": [4, 7], "x": 188, "y": 33, "flags": 4},
+            {"matrix": [6, 7], "x": 200, "y": 46, "flags": 4},
+            {"matrix": [8, 7], "x": 200, "y": 57, "flags": 4},
+            {"matrix": [9, 7], "x": 212, "y": 57, "flags": 4},
+            {"matrix": [9, 6], "x": 188, "y": 57, "flags": 4},
+            {"matrix": [7, 6], "x": 181, "y": 44, "flags": 4},
+            {"matrix": [3, 6], "x": 176, "y": 22, "flags": 4},
+            {"matrix": [1, 6], "x": 168, "y": 11, "flags": 4},
+            {"matrix": [0, 6], "x": 155, "y": 11, "flags": 4},
+            {"matrix": [2, 6], "x": 164, "y": 22, "flags": 4},
+            {"matrix": [5, 6], "x": 169, "y": 32, "flags": 4},
+            {"matrix": [6, 6], "x": 165, "y": 44, "flags": 4},
+            {"matrix": [8, 6], "x": 172, "y": 55, "flags": 4},
+            {"matrix": [9, 5], "x": 157, "y": 54, "flags": 4},
+            {"matrix": [7, 5], "x": 153, "y": 44, "flags": 4},
+            {"matrix": [4, 5], "x": 156, "y": 33, "flags": 4},
+            {"matrix": [3, 5], "x": 153, "y": 22, "flags": 4},
+            {"matrix": [1, 5], "x": 142, "y": 12, "flags": 4},
+            {"matrix": [0, 5], "x": 130, "y": 13, "flags": 4},
+            {"matrix": [2, 5], "x": 138, "y": 23, "flags": 4},
+            {"matrix": [5, 5], "x": 143, "y": 33, "flags": 4},
+            {"matrix": [6, 5], "x": 140, "y": 45, "flags": 4},
+            {"matrix": [8, 5], "x": 137, "y": 56, "flags": 4},
+            {"matrix": [7, 4], "x": 128, "y": 47, "flags": 4},
+            {"matrix": [4, 4], "x": 132, "y": 35, "flags": 4},
+            {"matrix": [3, 4], "x": 127, "y": 25, "flags": 4},
+            {"matrix": [1, 4], "x": 119, "y": 16, "flags": 4},
+            {"matrix": [0, 4], "x": 107, "y": 17, "flags": 4},
+            {"matrix": [2, 4], "x": 115, "y": 27, "flags": 4},
+            {"matrix": [5, 4], "x": 120, "y": 37, "flags": 4},
+            {"matrix": [6, 4], "x": 116, "y": 48, "flags": 4},
+            {"matrix": [9, 4], "x": 117, "y": 59, "flags": 4},
+            {"matrix": [7, 3], "x": 104, "y": 51, "flags": 4},
+            {"matrix": [4, 3], "x": 109, "y": 39, "flags": 4},
+            {"matrix": [3, 3], "x": 104, "y": 29, "flags": 4},
+            {"matrix": [1, 3], "x": 86, "y": 19, "flags": 4},
+            {"matrix": [0, 3], "x": 74, "y": 16, "flags": 4},
+            {"matrix": [2, 3], "x": 78, "y": 28, "flags": 4},
+            {"matrix": [5, 3], "x": 79, "y": 39, "flags": 4},
+            {"matrix": [6, 3], "x": 82, "y": 50, "flags": 4},
+            {"matrix": [8, 2], "x": 73, "y": 60, "flags": 4},
+            {"matrix": [7, 2], "x": 71, "y": 48, "flags": 4},
+            {"matrix": [4, 2], "x": 67, "y": 37, "flags": 4},
+            {"matrix": [3, 2], "x": 66, "y": 26, "flags": 4},
+            {"matrix": [1, 2], "x": 63, "y": 15, "flags": 4},
+            {"matrix": [0, 2], "x": 50, "y": 12, "flags": 4},
+            {"matrix": [2, 2], "x": 55, "y": 24, "flags": 4},
+            {"matrix": [5, 2], "x": 55, "y": 35, "flags": 4},
+            {"matrix": [6, 2], "x": 59, "y": 47, "flags": 4},
+            {"matrix": [9, 1], "x": 50, "y": 56, "flags": 4},
+            {"matrix": [7, 1], "x": 47, "y": 45, "flags": 4},
+            {"matrix": [4, 1], "x": 43, "y": 33, "flags": 4},
+            {"matrix": [3, 1], "x": 43, "y": 22, "flags": 4},
+            {"matrix": [1, 1], "x": 39, "y": 10, "flags": 4},
+            {"matrix": [0, 1], "x": 25, "y": 11, "flags": 4},
+            {"matrix": [2, 1], "x": 29, "y": 22, "flags": 4},
+            {"matrix": [5, 1], "x": 30, "y": 33, "flags": 4},
+            {"matrix": [6, 1], "x": 34, "y": 44, "flags": 4},
+            {"matrix": [8, 1], "x": 24, "y": 54, "flags": 4},
+            {"matrix": [9, 0], "x": 9, "y": 55, "flags": 4},
+            {"matrix": [7, 0], "x": 15, "y": 44, "flags": 4},
+            {"matrix": [4, 0], "x": 14, "y": 33, "flags": 4},
+            {"matrix": [3, 0], "x": 14, "y": 22, "flags": 4},
+            {"matrix": [1, 0], "x": 14, "y": 11, "flags": 4}
+        ]
    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
diff --git a/keyboards/basekeys/trifecta/trifecta.c b/keyboards/basekeys/trifecta/trifecta.c
deleted file mode 100644
index 926180d996..0000000000
--- a/keyboards/basekeys/trifecta/trifecta.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/* Copyright 2020 Swiftrax and Basekeys.com
- *
- * 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/>.
- */
-#include "quantum.h"
-#ifdef RGB_MATRIX_ENABLE
-led_config_t g_led_config = { {
-    { NO_LED, 70,     61,     52,     43, 34,     24,     14  },
-    {     79, 69,     60,     51,     42, 33,     23, NO_LED  },
-    { NO_LED, 71,     62,     53,     44, 35,     25,     15  },
-    {     78, 68,     59,     50,     41, 32,     22, NO_LED  },
-    {     77, 67,     58,     49,     40, 31, NO_LED,     16  },
-    { NO_LED, 72,     63,     54,     45, 36,     26, NO_LED  },
-    { NO_LED, 73,     64,     55,     46, 37,     27,     17  },
-    {     76, 66,     57,     48,     39, 30,     21, NO_LED  },
-    { NO_LED, 74,     56, NO_LED, NO_LED, 38,     28,     18  },
-    {     75, 65, NO_LED, NO_LED,     47, 29,     20,     19  }
-}, {
-        // Underglow
-    {  218,   7 },  { 214,  45 }, { 180,  47 }, {  147, 50 }, {  94,  62 }, {  37,  51 }, {   4,   8 }, {   36,  15 },
-    {  62,   18 },  {  78,   5 }, { 119,   7 }, {  145, 16 }, { 166,   3 }, { 200,  16 }, 
-    
-    //Per Key
-    { 185,  11 },  { 191,  22 }, { 188,  33 }, { 200,  46 }, { 200,  57 }, { 212,  57 }, { 188,  57 }, { 181,  44 },
-    { 176,  22 },  { 168,  11 }, { 155,  11 }, { 164,  22 }, { 169,  32 }, { 165,  44 }, { 172,  55 }, { 157,  54 }, 
-    { 153,  44 },  { 156,  33 }, { 153,  22 }, { 142,  12 }, { 130,  13 }, { 138,  23 }, { 143,  33 }, { 140,  45 }, 
-    { 137,  56 },  { 128,  47 }, { 132,  35 }, { 127,  25 }, { 119,  16 }, { 107,  17 }, { 115,  27 }, { 120,  37 }, 
-    { 116,  48 },  { 117,  59 }, { 104,  51 }, { 109,  39 }, { 104,  29 }, {  86,  19 }, {  74,  16 }, {  78,  28 }, 
-    {  79,  39 },  {  82,  50 }, {  73,  60 }, {  71,  48 }, {  67,  37 }, {  66,  26 }, {  63,  15 }, {  50,  12 }, 
-    {  55,  24 },  {  55,  35 }, {  59,  47 }, {  50,  56 }, {  47,  45 }, {  43,  33 }, {  43,  22 }, {  39,  10 }, 
-    {  25,  11 },  {  29,  22 }, {  30,  33 }, {  34,  44 }, {  24,  54 }, {   9,  55 }, {  15,  44 }, {  14,  33 }, 
-    {  14,  22 },  {  14,  11 }
-}, {
-    2, 2, 2, 2, 2, 2, 2, 2, 
-    2, 2, 2, 2, 2, 2, 
-    4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 
-    4, 4, 4, 4, 4, 4, 4, 4, 
-    4, 4, 4, 4, 4, 4, 4, 4, 
-    4, 4, 4, 4, 4, 4, 4, 4, 
-    4, 4, 4, 4, 4, 4, 4, 4, 
-    4, 4, 4, 4, 4, 4, 4, 4, 
-    4, 4, 4, 4, 4, 4, 4, 4, 
-    4, 4
-} };
-#endif
-\ No newline at end of file
diff --git a/keyboards/basketweave/config.h b/keyboards/basketweave/config.h
deleted file mode 100644
index ebf8596319..0000000000
--- a/keyboards/basketweave/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2020 null-ll
- *
- * 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
-/* 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/basketweave/info.json b/keyboards/basketweave/info.json
index 705ef675ba..75a720b7dd 100644
--- a/keyboards/basketweave/info.json
+++ b/keyboards/basketweave/info.json
@@ -9,6 +9,12 @@
        "device_version": "0.0.1",
        "max_power": 100
    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "encoder": true
+    },
    "matrix_pins": {
        "cols": ["A0", "A1", "A2", "A3", "A4", "B0", "B1", "B2", "D5", "D6", "C5", "C4", "C3", "C2", "C1"],
        "rows": ["A6", "C6", "C7", "A7", "A5"]
@@ -20,7 +26,11 @@
        ]
    },
    "qmk": {
-        "tap_keycode_delay": 10
+        "tap_keycode_delay": 10,
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
    },
    "processor": "atmega32a",
    "bootloader": "usbasploader",
diff --git a/keyboards/basketweave/rules.mk b/keyboards/basketweave/rules.mk
index b43c5121f4..c2ee0bc86f 100644
--- a/keyboards/basketweave/rules.mk
+++ b/keyboards/basketweave/rules.mk
@@ -1,16 +1,2 @@
 # Processor frequency
 F_CPU = 16000000
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes
diff --git a/keyboards/bastardkb/dilemma/4x6_4/config.h b/keyboards/bastardkb/dilemma/4x6_4/config.h
index 549965444d..7276c6181f 100644
--- a/keyboards/bastardkb/dilemma/4x6_4/config.h
+++ b/keyboards/bastardkb/dilemma/4x6_4/config.h
@@ -42,6 +42,3 @@
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U
-/* RGB matrix support. */
-#define SPLIT_TRANSPORT_MIRROR
-\ No newline at end of file
diff --git a/keyboards/bbrfkr/dynamis/info.json b/keyboards/bbrfkr/dynamis/info.json
index 6d1ae830eb..dc9b6cf584 100644
--- a/keyboards/bbrfkr/dynamis/info.json
+++ b/keyboards/bbrfkr/dynamis/info.json
@@ -8,6 +8,17 @@
        "pid": "0x0001",
        "device_version": "0.0.1"
    },
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "rgblight": true,
+        "pointing_device": true,
+        "encoder": true
+    },
+    "build": {
+        "lto": true
+    },
    "matrix_pins": {
        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7"],
        "rows": ["B6", "B4", "D6", "D5", "D1", "C6", "B5", "D7", "D4", "D0"]
diff --git a/keyboards/bbrfkr/dynamis/rules.mk b/keyboards/bbrfkr/dynamis/rules.mk
index aef3d2a28a..fab9162dc6 100644
--- a/keyboards/bbrfkr/dynamis/rules.mk
+++ b/keyboards/bbrfkr/dynamis/rules.mk
@@ -1,17 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-SPLIT_KEYBOARD = no
-POINTING_DEVICE_ENABLE = yes
 POINTING_DEVICE_DRIVER = pmw3360
-ENCODER_ENABLE = yes
-LTO_ENABLE = yes
diff --git a/keyboards/bear_face/config.h b/keyboards/bear_face/config.h
deleted file mode 100644
index 81ada21b71..0000000000
--- a/keyboards/bear_face/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2020 chemicalwill <https://github.com/chemicalwill>
-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
-/* 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
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-/* disable debug print */
-//#define NO_DEBUG
-/* disable print */
-//#define NO_PRINT
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/bear_face/info.json b/keyboards/bear_face/info.json
index 24dd696e9b..ad12468d56 100644
--- a/keyboards/bear_face/info.json
+++ b/keyboards/bear_face/info.json
@@ -18,6 +18,12 @@
        "mousekey": false,
        "nkro": true
    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
    "matrix_pins": {
        "cols": ["B5", "C7", "C6", "F0", "E6", "B7", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"],
        "rows": ["F5", "F6", "F4", "F1", "B0", "B6"]
diff --git a/keyboards/beatervan/config.h b/keyboards/beatervan/config.h
deleted file mode 100644
index f482b43c10..0000000000
--- a/keyboards/beatervan/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2020 OJtheTiny
- *
- * 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
-/* 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/beatervan/keyboard.json b/keyboards/beatervan/keyboard.json
index 4828127d14..27d0f3e535 100644
--- a/keyboards/beatervan/keyboard.json
+++ b/keyboards/beatervan/keyboard.json
@@ -17,6 +17,12 @@
    "nkro": true,
    "unicode": true
  },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
  "matrix_pins": {
    "cols": ["D7", "E6", "B4", "B5", "F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
    "rows": ["D1", "D0", "D4", "C6"]
diff --git a/keyboards/bemeier/bmek/rev1/info.json b/keyboards/bemeier/bmek/rev1/keyboard.json
index 70873aa527..5f55900966 100644
--- a/keyboards/bemeier/bmek/rev1/info.json
+++ b/keyboards/bemeier/bmek/rev1/keyboard.json
@@ -2,6 +2,17 @@
    "usb": {
        "device_version": "0.0.1"
    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "sleep_led": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "build": {
+        "lto": true
+    },
    "rgblight": {
        "saturation_steps": 8,
        "brightness_steps": 8,
diff --git a/keyboards/bemeier/bmek/rev1/rules.mk b/keyboards/bemeier/bmek/rev1/rules.mk
deleted file mode 100755
index e9b89a01e1..0000000000
--- a/keyboards/bemeier/bmek/rev1/rules.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE       = no
-EXTRAKEY_ENABLE       = yes
-CONSOLE_ENABLE        = no
-COMMAND_ENABLE        = no
-SLEEP_LED_ENABLE      = yes
-SPLIT_KEYBOARD        = no
-BACKLIGHT_ENABLE      = no
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-RGBLIGHT_ENABLE       = yes
-AUDIO_ENABLE          = no
-LTO_ENABLE            = yes
diff --git a/keyboards/bemeier/bmek/rev2/info.json b/keyboards/bemeier/bmek/rev2/keyboard.json
index f1440afaf2..f9e264a214 100644
--- a/keyboards/bemeier/bmek/rev2/info.json
+++ b/keyboards/bemeier/bmek/rev2/keyboard.json
@@ -2,6 +2,17 @@
    "usb": {
        "device_version": "0.0.2"
    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "sleep_led": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "build": {
+        "lto": true
+    },
    "rgblight": {
        "saturation_steps": 8,
        "brightness_steps": 8,
diff --git a/keyboards/bemeier/bmek/rev2/rules.mk b/keyboards/bemeier/bmek/rev2/rules.mk
deleted file mode 100755
index e9b89a01e1..0000000000
--- a/keyboards/bemeier/bmek/rev2/rules.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE       = no
-EXTRAKEY_ENABLE       = yes
-CONSOLE_ENABLE        = no
-COMMAND_ENABLE        = no
-SLEEP_LED_ENABLE      = yes
-SPLIT_KEYBOARD        = no
-BACKLIGHT_ENABLE      = no
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-RGBLIGHT_ENABLE       = yes
-AUDIO_ENABLE          = no
-LTO_ENABLE            = yes
diff --git a/keyboards/bemeier/bmek/rev3/info.json b/keyboards/bemeier/bmek/rev3/keyboard.json
index ac0faf8706..3d12f4ee4e 100644
--- a/keyboards/bemeier/bmek/rev3/info.json
+++ b/keyboards/bemeier/bmek/rev3/keyboard.json
@@ -2,6 +2,17 @@
    "usb": {
        "device_version": "0.0.3"
    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "sleep_led": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "build": {
+        "lto": true
+    },
    "rgblight": {
        "saturation_steps": 8,
        "brightness_steps": 8,
diff --git a/keyboards/bemeier/bmek/rev3/rules.mk b/keyboards/bemeier/bmek/rev3/rules.mk
deleted file mode 100755
index e9b89a01e1..0000000000
--- a/keyboards/bemeier/bmek/rev3/rules.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE       = no
-EXTRAKEY_ENABLE       = yes
-CONSOLE_ENABLE        = no
-COMMAND_ENABLE        = no
-SLEEP_LED_ENABLE      = yes
-SPLIT_KEYBOARD        = no
-BACKLIGHT_ENABLE      = no
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-RGBLIGHT_ENABLE       = yes
-AUDIO_ENABLE          = no
-LTO_ENABLE            = yes
diff --git a/keyboards/biacco42/ergo42/rev1/config.h b/keyboards/biacco42/ergo42/rev1/config.h
deleted file mode 100644
index 179b117243..0000000000
--- a/keyboards/biacco42/ergo42/rev1/config.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-Copyright 2017 Biacco42
-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
-/* 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
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-/* disable debug print */
-// #define NO_DEBUG
-/* disable print */
-// #define NO_PRINT
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/biacco42/ergo42/rev1/info.json b/keyboards/biacco42/ergo42/rev1/keyboard.json
index 67f27ad612..b3a53bb3a4 100644
--- a/keyboards/biacco42/ergo42/rev1/info.json
+++ b/keyboards/biacco42/ergo42/rev1/keyboard.json
@@ -8,6 +8,18 @@
    "pid": "0x0042",
    "device_version": "1.0.0"
  },
+  "features": {
+    "bootmagic": false,
+    "mousekey": true,
+    "extrakey": true,
+    "command": true
+  },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
  "rgblight": {
    "led_count": 12
  },
@@ -20,6 +32,7 @@
  },
  "diode_direction": "COL2ROW",
  "split": {
+        "enabled": true,
        "soft_serial_pin": "D0"
    },
  "processor": "atmega32u4",
diff --git a/keyboards/biacco42/ergo42/rev1/rules.mk b/keyboards/biacco42/ergo42/rev1/rules.mk
deleted file mode 100644
index 7b30c0beff..0000000000
--- a/keyboards/biacco42/ergo42/rev1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-BACKLIGHT_ENABLE = no
diff --git a/keyboards/biacco42/ergo42/rules.mk b/keyboards/biacco42/ergo42/rules.mk
index 62044b6c13..18059c0a3b 100644
--- a/keyboards/biacco42/ergo42/rules.mk
+++ b/keyboards/biacco42/ergo42/rules.mk
@@ -1,16 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-SPLIT_KEYBOARD = yes
 DEFAULT_FOLDER = biacco42/ergo42/rev1
diff --git a/keyboards/biacco42/meishi/config.h b/keyboards/biacco42/meishi/config.h
deleted file mode 100644
index df5455b3c2..0000000000
--- a/keyboards/biacco42/meishi/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2019 Biacco42
-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
-/* 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
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-/* disable debug print */
-//#define NO_DEBUG
-/* disable print */
-//#define NO_PRINT
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/biacco42/meishi/keyboard.json b/keyboards/biacco42/meishi/keyboard.json
index d9d37d72fe..b7d751d83e 100644
--- a/keyboards/biacco42/meishi/keyboard.json
+++ b/keyboards/biacco42/meishi/keyboard.json
@@ -16,6 +16,12 @@
        "mousekey": true,
        "nkro": false
    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
    "matrix_pins": {
        "cols": ["B1", "B3", "B2", "B6"],
        "rows": ["B5"]
diff --git a/keyboards/biacco42/meishi2/config.h b/keyboards/biacco42/meishi2/config.h
deleted file mode 100644
index df5455b3c2..0000000000
--- a/keyboards/biacco42/meishi2/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2019 Biacco42
-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
-/* 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
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-/* disable debug print */
-//#define NO_DEBUG
-/* disable print */
-//#define NO_PRINT
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/biacco42/meishi2/keyboard.json b/keyboards/biacco42/meishi2/keyboard.json
index 3a392442f2..2f553681bc 100644
--- a/keyboards/biacco42/meishi2/keyboard.json
+++ b/keyboards/biacco42/meishi2/keyboard.json
@@ -16,6 +16,12 @@
    "mousekey": true,
    "nkro": false
  },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
  "matrix_pins": {
    "cols": ["F5", "F6"],
    "rows": ["D7", "E6"]
diff --git a/keyboards/binepad/bn003/config.h b/keyboards/binepad/bn003/config.h
deleted file mode 100644
index 77f51ecf5a..0000000000
--- a/keyboards/binepad/bn003/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2020 BINEPAD
- *
- * 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
-/* 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/binepad/bn003/keyboard.json b/keyboards/binepad/bn003/keyboard.json
index 695518828e..440b5f6597 100644
--- a/keyboards/binepad/bn003/keyboard.json
+++ b/keyboards/binepad/bn003/keyboard.json
@@ -16,6 +16,12 @@
    "mousekey": true,
    "nkro": true
  },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
  "matrix_pins": {
    "cols": ["B4", "B5", "B6"],
    "rows": ["C6"]
diff --git a/keyboards/binepad/bn009/r1/info.json b/keyboards/binepad/bn009/r1/keyboard.json
index 4b6a49bb9d..c5338c648d 100644
--- a/keyboards/binepad/bn009/r1/info.json
+++ b/keyboards/binepad/bn009/r1/keyboard.json
@@ -1,5 +1,8 @@
 {
    "keyboard_name": "BN009 R1",
+    "build": {
+        "lto": true
+    },
    "bootloader": "atmel-dfu",
      "diode_direction": "COL2ROW",
      "matrix_pins": {
diff --git a/keyboards/binepad/bn009/r1/rules.mk b/keyboards/binepad/bn009/r1/rules.mk
deleted file mode 100644
index 10468472aa..0000000000
--- a/keyboards/binepad/bn009/r1/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright 2020 Binepad (@binpad)
-# SPDX-License-Identifier: GPL-2.0-or-later
-LTO_ENABLE = yes
diff --git a/keyboards/binepad/bnr1/rules.mk b/keyboards/binepad/bnr1/rules.mk
index 9719de29b8..ce85c57404 100755
--- a/keyboards/binepad/bnr1/rules.mk
+++ b/keyboards/binepad/bnr1/rules.mk
@@ -1,3 +1 @@
-# This file is mostly left blank
 DEFAULT_FOLDER = binepad/bnr1/v2
diff --git a/keyboards/binepad/bnr1/v1/info.json b/keyboards/binepad/bnr1/v1/keyboard.json
index e67ea81282..ff3e633e19 100644
--- a/keyboards/binepad/bnr1/v1/info.json
+++ b/keyboards/binepad/bnr1/v1/keyboard.json
@@ -6,6 +6,9 @@
        "pid": "0x4231",
        "device_version": "1.0.0"
    },
+    "build": {
+        "lto": true
+    },
    "matrix_pins": {
        "cols": ["B0"],
        "rows": ["E6"]
diff --git a/keyboards/binepad/bnr1/v1/rules.mk b/keyboards/binepad/bnr1/v1/rules.mk
deleted file mode 100644
index ac022b38ca..0000000000
--- a/keyboards/binepad/bnr1/v1/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file is mostly left blank
-LTO_ENABLE = yes
diff --git a/keyboards/bioi/g60/config.h b/keyboards/bioi/g60/config.h
index 976841be79..30ce798073 100644
--- a/keyboards/bioi/g60/config.h
+++ b/keyboards/bioi/g60/config.h
@@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 #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
 /* key combination for magic key command */
 #define KEYBOARD_LOCK_ENABLE
 #define MAGIC_KEY_LOCK L
diff --git a/keyboards/bioi/g60/info.json b/keyboards/bioi/g60/info.json
index a96d1acce5..8d3dd58770 100644
--- a/keyboards/bioi/g60/info.json
+++ b/keyboards/bioi/g60/info.json
@@ -8,6 +8,24 @@
        "pid": "0x6080",
        "device_version": "0.0.1"
    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "command": true,
+        "backlight": true,
+        "rgblight": true,
+        "bluetooth": true
+    },
+    "build": {
+        "lto": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
    "matrix_pins": {
        "cols": ["F6", "F7", "B3", "C7", "C6", "B6", "B5", "D5", "B4", "D7", "D6", "D4", "D1", "D0"],
        "rows": ["E6", "B0", "F1", "F5", "F4"]
diff --git a/keyboards/bioi/g60/rules.mk b/keyboards/bioi/g60/rules.mk
index 3635daac6f..c383c07aff 100644
--- a/keyboards/bioi/g60/rules.mk
+++ b/keyboards/bioi/g60/rules.mk
@@ -1,19 +1,5 @@
 # Processor frequency
 F_CPU = 8000000
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-LTO_ENABLE = yes            # Reduce firmware size
-BLUETOOTH_ENABLE = yes
 UART_DRIVER_REQUIRED = yes
 SRC += bluetooth_custom.c
diff --git a/keyboards/bioi/g60ble/config.h b/keyboards/bioi/g60ble/config.h
index 0b4ce9a090..8e0ef249fe 100644
--- a/keyboards/bioi/g60ble/config.h
+++ b/keyboards/bioi/g60ble/config.h
@@ -1,10 +1,5 @@
 #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
 /* key combination for magic key command */
 #define KEYBOARD_LOCK_ENABLE
 #define MAGIC_KEY_LOCK L
diff --git a/keyboards/bioi/g60ble/info.json b/keyboards/bioi/g60ble/info.json
index 1699f7275e..2d09fadff0 100644
--- a/keyboards/bioi/g60ble/info.json
+++ b/keyboards/bioi/g60ble/info.json
@@ -8,6 +8,24 @@
        "pid": "0x6080",
        "device_version": "0.0.1"
    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "backlight": true,
+        "rgblight": true,
+        "bluetooth": true
+    },
+    "build": {
+        "lto": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
    "matrix_pins": {
        "cols": ["F6", "F7", "B3", "C7", "C6", "B6", "B5", "D5", "B4", "D7", "D6", "D4", "D1", "D0"],
        "rows": ["E6", "B0", "F1", "F5", "F4"]
diff --git a/keyboards/bioi/g60ble/rules.mk b/keyboards/bioi/g60ble/rules.mk
index 6bfcc62d7e..c383c07aff 100644
--- a/keyboards/bioi/g60ble/rules.mk
+++ b/keyboards/bioi/g60ble/rules.mk
@@ -1,19 +1,5 @@
 # Processor frequency
 F_CPU = 8000000
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes     # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes      # Mouse keys
-EXTRAKEY_ENABLE = yes      # Audio control and System control
-CONSOLE_ENABLE = no        # Console for debug
-COMMAND_ENABLE = yes       # Commands for debug and configuration
-BACKLIGHT_ENABLE = yes     # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes
-LTO_ENABLE = yes
-BLUETOOTH_ENABLE = yes
 UART_DRIVER_REQUIRED = yes
 SRC += bluetooth_custom.c
diff --git a/keyboards/bioi/morgan65/config.h b/keyboards/bioi/morgan65/config.h
index 2e78cc2a3e..78f53856f7 100644
--- a/keyboards/bioi/morgan65/config.h
+++ b/keyboards/bioi/morgan65/config.h
@@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 #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
 /* key combination for magic key command */
 #define KEYBOARD_LOCK_ENABLE
 #define MAGIC_KEY_LOCK L
diff --git a/keyboards/bioi/morgan65/info.json b/keyboards/bioi/morgan65/info.json
index 6cf66b843a..8f83237f82 100644
--- a/keyboards/bioi/morgan65/info.json
+++ b/keyboards/bioi/morgan65/info.json
@@ -8,6 +8,24 @@
        "pid": "0x6581",
        "device_version": "0.0.1"
    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "command": true,
+        "backlight": true,
+        "rgblight": true,
+        "bluetooth": true
+    },
+    "build": {
+        "lto": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
    "matrix_pins": {
        "cols": ["F5", "F6", "F7", "C7", "B0", "B7", "B5", "D5", "B4", "D7", "D6", "D1", "D0", "B3"],
        "rows": ["E6", "C6", "F4", "B2", "D4"]
diff --git a/keyboards/bioi/morgan65/rules.mk b/keyboards/bioi/morgan65/rules.mk
index 3635daac6f..c383c07aff 100644
--- a/keyboards/bioi/morgan65/rules.mk
+++ b/keyboards/bioi/morgan65/rules.mk
@@ -1,19 +1,5 @@
 # Processor frequency
 F_CPU = 8000000
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-LTO_ENABLE = yes            # Reduce firmware size
-BLUETOOTH_ENABLE = yes
 UART_DRIVER_REQUIRED = yes
 SRC += bluetooth_custom.c
diff --git a/keyboards/bioi/s65/config.h b/keyboards/bioi/s65/config.h
index 8134bd96cf..9f005f2d79 100644
--- a/keyboards/bioi/s65/config.h
+++ b/keyboards/bioi/s65/config.h
@@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 #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
 /* key combination for magic key command */
 #define KEYBOARD_LOCK_ENABLE
 #define MAGIC_KEY_LOCK L
diff --git a/keyboards/bioi/s65/keyboard.json b/keyboards/bioi/s65/keyboard.json
index b34cd9e602..c55852f31c 100644
--- a/keyboards/bioi/s65/keyboard.json
+++ b/keyboards/bioi/s65/keyboard.json
@@ -20,6 +20,12 @@
        "nkro": true,
        "rgblight": true
    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
    "matrix_pins": {
        "cols": ["F1", "B3", "F4", "F5", "F6", "E6", "C7", "B2", "B1", "C6", "B6", "B5", "B4", "D7", "D4", "D5"],
        "rows": ["D2", "D0", "D1", "F7", "D6"]
diff --git a/keyboards/blackplum/config.h b/keyboards/blackplum/config.h
deleted file mode 100644
index 5f36081323..0000000000
--- a/keyboards/blackplum/config.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#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/blackplum/keyboard.json b/keyboards/blackplum/keyboard.json
index d17bc37832..277e0eae62 100644
--- a/keyboards/blackplum/keyboard.json
+++ b/keyboards/blackplum/keyboard.json
@@ -39,6 +39,12 @@
        "nkro": true,
        "rgblight": true
    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
    "matrix_pins": {
        "cols": ["D0", "D1", "D2", "F7", "F6", "F5", "F4", "F1"],
        "rows": ["C6", "B6", "B4", "B5", "D6", "D7", "D5", "D3", "D4"]
diff --git a/keyboards/blank/blank01/config.h b/keyboards/blank/blank01/config.h
deleted file mode 100644
index aea945a035..0000000000
--- a/keyboards/blank/blank01/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2021 gkeyboard
-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
-/* 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
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-/* disable debug print */
-//#define NO_DEBUG
-/* disable print */
-//#define NO_PRINT
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/blank/blank01/keyboard.json b/keyboards/blank/blank01/keyboard.json
index 5dfa7e67ec..f8af736bef 100644
--- a/keyboards/blank/blank01/keyboard.json
+++ b/keyboards/blank/blank01/keyboard.json
@@ -16,6 +16,12 @@
        "mousekey": true,
        "nkro": true
    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
    "matrix_pins": {
        "cols": ["D5", "D4", "D6", "D7", "B5", "B4", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"],
        "rows": ["D0", "D1", "D2", "D3", "B3"]
diff --git a/keyboards/blank_tehnologii/manibus/info.json b/keyboards/blank_tehnologii/manibus/keyboard.json
index 7e783c45b5..f6cd41758d 100644
--- a/keyboards/blank_tehnologii/manibus/info.json
+++ b/keyboards/blank_tehnologii/manibus/keyboard.json
@@ -9,12 +9,21 @@
        "pid": "0x4D4E",
        "device_version": "1.0.0"
    },
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "nkro": true
+    },
    "matrix_pins": {
        "cols": ["D7", "B4", "B5", "B6", "F0", "D4", "D6"],
        "rows": ["F4", "F5", "F6", "D3", "C6"]
    },
    "diode_direction": "COL2ROW",
    "split": {
+        "enabled": true,
        "soft_serial_pin": "D0",
        "matrix_pins": {
            "right": {
diff --git a/keyboards/blank_tehnologii/manibus/rules.mk b/keyboards/blank_tehnologii/manibus/rules.mk
deleted file mode 100644
index 1321ae0d17..0000000000
--- a/keyboards/blank_tehnologii/manibus/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # 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       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/blockey/config.h b/keyboards/blockey/config.h
deleted file mode 100644
index a93b381c85..0000000000
--- a/keyboards/blockey/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2018 Eucalyn
-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
-/* 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
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-/* disable debug print */
-//#define NO_DEBUG
-/* disable print */
-//#define NO_PRINT
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/blockey/keyboard.json b/keyboards/blockey/keyboard.json
index 0c150420dc..9710606a52 100644
--- a/keyboards/blockey/keyboard.json
+++ b/keyboards/blockey/keyboard.json
@@ -36,6 +36,12 @@
    "nkro": false,
    "rgblight": true
  },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
  "matrix_pins": {
    "cols": ["D0", "B4", "C6", "D7", "F4", "F5", "F7"],
    "rows": ["D3", "D1", "D4", "E6", "B5", "D2", "F6", "B3", "B2", "B6"]
diff --git a/keyboards/bluebell/swoop/info.json b/keyboards/bluebell/swoop/keyboard.json
index 52c859c154..5cc29818b8 100644
--- a/keyboards/bluebell/swoop/info.json
+++ b/keyboards/bluebell/swoop/keyboard.json
@@ -8,6 +8,12 @@
    "pid": "0x3046",
    "device_version": "1.0.0"
  },
+  "features": {
+    "bootmagic": true,
+    "mousekey": true,
+    "extrakey": true,
+    "rgblight": true
+  },
  "ws2812": {
    "pin": "D3"
  },
@@ -35,6 +41,7 @@
    ]
  },
  "split": {
+    "enabled": true,
    "soft_serial_pin": "D2",
    "encoder": {
      "right": {
diff --git a/keyboards/bluebell/swoop/rules.mk b/keyboards/bluebell/swoop/rules.mk
deleted file mode 100644
index fc87c61404..0000000000
--- a/keyboards/bluebell/swoop/rules.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-RGBLIGHT_ENABLE = yes       # Enable underlight
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/boardrun/bizarre/config.h b/keyboards/boardrun/bizarre/config.h
deleted file mode 100644
index 1b4e5a6d87..0000000000
--- a/keyboards/boardrun/bizarre/config.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-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
-/* 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
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-/* disable debug print */
-//#define NO_DEBUG
-/* disable print */
-//#define NO_PRINT
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/boardrun/bizarre/keyboard.json b/keyboards/boardrun/bizarre/keyboard.json
index 6901f93625..f61f3b053f 100644
--- a/keyboards/boardrun/bizarre/keyboard.json
+++ b/keyboards/boardrun/bizarre/keyboard.json
@@ -39,6 +39,12 @@
        "nkro": true,
        "rgblight": true
    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
    "matrix_pins": {
        "cols": ["F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0", "B3", "B2", "B1"],
        "rows": ["F0", "F1", "F4", "F5", "F6"]
diff --git a/keyboards/boardrun/classic/config.h b/keyboards/boardrun/classic/config.h
deleted file mode 100644
index 1b4e5a6d87..0000000000
--- a/keyboards/boardrun/classic/config.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-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
-/* 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
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-/* disable debug print */
-//#define NO_DEBUG
-/* disable print */
-//#define NO_PRINT
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/boardrun/classic/keyboard.json b/keyboards/boardrun/classic/keyboard.json
index cd83ef58f0..4831131f18 100644
--- a/keyboards/boardrun/classic/keyboard.json
+++ b/keyboards/boardrun/classic/keyboard.json
@@ -39,6 +39,12 @@
        "nkro": true,
        "rgblight": true
    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
    "matrix_pins": {
        "cols": ["F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0", "B3", "B2", "B1"],
        "rows": ["F0", "F1", "F4", "F5", "F6"]
diff --git a/keyboards/boardsource/equals/48/info.json b/keyboards/boardsource/equals/48/info.json
index 054779f6fe..5b63355931 100644
--- a/keyboards/boardsource/equals/48/info.json
+++ b/keyboards/boardsource/equals/48/info.json
@@ -3,7 +3,8 @@
    "bootloader": "rp2040",
    "processor": "RP2040",
    "features": {
-        "audio":true
+        "audio":true,
+        "quantum_painter": true
    },
    "matrix_pins": {
        "cols": ["GP0", "GP1", "GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11"],
diff --git a/keyboards/boardsource/equals/48/rules.mk b/keyboards/boardsource/equals/48/rules.mk
index 4192b0c2e5..2f75fc139f 100644
--- a/keyboards/boardsource/equals/48/rules.mk
+++ b/keyboards/boardsource/equals/48/rules.mk
@@ -1,3 +1,2 @@
 AUDIO_DRIVER = pwm_hardware
-QUANTUM_PAINTER_ENABLE = yes
 QUANTUM_PAINTER_DRIVERS += st7735_spi
diff --git a/keyboards/boardsource/equals/60/info.json b/keyboards/boardsource/equals/60/info.json
index da3fc3691a..3bc1f49be3 100644
--- a/keyboards/boardsource/equals/60/info.json
+++ b/keyboards/boardsource/equals/60/info.json
@@ -3,7 +3,8 @@
    "bootloader": "rp2040",
    "processor": "RP2040",
    "features": {
-        "audio":true
+        "audio":true,
+        "quantum_painter": true
    },
    "matrix_pins": {
        "cols": ["GP0", "GP1", "GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11"],
diff --git a/keyboards/boardsource/equals/60/rules.mk b/keyboards/boardsource/equals/60/rules.mk
index 4192b0c2e5..2f75fc139f 100644
--- a/keyboards/boardsource/equals/60/rules.mk
+++ b/keyboards/boardsource/equals/60/rules.mk
@@ -1,3 +1,2 @@
 AUDIO_DRIVER = pwm_hardware
-QUANTUM_PAINTER_ENABLE = yes
 QUANTUM_PAINTER_DRIVERS += st7735_spi
diff --git a/keyboards/boardwalk/config.h b/keyboards/boardwalk/config.h
deleted file mode 100644
index 1b4e5a6d87..0000000000
--- a/keyboards/boardwalk/config.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-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
-/* 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
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-/* disable debug print */
-//#define NO_DEBUG
-/* disable print */
-//#define NO_PRINT
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/boardwalk/keyboard.json b/keyboards/boardwalk/keyboard.json
index 8c4ad37eb0..6fb7673ec8 100644
--- a/keyboards/boardwalk/keyboard.json
+++ b/keyboards/boardwalk/keyboard.json
@@ -39,6 +39,12 @@
        "rgblight": true,
        "unicode": true
    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
    "matrix_pins": {
        "cols": ["F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"],
        "rows": ["F0", "F1", "F4", "F5", "F6"]
diff --git a/keyboards/bop/config.h b/keyboards/bop/config.h
index 7d7310ec0e..e80e499439 100644
--- a/keyboards/bop/config.h
+++ b/keyboards/bop/config.h
@@ -16,11 +16,5 @@
 #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
 /* Unicode select mode */
 #define UNICODE_SELECTED_MODES UNICODE_MODE_MACOS, UNICODE_MODE_LINUX, UNICODE_MODE_WINCOMPOSE
diff --git a/keyboards/bop/keyboard.json b/keyboards/bop/keyboard.json
index 81bbbf33f0..6a88bb4617 100644
--- a/keyboards/bop/keyboard.json
+++ b/keyboards/bop/keyboard.json
@@ -16,6 +16,12 @@
        "mousekey": true,
        "nkro": true
    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
    "matrix_pins": {
        "cols": ["D5", "C5", "B0", "B1", "B2", "B3", "B4", "B5", "B6", "E7", "E6", "F0", "F7", "F6", "F5", "F4", "F3", "F2", "F1", "C6"],
        "rows": ["B7", "D0", "D1", "D2", "D3", "D4"]
diff --git a/keyboards/boston/config.h b/keyboards/boston/config.h
index 483c57940c..aad033d221 100644
--- a/keyboards/boston/config.h
+++ b/keyboards/boston/config.h
@@ -20,11 +20,6 @@
 #define BACKLIGHT_PWM_CHANNEL 1
 #define BACKLIGHT_PAL_MODE 1
-/* 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
 #define RGBLIGHT_LAYERS
 //The 3D-printed version of Boston uses APA106 LEDs, which are reversed
diff --git a/keyboards/boston/keyboard.json b/keyboards/boston/keyboard.json
index 1960df6d45..050076c7a6 100644
--- a/keyboards/boston/keyboard.json
+++ b/keyboards/boston/keyboard.json
@@ -30,7 +30,11 @@
        ]
    },
    "qmk": {
-        "tap_keycode_delay": 15
+        "tap_keycode_delay": 15,
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
    },
    "backlight": {
        "pin": "A6",
diff --git a/keyboards/boston_meetup/2019/info.json b/keyboards/boston_meetup/2019/info.json
index 981d4de7c8..5ced95c018 100644
--- a/keyboards/boston_meetup/2019/info.json
+++ b/keyboards/boston_meetup/2019/info.json
@@ -2,6 +2,15 @@
    "usb": {
        "device_version": "20.1.9"
    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "audio": true,
+        "haptic": true,
+        "oled": true
+    },
    "rgb_matrix": {
        "driver": "ws2812"
    },
diff --git a/keyboards/boston_meetup/2019/rules.mk b/keyboards/boston_meetup/2019/rules.mk
index f5ef6ba5a2..dea510c2ab 100644
--- a/keyboards/boston_meetup/2019/rules.mk
+++ b/keyboards/boston_meetup/2019/rules.mk
@@ -1,16 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-AUDIO_ENABLE = yes          # Audio output
-RGBLIGHT_ENABLE = no
-RGB_MATRIX_ENABLE = no
-HAPTIC_ENABLE = yes
 HAPTIC_DRIVER = drv2605l
-OLED_ENABLE = yes
diff --git a/keyboards/box75/config.h b/keyboards/box75/config.h
deleted file mode 100644
index f608132b5a..0000000000
--- a/keyboards/box75/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2015 Álvaro "Gondolindrim" Volpato  <gondolindrim@acheronproject.com>
-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
-/* 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
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-/* disable debug print */
-//#define NO_DEBUG
-/* disable print */
-//#define NO_PRINT
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/box75/keyboard.json b/keyboards/box75/keyboard.json
index 8932f81ae7..89afff1716 100644
--- a/keyboards/box75/keyboard.json
+++ b/keyboards/box75/keyboard.json
@@ -16,6 +16,12 @@
        "mousekey": true,
        "nkro": true
    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
    "matrix_pins": {
        "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A8", "B15", "B14", "B13", "A15"],
        "rows": ["A10", "A9", "B12", "A2", "A1", "A0"]
diff --git a/keyboards/bpiphany/four_banger/config.h b/keyboards/bpiphany/four_banger/config.h
deleted file mode 100644
index 5f36081323..0000000000
--- a/keyboards/bpiphany/four_banger/config.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#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/bpiphany/four_banger/keyboard.json b/keyboards/bpiphany/four_banger/keyboard.json
index 2462050684..a368fbfe61 100644
--- a/keyboards/bpiphany/four_banger/keyboard.json
+++ b/keyboards/bpiphany/four_banger/keyboard.json
@@ -37,6 +37,12 @@
        "nkro": true,
        "rgblight": true
    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
    "matrix_pins": {
        "cols": ["B5", "B4"],
        "rows": ["B2", "B6"]
diff --git a/keyboards/bpiphany/frosty_flake/config.h b/keyboards/bpiphany/frosty_flake/config.h
index 8a895c3e50..37c868b47f 100644
--- a/keyboards/bpiphany/frosty_flake/config.h
+++ b/keyboards/bpiphany/frosty_flake/config.h
@@ -38,11 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COL_PINS { B0, B3, B2, B1, B6, B4, B5, C7 }
 #define MATRIX_ROW_PINS { NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN }
-/* 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
 /*
 * Feature disable options
 *  These options are also useful to firmware size reduction.
diff --git a/keyboards/bpiphany/frosty_flake/info.json b/keyboards/bpiphany/frosty_flake/info.json
index 95fbd477eb..33a2f792d9 100644
--- a/keyboards/bpiphany/frosty_flake/info.json
+++ b/keyboards/bpiphany/frosty_flake/info.json
@@ -8,6 +8,12 @@
    "pid": "0x6060",
    "device_version": "0.0.1"
  },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
  "processor": "atmega32u2",
  "bootloader": "atmel-dfu",
  "dynamic_keymap": {
diff --git a/keyboards/bpiphany/ghost_squid/info.json b/keyboards/bpiphany/ghost_squid/info.json
index 49b6e10309..85f6f0fa8e 100644
--- a/keyboards/bpiphany/ghost_squid/info.json
+++ b/keyboards/bpiphany/ghost_squid/info.json
@@ -8,6 +8,11 @@
        "pid": "0x6050",
        "device_version": "1.0.4"
    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true
+    },
    "indicators": {
        "caps_lock": "C6",
        "num_lock": "C5",
diff --git a/keyboards/bpiphany/ghost_squid/rules.mk b/keyboards/bpiphany/ghost_squid/rules.mk
index 2f6a5a7346..30ce5d293b 100644
--- a/keyboards/bpiphany/ghost_squid/rules.mk
+++ b/keyboards/bpiphany/ghost_squid/rules.mk
@@ -1,14 +1,2 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
 CUSTOM_MATRIX = lite
 SRC += matrix.c
diff --git a/keyboards/bpiphany/hid_liber/config.h b/keyboards/bpiphany/hid_liber/config.h
index 2e41e1f700..8ba4e7c73b 100755
--- a/keyboards/bpiphany/hid_liber/config.h
+++ b/keyboards/bpiphany/hid_liber/config.h
@@ -24,11 +24,6 @@
 // HID Liberation Device uses custom matrix code to accomodate a 74HC238 3 to 8 decoder on pins B1, B2 and B3.
-/* 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
 /*
 * Feature disable options
 *  These options are also useful to firmware size reduction.
diff --git a/keyboards/bpiphany/hid_liber/info.json b/keyboards/bpiphany/hid_liber/info.json
index 82fd77781a..67c8416849 100644
--- a/keyboards/bpiphany/hid_liber/info.json
+++ b/keyboards/bpiphany/hid_liber/info.json
@@ -8,6 +8,20 @@
        "pid": "0xB919",
        "device_version": "0.0.1"
    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "nkro": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
    "indicators": {
        "caps_lock": "B5",
        "scroll_lock": "B6",
diff --git a/keyboards/bpiphany/hid_liber/rules.mk b/keyboards/bpiphany/hid_liber/rules.mk
index fc98be5c12..1b9ebdb131 100755
--- a/keyboards/bpiphany/hid_liber/rules.mk
+++ b/keyboards/bpiphany/hid_liber/rules.mk
@@ -1,16 +1,4 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
 CUSTOM_MATRIX = yes         # Custom matrix file
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. Do not enable this with audio at the same time.
-AUDIO_ENABLE = no           # Audio output
 # Project specific files
 SRC = matrix.c
diff --git a/keyboards/bpiphany/kitten_paw/config.h b/keyboards/bpiphany/kitten_paw/config.h
index 0d23223dc9..3b934626f3 100644
--- a/keyboards/bpiphany/kitten_paw/config.h
+++ b/keyboards/bpiphany/kitten_paw/config.h
@@ -22,11 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 18
-/* 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
 /*
 * Feature disable options
 *  These options are also useful to firmware size reduction.
diff --git a/keyboards/bpiphany/kitten_paw/info.json b/keyboards/bpiphany/kitten_paw/info.json
index 64a38a6e56..829129d406 100644
--- a/keyboards/bpiphany/kitten_paw/info.json
+++ b/keyboards/bpiphany/kitten_paw/info.json
@@ -8,6 +8,19 @@
    "pid": "0x6050",
    "device_version": "1.0.4"
  },
+  "features": {
+    "bootmagic": false,
+    "mousekey": true,
+    "extrakey": true,
+    "console": true,
+    "command": true
+  },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
  "indicators": {
    "caps_lock": "C6",
    "num_lock": "B7",
diff --git a/keyboards/bpiphany/kitten_paw/rules.mk b/keyboards/bpiphany/kitten_paw/rules.mk
index 43ebddd357..8784813b33 100644
--- a/keyboards/bpiphany/kitten_paw/rules.mk
+++ b/keyboards/bpiphany/kitten_paw/rules.mk
@@ -1,14 +1,2 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
 CUSTOM_MATRIX = yes
 SRC += matrix.c
diff --git a/keyboards/bpiphany/tiger_lily/config.h b/keyboards/bpiphany/tiger_lily/config.h
index cb63e867fc..c6817a8944 100644
--- a/keyboards/bpiphany/tiger_lily/config.h
+++ b/keyboards/bpiphany/tiger_lily/config.h
@@ -38,11 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { C2, B3, B4, B2, B1, C7, B6, B5 }
 #define MATRIX_COL_PINS { NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN }
-/* 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
 /*
 * Feature disable options
 *  These options are also useful to firmware size reduction.
diff --git a/keyboards/bpiphany/tiger_lily/info.json b/keyboards/bpiphany/tiger_lily/info.json
index 659c6f3267..118f89f39d 100644
--- a/keyboards/bpiphany/tiger_lily/info.json
+++ b/keyboards/bpiphany/tiger_lily/info.json
@@ -8,6 +8,19 @@
    "pid": "0x544C",
    "device_version": "0.0.1"
  },
+  "features": {
+    "bootmagic": false,
+    "mousekey": true,
+    "extrakey": true,
+    "console": true,
+    "command": true
+  },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
  "indicators": {
    "caps_lock": "C6",
    "num_lock": "C5",
diff --git a/keyboards/bpiphany/tiger_lily/rules.mk b/keyboards/bpiphany/tiger_lily/rules.mk
index 43ebddd357..8784813b33 100644
--- a/keyboards/bpiphany/tiger_lily/rules.mk
+++ b/keyboards/bpiphany/tiger_lily/rules.mk
@@ -1,14 +1,2 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
 CUSTOM_MATRIX = yes
 SRC += matrix.c
diff --git a/keyboards/bpiphany/unloved_bastard/config.h b/keyboards/bpiphany/unloved_bastard/config.h
index af21267357..55322288ac 100644
--- a/keyboards/bpiphany/unloved_bastard/config.h
+++ b/keyboards/bpiphany/unloved_bastard/config.h
@@ -22,11 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 18
-/* 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
 /*
 * Feature disable options
 *  These options are also useful to firmware size reduction.
diff --git a/keyboards/bpiphany/unloved_bastard/info.json b/keyboards/bpiphany/unloved_bastard/info.json
index 4ca48fee99..4748057175 100644
--- a/keyboards/bpiphany/unloved_bastard/info.json
+++ b/keyboards/bpiphany/unloved_bastard/info.json
@@ -7,6 +7,20 @@
    "pid": "0x1337",
    "device_version": "0.0.1"
  },
+  "features": {
+    "bootmagic": true,
+    "mousekey": true,
+    "extrakey": true,
+    "console": true,
+    "command": true,
+    "sleep_led": true
+  },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
  "indicators": {
    "caps_lock": "C5",
    "num_lock": "B7",
diff --git a/keyboards/bpiphany/unloved_bastard/rules.mk b/keyboards/bpiphany/unloved_bastard/rules.mk
index 7a32c86032..8784813b33 100644
--- a/keyboards/bpiphany/unloved_bastard/rules.mk
+++ b/keyboards/bpiphany/unloved_bastard/rules.mk
@@ -1,15 +1,2 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-SLEEP_LED_ENABLE = yes
 CUSTOM_MATRIX = yes
 SRC += matrix.c
diff --git a/keyboards/bt66tech/bt66tech60/config.h b/keyboards/bt66tech/bt66tech60/config.h
index b49e0a11cd..d7ce751a64 100644
--- a/keyboards/bt66tech/bt66tech60/config.h
+++ b/keyboards/bt66tech/bt66tech60/config.h
@@ -20,11 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_PWM_DRIVER PWMD1
 #define BACKLIGHT_PWM_CHANNEL 1
-/* 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
 #define WS2812_SPI_DRIVER SPID2
 #define WS2812_SPI_MOSI_PAL_MODE 5
 /*
diff --git a/keyboards/bt66tech/bt66tech60/keyboard.json b/keyboards/bt66tech/bt66tech60/keyboard.json
index f89440f695..26e4964d45 100644
--- a/keyboards/bt66tech/bt66tech60/keyboard.json
+++ b/keyboards/bt66tech/bt66tech60/keyboard.json
@@ -20,6 +20,12 @@
        "rgblight": true,
        "sleep_led": true
    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
    "matrix_pins": {
        "cols": ["B9", "B8", "B7", "B6", "B5", "B4", "B3", "B11", "A15", "A10", "A9", "B14", "B13", "B12"],
        "rows": ["B10", "B1", "B0", "A7", "A6"]
diff --git a/keyboards/bubble75/hotswap/config.h b/keyboards/bubble75/hotswap/config.h
deleted file mode 100644
index de1b75d0d6..0000000000
--- a/keyboards/bubble75/hotswap/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2022 Velocifire
- *
- * 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
-/* 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/bubble75/hotswap/hotswap.c b/keyboards/bubble75/hotswap/hotswap.c
index 30c908a79f..fc10b0fc8c 100644
--- a/keyboards/bubble75/hotswap/hotswap.c
+++ b/keyboards/bubble75/hotswap/hotswap.c
@@ -17,34 +17,6 @@
 #include "quantum.h"
 #ifdef RGB_MATRIX_ENABLE
-led_config_t g_led_config = {
-  {
-    /* Key Matrix to LED Index */
-    { 0,  1,  2,  3,  4,  5,  6,  7,  8,  9,  10, 11, 12, NO_LED, 13 },
-    { 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14 },
-    { 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43 },
-    { 57, 56, 55, 54, 53, 52, 51, 50, 49, 48, 47, 46, 45, NO_LED, 44 },
-    { 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, NO_LED, 70, 71 },
-    { 80, 79, 78, NO_LED, NO_LED, 77, NO_LED, NO_LED, 76, 75, NO_LED, 74, NO_LED, 73, 72 }
-  }, {
-    /* LED Index to Physical Position */
-    // Switch LEDs
-    {0,0},     {23,0},    {38,0},    {54,0},    {69,0},    {75,0},    {90,0},    {105,0},   {120,0},  {143,0},  {158,0},  {173,0},  {188,0},            {225,0},
-    {225,18},  {203,18},  {180,18},  {165,18},  {150,18},  {135,18},  {120,18},  {105,18},  {90,18},  {75,18},  {60,18},  {45,18},  {30,18},  {15,18},  {0,18},
-    {4,30},    {19,30},   {34,30},   {49,30},   {64,30},   {79,30},   {84,30},   {99,30},   {114,30}, {129,30}, {144,30}, {159,30}, {174,30}, {219,30}, {225,30},
-    {225,41},     {201,41},    {191,41},    {161,41},  {146,41},  {131,41},  {116,41},  {101,41}, {86,41}, {71,41}, {56,41}, {41,41}, {26,41}, {6,41},
-    {13,52},   {34,52},   {49,52},   {64,52},   {79,52},   {94,52},   {109,52},  {124,52},  {139,52}, {154,52}, {169,52},       {189,52},     {210,52}, {225,52},
-    {225,64},  {210,64},  {195,64},      {186,64},    {167,64},                     {94,64},                           {39,64},         {21,64},        {2,64},
-  }, {
-    4,4,4,4,4,4,4,4,4,4,4,4,  4,4,
-    4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
-    4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
-    4,4,4,4,4,4,4,4,4,4,4,4,4,  4,
-    4,4,4,4,4,4,4,4,4,4,4,4,  4,4,
-    4,4,4,    4,    4,4,  4,  4,4,
-  }
-};
 bool rgb_matrix_indicators_kb(void) {
    if (!rgb_matrix_indicators_user()) {
        return false;
@@ -54,6 +26,4 @@ bool rgb_matrix_indicators_kb(void) {
    }
   return true;
 }
 #endif
diff --git a/keyboards/bubble75/hotswap/info.json b/keyboards/bubble75/hotswap/keyboard.json
index 99cfc4064e..011ce33ec4 100644
--- a/keyboards/bubble75/hotswap/info.json
+++ b/keyboards/bubble75/hotswap/keyboard.json
@@ -7,7 +7,21 @@
        "vid": "0x4242",
        "pid": "0x5A4C",
        "device_version": "0.0.1",
-        "force_nkro": true
+        "force_nkro": true,
+        "no_startup_check": true
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
    },
    "ws2812": {
        "pin": "B7"
@@ -42,7 +56,90 @@
            "solid_multisplash": true
        },
        "driver": "ws2812",
-        "max_brightness": 180
+        "max_brightness": 180,
+        "layout": [
+            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4},
+            {"matrix": [0, 1], "x": 23, "y": 0, "flags": 4},
+            {"matrix": [0, 2], "x": 38, "y": 0, "flags": 4},
+            {"matrix": [0, 3], "x": 54, "y": 0, "flags": 4},
+            {"matrix": [0, 4], "x": 69, "y": 0, "flags": 4},
+            {"matrix": [0, 5], "x": 75, "y": 0, "flags": 4},
+            {"matrix": [0, 6], "x": 90, "y": 0, "flags": 4},
+            {"matrix": [0, 7], "x": 105, "y": 0, "flags": 4},
+            {"matrix": [0, 8], "x": 120, "y": 0, "flags": 4},
+            {"matrix": [0, 9], "x": 143, "y": 0, "flags": 4},
+            {"matrix": [0, 10], "x": 158, "y": 0, "flags": 4},
+            {"matrix": [0, 11], "x": 173, "y": 0, "flags": 4},
+            {"matrix": [0, 12], "x": 188, "y": 0, "flags": 4},
+            {"matrix": [0, 14], "x": 225, "y": 0, "flags": 4},
+            {"matrix": [1, 14], "x": 225, "y": 18, "flags": 4},
+            {"matrix": [1, 13], "x": 203, "y": 18, "flags": 4},
+            {"matrix": [1, 12], "x": 180, "y": 18, "flags": 4},
+            {"matrix": [1, 11], "x": 165, "y": 18, "flags": 4},
+            {"matrix": [1, 10], "x": 150, "y": 18, "flags": 4},
+            {"matrix": [1, 9], "x": 135, "y": 18, "flags": 4},
+            {"matrix": [1, 8], "x": 120, "y": 18, "flags": 4},
+            {"matrix": [1, 7], "x": 105, "y": 18, "flags": 4},
+            {"matrix": [1, 6], "x": 90, "y": 18, "flags": 4},
+            {"matrix": [1, 5], "x": 75, "y": 18, "flags": 4},
+            {"matrix": [1, 4], "x": 60, "y": 18, "flags": 4},
+            {"matrix": [1, 3], "x": 45, "y": 18, "flags": 4},
+            {"matrix": [1, 2], "x": 30, "y": 18, "flags": 4},
+            {"matrix": [1, 1], "x": 15, "y": 18, "flags": 4},
+            {"matrix": [1, 0], "x": 0, "y": 18, "flags": 4},
+            {"matrix": [2, 0], "x": 4, "y": 30, "flags": 4},
+            {"matrix": [2, 1], "x": 19, "y": 30, "flags": 4},
+            {"matrix": [2, 2], "x": 34, "y": 30, "flags": 4},
+            {"matrix": [2, 3], "x": 49, "y": 30, "flags": 4},
+            {"matrix": [2, 4], "x": 64, "y": 30, "flags": 4},
+            {"matrix": [2, 5], "x": 79, "y": 30, "flags": 4},
+            {"matrix": [2, 6], "x": 84, "y": 30, "flags": 4},
+            {"matrix": [2, 7], "x": 99, "y": 30, "flags": 4},
+            {"matrix": [2, 8], "x": 114, "y": 30, "flags": 4},
+            {"matrix": [2, 9], "x": 129, "y": 30, "flags": 4},
+            {"matrix": [2, 10], "x": 144, "y": 30, "flags": 4},
+            {"matrix": [2, 11], "x": 159, "y": 30, "flags": 4},
+            {"matrix": [2, 12], "x": 174, "y": 30, "flags": 4},
+            {"matrix": [2, 13], "x": 219, "y": 30, "flags": 4},
+            {"matrix": [2, 14], "x": 225, "y": 30, "flags": 4},
+            {"matrix": [3, 14], "x": 225, "y": 41, "flags": 4},
+            {"matrix": [3, 12], "x": 201, "y": 41, "flags": 4},
+            {"matrix": [3, 11], "x": 191, "y": 41, "flags": 4},
+            {"matrix": [3, 10], "x": 161, "y": 41, "flags": 4},
+            {"matrix": [3, 9], "x": 146, "y": 41, "flags": 4},
+            {"matrix": [3, 8], "x": 131, "y": 41, "flags": 4},
+            {"matrix": [3, 7], "x": 116, "y": 41, "flags": 4},
+            {"matrix": [3, 6], "x": 101, "y": 41, "flags": 4},
+            {"matrix": [3, 5], "x": 86, "y": 41, "flags": 4},
+            {"matrix": [3, 4], "x": 71, "y": 41, "flags": 4},
+            {"matrix": [3, 3], "x": 56, "y": 41, "flags": 4},
+            {"matrix": [3, 2], "x": 41, "y": 41, "flags": 4},
+            {"matrix": [3, 1], "x": 26, "y": 41, "flags": 4},
+            {"matrix": [3, 0], "x": 6, "y": 41, "flags": 4},
+            {"matrix": [4, 0], "x": 13, "y": 52, "flags": 4},
+            {"matrix": [4, 1], "x": 34, "y": 52, "flags": 4},
+            {"matrix": [4, 2], "x": 49, "y": 52, "flags": 4},
+            {"matrix": [4, 3], "x": 64, "y": 52, "flags": 4},
+            {"matrix": [4, 4], "x": 79, "y": 52, "flags": 4},
+            {"matrix": [4, 5], "x": 94, "y": 52, "flags": 4},
+            {"matrix": [4, 6], "x": 109, "y": 52, "flags": 4},
+            {"matrix": [4, 7], "x": 124, "y": 52, "flags": 4},
+            {"matrix": [4, 8], "x": 139, "y": 52, "flags": 4},
+            {"matrix": [4, 9], "x": 154, "y": 52, "flags": 4},
+            {"matrix": [4, 10], "x": 169, "y": 52, "flags": 4},
+            {"matrix": [4, 11], "x": 189, "y": 52, "flags": 4},
+            {"matrix": [4, 13], "x": 210, "y": 52, "flags": 4},
+            {"matrix": [4, 14], "x": 225, "y": 52, "flags": 4},
+            {"matrix": [5, 14], "x": 225, "y": 64, "flags": 4},
+            {"matrix": [5, 13], "x": 210, "y": 64, "flags": 4},
+            {"matrix": [5, 11], "x": 195, "y": 64, "flags": 4},
+            {"matrix": [5, 9], "x": 186, "y": 64, "flags": 4},
+            {"matrix": [5, 8], "x": 167, "y": 64, "flags": 4},
+            {"matrix": [5, 5], "x": 94, "y": 64, "flags": 4},
+            {"matrix": [5, 2], "x": 39, "y": 64, "flags": 4},
+            {"matrix": [5, 1], "x": 21, "y": 64, "flags": 4},
+            {"matrix": [5, 0], "x": 2, "y": 64, "flags": 4}
+        ]
    },
    "matrix_pins": {
        "cols": ["B0", "B1", "B2", "B3", "E6", "F0", "D0", "D1", "D4", "D6", "D7", "B4", "B5", "B6", "C6"],
diff --git a/keyboards/bubble75/hotswap/rules.mk b/keyboards/bubble75/hotswap/rules.mk
deleted file mode 100644
index c11ab0df94..0000000000
--- a/keyboards/bubble75/hotswap/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-RGB_MATRIX_ENABLE = yes
-NO_USB_STARTUP_CHECK = yes
-\ No newline at end of file
diff --git a/keyboards/budgy/info.json b/keyboards/budgy/info.json
index 5903daa68d..645336e8ad 100644
--- a/keyboards/budgy/info.json
+++ b/keyboards/budgy/info.json
@@ -27,6 +27,7 @@
        ]
    },
    "split": {
+        "enabled": true,
        "matrix_pins": {
            "right": {
                "direct": [
diff --git a/keyboards/budgy/rules.mk b/keyboards/budgy/rules.mk
index 95546c6ef5..161ec22b16 100644
--- a/keyboards/budgy/rules.mk
+++ b/keyboards/budgy/rules.mk
@@ -1,2 +1 @@
-SPLIT_KEYBOARD = yes
 SERIAL_DRIVER = vendor
diff --git a/keyboards/buildakb/potato65/config.h b/keyboards/buildakb/potato65/config.h
deleted file mode 100644
index 5b25baa8c4..0000000000
--- a/keyboards/buildakb/potato65/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2021 Maelkk
-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
-/* 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
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-/* disable debug print */
-//#define NO_DEBUG
-/* disable print */
-//#define NO_PRINT
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/buildakb/potato65/keyboard.json b/keyboards/buildakb/potato65/keyboard.json
index 1aeba49bde..db20353142 100644
--- a/keyboards/buildakb/potato65/keyboard.json
+++ b/keyboards/buildakb/potato65/keyboard.json
@@ -39,6 +39,12 @@
        "nkro": false,
        "rgblight": true
    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
    "matrix_pins": {
        "cols": ["F6", "B0", "F1", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"],
        "rows": ["E6", "B7", "F7", "F4", "F5"]
diff --git a/keyboards/buildakb/potato65hs/config.h b/keyboards/buildakb/potato65hs/config.h
deleted file mode 100644
index d60fc7af01..0000000000
--- a/keyboards/buildakb/potato65hs/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-Copyright 2021 Maelkk
-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
-/* 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/buildakb/potato65hs/keyboard.json b/keyboards/buildakb/potato65hs/keyboard.json
index 61ecd61a15..9e5edd6adb 100644
--- a/keyboards/buildakb/potato65hs/keyboard.json
+++ b/keyboards/buildakb/potato65hs/keyboard.json
@@ -39,6 +39,12 @@
        "nkro": true,
        "rgblight": true
    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
    "matrix_pins": {
        "cols": ["D3", "D4", "D6", "D7", "B4", "B5", "B6", "F1", "B0", "B1", "B2", "B3", "B7", "D0", "D1"],
        "rows": ["F5", "F4", "F6", "F0", "D2"]
diff --git a/keyboards/buildakb/potato65s/config.h b/keyboards/buildakb/potato65s/config.h
deleted file mode 100644
index d60fc7af01..0000000000
--- a/keyboards/buildakb/potato65s/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-Copyright 2021 Maelkk
-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
-/* 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/buildakb/potato65s/keyboard.json b/keyboards/buildakb/potato65s/keyboard.json
index 915f967426..8dd9b6cc53 100644
--- a/keyboards/buildakb/potato65s/keyboard.json
+++ b/keyboards/buildakb/potato65s/keyboard.json
@@ -39,6 +39,12 @@
        "nkro": true,
        "rgblight": true
    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
    "matrix_pins": {
        "cols": ["D3", "D4", "D6", "D7", "B4", "B5", "B6", "F1", "B0", "B1", "B2", "B3", "B7", "D0", "D1"],
        "rows": ["F5", "F4", "F6", "F0", "D2"]
diff --git a/keyboards/buzzard/rev1/config.h b/keyboards/buzzard/rev1/config.h
index 36313a1c6a..a040e92dfd 100644
--- a/keyboards/buzzard/rev1/config.h
+++ b/keyboards/buzzard/rev1/config.h
@@ -3,11 +3,6 @@
 #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
 #ifdef OLED_ENABLE
 #define OLED_DISPLAY_128X32
 #endif
diff --git a/keyboards/buzzard/rev1/info.json b/keyboards/buzzard/rev1/info.json
index 0e7d246ae3..dd17a82754 100644
--- a/keyboards/buzzard/rev1/info.json
+++ b/keyboards/buzzard/rev1/info.json
@@ -8,12 +8,28 @@
        "pid": "0xB077",
        "device_version": "0.0.1"
    },
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "ps2": true
+    },
+    "build": {
+        "lto": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
    "matrix_pins": {
        "cols": ["B1", "B3", "B2", "B6", "B5", "B4"],
        "rows": ["F4", "F5", "F6", "F7"]
    },
    "diode_direction": "COL2ROW",
    "split": {
+        "enabled": true,
        "soft_serial_pin": "D2",
        "transport": {
            "sync": {
diff --git a/keyboards/buzzard/rev1/rules.mk b/keyboards/buzzard/rev1/rules.mk
index 2beb545ece..848877e375 100644
--- a/keyboards/buzzard/rev1/rules.mk
+++ b/keyboards/buzzard/rev1/rules.mk
@@ -1,2 +1 @@
-PS2_ENABLE = yes
 PS2_DRIVER = interrupt
diff --git a/keyboards/buzzard/rules.mk b/keyboards/buzzard/rules.mk
index c0b4e9943d..2f66720b77 100644
--- a/keyboards/buzzard/rules.mk
+++ b/keyboards/buzzard/rules.mk
@@ -1,16 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-SPLIT_KEYBOARD = yes
-LTO_ENABLE = yes
 DEFAULT_FOLDER = buzzard/rev1
author	James Young <18669334+noroadsleft@users.noreply.github.com>	2024-04-11 14:21:32 -0700
committer	GitHub <noreply@github.com>	2024-04-11 14:21:32 -0700
commit	cb81913d18fd567cb2dbadcd9a5c5c767f75ba60 (patch)
tree	35e62d69a2b1e79d41bff00d074057da46b60d10 /keyboards
parent	a532d1cc5a785da3d73812330aad95555efb81fa (diff)