diff --git a/keyboards/4pplet/unextended_std/rev_a/info.json b/keyboards/4pplet/unextended_std/rev_a/info.json
index 458439e7b74f..9714783dae4d 100644
--- a/keyboards/4pplet/unextended_std/rev_a/info.json
+++ b/keyboards/4pplet/unextended_std/rev_a/info.json
@@ -33,7 +33,6 @@
     },
 
     "rgblight": {
-        "pin": "A8",
         "led_count": 16,
         "animations": {
             "alternating": true,
@@ -48,7 +47,9 @@
             "twinkle": true
         }
     },
-
+    "ws2812": {
+      "pin": "A8"
+    },
     "indicators": {
         "caps_lock": "A10",
         "on_state": 0
diff --git a/keyboards/cannonkeys/ripple/info.json b/keyboards/cannonkeys/ripple/info.json
index 63564ae7cea4..5a42532f7021 100644
--- a/keyboards/cannonkeys/ripple/info.json
+++ b/keyboards/cannonkeys/ripple/info.json
@@ -25,7 +25,6 @@
     },
     "rgblight": {
         "led_count": 20,
-        "pin": "B15",
         "hue_steps": 17,
         "saturation_steps": 17,
         "brightness_steps": 17,
@@ -36,6 +35,10 @@
             "rainbow_swirl": true
         }
     },
+    "ws2812": {
+      "pin": "B15",
+      "driver": "spi"
+    },
     "backlight": {
         "pin": "A6",
         "levels": 15,
diff --git a/keyboards/cannonkeys/ripple/rules.mk b/keyboards/cannonkeys/ripple/rules.mk
index 2f5938630cc4..2a5031cd3205 100644
--- a/keyboards/cannonkeys/ripple/rules.mk
+++ b/keyboards/cannonkeys/ripple/rules.mk
@@ -1,7 +1,5 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
 
-WS2812_DRIVER = spi
-
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/citrus/erdnuss65/info.json b/keyboards/citrus/erdnuss65/info.json
index a33d44561dc9..d94851befd5a 100644
--- a/keyboards/citrus/erdnuss65/info.json
+++ b/keyboards/citrus/erdnuss65/info.json
@@ -31,9 +31,11 @@
         "audio": false
     },
     "rgblight": {
-        "pin": "A15",
         "led_count": 1
     },
+    "ws2812": {
+      "pin": "A15"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/jacky_studio/piggy60/rev2/config.h b/keyboards/jacky_studio/piggy60/rev2/config.h
index 932983d173dd..fa884d5f1870 100644
--- a/keyboards/jacky_studio/piggy60/rev2/config.h
+++ b/keyboards/jacky_studio/piggy60/rev2/config.h
@@ -16,7 +16,6 @@
 
 #pragma once
 
-#define RGB_DI_PIN B9
 #define RGB_MATRIX_LED_COUNT 14
 
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
diff --git a/keyboards/jacky_studio/piggy60/rev2/info.json b/keyboards/jacky_studio/piggy60/rev2/info.json
index 142d4b7e76b3..91b28898eccf 100644
--- a/keyboards/jacky_studio/piggy60/rev2/info.json
+++ b/keyboards/jacky_studio/piggy60/rev2/info.json
@@ -20,6 +20,7 @@
     },
     "processor": "STM32F103",
     "ws2812": {
+        "pin": "B9",
         "driver": "pwm"
     },
     "rgb_matrix": {
diff --git a/keyboards/junco/rev1/config.h b/keyboards/junco/rev1/config.h
index d9c0556cdfec..aba464da6658 100644
--- a/keyboards/junco/rev1/config.h
+++ b/keyboards/junco/rev1/config.h
@@ -18,12 +18,9 @@
 
 /* RGB Stuff */
 #ifdef RGB_MATRIX_ENABLE
-
-#    define RGB_DI_PIN GP15 // Pin for RGB logic
 #    define RGB_MATRIX_LED_COUNT 74
 #    define RGB_MATRIX_SPLIT \
         { 37, 37 } // 37 LEDs on each side
-
 #endif
 
 /* Rotary Encoders Definition */
diff --git a/keyboards/junco/rev1/info.json b/keyboards/junco/rev1/info.json
new file mode 100644
index 000000000000..f3c6017f23c0
--- /dev/null
+++ b/keyboards/junco/rev1/info.json
@@ -0,0 +1,6 @@
+{
+  "ws2812": {
+    "pin": "GP15",
+    "driver": "vendor"
+  }
+}
diff --git a/keyboards/junco/rev1/rules.mk b/keyboards/junco/rev1/rules.mk
index feb836dbe1e0..b8e1234c6a76 100644
--- a/keyboards/junco/rev1/rules.mk
+++ b/keyboards/junco/rev1/rules.mk
@@ -1,3 +1,2 @@
 # RGB Stuff
 RGB_MATRIX_DRIVER = WS2812
-WS2812_DRIVER = vendor
diff --git a/keyboards/lxxt/info.json b/keyboards/lxxt/info.json
index 0a90b3e00bca..6942d446df67 100644
--- a/keyboards/lxxt/info.json
+++ b/keyboards/lxxt/info.json
@@ -21,7 +21,6 @@
         "cols": ["GP25", "GP23", "GP7", "GP0", "GP15", "GP14", "GP13", "GP12", "GP11", "GP10", "GP6", "GP5", "GP4", "GP3", "GP2", "GP1"]
     },
 	"rgblight": {
-	"pin": "GP21",
 	"led_count": 16,
 	"hue_steps": 8,
 	"saturation_steps": 8,
@@ -41,6 +40,10 @@
             "twinkle": true
         }
     },
