Configure keyboard matrix from info.json (#10817)

* Make parameters from info.json available to the build system

* move all clueboard settings to info.json

* code formatting

* make flake8 happy

* make flake8 happy

* make qmk lint happy

* Add support for specifying led indicators in json

* move led indicators to the clueboard info.json

* Apply suggestions from code review

Co-authored-by: Erovia <Erovia@users.noreply.github.com>

* add missing docstring

Co-authored-by: Erovia <Erovia@users.noreply.github.com>

62 files changed, 3697 insertions, 3763 deletions

diff --git a/keyboards/clueboard/17/17.h b/keyboards/clueboard/17/17.h
index af3be4f5a9..ebf2083862 100644
--- a/keyboards/clueboard/17/17.h
+++ b/keyboards/clueboard/17/17.h
@@ -3,37 +3,4 @@
 
 #include "quantum.h"
 
-
-/* Cluepad matrix layout
- * .-------------------.
- * |NLCK|   /|   *|   -|
- * |-------------------|
- * |   7|   8|   9|    |
- * |--------------|    |
- * |   4|   5|   6|   +|
- * |-------------------|
- * |   1|   2|   3|    |
- * |--------------|    |
- * |        0|   .| Ent|
- * '-------------------'
- */
-// The first section contains all of the arguments
-// The second converts the arguments into a two-dimensional array
-#define LAYOUT_numpad_5x4( \
-    k00, k01, k02, k03, \
-    k10, k11, k12,      \
-    k20, k21, k22, k13, \
-    k30, k31, k32,      \
-    k40,      k42, k33  \
-) { \
-    { k00, k01,   k02, k03   }, \
-    { k10, k11,   k12, k13   }, \
-    { k20, k21,   k22, KC_NO }, \
-    { k30, k31,   k32, k33   }, \
-    { k40, KC_NO, k42, KC_NO }  \
-}
-
-#define LAYOUT LAYOUT_numpad_5x4
-#define KEYMAP LAYOUT_numpad_5x4
-
 #endif
diff --git a/keyboards/clueboard/17/config.h b/keyboards/clueboard/17/config.h
index b7e28cbb9f..877f478690 100644
--- a/keyboards/clueboard/17/config.h
+++ b/keyboards/clueboard/17/config.h
@@ -20,76 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xC1ED
-#define PRODUCT_ID      0x2312
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Clueboard
-#define PRODUCT         Cluepad with RGB Underlighting
-#define DESCRIPTION     QMK keyboard firmware for Cluepad
-
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 4
-
-// ROWS: Top to bottom, COLS: Left to right
-/* Row pin configuration
-* row: 0  1  2  3  4
-* pin:
-*/
-#define MATRIX_ROW_PINS { B0, D3, D5, D4, D6 }
-/* Column pin configuration
- * col: 0  1  2  3
- * pin: F4 E6 B1 D2
- */
-#define MATRIX_COL_PINS { F4, E6, B1, D2 }
-#define UNUSED_PINS
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-/* define if matrix has ghost */
-//#define MATRIX_HAS_GHOST
-
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
 /* Number of backlighting levels */
 #define BACKLIGHT_LEVELS 3
 
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/* Underlight configuration
- */
-#define RGB_DI_PIN F6
-#define RGBLIGHT_ANIMATIONS
-#define RGBLED_NUM 4     // Number of LEDs
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
-#define RGBLIGHT_VAL_STEP 17
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* Debug forcibly enabled */
-#define ALWAYS_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
-
 #endif
