19 files changed, 144 insertions, 40 deletions
diff --git a/users/curry/config.h b/users/curry/config.h
index 0c96293bd5..d5e1ba7bc5 100644
--- a/users/curry/config.h
+++ b/users/curry/config.h
@@ -7,7 +7,13 @@
 #define USB_POLLING_INTERVAL_MS 1
 
 #if defined(RGBLIGHT_ENABLE)
-#    undef RGBLIGHT_ANIMATIONS
+#    undef RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    undef RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    undef RGBLIGHT_EFFECT_CHRISTMAS
+#    undef RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    undef RGBLIGHT_EFFECT_RGB_TEST
+#    undef RGBLIGHT_EFFECT_ALTERNATING
+#    undef RGBLIGHT_EFFECT_TWINKLE
 #    define RGBLIGHT_SLEEP
 #    define RGBLIGHT_EFFECT_BREATHING
 #    define RGBLIGHT_EFFECT_SNAKE
diff --git a/users/drashna/post_config.h b/users/drashna/post_config.h
index ed80174819..029ffd65ad 100644
--- a/users/drashna/post_config.h
+++ b/users/drashna/post_config.h
@@ -5,7 +5,16 @@
 
 // because layouts seem to not be respecting config.h order atm
 #ifdef RGBLIGHT_ENABLE
-#    undef RGBLIGHT_ANIMATIONS
+#    undef RGBLIGHT_EFFECT_BREATHING
+#    undef RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    undef RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    undef RGBLIGHT_EFFECT_SNAKE
+#    undef RGBLIGHT_EFFECT_KNIGHT
+#    undef RGBLIGHT_EFFECT_CHRISTMAS
+#    undef RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    undef RGBLIGHT_EFFECT_RGB_TEST
+#    undef RGBLIGHT_EFFECT_ALTERNATING
+#    undef RGBLIGHT_EFFECT_TWINKLE
 #    if defined(__AVR__) && (!defined(__AVR_AT90USB1286__) && !defined(RGBLIGHT_ALL_ANIMATIONS))
 #        define RGBLIGHT_EFFECT_BREATHING
 #        define RGBLIGHT_EFFECT_SNAKE
diff --git a/users/greatwizard/config.h b/users/greatwizard/config.h
index 2ee9e50900..8814fa6bdd 100644
--- a/users/greatwizard/config.h
+++ b/users/greatwizard/config.h
@@ -17,7 +17,16 @@
 
 #define TAP_CODE_DELAY 5
 
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 
 #ifdef TAP_DANCE_ENABLE
 #    define TAPPING_TERM 175