+    "ws2812": {
+      "pin": "GP21",
+      "driver": "vendor"
+    },
     "diode_direction": "COL2ROW",
     "features": {
         "bootmagic": true,
@@ -130,4 +133,4 @@
 			]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/keyboards/lxxt/rules.mk b/keyboards/lxxt/rules.mk
index 7fbf8d36abf3..5af1ba85367f 100644
--- a/keyboards/lxxt/rules.mk
+++ b/keyboards/lxxt/rules.mk
@@ -1,3 +1 @@
 ENCODER_ENABLE = yes
-
-WS2812_DRIVER = vendor
diff --git a/keyboards/nullbitsco/snap/config.h b/keyboards/nullbitsco/snap/config.h
index ae0a5018becd..24e9340c0e3a 100644
--- a/keyboards/nullbitsco/snap/config.h
+++ b/keyboards/nullbitsco/snap/config.h
@@ -58,7 +58,6 @@
 #define MATRIX_EXT_PIN_RIGHT B6
 
 /* Optional SMT LED pins */
-#define RGB_DI_PIN B2
 #define RGBLED_NUM 10
 #define RGBLED_SPLIT { 5, 5 }
 #define RGBLIGHT_LED_MAP { 8, 9, 0, 1, 2, 6, 7, 3, 4, 5 }  
