4 files changed, 10 insertions, 7 deletions
diff --git a/keyboards/monstargear/xo87/rgb/config.h b/keyboards/monstargear/xo87/rgb/config.h
index d03610af38..4b4bad4056 100644
--- a/keyboards/monstargear/xo87/rgb/config.h
+++ b/keyboards/monstargear/xo87/rgb/config.h
@@ -16,9 +16,6 @@
 
 #pragma once
 
-#define MATRIX_ROW_PINS { E6,E7, E3, B0, B1 ,A2}
-#define MATRIX_COL_PINS { C5,C3,C1,E1,D6,D2,B7,B3,F6,F7,F3,A5,A1,E2,C7,A6 }
-#define DIODE_DIRECTION ROW2COL
 #define RGB_DI_PIN D7
 #define RGB_MATRIX_LED_COUNT 110
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
diff --git a/keyboards/monstargear/xo87/rgb/info.json b/keyboards/monstargear/xo87/rgb/info.json
index 8176bac03f..73723f3141 100644
--- a/keyboards/monstargear/xo87/rgb/info.json
+++ b/keyboards/monstargear/xo87/rgb/info.json
@@ -8,6 +8,11 @@
     "pid": "0x584F",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["C5", "C3", "C1", "E1", "D6", "D2", "B7", "B3", "F6", "F7", "F3", "A5", "A1", "E2", "C7", "A6"],
+    "rows": ["E6", "E7", "E3", "B0", "B1", "A2"]
+  },
+  "diode_direction": "ROW2COL",
   "processor": "at90usb646",
   "bootloader": "lufa-dfu",
   "community_layouts": ["tkl_ansi"],
diff --git a/keyboards/monstargear/xo87/solderable/config.h b/keyboards/monstargear/xo87/solderable/config.h
index 65c76647ab..347f14488f 100644
--- a/keyboards/monstargear/xo87/solderable/config.h
+++ b/keyboards/monstargear/xo87/solderable/config.h
@@ -19,15 +19,11 @@
 
 #define brightnessMax 8
 
-#define MATRIX_ROW_PINS { E6,E7,E3,B0,B1,A2}
-#define MATRIX_COL_PINS { C5,C3,C1,E1,D6,D2,B7,B3,F6,F7,F3,A5,A1,E2,C7,A6 }
-
 #define KEYLED_ROWS 6
 #define KEYLED_COLS 16
 #define KEYLED_ROW_PINS { E5,B4,B5,F0,C6,D5 }
 #define KEYLED_COL_PINS { C4,C2,C0,E0,D4,E4,B6,B2,F4,A0,F2,A4,F1,A7,D3,A3 }
 
-#define DIODE_DIRECTION ROW2COL
 #define RGB_DI_PIN D7
 #define RGB_MATRIX_LED_COUNT 21
 #define DRIVER_COUNT 2
diff --git a/keyboards/monstargear/xo87/solderable/info.json b/keyboards/monstargear/xo87/solderable/info.json
index f3a8ca1657..669c8c1592 100644
--- a/keyboards/monstargear/xo87/solderable/info.json
+++ b/keyboards/monstargear/xo87/solderable/info.json
@@ -8,6 +8,11 @@
         "pid": "0x5344",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C5", "C3", "C1", "E1", "D6", "D2", "B7", "B3", "F6", "F7", "F3", "A5", "A1", "E2", "C7", "A6"],
+        "rows": ["E6", "E7", "E3", "B0", "B1", "A2"]
+    },
+    "diode_direction": "ROW2COL",
     "backlight": {
         "driver": "custom",
         "pin": "F0"