f1a279810fbab3b5d5c4cfa0b4146cf042dae3bb

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

Message

Migrate features from rules.mk to DD (#23202)

Diff

This diff is truncated to protect this page.

  1diff --git a/keyboards/0xcb/tutelpad/info.json b/keyboards/0xcb/tutelpad/keyboard.json
  2rename from keyboards/0xcb/tutelpad/info.json
  3rename to keyboards/0xcb/tutelpad/keyboard.json
  4index e4c7fce98abf80637b6e43a953e35e827b33872f..2885377262a8ddfe25e120e80a06dd59702440f3 100644
  5--- a/keyboards/0xcb/tutelpad/info.json
  6+++ b/keyboards/0xcb/tutelpad/keyboard.json
  7@@ -33,6 +33,16 @@
  8     },
  9     "processor": "atmega32u4",
 10     "bootloader": "caterina",
 11+    "features": {
 12+        "bootmagic": true,
 13+        "command": false,
 14+        "console": false,
 15+        "extrakey": true,
 16+        "mousekey": false,
 17+        "nkro": false,
 18+        "oled": true,
 19+        "rgblight": true
 20+    },
 21     "matrix_pins": {
 22         "direct": [
 23             ["E6", "D7", "B1", "B3"],
 24diff --git a/keyboards/0xcb/tutelpad/rules.mk b/keyboards/0xcb/tutelpad/rules.mk
 25deleted file mode 100644
 26index f06d31c5f13b479236c720c56d819e4a3b83fbbf..0000000000000000000000000000000000000000
 27--- a/keyboards/0xcb/tutelpad/rules.mk
 28+++ /dev/null
 29@@ -1,13 +0,0 @@
 30-# Build Options
 31-#   change yes to no to disable
 32-#
 33-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
 34-MOUSEKEY_ENABLE = no        # Mouse keys
 35-EXTRAKEY_ENABLE = yes       # Audio control and System control
 36-CONSOLE_ENABLE = no         # Console for debug
 37-COMMAND_ENABLE = no         # Commands for debug and configuration 
 38-NKRO_ENABLE = no            # Enable N-Key Rollover
 39-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 40-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 41-AUDIO_ENABLE = no           # Audio output
 42-OLED_ENABLE = yes
 43diff --git a/keyboards/1upkeyboards/1up60rgb/info.json b/keyboards/1upkeyboards/1up60rgb/keyboard.json
 44rename from keyboards/1upkeyboards/1up60rgb/info.json
 45rename to keyboards/1upkeyboards/1up60rgb/keyboard.json
 46index 0d288916cc412d0eebae32656532acd78924cc0b..2985b5ae4f7d76542fca87049c0ae29322425b7c 100644
 47--- a/keyboards/1upkeyboards/1up60rgb/info.json
 48+++ b/keyboards/1upkeyboards/1up60rgb/keyboard.json
 49@@ -8,6 +8,16 @@
 50     "pid": "0x7267",
 51     "device_version": "0.0.1"
 52   },
 53+  "features": {
 54+    "backlight": true,
 55+    "bootmagic": true,
 56+    "command": false,
 57+    "console": false,
 58+    "extrakey": true,
 59+    "mousekey": true,
 60+    "nkro": true,
 61+    "rgblight": true
 62+  },
 63   "matrix_pins": {
 64     "cols": ["F0", "F1", "E6", "C7", "C6", "B7", "D4", "B1", "B0", "B5", "B4", "D7", "D6", "B3", "F4"],
 65     "rows": ["D0", "D1", "D2", "D3", "D5"]
 66diff --git a/keyboards/1upkeyboards/1up60rgb/rules.mk b/keyboards/1upkeyboards/1up60rgb/rules.mk
 67deleted file mode 100644
 68index 32e82925ccf8d93d0e07695e408fc86fdaaf2e19..0000000000000000000000000000000000000000
 69--- a/keyboards/1upkeyboards/1up60rgb/rules.mk
 70+++ /dev/null
 71@@ -1,12 +0,0 @@
 72-# Build Options
 73-#   change yes to no to disable
 74-#
 75-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
 76-MOUSEKEY_ENABLE = yes	# Mouse keys
 77-EXTRAKEY_ENABLE = yes	# Audio control and System control
 78-CONSOLE_ENABLE = no	# Console for debug
 79-COMMAND_ENABLE = no    # Commands for debug and configuration
 80-NKRO_ENABLE = yes           # Enable N-Key Rollover
 81-BACKLIGHT_ENABLE = yes  # Enable keyboard backlight functionality
 82-AUDIO_ENABLE = no
 83-RGBLIGHT_ENABLE = yes
 84diff --git a/keyboards/1upkeyboards/super16/info.json b/keyboards/1upkeyboards/super16/keyboard.json
 85rename from keyboards/1upkeyboards/super16/info.json
 86rename to keyboards/1upkeyboards/super16/keyboard.json
 87index 81b28c66557cda870b471b444836d8262e08887b..4bc18e98f73d2ef3e3fa38ed8a7059707415ccdf 100644
 88--- a/keyboards/1upkeyboards/super16/info.json
 89+++ b/keyboards/1upkeyboards/super16/keyboard.json
 90@@ -77,6 +77,15 @@
 91     },
 92     "driver": "ws2812"
 93   },
 94+  "features": {
 95+    "bootmagic": true,
 96+    "command": false,
 97+    "console": false,
 98+    "extrakey": true,
 99+    "mousekey": true,
100+    "nkro": false,
101+    "rgb_matrix": true
102+  },
103   "matrix_pins": {
104     "cols": ["D4", "C6", "F6", "F7"],
105     "rows": ["D1", "D0", "F4", "F5"]
106diff --git a/keyboards/1upkeyboards/super16/rules.mk b/keyboards/1upkeyboards/super16/rules.mk
107deleted file mode 100644
108index b5532d03ff07a245db494d448d984d6eebe06d17..0000000000000000000000000000000000000000
109--- a/keyboards/1upkeyboards/super16/rules.mk
110+++ /dev/null
111@@ -1,13 +0,0 @@
112-# Build Options
113-#   change yes to no to disable
114-#
115-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
116-MOUSEKEY_ENABLE = yes       # Mouse keys
117-EXTRAKEY_ENABLE = yes       # Audio control and System control
118-CONSOLE_ENABLE = no         # Console for debug
119-COMMAND_ENABLE = no         # Commands for debug and configuration
120-NKRO_ENABLE = no            # Enable N-Key Rollover
121-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
122-RGBLIGHT_ENABLE = no       # Enable keyboard RGB underglow
123-RGB_MATRIX_ENABLE = yes
124-AUDIO_ENABLE = no           # Audio output
125diff --git a/keyboards/1upkeyboards/super16v2/info.json b/keyboards/1upkeyboards/super16v2/keyboard.json
126rename from keyboards/1upkeyboards/super16v2/info.json
127rename to keyboards/1upkeyboards/super16v2/keyboard.json
128index 20a06f4c5ec632b8fa111c858143f5370959112e..3bc7bf0e07f956ac224c2a78f8db665d98bca48e 100644
129--- a/keyboards/1upkeyboards/super16v2/info.json
130+++ b/keyboards/1upkeyboards/super16v2/keyboard.json
131@@ -49,6 +49,16 @@
132       "driver": "ws2812",
133       "sleep": true
134     },
135+    "features": {
136+        "bootmagic": true,
137+        "command": false,
138+        "console": false,
139+        "encoder": true,
140+        "extrakey": true,
141+        "mousekey": true,
142+        "nkro": false,
143+        "rgb_matrix": true
144+    },
145     "matrix_pins": {
146       "cols": ["D5", "D6", "C2", "D0"],
147       "rows": ["D1", "D2", "D3", "D4"]
148diff --git a/keyboards/1upkeyboards/super16v2/rules.mk b/keyboards/1upkeyboards/super16v2/rules.mk
149deleted file mode 100644
150index a7f5baf8078b6df18f0f97993cf96955982db3a9..0000000000000000000000000000000000000000
151--- a/keyboards/1upkeyboards/super16v2/rules.mk
152+++ /dev/null
153@@ -1,14 +0,0 @@
154-# Build Options
155-#   change yes to no to disable
156-#
157-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
158-MOUSEKEY_ENABLE = yes       # Mouse keys
159-EXTRAKEY_ENABLE = yes       # Audio control and System control
160-CONSOLE_ENABLE = no         # Console for debug
161-COMMAND_ENABLE = no         # Commands for debug and configuration
162-NKRO_ENABLE = no            # Enable N-Key Rollover
163-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
164-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
165-AUDIO_ENABLE = no           # Audio output
166-RGB_MATRIX_ENABLE = yes
167-ENCODER_ENABLE = yes
168diff --git a/keyboards/2key2crawl/info.json b/keyboards/2key2crawl/keyboard.json
169rename from keyboards/2key2crawl/info.json
170rename to keyboards/2key2crawl/keyboard.json
171index b8644a07129301bbd9c8b9fd27518b4418130deb..4dfecbd696fa097e4ae75431e1ed4f487e8145ba 100644
172--- a/keyboards/2key2crawl/info.json
173+++ b/keyboards/2key2crawl/keyboard.json
174@@ -8,6 +8,15 @@
175         "pid": "0x6090",
176         "device_version": "0.0.2"
177     },
178+    "features": {
179+        "bootmagic": true,
180+        "command": false,
181+        "console": true,
182+        "encoder": true,
183+        "extrakey": false,
184+        "mousekey": false,
185+        "nkro": false
186+    },
187     "matrix_pins": {
188         "cols": ["B3", "B4", "B5", "B6", "B7", "C7", "B2"],
189         "rows": ["C4", "C5"]
190diff --git a/keyboards/2key2crawl/rules.mk b/keyboards/2key2crawl/rules.mk
191deleted file mode 100644
192index 5e715569bcaf684ef4d462a672e321eafa23ed33..0000000000000000000000000000000000000000
193--- a/keyboards/2key2crawl/rules.mk
194+++ /dev/null
195@@ -1,13 +0,0 @@
196-# Build Options
197-#   change yes to no to disable
198-#
199-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
200-MOUSEKEY_ENABLE = no	# Mouse keys
201-EXTRAKEY_ENABLE = no	# Audio control and System control
202-CONSOLE_ENABLE = yes	# Console for debug
203-COMMAND_ENABLE = no    # Commands for debug and configuration
204-NKRO_ENABLE = no            # Enable N-Key Rollover
205-BACKLIGHT_ENABLE = no  # [Crawlpad] Custom backlighting code is used, so this should not be enabled
206-AUDIO_ENABLE = no # [Crawlpad] This can be enabled if a speaker is connected to the expansion port. Not compatible with RGBLIGHT below
207-RGBLIGHT_ENABLE = no # [Crawlpad] This can be enabled if a ws2812 strip is connected to the expansion port.
208-ENCODER_ENABLE = yes # [2Key2crawl] Make the knobs turn
209diff --git a/keyboards/30wer/info.json b/keyboards/30wer/keyboard.json
210rename from keyboards/30wer/info.json
211rename to keyboards/30wer/keyboard.json
212index 85f3826acd341fb1a34d3387098684e8e175f470..606c13f7aade1d2ac5b9c73653a44cd2a088a60b 100644
213--- a/keyboards/30wer/info.json
214+++ b/keyboards/30wer/keyboard.json
215@@ -8,6 +8,14 @@
216         "pid": "0x5678",
217         "device_version": "0.0.1"
218     },
219+    "features": {
220+        "bootmagic": false,
221+        "command": false,
222+        "console": true,
223+        "extrakey": true,
224+        "mousekey": false,
225+        "nkro": true
226+    },
227     "matrix_pins": {
228         "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "D1", "D0", "D4", "C6", "D7"],
229         "rows": ["E6", "B4", "B5"]
230diff --git a/keyboards/30wer/rules.mk b/keyboards/30wer/rules.mk
231deleted file mode 100644
232index 0048c6435193aa77929f11d2a259a80401d6e688..0000000000000000000000000000000000000000
233--- a/keyboards/30wer/rules.mk
234+++ /dev/null
235@@ -1,12 +0,0 @@
236-# Build Options
237-#   change yes to no to disable
238-#
239-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
240-MOUSEKEY_ENABLE = no        # Mouse keys
241-EXTRAKEY_ENABLE = yes       # Audio control and System control
242-CONSOLE_ENABLE = yes        # Console for debug
243-COMMAND_ENABLE = no         # Commands for debug and configuration
244-NKRO_ENABLE = yes           # Enable N-Key Rollover
245-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
246-AUDIO_ENABLE = no           # Audio output
247-RGBLIGHT_ENABLE = no 		# Enable WS2812 RGB underlight.
248diff --git a/keyboards/3keyecosystem/2key2/info.json b/keyboards/3keyecosystem/2key2/keyboard.json
249rename from keyboards/3keyecosystem/2key2/info.json
250rename to keyboards/3keyecosystem/2key2/keyboard.json
251index 129662175ca93fd1c68ee948ff7d88607a4acde1..5c77fdf6ae86978797e50903625f7ede93b4d997 100644
252--- a/keyboards/3keyecosystem/2key2/info.json
253+++ b/keyboards/3keyecosystem/2key2/keyboard.json
254@@ -67,6 +67,15 @@
255         "sleep": true
256     },
257 
258+    "features": {
259+        "bootmagic": true,
260+        "command": false,
261+        "console": false,
262+        "extrakey": true,
263+        "mousekey": false,
264+        "nkro": false,
265+        "rgb_matrix": true
266+    },
267     "matrix_pins": {
268         "cols": ["F4", "D7"],
269         "rows": ["F6"]
270diff --git a/keyboards/3keyecosystem/2key2/rules.mk b/keyboards/3keyecosystem/2key2/rules.mk
271deleted file mode 100644
272index 94674b71a1cdfe524d77d172484098b829277e34..0000000000000000000000000000000000000000
273--- a/keyboards/3keyecosystem/2key2/rules.mk
274+++ /dev/null
275@@ -1,13 +0,0 @@
276-# Build Options
277-#   change yes to no to disable
278-#
279-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
280-MOUSEKEY_ENABLE = no        # Mouse keys
281-EXTRAKEY_ENABLE = yes       # Audio control and System control
282-CONSOLE_ENABLE = no         # Console for debug
283-COMMAND_ENABLE = no         # Commands for debug and configuration
284-NKRO_ENABLE = no            # Enable N-Key Rollover
285-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
286-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
287-RGB_MATRIX_ENABLE = yes		# Enable RGB matrix
288-AUDIO_ENABLE = no           # Audio output
289diff --git a/keyboards/40percentclub/4pack/info.json b/keyboards/40percentclub/4pack/keyboard.json
290rename from keyboards/40percentclub/4pack/info.json
291rename to keyboards/40percentclub/4pack/keyboard.json
292index 31d45598833895fa31e7f5880bf7c525f20c7da7..edfd64ad33e97c0f77d2bbc69f5d91ae9f42936a 100644
293--- a/keyboards/40percentclub/4pack/info.json
294+++ b/keyboards/40percentclub/4pack/keyboard.json
295@@ -14,6 +14,15 @@
296     },
297     "processor": "atmega32u4",
298     "bootloader": "caterina",
299+    "features": {
300+        "backlight": true,
301+        "bootmagic": false,
302+        "command": false,
303+        "console": false,
304+        "extrakey": true,
305+        "mousekey": false,
306+        "nkro": false
307+    },
308     "matrix_pins": {
309         "direct": [
310             ["E6", "D7", "C6", "D4"]
311diff --git a/keyboards/40percentclub/4pack/rules.mk b/keyboards/40percentclub/4pack/rules.mk
312deleted file mode 100644
313index ffd7289e96adbe57b93073cf7018afa51dd38380..0000000000000000000000000000000000000000
314--- a/keyboards/40percentclub/4pack/rules.mk
315+++ /dev/null
316@@ -1,12 +0,0 @@
317-# Build Options
318-#   change yes to no to disable
319-#
320-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
321-MOUSEKEY_ENABLE = no        # Mouse keys
322-EXTRAKEY_ENABLE = yes       # Audio control and System control
323-CONSOLE_ENABLE = no         # Console for debug
324-COMMAND_ENABLE = no         # Commands for debug and configuration
325-NKRO_ENABLE = no            # Enable N-Key Rollover
326-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
327-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
328-AUDIO_ENABLE = no           # Audio output
329diff --git a/keyboards/40percentclub/5x5/info.json b/keyboards/40percentclub/5x5/keyboard.json
330rename from keyboards/40percentclub/5x5/info.json
331rename to keyboards/40percentclub/5x5/keyboard.json
332index 3ebc123c9b9f10a5a943a5e27a2059455cda734b..0a50d29ffe78fa2dddd38ba0802d469af41207e5 100644
333--- a/keyboards/40percentclub/5x5/info.json
334+++ b/keyboards/40percentclub/5x5/keyboard.json
335@@ -8,6 +8,14 @@
336         "pid": "0x05B5",
337         "device_version": "1.0.0"
338     },
339+    "features": {
340+        "bootmagic": false,
341+        "command": true,
342+        "console": true,
343+        "extrakey": true,
344+        "mousekey": true,
345+        "nkro": false
346+    },
347     "matrix_pins": {
348         "cols": ["D7", "E6", "B4", "B5", "B6", "B7", "D6", "F7", "F6", "F5", "F4", "F1", "F0", "B3", "B1"],
349         "rows": ["B2", "D1", "D0", "D4", "C6"]
350diff --git a/keyboards/40percentclub/5x5/rules.mk b/keyboards/40percentclub/5x5/rules.mk
351deleted file mode 100644
352index cb3f21e8240063d69861cdec79f5fb39f6d10e9a..0000000000000000000000000000000000000000
353--- a/keyboards/40percentclub/5x5/rules.mk
354+++ /dev/null
355@@ -1,11 +0,0 @@
356-# Build Options
357-#   change yes to no to disable
358-#
359-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
360-MOUSEKEY_ENABLE = yes       # Mouse keys
361-EXTRAKEY_ENABLE = yes       # Audio control and System control
362-CONSOLE_ENABLE = yes        # Console for debug
363-COMMAND_ENABLE = yes        # Commands for debug and configuration
364-NKRO_ENABLE = no            # Enable N-Key Rollover
365-BACKLIGHT_ENABLE = no       # Enable keyboard RGB underglow
366-AUDIO_ENABLE = no           # Audio output
367diff --git a/keyboards/40percentclub/luddite/info.json b/keyboards/40percentclub/luddite/keyboard.json
368rename from keyboards/40percentclub/luddite/info.json
369rename to keyboards/40percentclub/luddite/keyboard.json
370index a8c8c13b2a5f1d8fb0ace56a3e19e34532ac64aa..8a0b5d5913bea303bbf9ebec967cb79faf900b79 100644
371--- a/keyboards/40percentclub/luddite/info.json
372+++ b/keyboards/40percentclub/luddite/keyboard.json
373@@ -8,6 +8,16 @@
374     "pid": "0x4C55",
375     "device_version": "10.0.1"
376   },
377+  "features": {
378+    "backlight": true,
379+    "bootmagic": true,
380+    "command": false,
381+    "console": false,
382+    "extrakey": true,
383+    "mousekey": true,
384+    "nkro": true,
385+    "rgblight": true
386+  },
387   "matrix_pins": {
388     "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
389     "rows": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6"]
390diff --git a/keyboards/40percentclub/luddite/rules.mk b/keyboards/40percentclub/luddite/rules.mk
391deleted file mode 100644
392index ca7b02cbdd20a1cee3004d8a8b99409fb853f892..0000000000000000000000000000000000000000
393--- a/keyboards/40percentclub/luddite/rules.mk
394+++ /dev/null
395@@ -1,12 +0,0 @@
396-# Build Options
397-#   change yes to no to disable
398-#
399-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
400-MOUSEKEY_ENABLE = yes	  # Mouse keys
401-EXTRAKEY_ENABLE = yes	  # Audio control and System control
402-CONSOLE_ENABLE = no			# Console for debug
403-COMMAND_ENABLE = no     # Commands for debug and configuration
404-NKRO_ENABLE = yes           # Enable N-Key Rollover
405-BACKLIGHT_ENABLE = yes  # Enable keyboard backlight functionality
406-AUDIO_ENABLE = no
407-RGBLIGHT_ENABLE = yes
408diff --git a/keyboards/40percentclub/mf68/info.json b/keyboards/40percentclub/mf68/keyboard.json
409rename from keyboards/40percentclub/mf68/info.json
410rename to keyboards/40percentclub/mf68/keyboard.json
411index 72185738564f8e0cef0bbb0e4620afa8f603d6c2..47259ac23f9a3ff706412bd195c29a3a4fbba5ab 100644
412--- a/keyboards/40percentclub/mf68/info.json
413+++ b/keyboards/40percentclub/mf68/keyboard.json
414@@ -8,6 +8,15 @@
415     "pid": "0x4D68",
416     "device_version": "1.0.1"
417   },
418+  "features": {
419+    "backlight": true,
420+    "bootmagic": true,
421+    "command": false,
422+    "console": false,
423+    "extrakey": true,
424+    "mousekey": true,
425+    "nkro": true
426+  },
427   "matrix_pins": {
428     "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4"],
429     "rows": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"]
430diff --git a/keyboards/40percentclub/mf68/rules.mk b/keyboards/40percentclub/mf68/rules.mk
431deleted file mode 100644
432index b325f3f0c79f93e364a4befeed7543e0364f2fb9..0000000000000000000000000000000000000000
433--- a/keyboards/40percentclub/mf68/rules.mk
434+++ /dev/null
435@@ -1,12 +0,0 @@
436-# Build Options
437-#   change yes to no to disable
438-#
439-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
440-MOUSEKEY_ENABLE = yes       # Mouse keys
441-EXTRAKEY_ENABLE = yes       # Audio control and System control
442-CONSOLE_ENABLE = no         # Console for debug
443-COMMAND_ENABLE = no         # Commands for debug and configuration
444-NKRO_ENABLE = yes           # Enable N-Key Rollover
445-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
446-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
447-AUDIO_ENABLE = no           # Audio output
448diff --git a/keyboards/40percentclub/nano/info.json b/keyboards/40percentclub/nano/keyboard.json
449rename from keyboards/40percentclub/nano/info.json
450rename to keyboards/40percentclub/nano/keyboard.json
451index 4cfd3a9a295cc1e9b17a8d139d4c3de94a66ca38..547aed16f9f46f9cc309aca07b9e6cb09c873ef5 100644
452--- a/keyboards/40percentclub/nano/info.json
453+++ b/keyboards/40percentclub/nano/keyboard.json
454@@ -28,6 +28,16 @@
455   },
456   "processor": "atmega32u4",
457   "bootloader": "caterina",
458+  "features": {
459+    "bootmagic": false,
460+    "command": false,
461+    "console": false,
462+    "extrakey": true,
463+    "mousekey": true,
464+    "nkro": true,
465+    "rgblight": true,
466+    "unicode": true
467+  },
468   "matrix_pins": {
469     "direct": [
470       ["F4", "F5", "F6", "F7"],
471diff --git a/keyboards/40percentclub/nano/rules.mk b/keyboards/40percentclub/nano/rules.mk
472deleted file mode 100644
473index a73f2bd6931dcdab5ce08684631fdec0fd16bf05..0000000000000000000000000000000000000000
474--- a/keyboards/40percentclub/nano/rules.mk
475+++ /dev/null
476@@ -1,13 +0,0 @@
477-# Build Options
478-#   change yes to no to disable
479-#
480-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
481-MOUSEKEY_ENABLE = yes       # Mouse keys
482-EXTRAKEY_ENABLE = yes       # Audio control and System control
483-CONSOLE_ENABLE = no         # Console for debug
484-COMMAND_ENABLE = no         # Commands for debug and configuration
485-NKRO_ENABLE = yes           # Enable N-Key Rollover
486-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
487-AUDIO_ENABLE = no           # Audio output
488-UNICODE_ENABLE = yes        # Unicode
489-RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
490diff --git a/keyboards/40percentclub/nein/info.json b/keyboards/40percentclub/nein/keyboard.json
491rename from keyboards/40percentclub/nein/info.json
492rename to keyboards/40percentclub/nein/keyboard.json
493index 0712923e49ec052f714f67d20f4617a448c1dee9..53a3a7639b8c61a2e3e4f8755fc87555456c9a60 100644
494--- a/keyboards/40percentclub/nein/info.json
495+++ b/keyboards/40percentclub/nein/keyboard.json
496@@ -10,6 +10,14 @@
497   },
498   "processor": "atmega32u4",
499   "bootloader": "caterina",
500+  "features": {
501+    "bootmagic": true,
502+    "command": false,
503+    "console": false,
504+    "extrakey": true,
505+    "mousekey": true,
506+    "nkro": true
507+  },
508   "matrix_pins": {
509     "direct": [
510       ["F4", "F5", "F6"],
511diff --git a/keyboards/40percentclub/nein/rules.mk b/keyboards/40percentclub/nein/rules.mk
512deleted file mode 100644
513index 3b6a1809db185253a61eef9fd4dc1e290a2eac5b..0000000000000000000000000000000000000000
514--- a/keyboards/40percentclub/nein/rules.mk
515+++ /dev/null
516@@ -1,12 +0,0 @@
517-# Build Options
518-#   change yes to no to disable
519-#
520-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
521-MOUSEKEY_ENABLE = yes       # Mouse keys
522-EXTRAKEY_ENABLE = yes       # Audio control and System control
523-CONSOLE_ENABLE = no         # Console for debug
524-COMMAND_ENABLE = no         # Commands for debug and configuration
525-NKRO_ENABLE = yes           # Enable N-Key Rollover
526-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
527-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
528-AUDIO_ENABLE = no           # Audio output
529diff --git a/keyboards/40percentclub/sixpack/info.json b/keyboards/40percentclub/sixpack/keyboard.json
530rename from keyboards/40percentclub/sixpack/info.json
531rename to keyboards/40percentclub/sixpack/keyboard.json
532index cd4864fbd127b74728da5d8ae5864af8d7602df0..059c9de091d856b989ab4f5a6ca156c70eb5648e 100644
533--- a/keyboards/40percentclub/sixpack/info.json
534+++ b/keyboards/40percentclub/sixpack/keyboard.json
535@@ -21,6 +21,15 @@
536     },
537     "processor": "atmega32u4",
538     "bootloader": "caterina",
539+    "features": {
540+        "backlight": true,
541+        "bootmagic": true,
542+        "command": false,
543+        "console": false,
544+        "extrakey": true,
545+        "mousekey": true,
546+        "nkro": false
547+    },
548     "matrix_pins": {
549       "direct": [
550         ["D4", "C6", "D7"],
551diff --git a/keyboards/40percentclub/sixpack/rules.mk b/keyboards/40percentclub/sixpack/rules.mk
552deleted file mode 100644
553index 254b0bc7bd1ac0fd895b46dc9a186de089873862..0000000000000000000000000000000000000000
554--- a/keyboards/40percentclub/sixpack/rules.mk
555+++ /dev/null
556@@ -1,12 +0,0 @@
557-# Build Options
558-#   change yes to no to disable
559-#
560-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
561-MOUSEKEY_ENABLE = yes       # Mouse keys
562-EXTRAKEY_ENABLE = yes       # Audio control and System control
563-CONSOLE_ENABLE = no         # Console for debug
564-COMMAND_ENABLE = no         # Commands for debug and configuration
565-NKRO_ENABLE = no            # Enable N-Key Rollover
566-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
567-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
568-AUDIO_ENABLE = no           # Audio output
569diff --git a/keyboards/40percentclub/tomato/info.json b/keyboards/40percentclub/tomato/keyboard.json
570rename from keyboards/40percentclub/tomato/info.json
571rename to keyboards/40percentclub/tomato/keyboard.json
572index eabe3545683f4d67e952787143dc2e4298cc4748..a44946d3725e295a2f77bf3989489588f8466e42 100644
573--- a/keyboards/40percentclub/tomato/info.json
574+++ b/keyboards/40percentclub/tomato/keyboard.json
575@@ -28,6 +28,15 @@
576   "ws2812": {
577     "pin": "B5"
578   },
579+  "features": {
580+    "bootmagic": true,
581+    "command": false,
582+    "console": false,
583+    "extrakey": true,
584+    "mousekey": true,
585+    "nkro": true,
586+    "rgblight": true
587+  },
588   "matrix_pins": {
589     "cols": ["B4", "E6", "D7", "C6", "D4", "D0"],
590     "rows": ["F7", "B1", "B3", "B2", "B6"]
591diff --git a/keyboards/40percentclub/tomato/rules.mk b/keyboards/40percentclub/tomato/rules.mk
592deleted file mode 100644
593index d781d36d3b43497fdbf1ad8dab156d1af101ab62..0000000000000000000000000000000000000000
594--- a/keyboards/40percentclub/tomato/rules.mk
595+++ /dev/null
596@@ -1,12 +0,0 @@
597-# Build Options
598-#   change yes to no to disable
599-#
600-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
601-MOUSEKEY_ENABLE = yes	  # Mouse keys
602-EXTRAKEY_ENABLE = yes	  # Audio control and System control
603-CONSOLE_ENABLE = no			# Console for debug
604-COMMAND_ENABLE = no    	# Commands for debug and configuration
605-NKRO_ENABLE = yes           # Enable N-Key Rollover
606-BACKLIGHT_ENABLE = no   # Enable keyboard backlight functionality
607-AUDIO_ENABLE = no
608-RGBLIGHT_ENABLE = yes
609diff --git a/keyboards/45_ats/info.json b/keyboards/45_ats/keyboard.json
610rename from keyboards/45_ats/info.json
611rename to keyboards/45_ats/keyboard.json
612index 410a2a9ee1f2eebb0d28335cb0fe749f1b233be1..7c873f21edeb1d9bf446c42a8b842d595e2ddec4 100644
613--- a/keyboards/45_ats/info.json
614+++ b/keyboards/45_ats/keyboard.json
615@@ -8,6 +8,14 @@
616       "pid": "0x4511",
617       "device_version": "0.0.1"
618     },
619+    "features": {
620+        "bootmagic": true,
621+        "command": true,
622+        "console": true,
623+        "extrakey": true,
624+        "mousekey": true,
625+        "nkro": false
626+    },
627     "matrix_pins": {
628       "cols": ["E6", "B0", "B1", "B2", "B3", "B7", "F6", "F5", "F4", "C7", "F7", "C6", "B6", "D4"],
629       "rows": ["D3", "D5", "D7", "D6"]
630diff --git a/keyboards/45_ats/rules.mk b/keyboards/45_ats/rules.mk
631deleted file mode 100644
632index 309e55c9f4c83eeae4ad49af0984de703915c4b3..0000000000000000000000000000000000000000
633--- a/keyboards/45_ats/rules.mk
634+++ /dev/null
635@@ -1,12 +0,0 @@
636-# Build Options
637-#   change yes to no to disable
638-#
639-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
640-MOUSEKEY_ENABLE = yes       # Mouse keys
641-EXTRAKEY_ENABLE = yes       # Audio control and System control
642-CONSOLE_ENABLE = yes        # Console for debug
643-COMMAND_ENABLE = yes        # Commands for debug and configuration
644-NKRO_ENABLE = no            # Enable N-Key Rollover
645-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
646-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
647-AUDIO_ENABLE = no           # Audio output
648diff --git a/keyboards/4by3/info.json b/keyboards/4by3/keyboard.json
649rename from keyboards/4by3/info.json
650rename to keyboards/4by3/keyboard.json
651index faab285d2c83168be88fba7c8b08b16fa15917a3..8801a1e92038238e9b48e53eed44102ead1d5f93 100644
652--- a/keyboards/4by3/info.json
653+++ b/keyboards/4by3/keyboard.json
654@@ -8,6 +8,14 @@
655         "pid": "0x2019",
656         "device_version": "0.0.1"
657     },
658+    "features": {
659+        "bootmagic": false,
660+        "command": true,
661+        "console": true,
662+        "extrakey": true,
663+        "mousekey": false,
664+        "nkro": true
665+    },
666     "matrix_pins": {
667         "cols": ["C6", "D7", "E6", "B4"],
668         "rows": ["D1", "D0", "D4"]
669diff --git a/keyboards/4by3/rules.mk b/keyboards/4by3/rules.mk
670deleted file mode 100644
671index e7d97d60d35233dbec92d6597a7f412c52b314a4..0000000000000000000000000000000000000000
672--- a/keyboards/4by3/rules.mk
673+++ /dev/null
674@@ -1,4 +0,0 @@
675-EXTRAKEY_ENABLE 	= yes
676-NKRO_ENABLE = yes           # Enable N-Key Rollover
677-CONSOLE_ENABLE		= yes
678-COMMAND_ENABLE		= yes
679diff --git a/keyboards/4pplet/aekiso60/rev_a/info.json b/keyboards/4pplet/aekiso60/rev_a/keyboard.json
680rename from keyboards/4pplet/aekiso60/rev_a/info.json
681rename to keyboards/4pplet/aekiso60/rev_a/keyboard.json
682index 7728ab50bb3a2d4fddd1e7edc95e918fd0d211c8..5e236adc9ac7a3bf33fae45f14aa89fdef4d6c83 100644
683--- a/keyboards/4pplet/aekiso60/rev_a/info.json
684+++ b/keyboards/4pplet/aekiso60/rev_a/keyboard.json
685@@ -24,6 +24,14 @@
686     "ws2812": {
687         "pin": "D3"
688     },
689+    "features": {
690+        "bootmagic": true,
691+        "command": false,
692+        "console": false,
693+        "extrakey": true,
694+        "mousekey": false,
695+        "nkro": false
696+    },
697     "matrix_pins": {
698         "cols": ["C4", "C6", "B7", "B6", "B5", "B4", "B3", "B2", "B1", "D6", "D5", "D4", "D2", "D1"],
699         "rows": ["C2", "D0", "B0", "C7", "C5"]
700diff --git a/keyboards/4pplet/aekiso60/rev_a/rules.mk b/keyboards/4pplet/aekiso60/rev_a/rules.mk
701deleted file mode 100644
702index 6fe874e748bea0ad70ddad4f580eb5acf5bd2888..0000000000000000000000000000000000000000
703--- a/keyboards/4pplet/aekiso60/rev_a/rules.mk
704+++ /dev/null
705@@ -1,12 +0,0 @@
706-# Build Options
707-#   change yes to no to disable
708-#
709-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
710-MOUSEKEY_ENABLE = no        # Mouse keys
711-EXTRAKEY_ENABLE = yes       # Audio control and System control
712-CONSOLE_ENABLE = no         # Console for debug
713-COMMAND_ENABLE = no         # Commands for debug and configuration
714-NKRO_ENABLE = no            # Enable N-Key Rollover
715-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
716-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
717-AUDIO_ENABLE = no           # Audio output
718diff --git a/keyboards/4pplet/bootleg/rev_a/info.json b/keyboards/4pplet/bootleg/rev_a/keyboard.json
719rename from keyboards/4pplet/bootleg/rev_a/info.json
720rename to keyboards/4pplet/bootleg/rev_a/keyboard.json
721index 0e0929fcfcda9762653b18b9c1c97cd8b2f78e53..10aa3de67838919d9c8d5fdf3961402d774682fc 100644
722--- a/keyboards/4pplet/bootleg/rev_a/info.json
723+++ b/keyboards/4pplet/bootleg/rev_a/keyboard.json
724@@ -8,6 +8,14 @@
725         "pid": "0x0004",
726         "device_version": "0.0.1"
727     },
728+    "features": {
729+        "bootmagic": true,
730+        "command": false,
731+        "console": false,
732+        "extrakey": true,
733+        "mousekey": false,
734+        "nkro": false
735+    },
736     "matrix_pins": {
737         "cols": ["C5", "C6", "C7", "B7", "B6", "B5", "B4", "B3", "B2", "B1", "B0", "D6", "D5", "D3", "D1"],
738         "rows": ["D0", "C2", "C4", "D4", "D2"]
739diff --git a/keyboards/4pplet/bootleg/rev_a/rules.mk b/keyboards/4pplet/bootleg/rev_a/rules.mk
740deleted file mode 100644
741index 6fe874e748bea0ad70ddad4f580eb5acf5bd2888..0000000000000000000000000000000000000000
742--- a/keyboards/4pplet/bootleg/rev_a/rules.mk
743+++ /dev/null
744@@ -1,12 +0,0 @@
745-# Build Options
746-#   change yes to no to disable
747-#
748-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
749-MOUSEKEY_ENABLE = no        # Mouse keys
750-EXTRAKEY_ENABLE = yes       # Audio control and System control
751-CONSOLE_ENABLE = no         # Console for debug
752-COMMAND_ENABLE = no         # Commands for debug and configuration
753-NKRO_ENABLE = no            # Enable N-Key Rollover
754-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
755-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
756-AUDIO_ENABLE = no           # Audio output
757diff --git a/keyboards/4pplet/perk60_iso/rev_a/info.json b/keyboards/4pplet/perk60_iso/rev_a/keyboard.json
758rename from keyboards/4pplet/perk60_iso/rev_a/info.json
759rename to keyboards/4pplet/perk60_iso/rev_a/keyboard.json
760index 06b16d1900ada6175f6661f666dfd77d587a45d2..ae60e30d7a5bbfcf90bbf102a9cb0905bfa290cb 100644
761--- a/keyboards/4pplet/perk60_iso/rev_a/info.json
762+++ b/keyboards/4pplet/perk60_iso/rev_a/keyboard.json
763@@ -40,6 +40,15 @@
764         },
765         "driver": "is31fl3733"
766     },
767+    "features": {
768+        "bootmagic": true,
769+        "command": false,
770+        "console": false,
771+        "extrakey": true,
772+        "mousekey": false,
773+        "nkro": true,
774+        "rgb_matrix": true
775+    },
776     "matrix_pins": {
777         "cols": ["A1", "B12", "B14", "A2", "A0", "A3", "A4"],
778         "rows": ["C14", "C13", "B5", "B4", "B8", "A15", "B3", "B9", "A5", "A7"]
779diff --git a/keyboards/4pplet/perk60_iso/rev_a/rules.mk b/keyboards/4pplet/perk60_iso/rev_a/rules.mk
780deleted file mode 100644
781index 6a7da3e998d8b03dc7bb865114c57eb3d9ac656b..0000000000000000000000000000000000000000
782--- a/keyboards/4pplet/perk60_iso/rev_a/rules.mk
783+++ /dev/null
784@@ -1,14 +0,0 @@
785-# Build Options
786-#   change yes to no to disable
787-#
788-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
789-MOUSEKEY_ENABLE = no        # Mouse keys
790-EXTRAKEY_ENABLE = yes       # Audio control and System control
791-CONSOLE_ENABLE = no         # Console for debug
792-COMMAND_ENABLE = no         # Commands for debug and configuration
793-NKRO_ENABLE = yes           # Enable N-Key Rollover
794-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
795-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
796-AUDIO_ENABLE = no           # Audio output
797-RGB_MATRIX_ENABLE = yes
798-
799diff --git a/keyboards/4pplet/waffling60/rev_a/info.json b/keyboards/4pplet/waffling60/rev_a/keyboard.json
800rename from keyboards/4pplet/waffling60/rev_a/info.json
801rename to keyboards/4pplet/waffling60/rev_a/keyboard.json
802index fbd30bdd29ef74d6e3a6b70abded271604d61037..cbb24bd56a451eaddd240bb98c3a63d8313c35d9 100644
803--- a/keyboards/4pplet/waffling60/rev_a/info.json
804+++ b/keyboards/4pplet/waffling60/rev_a/keyboard.json
805@@ -8,6 +8,14 @@
806         "pid": "0x0003",
807         "device_version": "0.0.1"
808     },
809+    "features": {
810+        "bootmagic": true,
811+        "command": false,
812+        "console": false,
813+        "extrakey": true,
814+        "mousekey": false,
815+        "nkro": false
816+    },
817     "matrix_pins": {
818         "cols": ["D3", "D0", "D2", "B6", "B5", "B4", "B3", "D6", "D5", "B0", "B1"],
819         "rows": ["D4", "D1", "C2", "C4", "C7", "B2"]
820diff --git a/keyboards/4pplet/waffling60/rev_a/rules.mk b/keyboards/4pplet/waffling60/rev_a/rules.mk
821deleted file mode 100644
822index 6fe874e748bea0ad70ddad4f580eb5acf5bd2888..0000000000000000000000000000000000000000
823--- a/keyboards/4pplet/waffling60/rev_a/rules.mk
824+++ /dev/null
825@@ -1,12 +0,0 @@
826-# Build Options
827-#   change yes to no to disable
828-#
829-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
830-MOUSEKEY_ENABLE = no        # 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 = no        # Enable keyboard RGB underglow
837-AUDIO_ENABLE = no           # Audio output
838diff --git a/keyboards/4pplet/waffling60/rev_b/info.json b/keyboards/4pplet/waffling60/rev_b/keyboard.json
839rename from keyboards/4pplet/waffling60/rev_b/info.json
840rename to keyboards/4pplet/waffling60/rev_b/keyboard.json
841index 7ba1964c7ca7f97c101c616c41145a68ab1a9e1e..54e51b388b7bc135bac9a8b000cf314010ba0b68 100644
842--- a/keyboards/4pplet/waffling60/rev_b/info.json
843+++ b/keyboards/4pplet/waffling60/rev_b/keyboard.json
844@@ -28,6 +28,15 @@
845     "ws2812": {
846         "pin": "D3"
847     },
848+    "features": {
849+        "bootmagic": true,
850+        "command": false,
851+        "console": false,
852+        "extrakey": true,
853+        "mousekey": false,
854+        "nkro": false,
855+        "rgblight": true
856+    },
857     "matrix_pins": {
858         "cols": ["C4", "C5", "D2", "C6", "C7", "B7", "B6", "B5", "B4", "B3", "B2", "B1", "D1", "D4"],
859         "rows": ["C2", "D0", "B0", "D6", "D5"]
860diff --git a/keyboards/4pplet/waffling60/rev_b/rules.mk b/keyboards/4pplet/waffling60/rev_b/rules.mk
861deleted file mode 100644
862index a927de843cb18167f020fd1a10f33f4ed0286e38..0000000000000000000000000000000000000000
863--- a/keyboards/4pplet/waffling60/rev_b/rules.mk
864+++ /dev/null
865@@ -1,12 +0,0 @@
866-# Build Options
867-#   change yes to no to disable
868-#
869-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
870-MOUSEKEY_ENABLE = no        # Mouse keys
871-EXTRAKEY_ENABLE = yes       # Audio control and System control
872-CONSOLE_ENABLE = no         # Console for debug
873-COMMAND_ENABLE = no         # Commands for debug and configuration
874-NKRO_ENABLE = no            # Enable N-Key Rollover
875-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
876-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
877-AUDIO_ENABLE = no           # Audio output
878diff --git a/keyboards/4pplet/waffling60/rev_c/info.json b/keyboards/4pplet/waffling60/rev_c/keyboard.json
879rename from keyboards/4pplet/waffling60/rev_c/info.json
880rename to keyboards/4pplet/waffling60/rev_c/keyboard.json
881index f2461aeaa9b5a8e944ab5970e06a6285f7b8d131..a7c23cc349532f688e5a490e6436ac66179113cb 100644
882--- a/keyboards/4pplet/waffling60/rev_c/info.json
883+++ b/keyboards/4pplet/waffling60/rev_c/keyboard.json
884@@ -8,6 +8,15 @@
885         "pid": "0x0008",
886         "device_version": "0.0.3"
887     },
888+    "features": {
889+        "bootmagic": true,
890+        "command": false,
891+        "console": false,
892+        "extrakey": true,
893+        "mousekey": false,
894+        "nkro": false,
895+        "rgblight": true
896+    },
897     "matrix_pins": {
898         "cols": ["C4", "C5", "D2", "C6", "C7", "B7", "B6", "B5", "B4", "B3", "B2", "B1", "D1", "D4"],
899         "rows": ["C2", "D0", "B0", "D6", "D5"]
900diff --git a/keyboards/4pplet/waffling60/rev_c/rules.mk b/keyboards/4pplet/waffling60/rev_c/rules.mk
901deleted file mode 100644
902index a927de843cb18167f020fd1a10f33f4ed0286e38..0000000000000000000000000000000000000000
903--- a/keyboards/4pplet/waffling60/rev_c/rules.mk
904+++ /dev/null
905@@ -1,12 +0,0 @@
906-# Build Options
907-#   change yes to no to disable
908-#
909-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
910-MOUSEKEY_ENABLE = no        # Mouse keys
911-EXTRAKEY_ENABLE = yes       # Audio control and System control
912-CONSOLE_ENABLE = no         # Console for debug
913-COMMAND_ENABLE = no         # Commands for debug and configuration
914-NKRO_ENABLE = no            # Enable N-Key Rollover
915-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
916-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
917-AUDIO_ENABLE = no           # Audio output
918diff --git a/keyboards/4pplet/waffling80/rev_a/info.json b/keyboards/4pplet/waffling80/rev_a/keyboard.json
919rename from keyboards/4pplet/waffling80/rev_a/info.json
920rename to keyboards/4pplet/waffling80/rev_a/keyboard.json
921index 8c3a84be1e6bb473a2943d1707d8ddb6029498d2..157cefa5362c989ca8285b6d93e96eb049b14c5c 100644
922--- a/keyboards/4pplet/waffling80/rev_a/info.json
923+++ b/keyboards/4pplet/waffling80/rev_a/keyboard.json
924@@ -12,6 +12,15 @@
925     "ws2812": {
926         "pin": "D7"
927     },
928+    "features": {
929+        "bootmagic": true,
930+        "command": false,
931+        "console": false,
932+        "extrakey": true,
933+        "mousekey": true,
934+        "nkro": true,
935+        "rgblight": true
936+    },
937     "matrix_pins": {
938         "cols": ["C6", "C7", "B7", "B6", "B5", "B2", "D0", "C2"],
939         "rows": ["C4", "C5", "B4", "B3", "B1", "B0", "D6", "D5", "D3", "D4", "D1", "D2"]
940diff --git a/keyboards/4pplet/waffling80/rev_a/rules.mk b/keyboards/4pplet/waffling80/rev_a/rules.mk
941deleted file mode 100644
942index ceea2d612c40b8c61c9b5ca8f6fe219337b7c715..0000000000000000000000000000000000000000
943--- a/keyboards/4pplet/waffling80/rev_a/rules.mk
944+++ /dev/null
945@@ -1,12 +0,0 @@
946-# Build Options
947-#   change yes to no to disable
948-#
949-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
950-MOUSEKEY_ENABLE = yes        # Mouse keys
951-EXTRAKEY_ENABLE = yes       # Audio control and System control
952-CONSOLE_ENABLE = no         # Console for debug
953-COMMAND_ENABLE = no         # Commands for debug and configuration
954-NKRO_ENABLE = yes            # Enable N-Key Rollover
955-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
956-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
957-AUDIO_ENABLE = no           # Audio output
958diff --git a/keyboards/4pplet/yakiimo/rev_a/info.json b/keyboards/4pplet/yakiimo/rev_a/keyboard.json
959rename from keyboards/4pplet/yakiimo/rev_a/info.json
960rename to keyboards/4pplet/yakiimo/rev_a/keyboard.json
961index ae4654007daa6a733a095f5ad678877a8ebcf08b..ec5addd85019b97e3c65115809c985214806a42e 100644
962--- a/keyboards/4pplet/yakiimo/rev_a/info.json
963+++ b/keyboards/4pplet/yakiimo/rev_a/keyboard.json
964@@ -8,6 +8,14 @@
965         "pid": "0x000A",
966         "device_version": "0.0.2"
967     },
968+    "features": {
969+        "bootmagic": true,
970+        "command": false,
971+        "console": false,
972+        "extrakey": true,
973+        "mousekey": true,
974+        "nkro": true
975+    },
976     "matrix_pins": {
977         "cols": ["B0", "A5", "A4", "A3", "A2", "A1", "A0", "C15", "A8"],
978         "rows": ["B10", "B1", "C13", "C14", "B14", "B12", "B9", "B8", "B5", "B4", "A15", "B3"]
979diff --git a/keyboards/4pplet/yakiimo/rev_a/rules.mk b/keyboards/4pplet/yakiimo/rev_a/rules.mk
980deleted file mode 100644
981index c3b8e77d77a9207eec95f558c5901a01ddcfae40..0000000000000000000000000000000000000000
982--- a/keyboards/4pplet/yakiimo/rev_a/rules.mk
983+++ /dev/null
984@@ -1,13 +0,0 @@
985-# Build Options
986-#   change yes to no to disable
987-#
988-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
989-MOUSEKEY_ENABLE = yes       # Mouse keys
990-EXTRAKEY_ENABLE = yes       # Audio control and System control
991-CONSOLE_ENABLE = no         # Console for debug
992-COMMAND_ENABLE = no         # Commands for debug and configuration
993-NKRO_ENABLE = yes           # Enable N-Key Rollover
994-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
995-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
996-AUDIO_ENABLE = no           # Audio output
997-