Migrate `rgblight.pin` and `RGB_DI_PIN` to `ws2812.pin` (#20303)

152 files changed, 205 insertions, 113 deletions

diff --git a/keyboards/handwired/6macro/config.h b/keyboards/handwired/6macro/config.h
index e93fe5511f..abbe9f5c9d 100644
--- a/keyboards/handwired/6macro/config.h
+++ b/keyboards/handwired/6macro/config.h
@@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGB_DI_PIN D2
 #define RGBLED_NUM 10
 #define RGB_MATRIX_LED_COUNT RGBLED_NUM
 #define RGBLIGHT_HUE_STEP 10
diff --git a/keyboards/handwired/6macro/info.json b/keyboards/handwired/6macro/info.json
index 02111f4746..8c9b3e832f 100644
--- a/keyboards/handwired/6macro/info.json
+++ b/keyboards/handwired/6macro/info.json
@@ -8,6 +8,9 @@
       "pid": "0x0037",
       "device_version": "0.0.1"
     },
+    "ws2812": {
+      "pin": "D2"
+    },
     "matrix_pins": {
       "cols": ["B0", "B1", "B2"],
       "rows": ["B3", "B4"]
diff --git a/keyboards/handwired/alcor_dactyl/config.h b/keyboards/handwired/alcor_dactyl/config.h
index ddf705fc95..cf2dd7aa8c 100644
--- a/keyboards/handwired/alcor_dactyl/config.h
+++ b/keyboards/handwired/alcor_dactyl/config.h
@@ -25,7 +25,6 @@
 #define SERIAL_USART_FULL_DUPLEX
 #define SERIAL_USART_TX_PIN GP10
 #define SERIAL_USART_RX_PIN GP9
-#define RGB_DI_PIN GP16
 #define RGB_MATRIX_LED_COUNT 2
 #define RGB_MATRIX_SPLIT { 1, 1 }
 #define EE_HANDS
diff --git a/keyboards/handwired/alcor_dactyl/info.json b/keyboards/handwired/alcor_dactyl/info.json
index 005424dbda..b5a872bfca 100644
--- a/keyboards/handwired/alcor_dactyl/info.json
+++ b/keyboards/handwired/alcor_dactyl/info.json
@@ -34,6 +34,7 @@
         ]
     },
     "ws2812": {
+        "pin": "GP16",
         "driver": "vendor"
     },
     "layouts": {
diff --git a/keyboards/handwired/atreus50/config.h b/keyboards/handwired/atreus50/config.h
index 9876e14fd3..89532fd32b 100644
--- a/keyboards/handwired/atreus50/config.h
+++ b/keyboards/handwired/atreus50/config.h
@@ -23,7 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_RESYNC_ENABLE
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN C6
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/handwired/atreus50/info.json b/keyboards/handwired/atreus50/info.json
index 4b12ba33d4..70cb5aa1f2 100644
--- a/keyboards/handwired/atreus50/info.json
+++ b/keyboards/handwired/atreus50/info.json
@@ -8,6 +8,9 @@
     "pid": "0x040D",
     "device_version": "0.0.1"
   },
