From 43a122e050647057dbaa16bc50417b9306e00bcc Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Sat, 13 Apr 2024 06:31:34 +0100
Subject: [PATCH] Migrate build target markers to keyboard.json - W (#23511)

---
 .../waterfowl/{info.json => keyboard.json}    |  8 ++++
 keyboards/waterfowl/rules.mk                  | 15 -------
 keyboards/wekey/we27/config.h                 | 39 -------------------
 .../wekey/we27/{info.json => keyboard.json}   | 14 +++++++
 keyboards/wekey/we27/rules.mk                 | 15 -------
 keyboards/westm/westmergo/config.h            | 22 -----------
 .../westmergo/{info.json => keyboard.json}    | 15 +++++++
 keyboards/westm/westmergo/rules.mk            | 13 -------
 .../whale/sk/v3/{info.json => keyboard.json}  |  6 +++
 keyboards/whale/sk/v3/rules.mk                | 12 ------
 .../{info.json => keyboard.json}              |  6 +++
 keyboards/wilba_tech/rama_works_kara/rules.mk | 15 +------
 .../{info.json => keyboard.json}              |  6 +++
 keyboards/wilba_tech/rama_works_koyu/rules.mk | 15 +------
 .../{info.json => keyboard.json}              |  6 +++
 .../wilba_tech/rama_works_m10_c/rules.mk      | 18 ++-------
 .../{info.json => keyboard.json}              |  6 +++
 .../wilba_tech/rama_works_m50_a/rules.mk      | 18 ++-------
 .../{info.json => keyboard.json}              |  6 +++
 .../wilba_tech/rama_works_m60_a/rules.mk      | 15 +------
 .../{info.json => keyboard.json}              |  6 +++
 .../wilba_tech/rama_works_m65_b/rules.mk      | 18 ++-------
 .../{info.json => keyboard.json}              |  6 +++
 .../wilba_tech/rama_works_m65_bx/rules.mk     | 18 ++-------
 .../{info.json => keyboard.json}              |  6 +++
 keyboards/wilba_tech/rama_works_m6_a/rules.mk | 13 -------
 .../{info.json => keyboard.json}              |  6 +++
 keyboards/wilba_tech/rama_works_m6_b/rules.mk | 15 +------
 .../{info.json => keyboard.json}              |  6 +++
 .../wilba_tech/rama_works_u80_a/rules.mk      | 13 +------
 .../wt60_a/{info.json => keyboard.json}       |  6 +++
 keyboards/wilba_tech/wt60_a/rules.mk          | 13 +------
 .../wt60_b/{info.json => keyboard.json}       |  6 +++
 keyboards/wilba_tech/wt60_b/rules.mk          | 15 +------
 .../wt60_bx/{info.json => keyboard.json}      |  6 +++
 keyboards/wilba_tech/wt60_bx/rules.mk         | 15 +------
 .../wt60_c/{info.json => keyboard.json}       |  6 +++
 keyboards/wilba_tech/wt60_c/rules.mk          | 15 +------
 .../wt65_a/{info.json => keyboard.json}       |  6 +++
 keyboards/wilba_tech/wt65_a/rules.mk          | 13 +------
 .../wt65_b/{info.json => keyboard.json}       |  6 +++
 keyboards/wilba_tech/wt65_b/rules.mk          | 13 +------
 .../wt69_a/{info.json => keyboard.json}       |  6 +++
 keyboards/wilba_tech/wt69_a/rules.mk          | 12 ------
 .../wt75_a/{info.json => keyboard.json}       |  6 +++
 keyboards/wilba_tech/wt75_a/rules.mk          | 13 +------
 .../wt75_b/{info.json => keyboard.json}       |  6 +++
 keyboards/wilba_tech/wt75_b/rules.mk          | 13 +------
 .../wt75_c/{info.json => keyboard.json}       |  6 +++
 keyboards/wilba_tech/wt75_c/rules.mk          | 13 +------
 .../wt80_a/{info.json => keyboard.json}       |  6 +++
 keyboards/wilba_tech/wt80_a/rules.mk          | 13 +------
 keyboards/wilba_tech/wt80_bc/config.h         | 22 -----------
 .../wt80_bc/{info.json => keyboard.json}      | 12 ++++++
 keyboards/wilba_tech/wt80_bc/rules.mk         | 12 ------
 keyboards/wilba_tech/wt8_a/config.h           | 22 -----------
 .../wt8_a/{info.json => keyboard.json}        | 12 ++++++
 keyboards/wilba_tech/wt8_a/rules.mk           | 12 ------
 .../zeal60/{info.json => keyboard.json}       |  6 +++
 keyboards/wilba_tech/zeal60/rules.mk          | 15 +------
 .../zeal65/{info.json => keyboard.json}       |  6 +++
 keyboards/wilba_tech/zeal65/rules.mk          | 15 +------
 .../wolf/frogpad/{info.json => keyboard.json} |  0
 .../wolf/kuku65/{info.json => keyboard.json}  |  6 +++
 keyboards/wolf/kuku65/rules.mk                | 13 -------
 .../wolf/m60_b/{info.json => keyboard.json}   |  0
 .../wolf/m6_c/{info.json => keyboard.json}    |  0
 .../wolf/neely65/{info.json => keyboard.json} |  0
 .../wolf/ryujin/{info.json => keyboard.json}  |  6 +++
 keyboards/wolf/ryujin/rules.mk                | 13 -------
 .../wolf/sabre/{info.json => keyboard.json}   |  7 ++++
 keyboards/wolf/sabre/rules.mk                 | 14 -------
 .../wolf/ts60/{info.json => keyboard.json}    |  8 ++++
 keyboards/wolf/ts60/rules.mk                  | 13 -------
 keyboards/wolfmarkclub/wm1/config.h           | 39 -------------------
 .../wm1/{info.json => keyboard.json}          | 21 ++++++++++
 keyboards/wolfmarkclub/wm1/rules.mk           | 22 -----------
 .../micro/{info.json => keyboard.json}        |  0
 .../nano/{info.json => keyboard.json}         | 12 ++++++
 keyboards/work_louder/nano/rules.mk           | 17 --------
 .../numpad/{info.json => keyboard.json}       |  0
 keyboards/wren/config.h                       | 21 ----------
 keyboards/wren/{info.json => keyboard.json}   | 13 +++++++
 keyboards/wren/rules.mk                       | 13 -------
 .../creek70/{info.json => keyboard.json}      |  3 +-
 keyboards/wuque/creek70/rules.mk              |  1 -
 keyboards/wuque/ikki68_aurora/config.h        | 24 ------------
 .../{info.json => keyboard.json}              | 13 +++++++
 keyboards/wuque/ikki68_aurora/rules.mk        | 14 -------
 .../serneity65/{info.json => keyboard.json}   |  8 ++++
 keyboards/wuque/serneity65/rules.mk           | 15 -------
 91 files changed, 330 insertions(+), 711 deletions(-)
 rename keyboards/waterfowl/{info.json => keyboard.json} (94%)
 delete mode 100644 keyboards/waterfowl/rules.mk
 delete mode 100644 keyboards/wekey/we27/config.h
 rename keyboards/wekey/we27/{info.json => keyboard.json} (89%)
 delete mode 100644 keyboards/westm/westmergo/config.h
 rename keyboards/westm/westmergo/{info.json => keyboard.json} (93%)
 rename keyboards/whale/sk/v3/{info.json => keyboard.json} (98%)
 delete mode 100644 keyboards/whale/sk/v3/rules.mk
 rename keyboards/wilba_tech/rama_works_kara/{info.json => keyboard.json} (96%)
 rename keyboards/wilba_tech/rama_works_koyu/{info.json => keyboard.json} (97%)
 rename keyboards/wilba_tech/rama_works_m10_c/{info.json => keyboard.json} (91%)
 rename keyboards/wilba_tech/rama_works_m50_a/{info.json => keyboard.json} (96%)
 rename keyboards/wilba_tech/rama_works_m60_a/{info.json => keyboard.json} (96%)
 rename keyboards/wilba_tech/rama_works_m65_b/{info.json => keyboard.json} (97%)
 rename keyboards/wilba_tech/rama_works_m65_bx/{info.json => keyboard.json} (98%)
 rename keyboards/wilba_tech/rama_works_m6_a/{info.json => keyboard.json} (87%)
 rename keyboards/wilba_tech/rama_works_m6_b/{info.json => keyboard.json} (87%)
 rename keyboards/wilba_tech/rama_works_u80_a/{info.json => keyboard.json} (98%)
 rename keyboards/wilba_tech/wt60_a/{info.json => keyboard.json} (98%)
 rename keyboards/wilba_tech/wt60_b/{info.json => keyboard.json} (98%)
 rename keyboards/wilba_tech/wt60_bx/{info.json => keyboard.json} (99%)
 rename keyboards/wilba_tech/wt60_c/{info.json => keyboard.json} (99%)
 rename keyboards/wilba_tech/wt65_a/{info.json => keyboard.json} (99%)
 rename keyboards/wilba_tech/wt65_b/{info.json => keyboard.json} (98%)
 rename keyboards/wilba_tech/wt69_a/{info.json => keyboard.json} (98%)
 rename keyboards/wilba_tech/wt75_a/{info.json => keyboard.json} (99%)
 rename keyboards/wilba_tech/wt75_b/{info.json => keyboard.json} (99%)
 rename keyboards/wilba_tech/wt75_c/{info.json => keyboard.json} (99%)
 rename keyboards/wilba_tech/wt80_a/{info.json => keyboard.json} (98%)
 delete mode 100644 keyboards/wilba_tech/wt80_bc/config.h
 rename keyboards/wilba_tech/wt80_bc/{info.json => keyboard.json} (98%)
 delete mode 100644 keyboards/wilba_tech/wt8_a/config.h
 rename keyboards/wilba_tech/wt8_a/{info.json => keyboard.json} (80%)
 rename keyboards/wilba_tech/zeal60/{info.json => keyboard.json} (99%)
 rename keyboards/wilba_tech/zeal65/{info.json => keyboard.json} (98%)
 rename keyboards/wolf/frogpad/{info.json => keyboard.json} (100%)
 rename keyboards/wolf/kuku65/{info.json => keyboard.json} (97%)
 rename keyboards/wolf/m60_b/{info.json => keyboard.json} (100%)
 rename keyboards/wolf/m6_c/{info.json => keyboard.json} (100%)
 rename keyboards/wolf/neely65/{info.json => keyboard.json} (100%)
 rename keyboards/wolf/ryujin/{info.json => keyboard.json} (97%)
 rename keyboards/wolf/sabre/{info.json => keyboard.json} (97%)
 rename keyboards/wolf/ts60/{info.json => keyboard.json} (97%)
 delete mode 100644 keyboards/wolfmarkclub/wm1/config.h
 rename keyboards/wolfmarkclub/wm1/{info.json => keyboard.json} (91%)
 rename keyboards/work_louder/micro/{info.json => keyboard.json} (100%)
 rename keyboards/work_louder/nano/{info.json => keyboard.json} (91%)
 rename keyboards/work_louder/numpad/{info.json => keyboard.json} (100%)
 rename keyboards/wren/{info.json => keyboard.json} (95%)
 delete mode 100644 keyboards/wren/rules.mk
 rename keyboards/wuque/creek70/{info.json => keyboard.json} (99%)
 delete mode 100644 keyboards/wuque/creek70/rules.mk
 delete mode 100644 keyboards/wuque/ikki68_aurora/config.h
 rename keyboards/wuque/ikki68_aurora/{info.json => keyboard.json} (99%)
 delete mode 100644 keyboards/wuque/ikki68_aurora/rules.mk
 rename keyboards/wuque/serneity65/{info.json => keyboard.json} (99%)
 delete mode 100644 keyboards/wuque/serneity65/rules.mk

diff --git a/keyboards/waterfowl/info.json b/keyboards/waterfowl/keyboard.json
similarity index 94%
rename from keyboards/waterfowl/info.json
rename to keyboards/waterfowl/keyboard.json
index 92b4add8ea..a178313042 100644
--- a/keyboards/waterfowl/info.json
+++ b/keyboards/waterfowl/keyboard.json
@@ -8,6 +8,14 @@
         "pid": "0x9CE3",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "oled": true
+    },
     "matrix_pins": {
         "cols": ["F4", "F5", "F6", "F7", "B1"],
         "rows": ["D4", "C6", "D7", "E6"]
diff --git a/keyboards/waterfowl/rules.mk b/keyboards/waterfowl/rules.mk
deleted file mode 100644
index afab74111f..0000000000
--- a/keyboards/waterfowl/rules.mk
+++ /dev/null
@@ -1,15 +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 = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-OLED_ENABLE = yes        # Enables the use of OLED displays
-ENCODER_ENABLE = yes	 # Enables the encoders
diff --git a/keyboards/wekey/we27/config.h b/keyboards/wekey/we27/config.h
deleted file mode 100644
index c86ead57bd..0000000000
--- a/keyboards/wekey/we27/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2021 @wekey
-
-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/wekey/we27/info.json b/keyboards/wekey/we27/keyboard.json
similarity index 89%
rename from keyboards/wekey/we27/info.json
rename to keyboards/wekey/we27/keyboard.json
index 802ae8eed6..d8cb7b0f80 100644
--- a/keyboards/wekey/we27/info.json
+++ b/keyboards/wekey/we27/keyboard.json
@@ -8,6 +8,20 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "rgb_matrix": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "rgb_matrix": {
         "animations": {
             "rainbow_moving_chevron": true
diff --git a/keyboards/wekey/we27/rules.mk b/keyboards/wekey/we27/rules.mk
index 1c5cc136ca..942ef4c5db 100644
--- a/keyboards/wekey/we27/rules.mk
+++ b/keyboards/wekey/we27/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 = 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
-RGB_MATRIX_ENABLE = yes     # Use RGB matrix
-
 RGB_MATRIX_CUSTOM_KB = yes
diff --git a/keyboards/westm/westmergo/config.h b/keyboards/westm/westmergo/config.h
deleted file mode 100644
index 4e85b2e402..0000000000
--- a/keyboards/westm/westmergo/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2021 WestM
- *
- * 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/westm/westmergo/info.json b/keyboards/westm/westmergo/keyboard.json
similarity index 93%
rename from keyboards/westm/westmergo/info.json
rename to keyboards/westm/westmergo/keyboard.json
index de733b988a..0ead866202 100644
--- a/keyboards/westm/westmergo/info.json
+++ b/keyboards/westm/westmergo/keyboard.json
@@ -8,6 +8,21 @@
         "pid": "0x0201",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "command": true,
+        "console": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "rgblight": {
         "led_count": 16,
         "animations": {
diff --git a/keyboards/westm/westmergo/rules.mk b/keyboards/westm/westmergo/rules.mk
index aae254503b..0ab54aaaf7 100644
--- a/keyboards/westm/westmergo/rules.mk
+++ b/keyboards/westm/westmergo/rules.mk
@@ -1,15 +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 = 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 = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
\ No newline at end of file
diff --git a/keyboards/whale/sk/v3/info.json b/keyboards/whale/sk/v3/keyboard.json
similarity index 98%
rename from keyboards/whale/sk/v3/info.json
rename to keyboards/whale/sk/v3/keyboard.json
index a7751b1d06..ce73d8251c 100644
--- a/keyboards/whale/sk/v3/info.json
+++ b/keyboards/whale/sk/v3/keyboard.json
@@ -8,6 +8,12 @@
         "pid": "0x0495",
         "device_version": "0.0.3"
     },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    },
     "matrix_pins": {
         "cols": ["D4", "C6", "D7", "E6", "F4", "F5", "F6"],
         "rows": ["B1", "B2", "B3", "B4", "B5", "B6"]
diff --git a/keyboards/whale/sk/v3/rules.mk b/keyboards/whale/sk/v3/rules.mk
deleted file mode 100644
index ab2c49da70..0000000000
--- a/keyboards/whale/sk/v3/rules.mk
+++ /dev/null
@@ -1,12 +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
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/wilba_tech/rama_works_kara/info.json b/keyboards/wilba_tech/rama_works_kara/keyboard.json
similarity index 96%
rename from keyboards/wilba_tech/rama_works_kara/info.json
rename to keyboards/wilba_tech/rama_works_kara/keyboard.json
index d4a5d079b3..896892e284 100644
--- a/keyboards/wilba_tech/rama_works_kara/info.json
+++ b/keyboards/wilba_tech/rama_works_kara/keyboard.json
@@ -8,6 +8,12 @@
         "pid": "0x4B52",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true
+    },
     "matrix_pins": {
         "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"],
         "rows": ["F0", "F1", "F4", "F6", "F7"]
diff --git a/keyboards/wilba_tech/rama_works_kara/rules.mk b/keyboards/wilba_tech/rama_works_kara/rules.mk
index b49711824a..34e6eaa45b 100644
--- a/keyboards/wilba_tech/rama_works_kara/rules.mk
+++ b/keyboards/wilba_tech/rama_works_kara/rules.mk
@@ -3,24 +3,11 @@
 # backlight effects.
 OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
 
-# 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 = 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
-
 CIE1931_CURVE = yes
+I2C_DRIVER_REQUIRED = yes
 
 # project specific files
 SRC =	keyboards/wilba_tech/wt_main.c \
 		keyboards/wilba_tech/wt_rgb_backlight.c \
 		quantum/color.c \
 		drivers/led/issi/is31fl3731.c
-I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/wilba_tech/rama_works_koyu/info.json b/keyboards/wilba_tech/rama_works_koyu/keyboard.json
similarity index 97%
rename from keyboards/wilba_tech/rama_works_koyu/info.json
rename to keyboards/wilba_tech/rama_works_koyu/keyboard.json
index 6d3def254d..507b5e1546 100644
--- a/keyboards/wilba_tech/rama_works_koyu/info.json
+++ b/keyboards/wilba_tech/rama_works_koyu/keyboard.json
@@ -8,6 +8,12 @@
         "pid": "0x4B59",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true
+    },
     "matrix_pins": {
         "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
         "rows": ["F0", "F1", "F4", "F6", "F7"]
diff --git a/keyboards/wilba_tech/rama_works_koyu/rules.mk b/keyboards/wilba_tech/rama_works_koyu/rules.mk
index c921fc5c18..34e6eaa45b 100644
--- a/keyboards/wilba_tech/rama_works_koyu/rules.mk
+++ b/keyboards/wilba_tech/rama_works_koyu/rules.mk
@@ -3,24 +3,11 @@
 # backlight effects.
 OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
 
-# 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 = 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
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
-
 CIE1931_CURVE = yes
+I2C_DRIVER_REQUIRED = yes
 
 # project specific files
 SRC =	keyboards/wilba_tech/wt_main.c \
 		keyboards/wilba_tech/wt_rgb_backlight.c \
 		quantum/color.c \
 		drivers/led/issi/is31fl3731.c
-I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/wilba_tech/rama_works_m10_c/info.json b/keyboards/wilba_tech/rama_works_m10_c/keyboard.json
similarity index 91%
rename from keyboards/wilba_tech/rama_works_m10_c/info.json
rename to keyboards/wilba_tech/rama_works_m10_c/keyboard.json
index 3b75a67557..bba4720aa3 100644
--- a/keyboards/wilba_tech/rama_works_m10_c/info.json
+++ b/keyboards/wilba_tech/rama_works_m10_c/keyboard.json
@@ -8,6 +8,12 @@
     "pid": "0x00AC",
     "device_version": "0.0.1"
   },
+  "features": {
+    "bootmagic": true,
+    "extrakey": true,
+    "mousekey": false,
+    "nkro": true
+  },
   "matrix_pins": {
     "cols": ["D7", "B6", "F0", "D6", "B5", "F1", "D4", "B4", "F4", "F5"],
     "rows": ["E6"]
diff --git a/keyboards/wilba_tech/rama_works_m10_c/rules.mk b/keyboards/wilba_tech/rama_works_m10_c/rules.mk
index d8a2bae455..34e6eaa45b 100644
--- a/keyboards/wilba_tech/rama_works_m10_c/rules.mk
+++ b/keyboards/wilba_tech/rama_works_m10_c/rules.mk
@@ -1,25 +1,13 @@
-# 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 = 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
-CIE1931_CURVE = yes
-
 # Do not put the microcontroller into power saving mode
 # when we get USB suspend event. We want it to keep updating
 # backlight effects.
 OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
 
+CIE1931_CURVE = yes
+I2C_DRIVER_REQUIRED = yes
+
 # project specific files
 SRC =	keyboards/wilba_tech/wt_main.c \
 		keyboards/wilba_tech/wt_rgb_backlight.c \
 		quantum/color.c \
 		drivers/led/issi/is31fl3731.c
-I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/wilba_tech/rama_works_m50_a/info.json b/keyboards/wilba_tech/rama_works_m50_a/keyboard.json
similarity index 96%
rename from keyboards/wilba_tech/rama_works_m50_a/info.json
rename to keyboards/wilba_tech/rama_works_m50_a/keyboard.json
index 5745804c5d..bf33a12277 100644
--- a/keyboards/wilba_tech/rama_works_m50_a/info.json
+++ b/keyboards/wilba_tech/rama_works_m50_a/keyboard.json
@@ -8,6 +8,12 @@
         "pid": "0x050A",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true
+    },
     "matrix_pins": {
         "cols": ["F4", "B5", "C7", "C6", "B6", "B2", "B3", "B1", "B4", "D7", "D6", "D4", "D3"],
         "rows": ["F0", "F1", "F5", "F6"]
diff --git a/keyboards/wilba_tech/rama_works_m50_a/rules.mk b/keyboards/wilba_tech/rama_works_m50_a/rules.mk
index d8a2bae455..34e6eaa45b 100644
--- a/keyboards/wilba_tech/rama_works_m50_a/rules.mk
+++ b/keyboards/wilba_tech/rama_works_m50_a/rules.mk
@@ -1,25 +1,13 @@
-# 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 = 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
-CIE1931_CURVE = yes
-
 # Do not put the microcontroller into power saving mode
 # when we get USB suspend event. We want it to keep updating
 # backlight effects.
 OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
 
+CIE1931_CURVE = yes
+I2C_DRIVER_REQUIRED = yes
+
 # project specific files
 SRC =	keyboards/wilba_tech/wt_main.c \
 		keyboards/wilba_tech/wt_rgb_backlight.c \
 		quantum/color.c \
 		drivers/led/issi/is31fl3731.c
-I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/wilba_tech/rama_works_m60_a/info.json b/keyboards/wilba_tech/rama_works_m60_a/keyboard.json
similarity index 96%
rename from keyboards/wilba_tech/rama_works_m60_a/info.json
rename to keyboards/wilba_tech/rama_works_m60_a/keyboard.json
index 32f6f2a5d3..566f6cd42a 100644
--- a/keyboards/wilba_tech/rama_works_m60_a/info.json
+++ b/keyboards/wilba_tech/rama_works_m60_a/keyboard.json
@@ -8,6 +8,12 @@
         "pid": "0x060A",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true
+    },
     "matrix_pins": {
         "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"],
         "rows": ["F0", "F1", "F4", "F6", "F7"]
diff --git a/keyboards/wilba_tech/rama_works_m60_a/rules.mk b/keyboards/wilba_tech/rama_works_m60_a/rules.mk
index c921fc5c18..34e6eaa45b 100644
--- a/keyboards/wilba_tech/rama_works_m60_a/rules.mk
+++ b/keyboards/wilba_tech/rama_works_m60_a/rules.mk
@@ -3,24 +3,11 @@
 # backlight effects.
 OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
 
-# 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 = 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
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
-
 CIE1931_CURVE = yes
+I2C_DRIVER_REQUIRED = yes
 
 # project specific files
 SRC =	keyboards/wilba_tech/wt_main.c \
 		keyboards/wilba_tech/wt_rgb_backlight.c \
 		quantum/color.c \
 		drivers/led/issi/is31fl3731.c
-I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/wilba_tech/rama_works_m65_b/info.json b/keyboards/wilba_tech/rama_works_m65_b/keyboard.json
similarity index 97%
rename from keyboards/wilba_tech/rama_works_m65_b/info.json
rename to keyboards/wilba_tech/rama_works_m65_b/keyboard.json
index 5bc67f7925..156affff7d 100644
--- a/keyboards/wilba_tech/rama_works_m65_b/info.json
+++ b/keyboards/wilba_tech/rama_works_m65_b/keyboard.json
@@ -8,6 +8,12 @@
         "pid": "0x065B",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true
+    },
     "matrix_pins": {
         "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
         "rows": ["F0", "F1", "F4", "F6", "F7"]
diff --git a/keyboards/wilba_tech/rama_works_m65_b/rules.mk b/keyboards/wilba_tech/rama_works_m65_b/rules.mk
index d8a2bae455..34e6eaa45b 100644
--- a/keyboards/wilba_tech/rama_works_m65_b/rules.mk
+++ b/keyboards/wilba_tech/rama_works_m65_b/rules.mk
@@ -1,25 +1,13 @@
-# 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 = 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
-CIE1931_CURVE = yes
-
 # Do not put the microcontroller into power saving mode
 # when we get USB suspend event. We want it to keep updating
 # backlight effects.
 OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
 
+CIE1931_CURVE = yes
+I2C_DRIVER_REQUIRED = yes
+
 # project specific files
 SRC =	keyboards/wilba_tech/wt_main.c \
 		keyboards/wilba_tech/wt_rgb_backlight.c \
 		quantum/color.c \
 		drivers/led/issi/is31fl3731.c
-I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/wilba_tech/rama_works_m65_bx/info.json b/keyboards/wilba_tech/rama_works_m65_bx/keyboard.json
similarity index 98%
rename from keyboards/wilba_tech/rama_works_m65_bx/info.json
rename to keyboards/wilba_tech/rama_works_m65_bx/keyboard.json
index 113dae991b..9b4edcc6ef 100644
--- a/keyboards/wilba_tech/rama_works_m65_bx/info.json
+++ b/keyboards/wilba_tech/rama_works_m65_bx/keyboard.json
@@ -8,6 +8,12 @@
         "pid": "0x165B",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true
+    },
     "matrix_pins": {
         "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
         "rows": ["F0", "F1", "F4", "F6", "F7"]
diff --git a/keyboards/wilba_tech/rama_works_m65_bx/rules.mk b/keyboards/wilba_tech/rama_works_m65_bx/rules.mk
index d8a2bae455..34e6eaa45b 100644
--- a/keyboards/wilba_tech/rama_works_m65_bx/rules.mk
+++ b/keyboards/wilba_tech/rama_works_m65_bx/rules.mk
@@ -1,25 +1,13 @@
-# 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 = 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
-CIE1931_CURVE = yes
-
 # Do not put the microcontroller into power saving mode
 # when we get USB suspend event. We want it to keep updating
 # backlight effects.
 OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
 
+CIE1931_CURVE = yes
+I2C_DRIVER_REQUIRED = yes
+
 # project specific files
 SRC =	keyboards/wilba_tech/wt_main.c \
 		keyboards/wilba_tech/wt_rgb_backlight.c \
 		quantum/color.c \
 		drivers/led/issi/is31fl3731.c
-I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/wilba_tech/rama_works_m6_a/info.json b/keyboards/wilba_tech/rama_works_m6_a/keyboard.json
similarity index 87%
rename from keyboards/wilba_tech/rama_works_m6_a/info.json
rename to keyboards/wilba_tech/rama_works_m6_a/keyboard.json
index 73091d3036..df7fc90a96 100644
--- a/keyboards/wilba_tech/rama_works_m6_a/info.json
+++ b/keyboards/wilba_tech/rama_works_m6_a/keyboard.json
@@ -8,6 +8,12 @@
     "pid": "0x006A",
     "device_version": "0.0.1"
   },
+  "features": {
+    "bootmagic": true,
+    "extrakey": true,
+    "mousekey": false,
+    "nkro": true
+  },
   "matrix_pins": {
     "cols": ["D4", "B5", "F4", "D7", "C6", "F6"],
     "rows": ["E6"]
diff --git a/keyboards/wilba_tech/rama_works_m6_a/rules.mk b/keyboards/wilba_tech/rama_works_m6_a/rules.mk
index 95303152b9..806a82e12a 100644
--- a/keyboards/wilba_tech/rama_works_m6_a/rules.mk
+++ b/keyboards/wilba_tech/rama_works_m6_a/rules.mk
@@ -2,16 +2,3 @@
 # when we get USB suspend event. We want it to keep updating
 # backlight effects.
 OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
-
-# 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 = 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
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.  Do not enable this with audio at the same time.
diff --git a/keyboards/wilba_tech/rama_works_m6_b/info.json b/keyboards/wilba_tech/rama_works_m6_b/keyboard.json
similarity index 87%
rename from keyboards/wilba_tech/rama_works_m6_b/info.json
rename to keyboards/wilba_tech/rama_works_m6_b/keyboard.json
index 4356011aae..4d258b826b 100644
--- a/keyboards/wilba_tech/rama_works_m6_b/info.json
+++ b/keyboards/wilba_tech/rama_works_m6_b/keyboard.json
@@ -8,6 +8,12 @@
     "pid": "0x006B",
     "device_version": "0.0.1"
   },
+  "features": {
+    "bootmagic": true,
+    "extrakey": true,
+    "mousekey": false,
+    "nkro": true
+  },
   "matrix_pins": {
     "cols": ["D4", "B5", "F4", "D7", "C6", "F6"],
     "rows": ["E6"]
diff --git a/keyboards/wilba_tech/rama_works_m6_b/rules.mk b/keyboards/wilba_tech/rama_works_m6_b/rules.mk
index eff0605d90..4650d7a6ea 100644
--- a/keyboards/wilba_tech/rama_works_m6_b/rules.mk
+++ b/keyboards/wilba_tech/rama_works_m6_b/rules.mk
@@ -3,24 +3,11 @@
 # backlight effects.
 OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
 
-# 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 = 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
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.  Do not enable this with audio at the same time.
-
 CIE1931_CURVE = yes
+I2C_DRIVER_REQUIRED = yes
 
 # project specific files
 SRC =	keyboards/wilba_tech/wt_main.c \
 		keyboards/wilba_tech/wt_rgb_backlight.c \
 		quantum/color.c \
 		drivers/led/issi/is31fl3218.c
-I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/wilba_tech/rama_works_u80_a/info.json b/keyboards/wilba_tech/rama_works_u80_a/keyboard.json
similarity index 98%
rename from keyboards/wilba_tech/rama_works_u80_a/info.json
rename to keyboards/wilba_tech/rama_works_u80_a/keyboard.json
index 96349f3909..bf06d9508f 100644
--- a/keyboards/wilba_tech/rama_works_u80_a/info.json
+++ b/keyboards/wilba_tech/rama_works_u80_a/keyboard.json
@@ -8,6 +8,12 @@
         "pid": "0x080A",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true
+    },
     "matrix_pins": {
         "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "B7", "B0"],
         "rows": ["F1", "F0", "E6", "F4", "F6", "F7"]
diff --git a/keyboards/wilba_tech/rama_works_u80_a/rules.mk b/keyboards/wilba_tech/rama_works_u80_a/rules.mk
index b262985880..d6df34b9bc 100644
--- a/keyboards/wilba_tech/rama_works_u80_a/rules.mk
+++ b/keyboards/wilba_tech/rama_works_u80_a/rules.mk
@@ -1,19 +1,8 @@
-# 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 = 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
 CIE1931_CURVE = yes
+I2C_DRIVER_REQUIRED = yes
 
 # project specific files
 SRC =	keyboards/wilba_tech/wt_main.c \
 		keyboards/wilba_tech/wt_rgb_backlight.c \
 		quantum/color.c \
 		drivers/led/issi/is31fl3731.c
-I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/wilba_tech/wt60_a/info.json b/keyboards/wilba_tech/wt60_a/keyboard.json
similarity index 98%
rename from keyboards/wilba_tech/wt60_a/info.json
rename to keyboards/wilba_tech/wt60_a/keyboard.json
index 6016905bdc..1c6d9f8c35 100644
--- a/keyboards/wilba_tech/wt60_a/info.json
+++ b/keyboards/wilba_tech/wt60_a/keyboard.json
@@ -8,6 +8,12 @@
         "pid": "0x060A",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true
+    },
     "matrix_pins": {
         "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"],
         "rows": ["F0", "E6", "F4", "F6", "F7"]
diff --git a/keyboards/wilba_tech/wt60_a/rules.mk b/keyboards/wilba_tech/wt60_a/rules.mk
index f7482c7a2f..858c317c20 100644
--- a/keyboards/wilba_tech/wt60_a/rules.mk
+++ b/keyboards/wilba_tech/wt60_a/rules.mk
@@ -1,18 +1,7 @@
-# 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 = 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
+I2C_DRIVER_REQUIRED = yes
 
 # project specific files
 SRC =	drivers/led/issi/is31fl3736-mono.c \
 		quantum/color.c \
 		keyboards/wilba_tech/wt_mono_backlight.c \
 		keyboards/wilba_tech/wt_main.c
-I2C_DRIVER_REQUIRED = yes
\ No newline at end of file
diff --git a/keyboards/wilba_tech/wt60_b/info.json b/keyboards/wilba_tech/wt60_b/keyboard.json
similarity index 98%
rename from keyboards/wilba_tech/wt60_b/info.json
rename to keyboards/wilba_tech/wt60_b/keyboard.json
index 253c081b9a..765ba96f61 100644
--- a/keyboards/wilba_tech/wt60_b/info.json
+++ b/keyboards/wilba_tech/wt60_b/keyboard.json
@@ -8,6 +8,12 @@
         "pid": "0x60B0",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true
+    },
     "matrix_pins": {
         "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"],
         "rows": ["F0", "F1", "F4", "F6", "F7"]
