36a6f2ba3c248e9f0498bc27be3788542ea3a972

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

Message

Migrate build target markers to keyboard.json - S (#23532)

Diff

This diff is truncated to protect this page.

   1diff --git a/keyboards/satt/comet46/info.json b/keyboards/satt/comet46/keyboard.json
   2rename from keyboards/satt/comet46/info.json
   3rename to keyboards/satt/comet46/keyboard.json
   4index 5b11be662e53b8164d5991e2967d21c3d85b350b..0092f19c799ab3c6153442306ce2fc729b36df21 100644
   5--- a/keyboards/satt/comet46/info.json
   6+++ b/keyboards/satt/comet46/keyboard.json
   7@@ -8,6 +8,12 @@
   8         "pid": "0x6060",
   9         "device_version": "0.0.1"
  10     },
  11+    "features": {
  12+        "bootmagic": false,
  13+        "extrakey": false,
  14+        "mousekey": false,
  15+        "nkro": true
  16+    },
  17     "processor": "atmega32u4",
  18     "bootloader": "caterina",
  19     "layouts": {
  20diff --git a/keyboards/satt/comet46/rules.mk b/keyboards/satt/comet46/rules.mk
  21index 0db5166ffacc4ae526f889b1eeb777a2ec84ccb5..18d234d62a0a6bc8ed6d9e8b2f2359da9a8d922f 100644
  22--- a/keyboards/satt/comet46/rules.mk
  23+++ b/keyboards/satt/comet46/rules.mk
  24@@ -1,15 +1,3 @@
  25-# Build Options
  26-#   change yes to no to disable
  27-#
  28-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
  29-MOUSEKEY_ENABLE = no        # Mouse keys
  30-EXTRAKEY_ENABLE = no        # Audio control and System control
  31-CONSOLE_ENABLE = no         # Console for debug
  32-COMMAND_ENABLE = no         # Commands for debug and configuration
  33-NKRO_ENABLE = yes           # Enable N-Key Rollover
  34-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
  35-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
  36-AUDIO_ENABLE = no           # Audio output
  37 CUSTOM_MATRIX = lite
  38 
  39 # project specific files
  40diff --git a/keyboards/sekigon/grs_70ec/info.json b/keyboards/sekigon/grs_70ec/keyboard.json
  41rename from keyboards/sekigon/grs_70ec/info.json
  42rename to keyboards/sekigon/grs_70ec/keyboard.json
  43index 833cd747895cbb930addbc7691dbf5dceadd7583..e940e71d8843a070f92af14258e141d6a3414f09 100644
  44--- a/keyboards/sekigon/grs_70ec/info.json
  45+++ b/keyboards/sekigon/grs_70ec/keyboard.json
  46@@ -8,6 +8,13 @@
  47         "pid": "0x70EC",
  48         "device_version": "0.0.1"
  49     },
  50+    "features": {
  51+        "bootmagic": true,
  52+        "console": true,
  53+        "extrakey": true,
  54+        "mousekey": true,
  55+        "nkro": false
  56+    },
  57     "split": {
  58         "enabled": true,
  59         "soft_serial_pin": "D3"
  60diff --git a/keyboards/sekigon/grs_70ec/rules.mk b/keyboards/sekigon/grs_70ec/rules.mk
  61index ac989e7ea8319812e0c739bd4c2e277533696d00..37cfffd769289a184c9ca4f57182edc95952c5cf 100644
  62--- a/keyboards/sekigon/grs_70ec/rules.mk
  63+++ b/keyboards/sekigon/grs_70ec/rules.mk
  64@@ -1,15 +1,3 @@
  65-# Build Options
  66-#   change yes to no to disable
  67-#
  68-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
  69-MOUSEKEY_ENABLE = yes       # Mouse keys
  70-EXTRAKEY_ENABLE = yes       # Audio control and System control
  71-CONSOLE_ENABLE = yes        # Console for debug
  72-COMMAND_ENABLE = no         # Commands for debug and configuration
  73-NKRO_ENABLE = no            # Enable N-Key Rollover
  74-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
  75-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
  76-AUDIO_ENABLE = no           # Audio output
  77 CUSTOM_MATRIX = lite
  78 
  79 ANALOG_DRIVER_REQUIRED = yes
  80diff --git a/keyboards/shandoncodes/mino_plus/hotswap/info.json b/keyboards/shandoncodes/mino_plus/hotswap/keyboard.json
  81rename from keyboards/shandoncodes/mino_plus/hotswap/info.json
  82rename to keyboards/shandoncodes/mino_plus/hotswap/keyboard.json
  83index b7cda6d71ff2edb3e503e831e691ef1de3212220..f181c610ed1d5da6d605b7e6d542c3179a8045a2 100644
  84--- a/keyboards/shandoncodes/mino_plus/hotswap/info.json
  85+++ b/keyboards/shandoncodes/mino_plus/hotswap/keyboard.json
  86@@ -10,7 +10,9 @@
  87         "console": false,
  88         "extrakey": true,
  89         "mousekey": true,
  90-        "nkro": true
  91+        "nkro": true,
  92+        "oled": true,
  93+        "wpm": true
  94     },
  95     "matrix_pins": {
  96         "cols": ["B12", "A15", "B3", "B2", "B0", "A7", "A5", "A4", "A3", "A2", "A1", "F1", "A0", "A8", "A10"],
  97diff --git a/keyboards/shandoncodes/mino_plus/hotswap/rules.mk b/keyboards/shandoncodes/mino_plus/hotswap/rules.mk
  98deleted file mode 100644
  99index 76e55c05f4838154c2bb49f6393fed4051d39703..0000000000000000000000000000000000000000
 100--- a/keyboards/shandoncodes/mino_plus/hotswap/rules.mk
 101+++ /dev/null
 102@@ -1,2 +0,0 @@
 103-OLED_ENABLE = yes
 104-WPM_ENABLE = yes
 105diff --git a/keyboards/shandoncodes/mino_plus/soldered/info.json b/keyboards/shandoncodes/mino_plus/soldered/keyboard.json
 106rename from keyboards/shandoncodes/mino_plus/soldered/info.json
 107rename to keyboards/shandoncodes/mino_plus/soldered/keyboard.json
 108index 52b612e01bf067afe80f8e6d99a66875d581fff0..2b717c4c597255d41367805471e548bbf81cf136 100644
 109--- a/keyboards/shandoncodes/mino_plus/soldered/info.json
 110+++ b/keyboards/shandoncodes/mino_plus/soldered/keyboard.json
 111@@ -10,7 +10,9 @@
 112         "console": false,
 113         "extrakey": true,
 114         "mousekey": true,
 115-        "nkro": true
 116+        "nkro": true,
 117+        "oled": true,
 118+        "wpm": true
 119     },
 120     "matrix_pins": {
 121         "cols": ["B4", "B3", "A15", "A10", "A8", "B14", "B12", "B10", "A5", "A4", "A3", "B0", "A7", "C15", "B5"],
 122diff --git a/keyboards/shandoncodes/mino_plus/soldered/rules.mk b/keyboards/shandoncodes/mino_plus/soldered/rules.mk
 123deleted file mode 100644
 124index 76e55c05f4838154c2bb49f6393fed4051d39703..0000000000000000000000000000000000000000
 125--- a/keyboards/shandoncodes/mino_plus/soldered/rules.mk
 126+++ /dev/null
 127@@ -1,2 +0,0 @@
 128-OLED_ENABLE = yes
 129-WPM_ENABLE = yes
 130diff --git a/keyboards/sharkoon/skiller_sgk50_s2/info.json b/keyboards/sharkoon/skiller_sgk50_s2/keyboard.json
 131rename from keyboards/sharkoon/skiller_sgk50_s2/info.json
 132rename to keyboards/sharkoon/skiller_sgk50_s2/keyboard.json
 133diff --git a/keyboards/sharkoon/skiller_sgk50_s2/rules.mk b/keyboards/sharkoon/skiller_sgk50_s2/rules.mk
 134deleted file mode 100644
 135index 6e7633bfe015beed407755e5b0bf5bfed8f67eae..0000000000000000000000000000000000000000
 136--- a/keyboards/sharkoon/skiller_sgk50_s2/rules.mk
 137+++ /dev/null
 138@@ -1 +0,0 @@
 139-# This file intentionally left blank
 140diff --git a/keyboards/signum/3_0/elitec/info.json b/keyboards/signum/3_0/elitec/keyboard.json
 141rename from keyboards/signum/3_0/elitec/info.json
 142rename to keyboards/signum/3_0/elitec/keyboard.json
 143index 84336ac59f43d822aefe10e5419eb484ae6a37df..5482e519a1adc0265d03fb4fe9e06227ba1b738c 100644
 144--- a/keyboards/signum/3_0/elitec/info.json
 145+++ b/keyboards/signum/3_0/elitec/keyboard.json
 146@@ -1,4 +1,10 @@
 147 {
 148+    "features": {
 149+        "bootmagic": true,
 150+        "extrakey": true,
 151+        "mousekey": true,
 152+        "nkro": true
 153+    },
 154     "matrix_pins": {
 155         "cols": ["B4", "D7", "D0", "E6", "D4", "F6", "F4", "F7", "B1", "B3", "C6", "B2"],
 156         "rows": ["D2", "D1", "F5", "B5"]
 157diff --git a/keyboards/signum/3_0/elitec/rules.mk b/keyboards/signum/3_0/elitec/rules.mk
 158index 614691a01be9683450047afdff012a996c4593fb..16051206467f5a6b4d545ce1f326a0032f97ec2e 100644
 159--- a/keyboards/signum/3_0/elitec/rules.mk
 160+++ b/keyboards/signum/3_0/elitec/rules.mk
 161@@ -1,16 +1,3 @@
 162-# Build Options
 163-#   change yes to no to disable
 164-#
 165-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
 166-MOUSEKEY_ENABLE = yes       # Mouse keys
 167-EXTRAKEY_ENABLE = yes       # Audio control and System control
 168-CONSOLE_ENABLE = no         # Console for debug
 169-COMMAND_ENABLE = no         # Commands for debug and configuration
 170-NKRO_ENABLE = yes           # Enable N-Key Rollover
 171-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 172-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 173-AUDIO_ENABLE = no           # Audio output
 174-
 175 # Disable unsupported hardware
 176 RGBLIGHT_SUPPORTED = no
 177 AUDIO_SUPPORTED = no
 178diff --git a/keyboards/signum/3_0/teensy/info.json b/keyboards/signum/3_0/teensy/keyboard.json
 179rename from keyboards/signum/3_0/teensy/info.json
 180rename to keyboards/signum/3_0/teensy/keyboard.json
 181index 7eae11532366702f0b6278f7f442ca08db27142f..1db8479d9b0ec29ecd03d57ad711bdfd5c3ac8b5 100644
 182--- a/keyboards/signum/3_0/teensy/info.json
 183+++ b/keyboards/signum/3_0/teensy/keyboard.json
 184@@ -1,4 +1,10 @@
 185 {
 186+    "features": {
 187+        "bootmagic": true,
 188+        "extrakey": true,
 189+        "mousekey": true,
 190+        "nkro": true
 191+    },
 192     "matrix_pins": {
 193         "cols": ["C6", "D2", "B7", "D3", "D0", "F7", "F5", "B6", "B5", "B4", "D1", "D7"],
 194         "rows": ["B0", "B3", "F6", "C7"]
 195diff --git a/keyboards/signum/3_0/teensy/rules.mk b/keyboards/signum/3_0/teensy/rules.mk
 196index 614691a01be9683450047afdff012a996c4593fb..16051206467f5a6b4d545ce1f326a0032f97ec2e 100644
 197--- a/keyboards/signum/3_0/teensy/rules.mk
 198+++ b/keyboards/signum/3_0/teensy/rules.mk
 199@@ -1,16 +1,3 @@
 200-# Build Options
 201-#   change yes to no to disable
 202-#
 203-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
 204-MOUSEKEY_ENABLE = yes       # Mouse keys
 205-EXTRAKEY_ENABLE = yes       # Audio control and System control
 206-CONSOLE_ENABLE = no         # Console for debug
 207-COMMAND_ENABLE = no         # Commands for debug and configuration
 208-NKRO_ENABLE = yes           # Enable N-Key Rollover
 209-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 210-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 211-AUDIO_ENABLE = no           # Audio output
 212-
 213 # Disable unsupported hardware
 214 RGBLIGHT_SUPPORTED = no
 215 AUDIO_SUPPORTED = no
 216diff --git a/keyboards/silverbullet44/info.json b/keyboards/silverbullet44/keyboard.json
 217rename from keyboards/silverbullet44/info.json
 218rename to keyboards/silverbullet44/keyboard.json
 219index e232fdba3e8b0416e26e16fd659be0997c3348ef..793ec229e4b460f792a0603f470e7a4f256a9342 100644
 220--- a/keyboards/silverbullet44/info.json
 221+++ b/keyboards/silverbullet44/keyboard.json
 222@@ -8,6 +8,17 @@
 223         "pid": "0x27DB",
 224         "device_version": "0.0.1"
 225     },
 226+    "build": {
 227+        "lto": true
 228+    },
 229+    "features": {
 230+        "audio": true,
 231+        "bootmagic": true,
 232+        "extrakey": false,
 233+        "mousekey": false,
 234+        "nkro": false,
 235+        "rgblight": true
 236+    },
 237     "ws2812": {
 238         "pin": "D3"
 239     },
 240diff --git a/keyboards/silverbullet44/rules.mk b/keyboards/silverbullet44/rules.mk
 241deleted file mode 100644
 242index 95e92dce2a4708268edc0f543b34dbacfac1c05e..0000000000000000000000000000000000000000
 243--- a/keyboards/silverbullet44/rules.mk
 244+++ /dev/null
 245@@ -1,14 +0,0 @@
 246-# Build Options
 247-#   change yes to no to disable
 248-#
 249-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
 250-MOUSEKEY_ENABLE = no        # Mouse keys
 251-EXTRAKEY_ENABLE = no        # Audio control and System control
 252-CONSOLE_ENABLE = no         # Console for debug
 253-COMMAND_ENABLE = no         # Commands for debug and configuration
 254-NKRO_ENABLE = no            # Enable N-Key Rollover
 255-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 256-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 257-RGB_MATRIX_ENABLE = no
 258-AUDIO_ENABLE = yes          # Audio output
 259-LTO_ENABLE = yes
 260diff --git a/keyboards/sirius/uni660/rev1/info.json b/keyboards/sirius/uni660/rev1/keyboard.json
 261rename from keyboards/sirius/uni660/rev1/info.json
 262rename to keyboards/sirius/uni660/rev1/keyboard.json
 263index f5b070f87e14db3abf2972db4aa4d03db78aa9b8..793edcc6858bbb0e4920bc4d068b0684f43317be 100644
 264--- a/keyboards/sirius/uni660/rev1/info.json
 265+++ b/keyboards/sirius/uni660/rev1/keyboard.json
 266@@ -8,6 +8,15 @@
 267         "pid": "0x0201",
 268         "device_version": "19.1.2"
 269     },
 270+    "features": {
 271+        "bootmagic": true,
 272+        "command": true,
 273+        "console": true,
 274+        "extrakey": true,
 275+        "mousekey": false,
 276+        "nkro": true,
 277+        "unicode": true
 278+    },
 279     "processor": "atmega32u4",
 280     "bootloader": "caterina",
 281     "layouts": {
 282diff --git a/keyboards/sirius/uni660/rev1/rules.mk b/keyboards/sirius/uni660/rev1/rules.mk
 283index 7ac75072699f41d70b88865804751f7600e633d5..18d234d62a0a6bc8ed6d9e8b2f2359da9a8d922f 100644
 284--- a/keyboards/sirius/uni660/rev1/rules.mk
 285+++ b/keyboards/sirius/uni660/rev1/rules.mk
 286@@ -1,16 +1,3 @@
 287-# Build Options
 288-#   change yes to no to disable
 289-#
 290-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
 291-MOUSEKEY_ENABLE = no        # Mouse keys
 292-EXTRAKEY_ENABLE = yes       # Audio control and System control
 293-CONSOLE_ENABLE = yes        # Console for debug
 294-COMMAND_ENABLE = yes        # Commands for debug and configuration
 295-NKRO_ENABLE = yes           # Enable N-Key Rollover
 296-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 297-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 298-AUDIO_ENABLE = no           # Audio output
 299-UNICODE_ENABLE = yes        # Unicode
 300 CUSTOM_MATRIX = lite
 301 
 302 # project specific files
 303diff --git a/keyboards/sirius/unigo66/info.json b/keyboards/sirius/unigo66/keyboard.json
 304rename from keyboards/sirius/unigo66/info.json
 305rename to keyboards/sirius/unigo66/keyboard.json
 306index 866fd9abbf9b4522269657782706a02059d53eb0..ac683a0f1db6f8cf86a1a21204395256b9547181 100644
 307--- a/keyboards/sirius/unigo66/info.json
 308+++ b/keyboards/sirius/unigo66/keyboard.json
 309@@ -8,6 +8,14 @@
 310         "pid": "0x1001",
 311         "device_version": "19.0.1"
 312     },
 313+    "features": {
 314+        "bootmagic": true,
 315+        "extrakey": true,
 316+        "mousekey": false,
 317+        "nkro": false,
 318+        "rgblight": false,
 319+        "usb_hid": true
 320+    },
 321     "processor": "atmega32u4",
 322     "bootloader": "atmel-dfu",
 323     "layouts": {
 324diff --git a/keyboards/sirius/unigo66/rules.mk b/keyboards/sirius/unigo66/rules.mk
 325index 6cf02169cf6320d358a819b1349dd90692c126e9..56889eab51add473d324ad3e9c24f844fd0ee258 100644
 326--- a/keyboards/sirius/unigo66/rules.mk
 327+++ b/keyboards/sirius/unigo66/rules.mk
 328@@ -1,18 +1,3 @@
 329-# Build Options
 330-#   change yes to no to disable
 331-#
 332-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
 333-MOUSEKEY_ENABLE = no        # Mouse keys
 334-EXTRAKEY_ENABLE = yes       # Audio control and System control
 335-CONSOLE_ENABLE = no         # Console for debug
 336-COMMAND_ENABLE = no         # Commands for debug and configuration
 337-NKRO_ENABLE = no            # Enable N-Key Rollover
 338-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 339-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 340-AUDIO_ENABLE = no           # Audio output
 341-
 342-USB_HID_ENABLE = yes
 343-
 344 CUSTOM_MATRIX = yes
 345 SRC += custom_matrix.cpp\
 346 	main.c
 347diff --git a/keyboards/sixkeyboard/info.json b/keyboards/sixkeyboard/keyboard.json
 348rename from keyboards/sixkeyboard/info.json
 349rename to keyboards/sixkeyboard/keyboard.json
 350index 247b255a363470af7361197de6d09ab1f0294232..aff5c985f79bdac00a7cf3b5663a92e72eb120c5 100644
 351--- a/keyboards/sixkeyboard/info.json
 352+++ b/keyboards/sixkeyboard/keyboard.json
 353@@ -9,6 +9,12 @@
 354     "device_version": "0.0.1",
 355     "force_nkro": true
 356   },
 357+  "features": {
 358+    "bootmagic": false,
 359+    "extrakey": false,
 360+    "mousekey": false,
 361+    "nkro": false
 362+  },
 363   "processor": "atmega16u2",
 364   "bootloader": "atmel-dfu",
 365   "community_layouts": ["ortho_2x3"],
 366diff --git a/keyboards/sixkeyboard/rules.mk b/keyboards/sixkeyboard/rules.mk
 367index d1d7bc4881846766ff0cf0550aff8406c4b0a9db..09c02c88b0dac949c6cba039ce6eee8be15799b5 100644
 368--- a/keyboards/sixkeyboard/rules.mk
 369+++ b/keyboards/sixkeyboard/rules.mk
 370@@ -1,14 +1,3 @@
 371-# Build Options
 372-#   change yes to no to disable
 373-#
 374-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
 375-MOUSEKEY_ENABLE = no		# Mouse keys
 376-EXTRAKEY_ENABLE = no		# Audio control and System control
 377-CONSOLE_ENABLE = no		# Console for debug
 378-COMMAND_ENABLE = no		# Commands for debug and configuration
 379-NKRO_ENABLE = no            # Enable N-Key Rollover
 380-BACKLIGHT_ENABLE = no	# Enable keyboard backlight functionality
 381-AUDIO_ENABLE = no
 382 CUSTOM_MATRIX = yes
 383 
 384 SRC += matrix.c
 385diff --git a/keyboards/skergo/config.h b/keyboards/skergo/config.h
 386deleted file mode 100644
 387index a463c64167ecad94eb9d754103615e6edb1f3b95..0000000000000000000000000000000000000000
 388--- a/keyboards/skergo/config.h
 389+++ /dev/null
 390@@ -1,23 +0,0 @@
 391-/* Copyright (C) 2021  Keyz.io Ltd.
 392-*
 393-* This program is free software: you can redistribute it and/or modify
 394-* it under the terms of the GNU General Public License as published by
 395-* the Free Software Foundation, either version 3 of the License, or
 396-* (at your option) any later version.
 397-*
 398-* This program is distributed in the hope that it will be useful,
 399-* but WITHOUT ANY WARRANTY; without even the implied warranty of
 400-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 401-* GNU General Public License for more details.
 402-*
 403-* You should have received a copy of the GNU General Public License
 404-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
 405-*/
 406-
 407-#pragma once
 408-
 409-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 410-#define LOCKING_SUPPORT_ENABLE
 411-
 412-/* Locking resynchronize hack */
 413-#define LOCKING_RESYNC_ENABLE
 414diff --git a/keyboards/skergo/info.json b/keyboards/skergo/keyboard.json
 415rename from keyboards/skergo/info.json
 416rename to keyboards/skergo/keyboard.json
 417index 0e68b6aedd7fcd5af35b342748be9842bb6684d8..49ff7b81b6e24ff17505d7e3340d2269168bf34a 100644
 418--- a/keyboards/skergo/info.json
 419+++ b/keyboards/skergo/keyboard.json
 420@@ -8,6 +8,18 @@
 421         "pid": "0x534B",
 422         "device_version": "0.0.1"
 423     },
 424+    "features": {
 425+        "bootmagic": true,
 426+        "extrakey": true,
 427+        "mousekey": true,
 428+        "nkro": false
 429+    },
 430+    "qmk": {
 431+        "locking": {
 432+            "enabled": true,
 433+            "resync": true
 434+        }
 435+    },
 436     "matrix_pins": {
 437         "cols": ["A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C2", "C1", "C0", "D7"],
 438         "rows": ["B0", "B4", "B3", "B2", "B1"]
 439diff --git a/keyboards/skergo/rules.mk b/keyboards/skergo/rules.mk
 440index 1e9f9255447260c885c9880c73200d1b8da42df5..c2ee0bc86f978b7fbb1163ae7a5e16b69dd7b63d 100644
 441--- a/keyboards/skergo/rules.mk
 442+++ b/keyboards/skergo/rules.mk
 443@@ -1,15 +1,2 @@
 444 # Processor frequency
 445 F_CPU = 16000000
 446-
 447-# Build Options
 448-#   change yes to no to disable
 449-#
 450-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
 451-MOUSEKEY_ENABLE = yes       # Mouse keys
 452-EXTRAKEY_ENABLE = yes       # Audio control and System control
 453-CONSOLE_ENABLE = no         # Console for debug
 454-COMMAND_ENABLE = no         # Commands for debug and configuration
 455-NKRO_ENABLE = no            # Enable N-Key Rollover
 456-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 457-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 458-AUDIO_ENABLE = no           # Audio output
 459diff --git a/keyboards/skippys_custom_pcs/rooboard65/config.h b/keyboards/skippys_custom_pcs/rooboard65/config.h
 460deleted file mode 100644
 461index b352868d2d440fda54700802029366c12f330ea7..0000000000000000000000000000000000000000
 462--- a/keyboards/skippys_custom_pcs/rooboard65/config.h
 463+++ /dev/null
 464@@ -1,41 +0,0 @@
 465-/*
 466-Copyright 2021 <me@fjlaboratories.com>
 467-
 468-This program is free software: you can redistribute it and/or modify
 469-it under the terms of the GNU General Public License as published by
 470-the Free Software Foundation, either version 2 of the License, or
 471-(at your option) any later version.
 472-
 473-This program is distributed in the hope that it will be useful,
 474-but WITHOUT ANY WARRANTY; without even the implied warranty of
 475-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 476-GNU General Public License for more details.
 477-
 478-You should have received a copy of the GNU General Public License
 479-along with this program. If not, see <http://www.gnu.org/licenses/>.
 480-*/
 481-
 482-#pragma once
 483-
 484-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 485-#define LOCKING_SUPPORT_ENABLE
 486-/* Locking resynchronize hack */
 487-#define LOCKING_RESYNC_ENABLE
 488-
 489-/* Define less important options */
 490-
 491-/*
 492- * Feature disable options
 493- * These options are also useful to firmware size reduction.
 494- */
 495-
 496-/* disable debug print */
 497-//#define NO_DEBUG
 498-
 499-/* disable print */
 500-//#define NO_PRINT
 501-
 502-/* disable action features */
 503-//#define NO_ACTION_LAYER
 504-//#define NO_ACTION_TAPPING
 505-//#define NO_ACTION_ONESHOT
 506diff --git a/keyboards/skippys_custom_pcs/rooboard65/info.json b/keyboards/skippys_custom_pcs/rooboard65/keyboard.json
 507rename from keyboards/skippys_custom_pcs/rooboard65/info.json
 508rename to keyboards/skippys_custom_pcs/rooboard65/keyboard.json
 509index b6151a303c4d7fec38a78d0d1c31637973882b77..527884714b25793fa07ff124e3797c92091c8568 100644
 510--- a/keyboards/skippys_custom_pcs/rooboard65/info.json
 511+++ b/keyboards/skippys_custom_pcs/rooboard65/keyboard.json
 512@@ -8,6 +8,20 @@
 513         "pid": "0x0002",
 514         "device_version": "0.0.1"
 515     },
 516+    "features": {
 517+        "bootmagic": true,
 518+        "command": true,
 519+        "extrakey": true,
 520+        "mousekey": true,
 521+        "nkro": true,
 522+        "rgblight": true
 523+    },
 524+    "qmk": {
 525+        "locking": {
 526+            "enabled": true,
 527+            "resync": true
 528+        }
 529+    },
 530     "ws2812": {
 531         "pin": "F7"
 532     },
 533diff --git a/keyboards/skippys_custom_pcs/rooboard65/rules.mk b/keyboards/skippys_custom_pcs/rooboard65/rules.mk
 534index 52a18008f4ae5ac16a252f1f98a0bebdf4424dda..3437a35bdf1d396646ebb3ac285788fb68a6f115 100644
 535--- a/keyboards/skippys_custom_pcs/rooboard65/rules.mk
 536+++ b/keyboards/skippys_custom_pcs/rooboard65/rules.mk
 537@@ -1,15 +1,2 @@
 538 # Processor frequency
 539 F_CPU = 8000000
 540-
 541-# Build Options
 542-#   change yes to no to disable
 543-#
 544-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
 545-MOUSEKEY_ENABLE = yes       # Mouse keys
 546-EXTRAKEY_ENABLE = yes       # Audio control and System control
 547-CONSOLE_ENABLE = no         # Console for debug
 548-COMMAND_ENABLE = yes        # Commands for debug and configuration
 549-NKRO_ENABLE = yes           # Enable N-Key Rollover
 550-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 551-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 552-AUDIO_ENABLE = no           # Audio output
 553diff --git a/keyboards/skippys_custom_pcs/roopad/info.json b/keyboards/skippys_custom_pcs/roopad/keyboard.json
 554rename from keyboards/skippys_custom_pcs/roopad/info.json
 555rename to keyboards/skippys_custom_pcs/roopad/keyboard.json
 556index c44fcd1541f2f1583704adf0badd94c7de86cedb..0da722ff120f2f1c257545216687b3f2b3604566 100644
 557--- a/keyboards/skippys_custom_pcs/roopad/info.json
 558+++ b/keyboards/skippys_custom_pcs/roopad/keyboard.json
 559@@ -8,6 +8,13 @@
 560         "pid": "0x0001",
 561         "device_version": "0.0.1"
 562     },
 563+    "features": {
 564+        "bootmagic": true,
 565+        "extrakey": true,
 566+        "mousekey": false,
 567+        "nkro": true,
 568+        "rgblight": true
 569+    },
 570     "rgblight": {
 571         "led_count": 21,
 572         "sleep": true,
 573diff --git a/keyboards/skippys_custom_pcs/roopad/rules.mk b/keyboards/skippys_custom_pcs/roopad/rules.mk
 574index d280d696f53899908cb6ff954576389b1f613d7c..3437a35bdf1d396646ebb3ac285788fb68a6f115 100644
 575--- a/keyboards/skippys_custom_pcs/roopad/rules.mk
 576+++ b/keyboards/skippys_custom_pcs/roopad/rules.mk
 577@@ -1,15 +1,2 @@
 578 # Processor frequency
 579 F_CPU = 8000000
 580-
 581-# Build Options
 582-#   change yes to no to disable
 583-#
 584-BOOTMAGIC_ENABLE = yes     # Enable Bootmagic Lite
 585-MOUSEKEY_ENABLE = no       # 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 = yes           # 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/skmt/15k/info.json b/keyboards/skmt/15k/keyboard.json
 594rename from keyboards/skmt/15k/info.json
 595rename to keyboards/skmt/15k/keyboard.json
 596index 903a13b985e84d1bc96245a719ad4d6e79f18bd2..9cf215f4d48e4367301d6490d671ec34aec39408 100644
 597--- a/keyboards/skmt/15k/info.json
 598+++ b/keyboards/skmt/15k/keyboard.json
 599@@ -4,6 +4,9 @@
 600     "maintainer": "satorusaka",
 601     "bootloader": "rp2040",
 602     "diode_direction": "COL2ROW",
 603+    "build": {
 604+        "lto": true
 605+    },
 606     "features": {
 607         "bootmagic": true,
 608         "command": false,
 609diff --git a/keyboards/skmt/15k/rules.mk b/keyboards/skmt/15k/rules.mk
 610deleted file mode 100644
 611index 4da205a168c7e5f0eec90d43c819f12dcd3cbb24..0000000000000000000000000000000000000000
 612--- a/keyboards/skmt/15k/rules.mk
 613+++ /dev/null
 614@@ -1 +0,0 @@
 615-LTO_ENABLE = yes
 616diff --git a/keyboards/smallkeyboard/info.json b/keyboards/smallkeyboard/keyboard.json
 617rename from keyboards/smallkeyboard/info.json
 618rename to keyboards/smallkeyboard/keyboard.json
 619index d5a64f465ad8413669fa3736149238b015539792..9963d83a47f2744d224a585f22c266e974f83a66 100644
 620--- a/keyboards/smallkeyboard/info.json
 621+++ b/keyboards/smallkeyboard/keyboard.json
 622@@ -8,6 +8,13 @@
 623     "pid": "0x736B",
 624     "device_version": "0.0.1"
 625   },
 626+  "features": {
 627+    "bootmagic": true,
 628+    "extrakey": true,
 629+    "mousekey": true,
 630+    "nkro": false,
 631+    "rgb_matrix": true
 632+  },
 633   "rgb_matrix": {
 634     "animations": {
 635       "alphas_mods": true,
 636diff --git a/keyboards/smallkeyboard/rules.mk b/keyboards/smallkeyboard/rules.mk
 637index 1dcdf89155020915bb7783d0a5f74b6c52e10351..982989bad1dd545060ec8c8ea0375a34abe6134b 100644
 638--- a/keyboards/smallkeyboard/rules.mk
 639+++ b/keyboards/smallkeyboard/rules.mk
 640@@ -1,16 +1 @@
 641-# Build Options
 642-#   change yes to no to disable
 643-#
 644-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
 645-MOUSEKEY_ENABLE = yes       # Mouse keys
 646-EXTRAKEY_ENABLE = yes       # Audio control and System control
 647-CONSOLE_ENABLE = no        # Console for debug
 648-COMMAND_ENABLE = no         # Commands for debug and configuration
 649-NKRO_ENABLE = no            # Enable N-Key Rollover
 650-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 651-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 652-AUDIO_ENABLE = no           # Audio output
 653-
 654-RGB_MATRIX_ENABLE = yes
 655-
 656 RGB_MATRIX_SUPPORTED = yes
 657diff --git a/keyboards/smithrune/iron160/iron160_h/info.json b/keyboards/smithrune/iron160/iron160_h/keyboard.json
 658rename from keyboards/smithrune/iron160/iron160_h/info.json
 659rename to keyboards/smithrune/iron160/iron160_h/keyboard.json
 660index 3fb14989d698120edb3f1d747acd504ac26e48f9..d9ada0879d59a9f2da7973ece22984c25c7d2e4b 100644
 661--- a/keyboards/smithrune/iron160/iron160_h/info.json
 662+++ b/keyboards/smithrune/iron160/iron160_h/keyboard.json
 663@@ -8,6 +8,14 @@
 664         "pid": "0x1648",
 665         "device_version": "0.0.1"
 666     },
 667+    "features": {
 668+        "bootmagic": true,
 669+        "command": true,
 670+        "extrakey": true,
 671+        "mousekey": true,
 672+        "nkro": true,
 673+        "rgblight": true
 674+    },
 675    "processor": "STM32F072",
 676    "bootloader": "stm32-dfu",
 677    "matrix_pins": {
 678diff --git a/keyboards/smithrune/iron160/iron160_h/rules.mk b/keyboards/smithrune/iron160/iron160_h/rules.mk
 679index c889da168d611789da172e844242d15a95d90961..4138455538faa8e0332f333b1bdffbe5c5350624 100644
 680--- a/keyboards/smithrune/iron160/iron160_h/rules.mk
 681+++ b/keyboards/smithrune/iron160/iron160_h/rules.mk
 682@@ -1,18 +1,2 @@
 683-# Build Options
 684-#   change yes to no to disable
 685-#
 686-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
 687-MOUSEKEY_ENABLE = yes       # Mouse keys
 688-EXTRAKEY_ENABLE = yes       # Audio control and System control
 689-CONSOLE_ENABLE = no         # Console for debug
 690-COMMAND_ENABLE = yes        # Commands for debug and configuration
 691-NKRO_ENABLE = yes           # USB Nkey Rollover
 692-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 693-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 694-AUDIO_ENABLE = no           # Audio output
 695-ENCODER_ENABLE = no
 696-LTO_ENABLE = no
 697-
 698 EEPROM_DRIVER = wear_leveling
 699 WEAR_LEVELING_DRIVER = legacy
 700-
 701diff --git a/keyboards/smithrune/iron160/iron160_s/info.json b/keyboards/smithrune/iron160/iron160_s/keyboard.json
 702rename from keyboards/smithrune/iron160/iron160_s/info.json
 703rename to keyboards/smithrune/iron160/iron160_s/keyboard.json
 704index 91c66a3d4fb7641226861b53a8862943f7b7914e..b2a465399f559da410e1964f99eea3d8377d51e3 100644
 705--- a/keyboards/smithrune/iron160/iron160_s/info.json
 706+++ b/keyboards/smithrune/iron160/iron160_s/keyboard.json
 707@@ -8,6 +8,14 @@
 708         "pid": "0x1653",
 709         "device_version": "0.0.1"
 710     },
 711+    "features": {
 712+        "backlight": true,
 713+        "bootmagic": true,
 714+        "command": true,
 715+        "extrakey": true,
 716+        "mousekey": true,
 717+        "nkro": true
 718+    },
 719     "processor": "STM32F072",
 720     "bootloader": "stm32-dfu",
 721     "matrix_pins": {
 722diff --git a/keyboards/smithrune/iron160/iron160_s/rules.mk b/keyboards/smithrune/iron160/iron160_s/rules.mk
 723index 2c863bbe31a69df8306ffbf11a649f6b25ee9ce6..4138455538faa8e0332f333b1bdffbe5c5350624 100644
 724--- a/keyboards/smithrune/iron160/iron160_s/rules.mk
 725+++ b/keyboards/smithrune/iron160/iron160_s/rules.mk
 726@@ -1,18 +1,2 @@
 727-# Build Options
 728-#   change yes to no to disable
 729-#
 730-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
 731-MOUSEKEY_ENABLE = yes       # Mouse keys
 732-EXTRAKEY_ENABLE = yes       # Audio control and System control
 733-CONSOLE_ENABLE = no         # Console for debug
 734-COMMAND_ENABLE = yes        # Commands for debug and configuration
 735-NKRO_ENABLE = yes           # USB Nkey Rollover
 736-BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
 737-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 738-AUDIO_ENABLE = no           # Audio output
 739-ENCODER_ENABLE = no
 740-LTO_ENABLE = no
 741-
 742 EEPROM_DRIVER = wear_leveling
 743 WEAR_LEVELING_DRIVER = legacy
 744-
 745diff --git a/keyboards/smithrune/iron165r2/f072/info.json b/keyboards/smithrune/iron165r2/f072/keyboard.json
 746rename from keyboards/smithrune/iron165r2/f072/info.json
 747rename to keyboards/smithrune/iron165r2/f072/keyboard.json
 748index 2cbbaa84f3f7e980982b75f5c27993cc1806bae7..e16493d0b5c9512a20e414c450731187f6914899 100644
 749--- a/keyboards/smithrune/iron165r2/f072/info.json
 750+++ b/keyboards/smithrune/iron165r2/f072/keyboard.json
 751@@ -1,4 +1,16 @@
 752 {
 753+    "build": {
 754+        "lto": false
 755+    },
 756+    "features": {
 757+        "backlight": true,
 758+        "bootmagic": true,
 759+        "command": true,
 760+        "extrakey": true,
 761+        "mousekey": false,
 762+        "nkro": true,
 763+        "rgblight": true
 764+    },
 765     "backlight": {
 766         "pin": "A6",
 767         "levels": 20,
 768diff --git a/keyboards/smithrune/iron165r2/f072/rules.mk b/keyboards/smithrune/iron165r2/f072/rules.mk
 769deleted file mode 100644
 770index b524e61f4bba9c582b56d52440343da4acb9c858..0000000000000000000000000000000000000000
 771--- a/keyboards/smithrune/iron165r2/f072/rules.mk
 772+++ /dev/null
 773@@ -1,15 +0,0 @@
 774-# Build Options
 775-#   change yes to no to disable
 776-#
 777-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
 778-MOUSEKEY_ENABLE = no        # Mouse keys
 779-EXTRAKEY_ENABLE = yes       # Audio control and System control
 780-CONSOLE_ENABLE = no         # Console for debug
 781-COMMAND_ENABLE = yes        # Commands for debug and configuration
 782-NKRO_ENABLE = yes           # USB Nkey Rollover
 783-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 784-AUDIO_ENABLE = no           # Audio output
 785-LTO_ENABLE = no
 786-ENCODER_ENABLE = no
 787-BACKLIGHT_ENABLE = yes
 788-
 789diff --git a/keyboards/smithrune/iron165r2/f411/info.json b/keyboards/smithrune/iron165r2/f411/keyboard.json
 790rename from keyboards/smithrune/iron165r2/f411/info.json
 791rename to keyboards/smithrune/iron165r2/f411/keyboard.json
 792index ff685e3cdd880654ce8d5d522b1c9b054e7270f2..d3d4b3de506fe1a2eb0304a7ce99e125c61b0b06 100644
 793--- a/keyboards/smithrune/iron165r2/f411/info.json
 794+++ b/keyboards/smithrune/iron165r2/f411/keyboard.json
 795@@ -1,4 +1,16 @@
 796 {
 797+    "build": {
 798+        "lto": false
 799+    },
 800+    "features": {
 801+        "backlight": true,
 802+        "bootmagic": true,
 803+        "command": true,
 804+        "extrakey": true,
 805+        "mousekey": false,
 806+        "nkro": true,
 807+        "rgblight": true
 808+    },
 809     "eeprom": {
 810         "driver": "i2c"
 811     },
 812diff --git a/keyboards/smithrune/iron165r2/f411/rules.mk b/keyboards/smithrune/iron165r2/f411/rules.mk
 813deleted file mode 100644
 814index f5a58ab0cb778cf63cac7fdde45b44ca0faf53ec..0000000000000000000000000000000000000000
 815--- a/keyboards/smithrune/iron165r2/f411/rules.mk
 816+++ /dev/null
 817@@ -1,14 +0,0 @@
 818-# Build Options
 819-#   change yes to no to disable
 820-#
 821-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
 822-MOUSEKEY_ENABLE = no        # Mouse keys
 823-EXTRAKEY_ENABLE = yes       # Audio control and System control
 824-CONSOLE_ENABLE = no         # Console for debug
 825-COMMAND_ENABLE = yes        # Commands for debug and configuration
 826-NKRO_ENABLE = yes           # USB Nkey Rollover
 827-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 828-AUDIO_ENABLE = no           # Audio output
 829-LTO_ENABLE = no
 830-ENCODER_ENABLE = no
 831-BACKLIGHT_ENABLE = yes
 832diff --git a/keyboards/snes_macropad/info.json b/keyboards/snes_macropad/keyboard.json
 833rename from keyboards/snes_macropad/info.json
 834rename to keyboards/snes_macropad/keyboard.json
 835diff --git a/keyboards/soda/cherish/config.h b/keyboards/soda/cherish/config.h
 836deleted file mode 100644
 837index f608132b5afd4d79846a79d3c1670eb89a3978ea..0000000000000000000000000000000000000000
 838--- a/keyboards/soda/cherish/config.h
 839+++ /dev/null
 840@@ -1,39 +0,0 @@
 841-/*
 842-Copyright 2015 Álvaro "Gondolindrim" Volpato  <gondolindrim@acheronproject.com>
 843-
 844-This program is free software: you can redistribute it and/or modify
 845-it under the terms of the GNU General Public License as published by
 846-the Free Software Foundation, either version 2 of the License, or
 847-(at your option) any later version.
 848-
 849-This program is distributed in the hope that it will be useful,
 850-but WITHOUT ANY WARRANTY; without even the implied warranty of
 851-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 852-GNU General Public License for more details.
 853-
 854-You should have received a copy of the GNU General Public License
 855-along with this program.  If not, see <http://www.gnu.org/licenses/>.
 856-*/
 857-
 858-#pragma once
 859-
 860-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 861-#define LOCKING_SUPPORT_ENABLE
 862-/* Locking resynchronize hack */
 863-#define LOCKING_RESYNC_ENABLE
 864-
 865-/*
 866- * Feature disable options
 867- *  These options are also useful to firmware size reduction.
 868- */
 869-
 870-/* disable debug print */
 871-//#define NO_DEBUG
 872-
 873-/* disable print */
 874-//#define NO_PRINT
 875-
 876-/* disable action features */
 877-//#define NO_ACTION_LAYER
 878-//#define NO_ACTION_TAPPING
 879-//#define NO_ACTION_ONESHOT
 880diff --git a/keyboards/soda/cherish/info.json b/keyboards/soda/cherish/keyboard.json
 881rename from keyboards/soda/cherish/info.json
 882rename to keyboards/soda/cherish/keyboard.json
 883index 1284c79ce4a9977e00182602df5ca2dd0a3943fc..b256e939651983750f761cb33b0bd108d9da0705 100644
 884--- a/keyboards/soda/cherish/info.json
 885+++ b/keyboards/soda/cherish/keyboard.json
 886@@ -8,6 +8,21 @@
 887         "pid": "0xEB52",
 888         "device_version": "0.0.1"
 889     },
 890+    "features": {
 891+        "bootmagic": true,
 892+        "command": true,
 893+        "console": true,
 894+        "extrakey": true,
 895+        "mousekey": true,
 896+        "nkro": true,
 897+        "rgblight": true
 898+    },
 899+    "qmk": {
 900+        "locking": {
 901+            "enabled": true,
 902+            "resync": true
 903+        }
 904+    },
 905     "rgblight": {
 906         "saturation_steps": 8,
 907         "brightness_steps": 8,
 908diff --git a/keyboards/soda/cherish/rules.mk b/keyboards/soda/cherish/rules.mk
 909index a8af2d4ebcaf129aa8e61deb8eab9ef061d4d798..04fe1eba2acd1835f0ab8ab55f6ae542d04c789d 100644
 910--- a/keyboards/soda/cherish/rules.mk
 911+++ b/keyboards/soda/cherish/rules.mk
 912@@ -1,16 +1,2 @@
 913-# Build Options
 914-#   change yes to no to disable
 915-#
 916-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
 917-MOUSEKEY_ENABLE = yes       # Mouse keys
 918-EXTRAKEY_ENABLE = yes       # Audio control and System control
 919-CONSOLE_ENABLE = yes        # Console for debug
 920-COMMAND_ENABLE = yes        # Commands for debug and configuration
 921-NKRO_ENABLE = yes           # Enable N-Key Rollover
 922-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 923-RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
 924-AUDIO_ENABLE = no           # Audio output
 925-
 926 # Wildcard to allow APM32 MCU
 927 DFU_SUFFIX_ARGS = -p FFFF -v FFFF
 928-
 929diff --git a/keyboards/spaceholdings/nebula12/info.json b/keyboards/spaceholdings/nebula12/keyboard.json
 930rename from keyboards/spaceholdings/nebula12/info.json
 931rename to keyboards/spaceholdings/nebula12/keyboard.json
 932index 6638498e0c6ce0ef4d0fe17bb6a3dcc21ee7a1a8..2b170e8e61878b350c41233475d9c835a80c3b38 100755
 933--- a/keyboards/spaceholdings/nebula12/info.json
 934+++ b/keyboards/spaceholdings/nebula12/keyboard.json
 935@@ -8,6 +8,13 @@
 936         "pid": "0x5337",
 937         "device_version": "0.0.1"
 938     },
 939+    "features": {
 940+        "bootmagic": true,
 941+        "extrakey": true,
 942+        "mousekey": true,
 943+        "nkro": true,
 944+        "rgblight": true
 945+    },
 946     "rgblight": {
 947         "saturation_steps": 8,
 948         "brightness_steps": 8,
 949diff --git a/keyboards/spaceholdings/nebula12/rules.mk b/keyboards/spaceholdings/nebula12/rules.mk
 950index a0b1795cee0d967b6f86f20a8ec0924051ddbdd2..dd548eee148d6d0ec0ed03b870e2135058479c4c 100755
 951--- a/keyboards/spaceholdings/nebula12/rules.mk
 952+++ b/keyboards/spaceholdings/nebula12/rules.mk
 953@@ -3,24 +3,11 @@
 954 # backlight effects.
 955 OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
 956 
 957-# Build Options
 958-#   change yes to no to disable
 959-#
 960-BACKLIGHT_ENABLE = no              # Enable keyboard backlight functionality
 961-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
 962-MOUSEKEY_ENABLE = yes              # Mouse keys
 963-EXTRAKEY_ENABLE = yes              # Audio control and System control
 964-CONSOLE_ENABLE = no                # Console for debug
 965-COMMAND_ENABLE = no                # Commands for debug and configuration
 966-NKRO_ENABLE = yes           # Enable N-Key Rollover
 967-AUDIO_ENABLE = no                  # Audio output
 968-RGBLIGHT_ENABLE = yes              # Underglow RGB
 969-
 970 CIE1931_CURVE = yes
 971+I2C_DRIVER_REQUIRED = yes
 972 
 973 # project specific files
 974 SRC +=  keyboards/wilba_tech/wt_main.c \
 975         keyboards/wilba_tech/wt_rgb_backlight.c \
 976         drivers/led/issi/is31fl3731.c \
 977         quantum/color.c
 978-I2C_DRIVER_REQUIRED = yes
 979diff --git a/keyboards/spaceholdings/nebula68/info.json b/keyboards/spaceholdings/nebula68/keyboard.json
 980rename from keyboards/spaceholdings/nebula68/info.json
 981rename to keyboards/spaceholdings/nebula68/keyboard.json
 982index dfc61b3a2d1ba6a43cd53176fc32d8822bfb4170..47cab7a5b02f439fb40eb825025ce84d9e0bf3b7 100755
 983--- a/keyboards/spaceholdings/nebula68/info.json
 984+++ b/keyboards/spaceholdings/nebula68/keyboard.json
 985@@ -8,6 +8,13 @@
 986         "pid": "0x5336",
 987         "device_version": "0.0.1"
 988     },
 989+    "features": {
 990+        "bootmagic": true,
 991+        "extrakey": true,
 992+        "mousekey": true,
 993+        "nkro": true,
 994+        "rgblight": true
 995+    },
 996     "ws2812": {
 997         "pin": "A7",
 998         "driver": "pwm"
 999diff --git a/keyboards/spaceholdings/nebula68/rules.mk b/keyboards/spaceholdings/nebula68/rules.mk
1000index d2484b627c36ab5cd5c328b3d12276872cd031b2..c2507bf03dfb7a8a62e09f66ca13f8fd3b4db0dc 100755
1001--- a/keyboards/spaceholdings/nebula68/rules.mk
1002+++ b/keyboards/spaceholdings/nebula68/rules.mk
1003@@ -3,24 +3,11 @@
1004 # backlight effects.
1005 OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
1006 
1007-# Build Options
1008-#   change yes to no to disable
1009-#
1010-BACKLIGHT_ENABLE = no              # Enable keyboard backlight functionality
1011-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
1012-MOUSEKEY_ENABLE = yes              # Mouse keys
1013-EXTRAKEY_ENABLE = yes              # Audio control and System control
1014-CONSOLE_ENABLE = no                # Console for debug
1015-COMMAND_ENABLE = no                # Commands for debug and configuration
1016-NKRO_ENABLE = yes           # Enable N-Key Rollover
1017-AUDIO_ENABLE = no                  # Audio output
1018-RGBLIGHT_ENABLE = yes              # Underglow RGB
1019-
1020 CIE1931_CURVE = yes
1021+I2C_DRIVER_REQUIRED = yes
1022 
1023 # project specific files
1024 SRC +=  keyboards/wilba_tech/wt_main.c \
1025         keyboards/wilba_tech/wt_rgb_backlight.c \
1026         drivers/led/issi/is31fl3733.c \
1027         quantum/color.c
1028-I2C_DRIVER_REQUIRED = yes