diff --git a/keyboards/clueboard/17/info.json b/keyboards/clueboard/17/info.json
index 12338ae1d3..46510c48c0 100644
--- a/keyboards/clueboard/17/info.json
+++ b/keyboards/clueboard/17/info.json
@@ -1,30 +1,67 @@
 {
+  "manufacturer": "Clueboard",
   "keyboard_name": "Clueboard 17% (Cluepad)",
-  "keyboard_folder": "clueboard/17",
-  "url": "",
-  "maintainer": "qmk",
-  "width": 4,
+  "maintainer": "skullydazed",
   "height": 5,
+  "width": 4,
+  "diode_direction": "COL2ROW",
+  "features": {
+    "backlight": true,
+    "bootmagic": false,
+    "command": false,
+    "console": true,
+    "extrakey": true,
+    "midi": false,
+    "mousekey": true,
+    "nkro": true,
+    "rgblight": true,
+    "unicode": false
+  },
+  "matrix_pins": {
+    "cols": ["F4", "E6", "B1", "D2"],
+    "rows": ["B0", "D3", "D5", "D4", "D6"]
+  },
+  "rgblight": {
+    "animations": {
+      "all": true
+    },
+    "brightness_steps": "17",
+    "hue_steps": "10",
+    "led_count": "4",
+    "pin": "F6",
+    "saturation_steps": "17"
+  },
+  "url": "",
+  "usb": {
+    "device_ver": "0x0001",
+    "pid": "0x2312",
+    "vid": "0xC1ED"
+  },
+  "layout_aliases": {
+    "KEYMAP": "LAYOUT_numpad_5x4",
+    "LAYOUT": "LAYOUT_numpad_5x4"
+  },
   "layouts": {
     "LAYOUT_numpad_5x4": {
+      "key_count": 17,
       "layout": [
-        {"label":"Num Lock", "x":0, "y":0},
-        {"label":"/", "x":1, "y":0},
-        {"label":"*", "x":2, "y":0},
-        {"label":"-", "x":3, "y":0},
-        {"label":"7", "x":0, "y":1},
-        {"label":"8", "x":1, "y":1},
-        {"label":"9", "x":2, "y":1},
-        {"label":"4", "x":0, "y":2},
-        {"label":"5", "x":1, "y":2},
-        {"label":"6", "x":2, "y":2},
-        {"label":"+", "x":3, "y":1, "h":2},
-        {"label":"1", "x":0, "y":3},
-        {"label":"2", "x":1, "y":3},
-        {"label":"3", "x":2, "y":3},
-        {"label":"0", "x":0, "y":4, "w":2},
-        {"label":".", "x":2, "y":4},
-        {"label":"Enter", "x":3, "y":3, "h":2}
+        { "label": "Num Lock", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
+        { "label": "/", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
+        { "label": "*", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
+        { "label": "-", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
+        { "label": "7", "matrix": [1, 0], "w": 1, "x": 0, "y": 1 },
+        { "label": "8", "matrix": [1, 1], "w": 1, "x": 1, "y": 1 },
+        { "label": "9", "matrix": [1, 2], "w": 1, "x": 2, "y": 1 },
+        { "label": "4", "matrix": [2, 0], "w": 1, "x": 0, "y": 2 },
+        { "label": "5", "matrix": [2, 1], "w": 1, "x": 1, "y": 2 },
+        { "label": "6", "matrix": [2, 2], "w": 1, "x": 2, "y": 2 },
+        { "h": 2, "label": "+", "matrix": [1, 3], "w": 1, "x": 3, "y": 1 },
+        { "label": "1", "matrix": [3, 0], "w": 1, "x": 0, "y": 3 },
+        { "label": "2", "matrix": [3, 1], "w": 1, "x": 1, "y": 3 },
+        { "label": "3", "matrix": [3, 2], "w": 1, "x": 2, "y": 3 },
+        { "label": "0", "matrix": [4, 0], "w": 2, "x": 0, "y": 4 },
+        { "label": ".", "matrix": [4, 2], "w": 1, "x": 2, "y": 4 },
+        { "h": 2, "label": "Enter", "matrix": [3, 3], "w": 1, "x": 3, "y": 3 }
       ]
     }
   }
diff --git a/keyboards/clueboard/17/keymaps/default/readme.md b/keyboards/clueboard/17/keymaps/default/readme.md
new file mode 100644
index 0000000000..4fc9092b39
--- /dev/null
+++ b/keyboards/clueboard/17/keymaps/default/readme.md
@@ -0,0 +1 @@
+Default keymap for the Clueboard 17.
diff --git a/keyboards/clueboard/17/rules.mk b/keyboards/clueboard/17/rules.mk
index 703bf3d2db..75fb718e33 100644
--- a/keyboards/clueboard/17/rules.mk
+++ b/keyboards/clueboard/17/rules.mk
@@ -12,14 +12,4 @@ MCU = atmega32u4
 BOOTLOADER = atmel-dfu
 
 # Build Options
-BOOTMAGIC_ENABLE = no	      # Virtual DIP switch configuration
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # USB Nkey Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 BACKLIGHT_DRIVER = custom
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-MIDI_ENABLE = no            # MIDI support
-UNICODE_ENABLE = no         # Unicode
diff --git a/keyboards/clueboard/2x1800/2018/2018.h b/keyboards/clueboard/2x1800/2018/2018.h
index 818ceed80d..c6e152ad44 100644
--- a/keyboards/clueboard/2x1800/2018/2018.h
+++ b/keyboards/clueboard/2x1800/2018/2018.h
@@ -18,78 +18,4 @@
 
 #include "quantum.h"
 
-// This a shortcut to help you visually see your layout.
-// The first section contains all of the arguments
-// The second converts the arguments into a two-dimensional array
-#define LAYOUT_all( \
-      k00, k01, k02, k03,    k04,   k06, k07, k08, k09,   k0a, k60, k61, k62,   k63, k64, k65, k66,    k67, k68, k69, k6a, \
-      k10, k11, k12, k13,   k14, k15, k16, k17, k18, k19, k1a, k70, k71, k72, k73, k74, k75,    k76,   k77, k78, k79, k7a, \
-      k20, k21, k22, k23,    k24,  k25, k26, k27, k28, k29, k2a, k80, k81, k82, k83, k84, k85,   k86,  k87, k88, k89, k8a, \
-           k31, k32, k33,   k34,   k35, k36, k37, k38, k39, k3a, k90, k91, k92, k93, k94,    k95,      k97, k98, k99,      \
-      k40, k41, k42, k43,  k44,  k45, k46, k47, k48, k49, k4a, ka0, ka1, ka2, ka3, ka4,  ka5,  k96,    ka7, ka8, ka9, kaa, \
-           k51, k52,  k53, k54, k55,  k56, k57, k58, k59, k5a, kb0, kb1, kb2, kb3, kb4, kb5, ka6, kb6, kb7, kb8, kb9       \
-) \
-{ \
-    { k00, k01, k02, k03, k04, KC_NO, k06, k07, k08, k09, k0a }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a }, \
-    { KC_NO, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a }, \
-    { KC_NO, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5a }, \
-    { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6a }, \
-    { k70, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7a }, \
-    { k80, k81, k82, k83, k84, k85, k86, k87, k88, k89, k8a }, \
-    { k90, k91, k92, k93, k94, k95, k96, k97, k98, k99, KC_NO }, \
-    { ka0, ka1, ka2, ka3, ka4, ka5, ka6, ka7, ka8, ka9, kaa }, \
-    { kb0, kb1, kb2, kb3, kb4, kb5, kb6, kb7, kb8, kb9, KC_NO } \
-}
-
-#define LAYOUT_4u_space( \
-      k00, k01, k02, k03,    k04,   k06, k07, k08, k09,   k0a, k60, k61, k62,   k63, k64, k65, k66,    k67, k68, k69, k6a, \
-      k10, k11, k12, k13,   k14, k15, k16, k17, k18, k19, k1a, k70, k71, k72, k73, k74, k75,    k76,   k77, k78, k79, k7a, \
-      k20, k21, k22, k23,    k24,  k25, k26, k27, k28, k29, k2a, k80, k81, k82, k83, k84, k85,   k86,  k87, k88, k89, k8a, \
-           k31, k32, k33,   k34,   k35, k36, k37, k38, k39, k3a, k90, k91, k92, k93, k94,    k95,      k97, k98, k99,      \
-      k40, k41, k42, k43,  k44,  k45, k46, k47, k48, k49, k4a, ka0, ka1, ka2, ka3, ka4,  ka5,  k96,    ka7, ka8, ka9, kaa, \
-           k51, k52,  k53, k54, k55,  k56, k57, k58,           kb0,      kb2, kb3, kb4, kb5, ka6, kb6, kb7, kb8, kb9       \
-) \
-{ \
-    { k00, k01, k02, k03, k04, KC_NO, k06, k07, k08, k09, k0a }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a }, \
-    { KC_NO, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a }, \
-    { KC_NO, k51, k52, k53, k54, k55, k56, k57, k58, KC_NO, KC_NO }, \
-    { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6a }, \
-    { k70, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7a }, \
-    { k80, k81, k82, k83, k84, k85, k86, k87, k88, k89, k8a }, \
-    { k90, k91, k92, k93, k94, k95, k96, k97, k98, k99, KC_NO }, \
-    { ka0, ka1, ka2, ka3, ka4, ka5, ka6, ka7, ka8, ka9, kaa }, \
-    { kb0, KC_NO, kb2, kb3, kb4, kb5, kb6, kb7, kb8, kb9, KC_NO } \
-}
-
-#define LAYOUT_7u_space( \
-      k00, k01, k02, k03,    k04,   k06, k07, k08, k09,   k0a, k60, k61, k62,   k63, k64, k65, k66,    k67, k68, k69, k6a, \
-      k10, k11, k12, k13,   k14, k15, k16, k17, k18, k19, k1a, k70, k71, k72, k73, k74, k75,    k76,   k77, k78, k79, k7a, \
-      k20, k21, k22, k23,    k24,  k25, k26, k27, k28, k29, k2a, k80, k81, k82, k83, k84, k85,   k86,  k87, k88, k89, k8a, \
-           k31, k32, k33,   k34,   k35, k36, k37, k38, k39, k3a, k90, k91, k92, k93, k94,    k95,      k97, k98, k99,      \
-      k40, k41, k42, k43,  k44,  k45, k46, k47, k48, k49, k4a, ka0, ka1, ka2, ka3, ka4,  ka5,  k96,    ka7, ka8, ka9, kaa, \
-           k51, k52,  k53, k54, k55,  k56, k57,                kb0,                kb4, kb5, ka6, kb6, kb7, kb8, kb9       \
-) \
-{ \
-    { k00, k01, k02, k03, k04, KC_NO, k06, k07, k08, k09, k0a }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a }, \
-    { KC_NO, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a }, \
-    { KC_NO, k51, k52, k53, k54, k55, k56, k57, KC_NO, KC_NO, KC_NO }, \
-    { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6a }, \
-    { k70, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7a }, \
-    { k80, k81, k82, k83, k84, k85, k86, k87, k88, k89, k8a }, \
-    { k90, k91, k92, k93, k94, k95, k96, k97, k98, k99, KC_NO }, \
-    { ka0, ka1, ka2, ka3, ka4, ka5, ka6, ka7, ka8, ka9, kaa }, \
-    { kb0, KC_NO, KC_NO, KC_NO, kb4, kb5, kb6, kb7, kb8, kb9, KC_NO } \
-}
-
-#define LAYOUT LAYOUT_all
-
 #endif
