14 files changed, 24 insertions, 10 deletions
diff --git a/keyboards/boardsource/beiwagon/config.h b/keyboards/boardsource/beiwagon/config.h
index 587dda7381..75b5888bc3 100644
--- a/keyboards/boardsource/beiwagon/config.h
+++ b/keyboards/boardsource/beiwagon/config.h
@@ -16,7 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #pragma once
-#define RGB_DI_PIN C6
 #define RGB_MATRIX_LED_COUNT 18
 #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
 #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
diff --git a/keyboards/boardsource/beiwagon/info.json b/keyboards/boardsource/beiwagon/info.json
index 69ce8d96f1..dc5f8cc20f 100644
--- a/keyboards/boardsource/beiwagon/info.json
+++ b/keyboards/boardsource/beiwagon/info.json
@@ -10,6 +10,9 @@
     "mousekey": false,
     "rgb_matrix": true
   },
+  "ws2812": {
+    "pin": "C6"
+  },
   "matrix_pins": {
     "cols": ["B5", "B6", "B7"],
     "rows": ["B0", "B1", "B2", "B3"]
diff --git a/keyboards/boardsource/holiday/spooky/info.json b/keyboards/boardsource/holiday/spooky/info.json
index 393b4fd806..359b95c699 100644
--- a/keyboards/boardsource/holiday/spooky/info.json
+++ b/keyboards/boardsource/holiday/spooky/info.json
@@ -22,7 +22,6 @@
   },
   "rgblight": {
     "led_count": 5,
-    "pin": "D3",
     "sleep": true,
     "animations": {
       "alternating": true,
@@ -37,6 +36,9 @@
       "twinkle": true
     }
   },
+  "ws2812": {
+    "pin": "D3"
+  },
   "community_layouts": [
     "ortho_2x3"
   ],
diff --git a/keyboards/boardsource/lulu/avr/info.json b/keyboards/boardsource/lulu/avr/info.json
index 2c9155f6ad..53e8f31056 100644
--- a/keyboards/boardsource/lulu/avr/info.json
+++ b/keyboards/boardsource/lulu/avr/info.json
@@ -10,7 +10,7 @@
   "split": {
     "soft_serial_pin": "D2"
   },
-  "rgblight": {
+  "ws2812": {
      "pin": "D3"
   },
   "encoder": {
diff --git a/keyboards/boardsource/lulu/rp2040/config.h b/keyboards/boardsource/lulu/rp2040/config.h
index 4f50a586df..2c86e48e6f 100644
--- a/keyboards/boardsource/lulu/rp2040/config.h
+++ b/keyboards/boardsource/lulu/rp2040/config.h
@@ -9,4 +9,3 @@
 #define I2C_DRIVER I2CD1
 #define I2C1_SDA_PIN GP22
 #define I2C1_SCL_PIN GP23
-#define RGB_DI_PIN GP29
diff --git a/keyboards/boardsource/lulu/rp2040/info.json b/keyboards/boardsource/lulu/rp2040/info.json
index eb9c31316d..eb57c593b4 100644
--- a/keyboards/boardsource/lulu/rp2040/info.json
+++ b/keyboards/boardsource/lulu/rp2040/info.json
@@ -11,6 +11,7 @@
     ]
   },
   "ws2812": {
+    "pin": "GP29",
     "driver": "vendor"
   }
 }
diff --git a/keyboards/boardsource/microdox/v1/info.json b/keyboards/boardsource/microdox/v1/info.json
index ba8307221a..6e47fbd2c4 100644
--- a/keyboards/boardsource/microdox/v1/info.json
+++ b/keyboards/boardsource/microdox/v1/info.json
@@ -13,7 +13,6 @@
     "soft_serial_pin": "D2"
   },
   "rgblight": {
-    "pin": "D3",
     "sleep": true,
     "led_count": 12,
     "split_count": [6, 6],
@@ -30,5 +29,8 @@
       "static_gradient": true,
       "twinkle": true
     }
