diff --git a/keyboards/crkbd/keymaps/rpbaptist/keymap.c b/keyboards/crkbd/keymaps/rpbaptist/keymap.c
index 1aafaf7055d..9109fd3df10 100644
--- a/keyboards/crkbd/keymaps/rpbaptist/keymap.c
+++ b/keyboards/crkbd/keymaps/rpbaptist/keymap.c
@@ -43,7 +43,11 @@ enum custom_keycodes {
 
 #define KC_CTENT RCTL_T(KC_ENTER)
 
+#define KC_RCTBR RCTL_T(KC_RBRACKET)
+#define KC_LCTBR LCTL_T(KC_LBRACKET)
+
 #define KC_SFSPC LSFT_T(KC_SPACE)
+#define KC_SFENT LSFT_T(KC_ENTER)
 #define KC_SFBSP RSFT_T(KC_BSPACE)
 
 #define KC_EUR ALGR(KC_5)
@@ -75,9 +79,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|------+------+------+------+------+------|                |------+------+------+------+------+------|
       FNTAB,     A,     R,     S,     T,     G,                      M,     N,     E,     I,     O,  QUOT,\
   //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-       LCTL,     Z,     X,     C,     D,     V,                      K,     H,  COMM,   DOT,  SLSH, CTENT,\
+      LCTBR,     Z,     X,     C,     D,     V,                      K,     H,  COMM,   DOT,  SLSH, RCTBR,\
   //|------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-                                   LALT, T_SYM, SFSPC,    SFBSP, T_NAV,  RGUI \
+                                   LALT, T_SYM, SFSPC,    SFENT, T_NAV,  RGUI \
                               //`--------------------'  `--------------------'
   ),
 
@@ -87,7 +91,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|------+------+------+------+------+------|                |------+------+------+------+------+------|
         TAB, _____, _____, _____, _____, _____,                  _____, _____, _____, _____, _____, _____,\
   //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-      _____, _____, _____, _____, _____, _____,                  _____, _____, _____, _____, _____, _____,\
+       LCTL, _____, _____, _____, _____, _____,                  _____, _____, _____, _____, _____,  RCTL,\
   //|------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
                                   _____, GMSFT, SPACE,    _____, _____, _____ \
                               //`--------------------'  `--------------------'
@@ -99,9 +103,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|------+------+------+------+------+------|                |------+------+------+------+------+------|
        LBRC,  RBRC, _____, _____, _____,  BSLS,                     F6,    F7,    F8,    F9,   F10, _____,\
   //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-          5,     6,     7,     8,     9,     0,                    F11,   F12,  MINS,   EQL, _____,   ENT,\
+          5,     6,     7,     8,     9,     0,                    F11,   F12,  MINS,   EQL, _____, _____,\
   //|------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-                                  _____, _____, _____,    _____, _____, _____ \
+                                  _____, _____, _____,      ENT, _____, _____ \
                               //`--------------------'  `--------------------'
   ),
 
@@ -113,7 +117,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|------+------+------+------+------+------|                |------+------+------+------+------+------|
       _____, XXXXX,  LBRC,  RBRC,   EUR,  PLUS,                   MINS,  UNDS,    LT,    GT,   EQL, _____,\
   //|------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-                                  _____, S_SYM, _____,      DEL, _____,_____ \
+                                  _____, S_SYM, _____,    _____, _____, _____ \
                               //`--------------------'  `--------------------'
   ),