diff --git a/keyboards/wilba_tech/wt60_b/rules.mk b/keyboards/wilba_tech/wt60_b/rules.mk
index 397643d372..34e6eaa45b 100644
--- a/keyboards/wilba_tech/wt60_b/rules.mk
+++ b/keyboards/wilba_tech/wt60_b/rules.mk
@@ -3,24 +3,11 @@
 # backlight effects.
 OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
 
-# 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 = 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
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
-
 CIE1931_CURVE = yes
+I2C_DRIVER_REQUIRED = yes
 
 # project specific files
 SRC =	keyboards/wilba_tech/wt_main.c \
 		keyboards/wilba_tech/wt_rgb_backlight.c \
 		quantum/color.c \
 		drivers/led/issi/is31fl3731.c
-I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/wilba_tech/wt60_bx/info.json b/keyboards/wilba_tech/wt60_bx/keyboard.json
similarity index 99%
rename from keyboards/wilba_tech/wt60_bx/info.json
rename to keyboards/wilba_tech/wt60_bx/keyboard.json
index 1978ce8a4f..6b4b6e9fb1 100644
--- a/keyboards/wilba_tech/wt60_bx/info.json
+++ b/keyboards/wilba_tech/wt60_bx/keyboard.json
@@ -8,6 +8,12 @@
         "pid": "0x60B1",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true
