8 files changed, 26 insertions, 46 deletions
diff --git a/keyboards/yushakobo/navpad/10/info.json b/keyboards/yushakobo/navpad/10/info.json
index ef0cdf5cbe..e28a2e2cb1 100644
--- a/keyboards/yushakobo/navpad/10/info.json
+++ b/keyboards/yushakobo/navpad/10/info.json
@@ -7,6 +7,14 @@
         "vid": "0x3265",
         "pid": "0x0008"
     },
+    "features": {
+        "bootmagic": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "rgblight": true
+    },
     "encoder": {
         "rotary": [
             {"pin_a": "B5", "pin_b": "B6"}
diff --git a/keyboards/yushakobo/navpad/10/rev0/rules.mk b/keyboards/yushakobo/navpad/10/rev0/rules.mk
new file mode 100644
index 0000000000..e8ffcca7a6
--- /dev/null
+++ b/keyboards/yushakobo/navpad/10/rev0/rules.mk
@@ -0,0 +1 @@
+SRC += navpad_prefs.c
diff --git a/keyboards/yushakobo/navpad/10/rev1/rules.mk b/keyboards/yushakobo/navpad/10/rev1/rules.mk
new file mode 100644
index 0000000000..e8ffcca7a6
--- /dev/null
+++ b/keyboards/yushakobo/navpad/10/rev1/rules.mk
@@ -0,0 +1 @@
+SRC += navpad_prefs.c
diff --git a/keyboards/yushakobo/navpad/10/rules.mk b/keyboards/yushakobo/navpad/10/rules.mk
index 61cbbf351d..32daeef814 100644
--- a/keyboards/yushakobo/navpad/10/rules.mk
+++ b/keyboards/yushakobo/navpad/10/rules.mk
@@ -1,17 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-ENCODER_ENABLE = yes
-
-SRC += navpad_prefs.c
 DEFAULT_FOLDER = yushakobo/navpad/10/rev1
diff --git a/keyboards/yushakobo/navpad/10_helix_r/info.json b/keyboards/yushakobo/navpad/10_helix_r/keyboard.json
index 8084f1f7bd..81854128da 100644
--- a/keyboards/yushakobo/navpad/10_helix_r/info.json
+++ b/keyboards/yushakobo/navpad/10_helix_r/keyboard.json
@@ -8,6 +8,14 @@
         "pid": "0x0008",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "rgblight": true
+    },
     "matrix_pins": {
         "cols": ["F5", "F6", "B2", "B3", "B1", "F7", null],
         "rows": ["D4", "C6", "D7", "E6", "B4", "F4"]
diff --git a/keyboards/yushakobo/navpad/10_helix_r/rules.mk b/keyboards/yushakobo/navpad/10_helix_r/rules.mk
index f30c00650c..e8ffcca7a6 100644
--- a/keyboards/yushakobo/navpad/10_helix_r/rules.mk
+++ b/keyboards/yushakobo/navpad/10_helix_r/rules.mk
@@ -1,16 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-ENCODER_ENABLE = yes
-
 SRC += navpad_prefs.c
diff --git a/keyboards/yushakobo/quick17/info.json b/keyboards/yushakobo/quick17/keyboard.json
index 51c41a6e82..aa0d39756d 100644
--- a/keyboards/yushakobo/quick17/info.json
+++ b/keyboards/yushakobo/quick17/keyboard.json
@@ -8,6 +8,14 @@
         "pid": "0x0006",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "rgb_matrix": true
+    },
     "rgb_matrix": {
         "driver": "ws2812",
         "max_brightness": 150,
diff --git a/keyboards/yushakobo/quick17/rules.mk b/keyboards/yushakobo/quick17/rules.mk
index 70ab5e2744..083da9448c 100644
--- a/keyboards/yushakobo/quick17/rules.mk
+++ b/keyboards/yushakobo/quick17/rules.mk
@@ -1,18 +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 = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes
-
-RGB_MATRIX_ENABLE = yes
 RGB_MATRIX_CUSTOM_KB = yes
 
 SRC += quick17_prefs.c