diff --git a/keyboards/clueboard/2x1800/2018/config.h b/keyboards/clueboard/2x1800/2018/config.h
index 0c57b43248..40486379ea 100644
--- a/keyboards/clueboard/2x1800/2018/config.h
+++ b/keyboards/clueboard/2x1800/2018/config.h
@@ -15,185 +15,17 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef CONFIG_H
-#define CONFIG_H
+#pragma once
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xC1ED
-#define PRODUCT_ID      0x23A0
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Clueboard
-#define PRODUCT         2x1800 2018
-#define DESCRIPTION     What does it mean?
-
-/* key matrix size */
-#define MATRIX_ROWS 12
-#define MATRIX_COLS 11
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { C0, C1, C2, C3, C7, F7, B1, F2, F3, F4, F5, F6 }
-#define MATRIX_COL_PINS { D2, D3, D4, D5, D7, E0, E1, B0, E6, B3, B2 }
-#define UNUSED_PINS { D0, D1, D6, C5, C6, E4, E5, E7, F0, F1, A0, A1, A2, A3, A4, A5, A6, A7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 5
-
-/* define if matrix has ghost (lacks anti-ghosting diodes) */
-//#define MATRIX_HAS_GHOST
-
 /* audio support */
 #define B7_AUDIO
 #define C4_AUDIO
 #define AUDIO_CLICKY
 