+    },
     "matrix_pins": {
         "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"],
         "rows": ["F0", "F1", "F4", "F6", "F7"]
diff --git a/keyboards/wilba_tech/wt60_bx/rules.mk b/keyboards/wilba_tech/wt60_bx/rules.mk
index 397643d372..34e6eaa45b 100644
--- a/keyboards/wilba_tech/wt60_bx/rules.mk
+++ b/keyboards/wilba_tech/wt60_bx/rules.mk
@@ -3,24 +3,11 @@
 # backlight effects.
 OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
 
-# 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 = 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
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
-
 CIE1931_CURVE = yes
+I2C_DRIVER_REQUIRED = yes
 
 # project specific files
 SRC =	keyboards/wilba_tech/wt_main.c \
 		keyboards/wilba_tech/wt_rgb_backlight.c \
 		quantum/color.c \
 		drivers/led/issi/is31fl3731.c
-I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/wilba_tech/wt60_c/info.json b/keyboards/wilba_tech/wt60_c/keyboard.json
similarity index 99%
rename from keyboards/wilba_tech/wt60_c/info.json
rename to keyboards/wilba_tech/wt60_c/keyboard.json
index 652714f52a..569cca93b7 100644
--- a/keyboards/wilba_tech/wt60_c/info.json
+++ b/keyboards/wilba_tech/wt60_c/keyboard.json
@@ -8,6 +8,12 @@
         "pid": "0x60C0",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true
