1a903372846f24028431d20bc25e64b4da69da27

Author
Joel Challis <git@zvecr.com>
Committer
GitHub <noreply@github.com>
Date

Message

Migrate features from rules.mk to data driven - OPQR (#23285)

Diff

This diff is truncated to protect this page.

   1diff --git a/keyboards/ocean/addon/info.json b/keyboards/ocean/addon/keyboard.json
   2rename from keyboards/ocean/addon/info.json
   3rename to keyboards/ocean/addon/keyboard.json
   4index 6fbd4c1b074ea5e3d84a4d951a2fe71d5222c7de..b7502a28b69caec567c49116b526337ca9574b05 100644
   5--- a/keyboards/ocean/addon/info.json
   6+++ b/keyboards/ocean/addon/keyboard.json
   7@@ -8,6 +8,14 @@
   8         "pid": "0x0012",
   9         "device_version": "0.0.1"
  10     },
  11+    "features": {
  12+        "bootmagic": true,
  13+        "command": false,
  14+        "console": false,
  15+        "extrakey": true,
  16+        "mousekey": true,
  17+        "nkro": true
  18+    },
  19     "matrix_pins": {
  20         "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5"],
  21         "rows": ["C6", "D7", "E6", "B4", "B5"]
  22diff --git a/keyboards/ocean/addon/rules.mk b/keyboards/ocean/addon/rules.mk
  23deleted file mode 100644
  24index fd62cad16580668194b4eac3641dde6854e2f15d..0000000000000000000000000000000000000000
  25--- a/keyboards/ocean/addon/rules.mk
  26+++ /dev/null
  27@@ -1,12 +0,0 @@
  28-# Build Options
  29-#   change yes to no to disable
  30-#
  31-BOOTMAGIC_ENABLE = yes       # Enable Bootmagic Lite
  32-MOUSEKEY_ENABLE = yes       # Mouse keys
  33-EXTRAKEY_ENABLE = yes       # Audio control and System control
  34-CONSOLE_ENABLE = no         # Console for debug
  35-COMMAND_ENABLE = no         # Commands for debug and configuration
  36-NKRO_ENABLE = yes           # Enable N-Key Rollover
  37-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
  38-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
  39-AUDIO_ENABLE = no           # Audio output
  40diff --git a/keyboards/ocean/gin_v2/info.json b/keyboards/ocean/gin_v2/keyboard.json
  41rename from keyboards/ocean/gin_v2/info.json
  42rename to keyboards/ocean/gin_v2/keyboard.json
  43index b5e7cdddd7d018fc4806b15959bcc4014e7945ef..b6f22b813b3a47c718ec69fca667fdcfa0252bec 100644
  44--- a/keyboards/ocean/gin_v2/info.json
  45+++ b/keyboards/ocean/gin_v2/keyboard.json
  46@@ -8,6 +8,14 @@
  47         "pid": "0x0005",
  48         "device_version": "0.0.1"
  49     },
  50+    "features": {
  51+        "bootmagic": true,
  52+        "command": false,
  53+        "console": false,
  54+        "extrakey": true,
  55+        "mousekey": true,
  56+        "nkro": true
  57+    },
  58     "matrix_pins": {
  59         "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
  60         "rows": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"]
  61diff --git a/keyboards/ocean/gin_v2/rules.mk b/keyboards/ocean/gin_v2/rules.mk
  62deleted file mode 100644
  63index 3b6a1809db185253a61eef9fd4dc1e290a2eac5b..0000000000000000000000000000000000000000
  64--- a/keyboards/ocean/gin_v2/rules.mk
  65+++ /dev/null
  66@@ -1,12 +0,0 @@
  67-# Build Options
  68-#   change yes to no to disable
  69-#
  70-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
  71-MOUSEKEY_ENABLE = yes       # Mouse keys
  72-EXTRAKEY_ENABLE = yes       # Audio control and System control
  73-CONSOLE_ENABLE = no         # Console for debug
  74-COMMAND_ENABLE = no         # Commands for debug and configuration
  75-NKRO_ENABLE = yes           # Enable N-Key Rollover
  76-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
  77-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
  78-AUDIO_ENABLE = no           # Audio output
  79diff --git a/keyboards/ocean/slamz/info.json b/keyboards/ocean/slamz/keyboard.json
  80rename from keyboards/ocean/slamz/info.json
  81rename to keyboards/ocean/slamz/keyboard.json
  82index a1a95aca60e6677c32a5c740a42d7c15bd34525b..67120777632e58e870c65073d48f1616fca8584f 100644
  83--- a/keyboards/ocean/slamz/info.json
  84+++ b/keyboards/ocean/slamz/keyboard.json
  85@@ -8,6 +8,14 @@
  86         "pid": "0x0011",
  87         "device_version": "0.0.1"
  88     },
  89+    "features": {
  90+        "bootmagic": true,
  91+        "command": false,
  92+        "console": false,
  93+        "extrakey": true,
  94+        "mousekey": true,
  95+        "nkro": true
  96+    },
  97     "matrix_pins": {
  98         "cols": ["C6", "D7", "E6", "B4", "B5", "B6", "B2", "B3", "B1", "F7"],
  99         "rows": ["D2", "D1", "D0", "D4"]
 100diff --git a/keyboards/ocean/slamz/rules.mk b/keyboards/ocean/slamz/rules.mk
 101deleted file mode 100644
 102index 3b6a1809db185253a61eef9fd4dc1e290a2eac5b..0000000000000000000000000000000000000000
 103--- a/keyboards/ocean/slamz/rules.mk
 104+++ /dev/null
 105@@ -1,12 +0,0 @@
 106-# Build Options
 107-#   change yes to no to disable
 108-#
 109-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
 110-MOUSEKEY_ENABLE = yes       # Mouse keys
 111-EXTRAKEY_ENABLE = yes       # Audio control and System control
 112-CONSOLE_ENABLE = no         # Console for debug
 113-COMMAND_ENABLE = no         # Commands for debug and configuration
 114-NKRO_ENABLE = yes           # Enable N-Key Rollover
 115-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 116-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 117-AUDIO_ENABLE = no           # Audio output
 118diff --git a/keyboards/ocean/stealth/info.json b/keyboards/ocean/stealth/keyboard.json
 119rename from keyboards/ocean/stealth/info.json
 120rename to keyboards/ocean/stealth/keyboard.json
 121index fcb08b0ca61e1b55ebdff4a759cdc9b5095df3a8..b094a5f4bf32e33022c08b77b56485cf5f3b6635 100644
 122--- a/keyboards/ocean/stealth/info.json
 123+++ b/keyboards/ocean/stealth/keyboard.json
 124@@ -8,6 +8,14 @@
 125         "pid": "0x0010",
 126         "device_version": "0.0.1"
 127     },
 128+    "features": {
 129+        "bootmagic": true,
 130+        "command": false,
 131+        "console": false,
 132+        "extrakey": true,
 133+        "mousekey": true,
 134+        "nkro": true
 135+    },
 136     "matrix_pins": {
 137         "cols": ["D0", "D4", "C6"],
 138         "rows": ["D1"]
 139diff --git a/keyboards/ocean/stealth/rules.mk b/keyboards/ocean/stealth/rules.mk
 140deleted file mode 100644
 141index d65d32df0aad323d78db1d97c099325df07e5d6f..0000000000000000000000000000000000000000
 142--- a/keyboards/ocean/stealth/rules.mk
 143+++ /dev/null
 144@@ -1,12 +0,0 @@
 145-# Build Options
 146-#   change yes to no to disable
 147-#
 148-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
 149-MOUSEKEY_ENABLE = yes       # Mouse keys
 150-EXTRAKEY_ENABLE = yes       # Audio control and System control
 151-CONSOLE_ENABLE = no         # Console for debug
 152-COMMAND_ENABLE = no         # Commands for debug and configuration
 153-NKRO_ENABLE = yes           # Enable N-Key Rollover
 154-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 155-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 156-AUDIO_ENABLE = no           # Audio output
 157diff --git a/keyboards/ocean/sus/info.json b/keyboards/ocean/sus/keyboard.json
 158rename from keyboards/ocean/sus/info.json
 159rename to keyboards/ocean/sus/keyboard.json
 160index bb9b8c501c4384d6687af9795194cd200804a2a8..ea2b1e326a11cee2c4b493fb9d9ff08476730a0f 100644
 161--- a/keyboards/ocean/sus/info.json
 162+++ b/keyboards/ocean/sus/keyboard.json
 163@@ -8,6 +8,14 @@
 164       "pid": "0x0009",
 165       "device_version": "0.0.1"
 166     },
 167+    "features": {
 168+        "bootmagic": false,
 169+        "command": false,
 170+        "console": false,
 171+        "extrakey": true,
 172+        "mousekey": true,
 173+        "nkro": true
 174+    },
 175     "matrix_pins": {
 176       "cols": ["C6", "D4", "D0"],
 177       "rows": ["B5", "B4", "E6", "D7"]
 178diff --git a/keyboards/ocean/sus/rules.mk b/keyboards/ocean/sus/rules.mk
 179deleted file mode 100644
 180index 75b0df17a21991c2ff75a227b7261bf70f7a96a0..0000000000000000000000000000000000000000
 181--- a/keyboards/ocean/sus/rules.mk
 182+++ /dev/null
 183@@ -1,12 +0,0 @@
 184-# Build Options
 185-#   change yes to no to disable
 186-#
 187-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
 188-MOUSEKEY_ENABLE = yes       # Mouse keys
 189-EXTRAKEY_ENABLE = yes       # Audio control and System control
 190-CONSOLE_ENABLE = no         # Console for debug
 191-COMMAND_ENABLE = no         # Commands for debug and configuration
 192-NKRO_ENABLE = yes           # Enable N-Key Rollover
 193-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 194-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 195-AUDIO_ENABLE = no           # Audio output
 196diff --git a/keyboards/ocean/wang_ergo/info.json b/keyboards/ocean/wang_ergo/keyboard.json
 197rename from keyboards/ocean/wang_ergo/info.json
 198rename to keyboards/ocean/wang_ergo/keyboard.json
 199index c09340a92f000ab95203e00f0e8d2ac293ea0e77..5debc4396dd9a7f330caf21192f64c2ac6fbe482 100644
 200--- a/keyboards/ocean/wang_ergo/info.json
 201+++ b/keyboards/ocean/wang_ergo/keyboard.json
 202@@ -8,6 +8,14 @@
 203         "pid": "0x0008",
 204         "device_version": "0.0.1"
 205     },
 206+    "features": {
 207+        "bootmagic": true,
 208+        "command": false,
 209+        "console": false,
 210+        "extrakey": true,
 211+        "mousekey": true,
 212+        "nkro": true
 213+    },
 214     "matrix_pins": {
 215         "cols": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "B6", "B2", "B3", "B1"],
 216         "rows": ["F4", "F5", "F6", "F7"]
 217diff --git a/keyboards/ocean/wang_ergo/rules.mk b/keyboards/ocean/wang_ergo/rules.mk
 218deleted file mode 100644
 219index d65d32df0aad323d78db1d97c099325df07e5d6f..0000000000000000000000000000000000000000
 220--- a/keyboards/ocean/wang_ergo/rules.mk
 221+++ /dev/null
 222@@ -1,12 +0,0 @@
 223-# Build Options
 224-#   change yes to no to disable
 225-#
 226-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
 227-MOUSEKEY_ENABLE = yes       # Mouse keys
 228-EXTRAKEY_ENABLE = yes       # Audio control and System control
 229-CONSOLE_ENABLE = no         # Console for debug
 230-COMMAND_ENABLE = no         # Commands for debug and configuration
 231-NKRO_ENABLE = yes           # Enable N-Key Rollover
 232-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 233-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 234-AUDIO_ENABLE = no           # Audio output
 235diff --git a/keyboards/ocean/wang_v2/info.json b/keyboards/ocean/wang_v2/keyboard.json
 236rename from keyboards/ocean/wang_v2/info.json
 237rename to keyboards/ocean/wang_v2/keyboard.json
 238index 93591d28c3eaa5a254cbd3b6caa1ad872070f853..6e80932ce2e242c7311051656a90bdedcf8fc46c 100644
 239--- a/keyboards/ocean/wang_v2/info.json
 240+++ b/keyboards/ocean/wang_v2/keyboard.json
 241@@ -8,6 +8,14 @@
 242         "pid": "0x0004",
 243         "device_version": "0.0.1"
 244     },
 245+    "features": {
 246+        "bootmagic": false,
 247+        "command": false,
 248+        "console": false,
 249+        "extrakey": true,
 250+        "mousekey": true,
 251+        "nkro": true
 252+    },
 253     "matrix_pins": {
 254         "cols": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "B6", "B2", "B3", "B1", "D3"],
 255         "rows": ["F4", "F5", "F6", "F7"]
 256diff --git a/keyboards/ocean/wang_v2/rules.mk b/keyboards/ocean/wang_v2/rules.mk
 257deleted file mode 100644
 258index 75b0df17a21991c2ff75a227b7261bf70f7a96a0..0000000000000000000000000000000000000000
 259--- a/keyboards/ocean/wang_v2/rules.mk
 260+++ /dev/null
 261@@ -1,12 +0,0 @@
 262-# Build Options
 263-#   change yes to no to disable
 264-#
 265-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
 266-MOUSEKEY_ENABLE = yes       # Mouse keys
 267-EXTRAKEY_ENABLE = yes       # Audio control and System control
 268-CONSOLE_ENABLE = no         # Console for debug
 269-COMMAND_ENABLE = no         # Commands for debug and configuration
 270-NKRO_ENABLE = yes           # Enable N-Key Rollover
 271-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 272-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 273-AUDIO_ENABLE = no           # Audio output
 274diff --git a/keyboards/ocean/yuri/info.json b/keyboards/ocean/yuri/keyboard.json
 275rename from keyboards/ocean/yuri/info.json
 276rename to keyboards/ocean/yuri/keyboard.json
 277index 3ed5df874602e204be91540668de6898a13f2c36..6542de2cdae62d7480be814012ba9c7fdfd55795 100644
 278--- a/keyboards/ocean/yuri/info.json
 279+++ b/keyboards/ocean/yuri/keyboard.json
 280@@ -8,6 +8,14 @@
 281         "pid": "0x0003",
 282         "device_version": "0.0.1"
 283     },
 284+    "features": {
 285+        "bootmagic": true,
 286+        "command": false,
 287+        "console": false,
 288+        "extrakey": true,
 289+        "mousekey": true,
 290+        "nkro": true
 291+    },
 292     "matrix_pins": {
 293         "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "B6", "B2", "B3", "B1"],
 294         "rows": ["F4", "F5", "F6", "F7"]
 295diff --git a/keyboards/ocean/yuri/rules.mk b/keyboards/ocean/yuri/rules.mk
 296deleted file mode 100644
 297index fd62cad16580668194b4eac3641dde6854e2f15d..0000000000000000000000000000000000000000
 298--- a/keyboards/ocean/yuri/rules.mk
 299+++ /dev/null
 300@@ -1,12 +0,0 @@
 301-# Build Options
 302-#   change yes to no to disable
 303-#
 304-BOOTMAGIC_ENABLE = yes       # Enable Bootmagic Lite
 305-MOUSEKEY_ENABLE = yes       # Mouse keys
 306-EXTRAKEY_ENABLE = yes       # Audio control and System control
 307-CONSOLE_ENABLE = no         # Console for debug
 308-COMMAND_ENABLE = no         # Commands for debug and configuration
 309-NKRO_ENABLE = yes           # Enable N-Key Rollover
 310-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 311-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 312-AUDIO_ENABLE = no           # Audio output
 313diff --git a/keyboards/odelia/info.json b/keyboards/odelia/keyboard.json
 314rename from keyboards/odelia/info.json
 315rename to keyboards/odelia/keyboard.json
 316index 6208e2da1ea698d65db143c87575803d8cf7bdc6..3c187b5c18d601929a1188f0362f2074d95ee8d5 100644
 317--- a/keyboards/odelia/info.json
 318+++ b/keyboards/odelia/keyboard.json
 319@@ -8,6 +8,14 @@
 320         "pid": "0xA129",
 321         "device_version": "0.0.1"
 322     },
 323+    "features": {
 324+        "bootmagic": true,
 325+        "command": false,
 326+        "console": false,
 327+        "extrakey": true,
 328+        "mousekey": true,
 329+        "nkro": false
 330+    },
 331     "matrix_pins": {
 332         "cols": ["B5", "B4", "D7", "D6", "E6", "D0", "D1", "D2", "D3", "D5"],
 333         "rows": ["B3", "B7", "B1", "B2", "B0", "F4", "F0", "F1", "D4", "B6"]
 334diff --git a/keyboards/odelia/rules.mk b/keyboards/odelia/rules.mk
 335deleted file mode 100644
 336index ab2c49da70e7a17a3147b942df44f2f8e2d8bf8c..0000000000000000000000000000000000000000
 337--- a/keyboards/odelia/rules.mk
 338+++ /dev/null
 339@@ -1,12 +0,0 @@
 340-# Build Options
 341-#   change yes to no to disable
 342-#
 343-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
 344-MOUSEKEY_ENABLE = yes       # Mouse keys
 345-EXTRAKEY_ENABLE = yes       # Audio control and System control
 346-CONSOLE_ENABLE = no         # Console for debug
 347-COMMAND_ENABLE = no         # Commands for debug and configuration
 348-NKRO_ENABLE = no            # Enable N-Key Rollover
 349-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 350-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 351-AUDIO_ENABLE = no           # Audio output
 352diff --git a/keyboards/ok60/info.json b/keyboards/ok60/keyboard.json
 353rename from keyboards/ok60/info.json
 354rename to keyboards/ok60/keyboard.json
 355index a8a345824cef50cd35375575ecdf7323b01f5c8c..f6459907bea2254a159451aa9cef00908b893492 100644
 356--- a/keyboards/ok60/info.json
 357+++ b/keyboards/ok60/keyboard.json
 358@@ -8,6 +8,16 @@
 359     "pid": "0x6060",
 360     "device_version": "0.0.1"
 361   },
 362+  "features": {
 363+    "backlight": true,
 364+    "bootmagic": true,
 365+    "command": false,
 366+    "console": false,
 367+    "extrakey": true,
 368+    "mousekey": true,
 369+    "nkro": true,
 370+    "rgblight": true
 371+  },
 372   "matrix_pins": {
 373     "cols": ["D0", "D1", "D2", "D3", "D5", "B6", "C6", "C7", "F1", "F0", "E6", "B3", "B2", "B1", "B0"],
 374     "rows": ["B5", "B4", "D7", "D6", "D4"]
 375diff --git a/keyboards/ok60/rules.mk b/keyboards/ok60/rules.mk
 376deleted file mode 100644
 377index ed7a8ea031267df15ad1b82ce165ab2138a67b99..0000000000000000000000000000000000000000
 378--- a/keyboards/ok60/rules.mk
 379+++ /dev/null
 380@@ -1,11 +0,0 @@
 381-# Build Options
 382-#   change yes to no to disable
 383-#
 384-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
 385-MOUSEKEY_ENABLE = yes		# Mouse keys
 386-EXTRAKEY_ENABLE = yes		# Audio control and System control
 387-# CONSOLE_ENABLE = yes		# Console for debug
 388-# COMMAND_ENABLE = yes		# Commands for debug and configuration
 389-NKRO_ENABLE = yes           # Enable N-Key Rollover
 390-BACKLIGHT_ENABLE = yes	# Enable keyboard backlight functionality
 391-RGBLIGHT_ENABLE = yes  # Enable the RGB backlight
 392diff --git a/keyboards/onekeyco/dango40/info.json b/keyboards/onekeyco/dango40/keyboard.json
 393rename from keyboards/onekeyco/dango40/info.json
 394rename to keyboards/onekeyco/dango40/keyboard.json
 395index c9087c630a27a52aba4e1b01d2de5bc79623dbc7..8a41f2532531c3f28f3e77bf05e752a4593b9f5b 100644
 396--- a/keyboards/onekeyco/dango40/info.json
 397+++ b/keyboards/onekeyco/dango40/keyboard.json
 398@@ -8,6 +8,15 @@
 399         "pid": "0xE9B9",
 400         "device_version": "0.0.1"
 401     },
 402+    "features": {
 403+        "bootmagic": true,
 404+        "command": false,
 405+        "console": false,
 406+        "encoder": true,
 407+        "extrakey": true,
 408+        "mousekey": true,
 409+        "nkro": false
 410+    },
 411     "matrix_pins": {
 412         "cols": ["F7", "F6", "F5", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C7", "B0"],
 413         "rows": ["F4", "F1", "F0", "C6"]
 414diff --git a/keyboards/onekeyco/dango40/rules.mk b/keyboards/onekeyco/dango40/rules.mk
 415deleted file mode 100644
 416index 614384dd3c751ddc29d383e64c3109477fe45ec0..0000000000000000000000000000000000000000
 417--- a/keyboards/onekeyco/dango40/rules.mk
 418+++ /dev/null
 419@@ -1,13 +0,0 @@
 420-# Build Options
 421-#   change yes to no to disable
 422-#
 423-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
 424-MOUSEKEY_ENABLE = yes       # Mouse keys
 425-EXTRAKEY_ENABLE = yes       # Audio control and System control
 426-CONSOLE_ENABLE = no         # Console for debug
 427-COMMAND_ENABLE = no         # Commands for debug and configuration
 428-NKRO_ENABLE = no            # Enable N-Key Rollover
 429-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 430-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 431-AUDIO_ENABLE = no           # Audio output
 432-ENCODER_ENABLE = yes 		# Enable encoder
 433diff --git a/keyboards/orange75/info.json b/keyboards/orange75/keyboard.json
 434rename from keyboards/orange75/info.json
 435rename to keyboards/orange75/keyboard.json
 436index 59665c2cb0fa49e0f368bdb66045439ee60a25e3..4208cc0f586ec3812126151a59ad8268e652da4a 100644
 437--- a/keyboards/orange75/info.json
 438+++ b/keyboards/orange75/keyboard.json
 439@@ -8,6 +8,15 @@
 440         "pid": "0x6060",
 441         "device_version": "0.0.1"
 442     },
 443+    "features": {
 444+        "backlight": true,
 445+        "bootmagic": true,
 446+        "command": false,
 447+        "console": false,
 448+        "extrakey": true,
 449+        "mousekey": true,
 450+        "nkro": true
 451+    },
 452     "matrix_pins": {
 453         "cols": ["D3", "D2", "D1", "D0", "B7", "B3"],
 454         "rows": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B4", "D7", "D4", "D5", "D6"]
 455diff --git a/keyboards/orange75/rules.mk b/keyboards/orange75/rules.mk
 456deleted file mode 100644
 457index e0fca34fa1e3fdb8ac095c76792086c2c67097e2..0000000000000000000000000000000000000000
 458--- a/keyboards/orange75/rules.mk
 459+++ /dev/null
 460@@ -1,12 +0,0 @@
 461-# Build Options
 462-#   change yes to no to disable
 463-#
 464-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
 465-MOUSEKEY_ENABLE = yes	# Mouse keys
 466-EXTRAKEY_ENABLE = yes	# Audio control and System control
 467-CONSOLE_ENABLE = no	# Console for debug
 468-COMMAND_ENABLE = no    # Commands for debug and configuration
 469-NKRO_ENABLE = yes           # Enable N-Key Rollover
 470-BACKLIGHT_ENABLE = yes  # Enable keyboard backlight functionality
 471-AUDIO_ENABLE = no
 472-RGBLIGHT_ENABLE = no
 473diff --git a/keyboards/org60/info.json b/keyboards/org60/keyboard.json
 474rename from keyboards/org60/info.json
 475rename to keyboards/org60/keyboard.json
 476index 2e4599752492df4db0383bbeef1dd7e243f62894..d4994346af2aa040f12215890c09f9049e963334 100644
 477--- a/keyboards/org60/info.json
 478+++ b/keyboards/org60/keyboard.json
 479@@ -8,6 +8,16 @@
 480         "pid": "0x6060",
 481         "device_version": "0.0.1"
 482     },
 483+    "features": {
 484+        "backlight": true,
 485+        "bootmagic": true,
 486+        "command": false,
 487+        "console": false,
 488+        "extrakey": true,
 489+        "mousekey": true,
 490+        "nkro": true,
 491+        "rgblight": true
 492+    },
 493     "matrix_pins": {
 494         "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3"],
 495         "rows": ["D0", "D1", "D2", "D3", "D5"]
 496diff --git a/keyboards/org60/rules.mk b/keyboards/org60/rules.mk
 497deleted file mode 100644
 498index d22d1cd2f42698d89ae85d10b347fbf0048b20a3..0000000000000000000000000000000000000000
 499--- a/keyboards/org60/rules.mk
 500+++ /dev/null
 501@@ -1,12 +0,0 @@
 502-# Build Options
 503-#   change yes to no to disable
 504-#
 505-AUDIO_ENABLE = no           # Audio output
 506-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 507-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
 508-COMMAND_ENABLE = no         # Commands for debug and configuration
 509-CONSOLE_ENABLE = no         # Console for debug
 510-EXTRAKEY_ENABLE = yes       # Audio control and System control
 511-MOUSEKEY_ENABLE = yes       # Mouse keys
 512-NKRO_ENABLE = yes           # Enable N-Key Rollover
 513-RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight. 
 514diff --git a/keyboards/ortho5by12/info.json b/keyboards/ortho5by12/keyboard.json
 515rename from keyboards/ortho5by12/info.json
 516rename to keyboards/ortho5by12/keyboard.json
 517index a107275b18cb6e0a3fb5205fa20ca2c6ded7cc06..c45788ba2fe7749a5e69aad59915caf31dabf7c5 100644
 518--- a/keyboards/ortho5by12/info.json
 519+++ b/keyboards/ortho5by12/keyboard.json
 520@@ -8,6 +8,14 @@
 521     "pid": "0x27DB",
 522     "device_version": "0.0.2"
 523   },
 524+  "features": {
 525+    "bootmagic": true,
 526+    "command": false,
 527+    "console": false,
 528+    "extrakey": true,
 529+    "mousekey": false,
 530+    "nkro": false
 531+  },
 532   "matrix_pins": {
 533     "cols": ["C2", "D0", "D1", "D4", "C3", "C1"],
 534     "rows": ["B5", "B1", "B2", "B3", "B4", "C0", "D5", "D6", "D7", "B0"]
 535diff --git a/keyboards/ortho5by12/rules.mk b/keyboards/ortho5by12/rules.mk
 536deleted file mode 100644
 537index 6fe874e748bea0ad70ddad4f580eb5acf5bd2888..0000000000000000000000000000000000000000
 538--- a/keyboards/ortho5by12/rules.mk
 539+++ /dev/null
 540@@ -1,12 +0,0 @@
 541-# Build Options
 542-#   change yes to no to disable
 543-#
 544-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
 545-MOUSEKEY_ENABLE = no        # Mouse keys
 546-EXTRAKEY_ENABLE = yes       # Audio control and System control
 547-CONSOLE_ENABLE = no         # Console for debug
 548-COMMAND_ENABLE = no         # Commands for debug and configuration
 549-NKRO_ENABLE = no            # Enable N-Key Rollover
 550-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 551-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 552-AUDIO_ENABLE = no           # Audio output
 553diff --git a/keyboards/owlab/jelly_epoch/hotswap/info.json b/keyboards/owlab/jelly_epoch/hotswap/keyboard.json
 554rename from keyboards/owlab/jelly_epoch/hotswap/info.json
 555rename to keyboards/owlab/jelly_epoch/hotswap/keyboard.json
 556index 0cf09660cab6bd0de192dc56a0c3712fd5bacd8b..38db4c965b35f626429ee34856ca7ff6033b66eb 100644
 557--- a/keyboards/owlab/jelly_epoch/hotswap/info.json
 558+++ b/keyboards/owlab/jelly_epoch/hotswap/keyboard.json
 559@@ -9,6 +9,15 @@
 560         "device_version": "0.0.1",
 561         "force_nkro": true
 562     },
 563+    "features": {
 564+        "bootmagic": true,
 565+        "command": false,
 566+        "console": false,
 567+        "extrakey": true,
 568+        "mousekey": true,
 569+        "nkro": false,
 570+        "rgblight": true
 571+    },
 572     "matrix_pins": {
 573         "cols": ["A1", "A2", "A3", "A4", "A5", "A6", "A7", "A8", "A9", "A10", "B11", "B8", "B9", "C13"],
 574         "rows": ["B0", "B1", "B2", "B3", "A15", "B10"]
 575diff --git a/keyboards/owlab/jelly_epoch/hotswap/rules.mk b/keyboards/owlab/jelly_epoch/hotswap/rules.mk
 576deleted file mode 100644
 577index 951dd07d6e0ba20c08df1b597eef42e1301e1515..0000000000000000000000000000000000000000
 578--- a/keyboards/owlab/jelly_epoch/hotswap/rules.mk
 579+++ /dev/null
 580@@ -1,12 +0,0 @@
 581-# Build Options
 582-#   change yes to no to disable
 583-#
 584-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
 585-MOUSEKEY_ENABLE = yes       # Mouse keys
 586-EXTRAKEY_ENABLE = yes       # Audio control and System control
 587-CONSOLE_ENABLE = no         # Console for debug
 588-COMMAND_ENABLE = no         # Commands for debug and configuration
 589-NKRO_ENABLE = no            # Enable N-Key Rollover
 590-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 591-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 592-AUDIO_ENABLE = no           # Audio output
 593diff --git a/keyboards/owlab/jelly_epoch/soldered/info.json b/keyboards/owlab/jelly_epoch/soldered/keyboard.json
 594rename from keyboards/owlab/jelly_epoch/soldered/info.json
 595rename to keyboards/owlab/jelly_epoch/soldered/keyboard.json
 596index 4337922ee05d4a342bf273830dda67ef45efcb18..5a12cdf0e9e9af7d775cc729a95a9072acb29b4e 100644
 597--- a/keyboards/owlab/jelly_epoch/soldered/info.json
 598+++ b/keyboards/owlab/jelly_epoch/soldered/keyboard.json
 599@@ -9,6 +9,15 @@
 600         "device_version": "0.0.1",
 601         "force_nkro": true
 602     },
 603+    "features": {
 604+        "bootmagic": true,
 605+        "command": false,
 606+        "console": false,
 607+        "extrakey": true,
 608+        "mousekey": true,
 609+        "nkro": false,
 610+        "rgblight": true
 611+    },
 612     "matrix_pins": {
 613         "cols": ["A1", "A2", "A3", "A4", "A5", "A6", "A7", "A8", "A9", "A10", "B11", "B8", "B9", "C13"],
 614         "rows": ["B0", "B1", "B2", "B3", "A15", "B10"]
 615diff --git a/keyboards/owlab/jelly_epoch/soldered/rules.mk b/keyboards/owlab/jelly_epoch/soldered/rules.mk
 616deleted file mode 100644
 617index 951dd07d6e0ba20c08df1b597eef42e1301e1515..0000000000000000000000000000000000000000
 618--- a/keyboards/owlab/jelly_epoch/soldered/rules.mk
 619+++ /dev/null
 620@@ -1,12 +0,0 @@
 621-# Build Options
 622-#   change yes to no to disable
 623-#
 624-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
 625-MOUSEKEY_ENABLE = yes       # Mouse keys
 626-EXTRAKEY_ENABLE = yes       # Audio control and System control
 627-CONSOLE_ENABLE = no         # Console for debug
 628-COMMAND_ENABLE = no         # Commands for debug and configuration
 629-NKRO_ENABLE = no            # Enable N-Key Rollover
 630-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 631-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 632-AUDIO_ENABLE = no           # Audio output
 633diff --git a/keyboards/owlab/spring/info.json b/keyboards/owlab/spring/keyboard.json
 634rename from keyboards/owlab/spring/info.json
 635rename to keyboards/owlab/spring/keyboard.json
 636index f55f08addc558b6fed6ba973f1ee22cf02d63145..7dcb6ec717bf3b684762ea3703a4aec54300ec67 100644
 637--- a/keyboards/owlab/spring/info.json
 638+++ b/keyboards/owlab/spring/keyboard.json
 639@@ -9,6 +9,15 @@
 640         "device_version": "0.0.1",
 641         "force_nkro": true
 642     },
 643+    "features": {
 644+        "bootmagic": true,
 645+        "command": false,
 646+        "console": false,
 647+        "extrakey": true,
 648+        "mousekey": true,
 649+        "nkro": true,
 650+        "rgblight": true
 651+    },
 652     "matrix_pins": {
 653         "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F4", "F7", "F6", "F5", "F1", "F0"],
 654         "rows": ["B0", "B7", "D0", "D1", "D2"]
 655diff --git a/keyboards/owlab/spring/rules.mk b/keyboards/owlab/spring/rules.mk
 656deleted file mode 100644
 657index bc48e6b5bb13792cfb2c8571ab31adcee0699863..0000000000000000000000000000000000000000
 658--- a/keyboards/owlab/spring/rules.mk
 659+++ /dev/null
 660@@ -1,12 +0,0 @@
 661-# Build Options
 662-#   change yes to no to disable
 663-#
 664-BOOTMAGIC_ENABLE = yes  # Enable Bootmagic Lite
 665-MOUSEKEY_ENABLE = yes   # Mouse keys
 666-EXTRAKEY_ENABLE = yes   # Audio control and System control
 667-CONSOLE_ENABLE = no     # Console for debug
 668-COMMAND_ENABLE = no     # Commands for debug and configuration
 669-NKRO_ENABLE = yes       # Enable N-Key Rollover	
 670-BACKLIGHT_ENABLE = no   # Enable keyboard backlight functionality
 671-RGBLIGHT_ENABLE = yes   # Enable keyboard RGB underglow
 672-AUDIO_ENABLE = no       # Audio output
 673diff --git a/keyboards/owlab/suit80/ansi/info.json b/keyboards/owlab/suit80/ansi/keyboard.json
 674rename from keyboards/owlab/suit80/ansi/info.json
 675rename to keyboards/owlab/suit80/ansi/keyboard.json
 676index fcce6c6fb609544323d1070ce8103a4848c5d925..22bf9f78cd2dd3b8525a7f34192ee782b4161882 100644
 677--- a/keyboards/owlab/suit80/ansi/info.json
 678+++ b/keyboards/owlab/suit80/ansi/keyboard.json
 679@@ -9,6 +9,14 @@
 680         "device_version": "0.0.1",
 681         "force_nkro": true
 682     },
 683+    "features": {
 684+        "bootmagic": true,
 685+        "command": false,
 686+        "console": false,
 687+        "extrakey": true,
 688+        "mousekey": true,
 689+        "nkro": true
 690+    },
 691     "matrix_pins": {
 692         "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F4", "F7", "F6", "F5", "F1", "F0"],
 693         "rows": ["E6", "B0", "B7", "D0", "D1", "D2"]
 694diff --git a/keyboards/owlab/suit80/ansi/rules.mk b/keyboards/owlab/suit80/ansi/rules.mk
 695deleted file mode 100644
 696index d65d32df0aad323d78db1d97c099325df07e5d6f..0000000000000000000000000000000000000000
 697--- a/keyboards/owlab/suit80/ansi/rules.mk
 698+++ /dev/null
 699@@ -1,12 +0,0 @@
 700-# Build Options
 701-#   change yes to no to disable
 702-#
 703-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
 704-MOUSEKEY_ENABLE = yes       # Mouse keys
 705-EXTRAKEY_ENABLE = yes       # Audio control and System control
 706-CONSOLE_ENABLE = no         # Console for debug
 707-COMMAND_ENABLE = no         # Commands for debug and configuration
 708-NKRO_ENABLE = yes           # Enable N-Key Rollover
 709-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 710-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 711-AUDIO_ENABLE = no           # Audio output
 712diff --git a/keyboards/owlab/suit80/iso/info.json b/keyboards/owlab/suit80/iso/keyboard.json
 713rename from keyboards/owlab/suit80/iso/info.json
 714rename to keyboards/owlab/suit80/iso/keyboard.json
 715index dc571071671ab369687daaee076da51166c23d7f..87e95e9beed707f4338306e3e03a93077da111a5 100644
 716--- a/keyboards/owlab/suit80/iso/info.json
 717+++ b/keyboards/owlab/suit80/iso/keyboard.json
 718@@ -9,6 +9,14 @@
 719         "device_version": "0.0.1",
 720         "force_nkro": true
 721     },
 722+    "features": {
 723+        "bootmagic": true,
 724+        "command": false,
 725+        "console": false,
 726+        "extrakey": true,
 727+        "mousekey": true,
 728+        "nkro": true
 729+    },
 730     "matrix_pins": {
 731         "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F4", "F7", "F6", "F5", "F1", "F0"],
 732         "rows": ["E6", "B0", "B7", "D0", "D1", "D2"]
 733diff --git a/keyboards/owlab/suit80/iso/rules.mk b/keyboards/owlab/suit80/iso/rules.mk
 734deleted file mode 100644
 735index d65d32df0aad323d78db1d97c099325df07e5d6f..0000000000000000000000000000000000000000
 736--- a/keyboards/owlab/suit80/iso/rules.mk
 737+++ /dev/null
 738@@ -1,12 +0,0 @@
 739-# Build Options
 740-#   change yes to no to disable
 741-#
 742-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
 743-MOUSEKEY_ENABLE = yes       # Mouse keys
 744-EXTRAKEY_ENABLE = yes       # Audio control and System control
 745-CONSOLE_ENABLE = no         # Console for debug
 746-COMMAND_ENABLE = no         # Commands for debug and configuration
 747-NKRO_ENABLE = yes           # Enable N-Key Rollover
 748-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 749-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 750-AUDIO_ENABLE = no           # Audio output
 751diff --git a/keyboards/owlab/voice65/hotswap/info.json b/keyboards/owlab/voice65/hotswap/keyboard.json
 752rename from keyboards/owlab/voice65/hotswap/info.json
 753rename to keyboards/owlab/voice65/hotswap/keyboard.json
 754index d32b74cfcbfb5b24f0898aa055afd76489b9cbdd..088cde400167dc631074478c9a553975e7361a7a 100644
 755--- a/keyboards/owlab/voice65/hotswap/info.json
 756+++ b/keyboards/owlab/voice65/hotswap/keyboard.json
 757@@ -64,6 +64,17 @@
 758         "max_brightness": 200,
 759         "sleep": true
 760     },
 761+    "features": {
 762+        "bootmagic": true,
 763+        "command": false,
 764+        "console": false,
 765+        "encoder": true,
 766+        "extrakey": true,
 767+        "mousekey": true,
 768+        "nkro": false,
 769+        "rgblight": true,
 770+        "rgb_matrix": true
 771+    },
 772     "matrix_pins": {
 773         "cols": ["A1", "A2", "A3", "A4", "A5", "A6", "A7", "A8", "A9", "A10", "A15", "B8", "B9", "B12", "B13"],
 774         "rows": ["B0", "B1", "B2", "B10", "B11"]
 775diff --git a/keyboards/owlab/voice65/hotswap/rules.mk b/keyboards/owlab/voice65/hotswap/rules.mk
 776deleted file mode 100644
 777index aa5f47503370059f134f3a7095d43bb677361fad..0000000000000000000000000000000000000000
 778--- a/keyboards/owlab/voice65/hotswap/rules.mk
 779+++ /dev/null
 780@@ -1,15 +0,0 @@
 781-# Build Options
 782-#   change yes to no to disable
 783-#
 784-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
 785-MOUSEKEY_ENABLE = yes       # Mouse keys
 786-EXTRAKEY_ENABLE = yes       # Audio control and System control
 787-CONSOLE_ENABLE = no         # Console for debug
 788-COMMAND_ENABLE = no         # Commands for debug and configuration
 789-NKRO_ENABLE = no            # Enable N-Key Rollover
 790-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 791-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 792-AUDIO_ENABLE = no           # Audio output
 793-ENCODER_ENABLE = yes        # Rotary encoder
 794-
 795-RGB_MATRIX_ENABLE = yes
 796diff --git a/keyboards/owlab/voice65/soldered/info.json b/keyboards/owlab/voice65/soldered/keyboard.json
 797rename from keyboards/owlab/voice65/soldered/info.json
 798rename to keyboards/owlab/voice65/soldered/keyboard.json
 799index 4cae769a9476e25e21b3e18b0d89053348e73df0..7aab520f76193c2f78c90c2bc377733041de7e54 100644
 800--- a/keyboards/owlab/voice65/soldered/info.json
 801+++ b/keyboards/owlab/voice65/soldered/keyboard.json
 802@@ -64,6 +64,17 @@
 803         "max_brightness": 200,
 804         "sleep": true
 805     },
 806+    "features": {
 807+        "bootmagic": true,
 808+        "command": false,
 809+        "console": false,
 810+        "encoder": true,
 811+        "extrakey": true,
 812+        "mousekey": true,
 813+        "nkro": false,
 814+        "rgblight": true,
 815+        "rgb_matrix": true
 816+    },
 817     "matrix_pins": {
 818         "cols": ["A1", "A2", "A3", "A4", "A5", "A6", "A7", "A8", "A9", "A10", "A15", "B8", "B9", "B12", "B13"],
 819         "rows": ["B0", "B1", "B2", "B10", "B11"]
 820diff --git a/keyboards/owlab/voice65/soldered/rules.mk b/keyboards/owlab/voice65/soldered/rules.mk
 821deleted file mode 100644
 822index aa5f47503370059f134f3a7095d43bb677361fad..0000000000000000000000000000000000000000
 823--- a/keyboards/owlab/voice65/soldered/rules.mk
 824+++ /dev/null
 825@@ -1,15 +0,0 @@
 826-# Build Options
 827-#   change yes to no to disable
 828-#
 829-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
 830-MOUSEKEY_ENABLE = yes       # Mouse keys
 831-EXTRAKEY_ENABLE = yes       # Audio control and System control
 832-CONSOLE_ENABLE = no         # Console for debug
 833-COMMAND_ENABLE = no         # Commands for debug and configuration
 834-NKRO_ENABLE = no            # Enable N-Key Rollover
 835-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 836-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 837-AUDIO_ENABLE = no           # Audio output
 838-ENCODER_ENABLE = yes        # Rotary encoder
 839-
 840-RGB_MATRIX_ENABLE = yes
 841diff --git a/keyboards/p3d/eu_isolation/info.json b/keyboards/p3d/eu_isolation/keyboard.json
 842rename from keyboards/p3d/eu_isolation/info.json
 843rename to keyboards/p3d/eu_isolation/keyboard.json
 844index f181418cf0e736d267b8699dd1ac76da70c98b42..a94ee990ad264a7aab085f4ad286ed2b82a910d5 100644
 845--- a/keyboards/p3d/eu_isolation/info.json
 846+++ b/keyboards/p3d/eu_isolation/keyboard.json
 847@@ -8,6 +8,14 @@
 848         "pid": "0x4373",
 849         "device_version": "0.0.1"
 850     },
 851+    "features": {
 852+        "bootmagic": false,
 853+        "command": false,
 854+        "console": true,
 855+        "extrakey": true,
 856+        "mousekey": true,
 857+        "nkro": true
 858+    },
 859     "matrix_pins": {
 860         "cols": ["D0", "D1", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4"],
 861         "rows": ["D2", "D3", "F1", "F0"]
 862diff --git a/keyboards/p3d/eu_isolation/rules.mk b/keyboards/p3d/eu_isolation/rules.mk
 863deleted file mode 100644
 864index 20825c8cfa60a7066b32ea8d602752991fa1c629..0000000000000000000000000000000000000000
 865--- a/keyboards/p3d/eu_isolation/rules.mk
 866+++ /dev/null
 867@@ -1,12 +0,0 @@
 868-# Build Options
 869-#   change yes to no to disable
 870-#
 871-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
 872-MOUSEKEY_ENABLE = yes       # Mouse keys
 873-EXTRAKEY_ENABLE = yes       # Audio control and System control
 874-CONSOLE_ENABLE = yes        # Console for debug
 875-COMMAND_ENABLE = no         # Commands for debug and configuration
 876-NKRO_ENABLE = yes           # Enable N-Key Rollover
 877-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 878-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 879-AUDIO_ENABLE = no           # Audio output
 880diff --git a/keyboards/p3d/glitch/info.json b/keyboards/p3d/glitch/keyboard.json
 881rename from keyboards/p3d/glitch/info.json
 882rename to keyboards/p3d/glitch/keyboard.json
 883index e7858124e2fe5cc0983f74dac2eda32b47193740..366707f807deb1cda59236099ebc83e8071a63b3 100644
 884--- a/keyboards/p3d/glitch/info.json
 885+++ b/keyboards/p3d/glitch/keyboard.json
 886@@ -9,6 +9,17 @@
 887         "device_version": "0.0.1",
 888         "max_power": 400
 889     },
 890+    "features": {
 891+        "bootmagic": true,
 892+        "command": false,
 893+        "console": false,
 894+        "encoder": true,
 895+        "extrakey": true,
 896+        "mousekey": true,
 897+        "nkro": false,
 898+        "oled": true,
 899+        "rgblight": true
 900+    },
 901     "matrix_pins": {
 902         "cols": ["B2", "D2", "B3", "B7", "F5", "F4", "F1", "F0"],
 903         "rows": ["D5", "D6", "B6", "D7", "C7", "B4", "B5", "D3", "D4", "C6"]
 904diff --git a/keyboards/p3d/glitch/rules.mk b/keyboards/p3d/glitch/rules.mk
 905deleted file mode 100644
 906index 65ecff135b00f9ba16c153f3291b33b05dda919b..0000000000000000000000000000000000000000
 907--- a/keyboards/p3d/glitch/rules.mk
 908+++ /dev/null
 909@@ -1,14 +0,0 @@
 910-# Build Options
 911-#   change yes to no to disable
 912-#
 913-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
 914-MOUSEKEY_ENABLE = yes       # Mouse keys
 915-EXTRAKEY_ENABLE = yes       # Audio control and System control
 916-CONSOLE_ENABLE = no         # Console for debug
 917-COMMAND_ENABLE = no         # Commands for debug and configuration
 918-NKRO_ENABLE = no            # Enable N-Key Rollover
 919-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 920-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 921-AUDIO_ENABLE = no           # Audio output
 922-ENCODER_ENABLE = yes
 923-OLED_ENABLE = yes
 924diff --git a/keyboards/p3d/q4z/info.json b/keyboards/p3d/q4z/keyboard.json
 925rename from keyboards/p3d/q4z/info.json
 926rename to keyboards/p3d/q4z/keyboard.json
 927index dc02296131badc4ea5db98e8b5a3e8c3143ca30e..0b71df61b3a811d91c2bd8397ba14df581f0e502 100644
 928--- a/keyboards/p3d/q4z/info.json
 929+++ b/keyboards/p3d/q4z/keyboard.json
 930@@ -8,6 +8,14 @@
 931         "pid": "0x0001",
 932         "device_version": "0.0.1"
 933     },
 934+    "features": {
 935+        "bootmagic": true,
 936+        "command": false,
 937+        "console": false,
 938+        "extrakey": true,
 939+        "mousekey": true,
 940+        "nkro": true
 941+    },
 942     "matrix_pins": {
 943         "cols": ["D1", "D0", "D4", "B6", "B2", "B3", "B1", "F7", "F6", "F5"],
 944         "rows": ["F4", "C6", "D7", "E6", "B4"]
 945diff --git a/keyboards/p3d/q4z/rules.mk b/keyboards/p3d/q4z/rules.mk
 946deleted file mode 100644
 947index 6d3709762d5420df35b47aa4de3327269ff68244..0000000000000000000000000000000000000000
 948--- a/keyboards/p3d/q4z/rules.mk
 949+++ /dev/null
 950@@ -1,12 +0,0 @@
 951-# Build Options
 952-#   change yes to no to disable
 953-#
 954-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
 955-MOUSEKEY_ENABLE = yes       # Mouse keys
 956-EXTRAKEY_ENABLE = yes       # Audio control and System control
 957-CONSOLE_ENABLE = no         # Console for debug
 958-COMMAND_ENABLE = no         # Commands for debug and configuration
 959-NKRO_ENABLE = yes           # Enable N-Key Rollover
 960-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 961-RGBLIGHT_ENABLE = no       # Enable keyboard RGB underglow
 962-AUDIO_ENABLE = no           # Audio output
 963diff --git a/keyboards/p3d/spacey/info.json b/keyboards/p3d/spacey/keyboard.json
 964rename from keyboards/p3d/spacey/info.json
 965rename to keyboards/p3d/spacey/keyboard.json
 966index 289eff730ff88f7c13522d28cc70c622bd7c6b20..d51e1dc32ca2be593529f1442f65313f57124b61 100644
 967--- a/keyboards/p3d/spacey/info.json
 968+++ b/keyboards/p3d/spacey/keyboard.json
 969@@ -8,6 +8,15 @@
 970         "pid": "0x2045",
 971         "device_version": "0.0.1"
 972     },
 973+    "features": {
 974+        "bootmagic": true,
 975+        "command": false,
 976+        "console": false,
 977+        "encoder": true,
 978+        "extrakey": true,
 979+        "mousekey": true,
 980+        "nkro": false
 981+    },
 982     "matrix_pins": {
 983         "cols": ["D5", "B7", "B5", "B4", "E6", "D7", "C7", "B3", "B2", "B6", "F0", "F1", "B1", "F7"],
 984         "rows": ["D4", "C6", "F6", "F5", "F4"]
 985diff --git a/keyboards/p3d/spacey/rules.mk b/keyboards/p3d/spacey/rules.mk
 986deleted file mode 100644
 987index b03b6fa90581ddccfbf5211bc36caf13f2fc3171..0000000000000000000000000000000000000000
 988--- a/keyboards/p3d/spacey/rules.mk
 989+++ /dev/null
 990@@ -1,13 +0,0 @@
 991-# Build Options
 992-#   change yes to no to disable
 993-#
 994-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
 995-MOUSEKEY_ENABLE = yes       # Mouse keys
 996-EXTRAKEY_ENABLE = yes       # Audio control and System control
 997-CONSOLE_ENABLE = no         # Console for debug
 998-COMMAND_ENABLE = no         # Commands for debug and configuration
 999-NKRO_ENABLE = no            # Enable N-Key Rollover
1000-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
1001-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
1002-AUDIO_ENABLE = no           # Audio output
1003-ENCODER_ENABLE = yes