Move `RGB_MATRIX_DRIVER` to data driven (#20350)

author: Ryan <fauxpark@gmail.com> 2023-04-08 18:08:08 +1000
committer: GitHub <noreply@github.com> 2023-04-08 18:08:08 +1000
commit: 522048725f6b076bdad1251243c65dd2acf6595d (patch)
tree: 413c5356450048e072fc8b2528ea887ee180edc7
parent: 10fc6c4cd6d7463737801430e8c13b347e1b85c7 (diff)
833 files changed, 1250 insertions, 437 deletions
diff --git a/keyboards/1upkeyboards/super16/info.json b/keyboards/1upkeyboards/super16/info.json
index de377a1030..923f536ac8 100644
--- a/keyboards/1upkeyboards/super16/info.json
+++ b/keyboards/1upkeyboards/super16/info.json
@@ -11,6 +11,9 @@
  "ws2812": {
    "pin": "D3"
  },
+  "rgb_matrix": {
+    "driver": "WS2812"
+  },
  "matrix_pins": {
    "cols": ["D4", "C6", "F6", "F7"],
    "rows": ["D1", "D0", "F4", "F5"]
diff --git a/keyboards/1upkeyboards/super16/rules.mk b/keyboards/1upkeyboards/super16/rules.mk
index 373bf88ecf..b5532d03ff 100644
--- a/keyboards/1upkeyboards/super16/rules.mk
+++ b/keyboards/1upkeyboards/super16/rules.mk
@@ -10,5 +10,4 @@ NKRO_ENABLE = no            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no       # Enable keyboard RGB underglow
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/1upkeyboards/super16v2/info.json b/keyboards/1upkeyboards/super16v2/info.json
index ed56d36c6a..39a8eefcc4 100644
--- a/keyboards/1upkeyboards/super16v2/info.json
+++ b/keyboards/1upkeyboards/super16v2/info.json
@@ -11,6 +11,9 @@
    "ws2812": {
      "pin": "B5"
    },
+    "rgb_matrix": {
+      "driver": "WS2812"
+    },
    "matrix_pins": {
      "cols": ["D5", "D6", "C2", "D0"],
      "rows": ["D1", "D2", "D3", "D4"]
diff --git a/keyboards/1upkeyboards/super16v2/rules.mk b/keyboards/1upkeyboards/super16v2/rules.mk
index 2653d876b5..a7f5baf807 100644
--- a/keyboards/1upkeyboards/super16v2/rules.mk
+++ b/keyboards/1upkeyboards/super16v2/rules.mk
@@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 ENCODER_ENABLE = yes
 \ No newline at end of file
diff --git a/keyboards/25keys/zinc/info.json b/keyboards/25keys/zinc/info.json
index d8588e4182..1efe467be9 100644
--- a/keyboards/25keys/zinc/info.json
+++ b/keyboards/25keys/zinc/info.json
@@ -7,6 +7,9 @@
    "pid": "0xEA3B",
    "device_version": "0.0.1"
   },
+   "rgb_matrix": {
+     "driver": "WS2812"
+   },
  "processor": "atmega32u4",
  "bootloader": "caterina"
 }
diff --git a/keyboards/25keys/zinc/rules.mk b/keyboards/25keys/zinc/rules.mk
index 21bd83b609..1e1d687ebb 100644
--- a/keyboards/25keys/zinc/rules.mk
+++ b/keyboards/25keys/zinc/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 RGBLIGHT_ENABLE = no       # Enable WS2812 RGB underlight.  Do not enable this with audio at the same time.
 RGB_MATRIX_ENABLE = no
-RGB_MATRIX_DRIVER = WS2812
 DEFAULT_FOLDER = 25keys/zinc/rev1
diff --git a/keyboards/3keyecosystem/2key2/info.json b/keyboards/3keyecosystem/2key2/info.json
index c07a2615bb..f2d712072e 100644
--- a/keyboards/3keyecosystem/2key2/info.json
+++ b/keyboards/3keyecosystem/2key2/info.json
@@ -8,6 +8,9 @@
        "pid": "0x3304",
        "device_version": "0.0.1"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["F4", "D7"],
        "rows": ["F6"]
diff --git a/keyboards/3keyecosystem/2key2/rules.mk b/keyboards/3keyecosystem/2key2/rules.mk
index 1246683290..94674b71a1 100644
--- a/keyboards/3keyecosystem/2key2/rules.mk
+++ b/keyboards/3keyecosystem/2key2/rules.mk
@@ -10,5 +10,4 @@ NKRO_ENABLE = no            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 RGB_MATRIX_ENABLE = yes         # Enable RGB matrix
-RGB_MATRIX_DRIVER = WS2812      # Select WS2812 driver for RGB matrix
 AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/4pplet/perk60_iso/rev_a/info.json b/keyboards/4pplet/perk60_iso/rev_a/info.json
index 0710674dff..9470d0ffe3 100644
--- a/keyboards/4pplet/perk60_iso/rev_a/info.json
+++ b/keyboards/4pplet/perk60_iso/rev_a/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0009",
        "device_version": "0.0.1"
    },
+    "rgb_matrix": {
+        "driver": "IS31FL3733"
+    },
    "matrix_pins": {
        "cols": ["A1", "B12", "B14", "A2", "A0", "A3", "A4"],
        "rows": ["C14", "C13", "B5", "B4", "B8", "A15", "B3", "B9", "A5", "A7"]
diff --git a/keyboards/4pplet/perk60_iso/rev_a/rules.mk b/keyboards/4pplet/perk60_iso/rev_a/rules.mk
index dbdd70b907..d89fef7194 100644
--- a/keyboards/4pplet/perk60_iso/rev_a/rules.mk
+++ b/keyboards/4pplet/perk60_iso/rev_a/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3733
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/4pplet/unextended_std/rev_a/info.json b/keyboards/4pplet/unextended_std/rev_a/info.json
index 458439e7b7..1e88400947 100644
--- a/keyboards/4pplet/unextended_std/rev_a/info.json
+++ b/keyboards/4pplet/unextended_std/rev_a/info.json
@@ -32,8 +32,10 @@
        "audio": false
    },
+    "ws2812": {
+        "pin": "A8"
+    },
    "rgblight": {
-        "pin": "A8",
        "led_count": 16,
        "animations": {
            "alternating": true,
diff --git a/keyboards/abatskeyboardclub/nayeon/info.json b/keyboards/abatskeyboardclub/nayeon/info.json
index 87ffc589cc..d7e3718c0b 100644
--- a/keyboards/abatskeyboardclub/nayeon/info.json
+++ b/keyboards/abatskeyboardclub/nayeon/info.json
@@ -24,6 +24,9 @@
        "pin": "GP19",
        "driver": "vendor"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "processor": "RP2040",
    "bootloader": "rp2040",
    "diode_direction": "COL2ROW",
diff --git a/keyboards/abatskeyboardclub/nayeon/rules.mk b/keyboards/abatskeyboardclub/nayeon/rules.mk
index 2bbf6c169a..e458f33f3c 100644
--- a/keyboards/abatskeyboardclub/nayeon/rules.mk
+++ b/keyboards/abatskeyboardclub/nayeon/rules.mk
@@ -1,3 +1,2 @@
 # RGB Matrix
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/acheron/apollo/87h/delta/info.json b/keyboards/acheron/apollo/87h/delta/info.json
index e0b190582b..c2a702781b 100644
--- a/keyboards/acheron/apollo/87h/delta/info.json
+++ b/keyboards/acheron/apollo/87h/delta/info.json
@@ -7,6 +7,9 @@
    "ws2812": {
        "pin": "B15"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["C8", "C9", "A8", "A10", "C7", "C6", "B14", "B12", "B10", "B1", "C5", "C4", "A7", "B0", "C11", "A3", "B4"],
        "rows": ["B3", "D2", "C12", "A6", "A5", "A4"]
diff --git a/keyboards/acheron/apollo/87h/delta/rules.mk b/keyboards/acheron/apollo/87h/delta/rules.mk
index 0f7a9e78f7..ce1d65be0f 100644
--- a/keyboards/acheron/apollo/87h/delta/rules.mk
+++ b/keyboards/acheron/apollo/87h/delta/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE -DDEBUG_EEPROM_OUTPUT=TRUE
diff --git a/keyboards/acheron/apollo/87h/gamma/info.json b/keyboards/acheron/apollo/87h/gamma/info.json
index 3074aeb68e..f10a6adb67 100644
--- a/keyboards/acheron/apollo/87h/gamma/info.json
+++ b/keyboards/acheron/apollo/87h/gamma/info.json
@@ -4,6 +4,9 @@
        "pid": "0x8774",
        "device_version": "0.0.3"
    },
+    "rgb_matrix": {
+        "driver": "IS31FL3741"
+    },
    "matrix_pins": {
        "cols": ["B3", "A15", "A10", "A8", "B14", "B12", "B10", "B1", "B0", "A7", "A4", "A5", "A6", "C15", "A0", "A1"],
        "rows": ["C14", "C13", "B9", "B4", "A3", "A2"]
diff --git a/keyboards/acheron/apollo/87h/gamma/rules.mk b/keyboards/acheron/apollo/87h/gamma/rules.mk
index 419a95fe02..25c83bb136 100644
--- a/keyboards/acheron/apollo/87h/gamma/rules.mk
+++ b/keyboards/acheron/apollo/87h/gamma/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3741
 KEYBOARD_SHARED_EP = yes
 # Enter lower-power sleep mode when on the ChibiOS idle thread
diff --git a/keyboards/acheron/apollo/87htsc/info.json b/keyboards/acheron/apollo/87htsc/info.json
index 3248ada82f..5a140a7bdc 100644
--- a/keyboards/acheron/apollo/87htsc/info.json
+++ b/keyboards/acheron/apollo/87htsc/info.json
@@ -11,6 +11,9 @@
    "ws2812": {
        "pin": "B15"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["C8", "C9", "A8", "A10", "C7", "C6", "B14", "B12", "B10", "B1", "C5", "C4", "A7", "B0", "C11", "A3", "B4"],
        "rows": ["B3", "D2", "C12", "A6", "A5", "A4"]
diff --git a/keyboards/acheron/apollo/87htsc/rules.mk b/keyboards/acheron/apollo/87htsc/rules.mk
index 0f7a9e78f7..ce1d65be0f 100644
--- a/keyboards/acheron/apollo/87htsc/rules.mk
+++ b/keyboards/acheron/apollo/87htsc/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE -DDEBUG_EEPROM_OUTPUT=TRUE
diff --git a/keyboards/acheron/apollo/88htsc/info.json b/keyboards/acheron/apollo/88htsc/info.json
index 4e7b86ac72..9fc9210c80 100644
--- a/keyboards/acheron/apollo/88htsc/info.json
+++ b/keyboards/acheron/apollo/88htsc/info.json
@@ -11,6 +11,9 @@
    "ws2812": {
        "pin": "B15"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["C8", "C9", "A8", "A10", "C7", "C6", "B14", "B12", "B10", "B1", "C5", "C4", "A7", "B0", "C11", "A3", "B4"],
        "rows": ["B3", "D2", "C12", "A6", "A5", "A4"]
diff --git a/keyboards/acheron/apollo/88htsc/rules.mk b/keyboards/acheron/apollo/88htsc/rules.mk
index 0f7a9e78f7..ce1d65be0f 100644
--- a/keyboards/acheron/apollo/88htsc/rules.mk
+++ b/keyboards/acheron/apollo/88htsc/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE -DDEBUG_EEPROM_OUTPUT=TRUE
diff --git a/keyboards/adafruit/macropad/info.json b/keyboards/adafruit/macropad/info.json
index 0324d1e817..8982caaae3 100644
--- a/keyboards/adafruit/macropad/info.json
+++ b/keyboards/adafruit/macropad/info.json
@@ -13,6 +13,9 @@
            {"pin_a": "GP18", "pin_b": "GP17"}
        ]
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "bootmagic": {
        "matrix": [1, 2]
    },
diff --git a/keyboards/adafruit/macropad/rules.mk b/keyboards/adafruit/macropad/rules.mk
index 9dcc495526..23b15d77fc 100644
--- a/keyboards/adafruit/macropad/rules.mk
+++ b/keyboards/adafruit/macropad/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = yes          # Audio output
 AUDIO_DRIVER = pwm_hardware
 ENCODER_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 OLED_ENABLE = yes
 OLED_DRIVER = custom
 # Project specific files
diff --git a/keyboards/adm42/info.json b/keyboards/adm42/info.json
index 03396e96c0..3fc07a2c1c 100644
--- a/keyboards/adm42/info.json
+++ b/keyboards/adm42/info.json
@@ -12,6 +12,9 @@
    "ws2812": {
        "pin": "B7"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["C6", "B6", "B5", "B4", "D7", "D6", "F0", "F1", "F4", "F5", "F6", "F7"],
        "rows": ["C7", "D5", "D3", "D2"]
diff --git a/keyboards/adm42/rev4/rules.mk b/keyboards/adm42/rev4/rules.mk
index 9be57067bb..aad92997d0 100644
--- a/keyboards/adm42/rev4/rules.mk
+++ b/keyboards/adm42/rev4/rules.mk
@@ -1,2 +1 @@
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/adpenrose/akemipad/info.json b/keyboards/adpenrose/akemipad/info.json
index 50a0498f0e..6dc558c78e 100644
--- a/keyboards/adpenrose/akemipad/info.json
+++ b/keyboards/adpenrose/akemipad/info.json
@@ -10,6 +10,9 @@
    "ws2812": {
        "pin": "F4"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["D3", "D2", "F5", "F6", "B2"],
        "rows": ["D4", "D7", "E6", "B6", "B4", "B5"]
diff --git a/keyboards/adpenrose/akemipad/rules.mk b/keyboards/adpenrose/akemipad/rules.mk
index 9886164987..084dbaec05 100644
--- a/keyboards/adpenrose/akemipad/rules.mk
+++ b/keyboards/adpenrose/akemipad/rules.mk
@@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = yes          # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 ENCODER_ENABLE = yes
diff --git a/keyboards/aeboards/satellite/rev1/info.json b/keyboards/aeboards/satellite/rev1/info.json
index ae95239637..55575017d2 100644
--- a/keyboards/aeboards/satellite/rev1/info.json
+++ b/keyboards/aeboards/satellite/rev1/info.json
@@ -8,6 +8,9 @@
        "pid": "0x6553",
        "device_version": "0.0.1"
    },
+    "rgb_matrix": {
+        "driver": "custom"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "diode_direction": "COL2ROW",
diff --git a/keyboards/aeboards/satellite/rev1/rules.mk b/keyboards/aeboards/satellite/rev1/rules.mk
index 125682bac3..1a4657b08c 100644
--- a/keyboards/aeboards/satellite/rev1/rules.mk
+++ b/keyboards/aeboards/satellite/rev1/rules.mk
@@ -12,7 +12,6 @@ AUDIO_ENABLE = no           # Audio output
 LTO_ENABLE = yes
 RGB_MATRIX_ENABLE = yes     # Enable RGB matrix effects.
-RGB_MATRIX_DRIVER = custom  # Enable RGB matrix effects.
 COMMON_VPATH += $(DRIVER_PATH)/issi
diff --git a/keyboards/aleblazer/zodiark/info.json b/keyboards/aleblazer/zodiark/info.json
index fdec486aad..3df4fb4c34 100644
--- a/keyboards/aleblazer/zodiark/info.json
+++ b/keyboards/aleblazer/zodiark/info.json
@@ -11,6 +11,9 @@
    "ws2812": {
        "pin": "B5"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
        "rows": ["C6", "D7", "E6", "B4", "F4"]
diff --git a/keyboards/aleblazer/zodiark/rules.mk b/keyboards/aleblazer/zodiark/rules.mk
index 402cbe3fbb..3f1afb07c1 100644
--- a/keyboards/aleblazer/zodiark/rules.mk
+++ b/keyboards/aleblazer/zodiark/rules.mk
@@ -15,4 +15,3 @@ OLED_DRIVER = SSD1306    # Enable Support for SSD1306 or SH1106 OLED Displays; C
 ENCODER_ENABLE = yes
 SPLIT_KEYBOARD = yes
 LTO_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/annepro2/c15/info.json b/keyboards/annepro2/c15/info.json
index c5a0c2a13c..15c3ca8ba1 100644
--- a/keyboards/annepro2/c15/info.json
+++ b/keyboards/annepro2/c15/info.json
@@ -3,5 +3,8 @@
    "usb": {
        "pid": "0xAC15"
    },
+    "rgb_matrix": {
+        "driver": "custom"
+    },
    "community_layouts": ["60_ansi"]
 }
diff --git a/keyboards/annepro2/c15/rules.mk b/keyboards/annepro2/c15/rules.mk
index 5041eae512..05b715e034 100644
--- a/keyboards/annepro2/c15/rules.mk
+++ b/keyboards/annepro2/c15/rules.mk
@@ -32,7 +32,6 @@ WEAR_LEVELING_DRIVER = spi_flash
 # Custom RGB matrix handling
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = custom
 # Keys
 CUSTOM_MATRIX = lite
diff --git a/keyboards/annepro2/c18/info.json b/keyboards/annepro2/c18/info.json
index d3e6ef6989..f7acff808c 100644
--- a/keyboards/annepro2/c18/info.json
+++ b/keyboards/annepro2/c18/info.json
@@ -3,5 +3,8 @@
    "usb": {
        "pid": "0xAC18"
    },
+    "rgb_matrix": {
+        "driver": "custom"
+    },
    "community_layouts": ["60_ansi", "60_iso"]
 }
diff --git a/keyboards/annepro2/c18/rules.mk b/keyboards/annepro2/c18/rules.mk
index 7e1f904322..1d53851df6 100644
--- a/keyboards/annepro2/c18/rules.mk
+++ b/keyboards/annepro2/c18/rules.mk
@@ -32,7 +32,6 @@ WEAR_LEVELING_DRIVER = spi_flash
 # Custom RGB matrix handling
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = custom
 # Keys
 CUSTOM_MATRIX = lite
diff --git a/keyboards/atlantis/ak81_ve/info.json b/keyboards/atlantis/ak81_ve/info.json
index 111a3cbc31..f7c0c0b3a8 100644
--- a/keyboards/atlantis/ak81_ve/info.json
+++ b/keyboards/atlantis/ak81_ve/info.json
@@ -7,6 +7,9 @@
        "pid": "0x0081",
        "device_version": "0.0.1"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["F0", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "B2", "B7", "D3", "D2", "D1", "D0", "B3"],
        "rows": ["F1", "F7", "F6", "F5", "F4", "D5"]
diff --git a/keyboards/atlantis/ak81_ve/rules.mk b/keyboards/atlantis/ak81_ve/rules.mk
index 3a7c70a102..aaaf913b96 100644
--- a/keyboards/atlantis/ak81_ve/rules.mk
+++ b/keyboards/atlantis/ak81_ve/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no       # Keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 LTO_ENABLE = yes
 DYNAMIC_MACRO_ENABLE = yes
 ENCODER_ENABLE = yes
 \ No newline at end of file
diff --git a/keyboards/axolstudio/yeti/hotswap/info.json b/keyboards/axolstudio/yeti/hotswap/info.json
index 064d987d13..e65ab71e73 100644
--- a/keyboards/axolstudio/yeti/hotswap/info.json
+++ b/keyboards/axolstudio/yeti/hotswap/info.json
@@ -8,6 +8,9 @@
    "pid": "0x9F9E",
    "device_version": "0.0.1"
  },
+  "rgb_matrix": {
+    "driver": "IS31FL3733"
+  },
  "matrix_pins": {
    "cols": ["C7", "F7", "F6", "F5", "F4", "F1", "F0", "B0", "B1", "B2", "B3", "B7", "D2", "D3", "D5"],
    "rows": ["E6", "C6", "B4", "B5", "B6"]
diff --git a/keyboards/axolstudio/yeti/hotswap/rules.mk b/keyboards/axolstudio/yeti/hotswap/rules.mk
index 9a194e3724..154f1e5326 100644
--- a/keyboards/axolstudio/yeti/hotswap/rules.mk
+++ b/keyboards/axolstudio/yeti/hotswap/rules.mk
@@ -10,6 +10,5 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 RGB_MATRIX_ENABLE = yes     # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3733
 LTO_ENABLE = yes
diff --git a/keyboards/bandominedoni/info.json b/keyboards/bandominedoni/info.json
index 32d1f03f10..0f96714954 100644
--- a/keyboards/bandominedoni/info.json
+++ b/keyboards/bandominedoni/info.json
@@ -8,6 +8,9 @@
        "pid": "0xF4B5",
        "device_version": "0.0.1"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["D1", "E6", "F7", "B1", "B3", "B2", "D0"],
        "rows": ["B5", "B4", "D7", "F6", "C6", "D4"]
diff --git a/keyboards/bandominedoni/rules.mk b/keyboards/bandominedoni/rules.mk
index 18ccf846ec..c32d761f10 100644
--- a/keyboards/bandominedoni/rules.mk
+++ b/keyboards/bandominedoni/rules.mk
@@ -14,6 +14,5 @@ MIDI_ENABLE = yes           # MIDI support
 ENCODER_ENABLE = yes        # encoder on mute button
 SPLIT_KEYBOARD = yes        # Enables split keyboard support
 RGB_MATRIX_ENABLE = no      # Use RGB matrix (Don't enable this when RGBLIGHT_ENABLE is used.)
-RGB_MATRIX_DRIVER = WS2812  #
 LTO_ENABLE = yes
diff --git a/keyboards/bastardkb/charybdis/3x5/blackpill/info.json b/keyboards/bastardkb/charybdis/3x5/blackpill/info.json
index fec474f14d..3fc4587f36 100644
--- a/keyboards/bastardkb/charybdis/3x5/blackpill/info.json
+++ b/keyboards/bastardkb/charybdis/3x5/blackpill/info.json
@@ -3,6 +3,9 @@
    "usb": {
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "ws2812": {
        "pin": "A1",
        "driver": "pwm"
diff --git a/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk b/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk
index ca068abe74..c48862af2c 100644
--- a/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk
@@ -15,7 +15,6 @@ AUDIO_SUPPORTED = no        # Audio is not supported
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
-RGB_MATRIX_DRIVER = WS2812
 SPLIT_KEYBOARD = yes
diff --git a/keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json b/keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json
index ec56b88c02..80a68aea5d 100644
--- a/keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json
+++ b/keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json
@@ -6,6 +6,9 @@
    "ws2812": {
        "pin": "D3"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["C7", "F0", "D7", "E6", "B4"],
        "rows": ["B7", "C6", "D4", "B5"]
diff --git a/keyboards/bastardkb/charybdis/3x5/v1/elitec/rules.mk b/keyboards/bastardkb/charybdis/3x5/v1/elitec/rules.mk
index 1176b482ae..cc6c21e8d2 100644
--- a/keyboards/bastardkb/charybdis/3x5/v1/elitec/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x5/v1/elitec/rules.mk
@@ -15,7 +15,6 @@ AUDIO_SUPPORTED = no        # Audio is not supported
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
-RGB_MATRIX_DRIVER = WS2812
 # Charybdis nano is a split 3x5 keyboard with a maximum of 3 thumb keys (2 on
 # the trackball side).
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json b/keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json
index a318e467df..ee2692fa06 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json
+++ b/keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json
@@ -6,6 +6,9 @@
    "ws2812": {
        "pin": "D3"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["F5", "B6", "D7", "E6", "B4"],
        "rows": ["F7", "C6", "D4", "B5"]
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/elitec/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/elitec/rules.mk
index 1176b482ae..cc6c21e8d2 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/elitec/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x5/v2/elitec/rules.mk
@@ -15,7 +15,6 @@ AUDIO_SUPPORTED = no        # Audio is not supported
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
-RGB_MATRIX_DRIVER = WS2812
 # Charybdis nano is a split 3x5 keyboard with a maximum of 3 thumb keys (2 on
 # the trackball side).
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/info.json b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/info.json
index 100b53fc61..3feffac0ab 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/info.json
+++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/info.json
@@ -3,6 +3,9 @@
    "usb": {
        "device_version": "2.0.0"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["GP28", "GP15", "GP6", "GP7", "GP8"],
        "rows": ["GP26", "GP5", "GP4", "GP9"]
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/rules.mk
index 37e9d6c3b8..80098fbbf6 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/rules.mk
@@ -19,7 +19,6 @@ AUDIO_SUPPORTED = no        # Audio is not supported
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
-RGB_MATRIX_DRIVER = WS2812
 SPLIT_KEYBOARD = yes
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json
index 841975db3d..c80cd648c3 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json
+++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json
@@ -3,6 +3,9 @@
    "usb": {
        "device_version": "2.0.0"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["GP28", "GP21", "GP6", "GP7", "GP8"],
        "rows": ["GP26", "GP5", "GP4", "GP9"]
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/rules.mk
index 37e9d6c3b8..80098fbbf6 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/rules.mk
@@ -19,7 +19,6 @@ AUDIO_SUPPORTED = no        # Audio is not supported
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
-RGB_MATRIX_DRIVER = WS2812
 SPLIT_KEYBOARD = yes
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json
index 465f54b42e..7fd33fdc4d 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json
+++ b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json
@@ -3,6 +3,9 @@
    "usb": {
        "device_version": "2.0.0"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "ws2812": {
        "pin": "D3",
        "driver": "pwm"
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk
index 92ea9dfb4c..f10636573e 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk
@@ -17,7 +17,6 @@ AUDIO_SUPPORTED = no        # Audio is not supported
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
-RGB_MATRIX_DRIVER = WS2812
 SPLIT_KEYBOARD = yes
diff --git a/keyboards/bastardkb/charybdis/3x6/blackpill/info.json b/keyboards/bastardkb/charybdis/3x6/blackpill/info.json
index c46230b5a0..a02c176d5e 100644
--- a/keyboards/bastardkb/charybdis/3x6/blackpill/info.json
+++ b/keyboards/bastardkb/charybdis/3x6/blackpill/info.json
@@ -3,6 +3,9 @@
    "usb": {
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "ws2812": {
        "pin": "A1",
        "driver": "pwm"
diff --git a/keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk b/keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk
index ca068abe74..c48862af2c 100644
--- a/keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk
@@ -15,7 +15,6 @@ AUDIO_SUPPORTED = no        # Audio is not supported
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
-RGB_MATRIX_DRIVER = WS2812
 SPLIT_KEYBOARD = yes
diff --git a/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json b/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json
index b816551a3e..8fba6b33cd 100644
--- a/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json
+++ b/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json
@@ -6,6 +6,9 @@
    "ws2812": {
        "pin": "D3"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["D5", "C7", "F0", "D7", "E6", "B4"],
        "rows": ["B7", "C6", "D4", "B5"]
diff --git a/keyboards/bastardkb/charybdis/3x6/v1/elitec/rules.mk b/keyboards/bastardkb/charybdis/3x6/v1/elitec/rules.mk
index 7e5e593915..6862a8e309 100644
--- a/keyboards/bastardkb/charybdis/3x6/v1/elitec/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x6/v1/elitec/rules.mk
@@ -15,7 +15,6 @@ AUDIO_SUPPORTED = no        # Audio is not supported
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
-RGB_MATRIX_DRIVER = WS2812
 SPLIT_KEYBOARD = yes
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json b/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json
index e3aa2ae1bf..7822fbc36d 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json
+++ b/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json
@@ -6,6 +6,9 @@
    "ws2812": {
        "pin": "D3"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["F6", "F5", "B6", "D7", "E6", "B4"],
        "rows": ["F7", "C6", "D4", "B5"]
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/elitec/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/elitec/rules.mk
index 7e5e593915..6862a8e309 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/elitec/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x6/v2/elitec/rules.mk
@@ -15,7 +15,6 @@ AUDIO_SUPPORTED = no        # Audio is not supported
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
-RGB_MATRIX_DRIVER = WS2812
 SPLIT_KEYBOARD = yes
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json
index 4fd92418b3..f4b25121ef 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json
@@ -3,6 +3,9 @@
    "usb": {
        "device_version": "2.0.0"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["GP27", "GP28", "GP15", "GP6", "GP7", "GP8"],
        "rows": ["GP26", "GP5", "GP4", "GP9"]
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk
index 37e9d6c3b8..80098fbbf6 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk
@@ -19,7 +19,6 @@ AUDIO_SUPPORTED = no        # Audio is not supported
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
-RGB_MATRIX_DRIVER = WS2812
 SPLIT_KEYBOARD = yes
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json
index 7dc1bcc85f..8e9b413329 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json
@@ -3,6 +3,9 @@
    "usb": {
        "device_version": "2.0.0"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["GP27", "GP28", "GP21", "GP6", "GP7", "GP8"],
        "rows": ["GP26", "GP5", "GP4", "GP9"]
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk
index 37e9d6c3b8..80098fbbf6 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk
@@ -19,7 +19,6 @@ AUDIO_SUPPORTED = no        # Audio is not supported
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
-RGB_MATRIX_DRIVER = WS2812
 SPLIT_KEYBOARD = yes
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json
index 33f416b49d..e67aa0d640 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json
+++ b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json
@@ -3,6 +3,9 @@
    "usb": {
        "device_version": "2.0.0"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "ws2812": {
        "pin": "D3",
        "driver": "pwm"
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk
index 92ea9dfb4c..f10636573e 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk
@@ -17,7 +17,6 @@ AUDIO_SUPPORTED = no        # Audio is not supported
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
-RGB_MATRIX_DRIVER = WS2812
 SPLIT_KEYBOARD = yes
diff --git a/keyboards/bastardkb/charybdis/4x6/blackpill/info.json b/keyboards/bastardkb/charybdis/4x6/blackpill/info.json
index d70a2168d6..c6bff84bf5 100644
--- a/keyboards/bastardkb/charybdis/4x6/blackpill/info.json
+++ b/keyboards/bastardkb/charybdis/4x6/blackpill/info.json
@@ -3,6 +3,9 @@
    "usb": {
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "ws2812": {
        "pin": "A1",
        "driver": "pwm"
diff --git a/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk b/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk
index 2258d4d25a..8ac0939d01 100644
--- a/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk
+++ b/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk
@@ -15,7 +15,6 @@ AUDIO_SUPPORTED = no        # Audio is not supported.
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default.
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default.
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
-RGB_MATRIX_DRIVER = WS2812
 SPLIT_KEYBOARD = yes
diff --git a/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json b/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json
index 61c81c48d2..36f341e0e7 100644
--- a/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json
+++ b/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json
@@ -6,6 +6,9 @@
    "ws2812": {
        "pin": "D3"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["D5", "C7", "F0", "D7", "E6", "B4"],
        "rows": ["F1", "B7", "C6", "D4", "B5"]
diff --git a/keyboards/bastardkb/charybdis/4x6/v1/elitec/rules.mk b/keyboards/bastardkb/charybdis/4x6/v1/elitec/rules.mk
index f643c2d082..51c8c665e2 100644
--- a/keyboards/bastardkb/charybdis/4x6/v1/elitec/rules.mk
+++ b/keyboards/bastardkb/charybdis/4x6/v1/elitec/rules.mk
@@ -15,7 +15,6 @@ AUDIO_SUPPORTED = no        # Audio is not supported.
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default.
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default.
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
-RGB_MATRIX_DRIVER = WS2812
 # Charybdis is a split 4x6 keyboard with a maximum of 5 thumb keys (3 on the
 # trackball side).
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json b/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json
index 86011a1550..3043400b7b 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json
+++ b/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json
@@ -6,6 +6,9 @@
    "ws2812": {
        "pin": "D3"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["F6", "F5", "B6", "D7", "E6", "B4"],
        "rows": ["F4", "F7", "C6", "D4", "B5"]
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/elitec/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/elitec/rules.mk
index f643c2d082..51c8c665e2 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/elitec/rules.mk
+++ b/keyboards/bastardkb/charybdis/4x6/v2/elitec/rules.mk
@@ -15,7 +15,6 @@ AUDIO_SUPPORTED = no        # Audio is not supported.
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default.
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default.
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
-RGB_MATRIX_DRIVER = WS2812
 # Charybdis is a split 4x6 keyboard with a maximum of 5 thumb keys (3 on the
 # trackball side).
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/info.json b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/info.json
index 125865ee94..e6b47c984e 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/info.json
+++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/info.json
@@ -3,6 +3,9 @@
    "usb": {
        "device_version": "2.0.0"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["GP27", "GP28", "GP15", "GP6", "GP7", "GP8"],
        "rows": ["GP29", "GP26", "GP5", "GP4", "GP9"]
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/rules.mk
index 37e9d6c3b8..80098fbbf6 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/rules.mk
+++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/rules.mk
@@ -19,7 +19,6 @@ AUDIO_SUPPORTED = no        # Audio is not supported
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
-RGB_MATRIX_DRIVER = WS2812
 SPLIT_KEYBOARD = yes
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/info.json b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/info.json
index 2c9903f8be..7814c41976 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/info.json
+++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/info.json
@@ -3,6 +3,9 @@
    "usb": {
        "device_version": "2.0.0"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["GP27", "GP28", "GP21", "GP6", "GP7", "GP8"],
        "rows": ["GP29", "GP26", "GP5", "GP4", "GP9"]
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/rules.mk
index 37e9d6c3b8..80098fbbf6 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/rules.mk
+++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/rules.mk
@@ -19,7 +19,6 @@ AUDIO_SUPPORTED = no        # Audio is not supported
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
-RGB_MATRIX_DRIVER = WS2812
 SPLIT_KEYBOARD = yes
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json
index 298a111d38..723f8ae5b1 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json
+++ b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json
@@ -3,6 +3,9 @@
    "usb": {
        "device_version": "2.0.0"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "ws2812": {
        "pin": "D3",
        "driver": "pwm"
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk
index 92ea9dfb4c..f10636573e 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk
+++ b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk
@@ -17,7 +17,6 @@ AUDIO_SUPPORTED = no        # Audio is not supported
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
-RGB_MATRIX_DRIVER = WS2812
 SPLIT_KEYBOARD = yes
diff --git a/keyboards/bastardkb/dilemma/3x5_3/info.json b/keyboards/bastardkb/dilemma/3x5_3/info.json
index 153d3053f9..57ea2c16df 100644
--- a/keyboards/bastardkb/dilemma/3x5_3/info.json
+++ b/keyboards/bastardkb/dilemma/3x5_3/info.json
@@ -4,6 +4,9 @@
        "device_version": "2.0.0",
        "pid": "0x1835"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["GP8", "GP9", "GP7", "GP6", "GP28"],
        "rows": ["GP4", "GP5", "GP27", "GP26"]
diff --git a/keyboards/bastardkb/dilemma/3x5_3/rules.mk b/keyboards/bastardkb/dilemma/3x5_3/rules.mk
index b6f1398421..2b52cffbf7 100644
--- a/keyboards/bastardkb/dilemma/3x5_3/rules.mk
+++ b/keyboards/bastardkb/dilemma/3x5_3/rules.mk
@@ -15,7 +15,6 @@ AUDIO_SUPPORTED = no        # Audio is not supported
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = no     # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
-RGB_MATRIX_DRIVER = WS2812
 SERIAL_DRIVER = vendor
diff --git a/keyboards/bastardkb/scylla/blackpill/info.json b/keyboards/bastardkb/scylla/blackpill/info.json
index 0ae5cf86a0..8b65317104 100644
--- a/keyboards/bastardkb/scylla/blackpill/info.json
+++ b/keyboards/bastardkb/scylla/blackpill/info.json
@@ -3,6 +3,9 @@
    "usb": {
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "ws2812": {
        "pin": "A1",
        "driver": "pwm"
diff --git a/keyboards/bastardkb/scylla/blackpill/rules.mk b/keyboards/bastardkb/scylla/blackpill/rules.mk
index 35c9c4e11f..88d65fbb90 100644
--- a/keyboards/bastardkb/scylla/blackpill/rules.mk
+++ b/keyboards/bastardkb/scylla/blackpill/rules.mk
@@ -15,7 +15,6 @@ AUDIO_SUPPORTED = no        # Audio is not supported
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
-RGB_MATRIX_DRIVER = WS2812  # RGB matrix driver support
 SPLIT_KEYBOARD = yes
diff --git a/keyboards/bastardkb/scylla/v1/elitec/info.json b/keyboards/bastardkb/scylla/v1/elitec/info.json
index b53a0f5e76..ffac558bbc 100644
--- a/keyboards/bastardkb/scylla/v1/elitec/info.json
+++ b/keyboards/bastardkb/scylla/v1/elitec/info.json
@@ -6,6 +6,9 @@
    "ws2812": {
        "pin": "D2"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["B4", "E6", "C6", "B1", "B3", "B2"],
        "rows": ["D7", "B5", "F7", "F6", "B6"]
diff --git a/keyboards/bastardkb/scylla/v1/elitec/rules.mk b/keyboards/bastardkb/scylla/v1/elitec/rules.mk
index 985f9489c2..ba717ec115 100644
--- a/keyboards/bastardkb/scylla/v1/elitec/rules.mk
+++ b/keyboards/bastardkb/scylla/v1/elitec/rules.mk
@@ -15,6 +15,5 @@ AUDIO_SUPPORTED = no        # Audio is not supported
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)
-RGB_MATRIX_DRIVER = WS2812  # RGB matrix driver support
 SPLIT_KEYBOARD = yes
diff --git a/keyboards/bastardkb/scylla/v2/elitec/info.json b/keyboards/bastardkb/scylla/v2/elitec/info.json
index 5b5b152628..1a8643b27d 100644
--- a/keyboards/bastardkb/scylla/v2/elitec/info.json
+++ b/keyboards/bastardkb/scylla/v2/elitec/info.json
@@ -6,6 +6,9 @@
    "ws2812": {
        "pin": "D3"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["F6", "F5", "B6", "D7", "E6", "B4"],
        "rows": ["F4", "F7", "C6", "D4", "B5"]
diff --git a/keyboards/bastardkb/scylla/v2/elitec/rules.mk b/keyboards/bastardkb/scylla/v2/elitec/rules.mk
index 985f9489c2..ba717ec115 100644
--- a/keyboards/bastardkb/scylla/v2/elitec/rules.mk
+++ b/keyboards/bastardkb/scylla/v2/elitec/rules.mk
@@ -15,6 +15,5 @@ AUDIO_SUPPORTED = no        # Audio is not supported
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)
-RGB_MATRIX_DRIVER = WS2812  # RGB matrix driver support
 SPLIT_KEYBOARD = yes
diff --git a/keyboards/bastardkb/scylla/v2/splinky_2/info.json b/keyboards/bastardkb/scylla/v2/splinky_2/info.json
index 0617850d34..8ba2d4d19a 100644
--- a/keyboards/bastardkb/scylla/v2/splinky_2/info.json
+++ b/keyboards/bastardkb/scylla/v2/splinky_2/info.json
@@ -3,6 +3,9 @@
    "usb": {
        "device_version": "2.0.0"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["GP27", "GP28", "GP15", "GP6", "GP7", "GP8"],
        "rows": ["GP29", "GP26", "GP5", "GP4", "GP9"]
diff --git a/keyboards/bastardkb/scylla/v2/splinky_2/rules.mk b/keyboards/bastardkb/scylla/v2/splinky_2/rules.mk
index e60131bda0..274e95c039 100644
--- a/keyboards/bastardkb/scylla/v2/splinky_2/rules.mk
+++ b/keyboards/bastardkb/scylla/v2/splinky_2/rules.mk
@@ -19,7 +19,6 @@ AUDIO_SUPPORTED = no        # Audio is not supported
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
-RGB_MATRIX_DRIVER = WS2812
 SPLIT_KEYBOARD = yes
diff --git a/keyboards/bastardkb/scylla/v2/splinky_3/info.json b/keyboards/bastardkb/scylla/v2/splinky_3/info.json
index 71177d525a..c0cd88672b 100644
--- a/keyboards/bastardkb/scylla/v2/splinky_3/info.json
+++ b/keyboards/bastardkb/scylla/v2/splinky_3/info.json
@@ -3,6 +3,9 @@
    "usb": {
        "device_version": "2.0.0"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["GP27", "GP28", "GP21", "GP6", "GP7", "GP8"],
        "rows": ["GP29", "GP26", "GP5", "GP4", "GP9"]
diff --git a/keyboards/bastardkb/scylla/v2/splinky_3/rules.mk b/keyboards/bastardkb/scylla/v2/splinky_3/rules.mk
index e60131bda0..274e95c039 100644
--- a/keyboards/bastardkb/scylla/v2/splinky_3/rules.mk
+++ b/keyboards/bastardkb/scylla/v2/splinky_3/rules.mk
@@ -19,7 +19,6 @@ AUDIO_SUPPORTED = no        # Audio is not supported
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
-RGB_MATRIX_DRIVER = WS2812
 SPLIT_KEYBOARD = yes
diff --git a/keyboards/bastardkb/scylla/v2/stemcell/info.json b/keyboards/bastardkb/scylla/v2/stemcell/info.json
index f8167d7b20..2c66f25554 100644
--- a/keyboards/bastardkb/scylla/v2/stemcell/info.json
+++ b/keyboards/bastardkb/scylla/v2/stemcell/info.json
@@ -3,6 +3,9 @@
    "usb": {
        "device_version": "2.0.0"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "ws2812": {
        "pin": "D3",
        "driver": "pwm"
diff --git a/keyboards/bastardkb/scylla/v2/stemcell/rules.mk b/keyboards/bastardkb/scylla/v2/stemcell/rules.mk
index 2c92eda3f9..c42b71866e 100644
--- a/keyboards/bastardkb/scylla/v2/stemcell/rules.mk
+++ b/keyboards/bastardkb/scylla/v2/stemcell/rules.mk
@@ -17,7 +17,6 @@ AUDIO_SUPPORTED = no        # Audio is not supported
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
-RGB_MATRIX_DRIVER = WS2812
 SPLIT_KEYBOARD = yes
diff --git a/keyboards/bastardkb/skeletyl/blackpill/info.json b/keyboards/bastardkb/skeletyl/blackpill/info.json
index 7bc12bfd32..2bec7f1981 100644
--- a/keyboards/bastardkb/skeletyl/blackpill/info.json
+++ b/keyboards/bastardkb/skeletyl/blackpill/info.json
@@ -3,6 +3,9 @@
    "usb": {
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "ws2812": {
        "pin": "A1",
        "driver": "pwm"
diff --git a/keyboards/bastardkb/skeletyl/blackpill/rules.mk b/keyboards/bastardkb/skeletyl/blackpill/rules.mk
index 35c9c4e11f..88d65fbb90 100644
--- a/keyboards/bastardkb/skeletyl/blackpill/rules.mk
+++ b/keyboards/bastardkb/skeletyl/blackpill/rules.mk
@@ -15,7 +15,6 @@ AUDIO_SUPPORTED = no        # Audio is not supported
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
-RGB_MATRIX_DRIVER = WS2812  # RGB matrix driver support
 SPLIT_KEYBOARD = yes
diff --git a/keyboards/bastardkb/skeletyl/v1/elitec/info.json b/keyboards/bastardkb/skeletyl/v1/elitec/info.json
index f6b828f6e2..f81bca976e 100644
--- a/keyboards/bastardkb/skeletyl/v1/elitec/info.json
+++ b/keyboards/bastardkb/skeletyl/v1/elitec/info.json
@@ -6,6 +6,9 @@
    "ws2812": {
        "pin": "D2"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["E6", "C6", "B1", "B3", "B2"],
        "rows": ["B5", "F7", "F6", "B6"]
diff --git a/keyboards/bastardkb/skeletyl/v1/elitec/rules.mk b/keyboards/bastardkb/skeletyl/v1/elitec/rules.mk
index 985f9489c2..ba717ec115 100644
--- a/keyboards/bastardkb/skeletyl/v1/elitec/rules.mk
+++ b/keyboards/bastardkb/skeletyl/v1/elitec/rules.mk
@@ -15,6 +15,5 @@ AUDIO_SUPPORTED = no        # Audio is not supported
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)
-RGB_MATRIX_DRIVER = WS2812  # RGB matrix driver support
 SPLIT_KEYBOARD = yes
diff --git a/keyboards/bastardkb/skeletyl/v2/elitec/info.json b/keyboards/bastardkb/skeletyl/v2/elitec/info.json
index 191b47c80e..2c43204ace 100644
--- a/keyboards/bastardkb/skeletyl/v2/elitec/info.json
+++ b/keyboards/bastardkb/skeletyl/v2/elitec/info.json
@@ -6,6 +6,9 @@
    "ws2812": {
        "pin": "D3"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["F5", "B6", "D7", "E6", "B4"],
        "rows": ["F7", "C6", "D4", "B5"]
diff --git a/keyboards/bastardkb/skeletyl/v2/elitec/rules.mk b/keyboards/bastardkb/skeletyl/v2/elitec/rules.mk
index 985f9489c2..ba717ec115 100644
--- a/keyboards/bastardkb/skeletyl/v2/elitec/rules.mk
+++ b/keyboards/bastardkb/skeletyl/v2/elitec/rules.mk
@@ -15,6 +15,5 @@ AUDIO_SUPPORTED = no        # Audio is not supported
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)
-RGB_MATRIX_DRIVER = WS2812  # RGB matrix driver support
 SPLIT_KEYBOARD = yes
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_2/info.json b/keyboards/bastardkb/skeletyl/v2/splinky_2/info.json
index ef833a414e..023c4d553e 100644
--- a/keyboards/bastardkb/skeletyl/v2/splinky_2/info.json
+++ b/keyboards/bastardkb/skeletyl/v2/splinky_2/info.json
@@ -3,6 +3,9 @@
    "usb": {
        "device_version": "2.0.0"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["GP28", "GP15", "GP6", "GP7", "GP8"],
        "rows": ["GP26", "GP5", "GP4", "GP9"]
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_2/rules.mk b/keyboards/bastardkb/skeletyl/v2/splinky_2/rules.mk
index e60131bda0..274e95c039 100644
--- a/keyboards/bastardkb/skeletyl/v2/splinky_2/rules.mk
+++ b/keyboards/bastardkb/skeletyl/v2/splinky_2/rules.mk
@@ -19,7 +19,6 @@ AUDIO_SUPPORTED = no        # Audio is not supported
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
-RGB_MATRIX_DRIVER = WS2812
 SPLIT_KEYBOARD = yes
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_3/info.json b/keyboards/bastardkb/skeletyl/v2/splinky_3/info.json
index 8f75e99afe..56a00a3c3d 100644
--- a/keyboards/bastardkb/skeletyl/v2/splinky_3/info.json
+++ b/keyboards/bastardkb/skeletyl/v2/splinky_3/info.json
@@ -3,6 +3,9 @@
    "usb": {
        "device_version": "2.0.0"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["GP28", "GP21", "GP6", "GP7", "GP8"],
        "rows": ["GP26", "GP5", "GP4", "GP9"]
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_3/rules.mk b/keyboards/bastardkb/skeletyl/v2/splinky_3/rules.mk
index e60131bda0..274e95c039 100644
--- a/keyboards/bastardkb/skeletyl/v2/splinky_3/rules.mk
+++ b/keyboards/bastardkb/skeletyl/v2/splinky_3/rules.mk
@@ -19,7 +19,6 @@ AUDIO_SUPPORTED = no        # Audio is not supported
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
-RGB_MATRIX_DRIVER = WS2812
 SPLIT_KEYBOARD = yes
diff --git a/keyboards/bastardkb/skeletyl/v2/stemcell/info.json b/keyboards/bastardkb/skeletyl/v2/stemcell/info.json
index abd96fb434..cc4bcf887f 100644
--- a/keyboards/bastardkb/skeletyl/v2/stemcell/info.json
+++ b/keyboards/bastardkb/skeletyl/v2/stemcell/info.json
@@ -3,6 +3,9 @@
    "usb": {
        "device_version": "2.0.0"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "ws2812": {
        "pin": "D3",
        "driver": "pwm"
diff --git a/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk b/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk
index 2c92eda3f9..c42b71866e 100644
--- a/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk
+++ b/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk
@@ -17,7 +17,6 @@ AUDIO_SUPPORTED = no        # Audio is not supported
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
-RGB_MATRIX_DRIVER = WS2812
 SPLIT_KEYBOARD = yes
diff --git a/keyboards/bastardkb/tbkmini/blackpill/info.json b/keyboards/bastardkb/tbkmini/blackpill/info.json
index fd03d551ff..30a1b0ac94 100644
--- a/keyboards/bastardkb/tbkmini/blackpill/info.json
+++ b/keyboards/bastardkb/tbkmini/blackpill/info.json
@@ -3,6 +3,9 @@
    "usb": {
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "ws2812": {
        "pin": "A1",
        "driver": "pwm"
diff --git a/keyboards/bastardkb/tbkmini/blackpill/rules.mk b/keyboards/bastardkb/tbkmini/blackpill/rules.mk
index 35c9c4e11f..88d65fbb90 100644
--- a/keyboards/bastardkb/tbkmini/blackpill/rules.mk
+++ b/keyboards/bastardkb/tbkmini/blackpill/rules.mk
@@ -15,7 +15,6 @@ AUDIO_SUPPORTED = no        # Audio is not supported
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
-RGB_MATRIX_DRIVER = WS2812  # RGB matrix driver support
 SPLIT_KEYBOARD = yes
diff --git a/keyboards/bastardkb/tbkmini/v1/elitec/info.json b/keyboards/bastardkb/tbkmini/v1/elitec/info.json
index 0fe5c8655e..a5a90811ec 100644
--- a/keyboards/bastardkb/tbkmini/v1/elitec/info.json
+++ b/keyboards/bastardkb/tbkmini/v1/elitec/info.json
@@ -6,6 +6,9 @@
    "ws2812": {
        "pin": "D2"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["B4", "E6", "C6", "B1", "B3", "B2"],
        "rows": ["B5", "F7", "F6", "B6"]
diff --git a/keyboards/bastardkb/tbkmini/v1/elitec/rules.mk b/keyboards/bastardkb/tbkmini/v1/elitec/rules.mk
index 985f9489c2..ba717ec115 100644
--- a/keyboards/bastardkb/tbkmini/v1/elitec/rules.mk
+++ b/keyboards/bastardkb/tbkmini/v1/elitec/rules.mk
@@ -15,6 +15,5 @@ AUDIO_SUPPORTED = no        # Audio is not supported
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)
-RGB_MATRIX_DRIVER = WS2812  # RGB matrix driver support
 SPLIT_KEYBOARD = yes
diff --git a/keyboards/bastardkb/tbkmini/v2/elitec/info.json b/keyboards/bastardkb/tbkmini/v2/elitec/info.json
index d0691aef2e..28c30f9ab7 100644
--- a/keyboards/bastardkb/tbkmini/v2/elitec/info.json
+++ b/keyboards/bastardkb/tbkmini/v2/elitec/info.json
@@ -6,6 +6,9 @@
    "ws2812": {
        "pin": "D3"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["F6", "F5", "B6", "D7", "E6", "B4"],
        "rows": ["F7", "C6", "D4", "B5"]
diff --git a/keyboards/bastardkb/tbkmini/v2/elitec/rules.mk b/keyboards/bastardkb/tbkmini/v2/elitec/rules.mk
index 985f9489c2..ba717ec115 100644
--- a/keyboards/bastardkb/tbkmini/v2/elitec/rules.mk
+++ b/keyboards/bastardkb/tbkmini/v2/elitec/rules.mk
@@ -15,6 +15,5 @@ AUDIO_SUPPORTED = no        # Audio is not supported
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)
-RGB_MATRIX_DRIVER = WS2812  # RGB matrix driver support
 SPLIT_KEYBOARD = yes
diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_2/info.json b/keyboards/bastardkb/tbkmini/v2/splinky_2/info.json
index 80d8134f7e..1dc6607f3d 100644
--- a/keyboards/bastardkb/tbkmini/v2/splinky_2/info.json
+++ b/keyboards/bastardkb/tbkmini/v2/splinky_2/info.json
@@ -3,6 +3,9 @@
    "usb": {
        "device_version": "2.0.0"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["GP27", "GP28", "GP15", "GP6", "GP7", "GP8"],
        "rows": ["GP26", "GP5", "GP4", "GP9"]
diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_2/rules.mk b/keyboards/bastardkb/tbkmini/v2/splinky_2/rules.mk
index e60131bda0..274e95c039 100644
--- a/keyboards/bastardkb/tbkmini/v2/splinky_2/rules.mk
+++ b/keyboards/bastardkb/tbkmini/v2/splinky_2/rules.mk
@@ -19,7 +19,6 @@ AUDIO_SUPPORTED = no        # Audio is not supported
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
-RGB_MATRIX_DRIVER = WS2812
 SPLIT_KEYBOARD = yes
diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_3/info.json b/keyboards/bastardkb/tbkmini/v2/splinky_3/info.json
index a5717988c8..2c96b46c2a 100644
--- a/keyboards/bastardkb/tbkmini/v2/splinky_3/info.json
+++ b/keyboards/bastardkb/tbkmini/v2/splinky_3/info.json
@@ -3,6 +3,9 @@
    "usb": {
        "device_version": "2.0.0"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["GP27", "GP28", "GP21", "GP6", "GP7", "GP8"],
        "rows": ["GP26", "GP5", "GP4", "GP9"]
diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_3/rules.mk b/keyboards/bastardkb/tbkmini/v2/splinky_3/rules.mk
index e60131bda0..274e95c039 100644
--- a/keyboards/bastardkb/tbkmini/v2/splinky_3/rules.mk
+++ b/keyboards/bastardkb/tbkmini/v2/splinky_3/rules.mk
@@ -19,7 +19,6 @@ AUDIO_SUPPORTED = no        # Audio is not supported
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
-RGB_MATRIX_DRIVER = WS2812
 SPLIT_KEYBOARD = yes
diff --git a/keyboards/bastardkb/tbkmini/v2/stemcell/info.json b/keyboards/bastardkb/tbkmini/v2/stemcell/info.json
index cdfc6273a0..ae8a3c4d88 100644
--- a/keyboards/bastardkb/tbkmini/v2/stemcell/info.json
+++ b/keyboards/bastardkb/tbkmini/v2/stemcell/info.json
@@ -3,6 +3,9 @@
    "usb": {
        "device_version": "2.0.0"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "ws2812": {
        "pin": "D3",
        "driver": "pwm"
diff --git a/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk b/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk
index 2c92eda3f9..c42b71866e 100644
--- a/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk
+++ b/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk
@@ -17,7 +17,6 @@ AUDIO_SUPPORTED = no        # Audio is not supported
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
-RGB_MATRIX_DRIVER = WS2812
 SPLIT_KEYBOARD = yes
diff --git a/keyboards/black_hellebore/info.json b/keyboards/black_hellebore/info.json
index 63d1d9418b..f7d35c58fd 100644
--- a/keyboards/black_hellebore/info.json
+++ b/keyboards/black_hellebore/info.json
@@ -28,7 +28,8 @@
        "pid": "0x4467",
        "vid": "0x3141"
    },
-    "rgb_matrix": {             
+    "rgb_matrix": {     
+        "driver": "WS2812",
        "layout": [
            { "flags": 4, "matrix": [0, 0] , "x": 7  , "y": 5 } ,
            { "flags": 4, "matrix": [0, 1] , "x": 22 , "y": 5 } ,
diff --git a/keyboards/black_hellebore/rules.mk b/keyboards/black_hellebore/rules.mk
index 32afd21635..e69de29bb2 100644
--- a/keyboards/black_hellebore/rules.mk
+++ b/keyboards/black_hellebore/rules.mk
@@ -1 +0,0 @@
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/blockboy/ac980mini/info.json b/keyboards/blockboy/ac980mini/info.json
index f2bb4beb94..1f1e88afe5 100644
--- a/keyboards/blockboy/ac980mini/info.json
+++ b/keyboards/blockboy/ac980mini/info.json
@@ -18,6 +18,9 @@
    "ws2812": {
        "pin": "B7"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "layouts": {
        "LAYOUT_all": {
            "layout": [
diff --git a/keyboards/blockboy/ac980mini/rules.mk b/keyboards/blockboy/ac980mini/rules.mk
index e564d512da..6111d23a8c 100644
--- a/keyboards/blockboy/ac980mini/rules.mk
+++ b/keyboards/blockboy/ac980mini/rules.mk
@@ -12,5 +12,4 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 LTO_ENABLE = yes
diff --git a/keyboards/boardsource/beiwagon/info.json b/keyboards/boardsource/beiwagon/info.json
index dc5f8cc20f..ac0e023c44 100644
--- a/keyboards/boardsource/beiwagon/info.json
+++ b/keyboards/boardsource/beiwagon/info.json
@@ -25,6 +25,7 @@
    "vid": "0x4273"
  },
  "rgb_matrix": {
+    "driver": "WS2812",
    "layout": [
      { "flags": 2, "x": 16, "y": 38 },
      { "flags": 2, "x": 16, "y": 113 },
diff --git a/keyboards/boardsource/beiwagon/rules.mk b/keyboards/boardsource/beiwagon/rules.mk
index 32afd21635..e69de29bb2 100644
--- a/keyboards/boardsource/beiwagon/rules.mk
+++ b/keyboards/boardsource/beiwagon/rules.mk
@@ -1 +0,0 @@
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/boardsource/microdox/v2/info.json b/keyboards/boardsource/microdox/v2/info.json
index 9d7e25dee4..ca9b976023 100644
--- a/keyboards/boardsource/microdox/v2/info.json
+++ b/keyboards/boardsource/microdox/v2/info.json
@@ -35,6 +35,7 @@
    }
  },
  "rgb_matrix": {
+    "driver": "WS2812",
    "layout": [
      { "flags": 2, "x": 12, "y": 11 },
      { "flags": 2, "x": 86, "y": 11 },
diff --git a/keyboards/boardsource/microdox/v2/rules.mk b/keyboards/boardsource/microdox/v2/rules.mk
index 32afd21635..e69de29bb2 100644
--- a/keyboards/boardsource/microdox/v2/rules.mk
+++ b/keyboards/boardsource/microdox/v2/rules.mk
@@ -1 +0,0 @@
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/boardsource/technik_o/info.json b/keyboards/boardsource/technik_o/info.json
index af8d16a020..df0dbd63a5 100644
--- a/keyboards/boardsource/technik_o/info.json
+++ b/keyboards/boardsource/technik_o/info.json
@@ -25,7 +25,8 @@
    "pid": "0x0079",
    "vid": "0x4273"
  },
-  "rgb_matrix": { 
+  "rgb_matrix": {
+    "driver": "WS2812",
    "layout": [
      { "flags": 2, "x": 220, "y": 17 },
      { "flags": 2, "x": 172, "y": 17 },
diff --git a/keyboards/boardsource/technik_o/rules.mk b/keyboards/boardsource/technik_o/rules.mk
index 32afd21635..e69de29bb2 100644
--- a/keyboards/boardsource/technik_o/rules.mk
+++ b/keyboards/boardsource/technik_o/rules.mk
@@ -1 +0,0 @@
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/boardsource/technik_s/info.json b/keyboards/boardsource/technik_s/info.json
index d55979b5c5..089acc9397 100644
--- a/keyboards/boardsource/technik_s/info.json
+++ b/keyboards/boardsource/technik_s/info.json
@@ -26,6 +26,7 @@
    "vid": "0x4273"
  },
  "rgb_matrix": {
+    "driver": "WS2812",
    "layout": [
      { "flags": 2, "x": 220, "y": 17 },
      { "flags": 2, "x": 172, "y": 17 },
diff --git a/keyboards/boardsource/technik_s/rules.mk b/keyboards/boardsource/technik_s/rules.mk
index 32afd21635..e69de29bb2 100644
--- a/keyboards/boardsource/technik_s/rules.mk
+++ b/keyboards/boardsource/technik_s/rules.mk
@@ -1 +0,0 @@
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/boardsource/the_mark/info.json b/keyboards/boardsource/the_mark/info.json
index f0097f8141..c73d93fa9d 100644
--- a/keyboards/boardsource/the_mark/info.json
+++ b/keyboards/boardsource/the_mark/info.json
@@ -43,6 +43,7 @@
    "pin": "C6"
  },
  "rgb_matrix": {
+    "driver": "WS2812",
    "layout": [
      { "flags": 2, "x": 224, "y": 42},
      { "flags": 2, "x": 224, "y": 21},
diff --git a/keyboards/boardsource/the_mark/rules.mk b/keyboards/boardsource/the_mark/rules.mk
index 32afd21635..e69de29bb2 100644
--- a/keyboards/boardsource/the_mark/rules.mk
+++ b/keyboards/boardsource/the_mark/rules.mk
@@ -1 +0,0 @@
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/boston_meetup/2019/info.json b/keyboards/boston_meetup/2019/info.json
index 609a917b75..d50e92e17c 100644
--- a/keyboards/boston_meetup/2019/info.json
+++ b/keyboards/boston_meetup/2019/info.json
@@ -2,6 +2,9 @@
    "usb": {
        "device_version": "20.1.9"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["A7", "A8", "B2", "B10"],
        "rows": ["A3", "B8", "B9", "B1"]
diff --git a/keyboards/boston_meetup/2019/rules.mk b/keyboards/boston_meetup/2019/rules.mk
index a32fadf0b0..b2f1131ffd 100644
--- a/keyboards/boston_meetup/2019/rules.mk
+++ b/keyboards/boston_meetup/2019/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 AUDIO_ENABLE = yes          # Audio output
 RGBLIGHT_ENABLE = no
 RGB_MATRIX_ENABLE = no
-RGB_MATRIX_DRIVER = WS2812
 HAPTIC_ENABLE = yes
 HAPTIC_DRIVER = DRV2605L
 OLED_ENABLE = yes
diff --git a/keyboards/bubble75/hotswap/info.json b/keyboards/bubble75/hotswap/info.json
index 27dd4fb20e..fd913dfecf 100644
--- a/keyboards/bubble75/hotswap/info.json
+++ b/keyboards/bubble75/hotswap/info.json
@@ -11,6 +11,9 @@
    "ws2812": {
        "pin": "B7"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["B0", "B1", "B2", "B3", "E6", "F0", "D0", "D1", "D4", "D6", "D7", "B4", "B5", "B6", "C6"],
        "rows": ["F4", "F5", "F6", "F7", "C7", "F1"]
diff --git a/keyboards/bubble75/hotswap/rules.mk b/keyboards/bubble75/hotswap/rules.mk
index d8dc7dca6f..c11ab0df94 100644
--- a/keyboards/bubble75/hotswap/rules.mk
+++ b/keyboards/bubble75/hotswap/rules.mk
@@ -9,5 +9,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 NO_USB_STARTUP_CHECK = yes
 \ No newline at end of file
diff --git a/keyboards/canary/canary60rgb/info.json b/keyboards/canary/canary60rgb/info.json
index c9e9224e0d..20ce131329 100644
--- a/keyboards/canary/canary60rgb/info.json
+++ b/keyboards/canary/canary60rgb/info.json
@@ -11,6 +11,9 @@
    "ws2812": {
        "pin": "B6"
    },
+    "rgb_matrix": {
+        "driver": "IS31FL3733"
+    },
    "matrix_pins": {
        "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"],
        "rows": ["F5", "F4", "F1", "B3", "B2"]
diff --git a/keyboards/canary/canary60rgb/v1/rules.mk b/keyboards/canary/canary60rgb/v1/rules.mk
index 66e5cfa2ae..3bbc926379 100644
--- a/keyboards/canary/canary60rgb/v1/rules.mk
+++ b/keyboards/canary/canary60rgb/v1/rules.mk
@@ -11,6 +11,5 @@ BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes          # Enable keyboard RGB underglow
 AUDIO_ENABLE = no              # Audio output
 RGB_MATRIX_ENABLE = yes        # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3733
 LTO_ENABLE = yes
diff --git a/keyboards/cannonkeys/ripple/info.json b/keyboards/cannonkeys/ripple/info.json
index 63564ae7ce..66ca4e8695 100644
--- a/keyboards/cannonkeys/ripple/info.json
+++ b/keyboards/cannonkeys/ripple/info.json
@@ -23,9 +23,12 @@
        "backlight": true,
        "rgblight": true
    },
+    "ws2812": {
+        "pin": "B15",
+        "driver": "spi"
+    },
    "rgblight": {
        "led_count": 20,
-        "pin": "B15",
        "hue_steps": 17,
        "saturation_steps": 17,
        "brightness_steps": 17,
diff --git a/keyboards/cannonkeys/ripple/rules.mk b/keyboards/cannonkeys/ripple/rules.mk
index 2f5938630c..2a5031cd32 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/capsunlocked/cu80/v2_ansi/rgb/info.json b/keyboards/capsunlocked/cu80/v2_ansi/rgb/info.json
index 52676aa041..45b4b9c8cd 100644
--- a/keyboards/capsunlocked/cu80/v2_ansi/rgb/info.json
+++ b/keyboards/capsunlocked/cu80/v2_ansi/rgb/info.json
@@ -3,6 +3,9 @@
  "features": {
    "rgblight": false
  },
+  "rgb_matrix": {
+    "driver": "WS2812"
+  },
  "usb": {
    "pid": "0x0082"
  }
diff --git a/keyboards/capsunlocked/cu80/v2_ansi/rgb/rules.mk b/keyboards/capsunlocked/cu80/v2_ansi/rgb/rules.mk
index d213c84de3..9470477f49 100644
--- a/keyboards/capsunlocked/cu80/v2_ansi/rgb/rules.mk
+++ b/keyboards/capsunlocked/cu80/v2_ansi/rgb/rules.mk
@@ -1,4 +1,3 @@
 RGB_MATRIX_ENABLE = yes     # Enable RGB matrix
-RGB_MATRIX_DRIVER = WS2812  # Set Driver to WS2812
 LTO_ENABLE = yes
diff --git a/keyboards/capsunlocked/cu80/v2_iso/rgb/info.json b/keyboards/capsunlocked/cu80/v2_iso/rgb/info.json
index e04971c21a..4f08f6116a 100644
--- a/keyboards/capsunlocked/cu80/v2_iso/rgb/info.json
+++ b/keyboards/capsunlocked/cu80/v2_iso/rgb/info.json
@@ -3,6 +3,9 @@
  "features": {
    "rgblight": false
  },
+  "rgb_matrix": {
+    "driver": "WS2812"
+  },
  "usb": {
    "pid": "0x0083"
  }
diff --git a/keyboards/capsunlocked/cu80/v2_iso/rgb/rules.mk b/keyboards/capsunlocked/cu80/v2_iso/rgb/rules.mk
index d213c84de3..9470477f49 100644
--- a/keyboards/capsunlocked/cu80/v2_iso/rgb/rules.mk
+++ b/keyboards/capsunlocked/cu80/v2_iso/rgb/rules.mk
@@ -1,4 +1,3 @@
 RGB_MATRIX_ENABLE = yes     # Enable RGB matrix
-RGB_MATRIX_DRIVER = WS2812  # Set Driver to WS2812
 LTO_ENABLE = yes
diff --git a/keyboards/checkerboards/quark_lp/info.json b/keyboards/checkerboards/quark_lp/info.json
index da801bd13e..264bddad12 100644
--- a/keyboards/checkerboards/quark_lp/info.json
+++ b/keyboards/checkerboards/quark_lp/info.json
@@ -11,6 +11,9 @@
    "ws2812": {
        "pin": "C2"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["B6", "B5", "B4", "B3", "B0", "D6", "D5", "D4", "D3", "D2", "D1", "D0"],
        "rows": ["C5", "C4", "C6", "C7"]
diff --git a/keyboards/checkerboards/quark_lp/rules.mk b/keyboards/checkerboards/quark_lp/rules.mk
index b1d915ebb5..f868af936d 100644
--- a/keyboards/checkerboards/quark_lp/rules.mk
+++ b/keyboards/checkerboards/quark_lp/rules.mk
@@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/cherrybstudio/cb87rgb/info.json b/keyboards/cherrybstudio/cb87rgb/info.json
index bdf1fb1c27..bbdbfde9a9 100644
--- a/keyboards/cherrybstudio/cb87rgb/info.json
+++ b/keyboards/cherrybstudio/cb87rgb/info.json
@@ -11,6 +11,9 @@
    "ws2812": {
        "pin": "E6"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "F5", "C6", "C7", "F7"],
        "rows": ["B0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "F6"]
diff --git a/keyboards/cherrybstudio/cb87rgb/rules.mk b/keyboards/cherrybstudio/cb87rgb/rules.mk
index 02c7c58f15..2539b3f85f 100644
--- a/keyboards/cherrybstudio/cb87rgb/rules.mk
+++ b/keyboards/cherrybstudio/cb87rgb/rules.mk
@@ -12,4 +12,3 @@ RGBLIGHT_ENABLE = no       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/chromatonemini/info.json b/keyboards/chromatonemini/info.json
index ad33101816..e81e52e6c0 100644
--- a/keyboards/chromatonemini/info.json
+++ b/keyboards/chromatonemini/info.json
@@ -20,6 +20,9 @@
    "ws2812": {
        "pin": "D3"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "diode_direction": "COL2ROW",
    "matrix_pins": {
        "cols": [ "F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6" ],
diff --git a/keyboards/chromatonemini/rules.mk b/keyboards/chromatonemini/rules.mk
index 0e94fdb0d7..4da205a168 100644
--- a/keyboards/chromatonemini/rules.mk
+++ b/keyboards/chromatonemini/rules.mk
@@ -1,2 +1 @@
-RGB_MATRIX_DRIVER = WS2812  #
 LTO_ENABLE = yes
diff --git a/keyboards/citrus/erdnuss65/info.json b/keyboards/citrus/erdnuss65/info.json
index a33d44561d..512b4ba960 100644
--- a/keyboards/citrus/erdnuss65/info.json
+++ b/keyboards/citrus/erdnuss65/info.json
@@ -30,8 +30,10 @@
        "rgblight": true,
        "audio": false
    },
+    "ws2812": {
+        "pin": "A15"
+    },
    "rgblight": {
-        "pin": "A15",
        "led_count": 1
    },
    "layouts": {
diff --git a/keyboards/crkbd/info.json b/keyboards/crkbd/info.json
index 0f254d380f..94b5f18083 100644
--- a/keyboards/crkbd/info.json
+++ b/keyboards/crkbd/info.json
@@ -8,6 +8,9 @@
    "pid": "0x0001",
    "device_version": "0.0.1"
  },
+  "rgb_matrix": {
+    "driver": "WS2812"
+  },
  "matrix_pins": {
    "cols": ["F4", "F5", "F6", "F7", "B1", "B3"],
    "rows": ["D4", "C6", "D7", "E6"]
diff --git a/keyboards/crkbd/rules.mk b/keyboards/crkbd/rules.mk
index 8feaf50a07..89dbcd35bd 100644
--- a/keyboards/crkbd/rules.mk
+++ b/keyboards/crkbd/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = no
-RGB_MATRIX_DRIVER = WS2812
 LTO_ENABLE = yes
 # if firmware size over limit, try this option
diff --git a/keyboards/dekunukem/duckypad/info.json b/keyboards/dekunukem/duckypad/info.json
index d6d971dcf4..e5859b718a 100644
--- a/keyboards/dekunukem/duckypad/info.json
+++ b/keyboards/dekunukem/duckypad/info.json
@@ -11,6 +11,9 @@
    "ws2812": {
        "pin": "A10"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "processor": "STM32F072",
    "bootloader": "stm32-dfu",
    "matrix_pins": {
diff --git a/keyboards/dekunukem/duckypad/rules.mk b/keyboards/dekunukem/duckypad/rules.mk
index 4b467eb944..d9bd708a95 100644
--- a/keyboards/dekunukem/duckypad/rules.mk
+++ b/keyboards/dekunukem/duckypad/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 OLED_ENABLE = yes
 OLED_DRIVER = SSD1306
diff --git a/keyboards/deng/djam/info.json b/keyboards/deng/djam/info.json
index ef1b783d96..4a5cd78f19 100644
--- a/keyboards/deng/djam/info.json
+++ b/keyboards/deng/djam/info.json
@@ -8,6 +8,9 @@
        "pid": "0x7325",
        "device_version": "0.0.1"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
        "rows": ["F0", "F1", "F4"]
diff --git a/keyboards/deng/djam/rules.mk b/keyboards/deng/djam/rules.mk
index 42a6d2bd1b..150b7c690d 100644
--- a/keyboards/deng/djam/rules.mk
+++ b/keyboards/deng/djam/rules.mk
@@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/deng/thirty/info.json b/keyboards/deng/thirty/info.json
index 9bfcfad411..1d9b018e6b 100644
--- a/keyboards/deng/thirty/info.json
+++ b/keyboards/deng/thirty/info.json
@@ -8,6 +8,9 @@
        "pid": "0x7342",
        "device_version": "0.0.1"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["B13", "B14", "B3", "A4", "A6"],
        "rows": ["B15", "A5", "A3", "A15", "B7", "B8"]
diff --git a/keyboards/deng/thirty/rules.mk b/keyboards/deng/thirty/rules.mk
index 91837f3d45..e8ce9e854b 100644
--- a/keyboards/deng/thirty/rules.mk
+++ b/keyboards/deng/thirty/rules.mk
@@ -15,4 +15,3 @@ BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/doio/kb16/rev1/info.json b/keyboards/doio/kb16/rev1/info.json
index f42f039846..f37a58e157 100644
--- a/keyboards/doio/kb16/rev1/info.json
+++ b/keyboards/doio/kb16/rev1/info.json
@@ -8,6 +8,9 @@
        "pid": "0x1601",
        "device_version": "0.0.1"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["F5", "F4", "F1", "F0", "B7"],
        "rows": ["D5", "D4", "D3", "D2"]
diff --git a/keyboards/doio/kb16/rev1/rules.mk b/keyboards/doio/kb16/rev1/rules.mk
index 475b3b9a52..5c5ad3de8c 100644
--- a/keyboards/doio/kb16/rev1/rules.mk
+++ b/keyboards/doio/kb16/rev1/rules.mk
@@ -24,7 +24,6 @@ OLED_DRIVER = SSD1306
 # RGB Matrix enabled
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 # Encoder enabled
 ENCODER_ENABLE = yes
diff --git a/keyboards/doio/kb16/rev2/info.json b/keyboards/doio/kb16/rev2/info.json
index 9dff8e0f6e..6d11cadaac 100644
--- a/keyboards/doio/kb16/rev2/info.json
+++ b/keyboards/doio/kb16/rev2/info.json
@@ -8,6 +8,9 @@
        "pid": "0x1601",
        "device_version": "0.0.2"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["B14", "B13", "B12", "B0", "A7"],
        "rows": ["B3", "B4", "B9", "B8"]
diff --git a/keyboards/doio/kb16/rev2/rules.mk b/keyboards/doio/kb16/rev2/rules.mk
index f1f486f639..f931af11e4 100644
--- a/keyboards/doio/kb16/rev2/rules.mk
+++ b/keyboards/doio/kb16/rev2/rules.mk
@@ -23,7 +23,6 @@ OLED_DRIVER = SSD1306
 # RGB Matrix enabled
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 # Encoder enabled
 ENCODER_ENABLE = yes
diff --git a/keyboards/doio/kb30/info.json b/keyboards/doio/kb30/info.json
index f06ffab850..3f3fa1c332 100644
--- a/keyboards/doio/kb30/info.json
+++ b/keyboards/doio/kb30/info.json
@@ -8,6 +8,9 @@
        "pid": "0x3001",
        "device_version": "0.0.1"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["B14", "B13", "B12", "B0", "A7", "A9", "A8"],
        "rows": ["B3", "B4", "B9", "B8", "A5", "A6"]
diff --git a/keyboards/doio/kb30/rules.mk b/keyboards/doio/kb30/rules.mk
index a50872f0d5..b12899890e 100644
--- a/keyboards/doio/kb30/rules.mk
+++ b/keyboards/doio/kb30/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 OLED_ENABLE = yes
 OLED_DRIVER = SSD1306
 ENCODER_ENABLE = yes
diff --git a/keyboards/doro67/rgb/info.json b/keyboards/doro67/rgb/info.json
index e6ad6d7476..f4a7d40dce 100644
--- a/keyboards/doro67/rgb/info.json
+++ b/keyboards/doro67/rgb/info.json
@@ -8,6 +8,9 @@
        "pid": "0x5247",
        "device_version": "0.0.1"
    },
+    "rgb_matrix": {
+      "driver": "WS2812"
+    },
    "matrix_pins": {
      "cols": ["B0", "B1", "B2", "B3", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F5", "F6", "F7"],
      "rows": ["D0", "D1", "D2", "D3", "D5"]
diff --git a/keyboards/doro67/rgb/rules.mk b/keyboards/doro67/rgb/rules.mk
index 7bd80b9503..b400e0a170 100644
--- a/keyboards/doro67/rgb/rules.mk
+++ b/keyboards/doro67/rgb/rules.mk
@@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/dp60/info.json b/keyboards/dp60/info.json
index 78d7a5abb6..a0491eabb6 100644
--- a/keyboards/dp60/info.json
+++ b/keyboards/dp60/info.json
@@ -11,6 +11,9 @@
    "ws2812": {
        "pin": "D7"
    },
+    "rgb_matrix": {
+        "driver": "IS31FL3731"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layout_aliases": {
diff --git a/keyboards/dp60/rules.mk b/keyboards/dp60/rules.mk
index 491e8e34a7..0aa07f4709 100644
--- a/keyboards/dp60/rules.mk
+++ b/keyboards/dp60/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 RGBLIGHT_ENABLE = no        # Use RGB underglow light
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3731 # Use RGB matrix
 CUSTOM_MATRIX = yes
 SRC += matrix.c
diff --git a/keyboards/drop/sense75/info.json b/keyboards/drop/sense75/info.json
index 8fd65c1bd7..a4aba158c1 100644
--- a/keyboards/drop/sense75/info.json
+++ b/keyboards/drop/sense75/info.json
@@ -113,6 +113,7 @@
        }
    },
    "rgb_matrix": {
+        "driver": "IS31FL3733",
        "layout": [
            { "flags": 2, "x": 2, "y": 0 },
            { "flags": 2, "x": 22, "y": 0 },
diff --git a/keyboards/drop/sense75/rules.mk b/keyboards/drop/sense75/rules.mk
index 781ba9b35a..44adba039b 100644
--- a/keyboards/drop/sense75/rules.mk
+++ b/keyboards/drop/sense75/rules.mk
@@ -1,2 +1 @@
 EEPROM_DRIVER = i2c
-RGB_MATRIX_DRIVER = IS31FL3733
diff --git a/keyboards/dtisaac/dosa40rgb/info.json b/keyboards/dtisaac/dosa40rgb/info.json
index 55a40684f9..b9f02c3470 100644
--- a/keyboards/dtisaac/dosa40rgb/info.json
+++ b/keyboards/dtisaac/dosa40rgb/info.json
@@ -11,6 +11,9 @@
    "ws2812": {
        "pin": "D0"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["D1", "D6", "D3", "D2", "B6", "C6", "C7", "F7", "F6", "F5", "F4"],
        "rows": ["B7", "D7", "F1", "F0"]
diff --git a/keyboards/dtisaac/dosa40rgb/rules.mk b/keyboards/dtisaac/dosa40rgb/rules.mk
index c3b1c4ef11..5cc9ef68e4 100644
--- a/keyboards/dtisaac/dosa40rgb/rules.mk
+++ b/keyboards/dtisaac/dosa40rgb/rules.mk
@@ -13,6 +13,5 @@ AUDIO_ENABLE = no           # Audio output
 BLUETOOTH_ENABLE = yes      # Enable Bluetooth
 BLUETOOTH_DRIVER = BluefruitLE
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 LTO_ENABLE = yes
diff --git a/keyboards/dumbpad/v3x/info.json b/keyboards/dumbpad/v3x/info.json
index e380528744..96706d84b6 100644
--- a/keyboards/dumbpad/v3x/info.json
+++ b/keyboards/dumbpad/v3x/info.json
@@ -5,6 +5,9 @@
    "usb": {
        "device_version": "0.1.0"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["C6", "D7", "E6", "B4", "B5"],
        "rows": ["F4", "F5", "F6", "F7"]
diff --git a/keyboards/dumbpad/v3x/rules.mk b/keyboards/dumbpad/v3x/rules.mk
index fb6e41a9c5..11f04a3ade 100644
--- a/keyboards/dumbpad/v3x/rules.mk
+++ b/keyboards/dumbpad/v3x/rules.mk
@@ -14,4 +14,3 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/durgod/dgk6x/info.json b/keyboards/durgod/dgk6x/info.json
index 90d3d2e5b7..df4c004ab5 100644
--- a/keyboards/durgod/dgk6x/info.json
+++ b/keyboards/durgod/dgk6x/info.json
@@ -4,6 +4,9 @@
        "scroll_lock": "A8",
        "on_state": 0
    },
+    "rgb_matrix": {
+        "driver": "IS31FL3733"
+    },
    "processor": "STM32F072", // F070
    "bootloader": "stm32-dfu",
    "board": "DURGOD_STM32_F070"
diff --git a/keyboards/durgod/dgk6x/rules.mk b/keyboards/durgod/dgk6x/rules.mk
index c82ce44bac..1a05a561be 100644
--- a/keyboards/durgod/dgk6x/rules.mk
+++ b/keyboards/durgod/dgk6x/rules.mk
@@ -16,6 +16,5 @@ AUDIO_ENABLE = no           # Audio output
 LTO_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3733
 DEFAULT_FOLDER=durgod/dgk6x/hades
diff --git a/keyboards/dztech/dz60rgb/v1/info.json b/keyboards/dztech/dz60rgb/v1/info.json
index 68b332c9cd..56a70183f5 100644
--- a/keyboards/dztech/dz60rgb/v1/info.json
+++ b/keyboards/dztech/dz60rgb/v1/info.json
@@ -3,6 +3,9 @@
        "pid": "0x1120",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "IS31FL3733"
+    },
    "matrix_pins": {
        "cols": ["A6", "A7", "B0", "B13", "B15", "A8", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14"],
        "rows": ["B1", "B10", "B11", "B14", "B12"]
diff --git a/keyboards/dztech/dz60rgb/v1/rules.mk b/keyboards/dztech/dz60rgb/v1/rules.mk
index c1fb17d02d..9f3770f0f4 100644
--- a/keyboards/dztech/dz60rgb/v1/rules.mk
+++ b/keyboards/dztech/dz60rgb/v1/rules.mk
@@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
 AUDIO_ENABLE = no              # Audio output
 RGB_MATRIX_ENABLE = yes        # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3733
 NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
diff --git a/keyboards/dztech/dz60rgb/v2/info.json b/keyboards/dztech/dz60rgb/v2/info.json
index 3553fab9b2..0b263d8099 100644
--- a/keyboards/dztech/dz60rgb/v2/info.json
+++ b/keyboards/dztech/dz60rgb/v2/info.json
@@ -3,6 +3,9 @@
        "pid": "0x1121",
        "device_version": "2.0.0"
    },
+    "rgb_matrix": {
+        "driver": "IS31FL3733"
+    },
    "matrix_pins": {
        "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"],
        "rows": ["F5", "F4", "F1", "B3", "B2"]
diff --git a/keyboards/dztech/dz60rgb/v2/rules.mk b/keyboards/dztech/dz60rgb/v2/rules.mk
index c1fb17d02d..9f3770f0f4 100644
--- a/keyboards/dztech/dz60rgb/v2/rules.mk
+++ b/keyboards/dztech/dz60rgb/v2/rules.mk
@@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
 AUDIO_ENABLE = no              # Audio output
 RGB_MATRIX_ENABLE = yes        # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3733
 NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
diff --git a/keyboards/dztech/dz60rgb/v2_1/info.json b/keyboards/dztech/dz60rgb/v2_1/info.json
index 89e4532160..796b1bc4a3 100644
--- a/keyboards/dztech/dz60rgb/v2_1/info.json
+++ b/keyboards/dztech/dz60rgb/v2_1/info.json
@@ -3,6 +3,9 @@
        "pid": "0x1121",
        "device_version": "2.1.0"
    },
+    "rgb_matrix": {
+        "driver": "IS31FL3733"
+    },
    "matrix_pins": {
        "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"],
        "rows": ["F5", "F4", "F1", "B3", "B2"]
diff --git a/keyboards/dztech/dz60rgb/v2_1/rules.mk b/keyboards/dztech/dz60rgb/v2_1/rules.mk
index 126a0c0d0b..832eb95f50 100644
--- a/keyboards/dztech/dz60rgb/v2_1/rules.mk
+++ b/keyboards/dztech/dz60rgb/v2_1/rules.mk
@@ -13,7 +13,6 @@ BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
 AUDIO_ENABLE = no              # Audio output
 RGB_MATRIX_ENABLE = yes        # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3733
 NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
 LTO_ENABLE = yes
diff --git a/keyboards/dztech/dz60rgb_ansi/v1/info.json b/keyboards/dztech/dz60rgb_ansi/v1/info.json
index 377c8cd036..77a9e801c6 100644
--- a/keyboards/dztech/dz60rgb_ansi/v1/info.json
+++ b/keyboards/dztech/dz60rgb_ansi/v1/info.json
@@ -3,6 +3,9 @@
        "pid": "0x1220",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "IS31FL3733"
+    },
    "matrix_pins": {
        "cols": ["A6", "A7", "B0", "B13", "B15", "A8", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14"],
        "rows": ["B1", "B10", "B11", "B14", "B12"]
diff --git a/keyboards/dztech/dz60rgb_ansi/v1/rules.mk b/keyboards/dztech/dz60rgb_ansi/v1/rules.mk
index c1fb17d02d..9f3770f0f4 100644
--- a/keyboards/dztech/dz60rgb_ansi/v1/rules.mk
+++ b/keyboards/dztech/dz60rgb_ansi/v1/rules.mk
@@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
 AUDIO_ENABLE = no              # Audio output
 RGB_MATRIX_ENABLE = yes        # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3733
 NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
diff --git a/keyboards/dztech/dz60rgb_ansi/v2/info.json b/keyboards/dztech/dz60rgb_ansi/v2/info.json
index 52070e8996..734d07db31 100644
--- a/keyboards/dztech/dz60rgb_ansi/v2/info.json
+++ b/keyboards/dztech/dz60rgb_ansi/v2/info.json
@@ -3,6 +3,9 @@
        "pid": "0x1221",
        "device_version": "2.0.0"
    },
+    "rgb_matrix": {
+        "driver": "IS31FL3733"
+    },
    "matrix_pins": {
        "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"],
        "rows": ["F5", "F4", "F1", "B3", "B2"]
diff --git a/keyboards/dztech/dz60rgb_ansi/v2/rules.mk b/keyboards/dztech/dz60rgb_ansi/v2/rules.mk
index 5ea934ec9a..17e0aea48d 100644
--- a/keyboards/dztech/dz60rgb_ansi/v2/rules.mk
+++ b/keyboards/dztech/dz60rgb_ansi/v2/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
 AUDIO_ENABLE = no              # Audio output
 RGB_MATRIX_ENABLE = yes        # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3733
 NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
 LTO_ENABLE = yes
diff --git a/keyboards/dztech/dz60rgb_ansi/v2_1/info.json b/keyboards/dztech/dz60rgb_ansi/v2_1/info.json
index d18a84790d..1d72dc44ee 100644
--- a/keyboards/dztech/dz60rgb_ansi/v2_1/info.json
+++ b/keyboards/dztech/dz60rgb_ansi/v2_1/info.json
@@ -3,6 +3,9 @@
        "pid": "0x1221",
        "device_version": "2.1.0"
    },
+    "rgb_matrix": {
+        "driver": "IS31FL3733"
+    },
    "matrix_pins": {
        "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"],
        "rows": ["F5", "F4", "F1", "B3", "B2"]
diff --git a/keyboards/dztech/dz60rgb_ansi/v2_1/rules.mk b/keyboards/dztech/dz60rgb_ansi/v2_1/rules.mk
index 78145d796d..a89963c2d4 100644
--- a/keyboards/dztech/dz60rgb_ansi/v2_1/rules.mk
+++ b/keyboards/dztech/dz60rgb_ansi/v2_1/rules.mk
@@ -13,5 +13,4 @@ BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
 AUDIO_ENABLE = no              # Audio output
 RGB_MATRIX_ENABLE = yes        # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3733
 LTO_ENABLE = yes
diff --git a/keyboards/dztech/dz60rgb_wkl/v1/info.json b/keyboards/dztech/dz60rgb_wkl/v1/info.json
index 278c245871..65bb086dc3 100644
--- a/keyboards/dztech/dz60rgb_wkl/v1/info.json
+++ b/keyboards/dztech/dz60rgb_wkl/v1/info.json
@@ -3,6 +3,9 @@
        "pid": "0x1320",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "IS31FL3733"
+    },
    "matrix_pins": {
        "cols": ["A6", "A7", "B0", "B13", "B15", "A8", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14"],
        "rows": ["B1", "B10", "B11", "B14", "B12"]
diff --git a/keyboards/dztech/dz60rgb_wkl/v1/rules.mk b/keyboards/dztech/dz60rgb_wkl/v1/rules.mk
index c1fb17d02d..9f3770f0f4 100644
--- a/keyboards/dztech/dz60rgb_wkl/v1/rules.mk
+++ b/keyboards/dztech/dz60rgb_wkl/v1/rules.mk
@@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
 AUDIO_ENABLE = no              # Audio output
 RGB_MATRIX_ENABLE = yes        # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3733
 NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
diff --git a/keyboards/dztech/dz60rgb_wkl/v2/info.json b/keyboards/dztech/dz60rgb_wkl/v2/info.json
index 1265608dbc..b9a2126e3d 100644
--- a/keyboards/dztech/dz60rgb_wkl/v2/info.json
+++ b/keyboards/dztech/dz60rgb_wkl/v2/info.json
@@ -3,6 +3,9 @@
        "pid": "0x1321",
        "device_version": "2.0.0"
    },
+    "rgb_matrix": {
+        "driver": "IS31FL3733"
+    },
    "matrix_pins": {
        "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"],
        "rows": ["F5", "F4", "F1", "B3", "B2"]
diff --git a/keyboards/dztech/dz60rgb_wkl/v2/rules.mk b/keyboards/dztech/dz60rgb_wkl/v2/rules.mk
index c1fb17d02d..9f3770f0f4 100644
--- a/keyboards/dztech/dz60rgb_wkl/v2/rules.mk
+++ b/keyboards/dztech/dz60rgb_wkl/v2/rules.mk
@@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
 AUDIO_ENABLE = no              # Audio output
 RGB_MATRIX_ENABLE = yes        # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3733
 NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
diff --git a/keyboards/dztech/dz60rgb_wkl/v2_1/info.json b/keyboards/dztech/dz60rgb_wkl/v2_1/info.json
index bd9e24e880..ce830f6b01 100644
--- a/keyboards/dztech/dz60rgb_wkl/v2_1/info.json
+++ b/keyboards/dztech/dz60rgb_wkl/v2_1/info.json
@@ -3,6 +3,9 @@
        "pid": "0x1321",
        "device_version": "2.1.0"
    },
+    "rgb_matrix": {
+        "driver": "IS31FL3733"
+    },
    "matrix_pins": {
        "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"],
        "rows": ["F5", "F4", "F1", "B3", "B2"]
diff --git a/keyboards/dztech/dz60rgb_wkl/v2_1/rules.mk b/keyboards/dztech/dz60rgb_wkl/v2_1/rules.mk
index 78145d796d..a89963c2d4 100644
--- a/keyboards/dztech/dz60rgb_wkl/v2_1/rules.mk
+++ b/keyboards/dztech/dz60rgb_wkl/v2_1/rules.mk
@@ -13,5 +13,4 @@ BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
 AUDIO_ENABLE = no              # Audio output
 RGB_MATRIX_ENABLE = yes        # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3733
 LTO_ENABLE = yes
diff --git a/keyboards/dztech/dz64rgb/info.json b/keyboards/dztech/dz64rgb/info.json
index 14d9c0122b..0b40a23469 100644
--- a/keyboards/dztech/dz64rgb/info.json
+++ b/keyboards/dztech/dz64rgb/info.json
@@ -8,6 +8,9 @@
        "pid": "0x1013",
        "device_version": "0.0.2"
    },
+    "rgb_matrix": {
+        "driver": "IS31FL3733"
+    },
    "matrix_pins": {
        "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"],
        "rows": ["F5", "F4", "F1", "B3", "B2"]
diff --git a/keyboards/dztech/dz64rgb/rules.mk b/keyboards/dztech/dz64rgb/rules.mk
index 04451b76a7..a20c8b449f 100644
--- a/keyboards/dztech/dz64rgb/rules.mk
+++ b/keyboards/dztech/dz64rgb/rules.mk
@@ -11,6 +11,5 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3733
 LTO_ENABLE = yes
 LAYOUT= 64_ansi
 \ No newline at end of file
diff --git a/keyboards/dztech/dz65rgb/v1/info.json b/keyboards/dztech/dz65rgb/v1/info.json
index 72b287c4ef..19279921a4 100644
--- a/keyboards/dztech/dz65rgb/v1/info.json
+++ b/keyboards/dztech/dz65rgb/v1/info.json
@@ -3,6 +3,9 @@
        "pid": "0x1420",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "IS31FL3731"
+    },
    "matrix_pins": {
        "cols": ["A6", "A7", "B0", "B13", "B15", "A8", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15"],
        "rows": ["B1", "B10", "B11", "B14", "B12"]
diff --git a/keyboards/dztech/dz65rgb/v1/rules.mk b/keyboards/dztech/dz65rgb/v1/rules.mk
index 7d73c4db84..ea646d3d93 100644
--- a/keyboards/dztech/dz65rgb/v1/rules.mk
+++ b/keyboards/dztech/dz65rgb/v1/rules.mk
@@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
 AUDIO_ENABLE = no              # Audio output
 RGB_MATRIX_ENABLE = yes        # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3731
diff --git a/keyboards/dztech/dz65rgb/v2/info.json b/keyboards/dztech/dz65rgb/v2/info.json
index 867b22dec8..b449f4979a 100644
--- a/keyboards/dztech/dz65rgb/v2/info.json
+++ b/keyboards/dztech/dz65rgb/v2/info.json
@@ -3,6 +3,9 @@
        "pid": "0x1421",
        "device_version": "2.0.0"
    },
+    "rgb_matrix": {
+        "driver": "IS31FL3731"
+    },
    "matrix_pins": {
        "cols": ["F7", "F6", "F5", "C7", "B0", "B1", "B2", "B3", "B4", "D7", "D6", "D4", "D5", "D3", "D2"],
        "rows": ["F0", "F1", "F4", "E6", "C6"]
diff --git a/keyboards/dztech/dz65rgb/v2/rules.mk b/keyboards/dztech/dz65rgb/v2/rules.mk
index 7d73c4db84..ea646d3d93 100644
--- a/keyboards/dztech/dz65rgb/v2/rules.mk
+++ b/keyboards/dztech/dz65rgb/v2/rules.mk
@@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
 AUDIO_ENABLE = no              # Audio output
 RGB_MATRIX_ENABLE = yes        # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3731
diff --git a/keyboards/dztech/dz65rgb/v3/info.json b/keyboards/dztech/dz65rgb/v3/info.json
index 619c94c7a4..e4e4dd6581 100644
--- a/keyboards/dztech/dz65rgb/v3/info.json
+++ b/keyboards/dztech/dz65rgb/v3/info.json
@@ -3,6 +3,9 @@
        "pid": "0x1424",
        "device_version": "3.0.0"
    },
+    "rgb_matrix": {
+        "driver": "IS31FL3741"
+    },
    "matrix_pins": {
        "cols": ["F7", "F6", "F5", "C7", "B0", "B1", "B2", "B3", "B4", "D7", "D6", "D4", "D5", "D3", "D2"],
        "rows": ["F0", "F1", "F4", "E6", "C6"]
diff --git a/keyboards/dztech/dz65rgb/v3/rules.mk b/keyboards/dztech/dz65rgb/v3/rules.mk
index 67366c7a00..bbe22adb0c 100755
--- a/keyboards/dztech/dz65rgb/v3/rules.mk
+++ b/keyboards/dztech/dz65rgb/v3/rules.mk
@@ -13,5 +13,4 @@ BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
 AUDIO_ENABLE = no              # Audio output
 RGB_MATRIX_ENABLE = yes        # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3741
 LTO_ENABLE = yes
diff --git a/keyboards/eek/info.json b/keyboards/eek/info.json
index bf909b607e..d4d5ee39d2 100644
--- a/keyboards/eek/info.json
+++ b/keyboards/eek/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0002",
        "device_version": "0.0.4"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["D4", "C6", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
        "rows": ["D7", "E6", "B4", "B5"]
diff --git a/keyboards/eek/rules.mk b/keyboards/eek/rules.mk
index d12dc9e031..74ca560427 100644
--- a/keyboards/eek/rules.mk
+++ b/keyboards/eek/rules.mk
@@ -10,5 +10,4 @@ NKRO_ENABLE = no            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
-RGB_MATRIX_DRIVER = WS2812
 DEFAULT_FOLDER = eek/silk_down
diff --git a/keyboards/ein_60/info.json b/keyboards/ein_60/info.json
index 95f448a476..0740a9273e 100644
--- a/keyboards/ein_60/info.json
+++ b/keyboards/ein_60/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0003",
        "device_version": "0.0.1"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["A3", "A2", "A1", "A0", "F6", "F5", "F0", "E0", "E1", "C0", "C1", "C2", "C3"],
        "rows": ["F1", "F2", "F3", "F4"]
diff --git a/keyboards/ein_60/rules.mk b/keyboards/ein_60/rules.mk
index 869c305184..648a0c38ff 100644
--- a/keyboards/ein_60/rules.mk
+++ b/keyboards/ein_60/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = no      # Enable for pretty RGB matrix effects
-RGB_MATRIX_DRIVER = WS2812  # Define RGB Matrix
 ENCODER_ENABLE = yes        # Enables the use of one or more encoders
 OLED_ENABLE = yes           # Enables the use of OLED displays
 OLED_DRIVER = SSD1306
diff --git a/keyboards/elephant42/info.json b/keyboards/elephant42/info.json
index 3c1e3ce737..d1218ddb4e 100644
--- a/keyboards/elephant42/info.json
+++ b/keyboards/elephant42/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0721",
        "device_version": "0.0.1"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["F4", "F5", "F6", "F7", "B1", "B3"],
        "rows": ["D4", "C6", "D7", "E6"]
diff --git a/keyboards/elephant42/rules.mk b/keyboards/elephant42/rules.mk
index 66270aae47..db121c92e3 100644
--- a/keyboards/elephant42/rules.mk
+++ b/keyboards/elephant42/rules.mk
@@ -10,7 +10,6 @@ NKRO_ENABLE = no            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 AUDIO_ENABLE = no           # Audio output
 SPLIT_KEYBOARD = yes
 OLED_ENABLE = yes
diff --git a/keyboards/ergodox_ez/info.json b/keyboards/ergodox_ez/info.json
index a6877bc630..5727d11184 100644
--- a/keyboards/ergodox_ez/info.json
+++ b/keyboards/ergodox_ez/info.json
@@ -9,6 +9,9 @@
    "ws2812": {
        "pin": "D7"
    },
+    "rgb_matrix": {
+        "driver": "IS31FL3731"
+    },
    "processor": "atmega32u4",
    "bootloader": "halfkay",
    "debounce": 30,
diff --git a/keyboards/ergodox_ez/rules.mk b/keyboards/ergodox_ez/rules.mk
index e421ae778d..b51e93061b 100644
--- a/keyboards/ergodox_ez/rules.mk
+++ b/keyboards/ergodox_ez/rules.mk
@@ -17,7 +17,6 @@ UNICODE_ENABLE   = no  # Unicode
 SWAP_HANDS_ENABLE= no   # Allow swapping hands of keyboard
 RGB_MATRIX_ENABLE = no # enable later
-RGB_MATRIX_DRIVER = IS31FL3731
 DEBOUNCE_TYPE = sym_eager_pr
 # project specific files
diff --git a/keyboards/evyd13/atom47/rev5/info.json b/keyboards/evyd13/atom47/rev5/info.json
index a71ee1e241..b336beab58 100644
--- a/keyboards/evyd13/atom47/rev5/info.json
+++ b/keyboards/evyd13/atom47/rev5/info.json
@@ -8,6 +8,9 @@
        "pid": "0x92EA",
        "device_version": "0.0.1"
    },
+    "rgb_matrix": {
+        "driver": "IS31FL3733"
+    },
    "matrix_pins": {
        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "E6", "D7", "B4", "B5", "B6", "C6", "C7"],
        "rows": ["B1", "B2", "B3", "D4"]
diff --git a/keyboards/evyd13/atom47/rev5/rules.mk b/keyboards/evyd13/atom47/rev5/rules.mk
index 3f2f8d3dd7..aad92997d0 100644
--- a/keyboards/evyd13/atom47/rev5/rules.mk
+++ b/keyboards/evyd13/atom47/rev5/rules.mk
@@ -1,2 +1 @@
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3733
diff --git a/keyboards/exclusive/e6_rgb/info.json b/keyboards/exclusive/e6_rgb/info.json
index 0f3c69f9f5..37e2a5c0e7 100644
--- a/keyboards/exclusive/e6_rgb/info.json
+++ b/keyboards/exclusive/e6_rgb/info.json
@@ -8,6 +8,9 @@
        "pid": "0x4536",
        "device_version": "0.6.2"
    },
+    "rgb_matrix": {
+        "driver": "IS31FL3733"
+    },
    "matrix_pins": {
        "cols": ["D7", "B4", "B5", "B6", "C6", "C7", "F7", "F0", "B0", "B1", "D2", "D3", "B3", "B2"],
        "rows": ["F1", "F4", "F5", "F6", "D6"]
diff --git a/keyboards/exclusive/e6_rgb/rules.mk b/keyboards/exclusive/e6_rgb/rules.mk
index fb1b6986b2..0bdf20535c 100644
--- a/keyboards/exclusive/e6_rgb/rules.mk
+++ b/keyboards/exclusive/e6_rgb/rules.mk
@@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = no      # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3733
diff --git a/keyboards/feker/ik75/info.json b/keyboards/feker/ik75/info.json
index 7fc70330f7..a7819048e7 100644
--- a/keyboards/feker/ik75/info.json
+++ b/keyboards/feker/ik75/info.json
@@ -8,6 +8,9 @@
        "pid": "0x1226",
        "device_version": "0.0.1"
    },
+    "rgb_matrix": {
+        "driver": "IS31FL3733"
+    },
    "matrix_pins": {
        "cols": ["E6", "B0", "B1", "B2", "B3", "B7", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "E2"],
        "rows": ["F7", "F6", "F5", "F4", "F1", "F0"]
diff --git a/keyboards/feker/ik75/rules.mk b/keyboards/feker/ik75/rules.mk
index 0bce6837a4..e086b6aaf8 100644
--- a/keyboards/feker/ik75/rules.mk
+++ b/keyboards/feker/ik75/rules.mk
@@ -17,7 +17,6 @@ SPACE_CADET_ENABLE = no
 # RGB Matrix enabled
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3733
 # Encoder enabled
 ENCODER_ENABLE = yes
diff --git a/keyboards/ferris/0_2/bling/info.json b/keyboards/ferris/0_2/bling/info.json
index 5473c33295..28ed4f90e3 100644
--- a/keyboards/ferris/0_2/bling/info.json
+++ b/keyboards/ferris/0_2/bling/info.json
@@ -2,5 +2,8 @@
    "keyboard_name": "Ferris 0.2 - Bling",
    "usb": {
        "pid": "0x0002"
+    },
+    "rgb_matrix": {
+        "driver": "IS31FL3731"
    }
 }
diff --git a/keyboards/ferris/0_2/bling/rules.mk b/keyboards/ferris/0_2/bling/rules.mk
index e04c8e4670..aad92997d0 100644
--- a/keyboards/ferris/0_2/bling/rules.mk
+++ b/keyboards/ferris/0_2/bling/rules.mk
@@ -1,2 +1 @@
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3731
diff --git a/keyboards/frooastboard/walnut/info.json b/keyboards/frooastboard/walnut/info.json
index a57272c765..eca0057eb2 100644
--- a/keyboards/frooastboard/walnut/info.json
+++ b/keyboards/frooastboard/walnut/info.json
@@ -14,6 +14,9 @@
        "mousekey": false,
        "nkro": true
    },
+    "rgb_matrix": {
+        "driver": "IS31FL3737"
+    },
    "build": {
        "lto": true
    },
diff --git a/keyboards/frooastboard/walnut/rules.mk b/keyboards/frooastboard/walnut/rules.mk
index d0bb93e136..c529890fb5 100644
--- a/keyboards/frooastboard/walnut/rules.mk
+++ b/keyboards/frooastboard/walnut/rules.mk
@@ -2,4 +2,3 @@
 #   change yes to no to disable
 #
 RGB_MATRIX_ENABLE = yes         # Enable keyboard RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3737  # Select RGB matrix driver
diff --git a/keyboards/geekboards/macropad_v2/info.json b/keyboards/geekboards/macropad_v2/info.json
index 0b8704885c..504238b21c 100644
--- a/keyboards/geekboards/macropad_v2/info.json
+++ b/keyboards/geekboards/macropad_v2/info.json
@@ -12,6 +12,9 @@
    "pin": "A7",
    "driver": "pwm"
  },
+  "rgb_matrix": {
+    "driver": "WS2812"
+  },
  "processor": "STM32F072",
  "bootloader": "stm32-dfu",
  "matrix_pins": {
diff --git a/keyboards/geekboards/macropad_v2/rules.mk b/keyboards/geekboards/macropad_v2/rules.mk
index 38a6bb6887..b7807ae418 100644
--- a/keyboards/geekboards/macropad_v2/rules.mk
+++ b/keyboards/geekboards/macropad_v2/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/geekboards/tester/info.json b/keyboards/geekboards/tester/info.json
index 64a752d24f..16f3496a13 100644
--- a/keyboards/geekboards/tester/info.json
+++ b/keyboards/geekboards/tester/info.json
@@ -8,6 +8,9 @@
        "pid": "0x1319",
        "device_version": "0.0.1"
    },
+    "rgb_matrix": {
+        "driver": "IS31FL3731"
+    },
    "matrix_pins": {
        "cols": ["F7", "F6", "D2", "D3"],
        "rows": ["B0", "D4"]
diff --git a/keyboards/geekboards/tester/rules.mk b/keyboards/geekboards/tester/rules.mk
index e17c577cc4..8ac152f428 100644
--- a/keyboards/geekboards/tester/rules.mk
+++ b/keyboards/geekboards/tester/rules.mk
@@ -10,4 +10,3 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes     # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3731
diff --git a/keyboards/giabalanai/info.json b/keyboards/giabalanai/info.json
index 094c02af09..f8962415cb 100644
--- a/keyboards/giabalanai/info.json
+++ b/keyboards/giabalanai/info.json
@@ -8,6 +8,9 @@
        "pid": "0xF4B0",
        "device_version": "0.0.1"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["B1", "F7", "F6", "F5", "F4", "B3", "B2", "B6", "D0", "D1"],
        "rows": ["B5", "B4", "E6", "D7", "C6", "D4"]
diff --git a/keyboards/giabalanai/rules.mk b/keyboards/giabalanai/rules.mk
index d0e8dc4f24..90ba252d26 100644
--- a/keyboards/giabalanai/rules.mk
+++ b/keyboards/giabalanai/rules.mk
@@ -5,6 +5,5 @@ COMMAND_ENABLE = no         # Commands for debug and configuration
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 # RGB_MATRIX_ENABLE is not suitable for giabalanai keyboard on the right side (there are dulpicate keys).
 RGB_MATRIX_ENABLE = no      # Use RGB matrix (Don't enable this when RGBLIGHT_ENABLE is used.)
-RGB_MATRIX_DRIVER = WS2812  # 2021/01/23 added.
 LTO_ENABLE = yes
diff --git a/keyboards/gizmo_engineering/gk6/info.json b/keyboards/gizmo_engineering/gk6/info.json
index 8c6ab64b26..d738d31d3d 100644
--- a/keyboards/gizmo_engineering/gk6/info.json
+++ b/keyboards/gizmo_engineering/gk6/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0001",
        "device_version": "30.3.1"
    },
+    "rgb_matrix": {
+        "driver": "IS31FL3731"
+    },
    "matrix_pins": {
        "cols": ["B5", "C6", "C7", "F7", "F6", "D5", "D3", "D2", "F1", "F4", "B7", "F5"],
        "rows": ["B6", "B4", "D7", "D6", "D4"]
diff --git a/keyboards/gizmo_engineering/gk6/rules.mk b/keyboards/gizmo_engineering/gk6/rules.mk
index c3d99b1e57..c6a142275f 100755
--- a/keyboards/gizmo_engineering/gk6/rules.mk
+++ b/keyboards/gizmo_engineering/gk6/rules.mk
@@ -12,4 +12,3 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3731
diff --git a/keyboards/gmmk/gmmk2/p65/ansi/info.json b/keyboards/gmmk/gmmk2/p65/ansi/info.json
index 0ece27735d..4f72e818ed 100644
--- a/keyboards/gmmk/gmmk2/p65/ansi/info.json
+++ b/keyboards/gmmk/gmmk2/p65/ansi/info.json
@@ -8,6 +8,9 @@
        "pid": "0x5045",
        "device_version": "0.0.1"
    },
+    "rgb_matrix": {
+        "driver": "AW20216"
+    },
    "matrix_pins": {
        "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"],
        "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8"]
diff --git a/keyboards/gmmk/gmmk2/p65/ansi/rules.mk b/keyboards/gmmk/gmmk2/p65/ansi/rules.mk
index ed301944f4..1b4692a621 100644
--- a/keyboards/gmmk/gmmk2/p65/ansi/rules.mk
+++ b/keyboards/gmmk/gmmk2/p65/ansi/rules.mk
@@ -11,6 +11,5 @@ BACKLIGHT_ENABLE = no        # Enable keyboard backlight functionality.
 RGBLIGHT_ENABLE = no         # Enable keyboard RGB underglow.
 AUDIO_ENABLE = no            # Audio output.
 RGB_MATRIX_ENABLE = yes      # Enable RGB matrix effects.
-RGB_MATRIX_DRIVER = AW20216  # Enable RGB matrix effects.
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/gmmk/gmmk2/p65/iso/info.json b/keyboards/gmmk/gmmk2/p65/iso/info.json
index af52b203dc..1572c34e5f 100644
--- a/keyboards/gmmk/gmmk2/p65/iso/info.json
+++ b/keyboards/gmmk/gmmk2/p65/iso/info.json
@@ -8,6 +8,9 @@
        "pid": "0x504A",
        "device_version": "0.0.1"
    },
+    "rgb_matrix": {
+        "driver": "AW20216"
+    },
    "matrix_pins": {
        "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"],
        "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8"]
diff --git a/keyboards/gmmk/gmmk2/p65/iso/rules.mk b/keyboards/gmmk/gmmk2/p65/iso/rules.mk
index ed301944f4..1b4692a621 100644
--- a/keyboards/gmmk/gmmk2/p65/iso/rules.mk
+++ b/keyboards/gmmk/gmmk2/p65/iso/rules.mk
@@ -11,6 +11,5 @@ BACKLIGHT_ENABLE = no        # Enable keyboard backlight functionality.
 RGBLIGHT_ENABLE = no         # Enable keyboard RGB underglow.
 AUDIO_ENABLE = no            # Audio output.
 RGB_MATRIX_ENABLE = yes      # Enable RGB matrix effects.
-RGB_MATRIX_DRIVER = AW20216  # Enable RGB matrix effects.
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/gmmk/gmmk2/p96/ansi/info.json b/keyboards/gmmk/gmmk2/p96/ansi/info.json
index 5a67f0b74c..4ed89902da 100644
--- a/keyboards/gmmk/gmmk2/p96/ansi/info.json
+++ b/keyboards/gmmk/gmmk2/p96/ansi/info.json
@@ -8,6 +8,9 @@
        "pid": "0x504B",
        "device_version": "0.0.1"
    },
+    "rgb_matrix": {
+        "driver": "AW20216"
+    },
    "matrix_pins": {
        "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"],
        "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "B10", "B11", "B12", "B13"]
diff --git a/keyboards/gmmk/gmmk2/p96/ansi/rules.mk b/keyboards/gmmk/gmmk2/p96/ansi/rules.mk
index 4230665e7c..a076e01916 100644
--- a/keyboards/gmmk/gmmk2/p96/ansi/rules.mk
+++ b/keyboards/gmmk/gmmk2/p96/ansi/rules.mk
@@ -11,6 +11,5 @@ BACKLIGHT_ENABLE = no        # Enable keyboard backlight functionality.
 RGBLIGHT_ENABLE = no         # Enable keyboard RGB underglow.
 AUDIO_ENABLE = no            # Audio output.
 RGB_MATRIX_ENABLE = yes      # Enable RGB matrix effects.
-RGB_MATRIX_DRIVER = AW20216  # Enable RGB matrix effects.
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = spi_flash
diff --git a/keyboards/gmmk/gmmk2/p96/iso/info.json b/keyboards/gmmk/gmmk2/p96/iso/info.json
index 22678f64a1..192e274245 100644
--- a/keyboards/gmmk/gmmk2/p96/iso/info.json
+++ b/keyboards/gmmk/gmmk2/p96/iso/info.json
@@ -8,6 +8,9 @@
        "pid": "0x505A",
        "device_version": "0.0.1"
    },
+    "rgb_matrix": {
+        "driver": "AW20216"
+    },
    "matrix_pins": {
        "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"],
        "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "B10", "B11", "B12", "B13"]
diff --git a/keyboards/gmmk/gmmk2/p96/iso/rules.mk b/keyboards/gmmk/gmmk2/p96/iso/rules.mk
index 4230665e7c..a076e01916 100644
--- a/keyboards/gmmk/gmmk2/p96/iso/rules.mk
+++ b/keyboards/gmmk/gmmk2/p96/iso/rules.mk
@@ -11,6 +11,5 @@ BACKLIGHT_ENABLE = no        # Enable keyboard backlight functionality.
 RGBLIGHT_ENABLE = no         # Enable keyboard RGB underglow.
 AUDIO_ENABLE = no            # Audio output.
 RGB_MATRIX_ENABLE = yes      # Enable RGB matrix effects.
-RGB_MATRIX_DRIVER = AW20216  # Enable RGB matrix effects.
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = spi_flash
diff --git a/keyboards/gmmk/numpad/info.json b/keyboards/gmmk/numpad/info.json
index d5ea534b67..f3020aa3f4 100644
--- a/keyboards/gmmk/numpad/info.json
+++ b/keyboards/gmmk/numpad/info.json
@@ -13,6 +13,9 @@
            {"pin_a": "A2", "pin_b": "A1"}
        ]
    },
+    "rgb_matrix": {
+        "driver": "AW20216"
+    },
    "processor": "WB32F3G71",
    "bootloader": "wb32-dfu",
    "diode_direction": "ROW2COL",
diff --git a/keyboards/gmmk/numpad/rules.mk b/keyboards/gmmk/numpad/rules.mk
index 4d23ffbfaf..5a0d3e34f8 100644
--- a/keyboards/gmmk/numpad/rules.mk
+++ b/keyboards/gmmk/numpad/rules.mk
@@ -15,7 +15,6 @@ KEYBOARD_SHARED_EP = yes
 MIDI_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = AW20216
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = spi_flash
diff --git a/keyboards/gmmk/pro/rev1/ansi/info.json b/keyboards/gmmk/pro/rev1/ansi/info.json
index 7e66ad5043..749a2ef47d 100644
--- a/keyboards/gmmk/pro/rev1/ansi/info.json
+++ b/keyboards/gmmk/pro/rev1/ansi/info.json
@@ -8,6 +8,9 @@
        "pid": "0x5044",
        "device_version": "0.0.1"
    },
+    "rgb_matrix": {
+        "driver": "AW20216"
+    },
    "matrix_pins": {
        "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"],
        "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "B10"]
diff --git a/keyboards/gmmk/pro/rev1/ansi/rules.mk b/keyboards/gmmk/pro/rev1/ansi/rules.mk
index 43949aa054..6d23fe350a 100644
--- a/keyboards/gmmk/pro/rev1/ansi/rules.mk
+++ b/keyboards/gmmk/pro/rev1/ansi/rules.mk
@@ -12,4 +12,3 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = AW20216
diff --git a/keyboards/gmmk/pro/rev1/iso/info.json b/keyboards/gmmk/pro/rev1/iso/info.json
index 082f28a774..45656419b9 100644
--- a/keyboards/gmmk/pro/rev1/iso/info.json
+++ b/keyboards/gmmk/pro/rev1/iso/info.json
@@ -8,6 +8,9 @@
        "pid": "0x5044",
        "device_version": "0.0.1"
    },
+    "rgb_matrix": {
+        "driver": "AW20216"
+    },
    "matrix_pins": {
        "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"],
        "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "B10"]
diff --git a/keyboards/gmmk/pro/rev1/iso/rules.mk b/keyboards/gmmk/pro/rev1/iso/rules.mk
index 43949aa054..6d23fe350a 100644
--- a/keyboards/gmmk/pro/rev1/iso/rules.mk
+++ b/keyboards/gmmk/pro/rev1/iso/rules.mk
@@ -12,4 +12,3 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = AW20216
diff --git a/keyboards/gmmk/pro/rev2/ansi/info.json b/keyboards/gmmk/pro/rev2/ansi/info.json
index 0a20c97d2e..44b68750be 100644
--- a/keyboards/gmmk/pro/rev2/ansi/info.json
+++ b/keyboards/gmmk/pro/rev2/ansi/info.json
@@ -8,6 +8,9 @@
       "pid": "0x5044",
       "device_version": "0.0.2"
    },
+    "rgb_matrix": {
+        "driver": "AW20216"
+    },
    "matrix_pins": {
        "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"],
        "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "B10"]
diff --git a/keyboards/gmmk/pro/rev2/ansi/rules.mk b/keyboards/gmmk/pro/rev2/ansi/rules.mk
index 1672a47804..2f50d82c82 100644
--- a/keyboards/gmmk/pro/rev2/ansi/rules.mk
+++ b/keyboards/gmmk/pro/rev2/ansi/rules.mk
@@ -12,6 +12,5 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = AW20216
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = spi_flash
diff --git a/keyboards/gmmk/pro/rev2/iso/info.json b/keyboards/gmmk/pro/rev2/iso/info.json
index e3cb707c48..12f2365dc8 100644
--- a/keyboards/gmmk/pro/rev2/iso/info.json
+++ b/keyboards/gmmk/pro/rev2/iso/info.json
@@ -8,6 +8,9 @@
       "pid": "0x5044",
       "device_version": "0.0.2"
    },
+    "rgb_matrix": {
+        "driver": "AW20216"
+    },
    "matrix_pins": {
        "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"],
        "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "B10"]
diff --git a/keyboards/gmmk/pro/rev2/iso/rules.mk b/keyboards/gmmk/pro/rev2/iso/rules.mk
index 7f154b74c1..db00e4c84c 100644
--- a/keyboards/gmmk/pro/rev2/iso/rules.mk
+++ b/keyboards/gmmk/pro/rev2/iso/rules.mk
@@ -15,6 +15,5 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = AW20216
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = spi_flash
diff --git a/keyboards/gopolar/gg86/info.json b/keyboards/gopolar/gg86/info.json
index 7dd7696eb7..8886063045 100644
--- a/keyboards/gopolar/gg86/info.json
+++ b/keyboards/gopolar/gg86/info.json
@@ -11,6 +11,9 @@
    "ws2812": {
        "pin": "E2"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "C7", "E6", "D2", "D3"],
        "rows": ["B0", "B1", "B2", "B3", "B7", "D5"]
diff --git a/keyboards/gopolar/gg86/rules.mk b/keyboards/gopolar/gg86/rules.mk
index 24c3d42112..9eef6b6cc4 100644
--- a/keyboards/gopolar/gg86/rules.mk
+++ b/keyboards/gopolar/gg86/rules.mk
@@ -19,7 +19,6 @@ NO_USB_STARTUP_CHECK = yes
 # RGB Matrix enabled
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 # OLED enabled
 OLED_ENABLE = yes
diff --git a/keyboards/hadron/ver3/info.json b/keyboards/hadron/ver3/info.json
index cb2654387b..753a9676ce 100644
--- a/keyboards/hadron/ver3/info.json
+++ b/keyboards/hadron/ver3/info.json
@@ -2,6 +2,9 @@
    "usb": {
        "device_version": "0.0.3"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["B8", "B2", "B10", "A0", "A1", "A2", "B0", "A3", "B1", "A6", "A7", "B12", "C13", "B11", "B9"],
        "rows": ["C15", "C14", "A10", "A9", "A8"]
diff --git a/keyboards/hadron/ver3/rules.mk b/keyboards/hadron/ver3/rules.mk
index 5d37686760..5739e57d19 100644
--- a/keyboards/hadron/ver3/rules.mk
+++ b/keyboards/hadron/ver3/rules.mk
@@ -11,7 +11,6 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 AUDIO_ENABLE = yes
 RGBLIGHT_ENABLE = yes
 RGB_MATRIX_ENABLE = no # once arm_rgb is implemented
-RGB_MATRIX_DRIVER = WS2812
 HAPTIC_ENABLE = yes
 HAPTIC_DRIVER = DRV2605L
 OLED_ENABLE = yes
diff --git a/keyboards/handwired/6macro/info.json b/keyboards/handwired/6macro/info.json
index 8c9b3e832f..5bc9833fa5 100644
--- a/keyboards/handwired/6macro/info.json
+++ b/keyboards/handwired/6macro/info.json
@@ -11,6 +11,9 @@
    "ws2812": {
      "pin": "D2"
    },
+    "rgb_matrix": {
+      "driver": "WS2812"
+    },
    "matrix_pins": {
      "cols": ["B0", "B1", "B2"],
      "rows": ["B3", "B4"]
diff --git a/keyboards/handwired/6macro/rules.mk b/keyboards/handwired/6macro/rules.mk
index 8c51d38be3..083cc21a34 100644
--- a/keyboards/handwired/6macro/rules.mk
+++ b/keyboards/handwired/6macro/rules.mk
@@ -8,7 +8,6 @@ CONSOLE_ENABLE = no        	# Console for debug
 COMMAND_ENABLE = no             # Commands for debug and configuration
 NKRO_ENABLE = yes           # Enable N-Key Rollover
 RGB_MATRIX_ENABLE = no     # Enable per-key coordinate based RGB effects. Do not enable with RGBlight
-RGB_MATRIX_DRIVER = WS2812
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 UNICODE_ENABLE = yes        # Unicode
diff --git a/keyboards/handwired/colorlice/info.json b/keyboards/handwired/colorlice/info.json
index 11ac235065..0cba448703 100644
--- a/keyboards/handwired/colorlice/info.json
+++ b/keyboards/handwired/colorlice/info.json
@@ -11,6 +11,9 @@
    "ws2812": {
      "pin": "B1"
    },
+    "rgb_matrix": {
+      "driver": "WS2812"
+    },
    "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/colorlice/rules.mk b/keyboards/handwired/colorlice/rules.mk
index 972181a4b4..16e007dd34 100644
--- a/keyboards/handwired/colorlice/rules.mk
+++ b/keyboards/handwired/colorlice/rules.mk
@@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 LTO_ENABLE = yes            # Use link time optimization
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/info.json b/keyboards/handwired/dactyl_manuform/3x5_3/info.json
index 13aee1eaaf..cfe109fb37 100644
--- a/keyboards/handwired/dactyl_manuform/3x5_3/info.json
+++ b/keyboards/handwired/dactyl_manuform/3x5_3/info.json
@@ -11,6 +11,9 @@
    "ws2812": {
        "pin": "D3"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["C6", "D7", "E6", "B4", "B5"],
        "rows": ["B1", "B3", "B2", "B6"]
diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/rules.mk b/keyboards/handwired/dactyl_manuform/3x5_3/rules.mk
index 275ece3219..38ee6f4252 100644
--- a/keyboards/handwired/dactyl_manuform/3x5_3/rules.mk
+++ b/keyboards/handwired/dactyl_manuform/3x5_3/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 # AUDIO_ENABLE = yes          # Audio output
 RGB_MATRIX_ENABLE = yes     # Enable WS2812 RGB matrix
-RGB_MATRIX_DRIVER = WS2812
 SPLIT_KEYBOARD = yes
 RGBLIGHT_SUPPORTED = yes
diff --git a/keyboards/handwired/dygma/raise/info.json b/keyboards/handwired/dygma/raise/info.json
index 312a0693a9..5c287bcc7e 100644
--- a/keyboards/handwired/dygma/raise/info.json
+++ b/keyboards/handwired/dygma/raise/info.json
@@ -8,6 +8,9 @@
        "pid": "0x2201",
        "device_version": "0.0.1"
    },
+    "rgb_matrix": {
+        "driver": "custom"
+    },
    "processor": "STM32F411",
    "bootloader": "stm32-dfu",
    "board": "BLACKPILL_STM32_F411",
diff --git a/keyboards/handwired/dygma/raise/rules.mk b/keyboards/handwired/dygma/raise/rules.mk
index 362a47d7da..761e075500 100644
--- a/keyboards/handwired/dygma/raise/rules.mk
+++ b/keyboards/handwired/dygma/raise/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = custom
 CUSTOM_MATRIX = lite
 # TODO(ibash) we don't actually need to enable raw, but there's some side effect
diff --git a/keyboards/handwired/hnah108/info.json b/keyboards/handwired/hnah108/info.json
index 5f43b185cf..4d7d3e0386 100644
--- a/keyboards/handwired/hnah108/info.json
+++ b/keyboards/handwired/hnah108/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0000",
        "device_version": "0.0.2"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["F0", "E6", "B0", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7"],
        "rows": ["F7", "F6", "F5", "F4", "F1", "C7", "B4", "B5", "B6", "C6"]
diff --git a/keyboards/handwired/hnah108/rules.mk b/keyboards/handwired/hnah108/rules.mk
index ae9acc534f..ec5f27bde8 100644
--- a/keyboards/handwired/hnah108/rules.mk
+++ b/keyboards/handwired/hnah108/rules.mk
@@ -12,4 +12,3 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/handwired/hnah40rgb/info.json b/keyboards/handwired/hnah40rgb/info.json
index 89ac784207..3eb92ce1ef 100644
--- a/keyboards/handwired/hnah40rgb/info.json
+++ b/keyboards/handwired/hnah40rgb/info.json
@@ -11,6 +11,9 @@
    "ws2812": {
        "pin": "E2"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["D5", "D6", "D3", "D2", "B6", "C6", "C7", "F7", "F6", "F5", "F4"],
        "rows": ["B7", "D7", "F1", "F0"]
diff --git a/keyboards/handwired/hnah40rgb/rules.mk b/keyboards/handwired/hnah40rgb/rules.mk
index cab4eea965..7c04c86483 100644
--- a/keyboards/handwired/hnah40rgb/rules.mk
+++ b/keyboards/handwired/hnah40rgb/rules.mk
@@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/handwired/orbweaver/info.json b/keyboards/handwired/orbweaver/info.json
index e9b37e1c81..d0b6d7f48a 100644
--- a/keyboards/handwired/orbweaver/info.json
+++ b/keyboards/handwired/orbweaver/info.json
@@ -12,6 +12,9 @@
        "mousekey": true,
        "nkro": true
    },
+    "rgb_matrix": {
+        "driver": "IS31FL3731"
+    },
    "matrix_pins": {
        "rows": ["GP4", "GP5", "GP6", "GP7", "GP8", "GP9"],
        "cols": ["GP12", "GP13", "GP14", "GP15", "GP16"]
diff --git a/keyboards/handwired/orbweaver/rules.mk b/keyboards/handwired/orbweaver/rules.mk
index 07c357daac..01f9d9397a 100644
--- a/keyboards/handwired/orbweaver/rules.mk
+++ b/keyboards/handwired/orbweaver/rules.mk
@@ -1,3 +1,2 @@
 # Add support for 3731 RGB matrix controller
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3731
diff --git a/keyboards/handwired/p65rgb/info.json b/keyboards/handwired/p65rgb/info.json
index 78b630e512..c752501362 100644
--- a/keyboards/handwired/p65rgb/info.json
+++ b/keyboards/handwired/p65rgb/info.json
@@ -11,6 +11,9 @@
    "ws2812": {
        "pin": "B4"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "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/p65rgb/rules.mk b/keyboards/handwired/p65rgb/rules.mk
index b5bcf508c4..5e57c341f1 100644
--- a/keyboards/handwired/p65rgb/rules.mk
+++ b/keyboards/handwired/p65rgb/rules.mk
@@ -10,6 +10,5 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 AUDIO_ENABLE = no           # Audio output
 LTO_ENABLE = yes
diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/info.json b/keyboards/handwired/tractyl_manuform/4x6_right/info.json
index 55d17ee09b..4d0f97fb42 100644
--- a/keyboards/handwired/tractyl_manuform/4x6_right/info.json
+++ b/keyboards/handwired/tractyl_manuform/4x6_right/info.json
@@ -6,6 +6,9 @@
        "pid": "0x3537",
        "device_version": "0.0.1"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["C0", "C1", "C2", "C3", "C4", "C5"],
        "rows": ["A0", "A1", "A2", "A3", "A4"]
diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/rules.mk b/keyboards/handwired/tractyl_manuform/4x6_right/rules.mk
index 8c9bf430d8..aabe18457a 100644
--- a/keyboards/handwired/tractyl_manuform/4x6_right/rules.mk
+++ b/keyboards/handwired/tractyl_manuform/4x6_right/rules.mk
@@ -11,8 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = no
-RGB_MATRIX_DRIVER = WS2812
 POINTING_DEVICE_ENABLE = yes
 POINTING_DEVICE_DRIVER = pmw3360
diff --git a/keyboards/helix/rev3_4rows/info.json b/keyboards/helix/rev3_4rows/info.json
index 091e6a988f..db9d760692 100644
--- a/keyboards/helix/rev3_4rows/info.json
+++ b/keyboards/helix/rev3_4rows/info.json
@@ -8,6 +8,9 @@
    "pid": "0x0004",
    "device_version": "0.0.1"
  },
+  "rgb_matrix": {
+    "driver": "WS2812"
+  },
  "encoder": {
    "rotary": [
      {"pin_a": "B6", "pin_b": "B5"}
diff --git a/keyboards/helix/rev3_4rows/rules.mk b/keyboards/helix/rev3_4rows/rules.mk
index f29deaf586..23b73845f0 100644
--- a/keyboards/helix/rev3_4rows/rules.mk
+++ b/keyboards/helix/rev3_4rows/rules.mk
@@ -2,7 +2,6 @@ EXTRAKEY_ENABLE = yes    # Audio control and System control
 RGBLIGHT_ENABLE = yes   # Enable keyboard RGB underglow
 SPLIT_KEYBOARD = yes
 RGB_MATRIX_ENABLE = no
-RGB_MATRIX_DRIVER = WS2812
 OLED_ENABLE = yes
 OLED_DRIVER = SSD1306
 ENCODER_ENABLE = yes
diff --git a/keyboards/helix/rev3_5rows/info.json b/keyboards/helix/rev3_5rows/info.json
index 1fd410ee22..abd4f64ab1 100644
--- a/keyboards/helix/rev3_5rows/info.json
+++ b/keyboards/helix/rev3_5rows/info.json
@@ -8,6 +8,9 @@
    "pid": "0x0003",
    "device_version": "0.0.1"
  },
+  "rgb_matrix": {
+    "driver": "WS2812"
+  },
  "encoder": {
    "rotary": [
      {"pin_a": "B6", "pin_b": "B5"}
diff --git a/keyboards/helix/rev3_5rows/rules.mk b/keyboards/helix/rev3_5rows/rules.mk
index f29deaf586..23b73845f0 100644
--- a/keyboards/helix/rev3_5rows/rules.mk
+++ b/keyboards/helix/rev3_5rows/rules.mk
@@ -2,7 +2,6 @@ EXTRAKEY_ENABLE = yes    # Audio control and System control
 RGBLIGHT_ENABLE = yes   # Enable keyboard RGB underglow
 SPLIT_KEYBOARD = yes
 RGB_MATRIX_ENABLE = no
-RGB_MATRIX_DRIVER = WS2812
 OLED_ENABLE = yes
 OLED_DRIVER = SSD1306
 ENCODER_ENABLE = yes
diff --git a/keyboards/hfdkb/ac001/info.json b/keyboards/hfdkb/ac001/info.json
index 1ce034931b..d46deb9d0d 100644
--- a/keyboards/hfdkb/ac001/info.json
+++ b/keyboards/hfdkb/ac001/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0001",
        "device_version": "0.0.1"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["A5", "A6", "A7", "C4", "C5"],
        "rows": ["B15"]
diff --git a/keyboards/hfdkb/ac001/rules.mk b/keyboards/hfdkb/ac001/rules.mk
index cf3008c6e4..81b7e82c3f 100644
--- a/keyboards/hfdkb/ac001/rules.mk
+++ b/keyboards/hfdkb/ac001/rules.mk
@@ -10,6 +10,5 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no       # Enable keyboard RGB underglow
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = spi_flash
diff --git a/keyboards/hfdkb/keyboard_sw/k83/info.json b/keyboards/hfdkb/keyboard_sw/k83/info.json
index 6810aff30f..efdea0336c 100644
--- a/keyboards/hfdkb/keyboard_sw/k83/info.json
+++ b/keyboards/hfdkb/keyboard_sw/k83/info.json
@@ -7,6 +7,9 @@
        "pid": "0x0007",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "IS31FL3733"
+    },
    "processor": "WB32FQ95",
    "bootloader": "wb32-dfu",
    "matrix_pins": {
diff --git a/keyboards/hfdkb/keyboard_sw/k83/rules.mk b/keyboards/hfdkb/keyboard_sw/k83/rules.mk
index 176dd64c1c..756d0c0719 100644
--- a/keyboards/hfdkb/keyboard_sw/k83/rules.mk
+++ b/keyboards/hfdkb/keyboard_sw/k83/rules.mk
@@ -14,7 +14,6 @@ AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes         # DPI Switch
 ENCODER_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3733
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = spi_flash
 #RGB_MATRIX_CUSTOM_USER = yes #Add turnoff LED
diff --git a/keyboards/horrortroll/chinese_pcb/devil68_pro/info.json b/keyboards/horrortroll/chinese_pcb/devil68_pro/info.json
index e721a68e79..0a4f93e10d 100644
--- a/keyboards/horrortroll/chinese_pcb/devil68_pro/info.json
+++ b/keyboards/horrortroll/chinese_pcb/devil68_pro/info.json
@@ -8,6 +8,9 @@
        "pid": "0x7001",
        "device_version": "0.0.1"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["B1", "B0", "B5", "B6", "C6", "C7", "E2", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"],
        "rows": ["B7", "B3", "B2", "F6", "F7"]
diff --git a/keyboards/horrortroll/chinese_pcb/devil68_pro/rules.mk b/keyboards/horrortroll/chinese_pcb/devil68_pro/rules.mk
index e3a981b634..138bf78056 100644
--- a/keyboards/horrortroll/chinese_pcb/devil68_pro/rules.mk
+++ b/keyboards/horrortroll/chinese_pcb/devil68_pro/rules.mk
@@ -13,4 +13,3 @@ AUDIO_ENABLE = no           # Audio output
 # RGB Matrix enabled
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/horrortroll/handwired_k552/info.json b/keyboards/horrortroll/handwired_k552/info.json
index d3d2cd5940..2d97949c82 100644
--- a/keyboards/horrortroll/handwired_k552/info.json
+++ b/keyboards/horrortroll/handwired_k552/info.json
@@ -11,6 +11,9 @@
    "ws2812": {
        "pin": "C14"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["B15", "C6", "C7", "A3", "A1", "C3", "C1", "B14", "B13", "A9", "B3", "B4", "A0", "C11", "C4", "C0", "C2"],
        "rows": ["C12", "C10", "A10", "A8", "C8", "C9"]
diff --git a/keyboards/horrortroll/handwired_k552/rules.mk b/keyboards/horrortroll/handwired_k552/rules.mk
index 9f0cc2d7a0..2d1a6e93ca 100644
--- a/keyboards/horrortroll/handwired_k552/rules.mk
+++ b/keyboards/horrortroll/handwired_k552/rules.mk
@@ -31,7 +31,6 @@ OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
 # RGB Matrix enabled
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 # OLED enabled
 OLED_ENABLE = yes
diff --git a/keyboards/hotdox76v2/info.json b/keyboards/hotdox76v2/info.json
index 5e9bf9a87f..de958c87d1 100644
--- a/keyboards/hotdox76v2/info.json
+++ b/keyboards/hotdox76v2/info.json
@@ -15,6 +15,9 @@
        "oled": true,
        "rgb_matrix": true
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "E6"],
        "rows": ["D6", "D7", "B4", "B5", "B6", "C6"]
diff --git a/keyboards/hotdox76v2/rules.mk b/keyboards/hotdox76v2/rules.mk
index 32afd21635..e69de29bb2 100644
--- a/keyboards/hotdox76v2/rules.mk
+++ b/keyboards/hotdox76v2/rules.mk
@@ -1 +0,0 @@
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/hs60/v1/info.json b/keyboards/hs60/v1/info.json
index a8b59352cb..09290faa73 100644
--- a/keyboards/hs60/v1/info.json
+++ b/keyboards/hs60/v1/info.json
@@ -8,6 +8,9 @@
    "pid": "0x0257",
    "device_version": "0.0.1"
  },
+  "rgb_matrix": {
+    "driver": "IS31FL3731"
+  },
  "matrix_pins": {
    "cols": ["F1", "F4", "F5", "E6", "F0", "B7", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5"],
    "rows": ["B0", "B1", "B2", "B3", "F7"]
diff --git a/keyboards/hs60/v1/rules.mk b/keyboards/hs60/v1/rules.mk
index 91c36443cd..7aa0a5ae51 100644
--- a/keyboards/hs60/v1/rules.mk
+++ b/keyboards/hs60/v1/rules.mk
@@ -15,7 +15,6 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes     # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3731
 RAW_ENABLE = yes
 # Experimental features for zealcmd please do no enable
diff --git a/keyboards/hub20/info.json b/keyboards/hub20/info.json
index b8356e6f77..991c4ebc46 100644
--- a/keyboards/hub20/info.json
+++ b/keyboards/hub20/info.json
@@ -8,6 +8,9 @@
      "pid": "0x4414",
      "device_version": "0.0.1"
    },
+    "rgb_matrix": {
+      "driver": "WS2812"
+    },
    "matrix_pins": {
      "cols": ["A6", "A7", "B7", "B6"],
      "rows": ["A13", "B14", "A10", "A0", "A2", "A1"]
diff --git a/keyboards/hub20/rules.mk b/keyboards/hub20/rules.mk
index 2dd9c5acc6..081ea9225a 100644
--- a/keyboards/hub20/rules.mk
+++ b/keyboards/hub20/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 ENCODER_ENABLE = yes
 # Enter lower-power sleep mode when on the ChibiOS idle thread
diff --git a/keyboards/idobao/id42/info.json b/keyboards/idobao/id42/info.json
index 4733c8230a..ea37dd3322 100644
--- a/keyboards/idobao/id42/info.json
+++ b/keyboards/idobao/id42/info.json
@@ -17,6 +17,9 @@
    "ws2812": {
        "pin": "B3"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["B4", "D7", "D6", "D4", "B5", "C7", "F0", "F7", "F6", "F1", "F4", "F5"],
        "rows": ["D5", "C6", "B6", "E6"]
diff --git a/keyboards/idobao/id42/rules.mk b/keyboards/idobao/id42/rules.mk
index eab741fd0a..58e39b17a5 100755
--- a/keyboards/idobao/id42/rules.mk
+++ b/keyboards/idobao/id42/rules.mk
@@ -2,4 +2,3 @@
 # ** settings are data driven & stored in `info.json` **
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/idobao/id61/info.json b/keyboards/idobao/id61/info.json
index 03d0649d9f..9fa2719e8c 100644
--- a/keyboards/idobao/id61/info.json
+++ b/keyboards/idobao/id61/info.json
@@ -17,6 +17,9 @@
    "ws2812": {
        "pin": "F0"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["C7", "F6", "F5", "F4", "F1", "B7", "D5", "D1", "D2", "D3", "D4", "D0", "D6", "D7"],
        "rows": ["B0", "B1", "B2", "B3", "F7"]
diff --git a/keyboards/idobao/id61/rules.mk b/keyboards/idobao/id61/rules.mk
index d034fbb12f..ed51a57621 100644
--- a/keyboards/idobao/id61/rules.mk
+++ b/keyboards/idobao/id61/rules.mk
@@ -3,4 +3,3 @@
 # ** settings are data driven & stored in `info.json` **
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/idobao/id63/info.json b/keyboards/idobao/id63/info.json
index 74aed63503..234f3e84ac 100644
--- a/keyboards/idobao/id63/info.json
+++ b/keyboards/idobao/id63/info.json
@@ -17,6 +17,9 @@
    "ws2812": {
        "pin": "B7"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["C7", "F6", "F5", "F4", "F1", "B3", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7"],
        "rows": ["B0", "B1", "B2", "E6", "F7"]
diff --git a/keyboards/idobao/id63/rules.mk b/keyboards/idobao/id63/rules.mk
index eab741fd0a..58e39b17a5 100644
--- a/keyboards/idobao/id63/rules.mk
+++ b/keyboards/idobao/id63/rules.mk
@@ -2,4 +2,3 @@
 # ** settings are data driven & stored in `info.json` **
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/idobao/id67/info.json b/keyboards/idobao/id67/info.json
index 490921f457..f21a9ecd67 100644
--- a/keyboards/idobao/id67/info.json
+++ b/keyboards/idobao/id67/info.json
@@ -17,6 +17,9 @@
    "ws2812": {
        "pin": "F0"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["C7", "F6", "F5", "F4", "F1", "B7", "D5", "D1", "D2", "D3", "D4", "D0", "D6", "D7", "B4"],
        "rows": ["B0", "B1", "B2", "B3", "F7"]
diff --git a/keyboards/idobao/id67/rules.mk b/keyboards/idobao/id67/rules.mk
index ce58b87be5..4341508fde 100644
--- a/keyboards/idobao/id67/rules.mk
+++ b/keyboards/idobao/id67/rules.mk
@@ -2,4 +2,3 @@
 #   change yes to no to disable
 #
 RGB_MATRIX_ENABLE = yes     # Enable RGB Matrix feature
-RGB_MATRIX_DRIVER = WS2812      # ID67 uses WS2812 driver
diff --git a/keyboards/idobao/id75/v2/info.json b/keyboards/idobao/id75/v2/info.json
index 5273a7227d..5275c54dbb 100644
--- a/keyboards/idobao/id75/v2/info.json
+++ b/keyboards/idobao/id75/v2/info.json
@@ -11,6 +11,9 @@
    "ws2812": {
        "pin": "F0"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["F6", "F5", "F4", "F1", "E6", "D5", "D3", "D2", "D1", "D0", "D4", "D6", "D7", "B4", "B5"],
        "rows": ["B0", "B3", "C7", "B6", "C6"]
diff --git a/keyboards/idobao/id75/v2/rules.mk b/keyboards/idobao/id75/v2/rules.mk
index a29a20b766..38f5eb554b 100644
--- a/keyboards/idobao/id75/v2/rules.mk
+++ b/keyboards/idobao/id75/v2/rules.mk
@@ -13,4 +13,3 @@ AUDIO_ENABLE = no           # Audio output
 LTO_ENABLE = yes            # Use link time optimization
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/idobao/id80/v3/ansi/info.json b/keyboards/idobao/id80/v3/ansi/info.json
index c121ff8e3d..7788a941f4 100644
--- a/keyboards/idobao/id80/v3/ansi/info.json
+++ b/keyboards/idobao/id80/v3/ansi/info.json
@@ -14,6 +14,9 @@
        "backlight": false,
        "rgblight": false
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["B7", "B3", "B2", "B1", "B0", "E6", "F1", "F4", "F5", "F6", "F7"],
        "rows": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"]
diff --git a/keyboards/idobao/id80/v3/ansi/rules.mk b/keyboards/idobao/id80/v3/ansi/rules.mk
index eab741fd0a..58e39b17a5 100644
--- a/keyboards/idobao/id80/v3/ansi/rules.mk
+++ b/keyboards/idobao/id80/v3/ansi/rules.mk
@@ -2,4 +2,3 @@
 # ** settings are data driven & stored in `info.json` **
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/idobao/id87/v2/info.json b/keyboards/idobao/id87/v2/info.json
index 7f21832a03..d51e39215b 100644
--- a/keyboards/idobao/id87/v2/info.json
+++ b/keyboards/idobao/id87/v2/info.json
@@ -17,6 +17,9 @@
    "ws2812": {
        "pin": "E2"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"],
        "rows": ["E6", "B0", "B1", "B2", "B3", "B7", "F7", "F6", "F5", "F4", "F1"]
diff --git a/keyboards/idobao/id87/v2/rules.mk b/keyboards/idobao/id87/v2/rules.mk
index eab741fd0a..58e39b17a5 100644
--- a/keyboards/idobao/id87/v2/rules.mk
+++ b/keyboards/idobao/id87/v2/rules.mk
@@ -2,4 +2,3 @@
 # ** settings are data driven & stored in `info.json` **
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/idobao/montex/v1rgb/info.json b/keyboards/idobao/montex/v1rgb/info.json
index 9860f7193a..5980cab117 100755
--- a/keyboards/idobao/montex/v1rgb/info.json
+++ b/keyboards/idobao/montex/v1rgb/info.json
@@ -6,6 +6,9 @@
        "pid": "0x0127",
        "device_version": "0.0.1"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["D5", "D3", "D2", "D1", "D0"],
        "rows": ["D4", "D6", "D7", "B4", "B5", "C6"]
diff --git a/keyboards/idobao/montex/v1rgb/rules.mk b/keyboards/idobao/montex/v1rgb/rules.mk
index 9a1656f5d6..88f044a7ec 100755
--- a/keyboards/idobao/montex/v1rgb/rules.mk
+++ b/keyboards/idobao/montex/v1rgb/rules.mk
@@ -10,4 +10,3 @@ NKRO_ENABLE = no            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/idobao/montex/v2/info.json b/keyboards/idobao/montex/v2/info.json
index 71c92c3331..5add3c6c2f 100755
--- a/keyboards/idobao/montex/v2/info.json
+++ b/keyboards/idobao/montex/v2/info.json
@@ -17,6 +17,9 @@
    "ws2812": {
        "pin": "B1"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["D5", "D3", "D2", "D1", "D0"],
        "rows": ["D4", "D6", "D7", "B4", "B5", "C6"]
diff --git a/keyboards/idobao/montex/v2/rules.mk b/keyboards/idobao/montex/v2/rules.mk
index 205f56d5fd..d249ac15a7 100755
--- a/keyboards/idobao/montex/v2/rules.mk
+++ b/keyboards/idobao/montex/v2/rules.mk
@@ -2,4 +2,3 @@
 # ** settings are data driven & stored in `info.json` **
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/ilumkb/simpler61/info.json b/keyboards/ilumkb/simpler61/info.json
index e9f4488dc7..8b2d379a38 100644
--- a/keyboards/ilumkb/simpler61/info.json
+++ b/keyboards/ilumkb/simpler61/info.json
@@ -8,6 +8,9 @@
        "pid": "0xC361",
        "device_version": "0.0.1"
    },
+    "rgb_matrix": {
+        "driver": "IS31FL3741"
+    },
    "matrix_pins": {
        "cols": ["B0", "B1", "B2", "B3", "B7", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7"],
        "rows": ["F6", "F5", "F4", "F1", "F0"]
diff --git a/keyboards/ilumkb/simpler61/rules.mk b/keyboards/ilumkb/simpler61/rules.mk
index df3e43eac7..c2f7c0e093 100644
--- a/keyboards/ilumkb/simpler61/rules.mk
+++ b/keyboards/ilumkb/simpler61/rules.mk
@@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
 AUDIO_ENABLE = no              # Audio output
 RGB_MATRIX_ENABLE = yes        # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3741
diff --git a/keyboards/ilumkb/simpler64/info.json b/keyboards/ilumkb/simpler64/info.json
index 40371b7a28..b13b3fbf3c 100644
--- a/keyboards/ilumkb/simpler64/info.json
+++ b/keyboards/ilumkb/simpler64/info.json
@@ -8,6 +8,9 @@
        "pid": "0xC364",
        "device_version": "0.0.1"
    },
+    "rgb_matrix": {
+        "driver": "IS31FL3741"
+    },
    "matrix_pins": {
        "cols": ["B0", "B1", "B2", "B3", "B7", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7"],
        "rows": ["F6", "F5", "F4", "F1", "F0"]
diff --git a/keyboards/ilumkb/simpler64/rules.mk b/keyboards/ilumkb/simpler64/rules.mk
index df3e43eac7..c2f7c0e093 100644
--- a/keyboards/ilumkb/simpler64/rules.mk
+++ b/keyboards/ilumkb/simpler64/rules.mk
@@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
 AUDIO_ENABLE = no              # Audio output
 RGB_MATRIX_ENABLE = yes        # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3741
diff --git a/keyboards/inett_studio/sqx/hotswap/info.json b/keyboards/inett_studio/sqx/hotswap/info.json
index daeabe72ae..02934bcf7c 100644
--- a/keyboards/inett_studio/sqx/hotswap/info.json
+++ b/keyboards/inett_studio/sqx/hotswap/info.json
@@ -11,6 +11,9 @@
    "ws2812": {
        "pin": "D7"
    },
+    "rgb_matrix": {
+        "driver": "IS31FL3731"
+    },
    "matrix_pins": {
        "cols": ["C7", "C6", "B6", "B5", "B4", "F7", "F6", "F5", "E6", "B0", "D2", "D4", "D5", "D3"],
        "rows": ["F0", "F1", "F4", "B7", "D6"]
diff --git a/keyboards/inett_studio/sqx/hotswap/rules.mk b/keyboards/inett_studio/sqx/hotswap/rules.mk
index bb431dcb1d..9495ef556a 100644
--- a/keyboards/inett_studio/sqx/hotswap/rules.mk
+++ b/keyboards/inett_studio/sqx/hotswap/rules.mk
@@ -10,7 +10,6 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 RGB_MATRIX_ENABLE = yes     # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3731
 AUDIO_ENABLE = no           # Audio output
 LTO_ENABLE = yes            # Reducing firmware size
diff --git a/keyboards/inett_studio/sqx/universal/info.json b/keyboards/inett_studio/sqx/universal/info.json
index f0b25a78c9..5f3c728046 100644
--- a/keyboards/inett_studio/sqx/universal/info.json
+++ b/keyboards/inett_studio/sqx/universal/info.json
@@ -11,6 +11,9 @@
    "ws2812": {
        "pin": "D7"
    },
+    "rgb_matrix": {
+        "driver": "IS31FL3731"
+    },
    "matrix_pins": {
        "cols": ["C7", "C6", "B6", "B5", "B4", "F7", "F6", "F5", "E6", "B0", "D2", "D4", "D5", "D3"],
        "rows": ["F0", "F1", "F4", "B7", "D6"]
diff --git a/keyboards/inett_studio/sqx/universal/rules.mk b/keyboards/inett_studio/sqx/universal/rules.mk
index 15a127480a..0b20413480 100644
--- a/keyboards/inett_studio/sqx/universal/rules.mk
+++ b/keyboards/inett_studio/sqx/universal/rules.mk
@@ -10,6 +10,5 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 RGB_MATRIX_ENABLE = yes     # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3731
 LTO_ENABLE = yes            # Reducing firmware size
diff --git a/keyboards/input_club/ergodox_infinity/info.json b/keyboards/input_club/ergodox_infinity/info.json
index c03c38ed0d..ca6aa92b5d 100644
--- a/keyboards/input_club/ergodox_infinity/info.json
+++ b/keyboards/input_club/ergodox_infinity/info.json
@@ -6,6 +6,9 @@
        "pid": "0xB04D",
        "device_version": "0.0.1"
    },
+    "led_matrix": {
+        "driver": "IS31FL3731"
+    },
    "matrix_pins": {
        "cols": ["D1", "D4", "D5", "D6", "D7"],
        "rows": ["B2", "B3", "B18", "B19", "C0", "C9", "C10", "C11", "D0"]
diff --git a/keyboards/input_club/ergodox_infinity/rules.mk b/keyboards/input_club/ergodox_infinity/rules.mk
index 88bd6b0041..4f1b0c0188 100644
--- a/keyboards/input_club/ergodox_infinity/rules.mk
+++ b/keyboards/input_club/ergodox_infinity/rules.mk
@@ -19,4 +19,3 @@ SERIAL_DRIVER = usart
 ST7565_ENABLE = yes
 LED_MATRIX_ENABLE = yes
-LED_MATRIX_DRIVER = IS31FL3731
diff --git a/keyboards/input_club/k_type/info.json b/keyboards/input_club/k_type/info.json
index 90662a47da..7279c8a933 100644
--- a/keyboards/input_club/k_type/info.json
+++ b/keyboards/input_club/k_type/info.json
@@ -8,6 +8,9 @@
        "pid": "0xB04D",
        "device_version": "0.0.1"
    },
+    "rgb_matrix": {
+        "driver": "custom"
+    },
    "matrix_pins": {
        "cols": ["B2", "B3", "B18", "B19", "C0", "C8", "C9", "D0", "D1", "D4"],
        "rows": ["D5", "D6", "D7", "C1", "C2", "C3", "C4", "C5", "C6", "C7"]
diff --git a/keyboards/input_club/k_type/rules.mk b/keyboards/input_club/k_type/rules.mk
index 3e5006cd5a..450eb9a023 100644
--- a/keyboards/input_club/k_type/rules.mk
+++ b/keyboards/input_club/k_type/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 # RGB options
 RGB_MATRIX_ENABLE = no
-RGB_MATRIX_DRIVER = custom
 # Additional files for RGB lighting
 SRC += k_type-rgbdriver.c
diff --git a/keyboards/input_club/whitefox/info.json b/keyboards/input_club/whitefox/info.json
index bd7da75a41..02dd975752 100644
--- a/keyboards/input_club/whitefox/info.json
+++ b/keyboards/input_club/whitefox/info.json
@@ -7,6 +7,9 @@
        "pid": "0xB04D",
        "device_version": "0.0.1"
    },
+    "led_matrix": {
+        "driver": "IS31FL3731"
+    },
    "matrix_pins": {
        "cols": ["B2", "B3", "B18", "B19", "C0", "C8", "C9", "C10", "C11"],
        "rows": ["D0", "D1", "D4", "D5", "D6", "D7", "C1", "C2"]
diff --git a/keyboards/input_club/whitefox/rules.mk b/keyboards/input_club/whitefox/rules.mk
index 2a45fc02dd..9b9b2ed739 100644
--- a/keyboards/input_club/whitefox/rules.mk
+++ b/keyboards/input_club/whitefox/rules.mk
@@ -11,7 +11,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 LED_MATRIX_ENABLE = yes
-LED_MATRIX_DRIVER = IS31FL3731
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/jacky_studio/bear_65/rev1/info.json b/keyboards/jacky_studio/bear_65/rev1/info.json
index 5d50328335..8bc527606f 100644
--- a/keyboards/jacky_studio/bear_65/rev1/info.json
+++ b/keyboards/jacky_studio/bear_65/rev1/info.json
@@ -10,6 +10,9 @@
        "pid": "0x000A",
        "device_version": "0.0.1"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "F7", "F6", "F5", "F4", "F1", "F0"],
        "rows": ["B0", "B1", "B2", "B3", "B7"]
diff --git a/keyboards/jacky_studio/bear_65/rev1/rules.mk b/keyboards/jacky_studio/bear_65/rev1/rules.mk
index 5d90baa2af..7e03810942 100644
--- a/keyboards/jacky_studio/bear_65/rev1/rules.mk
+++ b/keyboards/jacky_studio/bear_65/rev1/rules.mk
@@ -14,4 +14,3 @@ AUDIO_ENABLE = no           # Audio output
 LTO_ENABLE = yes            # Use LTO flags to reduce firmware size
 RGB_MATRIX_ENABLE = no          # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)
-RGB_MATRIX_DRIVER = WS2812      # RGB matrix driver support
diff --git a/keyboards/jacky_studio/bear_65/rev2/info.json b/keyboards/jacky_studio/bear_65/rev2/info.json
index 3377f36d6b..c6565255ed 100644
--- a/keyboards/jacky_studio/bear_65/rev2/info.json
+++ b/keyboards/jacky_studio/bear_65/rev2/info.json
@@ -10,6 +10,9 @@
        "pid": "0x0428",
        "device_version": "0.0.1"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "F7", "F6", "F5", "F4", "F1", "F0"],
        "rows": ["B0", "B1", "B2", "B3", "B7"]
diff --git a/keyboards/jacky_studio/bear_65/rev2/rules.mk b/keyboards/jacky_studio/bear_65/rev2/rules.mk
index 5d90baa2af..7e03810942 100644
--- a/keyboards/jacky_studio/bear_65/rev2/rules.mk
+++ b/keyboards/jacky_studio/bear_65/rev2/rules.mk
@@ -14,4 +14,3 @@ AUDIO_ENABLE = no           # Audio output
 LTO_ENABLE = yes            # Use LTO flags to reduce firmware size
 RGB_MATRIX_ENABLE = no          # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)
-RGB_MATRIX_DRIVER = WS2812      # RGB matrix driver support
diff --git a/keyboards/jacky_studio/piggy60/rev2/config.h b/keyboards/jacky_studio/piggy60/rev2/config.h
index 932983d173..fa884d5f18 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 142d4b7e76..91b28898ec 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/jadookb/jkb65/info.json b/keyboards/jadookb/jkb65/info.json
index a5da35516e..e235e7bc41 100644
--- a/keyboards/jadookb/jkb65/info.json
+++ b/keyboards/jadookb/jkb65/info.json
@@ -9,6 +9,9 @@
    "ws2812": {
        "pin": "F0"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layout_aliases": {
diff --git a/keyboards/jadookb/jkb65/rules.mk b/keyboards/jadookb/jkb65/rules.mk
index 14493320b2..9098dae1ca 100644
--- a/keyboards/jadookb/jkb65/rules.mk
+++ b/keyboards/jadookb/jkb65/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 LTO_ENABLE = yes
 DEFAULT_FOLDER = jadookb/jkb65/r1
diff --git a/keyboards/jkeys_design/gentleman65/info.json b/keyboards/jkeys_design/gentleman65/info.json
index a77db31f0d..5c14817597 100644
--- a/keyboards/jkeys_design/gentleman65/info.json
+++ b/keyboards/jkeys_design/gentleman65/info.json
@@ -11,6 +11,9 @@
    "ws2812": {
        "pin": "F4"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["D4", "D6", "D7", "B4", "B5", "B6", "C6", "D5", "C7", "F0", "B2", "B1", "B3", "B0", "B7", "D0"],
        "rows": ["D3", "D2", "D1", "F7", "F1"]
diff --git a/keyboards/jkeys_design/gentleman65/rules.mk b/keyboards/jkeys_design/gentleman65/rules.mk
index cb8a7d75f1..f81996d702 100644
--- a/keyboards/jkeys_design/gentleman65/rules.mk
+++ b/keyboards/jkeys_design/gentleman65/rules.mk
@@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = no
-RGB_MATRIX_DRIVER = WS2812
 ENCODER_ENABLE = yes
 \ No newline at end of file
diff --git a/keyboards/jkeys_design/gentleman65_se_s/info.json b/keyboards/jkeys_design/gentleman65_se_s/info.json
index d50dde9ed3..cb993de950 100644
--- a/keyboards/jkeys_design/gentleman65_se_s/info.json
+++ b/keyboards/jkeys_design/gentleman65_se_s/info.json
@@ -11,6 +11,9 @@
    "ws2812": {
        "pin": "F7"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["D5", "D3", "D2", "D1", "D0", "B7", "B2", "B3", "D4", "D6", "D7", "C7", "C6", "B6", "B5", "B4"],
        "rows": ["F0", "F1", "F4", "F5", "F6"]
diff --git a/keyboards/jkeys_design/gentleman65_se_s/rules.mk b/keyboards/jkeys_design/gentleman65_se_s/rules.mk
index cb8a7d75f1..f81996d702 100644
--- a/keyboards/jkeys_design/gentleman65_se_s/rules.mk
+++ b/keyboards/jkeys_design/gentleman65_se_s/rules.mk
@@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = no
-RGB_MATRIX_DRIVER = WS2812
 ENCODER_ENABLE = yes
 \ No newline at end of file
diff --git a/keyboards/junco/info.json b/keyboards/junco/info.json
index 72e0d5c92a..fb5c391d6a 100644
--- a/keyboards/junco/info.json
+++ b/keyboards/junco/info.json
@@ -8,6 +8,13 @@
        "pid": "0x4A13",
        "device_version": "1.0.0"
    },
+    "ws2812": {
+        "pin": "GP15",
+        "driver": "vendor"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "processor": "RP2040",
    "bootloader": "rp2040",
    "layouts": {
diff --git a/keyboards/junco/rev1/config.h b/keyboards/junco/rev1/config.h
index d9c0556cdf..95731fde01 100644
--- a/keyboards/junco/rev1/config.h
+++ b/keyboards/junco/rev1/config.h
@@ -19,7 +19,6 @@
 /* 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
diff --git a/keyboards/junco/rev1/rules.mk b/keyboards/junco/rev1/rules.mk
index feb836dbe1..e69de29bb2 100644
--- a/keyboards/junco/rev1/rules.mk
+++ b/keyboards/junco/rev1/rules.mk
@@ -1,3 +0,0 @@
-# RGB Stuff
-RGB_MATRIX_DRIVER = WS2812
-WS2812_DRIVER = vendor
diff --git a/keyboards/kapl/rev1/info.json b/keyboards/kapl/rev1/info.json
index af54d39db7..9c5891d119 100644
--- a/keyboards/kapl/rev1/info.json
+++ b/keyboards/kapl/rev1/info.json
@@ -11,6 +11,9 @@
  "ws2812": {
    "pin": "D4"
  },
+  "rgb_matrix": {
+    "driver": "WS2812"
+  },
  "matrix_pins": {
    "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
    "rows": ["C6", "D7", "E6", "B4", "B5"]
diff --git a/keyboards/kapl/rev1/rules.mk b/keyboards/kapl/rev1/rules.mk
index e3a4137694..95bef6d3a7 100644
--- a/keyboards/kapl/rev1/rules.mk
+++ b/keyboards/kapl/rev1/rules.mk
@@ -1,5 +1,4 @@
 # Do not enable RGB_MATRIX_ENABLE together with RGBLIGHT_ENABLE
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 LTO_ENABLE = yes
diff --git a/keyboards/kbdfans/baguette66/rgb/info.json b/keyboards/kbdfans/baguette66/rgb/info.json
index 77277441da..40e02c9515 100644
--- a/keyboards/kbdfans/baguette66/rgb/info.json
+++ b/keyboards/kbdfans/baguette66/rgb/info.json
@@ -10,6 +10,9 @@
    "ws2812": {
        "pin": "E6"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["C6", "C7", "F7", "F6", "B0", "B1", "B2", "B3", "D0", "D1", "D2", "D3", "D5", "D4", "D6"],
        "rows": ["F0", "F1", "F4", "F5", "B6"]
diff --git a/keyboards/kbdfans/baguette66/rgb/rules.mk b/keyboards/kbdfans/baguette66/rgb/rules.mk
index 2972c82a31..c9c55ceed1 100644
--- a/keyboards/kbdfans/baguette66/rgb/rules.mk
+++ b/keyboards/kbdfans/baguette66/rgb/rules.mk
@@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes     # Use RGB matrix
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/kbdfans/bella/rgb/info.json b/keyboards/kbdfans/bella/rgb/info.json
index 102591107f..818283adc1 100644
--- a/keyboards/kbdfans/bella/rgb/info.json
+++ b/keyboards/kbdfans/bella/rgb/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0008",
        "device_version": "0.0.1"
    },
+    "rgb_matrix": {
+        "driver": "IS31FL3741"
+    },
    "matrix_pins": {
        "cols": ["C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5"],
        "rows": ["B0", "B1", "B2", "B3", "B7", "B6"]
diff --git a/keyboards/kbdfans/bella/rgb/rules.mk b/keyboards/kbdfans/bella/rgb/rules.mk
index d65c419c55..d4493d25e0 100644
--- a/keyboards/kbdfans/bella/rgb/rules.mk
+++ b/keyboards/kbdfans/bella/rgb/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
 AUDIO_ENABLE = no              # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3741
 NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
 LTO_ENABLE = yes
diff --git a/keyboards/kbdfans/bella/rgb_iso/info.json b/keyboards/kbdfans/bella/rgb_iso/info.json
index 711977a2ac..aa5202c1d4 100644
--- a/keyboards/kbdfans/bella/rgb_iso/info.json
+++ b/keyboards/kbdfans/bella/rgb_iso/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0009",
        "device_version": "0.0.1"
    },
+    "rgb_matrix": {
+        "driver": "IS31FL3741"
+    },
    "matrix_pins": {
        "cols": ["C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5"],
        "rows": ["B0", "B1", "B2", "B3", "B7", "B6"]
diff --git a/keyboards/kbdfans/bella/rgb_iso/rules.mk b/keyboards/kbdfans/bella/rgb_iso/rules.mk
index d65c419c55..d4493d25e0 100644
--- a/keyboards/kbdfans/bella/rgb_iso/rules.mk
+++ b/keyboards/kbdfans/bella/rgb_iso/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
 AUDIO_ENABLE = no              # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3741
 NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
 LTO_ENABLE = yes
diff --git a/keyboards/kbdfans/boop65/rgb/info.json b/keyboards/kbdfans/boop65/rgb/info.json
index fe9e96ba37..db7c70a981 100644
--- a/keyboards/kbdfans/boop65/rgb/info.json
+++ b/keyboards/kbdfans/boop65/rgb/info.json
@@ -8,6 +8,9 @@
    "pid": "0x1000",
    "device_version": "0.0.1"
  },
+  "rgb_matrix": {
+    "driver": "IS31FL3741"
+  },
 "matrix_pins": {
    "cols": ["F7", "F6", "F5", "C7", "B0", "B1", "B2", "B3", "B4", "D7", "D6", "D4", "D5", "D3", "D2"],
    "rows": ["F0", "F1", "F4", "E6", "C6"]
diff --git a/keyboards/kbdfans/boop65/rgb/rules.mk b/keyboards/kbdfans/boop65/rgb/rules.mk
index 2e8325c39d..65ec78fd37 100644
--- a/keyboards/kbdfans/boop65/rgb/rules.mk
+++ b/keyboards/kbdfans/boop65/rgb/rules.mk
@@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes        # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3741
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v1/info.json b/keyboards/kbdfans/kbd67/mkiirgb/v1/info.json
index ecfc530ea8..733d68cc59 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/v1/info.json
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v1/info.json
@@ -4,6 +4,9 @@
        "pid": "0x1224",
        "device_version": "0.0.1"
    },
+    "rgb_matrix": {
+        "driver": "IS31FL3731"
+    },
    "matrix_pins": {
        "cols": ["A6", "A7", "B0", "B13", "B15", "A8", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15"],
        "rows": ["B1", "B10", "B11", "B14", "B12"]
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v1/rules.mk b/keyboards/kbdfans/kbd67/mkiirgb/v1/rules.mk
index cd78765d76..8e872c17ff 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/v1/rules.mk
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v1/rules.mk
@@ -10,4 +10,3 @@ COMMAND_ENABLE = no                # Commands for debug and configuration
 NKRO_ENABLE = yes           # Enable N-Key Rollover
 AUDIO_ENABLE = no
 RGB_MATRIX_ENABLE = yes            # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3731
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v2/info.json b/keyboards/kbdfans/kbd67/mkiirgb/v2/info.json
index 88e3cd5a31..441c543913 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/v2/info.json
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v2/info.json
@@ -4,6 +4,9 @@
        "pid": "0x1225",
        "device_version": "0.0.2"
    },
+    "rgb_matrix": {
+        "driver": "IS31FL3731"
+    },
    "matrix_pins": {
        "cols": ["F7", "F6", "F5", "C7", "B0", "B1", "B2", "B3", "B4", "D7", "D6", "D4", "D5", "D3", "D2"],
        "rows": ["F0", "F1", "F4", "E6", "C6"]
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v2/rules.mk b/keyboards/kbdfans/kbd67/mkiirgb/v2/rules.mk
index 39afa4b348..05b460b165 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/v2/rules.mk
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v2/rules.mk
@@ -10,5 +10,4 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes     # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3731
 NO_USB_STARTUP_CHECK = no          # Disable initialization only when usb is plugged in
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v3/info.json b/keyboards/kbdfans/kbd67/mkiirgb/v3/info.json
index 73410774ae..378ffa7845 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/v3/info.json
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v3/info.json
@@ -4,6 +4,9 @@
        "pid": "0x1226",
        "device_version": "0.0.3"
    },
+    "rgb_matrix": {
+        "driver": "IS31FL3741"
+    },
    "matrix_pins": {
        "cols": ["F7", "F6", "F5", "C7", "B0", "B1", "B2", "B3", "B4", "D7", "D6", "D4", "D5", "D3", "D2"],
        "rows": ["F0", "F1", "F4", "E6", "C6"]
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v3/rules.mk b/keyboards/kbdfans/kbd67/mkiirgb/v3/rules.mk
index 67366c7a00..bbe22adb0c 100755
--- a/keyboards/kbdfans/kbd67/mkiirgb/v3/rules.mk
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v3/rules.mk
@@ -13,5 +13,4 @@ BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
 AUDIO_ENABLE = no              # Audio output
 RGB_MATRIX_ENABLE = yes        # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3741
 LTO_ENABLE = yes
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v4/info.json b/keyboards/kbdfans/kbd67/mkiirgb/v4/info.json
index 4276e8ef93..f7d5ab552f 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/v4/info.json
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v4/info.json
@@ -7,6 +7,9 @@
    "ws2812": {
        "pin": "C7"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["F7", "F6", "F5", "F4", "B0", "B7", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"],
        "rows": ["B1", "F1", "B2", "B3", "C6"]
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v4/rules.mk b/keyboards/kbdfans/kbd67/mkiirgb/v4/rules.mk
index 653cd377ab..c552dae7c7 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/v4/rules.mk
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v4/rules.mk
@@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/kbdfans/kbd67/mkiirgb_iso/info.json b/keyboards/kbdfans/kbd67/mkiirgb_iso/info.json
index 5e8a3f00d5..4c7d09aa8e 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb_iso/info.json
+++ b/keyboards/kbdfans/kbd67/mkiirgb_iso/info.json
@@ -11,6 +11,9 @@
    "ws2812": {
        "pin": "C7"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["F7", "F6", "F5", "F4", "B0", "B7", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"],
        "rows": ["B1", "F1", "B2", "B3", "C6"]
diff --git a/keyboards/kbdfans/kbd67/mkiirgb_iso/rules.mk b/keyboards/kbdfans/kbd67/mkiirgb_iso/rules.mk
index 699a9f9384..5cd6062134 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb_iso/rules.mk
+++ b/keyboards/kbdfans/kbd67/mkiirgb_iso/rules.mk
@@ -13,4 +13,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/kbdfans/kbd75rgb/info.json b/keyboards/kbdfans/kbd75rgb/info.json
index 9452fabd9e..231f13f412 100644
--- a/keyboards/kbdfans/kbd75rgb/info.json
+++ b/keyboards/kbdfans/kbd75rgb/info.json
@@ -11,6 +11,9 @@
    "ws2812": {
        "pin": "C7"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["F7", "F6", "F5", "F4", "E6", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7"],
        "rows": ["F0", "F1", "B0", "B1", "B2", "C6"]
diff --git a/keyboards/kbdfans/kbd75rgb/rules.mk b/keyboards/kbdfans/kbd75rgb/rules.mk
index d8e620b77d..bc6cd404cc 100644
--- a/keyboards/kbdfans/kbd75rgb/rules.mk
+++ b/keyboards/kbdfans/kbd75rgb/rules.mk
@@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes     # Use RGB matrix
-RGB_MATRIX_DRIVER = WS2812
 LTO_ENABLE = yes
diff --git a/keyboards/kbdfans/kbdmini/info.json b/keyboards/kbdfans/kbdmini/info.json
index f01b329e67..b329a4ec56 100644
--- a/keyboards/kbdfans/kbdmini/info.json
+++ b/keyboards/kbdfans/kbdmini/info.json
@@ -8,6 +8,9 @@
        "pid": "0x2001",
        "device_version": "0.0.1"
    },
+    "rgb_matrix": {
+        "driver": "IS31FL3733"
+    },
    "matrix_pins": {
        "cols": ["B3", "B2", "B1", "B0", "F1", "F0", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
        "rows": ["B7", "E6", "F5", "F4"]
diff --git a/keyboards/kbdfans/kbdmini/rules.mk b/keyboards/kbdfans/kbdmini/rules.mk
index daa102eb3f..4a443969ff 100644
--- a/keyboards/kbdfans/kbdmini/rules.mk
+++ b/keyboards/kbdfans/kbdmini/rules.mk
@@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3733
diff --git a/keyboards/kbdfans/maja/info.json b/keyboards/kbdfans/maja/info.json
index 96f1e27a36..9df60b9bfa 100644
--- a/keyboards/kbdfans/maja/info.json
+++ b/keyboards/kbdfans/maja/info.json
@@ -8,6 +8,9 @@
        "pid": "0x6068",
        "device_version": "0.0.1"
    },
+    "rgb_matrix": {
+        "driver": "IS31FL3731"
+    },
    "matrix_pins": {
        "cols": ["C6", "C7", "F7", "F6", "F5", "F4", "F1", "B0", "B1", "B2", "B3", "B7", "D2", "D3", "D5"],
        "rows": ["F0", "B6", "B5", "B4", "D7"]
diff --git a/keyboards/kbdfans/maja/rules.mk b/keyboards/kbdfans/maja/rules.mk
index ba5c2a94f7..d0606ec4dd 100755
--- a/keyboards/kbdfans/maja/rules.mk
+++ b/keyboards/kbdfans/maja/rules.mk
@@ -10,5 +10,4 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes     # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3731
 NO_USB_STARTUP_CHECK = no   # Disable initialization only when usb is plugged in
diff --git a/keyboards/kbdfans/odin/rgb/info.json b/keyboards/kbdfans/odin/rgb/info.json
index 5b25de9f49..026458452c 100644
--- a/keyboards/kbdfans/odin/rgb/info.json
+++ b/keyboards/kbdfans/odin/rgb/info.json
@@ -11,6 +11,9 @@
    "ws2812": {
        "pin": "B15"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["A3", "A4", "A5", "A6", "A7", "B0", "B1", "B2", "B12", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "C13", "C14", "C15", "A0"],
        "rows": ["A10", "A9", "A8", "B14", "B13", "A2"]
diff --git a/keyboards/kbdfans/odin/rgb/rules.mk b/keyboards/kbdfans/odin/rgb/rules.mk
index 38a6bb6887..b7807ae418 100644
--- a/keyboards/kbdfans/odin/rgb/rules.mk
+++ b/keyboards/kbdfans/odin/rgb/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/keebio/bamfk4/info.json b/keyboards/keebio/bamfk4/info.json
index 9fd3a09dde..ff29f68504 100644
--- a/keyboards/keebio/bamfk4/info.json
+++ b/keyboards/keebio/bamfk4/info.json
@@ -11,6 +11,9 @@
    "ws2812": {
        "pin": "D3"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["E6", "D5", "B6", "B7"],
        "rows": ["F0"]
diff --git a/keyboards/keebio/bamfk4/rules.mk b/keyboards/keebio/bamfk4/rules.mk
index a236a21bde..73f76344df 100644
--- a/keyboards/keebio/bamfk4/rules.mk
+++ b/keyboards/keebio/bamfk4/rules.mk
@@ -12,6 +12,5 @@ RGBLIGHT_ENABLE = no       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no          # Audio output
 ENCODER_ENABLE = no
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 LTO_ENABLE = yes
diff --git a/keyboards/keebio/bdn9/rev2/info.json b/keyboards/keebio/bdn9/rev2/info.json
index de3aeda439..5a33976f83 100644
--- a/keyboards/keebio/bdn9/rev2/info.json
+++ b/keyboards/keebio/bdn9/rev2/info.json
@@ -7,6 +7,9 @@
    "ws2812": {
        "pin": "B15"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "encoder": {
        "rotary": [
            {"pin_a": "A8", "pin_b": "A4"},
diff --git a/keyboards/keebio/bdn9/rev2/rules.mk b/keyboards/keebio/bdn9/rev2/rules.mk
index a692875bb5..de8fd9fc26 100644
--- a/keyboards/keebio/bdn9/rev2/rules.mk
+++ b/keyboards/keebio/bdn9/rev2/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/keebio/iris/rev6/info.json b/keyboards/keebio/iris/rev6/info.json
index ab2842c08f..54e3736ffc 100644
--- a/keyboards/keebio/iris/rev6/info.json
+++ b/keyboards/keebio/iris/rev6/info.json
@@ -4,6 +4,9 @@
        "pid": "0x6256",
        "device_version": "6.0.0"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["F1", "F4", "B5", "C7", "D4", "D6"],
        "rows": ["B1", "F0", "F5", "B4", "D7"]
diff --git a/keyboards/keebio/iris/rev6/rules.mk b/keyboards/keebio/iris/rev6/rules.mk
index 5dcf2c2b7c..5cdaba9bce 100644
--- a/keyboards/keebio/iris/rev6/rules.mk
+++ b/keyboards/keebio/iris/rev6/rules.mk
@@ -13,6 +13,5 @@ AUDIO_ENABLE = no           # Audio output
 SPLIT_KEYBOARD = yes
 ENCODER_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 LTO_ENABLE = yes
diff --git a/keyboards/keebio/iris/rev6a/info.json b/keyboards/keebio/iris/rev6a/info.json
index e20b2a00c3..c44b7c4a0a 100644
--- a/keyboards/keebio/iris/rev6a/info.json
+++ b/keyboards/keebio/iris/rev6a/info.json
@@ -4,6 +4,9 @@
        "pid": "0x6356",
        "device_version": "6.1.0"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["F1", "F4", "B5", "C7", "D4", "D6"],
        "rows": ["B1", "F0", "F5", "B4", "D7"]
diff --git a/keyboards/keebio/iris/rev6a/rules.mk b/keyboards/keebio/iris/rev6a/rules.mk
index 5dcf2c2b7c..5cdaba9bce 100644
--- a/keyboards/keebio/iris/rev6a/rules.mk
+++ b/keyboards/keebio/iris/rev6a/rules.mk
@@ -13,6 +13,5 @@ AUDIO_ENABLE = no           # Audio output
 SPLIT_KEYBOARD = yes
 ENCODER_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 LTO_ENABLE = yes
diff --git a/keyboards/keebio/iris/rev6b/info.json b/keyboards/keebio/iris/rev6b/info.json
index 5f3fef008d..f59bc09462 100644
--- a/keyboards/keebio/iris/rev6b/info.json
+++ b/keyboards/keebio/iris/rev6b/info.json
@@ -4,6 +4,9 @@
        "pid": "0x6456",
        "device_version": "6.2.0"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["F1", "F4", "B5", "C7", "D4", "D6"],
        "rows": ["B1", "F0", "F5", "B4", "D7"]
diff --git a/keyboards/keebio/iris/rev6b/rules.mk b/keyboards/keebio/iris/rev6b/rules.mk
index 5dcf2c2b7c..5cdaba9bce 100644
--- a/keyboards/keebio/iris/rev6b/rules.mk
+++ b/keyboards/keebio/iris/rev6b/rules.mk
@@ -13,6 +13,5 @@ AUDIO_ENABLE = no           # Audio output
 SPLIT_KEYBOARD = yes
 ENCODER_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 LTO_ENABLE = yes
diff --git a/keyboards/keebio/iris/rev7/info.json b/keyboards/keebio/iris/rev7/info.json
index 1ceb00ef7a..530a91f09a 100644
--- a/keyboards/keebio/iris/rev7/info.json
+++ b/keyboards/keebio/iris/rev7/info.json
@@ -4,6 +4,9 @@
        "pid": "0x7256",
        "device_version": "7.0.0"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["F1", "F4", "B5", "C7", "D4", "D6"],
        "rows": ["B1", "F0", "F5", "B4", "D7"]
diff --git a/keyboards/keebio/iris/rev7/rules.mk b/keyboards/keebio/iris/rev7/rules.mk
index 5dcf2c2b7c..5cdaba9bce 100644
--- a/keyboards/keebio/iris/rev7/rules.mk
+++ b/keyboards/keebio/iris/rev7/rules.mk
@@ -13,6 +13,5 @@ AUDIO_ENABLE = no           # Audio output
 SPLIT_KEYBOARD = yes
 ENCODER_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 LTO_ENABLE = yes
diff --git a/keyboards/keebio/stick/info.json b/keyboards/keebio/stick/info.json
index a398786853..bf1c768f42 100644
--- a/keyboards/keebio/stick/info.json
+++ b/keyboards/keebio/stick/info.json
@@ -8,6 +8,9 @@
        "pid": "0x111C",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "encoder": {
        "rotary": [
            {"pin_a": "D1", "pin_b": "D0"},
diff --git a/keyboards/keebio/stick/rules.mk b/keyboards/keebio/stick/rules.mk
index d5f501196c..0f932779f5 100644
--- a/keyboards/keebio/stick/rules.mk
+++ b/keyboards/keebio/stick/rules.mk
@@ -12,4 +12,3 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/keybee/keybee65/info.json b/keyboards/keybee/keybee65/info.json
index 4367a8fb31..e279cd0668 100644
--- a/keyboards/keybee/keybee65/info.json
+++ b/keyboards/keybee/keybee65/info.json
@@ -11,6 +11,9 @@
    "ws2812": {
        "pin": "B0"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["E6", "D1", "D5", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
        "rows": ["D3", "D2", "D0", "B0", "F0"]
diff --git a/keyboards/keybee/keybee65/rules.mk b/keyboards/keybee/keybee65/rules.mk
index b0bc8468ed..c97335f3c5 100644
--- a/keyboards/keybee/keybee65/rules.mk
+++ b/keyboards/keybee/keybee65/rules.mk
@@ -12,4 +12,3 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = no
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/keyboardio/model01/info.json b/keyboards/keyboardio/model01/info.json
index c00c016173..bc24c214f7 100644
--- a/keyboards/keyboardio/model01/info.json
+++ b/keyboards/keyboardio/model01/info.json
@@ -8,6 +8,9 @@
    "pid": "0x2301",
    "device_version": "0.0.1"
  },
+  "rgb_matrix": {
+    "driver": "custom"
+  },
  "processor": "atmega32u4",
    "bootloader": "caterina",
  "debounce": 0,
diff --git a/keyboards/keyboardio/model01/rules.mk b/keyboards/keyboardio/model01/rules.mk
index 7edcc5ff77..e653ec5f73 100644
--- a/keyboards/keyboardio/model01/rules.mk
+++ b/keyboards/keyboardio/model01/rules.mk
@@ -15,4 +15,3 @@ SRC += leds.c \
 # You can set RGB_MATRIX_ENABLE = no in your rules.mk to disable this and save the Flash
 RGB_MATRIX_ENABLE = yes # Enable RGB matrix effects.
-RGB_MATRIX_DRIVER = custom
diff --git a/keyboards/keychron/q1/ansi/info.json b/keyboards/keychron/q1/ansi/info.json
index c878317063..7b98521985 100644
--- a/keyboards/keychron/q1/ansi/info.json
+++ b/keyboards/keychron/q1/ansi/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0100",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "IS31FL3733"
+    },
    "matrix_pins": {
        "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"],
        "rows": ["D3", "D2", "B3", "B2", "B1", "B0"]
diff --git a/keyboards/keychron/q1/ansi/rules.mk b/keyboards/keychron/q1/ansi/rules.mk
index 395b661685..0379fdb94c 100644
--- a/keyboards/keychron/q1/ansi/rules.mk
+++ b/keyboards/keychron/q1/ansi/rules.mk
@@ -12,5 +12,4 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3733
 LTO_ENABLE = yes
diff --git a/keyboards/keychron/q1/ansi_encoder/info.json b/keyboards/keychron/q1/ansi_encoder/info.json
index 9b1f1ba014..b46564f64b 100644
--- a/keyboards/keychron/q1/ansi_encoder/info.json
+++ b/keyboards/keychron/q1/ansi_encoder/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0101",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "IS31FL3733"
+    },
    "matrix_pins": {
        "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"],
        "rows": ["D3", "D2", "B3", "B2", "B1", "B0"]
diff --git a/keyboards/keychron/q1/ansi_encoder/rules.mk b/keyboards/keychron/q1/ansi_encoder/rules.mk
index f67fe2bf03..d60167579e 100644
--- a/keyboards/keychron/q1/ansi_encoder/rules.mk
+++ b/keyboards/keychron/q1/ansi_encoder/rules.mk
@@ -13,5 +13,4 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3733
 LTO_ENABLE = yes
diff --git a/keyboards/keychron/q1/iso/info.json b/keyboards/keychron/q1/iso/info.json
index 447a246471..cc8f74bc75 100644
--- a/keyboards/keychron/q1/iso/info.json
+++ b/keyboards/keychron/q1/iso/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0102",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "IS31FL3733"
+    },
    "matrix_pins": {
        "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"],
        "rows": ["D3", "D2", "B3", "B2", "B1", "B0"]
diff --git a/keyboards/keychron/q1/iso/rules.mk b/keyboards/keychron/q1/iso/rules.mk
index 395b661685..0379fdb94c 100644
--- a/keyboards/keychron/q1/iso/rules.mk
+++ b/keyboards/keychron/q1/iso/rules.mk
@@ -12,5 +12,4 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3733
 LTO_ENABLE = yes
diff --git a/keyboards/keychron/q1/iso_encoder/info.json b/keyboards/keychron/q1/iso_encoder/info.json
index ceee988875..5bc470e102 100644
--- a/keyboards/keychron/q1/iso_encoder/info.json
+++ b/keyboards/keychron/q1/iso_encoder/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0103",
        "device_version": "1.0.2"
    },
+    "rgb_matrix": {
+        "driver": "IS31FL3733"
+    },
    "matrix_pins": {
        "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"],
        "rows": ["D3", "D2", "B3", "B2", "B1", "B0"]
diff --git a/keyboards/keychron/q1/iso_encoder/rules.mk b/keyboards/keychron/q1/iso_encoder/rules.mk
index 3eea458e72..d994ac1fad 100644
--- a/keyboards/keychron/q1/iso_encoder/rules.mk
+++ b/keyboards/keychron/q1/iso_encoder/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3733
 RAW_ENABLE = yes
 LTO_ENABLE = yes
diff --git a/keyboards/keychron/q10/ansi_encoder/info.json b/keyboards/keychron/q10/ansi_encoder/info.json
index 9814da0c26..e90d961165 100644
--- a/keyboards/keychron/q10/ansi_encoder/info.json
+++ b/keyboards/keychron/q10/ansi_encoder/info.json
@@ -8,6 +8,9 @@
        "pid": "0x01A1",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
    "encoder": {
        "rotary": [
            {"pin_a": "A10", "pin_b": "A8"}
diff --git a/keyboards/keychron/q10/ansi_encoder/rules.mk b/keyboards/keychron/q10/ansi_encoder/rules.mk
index ef55047753..5df3cbccaf 100644
--- a/keyboards/keychron/q10/ansi_encoder/rules.mk
+++ b/keyboards/keychron/q10/ansi_encoder/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/q10/iso_encoder/info.json b/keyboards/keychron/q10/iso_encoder/info.json
index 96311fac06..5a696a39ad 100644
--- a/keyboards/keychron/q10/iso_encoder/info.json
+++ b/keyboards/keychron/q10/iso_encoder/info.json
@@ -8,6 +8,9 @@
        "pid": "0x01A3",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
    "encoder": {
        "rotary": [
            {"pin_a": "A10", "pin_b": "A8"}
diff --git a/keyboards/keychron/q10/iso_encoder/rules.mk b/keyboards/keychron/q10/iso_encoder/rules.mk
index ef55047753..5df3cbccaf 100644
--- a/keyboards/keychron/q10/iso_encoder/rules.mk
+++ b/keyboards/keychron/q10/iso_encoder/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/q12/ansi_encoder/info.json b/keyboards/keychron/q12/ansi_encoder/info.json
index 0e3179708a..2e15c38adc 100644
--- a/keyboards/keychron/q12/ansi_encoder/info.json
+++ b/keyboards/keychron/q12/ansi_encoder/info.json
@@ -8,6 +8,9 @@
        "pid": "0x01D1",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
    "encoder": {
        "rotary": [
            {"pin_a": "A2", "pin_b": "C14"}
diff --git a/keyboards/keychron/q12/ansi_encoder/rules.mk b/keyboards/keychron/q12/ansi_encoder/rules.mk
index bf60bb7d7d..9958a466f6 100644
--- a/keyboards/keychron/q12/ansi_encoder/rules.mk
+++ b/keyboards/keychron/q12/ansi_encoder/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/q12/iso_encoder/info.json b/keyboards/keychron/q12/iso_encoder/info.json
index c945fbc771..117d665dc3 100644
--- a/keyboards/keychron/q12/iso_encoder/info.json
+++ b/keyboards/keychron/q12/iso_encoder/info.json
@@ -8,6 +8,9 @@
        "pid": "0x01D3",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
    "encoder": {
        "rotary": [
            {"pin_a": "A2", "pin_b": "C14"}
diff --git a/keyboards/keychron/q12/iso_encoder/rules.mk b/keyboards/keychron/q12/iso_encoder/rules.mk
index f76ec9b08d..df920055a0 100644
--- a/keyboards/keychron/q12/iso_encoder/rules.mk
+++ b/keyboards/keychron/q12/iso_encoder/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/q2/ansi/info.json b/keyboards/keychron/q2/ansi/info.json
index eac3fc529c..10d665e02f 100644
--- a/keyboards/keychron/q2/ansi/info.json
+++ b/keyboards/keychron/q2/ansi/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0110",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
    "matrix_pins": {
        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
        "rows": ["B4", "B3", "A15", "A14", "A13"]
diff --git a/keyboards/keychron/q2/ansi/rules.mk b/keyboards/keychron/q2/ansi/rules.mk
index 6c675518ee..bc7a0e0ff3 100644
--- a/keyboards/keychron/q2/ansi/rules.mk
+++ b/keyboards/keychron/q2/ansi/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = no         # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/q2/ansi_encoder/info.json b/keyboards/keychron/q2/ansi_encoder/info.json
index e0f7c6cebd..abb5031073 100644
--- a/keyboards/keychron/q2/ansi_encoder/info.json
+++ b/keyboards/keychron/q2/ansi_encoder/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0111",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
    "matrix_pins": {
        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
        "rows": ["B4", "B3", "A15", "A14", "A13"]
diff --git a/keyboards/keychron/q2/ansi_encoder/rules.mk b/keyboards/keychron/q2/ansi_encoder/rules.mk
index 0e909ff6f8..3de172c6e3 100644
--- a/keyboards/keychron/q2/ansi_encoder/rules.mk
+++ b/keyboards/keychron/q2/ansi_encoder/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/q2/iso/info.json b/keyboards/keychron/q2/iso/info.json
index afc1079ae1..a29db71cca 100644
--- a/keyboards/keychron/q2/iso/info.json
+++ b/keyboards/keychron/q2/iso/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0112",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
    "matrix_pins": {
        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
        "rows": ["B4", "B3", "A15", "A14", "A13"]
diff --git a/keyboards/keychron/q2/iso/rules.mk b/keyboards/keychron/q2/iso/rules.mk
index 57b7516f4c..f4aca09af8 100644
--- a/keyboards/keychron/q2/iso/rules.mk
+++ b/keyboards/keychron/q2/iso/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = no         # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/q2/iso_encoder/info.json b/keyboards/keychron/q2/iso_encoder/info.json
index 249813f517..6c77c3ad5a 100644
--- a/keyboards/keychron/q2/iso_encoder/info.json
+++ b/keyboards/keychron/q2/iso_encoder/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0113",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
    "matrix_pins": {
        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
        "rows": ["B4", "B3", "A15", "A14", "A13"]
diff --git a/keyboards/keychron/q2/iso_encoder/rules.mk b/keyboards/keychron/q2/iso_encoder/rules.mk
index 987db28ad5..33a50c67f7 100644
--- a/keyboards/keychron/q2/iso_encoder/rules.mk
+++ b/keyboards/keychron/q2/iso_encoder/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/q2/jis/info.json b/keyboards/keychron/q2/jis/info.json
index f36cda421f..b43e1bd979 100644
--- a/keyboards/keychron/q2/jis/info.json
+++ b/keyboards/keychron/q2/jis/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0114",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
    "matrix_pins": {
        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
        "rows": ["B4", "B3", "A15", "A14", "A13"]
diff --git a/keyboards/keychron/q2/jis/rules.mk b/keyboards/keychron/q2/jis/rules.mk
index 345807d824..2b4a67b1ee 100644
--- a/keyboards/keychron/q2/jis/rules.mk
+++ b/keyboards/keychron/q2/jis/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/q2/jis_encoder/info.json b/keyboards/keychron/q2/jis_encoder/info.json
index 9e217dddea..09b4ec66a3 100644
--- a/keyboards/keychron/q2/jis_encoder/info.json
+++ b/keyboards/keychron/q2/jis_encoder/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0115",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
    "matrix_pins": {
        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
        "rows": ["B4", "B3", "A15", "A14", "A13"]
diff --git a/keyboards/keychron/q2/jis_encoder/rules.mk b/keyboards/keychron/q2/jis_encoder/rules.mk
index 5240004b8c..6a772965ff 100644
--- a/keyboards/keychron/q2/jis_encoder/rules.mk
+++ b/keyboards/keychron/q2/jis_encoder/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/q3/ansi/info.json b/keyboards/keychron/q3/ansi/info.json
index 1ebffbff45..c0819fa24c 100644
--- a/keyboards/keychron/q3/ansi/info.json
+++ b/keyboards/keychron/q3/ansi/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0120",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
    "processor": "STM32L432",
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/keychron/q3/ansi/rules.mk b/keyboards/keychron/q3/ansi/rules.mk
index 8669178c4c..566c476585 100644
--- a/keyboards/keychron/q3/ansi/rules.mk
+++ b/keyboards/keychron/q3/ansi/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 LTO_ENABLE = yes
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/q3/ansi_encoder/info.json b/keyboards/keychron/q3/ansi_encoder/info.json
index 3bd5a9d59a..78d9c50832 100644
--- a/keyboards/keychron/q3/ansi_encoder/info.json
+++ b/keyboards/keychron/q3/ansi_encoder/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0121",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
    "encoder": {
        "rotary": [
            {"pin_a": "A10", "pin_b": "A8"}
diff --git a/keyboards/keychron/q3/ansi_encoder/rules.mk b/keyboards/keychron/q3/ansi_encoder/rules.mk
index a8eaf50f9a..95a153f689 100644
--- a/keyboards/keychron/q3/ansi_encoder/rules.mk
+++ b/keyboards/keychron/q3/ansi_encoder/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 LTO_ENABLE = yes
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/q3/iso/info.json b/keyboards/keychron/q3/iso/info.json
index b50fffd3a2..b9c6b22df1 100644
--- a/keyboards/keychron/q3/iso/info.json
+++ b/keyboards/keychron/q3/iso/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0122",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
    "processor": "STM32L432",
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/keychron/q3/iso/rules.mk b/keyboards/keychron/q3/iso/rules.mk
index 8669178c4c..566c476585 100644
--- a/keyboards/keychron/q3/iso/rules.mk
+++ b/keyboards/keychron/q3/iso/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 LTO_ENABLE = yes
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/q3/iso_encoder/info.json b/keyboards/keychron/q3/iso_encoder/info.json
index 6f1a24b372..4c264bf33f 100644
--- a/keyboards/keychron/q3/iso_encoder/info.json
+++ b/keyboards/keychron/q3/iso_encoder/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0123",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
    "encoder": {
        "rotary": [
            {"pin_a": "A10", "pin_b": "A8"}
diff --git a/keyboards/keychron/q3/iso_encoder/rules.mk b/keyboards/keychron/q3/iso_encoder/rules.mk
index a8eaf50f9a..95a153f689 100644
--- a/keyboards/keychron/q3/iso_encoder/rules.mk
+++ b/keyboards/keychron/q3/iso_encoder/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 LTO_ENABLE = yes
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/q3/jis/info.json b/keyboards/keychron/q3/jis/info.json
index 69536c290c..55edbe16f2 100644
--- a/keyboards/keychron/q3/jis/info.json
+++ b/keyboards/keychron/q3/jis/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0124",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
    "processor": "STM32L432",
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/keychron/q3/jis/rules.mk b/keyboards/keychron/q3/jis/rules.mk
index 8669178c4c..566c476585 100644
--- a/keyboards/keychron/q3/jis/rules.mk
+++ b/keyboards/keychron/q3/jis/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 LTO_ENABLE = yes
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/q3/jis_encoder/info.json b/keyboards/keychron/q3/jis_encoder/info.json
index ed12472732..eb0ad6420a 100644
--- a/keyboards/keychron/q3/jis_encoder/info.json
+++ b/keyboards/keychron/q3/jis_encoder/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0125",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
    "encoder": {
        "rotary": [
            {"pin_a": "A10", "pin_b": "A8"}
diff --git a/keyboards/keychron/q3/jis_encoder/rules.mk b/keyboards/keychron/q3/jis_encoder/rules.mk
index a8eaf50f9a..95a153f689 100644
--- a/keyboards/keychron/q3/jis_encoder/rules.mk
+++ b/keyboards/keychron/q3/jis_encoder/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 LTO_ENABLE = yes
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/q4/ansi_v1/info.json b/keyboards/keychron/q4/ansi_v1/info.json
index cb0fc55e3f..3f05afc196 100644
--- a/keyboards/keychron/q4/ansi_v1/info.json
+++ b/keyboards/keychron/q4/ansi_v1/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0140",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
    "matrix_pins": {
        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9"],
        "rows": ["B4", "B3", "A15", "A14", "A13"]
diff --git a/keyboards/keychron/q4/ansi_v1/rules.mk b/keyboards/keychron/q4/ansi_v1/rules.mk
index 4bb31fd14c..9111c3b9bd 100644
--- a/keyboards/keychron/q4/ansi_v1/rules.mk
+++ b/keyboards/keychron/q4/ansi_v1/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 LTO_ENABLE = no
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/q4/ansi_v2/info.json b/keyboards/keychron/q4/ansi_v2/info.json
index cb0fc55e3f..3f05afc196 100644
--- a/keyboards/keychron/q4/ansi_v2/info.json
+++ b/keyboards/keychron/q4/ansi_v2/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0140",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
    "matrix_pins": {
        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9"],
        "rows": ["B4", "B3", "A15", "A14", "A13"]
diff --git a/keyboards/keychron/q4/ansi_v2/rules.mk b/keyboards/keychron/q4/ansi_v2/rules.mk
index 4bb31fd14c..9111c3b9bd 100644
--- a/keyboards/keychron/q4/ansi_v2/rules.mk
+++ b/keyboards/keychron/q4/ansi_v2/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 LTO_ENABLE = no
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/q4/iso/info.json b/keyboards/keychron/q4/iso/info.json
index 908c5bdae1..5686e96511 100644
--- a/keyboards/keychron/q4/iso/info.json
+++ b/keyboards/keychron/q4/iso/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0142",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
    "matrix_pins": {
        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9"],
        "rows": ["B4", "B3", "A15", "A14", "A13"]
diff --git a/keyboards/keychron/q4/iso/rules.mk b/keyboards/keychron/q4/iso/rules.mk
index 4bb31fd14c..9111c3b9bd 100644
--- a/keyboards/keychron/q4/iso/rules.mk
+++ b/keyboards/keychron/q4/iso/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 LTO_ENABLE = no
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/q5/ansi/info.json b/keyboards/keychron/q5/ansi/info.json
index 4e77f23b7c..8f3396500f 100644
--- a/keyboards/keychron/q5/ansi/info.json
+++ b/keyboards/keychron/q5/ansi/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0150",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
    "processor": "STM32L432",
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/keychron/q5/ansi/rules.mk b/keyboards/keychron/q5/ansi/rules.mk
index 311ca648e1..f2dba218bf 100644
--- a/keyboards/keychron/q5/ansi/rules.mk
+++ b/keyboards/keychron/q5/ansi/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/q5/ansi_encoder/info.json b/keyboards/keychron/q5/ansi_encoder/info.json
index 7bd6f179c6..86c3b2d39b 100644
--- a/keyboards/keychron/q5/ansi_encoder/info.json
+++ b/keyboards/keychron/q5/ansi_encoder/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0151",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
    "encoder": {
        "rotary": [
            {"pin_a": "C14", "pin_b": "A2"}
diff --git a/keyboards/keychron/q5/ansi_encoder/rules.mk b/keyboards/keychron/q5/ansi_encoder/rules.mk
index ef55047753..5df3cbccaf 100644
--- a/keyboards/keychron/q5/ansi_encoder/rules.mk
+++ b/keyboards/keychron/q5/ansi_encoder/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/q5/iso/info.json b/keyboards/keychron/q5/iso/info.json
index 20eebe22b0..dc7a2f5f2b 100644
--- a/keyboards/keychron/q5/iso/info.json
+++ b/keyboards/keychron/q5/iso/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0152",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
    "processor": "STM32L432",
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/keychron/q5/iso/rules.mk b/keyboards/keychron/q5/iso/rules.mk
index 311ca648e1..f2dba218bf 100644
--- a/keyboards/keychron/q5/iso/rules.mk
+++ b/keyboards/keychron/q5/iso/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/q5/iso_encoder/info.json b/keyboards/keychron/q5/iso_encoder/info.json
index 81cd72036f..26e27edd5e 100644
--- a/keyboards/keychron/q5/iso_encoder/info.json
+++ b/keyboards/keychron/q5/iso_encoder/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0153",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
    "encoder": {
        "rotary": [
            {"pin_a": "C14", "pin_b": "A2"}
diff --git a/keyboards/keychron/q5/iso_encoder/rules.mk b/keyboards/keychron/q5/iso_encoder/rules.mk
index ef55047753..5df3cbccaf 100644
--- a/keyboards/keychron/q5/iso_encoder/rules.mk
+++ b/keyboards/keychron/q5/iso_encoder/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/q6/ansi/info.json b/keyboards/keychron/q6/ansi/info.json
index ed1732655f..9e0b6106e2 100644
--- a/keyboards/keychron/q6/ansi/info.json
+++ b/keyboards/keychron/q6/ansi/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0160",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
    "processor": "STM32L432",
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/keychron/q6/ansi/rules.mk b/keyboards/keychron/q6/ansi/rules.mk
index e57fa16e32..ce3d41a17d 100644
--- a/keyboards/keychron/q6/ansi/rules.mk
+++ b/keyboards/keychron/q6/ansi/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 LTO_ENABLE = yes
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/q6/ansi_encoder/info.json b/keyboards/keychron/q6/ansi_encoder/info.json
index 60b983b12e..147dfa5e44 100644
--- a/keyboards/keychron/q6/ansi_encoder/info.json
+++ b/keyboards/keychron/q6/ansi_encoder/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0161",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
    "encoder": {
        "rotary": [
            {"pin_a": "C14", "pin_b": "A2"}
diff --git a/keyboards/keychron/q6/ansi_encoder/rules.mk b/keyboards/keychron/q6/ansi_encoder/rules.mk
index a8eaf50f9a..95a153f689 100644
--- a/keyboards/keychron/q6/ansi_encoder/rules.mk
+++ b/keyboards/keychron/q6/ansi_encoder/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 LTO_ENABLE = yes
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/q6/iso/info.json b/keyboards/keychron/q6/iso/info.json
index 0195e4420b..f502f42f61 100644
--- a/keyboards/keychron/q6/iso/info.json
+++ b/keyboards/keychron/q6/iso/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0162",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
    "processor": "STM32L432",
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/keychron/q6/iso/rules.mk b/keyboards/keychron/q6/iso/rules.mk
index 638f1eaeb0..3388811add 100644
--- a/keyboards/keychron/q6/iso/rules.mk
+++ b/keyboards/keychron/q6/iso/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 RAW_ENABLE = yes
 LTO_ENABLE = yes
 EEPROM_DRIVER = wear_leveling
diff --git a/keyboards/keychron/q6/iso_encoder/info.json b/keyboards/keychron/q6/iso_encoder/info.json
index 598a715c3f..8bc190a720 100644
--- a/keyboards/keychron/q6/iso_encoder/info.json
+++ b/keyboards/keychron/q6/iso_encoder/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0163",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
    "encoder": {
        "rotary": [
            {"pin_a": "C14", "pin_b": "A2"}
diff --git a/keyboards/keychron/q6/iso_encoder/rules.mk b/keyboards/keychron/q6/iso_encoder/rules.mk
index 757e051f46..d7fe88d9ca 100644
--- a/keyboards/keychron/q6/iso_encoder/rules.mk
+++ b/keyboards/keychron/q6/iso_encoder/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 RAW_ENABLE = yes
 LTO_ENABLE = yes
 EEPROM_DRIVER = wear_leveling
diff --git a/keyboards/keychron/q60/ansi/info.json b/keyboards/keychron/q60/ansi/info.json
index cf4e86f8aa..02b3d807fd 100644
--- a/keyboards/keychron/q60/ansi/info.json
+++ b/keyboards/keychron/q60/ansi/info.json
@@ -8,6 +8,9 @@
        "pid": "0x01C0",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
    "matrix_pins": {
        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9"],
        "rows": ["B4", "B3", "A15", "A14", "A13"]
diff --git a/keyboards/keychron/q60/ansi/rules.mk b/keyboards/keychron/q60/ansi/rules.mk
index 70c663e777..6dcd47b1fe 100644
--- a/keyboards/keychron/q60/ansi/rules.mk
+++ b/keyboards/keychron/q60/ansi/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/q65/ansi_encoder/info.json b/keyboards/keychron/q65/ansi_encoder/info.json
index b91892a55b..ec187ee615 100644
--- a/keyboards/keychron/q65/ansi_encoder/info.json
+++ b/keyboards/keychron/q65/ansi_encoder/info.json
@@ -8,6 +8,9 @@
        "pid": "0x01B1",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
    "encoder": {
        "rotary": [
            {"pin_a": "A10", "pin_b": "A8"}
diff --git a/keyboards/keychron/q65/ansi_encoder/rules.mk b/keyboards/keychron/q65/ansi_encoder/rules.mk
index ef55047753..5df3cbccaf 100644
--- a/keyboards/keychron/q65/ansi_encoder/rules.mk
+++ b/keyboards/keychron/q65/ansi_encoder/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/q7/ansi/info.json b/keyboards/keychron/q7/ansi/info.json
index 00240fd6a3..b06285ebd8 100644
--- a/keyboards/keychron/q7/ansi/info.json
+++ b/keyboards/keychron/q7/ansi/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0170",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
    "matrix_pins": {
        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "A10", "B5"],
        "rows": ["B4", "B3", "A15", "A14", "A13"]
diff --git a/keyboards/keychron/q7/ansi/rules.mk b/keyboards/keychron/q7/ansi/rules.mk
index 345807d824..2b4a67b1ee 100644
--- a/keyboards/keychron/q7/ansi/rules.mk
+++ b/keyboards/keychron/q7/ansi/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/q7/iso/info.json b/keyboards/keychron/q7/iso/info.json
index b060b570b9..1d78fbab7e 100644
--- a/keyboards/keychron/q7/iso/info.json
+++ b/keyboards/keychron/q7/iso/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0172",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
    "matrix_pins": {
        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "A10", "B5"],
        "rows": ["B4", "B3", "A15", "A14", "A13"]
diff --git a/keyboards/keychron/q7/iso/rules.mk b/keyboards/keychron/q7/iso/rules.mk
index deac2e12e6..7f91e808b1 100644
--- a/keyboards/keychron/q7/iso/rules.mk
+++ b/keyboards/keychron/q7/iso/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/q8/ansi/info.json b/keyboards/keychron/q8/ansi/info.json
index 96efa35d26..194b7ee983 100644
--- a/keyboards/keychron/q8/ansi/info.json
+++ b/keyboards/keychron/q8/ansi/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0180",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
    "matrix_pins": {
        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
        "rows": ["B4", "B3", "A15", "A14", "A13"]
diff --git a/keyboards/keychron/q8/ansi/rules.mk b/keyboards/keychron/q8/ansi/rules.mk
index 345807d824..2b4a67b1ee 100644
--- a/keyboards/keychron/q8/ansi/rules.mk
+++ b/keyboards/keychron/q8/ansi/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/q8/ansi_encoder/info.json b/keyboards/keychron/q8/ansi_encoder/info.json
index 071a7a25f9..09d3c183e2 100644
--- a/keyboards/keychron/q8/ansi_encoder/info.json
+++ b/keyboards/keychron/q8/ansi_encoder/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0181",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
    "matrix_pins": {
        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
        "rows": ["B4", "B3", "A15", "A14", "A13"]
diff --git a/keyboards/keychron/q8/ansi_encoder/rules.mk b/keyboards/keychron/q8/ansi_encoder/rules.mk
index d0d74a11b5..e94a89ab85 100644
--- a/keyboards/keychron/q8/ansi_encoder/rules.mk
+++ b/keyboards/keychron/q8/ansi_encoder/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/q8/iso/info.json b/keyboards/keychron/q8/iso/info.json
index e716b347a0..3502848441 100644
--- a/keyboards/keychron/q8/iso/info.json
+++ b/keyboards/keychron/q8/iso/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0182",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
    "matrix_pins": {
        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
        "rows": ["B4", "B3", "A15", "A14", "A13"]
diff --git a/keyboards/keychron/q8/iso/rules.mk b/keyboards/keychron/q8/iso/rules.mk
index 345807d824..2b4a67b1ee 100644
--- a/keyboards/keychron/q8/iso/rules.mk
+++ b/keyboards/keychron/q8/iso/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/q8/iso_encoder/info.json b/keyboards/keychron/q8/iso_encoder/info.json
index f70548f3c4..721ab371f0 100644
--- a/keyboards/keychron/q8/iso_encoder/info.json
+++ b/keyboards/keychron/q8/iso_encoder/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0183",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
    "matrix_pins": {
        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
        "rows": ["B4", "B3", "A15", "A14", "A13"]
diff --git a/keyboards/keychron/q8/iso_encoder/rules.mk b/keyboards/keychron/q8/iso_encoder/rules.mk
index 5240004b8c..6a772965ff 100644
--- a/keyboards/keychron/q8/iso_encoder/rules.mk
+++ b/keyboards/keychron/q8/iso_encoder/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/q9/ansi/info.json b/keyboards/keychron/q9/ansi/info.json
index cd971b155a..6198156d4b 100644
--- a/keyboards/keychron/q9/ansi/info.json
+++ b/keyboards/keychron/q9/ansi/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0190",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
    "matrix_pins": {
        "cols": ["A10", "A9", "A8", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "C15", "C14"],
        "rows": ["B3", "A15", "A14", "A13"]
diff --git a/keyboards/keychron/q9/ansi/rules.mk b/keyboards/keychron/q9/ansi/rules.mk
index 345807d824..2b4a67b1ee 100644
--- a/keyboards/keychron/q9/ansi/rules.mk
+++ b/keyboards/keychron/q9/ansi/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/q9/ansi_encoder/info.json b/keyboards/keychron/q9/ansi_encoder/info.json
index 7b4e73eee3..0fa8e952d3 100644
--- a/keyboards/keychron/q9/ansi_encoder/info.json
+++ b/keyboards/keychron/q9/ansi_encoder/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0191",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
    "matrix_pins": {
        "cols": ["A10", "A9", "A8", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "C15", "C14"],
        "rows": ["B3", "A15", "A14", "A13"]
diff --git a/keyboards/keychron/q9/ansi_encoder/rules.mk b/keyboards/keychron/q9/ansi_encoder/rules.mk
index 37010e0d59..7caead18d7 100644
--- a/keyboards/keychron/q9/ansi_encoder/rules.mk
+++ b/keyboards/keychron/q9/ansi_encoder/rules.mk
@@ -14,7 +14,6 @@ ENCODER_ENABLE = yes        # Enable Encoder
 ENCODER_MAP_ENBALE = no
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/q9/iso/info.json b/keyboards/keychron/q9/iso/info.json
index 7f435a2b7b..e581982475 100644
--- a/keyboards/keychron/q9/iso/info.json
+++ b/keyboards/keychron/q9/iso/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0192",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
    "matrix_pins": {
        "cols": ["A10", "A9", "A8", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "C15", "C14"],
        "rows": ["B3", "A15", "A14", "A13"]
diff --git a/keyboards/keychron/q9/iso/rules.mk b/keyboards/keychron/q9/iso/rules.mk
index 345807d824..2b4a67b1ee 100644
--- a/keyboards/keychron/q9/iso/rules.mk
+++ b/keyboards/keychron/q9/iso/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/q9/iso_encoder/info.json b/keyboards/keychron/q9/iso_encoder/info.json
index 8ecb23b0a3..2ae65f6092 100644
--- a/keyboards/keychron/q9/iso_encoder/info.json
+++ b/keyboards/keychron/q9/iso_encoder/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0193",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
    "matrix_pins": {
        "cols": ["A10", "A9", "A8", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "C15", "C14"],
        "rows": ["B3", "A15", "A14", "A13"]
diff --git a/keyboards/keychron/q9/iso_encoder/rules.mk b/keyboards/keychron/q9/iso_encoder/rules.mk
index 37010e0d59..7caead18d7 100644
--- a/keyboards/keychron/q9/iso_encoder/rules.mk
+++ b/keyboards/keychron/q9/iso_encoder/rules.mk
@@ -14,7 +14,6 @@ ENCODER_ENABLE = yes        # Enable Encoder
 ENCODER_MAP_ENBALE = no
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/s1/ansi/rgb/info.json b/keyboards/keychron/s1/ansi/rgb/info.json
index 2aabe622d4..0f490f8e81 100644
--- a/keyboards/keychron/s1/ansi/rgb/info.json
+++ b/keyboards/keychron/s1/ansi/rgb/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0410",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
    "matrix_pins": {
        "cols": ["A10", "A9", "A8", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "C15", "C14"],
        "rows": ["B5", "B4", "B3", "A15", "A14", "A13"]
diff --git a/keyboards/keychron/s1/ansi/rgb/rules.mk b/keyboards/keychron/s1/ansi/rgb/rules.mk
index 345807d824..2b4a67b1ee 100644
--- a/keyboards/keychron/s1/ansi/rgb/rules.mk
+++ b/keyboards/keychron/s1/ansi/rgb/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/s1/ansi/white/info.json b/keyboards/keychron/s1/ansi/white/info.json
index e6c0e4f3d1..667da15235 100644
--- a/keyboards/keychron/s1/ansi/white/info.json
+++ b/keyboards/keychron/s1/ansi/white/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0411",
        "device_version": "1.0.0"
    },
+    "led_matrix": {
+        "driver": "CKLED2001"
+    },
    "matrix_pins": {
        "cols": ["A10", "A9", "A8", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "C15", "C14"],
        "rows": ["B5", "B4", "B3", "A15", "A14", "A13"]
diff --git a/keyboards/keychron/s1/ansi/white/rules.mk b/keyboards/keychron/s1/ansi/white/rules.mk
index 081a3b63f0..1fa4f83a77 100644
--- a/keyboards/keychron/s1/ansi/white/rules.mk
+++ b/keyboards/keychron/s1/ansi/white/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 LED_MATRIX_ENABLE = yes
-LED_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/v1/ansi/info.json b/keyboards/keychron/v1/ansi/info.json
index d6d35f8474..8f0e43bc76 100644
--- a/keyboards/keychron/v1/ansi/info.json
+++ b/keyboards/keychron/v1/ansi/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0310",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
    "processor": "STM32L432",
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/keychron/v1/ansi/rules.mk b/keyboards/keychron/v1/ansi/rules.mk
index 311ca648e1..f2dba218bf 100644
--- a/keyboards/keychron/v1/ansi/rules.mk
+++ b/keyboards/keychron/v1/ansi/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/v1/ansi_encoder/info.json b/keyboards/keychron/v1/ansi_encoder/info.json
index af396f6bb6..1546de3fef 100644
--- a/keyboards/keychron/v1/ansi_encoder/info.json
+++ b/keyboards/keychron/v1/ansi_encoder/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0311",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
    "encoder": {
        "rotary": [
            {"pin_a": "A10", "pin_b": "A8"}
diff --git a/keyboards/keychron/v1/ansi_encoder/rules.mk b/keyboards/keychron/v1/ansi_encoder/rules.mk
index ef55047753..5df3cbccaf 100644
--- a/keyboards/keychron/v1/ansi_encoder/rules.mk
+++ b/keyboards/keychron/v1/ansi_encoder/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/v1/iso/info.json b/keyboards/keychron/v1/iso/info.json
index d9b11f5f55..8977c93a07 100644
--- a/keyboards/keychron/v1/iso/info.json
+++ b/keyboards/keychron/v1/iso/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0312",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
    "processor": "STM32L432",
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/keychron/v1/iso/rules.mk b/keyboards/keychron/v1/iso/rules.mk
index 311ca648e1..f2dba218bf 100644
--- a/keyboards/keychron/v1/iso/rules.mk
+++ b/keyboards/keychron/v1/iso/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/v1/iso_encoder/info.json b/keyboards/keychron/v1/iso_encoder/info.json
index c08e7d4539..fa0ec5e6e2 100644
--- a/keyboards/keychron/v1/iso_encoder/info.json
+++ b/keyboards/keychron/v1/iso_encoder/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0313",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
    "encoder": {
        "rotary": [
            {"pin_a": "A10", "pin_b": "A8"}
diff --git a/keyboards/keychron/v1/iso_encoder/rules.mk b/keyboards/keychron/v1/iso_encoder/rules.mk
index ef55047753..5df3cbccaf 100644
--- a/keyboards/keychron/v1/iso_encoder/rules.mk
+++ b/keyboards/keychron/v1/iso_encoder/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/v1/jis/info.json b/keyboards/keychron/v1/jis/info.json
index 8d06120f5d..585bb27e26 100644
--- a/keyboards/keychron/v1/jis/info.json
+++ b/keyboards/keychron/v1/jis/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0314",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
    "processor": "STM32L432",
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/keychron/v1/jis/rules.mk b/keyboards/keychron/v1/jis/rules.mk
index 311ca648e1..f2dba218bf 100644
--- a/keyboards/keychron/v1/jis/rules.mk
+++ b/keyboards/keychron/v1/jis/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/v1/jis_encoder/info.json b/keyboards/keychron/v1/jis_encoder/info.json
index 7554498481..5e473c07b4 100644
--- a/keyboards/keychron/v1/jis_encoder/info.json
+++ b/keyboards/keychron/v1/jis_encoder/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0315",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
    "encoder": {
        "rotary": [
            {"pin_a": "A10", "pin_b": "A8"}
diff --git a/keyboards/keychron/v1/jis_encoder/rules.mk b/keyboards/keychron/v1/jis_encoder/rules.mk
index ef55047753..5df3cbccaf 100644
--- a/keyboards/keychron/v1/jis_encoder/rules.mk
+++ b/keyboards/keychron/v1/jis_encoder/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/v10/ansi_encoder/info.json b/keyboards/keychron/v10/ansi_encoder/info.json
index cf8ae78b99..b314bcbbd2 100644
--- a/keyboards/keychron/v10/ansi_encoder/info.json
+++ b/keyboards/keychron/v10/ansi_encoder/info.json
@@ -8,6 +8,9 @@
        "pid": "0x03A1",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
    "encoder": {
        "rotary": [
            {"pin_a": "A10", "pin_b": "A8"}
diff --git a/keyboards/keychron/v10/ansi_encoder/rules.mk b/keyboards/keychron/v10/ansi_encoder/rules.mk
index ef55047753..5df3cbccaf 100644
--- a/keyboards/keychron/v10/ansi_encoder/rules.mk
+++ b/keyboards/keychron/v10/ansi_encoder/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/v10/iso_encoder/info.json b/keyboards/keychron/v10/iso_encoder/info.json
index 554e0b907e..ab18577939 100644
--- a/keyboards/keychron/v10/iso_encoder/info.json
+++ b/keyboards/keychron/v10/iso_encoder/info.json
@@ -8,6 +8,9 @@
        "pid": "0x03A3",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
    "encoder": {
        "rotary": [
            {"pin_a": "A10", "pin_b": "A8"}
diff --git a/keyboards/keychron/v10/iso_encoder/rules.mk b/keyboards/keychron/v10/iso_encoder/rules.mk
index ef55047753..5df3cbccaf 100644
--- a/keyboards/keychron/v10/iso_encoder/rules.mk
+++ b/keyboards/keychron/v10/iso_encoder/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/v2/ansi/info.json b/keyboards/keychron/v2/ansi/info.json
index 9c8bffb4f1..8b60fd9710 100644
--- a/keyboards/keychron/v2/ansi/info.json
+++ b/keyboards/keychron/v2/ansi/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0320",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
    "matrix_pins": {
        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
        "rows": ["B4", "B3", "A15", "A14", "A13"]
diff --git a/keyboards/keychron/v2/ansi/rules.mk b/keyboards/keychron/v2/ansi/rules.mk
index 345807d824..2b4a67b1ee 100644
--- a/keyboards/keychron/v2/ansi/rules.mk
+++ b/keyboards/keychron/v2/ansi/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/v2/ansi_encoder/info.json b/keyboards/keychron/v2/ansi_encoder/info.json
index 3a8f9add34..d59e469213 100644
--- a/keyboards/keychron/v2/ansi_encoder/info.json
+++ b/keyboards/keychron/v2/ansi_encoder/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0321",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
    "matrix_pins": {
        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
        "rows": ["B4", "B3", "A15", "A14", "A13"]
diff --git a/keyboards/keychron/v2/ansi_encoder/rules.mk b/keyboards/keychron/v2/ansi_encoder/rules.mk
index 5240004b8c..6a772965ff 100644
--- a/keyboards/keychron/v2/ansi_encoder/rules.mk
+++ b/keyboards/keychron/v2/ansi_encoder/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/v2/iso/info.json b/keyboards/keychron/v2/iso/info.json
index 9a79f31149..3343ef10b8 100644
--- a/keyboards/keychron/v2/iso/info.json
+++ b/keyboards/keychron/v2/iso/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0322",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
    "matrix_pins": {
        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
        "rows": ["B4", "B3", "A15", "A14", "A13"]
diff --git a/keyboards/keychron/v2/iso/rules.mk b/keyboards/keychron/v2/iso/rules.mk
index 345807d824..2b4a67b1ee 100644
--- a/keyboards/keychron/v2/iso/rules.mk
+++ b/keyboards/keychron/v2/iso/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/v2/iso_encoder/info.json b/keyboards/keychron/v2/iso_encoder/info.json
index 13a232c6da..c7492afdba 100644
--- a/keyboards/keychron/v2/iso_encoder/info.json
+++ b/keyboards/keychron/v2/iso_encoder/info.json
@@ -7,6 +7,9 @@
        "pid": "0x0323",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
    "matrix_pins": {
        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
        "rows": ["B4", "B3", "A15", "A14", "A13"]
diff --git a/keyboards/keychron/v2/iso_encoder/rules.mk b/keyboards/keychron/v2/iso_encoder/rules.mk
index 5240004b8c..6a772965ff 100644
--- a/keyboards/keychron/v2/iso_encoder/rules.mk
+++ b/keyboards/keychron/v2/iso_encoder/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/v2/jis/info.json b/keyboards/keychron/v2/jis/info.json
index a727490f8f..6ef7e94a37 100644
--- a/keyboards/keychron/v2/jis/info.json
+++ b/keyboards/keychron/v2/jis/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0324",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
    "matrix_pins": {
        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
        "rows": ["B4", "B3", "A15", "A14", "A13"]
diff --git a/keyboards/keychron/v2/jis/rules.mk b/keyboards/keychron/v2/jis/rules.mk
index 345807d824..2b4a67b1ee 100644
--- a/keyboards/keychron/v2/jis/rules.mk
+++ b/keyboards/keychron/v2/jis/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/v2/jis_encoder/info.json b/keyboards/keychron/v2/jis_encoder/info.json
index 222861041c..c24569847b 100644
--- a/keyboards/keychron/v2/jis_encoder/info.json
+++ b/keyboards/keychron/v2/jis_encoder/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0325",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
    "matrix_pins": {
        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
        "rows": ["B4", "B3", "A15", "A14", "A13"]
diff --git a/keyboards/keychron/v2/jis_encoder/rules.mk b/keyboards/keychron/v2/jis_encoder/rules.mk
index 5240004b8c..6a772965ff 100644
--- a/keyboards/keychron/v2/jis_encoder/rules.mk
+++ b/keyboards/keychron/v2/jis_encoder/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/v3/ansi/info.json b/keyboards/keychron/v3/ansi/info.json
index ae70657b84..513838db8c 100644
--- a/keyboards/keychron/v3/ansi/info.json
+++ b/keyboards/keychron/v3/ansi/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0330",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
    "processor": "STM32L432",
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/keychron/v3/ansi/rules.mk b/keyboards/keychron/v3/ansi/rules.mk
index 345807d824..2b4a67b1ee 100644
--- a/keyboards/keychron/v3/ansi/rules.mk
+++ b/keyboards/keychron/v3/ansi/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/v3/ansi_encoder/info.json b/keyboards/keychron/v3/ansi_encoder/info.json
index 5fdf765356..1f0e263e24 100644
--- a/keyboards/keychron/v3/ansi_encoder/info.json
+++ b/keyboards/keychron/v3/ansi_encoder/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0331",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
    "encoder": {
        "rotary": [
            {"pin_a": "A10", "pin_b": "A8"}
diff --git a/keyboards/keychron/v3/ansi_encoder/rules.mk b/keyboards/keychron/v3/ansi_encoder/rules.mk
index ef55047753..5df3cbccaf 100644
--- a/keyboards/keychron/v3/ansi_encoder/rules.mk
+++ b/keyboards/keychron/v3/ansi_encoder/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/v3/iso/info.json b/keyboards/keychron/v3/iso/info.json
index 9f79518cb2..c7163fcbc7 100644
--- a/keyboards/keychron/v3/iso/info.json
+++ b/keyboards/keychron/v3/iso/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0332",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
    "processor": "STM32L432",
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/keychron/v3/iso/rules.mk b/keyboards/keychron/v3/iso/rules.mk
index 8f5af0583c..201148f39d 100644
--- a/keyboards/keychron/v3/iso/rules.mk
+++ b/keyboards/keychron/v3/iso/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/v3/iso_encoder/info.json b/keyboards/keychron/v3/iso_encoder/info.json
index b38ad45930..915d3c6db1 100644
--- a/keyboards/keychron/v3/iso_encoder/info.json
+++ b/keyboards/keychron/v3/iso_encoder/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0333",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
    "encoder": {
        "rotary": [
            {"pin_a": "A10", "pin_b": "A8"}
diff --git a/keyboards/keychron/v3/iso_encoder/rules.mk b/keyboards/keychron/v3/iso_encoder/rules.mk
index ef55047753..5df3cbccaf 100644
--- a/keyboards/keychron/v3/iso_encoder/rules.mk
+++ b/keyboards/keychron/v3/iso_encoder/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/v3/jis/info.json b/keyboards/keychron/v3/jis/info.json
index 3bab42c8dd..f212f3d86f 100644
--- a/keyboards/keychron/v3/jis/info.json
+++ b/keyboards/keychron/v3/jis/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0334",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
    "processor": "STM32L432",
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/keychron/v3/jis/rules.mk b/keyboards/keychron/v3/jis/rules.mk
index deac2e12e6..7f91e808b1 100644
--- a/keyboards/keychron/v3/jis/rules.mk
+++ b/keyboards/keychron/v3/jis/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/v3/jis_encoder/info.json b/keyboards/keychron/v3/jis_encoder/info.json
index 1f2d2b425b..0e9df3bfb8 100644
--- a/keyboards/keychron/v3/jis_encoder/info.json
+++ b/keyboards/keychron/v3/jis_encoder/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0335",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
    "encoder": {
        "rotary": [
            {"pin_a": "A10", "pin_b": "A8"}
diff --git a/keyboards/keychron/v3/jis_encoder/rules.mk b/keyboards/keychron/v3/jis_encoder/rules.mk
index ef55047753..5df3cbccaf 100644
--- a/keyboards/keychron/v3/jis_encoder/rules.mk
+++ b/keyboards/keychron/v3/jis_encoder/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/v4/ansi/info.json b/keyboards/keychron/v4/ansi/info.json
index 372f8d2bf0..d1c6d60cec 100644
--- a/keyboards/keychron/v4/ansi/info.json
+++ b/keyboards/keychron/v4/ansi/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0340",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
    "matrix_pins": {
        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9"],
        "rows": ["B4", "B3", "A15", "A14", "A13"]
diff --git a/keyboards/keychron/v4/ansi/rules.mk b/keyboards/keychron/v4/ansi/rules.mk
index 70c663e777..6dcd47b1fe 100644
--- a/keyboards/keychron/v4/ansi/rules.mk
+++ b/keyboards/keychron/v4/ansi/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/v4/iso/info.json b/keyboards/keychron/v4/iso/info.json
index 79d23c7853..8ffc13cd85 100644
--- a/keyboards/keychron/v4/iso/info.json
+++ b/keyboards/keychron/v4/iso/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0342",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
    "matrix_pins": {
        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9"],
        "rows": ["B4", "B3", "A15", "A14", "A13"]
diff --git a/keyboards/keychron/v4/iso/rules.mk b/keyboards/keychron/v4/iso/rules.mk
index 70c663e777..6dcd47b1fe 100644
--- a/keyboards/keychron/v4/iso/rules.mk
+++ b/keyboards/keychron/v4/iso/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/v5/ansi/info.json b/keyboards/keychron/v5/ansi/info.json
index 40e253367c..6e4f7e2dae 100644
--- a/keyboards/keychron/v5/ansi/info.json
+++ b/keyboards/keychron/v5/ansi/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0350",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
    "processor": "STM32L432",
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/keychron/v5/ansi/rules.mk b/keyboards/keychron/v5/ansi/rules.mk
index 311ca648e1..f2dba218bf 100644
--- a/keyboards/keychron/v5/ansi/rules.mk
+++ b/keyboards/keychron/v5/ansi/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/v5/ansi_encoder/info.json b/keyboards/keychron/v5/ansi_encoder/info.json
index 9461379d1a..baa754f4a6 100644
--- a/keyboards/keychron/v5/ansi_encoder/info.json
+++ b/keyboards/keychron/v5/ansi_encoder/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0351",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
    "encoder": {
        "rotary": [
            {"pin_a": "C14", "pin_b": "A2"}
diff --git a/keyboards/keychron/v5/ansi_encoder/rules.mk b/keyboards/keychron/v5/ansi_encoder/rules.mk
index ef55047753..5df3cbccaf 100644
--- a/keyboards/keychron/v5/ansi_encoder/rules.mk
+++ b/keyboards/keychron/v5/ansi_encoder/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/v5/iso/info.json b/keyboards/keychron/v5/iso/info.json
index 729297f2a1..c4a10480e5 100644
--- a/keyboards/keychron/v5/iso/info.json
+++ b/keyboards/keychron/v5/iso/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0352",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
    "processor": "STM32L432",
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/keychron/v5/iso/rules.mk b/keyboards/keychron/v5/iso/rules.mk
index 311ca648e1..f2dba218bf 100644
--- a/keyboards/keychron/v5/iso/rules.mk
+++ b/keyboards/keychron/v5/iso/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/v5/iso_encoder/info.json b/keyboards/keychron/v5/iso_encoder/info.json
index 21c1891069..16d228d413 100644
--- a/keyboards/keychron/v5/iso_encoder/info.json
+++ b/keyboards/keychron/v5/iso_encoder/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0353",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
    "encoder": {
        "rotary": [
            {"pin_a": "C14", "pin_b": "A2"}
diff --git a/keyboards/keychron/v5/iso_encoder/rules.mk b/keyboards/keychron/v5/iso_encoder/rules.mk
index ef55047753..5df3cbccaf 100644
--- a/keyboards/keychron/v5/iso_encoder/rules.mk
+++ b/keyboards/keychron/v5/iso_encoder/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/v6/ansi/info.json b/keyboards/keychron/v6/ansi/info.json
index b694849f88..c9fb812f32 100644
--- a/keyboards/keychron/v6/ansi/info.json
+++ b/keyboards/keychron/v6/ansi/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0360",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
    "processor": "STM32L432",
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/keychron/v6/ansi/rules.mk b/keyboards/keychron/v6/ansi/rules.mk
index ee83debd68..de86b770f3 100644
--- a/keyboards/keychron/v6/ansi/rules.mk
+++ b/keyboards/keychron/v6/ansi/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/v6/ansi_encoder/info.json b/keyboards/keychron/v6/ansi_encoder/info.json
index d6f46506ec..9bfec3341d 100644
--- a/keyboards/keychron/v6/ansi_encoder/info.json
+++ b/keyboards/keychron/v6/ansi_encoder/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0361",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
    "encoder": {
        "rotary": [
            {"pin_a": "C14", "pin_b": "A2"}
diff --git a/keyboards/keychron/v6/ansi_encoder/rules.mk b/keyboards/keychron/v6/ansi_encoder/rules.mk
index bf60bb7d7d..9958a466f6 100644
--- a/keyboards/keychron/v6/ansi_encoder/rules.mk
+++ b/keyboards/keychron/v6/ansi_encoder/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/v6/iso/info.json b/keyboards/keychron/v6/iso/info.json
index 764a3d7622..9024029d26 100644
--- a/keyboards/keychron/v6/iso/info.json
+++ b/keyboards/keychron/v6/iso/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0362",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
    "processor": "STM32L432",
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/keychron/v6/iso/rules.mk b/keyboards/keychron/v6/iso/rules.mk
index ee83debd68..de86b770f3 100644
--- a/keyboards/keychron/v6/iso/rules.mk
+++ b/keyboards/keychron/v6/iso/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/v6/iso_encoder/info.json b/keyboards/keychron/v6/iso_encoder/info.json
index d8f86e5aa0..38fe956bca 100644
--- a/keyboards/keychron/v6/iso_encoder/info.json
+++ b/keyboards/keychron/v6/iso_encoder/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0363",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
    "encoder": {
        "rotary": [
            {"pin_a": "C14", "pin_b": "A2"}
diff --git a/keyboards/keychron/v6/iso_encoder/rules.mk b/keyboards/keychron/v6/iso_encoder/rules.mk
index f76ec9b08d..df920055a0 100644
--- a/keyboards/keychron/v6/iso_encoder/rules.mk
+++ b/keyboards/keychron/v6/iso_encoder/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/v7/ansi/info.json b/keyboards/keychron/v7/ansi/info.json
index 7b3eb8db78..4fb4147e45 100644
--- a/keyboards/keychron/v7/ansi/info.json
+++ b/keyboards/keychron/v7/ansi/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0370",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
    "matrix_pins": {
        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "A10", "B5"],
        "rows": ["B4", "B3", "A15", "A14", "A13"]
diff --git a/keyboards/keychron/v7/ansi/rules.mk b/keyboards/keychron/v7/ansi/rules.mk
index 70c663e777..6dcd47b1fe 100644
--- a/keyboards/keychron/v7/ansi/rules.mk
+++ b/keyboards/keychron/v7/ansi/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/v7/iso/info.json b/keyboards/keychron/v7/iso/info.json
index 449ec89487..26a85b57cd 100644
--- a/keyboards/keychron/v7/iso/info.json
+++ b/keyboards/keychron/v7/iso/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0372",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
    "matrix_pins": {
        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "A10", "B5"],
        "rows": ["B4", "B3", "A15", "A14", "A13"]
diff --git a/keyboards/keychron/v7/iso/rules.mk b/keyboards/keychron/v7/iso/rules.mk
index 70c663e777..6dcd47b1fe 100644
--- a/keyboards/keychron/v7/iso/rules.mk
+++ b/keyboards/keychron/v7/iso/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/v8/ansi/info.json b/keyboards/keychron/v8/ansi/info.json
index 6924af28b5..08864a29cf 100644
--- a/keyboards/keychron/v8/ansi/info.json
+++ b/keyboards/keychron/v8/ansi/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0380",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
    "matrix_pins": {
        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
        "rows": ["B4", "B3", "A15", "A14", "A13"]
diff --git a/keyboards/keychron/v8/ansi/rules.mk b/keyboards/keychron/v8/ansi/rules.mk
index 6f738741e9..bdb97dbf1c 100644
--- a/keyboards/keychron/v8/ansi/rules.mk
+++ b/keyboards/keychron/v8/ansi/rules.mk
@@ -14,7 +14,6 @@ ENCODER_ENABLE = no         # Enable Encoder
 ENCODER_MAP_ENABLE = no
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/v8/ansi_encoder/info.json b/keyboards/keychron/v8/ansi_encoder/info.json
index 8ff94cedb0..cce4165ec9 100644
--- a/keyboards/keychron/v8/ansi_encoder/info.json
+++ b/keyboards/keychron/v8/ansi_encoder/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0381",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
    "matrix_pins": {
        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
        "rows": ["B4", "B3", "A15", "A14", "A13"]
diff --git a/keyboards/keychron/v8/ansi_encoder/rules.mk b/keyboards/keychron/v8/ansi_encoder/rules.mk
index f2cbf4a660..d2bee999c8 100644
--- a/keyboards/keychron/v8/ansi_encoder/rules.mk
+++ b/keyboards/keychron/v8/ansi_encoder/rules.mk
@@ -14,7 +14,6 @@ ENCODER_ENABLE = yes        # Enable Encoder
 ENCODER_MAP_ENABLE = no
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/v8/iso/info.json b/keyboards/keychron/v8/iso/info.json
index 1cfb662ba2..2fc2f5292a 100644
--- a/keyboards/keychron/v8/iso/info.json
+++ b/keyboards/keychron/v8/iso/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0382",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
    "matrix_pins": {
        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
        "rows": ["B4", "B3", "A15", "A14", "A13"]
diff --git a/keyboards/keychron/v8/iso/rules.mk b/keyboards/keychron/v8/iso/rules.mk
index e306f3211e..fec3d8d15c 100644
--- a/keyboards/keychron/v8/iso/rules.mk
+++ b/keyboards/keychron/v8/iso/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = no         # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/keychron/v8/iso_encoder/info.json b/keyboards/keychron/v8/iso_encoder/info.json
index a70cc2c43b..e5f322851e 100644
--- a/keyboards/keychron/v8/iso_encoder/info.json
+++ b/keyboards/keychron/v8/iso_encoder/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0383",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
    "matrix_pins": {
        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
        "rows": ["B4", "B3", "A15", "A14", "A13"]
diff --git a/keyboards/keychron/v8/iso_encoder/rules.mk b/keyboards/keychron/v8/iso_encoder/rules.mk
index f2cbf4a660..d2bee999c8 100644
--- a/keyboards/keychron/v8/iso_encoder/rules.mk
+++ b/keyboards/keychron/v8/iso_encoder/rules.mk
@@ -14,7 +14,6 @@ ENCODER_ENABLE = yes        # Enable Encoder
 ENCODER_MAP_ENABLE = no
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
diff --git a/keyboards/kprepublic/bm40hsrgb/info.json b/keyboards/kprepublic/bm40hsrgb/info.json
index 02c02cf6a5..cf58efba9f 100644
--- a/keyboards/kprepublic/bm40hsrgb/info.json
+++ b/keyboards/kprepublic/bm40hsrgb/info.json
@@ -11,6 +11,9 @@
    "ws2812": {
        "pin": "E2"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["B6", "C6", "B4", "D7", "D4", "D6", "C7", "F6", "F5", "F4", "F1", "F0"],
        "rows": ["B3", "B2", "E6", "B5"]
diff --git a/keyboards/kprepublic/bm40hsrgb/rules.mk b/keyboards/kprepublic/bm40hsrgb/rules.mk
index 9690e3e495..7e0de4a3e8 100755
--- a/keyboards/kprepublic/bm40hsrgb/rules.mk
+++ b/keyboards/kprepublic/bm40hsrgb/rules.mk
@@ -10,6 +10,5 @@ NKRO_ENABLE = no            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 LAYOUTS_HAS_RGB = yes
diff --git a/keyboards/kprepublic/bm60hsrgb/rev1/info.json b/keyboards/kprepublic/bm60hsrgb/rev1/info.json
index 5b28d04f14..a7a93f60bf 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev1/info.json
+++ b/keyboards/kprepublic/bm60hsrgb/rev1/info.json
@@ -11,6 +11,9 @@
    "ws2812": {
        "pin": "E2"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7"],
        "rows": ["B0", "B1", "B2", "B3", "E6"]
diff --git a/keyboards/kprepublic/bm60hsrgb/rev1/rules.mk b/keyboards/kprepublic/bm60hsrgb/rev1/rules.mk
index cb6e15ad0a..4e7e766dda 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev1/rules.mk
+++ b/keyboards/kprepublic/bm60hsrgb/rev1/rules.mk
@@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no        # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no            # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 LTO_ENABLE = yes
diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/info.json b/keyboards/kprepublic/bm60hsrgb/rev2/info.json
index 4c0f4e11af..8ef6f2598c 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev2/info.json
+++ b/keyboards/kprepublic/bm60hsrgb/rev2/info.json
@@ -11,6 +11,9 @@
    "ws2812": {
        "pin": "F0"
    },
+    "rgb_matrix": {
+        "driver": "custom"
+    },
    "matrix_pins": {
        "cols": ["B2", "B3", "B7", "B0", "B1", "F7", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"],
        "rows": ["E6", "D2", "D3", "D5", "F6"]
diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/rules.mk b/keyboards/kprepublic/bm60hsrgb/rev2/rules.mk
index d1baac82c4..534a21dbf3 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev2/rules.mk
+++ b/keyboards/kprepublic/bm60hsrgb/rev2/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 NO_USB_STARTUP_CHECK = no
 LTO_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = custom
 WS2812_DRIVER_REQUIRED = yes
 COMMON_VPATH += $(DRIVER_PATH)/led/issi
diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev1/info.json b/keyboards/kprepublic/bm60hsrgb_ec/rev1/info.json
index 4554cd6bf8..5db6750d85 100644
--- a/keyboards/kprepublic/bm60hsrgb_ec/rev1/info.json
+++ b/keyboards/kprepublic/bm60hsrgb_ec/rev1/info.json
@@ -11,6 +11,9 @@
    "ws2812": {
        "pin": "E2"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7"],
        "rows": ["B0", "B1", "B2", "B3", "E6"]
diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev1/rules.mk b/keyboards/kprepublic/bm60hsrgb_ec/rev1/rules.mk
index 8164eaacdb..6cd530668c 100644
--- a/keyboards/kprepublic/bm60hsrgb_ec/rev1/rules.mk
+++ b/keyboards/kprepublic/bm60hsrgb_ec/rev1/rules.mk
@@ -11,6 +11,5 @@ BACKLIGHT_ENABLE = no        # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no            # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 LTO_ENABLE = yes
 ENCODER_ENABLE = yes
diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev2/info.json b/keyboards/kprepublic/bm60hsrgb_ec/rev2/info.json
index 4dadcc450c..dde62eea4c 100644
--- a/keyboards/kprepublic/bm60hsrgb_ec/rev2/info.json
+++ b/keyboards/kprepublic/bm60hsrgb_ec/rev2/info.json
@@ -11,6 +11,9 @@
    "ws2812": {
        "pin": "F0"
    },
+    "rgb_matrix": {
+        "driver": "IS31FL3733"
+    },
    "matrix_pins": {
        "cols": ["B2", "B3", "B7", "B0", "B1", "F7", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"],
        "rows": ["E6", "D2", "D3", "D5", "F6"]
diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev2/rules.mk b/keyboards/kprepublic/bm60hsrgb_ec/rev2/rules.mk
index 858a74bdf0..a4b968313c 100644
--- a/keyboards/kprepublic/bm60hsrgb_ec/rev2/rules.mk
+++ b/keyboards/kprepublic/bm60hsrgb_ec/rev2/rules.mk
@@ -11,6 +11,5 @@ BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes           # Enable keyboard RGB underglow
 AUDIO_ENABLE = no              # Audio output
 RGB_MATRIX_ENABLE = yes        # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3733
 ENCODER_ENABLE = yes
 LTO_ENABLE = yes
diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev1/info.json b/keyboards/kprepublic/bm60hsrgb_iso/rev1/info.json
index 5511d3d00b..0148d1ef53 100644
--- a/keyboards/kprepublic/bm60hsrgb_iso/rev1/info.json
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev1/info.json
@@ -11,6 +11,9 @@
    "ws2812": {
        "pin": "E2"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7"],
        "rows": ["B0", "B1", "B2", "B3", "E6"]
diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev1/rules.mk b/keyboards/kprepublic/bm60hsrgb_iso/rev1/rules.mk
index 0459a2ad6b..bb8155a9b8 100644
--- a/keyboards/kprepublic/bm60hsrgb_iso/rev1/rules.mk
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev1/rules.mk
@@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 LTO_ENABLE = yes
diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev2/info.json b/keyboards/kprepublic/bm60hsrgb_iso/rev2/info.json
index 9699a7d3c3..4fd7bc002a 100644
--- a/keyboards/kprepublic/bm60hsrgb_iso/rev2/info.json
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev2/info.json
@@ -11,6 +11,9 @@
    "ws2812": {
        "pin": "F0"
    },
+    "rgb_matrix": {
+        "driver": "custom"
+    },
    "matrix_pins": {
        "cols": ["B2", "B3", "B7", "B0", "B1", "F7", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"],
        "rows": ["E6", "D2", "D3", "D5", "F6"]
diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev2/rules.mk b/keyboards/kprepublic/bm60hsrgb_iso/rev2/rules.mk
index fde42415fe..b6b9ff1110 100644
--- a/keyboards/kprepublic/bm60hsrgb_iso/rev2/rules.mk
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev2/rules.mk
@@ -18,7 +18,6 @@ RGB_MATRIX_ENABLE = yes
 # The custom RGB Matrix driver combines IS31FL3733 and WS2812; things that are
 # normally done by common_features.mk for both of these drivers need to be done
 # here manually.
-RGB_MATRIX_DRIVER = custom
 COMMON_VPATH += $(DRIVER_PATH)/led/issi
 SRC += is31fl3733.c
 QUANTUM_LIB_SRC += i2c_master.c
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev1/info.json b/keyboards/kprepublic/bm60hsrgb_poker/rev1/info.json
index 230f141f22..cc41dbe8bd 100644
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev1/info.json
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev1/info.json
@@ -11,6 +11,9 @@
    "ws2812": {
        "pin": "E2"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7"],
        "rows": ["B0", "B1", "B2", "B3", "E6"]
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev1/rules.mk b/keyboards/kprepublic/bm60hsrgb_poker/rev1/rules.mk
index a1fe09e1fd..7b60a21412 100644
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev1/rules.mk
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev1/rules.mk
@@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json b/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json
index 4320fb9295..a85b20cd5f 100644
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json
@@ -11,6 +11,9 @@
    "ws2812": {
        "pin": "F0"
    },
+    "rgb_matrix": {
+        "driver": "custom"
+    },
    "matrix_pins": {
        "cols": ["B2", "B3", "B7", "B0", "B1", "F7", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"],
        "rows": ["E6", "D2", "D3", "D5", "F6"]
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/rules.mk b/keyboards/kprepublic/bm60hsrgb_poker/rev2/rules.mk
index 98b66d638e..5db18e7cfa 100644
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev2/rules.mk
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/rules.mk
@@ -17,7 +17,6 @@ RGB_MATRIX_ENABLE = yes
 # The custom RGB Matrix driver combines IS31FL3733 and WS2812; things that are
 # normally done by common_features.mk for both of these drivers need to be done
 # here manually.
-RGB_MATRIX_DRIVER = custom
 COMMON_VPATH += $(DRIVER_PATH)/led/issi
 SRC += is31fl3733.c
 QUANTUM_LIB_SRC += i2c_master.c
diff --git a/keyboards/kprepublic/bm65hsrgb/rev1/info.json b/keyboards/kprepublic/bm65hsrgb/rev1/info.json
index c5f617d281..d88f3b8177 100644
--- a/keyboards/kprepublic/bm65hsrgb/rev1/info.json
+++ b/keyboards/kprepublic/bm65hsrgb/rev1/info.json
@@ -11,6 +11,9 @@
    "ws2812": {
        "pin": "E2"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6"],
        "rows": ["B0", "B1", "B2", "B3", "E6"]
diff --git a/keyboards/kprepublic/bm65hsrgb/rev1/rules.mk b/keyboards/kprepublic/bm65hsrgb/rev1/rules.mk
index bd6310d859..5bdc9f5d4a 100644
--- a/keyboards/kprepublic/bm65hsrgb/rev1/rules.mk
+++ b/keyboards/kprepublic/bm65hsrgb/rev1/rules.mk
@@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 LTO_ENABLE = yes
diff --git a/keyboards/kprepublic/bm65hsrgb_iso/rev1/info.json b/keyboards/kprepublic/bm65hsrgb_iso/rev1/info.json
index 97b0acfbd4..dc5c2235a8 100644
--- a/keyboards/kprepublic/bm65hsrgb_iso/rev1/info.json
+++ b/keyboards/kprepublic/bm65hsrgb_iso/rev1/info.json
@@ -11,6 +11,9 @@
    "ws2812": {
        "pin": "E2"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6"],
        "rows": ["B0", "B1", "B2", "B3", "E6"]
diff --git a/keyboards/kprepublic/bm65hsrgb_iso/rev1/rules.mk b/keyboards/kprepublic/bm65hsrgb_iso/rev1/rules.mk
index bd6310d859..5bdc9f5d4a 100644
--- a/keyboards/kprepublic/bm65hsrgb_iso/rev1/rules.mk
+++ b/keyboards/kprepublic/bm65hsrgb_iso/rev1/rules.mk
@@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 LTO_ENABLE = yes
diff --git a/keyboards/kprepublic/bm68hsrgb/rev1/info.json b/keyboards/kprepublic/bm68hsrgb/rev1/info.json
index 3a1c8ff16c..a965121f64 100644
--- a/keyboards/kprepublic/bm68hsrgb/rev1/info.json
+++ b/keyboards/kprepublic/bm68hsrgb/rev1/info.json
@@ -11,6 +11,9 @@
    "ws2812": {
        "pin": "E2"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6"],
        "rows": ["B0", "B1", "B2", "B3", "E6"]
diff --git a/keyboards/kprepublic/bm68hsrgb/rev1/rules.mk b/keyboards/kprepublic/bm68hsrgb/rev1/rules.mk
index bd6310d859..5bdc9f5d4a 100644
--- a/keyboards/kprepublic/bm68hsrgb/rev1/rules.mk
+++ b/keyboards/kprepublic/bm68hsrgb/rev1/rules.mk
@@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 LTO_ENABLE = yes
diff --git a/keyboards/kprepublic/bm68hsrgb/rev2/info.json b/keyboards/kprepublic/bm68hsrgb/rev2/info.json
index 9f2cc9266d..7e4623804b 100644
--- a/keyboards/kprepublic/bm68hsrgb/rev2/info.json
+++ b/keyboards/kprepublic/bm68hsrgb/rev2/info.json
@@ -11,6 +11,9 @@
    "ws2812": {
        "pin": "E2"
    },
+    "rgb_matrix": {
+        "driver": "IS31FL3741"
+    },
    "matrix_pins": {
        "cols": ["F0", "F1", "B0", "B1", "B2", "B3", "E6", "B7", "D2", "D7", "B4", "B5", "B6", "C6", "C7"],
        "rows": ["D6", "D4", "D5", "D3", "F6"]
diff --git a/keyboards/kprepublic/bm68hsrgb/rev2/rules.mk b/keyboards/kprepublic/bm68hsrgb/rev2/rules.mk
index 9072e268b9..0dba15144c 100644
--- a/keyboards/kprepublic/bm68hsrgb/rev2/rules.mk
+++ b/keyboards/kprepublic/bm68hsrgb/rev2/rules.mk
@@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3741
 LTO_ENABLE = yes
diff --git a/keyboards/kprepublic/bm80hsrgb/info.json b/keyboards/kprepublic/bm80hsrgb/info.json
index 93ca1c86d8..d3989e3615 100644
--- a/keyboards/kprepublic/bm80hsrgb/info.json
+++ b/keyboards/kprepublic/bm80hsrgb/info.json
@@ -11,6 +11,9 @@
    "ws2812": {
        "pin": "E2"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["F0", "F1", "F4", "D7", "D6", "D4", "D5", "D3", "D2", "F5", "F6", "F7", "D1", "D0", "B4", "B5", "B6"],
        "rows": ["B3", "B2", "B1", "B0", "C6", "C7"]
diff --git a/keyboards/kprepublic/bm80hsrgb/rules.mk b/keyboards/kprepublic/bm80hsrgb/rules.mk
index bd6310d859..5bdc9f5d4a 100644
--- a/keyboards/kprepublic/bm80hsrgb/rules.mk
+++ b/keyboards/kprepublic/bm80hsrgb/rules.mk
@@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 LTO_ENABLE = yes
diff --git a/keyboards/kprepublic/bm80v2/info.json b/keyboards/kprepublic/bm80v2/info.json
index 08c71f20c0..cbad2ee816 100644
--- a/keyboards/kprepublic/bm80v2/info.json
+++ b/keyboards/kprepublic/bm80v2/info.json
@@ -8,6 +8,9 @@
        "pid": "0x1141",
        "device_version": "0.0.2"
    },
+    "rgb_matrix": {
+        "driver": "IS31FL3741"
+    },
    "matrix_pins": {
        "cols": ["E6", "F0", "F1", "F4", "D7", "D6", "B7", "B1", "B0", "B2", "B3", "D3", "D5", "D4", "D2", "B4", "B5"],
        "rows": ["C7", "C6", "B6", "F5", "F7", "F6"]
diff --git a/keyboards/kprepublic/bm80v2/rules.mk b/keyboards/kprepublic/bm80v2/rules.mk
index 0288e3a9b0..ab9a06f5b2 100644
--- a/keyboards/kprepublic/bm80v2/rules.mk
+++ b/keyboards/kprepublic/bm80v2/rules.mk
@@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
 AUDIO_ENABLE = no              # Audio output
 RGB_MATRIX_ENABLE = yes        # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3741
 LTO_ENABLE = yes
diff --git a/keyboards/kprepublic/bm80v2_iso/info.json b/keyboards/kprepublic/bm80v2_iso/info.json
index 3811a88e74..064af02128 100644
--- a/keyboards/kprepublic/bm80v2_iso/info.json
+++ b/keyboards/kprepublic/bm80v2_iso/info.json
@@ -8,6 +8,9 @@
        "pid": "0x1142",
        "device_version": "0.0.2"
    },
+    "rgb_matrix": {
+        "driver": "IS31FL3741"
+    },
    "matrix_pins": {
        "cols": ["E6", "F0", "F1", "F4", "D7", "D6", "B7", "B1", "B0", "B2", "B3", "D3", "D5", "D4", "D2", "B4", "B5"],
        "rows": ["C7", "C6", "B6", "F5", "F7", "F6"]
diff --git a/keyboards/kprepublic/bm80v2_iso/rules.mk b/keyboards/kprepublic/bm80v2_iso/rules.mk
index dfbbfb974d..e74a388dc0 100644
--- a/keyboards/kprepublic/bm80v2_iso/rules.mk
+++ b/keyboards/kprepublic/bm80v2_iso/rules.mk
@@ -12,6 +12,5 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes         # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3741
 LTO_ENABLE = yes
diff --git a/keyboards/kprepublic/bm980hsrgb/info.json b/keyboards/kprepublic/bm980hsrgb/info.json
index 7993c49e30..46ab7e42aa 100644
--- a/keyboards/kprepublic/bm980hsrgb/info.json
+++ b/keyboards/kprepublic/bm980hsrgb/info.json
@@ -8,6 +8,9 @@
        "pid": "0xEF61",
        "device_version": "0.0.1"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "E6", "F0", "F1", "F4", "F5", "D6"],
        "rows": ["D4", "B6", "B5", "B4", "F7", "F6", "D7"]
diff --git a/keyboards/kprepublic/bm980hsrgb/rules.mk b/keyboards/kprepublic/bm980hsrgb/rules.mk
index 41d2efeaa8..84a2d5cbe6 100644
--- a/keyboards/kprepublic/bm980hsrgb/rules.mk
+++ b/keyboards/kprepublic/bm980hsrgb/rules.mk
@@ -11,6 +11,5 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 LTO_ENABLE = yes
diff --git a/keyboards/latincompass/latin17rgb/info.json b/keyboards/latincompass/latin17rgb/info.json
index 91fb684f9b..7a5a6fbb6d 100644
--- a/keyboards/latincompass/latin17rgb/info.json
+++ b/keyboards/latincompass/latin17rgb/info.json
@@ -11,6 +11,9 @@
  "ws2812": {
    "pin": "B7"
  },
+  "rgb_matrix": {
+    "driver": "IS31FL3731"
+  },
  "matrix_pins": {
    "cols": ["F7", "F6", "F5", "F4"],
    "rows": ["C7", "C6", "B6", "B5", "B4"]
diff --git a/keyboards/latincompass/latin17rgb/rules.mk b/keyboards/latincompass/latin17rgb/rules.mk
index 9a4182e982..53e01e55d2 100644
--- a/keyboards/latincompass/latin17rgb/rules.mk
+++ b/keyboards/latincompass/latin17rgb/rules.mk
@@ -12,4 +12,3 @@ RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
 AUDIO_ENABLE = no              # Audio output
 NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3731
diff --git a/keyboards/latincompass/latin60rgb/info.json b/keyboards/latincompass/latin60rgb/info.json
index db9b9791e9..5ba1f86df8 100644
--- a/keyboards/latincompass/latin60rgb/info.json
+++ b/keyboards/latincompass/latin60rgb/info.json
@@ -8,6 +8,9 @@
    "pid": "0x6C69",
    "device_version": "0.0.1"
  },
+  "rgb_matrix": {
+    "driver": "IS31FL3733"
+  },
  "matrix_pins": {
    "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "E6", "B0", "B1", "B2", "B3", "D6", "D4", "D3"],
    "rows": ["C7", "C6", "B6", "B5", "B4"]
diff --git a/keyboards/latincompass/latin60rgb/rules.mk b/keyboards/latincompass/latin60rgb/rules.mk
index fe9c141422..ea646d3d93 100644
--- a/keyboards/latincompass/latin60rgb/rules.mk
+++ b/keyboards/latincompass/latin60rgb/rules.mk
@@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
 AUDIO_ENABLE = no              # Audio output
 RGB_MATRIX_ENABLE = yes        # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3733 
diff --git a/keyboards/latincompass/latin6rgb/info.json b/keyboards/latincompass/latin6rgb/info.json
index cecbce638a..dd7cfc232d 100644
--- a/keyboards/latincompass/latin6rgb/info.json
+++ b/keyboards/latincompass/latin6rgb/info.json
@@ -8,6 +8,9 @@
    "pid": "0x7C96",
    "device_version": "0.0.1"
  },
+  "rgb_matrix": {
+    "driver": "IS31FL3731"
+  },
  "matrix_pins": {
    "cols": ["F7", "F6", "F5"],
    "rows": ["C7", "C6"]
diff --git a/keyboards/latincompass/latin6rgb/rules.mk b/keyboards/latincompass/latin6rgb/rules.mk
index dc0e116999..f3108efe8b 100644
--- a/keyboards/latincompass/latin6rgb/rules.mk
+++ b/keyboards/latincompass/latin6rgb/rules.mk
@@ -14,6 +14,5 @@ AUDIO_ENABLE = no              # Audio output
 NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3731
 RGB_MATRIX_SUPPORTED = yes
diff --git a/keyboards/latincompass/latinpad/info.json b/keyboards/latincompass/latinpad/info.json
index 6c5bfe720e..6a7e0bd57f 100644
--- a/keyboards/latincompass/latinpad/info.json
+++ b/keyboards/latincompass/latinpad/info.json
@@ -8,6 +8,9 @@
        "pid": "0x6C70",
        "device_version": "0.0.1"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["D4", "C6", "D7", "E6"],
        "rows": ["F4", "F5", "F6", "F7", "B1"]
diff --git a/keyboards/latincompass/latinpad/rules.mk b/keyboards/latincompass/latinpad/rules.mk
index 7583158b92..4d41664e3c 100644
--- a/keyboards/latincompass/latinpad/rules.mk
+++ b/keyboards/latincompass/latinpad/rules.mk
@@ -14,4 +14,3 @@ OLED_ENABLE = yes
 OLED_DRIVER = SSD1306
 ENCODER_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/linworks/fave65h/info.json b/keyboards/linworks/fave65h/info.json
index bc53e4cb0f..c0fbdd6903 100644
--- a/keyboards/linworks/fave65h/info.json
+++ b/keyboards/linworks/fave65h/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0007",
        "device_version": "0.0.1"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
        "rows": ["D1", "D0", "D2", "D3", "D5"]
diff --git a/keyboards/linworks/fave65h/rules.mk b/keyboards/linworks/fave65h/rules.mk
index f876ea8a18..f92cb03d08 100644
--- a/keyboards/linworks/fave65h/rules.mk
+++ b/keyboards/linworks/fave65h/rules.mk
@@ -14,4 +14,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/linworks/fave87h/info.json b/keyboards/linworks/fave87h/info.json
index e1d679d05c..4b7aff9ae3 100644
--- a/keyboards/linworks/fave87h/info.json
+++ b/keyboards/linworks/fave87h/info.json
@@ -11,6 +11,9 @@
    "ws2812": {
        "pin": "D2"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "B0", "B7", "E6"],
        "rows": ["B1", "B2", "B3", "D3", "D1", "D0"]
diff --git a/keyboards/linworks/fave87h/rules.mk b/keyboards/linworks/fave87h/rules.mk
index f876ea8a18..f92cb03d08 100644
--- a/keyboards/linworks/fave87h/rules.mk
+++ b/keyboards/linworks/fave87h/rules.mk
@@ -14,4 +14,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/lxxt/info.json b/keyboards/lxxt/info.json
index 0a90b3e00b..abd0d7c84f 100644
--- a/keyboards/lxxt/info.json
+++ b/keyboards/lxxt/info.json
@@ -20,8 +20,11 @@
        "rows": ["GP29", "GP26", "GP22", "GP24", "GP17"],
        "cols": ["GP25", "GP23", "GP7", "GP0", "GP15", "GP14", "GP13", "GP12", "GP11", "GP10", "GP6", "GP5", "GP4", "GP3", "GP2", "GP1"]
    },
+    "ws2812": {
+        "pin": "GP21",
+        "driver": "vendor"
+    },
        "rgblight": {
-        "pin": "GP21",
        "led_count": 16,
        "hue_steps": 8,
        "saturation_steps": 8,
diff --git a/keyboards/lxxt/rules.mk b/keyboards/lxxt/rules.mk
index 7fbf8d36ab..5af1ba8536 100644
--- a/keyboards/lxxt/rules.mk
+++ b/keyboards/lxxt/rules.mk
@@ -1,3 +1 @@
 ENCODER_ENABLE = yes
-WS2812_DRIVER = vendor
diff --git a/keyboards/marksard/rhymestone/rev1/info.json b/keyboards/marksard/rhymestone/rev1/info.json
index 6bb2d54887..07135b5be0 100644
--- a/keyboards/marksard/rhymestone/rev1/info.json
+++ b/keyboards/marksard/rhymestone/rev1/info.json
@@ -8,6 +8,9 @@
        "pid": "0xDFA1",
        "device_version": "0.2.0"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["D4", "C6", "D7", "E6", "B4"],
        "rows": ["F4", "F5", "F6", "F7"]
diff --git a/keyboards/marksard/rhymestone/rules.mk b/keyboards/marksard/rhymestone/rules.mk
index affdbd6f11..6f15328b5a 100644
--- a/keyboards/marksard/rhymestone/rules.mk
+++ b/keyboards/marksard/rhymestone/rules.mk
@@ -12,6 +12,5 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 SPLIT_KEYBOARD = yes
 RGB_MATRIX_ENABLE = no
-RGB_MATRIX_DRIVER = WS2812
 DEFAULT_FOLDER = marksard/rhymestone/rev1
diff --git a/keyboards/massdrop/alt/info.json b/keyboards/massdrop/alt/info.json
index 63efddde0e..90de8c6904 100644
--- a/keyboards/massdrop/alt/info.json
+++ b/keyboards/massdrop/alt/info.json
@@ -8,6 +8,9 @@
        "pid": "0xEED3",
        "device_version": "1.0.1"
    },
+    "rgb_matrix": {
+        "driver": "custom"
+    },
    "matrix_pins": {
        "cols": ["B04", "B05", "B06", "B07", "B08", "B09", "B10", "B11", "B12", "B13", "A05", "A06", "A07", "A10", "A11"],
        "rows": ["A00", "A01", "A02", "A03", "A04"]
diff --git a/keyboards/massdrop/alt/rules.mk b/keyboards/massdrop/alt/rules.mk
index a302c82d86..e176fa733d 100644
--- a/keyboards/massdrop/alt/rules.mk
+++ b/keyboards/massdrop/alt/rules.mk
@@ -26,4 +26,3 @@ AUTO_SHIFT_ENABLE = no      # Auto Shift
 # Custom RGB matrix handling
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = custom
diff --git a/keyboards/massdrop/ctrl/info.json b/keyboards/massdrop/ctrl/info.json
index 1e21627f28..c9124ac782 100644
--- a/keyboards/massdrop/ctrl/info.json
+++ b/keyboards/massdrop/ctrl/info.json
@@ -8,6 +8,9 @@
        "pid": "0xEED2",
        "device_version": "1.0.1"
    },
+    "rgb_matrix": {
+        "driver": "custom"
+    },
    "matrix_pins": {
        "cols": ["A00", "A01", "A02", "A03", "A04", "A05", "A06", "A07"],
        "rows": ["B04", "B05", "B06", "B07", "B08", "B09", "A10", "A11", "B10", "B11", "B12"]
diff --git a/keyboards/massdrop/ctrl/rules.mk b/keyboards/massdrop/ctrl/rules.mk
index a302c82d86..e176fa733d 100644
--- a/keyboards/massdrop/ctrl/rules.mk
+++ b/keyboards/massdrop/ctrl/rules.mk
@@ -26,4 +26,3 @@ AUTO_SHIFT_ENABLE = no      # Auto Shift
 # Custom RGB matrix handling
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = custom
diff --git a/keyboards/matrix/noah/info.json b/keyboards/matrix/noah/info.json
index 232ea0a9ca..33dedc6bce 100644
--- a/keyboards/matrix/noah/info.json
+++ b/keyboards/matrix/noah/info.json
@@ -11,6 +11,9 @@
  "ws2812": {
    "pin": "B1"
  },
+  "rgb_matrix": {
+    "driver": "IS31FL3731"
+  },
  "community_layouts": ["65_iso_blocker"],
  "layouts": {
    "LAYOUT_default": {
diff --git a/keyboards/matrix/noah/rules.mk b/keyboards/matrix/noah/rules.mk
index e4ce6d5243..55ea2f42b0 100644
--- a/keyboards/matrix/noah/rules.mk
+++ b/keyboards/matrix/noah/rules.mk
@@ -25,7 +25,6 @@ NKRO_ENABLE = no            # Enable N-Key Rollover
 NO_USB_STARTUP_CHECK = yes      # Disable initialization only when usb is plugged in
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3731
 RGBLIGHT_ENABLE = yes
 RGBLIGHT_CUSTOM_DRIVER = yes
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev1/info.json b/keyboards/mechlovin/adelais/rgb_led/rev1/info.json
index 249d85c084..816b9414c1 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev1/info.json
+++ b/keyboards/mechlovin/adelais/rgb_led/rev1/info.json
@@ -3,6 +3,9 @@
    "usb": {
        "pid": "0xAEC1"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B12", "B11", "B10", "B8", "B4", "B5", "B3", "C14", "A15"],
        "rows": ["B1", "A0", "C13", "A1", "A2"]
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev1/rules.mk b/keyboards/mechlovin/adelais/rgb_led/rev1/rules.mk
index 9be57067bb..aad92997d0 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev1/rules.mk
+++ b/keyboards/mechlovin/adelais/rgb_led/rev1/rules.mk
@@ -1,2 +1 @@
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/info.json b/keyboards/mechlovin/adelais/rgb_led/rev2/info.json
index 2d71c2b5f9..4ac693f894 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev2/info.json
+++ b/keyboards/mechlovin/adelais/rgb_led/rev2/info.json
@@ -3,6 +3,9 @@
    "usb": {
        "pid": "0xAEC2"
    },
+    "rgb_matrix": {
+        "driver": "IS31FL3731"
+    },
    "matrix_pins": {
        "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B12", "B11", "B10", "B8", "B4", "B5", "B3", "C14", "A7"],
        "rows": ["B1", "A0", "C13", "A1", "A2"]
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/rules.mk b/keyboards/mechlovin/adelais/rgb_led/rev2/rules.mk
index b52c4f9db3..e79b2862e6 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev2/rules.mk
+++ b/keyboards/mechlovin/adelais/rgb_led/rev2/rules.mk
@@ -1,4 +1,3 @@
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3731
 RGBLIGHT_ENABLE = yes
 ENCODER_ENABLE = yes
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/info.json b/keyboards/mechlovin/adelais/rgb_led/rev3/info.json
index 9639ad3c1c..d1775ccb83 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev3/info.json
+++ b/keyboards/mechlovin/adelais/rgb_led/rev3/info.json
@@ -3,6 +3,9 @@
    "usb": {
        "pid": "0xAEC3"
    },
+    "rgb_matrix": {
+        "driver": "IS31FL3741"
+    },
    "matrix_pins": {
        "cols": ["B10", "B11", "B2", "B1", "B0", "A6", "A5", "A10", "A9", "A15", "B3", "B4", "B5", "B8", "B9"],
        "rows": ["A4", "A3", "C13", "A1", "A2"]
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/rules.mk b/keyboards/mechlovin/adelais/rgb_led/rev3/rules.mk
index 188d06aee1..5664ce6844 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev3/rules.mk
+++ b/keyboards/mechlovin/adelais/rgb_led/rev3/rules.mk
@@ -2,7 +2,6 @@
 #   change yes to no to disable
 #
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3741
 RGBLIGHT_ENABLE = yes
 ENCODER_ENABLE = yes
 CONSOLE_ENABLE = no        # Console for debug
diff --git a/keyboards/mechlovin/delphine/rgb_led/info.json b/keyboards/mechlovin/delphine/rgb_led/info.json
index 0255aae44a..3b9fb036e9 100644
--- a/keyboards/mechlovin/delphine/rgb_led/info.json
+++ b/keyboards/mechlovin/delphine/rgb_led/info.json
@@ -5,5 +5,8 @@
    },
    "ws2812": {
        "pin": "E2"
+    },
+    "rgb_matrix": {
+        "driver": "IS31FL3731"
    }
 }
diff --git a/keyboards/mechlovin/delphine/rgb_led/rules.mk b/keyboards/mechlovin/delphine/rgb_led/rules.mk
index 204fb1241b..5c624bc68f 100644
--- a/keyboards/mechlovin/delphine/rgb_led/rules.mk
+++ b/keyboards/mechlovin/delphine/rgb_led/rules.mk
@@ -1,3 +1,2 @@
 RGBLIGHT_ENABLE = no               # Enable keyboard RGB underglow
 RGB_MATRIX_ENABLE = yes            # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3731
diff --git a/keyboards/mechlovin/hannah60rgb/rev1/info.json b/keyboards/mechlovin/hannah60rgb/rev1/info.json
index 6d5223a32a..af4db50699 100644
--- a/keyboards/mechlovin/hannah60rgb/rev1/info.json
+++ b/keyboards/mechlovin/hannah60rgb/rev1/info.json
@@ -11,6 +11,9 @@
    "ws2812": {
        "pin": "A15"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A0", "C15", "B4", "B5", "B3", "C13", "C14"],
        "rows": ["A4", "A5", "A3", "A2", "A1"]
diff --git a/keyboards/mechlovin/hannah60rgb/rev1/rules.mk b/keyboards/mechlovin/hannah60rgb/rev1/rules.mk
index 9be57067bb..aad92997d0 100644
--- a/keyboards/mechlovin/hannah60rgb/rev1/rules.mk
+++ b/keyboards/mechlovin/hannah60rgb/rev1/rules.mk
@@ -1,2 +1 @@
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/mechlovin/hannah60rgb/rev2/info.json b/keyboards/mechlovin/hannah60rgb/rev2/info.json
index 2074fceb8b..c03bb99161 100644
--- a/keyboards/mechlovin/hannah60rgb/rev2/info.json
+++ b/keyboards/mechlovin/hannah60rgb/rev2/info.json
@@ -11,6 +11,9 @@
    "ws2812": {
        "pin": "A15"
    },
+    "rgb_matrix": {
+        "driver": "IS31FL3731"
+    },
    "matrix_pins": {
        "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A0", "C15", "B4", "B5", "B3", "C13", "C14"],
        "rows": ["A4", "A5", "A3", "A2", "A1"]
diff --git a/keyboards/mechlovin/hannah60rgb/rev2/rules.mk b/keyboards/mechlovin/hannah60rgb/rev2/rules.mk
index fcd42ec58e..e1f93c7525 100644
--- a/keyboards/mechlovin/hannah60rgb/rev2/rules.mk
+++ b/keyboards/mechlovin/hannah60rgb/rev2/rules.mk
@@ -1,3 +1,2 @@
 RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3731
diff --git a/keyboards/mechlovin/infinity87/rgb_rev1/info.json b/keyboards/mechlovin/infinity87/rgb_rev1/info.json
index 332606561c..097fc6a820 100644
--- a/keyboards/mechlovin/infinity87/rgb_rev1/info.json
+++ b/keyboards/mechlovin/infinity87/rgb_rev1/info.json
@@ -8,6 +8,9 @@
        "pid": "0x8710",
        "device_version": "0.0.1"
    },
+    "rgb_matrix": {
+        "driver": "IS31FL3741"
+    },
    "matrix_pins": {
        "cols": ["B12", "B13", "B14", "B15", "A8", "A9", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A2", "A1", "A0"],
        "rows": ["A10", "A13", "A14", "C13", "A4", "A3"]
diff --git a/keyboards/mechlovin/infinity87/rgb_rev1/rules.mk b/keyboards/mechlovin/infinity87/rgb_rev1/rules.mk
index 5a28c2e1c2..e408bde91c 100644
--- a/keyboards/mechlovin/infinity87/rgb_rev1/rules.mk
+++ b/keyboards/mechlovin/infinity87/rgb_rev1/rules.mk
@@ -1,2 +1 @@
 RGB_MATRIX_ENABLE = yes        # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3741
diff --git a/keyboards/mechlovin/infinity875/info.json b/keyboards/mechlovin/infinity875/info.json
index d85cccbe36..fcec3c2afa 100644
--- a/keyboards/mechlovin/infinity875/info.json
+++ b/keyboards/mechlovin/infinity875/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0875",
        "device_version": "0.0.1"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "indicators": {
        "caps_lock": "D6",
        "scroll_lock": "B4"
diff --git a/keyboards/mechlovin/infinity875/rules.mk b/keyboards/mechlovin/infinity875/rules.mk
index 202f5f759b..33f549f3ae 100644
--- a/keyboards/mechlovin/infinity875/rules.mk
+++ b/keyboards/mechlovin/infinity875/rules.mk
@@ -12,6 +12,5 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 CUSTOM_MATRIX = lite
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 SRC += matrix.c
diff --git a/keyboards/mechlovin/olly/octagon/info.json b/keyboards/mechlovin/olly/octagon/info.json
index 0e1054a1fb..712b3096f4 100644
--- a/keyboards/mechlovin/olly/octagon/info.json
+++ b/keyboards/mechlovin/olly/octagon/info.json
@@ -11,6 +11,9 @@
    "ws2812": {
        "pin": "A7"
    },
+    "led_matrix": {
+        "driver": "IS31FL3731"
+    },
    "matrix_pins": {
        "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B2", "B1", "A15", "B3", "B9", "B8", "B7", "B6", "B5", "B4"],
        "rows": ["B0", "B12", "A6", "A5", "A4", "A3"]
diff --git a/keyboards/mechlovin/olly/octagon/rules.mk b/keyboards/mechlovin/olly/octagon/rules.mk
index 25096b03d7..97303c7e2f 100644
--- a/keyboards/mechlovin/olly/octagon/rules.mk
+++ b/keyboards/mechlovin/olly/octagon/rules.mk
@@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 LED_MATRIX_ENABLE = yes
-LED_MATRIX_DRIVER = IS31FL3731
 RGBLIGHT_ENABLE = yes
 \ No newline at end of file
diff --git a/keyboards/mechlovin/zed65/mono_led/info.json b/keyboards/mechlovin/zed65/mono_led/info.json
index e0debf3cc5..25dc91a8f9 100644
--- a/keyboards/mechlovin/zed65/mono_led/info.json
+++ b/keyboards/mechlovin/zed65/mono_led/info.json
@@ -11,6 +11,9 @@
    "ws2812": {
        "pin": "A7"
    },
+    "led_matrix": {
+        "driver": "IS31FL3731"
+    },
    "matrix_pins": {
        "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B2", "B1", "A15", "B3", "B9", "B8", "B7", "B6", "B5", "B4"],
        "rows": ["B12", "A6", "A5", "A4", "A3"]
diff --git a/keyboards/mechlovin/zed65/mono_led/rules.mk b/keyboards/mechlovin/zed65/mono_led/rules.mk
index 78624e6fd3..55d38a7b91 100644
--- a/keyboards/mechlovin/zed65/mono_led/rules.mk
+++ b/keyboards/mechlovin/zed65/mono_led/rules.mk
@@ -1,5 +1,4 @@
 NKRO_ENABLE = yes            # Enable N-Key Rollover
 LED_MATRIX_ENABLE = yes
-LED_MATRIX_DRIVER = IS31FL3731
 RGBLIGHT_ENABLE = yes
 \ No newline at end of file
diff --git a/keyboards/melgeek/mach80/rev1/info.json b/keyboards/melgeek/mach80/rev1/info.json
index af9f7c2669..3a1a27847d 100644
--- a/keyboards/melgeek/mach80/rev1/info.json
+++ b/keyboards/melgeek/mach80/rev1/info.json
@@ -1,4 +1,7 @@
 {
+    "rgb_matrix": {
+        "driver": "IS31FL3741"
+    },
    "matrix_pins": {
        "cols": ["B0", "B1", "B2", "B3", "D2", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "D3"],
        "rows": ["F0", "F1", "F4", "F5", "F6", "E6"]
diff --git a/keyboards/melgeek/mach80/rev1/rules.mk b/keyboards/melgeek/mach80/rev1/rules.mk
index c4fed6e6e4..e0955f157a 100755
--- a/keyboards/melgeek/mach80/rev1/rules.mk
+++ b/keyboards/melgeek/mach80/rev1/rules.mk
@@ -10,6 +10,5 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
 RGB_MATRIX_ENABLE = yes        # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3741
 LTO_ENABLE = yes
diff --git a/keyboards/melgeek/mach80/rev2/info.json b/keyboards/melgeek/mach80/rev2/info.json
index af9f7c2669..3a1a27847d 100644
--- a/keyboards/melgeek/mach80/rev2/info.json
+++ b/keyboards/melgeek/mach80/rev2/info.json
@@ -1,4 +1,7 @@
 {
+    "rgb_matrix": {
+        "driver": "IS31FL3741"
+    },
    "matrix_pins": {
        "cols": ["B0", "B1", "B2", "B3", "D2", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "D3"],
        "rows": ["F0", "F1", "F4", "F5", "F6", "E6"]
diff --git a/keyboards/melgeek/mach80/rev2/rules.mk b/keyboards/melgeek/mach80/rev2/rules.mk
index c4fed6e6e4..e0955f157a 100755
--- a/keyboards/melgeek/mach80/rev2/rules.mk
+++ b/keyboards/melgeek/mach80/rev2/rules.mk
@@ -10,6 +10,5 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
 RGB_MATRIX_ENABLE = yes        # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3741
 LTO_ENABLE = yes
diff --git a/keyboards/melgeek/mj61/rev1/info.json b/keyboards/melgeek/mj61/rev1/info.json
index 67a4a004d6..c146adef04 100644
--- a/keyboards/melgeek/mj61/rev1/info.json
+++ b/keyboards/melgeek/mj61/rev1/info.json
@@ -1,4 +1,7 @@
 {
+    "rgb_matrix": {
+        "driver": "IS31FL3741"
+    },
    "matrix_pins": {
        "cols": ["B15", "A8", "A10", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"],
        "rows": ["B12", "B11", "B10", "B1", "A3"]
diff --git a/keyboards/melgeek/mj61/rev1/rules.mk b/keyboards/melgeek/mj61/rev1/rules.mk
index 186f1d00bf..30e3240a94 100644
--- a/keyboards/melgeek/mj61/rev1/rules.mk
+++ b/keyboards/melgeek/mj61/rev1/rules.mk
@@ -10,5 +10,4 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
 RGB_MATRIX_ENABLE = yes        # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3741
 NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
diff --git a/keyboards/melgeek/mj61/rev2/info.json b/keyboards/melgeek/mj61/rev2/info.json
index 62c5827117..330137a02a 100644
--- a/keyboards/melgeek/mj61/rev2/info.json
+++ b/keyboards/melgeek/mj61/rev2/info.json
@@ -1,4 +1,7 @@
 {
+    "rgb_matrix": {
+        "driver": "IS31FL3741"
+    },
    "matrix_pins": {
        "cols": ["B15", "A8", "B13", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"],
        "rows": ["B12", "B11", "B10", "B1", "A3"]
diff --git a/keyboards/melgeek/mj61/rev2/rules.mk b/keyboards/melgeek/mj61/rev2/rules.mk
index 186f1d00bf..30e3240a94 100644
--- a/keyboards/melgeek/mj61/rev2/rules.mk
+++ b/keyboards/melgeek/mj61/rev2/rules.mk
@@ -10,5 +10,4 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
 RGB_MATRIX_ENABLE = yes        # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3741
 NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
diff --git a/keyboards/melgeek/mj63/rev1/info.json b/keyboards/melgeek/mj63/rev1/info.json
index 67a4a004d6..c146adef04 100644
--- a/keyboards/melgeek/mj63/rev1/info.json
+++ b/keyboards/melgeek/mj63/rev1/info.json
@@ -1,4 +1,7 @@
 {
+    "rgb_matrix": {
+        "driver": "IS31FL3741"
+    },
    "matrix_pins": {
        "cols": ["B15", "A8", "A10", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"],
        "rows": ["B12", "B11", "B10", "B1", "A3"]
diff --git a/keyboards/melgeek/mj63/rev1/rules.mk b/keyboards/melgeek/mj63/rev1/rules.mk
index 186f1d00bf..30e3240a94 100644
--- a/keyboards/melgeek/mj63/rev1/rules.mk
+++ b/keyboards/melgeek/mj63/rev1/rules.mk
@@ -10,5 +10,4 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
 RGB_MATRIX_ENABLE = yes        # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3741
 NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
diff --git a/keyboards/melgeek/mj63/rev2/info.json b/keyboards/melgeek/mj63/rev2/info.json
index 62c5827117..330137a02a 100644
--- a/keyboards/melgeek/mj63/rev2/info.json
+++ b/keyboards/melgeek/mj63/rev2/info.json
@@ -1,4 +1,7 @@
 {
+    "rgb_matrix": {
+        "driver": "IS31FL3741"
+    },
    "matrix_pins": {
        "cols": ["B15", "A8", "B13", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"],
        "rows": ["B12", "B11", "B10", "B1", "A3"]
diff --git a/keyboards/melgeek/mj63/rev2/rules.mk b/keyboards/melgeek/mj63/rev2/rules.mk
index 186f1d00bf..30e3240a94 100644
--- a/keyboards/melgeek/mj63/rev2/rules.mk
+++ b/keyboards/melgeek/mj63/rev2/rules.mk
@@ -10,5 +10,4 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
 RGB_MATRIX_ENABLE = yes        # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3741
 NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
diff --git a/keyboards/melgeek/mj64/rev1/info.json b/keyboards/melgeek/mj64/rev1/info.json
index 67a4a004d6..c146adef04 100644
--- a/keyboards/melgeek/mj64/rev1/info.json
+++ b/keyboards/melgeek/mj64/rev1/info.json
@@ -1,4 +1,7 @@
 {
+    "rgb_matrix": {
+        "driver": "IS31FL3741"
+    },
    "matrix_pins": {
        "cols": ["B15", "A8", "A10", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"],
        "rows": ["B12", "B11", "B10", "B1", "A3"]
diff --git a/keyboards/melgeek/mj64/rev1/rules.mk b/keyboards/melgeek/mj64/rev1/rules.mk
index 186f1d00bf..30e3240a94 100644
--- a/keyboards/melgeek/mj64/rev1/rules.mk
+++ b/keyboards/melgeek/mj64/rev1/rules.mk
@@ -10,5 +10,4 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
 RGB_MATRIX_ENABLE = yes        # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3741
 NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
diff --git a/keyboards/melgeek/mj64/rev2/info.json b/keyboards/melgeek/mj64/rev2/info.json
index 67a4a004d6..c146adef04 100644
--- a/keyboards/melgeek/mj64/rev2/info.json
+++ b/keyboards/melgeek/mj64/rev2/info.json
@@ -1,4 +1,7 @@
 {
+    "rgb_matrix": {
+        "driver": "IS31FL3741"
+    },
    "matrix_pins": {
        "cols": ["B15", "A8", "A10", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"],
        "rows": ["B12", "B11", "B10", "B1", "A3"]
diff --git a/keyboards/melgeek/mj64/rev2/rules.mk b/keyboards/melgeek/mj64/rev2/rules.mk
index 186f1d00bf..30e3240a94 100644
--- a/keyboards/melgeek/mj64/rev2/rules.mk
+++ b/keyboards/melgeek/mj64/rev2/rules.mk
@@ -10,5 +10,4 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
 RGB_MATRIX_ENABLE = yes        # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3741
 NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
diff --git a/keyboards/melgeek/mj64/rev3/info.json b/keyboards/melgeek/mj64/rev3/info.json
index 62c5827117..330137a02a 100644
--- a/keyboards/melgeek/mj64/rev3/info.json
+++ b/keyboards/melgeek/mj64/rev3/info.json
@@ -1,4 +1,7 @@
 {
+    "rgb_matrix": {
+        "driver": "IS31FL3741"
+    },
    "matrix_pins": {
        "cols": ["B15", "A8", "B13", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"],
        "rows": ["B12", "B11", "B10", "B1", "A3"]
diff --git a/keyboards/melgeek/mj64/rev3/rules.mk b/keyboards/melgeek/mj64/rev3/rules.mk
index 186f1d00bf..30e3240a94 100644
--- a/keyboards/melgeek/mj64/rev3/rules.mk
+++ b/keyboards/melgeek/mj64/rev3/rules.mk
@@ -10,5 +10,4 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
 RGB_MATRIX_ENABLE = yes        # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3741
 NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
diff --git a/keyboards/melgeek/mj65/info.json b/keyboards/melgeek/mj65/info.json
index 2f9d6c6956..71fce4cf7a 100644
--- a/keyboards/melgeek/mj65/info.json
+++ b/keyboards/melgeek/mj65/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0065",
        "device_version": "0.0.1"
    },
+    "rgb_matrix": {
+        "driver": "IS31FL3741"
+    },
    "matrix_pins": {
        "cols": ["B15", "A8", "B13", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1", "B14"],
        "rows": ["B12", "B11", "B10", "B1", "A3"]
diff --git a/keyboards/melgeek/mj65/rev3/rules.mk b/keyboards/melgeek/mj65/rev3/rules.mk
index 51ff8073d2..b3984d93c0 100644
--- a/keyboards/melgeek/mj65/rev3/rules.mk
+++ b/keyboards/melgeek/mj65/rev3/rules.mk
@@ -10,7 +10,6 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
 RGB_MATRIX_ENABLE = yes        # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3741
 NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
 RGB_MATRIX_SUPPORTED = yes
 RGBLIGHT_SUPPORTED   = no
diff --git a/keyboards/melgeek/mojo68/info.json b/keyboards/melgeek/mojo68/info.json
index e765a8ee40..c4fe0a33db 100755
--- a/keyboards/melgeek/mojo68/info.json
+++ b/keyboards/melgeek/mojo68/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0068",
        "device_version": "0.0.1"
    },
+    "rgb_matrix": {
+        "driver": "IS31FL3741"
+    },
    "matrix_pins": {
        "cols": ["B0", "B1", "B2", "B3", "D2", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7"],
        "rows": ["F0", "F1", "F4", "F5", "F6"]
diff --git a/keyboards/melgeek/mojo68/rev1/rules.mk b/keyboards/melgeek/mojo68/rev1/rules.mk
index 6180ab52a4..c66b1abcd4 100755
--- a/keyboards/melgeek/mojo68/rev1/rules.mk
+++ b/keyboards/melgeek/mojo68/rev1/rules.mk
@@ -10,4 +10,3 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
 RGB_MATRIX_ENABLE = yes        # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3741
diff --git a/keyboards/melgeek/mojo75/info.json b/keyboards/melgeek/mojo75/info.json
index f15fa79188..7d7c6db3ff 100644
--- a/keyboards/melgeek/mojo75/info.json
+++ b/keyboards/melgeek/mojo75/info.json
@@ -8,6 +8,9 @@
        "pid": "0x7075",
        "device_version": "0.0.1"
    },
+    "rgb_matrix": {
+        "driver": "IS31FL3741"
+    },
    "matrix_pins": {
        "cols": ["B12", "B13", "B14", "B15", "A8", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"],
        "rows": ["B11", "B10", "B1", "B0", "A7", "A6"]
diff --git a/keyboards/melgeek/mojo75/rev1/rules.mk b/keyboards/melgeek/mojo75/rev1/rules.mk
index 186f1d00bf..30e3240a94 100644
--- a/keyboards/melgeek/mojo75/rev1/rules.mk
+++ b/keyboards/melgeek/mojo75/rev1/rules.mk
@@ -10,5 +10,4 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
 RGB_MATRIX_ENABLE = yes        # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3741
 NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
diff --git a/keyboards/melgeek/tegic/info.json b/keyboards/melgeek/tegic/info.json
index b0626ee421..68850559ba 100644
--- a/keyboards/melgeek/tegic/info.json
+++ b/keyboards/melgeek/tegic/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0081",
        "device_version": "0.0.1"
    },
+    "rgb_matrix": {
+        "driver": "IS31FL3741"
+    },
    "matrix_pins": {
        "cols": ["B0", "B1", "B2", "B3", "D2", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7"],
        "rows": ["F0", "F1", "F4", "F5", "F6", "D3"]
diff --git a/keyboards/melgeek/tegic/rev1/rules.mk b/keyboards/melgeek/tegic/rev1/rules.mk
index 974cf04cb8..d05853b8b0 100755
--- a/keyboards/melgeek/tegic/rev1/rules.mk
+++ b/keyboards/melgeek/tegic/rev1/rules.mk
@@ -10,7 +10,6 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
 RGB_MATRIX_ENABLE = yes        # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3741
 LTO_ENABLE = yes
diff --git a/keyboards/melgeek/z70ultra/info.json b/keyboards/melgeek/z70ultra/info.json
index 517cd9736e..697d107a4f 100644
--- a/keyboards/melgeek/z70ultra/info.json
+++ b/keyboards/melgeek/z70ultra/info.json
@@ -8,6 +8,9 @@
        "pid": "0x6570",
        "device_version": "0.0.1"
    },
+    "rgb_matrix": {
+        "driver": "IS31FL3741"
+    },
    "matrix_pins": {
        "cols": ["B11", "B10", "B1", "A10", "B5", "B4", "B3", "A15", "A2", "A1", "A0", "C15", "C14", "C13"],
        "rows": ["B12", "B13", "B14", "B15", "A3", "B9"]
diff --git a/keyboards/melgeek/z70ultra/rev1/rules.mk b/keyboards/melgeek/z70ultra/rev1/rules.mk
index 186f1d00bf..30e3240a94 100644
--- a/keyboards/melgeek/z70ultra/rev1/rules.mk
+++ b/keyboards/melgeek/z70ultra/rev1/rules.mk
@@ -10,5 +10,4 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
 RGB_MATRIX_ENABLE = yes        # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3741
 NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
diff --git a/keyboards/miller/gm862/info.json b/keyboards/miller/gm862/info.json
index eb74b083ef..ec09fc96a4 100644
--- a/keyboards/miller/gm862/info.json
+++ b/keyboards/miller/gm862/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0223",
        "device_version": "0.0.1"
    },
+    "rgb_matrix": {
+        "driver": "IS31FL3733"
+    },
    "matrix_pins": {
        "cols": ["B5", "B6", "C6", "C7", "F7", "F6", "B0", "B1", "B2", "B3", "B7", "D2", "D3", "D5"],
        "rows": ["F0", "F1", "F4", "F5", "B4"]
diff --git a/keyboards/miller/gm862/rules.mk b/keyboards/miller/gm862/rules.mk
index c1fb17d02d..9f3770f0f4 100644
--- a/keyboards/miller/gm862/rules.mk
+++ b/keyboards/miller/gm862/rules.mk
@@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
 AUDIO_ENABLE = no              # Audio output
 RGB_MATRIX_ENABLE = yes        # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3733
 NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
diff --git a/keyboards/ml/gas75/info.json b/keyboards/ml/gas75/info.json
index 4f9f61ed46..d2a09cf7f7 100644
--- a/keyboards/ml/gas75/info.json
+++ b/keyboards/ml/gas75/info.json
@@ -8,6 +8,9 @@
        "pid": "0x6060",
        "device_version": "0.0.1"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["D1", "D2", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "E6", "B0", "B1", "B2", "B3"],
        "rows": ["D3", "D5", "D4", "D7", "D6", "B4"]
diff --git a/keyboards/ml/gas75/rules.mk b/keyboards/ml/gas75/rules.mk
index 031ace3d41..27645344ae 100644
--- a/keyboards/ml/gas75/rules.mk
+++ b/keyboards/ml/gas75/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 # RGB Matrix enabled
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 # Encoder enabled
 ENCODER_ENABLE = yes
diff --git a/keyboards/momokai/tap_duo/info.json b/keyboards/momokai/tap_duo/info.json
index 6af5a806f5..843573c6ca 100644
--- a/keyboards/momokai/tap_duo/info.json
+++ b/keyboards/momokai/tap_duo/info.json
@@ -11,6 +11,9 @@
    "ws2812": {
        "pin": "F0"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["E6", "B2", "D1", "D2", "D3"],
        "rows": ["E0"]
diff --git a/keyboards/momokai/tap_duo/rules.mk b/keyboards/momokai/tap_duo/rules.mk
index 0459a2ad6b..bb8155a9b8 100644
--- a/keyboards/momokai/tap_duo/rules.mk
+++ b/keyboards/momokai/tap_duo/rules.mk
@@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 LTO_ENABLE = yes
diff --git a/keyboards/momokai/tap_trio/info.json b/keyboards/momokai/tap_trio/info.json
index f0ee7646e3..dbe5cb6bc7 100644
--- a/keyboards/momokai/tap_trio/info.json
+++ b/keyboards/momokai/tap_trio/info.json
@@ -11,6 +11,9 @@
    "ws2812": {
        "pin": "F0"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["E6", "B2", "B7", "D1", "D2", "D3"],
        "rows": ["E0"]
diff --git a/keyboards/momokai/tap_trio/rules.mk b/keyboards/momokai/tap_trio/rules.mk
index 0459a2ad6b..bb8155a9b8 100644
--- a/keyboards/momokai/tap_trio/rules.mk
+++ b/keyboards/momokai/tap_trio/rules.mk
@@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 LTO_ENABLE = yes
diff --git a/keyboards/monstargear/xo87/rgb/info.json b/keyboards/monstargear/xo87/rgb/info.json
index fc81a7b7ef..1ae406ac32 100644
--- a/keyboards/monstargear/xo87/rgb/info.json
+++ b/keyboards/monstargear/xo87/rgb/info.json
@@ -11,6 +11,9 @@
  "ws2812": {
    "pin": "D7"
  },
+  "rgb_matrix": {
+    "driver": "WS2812"
+  },
  "matrix_pins": {
    "cols": ["C5", "C3", "C1", "E1", "D6", "D2", "B7", "B3", "F6", "F7", "F3", "A5", "A1", "E2", "C7", "A6"],
    "rows": ["E6", "E7", "E3", "B0", "B1", "A2"]
diff --git a/keyboards/monstargear/xo87/rgb/rules.mk b/keyboards/monstargear/xo87/rgb/rules.mk
index cc8c380fc0..332aa40f38 100644
--- a/keyboards/monstargear/xo87/rgb/rules.mk
+++ b/keyboards/monstargear/xo87/rgb/rules.mk
@@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 RAW_ENABLE = no
diff --git a/keyboards/moonlander/info.json b/keyboards/moonlander/info.json
index 3492713a6a..c8b0133f47 100644
--- a/keyboards/moonlander/info.json
+++ b/keyboards/moonlander/info.json
@@ -8,6 +8,9 @@
        "pid": "0x1969",
        "device_version": "0.0.1"
    },
+    "rgb_matrix": {
+        "driver": "IS31FL3731"
+    },
    "processor": "STM32F303",
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/moonlander/rules.mk b/keyboards/moonlander/rules.mk
index 825afb6ba1..12987afdac 100644
--- a/keyboards/moonlander/rules.mk
+++ b/keyboards/moonlander/rules.mk
@@ -14,7 +14,6 @@ AUDIO_DRIVER = dac_additive
 CUSTOM_MATRIX = lite
 SWAP_HANDS_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3731
 EEPROM_DRIVER = i2c
 #project specific files
diff --git a/keyboards/mss_studio/m63_rgb/info.json b/keyboards/mss_studio/m63_rgb/info.json
index 2585dabccd..0907269c9e 100644
--- a/keyboards/mss_studio/m63_rgb/info.json
+++ b/keyboards/mss_studio/m63_rgb/info.json
@@ -11,6 +11,9 @@
    "ws2812": {
        "pin": "B15"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["B0", "B1", "B2", "B10", "A7", "A6", "A5", "A4", "B5", "B6", "A1", "B7", "B8", "B9"],
        "rows": ["B3", "B4", "A0", "A2", "A3"]
diff --git a/keyboards/mss_studio/m63_rgb/rules.mk b/keyboards/mss_studio/m63_rgb/rules.mk
index e3a981b634..138bf78056 100644
--- a/keyboards/mss_studio/m63_rgb/rules.mk
+++ b/keyboards/mss_studio/m63_rgb/rules.mk
@@ -13,4 +13,3 @@ AUDIO_ENABLE = no           # Audio output
 # RGB Matrix enabled
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/mss_studio/m64_rgb/info.json b/keyboards/mss_studio/m64_rgb/info.json
index c597e9d845..0680794c85 100644
--- a/keyboards/mss_studio/m64_rgb/info.json
+++ b/keyboards/mss_studio/m64_rgb/info.json
@@ -11,6 +11,9 @@
    "ws2812": {
        "pin": "B15"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["B0", "B1", "B2", "B10", "A7", "A6", "A5", "A4", "B5", "B6", "A1", "B7", "B8", "B9"],
        "rows": ["B3", "B4", "A0", "A2", "A3"]
diff --git a/keyboards/mss_studio/m64_rgb/rules.mk b/keyboards/mss_studio/m64_rgb/rules.mk
index e3a981b634..138bf78056 100644
--- a/keyboards/mss_studio/m64_rgb/rules.mk
+++ b/keyboards/mss_studio/m64_rgb/rules.mk
@@ -13,4 +13,3 @@ AUDIO_ENABLE = no           # Audio output
 # RGB Matrix enabled
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/mt/mt64rgb/info.json b/keyboards/mt/mt64rgb/info.json
index 46588f96c6..25f1c7082f 100644
--- a/keyboards/mt/mt64rgb/info.json
+++ b/keyboards/mt/mt64rgb/info.json
@@ -11,6 +11,9 @@
    "ws2812": {
        "pin": "B0"
    },
+    "rgb_matrix": {
+        "driver": "IS31FL3733"
+    },
    "matrix_pins": {
        "cols": ["B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "B1", "B2", "B3", "B7"],
        "rows": ["D7", "D6", "D5", "D3", "D2"]
diff --git a/keyboards/mt/mt64rgb/rules.mk b/keyboards/mt/mt64rgb/rules.mk
index 56bc9f5752..f72e92e8a8 100644
--- a/keyboards/mt/mt64rgb/rules.mk
+++ b/keyboards/mt/mt64rgb/rules.mk
@@ -10,7 +10,6 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 RGB_MATRIX_ENABLE = yes     # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3733
 AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/mt/mt84/info.json b/keyboards/mt/mt84/info.json
index c171ba99c4..0880102dd1 100644
--- a/keyboards/mt/mt84/info.json
+++ b/keyboards/mt/mt84/info.json
@@ -11,6 +11,9 @@
    "ws2812": {
        "pin": "B0"
    },
+    "rgb_matrix": {
+        "driver": "IS31FL3737"
+    },
    "matrix_pins": {
        "cols": ["B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "B1", "B2", "B3", "B7", "E6"],
        "rows": ["D7", "D6", "D5", "D3", "D2", "D4"]
diff --git a/keyboards/mt/mt84/rules.mk b/keyboards/mt/mt84/rules.mk
index fc03a2e534..03f1dd8986 100644
--- a/keyboards/mt/mt84/rules.mk
+++ b/keyboards/mt/mt84/rules.mk
@@ -9,7 +9,6 @@ COMMAND_ENABLE = no         # Commands for debug and configuration
 NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGB_MATRIX_ENABLE = yes     # Use RGB Matrix
-RGB_MATRIX_DRIVER = IS31FL3737
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 LTO_ENABLE = yes
diff --git a/keyboards/mwstudio/mw65_rgb/info.json b/keyboards/mwstudio/mw65_rgb/info.json
index 79dc8c0c7e..f4c1a50672 100644
--- a/keyboards/mwstudio/mw65_rgb/info.json
+++ b/keyboards/mwstudio/mw65_rgb/info.json
@@ -11,6 +11,9 @@
    "ws2812": {
        "pin": "B3"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["C6", "B6", "B5", "B4", "D7", "D6", "D4", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "E6"],
        "rows": ["D0", "D1", "D2", "D3", "B7"]
diff --git a/keyboards/mwstudio/mw65_rgb/rules.mk b/keyboards/mwstudio/mw65_rgb/rules.mk
index b7a0f357da..faabb5cad7 100644
--- a/keyboards/mwstudio/mw65_rgb/rules.mk
+++ b/keyboards/mwstudio/mw65_rgb/rules.mk
@@ -12,6 +12,5 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 ENCODER_ENABLE = yes
diff --git a/keyboards/mwstudio/mw75/info.json b/keyboards/mwstudio/mw75/info.json
index e15905a629..aaac84fcb1 100644
--- a/keyboards/mwstudio/mw75/info.json
+++ b/keyboards/mwstudio/mw75/info.json
@@ -8,6 +8,9 @@
        "pid": "0x7501",
        "device_version": "0.0.1"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "E6"],
        "rows": ["B7", "D0", "D1", "D2", "D3", "D5", "B0"]
diff --git a/keyboards/mwstudio/mw75/rules.mk b/keyboards/mwstudio/mw75/rules.mk
index 067e1df2ae..041f588c14 100644
--- a/keyboards/mwstudio/mw75/rules.mk
+++ b/keyboards/mwstudio/mw75/rules.mk
@@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 ENCODER_ENABLE = yes
diff --git a/keyboards/mwstudio/mw75r2/info.json b/keyboards/mwstudio/mw75r2/info.json
index b92412ae02..c66145d731 100644
--- a/keyboards/mwstudio/mw75r2/info.json
+++ b/keyboards/mwstudio/mw75r2/info.json
@@ -11,6 +11,9 @@
    "ws2812": {
        "pin": "B3"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D4", "D6", "F7", "F6", "E6", "F0", "F1", "F4", "F5"],
        "rows": ["B7", "D0", "D1", "D2", "D3", "D5"]
diff --git a/keyboards/mwstudio/mw75r2/rules.mk b/keyboards/mwstudio/mw75r2/rules.mk
index 067e1df2ae..041f588c14 100644
--- a/keyboards/mwstudio/mw75r2/rules.mk
+++ b/keyboards/mwstudio/mw75r2/rules.mk
@@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 ENCODER_ENABLE = yes
diff --git a/keyboards/nack/info.json b/keyboards/nack/info.json
index 00c319f9bc..827e0fec0e 100644
--- a/keyboards/nack/info.json
+++ b/keyboards/nack/info.json
@@ -12,6 +12,9 @@
        "pin": "B5",
        "driver": "spi"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["A6", "A7", "A8", "A9", "A10", "B0", "B1", "B2", "B6", "B7", "C13", "C14", "C15"],
        "rows": ["A0", "A1", "A2", "A3"]
diff --git a/keyboards/nack/rules.mk b/keyboards/nack/rules.mk
index 19245ea7c7..d2558648dd 100644
--- a/keyboards/nack/rules.mk
+++ b/keyboards/nack/rules.mk
@@ -11,6 +11,5 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = yes          # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 AUDIO_DRIVER = dac_basic        # How to drive the 2 speakers
 UNICODE_ENABLE = yes        # Unicode support
diff --git a/keyboards/ning/tiny_board/tb16_rgb/info.json b/keyboards/ning/tiny_board/tb16_rgb/info.json
index c47cdc9533..08e361c960 100644
--- a/keyboards/ning/tiny_board/tb16_rgb/info.json
+++ b/keyboards/ning/tiny_board/tb16_rgb/info.json
@@ -12,6 +12,9 @@
        "nkro": true,
        "rgb_matrix": true
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["B6", "B1", "B3", "B2"],
        "rows": ["F7", "F6", "F5", "F4"]
diff --git a/keyboards/ning/tiny_board/tb16_rgb/rules.mk b/keyboards/ning/tiny_board/tb16_rgb/rules.mk
index 32afd21635..e69de29bb2 100644
--- a/keyboards/ning/tiny_board/tb16_rgb/rules.mk
+++ b/keyboards/ning/tiny_board/tb16_rgb/rules.mk
@@ -1 +0,0 @@
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/novelkeys/nk20/info.json b/keyboards/novelkeys/nk20/info.json
index 1a2ce39f89..2befadb5d0 100644
--- a/keyboards/novelkeys/nk20/info.json
+++ b/keyboards/novelkeys/nk20/info.json
@@ -12,6 +12,9 @@
        "pin": "A7",
        "driver": "pwm"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["B13", "B14", "B15", "A4"],
        "rows": ["B12", "A5", "A3", "A2", "A1", "A0"]
diff --git a/keyboards/novelkeys/nk20/rules.mk b/keyboards/novelkeys/nk20/rules.mk
index ac9772559a..131bc94a44 100644
--- a/keyboards/novelkeys/nk20/rules.mk
+++ b/keyboards/novelkeys/nk20/rules.mk
@@ -19,4 +19,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes     # Enable Per-key RGB
-RGB_MATRIX_DRIVER = WS2812  # Per-key RGB Drive
diff --git a/keyboards/novelkeys/nk65b/info.json b/keyboards/novelkeys/nk65b/info.json
index 1385cb4eeb..93700e6851 100755
--- a/keyboards/novelkeys/nk65b/info.json
+++ b/keyboards/novelkeys/nk65b/info.json
@@ -12,6 +12,9 @@
        "pin": "B4",
        "driver": "pwm"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["A3", "A4", "A5", "A6", "A7", "B0", "B1", "B2", "B10", "B12", "B13", "B14", "B15", "A8", "A9"],
        "rows": ["A0", "A1", "A2", "B11", "B6"]
diff --git a/keyboards/novelkeys/nk65b/rules.mk b/keyboards/novelkeys/nk65b/rules.mk
index ac9772559a..131bc94a44 100755
--- a/keyboards/novelkeys/nk65b/rules.mk
+++ b/keyboards/novelkeys/nk65b/rules.mk
@@ -19,4 +19,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes     # Enable Per-key RGB
-RGB_MATRIX_DRIVER = WS2812  # Per-key RGB Drive
diff --git a/keyboards/novelkeys/nk87b/info.json b/keyboards/novelkeys/nk87b/info.json
index c00053e27a..02abc5e142 100755
--- a/keyboards/novelkeys/nk87b/info.json
+++ b/keyboards/novelkeys/nk87b/info.json
@@ -12,6 +12,9 @@
        "pin": "B0",
        "driver": "pwm"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["B12", "B13", "B14", "B15", "A8", "A10", "A14", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "A0", "A1"],
        "rows": ["B11", "B10", "B2", "B1", "A9", "A5"]
diff --git a/keyboards/novelkeys/nk87b/rules.mk b/keyboards/novelkeys/nk87b/rules.mk
index ac9772559a..131bc94a44 100644
--- a/keyboards/novelkeys/nk87b/rules.mk
+++ b/keyboards/novelkeys/nk87b/rules.mk
@@ -19,4 +19,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes     # Enable Per-key RGB
-RGB_MATRIX_DRIVER = WS2812  # Per-key RGB Drive
diff --git a/keyboards/nullbitsco/snap/config.h b/keyboards/nullbitsco/snap/config.h
index ae0a5018be..24e9340c0e 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 6567ccde85..ce69b4a559 100644
--- a/keyboards/nullbitsco/snap/info.json
+++ b/keyboards/nullbitsco/snap/info.json
@@ -7,6 +7,9 @@
        "pid": "0x6063",
        "device_version": "0.0.1"
    },
+    "ws2812": {
+        "pin": "B2"
+    },
    "debounce": 10,
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
diff --git a/keyboards/omkbd/runner3680/5x6_5x8/info.json b/keyboards/omkbd/runner3680/5x6_5x8/info.json
index 605bef904a..fa4f30bd7e 100644
--- a/keyboards/omkbd/runner3680/5x6_5x8/info.json
+++ b/keyboards/omkbd/runner3680/5x6_5x8/info.json
@@ -8,6 +8,9 @@
        "pid": "0x5658",
        "device_version": "0.0.5"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
        "rows": ["D4", "C6", "D7", "E6", "B4"]
diff --git a/keyboards/omkbd/runner3680/5x6_5x8/rules.mk b/keyboards/omkbd/runner3680/5x6_5x8/rules.mk
index 32afd21635..e69de29bb2 100644
--- a/keyboards/omkbd/runner3680/5x6_5x8/rules.mk
+++ b/keyboards/omkbd/runner3680/5x6_5x8/rules.mk
@@ -1 +0,0 @@
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/opendeck/32/rev1/info.json b/keyboards/opendeck/32/rev1/info.json
index df4d338fc0..e2491c8ef1 100644
--- a/keyboards/opendeck/32/rev1/info.json
+++ b/keyboards/opendeck/32/rev1/info.json
@@ -3,6 +3,9 @@
        "cols": ["B4", "D7", "D6", "D4", "F7", "F6", "F5", "F4"],
        "rows": ["C7", "C6", "B6", "B5"]
    },
+    "rgb_matrix": {
+        "driver": "IS31FL3731"
+    },
    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
diff --git a/keyboards/opendeck/32/rev1/rules.mk b/keyboards/opendeck/32/rev1/rules.mk
index 15bc9d0a1d..d6a08c8251 100644
--- a/keyboards/opendeck/32/rev1/rules.mk
+++ b/keyboards/opendeck/32/rev1/rules.mk
@@ -14,6 +14,5 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3731
 LTO_ENABLE = yes
diff --git a/keyboards/owlab/voice65/hotswap/info.json b/keyboards/owlab/voice65/hotswap/info.json
index 0c2d43c001..ea365441bd 100644
--- a/keyboards/owlab/voice65/hotswap/info.json
+++ b/keyboards/owlab/voice65/hotswap/info.json
@@ -8,6 +8,9 @@
        "pid": "0x564F",
        "device_version": "0.0.1"
    },
+    "rgb_matrix": {
+        "driver": "IS31FL3741"
+    },
    "matrix_pins": {
        "cols": ["A1", "A2", "A3", "A4", "A5", "A6", "A7", "A8", "A9", "A10", "A15", "B8", "B9", "B12", "B13"],
        "rows": ["B0", "B1", "B2", "B10", "B11"]
diff --git a/keyboards/owlab/voice65/hotswap/rules.mk b/keyboards/owlab/voice65/hotswap/rules.mk
index 3cd81f231c..aa5f475033 100644
--- a/keyboards/owlab/voice65/hotswap/rules.mk
+++ b/keyboards/owlab/voice65/hotswap/rules.mk
@@ -13,4 +13,3 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Rotary encoder
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3741
diff --git a/keyboards/owlab/voice65/soldered/info.json b/keyboards/owlab/voice65/soldered/info.json
index 8b63b265e7..587cdc80fb 100644
--- a/keyboards/owlab/voice65/soldered/info.json
+++ b/keyboards/owlab/voice65/soldered/info.json
@@ -8,6 +8,9 @@
        "pid": "0x5657",
        "device_version": "0.0.1"
    },
+    "rgb_matrix": {
+        "driver": "IS31FL3741"
+    },
    "matrix_pins": {
        "cols": ["A1", "A2", "A3", "A4", "A5", "A6", "A7", "A8", "A9", "A10", "A15", "B8", "B9", "B12", "B13"],
        "rows": ["B0", "B1", "B2", "B10", "B11"]
diff --git a/keyboards/owlab/voice65/soldered/rules.mk b/keyboards/owlab/voice65/soldered/rules.mk
index 3cd81f231c..aa5f475033 100644
--- a/keyboards/owlab/voice65/soldered/rules.mk
+++ b/keyboards/owlab/voice65/soldered/rules.mk
@@ -13,4 +13,3 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Rotary encoder
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3741
diff --git a/keyboards/paprikman/albacore/info.json b/keyboards/paprikman/albacore/info.json
index 211591fc38..8d62d0a247 100644
--- a/keyboards/paprikman/albacore/info.json
+++ b/keyboards/paprikman/albacore/info.json
@@ -8,6 +8,9 @@
        "pid": "0x000A",
        "device_version": "0.0.1"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["C6", "B6", "B5", "B4"],
        "rows": ["D5", "C7"]
diff --git a/keyboards/paprikman/albacore/rules.mk b/keyboards/paprikman/albacore/rules.mk
index c982617812..bfe55f1941 100644
--- a/keyboards/paprikman/albacore/rules.mk
+++ b/keyboards/paprikman/albacore/rules.mk
@@ -12,6 +12,5 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 LTO_ENABLE = yes
diff --git a/keyboards/percent/canoe_gen2/info.json b/keyboards/percent/canoe_gen2/info.json
index 0f64915a2a..8288368389 100644
--- a/keyboards/percent/canoe_gen2/info.json
+++ b/keyboards/percent/canoe_gen2/info.json
@@ -11,6 +11,9 @@
    "ws2812": {
        "pin": "B7"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["B0", "D0", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "F6", "F7"],
        "rows": ["B1", "B3", "B2", "F5", "F4"]
diff --git a/keyboards/percent/canoe_gen2/rules.mk b/keyboards/percent/canoe_gen2/rules.mk
index 0be47ec5d1..d399c10822 100644
--- a/keyboards/percent/canoe_gen2/rules.mk
+++ b/keyboards/percent/canoe_gen2/rules.mk
@@ -11,6 +11,5 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 RGB_MATRIX_CUSTOM_KB = yes
diff --git a/keyboards/phage_studio/pila87/info.json b/keyboards/phage_studio/pila87/info.json
index 95a16a39d3..522cd9c548 100644
--- a/keyboards/phage_studio/pila87/info.json
+++ b/keyboards/phage_studio/pila87/info.json
@@ -8,6 +8,9 @@
        "pid": "0x5887",
        "device_version": "0.0.1"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "processor": "STM32F103",
    "bootloader": "stm32duino",
    "matrix_pins": {
diff --git a/keyboards/phage_studio/pila87/rules.mk b/keyboards/phage_studio/pila87/rules.mk
index a204b2aa9e..05f967d7a8 100644
--- a/keyboards/phage_studio/pila87/rules.mk
+++ b/keyboards/phage_studio/pila87/rules.mk
@@ -19,7 +19,6 @@ OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
 # RGB Matrix enabled
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 # Wear-levelling driver
 EEPROM_DRIVER = wear_leveling
diff --git a/keyboards/phase_studio/titan65/hotswap/info.json b/keyboards/phase_studio/titan65/hotswap/info.json
index d55716fa79..c7429ca65c 100644
--- a/keyboards/phase_studio/titan65/hotswap/info.json
+++ b/keyboards/phase_studio/titan65/hotswap/info.json
@@ -11,6 +11,9 @@
    "ws2812": {
        "pin": "E6"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["B0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "F0", "F1", "C7", "F4", "F5", "F6"],
        "rows": ["B4", "B5", "B6", "C6", "F7"]
diff --git a/keyboards/phase_studio/titan65/hotswap/rules.mk b/keyboards/phase_studio/titan65/hotswap/rules.mk
index 4f7d24eafc..a3b3ae4eaa 100644
--- a/keyboards/phase_studio/titan65/hotswap/rules.mk
+++ b/keyboards/phase_studio/titan65/hotswap/rules.mk
@@ -11,8 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 AUDIO_SUPPORTED = no
 RGBLIGHT_SUPPORTED = no
diff --git a/keyboards/planck/ez/info.json b/keyboards/planck/ez/info.json
index 43d7273976..370a19357f 100644
--- a/keyboards/planck/ez/info.json
+++ b/keyboards/planck/ez/info.json
@@ -6,6 +6,9 @@
    "vid": "0x3297",
    "device_version": "0.0.1"
  },
+  "rgb_matrix": {
+    "driver": "IS31FL3737"
+  },
  "matrix_pins": {
    "cols": ["B11", "B10", "B2", "B1", "A7", "B0"],
    "rows": ["A10", "A9", "A8", "B15", "C13", "C14", "C15", "A2"]
diff --git a/keyboards/planck/ez/rules.mk b/keyboards/planck/ez/rules.mk
index 0bfe083b6c..a19a4fceaa 100644
--- a/keyboards/planck/ez/rules.mk
+++ b/keyboards/planck/ez/rules.mk
@@ -13,7 +13,6 @@ AUDIO_DRIVER = dac_additive
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 ENCODER_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3737
 LAYOUTS_HAS_RGB = no
diff --git a/keyboards/planck/light/info.json b/keyboards/planck/light/info.json
index e66674f2ef..64d9fdcd85 100644
--- a/keyboards/planck/light/info.json
+++ b/keyboards/planck/light/info.json
@@ -8,6 +8,9 @@
    "pid": "0xBEA2",
    "device_version": "0.0.1"
  },
+  "rgb_matrix": {
+    "driver": "IS31FL3731"
+  },
  "matrix_pins": {
    "cols": ["E6", "E3", "E4", "D3", "D4", "D5", "C0", "A7", "A6", "E1", "E0", "D7"],
    "rows": ["B0", "E7", "F0", "F1"]
diff --git a/keyboards/planck/light/rules.mk b/keyboards/planck/light/rules.mk
index 6a6a846ded..dbc992922b 100644
--- a/keyboards/planck/light/rules.mk
+++ b/keyboards/planck/light/rules.mk
@@ -12,6 +12,5 @@ MIDI_ENABLE = yes           # MIDI support
 AUDIO_ENABLE = yes           # Audio output
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3731
 LAYOUTS_HAS_RGB = no
diff --git a/keyboards/planck/rev6/info.json b/keyboards/planck/rev6/info.json
index 40af6bd442..c1e4e527ce 100644
--- a/keyboards/planck/rev6/info.json
+++ b/keyboards/planck/rev6/info.json
@@ -12,6 +12,9 @@
    "pin": "A1",
    "driver": "pwm"
  },
+  "rgb_matrix": {
+    "driver": "WS2812"
+  },
  "matrix_pins": {
    "cols": ["B11", "B10", "B2", "B1", "A7", "B0"],
    "rows": ["A10", "A9", "A8", "B15", "C13", "C14", "C15", "A2"]
diff --git a/keyboards/planck/rev6/rules.mk b/keyboards/planck/rev6/rules.mk
index 50b117dac0..048b723c4c 100644
--- a/keyboards/planck/rev6/rules.mk
+++ b/keyboards/planck/rev6/rules.mk
@@ -12,7 +12,6 @@ AUDIO_ENABLE = yes           # Audio output
 RGBLIGHT_ENABLE = yes        # Enable WS2812 RGB underlight.
 RGB_MATRIX_ENABLE = no
-RGB_MATRIX_DRIVER = WS2812
 ENCODER_ENABLE = yes
 DIP_SWITCH_ENABLE = yes
diff --git a/keyboards/planck/rev6_drop/info.json b/keyboards/planck/rev6_drop/info.json
index a759ada42b..00f1fab14e 100644
--- a/keyboards/planck/rev6_drop/info.json
+++ b/keyboards/planck/rev6_drop/info.json
@@ -12,6 +12,9 @@
    "pin": "A1",
    "driver": "pwm"
  },
+  "rgb_matrix": {
+    "driver": "WS2812"
+  },
  "matrix_pins": {
    "cols": ["B11", "B10", "B2", "B1", "A7", "B0"],
    "rows": ["A10", "A9", "A8", "B15", "C13", "C14", "C15", "A2"]
diff --git a/keyboards/planck/rev6_drop/rules.mk b/keyboards/planck/rev6_drop/rules.mk
index 378870d779..e20d33831d 100644
--- a/keyboards/planck/rev6_drop/rules.mk
+++ b/keyboards/planck/rev6_drop/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = yes          # Audio output
 CUSTOM_MATRIX = yes
 # Do not enable RGB_MATRIX_ENABLE together with RGBLIGHT_ENABLE
 RGB_MATRIX_ENABLE = no
-RGB_MATRIX_DRIVER = WS2812
 ENCODER_ENABLE = yes
 DIP_SWITCH_ENABLE = yes
diff --git a/keyboards/playkbtw/pk64rgb/info.json b/keyboards/playkbtw/pk64rgb/info.json
index 2751e9c685..13fc6dd0ea 100644
--- a/keyboards/playkbtw/pk64rgb/info.json
+++ b/keyboards/playkbtw/pk64rgb/info.json
@@ -8,6 +8,9 @@
        "pid": "0x3634",
        "device_version": "0.0.1"
    },
+    "rgb_matrix": {
+        "driver": "IS31FL3733"
+    },
    "matrix_pins": {
        "cols": ["B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "B1", "B2", "B3", "B7"],
        "rows": ["D7", "D6", "D5", "D3", "D2"]
diff --git a/keyboards/playkbtw/pk64rgb/rules.mk b/keyboards/playkbtw/pk64rgb/rules.mk
index e18aaeaa8a..f199d19d31 100644
--- a/keyboards/playkbtw/pk64rgb/rules.mk
+++ b/keyboards/playkbtw/pk64rgb/rules.mk
@@ -10,7 +10,6 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 RGB_MATRIX_ENABLE = yes     # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3733
 AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/preonic/rev3/info.json b/keyboards/preonic/rev3/info.json
index de242674bb..d6d494e005 100644
--- a/keyboards/preonic/rev3/info.json
+++ b/keyboards/preonic/rev3/info.json
@@ -10,6 +10,9 @@
        "pin": "A1",
        "driver": "pwm"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["B11", "B10", "B2", "B1", "A7", "B0"],
        "rows": ["A10", "A9", "A8", "B15", "C13", "C14", "C15", "A2", "A3", "A6"]
diff --git a/keyboards/preonic/rev3/rules.mk b/keyboards/preonic/rev3/rules.mk
index fa3348cef6..6836d19541 100644
--- a/keyboards/preonic/rev3/rules.mk
+++ b/keyboards/preonic/rev3/rules.mk
@@ -13,7 +13,6 @@ RGBLIGHT_ENABLE = yes        # Enable WS2812 RGB underlight.
 # Do not enable RGB_MATRIX_ENABLE together with RGBLIGHT_ENABLE
 RGB_MATRIX_ENABLE = no
-RGB_MATRIX_DRIVER = WS2812
 ENCODER_ENABLE = yes
 DIP_SWITCH_ENABLE = yes
diff --git a/keyboards/preonic/rev3_drop/info.json b/keyboards/preonic/rev3_drop/info.json
index ff105f700f..a3eac4eaf4 100644
--- a/keyboards/preonic/rev3_drop/info.json
+++ b/keyboards/preonic/rev3_drop/info.json
@@ -10,6 +10,9 @@
        "pin": "A1",
        "driver": "pwm"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["B11", "B10", "B2", "B1", "A7", "B0"],
        "rows": ["A10", "A9", "A8", "B15", "C13", "C14", "C15", "A2", "A3", "A6"]
diff --git a/keyboards/preonic/rev3_drop/rules.mk b/keyboards/preonic/rev3_drop/rules.mk
index 762dd6ff6c..d3ff068813 100644
--- a/keyboards/preonic/rev3_drop/rules.mk
+++ b/keyboards/preonic/rev3_drop/rules.mk
@@ -16,6 +16,5 @@ DIP_SWITCH_ENABLE = yes
 # Do not enable RGB_MATRIX_ENABLE together with RGBLIGHT_ENABLE
 RGB_MATRIX_ENABLE = no
-RGB_MATRIX_DRIVER = WS2812
 SRC += matrix.c
diff --git a/keyboards/prototypist/oceanographer/info.json b/keyboards/prototypist/oceanographer/info.json
index 1f589a540b..4fdaca429a 100644
--- a/keyboards/prototypist/oceanographer/info.json
+++ b/keyboards/prototypist/oceanographer/info.json
@@ -19,9 +19,11 @@
        ]
    },
+    "ws2812": {
+        "pin": "B3"
+    },
    "rgblight" : {
        "led_count": 3,
-        "pin": "B3",
        "sleep": true,
        "hue_steps": 10,
        "saturation_steps": 17,
diff --git a/keyboards/quarkeys/z40/info.json b/keyboards/quarkeys/z40/info.json
index 10531ddf57..bde8a576b9 100644
--- a/keyboards/quarkeys/z40/info.json
+++ b/keyboards/quarkeys/z40/info.json
@@ -8,6 +8,9 @@
          "pid": "0x2801",
          "device_version": "0.0.1"
      },
+    "rgb_matrix": {
+      "driver": "WS2812"
+    },
    "matrix_pins": {
      "cols": ["F4", "F5", "F6", "F7", "B6", "B5", "B4", "D7", "D6", "D0", "B1", "B0"],
      "rows": ["E6", "B3", "C7", "C6"]
diff --git a/keyboards/quarkeys/z40/rules.mk b/keyboards/quarkeys/z40/rules.mk
index 89107d24a8..4554ab2970 100644
--- a/keyboards/quarkeys/z40/rules.mk
+++ b/keyboards/quarkeys/z40/rules.mk
@@ -14,4 +14,3 @@ AUDIO_ENABLE = no           # Audio output
 RGBLIGHT_ENABLE = no        # Enable this and unable RGB_MATRIX_ENABLE to use RGB light effect
 RGB_MATRIX_ENABLE = yes         # Enable this and unable RGBLIGHT_ENABLE to use RGB Matrix effect 
-RGB_MATRIX_DRIVER = WS2812      # Comment out this line when RGBLIGHTING is enabled
diff --git a/keyboards/rgbkb/mun/rev1/info.json b/keyboards/rgbkb/mun/rev1/info.json
index 9d5bf972c1..b447c4b58d 100644
--- a/keyboards/rgbkb/mun/rev1/info.json
+++ b/keyboards/rgbkb/mun/rev1/info.json
@@ -12,6 +12,9 @@
        "pin": "B5",
        "driver": "pwm"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["A0", "B11", "B0", "B10", "B12", "B2", "A8"],
        "rows": ["A1", "A3", "B3", "A13", "B15", null, null]
diff --git a/keyboards/rgbkb/mun/rules.mk b/keyboards/rgbkb/mun/rules.mk
index 88f8890ce6..0862bde4e5 100644
--- a/keyboards/rgbkb/mun/rules.mk
+++ b/keyboards/rgbkb/mun/rules.mk
@@ -17,7 +17,6 @@ AUDIO_ENABLE = no           # Audio output
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 OLED_ENABLE = yes
 OLED_DRIVER = SSD1306    # Enable the OLED Driver
diff --git a/keyboards/rgbkb/pan/info.json b/keyboards/rgbkb/pan/info.json
index e12e7717eb..d151fd68d6 100644
--- a/keyboards/rgbkb/pan/info.json
+++ b/keyboards/rgbkb/pan/info.json
@@ -8,6 +8,9 @@
        "pid": "0x8C9C",
        "device_version": "0.0.2"
    },
+    "rgb_matrix": {
+        "driver": "custom"
+    },
    "layouts": {
        "LAYOUT_all": {
            "layout": [
diff --git a/keyboards/rgbkb/pan/rev1/rules.mk b/keyboards/rgbkb/pan/rev1/rules.mk
index 667c290059..4d3c0f6679 100644
--- a/keyboards/rgbkb/pan/rev1/rules.mk
+++ b/keyboards/rgbkb/pan/rev1/rules.mk
@@ -1,5 +1,2 @@
 # The default configuration is a atmega32a
 DEFAULT_FOLDER = rgbkb/pan/rev1/32a
-RGB_MATRIX_DRIVER = custom
-WS2812_DRIVER_REQUIRED := yes
diff --git a/keyboards/rgbkb/pan/rules.mk b/keyboards/rgbkb/pan/rules.mk
index aecabfe157..775fa48e12 100644
--- a/keyboards/rgbkb/pan/rules.mk
+++ b/keyboards/rgbkb/pan/rules.mk
@@ -9,7 +9,6 @@ COMMAND_ENABLE = no         # Commands for debug and configuration
 NKRO_ENABLE = no            # Enable N-Key Rollover
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 ENCODER_ENABLE = yes
 OLED_ENABLE = yes
 OLED_DRIVER = SSD1306
@@ -20,3 +19,5 @@ STAGGERED_LAYOUT = no # If you soldered R1-A12 and R4-A12, enable this.
 # Default to revision 1
 DEFAULT_FOLDER = rgbkb/pan/rev1
+WS2812_DRIVER_REQUIRED := yes
diff --git a/keyboards/rgbkb/sol/rev1/info.json b/keyboards/rgbkb/sol/rev1/info.json
index ae88231a49..b93857eb51 100644
--- a/keyboards/rgbkb/sol/rev1/info.json
+++ b/keyboards/rgbkb/sol/rev1/info.json
@@ -8,6 +8,9 @@
        "pid": "0x3060",
        "device_version": "0.0.1"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7"],
        "rows": ["C6", "B6", "B5", "B4", "D7", "E6"]
diff --git a/keyboards/rgbkb/sol/rev1/rules.mk b/keyboards/rgbkb/sol/rev1/rules.mk
index cef623df1a..af9b588b7a 100644
--- a/keyboards/rgbkb/sol/rev1/rules.mk
+++ b/keyboards/rgbkb/sol/rev1/rules.mk
@@ -15,7 +15,6 @@ RGBLIGHT_ENABLE         = yes       # Enable global lighting effects. Do not ena
 LED_MIRRORED            = yes       # Mirror LEDs across halves (enable DIP 1 on slave, and DIP 2 and 3 on master)
 RGB_MATRIX_ENABLE       = no        # Enable per-key coordinate based RGB effects. Do not enable with RGBlight
-RGB_MATRIX_DRIVER       = WS2812
 RGB_MATRIX_KEYPRESSES   = no        # Enable reactive per-key effects.
 RGB_MATRIX_FRAMEBUFFER_EFFECTS = no # Enable frame buffer effects like the typing heatmap.
diff --git a/keyboards/rgbkb/sol/rev2/info.json b/keyboards/rgbkb/sol/rev2/info.json
index 97b7921464..2daee64be4 100644
--- a/keyboards/rgbkb/sol/rev2/info.json
+++ b/keyboards/rgbkb/sol/rev2/info.json
@@ -8,6 +8,9 @@
        "pid": "0x3060",
        "device_version": "0.0.2"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7"],
        "rows": ["C6", "B6", "B5", "B4", "D7", "E6"]
diff --git a/keyboards/rgbkb/sol/rev2/rules.mk b/keyboards/rgbkb/sol/rev2/rules.mk
index 681a3e0993..53aeba76ae 100644
--- a/keyboards/rgbkb/sol/rev2/rules.mk
+++ b/keyboards/rgbkb/sol/rev2/rules.mk
@@ -15,7 +15,6 @@ RGBLIGHT_ENABLE         = no        # Enable global lighting effects. Do not ena
 LED_MIRRORED            = no        # Mirror LEDs across halves (enable DIP 1 on slave, and DIP 2 and 3 on master)
 RGB_MATRIX_ENABLE = yes             # Enable per-key coordinate based RGB effects. Do not enable with RGBlight
-RGB_MATRIX_DRIVER = WS2812
 RGB_MATRIX_KEYPRESSES   = no        # Enable reactive per-key effects.
 RGB_MATRIX_FRAMEBUFFER_EFFECTS = no # Enable frame buffer effects like the typing heatmap.
diff --git a/keyboards/rgbkb/sol3/rev1/info.json b/keyboards/rgbkb/sol3/rev1/info.json
index 77116bb733..3dd7404c44 100644
--- a/keyboards/rgbkb/sol3/rev1/info.json
+++ b/keyboards/rgbkb/sol3/rev1/info.json
@@ -12,6 +12,9 @@
        "pin": "B5",
        "driver": "pwm"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["A6", "A7", "B0", "B2", "B1", "B9", "B3", "B4"],
        "rows": ["B15", "A8", "A15", "B12", "A3", null]
diff --git a/keyboards/rgbkb/sol3/rules.mk b/keyboards/rgbkb/sol3/rules.mk
index 336da6dd19..382b858f46 100644
--- a/keyboards/rgbkb/sol3/rules.mk
+++ b/keyboards/rgbkb/sol3/rules.mk
@@ -21,7 +21,6 @@ DIP_SWITCH_ENABLE = yes
 RGBLIGHT_ENABLE = no
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 OLED_ENABLE = yes
 OLED_DRIVER = SSD1306    # Enable the OLED Driver
diff --git a/keyboards/rgbkb/zygomorph/rev1/info.json b/keyboards/rgbkb/zygomorph/rev1/info.json
index c85e9e0a9c..4be3dd61d3 100644
--- a/keyboards/rgbkb/zygomorph/rev1/info.json
+++ b/keyboards/rgbkb/zygomorph/rev1/info.json
@@ -8,6 +8,9 @@
      "pid": "0x3060",
      "device_version": "0.0.1"
    },
+    "rgb_matrix": {
+      "driver": "WS2812"
+    },
    "matrix_pins": {
      "cols": ["F4", "F6", "C7", "C6", "B6", "D4"],
      "rows": ["F1", "F5", "F7", "B5", "B4"]
diff --git a/keyboards/rgbkb/zygomorph/rules.mk b/keyboards/rgbkb/zygomorph/rules.mk
index e926ec7641..bc168c3983 100644
--- a/keyboards/rgbkb/zygomorph/rules.mk
+++ b/keyboards/rgbkb/zygomorph/rules.mk
@@ -10,7 +10,6 @@ NKRO_ENABLE = no            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
-RGB_MATRIX_DRIVER = WS2812
 SPLIT_KEYBOARD = yes
diff --git a/keyboards/rkg68/info.json b/keyboards/rkg68/info.json
index f318019dd6..dc49a6943f 100644
--- a/keyboards/rkg68/info.json
+++ b/keyboards/rkg68/info.json
@@ -14,13 +14,15 @@
                "cols": [ "F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3", "F4" ],
                "rows": [ "D0", "D1", "D2", "D3", "D5" ]
        },
+        "ws2812": {
+                "pin": "B3"
+        },
        "rgblight": {
                "animations": {
                        "knight": true,
                        "rainbow_swirl": true
                },
-                "led_count": 4,
+                "led_count": 4
-                "pin": "B3"
        },
        "url": "http://en.rkgaming.com/",
        "usb": {
diff --git a/keyboards/rura66/rev1/info.json b/keyboards/rura66/rev1/info.json
index 6c405ab95d..33557ff84f 100644
--- a/keyboards/rura66/rev1/info.json
+++ b/keyboards/rura66/rev1/info.json
@@ -8,6 +8,9 @@
    "pid": "0x0200",
    "device_version": "0.0.1"
  },
+  "rgb_matrix": {
+    "driver": "WS2812"
+  },
  "matrix_pins": {
    "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
    "rows": ["D4", "C6", "D7", "E6", "B4"]
diff --git a/keyboards/rura66/rev1/rules.mk b/keyboards/rura66/rev1/rules.mk
index 5130195b44..0f2fb66a80 100644
--- a/keyboards/rura66/rev1/rules.mk
+++ b/keyboards/rura66/rev1/rules.mk
@@ -2,7 +2,6 @@ EXTRAKEY_ENABLE = yes    # Audio control and System control
 RGBLIGHT_ENABLE = yes    # Enable keyboard RGB underglow
 SPLIT_KEYBOARD = yes
 RGB_MATRIX_ENABLE = no
-RGB_MATRIX_DRIVER = WS2812
 OLED_DRIVER = SSD1306
 ENCODER_ENABLE = no
 LTO_ENABLE = yes
diff --git a/keyboards/rura66/rules.mk b/keyboards/rura66/rules.mk
index 41795ddcb4..c7eacfa19a 100644
--- a/keyboards/rura66/rules.mk
+++ b/keyboards/rura66/rules.mk
@@ -13,6 +13,5 @@ AUDIO_ENABLE = no           # Audio output
 OLED_ENABLE = yes
 SPLIT_KEYBOARD = yes
 LTO_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 DEFAULT_FOLDER = rura66/rev1
diff --git a/keyboards/ryanskidmore/rskeys100/info.json b/keyboards/ryanskidmore/rskeys100/info.json
index 949c6021bc..3549d99b3f 100644
--- a/keyboards/ryanskidmore/rskeys100/info.json
+++ b/keyboards/ryanskidmore/rskeys100/info.json
@@ -9,6 +9,9 @@
    "ws2812": {
        "pin": "C7"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "url": "",
diff --git a/keyboards/ryanskidmore/rskeys100/rules.mk b/keyboards/ryanskidmore/rskeys100/rules.mk
index fe929e6ad6..8db3728a22 100644
--- a/keyboards/ryanskidmore/rskeys100/rules.mk
+++ b/keyboards/ryanskidmore/rskeys100/rules.mk
@@ -10,7 +10,6 @@ NKRO_ENABLE = yes            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no        # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no         # Enable keyboard RGB underglow
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 AUDIO_ENABLE = no            # Audio output
 CUSTOM_MATRIX = lite
diff --git a/keyboards/s_ol/0xc_pad/info.json b/keyboards/s_ol/0xc_pad/info.json
index 6f49522ba6..a35c054900 100644
--- a/keyboards/s_ol/0xc_pad/info.json
+++ b/keyboards/s_ol/0xc_pad/info.json
@@ -9,6 +9,9 @@
    "ws2812": {
        "pin": "C7"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "layouts": {
        "LAYOUT": {
            "layout": [
diff --git a/keyboards/s_ol/0xc_pad/rules.mk b/keyboards/s_ol/0xc_pad/rules.mk
index 69d30797b1..972d696cec 100644
--- a/keyboards/s_ol/0xc_pad/rules.mk
+++ b/keyboards/s_ol/0xc_pad/rules.mk
@@ -12,4 +12,3 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 LTO_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/salicylic_acid3/naked48/rev1/info.json b/keyboards/salicylic_acid3/naked48/rev1/info.json
index a7345e5d48..968965e51c 100644
--- a/keyboards/salicylic_acid3/naked48/rev1/info.json
+++ b/keyboards/salicylic_acid3/naked48/rev1/info.json
@@ -8,6 +8,9 @@
        "pid": "0xE8BA",
        "device_version": "0.0.1"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "D7", "E6", "B4", "B5"],
        "rows": ["D1", "D0", "D4", "C6"]
diff --git a/keyboards/salicylic_acid3/naked48/rules.mk b/keyboards/salicylic_acid3/naked48/rules.mk
index 956ae2cefc..033ade5a49 100644
--- a/keyboards/salicylic_acid3/naked48/rules.mk
+++ b/keyboards/salicylic_acid3/naked48/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = no
-RGB_MATRIX_DRIVER = WS2812
 SPLIT_KEYBOARD = yes
diff --git a/keyboards/salicylic_acid3/setta21/rev1/info.json b/keyboards/salicylic_acid3/setta21/rev1/info.json
index c8fb67d574..642bde6298 100644
--- a/keyboards/salicylic_acid3/setta21/rev1/info.json
+++ b/keyboards/salicylic_acid3/setta21/rev1/info.json
@@ -11,6 +11,9 @@
    "ws2812": {
        "pin": "D3"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["F4", "F5", "F6", "F7", "B1", "B3"],
        "rows": ["D4", "C6", "D7", "E6"]
diff --git a/keyboards/salicylic_acid3/setta21/rules.mk b/keyboards/salicylic_acid3/setta21/rules.mk
index ee8bd4cc40..d4aab3ee3f 100644
--- a/keyboards/salicylic_acid3/setta21/rules.mk
+++ b/keyboards/salicylic_acid3/setta21/rules.mk
@@ -13,6 +13,5 @@ RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
 OLED_ENABLE = no
 USE_I2C = no
 RGB_MATRIX_ENABLE = no
-RGB_MATRIX_DRIVER = WS2812
 DEFAULT_FOLDER = salicylic_acid3/setta21/rev1
diff --git a/keyboards/senselessclay/ck60/info.json b/keyboards/senselessclay/ck60/info.json
index 208fef9ae6..841c8fb429 100644
--- a/keyboards/senselessclay/ck60/info.json
+++ b/keyboards/senselessclay/ck60/info.json
@@ -11,6 +11,9 @@
    "ws2812": {
        "pin": "B1"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["F0", "D5", "D3", "D2", "D1", "D0", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
        "rows": ["B3", "B2", "F1", "F4", "F5"]
diff --git a/keyboards/senselessclay/ck60/rules.mk b/keyboards/senselessclay/ck60/rules.mk
index 5dadd1cf0e..c33aa21c4b 100644
--- a/keyboards/senselessclay/ck60/rules.mk
+++ b/keyboards/senselessclay/ck60/rules.mk
@@ -12,4 +12,3 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes     # RGB matrix lighting
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/silverbullet44/info.json b/keyboards/silverbullet44/info.json
index 3973885e4f..de86324dd9 100644
--- a/keyboards/silverbullet44/info.json
+++ b/keyboards/silverbullet44/info.json
@@ -11,6 +11,9 @@
    "ws2812": {
        "pin": "D3"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["B3", "B1", "F7", "F6", "F5", "F4"],
        "rows": ["D4", "C6", "D7", "E6"]
diff --git a/keyboards/silverbullet44/rules.mk b/keyboards/silverbullet44/rules.mk
index fa56d060bf..ed06e173de 100644
--- a/keyboards/silverbullet44/rules.mk
+++ b/keyboards/silverbullet44/rules.mk
@@ -10,7 +10,6 @@ NKRO_ENABLE = no            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 RGB_MATRIX_ENABLE = no
-RGB_MATRIX_DRIVER = WS2812
 AUDIO_ENABLE = yes          # Audio output
 SPLIT_KEYBOARD = yes
 LTO_ENABLE = yes
diff --git a/keyboards/smallkeyboard/info.json b/keyboards/smallkeyboard/info.json
index 8934a61917..a19bf29597 100644
--- a/keyboards/smallkeyboard/info.json
+++ b/keyboards/smallkeyboard/info.json
@@ -8,6 +8,9 @@
    "pid": "0x736B",
    "device_version": "0.0.1"
  },
+  "rgb_matrix": {
+    "driver": "IS31FL3731"
+  },
  "matrix_pins": {
    "cols": ["F7", "F6", "F5"],
    "rows": ["C7", "C6"]
diff --git a/keyboards/smallkeyboard/rules.mk b/keyboards/smallkeyboard/rules.mk
index 9202e8acf7..1dcdf89155 100644
--- a/keyboards/smallkeyboard/rules.mk
+++ b/keyboards/smallkeyboard/rules.mk
@@ -12,6 +12,5 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3731
 RGB_MATRIX_SUPPORTED = yes
diff --git a/keyboards/smithrune/iron160/iron160_h/info.json b/keyboards/smithrune/iron160/iron160_h/info.json
index 0c28862068..b8184da064 100644
--- a/keyboards/smithrune/iron160/iron160_h/info.json
+++ b/keyboards/smithrune/iron160/iron160_h/info.json
@@ -14,10 +14,12 @@
       "cols": ["A3" , "B9" , "B8" , "B5" , "B4", "B3" , "A6" , "A5" , "A4" , "A2" , "A1" , "A0" , "C15" , "C14"],
       "rows": ["A10", "A15", "C13", "A7" , "B0"]
   },
-   "rgblight": {
+   "ws2812": {
-       "led_count": 1,
       "pin": "B15"
   },
+   "rgblight": {
+       "led_count": 1
+   },
   "diode_direction": "COL2ROW",
    "layouts": {
        "LAYOUT": {
diff --git a/keyboards/soda/pocket/info.json b/keyboards/soda/pocket/info.json
index 815eb0da13..dca3dfe4be 100644
--- a/keyboards/soda/pocket/info.json
+++ b/keyboards/soda/pocket/info.json
@@ -11,6 +11,9 @@
    "ws2812": {
        "pin": "C15"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["A2", "A1", "B14", "B4", "B5", "B6", "B7"],
        "rows": ["A7", "B0", "B1", "B2", "B10", "B11"]
diff --git a/keyboards/soda/pocket/rules.mk b/keyboards/soda/pocket/rules.mk
index d8724cc6e6..27092ddbc6 100644
--- a/keyboards/soda/pocket/rules.mk
+++ b/keyboards/soda/pocket/rules.mk
@@ -1,5 +1,4 @@
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
 MOUSEKEY_ENABLE = yes       # Mouse keys
diff --git a/keyboards/sowbug/68keys/info.json b/keyboards/sowbug/68keys/info.json
index a5d2e8e35b..acead2062a 100644
--- a/keyboards/sowbug/68keys/info.json
+++ b/keyboards/sowbug/68keys/info.json
@@ -11,6 +11,9 @@
    "ws2812": {
        "pin": "B9"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["A3", "A4", "A5", "A6", "A7", "B0", "B1", "B10", "B11", "B12", "B13", "B14", "B15", "A8", "A9", "A10"],
        "rows": ["C14", "C15", "A0", "A1", "A2"]
diff --git a/keyboards/sowbug/68keys/rules.mk b/keyboards/sowbug/68keys/rules.mk
index 38a6bb6887..b7807ae418 100644
--- a/keyboards/sowbug/68keys/rules.mk
+++ b/keyboards/sowbug/68keys/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/sowbug/ansi_tkl/info.json b/keyboards/sowbug/ansi_tkl/info.json
index 995d05362f..a0689ac0dd 100644
--- a/keyboards/sowbug/ansi_tkl/info.json
+++ b/keyboards/sowbug/ansi_tkl/info.json
@@ -11,6 +11,9 @@
    "ws2812": {
        "pin": "B9"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["A4", "A5", "A6", "A7", "B0", "B1", "B10", "B11", "B12", "B13", "B14", "B15", "A8", "A9", "A10", "A15", "B3"],
        "rows": ["C14", "C15", "A0", "A1", "A2", "A3"]
diff --git a/keyboards/sowbug/ansi_tkl/rules.mk b/keyboards/sowbug/ansi_tkl/rules.mk
index 38a6bb6887..b7807ae418 100644
--- a/keyboards/sowbug/ansi_tkl/rules.mk
+++ b/keyboards/sowbug/ansi_tkl/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/spaceholdings/nebula12b/info.json b/keyboards/spaceholdings/nebula12b/info.json
index 5cf82edf92..5b64474b70 100755
--- a/keyboards/spaceholdings/nebula12b/info.json
+++ b/keyboards/spaceholdings/nebula12b/info.json
@@ -11,6 +11,9 @@
    "ws2812": {
        "pin": "D5"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["F4", "F5", "D7"],
        "rows": ["B7", "B4", "F7", "F6"]
diff --git a/keyboards/spaceholdings/nebula12b/rules.mk b/keyboards/spaceholdings/nebula12b/rules.mk
index e9b6e9fb5c..f89d2a5f9b 100755
--- a/keyboards/spaceholdings/nebula12b/rules.mk
+++ b/keyboards/spaceholdings/nebula12b/rules.mk
@@ -11,6 +11,5 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes     # Enable Per-key RGB
-RGB_MATRIX_DRIVER = WS2812  # Per-key RGB Driver
 LTO_ENABLE = yes
diff --git a/keyboards/spaceholdings/nebula68b/info.json b/keyboards/spaceholdings/nebula68b/info.json
index d3918f5f3b..89ee727172 100755
--- a/keyboards/spaceholdings/nebula68b/info.json
+++ b/keyboards/spaceholdings/nebula68b/info.json
@@ -11,6 +11,9 @@
    "ws2812": {
        "pin": "B7"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["D0", "D1", "D2", "D3", "D5", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"],
        "rows": ["D4", "D6", "D7", "B4", "E6"]
diff --git a/keyboards/spaceholdings/nebula68b/rules.mk b/keyboards/spaceholdings/nebula68b/rules.mk
index e9b6e9fb5c..f89d2a5f9b 100755
--- a/keyboards/spaceholdings/nebula68b/rules.mk
+++ b/keyboards/spaceholdings/nebula68b/rules.mk
@@ -11,6 +11,5 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes     # Enable Per-key RGB
-RGB_MATRIX_DRIVER = WS2812  # Per-key RGB Driver
 LTO_ENABLE = yes
diff --git a/keyboards/splitkb/kyria/rev1/info.json b/keyboards/splitkb/kyria/rev1/info.json
index 03774dcfe5..2e380145a0 100644
--- a/keyboards/splitkb/kyria/rev1/info.json
+++ b/keyboards/splitkb/kyria/rev1/info.json
@@ -4,6 +4,9 @@
        "pid": "0x9D9D",
        "device_version": "0.0.1"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
        "rows": ["B4", "E6", "D7", "D4"]
diff --git a/keyboards/splitkb/kyria/rev1/rules.mk b/keyboards/splitkb/kyria/rev1/rules.mk
index cb26f6210d..c4c82d05aa 100644
--- a/keyboards/splitkb/kyria/rev1/rules.mk
+++ b/keyboards/splitkb/kyria/rev1/rules.mk
@@ -11,4 +11,3 @@ OLED_ENABLE = yes          # Enables the use of OLED displays
 ENCODER_ENABLE = yes       # Enables the use of one or more encoders
 RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
 RGB_MATRIX_ENABLE = no     # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)
-RGB_MATRIX_DRIVER = WS2812 # RGB matrix driver support
diff --git a/keyboards/splitkb/kyria/rev2/info.json b/keyboards/splitkb/kyria/rev2/info.json
index 67c9e7a775..9b745dc906 100644
--- a/keyboards/splitkb/kyria/rev2/info.json
+++ b/keyboards/splitkb/kyria/rev2/info.json
@@ -4,6 +4,9 @@
        "pid": "0x9D9D",
        "device_version": "0.0.2"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["B2", "B6", "B5", "B4", "E6", "D7", "C6", "D4"],
        "rows": ["F6", "F7", "B1", "B3"]
diff --git a/keyboards/splitkb/kyria/rev2/rules.mk b/keyboards/splitkb/kyria/rev2/rules.mk
index cb26f6210d..c4c82d05aa 100644
--- a/keyboards/splitkb/kyria/rev2/rules.mk
+++ b/keyboards/splitkb/kyria/rev2/rules.mk
@@ -11,4 +11,3 @@ OLED_ENABLE = yes          # Enables the use of OLED displays
 ENCODER_ENABLE = yes       # Enables the use of one or more encoders
 RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
 RGB_MATRIX_ENABLE = no     # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)
-RGB_MATRIX_DRIVER = WS2812 # RGB matrix driver support
diff --git a/keyboards/system76/launch_1/info.json b/keyboards/system76/launch_1/info.json
index e9d991ac6a..db5912e381 100644
--- a/keyboards/system76/launch_1/info.json
+++ b/keyboards/system76/launch_1/info.json
@@ -10,6 +10,9 @@
    "ws2812": {
        "pin": "E2"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["D7", "C7", "C6", "B6", "B5", "B4", "D6", "D4", "E6", "D5", "D3", "D2", "B7", "B0"],
        "rows": ["F0", "F1", "F4", "F5", "F6", "F7"]
diff --git a/keyboards/system76/launch_1/rules.mk b/keyboards/system76/launch_1/rules.mk
index e20aa1fd58..7dbc07ced0 100644
--- a/keyboards/system76/launch_1/rules.mk
+++ b/keyboards/system76/launch_1/rules.mk
@@ -17,7 +17,6 @@ RAW_ENABLE = yes            # Raw HID commands (used by Keyboard Configurator)
 BACKLIGHT_ENABLE = no       # RGB backlight (conflicts with RGB matrix)
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 RGB_MATRIX_ENABLE = yes     # RGB matrix
-RGB_MATRIX_DRIVER = WS2812
 RGB_MATRIX_CUSTOM_KB = yes  # Custom keyboard effects
 AUDIO_ENABLE = no           # Audio output
 LTO_ENABLE = yes            # Link-time optimization for smaller binary
diff --git a/keyboards/teleport/native/info.json b/keyboards/teleport/native/info.json
index 16c0603e43..1e1d591512 100644
--- a/keyboards/teleport/native/info.json
+++ b/keyboards/teleport/native/info.json
@@ -10,6 +10,9 @@
        "vid": "0x7470",
        "device_version": "1.0.0"
    },
+    "rgb_matrix": {
+        "driver": "IS31FL3733"
+    },
    "features": {
        "bootmagic": true,
        "command": false,
diff --git a/keyboards/teleport/native/rules.mk b/keyboards/teleport/native/rules.mk
index f60d3a26fb..31c83c8eed 100644
--- a/keyboards/teleport/native/rules.mk
+++ b/keyboards/teleport/native/rules.mk
@@ -1,5 +1,4 @@
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3733
 RGB_MATRIX_CUSTOM_KB = yes
 DEFAULT_FOLDER = teleport/native/iso
diff --git a/keyboards/terrazzo/info.json b/keyboards/terrazzo/info.json
index 3552435786..f493960049 100644
--- a/keyboards/terrazzo/info.json
+++ b/keyboards/terrazzo/info.json
@@ -20,6 +20,9 @@
            {"pin_a": "C7", "pin_b": "F1", "resolution": 2}
        ]
    },
+    "led_matrix": {
+        "driver": "IS31FL3731"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/terrazzo/rules.mk b/keyboards/terrazzo/rules.mk
index ae42fe8a2f..e996c29fbc 100644
--- a/keyboards/terrazzo/rules.mk
+++ b/keyboards/terrazzo/rules.mk
@@ -11,6 +11,5 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 LED_MATRIX_ENABLE = yes
-LED_MATRIX_DRIVER = IS31FL3731
 ENCODER_ENABLE = yes
 WPM_ENABLE = yes
diff --git a/keyboards/tkc/portico/info.json b/keyboards/tkc/portico/info.json
index ad3b213e57..f4f2e15e84 100644
--- a/keyboards/tkc/portico/info.json
+++ b/keyboards/tkc/portico/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0008",
        "device_version": "0.0.1"
    },
+    "rgb_matrix": {
+        "driver": "IS31FL3731"
+    },
    "matrix_pins": {
        "cols": ["D3", "D5", "D4", "D6", "D7", "B4", "B5", "F6", "F5", "F4", "F1", "B0", "B1", "B2", "B3"],
        "rows": ["B6", "C6", "C7", "F7", "D2"]
diff --git a/keyboards/tkc/portico/rules.mk b/keyboards/tkc/portico/rules.mk
index 278b7fd572..4e382541f4 100644
--- a/keyboards/tkc/portico/rules.mk
+++ b/keyboards/tkc/portico/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
 AUDIO_ENABLE = no              # Audio output
 RGB_MATRIX_ENABLE = no
-RGB_MATRIX_DRIVER = IS31FL3731
 CIE1931_CURVE = yes
 # project specific files
diff --git a/keyboards/tkc/portico68v2/info.json b/keyboards/tkc/portico68v2/info.json
index a01809af6b..b37f02ecc9 100644
--- a/keyboards/tkc/portico68v2/info.json
+++ b/keyboards/tkc/portico68v2/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0012",
        "device_version": "0.0.1"
    },
+    "rgb_matrix": {
+        "driver": "IS31FL3741"
+    },
    "matrix_pins": {
        "cols": ["D3", "D5", "D4", "D6", "D7", "B4", "B5", "F6", "F5", "F4", "F1", "B0", "B1", "B2", "B3"],
        "rows": ["B6", "C6", "C7", "F7", "D2"]
diff --git a/keyboards/tkc/portico68v2/rules.mk b/keyboards/tkc/portico68v2/rules.mk
index c96ee7d13a..82b94419c1 100644
--- a/keyboards/tkc/portico68v2/rules.mk
+++ b/keyboards/tkc/portico68v2/rules.mk
@@ -12,4 +12,3 @@ RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
 AUDIO_ENABLE = no              # Audio output
 LTO_ENABLE = yes                           # Compile-time optimizations
 RGB_MATRIX_ENABLE = yes        # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3741
-\ No newline at end of file
diff --git a/keyboards/tkc/portico75/info.json b/keyboards/tkc/portico75/info.json
index 4b55800efd..a7b7a7d1ed 100644
--- a/keyboards/tkc/portico75/info.json
+++ b/keyboards/tkc/portico75/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0011",
        "device_version": "0.0.1"
    },
+    "rgb_matrix": {
+        "driver": "IS31FL3741"
+    },
    "matrix_pins": {
        "cols": ["F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "B3", "B7"],
        "rows": ["B0", "E6", "F0", "F1", "D3", "D2"]
diff --git a/keyboards/tkc/portico75/rules.mk b/keyboards/tkc/portico75/rules.mk
index cdc33f0c09..36e22b992d 100644
--- a/keyboards/tkc/portico75/rules.mk
+++ b/keyboards/tkc/portico75/rules.mk
@@ -11,6 +11,5 @@ BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
 AUDIO_ENABLE = no              # Audio output
 RGB_MATRIX_ENABLE = yes        # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3741
 CIE1931_CURVE = yes
 ENCODER_ENABLE = yes
diff --git a/keyboards/tominabox1/le_chiffre/he/info.json b/keyboards/tominabox1/le_chiffre/he/info.json
index 2d4f369413..209bafb76c 100644
--- a/keyboards/tominabox1/le_chiffre/he/info.json
+++ b/keyboards/tominabox1/le_chiffre/he/info.json
@@ -15,6 +15,9 @@
            {"pin_a": "D5", "pin_b": "D3"}
        ]
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu"
 }
diff --git a/keyboards/tominabox1/le_chiffre/he/rules.mk b/keyboards/tominabox1/le_chiffre/he/rules.mk
index 812087ff8e..53d9b0d47b 100644
--- a/keyboards/tominabox1/le_chiffre/he/rules.mk
+++ b/keyboards/tominabox1/le_chiffre/he/rules.mk
@@ -12,5 +12,4 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 LTO_ENABLE = yes
diff --git a/keyboards/tominabox1/le_chiffre/rev1/info.json b/keyboards/tominabox1/le_chiffre/rev1/info.json
index 5726f5a488..963a25b410 100644
--- a/keyboards/tominabox1/le_chiffre/rev1/info.json
+++ b/keyboards/tominabox1/le_chiffre/rev1/info.json
@@ -15,6 +15,9 @@
            {"pin_a": "D5", "pin_b": "D3"}
        ]
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu"
 }
diff --git a/keyboards/tominabox1/le_chiffre/rev1/rules.mk b/keyboards/tominabox1/le_chiffre/rev1/rules.mk
index c1a9ea0595..7d791dd396 100644
--- a/keyboards/tominabox1/le_chiffre/rev1/rules.mk
+++ b/keyboards/tominabox1/le_chiffre/rev1/rules.mk
@@ -12,6 +12,5 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 LTO_ENABLE = yes
diff --git a/keyboards/tominabox1/le_chiffre/rev2/info.json b/keyboards/tominabox1/le_chiffre/rev2/info.json
index b079e2ebad..ac09c6d879 100644
--- a/keyboards/tominabox1/le_chiffre/rev2/info.json
+++ b/keyboards/tominabox1/le_chiffre/rev2/info.json
@@ -15,6 +15,9 @@
            {"pin_a": "B6", "pin_b": "C6"}
        ]
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu"
 }
diff --git a/keyboards/tominabox1/le_chiffre/rev2/rules.mk b/keyboards/tominabox1/le_chiffre/rev2/rules.mk
index c1a9ea0595..7d791dd396 100644
--- a/keyboards/tominabox1/le_chiffre/rev2/rules.mk
+++ b/keyboards/tominabox1/le_chiffre/rev2/rules.mk
@@ -12,6 +12,5 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 LTO_ENABLE = yes
diff --git a/keyboards/tzarc/djinn/info.json b/keyboards/tzarc/djinn/info.json
index 0c396a3d53..c1c313e9ef 100644
--- a/keyboards/tzarc/djinn/info.json
+++ b/keyboards/tzarc/djinn/info.json
@@ -37,6 +37,9 @@
    "pin": "B2",
    "driver": "pwm"
  },
+  "rgb_matrix": {
+    "driver": "WS2812"
+  },
  "split": {
    "enabled": true,
    "main": "pin",
diff --git a/keyboards/tzarc/djinn/rules.mk b/keyboards/tzarc/djinn/rules.mk
index 0ff3f4d91e..e7c32e4dc1 100644
--- a/keyboards/tzarc/djinn/rules.mk
+++ b/keyboards/tzarc/djinn/rules.mk
@@ -4,8 +4,6 @@ SERIAL_DRIVER = usart
 CIE1931_CURVE = yes
-RGB_MATRIX_DRIVER = WS2812
 EEPROM_DRIVER = spi
 AUDIO_DRIVER = pwm_software
diff --git a/keyboards/tzarc/ghoul/info.json b/keyboards/tzarc/ghoul/info.json
index 58c5175cb2..e6f3adf19c 100644
--- a/keyboards/tzarc/ghoul/info.json
+++ b/keyboards/tzarc/ghoul/info.json
@@ -15,6 +15,9 @@
    "quantum_painter": true,
    "rgb_matrix": true
  },
+  "rgb_matrix": {
+    "driver": "WS2812"
+  },
  "matrix_pins": {
    "rows": ["NO_PIN","NO_PIN","NO_PIN","NO_PIN","NO_PIN","NO_PIN"],
    "cols": ["NO_PIN","NO_PIN","NO_PIN","NO_PIN","NO_PIN","NO_PIN","NO_PIN","NO_PIN"]
diff --git a/keyboards/tzarc/ghoul/rules.mk b/keyboards/tzarc/ghoul/rules.mk
index a18cf56fce..10630d80cf 100644
--- a/keyboards/tzarc/ghoul/rules.mk
+++ b/keyboards/tzarc/ghoul/rules.mk
@@ -1,6 +1,5 @@
 CUSTOM_MATRIX = lite
 EEPROM_DRIVER = spi
-RGB_MATRIX_DRIVER = WS2812
 QUANTUM_PAINTER_DRIVERS = ssd1351_spi
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/ungodly/launch_pad/info.json b/keyboards/ungodly/launch_pad/info.json
index abb568146e..97f3d10407 100644
--- a/keyboards/ungodly/launch_pad/info.json
+++ b/keyboards/ungodly/launch_pad/info.json
@@ -8,6 +8,9 @@
    "pid": "0x4C50",
    "device_version": "99.9.9"
  },
+  "rgb_matrix": {
+    "driver": "WS2812"
+  },
  "matrix_pins": {
    "cols": ["B0", "B1", "B2", "B3"],
    "rows": ["D4", "D6", "D7", "B4", "B5"]
diff --git a/keyboards/ungodly/launch_pad/rules.mk b/keyboards/ungodly/launch_pad/rules.mk
index 1177444e3e..5b696a9b07 100644
--- a/keyboards/ungodly/launch_pad/rules.mk
+++ b/keyboards/ungodly/launch_pad/rules.mk
@@ -15,7 +15,6 @@ OLED_ENABLE = yes
 OLED_DRIVER = SSD1306
 ENCODER_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 SPACE_CADET_ENABLE = no
 MAGIC_ENABLE = no
 GRAVE_ESC_ENABLE = no
diff --git a/keyboards/viktus/osav2_numpad/info.json b/keyboards/viktus/osav2_numpad/info.json
index ed1c03c19f..306db24f83 100644
--- a/keyboards/viktus/osav2_numpad/info.json
+++ b/keyboards/viktus/osav2_numpad/info.json
@@ -27,9 +27,11 @@
        "cols": ["F5", "F0", "D3", "D5"],
        "rows": ["F1", "F4", "D4", "D7", "D6"]
    },
+    "ws2812": {
+        "pin": "C7"
+    },
    "rgblight": {
        "led_count": 9,
-        "pin": "C7",
        "max_brightness": 191,
        "animations": {
            "breathing": true,
diff --git a/keyboards/wekey/we27/info.json b/keyboards/wekey/we27/info.json
index 0ded933932..5c29b5a995 100644
--- a/keyboards/wekey/we27/info.json
+++ b/keyboards/wekey/we27/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0001",
        "device_version": "0.0.1"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["F4", "F5", "C7", "D6", "D4"],
        "rows": ["F1", "D7", "B4", "B5", "B6", "F6"]
diff --git a/keyboards/wekey/we27/rules.mk b/keyboards/wekey/we27/rules.mk
index 3e2d707550..c76f29ff75 100644
--- a/keyboards/wekey/we27/rules.mk
+++ b/keyboards/wekey/we27/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 RGB_MATRIX_ENABLE = yes     # Use RGB matrix
-RGB_MATRIX_DRIVER = WS2812
 DEBOUNCE_TYPE     = sym_defer_pk
 RGB_MATRIX_CUSTOM_KB = yes
diff --git a/keyboards/winry/winry315/info.json b/keyboards/winry/winry315/info.json
index 10088f2c42..fcbafb86ff 100644
--- a/keyboards/winry/winry315/info.json
+++ b/keyboards/winry/winry315/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0315",
        "vid": "0xF1F1"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "encoder": {
        "rotary": [
            {"pin_a": "F1", "pin_b": "F0"},
diff --git a/keyboards/winry/winry315/rules.mk b/keyboards/winry/winry315/rules.mk
index d5f501196c..0f932779f5 100644
--- a/keyboards/winry/winry315/rules.mk
+++ b/keyboards/winry/winry315/rules.mk
@@ -12,4 +12,3 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/work_louder/loop/info.json b/keyboards/work_louder/loop/info.json
index 194b3274d4..64aed890de 100644
--- a/keyboards/work_louder/loop/info.json
+++ b/keyboards/work_louder/loop/info.json
@@ -7,6 +7,9 @@
        "vid": "0x574C",
        "pid": "0x1DF9"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["B3", "B2", "B1", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6"],
        "rows": ["F5"]
diff --git a/keyboards/work_louder/loop/rules.mk b/keyboards/work_louder/loop/rules.mk
index 7b2a49bbc2..b68ae20d14 100644
--- a/keyboards/work_louder/loop/rules.mk
+++ b/keyboards/work_louder/loop/rules.mk
@@ -14,7 +14,6 @@ ENCODER_ENABLE = yes
 LTO_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 LTO_ENABLE = yes
 SRC += rgb_functions.c
diff --git a/keyboards/work_louder/micro/info.json b/keyboards/work_louder/micro/info.json
index 22a4e5b261..f6b45226a0 100644
--- a/keyboards/work_louder/micro/info.json
+++ b/keyboards/work_louder/micro/info.json
@@ -42,6 +42,9 @@
    "ws2812": {
        "pin": "D1"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "url": "https://worklouder.cc/",
    "usb": {
        "device_version": "1.0.0",
diff --git a/keyboards/work_louder/micro/rules.mk b/keyboards/work_louder/micro/rules.mk
index bf0aa91911..ae0d803c0a 100644
--- a/keyboards/work_louder/micro/rules.mk
+++ b/keyboards/work_louder/micro/rules.mk
@@ -1,4 +1,2 @@
-RGB_MATRIX_DRIVER = WS2812
 SRC += rgb_functions.c \
        matrix.c
diff --git a/keyboards/work_louder/nano/info.json b/keyboards/work_louder/nano/info.json
index 1be97c86a7..70da0e4cc4 100644
--- a/keyboards/work_louder/nano/info.json
+++ b/keyboards/work_louder/nano/info.json
@@ -8,6 +8,9 @@
        "pid": "0xE6F0",
        "device_version": "0.0.1"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["B5", "B6", "C6"],
        "rows": ["F7"]
diff --git a/keyboards/work_louder/nano/rules.mk b/keyboards/work_louder/nano/rules.mk
index 60c7afc95e..bcbb4bb31d 100644
--- a/keyboards/work_louder/nano/rules.mk
+++ b/keyboards/work_louder/nano/rules.mk
@@ -14,6 +14,5 @@ ENCODER_ENABLE = yes
 LTO_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 SRC += rgb_functions.c
diff --git a/keyboards/work_louder/work_board/info.json b/keyboards/work_louder/work_board/info.json
index a25070dacd..3e208110a8 100644
--- a/keyboards/work_louder/work_board/info.json
+++ b/keyboards/work_louder/work_board/info.json
@@ -7,6 +7,9 @@
      "vid": "0x574C",
      "pid": "0xDCD1"
    },
+    "rgb_matrix": {
+      "driver": "WS2812"
+    },
    "matrix_pins": {
      "cols": ["D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "E6"],
      "rows": ["F0", "F1", "F4", "F5"]
diff --git a/keyboards/work_louder/work_board/rules.mk b/keyboards/work_louder/work_board/rules.mk
index 714b4b5d04..9f4b9a4bc5 100644
--- a/keyboards/work_louder/work_board/rules.mk
+++ b/keyboards/work_louder/work_board/rules.mk
@@ -14,7 +14,6 @@ ENCODER_ENABLE = yes
 LTO_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 SRC += rgb_functions.c
diff --git a/keyboards/xbows/knight/info.json b/keyboards/xbows/knight/info.json
index 147a69861f..9cce952dd7 100644
--- a/keyboards/xbows/knight/info.json
+++ b/keyboards/xbows/knight/info.json
@@ -8,6 +8,9 @@
        "pid": "0x4B6E",
        "device_version": "0.0.1"
    },
+    "rgb_matrix": {
+        "driver": "IS31FL3731"
+    },
    "matrix_pins": {
        "cols": ["B0", "B1", "B2", "B3", "B7", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6"],
        "rows": ["F7", "F6", "F5", "F4", "F1", "F0"]
diff --git a/keyboards/xbows/knight/rules.mk b/keyboards/xbows/knight/rules.mk
index 2c37110828..4a443969ff 100644
--- a/keyboards/xbows/knight/rules.mk
+++ b/keyboards/xbows/knight/rules.mk
@@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3731
diff --git a/keyboards/xbows/knight_plus/info.json b/keyboards/xbows/knight_plus/info.json
index 34ef43bba0..837d292932 100644
--- a/keyboards/xbows/knight_plus/info.json
+++ b/keyboards/xbows/knight_plus/info.json
@@ -8,6 +8,9 @@
        "pid": "0x4B50",
        "device_version": "0.0.1"
    },
+    "rgb_matrix": {
+        "driver": "IS31FL3731"
+    },
    "matrix_pins": {
        "cols": ["B0", "B1", "B2", "B3", "B7", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6"],
        "rows": ["F7", "F6", "F5", "F4", "F1", "F0"]
diff --git a/keyboards/xbows/knight_plus/rules.mk b/keyboards/xbows/knight_plus/rules.mk
index 2c37110828..4a443969ff 100644
--- a/keyboards/xbows/knight_plus/rules.mk
+++ b/keyboards/xbows/knight_plus/rules.mk
@@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3731
diff --git a/keyboards/xbows/nature/info.json b/keyboards/xbows/nature/info.json
index 96e559c365..fdabd72f32 100644
--- a/keyboards/xbows/nature/info.json
+++ b/keyboards/xbows/nature/info.json
@@ -8,6 +8,9 @@
        "pid": "0x4E61",
        "device_version": "0.0.1"
    },
+    "rgb_matrix": {
+        "driver": "IS31FL3731"
+    },
    "matrix_pins": {
        "cols": ["B0", "B1", "B2", "B3", "B7", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6"],
        "rows": ["F7", "F6", "F5", "F4", "F1", "F0"]
diff --git a/keyboards/xbows/nature/rules.mk b/keyboards/xbows/nature/rules.mk
index 2c37110828..4a443969ff 100644
--- a/keyboards/xbows/nature/rules.mk
+++ b/keyboards/xbows/nature/rules.mk
@@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3731
diff --git a/keyboards/xbows/numpad/info.json b/keyboards/xbows/numpad/info.json
index 3c2e69eb83..34744625d8 100644
--- a/keyboards/xbows/numpad/info.json
+++ b/keyboards/xbows/numpad/info.json
@@ -8,6 +8,9 @@
        "pid": "0x4E75",
        "device_version": "0.0.1"
    },
+    "rgb_matrix": {
+        "driver": "IS31FL3731"
+    },
    "matrix_pins": {
        "cols": ["D4", "D6", "B2", "B1"],
        "rows": ["B5", "B4", "C6", "B6", "D7", "B3"]
diff --git a/keyboards/xbows/numpad/rules.mk b/keyboards/xbows/numpad/rules.mk
index 2c37110828..4a443969ff 100644
--- a/keyboards/xbows/numpad/rules.mk
+++ b/keyboards/xbows/numpad/rules.mk
@@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3731
diff --git a/keyboards/xbows/ranger/info.json b/keyboards/xbows/ranger/info.json
index d58b2de722..ec3fcb0fb3 100644
--- a/keyboards/xbows/ranger/info.json
+++ b/keyboards/xbows/ranger/info.json
@@ -8,6 +8,9 @@
        "pid": "0x5261",
        "device_version": "0.0.1"
    },
+    "rgb_matrix": {
+        "driver": "IS31FL3731"
+    },
    "matrix_pins": {
        "cols": ["B7", "B3", "B2", "B1", "B0", "E6", "F0", "F1", "F4", "F5", "D7", "F6", "F7", "D4", "D5", "D3"],
        "rows": ["C7", "B6", "B4", "C6", "B5", "D6"]
diff --git a/keyboards/xbows/ranger/rules.mk b/keyboards/xbows/ranger/rules.mk
index 2c37110828..4a443969ff 100644
--- a/keyboards/xbows/ranger/rules.mk
+++ b/keyboards/xbows/ranger/rules.mk
@@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3731
diff --git a/keyboards/xbows/woody/info.json b/keyboards/xbows/woody/info.json
index 0e4314e60e..add3a33014 100644
--- a/keyboards/xbows/woody/info.json
+++ b/keyboards/xbows/woody/info.json
@@ -8,6 +8,9 @@
        "pid": "0x1224",
        "device_version": "0.0.1"
    },
+    "rgb_matrix": {
+        "driver": "IS31FL3731"
+    },
    "matrix_pins": {
        "cols": ["B6", "C6", "C7", "F4", "F5", "F6", "F7", "B7", "D2", "D3", "D5", "D4", "D6", "D7", "B4"],
        "rows": ["B3", "B2", "B1", "B0", "B5"]
diff --git a/keyboards/xbows/woody/rules.mk b/keyboards/xbows/woody/rules.mk
index c15a80d751..90dd66d772 100644
--- a/keyboards/xbows/woody/rules.mk
+++ b/keyboards/xbows/woody/rules.mk
@@ -10,5 +10,4 @@ COMMAND_ENABLE = no                # Commands for debug and configuration
 NKRO_ENABLE = yes           # Enable N-Key Rollover
 AUDIO_ENABLE = no
 RGB_MATRIX_ENABLE = yes            # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3731
 NO_USB_STARTUP_CHECK = no          # Disable initialization only when usb is plugged in
diff --git a/keyboards/xelus/dawn60/rev1_qmk/info.json b/keyboards/xelus/dawn60/rev1_qmk/info.json
index b575f3a88e..ffc050a260 100644
--- a/keyboards/xelus/dawn60/rev1_qmk/info.json
+++ b/keyboards/xelus/dawn60/rev1_qmk/info.json
@@ -2,6 +2,9 @@
    "ws2812": {
        "pin": "F0"
    },
+    "rgb_matrix": {
+        "driver": "custom"
+    },
    "matrix_pins": {
        "cols": ["B0", "D5", "B2", "F5", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
        "rows": ["B1", "B3", "F1", "F6", "F7"]
diff --git a/keyboards/xelus/dawn60/rev1_qmk/rules.mk b/keyboards/xelus/dawn60/rev1_qmk/rules.mk
index 71a023f2d0..4a799710d2 100644
--- a/keyboards/xelus/dawn60/rev1_qmk/rules.mk
+++ b/keyboards/xelus/dawn60/rev1_qmk/rules.mk
@@ -18,7 +18,6 @@ FAUXCLICKY_ENABLE = no      # Use buzzer to emulate clicky switches
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. - We have custom RGB underglow
 RGB_MATRIX_ENABLE = yes     # Enable RGB matrix effects.
-RGB_MATRIX_DRIVER = custom  # Enable RGB matrix effects.
 WS2812_DRIVER_REQUIRED = yes
 COMMON_VPATH += $(DRIVER_PATH)/issi
diff --git a/keyboards/xelus/la_plus/info.json b/keyboards/xelus/la_plus/info.json
index 3736b691a0..902163888a 100644
--- a/keyboards/xelus/la_plus/info.json
+++ b/keyboards/xelus/la_plus/info.json
@@ -11,6 +11,9 @@
    "ws2812": {
        "pin": "F1"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["E6", "D5", "B2", "B3", "D3", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
        "rows": ["B0", "B1", "F0", "F4", "F5"]
diff --git a/keyboards/xelus/la_plus/rules.mk b/keyboards/xelus/la_plus/rules.mk
index cf61932706..7f3c8075a5 100755
--- a/keyboards/xelus/la_plus/rules.mk
+++ b/keyboards/xelus/la_plus/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 RGB_MATRIX_CUSTOM_KB = yes
 LTO_ENABLE = yes
diff --git a/keyboards/xelus/pachi/rgb/rev1/info.json b/keyboards/xelus/pachi/rgb/rev1/info.json
index 854ca1744a..184dc1a67b 100644
--- a/keyboards/xelus/pachi/rgb/rev1/info.json
+++ b/keyboards/xelus/pachi/rgb/rev1/info.json
@@ -8,6 +8,9 @@
        "pid": "0x5052",
        "device_version": "0.0.1"
    },
+    "rgb_matrix": {
+        "driver": "custom"
+    },
    "matrix_pins": {
        "cols": ["C13", "C14", "C15", "H0", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "H1", "B10", "B11"],
        "rows": ["B14", "B13", "B12", "B2", "A8", "B15"]
diff --git a/keyboards/xelus/pachi/rgb/rev1/rules.mk b/keyboards/xelus/pachi/rgb/rev1/rules.mk
index 904565c01e..cec6f3c13d 100644
--- a/keyboards/xelus/pachi/rgb/rev1/rules.mk
+++ b/keyboards/xelus/pachi/rgb/rev1/rules.mk
@@ -14,7 +14,6 @@ FAUXCLICKY_ENABLE = no      # Use buzzer to emulate clicky switches
 EEPROM_DRIVER = i2c
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = custom
 COMMON_VPATH += $(DRIVER_PATH)/issi
 SRC += drivers/led/issi/is31fl3741.c
diff --git a/keyboards/xelus/pachi/rgb/rev2/info.json b/keyboards/xelus/pachi/rgb/rev2/info.json
index 2288f0558d..64aa3172c0 100644
--- a/keyboards/xelus/pachi/rgb/rev2/info.json
+++ b/keyboards/xelus/pachi/rgb/rev2/info.json
@@ -8,6 +8,9 @@
        "pid": "0x5053",
        "device_version": "0.0.2"
    },
+    "rgb_matrix": {
+        "driver": "custom"
+    },
    "matrix_pins": {
        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A10", "A9"],
        "rows": ["A5", "A6", "B0", "A7", "A8", "B1", "B4", "B5", "A15", "B3", "A13", "A14"]
diff --git a/keyboards/xelus/pachi/rgb/rev2/rules.mk b/keyboards/xelus/pachi/rgb/rev2/rules.mk
index 7150da0389..d5c0eee734 100644
--- a/keyboards/xelus/pachi/rgb/rev2/rules.mk
+++ b/keyboards/xelus/pachi/rgb/rev2/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 EEPROM_DRIVER = i2c
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = custom
 COMMON_VPATH += $(DRIVER_PATH)/issi
 SRC += drivers/led/issi/is31fl3741.c
diff --git a/keyboards/xelus/valor/rev2/info.json b/keyboards/xelus/valor/rev2/info.json
index 381e8eb649..d3f134fdf8 100644
--- a/keyboards/xelus/valor/rev2/info.json
+++ b/keyboards/xelus/valor/rev2/info.json
@@ -12,6 +12,9 @@
        "pin": "A9",
        "driver": "pwm"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["B2", "B1", "B0", "A7", "A6", "A5", "A4", "A13", "B7", "B6", "B5", "B4", "B3", "A15", "A14"],
        "rows": ["B11", "B10", "A3", "A1", "A2"]
diff --git a/keyboards/xelus/valor/rev2/rules.mk b/keyboards/xelus/valor/rev2/rules.mk
index 19af3d61b9..e0caab1474 100644
--- a/keyboards/xelus/valor/rev2/rules.mk
+++ b/keyboards/xelus/valor/rev2/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 RGB_MATRIX_CUSTOM_KB = yes
 EEPROM_DRIVER = i2c
diff --git a/keyboards/yandrstudio/nz64/info.json b/keyboards/yandrstudio/nz64/info.json
index 9ae46559d5..105014757e 100644
--- a/keyboards/yandrstudio/nz64/info.json
+++ b/keyboards/yandrstudio/nz64/info.json
@@ -8,6 +8,9 @@
        "pin": "A7",
        "driver": "pwm"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["A15", "B3", "B4", "B6", "B7", "B5", "C13", "A5", "A4", "B14", "B15", "A8", "A9", "A10"],
        "rows": ["C14", "B13", "B12", "C15", "A3"]
diff --git a/keyboards/yandrstudio/nz64/rules.mk b/keyboards/yandrstudio/nz64/rules.mk
index 3041064afc..e4a82c46db 100644
--- a/keyboards/yandrstudio/nz64/rules.mk
+++ b/keyboards/yandrstudio/nz64/rules.mk
@@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)
-RGB_MATRIX_DRIVER = WS2812  # RGB matrix driver support
diff --git a/keyboards/yandrstudio/nz67v2/info.json b/keyboards/yandrstudio/nz67v2/info.json
index b9355552d6..6149c998f7 100644
--- a/keyboards/yandrstudio/nz67v2/info.json
+++ b/keyboards/yandrstudio/nz67v2/info.json
@@ -10,6 +10,9 @@
        "pin": "B5",
        "driver": "pwm"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["B9", "A3", "A4", "A5", "A6", "A7", "B0", "B2", "B10", "B11", "B12", "B13", "B14", "B15", "A8"],
        "rows": ["B3", "B4", "B6", "B7", "B8"]
diff --git a/keyboards/yandrstudio/nz67v2/rules.mk b/keyboards/yandrstudio/nz67v2/rules.mk
index 46d3952083..ba2d7ccbc3 100644
--- a/keyboards/yandrstudio/nz67v2/rules.mk
+++ b/keyboards/yandrstudio/nz67v2/rules.mk
@@ -14,5 +14,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
-RGB_MATRIX_DRIVER = WS2812  # RGB matrix driver support
 ENCODER_ENABLE = yes        # Rotary encoder support
diff --git a/keyboards/yandrstudio/tg67/info.json b/keyboards/yandrstudio/tg67/info.json
index 677746d82e..0395d71ffd 100644
--- a/keyboards/yandrstudio/tg67/info.json
+++ b/keyboards/yandrstudio/tg67/info.json
@@ -10,6 +10,9 @@
        "pin": "A7",
        "driver": "pwm"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["B2", "B10", "B11", "A8", "A9", "A10", "B5", "A15", "B3", "A2", "A3", "B4", "A4", "A5", "A6"],
        "rows": ["B0", "B6", "B1", "B7", "A1"]
diff --git a/keyboards/yandrstudio/tg67/rules.mk b/keyboards/yandrstudio/tg67/rules.mk
index 2de6c8af43..8aabb4f22e 100644
--- a/keyboards/yandrstudio/tg67/rules.mk
+++ b/keyboards/yandrstudio/tg67/rules.mk
@@ -14,4 +14,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB Matrix
-RGB_MATRIX_DRIVER = WS2812  # RGB matrix driver support
diff --git a/keyboards/yanghu/unicorne/info.json b/keyboards/yanghu/unicorne/info.json
index be55f047b8..52a703d219 100644
--- a/keyboards/yanghu/unicorne/info.json
+++ b/keyboards/yanghu/unicorne/info.json
@@ -12,6 +12,9 @@
    "pin": "B1",
    "driver": "pwm"
  },
+  "rgb_matrix": {
+    "driver": "WS2812"
+  },
  "matrix_pins": {
    "cols": ["A14", "A15", "B13", "B14", "B15", "A13", "A0", "A1", "A2", "A3", "A6", "A7"],
    "rows": ["B9", "B8", "A10", "A9"]
diff --git a/keyboards/yanghu/unicorne/rules.mk b/keyboards/yanghu/unicorne/rules.mk
index e07355aefa..651d6bedf3 100644
--- a/keyboards/yanghu/unicorne/rules.mk
+++ b/keyboards/yanghu/unicorne/rules.mk
@@ -17,6 +17,5 @@ OLED_DRIVER = SSD1306
 AUDIO_DRIVER = pwm_hardware
 RGB_MATRIX_ENABLE = no # Do not enable with RGBLIGHT
-RGB_MATRIX_DRIVER = WS2812
 DEFAULT_FOLDER = yanghu/unicorne/f411
diff --git a/keyboards/ymdk/ymd40/air40/info.json b/keyboards/ymdk/ymd40/air40/info.json
index 349c117611..6fd647bc93 100644
--- a/keyboards/ymdk/ymd40/air40/info.json
+++ b/keyboards/ymdk/ymd40/air40/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0911",
        "device_version": "0.0.1"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["F1", "F0", "B0", "C7", "F4", "F5", "F6", "F7", "D4", "D6", "B4", "D7"],
        "rows": ["D0", "B3", "B2", "B1"]
diff --git a/keyboards/ymdk/ymd40/air40/rules.mk b/keyboards/ymdk/ymd40/air40/rules.mk
index 3adfcf796b..f408492aa8 100644
--- a/keyboards/ymdk/ymd40/air40/rules.mk
+++ b/keyboards/ymdk/ymd40/air40/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no
 RGBLIGHT_SUPPORTED = no
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 AUDIO_ENABLE = no           # Audio output
 AUDIO_SUPPORTED = no
 KEY_LOCK_ENABLE = no
diff --git a/keyboards/yncognito/batpad/info.json b/keyboards/yncognito/batpad/info.json
index 7eb388c4d0..ec57403a66 100644
--- a/keyboards/yncognito/batpad/info.json
+++ b/keyboards/yncognito/batpad/info.json
@@ -11,6 +11,9 @@
    "ws2812": {
        "pin": "B5"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["F1", "F0", "D5", "D3"],
        "rows": ["F4", "C7"]
diff --git a/keyboards/yncognito/batpad/rules.mk b/keyboards/yncognito/batpad/rules.mk
index 8009de294e..a72bbe128b 100644
--- a/keyboards/yncognito/batpad/rules.mk
+++ b/keyboards/yncognito/batpad/rules.mk
@@ -9,5 +9,4 @@ COMMAND_ENABLE = no         # Commands for debug and configuration
 NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no        # Enable keyboard backlight functionality
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 AUDIO_ENABLE = no            # Audio output
diff --git a/keyboards/yushakobo/quick17/info.json b/keyboards/yushakobo/quick17/info.json
index 8c59e1a549..15ced83d39 100644
--- a/keyboards/yushakobo/quick17/info.json
+++ b/keyboards/yushakobo/quick17/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0006",
        "device_version": "0.0.1"
    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
    "matrix_pins": {
        "cols": ["F5", "D4", "E6", "F7", "C6", "D7"],
        "rows": ["F4", "B3", "B6"]
diff --git a/keyboards/yushakobo/quick17/rules.mk b/keyboards/yushakobo/quick17/rules.mk
index a73ebf1d09..70ab5e2744 100644
--- a/keyboards/yushakobo/quick17/rules.mk
+++ b/keyboards/yushakobo/quick17/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 RGB_MATRIX_CUSTOM_KB = yes
 SRC += quick17_prefs.c
author	Ryan <fauxpark@gmail.com>	2023-04-08 18:08:08 +1000
committer	GitHub <noreply@github.com>	2023-04-08 18:08:08 +1000
commit	522048725f6b076bdad1251243c65dd2acf6595d (patch)
tree	413c5356450048e072fc8b2528ea887ee180edc7
parent	10fc6c4cd6d7463737801430e8c13b347e1b85c7 (diff)