4 files changed, 18 insertions, 25 deletions
diff --git a/keyboards/plywrks/ahgase/info.json b/keyboards/plywrks/ahgase/keyboard.json
index 2949aec9c6..b98d4f69ee 100644
--- a/keyboards/plywrks/ahgase/info.json
+++ b/keyboards/plywrks/ahgase/keyboard.json
@@ -8,6 +8,14 @@
         "pid": "0x7902",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    },
     "matrix_pins": {
         "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D4", "D5", "B0", "B1", "D1"],
         "rows": ["B2", "B3", "B7", "D6", "D3", "D2"]
diff --git a/keyboards/plywrks/ahgase/rules.mk b/keyboards/plywrks/ahgase/rules.mk
deleted file mode 100644
index ab2c49da70..0000000000
--- a/keyboards/plywrks/ahgase/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/plywrks/lune/info.json b/keyboards/plywrks/lune/keyboard.json
index 46c789054d..9368627e98 100644
--- a/keyboards/plywrks/lune/info.json
+++ b/keyboards/plywrks/lune/keyboard.json
@@ -26,6 +26,16 @@
     "ws2812": {
         "pin": "E2"
     },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "oled": true,
+        "rgblight": true
+    },
     "matrix_pins": {
         "cols": ["F4", "F5", "F6", "F7", "D4", "D5", "D3", "D2"],
         "rows": ["F1", "F0", "B7", "B0", "B6", "B5", "D7", "B4", "D6"]
diff --git a/keyboards/plywrks/lune/rules.mk b/keyboards/plywrks/lune/rules.mk
deleted file mode 100644
index e557ae8ab4..0000000000
--- a/keyboards/plywrks/lune/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-OLED_ENABLE = yes           # Enable OLED