4 files changed, 14 insertions, 23 deletions
diff --git a/keyboards/kbdmania/kmac/info.json b/keyboards/kbdmania/kmac/info.json
index 0ec6f0b2a9..c372cb1fc8 100644
--- a/keyboards/kbdmania/kmac/info.json
+++ b/keyboards/kbdmania/kmac/info.json
@@ -17,6 +17,14 @@
   },
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
+  "features": {
+    "bootmagic": true,
+    "mousekey": true,
+    "extrakey": true,
+    "command": true,
+    "nkro": true,
+    "backlight": true
+  },
   "community_layouts": ["tkl_ansi"],
   "layouts": {
     "LAYOUT_tkl_ansi": {
diff --git a/keyboards/kbdmania/kmac/rules.mk b/keyboards/kbdmania/kmac/rules.mk
index d9aa87a7dc..b35b955f69 100644
--- a/keyboards/kbdmania/kmac/rules.mk
+++ b/keyboards/kbdmania/kmac/rules.mk
@@ -1,18 +1,7 @@
 # Processor frequency
 F_CPU = 8000000
 
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
 CUSTOM_MATRIX = yes         # Custom matrix file
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
 
 # Project specific files
 SRC += matrix.c
diff --git a/keyboards/kbdmania/kmac_pad/info.json b/keyboards/kbdmania/kmac_pad/info.json
index f41da8a452..8dbb196f3e 100644
--- a/keyboards/kbdmania/kmac_pad/info.json
+++ b/keyboards/kbdmania/kmac_pad/info.json
@@ -9,6 +9,12 @@
   },
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
+  "features": {
+    "bootmagic": true,
+    "mousekey": true,
+    "extrakey": true,
+    "nkro": true
+  },
   "layouts": {
     "LAYOUT": {
       "layout": [
diff --git a/keyboards/kbdmania/kmac_pad/rules.mk b/keyboards/kbdmania/kmac_pad/rules.mk
index 1c42620aca..2ec2337384 100644
--- a/keyboards/kbdmania/kmac_pad/rules.mk
+++ b/keyboards/kbdmania/kmac_pad/rules.mk
@@ -1,18 +1,6 @@
 # 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 = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
 CUSTOM_MATRIX = lite        # Custom matrix file
 
 # Project specific files