diff --git a/keyboards/bluebell/swoop/keymaps/t4corun/rules.mk b/keyboards/bluebell/swoop/keymaps/t4corun/rules.mk
index abc1537a..d32190cc 100644
--- a/keyboards/bluebell/swoop/keymaps/t4corun/rules.mk
+++ b/keyboards/bluebell/swoop/keymaps/t4corun/rules.mk
@@ -1,9 +1,10 @@
 # override userspace defaults
-RGB_MATRIX_ENABLE = ws2812
+RGB_MATRIX_ENABLE = yes
 OLED_ENABLE = yes
 
 # override keyboard defaults
 #	qmk_firmware\keyboards\bluebell\swoop\rules.mk
 ENCODER_ENABLE = yes
 ENCODER_MAP_ENABLE = yes
-CONVERT_TO = blok
\ No newline at end of file
+CONVERT_TO = blok
+RGB_MATRIX_DRIVER = ws2812
\ No newline at end of file
diff --git a/users/t4corun/config/rgbmatrix_config.h b/users/t4corun/config/rgbmatrix_config.h
index f3faca0e..ef0013f8 100644
--- a/users/t4corun/config/rgbmatrix_config.h
+++ b/users/t4corun/config/rgbmatrix_config.h
@@ -17,14 +17,14 @@ Explore These
 
 
 //Clear variables we plan to use that might be set elsewhere
-#undef RGB_DISABLE_WHEN_USB_SUSPENDED
+#undef RGB_MATRIX_SLEEP
 #undef RGB_MATRIX_DEFAULT_HUE
 #undef RGB_MATRIX_DEFAULT_SAT
 #undef RGB_MATRIX_DEFAULT_VAL
 #undef RGB_MATRIX_DEFAULT_SPD
 #undef RGB_MATRIX_MAXIMUM_BRIGHTNESS
-#undef RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#undef RGB_MATRIX_KEYPRESSES
+//#undef RGB_MATRIX_FRAMEBUFFER_EFFECTS
+//#undef RGB_MATRIX_KEYPRESSES
 #undef RGB_MATRIX_TYPING_HEATMAP_DECREASE_DELAY_MS
 #undef RGB_MATRIX_TYPING_HEATMAP_SPREAD
 #undef RGB_MATRIX_TYPING_HEATMAP_AREA_LIMIT
@@ -56,6 +56,7 @@ Explore These
 #undef ENABLE_RGB_MATRIX_DUAL_BEACON
 #undef ENABLE_RGB_MATRIX_RAINBOW_BEACON
 #undef ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#undef ENABLE_RGB_MATRIX_FLOWER_BLOOMING
 #undef ENABLE_RGB_MATRIX_RAINDROPS
 #undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
 #undef ENABLE_RGB_MATRIX_HUE_BREATHING
@@ -64,6 +65,10 @@ Explore These
 #undef ENABLE_RGB_MATRIX_PIXEL_FRACTAL
 #undef ENABLE_RGB_MATRIX_PIXEL_FLOW
 #undef ENABLE_RGB_MATRIX_PIXEL_RAIN
+#undef ENABLE_RGB_MATRIX_STARLIGHT
+#undef ENABLE_RGB_MATRIX_STARLIGHT_DUAL_HUE
+#undef ENABLE_RGB_MATRIX_STARLIGHT_DUAL_SAT
+#undef ENABLE_RGB_MATRIX_RIVERFLOW
 //These modes also require the RGB_MATRIX_FRAMEBUFFER_EFFECTS define to be available.
 #undef ENABLE_RGB_MATRIX_TYPING_HEATMAP
 #undef ENABLE_RGB_MATRIX_DIGITAL_RAIN
@@ -89,8 +94,8 @@ Explore These
 
 
 //Set common configuration for all keyboards
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#define RGB_MATRIX_SLEEP
+//#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 
 #define RGB_MATRIX_DEFAULT_HUE 4
 #define RGB_MATRIX_DEFAULT_SAT 79
@@ -100,8 +105,9 @@ Explore These
 //Set per keyboard configuration
 #if defined(KEYBOARD_bastardkb_charybdis_3x5) || defined(KEYBOARD_dztech_dz60rgb_v2_1) || defined(KEYBOARD_bluebell_swoop)
 #   define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
-#   define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#   define RGB_MATRIX_KEYPRESSES
+//#   define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+//#   define RGB_MATRIX_KEYPRESSES
+
 //no extra defines required
 #   define ENABLE_RGB_MATRIX_BREATHING
 #   define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
diff --git a/users/t4corun/rules.mk b/users/t4corun/rules.mk
index b5c4753c..33821418 100644
--- a/users/t4corun/rules.mk
+++ b/users/t4corun/rules.mk
@@ -52,10 +52,6 @@ ifeq ($(strip $(RGB_MATRIX_ENABLE)), yes)
 	SRC += features/rgbmatrix.c
 endif
 
-ifeq ($(strip $(RGB_MATRIX_ENABLE)), ws2812)
-	SRC += features/rgbmatrix.c
-endif
-
 ifeq ($(strip $(MOUSEKEY_ENABLE)), yes)
 	SRC += features/mouse.c
 endif