9 files changed, 22 insertions, 76 deletions
diff --git a/keyboards/0xcb/1337/config.h b/keyboards/0xcb/1337/config.h
index 6ee93887f7..10f946592f 100644
--- a/keyboards/0xcb/1337/config.h
+++ b/keyboards/0xcb/1337/config.h
@@ -16,19 +16,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-#include "config_common.h"
 // clang-format off
 
-/* key matrix size */
-#define MATRIX_ROWS 3
-#define MATRIX_COLS 3
-
-/* Keyboard Matrix Assignments */
-#define DIRECT_PINS { \
-    { D2, D4, F4 }, \
-    { D7, B1, B3 }, \
-    { E6, B4, B2 } \
-}
 #define TAP_CODE_DELAY 10
 #define ENCODER_RESOLUTION 4
 #define ENCODERS_PAD_A { F6 }
@@ -65,9 +54,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #endif
 // clang-format on
 
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 5
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/0xcb/1337/info.json b/keyboards/0xcb/1337/info.json
index cd5993ee0d..ca04777536 100644
--- a/keyboards/0xcb/1337/info.json
+++ b/keyboards/0xcb/1337/info.json
@@ -8,6 +8,15 @@
     "pid": "0x1337",
     "device_version": "0.0.1"
   },
+  "processor": "atmega32u4",
+  "bootloader": "qmk-dfu",
+  "matrix_pins": {
+    "direct": [
+      ["D2", "D4", "F4"],
+      ["D7", "B1", "B3"],
+      ["E6", "B4", "B2"]
+    ]
+  },
   "layouts": {
     "LAYOUT": {
       "layout": [
diff --git a/keyboards/0xcb/1337/rules.mk b/keyboards/0xcb/1337/rules.mk
index 267c4d09ae..77dd67f53f 100644
--- a/keyboards/0xcb/1337/rules.mk
+++ b/keyboards/0xcb/1337/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = qmk-dfu
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/0xcb/static/config.h b/keyboards/0xcb/static/config.h
index 784baadc2c..0f517163e5 100644
--- a/keyboards/0xcb/static/config.h
+++ b/keyboards/0xcb/static/config.h
@@ -16,14 +16,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-#include "config_common.h"
 // clang-format off
 
-/* key matrix size */
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 6
-
-
 /*
  * Keyboard Matrix Assignments
  *
@@ -45,8 +39,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ENCODERS_PAD_A { D0 }
 #define ENCODERS_PAD_B { D1 }
 // clang-format on
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 5
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
@@ -56,7 +48,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* oled custom font */
 #define OLED_FONT_END 255
 #define OLED_FONT_H "gfxfont.c"
-
-/* bootmagic */
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/0xcb/static/info.json b/keyboards/0xcb/static/info.json
index 4a6232abad..b6e5f01b27 100644
--- a/keyboards/0xcb/static/info.json
+++ b/keyboards/0xcb/static/info.json
@@ -8,6 +8,8 @@
     "pid": "0xA455",
     "device_version": "0.0.1"
   },
+  "processor": "atmega328p",
+  "bootloader": "usbasploader",
   "layout_aliases": {
     "LAYOUT": "LAYOUT_all"
   },
diff --git a/keyboards/0xcb/static/rules.mk b/keyboards/0xcb/static/rules.mk
index a06dda50ba..24ff2f2cfd 100644
--- a/keyboards/0xcb/static/rules.mk
+++ b/keyboards/0xcb/static/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega328p
-
-# Bootloader selection
-BOOTLOADER = usbasploader
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/0xcb/tutelpad/config.h b/keyboards/0xcb/tutelpad/config.h
index a19fa7e83f..cdb29e6bd1 100644
--- a/keyboards/0xcb/tutelpad/config.h
+++ b/keyboards/0xcb/tutelpad/config.h
@@ -16,28 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "config_common.h"
-
-/* key matrix size */
-#define MATRIX_ROWS 2
-#define MATRIX_COLS 4
-
-/*
- * 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)
- *
- */
-/* Keyboard Matrix Assignments */
-#define DIRECT_PINS { \
-    { E6, D7, B1, B3 }, \
-    { B5, B4, B2, B6 } \
-}
-
 #define RGB_DI_PIN D3                   // LED data pin on controller
 #define RGBLED_NUM 4                    // Number of LEDs connected
 
@@ -62,12 +40,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define OLED_BRIGHTNESS 128
 #define OLED_DISPLAY_128X64
 
-
-/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
- * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
- */
-//#define GRAVE_ESC_CTRL_OVERRIDE
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
@@ -83,7 +55,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-
-/* Bootmagic Lite key configuration */
-#define BOOTMAGIC_LITE_ROW 1
-#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/0xcb/tutelpad/info.json b/keyboards/0xcb/tutelpad/info.json
index 00261daad3..0d9585dbb5 100644
--- a/keyboards/0xcb/tutelpad/info.json
+++ b/keyboards/0xcb/tutelpad/info.json
@@ -8,6 +8,17 @@
         "pid": "0xF09F",
         "device_version": "0.0.1"
     },
+    "bootmagic": {
+        "matrix": [1, 0]
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "matrix_pins": {
+        "direct": [
+            ["E6", "D7", "B1", "B3"],
+            ["B5", "B4", "B2", "B6"]
+        ]
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/0xcb/tutelpad/rules.mk b/keyboards/0xcb/tutelpad/rules.mk
index e022c905cd..9cc3b02a22 100644
--- a/keyboards/0xcb/tutelpad/rules.mk
+++ b/keyboards/0xcb/tutelpad/rules.mk
@@ -1,9 +1,3 @@
-## MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
 # Build Options
 #   change yes to no to disable
 #