diff --git a/users/ishtob/config.h b/users/ishtob/config.h
index 695077528c..af4f1ac5cd 100755
--- a/users/ishtob/config.h
+++ b/users/ishtob/config.h
@@ -25,7 +25,6 @@
 
 /* ws2812 RGB LED
 #define RGB_DI_PIN B5
-#define RGBLIGHT_ANIMATIONS
 #define RGBLED_NUM 8     // Number of LEDs
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 17
diff --git a/users/kageurufu/rules.mk b/users/kageurufu/rules.mk
index df9ae559a6..4bff403a7b 100644
--- a/users/kageurufu/rules.mk
+++ b/users/kageurufu/rules.mk
@@ -12,4 +12,3 @@ EXTRAKEY_ENABLE = yes
 COMMAND_ENABLE = yes
 CONSOLE_ENABLE = yes
 RGBLIGHT_ENABLE = no
-RGBLIGHT_ANIMATIONS = yes
diff --git a/users/konstantin/config.h b/users/konstantin/config.h
index d429452363..f5247cf5a9 100644
--- a/users/konstantin/config.h
+++ b/users/konstantin/config.h
@@ -31,7 +31,16 @@
 #define MOUSEKEY_WHEEL_TIME_TO_MAX 50
 
 // RGB lighting
-#undef  RGBLIGHT_ANIMATIONS
+#undef RGBLIGHT_EFFECT_BREATHING
+#undef RGBLIGHT_EFFECT_RAINBOW_MOOD
+#undef RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#undef RGBLIGHT_EFFECT_SNAKE
+#undef RGBLIGHT_EFFECT_KNIGHT
+#undef RGBLIGHT_EFFECT_CHRISTMAS
+#undef RGBLIGHT_EFFECT_STATIC_GRADIENT
+#undef RGBLIGHT_EFFECT_RGB_TEST
+#undef RGBLIGHT_EFFECT_ALTERNATING
+#undef RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/users/kuchosauronad0/config.h b/users/kuchosauronad0/config.h
index 8502031f02..9315f879ae 100644
--- a/users/kuchosauronad0/config.h
+++ b/users/kuchosauronad0/config.h
@@ -19,8 +19,17 @@
 #endif // !AUDIO_ENABLE
 
 #ifdef RGBLIGHT_ENABLE
-#  define RGBLIGHT_SLEEP
-#  undef  RGBLIGHT_ANIMATIONS
+#  undef RGBLIGHT_SLEEP
+#undef RGBLIGHT_EFFECT_BREATHING
+#undef RGBLIGHT_EFFECT_RAINBOW_MOOD
+#undef RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#undef RGBLIGHT_EFFECT_SNAKE
+#undef RGBLIGHT_EFFECT_KNIGHT
+#undef RGBLIGHT_EFFECT_CHRISTMAS
+#undef RGBLIGHT_EFFECT_STATIC_GRADIENT
+#undef RGBLIGHT_EFFECT_RGB_TEST
+#undef RGBLIGHT_EFFECT_ALTERNATING
+#undef RGBLIGHT_EFFECT_TWINKLE
 #  define RGBLIGHT_HUE_STEP 16
 #  define RGBLIGHT_SAT_STEP 16
 #  define RGBLIGHT_VAL_STEP 16
@@ -44,12 +53,12 @@
 #if defined(LEADER_ENABLE)
 #  define LEADER_PER_KEY_TIMING
 #  define LEADER_TIMEOUT 250
-#endif // !LEADER_ENABLE 
+#endif // !LEADER_ENABLE
 
 #if defined(COMBO_ENABLE)
 #  define COMBO_COUNT 4
 #  define COMBO_TERM 150
-#endif // !COMBO_ENABLE 
+#endif // !COMBO_ENABLE
 
 #if defined(NKRO_ENABLE)
 #  define FORCE_NKRO
@@ -82,5 +91,4 @@
 
 #define TAP_CODE_DELAY 5
 
-#define MACRO_TIMER 5 
-
+#define MACRO_TIMER 5
diff --git a/users/mechmerlin/config.h b/users/mechmerlin/config.h
index 459c181673..ec3b3e81e8 100644
--- a/users/mechmerlin/config.h
+++ b/users/mechmerlin/config.h
@@ -2,7 +2,16 @@
 
 #ifdef RGBLIGHT_ENABLE
     #define RGBLIGHT_SLEEP
-    #define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #endif // RGBLIGHT_ENABLE
 
 #ifdef RGB_MATRIX_ENABLE
diff --git a/users/miles2go/config.h b/users/miles2go/config.h
index 2a1d6504d6..dad7acad10 100644
--- a/users/miles2go/config.h
+++ b/users/miles2go/config.h
@@ -2,7 +2,16 @@
 
 #ifdef RGBLIGHT_ENABLE
 #define RGBLIGHT_SLEEP
-#undef RGBLIGHT_ANIMATIONS
+#undef RGBLIGHT_EFFECT_RAINBOW_MOOD
+#undef RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#undef RGBLIGHT_EFFECT_SNAKE
+#undef RGBLIGHT_EFFECT_KNIGHT
+#undef RGBLIGHT_EFFECT_CHRISTMAS
+#undef RGBLIGHT_EFFECT_STATIC_GRADIENT
+#undef RGBLIGHT_EFFECT_RGB_TEST
+#undef RGBLIGHT_EFFECT_ALTERNATING
+#undef RGBLIGHT_EFFECT_TWINKLE
+
 #define RGBLIGHT_EFFECT_BREATHING
 #endif // RGBLIGHT_ENABLE
 
@@ -33,11 +42,11 @@
 #define BABL_MODSWAP
 #define BABL_MOVE // Uncomment to add basic cursor movement
 #define BABL_OSKEYS // This adds Cut, paste, window movement and common OS shortcuts
-#define BABL_BROWSER // Browser shortcuts, with Chrome/Firefox as the default. 
-// edit the appropriate OS config file to enable Safari, Edge, vimpirator &etc. 
+#define BABL_BROWSER // Browser shortcuts, with Chrome/Firefox as the default.
+// edit the appropriate OS config file to enable Safari, Edge, vimpirator &etc.
 #define BABL_APP // Application specific settings this has sub-options.
 #define BABL_APP_CELLS // spreadsheets and tables
-#define BABL_APP_EDITOR // Fancy editor commands 
+#define BABL_APP_EDITOR // Fancy editor commands
 #define BABL_APP_WINDOWSPLITTING // splitting frames & windows
 
 //All OSes
diff --git a/users/miles2go/keymaps/handwired/ms_sculpt_mobile/config.h b/users/miles2go/keymaps/handwired/ms_sculpt_mobile/config.h
index bedc08fc02..552e98ba2e 100644
--- a/users/miles2go/keymaps/handwired/ms_sculpt_mobile/config.h
+++ b/users/miles2go/keymaps/handwired/ms_sculpt_mobile/config.h
@@ -14,7 +14,7 @@
 #define RGBLIGHT_COLOR_VI 0x00,0x90,0x00
 #define RGBLIGHT_COLOR_READMUX 0x33,0xFF,0x33 // green screen
 #define RGBLIGHT_COLOR_CHROMEOS 0xf4,0xc2,0xd // google yellows
-#endif 
+#endif
 
 #endif // bablpaste
 
@@ -29,8 +29,17 @@
 #define RGBLIGHT_COLOR_LAYER_2 0xFF, 0x00, 0x00  // symbol
 #define RGBLIGHT_COLOR_LAYER_3 0x00, 0xFF, 0xFF  // move
 #define RGBLIGHT_COLOR_LAYER_4 0xFF, 0x00, 0xFF  // delmove
-#define RGBLIGHT_COLOR_LAYER_5 0x00, 0xFF, 0xFF 
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_COLOR_LAYER_5 0x00, 0xFF, 0xFF
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGB_LIGHT_EFFECT_BREATHE_MAX 200
 #define RGBLIGHT_RAINBOW_SWIRL_RANGE 127
 #endif // rgblight
diff --git a/users/mtei/config.h b/users/mtei/config.h
index b245d7cff2..77074357e8 100644
--- a/users/mtei/config.h
+++ b/users/mtei/config.h
@@ -6,7 +6,6 @@
 #pragma once
 
 // Selection of RGBLIGHT MODE to use.
-#undef RGBLIGHT_ANIMATIONS
 #undef RGBLIGHT_EFFECT_BREATHING
 #undef RGBLIGHT_EFFECT_RAINBOW_MOOD
 #undef RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -16,6 +15,7 @@
 #undef RGBLIGHT_EFFECT_STATIC_GRADIENT
 #undef RGBLIGHT_EFFECT_RGB_TEST
 #undef RGBLIGHT_EFFECT_ALTERNATING
+#undef RGBLIGHT_EFFECT_TWINKLE
 
 #if defined(LED_ANIMATIONS)
 #    if LED_ANIMATIONS_LEVEL > 1
diff --git a/users/muppetjones/config.h b/users/muppetjones/config.h
index e8afa9d8c5..3dd4d1b1b6 100644
--- a/users/muppetjones/config.h
+++ b/users/muppetjones/config.h
@@ -17,7 +17,6 @@
 #pragma once
 
 #ifdef RGBLIGHT_ENABLE
-// #    define RGBLIGHT_ANIMATIONS
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 16
 #    define RGBLIGHT_VAL_STEP 16
diff --git a/users/muppetjones/readme/rgblayers.md b/users/muppetjones/readme/rgblayers.md
index fb69800177..862ba75941 100644
--- a/users/muppetjones/readme/rgblayers.md
+++ b/users/muppetjones/readme/rgblayers.md
@@ -14,7 +14,6 @@ This bit of code allows you to define layer lighting that respects your current
 
    ```
    #ifdef RGBLIGHT_ENABLE
-   // #    define RGBLIGHT_ANIMATIONS
    #    define RGBLIGHT_HUE_STEP 8
    #    define RGBLIGHT_SAT_STEP 16
    #    define RGBLIGHT_VAL_STEP 16
diff --git a/users/rverst/config.h b/users/rverst/config.h
index f5cb5c76fd..52e7c861ca 100644
--- a/users/rverst/config.h
+++ b/users/rverst/config.h
@@ -18,9 +18,16 @@
 
 #ifdef RGBLIGHT_ENABLE
 #    define RGBLIGHT_SLEEP
-#    ifdef RGBLIGHT_ANIMATIONS
-#        undef RGBLIGHT_ANIMATIONS
-#    endif
+#    undef RGBLIGHT_EFFECT_BREATHING
+#    undef RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    undef RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    undef RGBLIGHT_EFFECT_SNAKE
+#    undef RGBLIGHT_EFFECT_KNIGHT
+#    undef RGBLIGHT_EFFECT_CHRISTMAS
+#    undef RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    undef RGBLIGHT_EFFECT_RGB_TEST
+#    undef RGBLIGHT_EFFECT_ALTERNATING
+#    undef RGBLIGHT_EFFECT_TWINKLE
 #    define RGBLIGHT_SLEEP
 #    define RGBLIGHT_EFFECT_BREATHING
 #    define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/users/sethBarberee/config.h b/users/sethBarberee/config.h
index c97d39151b..00cb96d3e0 100644
--- a/users/sethBarberee/config.h
+++ b/users/sethBarberee/config.h
@@ -26,16 +26,23 @@
 # ifndef RGBLIGHT_VAL_STEP
 #   define RGBLIGHT_VAL_STEP 8
 #endif
-// Trim animations I don't use/like
-#   ifdef RGBLIGHT_ANIMATIONS
-#       undef RGBLIGHT_ANIMATIONS
-#   endif
-#   define RGBLIGHT_EFFECT_BREATHING
-#   define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#   define RGBLIGHT_EFFECT_TWINKLE
-#   ifndef CAPS_LOCK_MODE
-#       define CAPS_LOCK_MODE RGBLIGHT_MODE_STATIC_LIGHT
-#   endif
+ // Trim animations I don't use/like
+#    undef RGBLIGHT_EFFECT_BREATHING
+#    undef RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    undef RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    undef RGBLIGHT_EFFECT_SNAKE
+#    undef RGBLIGHT_EFFECT_KNIGHT
+#    undef RGBLIGHT_EFFECT_CHRISTMAS
+#    undef RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    undef RGBLIGHT_EFFECT_RGB_TEST
+#    undef RGBLIGHT_EFFECT_ALTERNATING
+#    undef RGBLIGHT_EFFECT_TWINKLE
+#    define RGBLIGHT_EFFECT_BREATHING
+#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    define RGBLIGHT_EFFECT_TWINKLE
+#    ifndef CAPS_LOCK_MODE
+#        define CAPS_LOCK_MODE RGBLIGHT_MODE_STATIC_LIGHT
+#    endif
 #endif // RGBLIGHT_ENABLE
 
 #ifndef AUDIO_ENABLE
diff --git a/users/spidey3/config.h b/users/spidey3/config.h
index 36d59b6a5d..808de4d591 100644
--- a/users/spidey3/config.h
+++ b/users/spidey3/config.h
@@ -14,7 +14,16 @@
 #    define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
 #    define RGBLIGHT_STARTUP_ANIMATION
 
-#    undef RGBLIGHT_ANIMATIONS
+#    undef RGBLIGHT_EFFECT_BREATHING
+#    undef RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    undef RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    undef RGBLIGHT_EFFECT_SNAKE
+#    undef RGBLIGHT_EFFECT_KNIGHT
+#    undef RGBLIGHT_EFFECT_CHRISTMAS
+#    undef RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    undef RGBLIGHT_EFFECT_RGB_TEST
+#    undef RGBLIGHT_EFFECT_ALTERNATING
+#    undef RGBLIGHT_EFFECT_TWINKLE
 #    define RGBLIGHT_EFFECT_BREATHING
 #    define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/users/tominabox1/config.h b/users/tominabox1/config.h
index 5fd8ba3a74..cf5d317fb7 100644
--- a/users/tominabox1/config.h
+++ b/users/tominabox1/config.h
@@ -15,7 +15,16 @@
   #ifdef RGBLIGHT_ENABLE
     #undef RGBLED_NUM
     #define RGBLED_NUM 50
-    #define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
     #define RGBLIGHT_SLEEP
   #endif // RGBLIGHT_ENABLE
 
diff --git a/users/uqs/config.h b/users/uqs/config.h
index b8a140fe87..5530417de1 100644
--- a/users/uqs/config.h
+++ b/users/uqs/config.h
@@ -4,7 +4,6 @@
 
 #ifdef RGBLIGHT_ENABLE
 #    define RGBLIGHT_SLEEP
-//#    define RGBLIGHT_ANIMATIONS      // disabled to save space
 #    define RGBLIGHT_LAYERS
 #    define RGBLIGHT_MAX_LAYERS 8      // default is 16
 #    define RGBLIGHT_DISABLE_KEYCODES  // RGB_foo keys no longer work, saves 600 bytes
diff --git a/users/yanfali/config.h b/users/yanfali/config.h
index a39e95c9dd..fa5ec42c09 100644
--- a/users/yanfali/config.h
+++ b/users/yanfali/config.h
@@ -14,7 +14,16 @@
 #undef RGBLED_NUM
 #define RGBLED_NUM 20
 
-#undef RGBLIGHT_ANIMATIONS
+#undef RGBLIGHT_EFFECT_BREATHING
+#undef RGBLIGHT_EFFECT_RAINBOW_MOOD
+#undef RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#undef RGBLIGHT_EFFECT_SNAKE
+#undef RGBLIGHT_EFFECT_KNIGHT
+#undef RGBLIGHT_EFFECT_CHRISTMAS
+#undef RGBLIGHT_EFFECT_STATIC_GRADIENT
+#undef RGBLIGHT_EFFECT_RGB_TEST
+#undef RGBLIGHT_EFFECT_ALTERNATING
+#undef RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL