Merge remote-tracking branch 'upstream/develop'

36 files changed, 64 insertions, 184 deletions

diff --git a/keyboards/clueboard/17/config.h b/keyboards/clueboard/17/config.h
deleted file mode 100644
index e2d0d1a23e..0000000000
--- a/keyboards/clueboard/17/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "config_common.h"
-
-/* Number of backlighting levels */
-#define BACKLIGHT_LEVELS 3
diff --git a/keyboards/clueboard/17/info.json b/keyboards/clueboard/17/info.json
index 33b888b059..a8e933d028 100644
--- a/keyboards/clueboard/17/info.json
+++ b/keyboards/clueboard/17/info.json
@@ -46,6 +46,9 @@
     "pid": "0x2312",
     "vid": "0xC1ED"
   },
+  "backlight": {
+    "driver": "custom"
+  },
   "layout_aliases": {
     "LAYOUT": "LAYOUT_numpad_5x4"
   },
diff --git a/keyboards/clueboard/17/rules.mk b/keyboards/clueboard/17/rules.mk
index d2e52d56b5..e69de29bb2 100644
--- a/keyboards/clueboard/17/rules.mk
+++ b/keyboards/clueboard/17/rules.mk
@@ -1,2 +0,0 @@
-# Build Options
-BACKLIGHT_DRIVER = custom
diff --git a/keyboards/clueboard/2x1800/2018/config.h b/keyboards/clueboard/2x1800/2018/config.h
index 9d5b9b5144..95cde57668 100644
--- a/keyboards/clueboard/2x1800/2018/config.h
+++ b/keyboards/clueboard/2x1800/2018/config.h
@@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "config_common.h"
 
 /* audio support */
 #define AUDIO_PIN_ALT B7
diff --git a/keyboards/clueboard/2x1800/2018/info.json b/keyboards/clueboard/2x1800/2018/info.json
index e732f28855..03162625c6 100644
--- a/keyboards/clueboard/2x1800/2018/info.json
+++ b/keyboards/clueboard/2x1800/2018/info.json
@@ -4,7 +4,6 @@
   "maintainer": "skullydazed",
   "processor": "at90usb1286",
   "bootloader": "halfkay",
-  "debounce": 5,
   "diode_direction": "ROW2COL",
   "features": {
     "audio": true,
diff --git a/keyboards/clueboard/2x1800/2019/2019.h b/keyboards/clueboard/2x1800/2019/2019.h
index 5debfacc5d..c5869ff66f 100644
--- a/keyboards/clueboard/2x1800/2019/2019.h
+++ b/keyboards/clueboard/2x1800/2019/2019.h
@@ -18,16 +18,12 @@
 #include "quantum.h"
 
 enum TWOx1800_keycodes {
-    ENC_BTN1 = SAFE_RANGE,
+    ENC_BTN1 = QK_KB_0,
     ENC_BTN2,
     ENC_BTN3,
     ENC_BTN4,
-    NEW_SAFE_RANGE
 };
 
-#undef SAFE_RANGE
-#define SAFE_RANGE NEW_SAFE_RANGE
-
 // Encoder update function that returns true/false
 bool encoder_update_keymap(uint8_t index, bool clockwise);
 
diff --git a/keyboards/clueboard/2x1800/2019/config.h b/keyboards/clueboard/2x1800/2019/config.h
index 162d41a2e2..031952a0b3 100644
--- a/keyboards/clueboard/2x1800/2019/config.h
+++ b/keyboards/clueboard/2x1800/2019/config.h
@@ -17,15 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "config_common.h"
-
-/*
- * Encoder Assignments
- */
-#define ENCODERS_PAD_A { A5, A4, A2, A1 }
-#define ENCODERS_PAD_B { A6, A7, A3, A0 }
-#define ENCODER_RESOLUTION 4
-
 /* audio support */
 #define AUDIO_PIN_ALT B7
 #define AUDIO_PIN C4
diff --git a/keyboards/clueboard/2x1800/2019/info.json b/keyboards/clueboard/2x1800/2019/info.json
index 886f3878bf..0eebbabb6d 100644
--- a/keyboards/clueboard/2x1800/2019/info.json
+++ b/keyboards/clueboard/2x1800/2019/info.json
@@ -2,7 +2,6 @@
   "manufacturer": "Clueboard",
   "keyboard_name": "Clueboard 2x1800 2019",
   "maintainer": "skullydazed",
-  "debounce": 5,
   "processor": "at90usb1286",
   "bootloader": "halfkay",
   "diode_direction": "ROW2COL",
@@ -28,6 +27,14 @@
     "pid": "0x23A0",
     "vid": "0xC1ED"
   },
