diff --git a/quantum/rgblight.c b/quantum/rgblight.c
index a0a01d2cd5..08515564bc 100644
--- a/quantum/rgblight.c
+++ b/quantum/rgblight.c
@@ -34,38 +34,14 @@
   #include "velocikey.h"
 #endif
 
-#ifdef RGBLIGHT_SPLIT
-  /* for split keyboard */
-  #define RGBLIGHT_SPLIT_SET_CHANGE_MODE         rgblight_status.change_flags |= RGBLIGHT_STATUS_CHANGE_MODE
-  #define RGBLIGHT_SPLIT_SET_CHANGE_HSVS         rgblight_status.change_flags |= RGBLIGHT_STATUS_CHANGE_HSVS
-  #define RGBLIGHT_SPLIT_SET_CHANGE_TIMER_ENABLE rgblight_status.change_flags |= RGBLIGHT_STATUS_CHANGE_TIMER
-  #define RGBLIGHT_SPLIT_ANIMATION_TICK          rgblight_status.change_flags |= RGBLIGHT_STATUS_ANIMATION_TICK
-#else
-  #define RGBLIGHT_SPLIT_SET_CHANGE_MODE
-  #define RGBLIGHT_SPLIT_SET_CHANGE_HSVS
-  #define RGBLIGHT_SPLIT_SET_CHANGE_TIMER_ENABLE
-  #define RGBLIGHT_SPLIT_ANIMATION_TICK
-#endif
-
 #define _RGBM_SINGLE_STATIC(sym)   RGBLIGHT_MODE_ ## sym,
 #define _RGBM_SINGLE_DYNAMIC(sym)
 #define _RGBM_MULTI_STATIC(sym)    RGBLIGHT_MODE_ ## sym,
 #define _RGBM_MULTI_DYNAMIC(sym)
