From 8f8fffc1740be81fbfe4a07a74e9f03962c1062a Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Sat, 27 Apr 2024 05:58:04 -0700
Subject: [PATCH] Data-Driven Keyboard Conversions: Mechlovin (#23624)

---
 keyboards/mechlovin/adelais/info.json              |  8 --------
 .../rgb_led/rev1/{info.json => keyboard.json}      |  9 +++++++++
 keyboards/mechlovin/adelais/rgb_led/rev1/rules.mk  |  1 -
 .../rgb_led/rev2/{info.json => keyboard.json}      | 11 +++++++++++
 keyboards/mechlovin/adelais/rgb_led/rev2/rules.mk  |  3 ---
 .../rgb_led/rev3/{info.json => keyboard.json}      | 11 +++++++++++
 keyboards/mechlovin/adelais/rgb_led/rev3/rules.mk  |  8 --------
 keyboards/mechlovin/adelais/rgb_led/rules.mk       |  4 +---
 .../adelais/standard_led/arm/rev2/keyboard.json    | 10 ++++++++++
 .../arm/rev3/{info.json => keyboard.json}          | 11 +++++++++++
 .../adelais/standard_led/arm/rev3/rules.mk         |  1 -
 .../standard_led/arm/rev4/apm32f103/keyboard.json  | 13 ++++++++++++-
 .../adelais/standard_led/arm/rev4/info.json        |  9 ---------
 .../standard_led/arm/rev4/stm32f303/keyboard.json  | 13 ++++++++++++-
 .../avr/rev1/{info.json => keyboard.json}          | 10 ++++++++++
 .../adelais/standard_led/avr/rev1/rules.mk         |  4 ----
 keyboards/mechlovin/adelais/standard_led/rules.mk  |  4 ----
 keyboards/mechlovin/delphine/info.json             |  8 --------
 .../delphine/mono_led/{info.json => keyboard.json} |  8 ++++++++
 keyboards/mechlovin/delphine/mono_led/rules.mk     |  2 --
 .../delphine/rgb_led/{info.json => keyboard.json}  |  7 +++++++
 keyboards/mechlovin/delphine/rgb_led/rules.mk      |  2 --
 .../hannah60rgb/rev1/{info.json => keyboard.json}  |  9 +++++++++
 keyboards/mechlovin/hannah60rgb/rev1/rules.mk      |  1 -
 .../hannah60rgb/rev2/{info.json => keyboard.json}  | 10 ++++++++++
 keyboards/mechlovin/hannah60rgb/rev2/rules.mk      |  2 --
 keyboards/mechlovin/hannah60rgb/rules.mk           | 12 ------------
 keyboards/mechlovin/hannah65/info.json             |  9 ---------
 .../mechlovin/hannah65/rev1/haus/keyboard.json     |  9 +++++++++
 .../hannah910/rev1/{info.json => keyboard.json}    |  7 +++++++
 keyboards/mechlovin/hannah910/rev1/rules.mk        | 12 ------------
 .../hannah910/rev2/{info.json => keyboard.json}    |  7 +++++++
 keyboards/mechlovin/hannah910/rev2/rules.mk        | 12 ------------
 .../hannah910/rev3/{info.json => keyboard.json}    |  7 +++++++
 keyboards/mechlovin/hannah910/rev3/rules.mk        | 12 ------------
 keyboards/mechlovin/hex4b/rev1/info.json           |  6 ++++++
 keyboards/mechlovin/hex4b/rev1/rules.mk            | 13 -------------
 .../hex4b/rev2/{info.json => keyboard.json}        |  9 +++++++++
 keyboards/mechlovin/hex4b/rev2/rules.mk            | 12 ------------
 keyboards/mechlovin/infinity87/rev1/info.json      |  9 ---------
 .../infinity87/rev1/rogue87/keyboard.json          |  6 ++++++
 .../infinity87/rev1/rouge87/keyboard.json          |  6 ++++++
 .../rev1/standard/{info.json => keyboard.json}     | 10 ++++++++++
 .../mechlovin/infinity87/rev1/standard/rules.mk    |  1 -
 keyboards/mechlovin/infinity87/rev2/info.json      |  8 ++++++++
 keyboards/mechlovin/infinity87/rev2/rules.mk       |  8 --------
 .../rgb_rev1/{info.json => keyboard.json}          |  9 +++++++++
 keyboards/mechlovin/infinity87/rgb_rev1/rules.mk   |  1 -
 keyboards/mechlovin/infinity87/rules.mk            | 14 --------------
 keyboards/mechlovin/infinity875/info.json          |  6 ++++++
 keyboards/mechlovin/infinity875/rules.mk           | 13 -------------
 keyboards/mechlovin/jay60/info.json                |  5 +++++
 keyboards/mechlovin/jay60/rules.mk                 | 13 -------------
 keyboards/mechlovin/mechlovin9/info.json           |  8 --------
 .../mechlovin9/rev1/{info.json => keyboard.json}   | 12 +++++++++---
 keyboards/mechlovin/mechlovin9/rev1/rules.mk       |  6 ------
 keyboards/mechlovin/mechlovin9/rev2/info.json      |  3 +++
 keyboards/mechlovin/mechlovin9/rev3/keyboard.json  |  5 +++++
 keyboards/mechlovin/olly/bb/info.json              |  7 +++++++
 keyboards/mechlovin/olly/bb/rules.mk               | 13 -------------
 keyboards/mechlovin/olly/jf/info.json              |  9 ---------
 keyboards/mechlovin/olly/jf/rev1/info.json         |  6 +++++-
 keyboards/mechlovin/olly/jf/rev2/keyboard.json     | 10 +++++++---
 keyboards/mechlovin/serratus/info.json             |  8 ++++++++
 keyboards/mechlovin/serratus/rules.mk              | 12 ------------
 keyboards/mechlovin/th1800/info.json               |  5 +++++
 keyboards/mechlovin/th1800/rules.mk                | 13 -------------
 keyboards/mechlovin/zed1800/info.json              |  9 ---------
 keyboards/mechlovin/zed1800/oreum/keyboard.json    |  8 ++++++++
 keyboards/mechlovin/zed1800/rules.mk               |  2 +-
 keyboards/mechlovin/zed1800/saber/keyboard.json    |  8 ++++++++
 keyboards/mechlovin/zed1800/zepsody/keyboard.json  |  8 ++++++++
 keyboards/mechlovin/zed65/910/keyboard.json        |  5 +++++
 keyboards/mechlovin/zed65/info.json                |  9 +--------
 .../zed65/mono_led/{info.json => keyboard.json}    | 10 ++++++++++
 keyboards/mechlovin/zed65/mono_led/rules.mk        |  4 ----
 .../retro66/{info.json => keyboard.json}           |  8 ++++++++
 .../mechlovin/zed65/no_backlight/retro66/rules.mk  |  1 -
 keyboards/mechlovin/zed65/no_backlight/rules.mk    |  2 --
 .../wearhaus66/{info.json => keyboard.json}        |  8 ++++++++
 .../zed65/no_backlight/wearhaus66/rules.mk         |  1 -
 keyboards/mechlovin/zed65/rev1/keyboard.json       |  5 +++++
 82 files changed, 327 insertions(+), 293 deletions(-)
 rename keyboards/mechlovin/adelais/rgb_led/rev1/{info.json => keyboard.json} (98%)
 delete mode 100644 keyboards/mechlovin/adelais/rgb_led/rev1/rules.mk
 rename keyboards/mechlovin/adelais/rgb_led/rev2/{info.json => keyboard.json} (98%)
 delete mode 100644 keyboards/mechlovin/adelais/rgb_led/rev2/rules.mk
 rename keyboards/mechlovin/adelais/rgb_led/rev3/{info.json => keyboard.json} (98%)
 delete mode 100644 keyboards/mechlovin/adelais/rgb_led/rev3/rules.mk
 rename keyboards/mechlovin/adelais/standard_led/arm/rev3/{info.json => keyboard.json} (98%)
 delete mode 100644 keyboards/mechlovin/adelais/standard_led/arm/rev3/rules.mk
 rename keyboards/mechlovin/adelais/standard_led/avr/rev1/{info.json => keyboard.json} (98%)
 rename keyboards/mechlovin/delphine/mono_led/{info.json => keyboard.json} (78%)
 delete mode 100644 keyboards/mechlovin/delphine/mono_led/rules.mk
 rename keyboards/mechlovin/delphine/rgb_led/{info.json => keyboard.json} (93%)
 delete mode 100644 keyboards/mechlovin/delphine/rgb_led/rules.mk
 rename keyboards/mechlovin/hannah60rgb/rev1/{info.json => keyboard.json} (98%)
 delete mode 100644 keyboards/mechlovin/hannah60rgb/rev1/rules.mk
 rename keyboards/mechlovin/hannah60rgb/rev2/{info.json => keyboard.json} (98%)
 delete mode 100644 keyboards/mechlovin/hannah60rgb/rev2/rules.mk
 rename keyboards/mechlovin/hannah910/rev1/{info.json => keyboard.json} (98%)
 delete mode 100644 keyboards/mechlovin/hannah910/rev1/rules.mk
 rename keyboards/mechlovin/hannah910/rev2/{info.json => keyboard.json} (98%)
 delete mode 100644 keyboards/mechlovin/hannah910/rev2/rules.mk
 rename keyboards/mechlovin/hannah910/rev3/{info.json => keyboard.json} (98%)
 delete mode 100644 keyboards/mechlovin/hannah910/rev3/rules.mk
 rename keyboards/mechlovin/hex4b/rev2/{info.json => keyboard.json} (75%)
 delete mode 100644 keyboards/mechlovin/hex4b/rev2/rules.mk
 rename keyboards/mechlovin/infinity87/rev1/standard/{info.json => keyboard.json} (99%)
 delete mode 100644 keyboards/mechlovin/infinity87/rev1/standard/rules.mk
 rename keyboards/mechlovin/infinity87/rgb_rev1/{info.json => keyboard.json} (99%)
 delete mode 100644 keyboards/mechlovin/infinity87/rgb_rev1/rules.mk
 rename keyboards/mechlovin/mechlovin9/rev1/{info.json => keyboard.json} (80%)
 delete mode 100644 keyboards/mechlovin/mechlovin9/rev1/rules.mk
 rename keyboards/mechlovin/zed65/mono_led/{info.json => keyboard.json} (98%)
 delete mode 100644 keyboards/mechlovin/zed65/mono_led/rules.mk
 rename keyboards/mechlovin/zed65/no_backlight/retro66/{info.json => keyboard.json} (97%)
 delete mode 100644 keyboards/mechlovin/zed65/no_backlight/retro66/rules.mk
 rename keyboards/mechlovin/zed65/no_backlight/wearhaus66/{info.json => keyboard.json} (98%)
 delete mode 100644 keyboards/mechlovin/zed65/no_backlight/wearhaus66/rules.mk

diff --git a/keyboards/mechlovin/adelais/info.json b/keyboards/mechlovin/adelais/info.json
index d8aae5a8da..42b16d6398 100644
--- a/keyboards/mechlovin/adelais/info.json
+++ b/keyboards/mechlovin/adelais/info.json
@@ -2,14 +2,6 @@
     "manufacturer": "Team.Mechlovin",
     "url": "",
     "maintainer": "mechlovin",
-    "features": {
-        "bootmagic": true,
-        "command": true,
-        "console": true,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": true
-    },
     "usb": {
         "vid": "0x4D4C",
         "device_version": "0.0.1"
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev1/info.json b/keyboards/mechlovin/adelais/rgb_led/rev1/keyboard.json
similarity index 98%
rename from keyboards/mechlovin/adelais/rgb_led/rev1/info.json
rename to keyboards/mechlovin/adelais/rgb_led/rev1/keyboard.json
index af68bb8457..01232b07e8 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev1/info.json
+++ b/keyboards/mechlovin/adelais/rgb_led/rev1/keyboard.json
@@ -3,6 +3,15 @@
     "usb": {
         "pid": "0xAEC1"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
     "rgb_matrix": {
         "animations": {
             "alphas_mods": true,
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev1/rules.mk b/keyboards/mechlovin/adelais/rgb_led/rev1/rules.mk
deleted file mode 100644
index aad92997d0..0000000000
--- a/keyboards/mechlovin/adelais/rgb_led/rev1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RGB_MATRIX_ENABLE = yes
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/info.json b/keyboards/mechlovin/adelais/rgb_led/rev2/keyboard.json
similarity index 98%
rename from keyboards/mechlovin/adelais/rgb_led/rev2/info.json
rename to keyboards/mechlovin/adelais/rgb_led/rev2/keyboard.json
index fb88cb359d..a8633af5da 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev2/info.json
+++ b/keyboards/mechlovin/adelais/rgb_led/rev2/keyboard.json
@@ -3,6 +3,17 @@
     "usb": {
         "pid": "0xAEC2"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "nkro": true,
+        "rgblight": true,
+        "rgb_matrix": true,
+        "encoder": true
+    },
     "rgb_matrix": {
         "animations": {
             "alphas_mods": true,
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/rules.mk b/keyboards/mechlovin/adelais/rgb_led/rev2/rules.mk
deleted file mode 100644
index e79b2862e6..0000000000
--- a/keyboards/mechlovin/adelais/rgb_led/rev2/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-RGB_MATRIX_ENABLE = yes
-RGBLIGHT_ENABLE = yes
-ENCODER_ENABLE = yes
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/info.json b/keyboards/mechlovin/adelais/rgb_led/rev3/keyboard.json
similarity index 98%
rename from keyboards/mechlovin/adelais/rgb_led/rev3/info.json
rename to keyboards/mechlovin/adelais/rgb_led/rev3/keyboard.json
index 62acf349c0..628eb404a5 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev3/info.json
+++ b/keyboards/mechlovin/adelais/rgb_led/rev3/keyboard.json
@@ -3,6 +3,17 @@
     "usb": {
         "pid": "0xAEC3"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": false,
+        "command": false,
+        "nkro": true,
+        "rgblight": true,
+        "rgb_matrix": true,
+        "encoder": true
+    },
     "rgb_matrix": {
         "animations": {
             "alphas_mods": true,
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/rules.mk b/keyboards/mechlovin/adelais/rgb_led/rev3/rules.mk
deleted file mode 100644
index e144301381..0000000000
--- a/keyboards/mechlovin/adelais/rgb_led/rev3/rules.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-RGB_MATRIX_ENABLE = yes
-RGBLIGHT_ENABLE = yes
-ENCODER_ENABLE = yes
-CONSOLE_ENABLE = no        # Console for debug
-COMMAND_ENABLE = no        # Commands for debug and configuration
diff --git a/keyboards/mechlovin/adelais/rgb_led/rules.mk b/keyboards/mechlovin/adelais/rgb_led/rules.mk
index 8a9bdd433d..18047f12c7 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rules.mk
+++ b/keyboards/mechlovin/adelais/rgb_led/rules.mk
@@ -1,3 +1 @@
-
-
-DEFAULT_FOLDER = mechlovin/adelais/rgb_led/rev1
\ No newline at end of file
+DEFAULT_FOLDER = mechlovin/adelais/rgb_led/rev1
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev2/keyboard.json b/keyboards/mechlovin/adelais/standard_led/arm/rev2/keyboard.json
index 9a2a280c10..53005dfa33 100644
--- a/keyboards/mechlovin/adelais/standard_led/arm/rev2/keyboard.json
+++ b/keyboards/mechlovin/adelais/standard_led/arm/rev2/keyboard.json
@@ -2,6 +2,16 @@
     "usb": {
         "pid": "0xAD01"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "nkro": true,
+        "backlight": true,
+        "rgblight": true
+    },
     "processor": "STM32F303",
     "board": "QMK_PROTON_C",
     "bootloader": "stm32-dfu",
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev3/info.json b/keyboards/mechlovin/adelais/standard_led/arm/rev3/keyboard.json
similarity index 98%
rename from keyboards/mechlovin/adelais/standard_led/arm/rev3/info.json
rename to keyboards/mechlovin/adelais/standard_led/arm/rev3/keyboard.json
index 46907dc7a9..1129500790 100644
--- a/keyboards/mechlovin/adelais/standard_led/arm/rev3/info.json
+++ b/keyboards/mechlovin/adelais/standard_led/arm/rev3/keyboard.json
@@ -2,6 +2,17 @@
     "usb": {
         "pid": "0xAD02"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "nkro": true,
+        "backlight": true,
+        "rgblight": true,
+        "encoder": true
+    },
     "encoder": {
         "rotary": [
             {"pin_a": "A6", "pin_b": "A5"},
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev3/rules.mk b/keyboards/mechlovin/adelais/standard_led/arm/rev3/rules.mk
deleted file mode 100644
index 5af1ba8536..0000000000
--- a/keyboards/mechlovin/adelais/standard_led/arm/rev3/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-ENCODER_ENABLE = yes
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/keyboard.json b/keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/keyboard.json
index cf993be247..f6b79e35d0 100644
--- a/keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/keyboard.json
+++ b/keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/keyboard.json
@@ -1,4 +1,15 @@
 {
     "processor": "STM32F103",
-    "bootloader": "stm32duino"
+    "bootloader": "stm32duino",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "nkro": true,
+        "backlight": true,
+        "rgblight": true,
+        "encoder": true
+    }
 }
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev4/info.json b/keyboards/mechlovin/adelais/standard_led/arm/rev4/info.json
index 17cf63fecf..f0d10942ad 100644
--- a/keyboards/mechlovin/adelais/standard_led/arm/rev4/info.json
+++ b/keyboards/mechlovin/adelais/standard_led/arm/rev4/info.json
@@ -1,13 +1,4 @@
 {
-    "features": {
-        "bootmagic": false,
-        "command": false,
-        "console": false,
-        "encoder": true,
-        "extrakey": false,
-        "mousekey": false,
-        "nkro": false
-    },
     "usb": {
         "pid": "0xAD03"
     },
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/keyboard.json b/keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/keyboard.json
index 774c3dcf31..9e9748fa93 100644
--- a/keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/keyboard.json
+++ b/keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/keyboard.json
@@ -1,5 +1,16 @@
 {
     "processor": "STM32F303",
     "board": "QMK_PROTON_C",
-    "bootloader": "stm32-dfu"
+    "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "nkro": true,
+        "backlight": true,
+        "rgblight": true,
+        "encoder": true
+    }
 }
diff --git a/keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json b/keyboards/mechlovin/adelais/standard_led/avr/rev1/keyboard.json
similarity index 98%
rename from keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json
rename to keyboards/mechlovin/adelais/standard_led/avr/rev1/keyboard.json
index 95aac7b0d4..3758a8f085 100644
--- a/keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json
+++ b/keyboards/mechlovin/adelais/standard_led/avr/rev1/keyboard.json
@@ -3,6 +3,16 @@
     "usb": {
         "pid": "0xAD04"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": false,
+        "command": false,
+        "nkro": true,
+        "backlight": true,
+        "rgblight": true
+    },
     "encoder": {
         "rotary": [
             {"pin_a": "D3", "pin_b": "D2"},
diff --git a/keyboards/mechlovin/adelais/standard_led/avr/rev1/rules.mk b/keyboards/mechlovin/adelais/standard_led/avr/rev1/rules.mk
index c807f2ad09..179d02c3c6 100644
--- a/keyboards/mechlovin/adelais/standard_led/avr/rev1/rules.mk
+++ b/keyboards/mechlovin/adelais/standard_led/avr/rev1/rules.mk
@@ -1,7 +1,3 @@
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no        # Commands for debug and configuration
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 CUSTOM_MATRIX = lite
 
 SRC += matrix.c
diff --git a/keyboards/mechlovin/adelais/standard_led/rules.mk b/keyboards/mechlovin/adelais/standard_led/rules.mk
index 271c6a9179..a1d2ba038d 100644
--- a/keyboards/mechlovin/adelais/standard_led/rules.mk
+++ b/keyboards/mechlovin/adelais/standard_led/rules.mk
@@ -1,5 +1 @@
-
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 DEFAULT_FOLDER = mechlovin/adelais/standard_led/arm/rev2
diff --git a/keyboards/mechlovin/delphine/info.json b/keyboards/mechlovin/delphine/info.json
index e8f39b8d6d..baeeab6f18 100644
--- a/keyboards/mechlovin/delphine/info.json
+++ b/keyboards/mechlovin/delphine/info.json
@@ -6,14 +6,6 @@
     "usb": {
         "vid": "0x4D4C"
     },
-    "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": true
-    },
     "matrix_pins": {
         "cols": ["F7", "D7", "D6", "D2"],
         "rows": ["F0", "F1", "F4", "F5", "F6", "D3"]
diff --git a/keyboards/mechlovin/delphine/mono_led/info.json b/keyboards/mechlovin/delphine/mono_led/keyboard.json
similarity index 78%
rename from keyboards/mechlovin/delphine/mono_led/info.json
rename to keyboards/mechlovin/delphine/mono_led/keyboard.json
index e1b90d1191..06fa071159 100644
--- a/keyboards/mechlovin/delphine/mono_led/info.json
+++ b/keyboards/mechlovin/delphine/mono_led/keyboard.json
@@ -3,6 +3,14 @@
         "pid": "0xDEF1",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "backlight": true,
+        "rgblight": true
+    },
     "rgblight": {
         "saturation_steps": 8,
         "brightness_steps": 8,
diff --git a/keyboards/mechlovin/delphine/mono_led/rules.mk b/keyboards/mechlovin/delphine/mono_led/rules.mk
deleted file mode 100644
index ed572b0bbf..0000000000
--- a/keyboards/mechlovin/delphine/mono_led/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
\ No newline at end of file
diff --git a/keyboards/mechlovin/delphine/rgb_led/info.json b/keyboards/mechlovin/delphine/rgb_led/keyboard.json
similarity index 93%
rename from keyboards/mechlovin/delphine/rgb_led/info.json
rename to keyboards/mechlovin/delphine/rgb_led/keyboard.json
index 6a0b8df2cf..35a163c05f 100644
--- a/keyboards/mechlovin/delphine/rgb_led/info.json
+++ b/keyboards/mechlovin/delphine/rgb_led/keyboard.json
@@ -3,6 +3,13 @@
         "pid": "0xDEF2",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
     "rgblight": {
         "saturation_steps": 8,
         "brightness_steps": 8,
diff --git a/keyboards/mechlovin/delphine/rgb_led/rules.mk b/keyboards/mechlovin/delphine/rgb_led/rules.mk
deleted file mode 100644
index 5c624bc68f..0000000000
--- a/keyboards/mechlovin/delphine/rgb_led/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-RGBLIGHT_ENABLE = no               # Enable keyboard RGB underglow
-RGB_MATRIX_ENABLE = yes            # Use RGB matrix
diff --git a/keyboards/mechlovin/hannah60rgb/rev1/info.json b/keyboards/mechlovin/hannah60rgb/rev1/keyboard.json
similarity index 98%
rename from keyboards/mechlovin/hannah60rgb/rev1/info.json
rename to keyboards/mechlovin/hannah60rgb/rev1/keyboard.json
index 6a3510c7df..4fb4dc2eef 100644
--- a/keyboards/mechlovin/hannah60rgb/rev1/info.json
+++ b/keyboards/mechlovin/hannah60rgb/rev1/keyboard.json
@@ -8,6 +8,15 @@
         "pid": "0x6001",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
     "ws2812": {
         "pin": "A15"
     },
diff --git a/keyboards/mechlovin/hannah60rgb/rev1/rules.mk b/keyboards/mechlovin/hannah60rgb/rev1/rules.mk
deleted file mode 100644
index aad92997d0..0000000000
--- a/keyboards/mechlovin/hannah60rgb/rev1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RGB_MATRIX_ENABLE = yes
diff --git a/keyboards/mechlovin/hannah60rgb/rev2/info.json b/keyboards/mechlovin/hannah60rgb/rev2/keyboard.json
similarity index 98%
rename from keyboards/mechlovin/hannah60rgb/rev2/info.json
rename to keyboards/mechlovin/hannah60rgb/rev2/keyboard.json
index e6be250311..06bb71a348 100644
--- a/keyboards/mechlovin/hannah60rgb/rev2/info.json
+++ b/keyboards/mechlovin/hannah60rgb/rev2/keyboard.json
@@ -8,6 +8,16 @@
         "pid": "0x6002",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "nkro": true,
+        "rgblight": true,
+        "rgb_matrix": true
+    },
     "rgblight": {
         "saturation_steps": 8,
         "brightness_steps": 8,
diff --git a/keyboards/mechlovin/hannah60rgb/rev2/rules.mk b/keyboards/mechlovin/hannah60rgb/rev2/rules.mk
deleted file mode 100644
index e1f93c7525..0000000000
--- a/keyboards/mechlovin/hannah60rgb/rev2/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
-RGB_MATRIX_ENABLE = yes
diff --git a/keyboards/mechlovin/hannah60rgb/rules.mk b/keyboards/mechlovin/hannah60rgb/rules.mk
index 65e5f070fb..e876a56afb 100644
--- a/keyboards/mechlovin/hannah60rgb/rules.mk
+++ b/keyboards/mechlovin/hannah60rgb/rules.mk
@@ -1,13 +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 = 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
-AUDIO_ENABLE = no            # Audio output
-
 DEFAULT_FOLDER = mechlovin/hannah60rgb/rev1
diff --git a/keyboards/mechlovin/hannah65/info.json b/keyboards/mechlovin/hannah65/info.json
index f9adc72966..88a3f39719 100644
--- a/keyboards/mechlovin/hannah65/info.json
+++ b/keyboards/mechlovin/hannah65/info.json
@@ -3,15 +3,6 @@
         "pin": "B8",
         "breathing": true
     },
-    "features": {
-        "backlight": true,
-        "bootmagic": true,
-        "command": true,
-        "console": true,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": true
-    },
     "matrix_pins": {
         "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A0", "C15", "B4", "B5", "B3", "C13", "C14", "A13"],
         "rows": ["A4", "A5", "A3", "A2", "A1"]
diff --git a/keyboards/mechlovin/hannah65/rev1/haus/keyboard.json b/keyboards/mechlovin/hannah65/rev1/haus/keyboard.json
index ac97de5f18..7a935fc1a5 100644
--- a/keyboards/mechlovin/hannah65/rev1/haus/keyboard.json
+++ b/keyboards/mechlovin/hannah65/rev1/haus/keyboard.json
@@ -8,6 +8,15 @@
         "pid": "0x6500",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "nkro": true,
+        "backlight": true
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [
diff --git a/keyboards/mechlovin/hannah910/rev1/info.json b/keyboards/mechlovin/hannah910/rev1/keyboard.json
similarity index 98%
rename from keyboards/mechlovin/hannah910/rev1/info.json
rename to keyboards/mechlovin/hannah910/rev1/keyboard.json
index af20cffd4f..8f01f6f39b 100644
--- a/keyboards/mechlovin/hannah910/rev1/info.json
+++ b/keyboards/mechlovin/hannah910/rev1/keyboard.json
@@ -8,6 +8,13 @@
         "pid": "0x9101",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "backlight": true,
+        "rgblight": true
+    },
     "matrix_pins": {
         "cols": ["E6", "B1", "B3", "F0", "F1", "F4", "F5", "F6", "F7", "D5", "D4", "B4", "D6", "D7", "B0"],
         "rows": ["B5", "B6", "D3", "C6", "C7"]
diff --git a/keyboards/mechlovin/hannah910/rev1/rules.mk b/keyboards/mechlovin/hannah910/rev1/rules.mk
deleted file mode 100644
index 8a6e2c7b71..0000000000
--- a/keyboards/mechlovin/hannah910/rev1/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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 = no            # 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/mechlovin/hannah910/rev2/info.json b/keyboards/mechlovin/hannah910/rev2/keyboard.json
similarity index 98%
rename from keyboards/mechlovin/hannah910/rev2/info.json
rename to keyboards/mechlovin/hannah910/rev2/keyboard.json
index a9cfe5f66b..c6fe19c34d 100644
--- a/keyboards/mechlovin/hannah910/rev2/info.json
+++ b/keyboards/mechlovin/hannah910/rev2/keyboard.json
@@ -8,6 +8,13 @@
         "pid": "0x9102",
         "device_version": "0.0.2"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "backlight": true,
+        "rgblight": true
+    },
     "matrix_pins": {
         "cols": ["E6", "B1", "B3", "F0", "F1", "F4", "F5", "F6", "F7", "D5", "D4", "B4", "D6", "D7", "B0"],
         "rows": ["B5", "B6", "D3", "C6", "C7"]
diff --git a/keyboards/mechlovin/hannah910/rev2/rules.mk b/keyboards/mechlovin/hannah910/rev2/rules.mk
deleted file mode 100644
index 8a6e2c7b71..0000000000
--- a/keyboards/mechlovin/hannah910/rev2/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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 = no            # 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/mechlovin/hannah910/rev3/info.json b/keyboards/mechlovin/hannah910/rev3/keyboard.json
similarity index 98%
rename from keyboards/mechlovin/hannah910/rev3/info.json
rename to keyboards/mechlovin/hannah910/rev3/keyboard.json
index abeaa1e182..8a6ea4d123 100644
--- a/keyboards/mechlovin/hannah910/rev3/info.json
+++ b/keyboards/mechlovin/hannah910/rev3/keyboard.json
@@ -8,6 +8,13 @@
         "pid": "0x9103",
         "device_version": "0.0.2"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "backlight": true,
+        "rgblight": true
+    },
     "matrix_pins": {
         "cols": ["E6", "B1", "B3", "F0", "F1", "F4", "F5", "F6", "F7", "D5", "D4", "B4", "D6", "D7", "B0"],
         "rows": ["B5", "B6", "D3", "C6", "C7"]
diff --git a/keyboards/mechlovin/hannah910/rev3/rules.mk b/keyboards/mechlovin/hannah910/rev3/rules.mk
deleted file mode 100644
index 8a6e2c7b71..0000000000
--- a/keyboards/mechlovin/hannah910/rev3/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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 = no            # 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/mechlovin/hex4b/rev1/info.json b/keyboards/mechlovin/hex4b/rev1/info.json
index 1e9a7d5776..d3251f5808 100644
--- a/keyboards/mechlovin/hex4b/rev1/info.json
+++ b/keyboards/mechlovin/hex4b/rev1/info.json
@@ -3,6 +3,12 @@
     "usb": {
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "backlight": true
+    },
     "matrix_pins": {
         "cols": ["B6", "B5", "B3", "B2", "B1", "B0", "A0", "A6", "A7", "C7", "C6", "C5", "C4", "D1", "D0"],
         "rows": ["B7", "A2", "A1", "A3", "A4", "A5"]
diff --git a/keyboards/mechlovin/hex4b/rev1/rules.mk b/keyboards/mechlovin/hex4b/rev1/rules.mk
index 15d473397d..c2ee0bc86f 100644
--- a/keyboards/mechlovin/hex4b/rev1/rules.mk
+++ b/keyboards/mechlovin/hex4b/rev1/rules.mk
@@ -1,15 +1,2 @@
 # Processor frequency
 F_CPU = 16000000
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/mechlovin/hex4b/rev2/info.json b/keyboards/mechlovin/hex4b/rev2/keyboard.json
similarity index 75%
rename from keyboards/mechlovin/hex4b/rev2/info.json
rename to keyboards/mechlovin/hex4b/rev2/keyboard.json
index 8609be01c3..1bdda81c5a 100644
--- a/keyboards/mechlovin/hex4b/rev2/info.json
+++ b/keyboards/mechlovin/hex4b/rev2/keyboard.json
@@ -3,6 +3,15 @@
     "usb": {
         "device_version": "0.0.2"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "nkro": true,
+        "backlight": true
+    },
     "matrix_pins": {
         "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A3", "C13", "B7", "B6", "B5", "B4", "B3"],
         "rows": ["A4", "B12", "B13", "B14", "B15", "A1"]
diff --git a/keyboards/mechlovin/hex4b/rev2/rules.mk b/keyboards/mechlovin/hex4b/rev2/rules.mk
deleted file mode 100644
index a5089d51a5..0000000000
--- a/keyboards/mechlovin/hex4b/rev2/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 = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/mechlovin/infinity87/rev1/info.json b/keyboards/mechlovin/infinity87/rev1/info.json
index 249bbd5cb4..dbe7cb83f9 100644
--- a/keyboards/mechlovin/infinity87/rev1/info.json
+++ b/keyboards/mechlovin/infinity87/rev1/info.json
@@ -1,13 +1,4 @@
 {
-    "features": {
-        "backlight": true,
-        "bootmagic": false,
-        "command": false,
-        "console": false,
-        "extrakey": false,
-        "mousekey": false,
-        "nkro": false
-    },
     "matrix_pins": {
         "cols": ["C13", "B9", "B4", "B7", "B8", "B5", "B6", "A9", "A5", "A6", "A7", "B1", "B2", "B10", "B3", "B14", "B15"],
         "rows": ["A10", "B13", "B12", "B11", "C14", "C15"]
diff --git a/keyboards/mechlovin/infinity87/rev1/rogue87/keyboard.json b/keyboards/mechlovin/infinity87/rev1/rogue87/keyboard.json
index 6fdc9d6e5d..2ac0510dbf 100644
--- a/keyboards/mechlovin/infinity87/rev1/rogue87/keyboard.json
+++ b/keyboards/mechlovin/infinity87/rev1/rogue87/keyboard.json
@@ -8,6 +8,12 @@
         "pid": "0x8704",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": false,
+        "backlight": true
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [
diff --git a/keyboards/mechlovin/infinity87/rev1/rouge87/keyboard.json b/keyboards/mechlovin/infinity87/rev1/rouge87/keyboard.json
index 39a9f16925..6b947f0f1f 100644
--- a/keyboards/mechlovin/infinity87/rev1/rouge87/keyboard.json
+++ b/keyboards/mechlovin/infinity87/rev1/rouge87/keyboard.json
@@ -8,6 +8,12 @@
         "pid": "0x8703",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": false,
+        "backlight": true
+    },
     "community_layouts": [
         "tkl_ansi_tsangan",
         "tkl_iso_tsangan"
diff --git a/keyboards/mechlovin/infinity87/rev1/standard/info.json b/keyboards/mechlovin/infinity87/rev1/standard/keyboard.json
similarity index 99%
rename from keyboards/mechlovin/infinity87/rev1/standard/info.json
rename to keyboards/mechlovin/infinity87/rev1/standard/keyboard.json
index 964a7a8cb9..a0cb10fac2 100644
--- a/keyboards/mechlovin/infinity87/rev1/standard/info.json
+++ b/keyboards/mechlovin/infinity87/rev1/standard/keyboard.json
@@ -8,6 +8,16 @@
         "pid": "0x8701",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "nkro": true,
+        "backlight": true,
+        "rgblight": true
+    },
     "rgblight": {
         "led_count": 26,
         "sleep": true,
diff --git a/keyboards/mechlovin/infinity87/rev1/standard/rules.mk b/keyboards/mechlovin/infinity87/rev1/standard/rules.mk
deleted file mode 100644
index 1e3cebb145..0000000000
--- a/keyboards/mechlovin/infinity87/rev1/standard/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/mechlovin/infinity87/rev2/info.json b/keyboards/mechlovin/infinity87/rev2/info.json
index 42db9894ca..fdc6686988 100644
--- a/keyboards/mechlovin/infinity87/rev2/info.json
+++ b/keyboards/mechlovin/infinity87/rev2/info.json
@@ -8,6 +8,14 @@
         "pid": "0x8702",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "backlight": true,
+        "rgblight": true
+    },
     "backlight": {
         "pin": "B6",
         "breathing": true
diff --git a/keyboards/mechlovin/infinity87/rev2/rules.mk b/keyboards/mechlovin/infinity87/rev2/rules.mk
index ea7804f158..179d02c3c6 100644
--- a/keyboards/mechlovin/infinity87/rev2/rules.mk
+++ b/keyboards/mechlovin/infinity87/rev2/rules.mk
@@ -1,11 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-CONSOLE_ENABLE = no
-COMMAND_ENABLE = no
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes
-RGBLIGHT_ENABLE = yes
 CUSTOM_MATRIX = lite
 
 SRC += matrix.c
diff --git a/keyboards/mechlovin/infinity87/rgb_rev1/info.json b/keyboards/mechlovin/infinity87/rgb_rev1/keyboard.json
similarity index 99%
rename from keyboards/mechlovin/infinity87/rgb_rev1/info.json
rename to keyboards/mechlovin/infinity87/rgb_rev1/keyboard.json
index 27a7b441e3..2d177949dc 100644
--- a/keyboards/mechlovin/infinity87/rgb_rev1/info.json
+++ b/keyboards/mechlovin/infinity87/rgb_rev1/keyboard.json
@@ -8,6 +8,15 @@
         "pid": "0x8710",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
     "rgb_matrix": {
         "animations": {
             "alphas_mods": true,
diff --git a/keyboards/mechlovin/infinity87/rgb_rev1/rules.mk b/keyboards/mechlovin/infinity87/rgb_rev1/rules.mk
deleted file mode 100644
index e408bde91c..0000000000
--- a/keyboards/mechlovin/infinity87/rgb_rev1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RGB_MATRIX_ENABLE = yes        # Use RGB matrix
diff --git a/keyboards/mechlovin/infinity87/rules.mk b/keyboards/mechlovin/infinity87/rules.mk
index 251f8440aa..4aa072cae7 100644
--- a/keyboards/mechlovin/infinity87/rules.mk
+++ b/keyboards/mechlovin/infinity87/rules.mk
@@ -1,15 +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 = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE  = no      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 DEFAULT_FOLDER = mechlovin/infinity87/rgb_rev1
diff --git a/keyboards/mechlovin/infinity875/info.json b/keyboards/mechlovin/infinity875/info.json
index cb8154a713..73bdb0af13 100644
--- a/keyboards/mechlovin/infinity875/info.json
+++ b/keyboards/mechlovin/infinity875/info.json
@@ -8,6 +8,12 @@
         "pid": "0x0875",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "rgb_matrix": true
+    },
     "rgb_matrix": {
         "driver": "ws2812",
         "max_brightness": 200,
diff --git a/keyboards/mechlovin/infinity875/rules.mk b/keyboards/mechlovin/infinity875/rules.mk
index 33f549f3ae..179d02c3c6 100644
--- a/keyboards/mechlovin/infinity875/rules.mk
+++ b/keyboards/mechlovin/infinity875/rules.mk
@@ -1,16 +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 = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
 CUSTOM_MATRIX = lite
-RGB_MATRIX_ENABLE = yes
 
 SRC += matrix.c
diff --git a/keyboards/mechlovin/jay60/info.json b/keyboards/mechlovin/jay60/info.json
index 1f8d68a541..37f25f36fe 100644
--- a/keyboards/mechlovin/jay60/info.json
+++ b/keyboards/mechlovin/jay60/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0600",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true
+    },
     "matrix_pins": {
         "cols": ["B6", "B5", "B3", "B2", "B1", "B0", "A0", "A6", "A7", "C7", "C6", "C5", "C4", "C3"],
         "rows": ["C2", "C1", "C0", "D7", "A1"]
diff --git a/keyboards/mechlovin/jay60/rules.mk b/keyboards/mechlovin/jay60/rules.mk
index 1e9f925544..c2ee0bc86f 100644
--- a/keyboards/mechlovin/jay60/rules.mk
+++ b/keyboards/mechlovin/jay60/rules.mk
@@ -1,15 +1,2 @@
 # Processor frequency
 F_CPU = 16000000
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/mechlovin/mechlovin9/info.json b/keyboards/mechlovin/mechlovin9/info.json
index a5439f56a9..41133813ef 100644
--- a/keyboards/mechlovin/mechlovin9/info.json
+++ b/keyboards/mechlovin/mechlovin9/info.json
@@ -2,14 +2,6 @@
     "manufacturer": "Mechlovin Studio",
     "url": "",
     "maintainer": "Team Mechlovin",
-    "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": false
-    },
     "usb": {
         "vid": "0x4D4C"
     },
diff --git a/keyboards/mechlovin/mechlovin9/rev1/info.json b/keyboards/mechlovin/mechlovin9/rev1/keyboard.json
similarity index 80%
rename from keyboards/mechlovin/mechlovin9/rev1/info.json
rename to keyboards/mechlovin/mechlovin9/rev1/keyboard.json
index 1ece8fc52d..2aebe56639 100644
--- a/keyboards/mechlovin/mechlovin9/rev1/info.json
+++ b/keyboards/mechlovin/mechlovin9/rev1/keyboard.json
@@ -4,14 +4,20 @@
         "pid": "0x6509",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "nkro": true,
+        "backlight": true
+    },
     "matrix_pins": {
         "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A0", "C15", "B4", "B5", "B3", "C13", "C14", "A13"],
         "rows": ["A4", "A5", "A3", "A2", "A1"]
     },
     "diode_direction": "COL2ROW",
-    "features": {
-        "backlight": true
-    },
     "backlight": {
         "pin": "B8",
         "breathing": true
diff --git a/keyboards/mechlovin/mechlovin9/rev1/rules.mk b/keyboards/mechlovin/mechlovin9/rev1/rules.mk
deleted file mode 100644
index d6fa845569..0000000000
--- a/keyboards/mechlovin/mechlovin9/rev1/rules.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
diff --git a/keyboards/mechlovin/mechlovin9/rev2/info.json b/keyboards/mechlovin/mechlovin9/rev2/info.json
index 01e8d59579..a9b45df59d 100644
--- a/keyboards/mechlovin/mechlovin9/rev2/info.json
+++ b/keyboards/mechlovin/mechlovin9/rev2/info.json
@@ -10,6 +10,9 @@
     },
     "diode_direction": "COL2ROW",
     "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
         "backlight": true
     },
     "backlight": {
diff --git a/keyboards/mechlovin/mechlovin9/rev3/keyboard.json b/keyboards/mechlovin/mechlovin9/rev3/keyboard.json
index faa4cf0a87..aa2787c34c 100644
--- a/keyboards/mechlovin/mechlovin9/rev3/keyboard.json
+++ b/keyboards/mechlovin/mechlovin9/rev3/keyboard.json
@@ -6,6 +6,11 @@
         "pid": "0x6509",
         "device_version": "0.0.3"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true
+    },
     "bootmagic": {
         "matrix": [0, 13]
     },
diff --git a/keyboards/mechlovin/olly/bb/info.json b/keyboards/mechlovin/olly/bb/info.json
index fddb893113..ac08e94c3c 100644
--- a/keyboards/mechlovin/olly/bb/info.json
+++ b/keyboards/mechlovin/olly/bb/info.json
@@ -8,6 +8,13 @@
         "pid": "0xD181",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "backlight": true,
+        "rgblight": true
+    },
     "backlight": {
         "pin": "D4",
         "breathing": true
diff --git a/keyboards/mechlovin/olly/bb/rules.mk b/keyboards/mechlovin/olly/bb/rules.mk
index 1d15495eef..73681d1f1e 100644
--- a/keyboards/mechlovin/olly/bb/rules.mk
+++ b/keyboards/mechlovin/olly/bb/rules.mk
@@ -1,18 +1,5 @@
 # Processor frequency
 F_CPU = 16000000
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
 CUSTOM_MATRIX = lite
 
 SRC += matrix.c
diff --git a/keyboards/mechlovin/olly/jf/info.json b/keyboards/mechlovin/olly/jf/info.json
index b67551a111..315191e840 100644
--- a/keyboards/mechlovin/olly/jf/info.json
+++ b/keyboards/mechlovin/olly/jf/info.json
@@ -5,15 +5,6 @@
     "usb": {
         "vid": "0x4D4C"
     },
-    "features": {
-        "nkro": false,
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "extrakey": true,
-        "mousekey": true,
-        "rgblight": true
-    },
     "diode_direction": "ROW2COL",
     "rgblight": {
         "led_count": 27,
diff --git a/keyboards/mechlovin/olly/jf/rev1/info.json b/keyboards/mechlovin/olly/jf/rev1/info.json
index 0b6aec094f..69f092af07 100644
--- a/keyboards/mechlovin/olly/jf/rev1/info.json
+++ b/keyboards/mechlovin/olly/jf/rev1/info.json
@@ -5,7 +5,11 @@
         "device_version": "0.0.1"
     },
     "features": {
-        "backlight": true
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "backlight": true,
+        "rgblight": true
     },
     "matrix_pins": {
         "cols": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
diff --git a/keyboards/mechlovin/olly/jf/rev2/keyboard.json b/keyboards/mechlovin/olly/jf/rev2/keyboard.json
index 600bf8a3af..3771188638 100644
--- a/keyboards/mechlovin/olly/jf/rev2/keyboard.json
+++ b/keyboards/mechlovin/olly/jf/rev2/keyboard.json
@@ -7,10 +7,14 @@
         }
     },
     "features": {
-        "command": true,
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
         "console": true,
+        "command": true,
+        "nkro": true,
         "led_matrix": true,
-        "nkro": true
+        "rgblight": true
     },
     "led_matrix": {
         "animations": {
@@ -704,4 +708,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/keyboards/mechlovin/serratus/info.json b/keyboards/mechlovin/serratus/info.json
index 780a369cb8..c283c48a35 100644
--- a/keyboards/mechlovin/serratus/info.json
+++ b/keyboards/mechlovin/serratus/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0870",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "backlight": true,
+        "rgblight": true
+    },
     "backlight": {
         "pin": "B6",
         "breathing": true
diff --git a/keyboards/mechlovin/serratus/rules.mk b/keyboards/mechlovin/serratus/rules.mk
index 03ea2f1bda..179d02c3c6 100644
--- a/keyboards/mechlovin/serratus/rules.mk
+++ b/keyboards/mechlovin/serratus/rules.mk
@@ -1,15 +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 = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
 CUSTOM_MATRIX = lite
 
 SRC += matrix.c
diff --git a/keyboards/mechlovin/th1800/info.json b/keyboards/mechlovin/th1800/info.json
index 001c73f683..66b7487545 100644
--- a/keyboards/mechlovin/th1800/info.json
+++ b/keyboards/mechlovin/th1800/info.json
@@ -8,6 +8,11 @@
         "pid": "0x1800",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true
+    },
     "matrix_pins": {
         "cols": ["A3", "D7", "C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7", "A7", "A6", "A5", "A4", "B3", "B2", "B0", "B1"],
         "rows": ["B6", "B7", "D0", "D1", "D5", "D6"]
diff --git a/keyboards/mechlovin/th1800/rules.mk b/keyboards/mechlovin/th1800/rules.mk
index 1e9f925544..c2ee0bc86f 100644
--- a/keyboards/mechlovin/th1800/rules.mk
+++ b/keyboards/mechlovin/th1800/rules.mk
@@ -1,15 +1,2 @@
 # Processor frequency
 F_CPU = 16000000
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/mechlovin/zed1800/info.json b/keyboards/mechlovin/zed1800/info.json
index 41179a6ef1..9de42c2442 100644
--- a/keyboards/mechlovin/zed1800/info.json
+++ b/keyboards/mechlovin/zed1800/info.json
@@ -17,15 +17,6 @@
             "backing_size": 4096
         }
     },
-    "features": {
-        "bootmagic": true,
-        "command": true,
-        "console": true,
-        "extrakey": true,
-        "mousekey": true,
-        "rgblight": true,
-        "audio": false
-    },
     "rgblight": {
         "sleep": true,
         "animations": {
diff --git a/keyboards/mechlovin/zed1800/oreum/keyboard.json b/keyboards/mechlovin/zed1800/oreum/keyboard.json
index 4a15f61ce4..c5652213d6 100644
--- a/keyboards/mechlovin/zed1800/oreum/keyboard.json
+++ b/keyboards/mechlovin/zed1800/oreum/keyboard.json
@@ -3,6 +3,14 @@
     "usb": {
         "pid": "0x1802"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "rgblight": true
+    },
     "matrix_pins": {
         "cols": ["A8", "B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "C13"],
         "rows": ["B8", "B7", "B6", "B5", "B4", "B3"]
diff --git a/keyboards/mechlovin/zed1800/rules.mk b/keyboards/mechlovin/zed1800/rules.mk
index d007da3fa2..e0088c95c3 100644
--- a/keyboards/mechlovin/zed1800/rules.mk
+++ b/keyboards/mechlovin/zed1800/rules.mk
@@ -1 +1 @@
-DEFAULT_FOLDER = mechlovin/zed1800/saber
\ No newline at end of file
+DEFAULT_FOLDER = mechlovin/zed1800/saber
diff --git a/keyboards/mechlovin/zed1800/saber/keyboard.json b/keyboards/mechlovin/zed1800/saber/keyboard.json
index d921d95a95..a3d236e511 100644
--- a/keyboards/mechlovin/zed1800/saber/keyboard.json
+++ b/keyboards/mechlovin/zed1800/saber/keyboard.json
@@ -3,6 +3,14 @@
     "usb": {
         "pid": "0x1803"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "rgblight": true
+    },
     "matrix_pins": {
         "cols": ["A8", "A15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "C13"],
         "rows": ["B8", "B7", "B6", "B5", "B4", "B3"]
diff --git a/keyboards/mechlovin/zed1800/zepsody/keyboard.json b/keyboards/mechlovin/zed1800/zepsody/keyboard.json
index dab92b26d7..8a973d181f 100644
--- a/keyboards/mechlovin/zed1800/zepsody/keyboard.json
+++ b/keyboards/mechlovin/zed1800/zepsody/keyboard.json
@@ -3,6 +3,14 @@
     "usb": {
         "pid": "0x1801"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "rgblight": true
+    },
     "matrix_pins": {
         "cols": ["A10", "A9", "A8", "A15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0"],
         "rows": ["B8", "B7", "B6", "B5", "B4", "B3"]
diff --git a/keyboards/mechlovin/zed65/910/keyboard.json b/keyboards/mechlovin/zed65/910/keyboard.json
index 3b1472014d..36f1a1ed3b 100644
--- a/keyboards/mechlovin/zed65/910/keyboard.json
+++ b/keyboards/mechlovin/zed65/910/keyboard.json
@@ -9,6 +9,11 @@
         "device_version": "0.0.1"
     },
     "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
         "nkro": true,
         "rgblight": true
     },
diff --git a/keyboards/mechlovin/zed65/info.json b/keyboards/mechlovin/zed65/info.json
index c255dd23c6..cf993be247 100644
--- a/keyboards/mechlovin/zed65/info.json
+++ b/keyboards/mechlovin/zed65/info.json
@@ -1,11 +1,4 @@
 {
     "processor": "STM32F103",
-    "bootloader": "stm32duino",
-    "features": {
-        "bootmagic": true,
-        "command": true,
-        "console": true,
-        "extrakey": true,
-        "mousekey": true
-    },
+    "bootloader": "stm32duino"
 }
diff --git a/keyboards/mechlovin/zed65/mono_led/info.json b/keyboards/mechlovin/zed65/mono_led/keyboard.json
similarity index 98%
rename from keyboards/mechlovin/zed65/mono_led/info.json
rename to keyboards/mechlovin/zed65/mono_led/keyboard.json
index aa46b1bd8b..0cf13002d9 100644
--- a/keyboards/mechlovin/zed65/mono_led/info.json
+++ b/keyboards/mechlovin/zed65/mono_led/keyboard.json
@@ -8,6 +8,16 @@
         "pid": "0x6503",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "nkro": true,
+        "led_matrix": true,
+        "rgblight": true
+    },
     "rgblight": {
         "saturation_steps": 8,
         "brightness_steps": 8,
diff --git a/keyboards/mechlovin/zed65/mono_led/rules.mk b/keyboards/mechlovin/zed65/mono_led/rules.mk
deleted file mode 100644
index 55d38a7b91..0000000000
--- a/keyboards/mechlovin/zed65/mono_led/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-
-NKRO_ENABLE = yes            # Enable N-Key Rollover
-LED_MATRIX_ENABLE = yes
-RGBLIGHT_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/mechlovin/zed65/no_backlight/retro66/info.json b/keyboards/mechlovin/zed65/no_backlight/retro66/keyboard.json
similarity index 97%
rename from keyboards/mechlovin/zed65/no_backlight/retro66/info.json
rename to keyboards/mechlovin/zed65/no_backlight/retro66/keyboard.json
index 0709014f76..49ed44f0a1 100644
--- a/keyboards/mechlovin/zed65/no_backlight/retro66/info.json
+++ b/keyboards/mechlovin/zed65/no_backlight/retro66/keyboard.json
@@ -8,6 +8,14 @@
         "pid": "0x6601",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "encoder": true
+    },
     "matrix_pins": {
         "cols": ["B11", "B12", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "B3", "A15", "B5"],
         "rows": ["B13", "B14", "A8", "A1", "A0"]
diff --git a/keyboards/mechlovin/zed65/no_backlight/retro66/rules.mk b/keyboards/mechlovin/zed65/no_backlight/retro66/rules.mk
deleted file mode 100644
index 5af1ba8536..0000000000
--- a/keyboards/mechlovin/zed65/no_backlight/retro66/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-ENCODER_ENABLE = yes
diff --git a/keyboards/mechlovin/zed65/no_backlight/rules.mk b/keyboards/mechlovin/zed65/no_backlight/rules.mk
index b0b388db50..a699765498 100644
--- a/keyboards/mechlovin/zed65/no_backlight/rules.mk
+++ b/keyboards/mechlovin/zed65/no_backlight/rules.mk
@@ -1,3 +1 @@
-BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
-
 DEFAULT_FOLDER = mechlovin/zed65/no_backlight/wearhaus66
diff --git a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/info.json b/keyboards/mechlovin/zed65/no_backlight/wearhaus66/keyboard.json
similarity index 98%
rename from keyboards/mechlovin/zed65/no_backlight/wearhaus66/info.json
rename to keyboards/mechlovin/zed65/no_backlight/wearhaus66/keyboard.json
index 5b0df671df..c9c9e0ddb1 100644
--- a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/info.json
+++ b/keyboards/mechlovin/zed65/no_backlight/wearhaus66/keyboard.json
@@ -8,6 +8,14 @@
         "pid": "0x6602",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "rgblight": true
+    },
     "matrix_pins": {
         "cols": ["B11", "B12", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "B3", "A15", "B5"],
         "rows": ["B13", "B14", "A8", "A1", "A0"]
diff --git a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/rules.mk b/keyboards/mechlovin/zed65/no_backlight/wearhaus66/rules.mk
deleted file mode 100644
index 84ef473c02..0000000000
--- a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
diff --git a/keyboards/mechlovin/zed65/rev1/keyboard.json b/keyboards/mechlovin/zed65/rev1/keyboard.json
index 20f04dbe65..99de5d53f2 100644
--- a/keyboards/mechlovin/zed65/rev1/keyboard.json
+++ b/keyboards/mechlovin/zed65/rev1/keyboard.json
@@ -9,6 +9,11 @@
         "device_version": "0.0.1"
     },
     "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
         "nkro": true,
         "rgblight": true
     },