+  "encoder": {
+    "rotary": [
+      {"pin_a": "A5", "pin_b": "A6"},
+      {"pin_a": "A4", "pin_b": "A7"},
+      {"pin_a": "A2", "pin_b": "A3"},
+      {"pin_a": "A1", "pin_b": "A0"}
+    ]
+  },
   "layout_aliases": {
     "LAYOUT": "LAYOUT_all"
   },
diff --git a/keyboards/clueboard/2x1800/2021/config.h b/keyboards/clueboard/2x1800/2021/config.h
index eccede6a41..eb4fd4bbf6 100644
--- a/keyboards/clueboard/2x1800/2021/config.h
+++ b/keyboards/clueboard/2x1800/2021/config.h
@@ -17,20 +17,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "config_common.h"
 
 /* audio support */
 #define AUDIO_PIN_ALT B7
 #define AUDIO_PIN C4
 #define AUDIO_CLICKY
 
-/*
- * Encoder Assignments
- */
-#define ENCODERS_PAD_A { D0, C5 }
-#define ENCODERS_PAD_B { D1, C6 }
-#define ENCODER_RESOLUTION 4
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/clueboard/2x1800/2021/font.h b/keyboards/clueboard/2x1800/2021/font.h
index 5ddcbfba56..191d11dcee 100644
--- a/keyboards/clueboard/2x1800/2021/font.h
+++ b/keyboards/clueboard/2x1800/2021/font.h
@@ -24,6 +24,8 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#pragma once
+
 // Top row of keyboard, when shift held
 #define CHR_TILDE      {0b00110000, 0b01000000, 0b00110000, 0b00001000, 0b00110000, 0b00000000}
 #define CHR_BANG       {0b00000000, 0b00000000, 0b11111010, 0b10000000, 0b00000000, 0b00000000}
diff --git a/keyboards/clueboard/2x1800/2021/info.json b/keyboards/clueboard/2x1800/2021/info.json
index 088ce343db..44842c0e16 100644
--- a/keyboards/clueboard/2x1800/2021/info.json
+++ b/keyboards/clueboard/2x1800/2021/info.json
@@ -3,7 +3,6 @@
     "keyboard_name": "Clueboard 2x1800 2021",
     "maintainer": "skullydazed",
     "bootloader": "halfkay",
-    "debounce": 5,
     "diode_direction": "ROW2COL",
     "features": {
         "audio": true,
@@ -27,6 +26,12 @@
     "usb": {
         "pid": "0x23A0"
     },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "D0", "pin_b": "D1"},
+            {"pin_a": "C5", "pin_b": "C6"}
+        ]
+    },
     "layout_aliases": {
         "LAYOUT": "LAYOUT_all"
     },
diff --git a/keyboards/clueboard/60/config.h b/keyboards/clueboard/60/config.h
deleted file mode 100644
index 9263a8f657..0000000000
--- a/keyboards/clueboard/60/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2017 skully <skullydazed@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "config_common.h"
-
-/* Backlight configuration
- */
-#define BACKLIGHT_LEVELS 1
diff --git a/keyboards/clueboard/60/info.json b/keyboards/clueboard/60/info.json
index 16f94644c9..d89253fa3e 100644
--- a/keyboards/clueboard/60/info.json
+++ b/keyboards/clueboard/60/info.json
@@ -29,6 +29,9 @@
     "pid": "0x2350",
     "vid": "0xC1ED"
   },