+  "ws2812": {
+    "pin": "C6"
+  },
   "matrix_pins": {
     "cols": ["D4", "D7", "E6", "B4", "B5", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
     "rows": ["D3", "D2", "D1", "D0"]
diff --git a/keyboards/handwired/bento/rev1/config.h b/keyboards/handwired/bento/rev1/config.h
index e23bcab286..2743c75877 100644
--- a/keyboards/handwired/bento/rev1/config.h
+++ b/keyboards/handwired/bento/rev1/config.h
@@ -16,7 +16,6 @@
 
 #pragma once
 
-#define RGB_DI_PIN D3
   #define RGBLED_NUM 4
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/handwired/bento/rev1/info.json b/keyboards/handwired/bento/rev1/info.json
index 5f7e673306..778a9a0412 100644
--- a/keyboards/handwired/bento/rev1/info.json
+++ b/keyboards/handwired/bento/rev1/info.json
@@ -8,6 +8,9 @@
     "pid": "0xDAD3",
     "device_version": "1.0.0"
   },
+  "ws2812": {
+    "pin": "D3"
+  },
   "encoder": {
     "rotary": [
       {"pin_a": "D1", "pin_b": "D0"}
diff --git a/keyboards/handwired/brain/config.h b/keyboards/handwired/brain/config.h
index 6ab3491141..7f7a49ed93 100644
--- a/keyboards/handwired/brain/config.h
+++ b/keyboards/handwired/brain/config.h
@@ -42,9 +42,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Enables This makes it easier for fast typists to use dual-function keys */
 #define PERMISSIVE_HOLD
 
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
-
 #define RGBLED_NUM 28  // Number of LEDs
 
 
diff --git a/keyboards/handwired/brain/info.json b/keyboards/handwired/brain/info.json
index aad4662d72..042d38046b 100644
--- a/keyboards/handwired/brain/info.json
+++ b/keyboards/handwired/brain/info.json
@@ -16,6 +16,9 @@
     "bootmagic": {
         "matrix": [0, 6]
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "split": {
         "soft_serial_pin": "D0",
         "bootmagic": {
diff --git a/keyboards/handwired/chiron/config.h b/keyboards/handwired/chiron/config.h
index 5a01accc73..677804cbe9 100644
--- a/keyboards/handwired/chiron/config.h
+++ b/keyboards/handwired/chiron/config.h
@@ -23,5 +23,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN D3
 #define RGBLED_NUM 4
diff --git a/keyboards/handwired/chiron/info.json b/keyboards/handwired/chiron/info.json
index e737e8428c..e5c076a77c 100644
--- a/keyboards/handwired/chiron/info.json
+++ b/keyboards/handwired/chiron/info.json
@@ -17,6 +17,9 @@
         "pin": "B6",
         "levels": 7
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "split": {
         "soft_serial_pin": "D0"
     },
diff --git a/keyboards/handwired/co60/rev7/config.h b/keyboards/handwired/co60/rev7/config.h
index d31fe37783..8cafa3c6f3 100644
--- a/keyboards/handwired/co60/rev7/config.h
+++ b/keyboards/handwired/co60/rev7/config.h
@@ -38,7 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_TWINKLE
 
 #define RGBLED_NUM 16
-#define RGB_DI_PIN A7
 #define RGB_MATRIX_LED_COUNT RGBLED_NUM
 
 #define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/handwired/co60/rev7/info.json b/keyboards/handwired/co60/rev7/info.json
index 0732acb438..3d520b5284 100644
--- a/keyboards/handwired/co60/rev7/info.json
+++ b/keyboards/handwired/co60/rev7/info.json
@@ -13,6 +13,7 @@
         "breathing": true
     },
     "ws2812": {
+        "pin": "A7",
         "driver": "spi"
     },
     "processor": "STM32F303",
diff --git a/keyboards/handwired/colorlice/config.h b/keyboards/handwired/colorlice/config.h
index 36417b4a7b..5c52df9ffa 100644
--- a/keyboards/handwired/colorlice/config.h
+++ b/keyboards/handwired/colorlice/config.h
@@ -23,7 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_RESYNC_ENABLE
 
 /* RGB LEDs */
-#define RGB_DI_PIN B1
 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
diff --git a/keyboards/handwired/colorlice/info.json b/keyboards/handwired/colorlice/info.json
index 29783d211c..11ac235065 100644
--- a/keyboards/handwired/colorlice/info.json
+++ b/keyboards/handwired/colorlice/info.json
@@ -8,6 +8,9 @@
       "pid": "0x0302",
       "device_version": "0.0.1"
     },
+    "ws2812": {
+      "pin": "B1"
+    },
     "matrix_pins": {
       "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "B6", "B5", "B4", "D7", "D6", "D4", "E6", "B0", "B3"],
       "rows": ["D0", "D1", "D2", "D3", "D5"]
diff --git a/keyboards/handwired/concertina/64key/config.h b/keyboards/handwired/concertina/64key/config.h
index 29473a1720..b315e309ae 100644
--- a/keyboards/handwired/concertina/64key/config.h
+++ b/keyboards/handwired/concertina/64key/config.h
@@ -17,7 +17,6 @@
 #pragma once
 
 /* LEDs are not used in the standard 64key configuration. */
-#define RGB_DI_PIN D3
 #define RGBLED_NUM 0
 
 #define PERMISSIVE_HOLD
diff --git a/keyboards/handwired/concertina/64key/info.json b/keyboards/handwired/concertina/64key/info.json
index 86a5a1326c..0e4542af9d 100644
--- a/keyboards/handwired/concertina/64key/info.json
+++ b/keyboards/handwired/concertina/64key/info.json
@@ -8,6 +8,9 @@
         "pid": "0x3632",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "matrix_pins": {
         "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
         "rows": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"]
diff --git a/keyboards/handwired/consolekeyboard/18key/config.h b/keyboards/handwired/consolekeyboard/18key/config.h
index 5ada7d8564..ac16864b09 100644
--- a/keyboards/handwired/consolekeyboard/18key/config.h
+++ b/keyboards/handwired/consolekeyboard/18key/config.h
@@ -16,7 +16,6 @@
 
 #pragma once
 
-#define RGB_DI_PIN F4
     #define RGBLED_NUM 6
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/handwired/consolekeyboard/18key/info.json b/keyboards/handwired/consolekeyboard/18key/info.json
index a7c04ae242..f4b99ed3f7 100644
--- a/keyboards/handwired/consolekeyboard/18key/info.json
+++ b/keyboards/handwired/consolekeyboard/18key/info.json
@@ -8,6 +8,9 @@
         "pid": "0x3332",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "F4"
+    },
     "matrix_pins": {
         "cols": ["D4", "C6", "D7", "C4", "B1", "B3", "B2", "B6", "C5", "E6", "B4"],
         "rows": ["D1", "D0"]
diff --git a/keyboards/handwired/consolekeyboard/20key/config.h b/keyboards/handwired/consolekeyboard/20key/config.h
index 5ada7d8564..ac16864b09 100644
--- a/keyboards/handwired/consolekeyboard/20key/config.h
+++ b/keyboards/handwired/consolekeyboard/20key/config.h
@@ -16,7 +16,6 @@
 
 #pragma once
 
-#define RGB_DI_PIN F4
     #define RGBLED_NUM 6
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/handwired/consolekeyboard/20key/info.json b/keyboards/handwired/consolekeyboard/20key/info.json
index 4d99a74d5b..c62b02259c 100644
--- a/keyboards/handwired/consolekeyboard/20key/info.json
+++ b/keyboards/handwired/consolekeyboard/20key/info.json
@@ -8,6 +8,9 @@
         "pid": "0x3432",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "F4"
+    },
     "matrix_pins": {
         "cols": ["D4", "C6", "D7", "C4", "B1", "B3", "B2", "B6", "C5", "E6", "B4", "B5"],
         "rows": ["D1", "D0"]
diff --git a/keyboards/handwired/consolekeyboard/27key/config.h b/keyboards/handwired/consolekeyboard/27key/config.h
index 5ada7d8564..ac16864b09 100644
--- a/keyboards/handwired/consolekeyboard/27key/config.h
+++ b/keyboards/handwired/consolekeyboard/27key/config.h
@@ -16,7 +16,6 @@
 
 #pragma once
 
-#define RGB_DI_PIN F4
     #define RGBLED_NUM 6
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/handwired/consolekeyboard/27key/info.json b/keyboards/handwired/consolekeyboard/27key/info.json
index 0f17682dc6..854fe37e30 100644
--- a/keyboards/handwired/consolekeyboard/27key/info.json
+++ b/keyboards/handwired/consolekeyboard/27key/info.json
@@ -8,6 +8,9 @@
         "pid": "0x3433",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "F4"
+    },
     "matrix_pins": {
         "cols": ["D4", "C6", "D7", "C4", "B1", "B3", "B2", "B6", "C5", "E6", "B4"],
         "rows": ["D1", "D0", "F7"]
diff --git a/keyboards/handwired/consolekeyboard/30key/config.h b/keyboards/handwired/consolekeyboard/30key/config.h
index d08d7e3c1a..226fee299f 100644
--- a/keyboards/handwired/consolekeyboard/30key/config.h
+++ b/keyboards/handwired/consolekeyboard/30key/config.h
@@ -16,7 +16,6 @@
 
 #pragma once
 
-#define RGB_DI_PIN F4
     #define RGBLED_NUM 6
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/handwired/consolekeyboard/30key/info.json b/keyboards/handwired/consolekeyboard/30key/info.json
index 0c53a6fa9c..fe08b20b28 100644
--- a/keyboards/handwired/consolekeyboard/30key/info.json
+++ b/keyboards/handwired/consolekeyboard/30key/info.json
@@ -8,6 +8,9 @@
         "pid": "0x3433",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "F4"
+    },
     "matrix_pins": {
         "cols": ["D4", "C6", "D7", "C4", "B1", "B3", "B2", "B6", "C5", "E6", "B4", "B5"],
         "rows": ["D1", "D0", "F7"]
diff --git a/keyboards/handwired/croxsplit44/config.h b/keyboards/handwired/croxsplit44/config.h
index ffb07b649f..5703448756 100644
--- a/keyboards/handwired/croxsplit44/config.h
+++ b/keyboards/handwired/croxsplit44/config.h
@@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGB_DI_PIN C4
     #define RGBLED_NUM 42
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/handwired/croxsplit44/info.json b/keyboards/handwired/croxsplit44/info.json
index fc8279c820..817f2fe85a 100644
--- a/keyboards/handwired/croxsplit44/info.json
+++ b/keyboards/handwired/croxsplit44/info.json
@@ -8,6 +8,9 @@
         "pid": "0x6146",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "C4"
+    },
     "matrix_pins": {
         "cols": ["B6", "B5", "B4", "D2", "C0", "C1", "F5", "F4", "F3", "F2", "F1", "F0"],
         "rows": ["D4", "D5", "D6", "D7"]
diff --git a/keyboards/handwired/cyberstar/config.h b/keyboards/handwired/cyberstar/config.h
index befd720cc3..869f4c9ba7 100644
--- a/keyboards/handwired/cyberstar/config.h
+++ b/keyboards/handwired/cyberstar/config.h
@@ -28,7 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_DMA_CHANNEL 3
 #define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB
 
-#define RGB_DI_PIN B4
 #define RGBLED_NUM 12
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/handwired/cyberstar/info.json b/keyboards/handwired/cyberstar/info.json
index 0da0497e15..6e3cb6de3f 100644
--- a/keyboards/handwired/cyberstar/info.json
+++ b/keyboards/handwired/cyberstar/info.json
@@ -9,6 +9,7 @@
         "device_version": "0.0.1"
     },
     "ws2812": {
+        "pin": "B4",
         "driver": "pwm"
     },
     "matrix_pins": {
diff --git a/keyboards/handwired/d48/config.h b/keyboards/handwired/d48/config.h
index c793057a92..64364451ff 100644
--- a/keyboards/handwired/d48/config.h
+++ b/keyboards/handwired/d48/config.h
@@ -2,7 +2,6 @@
 
 /* RGB Underglow */
 #ifdef RGBLIGHT_ENABLE
-#define RGB_DI_PIN A15
 #define RGBLED_NUM 14
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/handwired/d48/info.json b/keyboards/handwired/d48/info.json
index 08c9e6a1f8..2c426cd9a5 100644
--- a/keyboards/handwired/d48/info.json
+++ b/keyboards/handwired/d48/info.json
@@ -8,6 +8,9 @@
         "pid": "0x6060",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "A15"
+    },
     "matrix_pins": {
         "cols": ["A2", "B0", "A7", "A8", "A13", "A14", "B12", "B11", "B10", "B15", "B14", "B13"],
         "rows": ["B8", "B9", "B1", "B2", "B4"]
diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/config.h b/keyboards/handwired/dactyl_manuform/3x5_3/config.h
index ddae773bad..d84e9b6440 100644
--- a/keyboards/handwired/dactyl_manuform/3x5_3/config.h
+++ b/keyboards/handwired/dactyl_manuform/3x5_3/config.h
@@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 // WS2812 RGB LED strip input and number of LEDs
-#define RGB_DI_PIN D3
 #define RGB_MATRIX_LED_COUNT 36
 #define RGB_MATRIX_SPLIT { 18, 18 }
 #define RGB_MATRIX_CENTER { 133, 54 }
diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/info.json b/keyboards/handwired/dactyl_manuform/3x5_3/info.json
index f6309cba46..13aee1eaaf 100644
--- a/keyboards/handwired/dactyl_manuform/3x5_3/info.json
+++ b/keyboards/handwired/dactyl_manuform/3x5_3/info.json
@@ -8,6 +8,9 @@
         "pid": "0x3536",
         "device_version": "0.0.3"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "matrix_pins": {
         "cols": ["C6", "D7", "E6", "B4", "B5"],
         "rows": ["B1", "B3", "B2", "B6"]
diff --git a/keyboards/handwired/dactyl_manuform/4x5/config.h b/keyboards/handwired/dactyl_manuform/4x5/config.h
index fbff478bed..9a4e39dad2 100644
--- a/keyboards/handwired/dactyl_manuform/4x5/config.h
+++ b/keyboards/handwired/dactyl_manuform/4x5/config.h
@@ -19,5 +19,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 // WS2812 RGB LED strip input and number of LEDs
-#define RGB_DI_PIN D3
 #define RGBLED_NUM 12
diff --git a/keyboards/handwired/dactyl_manuform/4x5/info.json b/keyboards/handwired/dactyl_manuform/4x5/info.json
index 0f47f25afa..ddb96923f4 100644
--- a/keyboards/handwired/dactyl_manuform/4x5/info.json
+++ b/keyboards/handwired/dactyl_manuform/4x5/info.json
@@ -8,6 +8,9 @@
         "pid": "0x3435",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "matrix_pins": {
         "cols": ["C6", "D7", "E6", "B4", "B5"],
         "rows": ["F7", "B1", "B3", "B2", "B6"]
diff --git a/keyboards/handwired/dactyl_manuform/4x6/config.h b/keyboards/handwired/dactyl_manuform/4x6/config.h
index fbff478bed..9a4e39dad2 100644
--- a/keyboards/handwired/dactyl_manuform/4x6/config.h
+++ b/keyboards/handwired/dactyl_manuform/4x6/config.h
@@ -19,5 +19,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 // WS2812 RGB LED strip input and number of LEDs
-#define RGB_DI_PIN D3
 #define RGBLED_NUM 12
diff --git a/keyboards/handwired/dactyl_manuform/4x6/info.json b/keyboards/handwired/dactyl_manuform/4x6/info.json
index 7f89885c89..61d420c3a5 100644
--- a/keyboards/handwired/dactyl_manuform/4x6/info.json
+++ b/keyboards/handwired/dactyl_manuform/4x6/info.json
@@ -8,6 +8,9 @@
         "pid": "0x3436",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "matrix_pins": {
         "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
         "rows": ["F7", "B1", "B3", "B2", "B6"]
diff --git a/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheikled/config.h b/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheikled/config.h
index a73cac9ed6..a68c21b215 100644
--- a/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheikled/config.h
+++ b/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheikled/config.h
@@ -9,9 +9,9 @@
 #define SPLIT_HAND_PIN F6
 
 // WS2812 RGB LED strip input and number of LEDs
-#undef RGB_DI_PIN
+#undef WS2812_DI_PIN
 #undef RGBLED_NUM
-#define RGB_DI_PIN F4
+#define WS2812_DI_PIN F4
 #define RGBLED_NUM 52
 #define RGBLED_SPLIT {26, 26}
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheiklp/config.h b/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheiklp/config.h
index bfce275567..2db9052799 100644
--- a/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheiklp/config.h
+++ b/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheiklp/config.h
@@ -7,7 +7,7 @@
 #define USE_I2C
 #define SPLIT_HAND_PIN F6
 
-#undef RGB_DI_PIN
+#undef WS2812_DI_PIN
 #undef RGBLED_NUM
 
 #define DEBOUNCE 5
diff --git a/keyboards/handwired/dactyl_manuform/4x6_5/config.h b/keyboards/handwired/dactyl_manuform/4x6_5/config.h
index fbff478bed..9a4e39dad2 100644
--- a/keyboards/handwired/dactyl_manuform/4x6_5/config.h
+++ b/keyboards/handwired/dactyl_manuform/4x6_5/config.h
@@ -19,5 +19,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 // WS2812 RGB LED strip input and number of LEDs
-#define RGB_DI_PIN D3
 #define RGBLED_NUM 12
diff --git a/keyboards/handwired/dactyl_manuform/4x6_5/info.json b/keyboards/handwired/dactyl_manuform/4x6_5/info.json
index 93f4ec5bc1..871572c142 100644
--- a/keyboards/handwired/dactyl_manuform/4x6_5/info.json
+++ b/keyboards/handwired/dactyl_manuform/4x6_5/info.json
@@ -8,6 +8,9 @@
         "pid": "0x3436",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "matrix_pins": {
         "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
         "rows": ["F7", "B1", "B3", "B2", "B6"]
diff --git a/keyboards/handwired/dactyl_manuform/5x6/config.h b/keyboards/handwired/dactyl_manuform/5x6/config.h
index fbff478bed..9a4e39dad2 100644
--- a/keyboards/handwired/dactyl_manuform/5x6/config.h
+++ b/keyboards/handwired/dactyl_manuform/5x6/config.h
@@ -19,5 +19,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 // WS2812 RGB LED strip input and number of LEDs
-#define RGB_DI_PIN D3
 #define RGBLED_NUM 12
diff --git a/keyboards/handwired/dactyl_manuform/5x6/info.json b/keyboards/handwired/dactyl_manuform/5x6/info.json
index 532a1746d0..f5d6f8177d 100644
--- a/keyboards/handwired/dactyl_manuform/5x6/info.json
+++ b/keyboards/handwired/dactyl_manuform/5x6/info.json
@@ -8,6 +8,9 @@
         "pid": "0x3536",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "matrix_pins": {
         "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
         "rows": ["F6", "F7", "B1", "B3", "B2", "B6"]
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/squirrel/config.h b/keyboards/handwired/dactyl_manuform/5x6/keymaps/squirrel/config.h
index 44c4234c9b..e97810f8bc 100644
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/squirrel/config.h
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/squirrel/config.h
@@ -31,8 +31,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MOUSEKEY_WHEEL_MAX_SPEED   	3
 
 // RGB backlight
-#undef RGB_DI_PIN
-#define RGB_DI_PIN D3
+#undef WS2812_DI_PIN
+#define WS2812_DI_PIN D3
 #undef RGBLED_NUM
 #define RGBLED_NUM 30
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/thattolleyguy/config.h b/keyboards/handwired/dactyl_manuform/5x6/keymaps/thattolleyguy/config.h
index 5d740986fb..0d3e3d88d2 100644
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/thattolleyguy/config.h
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/thattolleyguy/config.h
@@ -23,8 +23,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define EE_HANDS
 // Rows are doubled-up
 
-#undef RGB_DI_PIN
-#define RGB_DI_PIN F5
+#undef WS2812_DI_PIN
+#define WS2812_DI_PIN F5
 
 #undef SOFT_SERIAL_PIN
 #define SOFT_SERIAL_PIN D0
diff --git a/keyboards/handwired/dactyl_manuform/5x7/config.h b/keyboards/handwired/dactyl_manuform/5x7/config.h
index fbff478bed..9a4e39dad2 100644
--- a/keyboards/handwired/dactyl_manuform/5x7/config.h
+++ b/keyboards/handwired/dactyl_manuform/5x7/config.h
@@ -19,5 +19,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 // WS2812 RGB LED strip input and number of LEDs
-#define RGB_DI_PIN D3
 #define RGBLED_NUM 12
diff --git a/keyboards/handwired/dactyl_manuform/5x7/info.json b/keyboards/handwired/dactyl_manuform/5x7/info.json
index 6e3b62e218..e5c3b5af86 100644
--- a/keyboards/handwired/dactyl_manuform/5x7/info.json
+++ b/keyboards/handwired/dactyl_manuform/5x7/info.json
@@ -8,6 +8,9 @@
         "pid": "0x3537",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "matrix_pins": {
         "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
         "rows": ["D4", "C6", "D7", "E6", "B4", "B5"]
diff --git a/keyboards/handwired/dactyl_manuform/6x6/promicro/config.h b/keyboards/handwired/dactyl_manuform/6x6/promicro/config.h
index 85aee07d82..1da1cb9590 100644
--- a/keyboards/handwired/dactyl_manuform/6x6/promicro/config.h
+++ b/keyboards/handwired/dactyl_manuform/6x6/promicro/config.h
@@ -17,5 +17,4 @@
 #pragma once
 
 // WS2812 RGB LED strip input and number of LEDs
-#define RGB_DI_PIN D3
 #define RGBLED_NUM 12
diff --git a/keyboards/handwired/dactyl_manuform/6x6/promicro/info.json b/keyboards/handwired/dactyl_manuform/6x6/promicro/info.json
index 32c81a5f93..2b542a15da 100644
--- a/keyboards/handwired/dactyl_manuform/6x6/promicro/info.json
+++ b/keyboards/handwired/dactyl_manuform/6x6/promicro/info.json
@@ -7,6 +7,9 @@
     "split": {
         "soft_serial_pin": "D0"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina"
 }
diff --git a/keyboards/handwired/dactyl_manuform/6x6_4/config.h b/keyboards/handwired/dactyl_manuform/6x6_4/config.h
index fbff478bed..9a4e39dad2 100644
--- a/keyboards/handwired/dactyl_manuform/6x6_4/config.h
+++ b/keyboards/handwired/dactyl_manuform/6x6_4/config.h
@@ -19,5 +19,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 // WS2812 RGB LED strip input and number of LEDs
-#define RGB_DI_PIN D3
 #define RGBLED_NUM 12
diff --git a/keyboards/handwired/dactyl_manuform/6x6_4/info.json b/keyboards/handwired/dactyl_manuform/6x6_4/info.json
index b2da174b5a..2d5dbd2351 100644
--- a/keyboards/handwired/dactyl_manuform/6x6_4/info.json
+++ b/keyboards/handwired/dactyl_manuform/6x6_4/info.json
@@ -8,6 +8,9 @@
         "pid": "0x3636",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "matrix_pins": {
         "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
         "rows": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"]
diff --git a/keyboards/handwired/dactyl_manuform/6x6_kinesis/config.h b/keyboards/handwired/dactyl_manuform/6x6_kinesis/config.h
index fbff478bed..9a4e39dad2 100644
--- a/keyboards/handwired/dactyl_manuform/6x6_kinesis/config.h
+++ b/keyboards/handwired/dactyl_manuform/6x6_kinesis/config.h
@@ -19,5 +19,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 // WS2812 RGB LED strip input and number of LEDs
-#define RGB_DI_PIN D3
 #define RGBLED_NUM 12
diff --git a/keyboards/handwired/dactyl_manuform/6x6_kinesis/info.json b/keyboards/handwired/dactyl_manuform/6x6_kinesis/info.json
index 190acc1848..9bf6f6f8bd 100644
--- a/keyboards/handwired/dactyl_manuform/6x6_kinesis/info.json
+++ b/keyboards/handwired/dactyl_manuform/6x6_kinesis/info.json
@@ -8,6 +8,9 @@
         "pid": "0x3636",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "matrix_pins": {
         "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
         "rows": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"]
diff --git a/keyboards/handwired/dactyl_manuform/6x7/config.h b/keyboards/handwired/dactyl_manuform/6x7/config.h
index fbff478bed..9a4e39dad2 100644
--- a/keyboards/handwired/dactyl_manuform/6x7/config.h
+++ b/keyboards/handwired/dactyl_manuform/6x7/config.h
@@ -19,5 +19,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 // WS2812 RGB LED strip input and number of LEDs
-#define RGB_DI_PIN D3
 #define RGBLED_NUM 12
diff --git a/keyboards/handwired/dactyl_manuform/6x7/info.json b/keyboards/handwired/dactyl_manuform/6x7/info.json
index 5f774715a0..b289804d36 100644
--- a/keyboards/handwired/dactyl_manuform/6x7/info.json
+++ b/keyboards/handwired/dactyl_manuform/6x7/info.json
@@ -8,6 +8,9 @@
         "pid": "0x3636",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "matrix_pins": {
         "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "B7"],
         "rows": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"]
diff --git a/keyboards/handwired/dactyl_manuform/dmote/62key/config.h b/keyboards/handwired/dactyl_manuform/dmote/62key/config.h
index c7f20b1103..41af664c25 100644
--- a/keyboards/handwired/dactyl_manuform/dmote/62key/config.h
+++ b/keyboards/handwired/dactyl_manuform/dmote/62key/config.h
@@ -5,6 +5,5 @@
 #define RGBLIGHT_EFFECT_KNIGHT_LENGTH 2
 #define RGBLIGHT_EFFECT_CHRISTMAS
 #define RGBLIGHT_EFFECT_CHRISTMAS_STEP 1
-#define RGB_DI_PIN D1
 #define RGBLED_NUM 6           // Used when chaining strips
 #define RGBLED_SPLIT { 3, 3 }  // Used when not chaining strips
diff --git a/keyboards/handwired/dactyl_manuform/dmote/62key/info.json b/keyboards/handwired/dactyl_manuform/dmote/62key/info.json
index 4e86c8b3a6..4d50af4668 100644
--- a/keyboards/handwired/dactyl_manuform/dmote/62key/info.json
+++ b/keyboards/handwired/dactyl_manuform/dmote/62key/info.json
@@ -10,6 +10,9 @@
         "pid": "0x3632",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D1"
+    },
     "matrix_pins": {
         "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
         "rows": ["F6", "F7", "B1", "B3", "B2", "B6"]
diff --git a/keyboards/handwired/dactyl_promicro/config.h b/keyboards/handwired/dactyl_promicro/config.h
index 00548e339c..ab6beb807f 100644
--- a/keyboards/handwired/dactyl_promicro/config.h
+++ b/keyboards/handwired/dactyl_promicro/config.h
@@ -33,9 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Enables This makes it easier for fast typists to use dual-function keys */
 #define PERMISSIVE_HOLD
 
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
-
 #define RGBLED_NUM 12    // Number of LEDs
 
 /*
diff --git a/keyboards/handwired/dactyl_promicro/info.json b/keyboards/handwired/dactyl_promicro/info.json
index 48202d90cd..10b7d4364a 100644
--- a/keyboards/handwired/dactyl_promicro/info.json
+++ b/keyboards/handwired/dactyl_promicro/info.json
@@ -16,6 +16,9 @@
     "split": {
         "soft_serial_pin": "D0"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/handwired/freoduo/config.h b/keyboards/handwired/freoduo/config.h
index 16acada5e7..232d5638eb 100644
--- a/keyboards/handwired/freoduo/config.h
+++ b/keyboards/handwired/freoduo/config.h
@@ -18,7 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define EE_HANDS
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN D4
 #if !defined(RGBLED_NUM)
 #    define RGBLED_NUM 30
 #    define RGBLIGHT_SPLIT
diff --git a/keyboards/handwired/freoduo/info.json b/keyboards/handwired/freoduo/info.json
index aaa5a77193..90b34f29d4 100644
--- a/keyboards/handwired/freoduo/info.json
+++ b/keyboards/handwired/freoduo/info.json
@@ -16,6 +16,9 @@
 "split": {
     "soft_serial_pin": "D0"
 },
+"ws2812": {
+    "pin": "D4"
+},
 "processor": "atmega32u4",
 "bootloader": "caterina",
 "debounce": 3,
diff --git a/keyboards/handwired/heisenberg/config.h b/keyboards/handwired/heisenberg/config.h
index 345e1da87a..3999283535 100644
--- a/keyboards/handwired/heisenberg/config.h
+++ b/keyboards/handwired/heisenberg/config.h
@@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGB_DI_PIN D4
 	#define RGBLED_NUM 6
 //   #define RGBLIGHT_HUE_STEP 8
 //   #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/handwired/heisenberg/info.json b/keyboards/handwired/heisenberg/info.json
index a839fe711b..e92e0f7b4b 100644
--- a/keyboards/handwired/heisenberg/info.json
+++ b/keyboards/handwired/heisenberg/info.json
@@ -8,6 +8,9 @@
     "pid": "0x0000",
     "device_version": "0.0.1"
   },
+  "ws2812": {
+    "pin": "D4"
+  },
   "matrix_pins": {
     "cols": ["C6", "D7", "E6", "B4", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
     "rows": ["D3", "D2", "D1", "D0"]
diff --git a/keyboards/handwired/hnah108/config.h b/keyboards/handwired/hnah108/config.h
index 875f441b12..bfa158713d 100644
--- a/keyboards/handwired/hnah108/config.h
+++ b/keyboards/handwired/hnah108/config.h
@@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGB_DI_PIN E2
 #define RGB_MATRIX_LED_COUNT 30
 // RGB Matrix Animation modes. Explicitly enabled
 // For full list of effects, see:
diff --git a/keyboards/handwired/hnah108/info.json b/keyboards/handwired/hnah108/info.json
index 6fdf6a699a..5f43b185cf 100644
--- a/keyboards/handwired/hnah108/info.json
+++ b/keyboards/handwired/hnah108/info.json
@@ -23,6 +23,9 @@
         "levels": 4,
         "breathing": true
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/handwired/hnah40rgb/config.h b/keyboards/handwired/hnah40rgb/config.h
index c964590d80..7b61de013b 100644
--- a/keyboards/handwired/hnah40rgb/config.h
+++ b/keyboards/handwired/hnah40rgb/config.h
@@ -18,7 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #ifdef RGB_MATRIX_ENABLE
-#define RGB_DI_PIN E2
 #define RGB_MATRIX_LED_COUNT 50
 #define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 #define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
diff --git a/keyboards/handwired/hnah40rgb/info.json b/keyboards/handwired/hnah40rgb/info.json
index 743a0bbecd..89ac784207 100644
--- a/keyboards/handwired/hnah40rgb/info.json
+++ b/keyboards/handwired/hnah40rgb/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "E2"
+    },
     "matrix_pins": {
         "cols": ["D5", "D6", "D3", "D2", "B6", "C6", "C7", "F7", "F6", "F5", "F4"],
         "rows": ["B7", "D7", "F1", "F0"]
diff --git a/keyboards/handwired/jopr/config.h b/keyboards/handwired/jopr/config.h
index e12034a6b8..5d5233ca99 100644
--- a/keyboards/handwired/jopr/config.h
+++ b/keyboards/handwired/jopr/config.h
@@ -9,7 +9,6 @@
 #define NO_ACTION_ONESHOT
 #define TAPPING_TOGGLE 3
 
-#define RGB_DI_PIN F4
 #define RGBLED_NUM 1
 #define RGBLIGHT_HUE_STEP 1
 #define RGBLIGHT_SAT_STEP 1
diff --git a/keyboards/handwired/jopr/info.json b/keyboards/handwired/jopr/info.json
index 3e0ce0ab5f..0dae7b010c 100644
--- a/keyboards/handwired/jopr/info.json
+++ b/keyboards/handwired/jopr/info.json
@@ -8,6 +8,9 @@
     "pid": "0x1000",
     "device_version": "0.0.1"
   },
+  "ws2812": {
+    "pin": "F4"
+  },
   "matrix_pins": {
     "cols": ["B3", "B2", "B1", "B0", "F7", "E6", "F6", "B5", "C7", "B4", "D1"],
     "rows": ["D0", "D6", "D2", "D4", "D3", "D5", "D7", "C6", "B6", "F5"]
diff --git a/keyboards/handwired/lovelive9/config.h b/keyboards/handwired/lovelive9/config.h
index d960bc9b2a..e6499e9111 100644
--- a/keyboards/handwired/lovelive9/config.h
+++ b/keyboards/handwired/lovelive9/config.h
@@ -2,9 +2,6 @@
 
 #pragma once
 
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
-
 #define RGBLED_NUM 9    // Number of LEDs
 
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/handwired/lovelive9/info.json b/keyboards/handwired/lovelive9/info.json
index 945b489751..25dc85704d 100644
--- a/keyboards/handwired/lovelive9/info.json
+++ b/keyboards/handwired/lovelive9/info.json
@@ -16,6 +16,9 @@
     "backlight": {
         "breathing_period": 2
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/handwired/macroboard/config.h b/keyboards/handwired/macroboard/config.h
index 5da6e9ac53..c9a2077f41 100644
--- a/keyboards/handwired/macroboard/config.h
+++ b/keyboards/handwired/macroboard/config.h
@@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGB_DI_PIN B9
 #define WS2812_PWM_DRIVER   PWMD4
 #define WS2812_PWM_CHANNEL  4
 #define WS2812_PWM_PAL_MODE 2
diff --git a/keyboards/handwired/macroboard/info.json b/keyboards/handwired/macroboard/info.json
index 5de694fbef..66dd82d144 100644
--- a/keyboards/handwired/macroboard/info.json
+++ b/keyboards/handwired/macroboard/info.json
@@ -8,6 +8,9 @@
         "pid": "0x2137",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B9"
+    },
     "layouts": {
         "LAYOUT_ortho_5x6": {
             "layout": [
diff --git a/keyboards/handwired/marauder/config.h b/keyboards/handwired/marauder/config.h
index 6c9be12a17..10f0d75ea9 100644
--- a/keyboards/handwired/marauder/config.h
+++ b/keyboards/handwired/marauder/config.h
@@ -18,7 +18,6 @@
 
 #define LAYER_STATE_8BIT
 
-#define RGB_DI_PIN D3
     #define RGBLED_NUM 7
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/handwired/marauder/info.json b/keyboards/handwired/marauder/info.json
index 059cc1dd33..eba81459ef 100644
--- a/keyboards/handwired/marauder/info.json
+++ b/keyboards/handwired/marauder/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "matrix_pins": {
         "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4", "B0"],
         "rows": ["D2", "D4", "C6", "D7", "E6", "B4", "B5", "B7", "D5", "C7", "F1", "F0"]
diff --git a/keyboards/handwired/minorca/keymaps/rgb/config.h b/keyboards/handwired/minorca/keymaps/rgb/config.h
index 6050bcf11d..4bee6b205d 100644
--- a/keyboards/handwired/minorca/keymaps/rgb/config.h
+++ b/keyboards/handwired/minorca/keymaps/rgb/config.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN D5
+#define WS2812_DI_PIN D5
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/handwired/onekey/blackpill_f401/info.json b/keyboards/handwired/onekey/blackpill_f401/info.json
index 6d75c549ce..69a7ea87a7 100644
--- a/keyboards/handwired/onekey/blackpill_f401/info.json
+++ b/keyboards/handwired/onekey/blackpill_f401/info.json
@@ -8,7 +8,7 @@
     "backlight": {
         "pin": "A0"
     },
-    "rgblight": {
+    "ws2812": {
         "pin": "A1"
     },
     "apa102": {
diff --git a/keyboards/handwired/onekey/blackpill_f401_tinyuf2/info.json b/keyboards/handwired/onekey/blackpill_f401_tinyuf2/info.json
index 8d558c4254..ed9435c740 100644
--- a/keyboards/handwired/onekey/blackpill_f401_tinyuf2/info.json
+++ b/keyboards/handwired/onekey/blackpill_f401_tinyuf2/info.json
@@ -9,7 +9,7 @@
     "backlight": {
         "pin": "A0"
     },
-    "rgblight": {
+    "ws2812": {
         "pin": "A1"
     },
     "apa102": {
diff --git a/keyboards/handwired/onekey/blackpill_f411/info.json b/keyboards/handwired/onekey/blackpill_f411/info.json
index 8ff55f5587..5ee8ec3d5e 100644
--- a/keyboards/handwired/onekey/blackpill_f411/info.json
+++ b/keyboards/handwired/onekey/blackpill_f411/info.json
@@ -8,7 +8,7 @@
     "backlight": {
         "pin": "A0"
     },
-    "rgblight": {
+    "ws2812": {
         "pin": "A1"
     },
     "apa102": {
diff --git a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/info.json b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/info.json
index 4bdbc5241a..8e8b52080a 100644
--- a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/info.json
+++ b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/info.json
@@ -9,7 +9,7 @@
     "backlight": {
         "pin": "A0"
     },
-    "rgblight": {
+    "ws2812": {
         "pin": "A1"
     },
     "apa102": {
diff --git a/keyboards/handwired/onekey/bluepill/info.json b/keyboards/handwired/onekey/bluepill/info.json
index 21de1b7696..5f1fecc95b 100644
--- a/keyboards/handwired/onekey/bluepill/info.json
+++ b/keyboards/handwired/onekey/bluepill/info.json
@@ -8,7 +8,7 @@
     "backlight": {
         "pin": "A0"
     },
-    "rgblight": {
+    "ws2812": {
         "pin": "A1"
     },
     "apa102": {
diff --git a/keyboards/handwired/onekey/bluepill_f103c6/info.json b/keyboards/handwired/onekey/bluepill_f103c6/info.json
index 9a21daf322..9460b43f5f 100644
--- a/keyboards/handwired/onekey/bluepill_f103c6/info.json
+++ b/keyboards/handwired/onekey/bluepill_f103c6/info.json
@@ -9,7 +9,7 @@
     "backlight": {
         "pin": "A0"
     },
-    "rgblight": {
+    "ws2812": {
         "pin": "A1"
     },
     "apa102": {
diff --git a/keyboards/handwired/onekey/bluepill_uf2boot/info.json b/keyboards/handwired/onekey/bluepill_uf2boot/info.json
index 3e874e8532..65174155b3 100644
--- a/keyboards/handwired/onekey/bluepill_uf2boot/info.json
+++ b/keyboards/handwired/onekey/bluepill_uf2boot/info.json
@@ -9,7 +9,7 @@
     "backlight": {
         "pin": "A0"
     },
-    "rgblight": {
+    "ws2812": {
         "pin": "A1"
     },
     "apa102": {
diff --git a/keyboards/handwired/onekey/elite_c/info.json b/keyboards/handwired/onekey/elite_c/info.json
index 4726c87053..b8532cbec0 100644
--- a/keyboards/handwired/onekey/elite_c/info.json
+++ b/keyboards/handwired/onekey/elite_c/info.json
@@ -8,7 +8,7 @@
     "backlight": {
         "pin": "B6"
     },
-    "rgblight": {
+    "ws2812": {
         "pin": "F6"
     },
     "apa102": {
diff --git a/keyboards/handwired/onekey/evb_wb32f3g71/info.json b/keyboards/handwired/onekey/evb_wb32f3g71/info.json
index 0bc9001321..dfb57df2b3 100644
--- a/keyboards/handwired/onekey/evb_wb32f3g71/info.json
+++ b/keyboards/handwired/onekey/evb_wb32f3g71/info.json
@@ -9,7 +9,7 @@
     "backlight": {
         "pin": "B8"
     },
-    "rgblight": {
+    "ws2812": {
         "pin": "A0"
     },
     "apa102": {
diff --git a/keyboards/handwired/onekey/evb_wb32fq95/info.json b/keyboards/handwired/onekey/evb_wb32fq95/info.json
index 7fcc3d4ebd..8a94f5e8b1 100644
--- a/keyboards/handwired/onekey/evb_wb32fq95/info.json
+++ b/keyboards/handwired/onekey/evb_wb32fq95/info.json
@@ -9,7 +9,7 @@
     "backlight": {
         "pin": "B8"
     },
-    "rgblight": {
+    "ws2812": {
         "pin": "A0"
     },
     "apa102": {
diff --git a/keyboards/handwired/onekey/kb2040/info.json b/keyboards/handwired/onekey/kb2040/info.json
index cb5176e3cd..5c0c92ef5d 100644
--- a/keyboards/handwired/onekey/kb2040/info.json
+++ b/keyboards/handwired/onekey/kb2040/info.json
@@ -5,10 +5,8 @@
         "cols": ["GP4"],
         "rows": ["GP5"]
     },
-    "rgblight": {
-        "pin": "GP17"
-    },
     "ws2812": {
+        "pin": "GP17",
         "driver": "vendor"
     }
 }
diff --git a/keyboards/handwired/onekey/nucleo_f446re/info.json b/keyboards/handwired/onekey/nucleo_f446re/info.json
index 2438c6e482..26de66e198 100644
--- a/keyboards/handwired/onekey/nucleo_f446re/info.json
+++ b/keyboards/handwired/onekey/nucleo_f446re/info.json
@@ -9,7 +9,7 @@
     "backlight": {
         "pin": "B8"
     },
-    "rgblight": {
+    "ws2812": {
         "pin": "A0"
     },
     "apa102": {
diff --git a/keyboards/handwired/onekey/nucleo_l432kc/info.json b/keyboards/handwired/onekey/nucleo_l432kc/info.json
index 43a4b27992..f6af0826fb 100644
--- a/keyboards/handwired/onekey/nucleo_l432kc/info.json
+++ b/keyboards/handwired/onekey/nucleo_l432kc/info.json
@@ -9,7 +9,7 @@
     "backlight": {
         "pin": "B8"
     },
-    "rgblight": {
+    "ws2812": {
         "pin": "A0"
     },
     "apa102": {
diff --git a/keyboards/handwired/onekey/promicro/info.json b/keyboards/handwired/onekey/promicro/info.json
index 84d2fba131..178e6185de 100644
--- a/keyboards/handwired/onekey/promicro/info.json
+++ b/keyboards/handwired/onekey/promicro/info.json
@@ -8,7 +8,7 @@
     "backlight": {
         "pin": "B6"
     },
-    "rgblight": {
+    "ws2812": {
         "pin": "F6"
     },
     "apa102": {
diff --git a/keyboards/handwired/onekey/proton_c/info.json b/keyboards/handwired/onekey/proton_c/info.json
index 833f7cbf2a..93dbc4c30d 100644
--- a/keyboards/handwired/onekey/proton_c/info.json
+++ b/keyboards/handwired/onekey/proton_c/info.json
@@ -8,7 +8,7 @@
     "backlight": {
         "pin": "B8"
     },
-    "rgblight": {
+    "ws2812": {
         "pin": "A0"
     },
     "apa102": {
diff --git a/keyboards/handwired/onekey/rp2040/info.json b/keyboards/handwired/onekey/rp2040/info.json
index 32bde911bb..40eb896232 100644
--- a/keyboards/handwired/onekey/rp2040/info.json
+++ b/keyboards/handwired/onekey/rp2040/info.json
@@ -9,7 +9,7 @@
     "backlight": {
         "pin": "GP25"
     },
-    "rgblight": {
+    "ws2812": {
         "pin": "GP25"
     }
 }
diff --git a/keyboards/handwired/onekey/sipeed_longan_nano/info.json b/keyboards/handwired/onekey/sipeed_longan_nano/info.json
index b37219bbc3..28aa8a2fdc 100644
--- a/keyboards/handwired/onekey/sipeed_longan_nano/info.json
+++ b/keyboards/handwired/onekey/sipeed_longan_nano/info.json
@@ -10,7 +10,7 @@
     "backlight": {
         "pin": "A1"
     },
-    "rgblight": {
+    "ws2812": {
         "pin": "A2"
     },
     "apa102": {
diff --git a/keyboards/handwired/onekey/stm32f0_disco/info.json b/keyboards/handwired/onekey/stm32f0_disco/info.json
index 993003373a..41210a3bbb 100644
--- a/keyboards/handwired/onekey/stm32f0_disco/info.json
+++ b/keyboards/handwired/onekey/stm32f0_disco/info.json
@@ -9,7 +9,7 @@
     "backlight": {
         "pin": "C8"
     },
-    "rgblight": {
+    "ws2812": {
         "pin": "B15"
     },
     "apa102": {
diff --git a/keyboards/handwired/onekey/teensy_2/info.json b/keyboards/handwired/onekey/teensy_2/info.json
index e62fc69ce7..d7720a01d3 100644
--- a/keyboards/handwired/onekey/teensy_2/info.json
+++ b/keyboards/handwired/onekey/teensy_2/info.json
@@ -9,7 +9,7 @@
     "backlight": {
         "pin": "B6"
     },
-    "rgblight": {
+    "ws2812": {
         "pin": "F6"
     },
     "apa102": {
diff --git a/keyboards/handwired/onekey/teensy_2pp/info.json b/keyboards/handwired/onekey/teensy_2pp/info.json
index 6e134d4506..f7de463fca 100644
--- a/keyboards/handwired/onekey/teensy_2pp/info.json
+++ b/keyboards/handwired/onekey/teensy_2pp/info.json
@@ -9,7 +9,7 @@
     "backlight": {
         "pin": "B6"
     },
-    "rgblight": {
+    "ws2812": {
         "pin": "F6"
     },
     "apa102": {
diff --git a/keyboards/handwired/owlet60/config.h b/keyboards/handwired/owlet60/config.h
index 4cb293cf88..bacb8449f2 100644
--- a/keyboards/handwired/owlet60/config.h
+++ b/keyboards/handwired/owlet60/config.h
@@ -40,7 +40,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
-#define RGB_DI_PIN D0
   #define RGBLED_NUM 8
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/handwired/owlet60/info.json b/keyboards/handwired/owlet60/info.json
index c8be456104..cc607adc71 100644
--- a/keyboards/handwired/owlet60/info.json
+++ b/keyboards/handwired/owlet60/info.json
@@ -8,6 +8,9 @@
         "pid": "0xDA19",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D0"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "debounce": 9,
diff --git a/keyboards/handwired/p65rgb/config.h b/keyboards/handwired/p65rgb/config.h
index ced8197ddb..b224411da4 100644
--- a/keyboards/handwired/p65rgb/config.h
+++ b/keyboards/handwired/p65rgb/config.h
@@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGB_DI_PIN B4
 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
diff --git a/keyboards/handwired/p65rgb/info.json b/keyboards/handwired/p65rgb/info.json
index 82e433527a..78b630e512 100644
--- a/keyboards/handwired/p65rgb/info.json
+++ b/keyboards/handwired/p65rgb/info.json
@@ -8,6 +8,9 @@
         "pid": "0x75B4",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B4"
+    },
     "matrix_pins": {
         "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "B0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D7"],
         "rows": ["C7", "C6", "B6", "B5", "D5"]
diff --git a/keyboards/handwired/prime_exl_plus/config.h b/keyboards/handwired/prime_exl_plus/config.h
index 1b683fdce9..a660e0ddfa 100644
--- a/keyboards/handwired/prime_exl_plus/config.h
+++ b/keyboards/handwired/prime_exl_plus/config.h
@@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGB_DI_PIN D4
 #define RGBLED_NUM 10
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/handwired/prime_exl_plus/info.json b/keyboards/handwired/prime_exl_plus/info.json
index 0d6d19bf5a..8acde1a159 100644
--- a/keyboards/handwired/prime_exl_plus/info.json
+++ b/keyboards/handwired/prime_exl_plus/info.json
@@ -8,6 +8,9 @@
     "pid": "0x6579",
     "device_version": "0.0.1"
   },
+  "ws2812": {
+    "pin": "D4"
+  },
   "matrix_pins": {
     "cols": ["F5", "F6", "F7", "C7", "C6", "B6", "B7", "B3", "D1", "D0"],
     "rows": ["D2", "D6", "B4", "F1", "E6", "F0", "F4", "B5", "D7", "D3"]
diff --git a/keyboards/handwired/prkl30/feather/config.h b/keyboards/handwired/prkl30/feather/config.h
index f8d36fe894..bb71df9c64 100644
--- a/keyboards/handwired/prkl30/feather/config.h
+++ b/keyboards/handwired/prkl30/feather/config.h
@@ -16,8 +16,6 @@
 #pragma once
 
 /* RGB Light Configuration */
-
-#define RGB_DI_PIN D1
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/handwired/prkl30/feather/info.json b/keyboards/handwired/prkl30/feather/info.json
index 5a3e21d8f1..08c6e107dd 100644
--- a/keyboards/handwired/prkl30/feather/info.json
+++ b/keyboards/handwired/prkl30/feather/info.json
@@ -1,4 +1,7 @@
 {
+    "ws2812": {
+        "pin": "D1"
+    },
     "matrix_pins": {
         "cols": ["D3", "D1", "B7", "D6", "C7", "B6", "B5", "D7", "C6", "D0"],
         "rows": ["F4", "F1", "F0", "D2"]
diff --git a/keyboards/handwired/prkl30/promicro/config.h b/keyboards/handwired/prkl30/promicro/config.h
index f8d36fe894..bb71df9c64 100644
--- a/keyboards/handwired/prkl30/promicro/config.h
+++ b/keyboards/handwired/prkl30/promicro/config.h
@@ -16,8 +16,6 @@
 #pragma once
 
 /* RGB Light Configuration */
-
-#define RGB_DI_PIN D1
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/handwired/prkl30/promicro/info.json b/keyboards/handwired/prkl30/promicro/info.json
index ddec0f8eeb..fcfffc6f02 100644
--- a/keyboards/handwired/prkl30/promicro/info.json
+++ b/keyboards/handwired/prkl30/promicro/info.json
@@ -3,6 +3,9 @@
         "cols": ["B4", "B5", "F6", "F5", "F4", "F7", "B1", "B3", "B2", "B6"],
         "rows": ["D4", "C6", "D7", "E6"]
     },
+    "ws2812": {
+        "pin": "D1"
+    },
     "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
diff --git a/keyboards/handwired/promethium/config.h b/keyboards/handwired/promethium/config.h
index 09a981afe1..342411a6b2 100644
--- a/keyboards/handwired/promethium/config.h
+++ b/keyboards/handwired/promethium/config.h
@@ -154,7 +154,6 @@ enum led_sequence {
     LED_TOTAL
 };
 
-#    define RGB_DI_PIN B5
 #    define RGBSPS_NUM LED_TOTAL
 #endif
 
diff --git a/keyboards/handwired/promethium/info.json b/keyboards/handwired/promethium/info.json
index 8735f12f78..83f2477b3e 100644
--- a/keyboards/handwired/promethium/info.json
+++ b/keyboards/handwired/promethium/info.json
@@ -8,6 +8,9 @@
     "pid": "0x6048",
     "device_version": "0.0.1"
   },
+  "ws2812": {
+    "pin": "B5"
+  },
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "layouts": {
diff --git a/keyboards/handwired/qc60/info.json b/keyboards/handwired/qc60/info.json
index 286df2173b..735c811451 100644
--- a/keyboards/handwired/qc60/info.json
+++ b/keyboards/handwired/qc60/info.json
@@ -8,6 +8,9 @@
     "pid": "0x0C60",
     "device_version": "1.0.0"
   },
+  "ws2812": {
+    "pin": "D3"
+  },
   "matrix_pins": {
     "cols": ["F7", "F6", "B1", "B3", "B2", "B6", "B5", "B4"],
     "rows": ["F4", "F5", "C6", "D7", "E6"]
diff --git a/keyboards/handwired/qc60/proto/config.h b/keyboards/handwired/qc60/proto/config.h
index 209a5ea30d..a64c4ebeec 100644
--- a/keyboards/handwired/qc60/proto/config.h
+++ b/keyboards/handwired/qc60/proto/config.h
@@ -1,5 +1,4 @@
 #pragma once
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN D3
 #define RGBLED_NUM 1    // Number of LEDs
diff --git a/keyboards/handwired/selene/config.h b/keyboards/handwired/selene/config.h
index c346b07623..7ee210aa84 100644
--- a/keyboards/handwired/selene/config.h
+++ b/keyboards/handwired/selene/config.h
@@ -16,7 +16,6 @@
 
 #pragma once
 
-#define RGB_DI_PIN A3
 #define RGBLED_NUM 50
 
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/handwired/selene/info.json b/keyboards/handwired/selene/info.json
index 2ce960ed20..8c617b015b 100644
--- a/keyboards/handwired/selene/info.json
+++ b/keyboards/handwired/selene/info.json
@@ -8,6 +8,9 @@
   	"pid": "0x0001",
   	"device_version": "0.0.1"
   },
+  "ws2812": {
+  	"pin": "A3"
+  },
   "matrix_pins": {
     "cols": ["A9", "A10", "B11", "B7", "B6", "B5", "B4", "B3", "B2", "B1", "B0", "C14", "A4", "A5", "A6", "A7", "A8", "A15", "A13", "A14", "B12"],
     "rows": ["B10", "B9", "B15", "B14", "B13", "B8"]
diff --git a/keyboards/handwired/skakunm_dactyl/config.h b/keyboards/handwired/skakunm_dactyl/config.h
index 3e57cd2e76..8b04fcdc71 100644
--- a/keyboards/handwired/skakunm_dactyl/config.h
+++ b/keyboards/handwired/skakunm_dactyl/config.h
@@ -19,11 +19,6 @@
 /* Enables This makes it easier for fast typists to use dual-function keys */
 #define PERMISSIVE_HOLD
 
-/* ws2812 RGB LED */
-//#define RGB_DI_PIN D3
-
-//#define RGBLED_NUM 12    // Number of LEDs
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/handwired/splittest/promicro/config.h b/keyboards/handwired/splittest/promicro/config.h
index f0fd3dfc85..4458ddaffe 100644
--- a/keyboards/handwired/splittest/promicro/config.h
+++ b/keyboards/handwired/splittest/promicro/config.h
@@ -21,6 +21,3 @@
 #define USE_I2C
 
 #define SPLIT_HAND_PIN F6
-
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
diff --git a/keyboards/handwired/splittest/promicro/info.json b/keyboards/handwired/splittest/promicro/info.json
index a99bc3ea13..f376520765 100644
--- a/keyboards/handwired/splittest/promicro/info.json
+++ b/keyboards/handwired/splittest/promicro/info.json
@@ -7,6 +7,9 @@
     "split": {
         "soft_serial_pin": "D1"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina"
 }
diff --git a/keyboards/handwired/splittest/teensy_2/config.h b/keyboards/handwired/splittest/teensy_2/config.h
index 6b52516807..20672a381f 100644
--- a/keyboards/handwired/splittest/teensy_2/config.h
+++ b/keyboards/handwired/splittest/teensy_2/config.h
@@ -22,8 +22,5 @@
 
 #define SPLIT_HAND_PIN F0
 
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
-
 // teensy has vbus detection issues - use usb detection instead
 #define SPLIT_USB_DETECT
diff --git a/keyboards/handwired/splittest/teensy_2/info.json b/keyboards/handwired/splittest/teensy_2/info.json
index f6fd6faf33..72e9d022b9 100644
--- a/keyboards/handwired/splittest/teensy_2/info.json
+++ b/keyboards/handwired/splittest/teensy_2/info.json
@@ -7,6 +7,9 @@
     "split": {
         "soft_serial_pin": "D1"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "halfkay"
 }
diff --git a/keyboards/handwired/steamvan/rev1/config.h b/keyboards/handwired/steamvan/rev1/config.h
index 9885c0737c..ffd061fa17 100644
--- a/keyboards/handwired/steamvan/rev1/config.h
+++ b/keyboards/handwired/steamvan/rev1/config.h
@@ -37,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_TWINKLE
 
 #define RGBLED_NUM 16
-#define RGB_DI_PIN A7
 #define RGB_MATRIX_LED_COUNT RGBLED_NUM
 
 #define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/handwired/steamvan/rev1/info.json b/keyboards/handwired/steamvan/rev1/info.json
index a9197852df..054f1845ff 100644
--- a/keyboards/handwired/steamvan/rev1/info.json
+++ b/keyboards/handwired/steamvan/rev1/info.json
@@ -18,6 +18,7 @@
     "breathing": true
   },
   "ws2812": {
+    "pin": "A7",
     "driver": "spi"
   },
   "processor": "STM32F303",
diff --git a/keyboards/handwired/swiftrax/bumblebee/config.h b/keyboards/handwired/swiftrax/bumblebee/config.h
index 48211c215f..4fe6fb4428 100644
--- a/keyboards/handwired/swiftrax/bumblebee/config.h
+++ b/keyboards/handwired/swiftrax/bumblebee/config.h
@@ -18,7 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 /* RGB Indicators */
-#define RGB_DI_PIN E6
 #define RGBLED_NUM 3
 
 /* Solenid Pin */
diff --git a/keyboards/handwired/swiftrax/bumblebee/info.json b/keyboards/handwired/swiftrax/bumblebee/info.json
index ad779c155b..c96702e68c 100644
--- a/keyboards/handwired/swiftrax/bumblebee/info.json
+++ b/keyboards/handwired/swiftrax/bumblebee/info.json
@@ -8,6 +8,9 @@
         "pid": "0xE881",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "E6"
+    },
     "matrix_pins": {
         "cols": ["C7", "D3", "D5", "D4", "D6", "D7", "B4", "B5"],
         "rows": ["B0", "B1", "B2", "B3", "F4", "F5", "F6", "F7"]
diff --git a/keyboards/handwired/swiftrax/glacier/config.h b/keyboards/handwired/swiftrax/glacier/config.h
index cdc4c78084..4bff062d6c 100644
--- a/keyboards/handwired/swiftrax/glacier/config.h
+++ b/keyboards/handwired/swiftrax/glacier/config.h
@@ -21,7 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DYNAMIC_KEYMAP_LAYER_COUNT 3
 
 /* RGB */
-#define RGB_DI_PIN B0
 #define RGBLED_NUM 12
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/handwired/swiftrax/glacier/info.json b/keyboards/handwired/swiftrax/glacier/info.json
index 993f4ca040..9609101901 100644
--- a/keyboards/handwired/swiftrax/glacier/info.json
+++ b/keyboards/handwired/swiftrax/glacier/info.json
@@ -8,6 +8,9 @@
         "pid": "0xE890",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B0"
+    },
     "matrix_pins": {
         "cols": ["F0", "F1", "F2", "F3", "F4", "F5", "F6", "D0", "D1", "D2"],
         "rows": ["B1", "B2", "B3", "B4", "B5", "B6", "E5", "E4", "D4", "D5", "D7", "D6"]
diff --git a/keyboards/handwired/swiftrax/walter/config.h b/keyboards/handwired/swiftrax/walter/config.h
index 5af5a9ff81..5fdda201e0 100644
--- a/keyboards/handwired/swiftrax/walter/config.h
+++ b/keyboards/handwired/swiftrax/walter/config.h
@@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGB_DI_PIN E6
 #define RGBLED_NUM 24
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/handwired/swiftrax/walter/info.json b/keyboards/handwired/swiftrax/walter/info.json
index 41ee872fcd..a52a0470e7 100644
--- a/keyboards/handwired/swiftrax/walter/info.json
+++ b/keyboards/handwired/swiftrax/walter/info.json
@@ -8,6 +8,9 @@
         "pid": "0xE964",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "E6"
+    },
     "matrix_pins": {
         "cols": ["F5", "C6", "F6", "F7", "C7", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"],
         "rows": ["B2", "B1", "F4", "F1", "F0"]
diff --git a/keyboards/handwired/symmetry60/config.h b/keyboards/handwired/symmetry60/config.h
index 0f33d65386..c92944a48f 100644
--- a/keyboards/handwired/symmetry60/config.h
+++ b/keyboards/handwired/symmetry60/config.h
@@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGB_DI_PIN B1
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/handwired/symmetry60/info.json b/keyboards/handwired/symmetry60/info.json
index 5841b607da..54d58d8b7f 100644
--- a/keyboards/handwired/symmetry60/info.json
+++ b/keyboards/handwired/symmetry60/info.json
@@ -8,6 +8,9 @@
     "pid": "0x0000",
     "device_version": "0.0.1"
   },
+  "ws2812": {
+    "pin": "B1"
+  },
   "matrix_pins": {
     "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "B6", "B5", "B4", "D7", "D6", "D4", "E6"],
     "rows": ["D0", "D1", "D2", "D3", "D5"]
diff --git a/keyboards/handwired/tennie/config.h b/keyboards/handwired/tennie/config.h
index 2f4d7d4ad8..40fbd33f9d 100644
--- a/keyboards/handwired/tennie/config.h
+++ b/keyboards/handwired/tennie/config.h
@@ -18,7 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #define RGBW
-#define RGB_DI_PIN D1
   #define RGBLED_NUM 1
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/handwired/tennie/info.json b/keyboards/handwired/tennie/info.json
index 0df5170fff..da74d9b80a 100644
--- a/keyboards/handwired/tennie/info.json
+++ b/keyboards/handwired/tennie/info.json
@@ -8,6 +8,9 @@
         "pid": "0x1313",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D1"
+    },
     "matrix_pins": {
         "cols": ["D7", "E6", "B4", "B5"],
         "rows": ["C6", "D4", "D0"]
diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/config.h b/keyboards/handwired/tractyl_manuform/4x6_right/config.h
index 971e75680e..a1cbfedc0c 100644
--- a/keyboards/handwired/tractyl_manuform/4x6_right/config.h
+++ b/keyboards/handwired/tractyl_manuform/4x6_right/config.h
@@ -19,7 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 // WS2812 RGB LED strip input and number of LEDs
-#define RGB_DI_PIN       E7
 #define RGB_MATRIX_LED_COUNT 62
 #define RGB_MATRIX_SPLIT { 32, 30 }
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/info.json b/keyboards/handwired/tractyl_manuform/4x6_right/info.json
index e0123bb019..55d17ee09b 100644
--- a/keyboards/handwired/tractyl_manuform/4x6_right/info.json
+++ b/keyboards/handwired/tractyl_manuform/4x6_right/info.json
@@ -17,6 +17,9 @@
             "matrix": [4, 5]
         }
     },
+    "ws2812": {
+        "pin": "E7"
+    },
     "processor": "at90usb1286",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/config.h
index b472107f42..428ecf02d7 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/config.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/config.h
@@ -19,7 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 // WS2812 RGB LED strip input and number of LEDs
-#define RGB_DI_PIN      D3
 #define RGBLED_NUM      20
 #define RGBLIGHT_SPLIT
 #define RGBLED_SPLIT \
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/info.json
index 7300efd02b..ae256b4e5d 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/info.json
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/info.json
@@ -13,6 +13,9 @@
     "split": {
         "soft_serial_pin": "D2"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu"
 }
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h
index 5ca6f5d958..2d05b71c92 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h
@@ -22,7 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define SPLIT_HAND_PIN      C14  // high = left, low = right
 
 // WS2812 RGB LED strip input and number of LEDs
-#define RGB_DI_PIN          A6
 #define WS2812_PWM_DRIVER   PWMD3  // default: PWMD2
 #define WS2812_PWM_CHANNEL  1      // default: 2
 #define WS2812_PWM_PAL_MODE 2      // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 2
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json
index 9b2dd813ca..0e0e020ddf 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json
@@ -6,6 +6,7 @@
     },
     "diode_direction": "COL2ROW",
     "ws2812": {
+        "pin": "A6",
         "driver": "pwm"
     },
     "encoder": {
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h
index d562a2a41c..2ab49de9fa 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h
@@ -22,7 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define SPLIT_HAND_PIN      C14  // high = left, low = right
 
 // WS2812 RGB LED strip input and number of LEDs
-#define RGB_DI_PIN          A1
 #define WS2812_PWM_DRIVER   PWMD2  // default: PWMD2
 #define WS2812_PWM_CHANNEL  2      // default: 2
 #define WS2812_PWM_PAL_MODE 1      // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 2
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json
index 214fb44125..671e3746c6 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json
@@ -6,6 +6,7 @@
     },
     "diode_direction": "COL2ROW",
     "ws2812": {
+        "pin": "A1",
         "driver": "pwm"
     },
     "encoder": {
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/config.h
index 069b6e876c..c917e37b4c 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/config.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/config.h
@@ -19,7 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 // WS2812 RGB LED strip input and number of LEDs
-#define RGB_DI_PIN      E7
 #define RGBLED_NUM      20
 #define RGBLIGHT_SPLIT
 #define RGBLED_SPLIT \
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/info.json
index facf346943..9b65179678 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/info.json
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/info.json
@@ -13,6 +13,9 @@
     "split": {
         "soft_serial_pin": "D2"
     },
+    "ws2812": {
+        "pin": "E7"
+    },
     "processor": "at90usb1286",
     "bootloader": "halfkay"
 }
diff --git a/keyboards/handwired/traveller/config.h b/keyboards/handwired/traveller/config.h
index c09d1503d9..8ac92c300c 100644
--- a/keyboards/handwired/traveller/config.h
+++ b/keyboards/handwired/traveller/config.h
@@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGB_DI_PIN B2
 #    define RGBLED_NUM 1
 #    define RGBLIGHT_HUE_STEP 10
 #    define RGBLIGHT_SAT_STEP 17
diff --git a/keyboards/handwired/traveller/info.json b/keyboards/handwired/traveller/info.json
index 9c7270c6de..b6598be8e8 100644
--- a/keyboards/handwired/traveller/info.json
+++ b/keyboards/handwired/traveller/info.json
@@ -8,6 +8,9 @@
         "pid": "0x6060",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B2"
+    },
     "matrix_pins": {
         "cols": ["B5", "D6", "B7", "B6", "F6", "B1", "B3", "F7", "B4", "E6", "D7", "C6", "D4"],
         "rows": ["D0", "D1", "D3", "D2"]
diff --git a/keyboards/handwired/tritium_numpad/config.h b/keyboards/handwired/tritium_numpad/config.h
index e2db822d67..838776b5eb 100644
--- a/keyboards/handwired/tritium_numpad/config.h
+++ b/keyboards/handwired/tritium_numpad/config.h
@@ -24,8 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* Underlight configuration
  */
-
-#define RGB_DI_PIN D2
 #define RGBLED_NUM 4     // Number of LEDs
 
 /*
diff --git a/keyboards/handwired/tritium_numpad/info.json b/keyboards/handwired/tritium_numpad/info.json
index ccbeae4d2a..e6c9010bfd 100644
--- a/keyboards/handwired/tritium_numpad/info.json
+++ b/keyboards/handwired/tritium_numpad/info.json
@@ -21,6 +21,9 @@
     "num_lock": "D5",
     "on_state": 0
   },
+  "ws2812": {
+    "pin": "D2"
+  },
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "community_layouts": ["numpad_6x4", "ortho_6x4"],
diff --git a/keyboards/handwired/tsubasa/config.h b/keyboards/handwired/tsubasa/config.h
index 7f21279edf..40f43d94c2 100644
--- a/keyboards/handwired/tsubasa/config.h
+++ b/keyboards/handwired/tsubasa/config.h
@@ -18,7 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 #define MASTER_RIGHT
 
-#define RGB_DI_PIN D2
 #    define RGBLED_NUM 12
 #    define RGBLIGHT_SPLIT
 #    define RGBLED_SPLIT {6, 6}
diff --git a/keyboards/handwired/tsubasa/info.json b/keyboards/handwired/tsubasa/info.json
index 1e5ba1eb8e..c78a1532a7 100644
--- a/keyboards/handwired/tsubasa/info.json
+++ b/keyboards/handwired/tsubasa/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0000",
         "device_version": "1.0.0"
     },
+    "ws2812": {
+        "pin": "D2"
+    },
     "matrix_pins": {
         "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
         "rows": ["C6", "D7", "E6", "B4", "B5"]
diff --git a/keyboards/handwired/unk/rev1/config.h b/keyboards/handwired/unk/rev1/config.h
index 177ad60ecd..de1208a7ec 100644
--- a/keyboards/handwired/unk/rev1/config.h
+++ b/keyboards/handwired/unk/rev1/config.h
@@ -25,9 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
-
 #define RGBLED_NUM 12    // Number of LEDs
 
 /*
diff --git a/keyboards/handwired/unk/rev1/info.json b/keyboards/handwired/unk/rev1/info.json
index 1faa61b706..da8c72203f 100644
--- a/keyboards/handwired/unk/rev1/info.json
+++ b/keyboards/handwired/unk/rev1/info.json
@@ -8,6 +8,9 @@
         "pid": "0x3060",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "matrix_pins": {
         "cols": ["B2", "B6", "D4", "C6", "D7", "E6", "B4", "B5"],
         "rows": ["F5", "B1", "F6", "B3", "F7"]
diff --git a/keyboards/handwired/uthol/rev2/config.h b/keyboards/handwired/uthol/rev2/config.h
index 744e66d948..bf9b590421 100644
--- a/keyboards/handwired/uthol/rev2/config.h
+++ b/keyboards/handwired/uthol/rev2/config.h
@@ -18,6 +18,5 @@
 #pragma once
 
 //RGB Stuff
-#define RGB_DI_PIN E6
 #define RGBLED_NUM 39
 #define RGBLIGHT_DEFAULT_HUE 201
diff --git a/keyboards/handwired/uthol/rev2/info.json b/keyboards/handwired/uthol/rev2/info.json
index bcefbb4956..7c46269579 100644
--- a/keyboards/handwired/uthol/rev2/info.json
+++ b/keyboards/handwired/uthol/rev2/info.json
@@ -3,6 +3,9 @@
     "usb": {
         "device_version": "0.0.2"
     },
+    "ws2812": {
+        "pin": "E6"
+    },
     "matrix_pins": {
         "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "B5", "B4", "B6", "B2", "B3"],
         "rows": ["B1", "F7", "F6", "F5", "F4"]
diff --git a/keyboards/handwired/uthol/rev3/config.h b/keyboards/handwired/uthol/rev3/config.h
index d7829f2fdc..dd7ef6a5a9 100644
--- a/keyboards/handwired/uthol/rev3/config.h
+++ b/keyboards/handwired/uthol/rev3/config.h
@@ -35,7 +35,6 @@
 #define PERMISSIVE_HOLD
 
 // RGB Stuff
-#define RGB_DI_PIN B0
 #define RGBLED_NUM 39
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/handwired/uthol/rev3/info.json b/keyboards/handwired/uthol/rev3/info.json
index 34c0a3503a..5ba12dc846 100644
--- a/keyboards/handwired/uthol/rev3/info.json
+++ b/keyboards/handwired/uthol/rev3/info.json
@@ -3,6 +3,9 @@
     "usb": {
         "device_version": "0.0.3"
     },
+    "ws2812": {
+        "pin": "B0"
+    },
     "matrix_pins": {
         "cols": ["B1", "B10", "B9", "B8", "B5", "B4", "B3", "A15", "B15", "B14", "B13", "B12"],
         "rows": ["A4", "A3", "A2", "A1", "A0"]