8 files changed, 12 insertions, 14 deletions
diff --git a/keyboards/0xcb/splaytoraid/config.h b/keyboards/0xcb/splaytoraid/config.h
index 01eb276069..2f2eb82fee 100644
--- a/keyboards/0xcb/splaytoraid/config.h
+++ b/keyboards/0xcb/splaytoraid/config.h
@@ -3,8 +3,6 @@
 
 #pragma once
 
-#define RGB_DI_PIN D0
-
 #define RGB_MATRIX_LED_COUNT 18
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
 #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_BREATHING
diff --git a/keyboards/0xcb/splaytoraid/info.json b/keyboards/0xcb/splaytoraid/info.json
index 7b8177df9f..cb69db25c3 100644
--- a/keyboards/0xcb/splaytoraid/info.json
+++ b/keyboards/0xcb/splaytoraid/info.json
@@ -32,11 +32,7 @@
     "encoder": {
         "enabled": true,
         "rotary": [
-            {
-                "pin_a": "B5",
-                "pin_b": "B6",
-                "resolution": 4
-            }
+            {"pin_a": "B5", "pin_b": "B6", "resolution": 4}
         ]
     },
     "rgb_matrix": {
@@ -62,6 +58,9 @@
             { "flags": 4, "matrix": [0, 3], "x": 163, "y": 64 }
         ]
     },
+    "ws2812": {
+        "pin": "D0"
+    },
     "layouts": {
         "LAYOUT_36": {
             "layout": [
diff --git a/keyboards/0xcb/splaytoraid/keymaps/default/keymap.c b/keyboards/0xcb/splaytoraid/keymaps/default/keymap.c
index e9dc9a50a0..dbc7e417f7 100644
--- a/keyboards/0xcb/splaytoraid/keymaps/default/keymap.c
+++ b/keyboards/0xcb/splaytoraid/keymaps/default/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
     [_BASE] =   { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
     [_LOWER] =  { ENCODER_CCW_CW(KC_MPRV, KC_MNXT) },
     [_RAISE] =  { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
diff --git a/keyboards/0xcb/splaytoraid/keymaps/pi/config.h b/keyboards/0xcb/splaytoraid/keymaps/pi/config.h
index d955f36ab3..52e39aef65 100644
--- a/keyboards/0xcb/splaytoraid/keymaps/pi/config.h
+++ b/keyboards/0xcb/splaytoraid/keymaps/pi/config.h
@@ -5,9 +5,6 @@
 
 #define TAPPING_TERM 180
 
-// Prevent normal rollover on alphas from accidentally triggering mods.
-#define IGNORE_MOD_TAP_INTERRUPT
-
 #undef LOCKING_SUPPORT_ENABLE
 #undef LOCKING_RESYNC_ENABLE
 
diff --git a/keyboards/0xcb/splaytoraid/keymaps/pi/keymap.c b/keyboards/0xcb/splaytoraid/keymaps/pi/keymap.c
index cbdfdf16b3..29953eedef 100644
--- a/keyboards/0xcb/splaytoraid/keymaps/pi/keymap.c
+++ b/keyboards/0xcb/splaytoraid/keymaps/pi/keymap.c
@@ -290,7 +290,7 @@ bool caps_word_press_user(uint16_t keycode) {
 // │ e n c o d e r                                             │
 // └───────────────────────────────────────────────────────────┘
 
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
     [_NAVIGATION] =  { ENCODER_CCW_CW(KC_LEFT, KC_RGHT) },
     [_QWERTY] =  { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
     [_COLEMAK] =  { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
diff --git a/keyboards/0xcb/splaytoraid/keymaps/via/keymap.c b/keyboards/0xcb/splaytoraid/keymaps/via/keymap.c
index 900344a42c..852417922e 100644
--- a/keyboards/0xcb/splaytoraid/keymaps/via/keymap.c
+++ b/keyboards/0xcb/splaytoraid/keymaps/via/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   )
 };
 
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
     [_BASE] =   { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
     [_LOWER] =  { ENCODER_CCW_CW(KC_MPRV, KC_MNXT) },
     [_RAISE] =  { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
diff --git a/keyboards/0xcb/splaytoraid/rp2040_ce/info.json b/keyboards/0xcb/splaytoraid/rp2040_ce/info.json
new file mode 100644
index 0000000000..9f0eb51118
--- /dev/null
+++ b/keyboards/0xcb/splaytoraid/rp2040_ce/info.json
@@ -0,0 +1,5 @@
+{
+    "ws2812": {
+        "driver": "vendor"
+    }
+}
diff --git a/keyboards/0xcb/splaytoraid/rp2040_ce/rules.mk b/keyboards/0xcb/splaytoraid/rp2040_ce/rules.mk
index 4b30a1bae0..9617c1460e 100644
--- a/keyboards/0xcb/splaytoraid/rp2040_ce/rules.mk
+++ b/keyboards/0xcb/splaytoraid/rp2040_ce/rules.mk
@@ -1,2 +1 @@
-WS2812_DRIVER = vendor
 CONVERT_TO = rp2040_ce