diff --git a/keyboards/nack/info.json b/keyboards/nack/keyboard.json
similarity index 96%
rename from keyboards/nack/info.json
rename to keyboards/nack/keyboard.json
index 4af3f64126..6a3b6db3ad 100644
--- a/keyboards/nack/info.json
+++ b/keyboards/nack/keyboard.json
@@ -8,6 +8,15 @@
         "pid": "0x6060",
         "device_version": "0.0.1"
     },
+    "features": {
+        "audio": true,
+        "bootmagic": false,
+        "extrakey": false,
+        "mousekey": false,
+        "nkro": true,
+        "rgb_matrix": true,
+        "unicode": true
+    },
     "ws2812": {
         "pin": "B5",
         "driver": "spi"
diff --git a/keyboards/nack/rules.mk b/keyboards/nack/rules.mk
index d2558648dd..72354402a6 100644
--- a/keyboards/nack/rules.mk
+++ b/keyboards/nack/rules.mk
@@ -1,15 +1 @@
-# 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 = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = yes          # Audio output
-RGB_MATRIX_ENABLE = yes
-AUDIO_DRIVER = dac_basic 	# How to drive the 2 speakers
-UNICODE_ENABLE = yes        # Unicode support
+AUDIO_DRIVER = dac_basic
diff --git a/keyboards/nasu/info.json b/keyboards/nasu/keyboard.json
similarity index 98%
rename from keyboards/nasu/info.json
rename to keyboards/nasu/keyboard.json
index c92da94c50..54905f4d09 100644
--- a/keyboards/nasu/info.json
+++ b/keyboards/nasu/keyboard.json
@@ -8,6 +8,12 @@
         "pid": "0x4E53",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
     "matrix_pins": {
         "cols": ["A9", "A8", "B15", "B14", "B13", "B12", "B11", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14"],
         "rows": ["A13", "A10", "B10", "B2", "A6"]
diff --git a/keyboards/nasu/rules.mk b/keyboards/nasu/rules.mk
index 7c0709f41e..0ab54aaaf7 100644
--- a/keyboards/nasu/rules.mk
+++ b/keyboards/nasu/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 = 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/nek_type_a/info.json b/keyboards/nek_type_a/keyboard.json
similarity index 96%
rename from keyboards/nek_type_a/info.json
rename to keyboards/nek_type_a/keyboard.json
index 6cb972b17f..632eafee44 100644
--- a/keyboards/nek_type_a/info.json
+++ b/keyboards/nek_type_a/keyboard.json
@@ -8,6 +8,15 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bluetooth": true,
+        "bootmagic": false,
+        "command": true,
+        "console": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": false
+    },
     "bluetooth": {
         "driver": "bluefruit_le"
     },
diff --git a/keyboards/nek_type_a/rules.mk b/keyboards/nek_type_a/rules.mk
index f79051ebce..e753d6afbe 100644
--- a/keyboards/nek_type_a/rules.mk
+++ b/keyboards/nek_type_a/rules.mk
@@ -1,20 +1,5 @@
 # Processor frequency
 F_CPU = 8000000
 
-# 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 = 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
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
 CUSTOM_MATRIX = yes
-DEBUG_ENABLE = yes
-BLUETOOTH_ENABLE = yes
-
 SRC += matrix.c mcp23017.c
diff --git a/keyboards/neson_design/700e/info.json b/keyboards/neson_design/700e/keyboard.json
similarity index 98%
rename from keyboards/neson_design/700e/info.json
rename to keyboards/neson_design/700e/keyboard.json
index 3b74e9609a..64a18f436b 100644
--- a/keyboards/neson_design/700e/info.json
+++ b/keyboards/neson_design/700e/keyboard.json
@@ -6,7 +6,15 @@
     "usb": {
         "vid": "0x4E65",
         "pid": "0x700E",
-        "device_version": "0.0.1"
+        "device_version": "0.0.1",
+        "no_startup_check": true
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
     },
     "matrix_pins": {
         "cols": ["F7", "B0", "B3", "B1", "B2", "F4", "C7", "C6", "B6", "B5", "B4", "D7", "D3", "D2", "D6", "D4"],
diff --git a/keyboards/neson_design/700e/rules.mk b/keyboards/neson_design/700e/rules.mk
index dd1db38bab..6fab966c73 100644
--- a/keyboards/neson_design/700e/rules.mk
+++ b/keyboards/neson_design/700e/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 = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes		# Enable keyboard RGB underglow
-NO_USB_STARTUP_CHECK = yes
-
 QUANTUM_LIB_SRC += drivers/led/issi/is31fl3731.c
 WS2812_DRIVER_REQUIRED = yes
 I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/neson_design/n6/info.json b/keyboards/neson_design/n6/keyboard.json
similarity index 98%
rename from keyboards/neson_design/n6/info.json
rename to keyboards/neson_design/n6/keyboard.json
index c48824d80f..66e6fb740c 100644
--- a/keyboards/neson_design/n6/info.json
+++ b/keyboards/neson_design/n6/keyboard.json
@@ -8,6 +8,13 @@
         "pid": "0x4E36",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true,
+        "rgblight": true
+    },
     "matrix_pins": {
         "cols": ["F7", "B0", "E6", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "B2", "D3", "D2"],
         "rows": ["F0", "B1", "F6", "F4", "F1"]
diff --git a/keyboards/neson_design/n6/rules.mk b/keyboards/neson_design/n6/rules.mk
index 4c9ce45352..6fab966c73 100644
--- a/keyboards/neson_design/n6/rules.mk
+++ b/keyboards/neson_design/n6/rules.mk
@@ -1,15 +1,3 @@
-# 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 = yes		# Enable keyboard RGB underglow
-
 QUANTUM_LIB_SRC += drivers/led/issi/is31fl3731.c
 WS2812_DRIVER_REQUIRED = yes
 I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/novelkeys/nk20/info.json b/keyboards/novelkeys/nk20/keyboard.json
similarity index 95%
rename from keyboards/novelkeys/nk20/info.json
rename to keyboards/novelkeys/nk20/keyboard.json
index 6d25ca4c21..f2728967b4 100644
--- a/keyboards/novelkeys/nk20/info.json
+++ b/keyboards/novelkeys/nk20/keyboard.json
@@ -8,6 +8,13 @@
         "pid": "0x4E4E",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
     "ws2812": {
         "pin": "A7",
         "driver": "pwm"
diff --git a/keyboards/novelkeys/nk20/rules.mk b/keyboards/novelkeys/nk20/rules.mk
index 9470fce1ba..0ab54aaaf7 100644
--- a/keyboards/novelkeys/nk20/rules.mk
+++ b/keyboards/novelkeys/nk20/rules.mk
@@ -1,16 +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
-RGB_MATRIX_ENABLE = yes     # Enable Per-key RGB
diff --git a/keyboards/novelkeys/nk65/info.json b/keyboards/novelkeys/nk65/info.json
index 59187f9ef8..e3bff19346 100755
--- a/keyboards/novelkeys/nk65/info.json
+++ b/keyboards/novelkeys/nk65/info.json
@@ -8,6 +8,12 @@
         "pid": "0x4E4B",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
     "processor": "STM32F303",
     "bootloader": "stm32-dfu",
     "board": "QMK_PROTON_C",
diff --git a/keyboards/novelkeys/nk65/rules.mk b/keyboards/novelkeys/nk65/rules.mk
index 5827e557b9..9fe973310c 100755
--- a/keyboards/novelkeys/nk65/rules.mk
+++ b/keyboards/novelkeys/nk65/rules.mk
@@ -3,25 +3,13 @@
 # backlight effects.
 OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
 
-# Build Options
-#   change yes to no to disable
-#
-BACKLIGHT_ENABLE = no              # Enable keyboard backlight functionality
-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
-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 \
 		drivers/led/issi/is31fl3733.c \
 		quantum/color.c
-I2C_DRIVER_REQUIRED = yes
 
 DEFAULT_FOLDER = novelkeys/nk65/base
diff --git a/keyboards/novelkeys/nk65b/info.json b/keyboards/novelkeys/nk65b/keyboard.json
similarity index 97%
rename from keyboards/novelkeys/nk65b/info.json
rename to keyboards/novelkeys/nk65b/keyboard.json
index 8e6e01fe46..0c2794c120 100755
--- a/keyboards/novelkeys/nk65b/info.json
+++ b/keyboards/novelkeys/nk65b/keyboard.json
@@ -8,6 +8,13 @@
         "pid": "0x4E4F",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
     "ws2812": {
         "pin": "B4",
         "driver": "pwm"
diff --git a/keyboards/novelkeys/nk65b/rules.mk b/keyboards/novelkeys/nk65b/rules.mk
index 9470fce1ba..0ab54aaaf7 100644
--- a/keyboards/novelkeys/nk65b/rules.mk
+++ b/keyboards/novelkeys/nk65b/rules.mk
@@ -1,16 +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
-RGB_MATRIX_ENABLE = yes     # Enable Per-key RGB
diff --git a/keyboards/novelkeys/nk87/info.json b/keyboards/novelkeys/nk87/keyboard.json
similarity index 98%
rename from keyboards/novelkeys/nk87/info.json
rename to keyboards/novelkeys/nk87/keyboard.json
index 6170895405..9573ff4c9c 100755
--- a/keyboards/novelkeys/nk87/info.json
+++ b/keyboards/novelkeys/nk87/keyboard.json
@@ -8,6 +8,12 @@
         "pid": "0x4E4C",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
     "matrix_pins": {
         "cols": ["A13", "A10", "A9", "A14", "A15", "B8", "B9", "B2", "B0", "A6", "A0", "A1", "A2", "A3", "A5", "B1", "B10"],
         "rows": ["A7", "B3", "B4", "B5", "A8", "A4"]
diff --git a/keyboards/novelkeys/nk87/rules.mk b/keyboards/novelkeys/nk87/rules.mk
index a0a09c1dab..ef378d1ec2 100755
--- a/keyboards/novelkeys/nk87/rules.mk
+++ b/keyboards/novelkeys/nk87/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 = 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
-
 CIE1931_CURVE = yes
+I2C_DRIVER_REQUIRED = yes
 
 # project specific files
 SRC =	keyboards/wilba_tech/wt_main.c \
 		keyboards/wilba_tech/wt_rgb_backlight.c \
 		drivers/led/issi/is31fl3733.c \
 		quantum/color.c
-I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/novelkeys/nk87b/info.json b/keyboards/novelkeys/nk87b/keyboard.json
similarity index 98%
rename from keyboards/novelkeys/nk87b/info.json
rename to keyboards/novelkeys/nk87b/keyboard.json
index cbcc8e2e18..f81793acee 100755
--- a/keyboards/novelkeys/nk87b/info.json
+++ b/keyboards/novelkeys/nk87b/keyboard.json
@@ -8,6 +8,13 @@
         "pid": "0x4E50",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
     "ws2812": {
         "pin": "B0",
         "driver": "pwm"
diff --git a/keyboards/novelkeys/nk87b/rules.mk b/keyboards/novelkeys/nk87b/rules.mk
index 9470fce1ba..0ab54aaaf7 100644
--- a/keyboards/novelkeys/nk87b/rules.mk
+++ b/keyboards/novelkeys/nk87b/rules.mk
@@ -1,16 +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
-RGB_MATRIX_ENABLE = yes     # Enable Per-key RGB
diff --git a/keyboards/novelkeys/nk_plus/info.json b/keyboards/novelkeys/nk_plus/keyboard.json
similarity index 100%
rename from keyboards/novelkeys/nk_plus/info.json
rename to keyboards/novelkeys/nk_plus/keyboard.json
diff --git a/keyboards/novelkeys/skelett60/info.json b/keyboards/novelkeys/skelett60/keyboard.json
similarity index 100%
rename from keyboards/novelkeys/skelett60/info.json
rename to keyboards/novelkeys/skelett60/keyboard.json
diff --git a/keyboards/novelkeys/skelett60/rules.mk b/keyboards/novelkeys/skelett60/rules.mk
index 6dd24d8e06..0ab54aaaf7 100644
--- a/keyboards/novelkeys/skelett60/rules.mk
+++ b/keyboards/novelkeys/skelett60/rules.mk
@@ -1,3 +1,2 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-
diff --git a/keyboards/nullbitsco/nibble/info.json b/keyboards/nullbitsco/nibble/keyboard.json
similarity index 98%
rename from keyboards/nullbitsco/nibble/info.json
rename to keyboards/nullbitsco/nibble/keyboard.json
index 159e501218..fb1c8098a0 100644
--- a/keyboards/nullbitsco/nibble/info.json
+++ b/keyboards/nullbitsco/nibble/keyboard.json
@@ -7,6 +7,17 @@
         "pid": "0x6060",
         "device_version": "0.0.1"
     },
+    "build": {
+        "lto": true
+    },
+    "features": {
+        "bootmagic": false,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true,
+        "rgblight": true
+    },
     "encoder": {
         "rotary": [
             {"pin_a": "B5", "pin_b": "B4"}
diff --git a/keyboards/nullbitsco/nibble/rules.mk b/keyboards/nullbitsco/nibble/rules.mk
index 5a1714cc9d..ad36b7fcc9 100644
--- a/keyboards/nullbitsco/nibble/rules.mk
+++ b/keyboards/nullbitsco/nibble/rules.mk
@@ -1,22 +1,9 @@
-# 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 = 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        # Use rotary encoder
-LTO_ENABLE = yes            # Link-time optimization
-CUSTOM_MATRIX = lite        # Lite custom matrix
+CUSTOM_MATRIX = lite
+
+UART_DRIVER_REQUIRED = yes
 
 # Project specific files
 SRC += matrix.c \
        common/bitc_led.c \
        big_led.c \
        common/remote_kb.c
-UART_DRIVER_REQUIRED = yes
diff --git a/keyboards/nullbitsco/scramble/rules.mk b/keyboards/nullbitsco/scramble/rules.mk
index 6f83796e9f..5753f7786d 100644
--- a/keyboards/nullbitsco/scramble/rules.mk
+++ b/keyboards/nullbitsco/scramble/rules.mk
@@ -1,4 +1 @@
-# NOTE: This file is shared and only exists to set the default build
-# The real build rules are set in the v1/v2 directories
-
 DEFAULT_FOLDER = nullbitsco/scramble/v2
diff --git a/keyboards/nullbitsco/scramble/v1/info.json b/keyboards/nullbitsco/scramble/v1/keyboard.json
similarity index 68%
rename from keyboards/nullbitsco/scramble/v1/info.json
rename to keyboards/nullbitsco/scramble/v1/keyboard.json
index 5a9aeef64b..145f4f389c 100644
--- a/keyboards/nullbitsco/scramble/v1/info.json
+++ b/keyboards/nullbitsco/scramble/v1/keyboard.json
@@ -1,4 +1,11 @@
 {
+    "features": {
+        "bootmagic": false,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    },
     "encoder": {
         "rotary": [
             {"pin_a": "D6", "pin_b": "D7"}
diff --git a/keyboards/nullbitsco/scramble/v1/rules.mk b/keyboards/nullbitsco/scramble/v1/rules.mk
deleted file mode 100644
index f917d68f4e..0000000000
--- a/keyboards/nullbitsco/scramble/v1/rules.mk
+++ /dev/null
@@ -1,13 +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 = 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        # Use rotary encoder
diff --git a/keyboards/nullbitsco/scramble/v2/info.json b/keyboards/nullbitsco/scramble/v2/keyboard.json
similarity index 69%
rename from keyboards/nullbitsco/scramble/v2/info.json
rename to keyboards/nullbitsco/scramble/v2/keyboard.json
index 2a89a1063b..a55e878741 100644
--- a/keyboards/nullbitsco/scramble/v2/info.json
+++ b/keyboards/nullbitsco/scramble/v2/keyboard.json
@@ -1,4 +1,11 @@
 {
+    "features": {
+        "bootmagic": false,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    },
     "encoder": {
         "rotary": [
             {"pin_a": "GP24", "pin_b": "GP25"}
diff --git a/keyboards/nullbitsco/scramble/v2/rules.mk b/keyboards/nullbitsco/scramble/v2/rules.mk
deleted file mode 100644
index f917d68f4e..0000000000
--- a/keyboards/nullbitsco/scramble/v2/rules.mk
+++ /dev/null
@@ -1,13 +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 = 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        # Use rotary encoder
diff --git a/keyboards/nullbitsco/snap/info.json b/keyboards/nullbitsco/snap/keyboard.json
similarity index 98%
rename from keyboards/nullbitsco/snap/info.json
rename to keyboards/nullbitsco/snap/keyboard.json
index 909e45d162..139bbf5b45 100644
--- a/keyboards/nullbitsco/snap/info.json
+++ b/keyboards/nullbitsco/snap/keyboard.json
@@ -7,6 +7,18 @@
         "pid": "0x6063",
         "device_version": "0.0.1"
     },
+    "build": {
+        "lto": true
+    },
+    "features": {
+        "bootmagic": false,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": false,
+        "rgblight": true,
+        "space_cadet": false
+    },
     "encoder": {
         "rotary": [
             {"pin_a": "B3", "pin_b": "B1"}
diff --git a/keyboards/nullbitsco/snap/rules.mk b/keyboards/nullbitsco/snap/rules.mk
index 087be867f3..1603cb408c 100644
--- a/keyboards/nullbitsco/snap/rules.mk
+++ b/keyboards/nullbitsco/snap/rules.mk
@@ -1,22 +1,8 @@
-# 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
-AUDIO_ENABLE = no          # Audio output
-LTO_ENABLE = yes           # Use Link Time Optimization
-ENCODER_ENABLE = yes       # Enables the use of one or more encoders
-SPACE_CADET_ENABLE = no    # Enables the use of Space Cadet
-RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
-CUSTOM_MATRIX = lite       # Split custom matrix
+CUSTOM_MATRIX = lite
+
+UART_DRIVER_REQUIRED = yes
 
 # Project specific files
 SRC +=  common/bitc_led.c \
         common/remote_kb.c \
         matrix.c
-UART_DRIVER_REQUIRED = yes
diff --git a/keyboards/nullbitsco/tidbit/info.json b/keyboards/nullbitsco/tidbit/keyboard.json
similarity index 90%
rename from keyboards/nullbitsco/tidbit/info.json
rename to keyboards/nullbitsco/tidbit/keyboard.json
index b8eaf60d89..83593ad523 100644
--- a/keyboards/nullbitsco/tidbit/info.json
+++ b/keyboards/nullbitsco/tidbit/keyboard.json
@@ -7,6 +7,17 @@
         "pid": "0x6064",
         "device_version": "0.0.1"
     },
+    "build": {
+        "lto": true
+    },
+    "features": {
+        "bootmagic": false,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "rgblight": true
+    },
     "rgblight": {
         "led_count": 8,
         "animations": {
diff --git a/keyboards/nullbitsco/tidbit/rules.mk b/keyboards/nullbitsco/tidbit/rules.mk
index b4a06216bb..9cc22114ae 100644
--- a/keyboards/nullbitsco/tidbit/rules.mk
+++ b/keyboards/nullbitsco/tidbit/rules.mk
@@ -1,18 +1,3 @@
-# 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
-ENCODER_ENABLE = yes
-LTO_ENABLE = yes
-
 # Project specific files
 SRC += common/bitc_led.c \
     common/remote_kb.c
diff --git a/keyboards/numatreus/info.json b/keyboards/numatreus/keyboard.json
similarity index 95%
rename from keyboards/numatreus/info.json
rename to keyboards/numatreus/keyboard.json
index bdf4a574c6..cfb612a541 100644
--- a/keyboards/numatreus/info.json
+++ b/keyboards/numatreus/keyboard.json
@@ -8,6 +8,13 @@
     "pid": "0xE80A",
     "device_version": "0.0.1"
   },
+  "features": {
+    "bootmagic": false,
+    "extrakey": false,
+    "mousekey": true,
+    "nkro": true,
+    "unicode": true
+  },
   "matrix_pins": {
     "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "D2", "D1", "D0", "D4"],
     "rows": ["C6", "D7", "E6", "B4"]
diff --git a/keyboards/numatreus/keymaps/like_jis/config.h b/keyboards/numatreus/keymaps/like_jis/config.h
index 70faffdf37..52675f5ec5 100644
--- a/keyboards/numatreus/keymaps/like_jis/config.h
+++ b/keyboards/numatreus/keymaps/like_jis/config.h
@@ -22,9 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // place overrides here
 
-#ifdef TAPPING_TERM
 #undef TAPPING_TERM
-#endif
 #define TAPPING_TERM 225
 
 #ifdef MOUSEKEY_ENABLE
@@ -45,14 +43,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #endif
 
 // Selection of RGBLIGHT MODE to use.
-#if defined(LED_ANIMATIONS)
-   //#define RGBLIGHT_EFFECT_BREATHING
-   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-   //#define RGBLIGHT_EFFECT_SNAKE
-   #define RGBLIGHT_EFFECT_KNIGHT
-   //#define RGBLIGHT_EFFECT_CHRISTMAS
-   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-   //#define RGBLIGHT_EFFECT_RGB_TEST
-   //#define RGBLIGHT_EFFECT_ALTERNATING
-#endif
+//#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+//#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+//#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+//#define RGBLIGHT_EFFECT_RGB_TEST
+//#define RGBLIGHT_EFFECT_ALTERNATING
diff --git a/keyboards/numatreus/keymaps/like_jis/rules.mk b/keyboards/numatreus/keymaps/like_jis/rules.mk
index 959653f3f8..995178768c 100644
--- a/keyboards/numatreus/keymaps/like_jis/rules.mk
+++ b/keyboards/numatreus/keymaps/like_jis/rules.mk
@@ -1,8 +1,3 @@
 MOUSEKEY_ENABLE = yes
 TAP_DANCE_ENABLE = yes
 RGBLIGHT_ENABLE = yes
-LED_ANIMATIONS = yes
-
-ifeq ($(strip $(LED_ANIMATIONS)), yes)
-    OPT_DEFS += -DLED_ANIMATIONS
-endif
diff --git a/keyboards/numatreus/post_rules.mk b/keyboards/numatreus/post_rules.mk
deleted file mode 100644
index 1f49875d0f..0000000000
--- a/keyboards/numatreus/post_rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-ifeq ($(strip $(LED_ANIMATIONS)), yes)
-    OPT_DEFS += -DLED_ANIMATIONS
-endif
diff --git a/keyboards/numatreus/rules.mk b/keyboards/numatreus/rules.mk
deleted file mode 100644
index 2a92a7e48b..0000000000
--- a/keyboards/numatreus/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # 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 = yes           # Enable N-Key Rollover
-#BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
-UNICODE_ENABLE = yes         # Unicode
-RGBLIGHT_ENABLE = no
-LED_ANIMATIONS = no