5 files changed, 16 insertions, 22 deletions
diff --git a/keyboards/rgbkb/zen/rev1/config.h b/keyboards/rgbkb/zen/rev1/config.h
index 327fe840c3..88951a1b44 100644
--- a/keyboards/rgbkb/zen/rev1/config.h
+++ b/keyboards/rgbkb/zen/rev1/config.h
@@ -17,22 +17,11 @@ 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 { B2, B3, B1, F7, F6, D4, 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 */
 #define LOCKING_RESYNC_ENABLE
 
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D1
-
 #define RGBLED_NUM 16    // Number of LEDs
 
 /*
diff --git a/keyboards/rgbkb/zen/rev1/info.json b/keyboards/rgbkb/zen/rev1/info.json
index 33b8334958..013b56764f 100644
--- a/keyboards/rgbkb/zen/rev1/info.json
+++ b/keyboards/rgbkb/zen/rev1/info.json
@@ -8,9 +8,17 @@
     "pid": "0x3060",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["B2", "B3", "B1", "F7", "F6", "D4", "B6"],
+    "rows": ["C6", "D7", "E6", "B4", "B5"]
+  },
+  "diode_direction": "COL2ROW",
   "split": {
     "soft_serial_pin": "D0"
   },
+  "ws2812": {
+    "pin": "D1"
+  },
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "layouts": {
diff --git a/keyboards/rgbkb/zen/rev1/rev1.c b/keyboards/rgbkb/zen/rev1/rev1.c
deleted file mode 100644
index 520a869e57..0000000000
--- a/keyboards/rgbkb/zen/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "rev1.h"
diff --git a/keyboards/rgbkb/zen/rev2/config.h b/keyboards/rgbkb/zen/rev2/config.h
index 85b6a68b79..394fd1630b 100644
--- a/keyboards/rgbkb/zen/rev2/config.h
+++ b/keyboards/rgbkb/zen/rev2/config.h
@@ -17,16 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// Proton-C does pin conversion
-#define MATRIX_ROW_PINS { C6, E6, B5, D7, B4 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B3, B1, B2 }
-
-#define RGB_DI_PIN         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/rgbkb/zen/rev2/info.json b/keyboards/rgbkb/zen/rev2/info.json
index cc25a74b73..ef91fd30d1 100644
--- a/keyboards/rgbkb/zen/rev2/info.json
+++ b/keyboards/rgbkb/zen/rev2/info.json
@@ -8,6 +8,11 @@
       "pid": "0x3061",
       "device_version": "0.0.2"
     },
+    "matrix_pins": {
+      "cols": ["F4", "F5", "F6", "F7", "B3", "B1", "B2"],
+      "rows": ["C6", "E6", "B5", "D7", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
       "rotary": [
         {"pin_a": "D4", "pin_b": "D2"}
@@ -16,6 +21,9 @@
     "split": {
       "soft_serial_pin": "D3"
     },
+    "ws2812": {
+      "pin": "B6"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {