diff --git a/keyboards/crkbd/keymaps/rpbaptist/config.h b/keyboards/crkbd/keymaps/rpbaptist/config.h
index 7af0658958e..fadafc9ea50 100644
--- a/keyboards/crkbd/keymaps/rpbaptist/config.h
+++ b/keyboards/crkbd/keymaps/rpbaptist/config.h
@@ -41,6 +41,18 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifdef RGBLIGHT_ENABLE
   #undef RGBLED_NUM
   #define RGBLIGHT_ANIMATIONS
+
+  #undef RGBLIGHT_EFFECT_CHRISTMAS
+  #undef RGBLIGHT_EFFECT_KNIGHT
+  #undef RGBLIGHT_EFFECT_RAINBOW_SWIRL
+  #undef RGBLIGHT_EFFECT_RGB_TEST
+  #undef RGBLIGHT_EFFECT_SNAKE
+
+  // #define RGBLIGHT_MODE_STATIC_GRADIENT
+  // #define RGBLIGHT_MODE_BREATHING
+  // #define RGBLIGHT_MODE_RAINBOW_MOOD
+  // #define RGBLIGHT_MODE_ALTERNATING
+
   #define RGBLED_NUM 27
   #define RGBLIGHT_LIMIT_VAL 120
   #define RGBLIGHT_HUE_STEP 10
diff --git a/keyboards/crkbd/keymaps/rpbaptist/keymap.c b/keyboards/crkbd/keymaps/rpbaptist/keymap.c
index 88e2242d433..f189a1b9107 100644
--- a/keyboards/crkbd/keymaps/rpbaptist/keymap.c
+++ b/keyboards/crkbd/keymaps/rpbaptist/keymap.c
@@ -52,9 +52,14 @@ enum layer_names {
 #define KC_LSAD  RGB_SAD
 #define KC_LVAI  RGB_VAI
 #define KC_LVAD  RGB_VAD
-#define KC_LSMOD RGB_SMOD
-#define KC_LFMOD  RGB_MOD
-#define KC_LRMOD  RGB_RMOD
+
+#define KC_LFMOD  RGB_MODE_FORWARD
+#define KC_LRMOD  RGB_MODE_REVERSE
+
+#define KC_RGBST RGB_MODE_PLAIN
+#define KC_RGBBR RGB_MODE_BREATHE
+#define KC_RGBRB RGB_MODE_RAINBOW
+#define KC_RGBGR RGB_MODE_GRADIENT
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_COLEMAKDHM] = LAYOUT_kc( \