-#define LED_NUM_LOCK_PIN B4
-#define LED_CAPS_LOCK_PIN B5
-#define LED_SCROLL_LOCK_PIN B6
-
-/* number of backlight levels */
-// #define BACKLIGHT_PIN B7
-// #define BACKLIGHT_BREATHING
-// #define BACKLIGHT_LEVELS 3
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
+
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-#define RGB_DI_PIN C6
-#define RGBLIGHT_ANIMATIONS
-#define RGBLED_NUM 16
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-
-/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
- * This is userful for the Windows task manager shortcut (ctrl+shift+esc).
- */
-// #define GRAVE_ESC_CTRL_OVERRIDE
-
-/*
- * Force NKRO
- *
- * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
- * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
- * makefile for this to work.)
- *
- * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
- * until the next keyboard reset.
- *
- * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
- * fully operational during normal computer usage.
- *
- * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
- * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
- * bootmagic, NKRO mode will always be enabled until it is toggled again during a
- * power-up.
- *
- */
-//#define FORCE_NKRO
-
-/*
- * Magic Key Options
- *
- * Magic keys are hotkey commands that allow control over firmware functions of
- * the keyboard. They are best used in combination with the HID Listen program,
- * found here: https://www.pjrc.com/teensy/hid_listen.html
- *
- * The options below allow the magic key functionality to be changed. This is
- * useful if your keyboard/keypad is missing keys and you want magic key support.
- *
- */
-
-/* control how magic key switches layers */
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS  true
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS  true
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false
-
-/* override magic key keymap */
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM
-//#define MAGIC_KEY_HELP1          H
-//#define MAGIC_KEY_HELP2          SLASH
-//#define MAGIC_KEY_DEBUG          D
-//#define MAGIC_KEY_DEBUG_MATRIX   X
-//#define MAGIC_KEY_DEBUG_KBD      K
-//#define MAGIC_KEY_DEBUG_MOUSE    M
-//#define MAGIC_KEY_VERSION        V
-//#define MAGIC_KEY_STATUS         S
-//#define MAGIC_KEY_CONSOLE        C
-//#define MAGIC_KEY_LAYER0_ALT1    ESC
-//#define MAGIC_KEY_LAYER0_ALT2    GRAVE
-//#define MAGIC_KEY_LAYER0         0
-//#define MAGIC_KEY_LAYER1         1
-//#define MAGIC_KEY_LAYER2         2
-//#define MAGIC_KEY_LAYER3         3
-//#define MAGIC_KEY_LAYER4         4
-//#define MAGIC_KEY_LAYER5         5
-//#define MAGIC_KEY_LAYER6         6
-//#define MAGIC_KEY_LAYER7         7
-//#define MAGIC_KEY_LAYER8         8
-//#define MAGIC_KEY_LAYER9         9
-//#define MAGIC_KEY_BOOTLOADER     PAUSE
-//#define MAGIC_KEY_LOCK           CAPS
-//#define MAGIC_KEY_EEPROM         E
-//#define MAGIC_KEY_NKRO           N
-//#define MAGIC_KEY_SLEEP_LED      Z
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
-
-/*
- * MIDI options
- */
-
-/* Prevent use of disabled MIDI features in the keymap */
-//#define MIDI_ENABLE_STRICT 1
-
-/* enable basic MIDI features:
-   - MIDI notes can be sent when in Music mode is on
-*/
-//#define MIDI_BASIC
-
-/* enable advanced MIDI features:
-   - MIDI notes can be added to the keymap
-   - Octave shift and transpose
-   - Virtual sustain, portamento, and modulation wheel
-   - etc.
-*/
-//#define MIDI_ADVANCED
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 1
-
-#endif
diff --git a/keyboards/clueboard/2x1800/2018/info.json b/keyboards/clueboard/2x1800/2018/info.json
index 0e3bb36a9d..b671174076 100644
--- a/keyboards/clueboard/2x1800/2018/info.json
+++ b/