-  }
+  },
+  "ws2812": {
+    "pin": "D3"
+  },
 }
diff --git a/keyboards/boardsource/microdox/v2/config.h b/keyboards/boardsource/microdox/v2/config.h
index 4846bf5146..236254317a 100644
--- a/keyboards/boardsource/microdox/v2/config.h
+++ b/keyboards/boardsource/microdox/v2/config.h
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
 
-#define RGB_DI_PIN B5
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
 #define RGB_MATRIX_LED_COUNT 44
 #define RGB_MATRIX_SPLIT { 22, 22 }
diff --git a/keyboards/boardsource/microdox/v2/info.json b/keyboards/boardsource/microdox/v2/info.json
index a53dfff708..9d7e25dee4 100644
--- a/keyboards/boardsource/microdox/v2/info.json
+++ b/keyboards/boardsource/microdox/v2/info.json
@@ -9,6 +9,9 @@
   "usb": {
     "device_version": "2.0.0"
   },
+  "ws2812": {
+    "pin": "B5"
+  },
   "encoder": {
     "enabled": true,
     "rotary": [
diff --git a/keyboards/boardsource/technik_o/config.h b/keyboards/boardsource/technik_o/config.h
index c6edbf1c4e..1148c13ebc 100644
--- a/keyboards/boardsource/technik_o/config.h
+++ b/keyboards/boardsource/technik_o/config.h
@@ -16,7 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #pragma once
-#define RGB_DI_PIN C6
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120
 #define RGB_MATRIX_LED_COUNT 58
 #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
diff --git a/keyboards/boardsource/technik_o/info.json b/keyboards/boardsource/technik_o/info.json
index d84a976e13..af8d16a020 100644
--- a/keyboards/boardsource/technik_o/info.json
+++ b/keyboards/boardsource/technik_o/info.json
@@ -11,6 +11,9 @@
     "nkro": true,
     "rgb_matrix": true
   },
+  "ws2812": {
+    "pin": "C6"
+  },
   "matrix_pins": {
     "cols": ["B5", "B6", "B7", "F5", "C7", "D0", "D1", "D2", "D3", "D4", "D5", "D6"],
     "rows": ["B0", "B1", "B2", "B3"]
diff --git a/keyboards/boardsource/technik_s/config.h b/keyboards/boardsource/technik_s/config.h
index ab4d79147c..fe6518356e 100644
--- a/keyboards/boardsource/technik_s/config.h
+++ b/keyboards/boardsource/technik_s/config.h
@@ -16,7 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #pragma once
-#define RGB_DI_PIN C6
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120
 #define RGB_MATRIX_LED_COUNT 55
 #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
diff --git a/keyboards/boardsource/technik_s/info.json b/keyboards/boardsource/technik_s/info.json
index 6593845e83..d55979b5c5 100644
--- a/keyboards/boardsource/technik_s/info.json
+++ b/keyboards/boardsource/technik_s/info.json
@@ -11,6 +11,9 @@
     "nkro": true,
     "rgb_matrix": true
   },
+  "ws2812": {
+    "pin": "C6"
+  },
   "matrix_pins": {
     "cols": ["B5", "B6", "B7", "F5", "C7", "D0", "D1", "D2", "D3", "D4", "D5", "D6"],
     "rows": ["B0", "B1", "B2", "B3"]
diff --git a/keyboards/boardsource/the_mark/info.json b/keyboards/boardsource/the_mark/info.json
index 46f10affcd..f0097f8141 100644
--- a/keyboards/boardsource/the_mark/info.json
+++ b/keyboards/boardsource/the_mark/info.json
@@ -24,7 +24,6 @@
   },
   "rgblight": {
     "led_count": 24,
-    "pin": "C6",
     "sleep": true,
     "max_brightness": 200,
     "animations": {
@@ -40,6 +39,9 @@
       "twinkle": true
     }
   },
+  "ws2812": {
+    "pin": "C6"
+  },
   "rgb_matrix": {
     "layout": [
       { "flags": 2, "x": 224, "y": 42},