12 files changed, 19 insertions, 13 deletions
diff --git a/keyboards/rgbkb/mun/config.h b/keyboards/rgbkb/mun/config.h
index 5b411a8c52..8e84cca0f7 100644
--- a/keyboards/rgbkb/mun/config.h
+++ b/keyboards/rgbkb/mun/config.h
@@ -49,8 +49,6 @@
 #define SPLIT_TRANSACTION_IDS_KB TOUCH_ENCODER_SYNC, RGB_MENU_SYNC
 
 /* RGB LED Configuration */
-#define RGBLED_NUM 98
-#define RGBLED_SPLIT { 49, 49 }
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/rgbkb/mun/rev1/info.json b/keyboards/rgbkb/mun/rev1/info.json
index 36b1ab0003..865ff816e5 100644
--- a/keyboards/rgbkb/mun/rev1/info.json
+++ b/keyboards/rgbkb/mun/rev1/info.json
@@ -8,6 +8,10 @@
         "pid": "0x3505",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "led_count": 98,
+        "split_count": [49, 49]
+    },
     "ws2812": {
         "pin": "B5",
         "driver": "pwm"
diff --git a/keyboards/rgbkb/pan/config.h b/keyboards/rgbkb/pan/config.h
index b89b6b4f65..242e397db4 100644
--- a/keyboards/rgbkb/pan/config.h
+++ b/keyboards/rgbkb/pan/config.h
@@ -16,7 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGBLED_NUM 64
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -27,7 +26,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#define RGB_MATRIX_LED_COUNT RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT 64
 
 // RGB Matrix Animation modes. Explicitly enabled
 // For full list of effects, see:
diff --git a/keyboards/rgbkb/pan/info.json b/keyboards/rgbkb/pan/info.json
index 5c3ed6f610..1f408bd713 100644
--- a/keyboards/rgbkb/pan/info.json
+++ b/keyboards/rgbkb/pan/info.json
@@ -12,6 +12,7 @@
         "driver": "custom"
     },
     "rgblight": {
+        "led_count": 64,
         "max_brightness": 120
     },
     "layouts": {
diff --git a/keyboards/rgbkb/sol3/config.h b/keyboards/rgbkb/sol3/config.h
index 1b8fa2314f..14dc56b121 100644
--- a/keyboards/rgbkb/sol3/config.h
+++ b/keyboards/rgbkb/sol3/config.h
@@ -52,10 +52,6 @@
 #define DIP_SWITCH_PINS { A14, B13 }
 #define DIP_SWITCH_PINS_RIGHT { A14, B0 }
 
-/* RGB LED Configuration */
-#define RGBLED_NUM 156
-#define RGBLED_SPLIT { 78, 78 }
-
 // RGB Lighting Animation modes. Explicitly enabled
 // For full list of effects, see:
 // https://docs.qmk.fm/#/feature_rgblight?id=effect-and-animation-toggles
diff --git a/keyboards/rgbkb/sol3/rev1/info.json b/keyboards/rgbkb/sol3/rev1/info.json
index 74af9d21fa..6db25dab19 100644
--- a/keyboards/rgbkb/sol3/rev1/info.json
+++ b/keyboards/rgbkb/sol3/rev1/info.json
@@ -8,6 +8,10 @@
         "pid": "0x3510",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "led_count": 156,
+        "split_count": [78, 78]
+    },
     "ws2812": {
         "pin": "B5",
         "driver": "pwm"
diff --git a/keyboards/rgbkb/zen/rev1/config.h b/keyboards/rgbkb/zen/rev1/config.h
index 88951a1b44..1578432cf8 100644
--- a/keyboards/rgbkb/zen/rev1/config.h
+++ b/keyboards/rgbkb/zen/rev1/config.h
@@ -22,8 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGBLED_NUM 16    // Number of LEDs
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/rgbkb/zen/rev1/info.json b/keyboards/rgbkb/zen/rev1/info.json
index 940df081c9..81370b916d 100644
--- a/keyboards/rgbkb/zen/rev1/info.json
+++ b/keyboards/rgbkb/zen/rev1/info.json
@@ -16,6 +16,9 @@
   "split": {
     "soft_serial_pin": "D0"
   },
+  "rgblight": {
+    "led_count": 16
+  },
   "ws2812": {
     "pin": "D1"
   },
diff --git a/keyboards/rgbkb/zen/rev2/config.h b/keyboards/rgbkb/zen/rev2/config.h
index 394fd1630b..6f706c197b 100644
--- a/keyboards/rgbkb/zen/rev2/config.h
+++ b/keyboards/rgbkb/zen/rev2/config.h
@@ -22,8 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* ws2812 RGB LED */
-#define RGBLED_NUM 34    // Number of LEDs
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/rgbkb/zen/rev2/info.json b/keyboards/rgbkb/zen/rev2/info.json
index eed39e5628..c2c4e52ec6 100644
--- a/keyboards/rgbkb/zen/rev2/info.json
+++ b/keyboards/rgbkb/zen/rev2/info.json
@@ -21,6 +21,9 @@
     "split": {
       "soft_serial_pin": "D3"
     },
+    "rgblight": {
+      "led_count": 34
+    },
     "ws2812": {
       "pin": "B6"
     },
diff --git a/keyboards/rgbkb/zygomorph/rev1/config.h b/keyboards/rgbkb/zygomorph/rev1/config.h
index 022e361de1..a7d023893e 100644
--- a/keyboards/rgbkb/zygomorph/rev1/config.h
+++ b/keyboards/rgbkb/zygomorph/rev1/config.h
@@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     #define RGBLED_NUM 30
 #else
     #define RGBLED_NUM 60
-    #define RGBLED_SPLIT { 30, 30 }
 #endif
 
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/rgbkb/zygomorph/rev1/info.json b/keyboards/rgbkb/zygomorph/rev1/info.json
index 4be3dd61d3..893e5ff589 100644
--- a/keyboards/rgbkb/zygomorph/rev1/info.json
+++ b/keyboards/rgbkb/zygomorph/rev1/info.json
@@ -24,6 +24,9 @@
     "split": {
       "soft_serial_pin": "D3"
     },
+    "rgblight": {
+      "split_count": [30, 30]
+    },
     "ws2812": {
       "pin": "B7"
     },