diff --git a/keyboards/nullbitsco/snap/info.json b/keyboards/nullbitsco/snap/info.json
index 6567ccde85a3..1598334724c6 100644
--- a/keyboards/nullbitsco/snap/info.json
+++ b/keyboards/nullbitsco/snap/info.json
@@ -10,6 +10,9 @@
     "debounce": 10,
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "ws2812": {
+      "pin": "B2"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [{"label":"Esc", "x":1, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6, "y":0}, {"label":"F6", "x":7, "y":0}, {"label":"F7", "x":8, "y":0}, {"label":"F8", "x":9, "y":0}, {"label":"F9", "x":10, "y":0}, {"label":"F10", "x":11, "y":0}, {"label":"F11", "x":12, "y":0}, {"label":"F12", "x":13, "y":0}, {"label":"PrtSc", "x":14, "y":0}, {"label":"Pause", "x":15, "y":0}, {"label":"M", "x":0, "y":1}, {"label":"~", "x":1, "y":1}, {"label":"!", "x":2, "y":1}, {"label":"@", "x":3, "y":1}, {"label":"#", "x":4, "y":1}, {"label":"$", "x":5, "y":1}, {"label":"%", "x":6, "y":1}, {"label":"^", "x":7, "y":1}, {"label":"&", "x":8, "y":1}, {"label":"*", "x":9, "y":1}, {"label":"(", "x":10, "y":1}, {"label":")", "x":11, "y":1}, {"label":"_", "x":12, "y":1}, {"label":"+", "x":13, "y":1}, {"label":"Bksp1", "x":14, "y":1}, {"label":"Bksp2", "x":15, "y":1}, {"label":"Home", "x":16, "y":1}, {"label":"M", "x":0, "y":2}, {"label":"Tab", "x":1, "y":2, "w":1.5}, {"label":"Q", "x":2.5, "y":2}, {"label":"W", "x":3.5, "y":2}, {"label":"E", "x":4.5, "y":2}, {"label":"R", "x":5.5, "y":2}, {"label":"T", "x":6.5, "y":2}, {"label":"Y", "x":7.5, "y":2}, {"label":"U", "x":8.5, "y":2}, {"label":"I", "x":9.5, "y":2}, {"label":"O", "x":10.5, "y":2}, {"label":"P", "x":11.5, "y":2}, {"label":"{", "x":12.5, "y":2}, {"label":"}", "x":13.5, "y":2}, {"label":"|", "x":14.5, "y":2, "w":1.5}, {"label":"End", "x":16, "y":2}, {"label":"M", "x":0, "y":3}, {"label":"Caps Lock", "x":1, "y":3, "w":1.75}, {"label":"A", "x":2.75, "y":3}, {"label":"S", "x":3.75, "y":3}, {"label":"D", "x":4.75, "y":3}, {"label":"F", "x":5.75, "y":3}, {"label":"G", "x":6.75, "y":3}, {"label":"H", "x":7.75, "y":3}, {"label":"J", "x":8.75, "y":3}, {"label":"K", "x":9.75, "y":3}, {"label":"L", "x":10.75, "y":3}, {"label":":", "x":11.75, "y":3}, {"label":"\"", "x":12.75, "y":3}, {"label":"Enter", "x":13.75, "y":3, "w":2.25}, {"label":"Page Up", "x":16, "y":3}, {"label":"M", "x":0, "y":4}, {"label":"Shift", "x":1, "y":4, "w":1.25}, {"label":"#", "x":2.25, "y":4}, {"label":"Z", "x":3.25, "y":4}, {"label":"X", "x":4.25, "y":4}, {"label":"C", "x":5.25, "y":4}, {"label":"V", "x":6.25, "y":4}, {"label":"B", "x":7.25, "y":4}, {"label":"N", "x":8.25, "y":4}, {"label":"M", "x":9.25, "y":4}, {"label":"<", "x":10.25, "y":4}, {"label":">", "x":11.25, "y":4}, {"label":"?", "x":12.25, "y":4}, {"label":"Shift", "x":13.25, "y":4, "w":1.75}, {"label":"\u2191", "x":15, "y":4}, {"label":"Page Down", "x":16, "y":4}, {"label":"M", "x":0, "y":5}, {"label":"Ctrl", "x":1, "y":5, "w":1.25}, {"label":"Win", "x":2.25, "y":5, "w":1.25}, {"label":"Alt", "x":3.5, "y":5, "w":1.25}, {"label":"Fn", "x":4.75, "y":5, "w":1.25}, {"label":"Space", "x":6, "y":5, "w":2.25}, {"label":"Space", "x":8.25, "y":5, "w":2.75}, {"label":"Alt", "x":11, "y":5}, {"label":"Fn", "x":12, "y":5}, {"label":"Ctrl", "x":13, "y":5}, {"label":"\u2190", "x":14, "y":5}, {"label":"\u2193", "x":15, "y":5}, {"label":"\u2192", "x":16, "y":5}]
diff --git a/keyboards/primekb/meridian/ktr1010/info.json b/keyboards/primekb/meridian/ktr1010/info.json
index 3a330b7306e6..7399fdc3d0cd 100644
--- a/keyboards/primekb/meridian/ktr1010/info.json
+++ b/keyboards/primekb/meridian/ktr1010/info.json
@@ -1,4 +1,7 @@
 {
+    "features": {
+      "rgblight": true
+    },
     "ws2812": {
         "pin": "B15"
     }
diff --git a/keyboards/primekb/meridian/meridian.c b/keyboards/primekb/meridian/meridian.c
index 8d94faf9eab9..aa5bd1bd35ec 100644
--- a/keyboards/primekb/meridian/meridian.c
+++ b/keyboards/primekb/meridian/meridian.c
@@ -24,11 +24,12 @@ void keyboard_pre_init_kb(void){
 }
 
 //Initialize all RGB indicators to 'off'
-__attribute__((weak))
-void keyboard_post_init_user(void) {
+#ifdef RGBLIGHT_ENABLE
+void keyboard_post_init_kb(void) {
     rgblight_setrgb_at(0, 0, 0, 0); // [..., 0] = top LED
     rgblight_setrgb_at(0, 0, 0, 1); // [..., 1] = middle LED
     rgblight_setrgb_at(0, 0, 0, 2); // [..., 2] = bottom LED
+    keyboard_post_init_user();
 }
 
 //Indicator light function
@@ -54,6 +55,7 @@ bool led_update_kb(led_t led_state) {
 }
     return res;
 }
+#endif
 
 //Below is an exmaple of layer indication using one of the RGB indicatiors. As configured, uses the bottom indicator (2) to light up red when layer 1 is in use. 
 /*
diff --git a/keyboards/primekb/meridian/rules.mk b/keyboards/primekb/meridian/rules.mk
index ead22f6c1558..0fa4a252142f 100644
--- a/keyboards/primekb/meridian/rules.mk
+++ b/keyboards/primekb/meridian/rules.mk
@@ -8,7 +8,6 @@ CONSOLE_ENABLE = yes        # Console for debug
 COMMAND_ENABLE = yes        # Commands for debug and configuration
 NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
diff --git a/keyboards/primekb/meridian/ws2812/info.json b/keyboards/primekb/meridian/ws2812/info.json
index 98702321171d..c356c6de571c 100644
--- a/keyboards/primekb/meridian/ws2812/info.json
+++ b/keyboards/primekb/meridian/ws2812/info.json
@@ -1,4 +1,7 @@
 {
+    "features": {
+      "rgblight": true
+    },
     "ws2812": {
         "pin": "B15",
         "driver": "spi"
diff --git a/keyboards/prototypist/oceanographer/info.json b/keyboards/prototypist/oceanographer/info.json
index 1f589a540be9..65d75e2a02d6 100644
--- a/keyboards/prototypist/oceanographer/info.json
+++ b/keyboards/prototypist/oceanographer/info.json
@@ -21,7 +21,6 @@
 
     "rgblight" : {
         "led_count": 3,
-        "pin": "B3",
         "sleep": true,
         "hue_steps": 10,
         "saturation_steps": 17,
@@ -31,7 +30,9 @@
             "breathing": true
         }
     },
-
+    "ws2812": {
+      "pin": "B3"
+    },
     "matrix_pins": {
         "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "B6", "B5", "B4", "D7", "D6", "D4"],
         "rows": ["B0", "D5", "D3", "D2"]
@@ -209,4 +210,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/keyboards/prototypist/oceanographer/rules.mk b/keyboards/prototypist/oceanographer/rules.mk
index 07ce0fe6c515..840dd0def161 100644
--- a/keyboards/prototypist/oceanographer/rules.mk
+++ b/keyboards/prototypist/oceanographer/rules.mk
@@ -3,5 +3,4 @@ OLED_DRIVER = SSD1306
 AUDIO_ENABLE = yes
 LTO_ENABLE = yes
 RGBLIGHT_ENABLE = yes
-RGBLIGHT_DRIVER = WS2812
 ENCODER_ENABLE = yes
diff --git a/keyboards/smithrune/iron160/iron160_h/info.json b/keyboards/smithrune/iron160/iron160_h/info.json
index 0c2886206814..d6339ec5dc3b 100644
--- a/keyboards/smithrune/iron160/iron160_h/info.json
+++ b/keyboards/smithrune/iron160/iron160_h/info.json
@@ -15,8 +15,10 @@
        "rows": ["A10", "A15", "C13", "A7" , "B0"]
    },
    "rgblight": {
-       "led_count": 1,
-       "pin": "B15"
+       "led_count": 1
+   },
+   "ws2812": {
+      "pin": "B15"
    },
    "diode_direction": "COL2ROW",
     "layouts": {
diff --git a/keyboards/viktus/osav2_numpad/info.json b/keyboards/viktus/osav2_numpad/info.json
index ed1c03c19ff9..dc46e0ecc2f1 100644
--- a/keyboards/viktus/osav2_numpad/info.json
+++ b/keyboards/viktus/osav2_numpad/info.json
@@ -29,7 +29,6 @@
     },
     "rgblight": {
         "led_count": 9,
-        "pin": "C7",
         "max_brightness": 191,
         "animations": {
             "breathing": true,
@@ -37,6 +36,9 @@
             "twinkle": true
         }
     },
+    "ws2812": {
+        "pin": "C7"
+    },
     "layouts": {
         "LAYOUT_all_split": {
             "layout": [