diff --git a/keyboards/fingerpunch/FP_LIBRARY_SUPPORT.md b/keyboards/fingerpunch/FP_LIBRARY_SUPPORT.md
index b110cc6678..954249f14d 100644
--- a/keyboards/fingerpunch/FP_LIBRARY_SUPPORT.md
+++ b/keyboards/fingerpunch/FP_LIBRARY_SUPPORT.md
@@ -37,6 +37,7 @@ Add the general effect inclusion file
 // For RGB_MATRIX enabled boards, Create the file rgb_matrix_kb.inc in your keyboard directory, and put this code in the file
 
 #include "keyboards/fingerpunch/src/rgb_matrix_effects/alpha_mod_homerow.inc"
+#include "keyboards/fingerpunch/src/rgb_matrix_effects/alpha_mod_homerow_cycle.inc"
 // There are more effects, add as many as you like
 ```
 
diff --git a/keyboards/fingerpunch/barobord/rgb_matrix_kb.inc b/keyboards/fingerpunch/barobord/rgb_matrix_kb.inc
index d623c9cc7d..1e6d96bf74 100644
--- a/keyboards/fingerpunch/barobord/rgb_matrix_kb.inc
+++ b/keyboards/fingerpunch/barobord/rgb_matrix_kb.inc
@@ -1 +1,2 @@
 #include "keyboards/fingerpunch/src/rgb_matrix_effects/alpha_mod_homerow.inc"
+#include "keyboards/fingerpunch/src/rgb_matrix_effects/alpha_mod_homerow_cycle.inc"
\ No newline at end of file
diff --git a/keyboards/fingerpunch/barobord_byomcu/rgb_matrix_kb.inc b/keyboards/fingerpunch/barobord_byomcu/rgb_matrix_kb.inc
index d623c9cc7d..1e6d96bf74 100644
--- a/keyboards/fingerpunch/barobord_byomcu/rgb_matrix_kb.inc
+++ b/keyboards/fingerpunch/barobord_byomcu/rgb_matrix_kb.inc
@@ -1 +1,2 @@
 #include "keyboards/fingerpunch/src/rgb_matrix_effects/alpha_mod_homerow.inc"
+#include "keyboards/fingerpunch/src/rgb_matrix_effects/alpha_mod_homerow_cycle.inc"
\ No newline at end of file
diff --git a/keyboards/fingerpunch/bigbarobord/rgb_matrix_kb.inc b/keyboards/fingerpunch/bigbarobord/rgb_matrix_kb.inc
index d623c9cc7d..1e6d96bf74 100644
--- a/keyboards/fingerpunch/bigbarobord/rgb_matrix_kb.inc
+++ b/keyboards/fingerpunch/bigbarobord/rgb_matrix_kb.inc
@@ -1 +1,2 @@
 #include "keyboards/fingerpunch/src/rgb_matrix_effects/alpha_mod_homerow.inc"
+#include "keyboards/fingerpunch/src/rgb_matrix_effects/alpha_mod_homerow_cycle.inc"
\ No newline at end of file
diff --git a/keyboards/fingerpunch/ffkb/atmega/v1/rgb_matrix_kb.inc b/keyboards/fingerpunch/ffkb/atmega/v1/rgb_matrix_kb.inc
index d623c9cc7d..1e6d96bf74 100644
--- a/keyboards/fingerpunch/ffkb/atmega/v1/rgb_matrix_kb.inc
+++ b/keyboards/fingerpunch/ffkb/atmega/v1/rgb_matrix_kb.inc
@@ -1 +1,2 @@
 #include "keyboards/fingerpunch/src/rgb_matrix_effects/alpha_mod_homerow.inc"
+#include "keyboards/fingerpunch/src/rgb_matrix_effects/alpha_mod_homerow_cycle.inc"
\ No newline at end of file
diff --git a/keyboards/fingerpunch/ffkb/byomcu/rgb_matrix_kb.inc b/keyboards/fingerpunch/ffkb/byomcu/rgb_matrix_kb.inc
index d623c9cc7d..1e6d96bf74 100644
--- a/keyboards/fingerpunch/ffkb/byomcu/rgb_matrix_kb.inc
+++ b/keyboards/fingerpunch/ffkb/byomcu/rgb_matrix_kb.inc
@@ -1 +1,2 @@
 #include "keyboards/fingerpunch/src/rgb_matrix_effects/alpha_mod_homerow.inc"
+#include "keyboards/fingerpunch/src/rgb_matrix_effects/alpha_mod_homerow_cycle.inc"
\ No newline at end of file
diff --git a/keyboards/fingerpunch/ffkb/rp/rgb_matrix_kb.inc b/keyboards/fingerpunch/ffkb/rp/rgb_matrix_kb.inc
index d623c9cc7d..1e6d96bf74 100644
--- a/keyboards/fingerpunch/ffkb/rp/rgb_matrix_kb.inc
+++ b/keyboards/fingerpunch/ffkb/rp/rgb_matrix_kb.inc
@@ -1 +1,2 @@
 #include "keyboards/fingerpunch/src/rgb_matrix_effects/alpha_mod_homerow.inc"
+#include "keyboards/fingerpunch/src/rgb_matrix_effects/alpha_mod_homerow_cycle.inc"
\ No newline at end of file
diff --git a/keyboards/fingerpunch/fpm101/rgb_matrix_kb.inc b/keyboards/fingerpunch/fpm101/rgb_matrix_kb.inc
index d623c9cc7d..1e6d96bf74 100644
--- a/keyboards/fingerpunch/fpm101/rgb_matrix_kb.inc
+++ b/keyboards/fingerpunch/fpm101/rgb_matrix_kb.inc
@@ -1 +1,2 @@
 #include "keyboards/fingerpunch/src/rgb_matrix_effects/alpha_mod_homerow.inc"
+#include "keyboards/fingerpunch/src/rgb_matrix_effects/alpha_mod_homerow_cycle.inc"
\ No newline at end of file
diff --git a/keyboards/fingerpunch/pinkiesout/rgb_matrix_kb.inc b/keyboards/fingerpunch/pinkiesout/rgb_matrix_kb.inc
index d623c9cc7d..1e6d96bf74 100644
--- a/keyboards/fingerpunch/pinkiesout/rgb_matrix_kb.inc
+++ b/keyboards/fingerpunch/pinkiesout/rgb_matrix_kb.inc
@@ -1 +1,2 @@
 #include "keyboards/fingerpunch/src/rgb_matrix_effects/alpha_mod_homerow.inc"
+#include "keyboards/fingerpunch/src/rgb_matrix_effects/alpha_mod_homerow_cycle.inc"
\ No newline at end of file
diff --git a/keyboards/fingerpunch/rockon/rgb_matrix_kb.inc b/keyboards/fingerpunch/rockon/rgb_matrix_kb.inc
index d623c9cc7d..1e6d96bf74 100644
--- a/keyboards/fingerpunch/rockon/rgb_matrix_kb.inc
+++ b/keyboards/fingerpunch/rockon/rgb_matrix_kb.inc
@@ -1 +1,2 @@
 #include "keyboards/fingerpunch/src/rgb_matrix_effects/alpha_mod_homerow.inc"
+#include "keyboards/fingerpunch/src/rgb_matrix_effects/alpha_mod_homerow_cycle.inc"
\ No newline at end of file
diff --git a/keyboards/fingerpunch/rockon_bp/rgb_matrix_kb.inc b/keyboards/fingerpunch/rockon_bp/rgb_matrix_kb.inc
index d623c9cc7d..1e6d96bf74 100644
--- a/keyboards/fingerpunch/rockon_bp/rgb_matrix_kb.inc
+++ b/keyboards/fingerpunch/rockon_bp/rgb_matrix_kb.inc
@@ -1 +1,2 @@
 #include "keyboards/fingerpunch/src/rgb_matrix_effects/alpha_mod_homerow.inc"
+#include "keyboards/fingerpunch/src/rgb_matrix_effects/alpha_mod_homerow_cycle.inc"
\ No newline at end of file
diff --git a/keyboards/fingerpunch/src/rgb_matrix_effects/alpha_mod_homerow_cycle.inc b/keyboards/fingerpunch/src/rgb_matrix_effects/alpha_mod_homerow_cycle.inc
new file mode 100644
index 0000000000..b7458d572d
--- /dev/null
+++ b/keyboards/fingerpunch/src/rgb_matrix_effects/alpha_mod_homerow_cycle.inc
@@ -0,0 +1,60 @@
+// Step 1.
+// Declare custom effects using the RGB_MATRIX_EFFECT macro
+// (note the lack of semicolon after the macro!)
+RGB_MATRIX_EFFECT(alpha_mod_homerow_cycle)
+
+// Step 2.
+// Define effects inside the `RGB_MATRIX_CUSTOM_EFFECT_IMPLS` ifdef block
+#ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+
+#include "eeprom.h"
+#include "eeconfig.h"
+
+static bool alpha_mod_homerow_cycle_runner(effect_params_t* params, bool shift) {
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+
+    uint8_t time = scale16by8(g_rgb_timer, 4);
+
+    // Set up a base value to copy from that doesn't modify the original rgb_matrix_config
+    HSV hsv_base = rgb_matrix_config.hsv;
+    hsv_base.h += time;
+
+    HSV hsv  = hsv_base;
+
+    // homerow color is based on saturation, grab it and then override it with 100
+    HSV hsv_for_homerow = hsv_base;
+    hsv_for_homerow.h += ((rgb_matrix_config.speed + hsv.s + 100) % 255);
+    
+    // Now set the saturation to 100 for both
+    hsv.s = 255;
+    hsv_for_homerow.s = 255;
+    
+    RGB rgb1 = rgb_matrix_hsv_to_rgb(hsv);
+    hsv.h += rgb_matrix_config.speed; 
+    RGB rgb2 = rgb_matrix_hsv_to_rgb(hsv);
+    RGB rgb3 = rgb_matrix_hsv_to_rgb(hsv_for_homerow);
+
+    for (uint8_t i = led_min; i < led_max; i++) {
+        RGB_MATRIX_TEST_LED_FLAGS();
+        if ((HAS_FLAGS(g_led_config.flags[i], LED_FLAG_KEYLIGHT) && HAS_FLAGS(g_led_config.flags[i], LED_FLAG_INDICATOR)) ||
+            (HAS_FLAGS(g_led_config.flags[i], LED_FLAG_MODIFIER) && HAS_FLAGS(g_led_config.flags[i], LED_FLAG_INDICATOR)) ) {
+            rgb_matrix_set_color(i, rgb3.r, rgb3.g, rgb3.b);
+        } else if (HAS_FLAGS(g_led_config.flags[i], LED_FLAG_MODIFIER)) {
+            rgb_matrix_set_color(i, rgb2.r, rgb2.g, rgb2.b);
+        } else {
+            rgb_matrix_set_color(i, rgb1.r, rgb1.g, rgb1.b);
+        }
+    }
+
+    return rgb_matrix_check_finished_leds(led_max);
+}
+
+static bool alpha_mod_homerow_cycle(effect_params_t* params) {
+    return alpha_mod_homerow_cycle_runner(params, false);
+}
+
+// static bool alpha_mod_homerow_color_shift(effect_params_t* params) {
+//     return alpha_mod_homerow_runner(params, true);
+// }
+
+#endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
\ No newline at end of file