+    },
     "matrix_pins": {
         "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"],
         "rows": ["F0", "F1", "F4", "F6", "F7"]
diff --git a/keyboards/wilba_tech/wt60_c/rules.mk b/keyboards/wilba_tech/wt60_c/rules.mk
index 397643d372..34e6eaa45b 100644
--- a/keyboards/wilba_tech/wt60_c/rules.mk
+++ b/keyboards/wilba_tech/wt60_c/rules.mk
@@ -3,24 +3,11 @@
 # backlight effects.
 OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
 
-# 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 = 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
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
-
 CIE1931_CURVE = yes
+I2C_DRIVER_REQUIRED = yes
 
 # project specific files
 SRC =	keyboards/wilba_tech/wt_main.c \
 		keyboards/wilba_tech/wt_rgb_backlight.c \
 		quantum/color.c \
 		drivers/led/issi/is31fl3731.c
-I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/wilba_tech/wt65_a/info.json b/keyboards/wilba_tech/wt65_a/keyboard.json
similarity index 99%
rename from keyboards/wilba_tech/wt65_a/info.json
rename to keyboards/wilba_tech/wt65_a/keyboard.json
index 1957c88dd2..ec87e830f0 100644
--- a/keyboards/wilba_tech/wt65_a/info.json
+++ b/keyboards/wilba_tech/wt65_a/keyboard.json
@@ -8,6 +8,12 @@
         "pid": "0x065A",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true
