6 files changed, 10 insertions, 10 deletions
diff --git a/keyboards/rgbkb/pan/config.h b/keyboards/rgbkb/pan/config.h
index 05d446d05d..f1b323bc17 100644
--- a/keyboards/rgbkb/pan/config.h
+++ b/keyboards/rgbkb/pan/config.h
@@ -29,9 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_TWINKLE
 #define RGB_MATRIX_LED_COUNT RGBLED_NUM
 
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define RGBLIGHT_LIMIT_VAL 120
 #define USB_MAX_POWER_CONSUMPTION 500
 
diff --git a/keyboards/rgbkb/pan/rev1/32a/config.h b/keyboards/rgbkb/pan/rev1/32a/config.h
index 5e7c4babbd..432288736d 100644
--- a/keyboards/rgbkb/pan/rev1/32a/config.h
+++ b/keyboards/rgbkb/pan/rev1/32a/config.h
@@ -16,7 +16,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_ROW_PINS { D7, D1, D5, D6, C2 }
-#define MATRIX_COL_PINS { C3, C4, C5, C6, C7, A7, A6, A5, A4, A3, A2, A1, A0 }
-
 #define RGB_DI_PIN B3
diff --git a/keyboards/rgbkb/pan/rev1/32a/info.json b/keyboards/rgbkb/pan/rev1/32a/info.json
index 1f7ece37eb..e6ebce6270 100644
--- a/keyboards/rgbkb/pan/rev1/32a/info.json
+++ b/keyboards/rgbkb/pan/rev1/32a/info.json
@@ -1,4 +1,9 @@
 {
+    "matrix_pins": {
+        "cols": ["C3", "C4", "C5", "C6", "C7", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0"],
+        "rows": ["D7", "D1", "D5", "D6", "C2"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32a",
     "bootloader": "usbasploader",
     "encoder": {
diff --git a/keyboards/rgbkb/pan/rev1/proton_c/config.h b/keyboards/rgbkb/pan/rev1/proton_c/config.h
index f25713b2be..0013f20e12 100644
--- a/keyboards/rgbkb/pan/rev1/proton_c/config.h
+++ b/keyboards/rgbkb/pan/rev1/proton_c/config.h
@@ -16,7 +16,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_ROW_PINS { A15, B10, A14, A13, A7 }
-#define MATRIX_COL_PINS { A8, A6, B0, B1, B2, B4, B5, A1, A2, B3, B9, A10, A9 }
-
 #define RGB_DI_PIN A3
diff --git a/keyboards/rgbkb/pan/rev1/proton_c/info.json b/keyboards/rgbkb/pan/rev1/proton_c/info.json
index 5fd7124b9c..0e04b61593 100644
--- a/keyboards/rgbkb/pan/rev1/proton_c/info.json
+++ b/keyboards/rgbkb/pan/rev1/proton_c/info.json
@@ -1,4 +1,9 @@
 {
+    "matrix_pins": {
+        "cols": ["A8", "A6", "B0", "B1", "B2", "B4", "B5", "A1", "A2", "B3", "B9", "A10", "A9"],
+        "rows": ["A15", "B10", "A14", "A13", "A7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F303",
     "bootloader": "stm32-dfu",
     "board": "QMK_PROTON_C",
diff --git a/keyboards/rgbkb/pan/rules.mk b/keyboards/rgbkb/pan/rules.mk
index 464dfecf6f..aecabfe157 100644
--- a/keyboards/rgbkb/pan/rules.mk
+++ b/keyboards/rgbkb/pan/rules.mk
@@ -10,7 +10,6 @@ NKRO_ENABLE = no            # Enable N-Key Rollover
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
 RGB_MATRIX_DRIVER = WS2812
-WS2812_DRIVER = bitbang
 ENCODER_ENABLE = yes
 OLED_ENABLE = yes
 OLED_DRIVER = SSD1306