-#define _RGBM_TMP_STATIC(sym, msym)      RGBLIGHT_MODE_ ## sym,
-#define _RGBM_TMP_DYNAMIC(sym, msym)
+#define _RGBM_TMP_STATIC(sym)      RGBLIGHT_MODE_ ## sym,
+#define _RGBM_TMP_DYNAMIC(sym)
 static uint8_t static_effect_table [] = {
-#include "rgblight_modes.h"
-};
-
-#define _RGBM_SINGLE_STATIC(sym)   RGBLIGHT_MODE_ ## sym,
-#define _RGBM_SINGLE_DYNAMIC(sym)  RGBLIGHT_MODE_ ## sym,
-#define _RGBM_MULTI_STATIC(sym)    RGBLIGHT_MODE_ ## sym,
-#define _RGBM_MULTI_DYNAMIC(sym)   RGBLIGHT_MODE_ ## sym,
-#define _RGBM_TMP_STATIC(sym, msym)  RGBLIGHT_MODE_ ## msym,
-#define _RGBM_TMP_DYNAMIC(sym, msym) RGBLIGHT_MODE_ ## msym,
-static uint8_t mode_base_table [] = {
-    0, // RGBLIGHT_MODE_zero
-#include "rgblight_modes.h"
+#include "rgblight.h"
 };
 
 static inline int is_static_effect(uint8_t mode) {
@@ -85,14 +61,10 @@ const uint16_t RGBLED_GRADIENT_RANGES[] PROGMEM = {360, 240, 180, 120, 90};
 #endif
 
 rgblight_config_t rgblight_config;
-rgblight_status_t rgblight_status = { .timer_enabled = false };
 bool is_rgblight_initialized = false;
 
-#ifdef RGBLIGHT_USE_TIMER
-animation_status_t animation_status = {};
-#endif
-
 LED_TYPE led[RGBLED_NUM];
+bool rgblight_timer_enabled = false;
 
 static uint8_t clipping_start_pos = 0;
 static uint8_t clipping_num_leds = RGBLED_NUM;
@@ -345,7 +317,6 @@ void rgblight_mode_eeprom_helper(uint8_t mode, bool write_to_eeprom) {
   } else {
     rgblight_config.mode = mode;
   }
-  RGBLIGHT_SPLIT_SET_CHANGE_MODE;
   if (write_to_eeprom) {
     eeconfig_update_rgblight(rgblight_config.raw);
     xprintf("rgblight mode [EEPROM]: %u\n", rgblight_config.mode);
@@ -414,7 +385,6 @@ void rgblight_disable(void) {
 #ifdef RGBLIGHT_USE_TIMER
       rgblight_timer_disable();
 #endif
-  RGBLIGHT_SPLIT_SET_CHANGE_MODE;
   wait_ms(50);
   rgblight_set();
 }
@@ -425,7 +395,6 @@ void rgblight_disable_noeeprom(void) {
 #ifdef RGBLIGHT_USE_TIMER
     rgblight_timer_disable();
 #endif
-  RGBLIGHT_SPLIT_SET_CHANGE_MODE;
   wait_ms(50);
   rgblight_set();
 }
@@ -532,13 +501,11 @@ void rgblight_decrease_val(void) {
 }
 void rgblight_increase_speed(void) {
     rgblight_config.speed = increment( rgblight_config.speed, 1, 0, 3 );
-    //RGBLIGHT_SPLIT_SET_CHANGE_HSVS; // NEED?
     eeconfig_update_rgblight(rgblight_config.raw);//EECONFIG needs to be increased to support this
 }
 
 void rgblight_decrease_speed(void) {
     rgblight_config.speed = decrement( rgblight_config.speed, 1, 0, 3 );
-    //RGBLIGHT_SPLIT_SET_CHANGE_HSVS; // NEED??
     eeconfig_update_rgblight(rgblight_config.raw);//EECONFIG needs to be increased to support this
 }
 
@@ -553,10 +520,6 @@ void rgblight_sethsv_noeeprom_old(uint16_t hue, uint8_t sat, uint8_t val) {
 
 void rgblight_sethsv_eeprom_helper(uint16_t hue, uint8_t sat, uint8_t val, bool write_to_eeprom) {
   if (rgblight_config.enable) {
-    rgblight_status.base_mode = mode_base_table[rgblight_config.mode];
-#ifdef RGBLIGHT_USE_TIMER
-    animation_status.restart = true;
-#endif
     if (rgblight_config.mode == RGBLIGHT_MODE_STATIC_LIGHT) {
       // same static color
       LED_TYPE tmp_led;
@@ -567,30 +530,33 @@ void rgblight_sethsv_eeprom_helper(uint16_t hue, uint8_t sat, uint8_t val, bool
       if ( 1 == 0 ) { //dummy
       }
 #ifdef RGBLIGHT_EFFECT_BREATHING
-      else if (rgblight_status.base_mode == RGBLIGHT_MODE_BREATHING ) {
+      else if (rgblight_config.mode >= RGBLIGHT_MODE_BREATHING &&
+          rgblight_config.mode <= RGBLIGHT_MODE_BREATHING_end) {
         // breathing mode, ignore the change of val, use in memory value instead
         val = rgblight_config.val;
       }
 #endif
 #ifdef RGBLIGHT_EFFECT_RAINBOW_MOOD
-      else if (rgblight_status.base_mode == RGBLIGHT_MODE_RAINBOW_MOOD) {
+      else if (rgblight_config.mode >= RGBLIGHT_MODE_RAINBOW_MOOD &&
+                  rgblight_config.mode <= RGBLIGHT_MODE_RAINBOW_MOOD_end) {
         // rainbow mood, ignore the change of hue
         hue = rgblight_config.hue;
       }
 #endif
 #ifdef RGBLIGHT_EFFECT_RAINBOW_SWIRL
-      else if (rgblight_status.base_mode == RGBLIGHT_MODE_RAINBOW_SWIRL) {
+      else if (rgblight_config.mode >= RGBLIGHT_MODE_RAINBOW_SWIRL &&
+               rgblight_config.mode <= RGBLIGHT_MODE_RAINBOW_SWIRL_end) {
         // rainbow swirl, ignore the change of hue
         hue = rgblight_config.hue;
       }
 #endif
 #ifdef RGBLIGHT_EFFECT_STATIC_GRADIENT
-      else if (rgblight_status.base_mode == RGBLIGHT_MODE_STATIC_GRADIENT) {
+      else if (rgblight_config.mode >= RGBLIGHT_MODE_STATIC_GRADIENT &&
+               rgblight_config.mode <= RGBLIGHT_MODE_STATIC_GRADIENT_end) {
         // static gradient
         uint16_t _hue;
-        uint8_t delta = rgblight_config.mode - rgblight_status.base_mode;
-        int8_t direction = (delta % 2) ? -1 : 1;
-        uint16_t range = pgm_read_word(&RGBLED_GRADIENT_RANGES[delta / 2]);
+        int8_t direction = ((rgblight_config.mode - RGBLIGHT_MODE_STATIC_GRADIENT) % 2) ? -1 : 1;
+        uint16_t range = pgm_read_word(&RGBLED_GRADIENT_RANGES[(rgblight_config.mode - RGBLIGHT_MODE_STATIC_GRADIENT) / 2]);
         for (uint8_t i = 0; i < RGBLED_NUM; i++) {
           _hue = (range / RGBLED_NUM * i * direction + hue + 360) % 360;
           dprintf("rgblight rainbow set hsv: %u,%u,%d,%u\n", i, _hue, direction, range);
@@ -600,13 +566,6 @@ void rgblight_sethsv_eeprom_helper(uint16_t hue, uint8_t sat, uint8_t val, bool
       }
 #endif
     }
-#ifdef RGBLIGHT_SPLIT
-    if( rgblight_config.hue != hue ||
-        rgblight_config.sat != sat ||
-        rgblight_config.val != val ) {
-        RGBLIGHT_SPLIT_SET_CHANGE_HSVS;
-    }
-#endif
     rgblight_config.hue = hue;
     rgblight_config.sat = sat;
     rgblight_config.val = val;
@@ -748,59 +707,10 @@ void rgblight_set(void) {
 }
 #endif
 
-#ifdef RGBLIGHT_SPLIT
-/* for split keyboard master side */
-uint8_t rgblight_get_change_flags(void) {
-    return rgblight_status.change_flags;
-}
-
-void rgblight_clear_change_flags(void) {
-    rgblight_status.change_flags = 0;
-}
-
-void rgblight_get_syncinfo(rgblight_syncinfo_t *syncinfo) {
-    syncinfo->config = rgblight_config;
-    syncinfo->status = rgblight_status;
-}
-
-/* for split keyboard slave side */
-void rgblight_update_sync(rgblight_syncinfo_t *syncinfo, bool write_to_eeprom) {
-    if (syncinfo->status.change_flags & RGBLIGHT_STATUS_CHANGE_MODE) {
-        if (syncinfo->config.enable) {
-            rgblight_config.enable = 1; // == rgblight_enable_noeeprom();
-            rgblight_mode_eeprom_helper(syncinfo->config.mode, write_to_eeprom);
-        } else {
-            rgblight_disable_noeeprom();
-        }
-    }
-    if (syncinfo->status.change_flags & RGBLIGHT_STATUS_CHANGE_HSVS) {
-        rgblight_sethsv_eeprom_helper(syncinfo->config.hue, syncinfo->config.sat, syncinfo->config.val, write_to_eeprom);
-        // rgblight_config.speed = config->speed; // NEED???
-    }
-  #ifdef RGBLIGHT_USE_TIMER
-    if (syncinfo->status.change_flags & RGBLIGHT_STATUS_CHANGE_TIMER) {
-        if (syncinfo->status.timer_enabled) {
-            rgblight_timer_enable();
-        } else {
-            rgblight_timer_disable();
-        }
-    }
-    #ifndef RGBLIGHT_SPLIT_NO_ANIMATION_SYNC
-    if (syncinfo->status.change_flags & RGBLIGHT_STATUS_ANIMATION_TICK) {
-        animation_status.restart = true;
-    }
-    #endif /* RGBLIGHT_SPLIT_NO_ANIMATION_SYNC */
-  #endif /* RGBLIGHT_USE_TIMER */
-}
-#endif /* RGBLIGHT_SPLIT */
-
 #ifdef RGBLIGHT_USE_TIMER
 
-typedef void (*effect_func_t)(animation_status_t *anim);
-
-// Animation timer -- use system timer (AVR Timer0)
+// Animation timer -- AVR Timer3
 void rgblight_timer_init(void) {
-  // OLD!!!! Animation timer -- AVR Timer3
   // static uint8_t rgblight_timer_is_init = 0;
   // if (rgblight_timer_is_init) {
   //   return;
@@ -816,29 +726,19 @@ void rgblight_timer_init(void) {
   // OCR3AL = RGBLED_TIMER_TOP & 0xff;
   // SREG = sreg;
 
-  rgblight_status.timer_enabled = false;
-  RGBLIGHT_SPLIT_SET_CHANGE_TIMER_ENABLE;
+  rgblight_timer_enabled = true;
 }
 void rgblight_timer_enable(void) {
-  if( !is_static_effect(rgblight_config.mode) ) {
-      rgblight_status.timer_enabled = true;
-  }
-  animation_status.last_timer = timer_read();
-  RGBLIGHT_SPLIT_SET_CHANGE_TIMER_ENABLE;
-  dprintf("rgblight timer enabled.\n");
+  rgblight_timer_enabled = true;
+  dprintf("TIMER3 enabled.\n");
 }
 void rgblight_timer_disable(void) {
-  rgblight_status.timer_enabled = false;
-  RGBLIGHT_SPLIT_SET_CHANGE_TIMER_ENABLE;
-  dprintf("rgblight timer disable.\n");
+  rgblight_timer_enabled = false;
+  dprintf("TIMER3 disabled.\n");
 }
 void rgblight_timer_toggle(void) {
-  dprintf("rgblight timer toggle.\n");
-  if(rgblight_status.timer_enabled) {
-      rgblight_timer_disable();
-  } else {
-      rgblight_timer_enable();
-  }
+  rgblight_timer_enabled ^= rgblight_timer_enabled;
+  dprintf("TIMER3 toggled.\n");
 }
 
 void rgblight_show_solid_color(uint8_t r, uint8_t g, uint8_t b) {
@@ -847,116 +747,64 @@ void rgblight_show_solid_color(uint8_t r, uint8_t g, uint8_t b) {
   rgblight_setrgb(r, g, b);
 }
 
-static void rgblight_effect_dummy(animation_status_t *anim) {
-    // do nothing
-    /********
-    dprintf("rgblight_task() what happened?\n");
-    dprintf("is_static_effect %d\n", is_static_effect(rgblight_config.mode));
-    dprintf("mode = %d, base_mode = %d, timer_enabled %d, ",
-            rgblight_config.mode, rgblight_status.base_mode,
-            rgblight_status.timer_enabled);
-    dprintf("last_timer = %d\n",anim->last_timer);
-    **/
-}
-
 void rgblight_task(void) {
-  if (rgblight_status.timer_enabled) {
-    effect_func_t effect_func = rgblight_effect_dummy;
-    uint16_t interval_time = 2000; // dummy interval
-    uint8_t delta = rgblight_config.mode - rgblight_status.base_mode;
-    animation_status.delta = delta;
 
+  if (rgblight_timer_enabled) {
     // static light mode, do nothing here
     if ( 1 == 0 ) { //dummy
     }
 #ifdef RGBLIGHT_EFFECT_BREATHING
-    else if (rgblight_status.base_mode == RGBLIGHT_MODE_BREATHING) {
+    else if (rgblight_config.mode >= RGBLIGHT_MODE_BREATHING  &&
+        rgblight_config.mode <= RGBLIGHT_MODE_BREATHING_end) {
       // breathing mode
-      interval_time = get_interval_time(&RGBLED_BREATHING_INTERVALS[delta], 1, 100);
-      effect_func = rgblight_effect_breathing;
+      rgblight_effect_breathing(rgblight_config.mode - RGBLIGHT_MODE_BREATHING );
     }
 #endif
 #ifdef RGBLIGHT_EFFECT_RAINBOW_MOOD
-    else if (rgblight_status.base_mode == RGBLIGHT_MODE_RAINBOW_MOOD) {
+    else if (rgblight_config.mode >= RGBLIGHT_MODE_RAINBOW_MOOD &&
+               rgblight_config.mode <= RGBLIGHT_MODE_RAINBOW_MOOD_end) {
       // rainbow mood mode
-      interval_time = get_interval_time(&RGBLED_RAINBOW_MOOD_INTERVALS[delta], 5, 100);
-      effect_func = rgblight_effect_rainbow_mood;
+      rgblight_effect_rainbow_mood(rgblight_config.mode - RGBLIGHT_MODE_RAINBOW_MOOD);
     }
 #endif
 #ifdef RGBLIGHT_EFFECT_RAINBOW_SWIRL
-    else if (rgblight_status.base_mode == RGBLIGHT_MODE_RAINBOW_SWIRL) {
+    else if (rgblight_config.mode >= RGBLIGHT_MODE_RAINBOW_SWIRL &&
+               rgblight_config.mode <= RGBLIGHT_MODE_RAINBOW_SWIRL_end) {
       // rainbow swirl mode
-      interval_time = get_interval_time(&RGBLED_RAINBOW_SWIRL_INTERVALS[delta / 2], 1, 100);
-      effect_func = rgblight_effect_rainbow_swirl;
+      rgblight_effect_rainbow_swirl(rgblight_config.mode - RGBLIGHT_MODE_RAINBOW_SWIRL);
     }
 #endif
 #ifdef RGBLIGHT_EFFECT_SNAKE
-    else if (rgblight_status.base_mode == RGBLIGHT_MODE_SNAKE) {
+    else if (rgblight_config.mode >= RGBLIGHT_MODE_SNAKE &&
+               rgblight_config.mode <= RGBLIGHT_MODE_SNAKE_end) {
       // snake mode
-      interval_time = get_interval_time(&RGBLED_SNAKE_INTERVALS[delta / 2], 1, 200);
-      effect_func = rgblight_effect_snake;
+      rgblight_effect_snake(rgblight_config.mode - RGBLIGHT_MODE_SNAKE);
     }
 #endif
 #ifdef RGBLIGHT_EFFECT_KNIGHT
-    else if (rgblight_status.base_mode == RGBLIGHT_MODE_KNIGHT) {
+    else if (rgblight_config.mode >= RGBLIGHT_MODE_KNIGHT &&
+               rgblight_config.mode <= RGBLIGHT_MODE_KNIGHT_end) {
       // knight mode
-      interval_time = get_interval_time(&RGBLED_KNIGHT_INTERVALS[delta], 5, 100);
-      effect_func = rgblight_effect_knight;
+      rgblight_effect_knight(rgblight_config.mode - RGBLIGHT_MODE_KNIGHT);
     }
 #endif
 #ifdef RGBLIGHT_EFFECT_CHRISTMAS
-    else if (rgblight_status.base_mode == RGBLIGHT_MODE_CHRISTMAS) {
+    else if (rgblight_config.mode == RGBLIGHT_MODE_CHRISTMAS) {
       // christmas mode
-      interval_time = RGBLIGHT_EFFECT_CHRISTMAS_INTERVAL;
-      effect_func = (effect_func_t)rgblight_effect_christmas;
+      rgblight_effect_christmas();
     }
 #endif
 #ifdef RGBLIGHT_EFFECT_RGB_TEST
-    else if (rgblight_status.base_mode == RGBLIGHT_MODE_RGB_TEST) {
+    else if (rgblight_config.mode == RGBLIGHT_MODE_RGB_TEST) {
       // RGB test mode
-      interval_time = pgm_read_word(&RGBLED_RGBTEST_INTERVALS[0]);
-      effect_func = (effect_func_t)rgblight_effect_rgbtest;
+      rgblight_effect_rgbtest();
     }
 #endif
 #ifdef RGBLIGHT_EFFECT_ALTERNATING
-    else if (rgblight_status.base_mode == RGBLIGHT_MODE_ALTERNATING){
-      interval_time = 500;
-      effect_func = (effect_func_t)rgblight_effect_alternating;
-    }
-#endif
-    if (animation_status.restart) {
-      animation_status.restart = false;
-      animation_status.last_timer = timer_read() - interval_time - 1;
-      animation_status.pos16 = 0; // restart signal to local each effect
+    else if (rgblight_config.mode == RGBLIGHT_MODE_ALTERNATING){
+      rgblight_effect_alternating();
     }
-    if (timer_elapsed(animation_status.last_timer) >= interval_time) {
-#if defined(RGBLIGHT_SPLIT) && !defined(RGBLIGHT_SPLIT_NO_ANIMATION_SYNC)
-      static uint16_t report_last_timer = 0;
-      static bool tick_flag = false;
-      uint16_t oldpos16;
-      if (tick_flag) {
-        tick_flag = false;
-        //dprintf("rgblight animation tick\n");
-        if (timer_elapsed(report_last_timer) >= 30000) {
-            report_last_timer = timer_read();
-            dprintf("rgblight animation tick report to slave\n");
-            RGBLIGHT_SPLIT_ANIMATION_TICK;
-        }
-      }
-      oldpos16 = animation_status.pos16;
-      //dprintf("call effect function\n");
-#endif
-      animation_status.last_timer += interval_time;
-      effect_func(&animation_status);
-#if defined(RGBLIGHT_SPLIT) && !defined(RGBLIGHT_SPLIT_NO_ANIMATION_SYNC)
-      //dprintf("pos16, oldpos16 = %d %d\n",
-      //        animation_status.pos16,oldpos16);
-      if (animation_status.pos16 == 0 && oldpos16 != 0) {
-          //dprintf("flag on\n");
-          tick_flag = true;
-      }
 #endif
-    }
   }
 }
 
@@ -967,13 +815,22 @@ void rgblight_task(void) {
 __attribute__ ((weak))
 const uint8_t RGBLED_BREATHING_INTERVALS[] PROGMEM = {30, 20, 10, 5};
 
-void rgblight_effect_breathing(animation_status_t *anim) {
+void rgblight_effect_breathing(uint8_t interval) {
+  static uint8_t pos = 0;
+  static uint16_t last_timer = 0;
   float val;
 
+  uint8_t interval_time = get_interval_time(&RGBLED_BREATHING_INTERVALS[interval], 1, 100);
+
+  if (timer_elapsed(last_timer) < interval_time) {
+    return;
+  }
+  last_timer = timer_read();
+
   // http://sean.voisen.org/blog/2011/10/breathing-led-with-arduino/
-  val = (exp(sin((anim->pos/255.0)*M_PI)) - RGBLIGHT_EFFECT_BREATHE_CENTER/M_E)*(RGBLIGHT_EFFECT_BREATHE_MAX/(M_E-1/M_E));
+  val = (exp(sin((pos/255.0)*M_PI)) - RGBLIGHT_EFFECT_BREATHE_CENTER/M_E)*(RGBLIGHT_EFFECT_BREATHE_MAX/(M_E-1/M_E));
   rgblight_sethsv_noeeprom_old(rgblight_config.hue, rgblight_config.sat, val);
-  anim->pos = (anim->pos + 1) % 256;
+  pos = (pos + 1) % 256;
 }
 #endif
 
@@ -981,9 +838,18 @@ void rgblight_effect_breathing(animation_status_t *anim) {
 __attribute__ ((weak))
 const uint8_t RGBLED_RAINBOW_MOOD_INTERVALS[] PROGMEM = {120, 60, 30};
 
-void rgblight_effect_rainbow_mood(animation_status_t *anim) {
-  rgblight_sethsv_noeeprom_old(anim->current_hue, rgblight_config.sat, rgblight_config.val);
-  anim->current_hue = (anim->current_hue + 1) % 360;
+void rgblight_effect_rainbow_mood(uint8_t interval) {
+  static uint16_t current_hue = 0;
+  static uint16_t last_timer = 0;
+
+  uint8_t interval_time = get_interval_time(&RGBLED_RAINBOW_MOOD_INTERVALS[interval], 5, 100);
+
+  if (timer_elapsed(last_timer) < interval_time) {
+    return;
+  }
+  last_timer = timer_read();
+  rgblight_sethsv_noeeprom_old(current_hue, rgblight_config.sat, rgblight_config.val);
+  current_hue = (current_hue + 1) % 360;
 }
 #endif
 
@@ -995,23 +861,31 @@ void rgblight_effect_rainbow_mood(animation_status_t *anim) {
 __attribute__ ((weak))
 const uint8_t RGBLED_RAINBOW_SWIRL_INTERVALS[] PROGMEM = {100, 50, 20};
 
-void rgblight_effect_rainbow_swirl(animation_status_t *anim) {
+void rgblight_effect_rainbow_swirl(uint8_t interval) {
+  static uint16_t current_hue = 0;
+  static uint16_t last_timer = 0;
   uint16_t hue;
   uint8_t i;
 
+  uint8_t interval_time = get_interval_time(&RGBLED_RAINBOW_SWIRL_INTERVALS[interval / 2], 1, 100);
+
+  if (timer_elapsed(last_timer) < interval_time) {
+    return;
+  }
+  last_timer = timer_read();
   for (i = 0; i < RGBLED_NUM; i++) {
-    hue = (RGBLIGHT_RAINBOW_SWIRL_RANGE / RGBLED_NUM * i + anim->current_hue) % 360;
+    hue = (RGBLIGHT_RAINBOW_SWIRL_RANGE / RGBLED_NUM * i + current_hue) % 360;
     sethsv(hue, rgblight_config.sat, rgblight_config.val, (LED_TYPE *)&led[i]);
   }
   rgblight_set();
 
-  if (anim->delta % 2) {
-    anim->current_hue = (anim->current_hue + 1) % 360;
+  if (interval % 2) {
+    current_hue = (current_hue + 1) % 360;
   } else {
-    if (anim->current_hue - 1 < 0) {
-      anim->current_hue = 359;
+    if (current_hue - 1 < 0) {
+      current_hue = 359;
     } else {
-      anim->current_hue = anim->current_hue - 1;
+      current_hue = current_hue - 1;
     }
   }
 }
@@ -1021,27 +895,22 @@ void rgblight_effect_rainbow_swirl(animation_status_t *anim) {
 __attribute__ ((weak))
 const uint8_t RGBLED_SNAKE_INTERVALS[] PROGMEM = {100, 50, 20};
 
-void rgblight_effect_snake(animation_status_t *anim) {
+void rgblight_effect_snake(uint8_t interval) {
   static uint8_t pos = 0;
+  static uint16_t last_timer = 0;
   uint8_t i, j;
   int8_t k;
   int8_t increment = 1;
-
-  if (anim->delta % 2) {
+  if (interval % 2) {
     increment = -1;
   }
 
-#if defined(RGBLIGHT_SPLIT) && !defined(RGBLIGHT_SPLIT_NO_ANIMATION_SYNC)
-  if (anim->pos == 0) { // restart signal
-    if (increment == 1) {
-      pos = RGBLED_NUM - 1;
-    } else {
-      pos = 0;
-    }
-    anim->pos = 1;
-  }
-#endif
+  uint8_t interval_time = get_interval_time(&RGBLED_SNAKE_INTERVALS[interval / 2], 1, 200);
 
+  if (timer_elapsed(last_timer) < interval_time) {
+    return;
+  }
+  last_timer = timer_read();
   for (i = 0; i < RGBLED_NUM; i++) {
     led[i].r = 0;
     led[i].g = 0;
@@ -1052,9 +921,7 @@ void rgblight_effect_snake(animation_status_t *anim) {
         k = k + RGBLED_NUM;
       }
       if (i == k) {
-        sethsv(rgblight_config.hue, rgblight_config.sat,
-               (uint8_t)(rgblight_config.val*(RGBLIGHT_EFFECT_SNAKE_LENGTH-j)/RGBLIGHT_EFFECT_SNAKE_LENGTH),
-               (LED_TYPE *)&led[i]);
+        sethsv(rgblight_config.hue, rgblight_config.sat, (uint8_t)(rgblight_config.val*(RGBLIGHT_EFFECT_SNAKE_LENGTH-j)/RGBLIGHT_EFFECT_SNAKE_LENGTH), (LED_TYPE *)&led[i]);
       }
     }
   }
@@ -1062,20 +929,11 @@ void rgblight_effect_snake(animation_status_t *anim) {
   if (increment == 1) {
     if (pos - 1 < 0) {
       pos = RGBLED_NUM - 1;
-#if defined(RGBLIGHT_SPLIT) && !defined(RGBLIGHT_SPLIT_NO_ANIMATION_SYNC)
-      anim->pos = 0;
-#endif
     } else {
       pos -= 1;
-#if defined(RGBLIGHT_SPLIT) && !defined(RGBLIGHT_SPLIT_NO_ANIMATION_SYNC)
-      anim->pos = 1;
-#endif
     }
   } else {
     pos = (pos + 1) % RGBLED_NUM;
-#if defined(RGBLIGHT_SPLIT) && !defined(RGBLIGHT_SPLIT_NO_ANIMATION_SYNC)
-    anim->pos = pos;
-#endif
   }
 }
 #endif
@@ -1084,21 +942,21 @@ void rgblight_effect_snake(animation_status_t *anim) {
 __attribute__ ((weak))
 const uint8_t RGBLED_KNIGHT_INTERVALS[] PROGMEM = {127, 63, 31};
 
-void rgblight_effect_knight(animation_status_t *anim) {
+void rgblight_effect_knight(uint8_t interval) {
+  static uint16_t last_timer = 0;
+
+  uint8_t interval_time = get_interval_time(&RGBLED_KNIGHT_INTERVALS[interval], 5, 100);
+
+  if (timer_elapsed(last_timer) < interval_time) {
+    return;
+  }
+  last_timer = timer_read();
 
   static int8_t low_bound = 0;
   static int8_t high_bound = RGBLIGHT_EFFECT_KNIGHT_LENGTH - 1;
   static int8_t increment = 1;
   uint8_t i, cur;
 
-#if defined(RGBLIGHT_SPLIT) && !defined(RGBLIGHT_SPLIT_NO_ANIMATION_SYNC)
-  if (anim->pos == 0) { // restart signal
-      anim->pos = 1;
-      low_bound = 0;
-      high_bound = RGBLIGHT_EFFECT_KNIGHT_LENGTH - 1;
-      increment = 1;
-  }
-#endif
   // Set all the LEDs to 0
   for (i = 0; i < RGBLED_NUM; i++) {
     led[i].r = 0;
@@ -1126,23 +984,23 @@ void rgblight_effect_knight(animation_status_t *anim) {
 
   if (high_bound <= 0 || low_bound >= RGBLIGHT_EFFECT_KNIGHT_LED_NUM - 1) {
     increment = -increment;
-#if defined(RGBLIGHT_SPLIT) && !defined(RGBLIGHT_SPLIT_NO_ANIMATION_SYNC)
-    if (increment == 1) {
-        anim->pos = 0;
-    }
-#endif
   }
 }
 #endif
 
 #ifdef RGBLIGHT_EFFECT_CHRISTMAS
-void rgblight_effect_christmas(animation_status_t *anim) {
+void rgblight_effect_christmas(void) {
+  static uint16_t current_offset = 0;
+  static uint16_t last_timer = 0;
   uint16_t hue;
   uint8_t i;
-
-  anim->current_offset = (anim->current_offset + 1) % 2;
+  if (timer_elapsed(last_timer) < RGBLIGHT_EFFECT_CHRISTMAS_INTERVAL) {
+    return;
+  }
+  last_timer = timer_read();
+  current_offset = (current_offset + 1) % 2;
   for (i = 0; i < RGBLED_NUM; i++) {
-    hue = 0 + ((i/RGBLIGHT_EFFECT_CHRISTMAS_STEP + anim->current_offset) % 2) * 120;
+    hue = 0 + ((i/RGBLIGHT_EFFECT_CHRISTMAS_STEP + current_offset) % 2) * 120;
     sethsv(hue, rgblight_config.sat, rgblight_config.val, (LED_TYPE *)&led[i]);
   }
   rgblight_set();
@@ -1153,39 +1011,52 @@ void rgblight_effect_christmas(animation_status_t *anim) {
 __attribute__ ((weak))
 const uint16_t RGBLED_RGBTEST_INTERVALS[] PROGMEM = {1024};
 
-void rgblight_effect_rgbtest(animation_status_t *anim) {
+void rgblight_effect_rgbtest(void) {
+  static uint8_t pos = 0;
+  static uint16_t last_timer = 0;
   static uint8_t maxval = 0;
   uint8_t g; uint8_t r; uint8_t b;
 
+  if (timer_elapsed(last_timer) < pgm_read_word(&RGBLED_RGBTEST_INTERVALS[0])) {
+    return;
+  }
+
   if( maxval == 0 ) {
       LED_TYPE tmp_led;
       sethsv(0, 255, RGBLIGHT_LIMIT_VAL, &tmp_led);
       maxval = tmp_led.r;
   }
+  last_timer = timer_read();
   g = r = b = 0;
-  switch( anim->pos ) {
+  switch( pos ) {
     case 0: r = maxval; break;
     case 1: g = maxval; break;
     case 2: b = maxval; break;
   }
   rgblight_setrgb(r, g, b);
-  anim->pos = (anim->pos + 1) % 3;
+  pos = (pos + 1) % 3;
 }
 #endif
 
 #ifdef RGBLIGHT_EFFECT_ALTERNATING
-void rgblight_effect_alternating(animation_status_t *anim) {
+void rgblight_effect_alternating(void){
+  static uint16_t last_timer = 0;
+  static uint16_t pos = 0;
+  if (timer_elapsed(last_timer) < 500) {
+    return;
+  }
+  last_timer = timer_read();
 
   for(int i = 0; i<RGBLED_NUM; i++){
-      if(i<RGBLED_NUM/2 && anim->pos){
+      if(i<RGBLED_NUM/2 && pos){
           sethsv(rgblight_config.hue, rgblight_config.sat, rgblight_config.val, (LED_TYPE *)&led[i]);
-      }else if (i>=RGBLED_NUM/2 && !anim->pos){
+      }else if (i>=RGBLED_NUM/2 && !pos){
           sethsv(rgblight_config.hue, rgblight_config.sat, rgblight_config.val, (LED_TYPE *)&led[i]);
       }else{
           sethsv(rgblight_config.hue, rgblight_config.sat, 0, (LED_TYPE *)&led[i]);
       }
   }
   rgblight_set();
-  anim->pos = (anim->pos + 1) % 2;
+  pos = (pos + 1) % 2;
 }
 #endif
diff --git a/quantum/rgblight.h b/quantum/rgblight.h
index 748d009dcf..1769f719d9 100644
--- a/quantum/rgblight.h
+++ b/quantum/rgblight.h
@@ -68,11 +68,11 @@
 #define _RGBM_SINGLE_DYNAMIC(sym)  RGBLIGHT_MODE_ ## sym,
 #define _RGBM_MULTI_STATIC(sym)    RGBLIGHT_MODE_ ## sym,
 #define _RGBM_MULTI_DYNAMIC(sym)   RGBLIGHT_MODE_ ## sym,
-#define _RGBM_TMP_STATIC(sym, msym)  RGBLIGHT_MODE_ ## sym,
-#define _RGBM_TMP_DYNAMIC(sym, msym) RGBLIGHT_MODE_ ## sym,
+#define _RGBM_TMP_STATIC(sym)      RGBLIGHT_MODE_ ## sym,
+#define _RGBM_TMP_DYNAMIC(sym)     RGBLIGHT_MODE_ ## sym,
 enum RGBLIGHT_EFFECT_MODE {
     RGBLIGHT_MODE_zero = 0,
-#include "rgblight_modes.h"
+#include "rgblight.h"
     RGBLIGHT_MODE_last
 };
 
@@ -163,33 +163,6 @@ typedef union {
   };
 } rgblight_config_t;
 
-typedef struct _rgblight_status_t {
-    uint8_t  base_mode;
-    bool timer_enabled;
-#ifdef RGBLIGHT_SPLIT
-    uint8_t change_flags;
-#endif
-} rgblight_status_t;
-
-#ifdef RGBLIGHT_SPLIT
-  #define RGBLIGHT_STATUS_CHANGE_MODE (1<<0)
-  #define RGBLIGHT_STATUS_CHANGE_HSVS (1<<1)
-  #define RGBLIGHT_STATUS_CHANGE_TIMER (1<<2)
-  #define RGBLIGHT_STATUS_ANIMATION_TICK (1<<3)
-
-  typedef struct _rgblight_syncinfo_t {
-    rgblight_config_t config;
-    rgblight_status_t status;
-  } rgblight_syncinfo_t;
-
-  /* for split keyboard master side */
-  uint8_t rgblight_get_change_flags(void);
-  void rgblight_clear_change_flags(void);
-  void rgblight_get_syncinfo(rgblight_syncinfo_t *syncinfo);
-  /* for split keyboard slave side */
-  void rgblight_update_sync(rgblight_syncinfo_t *syncinfo, bool write_to_eeprom);
-#endif
-
 void rgblight_init(void);
 void rgblight_increase(void);
 void rgblight_decrease(void);
@@ -264,33 +237,82 @@ void rgblight_timer_init(void);
 void rgblight_timer_enable(void);
 void rgblight_timer_disable(void);
 void rgblight_timer_toggle(void);
+void rgblight_effect_breathing(uint8_t interval);
+void rgblight_effect_rainbow_mood(uint8_t interval);
+void rgblight_effect_rainbow_swirl(uint8_t interval);
+void rgblight_effect_snake(uint8_t interval);
+void rgblight_effect_knight(uint8_t interval);
+void rgblight_effect_christmas(void);
+void rgblight_effect_rgbtest(void);
+void rgblight_effect_alternating(void);
 
-#ifdef RGBLIGHT_USE_TIMER
-
-typedef struct _animation_status_t {
-    uint16_t last_timer;
-    uint8_t  delta; /* mode - base_mode */
-    bool     restart;
-    union {
-        uint16_t pos16;
-        uint8_t  pos;
-        int16_t  current_hue;
-        uint16_t current_offset;
-    };
-} animation_status_t;
-
-extern animation_status_t animation_status;
-
-void rgblight_effect_breathing(animation_status_t *anim);
-void rgblight_effect_rainbow_mood(animation_status_t *anim);
-void rgblight_effect_rainbow_swirl(animation_status_t *anim);
-void rgblight_effect_snake(animation_status_t *anim);
-void rgblight_effect_knight(animation_status_t *anim);
-void rgblight_effect_christmas(animation_status_t *anim);
-void rgblight_effect_rgbtest(animation_status_t *anim);
-void rgblight_effect_alternating(animation_status_t *anim);
+#endif // #ifndef RGBLIGHT_H_DUMMY_DEFINE
+#endif // RGBLIGHT_H
 
+#ifdef _RGBM_SINGLE_STATIC
+  _RGBM_SINGLE_STATIC( STATIC_LIGHT )
+  #ifdef RGBLIGHT_EFFECT_BREATHING
+    _RGBM_MULTI_DYNAMIC( BREATHING )
+    _RGBM_TMP_DYNAMIC( breathing_3 )
+    _RGBM_TMP_DYNAMIC( breathing_4 )
+    _RGBM_TMP_DYNAMIC( BREATHING_end )
+  #endif
+  #ifdef RGBLIGHT_EFFECT_RAINBOW_MOOD
+    _RGBM_MULTI_DYNAMIC( RAINBOW_MOOD )
+    _RGBM_TMP_DYNAMIC( rainbow_mood_7 )
+    _RGBM_TMP_DYNAMIC( RAINBOW_MOOD_end )
+  #endif
+  #ifdef RGBLIGHT_EFFECT_RAINBOW_SWIRL
+    _RGBM_MULTI_DYNAMIC( RAINBOW_SWIRL )
+    _RGBM_TMP_DYNAMIC( rainbow_swirl_10 )
+    _RGBM_TMP_DYNAMIC( rainbow_swirl_11 )
+    _RGBM_TMP_DYNAMIC( rainbow_swirl_12 )
+    _RGBM_TMP_DYNAMIC( rainbow_swirl_13 )
+    _RGBM_TMP_DYNAMIC( RAINBOW_SWIRL_end )
+  #endif
+  #ifdef RGBLIGHT_EFFECT_SNAKE
+    _RGBM_MULTI_DYNAMIC( SNAKE )
+    _RGBM_TMP_DYNAMIC( snake_16 )
+    _RGBM_TMP_DYNAMIC( snake_17 )
+    _RGBM_TMP_DYNAMIC( snake_18 )
+    _RGBM_TMP_DYNAMIC( snake_19 )
+    _RGBM_TMP_DYNAMIC( SNAKE_end )
+  #endif
+  #ifdef RGBLIGHT_EFFECT_KNIGHT
+    _RGBM_MULTI_DYNAMIC( KNIGHT )
+    _RGBM_TMP_DYNAMIC( knight_22 )
+    _RGBM_TMP_DYNAMIC( KNIGHT_end )
+  #endif
+  #ifdef RGBLIGHT_EFFECT_CHRISTMAS
+    _RGBM_SINGLE_DYNAMIC( CHRISTMAS )
+  #endif
+  #ifdef RGBLIGHT_EFFECT_STATIC_GRADIENT
+    _RGBM_MULTI_STATIC( STATIC_GRADIENT )
+    _RGBM_TMP_STATIC( static_gradient_26 )
+    _RGBM_TMP_STATIC( static_gradient_27 )
+    _RGBM_TMP_STATIC( static_gradient_28 )
+    _RGBM_TMP_STATIC( static_gradient_29 )
+    _RGBM_TMP_STATIC( static_gradient_30 )
+    _RGBM_TMP_STATIC( static_gradient_31 )
+    _RGBM_TMP_STATIC( static_gradient_32 )
+    _RGBM_TMP_STATIC( static_gradient_33 )
+    _RGBM_TMP_STATIC( STATIC_GRADIENT_end )
+  #endif
+  #ifdef RGBLIGHT_EFFECT_RGB_TEST
+    _RGBM_SINGLE_DYNAMIC( RGB_TEST )
+  #endif
+  #ifdef RGBLIGHT_EFFECT_ALTERNATING
+    _RGBM_SINGLE_DYNAMIC( ALTERNATING )
+  #endif
+  ////  Add a new mode here.
+  // #ifdef RGBLIGHT_EFFECT_<name>
+  //    _RGBM_<SINGLE|MULTI>_<STATIC|DYNAMIC>( <name> )
+  // #endif
 #endif
 
-#endif // #ifndef RGBLIGHT_H_DUMMY_DEFINE
-#endif // RGBLIGHT_H
+#undef _RGBM_SINGLE_STATIC
+#undef _RGBM_SINGLE_DYNAMIC
+#undef _RGBM_MULTI_STATIC
+#undef _RGBM_MULTI_DYNAMIC
+#undef _RGBM_TMP_STATIC
+#undef _RGBM_TMP_DYNAMIC
diff --git a/quantum/rgblight_modes.h b/quantum/rgblight_modes.h
deleted file mode 100644
index 8a8f9bdda9..0000000000
--- a/quantum/rgblight_modes.h
+++ /dev/null
@@ -1,67 +0,0 @@
-#ifdef _RGBM_SINGLE_STATIC
-  _RGBM_SINGLE_STATIC( STATIC_LIGHT )
-  #ifdef RGBLIGHT_EFFECT_BREATHING
-    _RGBM_MULTI_DYNAMIC( BREATHING )
-    _RGBM_TMP_DYNAMIC( breathing_3, BREATHING )
-    _RGBM_TMP_DYNAMIC( breathing_4, BREATHING )
-    _RGBM_TMP_DYNAMIC( BREATHING_end, BREATHING )
-  #endif
-  #ifdef RGBLIGHT_EFFECT_RAINBOW_MOOD
-    _RGBM_MULTI_DYNAMIC( RAINBOW_MOOD )
-    _RGBM_TMP_DYNAMIC( rainbow_mood_7, RAINBOW_MOOD )
-    _RGBM_TMP_DYNAMIC( RAINBOW_MOOD_end, RAINBOW_MOOD )
-  #endif
-  #ifdef RGBLIGHT_EFFECT_RAINBOW_SWIRL
-    _RGBM_MULTI_DYNAMIC( RAINBOW_SWIRL )
-    _RGBM_TMP_DYNAMIC( rainbow_swirl_10, RAINBOW_SWIRL )
-    _RGBM_TMP_DYNAMIC( rainbow_swirl_11, RAINBOW_SWIRL )
-    _RGBM_TMP_DYNAMIC( rainbow_swirl_12, RAINBOW_SWIRL )
-    _RGBM_TMP_DYNAMIC( rainbow_swirl_13, RAINBOW_SWIRL )
-    _RGBM_TMP_DYNAMIC( RAINBOW_SWIRL_end, RAINBOW_SWIRL )
-  #endif
-  #ifdef RGBLIGHT_EFFECT_SNAKE
-    _RGBM_MULTI_DYNAMIC( SNAKE )
-    _RGBM_TMP_DYNAMIC( snake_16, SNAKE )
-    _RGBM_TMP_DYNAMIC( snake_17, SNAKE )
-    _RGBM_TMP_DYNAMIC( snake_18, SNAKE )
-    _RGBM_TMP_DYNAMIC( snake_19, SNAKE )
-    _RGBM_TMP_DYNAMIC( SNAKE_end, SNAKE )
-  #endif
-  #ifdef RGBLIGHT_EFFECT_KNIGHT
-    _RGBM_MULTI_DYNAMIC( KNIGHT )
-    _RGBM_TMP_DYNAMIC( knight_22, KNIGHT )
-    _RGBM_TMP_DYNAMIC( KNIGHT_end, KNIGHT )
-  #endif
-  #ifdef RGBLIGHT_EFFECT_CHRISTMAS
-    _RGBM_SINGLE_DYNAMIC( CHRISTMAS )
-  #endif
-  #ifdef RGBLIGHT_EFFECT_STATIC_GRADIENT
-    _RGBM_MULTI_STATIC( STATIC_GRADIENT )
-    _RGBM_TMP_STATIC( static_gradient_26, STATIC_GRADIENT )
-    _RGBM_TMP_STATIC( static_gradient_27, STATIC_GRADIENT )
-    _RGBM_TMP_STATIC( static_gradient_28, STATIC_GRADIENT )
-    _RGBM_TMP_STATIC( static_gradient_29, STATIC_GRADIENT )
-    _RGBM_TMP_STATIC( static_gradient_30, STATIC_GRADIENT )
-    _RGBM_TMP_STATIC( static_gradient_31, STATIC_GRADIENT )
-    _RGBM_TMP_STATIC( static_gradient_32, STATIC_GRADIENT )
-    _RGBM_TMP_STATIC( static_gradient_33, STATIC_GRADIENT )
-    _RGBM_TMP_STATIC( STATIC_GRADIENT_end, STATIC_GRADIENT )
-  #endif
-  #ifdef RGBLIGHT_EFFECT_RGB_TEST
-    _RGBM_SINGLE_DYNAMIC( RGB_TEST )
-  #endif
-  #ifdef RGBLIGHT_EFFECT_ALTERNATING
-    _RGBM_SINGLE_DYNAMIC( ALTERNATING )
-  #endif
-  ////  Add a new mode here.
-  // #ifdef RGBLIGHT_EFFECT_<name>
-  //    _RGBM_<SINGLE|MULTI>_<STATIC|DYNAMIC>( <name> )
-  // #endif
-#endif
-
-#undef _RGBM_SINGLE_STATIC
-#undef _RGBM_SINGLE_DYNAMIC
-#undef _RGBM_MULTI_STATIC
-#undef _RGBM_MULTI_DYNAMIC
-#undef _RGBM_TMP_STATIC
-#undef _RGBM_TMP_DYNAMIC