+    },
     "matrix_pins": {
         "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
         "rows": ["F0", "E6", "F4", "F6", "F7"]
diff --git a/keyboards/wilba_tech/wt65_a/rules.mk b/keyboards/wilba_tech/wt65_a/rules.mk
index f7482c7a2f..858c317c20 100644
--- a/keyboards/wilba_tech/wt65_a/rules.mk
+++ b/keyboards/wilba_tech/wt65_a/rules.mk
@@ -1,18 +1,7 @@
-# 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 = 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
+I2C_DRIVER_REQUIRED = yes
 
 # project specific files
 SRC =	drivers/led/issi/is31fl3736-mono.c \
 		quantum/color.c \
 		keyboards/wilba_tech/wt_mono_backlight.c \
 		keyboards/wilba_tech/wt_main.c
-I2C_DRIVER_REQUIRED = yes
\ No newline at end of file
diff --git a/keyboards/wilba_tech/wt65_b/info.json b/keyboards/wilba_tech/wt65_b/keyboard.json
similarity index 98%
rename from keyboards/wilba_tech/wt65_b/info.json
rename to keyboards/wilba_tech/wt65_b/keyboard.json
index 10de33b143..56f71f3fc1 100644
--- a/keyboards/wilba_tech/wt65_b/info.json
+++ b/keyboards/wilba_tech/wt65_b/keyboard.json
@@ -8,6 +8,12 @@
         "pid": "0x065B",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true
+    },
     "matrix_pins": {
         "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
         "rows": ["F0", "E6", "F4", "F6", "F7"]
diff --git a/keyboards/wilba_tech/wt65_b/rules.mk b/keyboards/wilba_tech/wt65_b/rules.mk
index f7482c7a2f..858c317c20 100644
--- a/keyboards/wilba_tech/wt65_b/rules.mk
+++ b/keyboards/wilba_tech/wt65_b/rules.mk
@@ -1,18 +1,7 @@
-# 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 = 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
+I2C_DRIVER_REQUIRED = yes
 
 # project specific files
 SRC =	drivers/led/issi/is31fl3736-mono.c \
 		quantum/color.c \
 		keyboards/wilba_tech/wt_mono_backlight.c \
 		keyboards/wilba_tech/wt_main.c
-I2C_DRIVER_REQUIRED = yes
\ No newline at end of file
diff --git a/keyboards/wilba_tech/wt69_a/info.json b/keyboards/wilba_tech/wt69_a/keyboard.json
similarity index 98%
rename from keyboards/wilba_tech/wt69_a/info.json
rename to keyboards/wilba_tech/wt69_a/keyboard.json
index bd93286a0f..8321ae86c4 100644
--- a/keyboards/wilba_tech/wt69_a/info.json
+++ b/keyboards/wilba_tech/wt69_a/keyboard.json
@@ -8,6 +8,12 @@
         "pid": "0x069A",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true
+    },
     "matrix_pins": {
         "cols": ["B7", "B0", "F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
         "rows": ["F0", "E6", "F4", "F6", "F7"]
diff --git a/keyboards/wilba_tech/wt69_a/rules.mk b/keyboards/wilba_tech/wt69_a/rules.mk
index 396da8c734..c0b7344f73 100644
--- a/keyboards/wilba_tech/wt69_a/rules.mk
+++ b/keyboards/wilba_tech/wt69_a/rules.mk
@@ -1,14 +1,2 @@
-# 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 = 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
-
 # project specific files
 SRC =	keyboards/wilba_tech/wt_main.c
diff --git a/keyboards/wilba_tech/wt75_a/info.json b/keyboards/wilba_tech/wt75_a/keyboard.json
similarity index 99%
rename from keyboards/wilba_tech/wt75_a/info.json
rename to keyboards/wilba_tech/wt75_a/keyboard.json
index 5cbb6f1f8b..609dff0c36 100644
--- a/keyboards/wilba_tech/wt75_a/info.json
+++ b/keyboards/wilba_tech/wt75_a/keyboard.json
@@ -8,6 +8,12 @@
         "pid": "0x075A",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true
+    },
     "matrix_pins": {
         "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
         "rows": ["F1", "F0", "E6", "F4", "F6", "F7"]
diff --git a/keyboards/wilba_tech/wt75_a/rules.mk b/keyboards/wilba_tech/wt75_a/rules.mk
index f7482c7a2f..858c317c20 100644
--- a/keyboards/wilba_tech/wt75_a/rules.mk
+++ b/keyboards/wilba_tech/wt75_a/rules.mk
@@ -1,18 +1,7 @@
-# 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 = 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
+I2C_DRIVER_REQUIRED = yes
 
 # project specific files
 SRC =	drivers/led/issi/is31fl3736-mono.c \
 		quantum/color.c \
 		keyboards/wilba_tech/wt_mono_backlight.c \
 		keyboards/wilba_tech/wt_main.c
-I2C_DRIVER_REQUIRED = yes
\ No newline at end of file
diff --git a/keyboards/wilba_tech/wt75_b/info.json b/keyboards/wilba_tech/wt75_b/keyboard.json
similarity index 99%
rename from keyboards/wilba_tech/wt75_b/info.json
rename to keyboards/wilba_tech/wt75_b/keyboard.json
index c0e996e001..15bc61e923 100644
--- a/keyboards/wilba_tech/wt75_b/info.json
+++ b/keyboards/wilba_tech/wt75_b/keyboard.json
@@ -8,6 +8,12 @@
         "pid": "0x075B",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true
+    },
     "matrix_pins": {
         "cols": ["F5", "D5", "B1", "B7", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "B2", "D4"],
         "rows": ["F1", "F0", "E6", "F4", "F6", "F7"]
diff --git a/keyboards/wilba_tech/wt75_b/rules.mk b/keyboards/wilba_tech/wt75_b/rules.mk
index f7482c7a2f..858c317c20 100644
--- a/keyboards/wilba_tech/wt75_b/rules.mk
+++ b/keyboards/wilba_tech/wt75_b/rules.mk
@@ -1,18 +1,7 @@
-# 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 = 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
+I2C_DRIVER_REQUIRED = yes
 
 # project specific files
 SRC =	drivers/led/issi/is31fl3736-mono.c \
 		quantum/color.c \
 		keyboards/wilba_tech/wt_mono_backlight.c \
 		keyboards/wilba_tech/wt_main.c
-I2C_DRIVER_REQUIRED = yes
\ No newline at end of file
diff --git a/keyboards/wilba_tech/wt75_c/info.json b/keyboards/wilba_tech/wt75_c/keyboard.json
similarity index 99%
rename from keyboards/wilba_tech/wt75_c/info.json
rename to keyboards/wilba_tech/wt75_c/keyboard.json
index daa6303fb9..38d1450ae0 100644
--- a/keyboards/wilba_tech/wt75_c/info.json
+++ b/keyboards/wilba_tech/wt75_c/keyboard.json
@@ -8,6 +8,12 @@
         "pid": "0x075C",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true
+    },
     "matrix_pins": {
         "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "B7", "D4"],
         "rows": ["F1", "F0", "E6", "F4", "F6", "F7"]
diff --git a/keyboards/wilba_tech/wt75_c/rules.mk b/keyboards/wilba_tech/wt75_c/rules.mk
index f7482c7a2f..858c317c20 100644
--- a/keyboards/wilba_tech/wt75_c/rules.mk
+++ b/keyboards/wilba_tech/wt75_c/rules.mk
@@ -1,18 +1,7 @@
-# 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 = 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
+I2C_DRIVER_REQUIRED = yes
 
 # project specific files
 SRC =	drivers/led/issi/is31fl3736-mono.c \
 		quantum/color.c \
 		keyboards/wilba_tech/wt_mono_backlight.c \
 		keyboards/wilba_tech/wt_main.c
-I2C_DRIVER_REQUIRED = yes
\ No newline at end of file
diff --git a/keyboards/wilba_tech/wt80_a/info.json b/keyboards/wilba_tech/wt80_a/keyboard.json
similarity index 98%
rename from keyboards/wilba_tech/wt80_a/info.json
rename to keyboards/wilba_tech/wt80_a/keyboard.json
index 570b3dc03a..d7d6d11882 100644
--- a/keyboards/wilba_tech/wt80_a/info.json
+++ b/keyboards/wilba_tech/wt80_a/keyboard.json
@@ -8,6 +8,12 @@
         "pid": "0x080A",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true
+    },
     "matrix_pins": {
         "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "B7", "B0"],
         "rows": ["F1", "F0", "E6", "F4", "F6", "F7"]
diff --git a/keyboards/wilba_tech/wt80_a/rules.mk b/keyboards/wilba_tech/wt80_a/rules.mk
index f7482c7a2f..858c317c20 100644
--- a/keyboards/wilba_tech/wt80_a/rules.mk
+++ b/keyboards/wilba_tech/wt80_a/rules.mk
@@ -1,18 +1,7 @@
-# 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 = 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
+I2C_DRIVER_REQUIRED = yes
 
 # project specific files
 SRC =	drivers/led/issi/is31fl3736-mono.c \
 		quantum/color.c \
 		keyboards/wilba_tech/wt_mono_backlight.c \
 		keyboards/wilba_tech/wt_main.c
-I2C_DRIVER_REQUIRED = yes
\ No newline at end of file
diff --git a/keyboards/wilba_tech/wt80_bc/config.h b/keyboards/wilba_tech/wt80_bc/config.h
deleted file mode 100644
index 9541b1df12..0000000000
--- a/keyboards/wilba_tech/wt80_bc/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2020 Jason Williams (Wilba)
- *
- * 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/wilba_tech/wt80_bc/info.json b/keyboards/wilba_tech/wt80_bc/keyboard.json
similarity index 98%
rename from keyboards/wilba_tech/wt80_bc/info.json
rename to keyboards/wilba_tech/wt80_bc/keyboard.json
index b76e9cf86c..072b965aef 100644
--- a/keyboards/wilba_tech/wt80_bc/info.json
+++ b/keyboards/wilba_tech/wt80_bc/keyboard.json
@@ -8,6 +8,18 @@
         "pid": "0x80B0",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "B7", "B0"],
         "rows": ["F1", "F0", "E6", "F4", "F6", "F7"]
diff --git a/keyboards/wilba_tech/wt80_bc/rules.mk b/keyboards/wilba_tech/wt80_bc/rules.mk
index 5b8a888845..c0b7344f73 100644
--- a/keyboards/wilba_tech/wt80_bc/rules.mk
+++ b/keyboards/wilba_tech/wt80_bc/rules.mk
@@ -1,14 +1,2 @@
-# 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 = 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
-
 # project specific files
 SRC =	keyboards/wilba_tech/wt_main.c
diff --git a/keyboards/wilba_tech/wt8_a/config.h b/keyboards/wilba_tech/wt8_a/config.h
deleted file mode 100644
index 1377a18714..0000000000
--- a/keyboards/wilba_tech/wt8_a/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2018 Jason Williams (Wilba)
- *
- * 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/wilba_tech/wt8_a/info.json b/keyboards/wilba_tech/wt8_a/keyboard.json
similarity index 80%
rename from keyboards/wilba_tech/wt8_a/info.json
rename to keyboards/wilba_tech/wt8_a/keyboard.json
index a07707d789..a84ff6a33f 100644
--- a/keyboards/wilba_tech/wt8_a/info.json
+++ b/keyboards/wilba_tech/wt8_a/keyboard.json
@@ -8,6 +8,18 @@
         "pid": "0x008A",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["F4", "F1", "B2", "B6", "F6", "F7", "D5", "B4"],
         "rows": ["E6"]
diff --git a/keyboards/wilba_tech/wt8_a/rules.mk b/keyboards/wilba_tech/wt8_a/rules.mk
index 396da8c734..c0b7344f73 100644
--- a/keyboards/wilba_tech/wt8_a/rules.mk
+++ b/keyboards/wilba_tech/wt8_a/rules.mk
@@ -1,14 +1,2 @@
-# 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 = 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
-
 # project specific files
 SRC =	keyboards/wilba_tech/wt_main.c
diff --git a/keyboards/wilba_tech/zeal60/info.json b/keyboards/wilba_tech/zeal60/keyboard.json
similarity index 99%
rename from keyboards/wilba_tech/zeal60/info.json
rename to keyboards/wilba_tech/zeal60/keyboard.json
index 295d11c069..34f7a312aa 100644
--- a/keyboards/wilba_tech/zeal60/info.json
+++ b/keyboards/wilba_tech/zeal60/keyboard.json
@@ -8,6 +8,12 @@
         "pid": "0x0060",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true
+    },
     "matrix_pins": {
         "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"],
         "rows": ["F0", "F1", "F4", "F6", "F7"]