+  "backlight": {
+    "levels": 1
+  },
   "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_iso"],
   "layout_aliases": {
     "LAYOUT": "LAYOUT_all"
diff --git a/keyboards/clueboard/66/keymaps/badger/keymap.c b/keyboards/clueboard/66/keymaps/badger/keymap.c
index e404029849..4c40e5ec19 100644
--- a/keyboards/clueboard/66/keymaps/badger/keymap.c
+++ b/keyboards/clueboard/66/keymaps/badger/keymap.c
@@ -15,39 +15,39 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "badger.h"
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY_LINUX]      = LAYOUT_66_ansi(\
-      KC_GRV,    KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,   KC_EQL,   KC_BSPC,  KC_HOME, \
-      KC_TAB,    KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,   KC_RBRC,  KC_BSLS,  KC_END, \
-      MOVE,      KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,   KC_ENT, \
-      KC_LSFT,   KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,   KC_UP,  \
+  [_QWERTY_LINUX]      = LAYOUT_66_ansi(
+      KC_GRV,    KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,   KC_EQL,   KC_BSPC,  KC_HOME,
+      KC_TAB,    KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,   KC_RBRC,  KC_BSLS,  KC_END,
+      MOVE,      KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,   KC_ENT,
+      KC_LSFT,   KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,   KC_UP,
       KC_LCTL,   KC_LALT,  KC_LGUI,  KC_SPC,   ADJUST,   KC_RGUI,  KC_LALT,  KC_LEFT,  KC_DOWN,  KC_RGHT),
 
-  [_MOVE_LINUX]        = LAYOUT_66_ansi(\
-     KC_ESC,     VD_1,     VD_2,     VD_3,     KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   IJ_UP,     IJ_DOWN,  KC_DEL,   KC_PGUP, \
-     _______,    IJ_STEP,  IJ_INTO,  IJ_OUT,   IJ_RUN,   IJ_STOP,  IJ_OUT,   KC_PGUP,  KC_HOME,  KC_END,   KC_PGDN,  IJ_BACK,   IJ_FWD,   KC_INS,   KC_PGDN, \
-     _______,    WM_LH,    WM_UH,    WM_RH,    WD_FRWD,  MAC_POP,  KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  CS_RIGHT, CS_DOWN,   _______, \
-     _______,    MM_UH,    MM_BH,    MAC_CPY,  MAC_PST,  WD_BACK,  KC_MNXT,  IJ_REN,   IJ_IMPL,  IJ_DECL,  IJ_USAG,  _______,   KC_BRIU, \
+  [_MOVE_LINUX]        = LAYOUT_66_ansi(
+     KC_ESC,     VD_1,     VD_2,     VD_3,     KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   IJ_UP,     IJ_DOWN,  KC_DEL,   KC_PGUP,
+     _______,    IJ_STEP,  IJ_INTO,  IJ_OUT,   IJ_RUN,   IJ_STOP,  IJ_OUT,   KC_PGUP,  KC_HOME,  KC_END,   KC_PGDN,  IJ_BACK,   IJ_FWD,   KC_INS,   KC_PGDN,
+     _______,    WM_LH,    WM_UH,    WM_RH,    WD_FRWD,  MAC_POP,  KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  CS_RIGHT, CS_DOWN,   _______,
+     _______,    MM_UH,    MM_BH,    MAC_CPY,  MAC_PST,  WD_BACK,  KC_MNXT,  IJ_REN,   IJ_IMPL,  IJ_DECL,  IJ_USAG,  _______,   KC_BRIU,
      _______,    _______,  _______,  _______,  _______,  _______,  _______,  KC_HOME,  KC_BRID,  KC_END),
 
-  [_QWERTY_MAC]  = LAYOUT_66_ansi(\
-      KC_GRV,    KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,   KC_EQL,   KC_BSPC,  KC_HOME, \
-      KC_TAB,    KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,   KC_RBRC,  KC_BSLS,  KC_END, \
-      MOVE_MAC,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,   KC_ENT, \
-      KC_LSFT,   KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,   KC_UP,  \
+  [_QWERTY_MAC]  = LAYOUT_66_ansi(
+      KC_GRV,    KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,   KC_EQL,   KC_BSPC,  KC_HOME,
+      KC_TAB,    KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,   KC_RBRC,  KC_BSLS,  KC_END,
+      MOVE_MAC,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,   KC_ENT,
+      KC_LSFT,   KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,   KC_UP,
       KC_LCTL,   KC_LALT,  KC_LGUI,  KC_SPC,   ADJUST,   KC_RGUI,  KC_LALT,  KC_LEFT,  KC_DOWN,  KC_RGHT),
 
-  [_MOVE_MAC]    = LAYOUT_66_ansi(\
-     KC_ESC,     M_VD1,    M_VD2,    M_VD3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   IJ_UP,     IJ_DOWN,  KC_DEL,   KC_PGUP, \
-     _______,    IJ_STEP,  IJ_INTO,  IJ_OUT,   IJ_RUN,   IJ_STOP,  IJ_OUT,   KC_PGUP,  KC_HOME,  KC_END,   KC_PGDN,  IJ_BACK,   IJ_FWD,   KC_INS,   KC_PGDN, \
-     _______,    MM_LH,    MM_MAX,   MM_RH,    WD_FRWD,  MAC_POP,  KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  CM_RIGHT, CM_DOWN,   _______, \
-     _______,    MM_UH,    MM_BH,    MAC_CPY,  MAC_PST,  WD_BACK,  KC_MNXT,  IJ_REN,   IJ_IMPL,  IJ_DECL,  IJ_USAG,  _______,   KC_BRIU, \
+  [_MOVE_MAC]    = LAYOUT_66_ansi(
+     KC_ESC,     M_VD1,    M_VD2,    M_VD3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   IJ_UP,     IJ_DOWN,  KC_DEL,   KC_PGUP,
+     _______,    IJ_STEP,  IJ_INTO,  IJ_OUT,   IJ_RUN,   IJ_STOP,  IJ_OUT,   KC_PGUP,  KC_HOME,  KC_END,   KC_PGDN,  IJ_BACK,   IJ_FWD,   KC_INS,   KC_PGDN,
+     _______,    MM_LH,    MM_MAX,   MM_RH,    WD_FRWD,  MAC_POP,  KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  CM_RIGHT, CM_DOWN,   _______,
+     _______,    MM_UH,    MM_BH,    MAC_CPY,  MAC_PST,  WD_BACK,  KC_MNXT,  IJ_REN,   IJ_IMPL,  IJ_DECL,  IJ_USAG,  _______,   KC_BRIU,
      _______,    _______,  _______,  _______,  _______,  _______,  _______,  KC_HOME,  KC_BRID,  KC_END),
 
-  [_ADJUST]      = LAYOUT_66_ansi(\
-      KC_ESC,    KC_F1,    KC_F2,    KC_F3,    KC_F4,     KC_F5,   KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,    KC_F12,   KC_DEL,   KC_VOLU, \
-      _______,   NK_ON,    NK_OFF,   EE_CLR,   QK_BOOT,   KC_MSTP, KC_MPLY,  KC_PGUP,  KC_HOME,  KC_END,   KC_PGDN,  AG_SWAP,   AG_NORM,  KC_INS,   KC_VOLD, \
-      _______,   GE_SWAP,  GE_NORM,  DB_TOGG,  AG_SWAP,   AG_NORM, KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  _______,  _______,   _______, \
-      _______,   DF_1,     DF_2,     KC_CAPS,  _______,   KC_MPRV, KC_MNXT,  KC_MUTE,  KC_WBAK,  KC_WFWD,  _______,  _______,   KC_BRIU, \
+  [_ADJUST]      = LAYOUT_66_ansi(
+      KC_ESC,    KC_F1,    KC_F2,    KC_F3,    KC_F4,     KC_F5,   KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,    KC_F12,   KC_DEL,   KC_VOLU,
+      _______,   NK_ON,    NK_OFF,   EE_CLR,   QK_BOOT,   KC_MSTP, KC_MPLY,  KC_PGUP,  KC_HOME,  KC_END,   KC_PGDN,  AG_SWAP,   AG_NORM,  KC_INS,   KC_VOLD,
+      _______,   GE_SWAP,  GE_NORM,  DB_TOGG,  AG_SWAP,   AG_NORM, KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  _______,  _______,   _______,
+      _______,   DF_1,     DF_2,     KC_CAPS,  _______,   KC_MPRV, KC_MNXT,  KC_MUTE,  KC_WBAK,  KC_WFWD,  _______,  _______,   KC_BRIU,
       _______,   _______,  _______,  _______,  _______,   _______, _______,  KC_HOME,  KC_BRID,  KC_END)
 };
 
diff --git a/keyboards/clueboard/66/rev1/config.h b/keyboards/clueboard/66/rev1/config.h
deleted file mode 100644
index b8c5759db6..0000000000
--- a/keyboards/clueboard/66/rev1/config.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#include "config_common.h"
diff --git a/keyboards/clueboard/66/rev1/info.json b/keyboards/clueboard/66/rev1/info.json
index 24e995bcb4..ed7d39cf95 100644
--- a/keyboards/clueboard/66/rev1/info.json
+++ b/keyboards/clueboard/66/rev1/info.json
@@ -4,7 +4,6 @@
   "maintainer": "skullydazed",
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
-  "debounce": 5,
   "diode_direction": "COL2ROW",
   "features": {
     "audio": false,
diff --git a/keyboards/clueboard/66/rev2/config.h b/keyboards/clueboard/66/rev2/config.h
index e226d71ea0..88d5112c8c 100644
--- a/keyboards/clueboard/66/rev2/config.h
+++ b/keyboards/clueboard/66/rev2/config.h
@@ -1,11 +1,5 @@
 #pragma once
 
-#include "config_common.h"
-
-/* Backlight configuration
- */
-#define BACKLIGHT_LEVELS 1
-
 /* Underlight configuration
  */
 #define RGBLIGHT_EFFECT_BREATHE_CENTER 1
diff --git a/keyboards/clueboard/66/rev2/info.json b/keyboards/clueboard/66/rev2/info.json
index 6f94caf7e5..5945c2c833 100644
--- a/keyboards/clueboard/66/rev2/info.json
+++ b/keyboards/clueboard/66/rev2/info.json
@@ -4,7 +4,6 @@
   "maintainer": "skullydazed",
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
-  "debounce": 5,
   "diode_direction": "COL2ROW",
   "features": {
     "audio": false,
@@ -51,6 +50,10 @@
     "pid": "0x2320",
     "vid": "0xC1ED"
   },
+  "backlight": {
+    "driver": "custom",
+    "levels": 1
+  },
   "community_layouts": ["66_ansi", "66_iso"],
   "layout_aliases": {
     "LAYOUT": "LAYOUT_all"
diff --git a/keyboards/clueboard/66/rev2/rules.mk b/keyboards/clueboard/66/rev2/rules.mk
index d2e52d56b5..e69de29bb2 100644
--- a/keyboards/clueboard/66/rev2/rules.mk
+++ b/keyboards/clueboard/66/rev2/rules.mk
@@ -1,2 +0,0 @@
-# Build Options
-BACKLIGHT_DRIVER = custom
diff --git a/keyboards/clueboard/66/rev3/config.h b/keyboards/clueboard/66/rev3/config.h
index 6ba11f512a..eb584f096f 100644
--- a/keyboards/clueboard/66/rev3/config.h
+++ b/keyboards/clueboard/66/rev3/config.h
@@ -1,11 +1,5 @@
 #pragma once
 
-#include "config_common.h"
-
-/* Backlight configuration
- */
-#define BACKLIGHT_LEVELS 1
-
 #define RGBLIGHT_EFFECT_BREATHE_CENTER 1
 #define RGBLIGHT_EFFECT_BREATHE_MAX 200
 #define RGBLIGHT_EFFECT_CHRISTMAS_INTERVAL 666*2
diff --git a/keyboards/clueboard/66/rev3/info.json b/keyboards/clueboard/66/rev3/info.json
index a44e007225..4c0569622c 100644
--- a/keyboards/clueboard/66/rev3/info.json
+++ b/keyboards/clueboard/66/rev3/info.json
@@ -4,7 +4,6 @@
   "maintainer": "skullydazed",
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
-  "debounce": 5,
   "diode_direction": "COL2ROW",
   "features": {
     "audio": false,
@@ -51,6 +50,10 @@
     "pid": "0x2370",
     "vid": "0xC1ED"
   },
+  "backlight": {
+    "driver": "custom",
+    "levels": 1
+  },
   "community_layouts": ["66_ansi", "66_iso"],
   "layout_aliases": {
     "LAYOUT": "LAYOUT_all"
diff --git a/keyboards/clueboard/66/rev3/rules.mk b/keyboards/clueboard/66/rev3/rules.mk
index 924437d89b..e69de29bb2 100644
--- a/keyboards/clueboard/66/rev3/rules.mk
+++ b/keyboards/clueboard/66/rev3/rules.mk
@@ -1 +0,0 @@
-BACKLIGHT_DRIVER = custom
diff --git a/keyboards/clueboard/66/rev4/config.h b/keyboards/clueboard/66/rev4/config.h
index bc5a9bf336..53e2ed5b64 100644
--- a/keyboards/clueboard/66/rev4/config.h
+++ b/keyboards/clueboard/66/rev4/config.h
@@ -1,11 +1,5 @@
 #pragma once
 
-#include "config_common.h"
-
- /* Backlight configuration
- */
-#define BACKLIGHT_LEVELS 1
-
 /* Underlight configuration
  */
 #define RGBLIGHT_EFFECT_BREATHE_CENTER 1
diff --git a/keyboards/clueboard/66/rev4/info.json b/keyboards/clueboard/66/rev4/info.json
index 41f5757c52..2c19b85d0d 100644
--- a/keyboards/clueboard/66/rev4/info.json
+++ b/keyboards/clueboard/66/rev4/info.json
@@ -2,7 +2,6 @@
   "manufacturer": "Clueboard",
   "keyboard_name": "Clueboard 66% rev4",
   "maintainer": "skullydazed",
-  "debounce": 5,
   "processor": "STM32F303",
   "board": "QMK_PROTON_C",
   "bootloader": "stm32-dfu",
diff --git a/keyboards/clueboard/66_hotswap/config.h b/keyboards/clueboard/66_hotswap/config.h
index 4e3af45222..e6e27713c8 100644
--- a/keyboards/clueboard/66_hotswap/config.h
+++ b/keyboards/clueboard/66_hotswap/config.h
@@ -16,7 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #pragma once
-#include "config_common.h"
 
 /*
  * Feature disable options
diff --git a/keyboards/clueboard/66_hotswap/gen1/config.h b/keyboards/clueboard/66_hotswap/gen1/config.h
index 8fce4af364..b50b676713 100644
--- a/keyboards/clueboard/66_hotswap/gen1/config.h
+++ b/keyboards/clueboard/66_hotswap/gen1/config.h
@@ -16,36 +16,6 @@
  */
 
 #pragma once
-#include "config_common.h"
-
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-// #define DEBOUNCE 6
-
-/* 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
-
-/*
- * 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
 
 /*
  * Feature disable options
@@ -63,10 +33,6 @@
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
- /* Backlight configuration
- */
-#define BACKLIGHT_LEVELS 10
-
 // This is a 7-bit address, that gets left-shifted and bit 0
 // set to 0 for write, 1 for read (as per I2C protocol)
 // The address will vary depending on your wiring:
diff --git a/keyboards/clueboard/66_hotswap/gen1/info.json b/keyboards/clueboard/66_hotswap/gen1/info.json
index 2b42bf22e8..afa4f8adb5 100644
--- a/keyboards/clueboard/66_hotswap/gen1/info.json
+++ b/keyboards/clueboard/66_hotswap/gen1/info.json
@@ -2,7 +2,6 @@
   "manufacturer": "Clueboard",
   "keyboard_name": "Clueboard 66% HotSwap Gen1",
   "maintainer": "skullydazed",
-  "debounce": 5,
   "processor": "STM32F303",
   "board": "QMK_PROTON_C",
   "bootloader": "stm32-dfu",
diff --git a/keyboards/clueboard/66_hotswap/prototype/config.h b/keyboards/clueboard/66_hotswap/prototype/config.h
index a1ab703c34..651037af12 100644
--- a/keyboards/clueboard/66_hotswap/prototype/config.h
+++ b/keyboards/clueboard/66_hotswap/prototype/config.h
@@ -1,5 +1,4 @@
 #pragma once
-#include "config_common.h"
 
 /* Speaker configuration
  */
@@ -11,10 +10,6 @@
  */
 #define NO_ACTION_TAPPING
 
-/* Backlight configuration
- */
-#define BACKLIGHT_LEVELS 1
-
 /* Underlight configuration
  */
 #define RGBLIGHT_EFFECT_BREATHE_CENTER 1
diff --git a/keyboards/clueboard/66_hotswap/prototype/info.json b/keyboards/clueboard/66_hotswap/prototype/info.json
index d29a4e7169..522eda3fba 100644
--- a/keyboards/clueboard/66_hotswap/prototype/info.json
+++ b/keyboards/clueboard/66_hotswap/prototype/info.json
@@ -2,7 +2,6 @@
   "manufacturer": "Clueboard",
   "keyboard_name": "Clueboard 66% HotSwap Prototype",
   "maintainer": "skullydazed",
-  "debounce": 5,
   "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
@@ -51,6 +50,10 @@
     "pid": "0x2390",
     "vid": "0xC1ED"
   },
+  "backlight": {
+    "driver": "custom",
+    "levels": 1
+  },
   "community_layouts": ["66_ansi"],
   "layout_aliases": {
     "LAYOUT": "LAYOUT_all"
diff --git a/keyboards/clueboard/66_hotswap/prototype/rules.mk b/keyboards/clueboard/66_hotswap/prototype/rules.mk
index 8193682fd3..4da205a168 100644
--- a/keyboards/clueboard/66_hotswap/prototype/rules.mk
+++ b/keyboards/clueboard/66_hotswap/prototype/rules.mk
@@ -1,3 +1 @@
-BACKLIGHT_DRIVER = custom
-
 LTO_ENABLE = yes
diff --git a/keyboards/clueboard/california/california.c b/keyboards/clueboard/california/california.c
deleted file mode 100644
index 342184a1ae..0000000000
--- a/keyboards/clueboard/california/california.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "california.h"
diff --git a/keyboards/clueboard/california/california.h b/keyboards/clueboard/california/california.h
deleted file mode 100644
index ef5b3f3e04..0000000000
--- a/keyboards/clueboard/california/california.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/clueboard/california/config.h b/keyboards/clueboard/california/config.h
index 017f1ddf66..1870e4cad8 100644
--- a/keyboards/clueboard/california/config.h
+++ b/keyboards/clueboard/california/config.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "config_common.h"
 
 #define AUDIO_PIN A5
 #define AUDIO_PIN_ALT A4
diff --git a/keyboards/clueboard/card/config.h b/keyboards/clueboard/card/config.h
index a115f5d6cf..6bf5d24045 100644
--- a/keyboards/clueboard/card/config.h
+++ b/keyboards/clueboard/card/config.h
@@ -17,10 +17,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "config_common.h"
-
-/* number of backlight levels */
-#define BACKLIGHT_LEVELS 6
-
 // Enable audio
 #define AUDIO_PIN C6
diff --git a/keyboards/clueboard/card/info.json b/keyboards/clueboard/card/info.json
index 739d253971..4564768c19 100644
--- a/keyboards/clueboard/card/info.json
+++ b/keyboards/clueboard/card/info.json
@@ -37,6 +37,10 @@
     "pid": "0x2330",
     "vid": "0xC1ED"
   },
+  "backlight": {
+    "driver": "custom",
+    "levels": 6
+  },
   "layout_aliases": {
     "LAYOUT": "LAYOUT_all"
   },
diff --git a/keyboards/clueboard/card/rules.mk b/keyboards/clueboard/card/rules.mk
index d2e52d56b5..e69de29bb2 100644
--- a/keyboards/clueboard/card/rules.mk
+++ b/keyboards/clueboard/card/rules.mk
@@ -1,2 +0,0 @@
-# Build Options
-BACKLIGHT_DRIVER = custom