683 files changed, 1764 insertions, 4315 deletions
diff --git a/keyboards/abacus/config.h b/keyboards/abacus/config.h
index 2e28b792a1..e579dea057 100644
--- a/keyboards/abacus/config.h
+++ b/keyboards/abacus/config.h
@@ -17,24 +17,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/*
- * 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 { D3, D2, D4, C6 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, D7, B3, E6, B2, B4, B6, B5}
 #define DIP_SWITCH_PINS { D0 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
 #define RGB_DI_PIN D1
 #ifdef RGB_DI_PIN
diff --git a/keyboards/abacus/info.json b/keyboards/abacus/info.json
index d14c59f8a2..b2fd151cec 100644
--- a/keyboards/abacus/info.json
+++ b/keyboards/abacus/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0000",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "D7", "B3", "E6", "B2", "B4", "B6", "B5"],
+        "rows": ["D3", "D2", "D4", "C6"]
+    },
+    "diode_direction": "COL2ROW",
    "encoder": {
        "rotary": [
            {"pin_a": "F1", "pin_b": "F0"}
diff --git a/keyboards/abstract/ellipse/rev1/config.h b/keyboards/abstract/ellipse/rev1/config.h
index f7932863e9..d3feabbe20 100644
--- a/keyboards/abstract/ellipse/rev1/config.h
+++ b/keyboards/abstract/ellipse/rev1/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/*
- * 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 { D3, C7 }
-#define MATRIX_COL_PINS { F0, B6, B5 }
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 #define RGB_DI_PIN E6
 #ifdef RGB_DI_PIN
   #define RGBLED_NUM 3
diff --git a/keyboards/abstract/ellipse/rev1/info.json b/keyboards/abstract/ellipse/rev1/info.json
index 230e286c5d..693faa86b5 100644
--- a/keyboards/abstract/ellipse/rev1/info.json
+++ b/keyboards/abstract/ellipse/rev1/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0001",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F0", "B6", "B5"],
+        "rows": ["D3", "C7"]
+    },
+    "diode_direction": "COL2ROW",
    "encoder": {
        "rotary": [
            {"pin_a": "B2", "pin_b": "B1", "resolution": 2},
diff --git a/keyboards/acekeyboard/titan60/config.h b/keyboards/acekeyboard/titan60/config.h
index 07378f5e3d..3a01bebf93 100644
--- a/keyboards/acekeyboard/titan60/config.h
+++ b/keyboards/acekeyboard/titan60/config.h
@@ -17,26 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/*
- * 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)
- *
- */
-//                         0   1   2   3   4   5   6   7   8   9   A   B   C   D
-#define MATRIX_ROW_PINS { B1, B2, B3, F0, F1 }
-#define MATRIX_COL_PINS { F4, F7, F5, F6, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3}
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 #define RGB_DI_PIN D0
 #ifdef RGB_DI_PIN
 #    define RGBLED_NUM 6
diff --git a/keyboards/acekeyboard/titan60/info.json b/keyboards/acekeyboard/titan60/info.json
index 00629035c0..00399db841 100644
--- a/keyboards/acekeyboard/titan60/info.json
+++ b/keyboards/acekeyboard/titan60/info.json
@@ -8,6 +8,11 @@
        "pid": "0x5449",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+      "cols": ["F4", "F7", "F5", "F6", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3"],
+      "rows": ["B1", "B2", "B3", "F0", "F1"]
+    },
+    "diode_direction": "COL2ROW",
    "backlight": {
      "pin": "B7",
      "breathing": true
diff --git a/keyboards/acheron/apollo/87h/delta/config.h b/keyboards/acheron/apollo/87h/delta/config.h
index 490c13c2e9..377801604d 100644
--- a/keyboards/acheron/apollo/87h/delta/config.h
+++ b/keyboards/acheron/apollo/87h/delta/config.h
@@ -17,12 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-//                        C0 , C1 , C2 , C3 , C4 , C5 , C6 , C7 , C8 , C9 , C10, C11, C12, C13, C14, C15, C16 } 
-#define MATRIX_COL_PINS { C8 , C9 , A8 , A10, C7 , C6 , B14, B12, B10, B1 , C5 , C4 , A7 , B0 , C11, A3 , B4  }
-//                        R0 , R1 , R2 , R3 , R4 , R5 
-#define MATRIX_ROW_PINS { B3 , D2 , C12, A6 , A5 , A4 }
-#define DIODE_DIRECTION COL2ROW
 /* 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/acheron/apollo/87h/delta/info.json b/keyboards/acheron/apollo/87h/delta/info.json
index 4e14f51df0..0ad176f451 100644
--- a/keyboards/acheron/apollo/87h/delta/info.json
+++ b/keyboards/acheron/apollo/87h/delta/info.json
@@ -4,6 +4,11 @@
        "pid": "0x8775",
        "device_version": "0.0.4"
    },
+    "matrix_pins": {
+        "cols": ["C8", "C9", "A8", "A10", "C7", "C6", "B14", "B12", "B10", "B1", "C5", "C4", "A7", "B0", "C11", "A3", "B4"],
+        "rows": ["B3", "D2", "C12", "A6", "A5", "A4"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "STM32F401",
    "bootloader": "stm32-dfu"
 }
diff --git a/keyboards/acheron/apollo/87h/gamma/config.h b/keyboards/acheron/apollo/87h/gamma/config.h
index 07da517e24..6209fa21f7 100644
--- a/keyboards/acheron/apollo/87h/gamma/config.h
+++ b/keyboards/acheron/apollo/87h/gamma/config.h
@@ -17,12 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-//                        C0 , C1 , C2 , C3 , C4 , C5 , C6 , C7 , C8 , C9 , C10, C11, C12, C13, C14, C15 }
-#define MATRIX_COL_PINS { B3 , A15, A10, A8 , B14, B12, B10, B1 , B0 , A7 , A4 , A5 , A6 , C15, A0 , A1  }
-//                        R0 , R1 , R2 , R3 , R4 , R5
-#define MATRIX_ROW_PINS { C14, C13, B9 , B4 , A3 , A2 }
-#define DIODE_DIRECTION COL2ROW
 /* 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/acheron/apollo/87h/gamma/info.json b/keyboards/acheron/apollo/87h/gamma/info.json
index 4a93afd70c..424f64405d 100644
--- a/keyboards/acheron/apollo/87h/gamma/info.json
+++ b/keyboards/acheron/apollo/87h/gamma/info.json
@@ -4,6 +4,11 @@
        "pid": "0x8774",
        "device_version": "0.0.3"
    },
+    "matrix_pins": {
+        "cols": ["B3", "A15", "A10", "A8", "B14", "B12", "B10", "B1", "B0", "A7", "A4", "A5", "A6", "C15", "A0", "A1"],
+        "rows": ["C14", "C13", "B9", "B4", "A3", "A2"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "STM32F411",
    "bootloader": "stm32-dfu"
 }
diff --git a/keyboards/acheron/apollo/87htsc/config.h b/keyboards/acheron/apollo/87htsc/config.h
index 8b61b285fd..7447e1dd29 100644
--- a/keyboards/acheron/apollo/87htsc/config.h
+++ b/keyboards/acheron/apollo/87htsc/config.h
@@ -17,12 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-//                        C0 , C1 , C2 , C3 , C4 , C5 , C6 , C7 , C8 , C9 , C10, C11, C12, C13, C14, C15, C16 } 
-#define MATRIX_COL_PINS { C8 , C9 , A8 , A10, C7 , C6 , B14, B12, B10, B1 , C5 , C4 , A7 , B0 , C11, A3 , B4  }
-//                        R0 , R1 , R2 , R3 , R4 , R5 
-#define MATRIX_ROW_PINS { B3 , D2 , C12, A6 , A5 , A4 }
-#define DIODE_DIRECTION COL2ROW
 /* 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/acheron/apollo/87htsc/info.json b/keyboards/acheron/apollo/87htsc/info.json
index 68fc1b018a..36897ff86e 100644
--- a/keyboards/acheron/apollo/87htsc/info.json
+++ b/keyboards/acheron/apollo/87htsc/info.json
@@ -8,6 +8,11 @@
        "pid": "0x8776",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["C8", "C9", "A8", "A10", "C7", "C6", "B14", "B12", "B10", "B1", "C5", "C4", "A7", "B0", "C11", "A3", "B4"],
+        "rows": ["B3", "D2", "C12", "A6", "A5", "A4"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "STM32F401",
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/acheron/apollo/88htsc/config.h b/keyboards/acheron/apollo/88htsc/config.h
index 490c13c2e9..377801604d 100644
--- a/keyboards/acheron/apollo/88htsc/config.h
+++ b/keyboards/acheron/apollo/88htsc/config.h
@@ -17,12 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-//                        C0 , C1 , C2 , C3 , C4 , C5 , C6 , C7 , C8 , C9 , C10, C11, C12, C13, C14, C15, C16 } 
-#define MATRIX_COL_PINS { C8 , C9 , A8 , A10, C7 , C6 , B14, B12, B10, B1 , C5 , C4 , A7 , B0 , C11, A3 , B4  }
-//                        R0 , R1 , R2 , R3 , R4 , R5 
-#define MATRIX_ROW_PINS { B3 , D2 , C12, A6 , A5 , A4 }
-#define DIODE_DIRECTION COL2ROW
 /* 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/acheron/apollo/88htsc/info.json b/keyboards/acheron/apollo/88htsc/info.json
index 92dd801826..3a7e0f7e5a 100644
--- a/keyboards/acheron/apollo/88htsc/info.json
+++ b/keyboards/acheron/apollo/88htsc/info.json
@@ -8,6 +8,11 @@
        "pid": "0x8873",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["C8", "C9", "A8", "A10", "C7", "C6", "B14", "B12", "B10", "B1", "C5", "C4", "A7", "B0", "C11", "A3", "B4"],
+        "rows": ["B3", "D2", "C12", "A6", "A5", "A4"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "STM32F401",
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/acheron/arctic/config.h b/keyboards/acheron/arctic/config.h
index 0187e823fc..f608132b5a 100644
--- a/keyboards/acheron/arctic/config.h
+++ b/keyboards/acheron/arctic/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-#define MATRIX_COL_PINS { B0, A5, A4, A3, A2, A1, A0, F1, F0, C15, C14, C13, B9, B8}
-#define MATRIX_ROW_PINS { B7, B6, A6, A7, B1}
-#define DIODE_DIRECTION COL2ROW
 /* 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/acheron/arctic/info.json b/keyboards/acheron/arctic/info.json
index 42a7bb7b42..f51a4c383e 100644
--- a/keyboards/acheron/arctic/info.json
+++ b/keyboards/acheron/arctic/info.json
@@ -8,6 +8,11 @@
        "pid": "0x4152",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["B0", "A5", "A4", "A3", "A2", "A1", "A0", "F1", "F0", "C15", "C14", "C13", "B9", "B8"],
+        "rows": ["B7", "B6", "A6", "A7", "B1"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "STM32F072",
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/acheron/athena/alpha/config.h b/keyboards/acheron/athena/alpha/config.h
index e99fb83328..fba5b051cc 100644
--- a/keyboards/acheron/athena/alpha/config.h
+++ b/keyboards/acheron/athena/alpha/config.h
@@ -17,12 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-#define MATRIX_COL_PINS { A8 , B14, B12, B10, B1 , B0 , A5 , A4 , A3 , A2 , A1 , A0 , C15, A7 , B4 , B3 , A15 }
-#define MATRIX_ROW_PINS { B9 , C13, B8 , B5 , A14 , C14 }
-#define DIODE_DIRECTION COL2ROW
 #define LOCKING_SUPPORT_ENABLE
 #define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/acheron/athena/alpha/info.json b/keyboards/acheron/athena/alpha/info.json
index 2ebf2da8de..a59bf20ff9 100644
--- a/keyboards/acheron/athena/alpha/info.json
+++ b/keyboards/acheron/athena/alpha/info.json
@@ -4,6 +4,11 @@
        "pid": "0x6584",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["A8", "B14", "B12", "B10", "B1", "B0", "A5", "A4", "A3", "A2", "A1", "A0", "C15", "A7", "B4", "B3", "A15"],
+        "rows": ["B9", "C13", "B8", "B5", "A14", "C14"]
+    },
+    "diode_direction": "COL2ROW",
    "backlight": {
        "pin": "A6",
        "levels": 20,
diff --git a/keyboards/acheron/athena/beta/config.h b/keyboards/acheron/athena/beta/config.h
index 7fbc624522..dc5f354876 100644
--- a/keyboards/acheron/athena/beta/config.h
+++ b/keyboards/acheron/athena/beta/config.h
@@ -17,12 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-#define MATRIX_COL_PINS { C7 , C6 , B14, B12, B10, B1 , C4 , A7 , A6 , A5 , A4 , A3 , A2 , C5 , A10, A8 , C9 }
-#define MATRIX_ROW_PINS { C11, C12, C10, A15, C0 , A1 }
-#define DIODE_DIRECTION COL2ROW
 #define LOCKING_SUPPORT_ENABLE
 #define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/acheron/athena/beta/info.json b/keyboards/acheron/athena/beta/info.json
index dd8e766f90..a303c5a25c 100644
--- a/keyboards/acheron/athena/beta/info.json
+++ b/keyboards/acheron/athena/beta/info.json
@@ -4,6 +4,11 @@
        "pid": "0x6585",
        "device_version": "0.0.2"
    },
+    "matrix_pins": {
+        "cols": ["C7", "C6", "B14", "B12", "B10", "B1", "C4", "A7", "A6", "A5", "A4", "A3", "A2", "C5", "A10", "A8", "C9"],
+        "rows": ["C11", "C12", "C10", "A15", "C0", "A1"]
+    },
+    "diode_direction": "COL2ROW",
    "backlight": {
        "pin": "B0",
        "levels": 20,
diff --git a/keyboards/acheron/austin/config.h b/keyboards/acheron/austin/config.h
index ce12edfd33..a47b76953a 100644
--- a/keyboards/acheron/austin/config.h
+++ b/keyboards/acheron/austin/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-#define MATRIX_COL_PINS { B10, B11, B12, B13, B14, B15, A8, A9, A10, A5, A15, B3, B4, B5, B8, A3, C15, C14, F1 }
-#define MATRIX_ROW_PINS { C13, A4, A7, B0, B1, B2 }
-#define DIODE_DIRECTION COL2ROW
 #define BACKLIGHT_PWM_DRIVER    PWMD3
 #define BACKLIGHT_PWM_CHANNEL   1
 #define BACKLIGHT_PAL_MODE      1
diff --git a/keyboards/acheron/austin/info.json b/keyboards/acheron/austin/info.json
index dad488df8f..0cc16067e5 100755
--- a/keyboards/acheron/austin/info.json
+++ b/keyboards/acheron/austin/info.json
@@ -8,6 +8,11 @@
        "pid": "0x4175",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["B10", "B11", "B12", "B13", "B14", "B15", "A8", "A9", "A10", "A5", "A15", "B3", "B4", "B5", "B8", "A3", "C15", "C14", "F1"],
+        "rows": ["C13", "A4", "A7", "B0", "B1", "B2"]
+    },
+    "diode_direction": "COL2ROW",
    "backlight": {
        "pin": "A6",
        "levels": 6,
diff --git a/keyboards/acheron/elongate/beta/config.h b/keyboards/acheron/elongate/beta/config.h
index a3b19e7fe6..30b0b74c95 100644
--- a/keyboards/acheron/elongate/beta/config.h
+++ b/keyboards/acheron/elongate/beta/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/*
- * 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 { D3, B7, D5, B5, D6 }
-#define MATRIX_COL_PINS { F5, F6, F4, F1, F0, B2, B1, C6, B0, B3, E6, D4, B4}
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
 #define RGB_DI_PIN D7
 #ifdef RGB_DI_PIN
  #define RGBLED_NUM 16
diff --git a/keyboards/acheron/elongate/beta/info.json b/keyboards/acheron/elongate/beta/info.json
index 1f625bca83..e373bb6654 100644
--- a/keyboards/acheron/elongate/beta/info.json
+++ b/keyboards/acheron/elongate/beta/info.json
@@ -8,6 +8,11 @@
        "pid": "0x454C",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F5", "F6", "F4", "F1", "F0", "B2", "B1", "C6", "B0", "B3", "E6", "D4", "B4"],
+        "rows": ["D3", "B7", "D5", "B5", "D6"]
+    },
+    "diode_direction": "COL2ROW",
    "indicators": {
        "caps_lock": "D1",
        "num_lock": "D2",
diff --git a/keyboards/acheron/elongate/delta/config.h b/keyboards/acheron/elongate/delta/config.h
index 0ceba36100..60362ab065 100755
--- a/keyboards/acheron/elongate/delta/config.h
+++ b/keyboards/acheron/elongate/delta/config.h
@@ -17,12 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-#define MATRIX_COL_PINS { A10, A9, A8, B14, B12, B11, B10, B2, B1, A7, A5, B9, B8, B7, B6 }
-#define MATRIX_ROW_PINS { B3, A15, B0, B4, B5 }
-#define DIODE_DIRECTION COL2ROW
 #define BACKLIGHT_PWM_DRIVER PWMD3
 #define BACKLIGHT_PWM_CHANNEL 1
 #define BACKLIGHT_PAL_MODE 1
diff --git a/keyboards/acheron/elongate/delta/info.json b/keyboards/acheron/elongate/delta/info.json
index f5f87333eb..5341ab654e 100644
--- a/keyboards/acheron/elongate/delta/info.json
+++ b/keyboards/acheron/elongate/delta/info.json
@@ -8,6 +8,11 @@
        "pid": "0x454D",
        "device_version": "0.0.2"
    },
+    "matrix_pins": {
+        "cols": ["A10", "A9", "A8", "B14", "B12", "B11", "B10", "B2", "B1", "A7", "A5", "B9", "B8", "B7", "B6"],
+        "rows": ["B3", "A15", "B0", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
    "backlight": {
        "pin": "A6",
        "levels": 20,
diff --git a/keyboards/acheron/keebspcb/config.h b/keyboards/acheron/keebspcb/config.h
index 1a8eab8b80..4b007cf387 100644
--- a/keyboards/acheron/keebspcb/config.h
+++ b/keyboards/acheron/keebspcb/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-#define MATRIX_COL_PINS { B12, A1, A0, F1, F0, C15, C14, C13, B9, B8, B7, B6, B5}
-#define MATRIX_ROW_PINS { B4, B3, A2, A3, A4}
-#define DIODE_DIRECTION COL2ROW
 /* 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/acheron/keebspcb/info.json b/keyboards/acheron/keebspcb/info.json
index 9c96a01191..5c53bc70e2 100644
--- a/keyboards/acheron/keebspcb/info.json
+++ b/keyboards/acheron/keebspcb/info.json
@@ -8,6 +8,11 @@
        "pid": "0x4B45",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["B12", "A1", "A0", "F1", "F0", "C15", "C14", "C13", "B9", "B8", "B7", "B6", "B5"],
+        "rows": ["B4", "B3", "A2", "A3", "A4"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "STM32F072",
    "bootloader": "stm32-dfu",
    "community_layouts": ["60_ansi_tsangan"],
diff --git a/keyboards/acheron/lasgweloth/config.h b/keyboards/acheron/lasgweloth/config.h
index e41924d0c6..f608132b5a 100644
--- a/keyboards/acheron/lasgweloth/config.h
+++ b/keyboards/acheron/lasgweloth/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-#define MATRIX_COL_PINS { B12, A2 , A1 , A0 , F1 , F0 , C15, C14, C13, A7 , A6 , A5 , A4 , B7}
-#define MATRIX_ROW_PINS { B9 , B8 , A3 , B0 , B1 }
-#define DIODE_DIRECTION COL2ROW
 /* 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/acheron/lasgweloth/info.json b/keyboards/acheron/lasgweloth/info.json
index b97521e48e..47d4b55105 100644
--- a/keyboards/acheron/lasgweloth/info.json
+++ b/keyboards/acheron/lasgweloth/info.json
@@ -8,6 +8,11 @@
        "pid": "0x7641",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["B12", "A2", "A1", "A0", "F1", "F0", "C15", "C14", "C13", "A7", "A6", "A5", "A4", "B7"],
+        "rows": ["B9", "B8", "A3", "B0", "B1"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "STM32F072",
    "bootloader": "stm32-dfu",
    "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift"],
diff --git a/keyboards/acheron/shark/alpha/config.h b/keyboards/acheron/shark/alpha/config.h
index 9c36ac3a1f..91f51146f0 100644
--- a/keyboards/acheron/shark/alpha/config.h
+++ b/keyboards/acheron/shark/alpha/config.h
@@ -17,28 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/*
- * 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 {B4, A15, B10, B2}
-#define MATRIX_COL_PINS {B1, B12, A1, A7, A5, A4, A3, A2, A0, C15, C14, C13}
-//{C13, C14, C15, A0,A2,A3,A4,A5,A6, A1,B12,B1}
-/* Unused pins, in the default layout, are:
-EncA (B6) because it is not used in the default PCB
-All Extra pins (A8, B15, B14, B13, B3, B5, B8, B9) , for the same reason;
-B0, which is unconnected on the PCB
-*/
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
 #define BACKLIGHT_PWM_DRIVER PWMD3
 #define BACKLIGHT_PWM_CHANNEL 3
diff --git a/keyboards/acheron/shark/alpha/info.json b/keyboards/acheron/shark/alpha/info.json
index d6b5dfcd0f..07c6550cb8 100644
--- a/keyboards/acheron/shark/alpha/info.json
+++ b/keyboards/acheron/shark/alpha/info.json
@@ -6,6 +6,11 @@
    "pid": "0x5368",
    "device_version": "0.0.1"
  },
+  "matrix_pins": {
+    "cols": ["B1", "B12", "A1", "A7", "A5", "A4", "A3", "A2", "A0", "C15", "C14", "C13"],
+    "rows": ["B4", "A15", "B10", "B2"]
+  },
+  "diode_direction": "COL2ROW",
  "encoder": {
    "rotary": [
      {"pin_a": "B6", "pin_b": "B7"}
diff --git a/keyboards/acheron/shark/beta/config.h b/keyboards/acheron/shark/beta/config.h
index 8cfc57b9d5..9a08dd1234 100644
--- a/keyboards/acheron/shark/beta/config.h
+++ b/keyboards/acheron/shark/beta/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-#define MATRIX_COL_PINS { A5 , A10, C13, B9 , B8 , B5 , B4 , B3 , A15, A0 , A1 , A2 }
-#define MATRIX_ROW_PINS { A8 , B14, A4 , A3 }
-#define DIODE_DIRECTION COL2ROW
 #define LOCKING_SUPPORT_ENABLE
 #define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/acheron/shark/beta/info.json b/keyboards/acheron/shark/beta/info.json
index 73025df6c4..313e877c8e 100644
--- a/keyboards/acheron/shark/beta/info.json
+++ b/keyboards/acheron/shark/beta/info.json
@@ -4,6 +4,11 @@
        "pid": "0x5369",
        "device_version": "0.0.2"
    },
+    "matrix_pins": {
+        "cols": ["A5", "A10", "C13", "B9", "B8", "B5", "B4", "B3", "A15", "A0", "A1", "A2"],
+        "rows": ["A8", "B14", "A4", "A3"]
+    },
+    "diode_direction": "COL2ROW",
    "encoder": {
        "rotary": [
            {"pin_a": "C15", "pin_b": "C14"}
diff --git a/keyboards/ada/ada1800mini/config.h b/keyboards/ada/ada1800mini/config.h
index 54da0bdad4..378ffa80b4 100644
--- a/keyboards/ada/ada1800mini/config.h
+++ b/keyboards/ada/ada1800mini/config.h
@@ -16,23 +16,6 @@
 #pragma once
-/*
- * 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 { D0, D1, D2, D3, D5 }
-#define MATRIX_COL_PINS { F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, B3, B2, B1 }
-#define DIODE_DIRECTION COL2ROW
 //TODO: implement RGB matrix when I get the hardware
 #define RGB_DI_PIN F0
 #ifdef RGB_DI_PIN
diff --git a/keyboards/ada/ada1800mini/info.json b/keyboards/ada/ada1800mini/info.json
index e3f97c6706..fdc7df02df 100644
--- a/keyboards/ada/ada1800mini/info.json
+++ b/keyboards/ada/ada1800mini/info.json
@@ -8,6 +8,11 @@
        "pid": "0x1800",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "B3", "B2", "B1"],
+        "rows": ["D0", "D1", "D2", "D3", "D5"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/ada/infinity81/config.h b/keyboards/ada/infinity81/config.h
index d8fc5bf226..0d64933ad9 100644
--- a/keyboards/ada/infinity81/config.h
+++ b/keyboards/ada/infinity81/config.h
@@ -3,23 +3,6 @@
 #pragma once
-/*
- * 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 { B3, B2, B1, B0, F6, B7 }
-#define MATRIX_COL_PINS { D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, F5, F1, F4 }
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 #define RGB_DI_PIN D0
 #ifdef RGB_DI_PIN
 #    define RGBLED_NUM 107
diff --git a/keyboards/ada/infinity81/info.json b/keyboards/ada/infinity81/info.json
index 5c32cd0639..6f4a6ac996 100644
--- a/keyboards/ada/infinity81/info.json
+++ b/keyboards/ada/infinity81/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0081",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F5", "F1", "F4"],
+        "rows": ["B3", "B2", "B1", "B0", "F6", "B7"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/adelheid/config.h b/keyboards/adelheid/config.h
index e22e250f85..db23a53119 100644
--- a/keyboards/adelheid/config.h
+++ b/keyboards/adelheid/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/*
- * 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 { D0, F4, D1, D2, D3, D5, F7 }
-#define MATRIX_COL_PINS { F0, F1, E6, C7, F6, B6, D4, B1, B0, B7, B5, B4, D7, D6, B3 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
 /* 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/adelheid/info.json b/keyboards/adelheid/info.json
index 19970b27cf..c323d62a75 100644
--- a/keyboards/adelheid/info.json
+++ b/keyboards/adelheid/info.json
@@ -8,6 +8,11 @@
        "pid": "0xAD78",
        "device_version": "0.0.2"
    },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "E6", "C7", "F6", "B6", "D4", "B1", "B0", "B7", "B5", "B4", "D7", "D6", "B3"],
+        "rows": ["D0", "F4", "D1", "D2", "D3", "D5", "F7"]
+    },
+    "diode_direction": "COL2ROW",
    "backlight": {
        "pin": "C6"
    },
diff --git a/keyboards/adkb96/info.json b/keyboards/adkb96/info.json
index e86480d7d7..1a9a95cec3 100644
--- a/keyboards/adkb96/info.json
+++ b/keyboards/adkb96/info.json
@@ -8,6 +8,11 @@
                "pid": "0xAD96",
                "device_version": "0.0.1"
        },
+        "matrix_pins": {
+                "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
+                "rows": ["D4", "C6", "D7", "E6", "B4", "B5"]
+        },
+        "diode_direction": "COL2ROW",
        "split": {
                "soft_serial_pin": "D0"
        },
diff --git a/keyboards/adkb96/rev1/config.h b/keyboards/adkb96/rev1/config.h
index c5a9673671..89de3d9a64 100644
--- a/keyboards/adkb96/rev1/config.h
+++ b/keyboards/adkb96/rev1/config.h
@@ -18,12 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-// wiring of each half
-#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5, F4 }
-#define DIODE_DIRECTION COL2ROW
 /* define tapping term */
 #define TAPPING_TERM 100
diff --git a/keyboards/adm42/config.h b/keyboards/adm42/config.h
index 03749906e8..af23da4c66 100644
--- a/keyboards/adm42/config.h
+++ b/keyboards/adm42/config.h
@@ -16,9 +16,6 @@
 #pragma once
-#define DIODE_DIRECTION ROW2COL
 #define TAP_CODE_DELAY 1
 #if defined(CONSOLE_ENABLE)
diff --git a/keyboards/adm42/info.json b/keyboards/adm42/info.json
index 3596cdb446..5d518c3b86 100644
--- a/keyboards/adm42/info.json
+++ b/keyboards/adm42/info.json
@@ -9,6 +9,11 @@
        "pid": "0xE873",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["C6", "B6", "B5", "B4", "D7", "D6", "F0", "F1", "F4", "F5", "F6", "F7"],
+        "rows": ["C7", "D5", "D3", "D2"]
+    },
+    "diode_direction": "ROW2COL",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layout_aliases": {
diff --git a/keyboards/adm42/rev4/config.h b/keyboards/adm42/rev4/config.h
index fa2bcb3e43..73a212910a 100644
--- a/keyboards/adm42/rev4/config.h
+++ b/keyboards/adm42/rev4/config.h
@@ -16,9 +16,6 @@
 #pragma once
-#define MATRIX_COL_PINS { C6, B6, B5, B4, D7, D6, F0, F1, F4, F5, F6, F7 }
-#define MATRIX_ROW_PINS { C7, D5, D3, D2 }
 #define ADM42_LED E6
 #define RGB_DI_PIN B7
diff --git a/keyboards/adpenrose/akemipad/config.h b/keyboards/adpenrose/akemipad/config.h
index 47fcf429ac..9743566d12 100644
--- a/keyboards/adpenrose/akemipad/config.h
+++ b/keyboards/adpenrose/akemipad/config.h
@@ -3,23 +3,6 @@
 #pragma once
-/*
- * 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 { D4, D7, E6, B6, B4, B5 }
-#define MATRIX_COL_PINS { D3, D2, F5, F6, B2 }
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 #define TAP_CODE_DELAY 10
 /* Audio functionality */
diff --git a/keyboards/adpenrose/akemipad/info.json b/keyboards/adpenrose/akemipad/info.json
index 9b5a8d6ef6..80085f949e 100644
--- a/keyboards/adpenrose/akemipad/info.json
+++ b/keyboards/adpenrose/akemipad/info.json
@@ -7,6 +7,11 @@
        "pid": "0x0004",
        "vid": "0x4450"
    },
+    "matrix_pins": {
+        "cols": ["D3", "D2", "F5", "F6", "B2"],
+        "rows": ["D4", "D7", "E6", "B6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
    "encoder": {
        "rotary": [
            {"pin_a": "B1", "pin_b": "B3"}
diff --git a/keyboards/adpenrose/kintsugi/config.h b/keyboards/adpenrose/kintsugi/config.h
index 5ffeb86837..0e10856cc8 100644
--- a/keyboards/adpenrose/kintsugi/config.h
+++ b/keyboards/adpenrose/kintsugi/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/*
- * 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 { B0, E6, D7, C6, D4, D2, F4, F5, B5, B4 }
-#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6, F0 }
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 #define TAP_CODE_DELAY 10
 /* Underglow options: */
diff --git a/keyboards/adpenrose/kintsugi/info.json b/keyboards/adpenrose/kintsugi/info.json
index a26c65b42a..efe7d069d0 100644
--- a/keyboards/adpenrose/kintsugi/info.json
+++ b/keyboards/adpenrose/kintsugi/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0001",
        "device_version": "1.0.0"
    },
+    "matrix_pins": {
+        "cols": ["F6", "F7", "B1", "B3", "B2", "B6", "F0"],
+        "rows": ["B0", "E6", "D7", "C6", "D4", "D2", "F4", "F5", "B5", "B4"]
+    },
+    "diode_direction": "COL2ROW",
    "encoder": {
        "rotary": [
            {"pin_a": "B7", "pin_b": "D5"}
diff --git a/keyboards/adpenrose/obi/config.h b/keyboards/adpenrose/obi/config.h
index c9f606999e..fd9156ca82 100644
--- a/keyboards/adpenrose/obi/config.h
+++ b/keyboards/adpenrose/obi/config.h
@@ -3,23 +3,6 @@
 #pragma once
-/*
- * 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 { F4, F5, C7, C6 }
-#define MATRIX_COL_PINS { F6, B7, B6, B4, B5, D6, D5, D3, D7, D4, D2, D1, D0, B0 }
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 #define TAP_CODE_DELAY 10
 /* Underglow options: */
diff --git a/keyboards/adpenrose/obi/info.json b/keyboards/adpenrose/obi/info.json
index c0c1b73c64..6417bf57ca 100644
--- a/keyboards/adpenrose/obi/info.json
+++ b/keyboards/adpenrose/obi/info.json
@@ -7,6 +7,11 @@
        "pid": "0x0002",
        "vid": "0x4450"
    },
+    "matrix_pins": {
+        "cols": ["F6", "B7", "B6", "B4", "B5", "D6", "D5", "D3", "D7", "D4", "D2", "D1", "D0", "B0"],
+        "rows": ["F4", "F5", "C7", "C6"]
+    },
+    "diode_direction": "COL2ROW",
    "encoder": {
        "rotary": [
            {"pin_a": "F1", "pin_b": "F0"}
diff --git a/keyboards/adpenrose/shisaku/config.h b/keyboards/adpenrose/shisaku/config.h
index 47555b5190..9113167572 100644
--- a/keyboards/adpenrose/shisaku/config.h
+++ b/keyboards/adpenrose/shisaku/config.h
@@ -3,22 +3,5 @@
 #pragma once
-/*
- * 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 { B2, B0, B1, D0, B4, D6, B3, D7 }
-#define MATRIX_COL_PINS { D1, C3, C4, D4, C0, C1, C2 }
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 /* Solenoid pin */
 #define SOLENOID_PIN C5
diff --git a/keyboards/adpenrose/shisaku/info.json b/keyboards/adpenrose/shisaku/info.json
index dd1aaf540a..9223f5a101 100644
--- a/keyboards/adpenrose/shisaku/info.json
+++ b/keyboards/adpenrose/shisaku/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0003",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["D1", "C3", "C4", "D4", "C0", "C1", "C2"],
+        "rows": ["B2", "B0", "B1", "D0", "B4", "D6", "B3", "D7"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega328p",
    "bootloader": "usbasploader",
    "layouts": {
diff --git a/keyboards/aeboards/aegis/config.h b/keyboards/aeboards/aegis/config.h
index edaef2f7b9..8606067a4c 100644
--- a/keyboards/aeboards/aegis/config.h
+++ b/keyboards/aeboards/aegis/config.h
@@ -16,14 +16,6 @@
 #pragma once
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F5, F6, E6, F7, D1, D0, D6, D4, B4, D7, B6, B5 }
-#define MATRIX_COL_PINS { C7, C6, B7, D2, D3, B3, B2, B1, B0 }
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/aeboards/aegis/info.json b/keyboards/aeboards/aegis/info.json
index b3817db452..63b9ea551e 100644
--- a/keyboards/aeboards/aegis/info.json
+++ b/keyboards/aeboards/aegis/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0807",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["C7", "C6", "B7", "D2", "D3", "B3", "B2", "B1", "B0"],
+        "rows": ["F5", "F6", "E6", "F7", "D1", "D0", "D6", "D4", "B4", "D7", "B6", "B5"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/aeboards/constellation/rev1/config.h b/keyboards/aeboards/constellation/rev1/config.h
index 83eb6e90d3..01155887a5 100755
--- a/keyboards/aeboards/constellation/rev1/config.h
+++ b/keyboards/aeboards/constellation/rev1/config.h
@@ -17,14 +17,6 @@
 #pragma once
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B0, B1, F0, F1, F4 }
-#define MATRIX_COL_PINS { E6, D5, B2, B3, D3, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4 }
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/aeboards/constellation/rev1/info.json b/keyboards/aeboards/constellation/rev1/info.json
index 6f82ab71f5..aec20e5829 100644
--- a/keyboards/aeboards/constellation/rev1/info.json
+++ b/keyboards/aeboards/constellation/rev1/info.json
@@ -8,6 +8,11 @@
        "pid": "0x065C",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["E6", "D5", "B2", "B3", "D3", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["B0", "B1", "F0", "F1", "F4"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/aeboards/constellation/rev2/config.h b/keyboards/aeboards/constellation/rev2/config.h
index faaedf495d..f4b7be6bdf 100755
--- a/keyboards/aeboards/constellation/rev2/config.h
+++ b/keyboards/aeboards/constellation/rev2/config.h
@@ -16,14 +16,6 @@
 #pragma once
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B15, A14, A2, B13, B14 }
-#define MATRIX_COL_PINS { B12, A1, H0, C15, C14, B11, B10, B2, B1, B0, A7, A6, A5, A4, A3 }
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/aeboards/constellation/rev2/info.json b/keyboards/aeboards/constellation/rev2/info.json
index 1009cca20d..ac79c2e336 100644
--- a/keyboards/aeboards/constellation/rev2/info.json
+++ b/keyboards/aeboards/constellation/rev2/info.json
@@ -8,6 +8,11 @@
        "pid": "0x065C",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["B12", "A1", "H0", "C15", "C14", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3"],
+        "rows": ["B15", "A14", "A2", "B13", "B14"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "STM32L422",
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/aeboards/constellation/rev3/config.h b/keyboards/aeboards/constellation/rev3/config.h
index 83eb6e90d3..01155887a5 100755
--- a/keyboards/aeboards/constellation/rev3/config.h
+++ b/keyboards/aeboards/constellation/rev3/config.h
@@ -17,14 +17,6 @@
 #pragma once
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B0, B1, F0, F1, F4 }
-#define MATRIX_COL_PINS { E6, D5, B2, B3, D3, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4 }
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/aeboards/constellation/rev3/info.json b/keyboards/aeboards/constellation/rev3/info.json
index 514fcb778e..b50c8893e1 100644
--- a/keyboards/aeboards/constellation/rev3/info.json
+++ b/keyboards/aeboards/constellation/rev3/info.json
@@ -8,6 +8,11 @@
        "pid": "0x065D",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["E6", "D5", "B2", "B3", "D3", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["B0", "B1", "F0", "F1", "F4"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/afternoonlabs/breeze/rev0/config.h b/keyboards/afternoonlabs/breeze/rev0/config.h
index be38eaf0ab..3500564544 100644
--- a/keyboards/afternoonlabs/breeze/rev0/config.h
+++ b/keyboards/afternoonlabs/breeze/rev0/config.h
@@ -16,12 +16,4 @@
 #pragma once
-// wiring of each half
-#define MATRIX_ROW_PINS \
-    { F4, F5, F6, F7, B1 }
-#define MATRIX_COL_PINS \
-    { B2, D1, D0, D4, C6, D7, E6, B4, B5 }
 #define SPLIT_HAND_PIN B3
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/afternoonlabs/breeze/rev0/info.json b/keyboards/afternoonlabs/breeze/rev0/info.json
index 19e22b8342..5d3ebbe5ca 100644
--- a/keyboards/afternoonlabs/breeze/rev0/info.json
+++ b/keyboards/afternoonlabs/breeze/rev0/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0001",
        "device_version": "0.0.0"
    },
+    "matrix_pins": {
+        "cols": ["B2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F4", "F5", "F6", "F7", "B1"]
+    },
+    "diode_direction": "COL2ROW",
    "split": {
        "soft_serial_pin": "D2"
    },
diff --git a/keyboards/afternoonlabs/breeze/rev1/config.h b/keyboards/afternoonlabs/breeze/rev1/config.h
index 1e51a357b2..d6bb6df14c 100644
--- a/keyboards/afternoonlabs/breeze/rev1/config.h
+++ b/keyboards/afternoonlabs/breeze/rev1/config.h
@@ -16,12 +16,4 @@
 #pragma once
-// wiring of each half
-#define MATRIX_ROW_PINS \
-    { F4, F5, F6, F7, B1 }
-#define MATRIX_COL_PINS \
-    { B2, D1, D0, D4, C6, D7, E6, B4, B5 }
 #define SPLIT_HAND_PIN B3
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/afternoonlabs/breeze/rev1/info.json b/keyboards/afternoonlabs/breeze/rev1/info.json
index 4feeeca875..191c3ffc63 100644
--- a/keyboards/afternoonlabs/breeze/rev1/info.json
+++ b/keyboards/afternoonlabs/breeze/rev1/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0001",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["B2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F4", "F5", "F6", "F7", "B1"]
+    },
+    "diode_direction": "COL2ROW",
    "split": {
        "soft_serial_pin": "D2"
    },
diff --git a/keyboards/afternoonlabs/gust/rev1/config.h b/keyboards/afternoonlabs/gust/rev1/config.h
deleted file mode 100644
index db2839cfc9..0000000000
--- a/keyboards/afternoonlabs/gust/rev1/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2021 eithanshavit
- *
- * 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
-// wiring of each half
-#define MATRIX_ROW_PINS { F5, F4, D0 }
-#define MATRIX_COL_PINS { D1, D2, D3 }
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/afternoonlabs/gust/rev1/info.json b/keyboards/afternoonlabs/gust/rev1/info.json
index a07fab20e2..e031108f51 100644
--- a/keyboards/afternoonlabs/gust/rev1/info.json
+++ b/keyboards/afternoonlabs/gust/rev1/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0002",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["D1", "D2", "D3"],
+        "rows": ["F5", "F4", "D0"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "caterina",
    "layouts": {
diff --git a/keyboards/afternoonlabs/oceanbreeze/rev1/config.h b/keyboards/afternoonlabs/oceanbreeze/rev1/config.h
index 42621b39ef..d6bb6df14c 100644
--- a/keyboards/afternoonlabs/oceanbreeze/rev1/config.h
+++ b/keyboards/afternoonlabs/oceanbreeze/rev1/config.h
@@ -16,12 +16,4 @@
 #pragma once
-// wiring of each half
-#define MATRIX_ROW_PINS \
-    { F4, F5, F6, F7, B1, B6 }
-#define MATRIX_COL_PINS \
-    { B2, D1, D0, D4, C6, D7, E6, B4, B5 }
 #define SPLIT_HAND_PIN B3
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/afternoonlabs/oceanbreeze/rev1/info.json b/keyboards/afternoonlabs/oceanbreeze/rev1/info.json
index 531d2622ca..1a099ee548 100644
--- a/keyboards/afternoonlabs/oceanbreeze/rev1/info.json
+++ b/keyboards/afternoonlabs/oceanbreeze/rev1/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0003",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["B2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F4", "F5", "F6", "F7", "B1", "B6"]
+    },
+    "diode_direction": "COL2ROW",
    "split": {
        "soft_serial_pin": "D2"
    },
diff --git a/keyboards/afternoonlabs/southern_breeze/rev1/config.h b/keyboards/afternoonlabs/southern_breeze/rev1/config.h
index 1e51a357b2..d6bb6df14c 100644
--- a/keyboards/afternoonlabs/southern_breeze/rev1/config.h
+++ b/keyboards/afternoonlabs/southern_breeze/rev1/config.h
@@ -16,12 +16,4 @@
 #pragma once
-// wiring of each half
-#define MATRIX_ROW_PINS \
-    { F4, F5, F6, F7, B1 }
-#define MATRIX_COL_PINS \
-    { B2, D1, D0, D4, C6, D7, E6, B4, B5 }
 #define SPLIT_HAND_PIN B3
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/afternoonlabs/southern_breeze/rev1/info.json b/keyboards/afternoonlabs/southern_breeze/rev1/info.json
index 17bb446694..c9a7ecc3ca 100644
--- a/keyboards/afternoonlabs/southern_breeze/rev1/info.json
+++ b/keyboards/afternoonlabs/southern_breeze/rev1/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0005",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["B2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F4", "F5", "F6", "F7", "B1"]
+    },
+    "diode_direction": "COL2ROW",
    "split": {
        "soft_serial_pin": "D2"
    },
diff --git a/keyboards/afternoonlabs/summer_breeze/rev1/config.h b/keyboards/afternoonlabs/summer_breeze/rev1/config.h
index 1e51a357b2..d6bb6df14c 100644
--- a/keyboards/afternoonlabs/summer_breeze/rev1/config.h
+++ b/keyboards/afternoonlabs/summer_breeze/rev1/config.h
@@ -16,12 +16,4 @@
 #pragma once
-// wiring of each half
-#define MATRIX_ROW_PINS \
-    { F4, F5, F6, F7, B1 }
-#define MATRIX_COL_PINS \
-    { B2, D1, D0, D4, C6, D7, E6, B4, B5 }
 #define SPLIT_HAND_PIN B3
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/afternoonlabs/summer_breeze/rev1/info.json b/keyboards/afternoonlabs/summer_breeze/rev1/info.json
index e5ac8d452d..f42ad75bac 100644
--- a/keyboards/afternoonlabs/summer_breeze/rev1/info.json
+++ b/keyboards/afternoonlabs/summer_breeze/rev1/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0004",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["B2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F4", "F5", "F6", "F7", "B1"]
+    },
+    "diode_direction": "COL2ROW",
    "split": {
        "soft_serial_pin": "D2"
    },
diff --git a/keyboards/ai03/andromeda/config.h b/keyboards/ai03/andromeda/config.h
index 1fb163a652..056f54d521 100644
--- a/keyboards/ai03/andromeda/config.h
+++ b/keyboards/ai03/andromeda/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-#define MATRIX_COL_PINS { A10, A9, A8, B15, B14, B13, B12, B11, B10, B2, B1, B0, A7, A6, B5, B8, B9 }
-#define MATRIX_ROW_PINS { B4, B3, A15, A3, A4, A5 }
-#define DIODE_DIRECTION COL2ROW
 /* 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/ai03/andromeda/info.json b/keyboards/ai03/andromeda/info.json
index ade4938b82..e29bb3e121 100644
--- a/keyboards/ai03/andromeda/info.json
+++ b/keyboards/ai03/andromeda/info.json
@@ -8,6 +8,11 @@
        "pid": "0x000A",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "B5", "B8", "B9"],
+        "rows": ["B4", "B3", "A15", "A3", "A4", "A5"]
+    },
+    "diode_direction": "COL2ROW",
    "indicators": {
        "caps_lock": "A2",
        "scroll_lock": "A1",
diff --git a/keyboards/ai03/equinox/config.h b/keyboards/ai03/equinox/config.h
index 32065a4740..50001e978c 100644
--- a/keyboards/ai03/equinox/config.h
+++ b/keyboards/ai03/equinox/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/*
- * 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 { D3, C5, D4, D5 }
-#define MATRIX_COL_PINS { D1, D2, C6, C7, B6, B5, B4, B3, B2, B1, B0, D6 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
 /* 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/ai03/equinox/rev0/config.h b/keyboards/ai03/equinox/rev0/config.h
deleted file mode 100644
index 78c6fb8fcd..0000000000
--- a/keyboards/ai03/equinox/rev0/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-Copyright 2019 Ryota Goto
-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
-// Fix for prototype missing COL0, COL1, using backlight and RGB underglow I/O pins
-#undef MATRIX_COL_PINS
-#define MATRIX_COL_PINS { C4, B7, C6, C7, B6, B5, B4, B3, B2, B1, B0, D6 }
diff --git a/keyboards/ai03/equinox/rev0/info.json b/keyboards/ai03/equinox/rev0/info.json
index d76623777e..f5dd365564 100644
--- a/keyboards/ai03/equinox/rev0/info.json
+++ b/keyboards/ai03/equinox/rev0/info.json
@@ -1,4 +1,9 @@
 {
+    "matrix_pins": {
+        "cols": ["C4", "B7", "C6", "C7", "B6", "B5", "B4", "B3", "B2", "B1", "B0", "D6"],
+        "rows": ["D3", "C5", "D4", "D5"]
+    },
+    "diode_direction": "COL2ROW",
    "backlight": {
        "pin": "D1",
        "levels": 5,
diff --git a/keyboards/ai03/equinox/rev1/info.json b/keyboards/ai03/equinox/rev1/info.json
index 19cd40d140..9c0727f7ba 100644
--- a/keyboards/ai03/equinox/rev1/info.json
+++ b/keyboards/ai03/equinox/rev1/info.json
@@ -1,4 +1,9 @@
 {
+    "matrix_pins": {
+        "cols": ["D1", "D2", "C6", "C7", "B6", "B5", "B4", "B3", "B2", "B1", "B0", "D6"],
+        "rows": ["D3", "C5", "D4", "D5"]
+    },
+    "diode_direction": "COL2ROW",
    "backlight": {
        "pin": "B7",
        "levels": 5,
diff --git a/keyboards/ai03/jp60/config.h b/keyboards/ai03/jp60/config.h
index 76e81dc2aa..9fe6627ecc 100644
--- a/keyboards/ai03/jp60/config.h
+++ b/keyboards/ai03/jp60/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/*
- * 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 { B6, B5, B4, D7, E6 }
-#define MATRIX_COL_PINS { D2, D1, D3, D5, D4, D6, C6, F0, F1, F4, F5, F6, F7, C7 }
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 /* 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/ai03/jp60/info.json b/keyboards/ai03/jp60/info.json
index 3a07c7224c..c7b55c53be 100644
--- a/keyboards/ai03/jp60/info.json
+++ b/keyboards/ai03/jp60/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0024",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["D2", "D1", "D3", "D5", "D4", "D6", "C6", "F0", "F1", "F4", "F5", "F6", "F7", "C7"],
+        "rows": ["B6", "B5", "B4", "D7", "E6"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/ai03/lunar/config.h b/keyboards/ai03/lunar/config.h
index 10c8ab70ab..50001e978c 100644
--- a/keyboards/ai03/lunar/config.h
+++ b/keyboards/ai03/lunar/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/*
- * 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 { B3, D0, D1, D2, D3 }
-#define MATRIX_COL_PINS { D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4, F1, F0 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
 /* 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/ai03/lunar/info.json b/keyboards/ai03/lunar/info.json
index 6c069207e1..2b97d0042c 100644
--- a/keyboards/ai03/lunar/info.json
+++ b/keyboards/ai03/lunar/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0001",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"],
+        "rows": ["B3", "D0", "D1", "D2", "D3"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/ai03/orbit/config.h b/keyboards/ai03/orbit/config.h
index 85d4ae5bfe..f4157a1729 100644
--- a/keyboards/ai03/orbit/config.h
+++ b/keyboards/ai03/orbit/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/*
- * 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 { F7, F6, F5, F4, D3 }
-#define MATRIX_COL_PINS { C7, B4, D7, D6, D4, F1, F0 }
-#define MATRIX_ROW_PINS_RIGHT { B6, B5, B4, D7, E6 }
-#define MATRIX_COL_PINS_RIGHT { D4, D6, F1, F0, F4, F5, C6 }
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 #define SELECT_SOFT_SERIAL_SPEED 1
 #define SPLIT_LED_STATE_ENABLE
diff --git a/keyboards/ai03/orbit/info.json b/keyboards/ai03/orbit/info.json
index 840fb1fc20..981f3cd685 100644
--- a/keyboards/ai03/orbit/info.json
+++ b/keyboards/ai03/orbit/info.json
@@ -8,11 +8,22 @@
        "pid": "0x0003",
        "device_version": "0.0.3"
    },
+    "matrix_pins": {
+        "cols": ["C7", "B4", "D7", "D6", "D4", "F1", "F0"],
+        "rows": ["F7", "F6", "F5", "F4", "D3"]
+    },
+    "diode_direction": "COL2ROW",
    "backlight": {
        "pin": "B7"
    },
    "split": {
-        "soft_serial_pin": "D0"
+        "soft_serial_pin": "D0",
+        "matrix_pins": {
+            "right": {
+                "cols": ["D4", "D6", "F1", "F0", "F4", "F5", "C6"],
+                "rows": ["B6", "B5", "B4", "D7", "E6"]
+            }
+        }
    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
diff --git a/keyboards/ai03/orbit_x/config.h b/keyboards/ai03/orbit_x/config.h
index 27a383f7bb..05d319d030 100644
--- a/keyboards/ai03/orbit_x/config.h
+++ b/keyboards/ai03/orbit_x/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/*
- * 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 { D7, D6, D4, F0 }
-#define MATRIX_COL_PINS { E6, F6, B1, B0, C7, C6 }
-#define MATRIX_ROW_PINS_RIGHT { B5, D7, B4, D4 }
-#define MATRIX_COL_PINS_RIGHT { D6, B6, B1, B0, B3, B2 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
 #define SPLIT_HAND_PIN D5
 #define SPLIT_USB_DETECT
 #define SPLIT_USB_TIMEOUT 2500
diff --git a/keyboards/ai03/orbit_x/info.json b/keyboards/ai03/orbit_x/info.json
index fdb26bddf4..ef52a070e2 100644
--- a/keyboards/ai03/orbit_x/info.json
+++ b/keyboards/ai03/orbit_x/info.json
@@ -8,8 +8,19 @@
        "pid": "0x0014",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["E6", "F6", "B1", "B0", "C7", "C6"],
+        "rows": ["D7", "D6", "D4", "F0"]
+    },
+    "diode_direction": "COL2ROW",
    "split": {
-        "soft_serial_pin": "D0"
+        "soft_serial_pin": "D0",
+        "matrix_pins": {
+            "right": {
+                "cols": ["D6", "B6", "B1", "B0", "B3", "B2"],
+                "rows": ["B5", "D7", "B4", "D4"]
+            }
+        }
    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
diff --git a/keyboards/ai03/polaris/config.h b/keyboards/ai03/polaris/config.h
index 871f4bc8db..3946e761c3 100644
--- a/keyboards/ai03/polaris/config.h
+++ b/keyboards/ai03/polaris/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/*
- * 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 { B1, B2, B3, F0, F1 }
-#define MATRIX_COL_PINS { F4, F7, F5, F6, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
 #define RGB_DI_PIN D2
 #ifdef RGB_DI_PIN
  #define RGBLED_NUM 14
diff --git a/keyboards/ai03/polaris/info.json b/keyboards/ai03/polaris/info.json
index ae0fcb927d..ee2f32ffae 100644
--- a/keyboards/ai03/polaris/info.json
+++ b/keyboards/ai03/polaris/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0002",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F4", "F7", "F5", "F6", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3"],
+        "rows": ["B1", "B2", "B3", "F0", "F1"]
+    },
+    "diode_direction": "COL2ROW",
    "backlight": {
        "pin": "B7",
        "levels": 5,
diff --git a/keyboards/ai03/quasar/config.h b/keyboards/ai03/quasar/config.h
index 04765c0788..50001e978c 100644
--- a/keyboards/ai03/quasar/config.h
+++ b/keyboards/ai03/quasar/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/*
- * 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 { D0, D1, D2, D3, D5, D4, D6, D7 }
-#define MATRIX_COL_PINS { B0, B1, B2, B3, B7, F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
 /* 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/ai03/quasar/info.json b/keyboards/ai03/quasar/info.json
index c29799484d..68dc3c4a6f 100644
--- a/keyboards/ai03/quasar/info.json
+++ b/keyboards/ai03/quasar/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0010",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["B0", "B1", "B2", "B3", "B7", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4"],
+        "rows": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/ai03/soyuz/config.h b/keyboards/ai03/soyuz/config.h
index 027bc03faa..50001e978c 100644
--- a/keyboards/ai03/soyuz/config.h
+++ b/keyboards/ai03/soyuz/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/*
- * 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 { D4, C6, B6, E6, B4 }
-#define MATRIX_COL_PINS { F4, B3, D7, B5 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
 /* 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/ai03/soyuz/info.json b/keyboards/ai03/soyuz/info.json
index b008ef45b6..f10a5d4000 100644
--- a/keyboards/ai03/soyuz/info.json
+++ b/keyboards/ai03/soyuz/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0018",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F4", "B3", "D7", "B5"],
+        "rows": ["D4", "C6", "B6", "E6", "B4"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "community_layouts": ["ortho_5x4", "numpad_5x4"],
diff --git a/keyboards/ai03/vega/config.h b/keyboards/ai03/vega/config.h
index b2798481d4..b575a49f38 100644
--- a/keyboards/ai03/vega/config.h
+++ b/keyboards/ai03/vega/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-#define MATRIX_COL_PINS { B5, A3, A9, A8, B15, B14, B13, B12, B11, B10, B2, B1, B0, A7, A6 }
-#define MATRIX_ROW_PINS { A1, A2, B3, A15, A10 }
-#define DIODE_DIRECTION COL2ROW
 /* 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/ai03/vega/info.json b/keyboards/ai03/vega/info.json
index 7b3c16cb52..3da23cac09 100644
--- a/keyboards/ai03/vega/info.json
+++ b/keyboards/ai03/vega/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0015",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["B5", "A3", "A9", "A8", "B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6"],
+        "rows": ["A1", "A2", "B3", "A15", "A10"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "STM32F072",
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/ai03/voyager60_alps/config.h b/keyboards/ai03/voyager60_alps/config.h
index 30b7481688..704a6879f5 100644
--- a/keyboards/ai03/voyager60_alps/config.h
+++ b/keyboards/ai03/voyager60_alps/config.h
@@ -14,12 +14,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-#define MATRIX_ROW_PINS { B1, B2, B3, F0, F1 }
-#define MATRIX_COL_PINS { F4, F7, F5, F6, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3}
-#define DIODE_DIRECTION COL2ROW
 #define RGB_DI_PIN D2
 #ifdef RGB_DI_PIN
  #define RGBLED_NUM 14
diff --git a/keyboards/ai03/voyager60_alps/info.json b/keyboards/ai03/voyager60_alps/info.json
index a7a68e43b0..fed5542930 100644
--- a/keyboards/ai03/voyager60_alps/info.json
+++ b/keyboards/ai03/voyager60_alps/info.json
@@ -8,6 +8,11 @@
        "pid": "0x060A",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F4", "F7", "F5", "F6", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3"],
+        "rows": ["B1", "B2", "B3", "F0", "F1"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/akb/eb46/config.h b/keyboards/akb/eb46/config.h
deleted file mode 100644
index 3fa5884805..0000000000
--- a/keyboards/akb/eb46/config.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-Copyright 2019 Elliot Powell
-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
-/*
- * 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 \
-  { B5, B4, D7, B6 }
-#define MATRIX_COL_PINS \
-  { B0, B1, B2, B3, B7, D0, D1, D2, D3, D5, D4, D6, C6 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/akb/eb46/info.json b/keyboards/akb/eb46/info.json
index ad1f03501a..d5c4312cc6 100644
--- a/keyboards/akb/eb46/info.json
+++ b/keyboards/akb/eb46/info.json
@@ -7,6 +7,11 @@
        "pid": "0xFEED",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["B0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "C6"],
+        "rows": ["B5", "B4", "D7", "B6"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/akb/raine/config.h b/keyboards/akb/raine/config.h
index 1f717ab436..4ffa418a09 100644
--- a/keyboards/akb/raine/config.h
+++ b/keyboards/akb/raine/config.h
@@ -16,16 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
-/* key matrix pins */
-#define MATRIX_ROW_PINS \
-  { E6, C6, F7, B2, B0 }
-#define MATRIX_COL_PINS \
-  { F6, F5, F4, B1, F1, F0, B3, B7, D0, D1, D2, D3, D5, D4, D6, D7 }
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 /* 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/akb/raine/info.json b/keyboards/akb/raine/info.json
index f6f648e137..9fe50b25af 100644
--- a/keyboards/akb/raine/info.json
+++ b/keyboards/akb/raine/info.json
@@ -7,6 +7,11 @@
        "pid": "0x6060",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F6", "F5", "F4", "B1", "F1", "F0", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7"],
+        "rows": ["E6", "C6", "F7", "B2", "B0"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/akegata_denki/device_one/config.h b/keyboards/akegata_denki/device_one/config.h
deleted file mode 100644
index dc1e1cded3..0000000000
--- a/keyboards/akegata_denki/device_one/config.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-#define MATRIX_ROW_PINS { B1, B0, A9, A8, A0 }
-#define MATRIX_COL_PINS { A2, A3, A4, A5, A6, A7, A1, A10, A15, B3, B4, B5, B6, B7, B8}
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/akegata_denki/device_one/info.json b/keyboards/akegata_denki/device_one/info.json
index a00144adf7..59449c4754 100644
--- a/keyboards/akegata_denki/device_one/info.json
+++ b/keyboards/akegata_denki/device_one/info.json
@@ -6,7 +6,12 @@
    "vid": "0xFEED",
    "pid": "0xADD0",
    "device_version": "0.0.1"
-    },
+  },
+  "matrix_pins": {
+    "cols": ["A2", "A3", "A4", "A5", "A6", "A7", "A1", "A10", "A15", "B3", "B4", "B5", "B6", "B7", "B8"],
+    "rows": ["B1", "B0", "A9", "A8", "A0"]
+  },
+  "diode_direction": "COL2ROW",
  "processor": "STM32F042",
  "bootloader": "stm32-dfu",
  "board": "ST_NUCLEO32_F042K6",
diff --git a/keyboards/alas/config.h b/keyboards/alas/config.h
index 95a8e7bcdb..a442481560 100644
--- a/keyboards/alas/config.h
+++ b/keyboards/alas/config.h
@@ -17,12 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-#define MATRIX_ROW_PINS { A2, B9, B8, B5, B4 }
-#define MATRIX_COL_PINS { A1, B1, B0, A7, A6, A5, A4, A3, B2, B10, B11, B12, B13, B14 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
 /* Ensure we jump to bootloader if the RESET keycode was pressed */
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
diff --git a/keyboards/alas/info.json b/keyboards/alas/info.json
index aa87efaae3..1563fd843c 100755
--- a/keyboards/alas/info.json
+++ b/keyboards/alas/info.json
@@ -8,6 +8,11 @@
        "pid": "0x414C",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["A1", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "B2", "B10", "B11", "B12", "B13", "B14"],
+        "rows": ["A2", "B9", "B8", "B5", "B4"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "STM32F072",
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/aleblazer/zodiark/config.h b/keyboards/aleblazer/zodiark/config.h
index 148e9a7672..5f80ba36b4 100644
--- a/keyboards/aleblazer/zodiark/config.h
+++ b/keyboards/aleblazer/zodiark/config.h
@@ -18,12 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define SELECT_SOFT_SERIAL_SPEED 1
-#define DIODE_DIRECTION COL2ROW
-/* key matrix pins */
-#define MATRIX_ROW_PINS { C6, D7, E6, B4, F4 }
-#define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6 }
 #define RGB_DI_PIN B5
 #ifdef RGBLIGHT_ENABLE
diff --git a/keyboards/aleblazer/zodiark/info.json b/keyboards/aleblazer/zodiark/info.json
index 8211117625..ca63fd47dd 100644
--- a/keyboards/aleblazer/zodiark/info.json
+++ b/keyboards/aleblazer/zodiark/info.json
@@ -8,6 +8,11 @@
        "pid": "0xF902",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["C6", "D7", "E6", "B4", "F4"]
+    },
+    "diode_direction": "COL2ROW",
    "encoder": {
        "rotary": [
            {"pin_a": "D2", "pin_b": "D4", "resolution": 3}
diff --git a/keyboards/alf/dc60/config.h b/keyboards/alf/dc60/config.h
index e81b6a2010..b62a2cc0ac 100644
--- a/keyboards/alf/dc60/config.h
+++ b/keyboards/alf/dc60/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/*
- * 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 { B0, B1, B2, B3, B4 }
-#define MATRIX_COL_PINS { B5, D0, D1, D2, D3, D4, D5, D6, D7, C6, C7, F4, F5, F6, F7 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
 #define RGB_DI_PIN E6
 #ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/alf/dc60/info.json b/keyboards/alf/dc60/info.json
index faf199d8a0..1ec142f403 100644
--- a/keyboards/alf/dc60/info.json
+++ b/keyboards/alf/dc60/info.json
@@ -7,6 +7,11 @@
        "pid": "0x0000",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["B5", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "C6", "C7", "F4", "F5", "F6", "F7"],
+        "rows": ["B0", "B1", "B2", "B3", "B4"]
+    },
+    "diode_direction": "COL2ROW",
    "backlight": {
        "pin": "B6",
        "levels": 5,
diff --git a/keyboards/alf/x11/config.h b/keyboards/alf/x11/config.h
index 04ebe0c657..1c4361c5c5 100644
--- a/keyboards/alf/x11/config.h
+++ b/keyboards/alf/x11/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/*
- * 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 { B0, B1, B2, B3, B4, B5, B6 }
-#define MATRIX_COL_PINS { D0, D1, D2, D3, D4, D5, D6, D7, F0, F1, F4, F5, F6 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
 #define RGB_DI_PIN F7
 #ifdef RGB_DI_PIN
  #define RGBLED_NUM 28
diff --git a/keyboards/alf/x11/info.json b/keyboards/alf/x11/info.json
index 8b3ae6f2ba..a3e18ce9b3 100644
--- a/keyboards/alf/x11/info.json
+++ b/keyboards/alf/x11/info.json
@@ -8,6 +8,11 @@
    "pid": "0x0001",
    "device_version": "0.0.1"
  },
+  "matrix_pins": {
+    "cols": ["D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "F0", "F1", "F4", "F5", "F6"],
+    "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6"]
+  },
+  "diode_direction": "COL2ROW",
  "backlight": {
    "pin": "B7",
    "breathing": true
diff --git a/keyboards/alf/x2/config.h b/keyboards/alf/x2/config.h
index 374873d5d5..5faf0aad8b 100644
--- a/keyboards/alf/x2/config.h
+++ b/keyboards/alf/x2/config.h
@@ -16,16 +16,6 @@
 #pragma once
-/* key matrix pins */
-#define MATRIX_ROW_PINS \
-    { D0, D1, D2, D3, D5 }
-#define MATRIX_COL_PINS \
-    { F0, F1, E6, C7, C6, B7, D4, B1, B0, B5, B4, D7, D6, B3, F4 }
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION   COL2ROW
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/alf/x2/info.json b/keyboards/alf/x2/info.json
index 5e0b3087a8..7c1b3b9967 100644
--- a/keyboards/alf/x2/info.json
+++ b/keyboards/alf/x2/info.json
@@ -8,6 +8,11 @@
        "pid": "0x6060",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "E6", "C7", "C6", "B7", "D4", "B1", "B0", "B5", "B4", "D7", "D6", "B3", "F4"],
+        "rows": ["D0", "D1", "D2", "D3", "D5"]
+    },
+    "diode_direction": "COL2ROW",
    "indicators": {
        "caps_lock": "B2",
        "on_state": 0
diff --git a/keyboards/alfredslab/swift65/hotswap/config.h b/keyboards/alfredslab/swift65/hotswap/config.h
index 585855ebe9..1fc317877d 100644
--- a/keyboards/alfredslab/swift65/hotswap/config.h
+++ b/keyboards/alfredslab/swift65/hotswap/config.h
@@ -16,22 +16,6 @@
 #pragma once
-/*
- * 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 { B1, B2, B3, D6, D4 }
-#define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0, C7, C6, B6, B5, B4, D7, D5, D3, D1 }
-#define DIODE_DIRECTION COL2ROW
 #define RGB_DI_PIN D2
 #ifdef RGB_DI_PIN
    #define RGBLED_NUM 22
diff --git a/keyboards/alfredslab/swift65/hotswap/info.json b/keyboards/alfredslab/swift65/hotswap/info.json
index 89ac7c7b17..775c580879 100644
--- a/keyboards/alfredslab/swift65/hotswap/info.json
+++ b/keyboards/alfredslab/swift65/hotswap/info.json
@@ -8,6 +8,11 @@
        "pid": "0xD4C4",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "C7", "C6", "B6", "B5", "B4", "D7", "D5", "D3", "D1"],
+        "rows": ["B1", "B2", "B3", "D6", "D4"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layout_aliases": {
diff --git a/keyboards/alfredslab/swift65/solder/config.h b/keyboards/alfredslab/swift65/solder/config.h
index aa2502a0a1..ae3dc8c2e0 100644
--- a/keyboards/alfredslab/swift65/solder/config.h
+++ b/keyboards/alfredslab/swift65/solder/config.h
@@ -17,22 +17,6 @@
 #pragma once
-/*
- * 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 { B1, B2, B3, D4, D6 }
-#define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0, C7, C6, B6, B5, B4, D7, D5, D3, D1, D0 }
-#define DIODE_DIRECTION COL2ROW
 #define RGB_DI_PIN D2
 #ifdef RGB_DI_PIN
    #define RGBLED_NUM 14
diff --git a/keyboards/alfredslab/swift65/solder/info.json b/keyboards/alfredslab/swift65/solder/info.json
index 0f1d9c428e..23f3e16fc4 100644
--- a/keyboards/alfredslab/swift65/solder/info.json
+++ b/keyboards/alfredslab/swift65/solder/info.json
@@ -8,6 +8,11 @@
        "pid": "0xD4C3",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "C7", "C6", "B6", "B5", "B4", "D7", "D5", "D3", "D1", "D0"],
+        "rows": ["B1", "B2", "B3", "D4", "D6"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layout_aliases": {
diff --git a/keyboards/aliceh66/pianoforte/config.h b/keyboards/aliceh66/pianoforte/config.h
index 40d071201a..91e0225569 100644
--- a/keyboards/aliceh66/pianoforte/config.h
+++ b/keyboards/aliceh66/pianoforte/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-#define MATRIX_COL_PINS { D4, D6, D7, B4, B5, F1, F0, E6, B6 }
-#define MATRIX_ROW_PINS { D1, D0, D3, D2, D5, B0, C6, C7, F6, F7, F5, F4 }
-#define DIODE_DIRECTION COL2ROW
 #define DYNAMIC_KEYMAP_LAYER_COUNT 2
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/aliceh66/pianoforte/info.json b/keyboards/aliceh66/pianoforte/info.json
index 56e2bf2cdf..60fd6a7ba9 100644
--- a/keyboards/aliceh66/pianoforte/info.json
+++ b/keyboards/aliceh66/pianoforte/info.json
@@ -8,6 +8,11 @@
        "pid": "0x7066",
        "vid": "0x6168"
    },
+    "matrix_pins": {
+        "cols": ["D4", "D6", "D7", "B4", "B5", "F1", "F0", "E6", "B6"],
+        "rows": ["D1", "D0", "D3", "D2", "D5", "B0", "C6", "C7", "F6", "F7", "F5", "F4"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "community_layouts": ["tkl_f13_ansi", "tkl_f13_iso"],
diff --git a/keyboards/aliceh66/pianoforte_hs/config.h b/keyboards/aliceh66/pianoforte_hs/config.h
index 7aa6ea4e4b..91e0225569 100644
--- a/keyboards/aliceh66/pianoforte_hs/config.h
+++ b/keyboards/aliceh66/pianoforte_hs/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-#define MATRIX_COL_PINS { D6, D7, B4, B5, B6, F6, F5, E6, D4 }
-#define MATRIX_ROW_PINS { D2, D1, D3, D0, D5, B0, F0, F1, F7, F4, C7, C6 }
-#define DIODE_DIRECTION COL2ROW
 #define DYNAMIC_KEYMAP_LAYER_COUNT 2
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/aliceh66/pianoforte_hs/info.json b/keyboards/aliceh66/pianoforte_hs/info.json
index d6e7fa34e8..42bc824a9f 100644
--- a/keyboards/aliceh66/pianoforte_hs/info.json
+++ b/keyboards/aliceh66/pianoforte_hs/info.json
@@ -8,6 +8,11 @@
        "pid": "0x7068",
        "vid": "0x6168"
    },
+    "matrix_pins": {
+        "cols": ["D6", "D7", "B4", "B5", "B6", "F6", "F5", "E6", "D4"],
+        "rows": ["D2", "D1", "D3", "D0", "D5", "B0", "F0", "F1", "F7", "F4", "C7", "C6"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/alpha/config.h b/keyboards/alpha/config.h
index 828839870a..0f104a2a5c 100755
--- a/keyboards/alpha/config.h
+++ b/keyboards/alpha/config.h
@@ -1,13 +1,5 @@
 #pragma once
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D4, B4, B5 }
-#define MATRIX_COL_PINS { D7, E6, C6, B6, B2, B3, B1, F7, F6, F5 }
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/alpha/info.json b/keyboards/alpha/info.json
index 472bedb1fa..1f76cce458 100644
--- a/keyboards/alpha/info.json
+++ b/keyboards/alpha/info.json
@@ -7,6 +7,11 @@
    "pid": "0x6060",
    "device_version": "0.0.1"
  },
+  "matrix_pins": {
+    "cols": ["D7", "E6", "C6", "B6", "B2", "B3", "B1", "F7", "F6", "F5"],
+    "rows": ["D4", "B4", "B5"]
+  },
+  "diode_direction": "COL2ROW",
  "processor": "atmega32u4",
  "bootloader": "caterina",
  "layouts": {
diff --git a/keyboards/alpine65/config.h b/keyboards/alpine65/config.h
index 61af018700..1dee90a07f 100644
--- a/keyboards/alpine65/config.h
+++ b/keyboards/alpine65/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-#define MATRIX_COL_PINS { B9 , B8 , B7 , B6 , B5 , B4 , B3 , A15, A9 , A8 , B14, B12, A10, A0 , A1 }
-#define MATRIX_ROW_PINS { C14, C15, C13, A2 , A3 }
-#define DIODE_DIRECTION COL2ROW
 /* 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/alpine65/info.json b/keyboards/alpine65/info.json
index 1c1407b45b..ec59236ea5 100644
--- a/keyboards/alpine65/info.json
+++ b/keyboards/alpine65/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0065",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A9", "A8", "B14", "B12", "A10", "A0", "A1"],
+        "rows": ["C14", "C15", "C13", "A2", "A3"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "STM32F072",
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/alps64/config.h b/keyboards/alps64/config.h
index aff4064bb4..4b007cf387 100644
--- a/keyboards/alps64/config.h
+++ b/keyboards/alps64/config.h
@@ -17,12 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-#define MATRIX_COL_PINS {  B0, B1, B2, B3, B4, B5, B6, B7 }
-#define MATRIX_ROW_PINS {  D0, D1, D2, D3, D4, D5, D6, C2 }
-#define DIODE_DIRECTION COL2ROW
 /* 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/alps64/info.json b/keyboards/alps64/info.json
index e1ea2b9b5e..3f3d6af0fc 100644
--- a/keyboards/alps64/info.json
+++ b/keyboards/alps64/info.json
@@ -4,10 +4,15 @@
  "url": "",
  "maintainer": "qmk",
  "usb": {
-        "vid": "0x6873",
+    "vid": "0x6873",
-        "pid": "0x6464",
+    "pid": "0x6464",
-        "device_version": "0.0.1"
+    "device_version": "0.0.1"
-    },
+  },
+  "matrix_pins": {
+    "cols": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7"],
+    "rows": ["D0", "D1", "D2", "D3", "D4", "D5", "D6", "C2"]
+  },
+  "diode_direction": "COL2ROW",
  "indicators": {
    "caps_lock": "C5",
  },
diff --git a/keyboards/alt34/rev1/config.h b/keyboards/alt34/rev1/config.h
index 60e4a857cf..ffff9dc8c6 100644
--- a/keyboards/alt34/rev1/config.h
+++ b/keyboards/alt34/rev1/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-// wiring of each half
-#define MATRIX_ROW_PINS { D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { B6, B2, B3, B1, F7 }
-#define DIODE_DIRECTION COL2ROW
 /* 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/alt34/rev1/info.json b/keyboards/alt34/rev1/info.json
index ce9e5388d7..b49357c686 100644
--- a/keyboards/alt34/rev1/info.json
+++ b/keyboards/alt34/rev1/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0001",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["B6", "B2", "B3", "B1", "F7"],
+        "rows": ["D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "community_layouts": ["split_3x5_2"],
diff --git a/keyboards/amag23/config.h b/keyboards/amag23/config.h
index 82e82fc469..34e622bfb3 100644
--- a/keyboards/amag23/config.h
+++ b/keyboards/amag23/config.h
@@ -15,13 +15,6 @@
 */
 #pragma once
-#define MATRIX_ROW_PINS { A0, A1, A2, A3 }
-#define MATRIX_COL_PINS { B0, B1, B2, B3, B4, B5 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
 #define RGBLED_NUM 7
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/amag23/info.json b/keyboards/amag23/info.json
index 822f18c906..de2e733507 100644
--- a/keyboards/amag23/info.json
+++ b/keyboards/amag23/info.json
@@ -8,6 +8,11 @@
        "pid": "0x2323",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["B0", "B1", "B2", "B3", "B4", "B5"],
+        "rows": ["A0", "A1", "A2", "A3"]
+    },
+    "diode_direction": "ROW2COL",
    "processor": "atmega32a",
    "bootloader": "bootloadhid",
    "layouts": {
diff --git a/keyboards/amjkeyboard/amj40/config.h b/keyboards/amjkeyboard/amj40/config.h
index bdefff8c4f..f14e2fb185 100755
--- a/keyboards/amjkeyboard/amj40/config.h
+++ b/keyboards/amjkeyboard/amj40/config.h
@@ -17,15 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-// ROWS: Top to bottom, COLS: Left to right
-#define MATRIX_ROW_PINS { F4, F5, F6, F7}
-#define MATRIX_COL_PINS { F1, F0, E6, C7, C6, B0, D4, B1, B7, B5, B4, D7}
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 /* 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/amjkeyboard/amj40/info.json b/keyboards/amjkeyboard/amj40/info.json
index fe66c34b86..60eeb456f4 100644
--- a/keyboards/amjkeyboard/amj40/info.json
+++ b/keyboards/amjkeyboard/amj40/info.json
@@ -8,6 +8,11 @@
        "pid": "0x6072",
        "device_version": "0.0.2"
    },
+    "matrix_pins": {
+        "cols": ["F1", "F0", "E6", "C7", "C6", "B0", "D4", "B1", "B7", "B5", "B4", "D7"],
+        "rows": ["F4", "F5", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
    "backlight": {
        "pin": "B6",
        "levels": 4
diff --git a/keyboards/amjkeyboard/amj60/config.h b/keyboards/amjkeyboard/amj60/config.h
index 0a38f73032..0f15b43161 100644
--- a/keyboards/amjkeyboard/amj60/config.h
+++ b/keyboards/amjkeyboard/amj60/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/*
- * 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 { F7, F6, F5, F4, D5 }
-#define MATRIX_COL_PINS { F1, F0, E6, C7, C6, B0, D4, B1, B7, B5, B4, D7, D6, B3 }
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 #define RGB_DI_PIN E2
 #ifdef RGB_DI_PIN
 #    define RGBLED_NUM 8
diff --git a/keyboards/amjkeyboard/amj60/info.json b/keyboards/amjkeyboard/amj60/info.json
index d624894691..2f322c3bb6 100644
--- a/keyboards/amjkeyboard/amj60/info.json
+++ b/keyboards/amjkeyboard/amj60/info.json
@@ -8,6 +8,11 @@
        "pid": "0x6066",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F1", "F0", "E6", "C7", "C6", "B0", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3"],
+        "rows": ["F7", "F6", "F5", "F4", "D5"]
+    },
+    "diode_direction": "COL2ROW",
    "backlight": {
        "pin": "B6",
        "levels": 4,
diff --git a/keyboards/amjkeyboard/amj66/config.h b/keyboards/amjkeyboard/amj66/config.h
index 7271119876..b48aca7770 100644
--- a/keyboards/amjkeyboard/amj66/config.h
+++ b/keyboards/amjkeyboard/amj66/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS { F7, F6, F5, F4, F1 }
-#define MATRIX_COL_PINS { F0, B3, B2, B1, B0, B7, D0, D1, D2, D3, D5, D6, D7, B4, B5, B6 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/amjkeyboard/amj66/info.json b/keyboards/amjkeyboard/amj66/info.json
index ed41d4d58c..277d2ed790 100644
--- a/keyboards/amjkeyboard/amj66/info.json
+++ b/keyboards/amjkeyboard/amj66/info.json
@@ -8,6 +8,11 @@
        "pid": "0xBD66",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F0", "B3", "B2", "B1", "B0", "B7", "D0", "D1", "D2", "D3", "D5", "D6", "D7", "B4", "B5", "B6"],
+        "rows": ["F7", "F6", "F5", "F4", "F1"]
+    },
+    "diode_direction": "COL2ROW",
    "backlight": {
        "pin": "D4",
        "breathing": true
diff --git a/keyboards/amjkeyboard/amj84/config.h b/keyboards/amjkeyboard/amj84/config.h
index 7aef945e5b..da28e92400 100644
--- a/keyboards/amjkeyboard/amj84/config.h
+++ b/keyboards/amjkeyboard/amj84/config.h
@@ -3,23 +3,6 @@
 #pragma once
-/*
- * 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 { D0, F7, F6, F5, F4, D5 }
-#define MATRIX_COL_PINS { F1, F0, E6, C7, C6, B0, D4, B1, B7, B5, B4, D7, D6, B3, D1 }
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 /* 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/amjkeyboard/amj84/info.json b/keyboards/amjkeyboard/amj84/info.json
index 20f8fd99b1..aeb6194445 100644
--- a/keyboards/amjkeyboard/amj84/info.json
+++ b/keyboards/amjkeyboard/amj84/info.json
@@ -8,6 +8,11 @@
        "pid": "0x6068",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F1", "F0", "E6", "C7", "C6", "B0", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3", "D1"],
+        "rows": ["D0", "F7", "F6", "F5", "F4", "D5"]
+    },
+    "diode_direction": "COL2ROW",
    "backlight": {
        "pin": "B6",
        "breathing": true
diff --git a/keyboards/amjkeyboard/amjpad/config.h b/keyboards/amjkeyboard/amjpad/config.h
index 63e6e899fa..02b595d6f7 100644
--- a/keyboards/amjkeyboard/amjpad/config.h
+++ b/keyboards/amjkeyboard/amjpad/config.h
@@ -17,15 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-// ROWS: Top to bottom, COLS: Left to right
-#define MATRIX_ROW_PINS { F7, F6, F5, F4, D5, D0 }
-#define MATRIX_COL_PINS { F1, F0, E6, C7 }
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 /* 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/amjkeyboard/amjpad/info.json b/keyboards/amjkeyboard/amjpad/info.json
index 7a22d14639..3bd3a7f24c 100644
--- a/keyboards/amjkeyboard/amjpad/info.json
+++ b/keyboards/amjkeyboard/amjpad/info.json
@@ -8,6 +8,11 @@
    "pid": "0x6060",
    "device_version": "0.0.3"
  },
+  "matrix_pins": {
+    "cols": ["F1", "F0", "E6", "C7"],
+    "rows": ["F7", "F6", "F5", "F4", "D5", "D0"]
+  },
+  "diode_direction": "COL2ROW",
  "backlight": {
    "pin": "B6",
    "levels": 4
diff --git a/keyboards/ano/config.h b/keyboards/ano/config.h
index df6d076d5c..296abfa02e 100644
--- a/keyboards/ano/config.h
+++ b/keyboards/ano/config.h
@@ -16,11 +16,6 @@
 
 #pragma once
-#define MATRIX_ROW_PINS { A4, B14, B15, B9, B10, B11 }
-#define MATRIX_COL_PINS { B0, B1, B2, B3, B4, B5, B6, B7, A5, A6, A7, A8, A15, A2, A1, A0, B8, B13 }
-#define DIODE_DIRECTION COL2ROW
 #define TAP_CODE_DELAY 10
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/ano/info.json b/keyboards/ano/info.json
index 19d53a9ce1..fd4ff724b8 100644
--- a/keyboards/ano/info.json
+++ b/keyboards/ano/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0651",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "A5", "A6", "A7", "A8", "A15", "A2", "A1", "A0", "B8", "B13"],
+        "rows": ["A4", "B14", "B15", "B9", "B10", "B11"]
+    },
+    "diode_direction": "COL2ROW",
    "encoder": {
        "rotary": [
            {"pin_a": "B12", "pin_b": "A14", "resolution": 2}
diff --git a/keyboards/anomalykb/a65i/config.h b/keyboards/anomalykb/a65i/config.h
index 4e13b2edd9..947f85bbb2 100644
--- a/keyboards/anomalykb/a65i/config.h
+++ b/keyboards/anomalykb/a65i/config.h
@@ -17,12 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-#define MATRIX_ROW_PINS { B3, B2, B1, B0, B5 }
-#define MATRIX_COL_PINS { D7, D6, D4, B4, B6, E6, F1, B7, C6, C7, D5, D3, D2, F0, D1, D0 }
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/anomalykb/a65i/info.json b/keyboards/anomalykb/a65i/info.json
index d3307d7964..f5054f1b20 100644
--- a/keyboards/anomalykb/a65i/info.json
+++ b/keyboards/anomalykb/a65i/info.json
@@ -7,6 +7,11 @@
        "pid": "0x0004",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["D7", "D6", "D4", "B4", "B6", "E6", "F1", "B7", "C6", "C7", "D5", "D3", "D2", "F0", "D1", "D0"],
+        "rows": ["B3", "B2", "B1", "B0", "B5"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layout_aliases": {
diff --git a/keyboards/aos/tkl/config.h b/keyboards/aos/tkl/config.h
index 466eff89af..84928fb975 100644
--- a/keyboards/aos/tkl/config.h
+++ b/keyboards/aos/tkl/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-#define MATRIX_ROW_PINS { D3, D2, B7, F1, C7, D5 }
-#define MATRIX_COL_PINS { B0, B1, B2, B3, F4, F5, F6, F7, B6, B5, D7, B4, D6, F0, D1, C6, D4 }
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/aos/tkl/info.json b/keyboards/aos/tkl/info.json
index c6d37930a4..06a8892c63 100644
--- a/keyboards/aos/tkl/info.json
+++ b/keyboards/aos/tkl/info.json
@@ -7,6 +7,11 @@
        "pid": "0x1000",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["B0", "B1", "B2", "B3", "F4", "F5", "F6", "F7", "B6", "B5", "D7", "B4", "D6", "F0", "D1", "C6", "D4"],
+        "rows": ["D3", "D2", "B7", "F1", "C7", "D5"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/aozora/config.h b/keyboards/aozora/config.h
index dc68828e0f..5171d0c312 100644
--- a/keyboards/aozora/config.h
+++ b/keyboards/aozora/config.h
@@ -16,21 +16,5 @@
 #pragma once
-/*
- * 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 { F6, F5, F4, F1, F0 }
-#define MATRIX_COL_PINS { B0, B1, B2, B3, B7, D0, D1, D4, D6, D7, B4, B5, B6, C6, C7, F7, D2}
-#define DIODE_DIRECTION COL2ROW
 /* EEPROM for via */
 #define DYNAMIC_KEYMAP_LAYER_COUNT 2
diff --git a/keyboards/aozora/info.json b/keyboards/aozora/info.json
index b385261282..b49708a336 100644
--- a/keyboards/aozora/info.json
+++ b/keyboards/aozora/info.json
@@ -8,6 +8,11 @@
        "pid": "0xE86A",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["B0", "B1", "B2", "B3", "B7", "D0", "D1", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "D2"],
+        "rows": ["F6", "F5", "F4", "F1", "F0"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/aplyard/aplx6/rev1/config.h b/keyboards/aplyard/aplx6/rev1/config.h
deleted file mode 100644
index cd4a58eec5..0000000000
--- a/keyboards/aplyard/aplx6/rev1/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-Copyright 2020 April Aplyard <alex.fragiou@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
-/* pin-out */
-#define MATRIX_ROW_PINS { E6, B3 }
-#define MATRIX_COL_PINS { F7, B6, F4 }
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/aplyard/aplx6/rev1/info.json b/keyboards/aplyard/aplx6/rev1/info.json
index 6a1ac3071b..167699150f 100644
--- a/keyboards/aplyard/aplx6/rev1/info.json
+++ b/keyboards/aplyard/aplx6/rev1/info.json
@@ -3,6 +3,11 @@
        "pid": "0x0030",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F7", "B6", "F4"],
+        "rows": ["E6", "B3"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "caterina"
 }
diff --git a/keyboards/aplyard/aplx6/rev2/config.h b/keyboards/aplyard/aplx6/rev2/config.h
index f2793935cb..2724ccf117 100644
--- a/keyboards/aplyard/aplx6/rev2/config.h
+++ b/keyboards/aplyard/aplx6/rev2/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/* 9Key PCB default pin-out */
-#define MATRIX_ROW_PINS { B4, B5 }
-#define MATRIX_COL_PINS { C6, D7, E6 }
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 #define TAPPING_TERM 200
 #define TAP_CODE_DELAY 50
diff --git a/keyboards/aplyard/aplx6/rev2/info.json b/keyboards/aplyard/aplx6/rev2/info.json
index 114894a714..726dab814c 100644
--- a/keyboards/aplyard/aplx6/rev2/info.json
+++ b/keyboards/aplyard/aplx6/rev2/info.json
@@ -3,6 +3,11 @@
        "pid": "0x0040",
        "device_version": "0.0.2"
    },
+    "matrix_pins": {
+        "cols": ["C6", "D7", "E6"],
+        "rows": ["B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
    "encoder": {
        "rotary": [
            {"pin_a": "F5", "pin_b": "F4"}
diff --git a/keyboards/arabica37/rev1/config.h b/keyboards/arabica37/rev1/config.h
index 495e8dcb32..62111b4b71 100644
--- a/keyboards/arabica37/rev1/config.h
+++ b/keyboards/arabica37/rev1/config.h
@@ -18,14 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-#define MATRIX_ROW_PINS { D4, C6, D7, E6 }
-// wiring of each half
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 }
-// #define MATRIX_COL_PINS { B2, B3, B1, F7, F6, F5, F4 } //uncomment this line and comment line above if you need to reverse left-to-right key order
-#define DIODE_DIRECTION COL2ROW
 /* ws2812 RGB LED */
 #define RGB_DI_PIN D3
diff --git a/keyboards/arabica37/rev1/info.json b/keyboards/arabica37/rev1/info.json
index 3629bf761f..36ff667df1 100644
--- a/keyboards/arabica37/rev1/info.json
+++ b/keyboards/arabica37/rev1/info.json
@@ -8,6 +8,11 @@
        "pid": "0x3060",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
+        "rows": ["D4", "C6", "D7", "E6"]
+    },
+    "diode_direction": "COL2ROW",
    "split": {
        "soft_serial_pin": "D2"
    },
diff --git a/keyboards/ares/config.h b/keyboards/ares/config.h
index 3d384af9ea..ddc21dae30 100644
--- a/keyboards/ares/config.h
+++ b/keyboards/ares/config.h
@@ -20,11 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLED_NUM 16
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4 }
-#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 }
-#define DIODE_DIRECTION COL2ROW
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/ares/info.json b/keyboards/ares/info.json
index 391c7a8125..ecbe2c18dc 100644
--- a/keyboards/ares/info.json
+++ b/keyboards/ares/info.json
@@ -8,6 +8,11 @@
        "pid": "0x422D",
        "device_version": "2.0.0"
    },
+    "matrix_pins": {
+        "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "D7"],
+        "rows": ["B0", "B1", "B2", "B3", "B4"]
+    },
+    "diode_direction": "COL2ROW",
    "backlight": {
        "pin": "D4"
    },
diff --git a/keyboards/arisu/config.h b/keyboards/arisu/config.h
index 5001da5590..3cf449a32b 100644
--- a/keyboards/arisu/config.h
+++ b/keyboards/arisu/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/*
- * 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 { D0, D1, D2, D3, D5 }
-#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B0, B7, B5, B4, D7, D6, B3 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
 /* 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/arisu/info.json b/keyboards/arisu/info.json
index 1fe2eadbe3..941f9a467d 100644
--- a/keyboards/arisu/info.json
+++ b/keyboards/arisu/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0000",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B0", "B7", "B5", "B4", "D7", "D6", "B3"],
+        "rows": ["D0", "D1", "D2", "D3", "D5"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/ash1800/config.h b/keyboards/ash1800/config.h
index c48bc4ec6a..2f259d40f6 100644
--- a/keyboards/ash1800/config.h
+++ b/keyboards/ash1800/config.h
@@ -17,27 +17,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/*
- * 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 { C6, B6, B5, B4, D7, D0, D1, D2, D3, D5, D4, D6 }
-#define MATRIX_COL_PINS { F1, F4, F5, F6, B0, B2, B1, B3, B7, C7 }
 #define NUM_LOCK_LED_PIN E6
 #define CAPS_LOCK_LED_PIN F0
 #define SCROLL_LOCK_LED_PIN F7
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
 /* 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/ash1800/info.json b/keyboards/ash1800/info.json
index 2c9338b2f6..e843d52f2b 100644
--- a/keyboards/ash1800/info.json
+++ b/keyboards/ash1800/info.json
@@ -7,6 +7,11 @@
        "pid": "0x1800",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F1", "F4", "F5", "F6", "B0", "B2", "B1", "B3", "B7", "C7"],
+        "rows": ["C6", "B6", "B5", "B4", "D7", "D0", "D1", "D2", "D3", "D5", "D4", "D6"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/ash_xiix/config.h b/keyboards/ash_xiix/config.h
index e21327b99c..8f81c450eb 100644
--- a/keyboards/ash_xiix/config.h
+++ b/keyboards/ash_xiix/config.h
@@ -14,27 +14,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/*
- * 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 { C6, B6, B5, B4, D7, D0, D1, D2, D3, D5, D4, D6 }
-#define MATRIX_COL_PINS { F1, F4, F5, F6, B0, B2, B1, B3, B7, C7 }
 #define NUM_LOCK_LED_PIN E6
 #define CAPS_LOCK_LED_PIN F0
 #define SCROLL_LOCK_LED_PIN F7
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 #define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/ash_xiix/info.json b/keyboards/ash_xiix/info.json
index 4bc7fb1987..3eaa711e31 100644
--- a/keyboards/ash_xiix/info.json
+++ b/keyboards/ash_xiix/info.json
@@ -8,6 +8,11 @@
        "pid": "0x14BC",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F1", "F4", "F5", "F6", "B0", "B2", "B1", "B3", "B7", "C7"],
+        "rows": ["C6", "B6", "B5", "B4", "D7", "D0", "D1", "D2", "D3", "D5", "D4", "D6"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/ashpil/modelm_usbc/config.h b/keyboards/ashpil/modelm_usbc/config.h
deleted file mode 100644
index 00c5f5626b..0000000000
--- a/keyboards/ashpil/modelm_usbc/config.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-Copyright 2019 ashpil
-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
-/*
- * 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 { C7, C6, C5, C4, C3, C2, C1, C0 }
-#define MATRIX_COL_PINS { E6, E7, F0, F1, F2, F3, F4, F5, F6, F7, A0, A1, A2, A3, A4, A5 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-/*
- * 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
diff --git a/keyboards/ashpil/modelm_usbc/info.json b/keyboards/ashpil/modelm_usbc/info.json
index c048dd047a..f34dfa63fe 100644
--- a/keyboards/ashpil/modelm_usbc/info.json
+++ b/keyboards/ashpil/modelm_usbc/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0000",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["E6", "E7", "F0", "F1", "F2", "F3", "F4", "F5", "F6", "F7", "A0", "A1", "A2", "A3", "A4", "A5"],
+        "rows": ["C7", "C6", "C5", "C4", "C3", "C2", "C1", "C0"]
+    },
+    "diode_direction": "ROW2COL",
    "bootmagic": {
        "matrix": [0, 2]
    },
diff --git a/keyboards/at_at/660m/config.h b/keyboards/at_at/660m/config.h
index bf47051193..70ad2757b9 100644
--- a/keyboards/at_at/660m/config.h
+++ b/keyboards/at_at/660m/config.h
@@ -23,10 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* LSE clock */
 #define STM32_LSECLK 32768
-#define MATRIX_COL_PINS { B15, B14, B13, B12, B11, B10, B2, B1, B9, B8, B7, B6, B5, B3, B4, B0 }
-#define MATRIX_ROW_PINS { A3, A4, A5, A0, A1 }
-#define DIODE_DIRECTION COL2ROW
 /* 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/at_at/660m/info.json b/keyboards/at_at/660m/info.json
index 49af285177..4fdd84daeb 100644
--- a/keyboards/at_at/660m/info.json
+++ b/keyboards/at_at/660m/info.json
@@ -8,6 +8,11 @@
        "pid": "0x6600",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B9", "B8", "B7", "B6", "B5", "B3", "B4", "B0"],
+        "rows": ["A3", "A4", "A5", "A0", "A1"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "STM32F072",
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/atlantis/ak81_ve/config.h b/keyboards/atlantis/ak81_ve/config.h
index 7379856a4f..9790c75556 100644
--- a/keyboards/atlantis/ak81_ve/config.h
+++ b/keyboards/atlantis/ak81_ve/config.h
@@ -16,17 +16,9 @@
 #pragma once
-/* Key matrix pins */
-#define MATRIX_ROW_PINS { F1, F7, F6, F5, F4, D5 }
-#define MATRIX_COL_PINS { F0, C7, C6, B6, B5, B4, D7, D6, B2, B7, D3, D2, D1, D0, B3 }
 #define ENCODERS_CCW_KEY { { 4, 5 } } // Note:  array is { col, row )
 #define ENCODERS_CW_KEY  { { 3, 5 } } // Note:  array is { col, row )
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/atlantis/ak81_ve/info.json b/keyboards/atlantis/ak81_ve/info.json
index 0269bd1e27..eb731f3860 100644
--- a/keyboards/atlantis/ak81_ve/info.json
+++ b/keyboards/atlantis/ak81_ve/info.json
@@ -7,6 +7,11 @@
        "pid": "0x0081",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F0", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "B2", "B7", "D3", "D2", "D1", "D0", "B3"],
+        "rows": ["F1", "F7", "F6", "F5", "F4", "D5"]
+    },
+    "diode_direction": "COL2ROW",
    "encoder": {
        "rotary": [
            {"pin_a": "E6", "pin_b": "B0"}
diff --git a/keyboards/atlas_65/config.h b/keyboards/atlas_65/config.h
index 78beebcc65..d0851ac1fd 100644
--- a/keyboards/atlas_65/config.h
+++ b/keyboards/atlas_65/config.h
@@ -16,23 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/*
- * 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 { D0, D1, D2, D3, D5 }
-#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B0, B7, B5, B4, D7, D6, B3 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
 /* 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/atlas_65/info.json b/keyboards/atlas_65/info.json
index 7d755c37bf..af2487f604 100644
--- a/keyboards/atlas_65/info.json
+++ b/keyboards/atlas_65/info.json
@@ -8,6 +8,11 @@
        "pid": "0x1000",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B0", "B7", "B5", "B4", "D7", "D6", "B3"],
+        "rows": ["D0", "D1", "D2", "D3", "D5"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/atomic/config.h b/keyboards/atomic/config.h
index 9c50c21e3f..b9449c4714 100644
--- a/keyboards/atomic/config.h
+++ b/keyboards/atomic/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/*
- * 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 { D0, D5, B5, B6, C6 }
-#define MATRIX_COL_PINS { F1, F0, B0, C7, F4, F5, F6, F7, D4, D6, B4, D7, D3, D2, D1 }
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 /* 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/atomic/info.json b/keyboards/atomic/info.json
index 95f5088995..0324d8533e 100644
--- a/keyboards/atomic/info.json
+++ b/keyboards/atomic/info.json
@@ -7,6 +7,11 @@
        "pid": "0x6060",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F1", "F0", "B0", "C7", "F4", "F5", "F6", "F7", "D4", "D6", "B4", "D7", "D3", "D2", "D1"],
+        "rows": ["D0", "D5", "B5", "B6", "C6"]
+    },
+    "diode_direction": "COL2ROW",
    "backlight": {
        "pin": "B7"
    },
diff --git a/keyboards/atreus/astar/config.h b/keyboards/atreus/astar/config.h
deleted file mode 100644
index 90bf37823d..0000000000
--- a/keyboards/atreus/astar/config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2019
- *
- * 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
-/*
- * 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 { D0, D1, D3, D2 }
-#if defined(PCBDOWN)
-  #define MATRIX_COL_PINS { B7, D6, F7, F6, B6, D4, E6, B4, B5, C6, D7 }
-#else
-  #define MATRIX_COL_PINS { D7, C6, B5, B4, E6, D4, B6, F6, F7, D6, B7 }
-#endif
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/atreus/astar/info.json b/keyboards/atreus/astar/info.json
index 4369a04103..e201078ffe 100644
--- a/keyboards/atreus/astar/info.json
+++ b/keyboards/atreus/astar/info.json
@@ -1,4 +1,9 @@
 {
+    "matrix_pins": {
+        "cols": ["D7", "C6", "B5", "B4", "E6", "D4", "B6", "F6", "F7", "D6", "B7"],
+        "rows": ["D0", "D1", "D3", "D2"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "caterina"
 }
diff --git a/keyboards/atreus/astar_mirrored/config.h b/keyboards/atreus/astar_mirrored/config.h
index 83c9cf7fc6..3bd163dec3 100644
--- a/keyboards/atreus/astar_mirrored/config.h
+++ b/keyboards/atreus/astar_mirrored/config.h
@@ -16,21 +16,4 @@
 #pragma once
-/*
- * 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 PCBDOWN 1
-#define MATRIX_ROW_PINS { D0, D1, D3, D2 }
-#define MATRIX_COL_PINS { B7, D6, F7, F6, B6, D4, E6, B4, B5, C6, D7 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/atreus/astar_mirrored/info.json b/keyboards/atreus/astar_mirrored/info.json
index 4369a04103..b83be5d29d 100644
--- a/keyboards/atreus/astar_mirrored/info.json
+++ b/keyboards/atreus/astar_mirrored/info.json
@@ -1,4 +1,9 @@
 {
+    "matrix_pins": {
+        "cols": ["B7", "D6", "F7", "F6", "B6", "D4", "E6", "B4", "B5", "C6", "D7"],
+        "rows": ["D0", "D1", "D3", "D2"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "caterina"
 }
diff --git a/keyboards/atreus/f103/config.h b/keyboards/atreus/f103/config.h
deleted file mode 100644
index d6d3b033dd..0000000000
--- a/keyboards/atreus/f103/config.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2022 DmNosachev
- *
- * 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
-/*
- * 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)
- *
-*/
-/* key matrix pins */
-#define MATRIX_COL_PINS { B10, B1, B0, A7, A6, B5, B4, B3, A15, A10, A9 }
-#define MATRIX_ROW_PINS { A5, A4, A3, A2 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/atreus/f103/info.json b/keyboards/atreus/f103/info.json
index cf993be247..341ed4e8e6 100644
--- a/keyboards/atreus/f103/info.json
+++ b/keyboards/atreus/f103/info.json
@@ -1,4 +1,9 @@
 {
+    "matrix_pins": {
+        "cols": ["B10", "B1", "B0", "A7", "A6", "B5", "B4", "B3", "A15", "A10", "A9"],
+        "rows": ["A5", "A4", "A3", "A2"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "STM32F103",
    "bootloader": "stm32duino"
 }
diff --git a/keyboards/atreus/feather/config.h b/keyboards/atreus/feather/config.h
index 34880f0e3e..505296a505 100644
--- a/keyboards/atreus/feather/config.h
+++ b/keyboards/atreus/feather/config.h
@@ -16,23 +16,4 @@
 #pragma once
-/*
- * 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 { D0, D1, D3, D2 }
-// #define MATRIX_COL_PINS { D7, C6, B5, B4, E6, D4, B6, F6, F7, D6, B7 }
-#define MATRIX_ROW_PINS { B7, D6, C7, F5 }
-#define MATRIX_COL_PINS { D7, B5, D1, D0, C6, B6, F0, D2, D3, F4, F1 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
 #define OUTPUT_AUTO_ENABLE
diff --git a/keyboards/atreus/feather/info.json b/keyboards/atreus/feather/info.json
index 4369a04103..1f70534b7f 100644
--- a/keyboards/atreus/feather/info.json
+++ b/keyboards/atreus/feather/info.json
@@ -1,4 +1,9 @@
 {
+    "matrix_pins": {
+        "cols": ["D7", "B5", "D1", "D0", "C6", "B6", "F0", "D2", "D3", "F4", "F1"],
+        "rows": ["B7", "D6", "C7", "F5"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "caterina"
 }
diff --git a/keyboards/atreus/promicro/config.h b/keyboards/atreus/promicro/config.h
deleted file mode 100644
index 6c0dd1d4b9..0000000000
--- a/keyboards/atreus/promicro/config.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright 2019
- *
- * 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
-/*
- * 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)
- *
-*/
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F4, B2, B4, B5 }
-#if defined(PCBDOWN)
-  #define MATRIX_COL_PINS { D0, D4, C6, D7, E6, B6, B3, B1, F7, F6, F5 }
-#else
-  #define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B6, E6, D7, C6, D4, D0 }
-#endif
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/atreus/promicro/info.json b/keyboards/atreus/promicro/info.json
index 4369a04103..e614b4e2a0 100644
--- a/keyboards/atreus/promicro/info.json
+++ b/keyboards/atreus/promicro/info.json
@@ -1,4 +1,9 @@
 {
+    "matrix_pins": {
+        "cols": ["F5", "F6", "F7", "B1", "B3", "B6", "E6", "D7", "C6", "D4", "D0"],
+        "rows": ["F4", "B2", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "caterina"
 }
diff --git a/keyboards/atreus/teensy2/config.h b/keyboards/atreus/teensy2/config.h
deleted file mode 100644
index 4664561f9b..0000000000
--- a/keyboards/atreus/teensy2/config.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2019
- *
- * 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
-/*
- * 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 { D0, D1, D2, D3 }
-#define MATRIX_COL_PINS { F6, F5, F4, B7, B6, B5, B4, B3, B2, B1, B0 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/atreus/teensy2/info.json b/keyboards/atreus/teensy2/info.json
index 0b2db81c11..067ea9a01d 100644
--- a/keyboards/atreus/teensy2/info.json
+++ b/keyboards/atreus/teensy2/info.json
@@ -1,4 +1,9 @@
 {
+    "matrix_pins": {
+        "cols": ["F6", "F5", "F4", "B7", "B6", "B5", "B4", "B3", "B2", "B1", "B0"],
+        "rows": ["D0", "D1", "D2", "D3"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "halfkay"
 }
diff --git a/keyboards/atreus62/config.h b/keyboards/atreus62/config.h
index b497998196..9b7700e013 100644
--- a/keyboards/atreus62/config.h
+++ b/keyboards/atreus62/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-// wiring of each half
-#define MATRIX_ROW_PINS { D2, D3, D1, D0, D4 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, B5, B4, E6, D7, C6 }
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
 /* 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/atreus62/info.json b/keyboards/atreus62/info.json
index 9818475ace..0221f2c551 100644
--- a/keyboards/atreus62/info.json
+++ b/keyboards/atreus62/info.json
@@ -4,10 +4,15 @@
  "url": "",
  "maintainer": "qmk",
  "usb": {
-        "vid": "0xFEED",
+    "vid": "0xFEED",
-        "pid": "0x6062",
+    "pid": "0x6062",
-        "device_version": "0.0.1"
+    "device_version": "0.0.1"
-    },
+  },
+  "matrix_pins": {
+    "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "B5", "B4", "E6", "D7", "C6"],
+    "rows": ["D2", "D3", "D1", "D0", "D4"]
+  },
+  "diode_direction": "ROW2COL",
  "processor": "atmega32u4",
  "bootloader": "caterina",
  "layouts": {
diff --git a/keyboards/atreyu/rev1/config.h b/keyboards/atreyu/rev1/config.h
index 99eb2c21e6..d7c434426b 100644
--- a/keyboards/atreyu/rev1/config.h
+++ b/keyboards/atreyu/rev1/config.h
@@ -16,23 +16,6 @@
 #pragma once
-/*
- * 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 { D7, E6, B4, B5, F6, F7, B1, B3, B6, B2 }
-#define MATRIX_COL_PINS { C6, D4, D0, D1, D2, D3 }
-/* COL2ROW, ROW2COL, or CUSTOM_MATRIX */
-#define DIODE_DIRECTION COL2ROW
- 
 /* 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/atreyu/rev1/info.json b/keyboards/atreyu/rev1/info.json
index 6d191d0635..00012812a4 100644
--- a/keyboards/atreyu/rev1/info.json
+++ b/keyboards/atreyu/rev1/info.json
@@ -8,6 +8,11 @@
      "pid": "0x0001",
      "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["C6", "D4", "D0", "D1", "D2", "D3"],
+        "rows": ["D7", "E6", "B4", "B5", "F6", "F7", "B1", "B3", "B6", "B2"]
+    },
+    "diode_direction": "COL2ROW",
    "encoder": {
        "rotary": [
            {"pin_a": "F5", "pin_b": "F4"}
diff --git a/keyboards/atreyu/rev2/config.h b/keyboards/atreyu/rev2/config.h
index de63cf3bd1..d7c434426b 100644
--- a/keyboards/atreyu/rev2/config.h
+++ b/keyboards/atreyu/rev2/config.h
@@ -16,23 +16,6 @@
 #pragma once
-/*
- * 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 { D7, E6, B4, B5, F6, F7, B1, B3, B6, B2 }
-#define MATRIX_COL_PINS { F4, F5, C6, D4, D2, D3 }
-/* COL2ROW, ROW2COL, or CUSTOM_MATRIX */
-#define DIODE_DIRECTION COL2ROW
- 
 /* 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/atreyu/rev2/info.json b/keyboards/atreyu/rev2/info.json
index a890b8d271..707f8554e0 100644
--- a/keyboards/atreyu/rev2/info.json
+++ b/keyboards/atreyu/rev2/info.json
@@ -8,6 +8,11 @@
      "pid": "0x0001",
      "device_version": "0.0.2"
    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "C6", "D4", "D2", "D3"],
+        "rows": ["D7", "E6", "B4", "B5", "F6", "F7", "B1", "B3", "B6", "B2"]
+    },
+    "diode_direction": "COL2ROW",
    "encoder": {
        "rotary": [
            {"pin_a": "D5", "pin_b": "B7"},
diff --git a/keyboards/atset/at1/config.h b/keyboards/atset/at1/config.h
index 11b4549d46..dc6abdcaf2 100644
--- a/keyboards/atset/at1/config.h
+++ b/keyboards/atset/at1/config.h
@@ -15,13 +15,6 @@
 #pragma once
-#define MATRIX_ROW_PINS { D2 }
-#define MATRIX_COL_PINS { B6 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
 /* 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/atset/at1/info.json b/keyboards/atset/at1/info.json
index 8e68513a43..85b848e8d6 100644
--- a/keyboards/atset/at1/info.json
+++ b/keyboards/atset/at1/info.json
@@ -7,6 +7,11 @@
    "pid": "0x6060",
    "device_version": "0.0.1"
  },
+  "matrix_pins": {
+    "cols": ["B6"],
+    "rows": ["D2"]
+  },
+  "diode_direction": "COL2ROW",
  "processor": "atmega32u4",
  "bootloader": "atmel-dfu",
  "layouts": {
diff --git a/keyboards/atset/at12/config.h b/keyboards/atset/at12/config.h
index 77ace78035..dc6abdcaf2 100644
--- a/keyboards/atset/at12/config.h
+++ b/keyboards/atset/at12/config.h
@@ -15,13 +15,6 @@
 #pragma once
-#define MATRIX_ROW_PINS { D3, D2, D1, D0 }
-#define MATRIX_COL_PINS { B6, B5, B4 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
 /* 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/atset/at12/info.json b/keyboards/atset/at12/info.json
index e7914318b8..7708afac20 100644
--- a/keyboards/atset/at12/info.json
+++ b/keyboards/atset/at12/info.json
@@ -7,6 +7,11 @@
    "pid": "0x6060",
    "device_version": "0.0.1"
  },
+  "matrix_pins": {
+    "cols": ["B6", "B5", "B4"],
+    "rows": ["D3", "D2", "D1", "D0"]
+  },
+  "diode_direction": "COL2ROW",
  "processor": "atmega32u4",
  "bootloader": "atmel-dfu",
  "layouts": {
diff --git a/keyboards/atset/at16/config.h b/keyboards/atset/at16/config.h
index 6db5e0ead5..dc6abdcaf2 100644
--- a/keyboards/atset/at16/config.h
+++ b/keyboards/atset/at16/config.h
@@ -15,13 +15,6 @@
 #pragma once
-#define MATRIX_ROW_PINS { D3, D2, D1, D0 }
-#define MATRIX_COL_PINS { B6, B5, B4, B2 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
 /* 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/atset/at16/info.json b/keyboards/atset/at16/info.json
index 3ea641eec9..2d5daf6ab1 100644
--- a/keyboards/atset/at16/info.json
+++ b/keyboards/atset/at16/info.json
@@ -7,6 +7,11 @@
    "pid": "0x6060",
    "device_version": "0.0.1"
  },
+  "matrix_pins": {
+    "cols": ["B6", "B5", "B4", "B2"],
+    "rows": ["D3", "D2", "D1", "D0"]
+  },
+  "diode_direction": "COL2ROW",
  "processor": "atmega32u4",
  "bootloader": "atmel-dfu",
  "community_layouts": ["ortho_4x4"],
diff --git a/keyboards/atset/at3/config.h b/keyboards/atset/at3/config.h
index b9d7f7c641..dc6abdcaf2 100644
--- a/keyboards/atset/at3/config.h
+++ b/keyboards/atset/at3/config.h
@@ -15,13 +15,6 @@
 #pragma once
-#define MATRIX_ROW_PINS { D2 }
-#define MATRIX_COL_PINS { B6, B5, B4 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
 /* 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/atset/at3/info.json b/keyboards/atset/at3/info.json
index 1241361d71..9f804fad1a 100644
--- a/keyboards/atset/at3/info.json
+++ b/keyboards/atset/at3/info.json
@@ -7,6 +7,11 @@
    "pid": "0x6060",
    "device_version": "0.0.1"
  },
+  "matrix_pins": {
+    "cols": ["B6", "B5", "B4"],
+    "rows": ["D2"]
+  },
+  "diode_direction": "COL2ROW",
  "processor": "atmega32u4",
  "bootloader": "atmel-dfu",
  "layouts": {
diff --git a/keyboards/atset/at6/config.h b/keyboards/atset/at6/config.h
index 522ad5fec3..dc6abdcaf2 100644
--- a/keyboards/atset/at6/config.h
+++ b/keyboards/atset/at6/config.h
@@ -15,13 +15,6 @@
 #pragma once
-#define MATRIX_ROW_PINS { D2, D1 }
-#define MATRIX_COL_PINS { B6, B5, B4 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
 /* 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/atset/at6/info.json b/keyboards/atset/at6/info.json
index 03be76e696..bfcbafdff5 100644
--- a/keyboards/atset/at6/info.json
+++ b/keyboards/atset/at6/info.json
@@ -7,6 +7,11 @@
    "pid": "0x6060",
    "device_version": "0.0.1"
  },
+  "matrix_pins": {
+    "cols": ["B6", "B5", "B4"],
+    "rows": ["D2", "D1"]
+  },
+  "diode_direction": "COL2ROW",
  "processor": "atmega32u4",
  "bootloader": "atmel-dfu",
  "layouts": {
diff --git a/keyboards/atset/at9/config.h b/keyboards/atset/at9/config.h
index cc0fa4cbc8..dc6abdcaf2 100644
--- a/keyboards/atset/at9/config.h
+++ b/keyboards/atset/at9/config.h
@@ -15,13 +15,6 @@
 #pragma once
-#define MATRIX_ROW_PINS { D2, D1, D0 }
-#define MATRIX_COL_PINS { B6, B5, B4 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
 /* 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/atset/at9/info.json b/keyboards/atset/at9/info.json
index ecff089964..2afafe5cef 100644
--- a/keyboards/atset/at9/info.json
+++ b/keyboards/atset/at9/info.json
@@ -7,6 +7,11 @@
    "pid": "0x6060",
    "device_version": "0.0.1"
  },
+  "matrix_pins": {
+    "cols": ["B6", "B5", "B4"],
+    "rows": ["D2", "D1", "D0"]
+  },
+  "diode_direction": "COL2ROW",
  "processor": "atmega32u4",
  "bootloader": "atmel-dfu",
  "layouts": {
diff --git a/keyboards/atxkb/1894/config.h b/keyboards/atxkb/1894/config.h
index e4f44cdfce..637150ae7b 100644
--- a/keyboards/atxkb/1894/config.h
+++ b/keyboards/atxkb/1894/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/*
- * 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 { B1, B2, B3, F0, F1 }
-#define MATRIX_COL_PINS { F4, F7, F5, F6, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
 #define RGB_DI_PIN D2
 #ifdef RGB_DI_PIN
  #define RGBLED_NUM 14
diff --git a/keyboards/atxkb/1894/info.json b/keyboards/atxkb/1894/info.json
index fef98bcacf..69615775b4 100644
--- a/keyboards/atxkb/1894/info.json
+++ b/keyboards/atxkb/1894/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0001",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F4", "F7", "F5", "F6", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3"],
+        "rows": ["B1", "B2", "B3", "F0", "F1"]
+    },
+    "diode_direction": "COL2ROW",
    "backlight": {
        "pin": "B7",
        "levels": 5,
diff --git a/keyboards/aurora65/config.h b/keyboards/aurora65/config.h
index 7b3f4608ea..38fa2c0881 100644
--- a/keyboards/aurora65/config.h
+++ b/keyboards/aurora65/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-#define MATRIX_ROW_PINS { B3, B4, B5, A8, A4 }
-#define MATRIX_COL_PINS { A13, A10, A9, A14, A15, B8, B9, B2, B1, B0, A0, A1, A2, A3, A5 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
 /* RGB Light */
 #define WS2812_PWM_DRIVER PWMD1
 #define WS2812_PWM_CHANNEL 3
diff --git a/keyboards/aurora65/info.json b/keyboards/aurora65/info.json
index 28adec5eab..3d7c71815a 100644
--- a/keyboards/aurora65/info.json
+++ b/keyboards/aurora65/info.json
@@ -8,6 +8,11 @@
        "pid": "0x4136",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["A13", "A10", "A9", "A14", "A15", "B8", "B9", "B2", "B1", "B0", "A0", "A1", "A2", "A3", "A5"],
+        "rows": ["B3", "B4", "B5", "A8", "A4"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "STM32F072",
    "bootloader": "stm32-dfu",
    "community_layouts": ["65_ansi_blocker"],
diff --git a/keyboards/avalanche/v1/config.h b/keyboards/avalanche/v1/config.h
deleted file mode 100644
index 940476e03a..0000000000
--- a/keyboards/avalanche/v1/config.h
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright 2022 Vitaly Volkov (@vlkv)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#pragma once
-#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6 }
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/avalanche/v1/info.json b/keyboards/avalanche/v1/info.json
index 518a0c0742..e8ce03904f 100644
--- a/keyboards/avalanche/v1/info.json
+++ b/keyboards/avalanche/v1/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0001",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["D4", "C6", "D7", "E6", "B4"]
+    },
+    "diode_direction": "COL2ROW",
    "split": {
        "soft_serial_pin": "D2"
    },
diff --git a/keyboards/avalanche/v2/config.h b/keyboards/avalanche/v2/config.h
index 3978f581e1..1b6ce7be90 100644
--- a/keyboards/avalanche/v2/config.h
+++ b/keyboards/avalanche/v2/config.h
@@ -3,11 +3,6 @@
 #pragma once
-#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 }
-#define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6 }
-#define DIODE_DIRECTION COL2ROW
 #define RGB_DI_PIN D3
 #define RGBLED_NUM 12
diff --git a/keyboards/avalanche/v2/info.json b/keyboards/avalanche/v2/info.json
index 7105fc1787..3289a95faf 100644
--- a/keyboards/avalanche/v2/info.json
+++ b/keyboards/avalanche/v2/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0002",
        "device_version": "0.0.2"
    },
+    "matrix_pins": {
+        "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["D4", "C6", "D7", "E6", "B4"]
+    },
+    "diode_direction": "COL2ROW",
    "encoder": {
        "rotary": [
            {"pin_a": "B5", "pin_b": "F4", "resolution": 2}
diff --git a/keyboards/avalanche/v3/config.h b/keyboards/avalanche/v3/config.h
index efe0c27932..699a7c88fa 100644
--- a/keyboards/avalanche/v3/config.h
+++ b/keyboards/avalanche/v3/config.h
@@ -3,11 +3,6 @@
 #pragma once
-#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 }
-#define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6 }
-#define DIODE_DIRECTION COL2ROW
 #define RGB_DI_PIN D3
 #define RGBLED_NUM 12
diff --git a/keyboards/avalanche/v3/info.json b/keyboards/avalanche/v3/info.json
index 70ffcc9efc..27ae1d8a13 100644
--- a/keyboards/avalanche/v3/info.json
+++ b/keyboards/avalanche/v3/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0003",
        "device_version": "0.0.3"
    },
+    "matrix_pins": {
+        "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["D4", "C6", "D7", "E6", "B4"]
+    },
+    "diode_direction": "COL2ROW",
    "encoder": {
        "rotary": [
            {"pin_a": "B5", "pin_b": "F4", "resolution": 2}
diff --git a/keyboards/avalanche/v4/config.h b/keyboards/avalanche/v4/config.h
index 86dff022e0..10d9ca889a 100644
--- a/keyboards/avalanche/v4/config.h
+++ b/keyboards/avalanche/v4/config.h
@@ -3,11 +3,6 @@
 #pragma once
-#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 }
-#define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6 }
-#define DIODE_DIRECTION COL2ROW
 #ifdef RGBLIGHT_ENABLE
 #    define RGB_DI_PIN D3
 #    define RGBLED_NUM 64
diff --git a/keyboards/avalanche/v4/info.json b/keyboards/avalanche/v4/info.json
index 5b31b5ca11..93207e83b1 100644
--- a/keyboards/avalanche/v4/info.json
+++ b/keyboards/avalanche/v4/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0004",
        "device_version": "0.0.4"
    },
+    "matrix_pins": {
+        "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["D4", "C6", "D7", "E6", "B4"]
+    },
+    "diode_direction": "COL2ROW",
    "encoder": {
        "rotary": [
            {"pin_a": "B5", "pin_b": "F4", "resolution": 2}
diff --git a/keyboards/aves60/config.h b/keyboards/aves60/config.h
index f8a64364ad..fef8226df6 100644
--- a/keyboards/aves60/config.h
+++ b/keyboards/aves60/config.h
@@ -3,23 +3,6 @@
 #pragma once
-/*
- * 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 { F6, F7, F5, F1, F4 }
-#define MATRIX_COL_PINS { B2, B3, D0, D1, D2, D3, C7, C6, B6, B5, B4, D7, D6, D4 }
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 #define RGB_DI_PIN D5
 #ifdef RGB_DI_PIN
 #define RGBLED_NUM 9
diff --git a/keyboards/aves60/info.json b/keyboards/aves60/info.json
index 71420c4423..3cb54d2180 100644
--- a/keyboards/aves60/info.json
+++ b/keyboards/aves60/info.json
@@ -8,6 +8,11 @@
        "pid": "0xD408",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["B2", "B3", "D0", "D1", "D2", "D3", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["F6", "F7", "F5", "F1", "F4"]
+    },
+    "diode_direction": "COL2ROW",
    "bootmagic": {
        "matrix": [4, 6]
    },
diff --git a/keyboards/aves65/config.h b/keyboards/aves65/config.h
index 9037aa13f4..00312ff335 100644
--- a/keyboards/aves65/config.h
+++ b/keyboards/aves65/config.h
@@ -17,15 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-// ROWS: Top to bottom, COLS: Left to right
-#define MATRIX_ROW_PINS {D4,D6,D7,B4,E6}
-#define MATRIX_COL_PINS {D0,D1,D2,D3,D5,B5,F0,F1,F4,F5,F6,F7,C7,C6,B6}
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 /* 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/aves65/info.json b/keyboards/aves65/info.json
index 8984465f07..26e9a7ab44 100644
--- a/keyboards/aves65/info.json
+++ b/keyboards/aves65/info.json
@@ -8,6 +8,11 @@
        "pid": "0x9038",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["D0", "D1", "D2", "D3", "D5", "B5", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6"],
+        "rows": ["D4", "D6", "D7", "B4", "E6"]
+    },
+    "diode_direction": "COL2ROW",
    "qmk_lufa_bootloader": {
        "esc_input": "D4",
        "esc_output": "D0"
diff --git a/keyboards/axolstudio/foundation_gamma/config.h b/keyboards/axolstudio/foundation_gamma/config.h
deleted file mode 100644
index c6cbb045b3..0000000000
--- a/keyboards/axolstudio/foundation_gamma/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-Copyright 2021 kb-elmo<mail@elmo.space>
-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
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS { B2, B1, B0, F7, F6, F5 }
-#define MATRIX_COL_PINS { C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0, B3, F4, F1, F0 }
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/axolstudio/foundation_gamma/info.json b/keyboards/axolstudio/foundation_gamma/info.json
index ecc7bcad90..aac82dd201 100644
--- a/keyboards/axolstudio/foundation_gamma/info.json
+++ b/keyboards/axolstudio/foundation_gamma/info.json
@@ -8,6 +8,11 @@
        "pid": "0xE3EB",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0", "B3", "F4", "F1", "F0"],
+        "rows": ["B2", "B1", "B0", "F7", "F6", "F5"]
+    },
+    "diode_direction": "COL2ROW",
    "indicators": {
        "caps_lock": "B7"
    },
diff --git a/keyboards/axolstudio/helpo/config.h b/keyboards/axolstudio/helpo/config.h
deleted file mode 100644
index 549e53672c..0000000000
--- a/keyboards/axolstudio/helpo/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-Copyright 2020 kb-elmo
-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
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS { A2, A3, A4, A5 }
-#define MATRIX_COL_PINS { A1, B4, B3, B2, B1 }
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/axolstudio/helpo/info.json b/keyboards/axolstudio/helpo/info.json
index 1174a32d05..c6d1d58f6c 100644
--- a/keyboards/axolstudio/helpo/info.json
+++ b/keyboards/axolstudio/helpo/info.json
@@ -8,6 +8,11 @@
        "pid": "0xC89F",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["A1", "B4", "B3", "B2", "B1"],
+        "rows": ["A2", "A3", "A4", "A5"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32a",
    "bootloader": "usbasploader",
    "layouts": {
diff --git a/keyboards/axolstudio/yeti/hotswap/config.h b/keyboards/axolstudio/yeti/hotswap/config.h
index 61f18a8b3a..694a6449f0 100644
--- a/keyboards/axolstudio/yeti/hotswap/config.h
+++ b/keyboards/axolstudio/yeti/hotswap/config.h
@@ -17,15 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS { E6, C6, B4, B5, B6 }
-#define MATRIX_COL_PINS { C7, F7, F6, F5, F4, F1, F0, B0, B1, B2, B3, B7, D2, D3, D5 }
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION ROW2COL
 /* RGB Matrix */
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/axolstudio/yeti/hotswap/info.json b/keyboards/axolstudio/yeti/hotswap/info.json
index 40aa7b8b70..064d987d13 100644
--- a/keyboards/axolstudio/yeti/hotswap/info.json
+++ b/keyboards/axolstudio/yeti/hotswap/info.json
@@ -8,6 +8,11 @@
    "pid": "0x9F9E",
    "device_version": "0.0.1"
  },
+  "matrix_pins": {
+    "cols": ["C7", "F7", "F6", "F5", "F4", "F1", "F0", "B0", "B1", "B2", "B3", "B7", "D2", "D3", "D5"],
+    "rows": ["E6", "C6", "B4", "B5", "B6"]
+  },
+  "diode_direction": "ROW2COL",
  "processor": "atmega32u4",
  "bootloader": "atmel-dfu",
  "layouts": {
diff --git a/keyboards/axolstudio/yeti/soldered/config.h b/keyboards/axolstudio/yeti/soldered/config.h
deleted file mode 100644
index 0e31a7113d..0000000000
--- a/keyboards/axolstudio/yeti/soldered/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-Copyright 2020 kb-elmo
-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
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS { C7, C6, B6, B5, B4 }
-#define MATRIX_COL_PINS { F6, F5, F4, F1, F0, F7, D7, D6, D4, B3, B7, D0, D1, D2, D3, D5 }
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/axolstudio/yeti/soldered/info.json b/keyboards/axolstudio/yeti/soldered/info.json
index 7bd5d8e095..0f283bc675 100644
--- a/keyboards/axolstudio/yeti/soldered/info.json
+++ b/keyboards/axolstudio/yeti/soldered/info.json
@@ -8,6 +8,11 @@
    "pid": "0x9F9F",
    "device_version": "0.0.1"
  },
+  "matrix_pins": {
+    "cols": ["F6", "F5", "F4", "F1", "F0", "F7", "D7", "D6", "D4", "B3", "B7", "D0", "D1", "D2", "D3", "D5"],
+    "rows": ["C7", "C6", "B6", "B5", "B4"]
+  },
+  "diode_direction": "ROW2COL",
  "processor": "atmega32u4",
  "bootloader": "atmel-dfu",
  "community_layouts": ["alice", "alice_split_bs"],
diff --git a/keyboards/aya/config.h b/keyboards/aya/config.h
index 56e966ce0f..14fc201d49 100644
--- a/keyboards/aya/config.h
+++ b/keyboards/aya/config.h
@@ -16,10 +16,5 @@
 #pragma once
-#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 }
-#define DIODE_DIRECTION ROW2COL
 #define SPLIT_HAND_PIN B5
 #define USE_I2C
diff --git a/keyboards/aya/info.json b/keyboards/aya/info.json
index 325ab9d721..d35001e132 100644
--- a/keyboards/aya/info.json
+++ b/keyboards/aya/info.json
@@ -8,6 +8,11 @@
        "pid": "0x2925",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
+        "rows": ["D4", "C6", "D7", "E6", "B4"]
+    },
+    "diode_direction": "ROW2COL",
    "processor": "atmega32u4",
    "bootloader": "caterina",
    "layouts": {
diff --git a/keyboards/salicylic_acid3/7skb/rev1/config.h b/keyboards/salicylic_acid3/7skb/rev1/config.h
index b85eee3da2..4156fd3aae 100644
--- a/keyboards/salicylic_acid3/7skb/rev1/config.h
+++ b/keyboards/salicylic_acid3/7skb/rev1/config.h
@@ -18,12 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-// wiring of each half
-#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B5 }
-#define DIODE_DIRECTION COL2ROW
 #define SPLIT_HAND_PIN B6
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/salicylic_acid3/7skb/rev1/info.json b/keyboards/salicylic_acid3/7skb/rev1/info.json
index 242135b16c..f0bf9b1d98 100644
--- a/keyboards/salicylic_acid3/7skb/rev1/info.json
+++ b/keyboards/salicylic_acid3/7skb/rev1/info.json
@@ -8,6 +8,11 @@
        "pid": "0xEB5F",
        "device_version": "0.0.7"
    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B5"],
+        "rows": ["D4", "C6", "D7", "E6", "B4"]
+    },
+    "diode_direction": "COL2ROW",
    "split": {
        "soft_serial_pin": "D2"
    },
diff --git a/keyboards/salicylic_acid3/7splus/config.h b/keyboards/salicylic_acid3/7splus/config.h
index 23eae6dac4..b4ac29b52d 100644
--- a/keyboards/salicylic_acid3/7splus/config.h
+++ b/keyboards/salicylic_acid3/7splus/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-// wiring of each half
-#define MATRIX_ROW_PINS { D1, D0, D4, C6, D7, E6, B4 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B5 }
-#define DIODE_DIRECTION COL2ROW
 #define SPLIT_HAND_PIN B6
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/salicylic_acid3/7splus/info.json b/keyboards/salicylic_acid3/7splus/info.json
index 7762132ec0..72dcc86573 100644
--- a/keyboards/salicylic_acid3/7splus/info.json
+++ b/keyboards/salicylic_acid3/7splus/info.json
@@ -8,6 +8,11 @@
        "pid": "0xEAE7",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B5"],
+        "rows": ["D1", "D0", "D4", "C6", "D7", "E6", "B4"]
+    },
+    "diode_direction": "COL2ROW",
    "split": {
        "soft_serial_pin": "D2"
    },
diff --git a/keyboards/salicylic_acid3/ajisai74/config.h b/keyboards/salicylic_acid3/ajisai74/config.h
index aa568db0a6..8f24db085d 100644
--- a/keyboards/salicylic_acid3/ajisai74/config.h
+++ b/keyboards/salicylic_acid3/ajisai74/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-// wiring of each half
-#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B5, D3 }
-#define DIODE_DIRECTION COL2ROW
 #define SPLIT_HAND_PIN B6
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/salicylic_acid3/ajisai74/info.json b/keyboards/salicylic_acid3/ajisai74/info.json
index e9b4d6e60e..8378a1cd5d 100644
--- a/keyboards/salicylic_acid3/ajisai74/info.json
+++ b/keyboards/salicylic_acid3/ajisai74/info.json
@@ -8,6 +8,11 @@
        "pid": "0xEB54",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B5", "D3"],
+        "rows": ["D4", "C6", "D7", "E6", "B4"]
+    },
+    "diode_direction": "COL2ROW",
    "split": {
        "soft_serial_pin": "D2"
    },
diff --git a/keyboards/salicylic_acid3/ergoarrows/config.h b/keyboards/salicylic_acid3/ergoarrows/config.h
index c64ee24098..150c2f4dcc 100644
--- a/keyboards/salicylic_acid3/ergoarrows/config.h
+++ b/keyboards/salicylic_acid3/ergoarrows/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-// wiring of each half
-#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 }
-#define DIODE_DIRECTION COL2ROW
 #define SPLIT_HAND_PIN B6
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/salicylic_acid3/ergoarrows/info.json b/keyboards/salicylic_acid3/ergoarrows/info.json
index 9396eca367..6d0282fdd6 100644
--- a/keyboards/salicylic_acid3/ergoarrows/info.json
+++ b/keyboards/salicylic_acid3/ergoarrows/info.json
@@ -8,6 +8,11 @@
        "pid": "0xEA54",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
+        "rows": ["D4", "C6", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
    "split": {
        "soft_serial_pin": "D0"
    },
diff --git a/keyboards/salicylic_acid3/getta25/rev1/config.h b/keyboards/salicylic_acid3/getta25/rev1/config.h
index 479aa6c3f7..d004f287df 100644
--- a/keyboards/salicylic_acid3/getta25/rev1/config.h
+++ b/keyboards/salicylic_acid3/getta25/rev1/config.h
@@ -18,13 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-// wiring of each half
-#define MATRIX_ROW_PINS { D4, C6, D7, E6, B2 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 }
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 /* 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/salicylic_acid3/getta25/rev1/info.json b/keyboards/salicylic_acid3/getta25/rev1/info.json
index 7443540704..33f5822449 100644
--- a/keyboards/salicylic_acid3/getta25/rev1/info.json
+++ b/keyboards/salicylic_acid3/getta25/rev1/info.json
@@ -8,6 +8,11 @@
        "pid": "0x3060",
        "device_version": "0.1.3"
    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3"],
+        "rows": ["D4", "C6", "D7", "E6", "B2"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "caterina",
    "layouts": {
diff --git a/keyboards/salicylic_acid3/jisplit89/rev1/config.h b/keyboards/salicylic_acid3/jisplit89/rev1/config.h
index 65b373f168..70e81ae774 100644
--- a/keyboards/salicylic_acid3/jisplit89/rev1/config.h
+++ b/keyboards/salicylic_acid3/jisplit89/rev1/config.h
@@ -17,12 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-// wiring of each half
-#define MATRIX_ROW_PINS { D1, D0, D4, C6, D7, E6, B4 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B5 }
-#define DIODE_DIRECTION COL2ROW
 #define SPLIT_HAND_PIN B6
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/salicylic_acid3/jisplit89/rev1/info.json b/keyboards/salicylic_acid3/jisplit89/rev1/info.json
index 53f61f87f2..33488610b8 100644
--- a/keyboards/salicylic_acid3/jisplit89/rev1/info.json
+++ b/keyboards/salicylic_acid3/jisplit89/rev1/info.json
@@ -8,6 +8,11 @@
        "pid": "0xEB4F",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B5"],
+        "rows": ["D1", "D0", "D4", "C6", "D7", "E6", "B4"]
+    },
+    "diode_direction": "COL2ROW",
    "split": {
        "soft_serial_pin": "D2"
    },
diff --git a/keyboards/salicylic_acid3/nafuda/config.h b/keyboards/salicylic_acid3/nafuda/config.h
index f9312912ce..4d7fc6297b 100644
--- a/keyboards/salicylic_acid3/nafuda/config.h
+++ b/keyboards/salicylic_acid3/nafuda/config.h
@@ -18,13 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-// wiring of each half
-#define MATRIX_ROW_PINS { D1, D0, D4 }
-#define MATRIX_COL_PINS { F4, F5, F6 }
-#define DIODE_DIRECTION COL2ROW
 /* 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/salicylic_acid3/nafuda/info.json b/keyboards/salicylic_acid3/nafuda/info.json
index 05cf322ccf..3cef936a33 100644
--- a/keyboards/salicylic_acid3/nafuda/info.json
+++ b/keyboards/salicylic_acid3/nafuda/info.json
@@ -8,6 +8,11 @@
        "pid": "0x3060",
        "device_version": "0.1.2"
    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6"],
+        "rows": ["D1", "D0", "D4"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "caterina",
    "layouts": {
diff --git a/keyboards/salicylic_acid3/naked48/rev1/config.h b/keyboards/salicylic_acid3/naked48/rev1/config.h
index 8adf11f4df..3f1c2f9ca5 100644
--- a/keyboards/salicylic_acid3/naked48/rev1/config.h
+++ b/keyboards/salicylic_acid3/naked48/rev1/config.h
@@ -17,15 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-// wiring of each half
-#define MATRIX_ROW_PINS { D1, D0, D4, C6 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, D7, E6, B4, B5 }
-// When using Nafuda, comment out MATRIX_ROW_PINS_RIGHT and MATRIX_COL_PINS_RIGHT.
-#define MATRIX_ROW_PINS_RIGHT { D4, C6, D7, E6 }
-#define MATRIX_COL_PINS_RIGHT { F4, F5, F6, F7, B1, B3, B2, B6, B4, B5, B2, B2 }
-#define DIODE_DIRECTION COL2ROW
 /* 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/salicylic_acid3/naked48/rev1/info.json b/keyboards/salicylic_acid3/naked48/rev1/info.json
index 5dc05a02d0..96d81a7e71 100644
--- a/keyboards/salicylic_acid3/naked48/rev1/info.json
+++ b/keyboards/salicylic_acid3/naked48/rev1/info.json
@@ -8,8 +8,19 @@
        "pid": "0xE8BA",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "D7", "E6", "B4", "B5"],
+        "rows": ["D1", "D0", "D4", "C6"]
+    },
+    "diode_direction": "COL2ROW",
    "split": {
-        "soft_serial_pin": "D2"
+        "soft_serial_pin": "D2",
+        "matrix_pins": {
+            "right": {
+                "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "B4", "B5", "B2", "B2"],
+                "rows": ["D4", "C6", "D7", "E6"]
+            }
+        }
    },
    "processor": "atmega32u4",
    "bootloader": "caterina",
diff --git a/keyboards/salicylic_acid3/naked60/rev1/config.h b/keyboards/salicylic_acid3/naked60/rev1/config.h
index d7e3f223ea..2f62289261 100644
--- a/keyboards/salicylic_acid3/naked60/rev1/config.h
+++ b/keyboards/salicylic_acid3/naked60/rev1/config.h
@@ -17,18 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-// Rows are doubled-up
-#define MATRIX_ROW_PINS { B6, D1, D0, D4, C6 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, D7, E6, B4, B5, D3 }
-// When using Setta21
-#define MATRIX_ROW_PINS_RIGHT { D4, C6, D7, E6, B2 }
-#define MATRIX_COL_PINS_RIGHT { F4, F5, F6, F7, B1, B3, B2, B6, B4, B5, B2, B2 }
-// When using Nafuda
-//#define MATRIX_ROW_PINS_RIGHT { D1, D0, D4, C6, B6 }
-//#define MATRIX_COL_PINS_RIGHT { F4, F5, F6, F7, B1, B3, B2, D7, E6, B4, B5, D3 }
-#define DIODE_DIRECTION COL2ROW
 /* 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/salicylic_acid3/naked60/rev1/info.json b/keyboards/salicylic_acid3/naked60/rev1/info.json
index 2f46e127ea..92da4070a5 100644
--- a/keyboards/salicylic_acid3/naked60/rev1/info.json
+++ b/keyboards/salicylic_acid3/naked60/rev1/info.json
@@ -8,8 +8,19 @@
        "pid": "0xEB5C",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "D7", "E6", "B4", "B5", "D3"],
+        "rows": ["B6", "D1", "D0", "D4", "C6"]
+    },
+    "diode_direction": "COL2ROW",
    "split": {
-        "soft_serial_pin": "D2"
+        "soft_serial_pin": "D2",
+        "matrix_pins": {
+            "right": {
+                "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "B4", "B5", "B2", "B2"],
+                "rows": ["D4", "C6", "D7", "E6", "B2"]
+            }
+        }
    },
    "processor": "atmega32u4",
    "bootloader": "caterina",
diff --git a/keyboards/salicylic_acid3/naked64/rev1/config.h b/keyboards/salicylic_acid3/naked64/rev1/config.h
index 11031a4f25..4d991f2ea3 100644
--- a/keyboards/salicylic_acid3/naked64/rev1/config.h
+++ b/keyboards/salicylic_acid3/naked64/rev1/config.h
@@ -18,14 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-// wiring of each half
-#define MATRIX_ROW_PINS { D1, D0, D4, C6, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, D3 }
-#define MATRIX_ROW_PINS_RIGHT { D4, C6, D7, E6, B4, B5, B2, B2 }
-#define MATRIX_COL_PINS_RIGHT { F4, F5, F6, F7, B1, B3, B2, B6 }
-#define DIODE_DIRECTION COL2ROW
 /* 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/salicylic_acid3/naked64/rev1/info.json b/keyboards/salicylic_acid3/naked64/rev1/info.json
index 52a7c2906e..2416e063d9 100644
--- a/keyboards/salicylic_acid3/naked64/rev1/info.json
+++ b/keyboards/salicylic_acid3/naked64/rev1/info.json
@@ -8,8 +8,19 @@
        "pid": "0x3060",
        "device_version": "0.0.3"
    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "D3"],
+        "rows": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
    "split": {
-        "soft_serial_pin": "D2"
+        "soft_serial_pin": "D2",
+        "matrix_pins": {
+            "right": {
+                "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+                "rows": ["D4", "C6", "D7", "E6", "B4", "B5", "B2", "B2"]
+            }
+        }
    },
    "processor": "atmega32u4",
    "bootloader": "caterina",
diff --git a/keyboards/salicylic_acid3/nknl7en/config.h b/keyboards/salicylic_acid3/nknl7en/config.h
index 43e7cfb222..24acc89bcf 100644
--- a/keyboards/salicylic_acid3/nknl7en/config.h
+++ b/keyboards/salicylic_acid3/nknl7en/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-// wiring of each half
-#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B5, D2 }
-#define DIODE_DIRECTION COL2ROW
 #define SPLIT_HAND_PIN B6
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/salicylic_acid3/nknl7en/info.json b/keyboards/salicylic_acid3/nknl7en/info.json
index 06d915c2f4..c36278aa47 100644
--- a/keyboards/salicylic_acid3/nknl7en/info.json
+++ b/keyboards/salicylic_acid3/nknl7en/info.json
@@ -8,6 +8,11 @@
        "pid": "0xEA56",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B5", "D2"],
+        "rows": ["D4", "C6", "D7", "E6", "B4"]
+    },
+    "diode_direction": "COL2ROW",
    "split": {
        "soft_serial_pin": "D0"
    },
diff --git a/keyboards/salicylic_acid3/nknl7jp/config.h b/keyboards/salicylic_acid3/nknl7jp/config.h
index 69ef56fe6e..3c8fca5ab0 100644
--- a/keyboards/salicylic_acid3/nknl7jp/config.h
+++ b/keyboards/salicylic_acid3/nknl7jp/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-// wiring of each half
-#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B5, D2 }
-#define DIODE_DIRECTION COL2ROW
 #define SPLIT_HAND_PIN B6
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/salicylic_acid3/nknl7jp/info.json b/keyboards/salicylic_acid3/nknl7jp/info.json
index 7338cb15fe..b2f07e233a 100644
--- a/keyboards/salicylic_acid3/nknl7jp/info.json
+++ b/keyboards/salicylic_acid3/nknl7jp/info.json
@@ -8,6 +8,11 @@
        "pid": "0xEA55",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B5", "D2"],
+        "rows": ["D4", "C6", "D7", "E6", "B4"]
+    },
+    "diode_direction": "COL2ROW",
    "split": {
        "soft_serial_pin": "D0"
    },
diff --git a/keyboards/salicylic_acid3/setta21/rev1/config.h b/keyboards/salicylic_acid3/setta21/rev1/config.h
index 6672b0014c..26f1bf2661 100644
--- a/keyboards/salicylic_acid3/setta21/rev1/config.h
+++ b/keyboards/salicylic_acid3/setta21/rev1/config.h
@@ -18,12 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-// wiring of each half
-#define MATRIX_ROW_PINS { D4, C6, D7, E6 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 }
-#define DIODE_DIRECTION COL2ROW
 /* 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/salicylic_acid3/setta21/rev1/info.json b/keyboards/salicylic_acid3/setta21/rev1/info.json
index a798c25e63..b4013093cd 100644
--- a/keyboards/salicylic_acid3/setta21/rev1/info.json
+++ b/keyboards/salicylic_acid3/setta21/rev1/info.json
@@ -8,6 +8,11 @@
        "pid": "0x3060",
        "device_version": "0.1.1"
    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3"],
+        "rows": ["D4", "C6", "D7", "E6"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "caterina",
    "community_layouts": ["numpad_6x4"],
diff --git a/keyboards/sam/s80/config.h b/keyboards/sam/s80/config.h
index 0a235bd36c..3d6d768957 100644
--- a/keyboards/sam/s80/config.h
+++ b/keyboards/sam/s80/config.h
@@ -16,22 +16,6 @@
 #pragma once
-/*
- * 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 { E6, B0, B1, B2, B3, B7, F7, F6, F5, F4, F1 }
-#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4 }
-#define DIODE_DIRECTION ROW2COL
 #define RGB_DI_PIN E2
 #ifdef RGB_DI_PIN
 #    define RGBLED_NUM 20
diff --git a/keyboards/sam/s80/info.json b/keyboards/sam/s80/info.json
index ab0cde43a1..dd03cf3098 100644
--- a/keyboards/sam/s80/info.json
+++ b/keyboards/sam/s80/info.json
@@ -8,6 +8,11 @@
        "pid": "0x3830",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"],
+        "rows": ["E6", "B0", "B1", "B2", "B3", "B7", "F7", "F6", "F5", "F4", "F1"]
+    },
+    "diode_direction": "ROW2COL",
    "backlight": {
        "pin": "B6"
    },
diff --git a/keyboards/sam/sg81m/config.h b/keyboards/sam/sg81m/config.h
index 7cfba55dc8..946649d038 100644
--- a/keyboards/sam/sg81m/config.h
+++ b/keyboards/sam/sg81m/config.h
@@ -16,21 +16,6 @@
 #pragma once
-/*
- * 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 { F0, F1, F4, F5, F6, F7 }
-#define MATRIX_COL_PINS { B7, B6, B5, B4, C7, C6, D0, D1, D2, D3, D4, D5, D6, D7 }
-#define DIODE_DIRECTION COL2ROW
 #define RGB_DI_PIN E6 //reserved pin for potential underglow rgb
 #ifdef RGB_DI_PIN
    #define RGBLED_NUM 10
diff --git a/keyboards/sam/sg81m/info.json b/keyboards/sam/sg81m/info.json
index ebf5dda947..9f741abeff 100644
--- a/keyboards/sam/sg81m/info.json
+++ b/keyboards/sam/sg81m/info.json
@@ -8,6 +8,11 @@
        "pid": "0x3831",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["B7", "B6", "B5", "B4", "C7", "C6", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7"],
+        "rows": ["F0", "F1", "F4", "F5", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
    "indicators": {
        "caps_lock": "B0"
    },
diff --git a/keyboards/sanctified/dystopia/config.h b/keyboards/sanctified/dystopia/config.h
deleted file mode 100644
index 1ab243f5ed..0000000000
--- a/keyboards/sanctified/dystopia/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2021 Quentin Melis
- *
- * 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
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS { B2, B3, E6, D5, D3 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, D4, D6, D7, B4 }
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/sanctified/dystopia/info.json b/keyboards/sanctified/dystopia/info.json
index 3c0814074e..c71f327f6a 100644
--- a/keyboards/sanctified/dystopia/info.json
+++ b/keyboards/sanctified/dystopia/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0001",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "D4", "D6", "D7", "B4"],
+        "rows": ["B2", "B3", "E6", "D5", "D3"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/sandwich/keeb68/config.h b/keyboards/sandwich/keeb68/config.h
index d12d01cb38..fdd0cd8c86 100644
--- a/keyboards/sandwich/keeb68/config.h
+++ b/keyboards/sandwich/keeb68/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/*
- * 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 { F0, F1, F4, F5, F6 }
-#define MATRIX_COL_PINS { B6, C6, F7, E6, B7, D0, D1, D2, D3, D4, D6, D7, B4, B5 }
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 /* 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/sandwich/keeb68/info.json b/keyboards/sandwich/keeb68/info.json
index ed30bd810a..c4e8752997 100644
--- a/keyboards/sandwich/keeb68/info.json
+++ b/keyboards/sandwich/keeb68/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0000",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["B6", "C6", "F7", "E6", "B7", "D0", "D1", "D2", "D3", "D4", "D6", "D7", "B4", "B5"],
+        "rows": ["F0", "F1", "F4", "F5", "F6"]
+    },
+    "diode_direction": "COL2ROW",
    "backlight": {
        "pin": "C7",
        "levels": 5,
diff --git a/keyboards/satt/vision/config.h b/keyboards/satt/vision/config.h
index 6617b6ef13..4b007cf387 100644
--- a/keyboards/satt/vision/config.h
+++ b/keyboards/satt/vision/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-#define MATRIX_COL_PINS { B1, B0, A7, A6, A5, A4, A3, B8, B7, B6, B5, B4, B3, A15 }
-#define MATRIX_ROW_PINS { B12, B2, A2, A1 }
-#define DIODE_DIRECTION COL2ROW
 /* 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/satt/vision/info.json b/keyboards/satt/vision/info.json
index fcca710f19..15977a5892 100644
--- a/keyboards/satt/vision/info.json
+++ b/keyboards/satt/vision/info.json
@@ -8,6 +8,11 @@
        "pid": "0x5649",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["B1", "B0", "A7", "A6", "A5", "A4", "A3", "B8", "B7", "B6", "B5", "B4", "B3", "A15"],
+        "rows": ["B12", "B2", "A2", "A1"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "STM32F072",
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/sauce/mild/config.h b/keyboards/sauce/mild/config.h
index abe4886633..037c0b0a23 100644
--- a/keyboards/sauce/mild/config.h
+++ b/keyboards/sauce/mild/config.h
@@ -16,23 +16,6 @@
 #pragma once
-/*
- * 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 { C13, C14, C15, A15, F0, F1 }
-#define MATRIX_COL_PINS { A10, A9, A8, B11, B10, B2, B1, B0, A7, A5, A4, A3, A2, A1, B6, B5, B4 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
 /* 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/sauce/mild/info.json b/keyboards/sauce/mild/info.json
index 90b36d48f8..71179445ee 100644
--- a/keyboards/sauce/mild/info.json
+++ b/keyboards/sauce/mild/info.json
@@ -8,6 +8,11 @@
    "pid": "0x7783",
    "device_version": "0.0.1"
  },
+  "matrix_pins": {
+    "cols": ["A10", "A9", "A8", "B11", "B10", "B2", "B1", "B0", "A7", "A5", "A4", "A3", "A2", "A1", "B6", "B5", "B4"],
+    "rows": ["C13", "C14", "C15", "A15", "F0", "F1"]
+  },
+  "diode_direction": "COL2ROW",
  "indicators": {
    "caps_lock": "A6",
    "scroll_lock": "B14"
diff --git a/keyboards/sawnsprojects/amber80/solder/config.h b/keyboards/sawnsprojects/amber80/solder/config.h
index 53a07a179c..a20ec04bdb 100644
--- a/keyboards/sawnsprojects/amber80/solder/config.h
+++ b/keyboards/sawnsprojects/amber80/solder/config.h
@@ -16,22 +16,6 @@
 #pragma once
-/*
- * 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 { B1, B2, B3, B7, D0, D1, F1, F0, D7, B4, D5, D3 }
-#define MATRIX_COL_PINS { F4, F6, F7, C7, C6, B6, B5, D6, D4 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
 /* RGB */
 #define RGB_DI_PIN D2
 #ifdef RGB_DI_PIN
diff --git a/keyboards/sawnsprojects/amber80/solder/info.json b/keyboards/sawnsprojects/amber80/solder/info.json
index 1e9870fa90..3cd4c7c96d 100644
--- a/keyboards/sawnsprojects/amber80/solder/info.json
+++ b/keyboards/sawnsprojects/amber80/solder/info.json
@@ -8,6 +8,11 @@
        "pid": "0xA801",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F4", "F6", "F7", "C7", "C6", "B6", "B5", "D6", "D4"],
+        "rows": ["B1", "B2", "B3", "B7", "D0", "D1", "F1", "F0", "D7", "B4", "D5", "D3"]
+    },
+    "diode_direction": "COL2ROW",
    "indicators": {
        "caps_lock": "F5",
        "scroll_lock": "B0",
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/config.h b/keyboards/sawnsprojects/krush/krush60/solder/config.h
index 76f4acfbf6..6a5ac54353 100644
--- a/keyboards/sawnsprojects/krush/krush60/solder/config.h
+++ b/keyboards/sawnsprojects/krush/krush60/solder/config.h
@@ -16,13 +16,6 @@
 #pragma once
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B1, B2, D1, D2, D4, D6, F6, F7, F5, F4 }
-#define MATRIX_COL_PINS { C7, C6, B6, B5, B4, D7, D5, D3 }
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 #define RGB_DI_PIN F1
 #ifdef RGB_DI_PIN
    #define RGBLED_NUM 20
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/info.json b/keyboards/sawnsprojects/krush/krush60/solder/info.json
index a54172480d..380fa706b0 100644
--- a/keyboards/sawnsprojects/krush/krush60/solder/info.json
+++ b/keyboards/sawnsprojects/krush/krush60/solder/info.json
@@ -8,6 +8,11 @@
        "pid": "0x6B32",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D5", "D3"],
+        "rows": ["B1", "B2", "D1", "D2", "D4", "D6", "F6", "F7", "F5", "F4"]
+    },
+    "diode_direction": "COL2ROW",
    "indicators": {
        "caps_lock": "F0",
        "on_state": 0
diff --git a/keyboards/sawnsprojects/krush/krush65/hotswap/config.h b/keyboards/sawnsprojects/krush/krush65/hotswap/config.h
index 8a947093dc..ef7cb26289 100644
--- a/keyboards/sawnsprojects/krush/krush65/hotswap/config.h
+++ b/keyboards/sawnsprojects/krush/krush65/hotswap/config.h
@@ -16,13 +16,6 @@
 #pragma once
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B1, B2, D4, F1, F0 }
-#define MATRIX_COL_PINS { B7, B3, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D0, D5, D6, D3 }
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 /* Encoders */
 #define ENCODERS_CW_KEY  { { 12, 3 } }
diff --git a/keyboards/sawnsprojects/krush/krush65/hotswap/info.json b/keyboards/sawnsprojects/krush/krush65/hotswap/info.json
index 3872047ef8..94a091b0f8 100644
--- a/keyboards/sawnsprojects/krush/krush65/hotswap/info.json
+++ b/keyboards/sawnsprojects/krush/krush65/hotswap/info.json
@@ -8,6 +8,11 @@
        "pid": "0x5B31",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["B7", "B3", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D0", "D5", "D6", "D3"],
+        "rows": ["B1", "B2", "D4", "F1", "F0"]
+    },
+    "diode_direction": "COL2ROW",
    "encoder": {
        "rotary": [
            {"pin_a": "D1", "pin_b": "D2"}
diff --git a/keyboards/sawnsprojects/krush/krush65/solder/config.h b/keyboards/sawnsprojects/krush/krush65/solder/config.h
index 76f4acfbf6..6a5ac54353 100644
--- a/keyboards/sawnsprojects/krush/krush65/solder/config.h
+++ b/keyboards/sawnsprojects/krush/krush65/solder/config.h
@@ -16,13 +16,6 @@
 #pragma once
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B1, B2, D1, D2, D4, D6, F6, F7, F5, F4 }
-#define MATRIX_COL_PINS { C7, C6, B6, B5, B4, D7, D5, D3 }
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 #define RGB_DI_PIN F1
 #ifdef RGB_DI_PIN
    #define RGBLED_NUM 20
diff --git a/keyboards/sawnsprojects/krush/krush65/solder/info.json b/keyboards/sawnsprojects/krush/krush65/solder/info.json
index 9666127299..cf337c55f5 100644
--- a/keyboards/sawnsprojects/krush/krush65/solder/info.json
+++ b/keyboards/sawnsprojects/krush/krush65/solder/info.json
@@ -8,6 +8,11 @@
        "pid": "0x6B31",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D5", "D3"],
+        "rows": ["B1", "B2", "D1", "D2", "D4", "D6", "F6", "F7", "F5", "F4"]
+    },
+    "diode_direction": "COL2ROW",
    "encoder": {
        "rotary": [
            {"pin_a": "D0", "pin_b": "B3"}
diff --git a/keyboards/sawnsprojects/satxri6key/config.h b/keyboards/sawnsprojects/satxri6key/config.h
index f0c527387d..a5f61e98e7 100644
--- a/keyboards/sawnsprojects/satxri6key/config.h
+++ b/keyboards/sawnsprojects/satxri6key/config.h
@@ -16,22 +16,6 @@
 #pragma once
-/*
- * 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 { F7, F6 }
-#define MATRIX_COL_PINS { F1, F4, F5 }
-#define DIODE_DIRECTION COL2ROW
 #define RGB_DI_PIN F0
 #ifdef RGB_DI_PIN
    #define RGBLED_NUM 6
diff --git a/keyboards/sawnsprojects/satxri6key/info.json b/keyboards/sawnsprojects/satxri6key/info.json
index 50c304dda2..f2db2dedc4 100644
--- a/keyboards/sawnsprojects/satxri6key/info.json
+++ b/keyboards/sawnsprojects/satxri6key/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0727",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F1", "F4", "F5"],
+        "rows": ["F7", "F6"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/sawnsprojects/vcl65/solder/config.h b/keyboards/sawnsprojects/vcl65/solder/config.h
index bd4258f12a..5cb0b63ba9 100644
--- a/keyboards/sawnsprojects/vcl65/solder/config.h
+++ b/keyboards/sawnsprojects/vcl65/solder/config.h
@@ -16,13 +16,6 @@
 #pragma once
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F6, F7, F0, F4, B1 }
-#define MATRIX_COL_PINS { B2, B5, F5, C7, B4, C6, D7, D6, D4, D5, D3, D2, B6, D1, D0 }
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 #define RGB_DI_PIN B7
 #ifdef RGB_DI_PIN
    #define RGBLED_NUM 20
diff --git a/keyboards/sawnsprojects/vcl65/solder/info.json b/keyboards/sawnsprojects/vcl65/solder/info.json
index 1b0c638ecc..617851ba00 100644
--- a/keyboards/sawnsprojects/vcl65/solder/info.json
+++ b/keyboards/sawnsprojects/vcl65/solder/info.json
@@ -8,6 +8,11 @@
        "pid": "0x1727",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["B2", "B5", "F5", "C7", "B4", "C6", "D7", "D6", "D4", "D5", "D3", "D2", "B6", "D1", "D0"],
+        "rows": ["F6", "F7", "F0", "F4", "B1"]
+    },
+    "diode_direction": "COL2ROW",
    "indicators": {
        "caps_lock": "F1",
        "on_state": 0
diff --git a/keyboards/scatter42/config.h b/keyboards/scatter42/config.h
index 564a2451fd..2021cca3b0 100644
--- a/keyboards/scatter42/config.h
+++ b/keyboards/scatter42/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/*
- * 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 { D4, C6, D7, E6 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 }
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 /* 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/scatter42/info.json b/keyboards/scatter42/info.json
index f928b4c24c..748093a516 100644
--- a/keyboards/scatter42/info.json
+++ b/keyboards/scatter42/info.json
@@ -8,6 +8,11 @@
        "pid": "0x3B47",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3"],
+        "rows": ["D4", "C6", "D7", "E6"]
+    },
+    "diode_direction": "COL2ROW",
    "split": {
        "soft_serial_pin": "D2"
    },
diff --git a/keyboards/sck/gtm/config.h b/keyboards/sck/gtm/config.h
index f4961f2242..a99fc7a3e8 100644
--- a/keyboards/sck/gtm/config.h
+++ b/keyboards/sck/gtm/config.h
@@ -1,13 +1,5 @@
 #pragma once
-/* key matrix pins */
-#define MATRIX_ROW_PINS { C4, C5, D1 }
-#define MATRIX_COL_PINS { B4, B5, B6, B7, C7, D0 }
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/sck/gtm/info.json b/keyboards/sck/gtm/info.json
index 3f254f2c77..c3cc44cd64 100644
--- a/keyboards/sck/gtm/info.json
+++ b/keyboards/sck/gtm/info.json
@@ -8,6 +8,11 @@
        "pid": "0x6090",
        "device_version": "0.0.2"
    },
+    "matrix_pins": {
+        "cols": ["B4", "B5", "B6", "B7", "C7", "D0"],
+        "rows": ["C4", "C5", "D1"]
+    },
+    "diode_direction": "COL2ROW",
    "encoder": {
        "rotary": [
            {"pin_a": "D2", "pin_b": "D3", "resolution": 1}
diff --git a/keyboards/sck/m0116b/config.h b/keyboards/sck/m0116b/config.h
index f76b93ff68..a3c400ab47 100644
--- a/keyboards/sck/m0116b/config.h
+++ b/keyboards/sck/m0116b/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/*
- * 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 { D1, F0, F1, F4, F5, F6 }
-#define MATRIX_COL_PINS { D5, D3, D2, D0, B3, B2, B1, B0, E6, B5, B6, C6, C7, F7, D4, D6, D7, B4 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
 /* 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/sck/m0116b/info.json b/keyboards/sck/m0116b/info.json
index 8588e9d605..8a2c4d109a 100644
--- a/keyboards/sck/m0116b/info.json
+++ b/keyboards/sck/m0116b/info.json
@@ -8,6 +8,11 @@
    "pid": "0x0000",
    "device_version": "0.0.1"
  },
+  "matrix_pins": {
+    "cols": ["D5", "D3", "D2", "D0", "B3", "B2", "B1", "B0", "E6", "B5", "B6", "C6", "C7", "F7", "D4", "D6", "D7", "B4"],
+    "rows": ["D1", "F0", "F1", "F4", "F5", "F6"]
+  },
+  "diode_direction": "COL2ROW",
  "bootmagic": {
    "matrix": [0, 6]
  },
diff --git a/keyboards/sck/neiso/config.h b/keyboards/sck/neiso/config.h
index 21a4f0d60c..a3c400ab47 100644
--- a/keyboards/sck/neiso/config.h
+++ b/keyboards/sck/neiso/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/*
- * 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 \
-    { F4 }
-#define MATRIX_COL_PINS \
-    { B3, D2, F5, F7, B4 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
 /* 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/sck/neiso/info.json b/keyboards/sck/neiso/info.json
index 3140669af5..2f233b4066 100644
--- a/keyboards/sck/neiso/info.json
+++ b/keyboards/sck/neiso/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0000",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["B3", "D2", "F5", "F7", "B4"],
+        "rows": ["F4"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "caterina",
    "layouts": {
diff --git a/keyboards/sck/osa/config.h b/keyboards/sck/osa/config.h
index 801a7fdc16..b81c970db7 100644
--- a/keyboards/sck/osa/config.h
+++ b/keyboards/sck/osa/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/*
- * 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 { F0, F1, F4, F5, F6, B0, B1, B2, B3, B7 }
-#define MATRIX_COL_PINS { B4, D7, D5, D3, D2, D0, D1, B5 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
   #define RGB_DI_PIN D4
   #ifdef RGB_DI_PIN
   #define RGBLED_NUM 9
diff --git a/keyboards/sck/osa/info.json b/keyboards/sck/osa/info.json
index c919d3b6e8..547363e414 100644
--- a/keyboards/sck/osa/info.json
+++ b/keyboards/sck/osa/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0001",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["B4", "D7", "D5", "D3", "D2", "D0", "D1", "B5"],
+        "rows": ["F0", "F1", "F4", "F5", "F6", "B0", "B1", "B2", "B3", "B7"]
+    },
+    "diode_direction": "COL2ROW",
    "indicators": {
        "caps_lock": "C6",
        "num_lock": "C7",
diff --git a/keyboards/sendyyeah/75pixels/config.h b/keyboards/sendyyeah/75pixels/config.h
deleted file mode 100644
index 5f5bc38b34..0000000000
--- a/keyboards/sendyyeah/75pixels/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
- /* Copyright 2021 sendyyeah
-  *
-  * 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
-/*
- * Keyboard Matrix Assignments
- */
-#define MATRIX_ROW_PINS { B6, F4, F5, F6, F7, B1, B3, B2, B4, B5 }
-#define MATRIX_COL_PINS { D3, D2, D1, D0, D4, C6, D7, E6 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/sendyyeah/75pixels/info.json b/keyboards/sendyyeah/75pixels/info.json
index 81ced955d6..aeaf26da6c 100644
--- a/keyboards/sendyyeah/75pixels/info.json
+++ b/keyboards/sendyyeah/75pixels/info.json
@@ -8,6 +8,11 @@
        "pid": "0x3735",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6"],
+        "rows": ["B6", "F4", "F5", "F6", "F7", "B1", "B3", "B2", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "caterina",
    "community_layouts": ["ortho_5x15"],
diff --git a/keyboards/sendyyeah/bevi/config.h b/keyboards/sendyyeah/bevi/config.h
deleted file mode 100644
index 7ef151b3bd..0000000000
--- a/keyboards/sendyyeah/bevi/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
- /* Copyright 2021 sendyyeah
-  *
-  * 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
-/*
- * Keyboard Matrix Assignments
- */
-#define MATRIX_ROW_PINS { B3, B2, D3, D2, D1, D0, D4, C6, D7, E6 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B6, B4, B5 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/sendyyeah/bevi/info.json b/keyboards/sendyyeah/bevi/info.json
index 355fe1f850..b4a62656a2 100644
--- a/keyboards/sendyyeah/bevi/info.json
+++ b/keyboards/sendyyeah/bevi/info.json
@@ -8,6 +8,11 @@
        "pid": "0x4256",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B6", "B4", "B5"],
+        "rows": ["B3", "B2", "D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "caterina",
    "layouts": {
diff --git a/keyboards/senselessclay/ck60/config.h b/keyboards/senselessclay/ck60/config.h
index a5da1ed51e..5c4153e3d0 100644
--- a/keyboards/senselessclay/ck60/config.h
+++ b/keyboards/senselessclay/ck60/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS { B3, B2, F1, F4, F5 }
-#define MATRIX_COL_PINS { F0, D5, D3, D2, D1, D0, C7, C6, B6, B5, B4, D7, D6, D4 }
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 /* RGB matrix lighting */ 
 #define RGB_DI_PIN B1
 #define RGB_MATRIX_LED_COUNT 62
diff --git a/keyboards/senselessclay/ck60/info.json b/keyboards/senselessclay/ck60/info.json
index d089aa333c..45e84f254b 100644
--- a/keyboards/senselessclay/ck60/info.json
+++ b/keyboards/senselessclay/ck60/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0601",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F0", "D5", "D3", "D2", "D1", "D0", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["B3", "B2", "F1", "F4", "F5"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layout_aliases": {
diff --git a/keyboards/senselessclay/ck65/config.h b/keyboards/senselessclay/ck65/config.h
index 5aeeee7a74..2d2326fb40 100644
--- a/keyboards/senselessclay/ck65/config.h
+++ b/keyboards/senselessclay/ck65/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/*
- * 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)
- *
- */
-/* rev0 */
-#define MATRIX_ROW_PINS { B3, B2, F1, F4, F5 }
-#define MATRIX_COL_PINS { F0, D5, D3, D2, D1, D0, F7, C7, C6, B6, B5, B4, D7, D6, D4 }
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 /* 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/senselessclay/ck65/info.json b/keyboards/senselessclay/ck65/info.json
index cb596c21e2..7bc2839a9f 100644
--- a/keyboards/senselessclay/ck65/info.json
+++ b/keyboards/senselessclay/ck65/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0651",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F0", "D5", "D3", "D2", "D1", "D0", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["B3", "B2", "F1", "F4", "F5"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layout_aliases": {
diff --git a/keyboards/senselessclay/gos65/config.h b/keyboards/senselessclay/gos65/config.h
index 22dadfed74..02d27c11e6 100644
--- a/keyboards/senselessclay/gos65/config.h
+++ b/keyboards/senselessclay/gos65/config.h
@@ -17,30 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/*
- * 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)
- *
- */
-/* rev0 */
-/*
-#define MATRIX_ROW_PINS { B1, B2, F6, F5, F4 }
-#define MATRIX_COL_PINS { F1, D5, D3, D2, D1, D0, F7, C7, C6, B6, B5, B4, D7, D6, D4 }
-*/
-/* rev1 */
-#define MATRIX_ROW_PINS { B1, B2, F1, F6, F5 }
-#define MATRIX_COL_PINS { F4, D5, D3, D2, D1, D0, F7, C7, C6, B6, B5, B4, D7, D6, D4 }
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 /* 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/senselessclay/gos65/info.json b/keyboards/senselessclay/gos65/info.json
index b1007fe065..bdd73caed4 100644
--- a/keyboards/senselessclay/gos65/info.json
+++ b/keyboards/senselessclay/gos65/info.json
@@ -8,6 +8,11 @@
      "pid": "0x0650",
      "device_version": "0.0.1"
    },
+    "matrix_pins": {
+      "cols": ["F4", "D5", "D3", "D2", "D1", "D0", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+      "rows": ["B1", "B2", "F1", "F6", "F5"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/senselessclay/had60/config.h b/keyboards/senselessclay/had60/config.h
index 01d85c0517..bdeea958dc 100644
--- a/keyboards/senselessclay/had60/config.h
+++ b/keyboards/senselessclay/had60/config.h
@@ -17,28 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/*
- * 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)
- *
- */
-/* rev0 */ 
-//#define MATRIX_ROW_PINS { F0, D0, D4, F5, F4 }
-//#define MATRIX_COL_PINS { F1, D5, D3, D2, D1, F6, F7, C7, C6, B6, B5, B4, D7, D6 }
-/* rev1 */ 
-#define MATRIX_ROW_PINS { F1, F0, F7, F6, F5 }
-#define MATRIX_COL_PINS { F4, D5, D3, D2, D1, D0, C7, C6, B6, B5, B4, D7, D6, D4 }
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 /* 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/senselessclay/had60/info.json b/keyboards/senselessclay/had60/info.json
index a5a46d0cd5..f76a1355ee 100644
--- a/keyboards/senselessclay/had60/info.json
+++ b/keyboards/senselessclay/had60/info.json
@@ -8,6 +8,11 @@
      "pid": "0x060F",
      "device_version": "0.0.1"
    },
+    "matrix_pins": {
+      "cols": ["F4", "D5", "D3", "D2", "D1", "D0", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+      "rows": ["F1", "F0", "F7", "F6", "F5"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/sentraq/number_pad/config.h b/keyboards/sentraq/number_pad/config.h
index 0d96be0baf..fe49e0c521 100644
--- a/keyboards/sentraq/number_pad/config.h
+++ b/keyboards/sentraq/number_pad/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/*
- * 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 { F5, F0, B5, D6, D4 }
-#define MATRIX_COL_PINS { C7, D5, D1, D0 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
 #define RGB_DI_PIN B0
 #ifdef RGB_DI_PIN
  #define RGBLED_NUM 13
diff --git a/keyboards/sentraq/number_pad/info.json b/keyboards/sentraq/number_pad/info.json
index 5b7af3fb0f..a5db65d78b 100644
--- a/keyboards/sentraq/number_pad/info.json
+++ b/keyboards/sentraq/number_pad/info.json
@@ -7,6 +7,11 @@
    "pid": "0x0000",
    "device_version": "0.0.1"
  },
+  "matrix_pins": {
+    "cols": ["C7", "D5", "D1", "D0"],
+    "rows": ["F5", "F0", "B5", "D6", "D4"]
+  },
+  "diode_direction": "COL2ROW",
  "backlight": {
    "pin": "B7"
  },
diff --git a/keyboards/sentraq/s60_x/default/config.h b/keyboards/sentraq/s60_x/default/config.h
index 01ce1f2e65..1fa22a6e9d 100644
--- a/keyboards/sentraq/s60_x/default/config.h
+++ b/keyboards/sentraq/s60_x/default/config.h
@@ -1,19 +1,11 @@
 #pragma once
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B7, B3, B2, B1, B0 }
-#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, E6, F1 }
 /* 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
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 #define LOCKING_SUPPORT_ENABLE
 #define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/sentraq/s60_x/default/info.json b/keyboards/sentraq/s60_x/default/info.json
index ae5728a679..78e8827c00 100644
--- a/keyboards/sentraq/s60_x/default/info.json
+++ b/keyboards/sentraq/s60_x/default/info.json
@@ -1,5 +1,10 @@
 {
    "keyboard_name": "S60-X",
+    "matrix_pins": {
+        "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "E6", "F1"],
+        "rows": ["B7", "B3", "B2", "B1", "B0"]
+    },
+    "diode_direction": "COL2ROW",
    "backlight": {
        "pin": "B7",
        "breathing": true
diff --git a/keyboards/sentraq/s60_x/rgb/config.h b/keyboards/sentraq/s60_x/rgb/config.h
index 2332b484e1..85f6271c32 100644
--- a/keyboards/sentraq/s60_x/rgb/config.h
+++ b/keyboards/sentraq/s60_x/rgb/config.h
@@ -1,19 +1,11 @@
 #pragma once
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B5, B4, D7, D6, D4 }
-#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, B6, C6, C7, F1, F0, E6, B3, B2, B1, B0 }
 /* 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
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 #define RGB_DI_PIN F6
 #ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/sentraq/s60_x/rgb/info.json b/keyboards/sentraq/s60_x/rgb/info.json
index 6420a8069a..0c6aba4ac6 100644
--- a/keyboards/sentraq/s60_x/rgb/info.json
+++ b/keyboards/sentraq/s60_x/rgb/info.json
@@ -1,5 +1,10 @@
 {
    "keyboard_name": "S60-X-RGB",
+    "matrix_pins": {
+        "cols": ["D0", "D1", "D2", "D3", "D5", "B6", "C6", "C7", "F1", "F0", "E6", "B3", "B2", "B1", "B0"],
+        "rows": ["B5", "B4", "D7", "D6", "D4"]
+    },
+    "diode_direction": "COL2ROW",
    "backlight": {
        "pin": "B7",
        "breathing":  true
diff --git a/keyboards/sentraq/s65_plus/config.h b/keyboards/sentraq/s65_plus/config.h
index 3b8323074f..ea97d48f84 100644
--- a/keyboards/sentraq/s65_plus/config.h
+++ b/keyboards/sentraq/s65_plus/config.h
@@ -1,10 +1,5 @@
 #pragma once
-/* key matrix pins */
-#define MATRIX_ROW_PINS { C7, C6, B6, B5, B4 }
-#define MATRIX_COL_PINS { F6, F5, F4, F1, F0, E6, B0, B1, D5, B2, B3, D0, D1, D2, D4, D6, D7, F7 }
 #define RGB_DI_PIN D3
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
@@ -22,9 +17,6 @@
 #define RGBLIGHT_VAL_STEP 8
 #define RGBLIGHT_EFFECT_KNIGHT_OFFSET 20
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/sentraq/s65_plus/info.json b/keyboards/sentraq/s65_plus/info.json
index 3d9f6d1f21..b19bffd207 100644
--- a/keyboards/sentraq/s65_plus/info.json
+++ b/keyboards/sentraq/s65_plus/info.json
@@ -8,6 +8,11 @@
    "pid": "0x6060",
    "device_version": "0.0.1"
  },
+  "matrix_pins": {
+    "cols": ["F6", "F5", "F4", "F1", "F0", "E6", "B0", "B1", "D5", "B2", "B3", "D0", "D1", "D2", "D4", "D6", "D7", "F7"],
+    "rows": ["C7", "C6", "B6", "B5", "B4"]
+  },
+  "diode_direction": "COL2ROW",
  "backlight": {
    "pin": "B7"
  },
diff --git a/keyboards/sentraq/s65_x/config.h b/keyboards/sentraq/s65_x/config.h
index e8d1cb933d..c4678115db 100644
--- a/keyboards/sentraq/s65_x/config.h
+++ b/keyboards/sentraq/s65_x/config.h
@@ -1,10 +1,5 @@
 #pragma once
-/* key matrix pins */
-#define MATRIX_ROW_PINS { C7, C6, B6, B5, B4 }
-#define MATRIX_COL_PINS { F4, F1, F0, E6, B0, B1, D5, B2, B3, D0, D1, D2, D4, D6, D7, F7 }
 #define RGB_DI_PIN D3
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
@@ -23,9 +18,6 @@
 #define RGBLIGHT_EFFECT_KNIGHT_OFFSET 20
 #define RGBLIGHT_SLEEP
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/sentraq/s65_x/info.json b/keyboards/sentraq/s65_x/info.json
index a37852080c..0ef809d1fe 100644
--- a/keyboards/sentraq/s65_x/info.json
+++ b/keyboards/sentraq/s65_x/info.json
@@ -8,6 +8,11 @@
    "pid": "0x6060",
    "device_version": "0.0.1"
  },
+  "matrix_pins": {
+    "cols": ["F4", "F1", "F0", "E6", "B0", "B1", "D5", "B2", "B3", "D0", "D1", "D2", "D4", "D6", "D7", "F7"],
+    "rows": ["C7", "C6", "B6", "B5", "B4"]
+  },
+  "diode_direction": "COL2ROW",
  "backlight": {
    "pin": "B7",
    "levels": 5,
diff --git a/keyboards/sets3n/kk980/config.h b/keyboards/sets3n/kk980/config.h
index bd71fdfc2f..b360e531a8 100644
--- a/keyboards/sets3n/kk980/config.h
+++ b/keyboards/sets3n/kk980/config.h
@@ -16,25 +16,6 @@
 #pragma once
-/*
- * 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)
- *
- */
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B2, B3, D3, D4, D5, D6 }
-#define MATRIX_COL_PINS { E6, F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, B1, B0, D0, D1 }
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/sets3n/kk980/info.json b/keyboards/sets3n/kk980/info.json
index d4132bf736..4705096576 100644
--- a/keyboards/sets3n/kk980/info.json
+++ b/keyboards/sets3n/kk980/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0002",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "B1", "B0", "D0", "D1"],
+        "rows": ["B2", "B3", "D3", "D4", "D5", "D6"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/shambles/config.h b/keyboards/shambles/config.h
index 95acbd4600..db73ba34a9 100644
--- a/keyboards/shambles/config.h
+++ b/keyboards/shambles/config.h
@@ -1,13 +1,5 @@
 #pragma once
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F5, B3, B1, F7 }
-#define MATRIX_COL_PINS { D3, D1, D0, D4, C6, D7, E6, B4, B5, B6, B2, F4, F6 }
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/shambles/info.json b/keyboards/shambles/info.json
index a82614f0ae..b57cdd3a00 100644
--- a/keyboards/shambles/info.json
+++ b/keyboards/shambles/info.json
@@ -8,6 +8,11 @@
    "pid": "0x0F42",
    "device_version": "0.0.1"
  },
+  "matrix_pins": {
+    "cols": ["D3", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "B6", "B2", "F4", "F6"],
+    "rows": ["F5", "B3", "B1", "F7"]
+  },
+  "diode_direction": "COL2ROW",
  "processor": "atmega32u4",
  "bootloader": "atmel-dfu",
  "layouts": {
diff --git a/keyboards/shapeshifter4060/config.h b/keyboards/shapeshifter4060/config.h
index 981222dbe8..514076daf8 100644
--- a/keyboards/shapeshifter4060/config.h
+++ b/keyboards/shapeshifter4060/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-#define MATRIX_ROW_PINS { F4, F5, F6, F7 }
-#define MATRIX_COL_PINS { D0, D1, B1, B3, B2, B6, B5, B4, E6, D7, C6, D4 }
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
 /* 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/shapeshifter4060/info.json b/keyboards/shapeshifter4060/info.json
index 7a23820e24..13c77a9618 100644
--- a/keyboards/shapeshifter4060/info.json
+++ b/keyboards/shapeshifter4060/info.json
@@ -8,6 +8,11 @@
        "pid": "0xA1F1",
        "device_version": "0.0.2"
    },
+    "matrix_pins": {
+        "cols": ["D0", "D1", "B1", "B3", "B2", "B6", "B5", "B4", "E6", "D7", "C6", "D4"],
+        "rows": ["F4", "F5", "F6", "F7"]
+    },
+    "diode_direction": "ROW2COL",
    "processor": "atmega32u4",
    "bootloader": "caterina",
    "layouts": {
diff --git a/keyboards/shiro/config.h b/keyboards/shiro/config.h
index 8e2a8a7974..e962d78666 100644
--- a/keyboards/shiro/config.h
+++ b/keyboards/shiro/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/*
- * 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 { D4, C6, D7, E6, B4 }
-#define MATRIX_COL_PINS { F4, F5, F6 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
 /* 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/shiro/info.json b/keyboards/shiro/info.json
index a28a2fd905..919cce0741 100644
--- a/keyboards/shiro/info.json
+++ b/keyboards/shiro/info.json
@@ -8,6 +8,11 @@
    "pid": "0x0000",
    "device_version": "0.0.1"
  },
+  "matrix_pins": {
+    "cols": ["F4", "F5", "F6"],
+    "rows": ["D4", "C6", "D7", "E6", "B4"]
+  },
+  "diode_direction": "COL2ROW",
  "processor": "atmega32u4",
  "bootloader": "caterina",
  "layouts": {
diff --git a/keyboards/shk9/config.h b/keyboards/shk9/config.h
index 5079642e46..deabfc9973 100644
--- a/keyboards/shk9/config.h
+++ b/keyboards/shk9/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS { B0, B1, B2 }
-#define MATRIX_COL_PINS { B3, B4, B5 }
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 /* 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/shk9/info.json b/keyboards/shk9/info.json
index 444736778b..fdb20b9a4d 100644
--- a/keyboards/shk9/info.json
+++ b/keyboards/shk9/info.json
@@ -8,6 +8,11 @@
      "pid": "0x4B39",
      "device_version": "0.0.1"
    },
+    "matrix_pins": {
+      "cols": ["B3", "B4", "B5"],
+      "rows": ["B0", "B1", "B2"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/shoc/config.h b/keyboards/shoc/config.h
index 8190ac773a..beb5d63a40 100644
--- a/keyboards/shoc/config.h
+++ b/keyboards/shoc/config.h
@@ -18,10 +18,3 @@
 #define OLED_DISPLAY_128X64
 #define OLED_TIMEOUT 300000
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F4, F5, F6, F7, B1, B3, B6, B2 }
-#define MATRIX_COL_PINS { D3, D2, D4, C6, D7, E6, B4, B5 }
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/shoc/info.json b/keyboards/shoc/info.json
index d398e67956..8a4196375c 100644
--- a/keyboards/shoc/info.json
+++ b/keyboards/shoc/info.json
@@ -8,6 +8,11 @@
        "pid": "0x6060",
        "device_version": "1.0.0"
    },
+    "matrix_pins": {
+        "cols": ["D3", "D2", "D4", "C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F4", "F5", "F6", "F7", "B1", "B3", "B6", "B2"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "caterina",
    "layouts": {
diff --git a/keyboards/sidderskb/majbritt/rev1/config.h b/keyboards/sidderskb/majbritt/rev1/config.h
deleted file mode 100644
index 9a8b654abf..0000000000
--- a/keyboards/sidderskb/majbritt/rev1/config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-Copyright 2020 MechMerlin
-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
-/*
- * 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 { D0, D1, D2, D3, D5 }
-#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B0, B7, B5, B4, D7, D6, B3 }
-#define DIODE_DIRECTION COL2ROW
-// generated by KBFirmware JSON to QMK Parser
-// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/sidderskb/majbritt/rev1/info.json b/keyboards/sidderskb/majbritt/rev1/info.json
index 890bb5a5cb..aad1ca1a1e 100644
--- a/keyboards/sidderskb/majbritt/rev1/info.json
+++ b/keyboards/sidderskb/majbritt/rev1/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0001",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B0", "B7", "B5", "B4", "D7", "D6", "B3"],
+        "rows": ["D0", "D1", "D2", "D3", "D5"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/sidderskb/majbritt/rev2/config.h b/keyboards/sidderskb/majbritt/rev2/config.h
index c0c6902e3b..ced239c833 100644
--- a/keyboards/sidderskb/majbritt/rev2/config.h
+++ b/keyboards/sidderskb/majbritt/rev2/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-                        //0 , 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 10, 11, 12, 13, 14 ,15
-#define MATRIX_ROW_PINS { B0, B1, F7, C6, B5}
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, C7, B6, D6, B4, D4, D7, D5 ,D3, D2, D1, D0}
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 /* 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/sidderskb/majbritt/rev2/info.json b/keyboards/sidderskb/majbritt/rev2/info.json
index 2ba227e4a8..574f882247 100644
--- a/keyboards/sidderskb/majbritt/rev2/info.json
+++ b/keyboards/sidderskb/majbritt/rev2/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0001",
        "device_version": "0.0.2"
    },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "C7", "B6", "D6", "B4", "D4", "D7", "D5", "D3", "D2", "D1", "D0"],
+        "rows": ["B0", "B1", "F7", "C6", "B5"]
+    },
+    "diode_direction": "COL2ROW",
    "encoder": {
        "rotary": [
            {"pin_a": "B3", "pin_b": "B7"}
diff --git a/keyboards/signum/3_0/config.h b/keyboards/signum/3_0/config.h
deleted file mode 100644
index b554c93b85..0000000000
--- a/keyboards/signum/3_0/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2021 Stan Gurenkov <rococo04_fox@icloud.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
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/signum/3_0/elitec/config.h b/keyboards/signum/3_0/elitec/config.h
deleted file mode 100644
index 7373bfab66..0000000000
--- a/keyboards/signum/3_0/elitec/config.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma once
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D2, D1, F5, B5 }
-#define MATRIX_COL_PINS { B4, D7, D0, E6, D4, F6, F4, F7, B1, B3, C6, B2 }
diff --git a/keyboards/signum/3_0/elitec/info.json b/keyboards/signum/3_0/elitec/info.json
new file mode 100644
index 0000000000..84336ac59f
--- /dev/null
+++ b/keyboards/signum/3_0/elitec/info.json
@@ -0,0 +1,7 @@
+{
+    "matrix_pins": {
+        "cols": ["B4", "D7", "D0", "E6", "D4", "F6", "F4", "F7", "B1", "B3", "C6", "B2"],
+        "rows": ["D2", "D1", "F5", "B5"]
+    },
+    "diode_direction": "COL2ROW"
+}
diff --git a/keyboards/signum/3_0/teensy/config.h b/keyboards/signum/3_0/teensy/config.h
deleted file mode 100644
index 2a81c0f565..0000000000
--- a/keyboards/signum/3_0/teensy/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2021 Stan Gurenkov <rococo04_fox@icloud.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
-/* key matrix pins */
-// clang-format off
-#define MATRIX_ROW_PINS { B0, B3, F6, C7 }
-#define MATRIX_COL_PINS { C6, D2, B7, D3, D0, F7, F5, B6, B5, B4, D1, D7 }
-// clang-format on
diff --git a/keyboards/signum/3_0/teensy/info.json b/keyboards/signum/3_0/teensy/info.json
new file mode 100644
index 0000000000..7eae115323
--- /dev/null
+++ b/keyboards/signum/3_0/teensy/info.json
@@ -0,0 +1,7 @@
+{
+    "matrix_pins": {
+        "cols": ["C6", "D2", "B7", "D3", "D0", "F7", "F5", "B6", "B5", "B4", "D1", "D7"],
+        "rows": ["B0", "B3", "F6", "C7"]
+    },
+    "diode_direction": "COL2ROW"
+}
diff --git a/keyboards/silverbullet44/config.h b/keyboards/silverbullet44/config.h
index 378fe0b2a6..70f72f1d00 100644
--- a/keyboards/silverbullet44/config.h
+++ b/keyboards/silverbullet44/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/*
- * 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 { D4, C6, D7, E6 }
-#define MATRIX_COL_PINS { B3, B1, F7, F6, F5, F4 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
 #define MASTER_RIGHT
 #define RGB_DI_PIN D3
diff --git a/keyboards/silverbullet44/info.json b/keyboards/silverbullet44/info.json
index 18d9889666..3458bfe1f5 100644
--- a/keyboards/silverbullet44/info.json
+++ b/keyboards/silverbullet44/info.json
@@ -8,6 +8,11 @@
        "pid": "0x27DB",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["B3", "B1", "F7", "F6", "F5", "F4"],
+        "rows": ["D4", "C6", "D7", "E6"]
+    },
+    "diode_direction": "COL2ROW",
    "split": {
        "soft_serial_pin": "D2"
    },
diff --git a/keyboards/singa/config.h b/keyboards/singa/config.h
index 3e9694ca36..75b78de22d 100644
--- a/keyboards/singa/config.h
+++ b/keyboards/singa/config.h
@@ -20,11 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLED_NUM 18
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5, B6 }
-#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 }
-#define DIODE_DIRECTION COL2ROW
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/singa/info.json b/keyboards/singa/info.json
index b41713f709..4302010a1e 100644
--- a/keyboards/singa/info.json
+++ b/keyboards/singa/info.json
@@ -8,6 +8,11 @@
      "pid": "0x7575",
      "device_version": "2.0.0"
    },
+    "matrix_pins": {
+        "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "D7"],
+        "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6"]
+    },
+    "diode_direction": "COL2ROW",
    "backlight": {
      "pin": "D4"
    },
diff --git a/keyboards/skeletn87/hotswap/config.h b/keyboards/skeletn87/hotswap/config.h
index 5307bcd65a..7af4feb363 100644
--- a/keyboards/skeletn87/hotswap/config.h
+++ b/keyboards/skeletn87/hotswap/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS { C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, B0, B1 }
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 #define RGB_DI_PIN B3
 #ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/skeletn87/hotswap/info.json b/keyboards/skeletn87/hotswap/info.json
index 39b296a679..31aebd5e90 100644
--- a/keyboards/skeletn87/hotswap/info.json
+++ b/keyboards/skeletn87/hotswap/info.json
@@ -8,6 +8,11 @@
        "pid": "0xB5E9",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "B0", "B1"],
+        "rows": ["C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"]
+    },
+    "diode_direction": "COL2ROW",
    "backlight": {
        "pin": "B7",
        "levels": 8,
diff --git a/keyboards/skeletn87/soldered/config.h b/keyboards/skeletn87/soldered/config.h
index 095b95d13c..698eecb6fc 100644
--- a/keyboards/skeletn87/soldered/config.h
+++ b/keyboards/skeletn87/soldered/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS { C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, B0, B1 }
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 #define RGB_DI_PIN B2
 #ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/skeletn87/soldered/info.json b/keyboards/skeletn87/soldered/info.json
index 32ed0e6f0e..e7afa01eba 100644
--- a/keyboards/skeletn87/soldered/info.json
+++ b/keyboards/skeletn87/soldered/info.json
@@ -8,6 +8,11 @@
        "pid": "0xB5E8",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "B0", "B1"],
+        "rows": ["C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"]
+    },
+    "diode_direction": "COL2ROW",
    "backlight": {
        "pin": "B7",
        "levels": 8,
diff --git a/keyboards/skeletonkbd/skeletonnumpad/config.h b/keyboards/skeletonkbd/skeletonnumpad/config.h
index 7814933e42..c8ed85b89e 100644
--- a/keyboards/skeletonkbd/skeletonnumpad/config.h
+++ b/keyboards/skeletonkbd/skeletonnumpad/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/*
- * 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 { B6, C6, C7, F7, F6 }
-#define MATRIX_COL_PINS { D6, D7, B4, B5 }
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 #define RGB_DI_PIN D4
 #ifdef RGB_DI_PIN
 #    define RGBLED_NUM 17
diff --git a/keyboards/skeletonkbd/skeletonnumpad/info.json b/keyboards/skeletonkbd/skeletonnumpad/info.json
index c637cbfffc..82f7c4cee1 100644
--- a/keyboards/skeletonkbd/skeletonnumpad/info.json
+++ b/keyboards/skeletonkbd/skeletonnumpad/info.json
@@ -8,6 +8,11 @@
        "pid": "0x6E70",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["D6", "D7", "B4", "B5"],
+        "rows": ["B6", "C6", "C7", "F7", "F6"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/skergo/config.h b/keyboards/skergo/config.h
index 9d5633e574..a463c64167 100644
--- a/keyboards/skergo/config.h
+++ b/keyboards/skergo/config.h
@@ -16,14 +16,6 @@
 #pragma once
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B0, B4, B3, B2, B1 }
-#define MATRIX_COL_PINS { A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C2, C1, C0, D7 }
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/skergo/info.json b/keyboards/skergo/info.json
index 01572f630f..944516fecd 100644
--- a/keyboards/skergo/info.json
+++ b/keyboards/skergo/info.json
@@ -8,6 +8,11 @@
        "pid": "0x534B",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C2", "C1", "C0", "D7"],
+        "rows": ["B0", "B4", "B3", "B2", "B1"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32a",
    "bootloader": "usbasploader",
    "layout_aliases": {
diff --git a/keyboards/skippys_custom_pcs/rooboard65/config.h b/keyboards/skippys_custom_pcs/rooboard65/config.h
index 2f32ae1375..f8b5ae2db6 100644
--- a/keyboards/skippys_custom_pcs/rooboard65/config.h
+++ b/keyboards/skippys_custom_pcs/rooboard65/config.h
@@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/*
- * 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 { F0, F1, F4, F5, F6  }
-#define MATRIX_COL_PINS { C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, B3, B2, B1, D1 }
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 /* 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/skippys_custom_pcs/rooboard65/info.json b/keyboards/skippys_custom_pcs/rooboard65/info.json
index 497b5a0e7f..dada0aec1f 100644
--- a/keyboards/skippys_custom_pcs/rooboard65/info.json
+++ b/keyboards/skippys_custom_pcs/rooboard65/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0002",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B3", "B2", "B1", "D1"],
+        "rows": ["F0", "F1", "F4", "F5", "F6"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "community_layouts": ["65_ansi"],
diff --git a/keyboards/skippys_custom_pcs/roopad/config.h b/keyboards/skippys_custom_pcs/roopad/config.h
index 7c4946f423..e912cc50ea 100644
--- a/keyboards/skippys_custom_pcs/roopad/config.h
+++ b/keyboards/skippys_custom_pcs/roopad/config.h
@@ -17,25 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/*
- * 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)
- *
-*/
-// Checked with Eagle Schematic
-#define MATRIX_ROW_PINS { B5, F6, F5, F4, F1 }
-#define MATRIX_COL_PINS { F0, B4, D7, D6, D4 }
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 #define RGB_DI_PIN B6
 #define RGBLED_NUM 21
 #define RGBLIGHT_SLEEP
diff --git a/keyboards/skippys_custom_pcs/roopad/info.json b/keyboards/skippys_custom_pcs/roopad/info.json
index 9b7c079765..e0110579f8 100644
--- a/keyboards/skippys_custom_pcs/roopad/info.json
+++ b/keyboards/skippys_custom_pcs/roopad/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0001",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F0", "B4", "D7", "D6", "D4"],
+        "rows": ["B5", "F6", "F5", "F4", "F1"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/slz40/config.h b/keyboards/slz40/config.h
index b55916fe15..e66e3202cc 100644
--- a/keyboards/slz40/config.h
+++ b/keyboards/slz40/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/*
- * 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 { B4, B5, B3, B2, B6 }
-#define MATRIX_COL_PINS { F4, D2, F5, D1, F6, D0, F7, D4, B1, C6, E6, D7 }
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 /* 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/slz40/info.json b/keyboards/slz40/info.json
index dcbd0c73b2..788fe1db95 100644
--- a/keyboards/slz40/info.json
+++ b/keyboards/slz40/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0000",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F4", "D2", "F5", "D1", "F6", "D0", "F7", "D4", "B1", "C6", "E6", "D7"],
+        "rows": ["B4", "B5", "B3", "B2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/smallkeyboard/config.h b/keyboards/smallkeyboard/config.h
index 570607c3ca..4bee1c3663 100644
--- a/keyboards/smallkeyboard/config.h
+++ b/keyboards/smallkeyboard/config.h
@@ -17,23 +17,6 @@
 #pragma once
-/*
- * 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 {C7, C6 }
-#define MATRIX_COL_PINS {F7, F6, F5}
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #    define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/smallkeyboard/info.json b/keyboards/smallkeyboard/info.json
index 11a96f5af6..16c79cf6ad 100644
--- a/keyboards/smallkeyboard/info.json
+++ b/keyboards/smallkeyboard/info.json
@@ -8,6 +8,11 @@
    "pid": "0x736B",
    "device_version": "0.0.1"
  },
+  "matrix_pins": {
+    "cols": ["F7", "F6", "F5"],
+    "rows": ["C7", "C6"]
+  },
+  "diode_direction": "ROW2COL",
  "processor": "atmega32u4",
  "bootloader": "atmel-dfu",
  "debounce": 3,
diff --git a/keyboards/smithrune/iron165r2/config.h b/keyboards/smithrune/iron165r2/config.h
index d8e7bc64d8..9749d68d72 100644
--- a/keyboards/smithrune/iron165r2/config.h
+++ b/keyboards/smithrune/iron165r2/config.h
@@ -17,12 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-#define MATRIX_COL_PINS { A3 , B8 , B9 , B1 , B0 , B5 , B4 , B3 , A15, A8 , A1 , A0 , C15, C14, C13}
-#define MATRIX_ROW_PINS { B10, A10, A2 , A5 , A7 }
-#define DIODE_DIRECTION COL2ROW
 #define LOCKING_SUPPORT_ENABLE
 #define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/smithrune/iron165r2/info.json b/keyboards/smithrune/iron165r2/info.json
index ed24e0e63c..35a2a0c4bd 100644
--- a/keyboards/smithrune/iron165r2/info.json
+++ b/keyboards/smithrune/iron165r2/info.json
@@ -8,6 +8,11 @@
        "pid": "0x1652",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["A3", "B8", "B9", "B1", "B0", "B5", "B4", "B3", "A15", "A8", "A1", "A0", "C15", "C14", "C13"],
+        "rows": ["B10", "A10", "A2", "A5", "A7"]
+    },
+    "diode_direction": "COL2ROW",
    "indicators": {
        "caps_lock": "A4"
    },
diff --git a/keyboards/smithrune/iron180/config.h b/keyboards/smithrune/iron180/config.h
index 92c28d5719..7506922b00 100644
--- a/keyboards/smithrune/iron180/config.h
+++ b/keyboards/smithrune/iron180/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-#define MATRIX_COL_PINS { B7 , B6 , B5 , B4 , B3 , A10, A9 , A8 , B15, B14, B13, B12, B11, B2 , A4 , B1 , A3 }
-#define MATRIX_ROW_PINS { B9 , B8 , A15, B0 , A7 , A5 }
-#define DIODE_DIRECTION COL2ROW
 #define BACKLIGHT_PWM_DRIVER    PWMD3
 #define BACKLIGHT_PWM_CHANNEL   1
 #define BACKLIGHT_PAL_MODE      1
diff --git a/keyboards/smithrune/iron180/info.json b/keyboards/smithrune/iron180/info.json
index 0f8c436240..17febf6be5 100644
--- a/keyboards/smithrune/iron180/info.json
+++ b/keyboards/smithrune/iron180/info.json
@@ -8,6 +8,11 @@
        "pid": "0x1180",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["B7", "B6", "B5", "B4", "B3", "A10", "A9", "A8", "B15", "B14", "B13", "B12", "B11", "B2", "A4", "B1", "A3"],
+        "rows": ["B9", "B8", "A15", "B0", "A7", "A5"]
+    },
+    "diode_direction": "COL2ROW",
    "backlight": {
        "pin": "A6",
        "levels": 6,
diff --git a/keyboards/smk60/config.h b/keyboards/smk60/config.h
index a4aa26d5d5..622495f6d0 100644
--- a/keyboards/smk60/config.h
+++ b/keyboards/smk60/config.h
@@ -4,12 +4,6 @@
 */
 #pragma once
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B0, F0, F1, F5, B2 }
-#define MATRIX_COL_PINS { B4, B5, B6, C6, C7, F6, F7, F4, B1, B3, D0, D1, D2, D3, D5}
-#define DIODE_DIRECTION COL2ROW
 /*
 * Feature disable options
 *  These options are also useful to firmware size reduction.
diff --git a/keyboards/smk60/info.json b/keyboards/smk60/info.json
index 9e356ef6c8..bc32109a17 100644
--- a/keyboards/smk60/info.json
+++ b/keyboards/smk60/info.json
@@ -8,6 +8,11 @@
        "pid": "0x6585",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["B4", "B5", "B6", "C6", "C7", "F6", "F7", "F4", "B1", "B3", "D0", "D1", "D2", "D3", "D5"],
+        "rows": ["B0", "F0", "F1", "F5", "B2"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "community_layouts": ["60_ansi", "60_hhkb", "60_iso"],
diff --git a/keyboards/snampad/config.h b/keyboards/snampad/config.h
index 9c0f2de65b..63349588ec 100644
--- a/keyboards/snampad/config.h
+++ b/keyboards/snampad/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/*
- * 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 { F4, F5, F6, F7, B1, B3 }
-#define MATRIX_COL_PINS { D0, D1, D2, D3  }
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION ROW2COL
 /* 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/snampad/info.json b/keyboards/snampad/info.json
index a8f8997593..a8a9222d67 100644
--- a/keyboards/snampad/info.json
+++ b/keyboards/snampad/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0000",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["D0", "D1", "D2", "D3"],
+        "rows": ["F4", "F5", "F6", "F7", "B1", "B3"]
+    },
+    "diode_direction": "ROW2COL",
    "processor": "atmega32u4",
    "bootloader": "caterina",
    "community_layouts": ["numpad_6x4"],
diff --git a/keyboards/sneakbox/aliceclone/config.h b/keyboards/sneakbox/aliceclone/config.h
index cae120ac7e..31e6bd43c8 100644
--- a/keyboards/sneakbox/aliceclone/config.h
+++ b/keyboards/sneakbox/aliceclone/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F1, E6, F4, B1, F5, B2, F6, B3, F7, B7 }
-#define MATRIX_COL_PINS { F0, D0, C7, C6, B6, B5, B4, D1 }
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/sneakbox/aliceclone/info.json b/keyboards/sneakbox/aliceclone/info.json
index 6890765f7f..fb2b7c56cd 100644
--- a/keyboards/sneakbox/aliceclone/info.json
+++ b/keyboards/sneakbox/aliceclone/info.json
@@ -8,6 +8,11 @@
    "pid": "0x0001",
    "device_version": "0.0.1"
  },
+  "matrix_pins": {
+    "cols": ["F0", "D0", "C7", "C6", "B6", "B5", "B4", "D1"],
+    "rows": ["F1", "E6", "F4", "B1", "F5", "B2", "F6", "B3", "F7", "B7"]
+  },
+  "diode_direction": "COL2ROW",
  "encoder": {
    "rotary": [
      {"pin_a": "D3", "pin_b": "D2", "resolution": 1}
diff --git a/keyboards/sneakbox/aliceclonergb/config.h b/keyboards/sneakbox/aliceclonergb/config.h
index 26bddb382a..6a7dcff5ed 100644
--- a/keyboards/sneakbox/aliceclonergb/config.h
+++ b/keyboards/sneakbox/aliceclonergb/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F1, E6, F4, B1, F5, B2, F6, B3, F7, B7 }
-#define MATRIX_COL_PINS { F0, D0, C7, C6, B6, B5, B4, D1 }
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 #define RGB_DI_PIN D5
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/sneakbox/aliceclonergb/info.json b/keyboards/sneakbox/aliceclonergb/info.json
index cb7226ae81..a138d5d276 100644
--- a/keyboards/sneakbox/aliceclonergb/info.json
+++ b/keyboards/sneakbox/aliceclonergb/info.json
@@ -8,6 +8,11 @@
    "pid": "0x0006",
    "device_version": "0.0.1"
  },
+  "matrix_pins": {
+    "cols": ["F0", "D0", "C7", "C6", "B6", "B5", "B4", "D1"],
+    "rows": ["F1", "E6", "F4", "B1", "F5", "B2", "F6", "B3", "F7", "B7"]
+  },
+  "diode_direction": "COL2ROW",
  "encoder": {
    "rotary": [
      {"pin_a": "D3", "pin_b": "D2", "resolution": 1}
diff --git a/keyboards/sneakbox/ava/config.h b/keyboards/sneakbox/ava/config.h
index 23a0132305..a936b135f9 100644
--- a/keyboards/sneakbox/ava/config.h
+++ b/keyboards/sneakbox/ava/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F1, E6, F4, B1, F5, B2, F6, B3, B7 }
-#define MATRIX_COL_PINS { F0, D0, C7, C6, B6, B5, B4, D1 }
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 #define RGB_DI_PIN F7
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/sneakbox/ava/info.json b/keyboards/sneakbox/ava/info.json
index dae35f1dc6..068806ca33 100644
--- a/keyboards/sneakbox/ava/info.json
+++ b/keyboards/sneakbox/ava/info.json
@@ -8,6 +8,11 @@
    "pid": "0x0004",
    "device_version": "0.0.1"
  },
+  "matrix_pins": {
+    "cols": ["F0", "D0", "C7", "C6", "B6", "B5", "B4", "D1"],
+    "rows": ["F1", "E6", "F4", "B1", "F5", "B2", "F6", "B3", "B7"]
+  },
+  "diode_direction": "COL2ROW",
  "encoder": {
    "rotary": [
      {"pin_a": "D3", "pin_b": "D2", "resolution": 1}
diff --git a/keyboards/sneakbox/disarray/ortho/config.h b/keyboards/sneakbox/disarray/ortho/config.h
index 78b024604c..f71cc2ebbb 100644
--- a/keyboards/sneakbox/disarray/ortho/config.h
+++ b/keyboards/sneakbox/disarray/ortho/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B7, D0, D1, D2, D3, B0}
-#define MATRIX_COL_PINS { D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4, F1, F0, E6}
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/sneakbox/disarray/ortho/info.json b/keyboards/sneakbox/disarray/ortho/info.json
index 65c8ff41d1..d832b56a73 100644
--- a/keyboards/sneakbox/disarray/ortho/info.json
+++ b/keyboards/sneakbox/disarray/ortho/info.json
@@ -8,6 +8,11 @@
    "pid": "0x0003",
    "device_version": "0.0.1"
  },
+  "matrix_pins": {
+    "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "E6"],
+    "rows": ["B7", "D0", "D1", "D2", "D3", "B0"]
+  },
+  "diode_direction": "COL2ROW",
  "encoder": {
    "rotary": [
      {"pin_a": "B3", "pin_b": "B2", "resolution": 1}
diff --git a/keyboards/sneakbox/disarray/staggered/config.h b/keyboards/sneakbox/disarray/staggered/config.h
index 486442bcf1..f71cc2ebbb 100644
--- a/keyboards/sneakbox/disarray/staggered/config.h
+++ b/keyboards/sneakbox/disarray/staggered/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B7, D0, D1, D2, D3}
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, E6}
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/sneakbox/disarray/staggered/info.json b/keyboards/sneakbox/disarray/staggered/info.json
index 1a788b77ec..a69447365a 100644
--- a/keyboards/sneakbox/disarray/staggered/info.json
+++ b/keyboards/sneakbox/disarray/staggered/info.json
@@ -8,6 +8,11 @@
    "pid": "0x0002",
    "device_version": "0.0.1"
  },
+  "matrix_pins": {
+    "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "E6"],
+    "rows": ["B7", "D0", "D1", "D2", "D3"]
+  },
+  "diode_direction": "COL2ROW",
  "encoder": {
    "rotary": [
      {"pin_a": "B3", "pin_b": "B2", "resolution": 1}
diff --git a/keyboards/soda/cherish/config.h b/keyboards/soda/cherish/config.h
index 95d332cf95..fdcd9d801b 100644
--- a/keyboards/soda/cherish/config.h
+++ b/keyboards/soda/cherish/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-#define MATRIX_COL_PINS { B12, B13, B14, B15, A8, A9, A10, A14, A15, B3, B4, B5, B6, B7, B8}
-#define MATRIX_ROW_PINS { A7, B0, B1, B2, B10, B11 }
-#define DIODE_DIRECTION COL2ROW
 /* 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/soda/cherish/info.json b/keyboards/soda/cherish/info.json
index 713356f944..446fda090b 100644
--- a/keyboards/soda/cherish/info.json
+++ b/keyboards/soda/cherish/info.json
@@ -8,6 +8,11 @@
        "pid": "0xEB52",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["B12", "B13", "B14", "B15", "A8", "A9", "A10", "A14", "A15", "B3", "B4", "B5", "B6", "B7", "B8"],
+        "rows": ["A7", "B0", "B1", "B2", "B10", "B11"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "STM32F072",
    "bootloader": "stm32-dfu",
    "layout_aliases": {
diff --git a/keyboards/soda/pocket/config.h b/keyboards/soda/pocket/config.h
index 4b6ff7b4ab..89571c505f 100644
--- a/keyboards/soda/pocket/config.h
+++ b/keyboards/soda/pocket/config.h
@@ -15,11 +15,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-#define MATRIX_COL_PINS { A2, A1, B14, B4, B5, B6, B7}
-#define MATRIX_ROW_PINS { A7, B0, B1, B2, B10, B11 }
-#define DIODE_DIRECTION ROW2COL
 #define LED_NUM_LOCK_PIN B15
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/soda/pocket/info.json b/keyboards/soda/pocket/info.json
index b91f795b04..96b5276f80 100644
--- a/keyboards/soda/pocket/info.json
+++ b/keyboards/soda/pocket/info.json
@@ -8,6 +8,11 @@
        "pid": "0x4F51",
        "device_version": "1.0.2"
    },
+    "matrix_pins": {
+        "cols": ["A2", "A1", "B14", "B4", "B5", "B6", "B7"],
+        "rows": ["A7", "B0", "B1", "B2", "B10", "B11"]
+    },
+    "diode_direction": "ROW2COL",
    "processor": "STM32F072",
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/sofle/keyhive/config.h b/keyboards/sofle/keyhive/config.h
index c65caad1de..0f02ae7cfb 100755
--- a/keyboards/sofle/keyhive/config.h
+++ b/keyboards/sofle/keyhive/config.h
@@ -18,14 +18,6 @@
 #pragma once
-// wiring of each half
-#define MATRIX_ROW_PINS       { C6, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS       { B6, B2, B3, B1, F7, F6, NO_PIN } // A virtual pin is needed for the encoder key matrix in via.
-#define MATRIX_ROW_PINS_RIGHT { C6, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS_RIGHT { F6, F7, B1, B3, B2, B6, NO_PIN } // A virtual pin is needed for the encoder key matrix in via.
-#define DIODE_DIRECTION COL2ROW
 #define TAP_CODE_DELAY  10
 // OLED settings
diff --git a/keyboards/sofle/keyhive/info.json b/keyboards/sofle/keyhive/info.json
index f1d76cb788..5bfc312cf2 100644
--- a/keyboards/sofle/keyhive/info.json
+++ b/keyboards/sofle/keyhive/info.json
@@ -6,6 +6,11 @@
        "pid": "0x1287",
        "device_version": "0.0.2"
    },
+    "matrix_pins": {
+        "cols": ["B6", "B2", "B3", "B1", "F7", "F6", null],
+        "rows": ["C6", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
    "encoder": {
        "rotary": [
            {"pin_a": "F5", "pin_b": "F4"}
@@ -19,6 +24,12 @@
                    {"pin_a": "F4", "pin_b": "F5", "resolution": 2}
                ]
            }
+        },
+        "matrix_pins": {
+            "right": {
+                "cols": ["F6", "F7", "B1", "B3", "B2", "B6", null],
+                "rows": ["C6", "D7", "E6", "B4", "B5"]
+            }
        }
    },
    "processor": "atmega32u4",
diff --git a/keyboards/sofle/rev1/config.h b/keyboards/sofle/rev1/config.h
index 34886b3be1..be64549748 100644
--- a/keyboards/sofle/rev1/config.h
+++ b/keyboards/sofle/rev1/config.h
@@ -1,10 +1,5 @@
 #pragma once
-// wiring of each half
-#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 }
-#define DIODE_DIRECTION COL2ROW
 #define TAPPING_TERM 100
 #define TAP_CODE_DELAY 10
diff --git a/keyboards/sofle/rev1/info.json b/keyboards/sofle/rev1/info.json
index 4a113ec2f2..1f9829426e 100644
--- a/keyboards/sofle/rev1/info.json
+++ b/keyboards/sofle/rev1/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0287",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["C6", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
    "encoder": {
        "rotary": [
            {"pin_a": "F5", "pin_b": "F4", "resolution": 2}
diff --git a/keyboards/soup10/config.h b/keyboards/soup10/config.h
index fd11a7d1a9..f479b15794 100644
--- a/keyboards/soup10/config.h
+++ b/keyboards/soup10/config.h
@@ -17,24 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/*
- * 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)
- *
- */
-//                        0   1   2   3
-#define MATRIX_ROW_PINS { D1, D0, D4, C6 }
-#define MATRIX_COL_PINS { D7, E6, B4 }
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 /* 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/soup10/info.json b/keyboards/soup10/info.json
index e96e371d3e..df601d4012 100644
--- a/keyboards/soup10/info.json
+++ b/keyboards/soup10/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0001",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["D7", "E6", "B4"],
+        "rows": ["D1", "D0", "D4", "C6"]
+    },
+    "diode_direction": "COL2ROW",
    "bootmagic": {
        "matrix": [0, 1]
    },
diff --git a/keyboards/sowbug/68keys/config.h b/keyboards/sowbug/68keys/config.h
index 265cb24f07..5f01daec82 100644
--- a/keyboards/sowbug/68keys/config.h
+++ b/keyboards/sowbug/68keys/config.h
@@ -18,14 +18,6 @@
 #pragma once
-// key matrix pins
-#define MATRIX_ROW_PINS { C14, C15, A0, A1, A2 }
-#define MATRIX_COL_PINS { A3, A4, A5, A6, A7, B0, B1, B10, B11, B12, B13, B14, B15, A8, A9, A10 }
-// COL2ROW or ROW2COL
-#define DIODE_DIRECTION COL2ROW
 #define RGB_DI_PIN B9
 #define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/sowbug/68keys/info.json b/keyboards/sowbug/68keys/info.json
index fef199e6cd..8da6bdc825 100644
--- a/keyboards/sowbug/68keys/info.json
+++ b/keyboards/sowbug/68keys/info.json
@@ -8,6 +8,11 @@
        "pid": "0x8888",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["A3", "A4", "A5", "A6", "A7", "B0", "B1", "B10", "B11", "B12", "B13", "B14", "B15", "A8", "A9", "A10"],
+        "rows": ["C14", "C15", "A0", "A1", "A2"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "STM32F103",
    "bootloader": "stm32duino",
    "layouts": {
diff --git a/keyboards/sowbug/ansi_tkl/config.h b/keyboards/sowbug/ansi_tkl/config.h
index 770a48b14d..7c520910bc 100644
--- a/keyboards/sowbug/ansi_tkl/config.h
+++ b/keyboards/sowbug/ansi_tkl/config.h
@@ -18,16 +18,6 @@
 #pragma once
-// key matrix pins
-#define MATRIX_ROW_PINS \
-    { C14, C15, A0, A1, A2, A3 }
-#define MATRIX_COL_PINS \
-    { A4, A5, A6, A7, B0, B1, B10, B11, B12, B13, B14, B15, A8, A9, A10, A15, B3 }
-// COL2ROW or ROW2COL
-#define DIODE_DIRECTION COL2ROW
 #define RGB_DI_PIN B9
 #define RGB_MATRIX_KEYPRESSES
 #define RGBLED_NUM 87
diff --git a/keyboards/sowbug/ansi_tkl/info.json b/keyboards/sowbug/ansi_tkl/info.json
index 30cef14f70..a1c19c60aa 100644
--- a/keyboards/sowbug/ansi_tkl/info.json
+++ b/keyboards/sowbug/ansi_tkl/info.json
@@ -8,6 +8,11 @@
        "pid": "0x8889",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["A4", "A5", "A6", "A7", "B0", "B1", "B10", "B11", "B12", "B13", "B14", "B15", "A8", "A9", "A10", "A15", "B3"],
+        "rows": ["C14", "C15", "A0", "A1", "A2", "A3"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "STM32F103",
    "bootloader": "stm32duino",
    "layouts": {
diff --git a/keyboards/soy20/config.h b/keyboards/soy20/config.h
index 19ca0d46e5..6e73672c8d 100644
--- a/keyboards/soy20/config.h
+++ b/keyboards/soy20/config.h
@@ -16,14 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.*/
 #pragma once
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4 }
-#define MATRIX_COL_PINS { B5, B6, B7, C7 }
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/soy20/info.json b/keyboards/soy20/info.json
index 4add710d13..069427beed 100644
--- a/keyboards/soy20/info.json
+++ b/keyboards/soy20/info.json
@@ -8,6 +8,11 @@
        "pid": "0x534F",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["B5", "B6", "B7", "C7"],
+        "rows": ["B0", "B1", "B2", "B3", "B4"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u2",
    "bootloader": "atmel-dfu",
    "community_layouts": ["ortho_5x4"],
diff --git a/keyboards/spaceholdings/nebula12/config.h b/keyboards/spaceholdings/nebula12/config.h
index fb56b1ddda..8199836860 100755
--- a/keyboards/spaceholdings/nebula12/config.h
+++ b/keyboards/spaceholdings/nebula12/config.h
@@ -24,13 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* LSE clock */
 #define STM32_LSECLK 32768
-#define MATRIX_ROW_PINS { A8, C15, A0, A1 }
-#define MATRIX_COL_PINS { A9, C13, C14 }
-// To enable debugger set A13 A14 -> A5 A7
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
 /* Ensure we jump to bootloader if the QK_BOOT keycode was pressed */
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
diff --git a/keyboards/spaceholdings/nebula12/info.json b/keyboards/spaceholdings/nebula12/info.json
index fac12196b1..898a6ea11e 100755
--- a/keyboards/spaceholdings/nebula12/info.json
+++ b/keyboards/spaceholdings/nebula12/info.json
@@ -8,6 +8,11 @@
        "pid": "0x5337",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["A9", "C13", "C14"],
+        "rows": ["A8", "C15", "A0", "A1"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "STM32F072",
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/spaceholdings/nebula12b/config.h b/keyboards/spaceholdings/nebula12b/config.h
index 9c44c01b7a..0928d190df 100755
--- a/keyboards/spaceholdings/nebula12b/config.h
+++ b/keyboards/spaceholdings/nebula12b/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-#define MATRIX_ROW_PINS { B7, B4, F7, F6 }
-#define MATRIX_COL_PINS { F4, F5, D7 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
 /* RGB options */
 #define RGB_DI_PIN D5
diff --git a/keyboards/spaceholdings/nebula12b/info.json b/keyboards/spaceholdings/nebula12b/info.json
index 400e5790c9..8d5af9da50 100755
--- a/keyboards/spaceholdings/nebula12b/info.json
+++ b/keyboards/spaceholdings/nebula12b/info.json
@@ -8,6 +8,11 @@
        "pid": "0x5332",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "D7"],
+        "rows": ["B7", "B4", "F7", "F6"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/spaceholdings/nebula68/config.h b/keyboards/spaceholdings/nebula68/config.h
index 5e9d0a58e5..a3b44e4afe 100755
--- a/keyboards/spaceholdings/nebula68/config.h
+++ b/keyboards/spaceholdings/nebula68/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-#define MATRIX_ROW_PINS { B3, B4, B5, A8, A4 }
-#define MATRIX_COL_PINS { A13, A10, A9, A14, A15, B8, B9, C13, C14, C15, A0, A1, A2, A3, A5 }
-// To enable debugger set A13 A14 -> A5 A7
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
 #define WS2812_PWM_DRIVER PWMD3  // default: PWMD2
 #define WS2812_PWM_CHANNEL 2  // default: 2
 #define WS2812_PWM_PAL_MODE 2  // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 2
diff --git a/keyboards/spaceholdings/nebula68/info.json b/keyboards/spaceholdings/nebula68/info.json
index 77bda023d3..9ee3469f0d 100755
--- a/keyboards/spaceholdings/nebula68/info.json
+++ b/keyboards/spaceholdings/nebula68/info.json
@@ -8,6 +8,11 @@
        "pid": "0x5336",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["A13", "A10", "A9", "A14", "A15", "B8", "B9", "C13", "C14", "C15", "A0", "A1", "A2", "A3", "A5"],
+        "rows": ["B3", "B4", "B5", "A8", "A4"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "STM32F303",
    "bootloader": "stm32-dfu",
    "board": "QMK_PROTON_C",
diff --git a/keyboards/spaceholdings/nebula68b/config.h b/keyboards/spaceholdings/nebula68b/config.h
index ee00fb233c..08ce4cb92d 100755
--- a/keyboards/spaceholdings/nebula68b/config.h
+++ b/keyboards/spaceholdings/nebula68b/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-#define MATRIX_ROW_PINS { D4, D6, D7, B4, E6 }
-#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, B5, B6, C6, C7, F7, F6, F5, F4, F1, F0 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
 /* RGB options */
 #define RGB_DI_PIN B7
diff --git a/keyboards/spaceholdings/nebula68b/info.json b/keyboards/spaceholdings/nebula68b/info.json
index b1ca0f0fd0..ef5d1b6b9c 100755
--- a/keyboards/spaceholdings/nebula68b/info.json
+++ b/keyboards/spaceholdings/nebula68b/info.json
@@ -8,6 +8,11 @@
        "pid": "0x5338",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["D0", "D1", "D2", "D3", "D5", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"],
+        "rows": ["D4", "D6", "D7", "B4", "E6"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/spaceman/pancake/rev1/config.h b/keyboards/spaceman/pancake/rev1/config.h
deleted file mode 100644
index 5c72d34933..0000000000
--- a/keyboards/spaceman/pancake/rev1/config.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2019 Spaceman
- *
- * 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
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/spaceman/pancake/rev1/feather/config.h b/keyboards/spaceman/pancake/rev1/feather/config.h
index ea6af6336d..9ff72156da 100644
--- a/keyboards/spaceman/pancake/rev1/feather/config.h
+++ b/keyboards/spaceman/pancake/rev1/feather/config.h
@@ -15,8 +15,4 @@
 */
 #pragma once
-/* Pancake default pinout */
-#define MATRIX_ROW_PINS { B5, D7, C6, D0 }
-#define MATRIX_COL_PINS { C7, D6, B7, B6, F0, D2, D3, F1, F4, F5, F6, F7 }
 #define VIA_HAS_BROKEN_KEYCODES
diff --git a/keyboards/spaceman/pancake/rev1/feather/info.json b/keyboards/spaceman/pancake/rev1/feather/info.json
new file mode 100644
index 0000000000..2d8072e7f1
--- /dev/null
+++ b/keyboards/spaceman/pancake/rev1/feather/info.json
@@ -0,0 +1,7 @@
+{
+    "matrix_pins": {
+        "cols": ["C7", "D6", "B7", "B6", "F0", "D2", "D3", "F1", "F4", "F5", "F6", "F7"],
+        "rows": ["B5", "D7", "C6", "D0"]
+    },
+    "diode_direction": "COL2ROW"
+}
diff --git a/keyboards/spaceman/pancake/rev1/promicro/config.h b/keyboards/spaceman/pancake/rev1/promicro/config.h
deleted file mode 100644
index 3024db4d46..0000000000
--- a/keyboards/spaceman/pancake/rev1/promicro/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2019 Spaceman
- *
- * 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
-/* Pancake default pinout */
-#define MATRIX_ROW_PINS { B1, B3, B2, B6 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, E6, B4, B5, D7, C6, D4, D0, D1 }
diff --git a/keyboards/spaceman/pancake/rev1/promicro/info.json b/keyboards/spaceman/pancake/rev1/promicro/info.json
new file mode 100644
index 0000000000..47ab8fdcd0
--- /dev/null
+++ b/keyboards/spaceman/pancake/rev1/promicro/info.json
@@ -0,0 +1,7 @@
+{
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "E6", "B4", "B5", "D7", "C6", "D4", "D0", "D1"],
+        "rows": ["B1", "B3", "B2", "B6"]
+    },
+    "diode_direction": "COL2ROW"
+}
diff --git a/keyboards/spaceman/pancake/rev2/config.h b/keyboards/spaceman/pancake/rev2/config.h
deleted file mode 100644
index 294f9cc663..0000000000
--- a/keyboards/spaceman/pancake/rev2/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2020 Spaceman
- *
- * 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
-#define DIODE_DIRECTION COL2ROW
-#define MATRIX_ROW_PINS { C7, C6, B6, B5 }
-#define MATRIX_COL_PINS { B7, B3, B2, B1 ,B0, E6, F0, F1, F4, F5, F6, F7 }
diff --git a/keyboards/spaceman/pancake/rev2/info.json b/keyboards/spaceman/pancake/rev2/info.json
index 22da63e5f2..49c12d20e0 100644
--- a/keyboards/spaceman/pancake/rev2/info.json
+++ b/keyboards/spaceman/pancake/rev2/info.json
@@ -8,6 +8,11 @@
    "pid": "0x5032",
    "device_version": "0.0.2"
  },
+  "matrix_pins": {
+    "cols": ["B7", "B3", "B2", "B1", "B0", "E6", "F0", "F1", "F4", "F5", "F6", "F7"],
+    "rows": ["C7", "C6", "B6", "B5"]
+  },
+  "diode_direction": "COL2ROW",
  "processor": "atmega32u4",
  "bootloader": "atmel-dfu",
  "community_layouts": ["ortho_4x12"],
diff --git a/keyboards/spaceman/yun65/config.h b/keyboards/spaceman/yun65/config.h
deleted file mode 100644
index b8900721e4..0000000000
--- a/keyboards/spaceman/yun65/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2020 Spaceman
- *
- * 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
-#define DIODE_DIRECTION COL2ROW
-#define MATRIX_ROW_PINS { E6, D3, D2, D1, D0 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, D4, D6, D7, B4, B5, B6, C6, C7, D5, B3 }
diff --git a/keyboards/spaceman/yun65/info.json b/keyboards/spaceman/yun65/info.json
index 1103a08c72..5ffd5772f6 100644
--- a/keyboards/spaceman/yun65/info.json
+++ b/keyboards/spaceman/yun65/info.json
@@ -8,6 +8,11 @@
    "pid": "0x594E",
    "device_version": "0.0.1"
  },
+  "matrix_pins": {
+    "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "D5", "B3"],
+    "rows": ["E6", "D3", "D2", "D1", "D0"]
+  },
+  "diode_direction": "COL2ROW",
  "processor": "atmega32u4",
  "bootloader": "atmel-dfu",
  "layouts": {
diff --git a/keyboards/spacetime/config.h b/keyboards/spacetime/config.h
index 22fced8d29..b7ece10f6c 100644
--- a/keyboards/spacetime/config.h
+++ b/keyboards/spacetime/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/*
- * 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 { D4, C6, D7, E6 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
 /* 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/spacetime/info.json b/keyboards/spacetime/info.json
index b4c037caeb..c82bd6ecbb 100644
--- a/keyboards/spacetime/info.json
+++ b/keyboards/spacetime/info.json
@@ -8,6 +8,11 @@
    "pid": "0x0A0C",
    "device_version": "1.0.0"
  },
+  "matrix_pins": {
+    "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
+    "rows": ["D4", "C6", "D7", "E6"]
+  },
+  "diode_direction": "COL2ROW",
  "split": {
    "soft_serial_pin": "D0"
  },
diff --git a/keyboards/spacey/config.h b/keyboards/spacey/config.h
deleted file mode 100644
index 411f2c2578..0000000000
--- a/keyboards/spacey/config.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-Copyright 2021 vanilla
-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
-/*
- * 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 { D4, C6, F6, F5, F4 }
-#define MATRIX_COL_PINS { D5, B7, B5, B4, E6, D7, C7, B3, B2, B6, F0, F1, B1, F7 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/spacey/info.json b/keyboards/spacey/info.json
index c24d46d753..881efb60d6 100644
--- a/keyboards/spacey/info.json
+++ b/keyboards/spacey/info.json
@@ -8,6 +8,11 @@
        "pid": "0x2045",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["D5", "B7", "B5", "B4", "E6", "D7", "C7", "B3", "B2", "B6", "F0", "F1", "B1", "F7"],
+        "rows": ["D4", "C6", "F6", "F5", "F4"]
+    },
+    "diode_direction": "COL2ROW",
    "encoder": {
        "rotary": [
            {"pin_a": "D0", "pin_b": "D1"}
diff --git a/keyboards/sparrow62/config.h b/keyboards/sparrow62/config.h
index 45d0711d85..3f234d31cb 100644
--- a/keyboards/sparrow62/config.h
+++ b/keyboards/sparrow62/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-// wiring of each half
-#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6 }
-#define DIODE_DIRECTION COL2ROW
 #define SPLIT_HAND_PIN F4
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/sparrow62/info.json b/keyboards/sparrow62/info.json
index c3d8a099e5..62e9d019c3 100644
--- a/keyboards/sparrow62/info.json
+++ b/keyboards/sparrow62/info.json
@@ -8,6 +8,11 @@
        "pid": "0x7461",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["C6", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
    "split": {
        "soft_serial_pin": "D2"
    },
diff --git a/keyboards/specskeys/config.h b/keyboards/specskeys/config.h
index a987f5782f..490ac5e5c0 100644
--- a/keyboards/specskeys/config.h
+++ b/keyboards/specskeys/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/*
- * 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 { F0, F1, F4, F5, F6, F7 }
-#define MATRIX_COL_PINS { E6, B0, B1, B2, B3, D0, D1, D2, D3, D5, D4, D6, D7, B4, B5, B6 }
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 /* 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/specskeys/info.json b/keyboards/specskeys/info.json
index 8a4ff0d90b..ab08aaef3d 100644
--- a/keyboards/specskeys/info.json
+++ b/keyboards/specskeys/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0080",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["E6", "B0", "B1", "B2", "B3", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6"],
+        "rows": ["F0", "F1", "F4", "F5", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
    "backlight": {
        "pin": "B7",
        "levels": 1
diff --git a/keyboards/splitish/config.h b/keyboards/splitish/config.h
index 7f7b41f58c..f3fe3850d7 100644
--- a/keyboards/splitish/config.h
+++ b/keyboards/splitish/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-#define MATRIX_COL_PINS { F4 , F5 , F6 , F7 , B1 , B3 , C6 , D4 , D0 , D1 , D2 , D3 }
-#define MATRIX_ROW_PINS { B4 , B5 , B2 , B6 }
-#define DIODE_DIRECTION COL2ROW
 #define LOCKING_SUPPORT_ENABLE
 #define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/splitish/info.json b/keyboards/splitish/info.json
index 067b20c8cf..d973c34eba 100644
--- a/keyboards/splitish/info.json
+++ b/keyboards/splitish/info.json
@@ -8,6 +8,11 @@
        "pid": "0x6464",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "C6", "D4", "D0", "D1", "D2", "D3"],
+        "rows": ["B4", "B5", "B2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "caterina",
    "layouts": {
diff --git a/keyboards/splitkb/kyria/rev1/config.h b/keyboards/splitkb/kyria/rev1/config.h
index 8ca0d50ea6..dc83cf6b86 100644
--- a/keyboards/splitkb/kyria/rev1/config.h
+++ b/keyboards/splitkb/kyria/rev1/config.h
@@ -17,15 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-// wiring
-#define MATRIX_ROW_PINS \
-    { B4, E6, D7, D4 }
-#define MATRIX_COL_PINS \
-    { B6, B2, B3, B1, F7, F6, F5, F4 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
 /*
 * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
 */
diff --git a/keyboards/splitkb/kyria/rev1/info.json b/keyboards/splitkb/kyria/rev1/info.json
index 895f9283ac..3a2b853eac 100644
--- a/keyboards/splitkb/kyria/rev1/info.json
+++ b/keyboards/splitkb/kyria/rev1/info.json
@@ -4,6 +4,11 @@
        "pid": "0x9D9D",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
+        "rows": ["B4", "E6", "D7", "D4"]
+    },
+    "diode_direction": "COL2ROW",
    "encoder": {
        "rotary": [
            {"pin_a": "C6", "pin_b": "B5"}
diff --git a/keyboards/splitkb/kyria/rev2/config.h b/keyboards/splitkb/kyria/rev2/config.h
index 1799c6aa49..8b878739fe 100644
--- a/keyboards/splitkb/kyria/rev2/config.h
+++ b/keyboards/splitkb/kyria/rev2/config.h
@@ -17,19 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-// wiring
-#define MATRIX_ROW_PINS \
-    { F6, F7, B1, B3 }
-#define MATRIX_COL_PINS \
-    { B2, B6, B5, B4, E6, D7, C6, D4 }
-#define MATRIX_ROW_PINS_RIGHT \
-    { D4, C6, D7, E6 }
-#define MATRIX_COL_PINS_RIGHT \
-    { B4, B5, B6, B2, B3, B1, F7, F6 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
 // Side detection
 // col 4 row 3 on right-hand-side
 #define SPLIT_HAND_MATRIX_GRID E6, B3 // row first because the board is col2row
diff --git a/keyboards/splitkb/kyria/rev2/info.json b/keyboards/splitkb/kyria/rev2/info.json
index d21d820804..c0aa1047c5 100644
--- a/keyboards/splitkb/kyria/rev2/info.json
+++ b/keyboards/splitkb/kyria/rev2/info.json
@@ -4,6 +4,11 @@
        "pid": "0x9D9D",
        "device_version": "0.0.2"
    },
+    "matrix_pins": {
+        "cols": ["B2", "B6", "B5", "B4", "E6", "D7", "C6", "D4"],
+        "rows": ["F6", "F7", "B1", "B3"]
+    },
+    "diode_direction": "COL2ROW",
    "encoder": {
        "rotary": [
            {"pin_a": "F4", "pin_b": "F5"}
@@ -16,6 +21,12 @@
                    {"pin_a": "F5", "pin_b": "F4"}
                ]
            }
+        },
+        "matrix_pins": {
+            "right": {
+                "cols": ["B4", "B5", "B6", "B2", "B3", "B1", "F7", "F6"],
+                "rows": ["D4", "C6", "D7", "E6"]
+            }
        }
    },
    "layouts": {
diff --git a/keyboards/splitty/config.h b/keyboards/splitty/config.h
index 3056705bb2..e190122bc8 100644
--- a/keyboards/splitty/config.h
+++ b/keyboards/splitty/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS \
-    { F0, F1, D4, D5, D6 }
-#define MATRIX_COL_PINS \
-    { B0, B1, B2, B3, B4, B5, B6 }
-#define DIODE_DIRECTION COL2ROW
 /* Split Keyboard specific options. */
 #define USE_I2C
 #define EE_HANDS
diff --git a/keyboards/splitty/info.json b/keyboards/splitty/info.json
index bdcb13d044..a2983474be 100644
--- a/keyboards/splitty/info.json
+++ b/keyboards/splitty/info.json
@@ -8,6 +8,11 @@
    "pid": "0x6052",
    "device_version": "0.0.1"
  },
+  "matrix_pins": {
+    "cols": ["B0", "B1", "B2", "B3", "B4", "B5", "B6"],
+    "rows": ["F0", "F1", "D4", "D5", "D6"]
+  },
+  "diode_direction": "COL2ROW",
  "processor": "atmega32u4",
  "bootloader": "atmel-dfu",
  "layouts": {
diff --git a/keyboards/sporewoh/banime40/config.h b/keyboards/sporewoh/banime40/config.h
index 5059ce5d4e..75882003aa 100644
--- a/keyboards/sporewoh/banime40/config.h
+++ b/keyboards/sporewoh/banime40/config.h
@@ -17,13 +17,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/* pin-out for PCB */
-#define MATRIX_ROW_PINS { E6, D7, C6, D4 }
-#define MATRIX_COL_PINS { B4, B5, B6, B2, B3, B1, F7, F6, F5, F4 }
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 #define DYNAMIC_KEYMAP_LAYER_COUNT 10
diff --git a/keyboards/sporewoh/banime40/info.json b/keyboards/sporewoh/banime40/info.json
index 71a30c5b32..726aef3e28 100644
--- a/keyboards/sporewoh/banime40/info.json
+++ b/keyboards/sporewoh/banime40/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0001",
        "device_version": "0.0.1"
     },
+     "matrix_pins": {
+        "cols": ["B4", "B5", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
+        "rows": ["E6", "D7", "C6", "D4"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "caterina",
    "community_layouts": ["ortho_4x10"],
diff --git a/keyboards/star75/config.h b/keyboards/star75/config.h
index e616210705..a9e98683c5 100644
--- a/keyboards/star75/config.h
+++ b/keyboards/star75/config.h
@@ -3,14 +3,6 @@ Copyright 2022 Horns Lyn (@hornslyn)
 SPDX-License-Identifier: GPL-2.0-or-later */
 #pragma once
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B7, D0, D1, D2, D3, D5 }
-#define MATRIX_COL_PINS { D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4, F1, F0, E6 }
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/star75/info.json b/keyboards/star75/info.json
index 4bf206e4e5..1f28a20819 100644
--- a/keyboards/star75/info.json
+++ b/keyboards/star75/info.json
@@ -8,6 +8,11 @@
        "pid": "0x6060",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "E6"],
+        "rows": ["B7", "D0", "D1", "D2", "D3", "D5"]
+    },
+    "diode_direction": "COL2ROW",
    "encoder": {
        "rotary": [
            {"pin_a": "B2", "pin_b": "B1"}
diff --git a/keyboards/stello65/beta/config.h b/keyboards/stello65/beta/config.h
index 4efc0635a1..61ebee945d 100644
--- a/keyboards/stello65/beta/config.h
+++ b/keyboards/stello65/beta/config.h
@@ -3,23 +3,6 @@
 #pragma once
-/*
- * 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 { F0, E6, D0, D1, C6, F7, F6, F5, F4, F1 }
-#define MATRIX_COL_PINS { C7, B6, B5, B4, D7, D6, D4, D5 }
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 #define ENCODERS_CW_KEY  { { 4, 7 } }
 #define ENCODERS_CCW_KEY { { 4, 6 } }
diff --git a/keyboards/stello65/beta/info.json b/keyboards/stello65/beta/info.json
index d4e73eba1d..e01f7399eb 100644
--- a/keyboards/stello65/beta/info.json
+++ b/keyboards/stello65/beta/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0003",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["C7", "B6", "B5", "B4", "D7", "D6", "D4", "D5"],
+        "rows": ["F0", "E6", "D0", "D1", "C6", "F7", "F6", "F5", "F4", "F1"]
+    },
+    "diode_direction": "COL2ROW",
    "encoder": {
        "rotary": [
            {"pin_a": "D3", "pin_b": "D2", "resolution": 2}
diff --git a/keyboards/stello65/hs_rev1/config.h b/keyboards/stello65/hs_rev1/config.h
index d076264be9..6511724728 100644
--- a/keyboards/stello65/hs_rev1/config.h
+++ b/keyboards/stello65/hs_rev1/config.h
@@ -3,23 +3,6 @@
 #pragma once
-/*
- * 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 { F1, F0, D1, D2, B6, C6, C7, F7, F6, F5 }
-#define MATRIX_COL_PINS { E6, B5, B4, D7, D6, D4, D5, D3 }
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 #define RGB_DI_PIN D0
 #ifdef RGB_DI_PIN
 #    define RGBLED_NUM 4
diff --git a/keyboards/stello65/hs_rev1/info.json b/keyboards/stello65/hs_rev1/info.json
index 218f2657ad..17f48c644f 100644
--- a/keyboards/stello65/hs_rev1/info.json
+++ b/keyboards/stello65/hs_rev1/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0004",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["E6", "B5", "B4", "D7", "D6", "D4", "D5", "D3"],
+        "rows": ["F1", "F0", "D1", "D2", "B6", "C6", "C7", "F7", "F6", "F5"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/stello65/sl_rev1/config.h b/keyboards/stello65/sl_rev1/config.h
index de25e1504f..0247bae3a1 100644
--- a/keyboards/stello65/sl_rev1/config.h
+++ b/keyboards/stello65/sl_rev1/config.h
@@ -3,23 +3,6 @@
 #pragma once
-/*
- * 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 { F0, E6, D0, D1, C6, F7, F6, F5, F4, F1 }
-#define MATRIX_COL_PINS { C7, B4, D7, D6, D4, D5, D3, D2 }
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 #define RGB_DI_PIN B7
 #ifdef RGB_DI_PIN
 #    define RGBLED_NUM 4
diff --git a/keyboards/stello65/sl_rev1/info.json b/keyboards/stello65/sl_rev1/info.json
index 647afe2e9c..6d36772839 100644
--- a/keyboards/stello65/sl_rev1/info.json
+++ b/keyboards/stello65/sl_rev1/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0005",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["C7", "B4", "D7", "D6", "D4", "D5", "D3", "D2"],
+        "rows": ["F0", "E6", "D0", "D1", "C6", "F7", "F6", "F5", "F4", "F1"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/stenokeyboards/the_uni/pro_micro/config.h b/keyboards/stenokeyboards/the_uni/pro_micro/config.h
index 860b809ef3..bf5b37166a 100644
--- a/keyboards/stenokeyboards/the_uni/pro_micro/config.h
+++ b/keyboards/stenokeyboards/the_uni/pro_micro/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F4, B2, B6 }
-#define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B5, B4, E6, D7, C6, D4 }
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/stenokeyboards/the_uni/pro_micro/info.json b/keyboards/stenokeyboards/the_uni/pro_micro/info.json
index e1dda21feb..40dd660d09 100644
--- a/keyboards/stenokeyboards/the_uni/pro_micro/info.json
+++ b/keyboards/stenokeyboards/the_uni/pro_micro/info.json
@@ -2,6 +2,11 @@
    "usb": {
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F5", "F6", "F7", "B1", "B3", "B5", "B4", "E6", "D7", "C6", "D4"],
+        "rows": ["F4", "B2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "caterina"
 }
diff --git a/keyboards/stenokeyboards/the_uni/rp_2040/config.h b/keyboards/stenokeyboards/the_uni/rp_2040/config.h
index 46c8a81a84..a2c060d424 100644
--- a/keyboards/stenokeyboards/the_uni/rp_2040/config.h
+++ b/keyboards/stenokeyboards/the_uni/rp_2040/config.h
@@ -16,15 +16,10 @@
 #pragma once
-#define MATRIX_COL_PINS { GP24, GP23, GP21, GP20, GP19, GP6, GP5, GP4, GP3, GP2, GP1 }
-#define MATRIX_ROW_PINS { GP25, GP18, GP17 }
 // #define DEBUG_MATRIX_SCAN_RATE
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
 //#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP25
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 #define FORCE_NKRO
diff --git a/keyboards/stenokeyboards/the_uni/rp_2040/info.json b/keyboards/stenokeyboards/the_uni/rp_2040/info.json
index 6425514687..c48ad290f4 100644
--- a/keyboards/stenokeyboards/the_uni/rp_2040/info.json
+++ b/keyboards/stenokeyboards/the_uni/rp_2040/info.json
@@ -2,6 +2,11 @@
    "usb": {
        "device_version": "0.0.4"
    },
+    "matrix_pins": {
+        "cols": ["GP24", "GP23", "GP21", "GP20", "GP19", "GP6", "GP5", "GP4", "GP3", "GP2", "GP1"],
+        "rows": ["GP25", "GP18", "GP17"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "RP2040",
    "bootloader": "rp2040"
 }
diff --git a/keyboards/stenokeyboards/the_uni/usb_c/config.h b/keyboards/stenokeyboards/the_uni/usb_c/config.h
index 94fa1c6b63..bf5b37166a 100644
--- a/keyboards/stenokeyboards/the_uni/usb_c/config.h
+++ b/keyboards/stenokeyboards/the_uni/usb_c/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B7, D6, C7 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, D5, D3, D2, D1, D0, D4 }
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/stenokeyboards/the_uni/usb_c/info.json b/keyboards/stenokeyboards/the_uni/usb_c/info.json
index 14c0e6d7cb..ef761abe8a 100644
--- a/keyboards/stenokeyboards/the_uni/usb_c/info.json
+++ b/keyboards/stenokeyboards/the_uni/usb_c/info.json
@@ -2,6 +2,11 @@
    "usb": {
        "device_version": "0.0.3"
    },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "D5", "D3", "D2", "D1", "D0", "D4"],
+        "rows": ["B7", "D6", "C7"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu"
 }
diff --git a/keyboards/stratos/config.h b/keyboards/stratos/config.h
index 6cec383ec9..0f48233bf1 100644
--- a/keyboards/stratos/config.h
+++ b/keyboards/stratos/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS { B1, B2, B3, F0, F1 }
-#define MATRIX_COL_PINS { F4, F7, F5, F6, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3 }
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 /* RGB LEDs */
 #ifdef RGBLIGHT_ENABLE
 #define RGB_DI_PIN D2
diff --git a/keyboards/stratos/info.json b/keyboards/stratos/info.json
index 2f278e18e7..c7a490036c 100644
--- a/keyboards/stratos/info.json
+++ b/keyboards/stratos/info.json
@@ -8,6 +8,11 @@
        "pid": "0x992D",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F4", "F7", "F5", "F6", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3"],
+        "rows": ["B1", "B2", "B3", "F0", "F1"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "community_layouts": ["60_ansi", "60_ansi_arrow", "60_ansi_tsangan", "60_tsangan_hhkb", "60_ansi_split_bs_rshift", "60_iso", "60_iso_split_bs_rshift", "60_iso_tsangan"],
diff --git a/keyboards/studiokestra/bourgeau/config.h b/keyboards/studiokestra/bourgeau/config.h
index 45c78b063f..e17664611c 100644
--- a/keyboards/studiokestra/bourgeau/config.h
+++ b/keyboards/studiokestra/bourgeau/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-#define MATRIX_ROW_PINS { D4, D6, D7, D5, B1, F0 }
-#define MATRIX_COL_PINS { E6, B0, D2, D1, D0, D3, B6, F1, F4, F5, F6, F7, C7, C6, B5, B4 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
 #define RGB_DI_PIN B7
 #ifdef RGB_DI_PIN
  #define RGBLED_NUM 24
diff --git a/keyboards/studiokestra/bourgeau/info.json b/keyboards/studiokestra/bourgeau/info.json
index 0cde6da684..6f19e91dd7 100644
--- a/keyboards/studiokestra/bourgeau/info.json
+++ b/keyboards/studiokestra/bourgeau/info.json
@@ -8,6 +8,11 @@
        "pid": "0x7501",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["E6", "B0", "D2", "D1", "D0", "D3", "B6", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B5", "B4"],
+        "rows": ["D4", "D6", "D7", "D5", "B1", "F0"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layout_aliases": {
diff --git a/keyboards/studiokestra/cascade/config.h b/keyboards/studiokestra/cascade/config.h
index 1ef5926c8e..d48b336fe7 100644
--- a/keyboards/studiokestra/cascade/config.h
+++ b/keyboards/studiokestra/cascade/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-#define MATRIX_ROW_PINS { F0, B1, D4, F4, F1 }
-#define MATRIX_COL_PINS { E6, D5, D1, D0, F5, F6, F7, C7, C6, B6, B5, B4, D6, D7 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
 #define RGB_DI_PIN B0
 #ifdef RGB_DI_PIN
  #define RGBLED_NUM 16
diff --git a/keyboards/studiokestra/cascade/info.json b/keyboards/studiokestra/cascade/info.json
index 096e20a27b..1cda31cab7 100644
--- a/keyboards/studiokestra/cascade/info.json
+++ b/keyboards/studiokestra/cascade/info.json
@@ -8,6 +8,11 @@
        "pid": "0x6001",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["E6", "D5", "D1", "D0", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D6", "D7"],
+        "rows": ["F0", "B1", "D4", "F4", "F1"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/studiokestra/galatea/config.h b/keyboards/studiokestra/galatea/config.h
index 7c5b4dbb29..e95d41f6de 100644
--- a/keyboards/studiokestra/galatea/config.h
+++ b/keyboards/studiokestra/galatea/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, B2, D5 }
-#define MATRIX_ROW_PINS { D1, D0, B0, B7, E6, B3, B6, C6, D6, D7, B4, D3 }
-#define DIODE_DIRECTION COL2ROW
 #if defined(KEYBOARD_studiokestra_galatea_rev2)
  #define RGB_DI_PIN D4
  #define RGBLED_NUM 24
diff --git a/keyboards/studiokestra/galatea/rev1/info.json b/keyboards/studiokestra/galatea/rev1/info.json
index ce1b7f5816..e6a1899e55 100644
--- a/keyboards/studiokestra/galatea/rev1/info.json
+++ b/keyboards/studiokestra/galatea/rev1/info.json
@@ -8,6 +8,11 @@
        "pid": "0x8801",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "B2", "D5"],
+        "rows": ["D1", "D0", "B0", "B7", "E6", "B3", "B6", "C6", "D6", "D7", "B4", "D3"]
+    },
+    "diode_direction": "COL2ROW",
    "indicators": {
        "caps_lock": "B5",
        "scroll_lock": "D2",
diff --git a/keyboards/studiokestra/galatea/rev2/info.json b/keyboards/studiokestra/galatea/rev2/info.json
index dc3865c584..ae1dee5aa0 100644
--- a/keyboards/studiokestra/galatea/rev2/info.json
+++ b/keyboards/studiokestra/galatea/rev2/info.json
@@ -8,6 +8,11 @@
        "pid": "0x8802",
        "device_version": "0.0.2"
    },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "B2", "D5"],
+        "rows": ["D1", "D0", "B0", "B7", "E6", "B3", "B6", "C6", "D6", "D7", "B4", "D3"]
+    },
+    "diode_direction": "COL2ROW",
    "indicators": {
        "caps_lock": "B5",
        "scroll_lock": "D2",
diff --git a/keyboards/studiokestra/nascent/config.h b/keyboards/studiokestra/nascent/config.h
index 5bb31afde5..f1b419a3e2 100644
--- a/keyboards/studiokestra/nascent/config.h
+++ b/keyboards/studiokestra/nascent/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-#define MATRIX_COL_PINS { D2, D3, D7, D6, D4, D5, B0, E6 }
-#define MATRIX_ROW_PINS { F5, F4, F7, F6, C6, C7, B4, B5, D0, D1 }
-#define DIODE_DIRECTION COL2ROW
 /* 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/studiokestra/nascent/info.json b/keyboards/studiokestra/nascent/info.json
index 43aba81924..69d74f9fca 100644
--- a/keyboards/studiokestra/nascent/info.json
+++ b/keyboards/studiokestra/nascent/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0165",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["D2", "D3", "D7", "D6", "D4", "D5", "B0", "E6"],
+        "rows": ["F5", "F4", "F7", "F6", "C6", "C7", "B4", "B5", "D0", "D1"]
+    },
+    "diode_direction": "COL2ROW",
    "indicators": {
        "caps_lock": "B6",
        "on_state": 0
diff --git a/keyboards/studiokestra/nue/config.h b/keyboards/studiokestra/nue/config.h
index 0165b7cef4..e2d4270dd6 100644
--- a/keyboards/studiokestra/nue/config.h
+++ b/keyboards/studiokestra/nue/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-#define MATRIX_COL_PINS { F0, F6, F7, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7 }
-#define MATRIX_ROW_PINS { B0, B7, F1, F5, F4}
-#define DIODE_DIRECTION COL2ROW
 /* 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/studiokestra/nue/info.json b/keyboards/studiokestra/nue/info.json
index bff06e269d..c4cbd11a7b 100644
--- a/keyboards/studiokestra/nue/info.json
+++ b/keyboards/studiokestra/nue/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0701",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F0", "F6", "F7", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"],
+        "rows": ["B0", "B7", "F1", "F5", "F4"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/suavity/ehan/config.h b/keyboards/suavity/ehan/config.h
index 6041beba7f..befff72ca8 100644
--- a/keyboards/suavity/ehan/config.h
+++ b/keyboards/suavity/ehan/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-#define MATRIX_COL_PINS { A10, A9, A8, B15, B14, B13, B12, C14, B7, B6, B5,  B4,  B3,  A15, C13, B9, B8 }
-// Matrix Column Pins:     C0  C1  C2   C3   C4   C5   C6   C7  C8  C9  C10  C11  C12  C13  C14  C15  C16
-#define MATRIX_ROW_PINS { A7, B0, A3, A4, A5, A6 }
-// Matrix Row Pins:       R0  R1  R2  R3  R4  R5
-#define DIODE_DIRECTION COL2ROW
-// Current flow out of the diodes are from rows to columns
 /* 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/suavity/ehan/info.json b/keyboards/suavity/ehan/info.json
index 492165be2b..330809655c 100755
--- a/keyboards/suavity/ehan/info.json
+++ b/keyboards/suavity/ehan/info.json
@@ -8,6 +8,11 @@
        "pid": "0x4548",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B12", "C14", "B7", "B6", "B5", "B4", "B3", "A15", "C13", "B9", "B8"],
+        "rows": ["A7", "B0", "A3", "A4", "A5", "A6"]
+    },
+    "diode_direction": "COL2ROW",
    "indicators": {
        "caps_lock": "B11",
        "scroll_lock": "F1"
diff --git a/keyboards/subatomic/config.h b/keyboards/subatomic/config.h
index 058b582c36..b0c6bce36a 100644
--- a/keyboards/subatomic/config.h
+++ b/keyboards/subatomic/config.h
@@ -17,17 +17,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/* Planck PCB default pin-out */
-#define MATRIX_ROW_PINS { D2, D5, B5, B6, D3 }
-#define MATRIX_COL_PINS { F1, F0, B0, C7, F4, F5, F6, F7, D4, D6, B4, D7, C6, C5 }
 // #define AUDIO_VOICES
 // #define AUDIO_PIN C6
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 /* 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/subatomic/info.json b/keyboards/subatomic/info.json
index 99af17a9b7..483d7689f1 100644
--- a/keyboards/subatomic/info.json
+++ b/keyboards/subatomic/info.json
@@ -8,6 +8,11 @@
    "pid": "0x6063",
    "device_version": "0.0.1"
  },
+  "matrix_pins": {
+    "cols": ["F1", "F0", "B0", "C7", "F4", "F5", "F6", "F7", "D4", "D6", "B4", "D7", "C6", "C5"],
+    "rows": ["D2", "D5", "B5", "B6", "D3"]
+  },
+  "diode_direction": "COL2ROW",
  "backlight": {
    "pin": "B7"
  },
diff --git a/keyboards/subrezon/la_nc/config.h b/keyboards/subrezon/la_nc/config.h
deleted file mode 100644
index 7e45963ed7..0000000000
--- a/keyboards/subrezon/la_nc/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2022 Daniel Osipishin (@subrezon)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#pragma once
-// key matrix
-#define MATRIX_ROW_PINS {D3, F4, D2, B2, B5, B6}
-#define MATRIX_COL_PINS {B3, B1, F7, F6, F5, D4, C6, D7, E6, B4}
-#define DIODE_DIRECTION COL2ROW
-// uncomment to reduce firmware size
-//#define NO_DEBUG
-//#define NO_PRINT
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/subrezon/la_nc/info.json b/keyboards/subrezon/la_nc/info.json
index b0a8eb7daa..3d73586815 100644
--- a/keyboards/subrezon/la_nc/info.json
+++ b/keyboards/subrezon/la_nc/info.json
@@ -6,6 +6,11 @@
        "pid": "0x1A7C",
        "device_version": "1.0.0"
    },
+    "matrix_pins": {
+        "cols": ["B3", "B1", "F7", "F6", "F5", "D4", "C6", "D7", "E6", "B4"],
+        "rows": ["D3", "F4", "D2", "B2", "B5", "B6"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "caterina",
    "layouts": {
diff --git a/keyboards/superuser/ext/config.h b/keyboards/superuser/ext/config.h
deleted file mode 100644
index 0bcd052fed..0000000000
--- a/keyboards/superuser/ext/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-Copyright 2021 superuser
-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
-/*
- * 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 { D0, D1, D2, D3, D5 }
-#define MATRIX_COL_PINS { B2, B1, F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, E6, B0, B3}
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/superuser/ext/info.json b/keyboards/superuser/ext/info.json
index 57d4ccbb18..990e210f02 100644
--- a/keyboards/superuser/ext/info.json
+++ b/keyboards/superuser/ext/info.json
@@ -8,6 +8,11 @@
        "pid": "0x4558",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["B2", "B1", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "E6", "B0", "B3"],
+        "rows": ["D0", "D1", "D2", "D3", "D5"]
+    },
+    "diode_direction": "COL2ROW",
    "indicators": {
        "caps_lock": "B7"
    },
diff --git a/keyboards/superuser/frl/config.h b/keyboards/superuser/frl/config.h
deleted file mode 100644
index 607133eaf8..0000000000
--- a/keyboards/superuser/frl/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-Copyright 2021 superuser
-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
-/*
- * 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 { D0, D1, D2, D3, D5 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, E6, B0, B3}
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/superuser/frl/info.json b/keyboards/superuser/frl/info.json
index 14c7b1e54f..e4c752140e 100644
--- a/keyboards/superuser/frl/info.json
+++ b/keyboards/superuser/frl/info.json
@@ -8,6 +8,11 @@
        "pid": "0x4652",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "E6", "B0", "B3"],
+        "rows": ["D0", "D1", "D2", "D3", "D5"]
+    },
+    "diode_direction": "COL2ROW",
    "indicators": {
        "caps_lock": "B7"
    },
diff --git a/keyboards/superuser/tkl/config.h b/keyboards/superuser/tkl/config.h
deleted file mode 100644
index 665276c79d..0000000000
--- a/keyboards/superuser/tkl/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-Copyright 2021 superuser
-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
-/*
- * 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 { B2, D0, D1, D2, D3, D5 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, E6, B0, B3}
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/superuser/tkl/info.json b/keyboards/superuser/tkl/info.json
index 6e94c7a28e..1469c7c95a 100644
--- a/keyboards/superuser/tkl/info.json
+++ b/keyboards/superuser/tkl/info.json
@@ -8,6 +8,11 @@
        "pid": "0x544B",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "E6", "B0", "B3"],
+        "rows": ["B2", "D0", "D1", "D2", "D3", "D5"]
+    },
+    "diode_direction": "COL2ROW",
    "indicators": {
        "caps_lock": "B7"
    },
diff --git a/keyboards/swiftrax/retropad/config.h b/keyboards/swiftrax/retropad/config.h
index f963856c97..66a3ef6740 100644
--- a/keyboards/swiftrax/retropad/config.h
+++ b/keyboards/swiftrax/retropad/config.h
@@ -17,15 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-// ROWS: Top to bottom, COLS: Left to right
-#define MATRIX_ROW_PINS { C7, C6, B5 }
-#define MATRIX_COL_PINS { B4, D2 }
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 #define RGB_DI_PIN B7
 #ifdef  RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/swiftrax/retropad/info.json b/keyboards/swiftrax/retropad/info.json
index ea43a71b12..96f523fb4b 100644
--- a/keyboards/swiftrax/retropad/info.json
+++ b/keyboards/swiftrax/retropad/info.json
@@ -8,6 +8,11 @@
        "pid": "0xEB0C",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["B4", "D2"],
+        "rows": ["C7", "C6", "B5"]
+    },
+    "diode_direction": "COL2ROW",
    "encoder": {
        "rotary": [
            {"pin_a": "D0", "pin_b": "D1"}
diff --git a/keyboards/switchplate/southpaw_65/config.h b/keyboards/switchplate/southpaw_65/config.h
index 598ac367b3..12b18b0cba 100644
--- a/keyboards/switchplate/southpaw_65/config.h
+++ b/keyboards/switchplate/southpaw_65/config.h
@@ -21,22 +21,6 @@
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 19
-/*
- * 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 { D0, D5 }
-//#define MATRIX_COL_PINS { F1, F0, B0 }
-/* COL2ROW, ROW2COL */
-//#define DIODE_DIRECTION COL2ROW
 #define RGB_DI_PIN C7
 #define RGBLED_NUM 9
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/switchplate/southpaw_fullsize/config.h b/keyboards/switchplate/southpaw_fullsize/config.h
index 92247d7951..8abadb9522 100644
--- a/keyboards/switchplate/southpaw_fullsize/config.h
+++ b/keyboards/switchplate/southpaw_fullsize/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/*
- * 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 { E1, C0, C1, C2, C3, C4 }
-#define MATRIX_COL_PINS { A7, C7, C6, C5, F0, F1, F2, F3, F4, F5, F6, F7, A0, A1, A2, A3, A4, A5, A6, E0, D7, D6 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
 /* 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/switchplate/southpaw_fullsize/info.json b/keyboards/switchplate/southpaw_fullsize/info.json
index 1b1cda7d2f..756ee84906 100644
--- a/keyboards/switchplate/southpaw_fullsize/info.json
+++ b/keyboards/switchplate/southpaw_fullsize/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0017",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["A7", "C7", "C6", "C5", "F0", "F1", "F2", "F3", "F4", "F5", "F6", "F7", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "E0", "D7", "D6"],
+        "rows": ["E1", "C0", "C1", "C2", "C3", "C4"]
+    },
+    "diode_direction": "COL2ROW",
    "backlight": {
        "pin": "B7"
    },
diff --git a/keyboards/switchplate/switchplate910/config.h b/keyboards/switchplate/switchplate910/config.h
index adb547468a..ef90a43c6f 100644
--- a/keyboards/switchplate/switchplate910/config.h
+++ b/keyboards/switchplate/switchplate910/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/*
- * 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 { F4, F5, F6, F7, D1 }
-#define MATRIX_COL_PINS { D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, B3, B2, B0, B1 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
 /* 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/switchplate/switchplate910/info.json b/keyboards/switchplate/switchplate910/info.json
index 5807471094..b324cc6415 100644
--- a/keyboards/switchplate/switchplate910/info.json
+++ b/keyboards/switchplate/switchplate910/info.json
@@ -8,6 +8,11 @@
        "pid": "0x2065",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "B3", "B2", "B0", "B1"],
+        "rows": ["F4", "F5", "F6", "F7", "D1"]
+    },
+    "diode_direction": "COL2ROW",
    "backlight": {
        "pin": "B7"
    },
diff --git a/keyboards/synapse/config.h b/keyboards/synapse/config.h
index f9b40cedee..9f86bdabd7 100644
--- a/keyboards/synapse/config.h
+++ b/keyboards/synapse/config.h
@@ -16,14 +16,4 @@
 #pragma once
-#define MATRIX_ROW_PINS \
-    { E6, B0, F4, F1 }
-#define MATRIX_COL_PINS \
-    { F0, D4, F5, B1, B2, B3, B7, D0, D1, D2, D3, B6 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/synapse/info.json b/keyboards/synapse/info.json
index ff629b48c5..8f207c975b 100644
--- a/keyboards/synapse/info.json
+++ b/keyboards/synapse/info.json
@@ -8,6 +8,11 @@
        "pid": "0x5359",
        "device_version": "0.0.1"
  },
+  "matrix_pins": {
+    "cols": ["F0", "D4", "F5", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "B6"],
+    "rows": ["E6", "B0", "F4", "F1"]
+  },
+  "diode_direction": "COL2ROW",
  "encoder": {
        "rotary": [
                {"pin_a": "D7", "pin_b": "D6"},
diff --git a/keyboards/system76/launch_1/config.h b/keyboards/system76/launch_1/config.h
index 886b5e2b78..10b1036c72 100644
--- a/keyboards/system76/launch_1/config.h
+++ b/keyboards/system76/launch_1/config.h
@@ -17,22 +17,6 @@
 #pragma once
-/*
- * Key matrix pins
- * ROWS: AVR pins used for rows, top to bottom
- * COLS: AVR pins used for columns, left to right
- */
-#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6, F7 }
-#define MATRIX_COL_PINS { D7, C7, C6, B6, B5, B4, D6, D4, E6, D5, D3, D2, B7, B0 }
-/*
- * Diode Direction
- * COL2ROW = COL => Anode (+), ROW => Cathode (-)
- * ROW2COL = ROW => Anode (+), COL => Cathode (-)
- */
-#define DIODE_DIRECTION COL2ROW
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_DI_PIN E2
 #    define RGB_MATRIX_LED_COUNT 84
diff --git a/keyboards/system76/launch_1/info.json b/keyboards/system76/launch_1/info.json
index e61caec07c..e6c8743541 100644
--- a/keyboards/system76/launch_1/info.json
+++ b/keyboards/system76/launch_1/info.json
@@ -7,6 +7,11 @@
        "pid": "0x0001",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["D7", "C7", "C6", "B6", "B5", "B4", "D6", "D4", "E6", "D5", "D3", "D2", "B7", "B0"],
+        "rows": ["F0", "F1", "F4", "F5", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/w1_at/config.h b/keyboards/w1_at/config.h
index e272a69ec9..79fdc4275f 100644
--- a/keyboards/w1_at/config.h
+++ b/keyboards/w1_at/config.h
@@ -17,12 +17,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-#define MATRIX_ROW_PINS { A2, B9, B8, B5, B4 }
-#define MATRIX_COL_PINS { B7, A0, A1, B1, B0, A7, A6, A5, A4, A3, B2, B10, B11, B12, B13, B14, B15, A8, A9, A10 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
 /* Ensure we jump to bootloader if the QK_BOOT keycode was pressed */
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
diff --git a/keyboards/w1_at/info.json b/keyboards/w1_at/info.json
index a922e0f4c9..0f7bdfb854 100644
--- a/keyboards/w1_at/info.json
+++ b/keyboards/w1_at/info.json
@@ -8,6 +8,11 @@
        "pid": "0x5754",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["B7", "A0", "A1", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "B2", "B10", "B11", "B12", "B13", "B14", "B15", "A8", "A9", "A10"],
+        "rows": ["A2", "B9", "B8", "B5", "B4"]
+    },
+    "diode_direction": "COL2ROW",
    "indicators": {
        "caps_lock": "B6",
        "num_lock": "B3",
diff --git a/keyboards/waldo/config.h b/keyboards/waldo/config.h
index 028b00de10..097b1818ae 100644
--- a/keyboards/waldo/config.h
+++ b/keyboards/waldo/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/* Planck PCB default pin-out */
-#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6 }
-#define MATRIX_COL_PINS { F7, D5, D3, D2, B3, B2, C7, C6, B6, B5, B4, D7, D6, D4, B1 }
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 /* 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/waldo/info.json b/keyboards/waldo/info.json
index 0c85e1d8d5..6ee9b4befd 100644
--- a/keyboards/waldo/info.json
+++ b/keyboards/waldo/info.json
@@ -7,6 +7,11 @@
        "pid": "0x6060",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F7", "D5", "D3", "D2", "B3", "B2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "B1"],
+        "rows": ["F0", "F1", "F4", "F5", "F6"]
+    },
+    "diode_direction": "COL2ROW",
    "backlight": {
        "pin": "B7",
        "breathing": true
diff --git a/keyboards/walletburner/cajal/config.h b/keyboards/walletburner/cajal/config.h
index 61e2d421ae..9b9506927f 100644
--- a/keyboards/walletburner/cajal/config.h
+++ b/keyboards/walletburner/cajal/config.h
@@ -16,14 +16,6 @@
 #pragma once
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D4, D5, C7, C6 }
-#define MATRIX_COL_PINS { F4, F1, F0, E6, B0, B1, B2, B3, D0, D1, D2, D3, B4, F6 }
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/walletburner/cajal/info.json b/keyboards/walletburner/cajal/info.json
index 7aa0563d4c..bba30bebcd 100644
--- a/keyboards/walletburner/cajal/info.json
+++ b/keyboards/walletburner/cajal/info.json
@@ -8,6 +8,11 @@
        "pid": "0x6361",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F4", "F1", "F0", "E6", "B0", "B1", "B2", "B3", "D0", "D1", "D2", "D3", "B4", "F6"],
+        "rows": ["D4", "D5", "C7", "C6"]
+    },
+    "diode_direction": "COL2ROW",
    "encoder": {
        "rotary": [
            {"pin_a": "D6", "pin_b": "D7"}
diff --git a/keyboards/walletburner/neuron/config.h b/keyboards/walletburner/neuron/config.h
index 84f3444730..905e59e17e 100644
--- a/keyboards/walletburner/neuron/config.h
+++ b/keyboards/walletburner/neuron/config.h
@@ -1,13 +1,5 @@
 #pragma once
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D0, D1, D3, F5 }
-#define MATRIX_COL_PINS { F0, F7, F6, F4, F1, E6, D6, D2, B4, D7, B6, D5 }
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/walletburner/neuron/info.json b/keyboards/walletburner/neuron/info.json
index dd746f4c4b..0b7ee467f6 100644
--- a/keyboards/walletburner/neuron/info.json
+++ b/keyboards/walletburner/neuron/info.json
@@ -8,6 +8,11 @@
        "pid": "0x6E75",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F0", "F7", "F6", "F4", "F1", "E6", "D6", "D2", "B4", "D7", "B6", "D5"],
+        "rows": ["D0", "D1", "D3", "F5"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/waterfowl/config.h b/keyboards/waterfowl/config.h
index 62f5ba6633..40d9a4b8da 100644
--- a/keyboards/waterfowl/config.h
+++ b/keyboards/waterfowl/config.h
@@ -16,13 +16,6 @@
 #pragma once
-// Wiring
-#define MATRIX_ROW_PINS { D4, C6, D7, E6 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1 }
-// COL2ROW, ROW2COL
-#define DIODE_DIRECTION COL2ROW
 #define OLED_DISPLAY_128X64
 #define SPLIT_MODS_ENABLE
 #define SPLIT_WPM_ENABLE
diff --git a/keyboards/waterfowl/info.json b/keyboards/waterfowl/info.json
index 17f01e24e2..0ee5b095b1 100644
--- a/keyboards/waterfowl/info.json
+++ b/keyboards/waterfowl/info.json
@@ -8,6 +8,11 @@
        "pid": "0x9CE3",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1"],
+        "rows": ["D4", "C6", "D7", "E6"]
+    },
+    "diode_direction": "COL2ROW",
    "encoder": {
        "rotary": [
            {"pin_a": "B4", "pin_b": "B5"},
diff --git a/keyboards/wavtype/foundation/config.h b/keyboards/wavtype/foundation/config.h
index 7c189d3ad1..91ce68b938 100644
--- a/keyboards/wavtype/foundation/config.h
+++ b/keyboards/wavtype/foundation/config.h
@@ -3,23 +3,6 @@
 #pragma once
-/*
- * 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 { B3, B2, B1, F0, F1 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, D2, D1, D0, D3, D5, D4, B7, D6, D7, B4, B5, B6, C6, C7 }
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 #define RGB_DI_PIN B0
 #ifdef RGB_DI_PIN
 #    define RGBLED_NUM 16
diff --git a/keyboards/wavtype/foundation/info.json b/keyboards/wavtype/foundation/info.json
index 36153f2bca..3b770ae352 100644
--- a/keyboards/wavtype/foundation/info.json
+++ b/keyboards/wavtype/foundation/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0003",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "D2", "D1", "D0", "D3", "D5", "D4", "B7", "D6", "D7", "B4", "B5", "B6", "C6", "C7"],
+        "rows": ["B3", "B2", "B1", "F0", "F1"]
+    },
+    "diode_direction": "COL2ROW",
    "bootmagic": {
        "matrix": [0, 1]
    },
diff --git a/keyboards/wavtype/p01_ultra/config.h b/keyboards/wavtype/p01_ultra/config.h
index ad046b7fd1..534b0f83da 100644
--- a/keyboards/wavtype/p01_ultra/config.h
+++ b/keyboards/wavtype/p01_ultra/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/*
- * 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 { B4, D7, D6, B5, B6, D4 }
-#define MATRIX_COL_PINS { C6, C7, F7, F6, F5, F4, F1, F0, B3, B2, B1, B0, B7, D0, D1, D2, D3, D5 }
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION ROW2COL
 #define RGB_DI_PIN E6
 #ifdef RGB_DI_PIN
 #    define RGBLED_NUM 18
diff --git a/keyboards/wavtype/p01_ultra/info.json b/keyboards/wavtype/p01_ultra/info.json
index d88ac83836..1c27944c76 100644
--- a/keyboards/wavtype/p01_ultra/info.json
+++ b/keyboards/wavtype/p01_ultra/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0004",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "B3", "B2", "B1", "B0", "B7", "D0", "D1", "D2", "D3", "D5"],
+        "rows": ["B4", "D7", "D6", "B5", "B6", "D4"]
+    },
+    "diode_direction": "ROW2COL",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layout_aliases": {
diff --git a/keyboards/weirdo/geminate60/config.h b/keyboards/weirdo/geminate60/config.h
index f187c1b234..fd3f070d35 100644
--- a/keyboards/weirdo/geminate60/config.h
+++ b/keyboards/weirdo/geminate60/config.h
@@ -15,10 +15,6 @@
  */ 
 #pragma once
-#define MATRIX_ROW_PINS { A9, A10, B10, B11, B15}
-#define MATRIX_COL_PINS { A8, B14, B13, B12, B1, B0, A7 , A1 , A15, B3, B4, B5, B6, B7, B8}
-#define DIODE_DIRECTION ROW2COL
 #define RGB_DI_PIN A6
 #define RGBLED_NUM 1
 //#define RGBLIGHT_DISABLE_KEYCODES
diff --git a/keyboards/weirdo/geminate60/info.json b/keyboards/weirdo/geminate60/info.json
index 890a017867..76de73c51e 100644
--- a/keyboards/weirdo/geminate60/info.json
+++ b/keyboards/weirdo/geminate60/info.json
@@ -8,6 +8,11 @@
        "pid": "0x676D",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["A8", "B14", "B13", "B12", "B1", "B0", "A7", "A1", "A15", "B3", "B4", "B5", "B6", "B7", "B8"],
+        "rows": ["A9", "A10", "B10", "B11", "B15"]
+    },
+    "diode_direction": "ROW2COL",
    "processor": "STM32F303",
    "bootloader": "stm32-dfu",
    "board": "QMK_PROTON_C",
diff --git a/keyboards/weirdo/kelowna/rgb64/config.h b/keyboards/weirdo/kelowna/rgb64/config.h
index 92fa599442..e3e65a074b 100644
--- a/keyboards/weirdo/kelowna/rgb64/config.h
+++ b/keyboards/weirdo/kelowna/rgb64/config.h
@@ -15,10 +15,6 @@
  */ 
 #pragma once
-#define MATRIX_COL_PINS { A3, A4, A5, A7, B0, B1, B10, B15, A8, A9, A10, B7, B6, B5, B4}
-#define MATRIX_ROW_PINS { B12, B13, B14, C11, A1}
-#define DIODE_DIRECTION ROW2COL
 #define RGB_DI_PIN A6
 #define RGBLED_NUM 64
 //#define RGBLIGHT_DISABLE_KEYCODES
diff --git a/keyboards/weirdo/kelowna/rgb64/info.json b/keyboards/weirdo/kelowna/rgb64/info.json
index 934da67ee4..ff6b6b0f85 100644
--- a/keyboards/weirdo/kelowna/rgb64/info.json
+++ b/keyboards/weirdo/kelowna/rgb64/info.json
@@ -8,6 +8,11 @@
        "pid": "0x4C64",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["A3", "A4", "A5", "A7", "B0", "B1", "B10", "B15", "A8", "A9", "A10", "B7", "B6", "B5", "B4"],
+        "rows": ["B12", "B13", "B14", "C11", "A1"]
+    },
+    "diode_direction": "ROW2COL",
    "processor": "STM32F303",
    "bootloader": "stm32-dfu",
    "board": "QMK_PROTON_C",
diff --git a/keyboards/weirdo/ls_60/config.h b/keyboards/weirdo/ls_60/config.h
index 46340f7833..93b7d5c69e 100644
--- a/keyboards/weirdo/ls_60/config.h
+++ b/keyboards/weirdo/ls_60/config.h
@@ -15,10 +15,6 @@
  */ 
 #pragma once
-#define MATRIX_ROW_PINS { A9, A10, B10, B11, B15}
-#define MATRIX_COL_PINS { A8, B14, B13, B12, B1, B0, A7 , A1 , A15, B3, B4, B5, B6, B7, B8}
-#define DIODE_DIRECTION ROW2COL
 #define RGB_DI_PIN A6
 #define RGBLED_NUM 1
 //#define RGBLIGHT_DISABLE_KEYCODES
diff --git a/keyboards/weirdo/ls_60/info.json b/keyboards/weirdo/ls_60/info.json
index 906a993884..a9247037fc 100644
--- a/keyboards/weirdo/ls_60/info.json
+++ b/keyboards/weirdo/ls_60/info.json
@@ -8,6 +8,11 @@
        "pid": "0x4C53",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["A8", "B14", "B13", "B12", "B1", "B0", "A7", "A1", "A15", "B3", "B4", "B5", "B6", "B7", "B8"],
+        "rows": ["A9", "A10", "B10", "B11", "B15"]
+    },
+    "diode_direction": "ROW2COL",
    "processor": "STM32F303",
    "bootloader": "stm32-dfu",
    "board": "QMK_PROTON_C",
diff --git a/keyboards/weirdo/naiping/np64/config.h b/keyboards/weirdo/naiping/np64/config.h
index 8fa16298e2..2b4073cbd6 100644
--- a/keyboards/weirdo/naiping/np64/config.h
+++ b/keyboards/weirdo/naiping/np64/config.h
@@ -15,10 +15,6 @@
  */
 #pragma once
-#define MATRIX_ROW_PINS { E6, B7, F7, F4, F5 }
-#define MATRIX_COL_PINS { F6, B0, F1, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1 }
-#define DIODE_DIRECTION ROW2COL
 #define RGB_DI_PIN B1
 #define RGBLED_NUM 80
 //#define RGBLIGHT_DISABLE_KEYCODES
diff --git a/keyboards/weirdo/naiping/np64/info.json b/keyboards/weirdo/naiping/np64/info.json
index c188d4bb11..0c1bf74f3c 100644
--- a/keyboards/weirdo/naiping/np64/info.json
+++ b/keyboards/weirdo/naiping/np64/info.json
@@ -8,6 +8,11 @@
        "pid": "0x7064",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F6", "B0", "F1", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1"],
+        "rows": ["E6", "B7", "F7", "F4", "F5"]
+    },
+    "diode_direction": "ROW2COL",
    "processor": "STM32F303",
    "bootloader": "stm32-dfu",
    "board": "QMK_PROTON_C",
diff --git a/keyboards/weirdo/naiping/nphhkb/config.h b/keyboards/weirdo/naiping/nphhkb/config.h
index 43b8d1c32e..683ba29edc 100644
--- a/keyboards/weirdo/naiping/nphhkb/config.h
+++ b/keyboards/weirdo/naiping/nphhkb/config.h
@@ -15,10 +15,6 @@
  */ 
 #pragma once
-#define MATRIX_COL_PINS { A4, C15, C14, A5, A6,  A15, B1, B10, B12, B13, B14, B15,  B6, A8, B5}
-#define MATRIX_ROW_PINS { B7, B8, B9, C13, B4}
-#define DIODE_DIRECTION ROW2COL
 #define RGB_DI_PIN A7
 #define RGBLED_NUM 78
 //#define RGBLIGHT_DISABLE_KEYCODES
diff --git a/keyboards/weirdo/naiping/nphhkb/info.json b/keyboards/weirdo/naiping/nphhkb/info.json
index b1b1c1f23d..c0df6fb453 100644
--- a/keyboards/weirdo/naiping/nphhkb/info.json
+++ b/keyboards/weirdo/naiping/nphhkb/info.json
@@ -8,6 +8,11 @@
        "pid": "0x7068",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["A4", "C15", "C14", "A5", "A6", "A15", "B1", "B10", "B12", "B13", "B14", "B15", "B6", "A8", "B5"],
+        "rows": ["B7", "B8", "B9", "C13", "B4"]
+    },
+    "diode_direction": "ROW2COL",
    "processor": "STM32F303",
    "bootloader": "stm32-dfu",
    "board": "QMK_PROTON_C",
diff --git a/keyboards/weirdo/naiping/npminila/config.h b/keyboards/weirdo/naiping/npminila/config.h
index 265ae2e207..fd2dcbdde1 100644
--- a/keyboards/weirdo/naiping/npminila/config.h
+++ b/keyboards/weirdo/naiping/npminila/config.h
@@ -15,10 +15,6 @@
  */ 
 #pragma once
-#define MATRIX_ROW_PINS { E6, B7, F7, F4, F5 }
-#define MATRIX_COL_PINS { F6, B0, F1, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2 }
-#define DIODE_DIRECTION ROW2COL
 #define RGB_DI_PIN D1
 #define RGBLED_NUM 82
 //#define RGBLIGHT_DISABLE_KEYCODES
diff --git a/keyboards/weirdo/naiping/npminila/info.json b/keyboards/weirdo/naiping/npminila/info.json
index 9904ca28fc..7c489e378c 100644
--- a/keyboards/weirdo/naiping/npminila/info.json
+++ b/keyboards/weirdo/naiping/npminila/info.json
@@ -8,6 +8,11 @@
        "pid": "0x706D",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F6", "B0", "F1", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2"],
+        "rows": ["E6", "B7", "F7", "F4", "F5"]
+    },
+    "diode_direction": "ROW2COL",
    "processor": "STM32F303",
    "bootloader": "stm32-dfu",
    "board": "QMK_PROTON_C",
diff --git a/keyboards/weirdo/tiger910/config.h b/keyboards/weirdo/tiger910/config.h
index 34f2b70605..e484ffe49e 100644
--- a/keyboards/weirdo/tiger910/config.h
+++ b/keyboards/weirdo/tiger910/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4 }
-#define MATRIX_COL_PINS { B5, B6, B7, C0, C1, C2, C3, C4, C5, C6, C7, D0, D1, D2, D3, D4 }
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION ROW2COL
 /* 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/weirdo/tiger910/info.json b/keyboards/weirdo/tiger910/info.json
index 9634cc6f9a..d09e618408 100644
--- a/keyboards/weirdo/tiger910/info.json
+++ b/keyboards/weirdo/tiger910/info.json
@@ -8,6 +8,11 @@
        "pid": "0x5447",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["B5", "B6", "B7", "C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7", "D0", "D1", "D2", "D3", "D4"],
+        "rows": ["B0", "B1", "B2", "B3", "B4"]
+    },
+    "diode_direction": "ROW2COL",
    "processor": "atmega32u4",
    "bootloader": "caterina",
    "layouts": {
diff --git a/keyboards/wekey/polaris/config.h b/keyboards/wekey/polaris/config.h
index e43421638e..c86ead57bd 100644
--- a/keyboards/wekey/polaris/config.h
+++ b/keyboards/wekey/polaris/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/*
- * 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 { F4, F1, F0, B7, F7, D5, C6, C7, F5, F6 }
-#define MATRIX_COL_PINS { E6, B4, B5, B6, D0, D1, D2, D3 }
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 /* 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/wekey/polaris/info.json b/keyboards/wekey/polaris/info.json
index ad7477b5fc..11a7ca9b9d 100644
--- a/keyboards/wekey/polaris/info.json
+++ b/keyboards/wekey/polaris/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0002",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["E6", "B4", "B5", "B6", "D0", "D1", "D2", "D3"],
+        "rows": ["F4", "F1", "F0", "B7", "F7", "D5", "C6", "C7", "F5", "F6"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_tsangan_hhkb"],
diff --git a/keyboards/wekey/we27/config.h b/keyboards/wekey/we27/config.h
index c720fc2103..86f2ffb3ee 100644
--- a/keyboards/wekey/we27/config.h
+++ b/keyboards/wekey/we27/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/*
- * 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 { F1, D7, B4, B5, B6, F6 }
-#define MATRIX_COL_PINS { F4, F5, C7, D6, D4 }
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 #ifdef RGB_MATRIX_ENABLE
 // The pin connected to the data pin of the LEDs
 #define RGB_DI_PIN C6
diff --git a/keyboards/wekey/we27/info.json b/keyboards/wekey/we27/info.json
index 0a114ad548..736b7f5d70 100644
--- a/keyboards/wekey/we27/info.json
+++ b/keyboards/wekey/we27/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0001",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "C7", "D6", "D4"],
+        "rows": ["F1", "D7", "B4", "B5", "B6", "F6"]
+    },
+    "diode_direction": "COL2ROW",
    "encoder": {
        "rotary": [
            {"pin_a": "D3", "pin_b": "D2", "resolution": 2}
diff --git a/keyboards/westfoxtrot/aanzee/config.h b/keyboards/westfoxtrot/aanzee/config.h
index 70f820c25e..c1e79e7699 100644
--- a/keyboards/westfoxtrot/aanzee/config.h
+++ b/keyboards/westfoxtrot/aanzee/config.h
@@ -17,15 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-// ROWS: Top to bottom, COLS: Left to right
-#define MATRIX_ROW_PINS {B4,D7,D6,D4,B3}
-#define MATRIX_COL_PINS {D2,D1,D0,D3,D5,C7,C6,B6,B5,F0,F1,F4,F5,F6,F7,B0}
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 #define RGB_DI_PIN E6
 #ifdef RGB_DI_PIN
   #define RGBLED_NUM 9
diff --git a/keyboards/westfoxtrot/aanzee/info.json b/keyboards/westfoxtrot/aanzee/info.json
index 4c3e9bf058..a2b5f6b49c 100644
--- a/keyboards/westfoxtrot/aanzee/info.json
+++ b/keyboards/westfoxtrot/aanzee/info.json
@@ -8,6 +8,11 @@
    "pid": "0xAA01",
    "device_version": "0.0.1"
  },
+  "matrix_pins": {
+    "cols": ["D2", "D1", "D0", "D3", "D5", "C7", "C6", "B6", "B5", "F0", "F1", "F4", "F5", "F6", "F7", "B0"],
+    "rows": ["B4", "D7", "D6", "D4", "B3"]
+  },
+  "diode_direction": "COL2ROW",
  "backlight": {
    "pin": "B7",
    "levels": 5,
diff --git a/keyboards/westfoxtrot/cyclops/config.h b/keyboards/westfoxtrot/cyclops/config.h
index 9e3dfc4911..d1de752f79 100644
--- a/keyboards/westfoxtrot/cyclops/config.h
+++ b/keyboards/westfoxtrot/cyclops/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/*
- * 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 { D1, D0, D7, B4, F0 }
-#define MATRIX_COL_PINS { D3, D2, D5, D6, B6, B1, B2, B3, C6, C7, F7, F6, F4, F5, F1 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
 /* 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/westfoxtrot/cyclops/info.json b/keyboards/westfoxtrot/cyclops/info.json
index 7af7031374..419a53588b 100644
--- a/keyboards/westfoxtrot/cyclops/info.json
+++ b/keyboards/westfoxtrot/cyclops/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0A66",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["D3", "D2", "D5", "D6", "B6", "B1", "B2", "B3", "C6", "C7", "F7", "F6", "F4", "F5", "F1"],
+        "rows": ["D1", "D0", "D7", "B4", "F0"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/westfoxtrot/cypher/rev1/config.h b/keyboards/westfoxtrot/cypher/rev1/config.h
index a6e5ac891f..cd1f84bc1f 100644
--- a/keyboards/westfoxtrot/cypher/rev1/config.h
+++ b/keyboards/westfoxtrot/cypher/rev1/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/*
- * 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 { B0, B1, B2, B3, B4, F6, B6, B7, C6, C7 }
-#define MATRIX_COL_PINS { D0, D1, D2, D3, D4, D5, D6, D7, E6, F0 }
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 /* 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/westfoxtrot/cypher/rev1/info.json b/keyboards/westfoxtrot/cypher/rev1/info.json
index 5089486866..217d979c41 100644
--- a/keyboards/westfoxtrot/cypher/rev1/info.json
+++ b/keyboards/westfoxtrot/cypher/rev1/info.json
@@ -6,6 +6,11 @@
    "pid": "0xAA97",
    "device_version": "0.0.1"
  },
+  "matrix_pins": {
+    "cols": ["D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "E6", "F0"],
+    "rows": ["B0", "B1", "B2", "B3", "B4", "F6", "B6", "B7", "C6", "C7"]
+  },
+  "diode_direction": "COL2ROW",
  "backlight": {
    "pin": "B5",
    "levels": 5,
diff --git a/keyboards/westfoxtrot/cypher/rev5/config.h b/keyboards/westfoxtrot/cypher/rev5/config.h
index 61604a74a9..050bb413f7 100644
--- a/keyboards/westfoxtrot/cypher/rev5/config.h
+++ b/keyboards/westfoxtrot/cypher/rev5/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/*
- * 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 { B0, F1, F5, F6, F7, D1, F4, D4, C6, C7 }
-#define MATRIX_COL_PINS { D6, D7, B4, B5, B6, B7, B3, B2, B1, F0 }
-/* COL2ROW, ROW2COL, or CUSTOM_MATRIX */
-#define DIODE_DIRECTION COL2ROW
 /* 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/westfoxtrot/cypher/rev5/info.json b/keyboards/westfoxtrot/cypher/rev5/info.json
index 17bc326890..3725b4e3c9 100644
--- a/keyboards/westfoxtrot/cypher/rev5/info.json
+++ b/keyboards/westfoxtrot/cypher/rev5/info.json
@@ -6,6 +6,11 @@
      "pid": "0xAA98",
      "device_version": "0.0.2"
    },
+    "matrix_pins": {
+      "cols": ["D6", "D7", "B4", "B5", "B6", "B7", "B3", "B2", "B1", "F0"],
+      "rows": ["B0", "F1", "F5", "F6", "F7", "D1", "F4", "D4", "C6", "C7"]
+    },
+    "diode_direction": "COL2ROW",
    "backlight": {
      "pin": "D0",
      "levels": 5,
diff --git a/keyboards/westfoxtrot/prophet/config.h b/keyboards/westfoxtrot/prophet/config.h
index 3206c0e56d..d7d992f50e 100644
--- a/keyboards/westfoxtrot/prophet/config.h
+++ b/keyboards/westfoxtrot/prophet/config.h
@@ -1,15 +1,5 @@
 #pragma once
-/*
- * Keyboard Matrix Assignments
-*/
-#define MATRIX_ROW_PINS { C13, B2, B1, A4, A3 }
-#define MATRIX_COL_PINS { A6, A7, B0, A9, A8, A14, A15, B3, B4, B5, B8, B7, B6, B9 }
-/* COL2ROW, ROW2COL, or CUSTOM_MATRIX */
-#define DIODE_DIRECTION COL2ROW
 /* 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/westfoxtrot/prophet/info.json b/keyboards/westfoxtrot/prophet/info.json
index ee65ab2601..94be2e52db 100644
--- a/keyboards/westfoxtrot/prophet/info.json
+++ b/keyboards/westfoxtrot/prophet/info.json
@@ -8,6 +8,11 @@
        "pid": "0xAA03",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["A6", "A7", "B0", "A9", "A8", "A14", "A15", "B3", "B4", "B5", "B8", "B7", "B6", "B9"],
+        "rows": ["C13", "B2", "B1", "A4", "A3"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "STM32F072",
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/westm/westm68/config.h b/keyboards/westm/westm68/config.h
index 68ad770787..9a425a91a8 100644
--- a/keyboards/westm/westm68/config.h
+++ b/keyboards/westm/westm68/config.h
@@ -20,10 +20,6 @@
 /* Ensure we jump to bootloader if the QK_BOOT keycode was pressed */
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
-#define MATRIX_ROW_PINS { A13, B9, F1, A10, A9 }
-#define MATRIX_COL_PINS { B14, B13, B12, B11, B10, B2, B1, B8, B7, B6, B5, B4, B3, A15, A14 }
-#define DIODE_DIRECTION COL2ROW
 /* 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/westm/westm68/info.json b/keyboards/westm/westm68/info.json
index 8ff4f8d8ce..46138869fc 100644
--- a/keyboards/westm/westm68/info.json
+++ b/keyboards/westm/westm68/info.json
@@ -7,6 +7,11 @@
        "vid": "0x574D",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["B14", "B13", "B12", "B11", "B10", "B2", "B1", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14"],
+        "rows": ["A13", "B9", "F1", "A10", "A9"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "STM32F072",
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/westm/westm9/config.h b/keyboards/westm/westm9/config.h
index 51efda06a6..9a425a91a8 100644
--- a/keyboards/westm/westm9/config.h
+++ b/keyboards/westm/westm9/config.h
@@ -20,10 +20,6 @@
 /* Ensure we jump to bootloader if the QK_BOOT keycode was pressed */
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
-#define MATRIX_ROW_PINS { A14, A15, B3 }
-#define MATRIX_COL_PINS { B8, B5, B4 }
-#define DIODE_DIRECTION COL2ROW
 /* 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/westm/westm9/info.json b/keyboards/westm/westm9/info.json
index c9ec1e17d7..ed0b994805 100644
--- a/keyboards/westm/westm9/info.json
+++ b/keyboards/westm/westm9/info.json
@@ -7,6 +7,11 @@
        "vid": "0x574D",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["B8", "B5", "B4"],
+        "rows": ["A14", "A15", "B3"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "STM32F072",
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/westm/westmergo/config.h b/keyboards/westm/westmergo/config.h
index fd10220d9f..7b6f2e2120 100644
--- a/keyboards/westm/westmergo/config.h
+++ b/keyboards/westm/westmergo/config.h
@@ -16,10 +16,6 @@
 #pragma once
-#define MATRIX_ROW_PINS { A13, B9, F1, A10, A9 }
-#define MATRIX_COL_PINS { B15, B14, B13, B12, B11, B10, B2, B1, B8, B7, B6, B5, B4, B3, A15, A14 }
-#define DIODE_DIRECTION COL2ROW
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/westm/westmergo/info.json b/keyboards/westm/westmergo/info.json
index a50da579e3..edfc012c28 100644
--- a/keyboards/westm/westmergo/info.json
+++ b/keyboards/westm/westmergo/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0201",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14"],
+        "rows": ["A13", "B9", "F1", "A10", "A9"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "STM32F072",
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/whale/sk/v3/config.h b/keyboards/whale/sk/v3/config.h
deleted file mode 100644
index c473b10dc8..0000000000
--- a/keyboards/whale/sk/v3/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-Copyright 2020 Whale Mo
-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
-/*
- * 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 { B1, B2, B3, B4, B5, B6 }
-#define MATRIX_COL_PINS { D4, C6, D7, E6, F4, F5, F6 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/whale/sk/v3/info.json b/keyboards/whale/sk/v3/info.json
index 0ab3b6c0a2..78967cd6e9 100644
--- a/keyboards/whale/sk/v3/info.json
+++ b/keyboards/whale/sk/v3/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0495",
        "device_version": "0.0.3"
    },
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "E6", "F4", "F5", "F6"],
+        "rows": ["B1", "B2", "B3", "B4", "B5", "B6"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "caterina",
    "debounce": 3,
diff --git a/keyboards/wilba_tech/rama_works_kara/config.h b/keyboards/wilba_tech/rama_works_kara/config.h
index 6f8d6f9b8b..d34fd6468c 100644
--- a/keyboards/wilba_tech/rama_works_kara/config.h
+++ b/keyboards/wilba_tech/rama_works_kara/config.h
@@ -15,18 +15,10 @@
 */
 #pragma once
-// M60-A PCB default pin-out
-#define MATRIX_ROW_PINS { F0, F1, F4, F6, F7 }
-#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6 }
 // IS31FL3731 driver
 #define DRIVER_COUNT 2
 #define RGB_MATRIX_LED_COUNT 72
-// COL2ROW or ROW2COL
-#define DIODE_DIRECTION COL2ROW
 // 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/wilba_tech/rama_works_kara/info.json b/keyboards/wilba_tech/rama_works_kara/info.json
index 18bba59fe5..3dd9ad22c2 100644
--- a/keyboards/wilba_tech/rama_works_kara/info.json
+++ b/keyboards/wilba_tech/rama_works_kara/info.json
@@ -8,6 +8,11 @@
        "pid": "0x4B52",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"],
+        "rows": ["F0", "F1", "F4", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "community_layouts": ["60_hhkb"],
diff --git a/keyboards/wilba_tech/rama_works_koyu/config.h b/keyboards/wilba_tech/rama_works_koyu/config.h
index c0b005d443..c3bb43ec6d 100644
--- a/keyboards/wilba_tech/rama_works_koyu/config.h
+++ b/keyboards/wilba_tech/rama_works_koyu/config.h
@@ -15,18 +15,10 @@
 */
 #pragma once
-// KOYU PCB pin-out
-#define MATRIX_ROW_PINS { F0, F1, F4, F6, F7 }
-#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4 }
 // IS31FL3731 driver
 #define DRIVER_COUNT 2
 #define RGB_MATRIX_LED_COUNT 72
-// COL2ROW or ROW2COL
-#define DIODE_DIRECTION COL2ROW
 // 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/wilba_tech/rama_works_koyu/info.json b/keyboards/wilba_tech/rama_works_koyu/info.json
index 190638c001..55a180af63 100644
--- a/keyboards/wilba_tech/rama_works_koyu/info.json
+++ b/keyboards/wilba_tech/rama_works_koyu/info.json
@@ -8,6 +8,11 @@
        "pid": "0x4B59",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["F0", "F1", "F4", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/wilba_tech/rama_works_m10_b/config.h b/keyboards/wilba_tech/rama_works_m10_b/config.h
index be92b36639..00ecf5f186 100644
--- a/keyboards/wilba_tech/rama_works_m10_b/config.h
+++ b/keyboards/wilba_tech/rama_works_m10_b/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/*
- * 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 { E6 }
-#define MATRIX_COL_PINS { D7, B6, F0, D6, B5, F1, D4, B4, F4, F5 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
 /* 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/wilba_tech/rama_works_m10_b/info.json b/keyboards/wilba_tech/rama_works_m10_b/info.json
index 4b7c87be21..0133776586 100644
--- a/keyboards/wilba_tech/rama_works_m10_b/info.json
+++ b/keyboards/wilba_tech/rama_works_m10_b/info.json
@@ -8,6 +8,11 @@
    "pid": "0x00AB",
    "device_version": "0.0.1"
  },
+  "matrix_pins": {
+    "cols": ["D7", "B6", "F0", "D6", "B5", "F1", "D4", "B4", "F4", "F5"],
+    "rows": ["E6"]
+  },
+  "diode_direction": "COL2ROW",
  "backlight": {
    "pin": "C6"
  },
diff --git a/keyboards/wilba_tech/rama_works_m10_c/config.h b/keyboards/wilba_tech/rama_works_m10_c/config.h
index 9f68eb4287..1cc9655b1b 100644
--- a/keyboards/wilba_tech/rama_works_m10_c/config.h
+++ b/keyboards/wilba_tech/rama_works_m10_c/config.h
@@ -15,23 +15,6 @@
 */
 #pragma once
-/*
- * 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 { E6 }
-#define MATRIX_COL_PINS { D7, B6, F0, D6, B5, F1, D4, B4, F4, F5 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
 /* 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/wilba_tech/rama_works_m10_c/info.json b/keyboards/wilba_tech/rama_works_m10_c/info.json
index b60dd53815..6b6bd3d61b 100644
--- a/keyboards/wilba_tech/rama_works_m10_c/info.json
+++ b/keyboards/wilba_tech/rama_works_m10_c/info.json
@@ -8,6 +8,11 @@
    "pid": "0x00AC",
    "device_version": "0.0.1"
  },
+  "matrix_pins": {
+    "cols": ["D7", "B6", "F0", "D6", "B5", "F1", "D4", "B4", "F4", "F5"],
+    "rows": ["E6"]
+  },
+  "diode_direction": "COL2ROW",
  "processor": "atmega32u4",
  "bootloader": "atmel-dfu",
  "layouts": {
diff --git a/keyboards/wilba_tech/rama_works_m50_a/config.h b/keyboards/wilba_tech/rama_works_m50_a/config.h
index 79a1614268..ab04ab070b 100644
--- a/keyboards/wilba_tech/rama_works_m50_a/config.h
+++ b/keyboards/wilba_tech/rama_works_m50_a/config.h
@@ -15,23 +15,6 @@
 */
 #pragma once
-/*
- * 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 { F0, F1, F5, F6 }
-#define MATRIX_COL_PINS { F4, B5, C7, C6, B6, B2, B3, B1, B4, D7, D6, D4, D3 }
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 /* 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/wilba_tech/rama_works_m50_a/info.json b/keyboards/wilba_tech/rama_works_m50_a/info.json
index a53a960f0a..e26b56dd2f 100644
--- a/keyboards/wilba_tech/rama_works_m50_a/info.json
+++ b/keyboards/wilba_tech/rama_works_m50_a/info.json
@@ -8,6 +8,11 @@
        "pid": "0x050A",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F4", "B5", "C7", "C6", "B6", "B2", "B3", "B1", "B4", "D7", "D6", "D4", "D3"],
+        "rows": ["F0", "F1", "F5", "F6"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/wilba_tech/rama_works_m50_ax/config.h b/keyboards/wilba_tech/rama_works_m50_ax/config.h
index add6c1c779..9b6b3c7955 100644
--- a/keyboards/wilba_tech/rama_works_m50_ax/config.h
+++ b/keyboards/wilba_tech/rama_works_m50_ax/config.h
@@ -15,23 +15,6 @@
 */
 #pragma once
-/*
- * 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 { F0, F1, F5, F6 }
-#define MATRIX_COL_PINS { F4, B5, C7, C6, B6, B2, B3, B1, B4, D7, D6, D4, D3 }
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 /* 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/wilba_tech/rama_works_m50_ax/info.json b/keyboards/wilba_tech/rama_works_m50_ax/info.json
index 2fc265fec9..fc296c2754 100644
--- a/keyboards/wilba_tech/rama_works_m50_ax/info.json
+++ b/keyboards/wilba_tech/rama_works_m50_ax/info.json
@@ -8,6 +8,11 @@
        "pid": "0x150A",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F4", "B5", "C7", "C6", "B6", "B2", "B3", "B1", "B4", "D7", "D6", "D4", "D3"],
+        "rows": ["F0", "F1", "F5", "F6"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/wilba_tech/rama_works_m60_a/config.h b/keyboards/wilba_tech/rama_works_m60_a/config.h
index acc21edc28..c80a018496 100644
--- a/keyboards/wilba_tech/rama_works_m60_a/config.h
+++ b/keyboards/wilba_tech/rama_works_m60_a/config.h
@@ -15,18 +15,10 @@
 */
 #pragma once
-// M60-A PCB default pin-out
-#define MATRIX_ROW_PINS { F0, F1, F4, F6, F7 }
-#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6 }
 // IS31FL3731 driver
 #define DRIVER_COUNT 2
 #define RGB_MATRIX_LED_COUNT 72
-// COL2ROW or ROW2COL
-#define DIODE_DIRECTION COL2ROW
 // 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/wilba_tech/rama_works_m60_a/info.json b/keyboards/wilba_tech/rama_works_m60_a/info.json
index d76b178947..8ba17a5df2 100644
--- a/keyboards/wilba_tech/rama_works_m60_a/info.json
+++ b/keyboards/wilba_tech/rama_works_m60_a/info.json
@@ -8,6 +8,11 @@
        "pid": "0x060A",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"],
+        "rows": ["F0", "F1", "F4", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "community_layouts": ["60_hhkb"],
diff --git a/keyboards/wilba_tech/rama_works_m65_b/config.h b/keyboards/wilba_tech/rama_works_m65_b/config.h
index 5b745b109d..6d3f0fb97f 100644
--- a/keyboards/wilba_tech/rama_works_m65_b/config.h
+++ b/keyboards/wilba_tech/rama_works_m65_b/config.h
@@ -15,23 +15,6 @@
 */
 #pragma once
-/*
- * 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 { F0, F1, F4, F6, F7 }
-#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4 }
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 /* 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/wilba_tech/rama_works_m65_b/info.json b/keyboards/wilba_tech/rama_works_m65_b/info.json
index 55f9f05536..a8ca36bf16 100644
--- a/keyboards/wilba_tech/rama_works_m65_b/info.json
+++ b/keyboards/wilba_tech/rama_works_m65_b/info.json
@@ -8,6 +8,11 @@
        "pid": "0x065B",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["F0", "F1", "F4", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/wilba_tech/rama_works_m65_bx/config.h b/keyboards/wilba_tech/rama_works_m65_bx/config.h
index eb2b08304a..e367a7fc76 100644
--- a/keyboards/wilba_tech/rama_works_m65_bx/config.h
+++ b/keyboards/wilba_tech/rama_works_m65_bx/config.h
@@ -15,23 +15,6 @@
 */
 #pragma once
-/*
- * 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 { F0, F1, F4, F6, F7 }
-#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4 }
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 /* 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/wilba_tech/rama_works_m65_bx/info.json b/keyboards/wilba_tech/rama_works_m65_bx/info.json
index ca5bf2b21e..1e4af340db 100644
--- a/keyboards/wilba_tech/rama_works_m65_bx/info.json
+++ b/keyboards/wilba_tech/rama_works_m65_bx/info.json
@@ -8,6 +8,11 @@
        "pid": "0x165B",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["F0", "F1", "F4", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/wilba_tech/rama_works_m6_a/config.h b/keyboards/wilba_tech/rama_works_m6_a/config.h
index 9937b3f5be..6a19f1e7e9 100644
--- a/keyboards/wilba_tech/rama_works_m6_a/config.h
+++ b/keyboards/wilba_tech/rama_works_m6_a/config.h
@@ -15,23 +15,6 @@
 */
 #pragma once
-/*
- * 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 { E6 }
-#define MATRIX_COL_PINS { D4, B5, F4, D7, C6, F6 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
 /* 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/wilba_tech/rama_works_m6_a/info.json b/keyboards/wilba_tech/rama_works_m6_a/info.json
index 67912b6ce0..5158e7e06f 100644
--- a/keyboards/wilba_tech/rama_works_m6_a/info.json
+++ b/keyboards/wilba_tech/rama_works_m6_a/info.json
@@ -8,6 +8,11 @@
    "pid": "0x006A",
    "device_version": "0.0.1"
  },
+  "matrix_pins": {
+    "cols": ["D4", "B5", "F4", "D7", "C6", "F6"],
+    "rows": ["E6"]
+  },
+  "diode_direction": "COL2ROW",
  "processor": "atmega32u4",
  "bootloader": "atmel-dfu",
  "layouts": {
diff --git a/keyboards/wilba_tech/rama_works_m6_b/config.h b/keyboards/wilba_tech/rama_works_m6_b/config.h
index 6b6b405cd0..a117bcc2a8 100644
--- a/keyboards/wilba_tech/rama_works_m6_b/config.h
+++ b/keyboards/wilba_tech/rama_works_m6_b/config.h
@@ -15,23 +15,6 @@
 */
 #pragma once
-/*
- * 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 { E6 }
-#define MATRIX_COL_PINS { D4, B5, F4, D7, C6, F6 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
 /* 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/wilba_tech/rama_works_m6_b/info.json b/keyboards/wilba_tech/rama_works_m6_b/info.json
index 96fc84b002..3a3b32d1df 100644
--- a/keyboards/wilba_tech/rama_works_m6_b/info.json
+++ b/keyboards/wilba_tech/rama_works_m6_b/info.json
@@ -8,6 +8,11 @@
    "pid": "0x006B",
    "device_version": "0.0.1"
  },
+  "matrix_pins": {
+    "cols": ["D4", "B5", "F4", "D7", "C6", "F6"],
+    "rows": ["E6"]
+  },
+  "diode_direction": "COL2ROW",
  "processor": "atmega32u4",
  "bootloader": "atmel-dfu",
  "layouts": {
diff --git a/keyboards/wilba_tech/rama_works_u80_a/config.h b/keyboards/wilba_tech/rama_works_u80_a/config.h
index 8a94e15b47..cb2d88bd47 100644
--- a/keyboards/wilba_tech/rama_works_u80_a/config.h
+++ b/keyboards/wilba_tech/rama_works_u80_a/config.h
@@ -16,23 +16,6 @@
 #pragma once
-/*
- * 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 { F1, F0, E6, F4, F6, F7 }
-#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4, B7, B0 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
 /* 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/wilba_tech/rama_works_u80_a/info.json b/keyboards/wilba_tech/rama_works_u80_a/info.json
index 27a5fe7148..2ee00ae161 100644
--- a/keyboards/wilba_tech/rama_works_u80_a/info.json
+++ b/keyboards/wilba_tech/rama_works_u80_a/info.json
@@ -8,6 +8,11 @@
        "pid": "0x080A",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "B7", "B0"],
+        "rows": ["F1", "F0", "E6", "F4", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/wilba_tech/wt60_a/config.h b/keyboards/wilba_tech/wt60_a/config.h
index 0179cfaa64..488eeade83 100644
--- a/keyboards/wilba_tech/wt60_a/config.h
+++ b/keyboards/wilba_tech/wt60_a/config.h
@@ -16,23 +16,6 @@
 #pragma once
-/*
- * 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 { F0, E6, F4, F6, F7 }
-#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
 /* 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/wilba_tech/wt60_a/info.json b/keyboards/wilba_tech/wt60_a/info.json
index 85b1e2e6a1..e429b635de 100644
--- a/keyboards/wilba_tech/wt60_a/info.json
+++ b/keyboards/wilba_tech/wt60_a/info.json
@@ -8,6 +8,11 @@
        "pid": "0x060A",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"],
+        "rows": ["F0", "E6", "F4", "F6", "F7"]
+    },
+    "diode_direction": "ROW2COL",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/wilba_tech/wt60_b/config.h b/keyboards/wilba_tech/wt60_b/config.h
index 887e11c81f..cf495a2e78 100644
--- a/keyboards/wilba_tech/wt60_b/config.h
+++ b/keyboards/wilba_tech/wt60_b/config.h
@@ -16,23 +16,6 @@
 #pragma once
-/*
- * 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 { F0, F1, F4, F6, F7 }
-#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
 /* 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/wilba_tech/wt60_b/info.json b/keyboards/wilba_tech/wt60_b/info.json
index 6e8d463abb..1a9338a5c8 100644
--- a/keyboards/wilba_tech/wt60_b/info.json
+++ b/keyboards/wilba_tech/wt60_b/info.json
@@ -8,6 +8,11 @@
        "pid": "0x60B0",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"],
+        "rows": ["F0", "F1", "F4", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/wilba_tech/wt60_bx/config.h b/keyboards/wilba_tech/wt60_bx/config.h
index 5bc298d70e..6f89b14954 100644
--- a/keyboards/wilba_tech/wt60_bx/config.h
+++ b/keyboards/wilba_tech/wt60_bx/config.h
@@ -16,23 +16,6 @@
 #pragma once
-/*
- * 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 { F0, F1, F4, F6, F7 }
-#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
 /* 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/wilba_tech/wt60_bx/info.json b/keyboards/wilba_tech/wt60_bx/info.json
index 8c3cf7de2a..9b63c7f8e7 100644
--- a/keyboards/wilba_tech/wt60_bx/info.json
+++ b/keyboards/wilba_tech/wt60_bx/info.json
@@ -8,6 +8,11 @@
        "pid": "0x60B1",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"],
+        "rows": ["F0", "F1", "F4", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/wilba_tech/wt60_c/config.h b/keyboards/wilba_tech/wt60_c/config.h
index 7b7fdaf020..776aebcf20 100644
--- a/keyboards/wilba_tech/wt60_c/config.h
+++ b/keyboards/wilba_tech/wt60_c/config.h
@@ -16,23 +16,6 @@
 #pragma once
-/*
- * 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 { F0, F1, F4, F6, F7 }
-#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
 /* 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/wilba_tech/wt60_c/info.json b/keyboards/wilba_tech/wt60_c/info.json
index b39a2786a4..b23b639c7e 100644
--- a/keyboards/wilba_tech/wt60_c/info.json
+++ b/keyboards/wilba_tech/wt60_c/info.json
@@ -8,6 +8,11 @@
        "pid": "0x60C0",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"],
+        "rows": ["F0", "F1", "F4", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/wilba_tech/wt60_g/config.h b/keyboards/wilba_tech/wt60_g/config.h
index 3264526694..9541b1df12 100644
--- a/keyboards/wilba_tech/wt60_g/config.h
+++ b/keyboards/wilba_tech/wt60_g/config.h
@@ -16,23 +16,6 @@
 #pragma once
-/*
- * 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 { F0, F1, F4, F6, F7 }
-#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6 } // D4, B7, B0
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
 /* 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/wilba_tech/wt60_g/info.json b/keyboards/wilba_tech/wt60_g/info.json
index 5c22b6dc21..113729e250 100644
--- a/keyboards/wilba_tech/wt60_g/info.json
+++ b/keyboards/wilba_tech/wt60_g/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0021",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"],
+        "rows": ["F0", "F1", "F4", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/wilba_tech/wt60_g2/config.h b/keyboards/wilba_tech/wt60_g2/config.h
index c841f6365a..b7d24e1cd3 100644
--- a/keyboards/wilba_tech/wt60_g2/config.h
+++ b/keyboards/wilba_tech/wt60_g2/config.h
@@ -16,23 +16,6 @@
 #pragma once
-/*
- * 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 { F0, F1, F4, F6, F7 }
-#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6 } // D4, B7, B0
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
 /* 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/wilba_tech/wt60_g2/info.json b/keyboards/wilba_tech/wt60_g2/info.json
index 33b0fd0d50..b1d34eb65d 100644
--- a/keyboards/wilba_tech/wt60_g2/info.json
+++ b/keyboards/wilba_tech/wt60_g2/info.json
@@ -8,6 +8,11 @@
        "pid": "0x002F",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"],
+        "rows": ["F0", "F1", "F4", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/wilba_tech/wt60_h1/config.h b/keyboards/wilba_tech/wt60_h1/config.h
index 3264526694..9541b1df12 100644
--- a/keyboards/wilba_tech/wt60_h1/config.h
+++ b/keyboards/wilba_tech/wt60_h1/config.h
@@ -16,23 +16,6 @@
 #pragma once
-/*
- * 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 { F0, F1, F4, F6, F7 }
-#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6 } // D4, B7, B0
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
 /* 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/wilba_tech/wt60_h1/info.json b/keyboards/wilba_tech/wt60_h1/info.json
index 928ea8ba8a..4ef210f05f 100644
--- a/keyboards/wilba_tech/wt60_h1/info.json
+++ b/keyboards/wilba_tech/wt60_h1/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0024",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"],
+        "rows": ["F0", "F1", "F4", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "community_layouts": ["60_tsangan_hhkb"],
diff --git a/keyboards/wilba_tech/wt60_h2/config.h b/keyboards/wilba_tech/wt60_h2/config.h
index 3264526694..9541b1df12 100644
--- a/keyboards/wilba_tech/wt60_h2/config.h
+++ b/keyboards/wilba_tech/wt60_h2/config.h
@@ -16,23 +16,6 @@
 #pragma once
-/*
- * 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 { F0, F1, F4, F6, F7 }
-#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6 } // D4, B7, B0
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
 /* 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/wilba_tech/wt60_h2/info.json b/keyboards/wilba_tech/wt60_h2/info.json
index e9c59d1b8c..046a8526bc 100644
--- a/keyboards/wilba_tech/wt60_h2/info.json
+++ b/keyboards/wilba_tech/wt60_h2/info.json
@@ -8,6 +8,11 @@
        "pid": "0x002B",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"],
+        "rows": ["F0", "F1", "F4", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/wilba_tech/wt60_h3/config.h b/keyboards/wilba_tech/wt60_h3/config.h
index 3264526694..9541b1df12 100644
--- a/keyboards/wilba_tech/wt60_h3/config.h
+++ b/keyboards/wilba_tech/wt60_h3/config.h
@@ -16,23 +16,6 @@
 #pragma once
-/*
- * 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 { F0, F1, F4, F6, F7 }
-#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6 } // D4, B7, B0
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
 /* 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/wilba_tech/wt60_h3/info.json b/keyboards/wilba_tech/wt60_h3/info.json
index df002063a3..f4cb4bedbc 100644
--- a/keyboards/wilba_tech/wt60_h3/info.json
+++ b/keyboards/wilba_tech/wt60_h3/info.json
@@ -8,6 +8,11 @@
        "pid": "0x002C",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"],
+        "rows": ["F0", "F1", "F4", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layout_aliases": {
diff --git a/keyboards/wilba_tech/wt60_xt/config.h b/keyboards/wilba_tech/wt60_xt/config.h
index 888197a216..ea2f490317 100644
--- a/keyboards/wilba_tech/wt60_xt/config.h
+++ b/keyboards/wilba_tech/wt60_xt/config.h
@@ -20,22 +20,6 @@
 #define AUDIO_PIN C6
 #define AUDIO_CLICKY
-/*
- * 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 { F0, E6, F4, F6, F7 }
-#define MATRIX_COL_PINS { B7, B0, F5, D5, B1, B2, B3, D3, D2, C7, B6, B5, B4, D7, D6, D4 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
 /* 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/wilba_tech/wt60_xt/info.json b/keyboards/wilba_tech/wt60_xt/info.json
index d31d8380b1..edbd17a5c3 100644
--- a/keyboards/wilba_tech/wt60_xt/info.json
+++ b/keyboards/wilba_tech/wt60_xt/info.json
@@ -8,6 +8,11 @@
        "pid": "0x001C",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["B7", "B0", "F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["F0", "E6", "F4", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/wilba_tech/wt65_a/config.h b/keyboards/wilba_tech/wt65_a/config.h
index 906887f3fa..aa75002b4f 100644
--- a/keyboards/wilba_tech/wt65_a/config.h
+++ b/keyboards/wilba_tech/wt65_a/config.h
@@ -16,23 +16,6 @@
 #pragma once
-/*
- * 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 { F0, E6, F4, F6, F7 }
-#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
 /* 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/wilba_tech/wt65_a/info.json b/keyboards/wilba_tech/wt65_a/info.json
index 1c73d40556..1b56bd785c 100644
--- a/keyboards/wilba_tech/wt65_a/info.json
+++ b/keyboards/wilba_tech/wt65_a/info.json
@@ -8,6 +8,11 @@
        "pid": "0x065A",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["F0", "E6", "F4", "F6", "F7"]
+    },
+    "diode_direction": "ROW2COL",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/wilba_tech/wt65_b/config.h b/keyboards/wilba_tech/wt65_b/config.h
index 2cec4c23d7..60cdbe4cc6 100644
--- a/keyboards/wilba_tech/wt65_b/config.h
+++ b/keyboards/wilba_tech/wt65_b/config.h
@@ -16,23 +16,6 @@
 #pragma once
-/*
- * 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 { F0, E6, F4, F6, F7 }
-#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
 /* 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/wilba_tech/wt65_b/info.json b/keyboards/wilba_tech/wt65_b/info.json
index 17dc827d55..5ac0d81f28 100644
--- a/keyboards/wilba_tech/wt65_b/info.json
+++ b/keyboards/wilba_tech/wt65_b/info.json
@@ -8,6 +8,11 @@
        "pid": "0x065B",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["F0", "E6", "F4", "F6", "F7"]
+    },
+    "diode_direction": "ROW2COL",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/wilba_tech/wt65_d/config.h b/keyboards/wilba_tech/wt65_d/config.h
index d383760f19..f37e4b2db6 100644
--- a/keyboards/wilba_tech/wt65_d/config.h
+++ b/keyboards/wilba_tech/wt65_d/config.h
@@ -3,11 +3,6 @@
 #pragma once
-// Keyboard Matrix Assignments
-#define MATRIX_ROW_PINS { E6, F0, F4, F6, F7 }
-#define MATRIX_COL_PINS { F5, D5, D3, D2, B7, B0, B3, C7, C6, B6, B5, B4, D7, D6, D4 }
-#define DIODE_DIRECTION COL2ROW
 // Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap 
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/wilba_tech/wt65_d/info.json b/keyboards/wilba_tech/wt65_d/info.json
index 68dc46d548..dec1e89e95 100644
--- a/keyboards/wilba_tech/wt65_d/info.json
+++ b/keyboards/wilba_tech/wt65_d/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0031",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "D3", "D2", "B7", "B0", "B3", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["E6", "F0", "F4", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
    "indicators": {
        "caps_lock": "F1"
    },
diff --git a/keyboards/wilba_tech/wt65_f/config.h b/keyboards/wilba_tech/wt65_f/config.h
index bf47e02d25..b7d24e1cd3 100644
--- a/keyboards/wilba_tech/wt65_f/config.h
+++ b/keyboards/wilba_tech/wt65_f/config.h
@@ -16,23 +16,6 @@
 #pragma once
-/*
- * 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 { F0, F1, F4, F6, F7 }
-#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4 } // B7, B0
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
 /* 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/wilba_tech/wt65_f/info.json b/keyboards/wilba_tech/wt65_f/info.json
index f5916bea1b..9cf7004132 100644
--- a/keyboards/wilba_tech/wt65_f/info.json
+++ b/keyboards/wilba_tech/wt65_f/info.json
@@ -8,6 +8,11 @@
        "pid": "0x002D",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["F0", "F1", "F4", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/wilba_tech/wt65_fx/config.h b/keyboards/wilba_tech/wt65_fx/config.h
index bf47e02d25..b7d24e1cd3 100644
--- a/keyboards/wilba_tech/wt65_fx/config.h
+++ b/keyboards/wilba_tech/wt65_fx/config.h
@@ -16,23 +16,6 @@
 #pragma once
-/*
- * 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 { F0, F1, F4, F6, F7 }
-#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4 } // B7, B0
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
 /* 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/wilba_tech/wt65_fx/info.json b/keyboards/wilba_tech/wt65_fx/info.json
index afbc80b8c1..d9195621e2 100644
--- a/keyboards/wilba_tech/wt65_fx/info.json
+++ b/keyboards/wilba_tech/wt65_fx/info.json
@@ -8,6 +8,11 @@
        "pid": "0x002E",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["F0", "F1", "F4", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/wilba_tech/wt65_g/config.h b/keyboards/wilba_tech/wt65_g/config.h
index 807b7fa8ee..9541b1df12 100644
--- a/keyboards/wilba_tech/wt65_g/config.h
+++ b/keyboards/wilba_tech/wt65_g/config.h
@@ -16,23 +16,6 @@
 #pragma once
-/*
- * 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 { F0, F1, F4, F6, F7 }
-#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4 } // B7, B0
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
 /* 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/wilba_tech/wt65_g/info.json b/keyboards/wilba_tech/wt65_g/info.json
index bdfea960a4..1f794e5e37 100644
--- a/keyboards/wilba_tech/wt65_g/info.json
+++ b/keyboards/wilba_tech/wt65_g/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0022",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["F0", "F1", "F4", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/wilba_tech/wt65_g2/config.h b/keyboards/wilba_tech/wt65_g2/config.h
index 807b7fa8ee..9541b1df12 100644
--- a/keyboards/wilba_tech/wt65_g2/config.h
+++ b/keyboards/wilba_tech/wt65_g2/config.h
@@ -16,23 +16,6 @@
 #pragma once
-/*
- * 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 { F0, F1, F4, F6, F7 }
-#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4 } // B7, B0
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
 /* 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/wilba_tech/wt65_g2/info.json b/keyboards/wilba_tech/wt65_g2/info.json
index 5d8769625a..b3d8d3bdbb 100644
--- a/keyboards/wilba_tech/wt65_g2/info.json
+++ b/keyboards/wilba_tech/wt65_g2/info.json
@@ -8,6 +8,11 @@
        "pid": "0x002A",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["F0", "F1", "F4", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/wilba_tech/wt65_h1/config.h b/keyboards/wilba_tech/wt65_h1/config.h
index 807b7fa8ee..9541b1df12 100644
--- a/keyboards/wilba_tech/wt65_h1/config.h
+++ b/keyboards/wilba_tech/wt65_h1/config.h
@@ -16,23 +16,6 @@
 #pragma once
-/*
- * 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 { F0, F1, F4, F6, F7 }
-#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4 } // B7, B0
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
 /* 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/wilba_tech/wt65_h1/info.json b/keyboards/wilba_tech/wt65_h1/info.json
index 2ccb1d9099..65e8c39016 100644
--- a/keyboards/wilba_tech/wt65_h1/info.json
+++ b/keyboards/wilba_tech/wt65_h1/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0025",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["F0", "F1", "F4", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "community_layouts": ["65_ansi_blocker_tsangan"],
diff --git a/keyboards/wilba_tech/wt65_xt/config.h b/keyboards/wilba_tech/wt65_xt/config.h
index 525df76d1b..9541b1df12 100644
--- a/keyboards/wilba_tech/wt65_xt/config.h
+++ b/keyboards/wilba_tech/wt65_xt/config.h
@@ -16,23 +16,6 @@
 #pragma once
-/*
- * 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 { F0, F1, F4, F6, F7 }
-#define MATRIX_COL_PINS { B7, B0, F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
 /* 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/wilba_tech/wt65_xt/info.json b/keyboards/wilba_tech/wt65_xt/info.json
index 575d1c3add..98c21c8230 100644
--- a/keyboards/wilba_tech/wt65_xt/info.json
+++ b/keyboards/wilba_tech/wt65_xt/info.json
@@ -8,6 +8,11 @@
        "pid": "0x001D",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["B7", "B0", "F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["F0", "F1", "F4", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/wilba_tech/wt65_xtx/config.h b/keyboards/wilba_tech/wt65_xtx/config.h
index c799ec8bc4..9b6b3c7955 100644
--- a/keyboards/wilba_tech/wt65_xtx/config.h
+++ b/keyboards/wilba_tech/wt65_xtx/config.h
@@ -15,23 +15,6 @@
 */
 #pragma once
-/*
- * 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 { F0, F1, F4, F6, F7 }
-#define MATRIX_COL_PINS { B7, B0, F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
 /* 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/wilba_tech/wt65_xtx/info.json b/keyboards/wilba_tech/wt65_xtx/info.json
index 196044185b..e9394e8a02 100644
--- a/keyboards/wilba_tech/wt65_xtx/info.json
+++ b/keyboards/wilba_tech/wt65_xtx/info.json
@@ -8,6 +8,11 @@
        "pid": "0x001E",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["B7", "B0", "F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["F0", "F1", "F4", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/wilba_tech/wt69_a/config.h b/keyboards/wilba_tech/wt69_a/config.h
index e893d73def..bc06d6ce9c 100644
--- a/keyboards/wilba_tech/wt69_a/config.h
+++ b/keyboards/wilba_tech/wt69_a/config.h
@@ -16,23 +16,6 @@
 #pragma once
-/*
- * 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 { F0, E6, F4, F6, F7 }
-#define MATRIX_COL_PINS { B7, B0, F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
 /* 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/wilba_tech/wt69_a/info.json b/keyboards/wilba_tech/wt69_a/info.json
index 67faf978d4..7d643b66ce 100644
--- a/keyboards/wilba_tech/wt69_a/info.json
+++ b/keyboards/wilba_tech/wt69_a/info.json
@@ -8,6 +8,11 @@
        "pid": "0x069A",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["B7", "B0", "F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["F0", "E6", "F4", "F6", "F7"]
+    },
+    "diode_direction": "ROW2COL",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/wilba_tech/wt70_jb/config.h b/keyboards/wilba_tech/wt70_jb/config.h
index 0a853d659c..afc09fb5fe 100644
--- a/keyboards/wilba_tech/wt70_jb/config.h
+++ b/keyboards/wilba_tech/wt70_jb/config.h
@@ -15,23 +15,6 @@
 */
 #pragma once
-/*
- * 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 { E6, F0, F4, F6, F7 }
-#define MATRIX_COL_PINS { F5, D5, D3, D2, D1, D0, B7, C7, C6, B6, B5, B4, D7, D6, D4, B0, B3 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
 /* 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/wilba_tech/wt70_jb/info.json b/keyboards/wilba_tech/wt70_jb/info.json
index a004bb43a0..a913e0b225 100644
--- a/keyboards/wilba_tech/wt70_jb/info.json
+++ b/keyboards/wilba_tech/wt70_jb/info.json
@@ -8,6 +8,11 @@
        "pid": "0x001F",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "D3", "D2", "D1", "D0", "B7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "B0", "B3"],
+        "rows": ["E6", "F0", "F4", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/wilba_tech/wt75_a/config.h b/keyboards/wilba_tech/wt75_a/config.h
index d678e7f0e9..4638b0fba9 100644
--- a/keyboards/wilba_tech/wt75_a/config.h
+++ b/keyboards/wilba_tech/wt75_a/config.h
@@ -16,23 +16,6 @@
 #pragma once
-/*
- * 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 { F1, F0, E6, F4, F6, F7 }
-#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4 }
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION ROW2COL
 /* 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/wilba_tech/wt75_a/info.json b/keyboards/wilba_tech/wt75_a/info.json
index 2434233335..a531ab8a19 100644
--- a/keyboards/wilba_tech/wt75_a/info.json
+++ b/keyboards/wilba_tech/wt75_a/info.json
@@ -8,6 +8,11 @@
        "pid": "0x075A",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["F1", "F0", "E6", "F4", "F6", "F7"]
+    },
+    "diode_direction": "ROW2COL",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/wilba_tech/wt75_b/config.h b/keyboards/wilba_tech/wt75_b/config.h
index e36da68c4e..f519fe6603 100644
--- a/keyboards/wilba_tech/wt75_b/config.h
+++ b/keyboards/wilba_tech/wt75_b/config.h
@@ -16,23 +16,6 @@
 #pragma once
-/*
- * 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 { F1, F0, E6, F4, F6, F7 }
-#define MATRIX_COL_PINS { F5, D5, B1, B7, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, B2, D4 }
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION ROW2COL
 /* 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/wilba_tech/wt75_b/info.json b/keyboards/wilba_tech/wt75_b/info.json
index b2bd5a02ae..af090acd3a 100644
--- a/keyboards/wilba_tech/wt75_b/info.json
+++ b/keyboards/wilba_tech/wt75_b/info.json
@@ -8,6 +8,11 @@
        "pid": "0x075B",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B7", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "B2", "D4"],
+        "rows": ["F1", "F0", "E6", "F4", "F6", "F7"]
+    },
+    "diode_direction": "ROW2COL",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/wilba_tech/wt75_c/config.h b/keyboards/wilba_tech/wt75_c/config.h
index 0bd449089c..7d07822eb6 100644
--- a/keyboards/wilba_tech/wt75_c/config.h
+++ b/keyboards/wilba_tech/wt75_c/config.h
@@ -16,23 +16,6 @@
 #pragma once
-/*
- * 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 { F1, F0, E6, F4, F6, F7 }
-#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, B7, D4 }
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION ROW2COL
 /* 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/wilba_tech/wt75_c/info.json b/keyboards/wilba_tech/wt75_c/info.json
index 85a9987908..86ccc5df0e 100644
--- a/keyboards/wilba_tech/wt75_c/info.json
+++ b/keyboards/wilba_tech/wt75_c/info.json
@@ -8,6 +8,11 @@
        "pid": "0x075C",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "B7", "D4"],
+        "rows": ["F1", "F0", "E6", "F4", "F6", "F7"]
+    },
+    "diode_direction": "ROW2COL",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/wilba_tech/wt80_a/config.h b/keyboards/wilba_tech/wt80_a/config.h
index 8112d1f888..59cb397a00 100644
--- a/keyboards/wilba_tech/wt80_a/config.h
+++ b/keyboards/wilba_tech/wt80_a/config.h
@@ -16,23 +16,6 @@
 #pragma once
-/*
- * 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 { F1, F0, E6, F4, F6, F7 }
-#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4, B7, B0 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
 /* 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/wilba_tech/wt80_a/info.json b/keyboards/wilba_tech/wt80_a/info.json
index 337207404a..0a814235d9 100644
--- a/keyboards/wilba_tech/wt80_a/info.json
+++ b/keyboards/wilba_tech/wt80_a/info.json
@@ -8,6 +8,11 @@
        "pid": "0x080A",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "B7", "B0"],
+        "rows": ["F1", "F0", "E6", "F4", "F6", "F7"]
+    },
+    "diode_direction": "ROW2COL",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/wilba_tech/wt80_bc/config.h b/keyboards/wilba_tech/wt80_bc/config.h
index aa5ba2d573..9541b1df12 100644
--- a/keyboards/wilba_tech/wt80_bc/config.h
+++ b/keyboards/wilba_tech/wt80_bc/config.h
@@ -16,23 +16,6 @@
 #pragma once
-/*
- * 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 { F1, F0, E6, F4, F6, F7 }
-#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4, B7, B0 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
 /* 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/wilba_tech/wt80_bc/info.json b/keyboards/wilba_tech/wt80_bc/info.json
index e2858d238a..a85325525b 100644
--- a/keyboards/wilba_tech/wt80_bc/info.json
+++ b/keyboards/wilba_tech/wt80_bc/info.json
@@ -8,6 +8,11 @@
        "pid": "0x80B0",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "B7", "B0"],
+        "rows": ["F1", "F0", "E6", "F4", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/wilba_tech/wt80_g/config.h b/keyboards/wilba_tech/wt80_g/config.h
index aa5ba2d573..9541b1df12 100644
--- a/keyboards/wilba_tech/wt80_g/config.h
+++ b/keyboards/wilba_tech/wt80_g/config.h
@@ -16,23 +16,6 @@
 #pragma once
-/*
- * 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 { F1, F0, E6, F4, F6, F7 }
-#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4, B7, B0 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
 /* 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/wilba_tech/wt80_g/info.json b/keyboards/wilba_tech/wt80_g/info.json
index 1c7ff192d1..8aec5901ea 100644
--- a/keyboards/wilba_tech/wt80_g/info.json
+++ b/keyboards/wilba_tech/wt80_g/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0023",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "B7", "B0"],
+        "rows": ["F1", "F0", "E6", "F4", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/wilba_tech/wt8_a/config.h b/keyboards/wilba_tech/wt8_a/config.h
index 3ef5baf588..1377a18714 100644
--- a/keyboards/wilba_tech/wt8_a/config.h
+++ b/keyboards/wilba_tech/wt8_a/config.h
@@ -16,23 +16,6 @@
 #pragma once
-/*
- * 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 { E6 }
-#define MATRIX_COL_PINS { F4, F1, B2, B6, F6, F7, D5, B4 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
 /* 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/wilba_tech/wt8_a/info.json b/keyboards/wilba_tech/wt8_a/info.json
index 53cffb13ae..b462b05eeb 100644
--- a/keyboards/wilba_tech/wt8_a/info.json
+++ b/keyboards/wilba_tech/wt8_a/info.json
@@ -8,6 +8,11 @@
        "pid": "0x008A",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F4", "F1", "B2", "B6", "F6", "F7", "D5", "B4"],
+        "rows": ["E6"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/wilba_tech/zeal60/config.h b/keyboards/wilba_tech/zeal60/config.h
index 5a3ad34bf7..e57bafe20d 100644
--- a/keyboards/wilba_tech/zeal60/config.h
+++ b/keyboards/wilba_tech/zeal60/config.h
@@ -15,18 +15,10 @@
 */
 #pragma once
-// Zeal60 PCB default pin-out
-#define MATRIX_ROW_PINS { F0, F1, F4, F6, F7 }
-#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6 }
 // IS31FL3731 driver
 #define DRIVER_COUNT 2
 #define RGB_MATRIX_LED_COUNT 72
-// COL2ROW or ROW2COL
-#define DIODE_DIRECTION COL2ROW
 // 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/wilba_tech/zeal60/info.json b/keyboards/wilba_tech/zeal60/info.json
index 5ef0875419..764b040320 100644
--- a/keyboards/wilba_tech/zeal60/info.json
+++ b/keyboards/wilba_tech/zeal60/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0060",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"],
+        "rows": ["F0", "F1", "F4", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "community_layouts": ["60_ansi", "60_iso", "60_hhkb", "60_ansi_split_bs_rshift"],
diff --git a/keyboards/wilba_tech/zeal65/config.h b/keyboards/wilba_tech/zeal65/config.h
index 1ab6b62751..4a73ed3b27 100644
--- a/keyboards/wilba_tech/zeal65/config.h
+++ b/keyboards/wilba_tech/zeal65/config.h
@@ -15,18 +15,10 @@
 */
 #pragma once
-// Zeal60 PCB default pin-out
-#define MATRIX_ROW_PINS { F0, F1, F4, F6, F7 }
-#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4 }
 // IS31FL3731 driver
 #define DRIVER_COUNT 2
 #define RGB_MATRIX_LED_COUNT 72
-// COL2ROW or ROW2COL
-#define DIODE_DIRECTION COL2ROW
 // 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/wilba_tech/zeal65/info.json b/keyboards/wilba_tech/zeal65/info.json
index 935dc18874..0918277e81 100644
--- a/keyboards/wilba_tech/zeal65/info.json
+++ b/keyboards/wilba_tech/zeal65/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0065",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["F0", "F1", "F4", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/winkeyless/b87/config.h b/keyboards/winkeyless/b87/config.h
index ce27a1c563..b585802fb8 100644
--- a/keyboards/winkeyless/b87/config.h
+++ b/keyboards/winkeyless/b87/config.h
@@ -16,11 +16,6 @@
 #pragma once
-/*Define Matrix Pins */
-#define MATRIX_ROW_PINS {B5, B4, B3, B2, B1, B0, B6, B7}
-#define MATRIX_COL_PINS {A0, A1, A2, A3, A4, A5, C5, C4, C3, C2, D7, C6, C7, A7, A6}
-    
 #define RGBLED_NUM 20  // Number of LEDs
 // RGB effects
 #define RGBLIGHT_EFFECT_BREATHING
@@ -33,6 +28,3 @@
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/winkeyless/b87/info.json b/keyboards/winkeyless/b87/info.json
index 542cc74d27..506ddf78ec 100644
--- a/keyboards/winkeyless/b87/info.json
+++ b/keyboards/winkeyless/b87/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0B87",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "C5", "C4", "C3", "C2", "D7", "C6", "C7", "A7", "A6"],
+        "rows": ["B5", "B4", "B3", "B2", "B1", "B0", "B6", "B7"]
+    },
+    "diode_direction": "COL2ROW",
    "backlight": {
        "pin": "D4"
    },
diff --git a/keyboards/winkeyless/bface/config.h b/keyboards/winkeyless/bface/config.h
index cbb0be707d..b7529e4311 100644
--- a/keyboards/winkeyless/bface/config.h
+++ b/keyboards/winkeyless/bface/config.h
@@ -18,12 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-//                        0   1   2   3   4   5   6   7   8   9   A   B   C   D   E
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5, B6, B7 }
-#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7}
-#define DIODE_DIRECTION COL2ROW
 #define RGBLED_NUM 16
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/winkeyless/bface/info.json b/keyboards/winkeyless/bface/info.json
index f7a8c61032..fc3b3c45d3 100644
--- a/keyboards/winkeyless/bface/info.json
+++ b/keyboards/winkeyless/bface/info.json
@@ -8,6 +8,11 @@
    "pid": "0x4246",
    "device_version": "2.0.0"
  },
+  "matrix_pins": {
+    "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "D7"],
+    "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7"]
+  },
+  "diode_direction": "COL2ROW",
  "backlight": {
    "pin": "D4"
  },
diff --git a/keyboards/winkeyless/bmini/config.h b/keyboards/winkeyless/bmini/config.h
index 033807a3f5..ddc21dae30 100644
--- a/keyboards/winkeyless/bmini/config.h
+++ b/keyboards/winkeyless/bmini/config.h
@@ -20,10 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLED_NUM 16
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5, B6, B7 }
-#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 }
-#define DIODE_DIRECTION COL2ROW
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/winkeyless/bmini/info.json b/keyboards/winkeyless/bmini/info.json
index 58edbac998..add6deafad 100644
--- a/keyboards/winkeyless/bmini/info.json
+++ b/keyboards/winkeyless/bmini/info.json
@@ -8,6 +8,11 @@
    "pid": "0x424D",
    "device_version": "2.0.0"
  },
+  "matrix_pins": {
+    "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "D7"],
+    "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7"]
+  },
+  "diode_direction": "COL2ROW",
  "backlight": {
    "pin": "D4"
  },
diff --git a/keyboards/winkeyless/bminiex/config.h b/keyboards/winkeyless/bminiex/config.h
index 351de6f475..116c09d6ac 100644
--- a/keyboards/winkeyless/bminiex/config.h
+++ b/keyboards/winkeyless/bminiex/config.h
@@ -20,10 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLED_NUM 20
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5, B6, B7 }
-#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 }
-#define DIODE_DIRECTION COL2ROW
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/winkeyless/bminiex/info.json b/keyboards/winkeyless/bminiex/info.json
index afd766f480..c60a38fe2f 100644
--- a/keyboards/winkeyless/bminiex/info.json
+++ b/keyboards/winkeyless/bminiex/info.json
@@ -8,6 +8,11 @@
    "pid": "0x4258",
    "device_version": "2.0.0"
  },
+  "matrix_pins": {
+    "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "D7"],
+    "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7"]
+  },
+  "diode_direction": "COL2ROW",
  "backlight": {
    "pin": "D4",
    "levels": 5
diff --git a/keyboards/winry/winry25tc/config.h b/keyboards/winry/winry25tc/config.h
index f67f725ef6..90e70999b6 100644
--- a/keyboards/winry/winry25tc/config.h
+++ b/keyboards/winry/winry25tc/config.h
@@ -16,12 +16,6 @@
 #pragma once
-#define MATRIX_ROW_PINS { E6, F0, D6, D2, B6 }
-#define MATRIX_COL_PINS { F5, C7, B7, B2, B4 }
-#define DIODE_DIRECTION COL2ROW
 #define RGB_DI_PIN D5
 #define RGBLED_NUM 40
 #define RGBLIGHT_HUE_STEP 8
diff --git a/keyboards/winry/winry25tc/info.json b/keyboards/winry/winry25tc/info.json
index 4cbb746408..0391d278b9 100644
--- a/keyboards/winry/winry25tc/info.json
+++ b/keyboards/winry/winry25tc/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0000",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F5", "C7", "B7", "B2", "B4"],
+        "rows": ["E6", "F0", "D6", "D2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/wolf/kuku65/config.h b/keyboards/wolf/kuku65/config.h
deleted file mode 100644
index a103afe451..0000000000
--- a/keyboards/wolf/kuku65/config.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-Copyright 2020 <contact@vwolf.be>
-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
-/*
- * 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)
- *
-*/
-// Checked with Eagle Schematic
-#define MATRIX_ROW_PINS { B3, B2, B1, B0, B7  }
-#define MATRIX_COL_PINS { D0, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1 }
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/wolf/kuku65/info.json b/keyboards/wolf/kuku65/info.json
index 39fec251a1..36022287d2 100644
--- a/keyboards/wolf/kuku65/info.json
+++ b/keyboards/wolf/kuku65/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0052",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["D0", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1"],
+        "rows": ["B3", "B2", "B1", "B0", "B7"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/wolf/ryujin/config.h b/keyboards/wolf/ryujin/config.h
deleted file mode 100644
index dd9ec9803a..0000000000
--- a/keyboards/wolf/ryujin/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-Copyright 2020 <contact@vwolf.be>
-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
-// Checked with Eagle Schematic
-#define MATRIX_ROW_PINS { D5, D3, D2, D1, D0  }
-#define MATRIX_COL_PINS { E6, F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4 }
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/wolf/ryujin/info.json b/keyboards/wolf/ryujin/info.json
index 5afce87aef..4a7c080606 100644
--- a/keyboards/wolf/ryujin/info.json
+++ b/keyboards/wolf/ryujin/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0200",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["D5", "D3", "D2", "D1", "D0"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/wolf/sabre/config.h b/keyboards/wolf/sabre/config.h
deleted file mode 100644
index c0150fce0b..0000000000
--- a/keyboards/wolf/sabre/config.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-Copyright 2020 <contact@vwolf.be>
-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
-/*
- * 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)
- *
-*/
-// Checked with Eagle Schematic
-#define MATRIX_ROW_PINS { D0, D1, F1, F0, B5, B6, C7, C6, F6, F7, F4, F5 }
-#define MATRIX_COL_PINS { D2, D3, D5, D4, D6, D7, B4, B2, B1 }
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/wolf/sabre/info.json b/keyboards/wolf/sabre/info.json
index 40ee60a6d0..526422d945 100644
--- a/keyboards/wolf/sabre/info.json
+++ b/keyboards/wolf/sabre/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0055",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["D2", "D3", "D5", "D4", "D6", "D7", "B4", "B2", "B1"],
+        "rows": ["D0", "D1", "F1", "F0", "B5", "B6", "C7", "C6", "F6", "F7", "F4", "F5"]
+    },
+    "diode_direction": "COL2ROW",
    "backlight": {
        "pin": "B7"
    },
diff --git a/keyboards/wolf/ts60/config.h b/keyboards/wolf/ts60/config.h
index 7664e747c7..cfc1ef79bc 100644
--- a/keyboards/wolf/ts60/config.h
+++ b/keyboards/wolf/ts60/config.h
@@ -17,25 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/*
- * 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)
- *
-*/
-// Checked with Eagle Schematic
-#define MATRIX_ROW_PINS { D2, D3, D6, D4, F6, F7, F5, F0, F4, F1 }
-#define MATRIX_COL_PINS { D1, D5, C7, C6, B6, B5, B4, D7}
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 /* Define RGB Underglow */
 #define RGB_DI_PIN D0
 #define RGBLED_NUM 16
diff --git a/keyboards/wolf/ts60/info.json b/keyboards/wolf/ts60/info.json
index 8b40cd6ff2..a8b8e91268 100644
--- a/keyboards/wolf/ts60/info.json
+++ b/keyboards/wolf/ts60/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0050",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["D1", "D5", "C7", "C6", "B6", "B5", "B4", "D7"],
+        "rows": ["D2", "D3", "D6", "D4", "F6", "F7", "F5", "F0", "F4", "F1"]
+    },
+    "diode_direction": "COL2ROW",
    "backlight": {
        "pin": "B7",
        "levels": 6
diff --git a/keyboards/wolfmarkclub/wm1/config.h b/keyboards/wolfmarkclub/wm1/config.h
index f9802c89f3..93b0d14a3a 100644
--- a/keyboards/wolfmarkclub/wm1/config.h
+++ b/keyboards/wolfmarkclub/wm1/config.h
@@ -17,12 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-//                         0    1    2    3    4     5   6   7    8     9   A   B  C   D   E
-#define MATRIX_ROW_PINS { C4,  A7,  A6,  A5,  A4 }
-#define MATRIX_COL_PINS { B10, B11, B12, B13, B14, B15, C6, C10, C11, C12, D2, B5, B6, B7, B8 }
-#define DIODE_DIRECTION COL2ROW
 #define RGB_DI_PIN A3
 #ifdef RGB_DI_PIN
 #define RGBLED_NUM 18
diff --git a/keyboards/wolfmarkclub/wm1/info.json b/keyboards/wolfmarkclub/wm1/info.json
index 3eef787a74..ac1827daf6 100644
--- a/keyboards/wolfmarkclub/wm1/info.json
+++ b/keyboards/wolfmarkclub/wm1/info.json
@@ -8,6 +8,11 @@
        "pid": "0x2B29",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["B10", "B11", "B12", "B13", "B14", "B15", "C6", "C10", "C11", "C12", "D2", "B5", "B6", "B7", "B8"],
+        "rows": ["C4", "A7", "A6", "A5", "A4"]
+    },
+    "diode_direction": "COL2ROW",
    "layouts": {
        "LAYOUT": {
            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":8.75, "y":0}, {"x":9.75, "y":0}, {"x":10.75, "y":0}, {"x":11.75, "y":0}, {"x":12.75, "y":0}, {"x":13.75, "y":0}, {"x":14.75, "y":0}, {"x":15.75, "y":0}, {"x":17, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":8.25, "y":1}, {"x":9.25, "y":1}, {"x":10.25, "y":1}, {"x":11.25, "y":1}, {"x":12.25, "y":1}, {"x":13.25, "y":1}, {"x":14.25, "y":1}, {"x":15.25, "y":1, "w":1.5}, {"x":17, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":8.5, "y":2}, {"x":9.5, "y":2}, {"x":10.5, "y":2}, {"x":11.5, "y":2}, {"x":12.5, "y":2}, {"x":13.5, "y":2}, {"x":14.5, "y":2, "w":2.25}, {"x":17, "y":2}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3, "w":1.75}, {"x":16.25, "y":3.25}, {"x":0, "y":4, "w":1.5}, {"x":3, "y":4, "w":1.5}, {"x":4.5, "y":4, "w":2}, {"x":6.5, "y":4}, {"x":8, "y":4, "w":2.75}, {"x":10.75, "y":4, "w":1.5}, {"x":13.25, "y":4, "w":1.5}, {"x":15.25, "y":4.25}, {"x":16.25, "y":4.25}, {"x":17.25, "y":4.25}]
diff --git a/keyboards/woodkeys/bigseries/1key/config.h b/keyboards/woodkeys/bigseries/1key/config.h
index 32263155ff..643a094f44 100755
--- a/keyboards/woodkeys/bigseries/1key/config.h
+++ b/keyboards/woodkeys/bigseries/1key/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B0 }
-#define MATRIX_COL_PINS { B4 }
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
 /* key combination for command */
 #define IS_COMMAND() ( \
    false \
diff --git a/keyboards/woodkeys/bigseries/1key/info.json b/keyboards/woodkeys/bigseries/1key/info.json
index f2f93b63ea..1d0a787d9a 100644
--- a/keyboards/woodkeys/bigseries/1key/info.json
+++ b/keyboards/woodkeys/bigseries/1key/info.json
@@ -8,6 +8,11 @@
        "pid": "0x6071",
        "device_version": "0.0.2"
    },
+    "matrix_pins": {
+        "cols": ["B4"],
+        "rows": ["B0"]
+    },
+    "diode_direction": "ROW2COL",
    "processor": "atmega32u2",
    "bootloader": "atmel-dfu",
    "debounce": 50,
diff --git a/keyboards/woodkeys/bigseries/2key/config.h b/keyboards/woodkeys/bigseries/2key/config.h
index 6b40065765..62734fc947 100755
--- a/keyboards/woodkeys/bigseries/2key/config.h
+++ b/keyboards/woodkeys/bigseries/2key/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B0 }
-#define MATRIX_COL_PINS { B4, B3 }
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
 /* key combination for command */
 #define IS_COMMAND() ( \
    false \
diff --git a/keyboards/woodkeys/bigseries/2key/info.json b/keyboards/woodkeys/bigseries/2key/info.json
index 5137f4f1d1..c3a2b62eb8 100644
--- a/keyboards/woodkeys/bigseries/2key/info.json
+++ b/keyboards/woodkeys/bigseries/2key/info.json
@@ -8,6 +8,11 @@
        "pid": "0x6071",
        "device_version": "0.0.2"
    },
+    "matrix_pins": {
+        "cols": ["B4", "B3"],
+        "rows": ["B0"]
+    },
+    "diode_direction": "ROW2COL",
    "processor": "atmega32u2",
    "bootloader": "atmel-dfu",
    "debounce": 50,
diff --git a/keyboards/woodkeys/bigseries/3key/config.h b/keyboards/woodkeys/bigseries/3key/config.h
index 9c81df0835..592aae3c88 100755
--- a/keyboards/woodkeys/bigseries/3key/config.h
+++ b/keyboards/woodkeys/bigseries/3key/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B0 }
-#define MATRIX_COL_PINS { B4, B3, B5 }
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
 /* key combination for command */
 #define IS_COMMAND() ( \
    false \
diff --git a/keyboards/woodkeys/bigseries/3key/info.json b/keyboards/woodkeys/bigseries/3key/info.json
index af1c85f925..43b99312db 100644
--- a/keyboards/woodkeys/bigseries/3key/info.json
+++ b/keyboards/woodkeys/bigseries/3key/info.json
@@ -8,6 +8,11 @@
        "pid": "0x6073",
        "device_version": "0.0.2"
    },
+    "matrix_pins": {
+        "cols": ["B4", "B3", "B5"],
+        "rows": ["B0"]
+    },
+    "diode_direction": "ROW2COL",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "debounce": 50,
diff --git a/keyboards/woodkeys/bigseries/4key/config.h b/keyboards/woodkeys/bigseries/4key/config.h
index 9b1f699ce1..53e1242c88 100755
--- a/keyboards/woodkeys/bigseries/4key/config.h
+++ b/keyboards/woodkeys/bigseries/4key/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B0, B5 }
-#define MATRIX_COL_PINS { B4, B3 }
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
 /* key combination for command */
 #define IS_COMMAND() ( \
    false \
diff --git a/keyboards/woodkeys/bigseries/4key/info.json b/keyboards/woodkeys/bigseries/4key/info.json
index b6e02aa987..8fb9a9071a 100644
--- a/keyboards/woodkeys/bigseries/4key/info.json
+++ b/keyboards/woodkeys/bigseries/4key/info.json
@@ -8,6 +8,11 @@
        "pid": "0x6074",
        "device_version": "0.0.2"
    },
+    "matrix_pins": {
+        "cols": ["B4", "B3"],
+        "rows": ["B0", "B5"]
+    },
+    "diode_direction": "ROW2COL",
    "processor": "atmega32u2",
    "bootloader": "atmel-dfu",
    "debounce": 50,
diff --git a/keyboards/woodkeys/scarletbandana/config.h b/keyboards/woodkeys/scarletbandana/config.h
index fac7647ab8..c640c6254f 100644
--- a/keyboards/woodkeys/scarletbandana/config.h
+++ b/keyboards/woodkeys/scarletbandana/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
 #ifdef RGBLIGHT_ENABLE
 #define RGB_DI_PIN D3
 #define RGBLIGHT_EFFECT_BREATHING
@@ -36,9 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLED_NUM 8    // Number of LEDs
 #endif
-#define MATRIX_ROW_PINS { D4, D6, D7, B4, B5 }
-#define MATRIX_COL_PINS { B2, B3, B7, B1, F5, F4, F6, F7, B0, F0, F1, D0, D1, D2, D5, B6, C7 }
 #ifdef AUDIO_ENABLE
 #define AUDIO_PIN C6
 #define STARTUP_SONG SONG(PREONIC_SOUND)
diff --git a/keyboards/woodkeys/scarletbandana/info.json b/keyboards/woodkeys/scarletbandana/info.json
index 180cd46098..7550db40c8 100644
--- a/keyboards/woodkeys/scarletbandana/info.json
+++ b/keyboards/woodkeys/scarletbandana/info.json
@@ -8,6 +8,11 @@
        "pid": "0x6969",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["B2", "B3", "B7", "B1", "F5", "F4", "F6", "F7", "B0", "F0", "F1", "D0", "D1", "D2", "D5", "B6", "C7"],
+        "rows": ["D4", "D6", "D7", "B4", "B5"]
+    },
+    "diode_direction": "ROW2COL",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/work_louder/loop/config.h b/keyboards/work_louder/loop/config.h
index 1e17946cef..020b95da17 100644
--- a/keyboards/work_louder/loop/config.h
+++ b/keyboards/work_louder/loop/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/*
- * 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 \
-    { F5 }
-#define MATRIX_COL_PINS { B3, B2, B1, D6, D7, B4, B5, B6, C6, C7, F7, F6 }
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 #define USB_MAX_POWER_CONSUMPTION 100
 #define RGBLIGHT_DI_PIN E6
diff --git a/keyboards/work_louder/loop/info.json b/keyboards/work_louder/loop/info.json
index df4a5c1be0..00e70ab0db 100644
--- a/keyboards/work_louder/loop/info.json
+++ b/keyboards/work_louder/loop/info.json
@@ -7,6 +7,11 @@
        "vid": "0x574C",
        "pid": "0x1DF9"
    },
+    "matrix_pins": {
+        "cols": ["B3", "B2", "B1", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6"],
+        "rows": ["F5"]
+    },
+    "diode_direction": "COL2ROW",
    "encoder": {
        "rotary": [
            {"pin_a": "D0", "pin_b": "D1"},
diff --git a/keyboards/work_louder/nano/config.h b/keyboards/work_louder/nano/config.h
index 9148cf1abf..add9608eb4 100644
--- a/keyboards/work_louder/nano/config.h
+++ b/keyboards/work_louder/nano/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/*
- * 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 \
-    { F7 }
-#define MATRIX_COL_PINS \
-    { B5, B6, C6 }
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION        COL2ROW
 #define USB_MAX_POWER_CONSUMPTION 100
 #define RGBLIGHT_DI_PIN        C7
diff --git a/keyboards/work_louder/nano/info.json b/keyboards/work_louder/nano/info.json
index 3eb050b92a..798127b4c0 100644
--- a/keyboards/work_louder/nano/info.json
+++ b/keyboards/work_louder/nano/info.json
@@ -8,6 +8,11 @@
        "pid": "0xE6F0",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["B5", "B6", "C6"],
+        "rows": ["F7"]
+    },
+    "diode_direction": "COL2ROW",
    "encoder": {
        "rotary": [
            {"pin_a": "D7", "pin_b": "B4"}
diff --git a/keyboards/work_louder/work_board/config.h b/keyboards/work_louder/work_board/config.h
index d9da63eb50..de4cf74bad 100644
--- a/keyboards/work_louder/work_board/config.h
+++ b/keyboards/work_louder/work_board/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/*
- * 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 \
-    { F0, F1, F4, F5 }
-#define MATRIX_COL_PINS \
-    { D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, E6 }
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION        COL2ROW
 #define USB_MAX_POWER_CONSUMPTION 100
 #define RGBLIGHT_DI_PIN        D2
diff --git a/keyboards/work_louder/work_board/info.json b/keyboards/work_louder/work_board/info.json
index 5e934e90e0..6826f123a9 100644
--- a/keyboards/work_louder/work_board/info.json
+++ b/keyboards/work_louder/work_board/info.json
@@ -7,6 +7,11 @@
      "vid": "0x574C",
      "pid": "0xDCD1"
    },
+    "matrix_pins": {
+      "cols": ["D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "E6"],
+      "rows": ["F0", "F1", "F4", "F5"]
+    },
+    "diode_direction": "COL2ROW",
    "encoder": {
      "rotary": [
        {"pin_a": "B0", "pin_b": "B1"}
diff --git a/keyboards/wren/config.h b/keyboards/wren/config.h
index 72e110cc6b..bd4af23167 100644
--- a/keyboards/wren/config.h
+++ b/keyboards/wren/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/*
- * 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 { D3, D2, C6, D4, B5 }
-#define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5, F4, D7, F0 }
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 #define USE_I2C
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/wren/info.json b/keyboards/wren/info.json
index 184ddea75b..06fa7ddf10 100644
--- a/keyboards/wren/info.json
+++ b/keyboards/wren/info.json
@@ -7,6 +7,11 @@
        "pid": "0x0000",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4", "D7", "F0"],
+        "rows": ["D3", "D2", "C6", "D4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
    "encoder": {
        "rotary": [
            {"pin_a": "E6", "pin_b": "B4"}
diff --git a/keyboards/wsk/alpha9/config.h b/keyboards/wsk/alpha9/config.h
index 19943cdb98..9796f37b97 100644
--- a/keyboards/wsk/alpha9/config.h
+++ b/keyboards/wsk/alpha9/config.h
@@ -16,14 +16,6 @@
 #pragma once
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D4, B4, B5 }
-#define MATRIX_COL_PINS { D7, E6, C6, B6, B2, B3, B1, F7, F6, F5, D1, D0, D2 }
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/wsk/alpha9/info.json b/keyboards/wsk/alpha9/info.json
index 65d1bec3f7..bb5415b022 100644
--- a/keyboards/wsk/alpha9/info.json
+++ b/keyboards/wsk/alpha9/info.json
@@ -8,6 +8,11 @@
    "pid": "0x692A",
    "device_version": "0.0.1"
  },
+  "matrix_pins": {
+    "cols": ["D7", "E6", "C6", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "D1", "D0", "D2"],
+    "rows": ["D4", "B4", "B5"]
+  },
+  "diode_direction": "COL2ROW",
  "indicators": {
    "caps_lock": "D3",
    "on_state": 0
diff --git a/keyboards/wsk/g4m3ralpha/config.h b/keyboards/wsk/g4m3ralpha/config.h
index fb101db58f..98d3d12d3d 100644
--- a/keyboards/wsk/g4m3ralpha/config.h
+++ b/keyboards/wsk/g4m3ralpha/config.h
@@ -16,14 +16,6 @@
 #pragma once
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D4, B4, B5, D1 }
-#define MATRIX_COL_PINS { D7, E6, C6, B6, B2, B3, B1, F7, F6, F5 }
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/wsk/g4m3ralpha/info.json b/keyboards/wsk/g4m3ralpha/info.json
index a55225c0bc..37672ede0a 100644
--- a/keyboards/wsk/g4m3ralpha/info.json
+++ b/keyboards/wsk/g4m3ralpha/info.json
@@ -8,6 +8,11 @@
    "pid": "0x56D9",
    "device_version": "0.0.1"
  },
+  "matrix_pins": {
+    "cols": ["D7", "E6", "C6", "B6", "B2", "B3", "B1", "F7", "F6", "F5"],
+    "rows": ["D4", "B4", "B5", "D1"]
+  },
+  "diode_direction": "COL2ROW",
  "processor": "atmega32u4",
  "bootloader": "caterina",
  "layouts": {
diff --git a/keyboards/wsk/gothic50/config.h b/keyboards/wsk/gothic50/config.h
index da5729ed4f..b893b35e69 100644
--- a/keyboards/wsk/gothic50/config.h
+++ b/keyboards/wsk/gothic50/config.h
@@ -1,15 +1,5 @@
 #pragma once
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B5, B4, D7, D6 }
-#define MATRIX_COL_PINS { E6, F0, F1, C7, C6, B6, D4, D5, D3, D2, D1, D0, B7, B0 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
 #define RGB_DI_PIN F7
 #ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/wsk/gothic50/info.json b/keyboards/wsk/gothic50/info.json
index bce25f3934..f773ebf193 100644
--- a/keyboards/wsk/gothic50/info.json
+++ b/keyboards/wsk/gothic50/info.json
@@ -8,6 +8,11 @@
        "pid": "0x04EF",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["E6", "F0", "F1", "C7", "C6", "B6", "D4", "D5", "D3", "D2", "D1", "D0", "B7", "B0"],
+        "rows": ["B5", "B4", "D7", "D6"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/wsk/gothic70/config.h b/keyboards/wsk/gothic70/config.h
index 8cfb2dcab9..de29eadb14 100644
--- a/keyboards/wsk/gothic70/config.h
+++ b/keyboards/wsk/gothic70/config.h
@@ -1,14 +1,5 @@
 #pragma once
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
-#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B0, B7, B5, B4, D7, D6, B3 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
 #define RGB_DI_PIN F4
 #ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/wsk/gothic70/info.json b/keyboards/wsk/gothic70/info.json
index f7baad64c1..0fd4a6018d 100644
--- a/keyboards/wsk/gothic70/info.json
+++ b/keyboards/wsk/gothic70/info.json
@@ -8,6 +8,11 @@
        "pid": "0x63CC",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B0", "B7", "B5", "B4", "D7", "D6", "B3"],
+        "rows": ["D0", "D1", "D2", "D3", "D5"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/wsk/houndstooth/config.h b/keyboards/wsk/houndstooth/config.h
index b9cc1722c3..08f6b873c5 100644
--- a/keyboards/wsk/houndstooth/config.h
+++ b/keyboards/wsk/houndstooth/config.h
@@ -1,13 +1,5 @@
 #pragma once
-/* key matrix pins */
-#define MATRIX_ROW_PINS { C6, F7, D7, B1, B4, B2, B5, B6 }
-#define MATRIX_COL_PINS { D1, F4, D0, F5, D4, F6 }
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/wsk/houndstooth/info.json b/keyboards/wsk/houndstooth/info.json
index 490088543c..e383e46b3c 100644
--- a/keyboards/wsk/houndstooth/info.json
+++ b/keyboards/wsk/houndstooth/info.json
@@ -8,6 +8,11 @@
        "pid": "0xFA9C",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["D1", "F4", "D0", "F5", "D4", "F6"],
+        "rows": ["C6", "F7", "D7", "B1", "B4", "B2", "B5", "B6"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "caterina",
    "layouts": {
diff --git a/keyboards/wsk/jerkin/config.h b/keyboards/wsk/jerkin/config.h
index dcecb58d15..68d4a8fef7 100644
--- a/keyboards/wsk/jerkin/config.h
+++ b/keyboards/wsk/jerkin/config.h
@@ -1,13 +1,5 @@
 #pragma once
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B3, B4, B5 }
-#define MATRIX_COL_PINS { D3, D2, D1, D0, D4, C6, B1, F7, F6, F5, F4, E6, D7 }
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/wsk/jerkin/info.json b/keyboards/wsk/jerkin/info.json
index bc273e6c5e..19099a4f56 100644
--- a/keyboards/wsk/jerkin/info.json
+++ b/keyboards/wsk/jerkin/info.json
@@ -8,6 +8,11 @@
        "pid": "0x79AE",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "B1", "F7", "F6", "F5", "F4", "E6", "D7"],
+        "rows": ["B3", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "caterina",
    "layouts": {
diff --git a/keyboards/wsk/kodachi50/config.h b/keyboards/wsk/kodachi50/config.h
index 8f965e4b09..eecc8ba082 100644
--- a/keyboards/wsk/kodachi50/config.h
+++ b/keyboards/wsk/kodachi50/config.h
@@ -1,13 +1,5 @@
 #pragma once
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D2, B5, B6, B2, B3, B1, F7, F6 }
-#define MATRIX_COL_PINS { D1, D0, D4, C6, D7, E6, B4 }
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/wsk/kodachi50/info.json b/keyboards/wsk/kodachi50/info.json
index 713c1f064f..29f17cc225 100644
--- a/keyboards/wsk/kodachi50/info.json
+++ b/keyboards/wsk/kodachi50/info.json
@@ -8,6 +8,11 @@
        "pid": "0x72D4",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["D1", "D0", "D4", "C6", "D7", "E6", "B4"],
+        "rows": ["D2", "B5", "B6", "B2", "B3", "B1", "F7", "F6"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "caterina",
    "layouts": {
diff --git a/keyboards/wsk/pain27/config.h b/keyboards/wsk/pain27/config.h
index 593192dfb5..5ddf06145f 100644
--- a/keyboards/wsk/pain27/config.h
+++ b/keyboards/wsk/pain27/config.h
@@ -1,13 +1,5 @@
 #pragma once
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F4, F5, D0 }
-#define MATRIX_COL_PINS { D2, B3, F6, B1, B2, B6, D4, C6, D7, E6 }
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/wsk/pain27/info.json b/keyboards/wsk/pain27/info.json
index ee3d584873..021d5ac573 100644
--- a/keyboards/wsk/pain27/info.json
+++ b/keyboards/wsk/pain27/info.json
@@ -8,6 +8,11 @@
        "pid": "0x9E8C",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["D2", "B3", "F6", "B1", "B2", "B6", "D4", "C6", "D7", "E6"],
+        "rows": ["F4", "F5", "D0"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "caterina",
    "layouts": {
diff --git a/keyboards/wsk/sl40/config.h b/keyboards/wsk/sl40/config.h
index 2dca1b6d6d..ed32129b59 100644
--- a/keyboards/wsk/sl40/config.h
+++ b/keyboards/wsk/sl40/config.h
@@ -16,14 +16,6 @@
 #pragma once
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F4, F5, D2, D0 }
-#define MATRIX_COL_PINS { D3, D1, F6, F7, B6, B2, B3, B1, D4, C6, D7, E6, B4, B5 }
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/wsk/sl40/info.json b/keyboards/wsk/sl40/info.json
index f9f700e42c..713987382f 100644
--- a/keyboards/wsk/sl40/info.json
+++ b/keyboards/wsk/sl40/info.json
@@ -8,6 +8,11 @@
        "pid": "0xC456",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["D3", "D1", "F6", "F7", "B6", "B2", "B3", "B1", "D4", "C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F4", "F5", "D2", "D0"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "caterina",
    "layouts": {
diff --git a/keyboards/wsk/tkl30/config.h b/keyboards/wsk/tkl30/config.h
index 8b12e346b6..4cb0e034be 100644
--- a/keyboards/wsk/tkl30/config.h
+++ b/keyboards/wsk/tkl30/config.h
@@ -1,13 +1,5 @@
 #pragma once
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D2, B5, F4 }
-#define MATRIX_COL_PINS { D3, D1, D0, D4, F7, C6, B1, D7, B3, E6, B2, B4, B6, F6, E5 }
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/wsk/tkl30/info.json b/keyboards/wsk/tkl30/info.json
index b210528ba0..f3f57e50b5 100644
--- a/keyboards/wsk/tkl30/info.json
+++ b/keyboards/wsk/tkl30/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0B7F",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["D3", "D1", "D0", "D4", "F7", "C6", "B1", "D7", "B3", "E6", "B2", "B4", "B6", "F6", "E5"],
+        "rows": ["D2", "B5", "F4"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "caterina",
    "layouts": {
diff --git a/keyboards/wuque/ikki68/config.h b/keyboards/wuque/ikki68/config.h
index 45f7843698..53b2870640 100644
--- a/keyboards/wuque/ikki68/config.h
+++ b/keyboards/wuque/ikki68/config.h
@@ -17,12 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, E6 }
-#define MATRIX_COL_PINS { D1, D0, D2, D3, D5, D4, D6, D7, B4, B5, F0, F1, B6, F4, F5, F6,F7 }
-#define DIODE_DIRECTION COL2ROW
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/wuque/ikki68/info.json b/keyboards/wuque/ikki68/info.json
index 4cdf46a99a..fd1cb7f9ba 100644
--- a/keyboards/wuque/ikki68/info.json
+++ b/keyboards/wuque/ikki68/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0003",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["D1", "D0", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "F0", "F1", "B6", "F4", "F5", "F6", "F7"],
+        "rows": ["B0", "B1", "B2", "B3", "E6"]
+    },
+    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "community_layouts": ["68_ansi"],
diff --git a/keyboards/wuque/ikki68_aurora/config.h b/keyboards/wuque/ikki68_aurora/config.h
index 85a6ecf974..496e22c07a 100644
--- a/keyboards/wuque/ikki68_aurora/config.h
+++ b/keyboards/wuque/ikki68_aurora/config.h
@@ -17,12 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-#define MATRIX_ROW_PINS { B7, B3, B2, B1, B0 }
-#define MATRIX_COL_PINS { D5, D3, D2, D1, D0, F0, F1, E6, B5, B4, D7, D6, D4, F4, F5, F6 }
-#define DIODE_DIRECTION COL2ROW
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/wuque/ikki68_aurora/info.json b/keyboards/wuque/ikki68_aurora/info.json
index bf47f85a75..d9157dc5d6 100644
--- a/keyboards/wuque/ikki68_aurora/info.json
+++ b/keyboards/wuque/ikki68_aurora/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0011",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["D5", "D3", "D2", "D1", "D0", "F0", "F1", "E6", "B5", "B4", "D7", "D6", "D4", "F4", "F5", "F6"],
+        "rows": ["B7", "B3", "B2", "B1", "B0"]
+    },
+    "diode_direction": "COL2ROW",
    "indicators": {
        "caps_lock": "F7",
        "on_state": 0
diff --git a/keyboards/wuque/mammoth20x/config.h b/keyboards/wuque/mammoth20x/config.h
index 8d9a74f5aa..c35fac65d6 100644
--- a/keyboards/wuque/mammoth20x/config.h
+++ b/keyboards/wuque/mammoth20x/config.h
@@ -17,12 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-#define MATRIX_ROW_PINS { D5, F0, F1, F4, F5, F6 }
-#define MATRIX_COL_PINS { B0, B1, E6, F7 }
-#define DIODE_DIRECTION COL2ROW
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/wuque/mammoth20x/info.json b/keyboards/wuque/mammoth20x/info.json
index b251951bec..e348f8af5a 100644
--- a/keyboards/wuque/mammoth20x/info.json
+++ b/keyboards/wuque/mammoth20x/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0005",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["B0", "B1", "E6", "F7"],
+        "rows": ["D5", "F0", "F1", "F4", "F5", "F6"]
+    },
+    "diode_direction": "COL2ROW",
    "encoder": {
        "rotary": [
            {"pin_a": "D3", "pin_b": "D2", "resolution": 2}
diff --git a/keyboards/wuque/mammoth75x/config.h b/keyboards/wuque/mammoth75x/config.h
index 55702e3352..6b0d17be5c 100644
--- a/keyboards/wuque/mammoth75x/config.h
+++ b/keyboards/wuque/mammoth75x/config.h
@@ -17,12 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-#define MATRIX_ROW_PINS { B0, C7, D2, F7, D1, D0 }
-#define MATRIX_COL_PINS { D3, D5, D4, D6, D7, B4, B5, E6, F0, F1, F4, F5, F6, C6, B7, B3 }
-#define DIODE_DIRECTION COL2ROW
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/wuque/mammoth75x/info.json b/keyboards/wuque/mammoth75x/info.json
index b668948f46..bacdeef0e4 100644
--- a/keyboards/wuque/mammoth75x/info.json
+++ b/keyboards/wuque/mammoth75x/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0004",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["D3", "D5", "D4", "D6", "D7", "B4", "B5", "E6", "F0", "F1", "F4", "F5", "F6", "C6", "B7", "B3"],
+        "rows": ["B0", "C7", "D2", "F7", "D1", "D0"]
+    },
+    "diode_direction": "COL2ROW",
    "encoder": {
        "rotary": [
            {"pin_a": "B2", "pin_b": "B1", "resolution": 2}
diff --git a/keyboards/wuque/promise87/ansi/config.h b/keyboards/wuque/promise87/ansi/config.h
index e609117661..814dbd2d02 100644
--- a/keyboards/wuque/promise87/ansi/config.h
+++ b/keyboards/wuque/promise87/ansi/config.h
@@ -16,12 +16,6 @@
 #pragma once
-#define MATRIX_ROW_PINS { B3, B7, B2, F0, D3, D0 }
-#define MATRIX_COL_PINS { D6, D7, D1, D5, F7, D4, F5, F4, F1, C7, C6, B6, B5, B4, E6, B1, B0 }
-#define DIODE_DIRECTION COL2ROW
 #define RGB_DI_PIN D2
 #ifdef RGB_DI_PIN
    #define RGBLED_NUM 1
diff --git a/keyboards/wuque/promise87/ansi/info.json b/keyboards/wuque/promise87/ansi/info.json
index 0a0fefabd0..d6cfb88bb2 100644
--- a/keyboards/wuque/promise87/ansi/info.json
+++ b/keyboards/wuque/promise87/ansi/info.json
@@ -8,6 +8,11 @@
    "pid": "0x0005",
    "device_version": "0.0.1"
  },
+  "matrix_pins": {
+    "cols": ["D6", "D7", "D1", "D5", "F7", "D4", "F5", "F4", "F1", "C7", "C6", "B6", "B5", "B4", "E6", "B1", "B0"],
+    "rows": ["B3", "B7", "B2", "F0", "D3", "D0"]
+  },
+  "diode_direction": "COL2ROW",
  "indicators": {
    "caps_lock": "F6",
    "on_state": 0
diff --git a/keyboards/wuque/promise87/wkl/config.h b/keyboards/wuque/promise87/wkl/config.h
index e609117661..814dbd2d02 100644
--- a/keyboards/wuque/promise87/wkl/config.h
+++ b/keyboards/wuque/promise87/wkl/config.h
@@ -16,12 +16,6 @@
 #pragma once
-#define MATRIX_ROW_PINS { B3, B7, B2, F0, D3, D0 }
-#define MATRIX_COL_PINS { D6, D7, D1, D5, F7, D4, F5, F4, F1, C7, C6, B6, B5, B4, E6, B1, B0 }
-#define DIODE_DIRECTION COL2ROW
 #define RGB_DI_PIN D2
 #ifdef RGB_DI_PIN
    #define RGBLED_NUM 1
diff --git a/keyboards/wuque/promise87/wkl/info.json b/keyboards/wuque/promise87/wkl/info.json
index eca78d19b5..1b8876686b 100644
--- a/keyboards/wuque/promise87/wkl/info.json
+++ b/keyboards/wuque/promise87/wkl/info.json
@@ -8,6 +8,11 @@
    "pid": "0x0006",
    "device_version": "0.0.1"
  },
+  "matrix_pins": {
+    "cols": ["D6", "D7", "D1", "D5", "F7", "D4", "F5", "F4", "F1", "C7", "C6", "B6", "B5", "B4", "E6", "B1", "B0"],
+    "rows": ["B3", "B7", "B2", "F0", "D3", "D0"]
+  },
+  "diode_direction": "COL2ROW",
  "indicators": {
    "caps_lock": "F6",
    "on_state": 0
diff --git a/keyboards/wuque/serneity65/config.h b/keyboards/wuque/serneity65/config.h
index 036181772b..134605fcab 100644
--- a/keyboards/wuque/serneity65/config.h
+++ b/keyboards/wuque/serneity65/config.h
@@ -16,12 +16,6 @@
 #pragma once
-#define MATRIX_ROW_PINS { B0, F0, B1, D2, D3 }
-#define MATRIX_COL_PINS { B6, B5, D5, D4, D6, B4, D7, F1, F4, F5, F6, F7, C7, E6, B7 }
-#define DIODE_DIRECTION COL2ROW
 // Note:  array is { col, row )
 #define ENCODERS_CW_KEY  { { 3, 4 } }
 #define ENCODERS_CCW_KEY { { 5, 4 } }
diff --git a/keyboards/wuque/serneity65/info.json b/keyboards/wuque/serneity65/info.json
index 744b112f70..4d295b0f75 100644
--- a/keyboards/wuque/serneity65/info.json
+++ b/keyboards/wuque/serneity65/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0003",
        "device_version": "0.0.1"
    },
+    "matrix_pins": {
+        "cols": ["B6", "B5", "D5", "D4", "D6", "B4", "D7", "F1", "F4", "F5", "F6", "F7", "C7", "E6", "B7"],
+        "rows": ["B0", "F0", "B1", "D2", "D3"]
+    },
+    "diode_direction": "COL2ROW",
    "encoder": {
        "rotary": [
            {"pin_a": "B2", "pin_b": "B3"}
diff --git a/keyboards/wuque/tata80/wk/config.h b/keyboards/wuque/tata80/wk/config.h
index c4890ec9b1..bbde3a6157 100644
--- a/keyboards/wuque/tata80/wk/config.h
+++ b/keyboards/wuque/tata80/wk/config.h
@@ -15,14 +15,6 @@
 */
 #pragma once
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6, F7 }
-#define MATRIX_COL_PINS { C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0, B7, B3, B2, B1, B0 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
 /* 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/wuque/tata80/wk/info.json b/keyboards/wuque/tata80/wk/info.json
index f1b5acf12d..23146206c4 100644
--- a/keyboards/wuque/tata80/wk/info.json
+++ b/keyboards/wuque/tata80/wk/info.json
@@ -8,6 +8,11 @@
    "pid": "0x0168",
    "device_version": "0.0.1"
  },
+  "matrix_pins": {
+    "cols": ["C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0", "B7", "B3", "B2", "B1", "B0"],
+    "rows": ["F0", "F1", "F4", "F5", "F6", "F7"]
+  },
+  "diode_direction": "COL2ROW",
  "processor": "atmega32u4",
  "bootloader": "atmel-dfu",
  "indicators": {
diff --git a/keyboards/wuque/tata80/wkl/config.h b/keyboards/wuque/tata80/wkl/config.h
index c4890ec9b1..bbde3a6157 100644
--- a/keyboards/wuque/tata80/wkl/config.h
+++ b/keyboards/wuque/tata80/wkl/config.h
@@ -15,14 +15,6 @@
 */
 #pragma once
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6, F7 }
-#define MATRIX_COL_PINS { C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0, B7, B3, B2, B1, B0 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
 /* 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/wuque/tata80/wkl/info.json b/keyboards/wuque/tata80/wkl/info.json
index c23c8dd856..47089bf7a1 100644
--- a/keyboards/wuque/tata80/wkl/info.json
+++ b/keyboards/wuque/tata80/wkl/info.json
@@ -8,6 +8,11 @@
    "pid": "0x0169",
    "device_version": "0.0.1"
  },
+  "matrix_pins": {
+    "cols": ["C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0", "B7", "B3", "B2", "B1", "B0"],
+    "rows": ["F0", "F1", "F4", "F5", "F6", "F7"]
+  },
+  "diode_direction": "COL2ROW",
  "processor": "atmega32u4",
  "bootloader": "atmel-dfu",
  "indicators": {