diff --git a/keyboards/wilba_tech/zeal60/rules.mk b/keyboards/wilba_tech/zeal60/rules.mk
index d1ce11b473..34e6eaa45b 100644
--- a/keyboards/wilba_tech/zeal60/rules.mk
+++ b/keyboards/wilba_tech/zeal60/rules.mk
@@ -3,24 +3,11 @@
 # backlight effects.
 OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
 
-# 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 = 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
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-
 CIE1931_CURVE = yes
+I2C_DRIVER_REQUIRED = yes
 
 # project specific files
 SRC =	keyboards/wilba_tech/wt_main.c \
 		keyboards/wilba_tech/wt_rgb_backlight.c \
 		quantum/color.c \
 		drivers/led/issi/is31fl3731.c
-I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/wilba_tech/zeal65/info.json b/keyboards/wilba_tech/zeal65/keyboard.json
similarity index 98%
rename from keyboards/wilba_tech/zeal65/info.json
rename to keyboards/wilba_tech/zeal65/keyboard.json
index 814ea28660..2bc5e65b7b 100644
--- a/keyboards/wilba_tech/zeal65/info.json
+++ b/keyboards/wilba_tech/zeal65/keyboard.json
@@ -8,6 +8,12 @@
         "pid": "0x0065",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true
+    },
     "matrix_pins": {
         "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
         "rows": ["F0", "F1", "F4", "F6", "F7"]
diff --git a/keyboards/wilba_tech/zeal65/rules.mk b/keyboards/wilba_tech/zeal65/rules.mk
index d1ce11b473..34e6eaa45b 100644
--- a/keyboards/wilba_tech/zeal65/rules.mk
+++ b/keyboards/wilba_tech/zeal65/rules.mk
@@ -3,24 +3,11 @@
 # backlight effects.
 OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
 
-# 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 = 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
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-
 CIE1931_CURVE = yes
+I2C_DRIVER_REQUIRED = yes
 
 # project specific files
 SRC =	keyboards/wilba_tech/wt_main.c \
 		keyboards/wilba_tech/wt_rgb_backlight.c \
 		quantum/color.c \
 		drivers/led/issi/is31fl3731.c
-I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/wolf/frogpad/info.json b/keyboards/wolf/frogpad/keyboard.json
similarity index 100%
rename from keyboards/wolf/frogpad/info.json
rename to keyboards/wolf/frogpad/keyboard.json
diff --git a/keyboards/wolf/kuku65/info.json b/keyboards/wolf/kuku65/keyboard.json
similarity index 97%
rename from keyboards/wolf/kuku65/info.json
rename to keyboards/wolf/kuku65/keyboard.json
index e088a5b777..5146d77d1b 100644
--- a/keyboards/wolf/kuku65/info.json
+++ b/keyboards/wolf/kuku65/keyboard.json
@@ -8,6 +8,12 @@
         "pid": "0x0052",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true
+    },
     "matrix_pins": {
         "cols": ["D0", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1"],
         "rows": ["B3", "B2", "B1", "B0", "B7"]
diff --git a/keyboards/wolf/kuku65/rules.mk b/keyboards/wolf/kuku65/rules.mk
index 67bb629651..3437a35bdf 100644
--- a/keyboards/wolf/kuku65/rules.mk
+++ b/keyboards/wolf/kuku65/rules.mk
@@ -1,15 +1,2 @@
 # 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 = 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
diff --git a/keyboards/wolf/m60_b/info.json b/keyboards/wolf/m60_b/keyboard.json
similarity index 100%
rename from keyboards/wolf/m60_b/info.json
rename to keyboards/wolf/m60_b/keyboard.json
diff --git a/keyboards/wolf/m6_c/info.json b/keyboards/wolf/m6_c/keyboard.json
similarity index 100%
rename from keyboards/wolf/m6_c/info.json
rename to keyboards/wolf/m6_c/keyboard.json
diff --git a/keyboards/wolf/neely65/info.json b/keyboards/wolf/neely65/keyboard.json
similarity index 100%
rename from keyboards/wolf/neely65/info.json
rename to keyboards/wolf/neely65/keyboard.json
diff --git a/keyboards/wolf/ryujin/info.json b/keyboards/wolf/ryujin/keyboard.json
similarity index 97%
rename from keyboards/wolf/ryujin/info.json
rename to keyboards/wolf/ryujin/keyboard.json
index 1e7702a340..8e72cccd9e 100644
--- a/keyboards/wolf/ryujin/info.json
+++ b/keyboards/wolf/ryujin/keyboard.json
@@ -8,6 +8,12 @@
         "pid": "0x0200",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true
+    },
     "matrix_pins": {
         "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
         "rows": ["D5", "D3", "D2", "D1", "D0"]
diff --git a/keyboards/wolf/ryujin/rules.mk b/keyboards/wolf/ryujin/rules.mk
index 67bb629651..3437a35bdf 100644
--- a/keyboards/wolf/ryujin/rules.mk
+++ b/keyboards/wolf/ryujin/rules.mk
@@ -1,15 +1,2 @@
 # 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 = 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
diff --git a/keyboards/wolf/sabre/info.json b/keyboards/wolf/sabre/keyboard.json
similarity index 97%
rename from keyboards/wolf/sabre/info.json
rename to keyboards/wolf/sabre/keyboard.json
index 1be6824d09..11b235efe7 100644
--- a/keyboards/wolf/sabre/info.json
+++ b/keyboards/wolf/sabre/keyboard.json
@@ -8,6 +8,13 @@
         "pid": "0x0055",
         "device_version": "0.0.1"
     },
+    "features": {
+        "backlight": true,
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true
+    },
     "matrix_pins": {
         "cols": ["D2", "D3", "D5", "D4", "D6", "D7", "B4", "B2", "B1"],
         "rows": ["D0", "D1", "F1", "F0", "B5", "B6", "C7", "C6", "F6", "F7", "F4", "F5"]
diff --git a/keyboards/wolf/sabre/rules.mk b/keyboards/wolf/sabre/rules.mk
index e7cc37d18d..3437a35bdf 100644
--- a/keyboards/wolf/sabre/rules.mk
+++ b/keyboards/wolf/sabre/rules.mk
@@ -1,16 +1,2 @@
 # 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 = no        # Commands for debug and configuration
-NKRO_ENABLE = yes           # USB Nkey Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-BACKLIGHT_ENABLE = yes
diff --git a/keyboards/wolf/ts60/info.json b/keyboards/wolf/ts60/keyboard.json
similarity index 97%
rename from keyboards/wolf/ts60/info.json
rename to keyboards/wolf/ts60/keyboard.json
index 8f6d9318ea..ff5059f2f1 100644
--- a/keyboards/wolf/ts60/info.json
+++ b/keyboards/wolf/ts60/keyboard.json
@@ -8,6 +8,14 @@
         "pid": "0x0050",
         "device_version": "0.0.1"
     },
+    "features": {
+        "backlight": true,
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
     "matrix_pins": {
         "cols": ["D1", "D5", "C7", "C6", "B6", "B5", "B4", "D7"],
         "rows": ["D2", "D3", "D6", "D4", "F6", "F7", "F5", "F0", "F4", "F1"]
diff --git a/keyboards/wolf/ts60/rules.mk b/keyboards/wolf/ts60/rules.mk
index fb26dc7de5..3437a35bdf 100644
--- a/keyboards/wolf/ts60/rules.mk
+++ b/keyboards/wolf/ts60/rules.mk
@@ -1,15 +1,2 @@
 # 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 = no        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/wolfmarkclub/wm1/config.h b/keyboards/wolfmarkclub/wm1/config.h
deleted file mode 100644
index 4b007cf387..0000000000
--- a/keyboards/wolfmarkclub/wm1/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2015 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/wolfmarkclub/wm1/info.json b/keyboards/wolfmarkclub/wm1/keyboard.json
similarity index 91%
rename from keyboards/wolfmarkclub/wm1/info.json
rename to keyboards/wolfmarkclub/wm1/keyboard.json
index 04b8ae3b11..56c062e102 100644
--- a/keyboards/wolfmarkclub/wm1/info.json
+++ b/keyboards/wolfmarkclub/wm1/keyboard.json
@@ -8,6 +8,25 @@
         "pid": "0x2B29",
         "device_version": "0.0.1"
     },
+    "build": {
+        "lto": true
+    },
+    "features": {
+        "bootmagic": false,
+        "command": true,
+        "console": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true,
+        "sleep_led": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "rgblight": {
         "saturation_steps": 8,
         "brightness_steps": 8,
@@ -34,6 +53,8 @@
         "rows": ["C4", "A7", "A6", "A5", "A4"]
     },
     "diode_direction": "COL2ROW",
+    "processor": "STM32F103",
+    "bootloader": "custom",
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/wolfmarkclub/wm1/rules.mk b/keyboards/wolfmarkclub/wm1/rules.mk
index 512ef119fd..63ba3477c3 100644
--- a/keyboards/wolfmarkclub/wm1/rules.mk
+++ b/keyboards/wolfmarkclub/wm1/rules.mk
@@ -1,27 +1,5 @@
-# MCU name
-MCU = STM32F103
-
 # GENERIC STM32F103C8T6 board - mass storage bootloader
 MCU_LDSCRIPT = wm1_f103
 BOARD = STM32_F103_STM32DUINO
 
-# Bootloader selection
-BOOTLOADER = custom
-
 PROGRAM_CMD = echo 'CLI flashing not supported' >&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 = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-SLEEP_LED_ENABLE = yes
-LTO_ENABLE = yes
-
diff --git a/keyboards/work_louder/micro/info.json b/keyboards/work_louder/micro/keyboard.json
similarity index 100%
rename from keyboards/work_louder/micro/info.json
rename to keyboards/work_louder/micro/keyboard.json
diff --git a/keyboards/work_louder/nano/info.json b/keyboards/work_louder/nano/keyboard.json
similarity index 91%
rename from keyboards/work_louder/nano/info.json
rename to keyboards/work_louder/nano/keyboard.json
index 61c48b3e80..e15d095de0 100644
--- a/keyboards/work_louder/nano/info.json
+++ b/keyboards/work_louder/nano/keyboard.json
@@ -9,6 +9,18 @@
         "device_version": "0.0.1",
         "max_power": 100
     },
+    "build": {
+        "lto": true
+    },
+    "features": {
+        "bootmagic": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true,
+        "rgblight": true
+    },
     "rgb_matrix": {
         "animations": {
             "alphas_mods": true,
diff --git a/keyboards/work_louder/nano/rules.mk b/keyboards/work_louder/nano/rules.mk
index bcbb4bb31d..e0822c009b 100644
--- a/keyboards/work_louder/nano/rules.mk
+++ b/keyboards/work_louder/nano/rules.mk
@@ -1,18 +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
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes
-LTO_ENABLE = yes
-
-RGB_MATRIX_ENABLE = yes
-
 SRC += rgb_functions.c
diff --git a/keyboards/work_louder/numpad/info.json b/keyboards/work_louder/numpad/keyboard.json
similarity index 100%
rename from keyboards/work_louder/numpad/info.json
rename to keyboards/work_louder/numpad/keyboard.json
diff --git a/keyboards/wren/config.h b/keyboards/wren/config.h
index bd4af23167..4969f8e831 100644
--- a/keyboards/wren/config.h
+++ b/keyboards/wren/config.h
@@ -18,24 +18,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #define USE_I2C
-
-/* 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/wren/info.json b/keyboards/wren/keyboard.json
similarity index 95%
rename from keyboards/wren/info.json
rename to keyboards/wren/keyboard.json
index ed56ff2b3a..c6d0330e2f 100644
--- a/keyboards/wren/info.json
+++ b/keyboards/wren/keyboard.json
@@ -7,6 +7,19 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4", "D7", "F0"],
         "rows": ["D3", "D2", "C6", "D4", "B5"]
diff --git a/keyboards/wren/rules.mk b/keyboards/wren/rules.mk
deleted file mode 100644
index 088c390ec8..0000000000
--- a/keyboards/wren/rules.mk
+++ /dev/null
@@ -1,13 +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
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes        # Enables the use of one or more encoders
diff --git a/keyboards/wuque/creek70/info.json b/keyboards/wuque/creek70/keyboard.json
similarity index 99%
rename from keyboards/wuque/creek70/info.json
rename to keyboards/wuque/creek70/keyboard.json
index f0951430db..e7227ace8e 100644
--- a/keyboards/wuque/creek70/info.json
+++ b/keyboards/wuque/creek70/keyboard.json
@@ -11,7 +11,8 @@
     "console": false,
     "extrakey": true,
     "mousekey": true,
-    "nkro": true
+    "nkro": true,
+    "rgblight": true
   },
   "matrix_pins": {
     "rows": ["B3", "B2", "F0", "D3", "D1"],
diff --git a/keyboards/wuque/creek70/rules.mk b/keyboards/wuque/creek70/rules.mk
deleted file mode 100644
index 1e3cebb145..0000000000
--- a/keyboards/wuque/creek70/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/wuque/ikki68_aurora/config.h b/keyboards/wuque/ikki68_aurora/config.h
deleted file mode 100644
index db5a8d534e..0000000000
--- a/keyboards/wuque/ikki68_aurora/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-Copyright 2021 wuquestudio
-
-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/wuque/ikki68_aurora/info.json b/keyboards/wuque/ikki68_aurora/keyboard.json
similarity index 99%
rename from keyboards/wuque/ikki68_aurora/info.json
rename to keyboards/wuque/ikki68_aurora/keyboard.json
index a65b265b66..31d0ff2f91 100644
--- a/keyboards/wuque/ikki68_aurora/info.json
+++ b/keyboards/wuque/ikki68_aurora/keyboard.json
@@ -8,6 +8,19 @@
         "pid": "0x0011",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["D5", "D3", "D2", "D1", "D0", "F0", "F1", "E6", "B5", "B4", "D7", "D6", "D4", "F4", "F5", "F6"],
         "rows": ["B7", "B3", "B2", "B1", "B0"]
diff --git a/keyboards/wuque/ikki68_aurora/rules.mk b/keyboards/wuque/ikki68_aurora/rules.mk
deleted file mode 100644
index 540e0c2514..0000000000
--- a/keyboards/wuque/ikki68_aurora/rules.mk
+++ /dev/null
@@ -1,14 +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 = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-LAYOUT = 68_ansi 68_iso
diff --git a/keyboards/wuque/serneity65/info.json b/keyboards/wuque/serneity65/keyboard.json
similarity index 99%
rename from keyboards/wuque/serneity65/info.json
rename to keyboards/wuque/serneity65/keyboard.json
index f27073b285..b64103d533 100644
--- a/keyboards/wuque/serneity65/info.json
+++ b/keyboards/wuque/serneity65/keyboard.json
@@ -8,6 +8,14 @@
         "pid": "0x0003",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "console": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
     "matrix_pins": {
         "cols": ["B6", "B5", "D5", "D4", "D6", "B4", "D7", "F1", "F4", "F5", "F6", "F7", "C7", "E6", "B7"],
         "rows": ["B0", "F0", "B1", "D2", "D3"]
diff --git a/keyboards/wuque/serneity65/rules.mk b/keyboards/wuque/serneity65/rules.mk
deleted file mode 100644
index 8c163bff64..0000000000
--- a/keyboards/wuque/serneity65/rules.mk
+++ /dev/null
@@ -1,15 +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 = yes         # 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
-ENCODER_ENABLE = yes		# Enable Encoder
-
-LAYOUT = 65_ansi