diff --git a/keyboards/crkbd/keymaps/rpbaptist/config.h b/keyboards/crkbd/keymaps/rpbaptist/config.h
index e7302ec6733..ac5d46ce0d8 100644
--- a/keyboards/crkbd/keymaps/rpbaptist/config.h
+++ b/keyboards/crkbd/keymaps/rpbaptist/config.h
@@ -37,7 +37,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifdef RGBLIGHT_ENABLE
   #undef RGBLED_NUM
   #define RGBLIGHT_ANIMATIONS
-  #define RGBLED_NUM 12
+  #define RGBLED_NUM 27
   #define RGBLIGHT_HUE_STEP 10
   #define RGBLIGHT_SAT_STEP 16
   #define RGBLIGHT_VAL_STEP 16
diff --git a/keyboards/crkbd/keymaps/rpbaptist/keymap.c b/keyboards/crkbd/keymaps/rpbaptist/keymap.c
index 9ab74e73342..db05541e6b2 100644
--- a/keyboards/crkbd/keymaps/rpbaptist/keymap.c
+++ b/keyboards/crkbd/keymaps/rpbaptist/keymap.c
@@ -10,10 +10,10 @@
 
 extern keymap_config_t keymap_config;
 
-// #ifdef RGBLIGHT_ENABLE
-//Following line allows macro to read current RGB settings
-// extern rgblight_config_t rgblight_config;
-// #endif
+#ifdef RGBLIGHT_ENABLE
+  // Following line allows macro to read current RGB settings
+  extern rgblight_config_t rgblight_config;
+#endif
 
 extern uint8_t is_master;
 
diff --git a/keyboards/crkbd/keymaps/rpbaptist/rules.mk b/keyboards/crkbd/keymaps/rpbaptist/rules.mk
index 2b92979c4c2..3e576b3e3c5 100644
--- a/keyboards/crkbd/keymaps/rpbaptist/rules.mk
+++ b/keyboards/crkbd/keymaps/rpbaptist/rules.mk
@@ -5,24 +5,26 @@ EXTRAFLAGS        += -flto
 #   change to "no" to disable the options, or define them in the Makefile in
 #   the appropriate keymap folder that will get included automatically
 #
-MOUSEKEY_ENABLE    = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE    = yes       # Audio control and System control(+450)
-NKRO_ENABLE        = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+MOUSEKEY_ENABLE    = yes      # Mouse keys(+4700)
+EXTRAKEY_ENABLE    = yes      # Audio control and System control(+450)
+NKRO_ENABLE        = yes      # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+RGBLIGHT_ENABLE    = yes       # Enable WS2812 RGB underlight.
 
 BOOTMAGIC_ENABLE   = no       # Virtual DIP switch configuration(+1000)
-CONSOLE_ENABLE     = no         # Console for debug(+400)
-COMMAND_ENABLE     = no         # Commands for debug and configuration
+CONSOLE_ENABLE     = no       # Console for debug(+400)
+COMMAND_ENABLE     = no       # Commands for debug and configuration
 BACKLIGHT_ENABLE   = no       # Enable keyboard backlight functionality
-MIDI_ENABLE        = no            # MIDI controls
-AUDIO_ENABLE       = no           # Audio output on port C6
-UNICODE_ENABLE     = no         # Unicode
+MIDI_ENABLE        = no       # MIDI controls
+AUDIO_ENABLE       = no       # Audio output on port C6
+UNICODE_ENABLE     = no       # Unicode
 BLUETOOTH_ENABLE   = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE    = no        # Enable WS2812 RGB underlight.
-SWAP_HANDS_ENABLE  = no      # Enable one-hand typing
+SWAP_HANDS_ENABLE  = no       # Enable one-hand typing
 
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE   = no    # Breathing sleep LED during USB suspend
 
 # BOOTLOADER       = qmk-dfu
 
+# RGB_MATRIX_ENABLE = WS2812
+
 OLED_DRIVER_ENABLE = yes