diff --git a/keyboards/crkbd/keymaps/rpbaptist/config.h b/keyboards/crkbd/keymaps/rpbaptist/config.h
index 5c5fd5eacbc..fa4158f7eb6 100644
--- a/keyboards/crkbd/keymaps/rpbaptist/config.h
+++ b/keyboards/crkbd/keymaps/rpbaptist/config.h
@@ -59,8 +59,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define OLED_FONT_H "keyboards/crkbd/keymaps/rpbaptist/glcdfont.c"
 
-#define LCPO_KEYS KC_LCTL, KC_RSFT, KC_COMM
-#define RCPC_KEYS KC_RCTL, KC_RSFT, KC_DOT
+// #define LCPO_KEYS KC_LCTL, KC_RSFT, KC_COMM
+// #define RCPC_KEYS KC_RCTL, KC_RSFT, KC_DOT
 
 #define NO_ACTION_FUNCTION
 #define NO_ACTION_MACRO
diff --git a/keyboards/crkbd/keymaps/rpbaptist/keymap.c b/keyboards/crkbd/keymaps/rpbaptist/keymap.c
index 89e789842b9..197519182f3 100644
--- a/keyboards/crkbd/keymaps/rpbaptist/keymap.c
+++ b/keyboards/crkbd/keymaps/rpbaptist/keymap.c
@@ -23,8 +23,8 @@ enum layer_names {
   _GAMING_EXT,
   _FN,
   _SYM,
-  _UTIL,
-  _NAV
+  _NAV,
+  _UTIL
 };
 
 #define KC_CLMK DF(_COLEMAKDHM)
@@ -33,12 +33,10 @@ enum layer_names {
 #define KC_T_NAV TT(_NAV)
 #define KC_S_NAV MO(_NAV)
 
-#define KC_FNESC LT(_FN, KC_ESC)
-#define KC_UTTAB LT(_UTIL, KC_TAB)
+#define KC_FNTAB LT(_FN, KC_TAB)
 #define KC_SMSPC LT(_SYM, KC_SPC)
 
 #define KC_GMSPC LT(_GAMING_EXT, KC_SPC)
-#define KC_FNGRV LT(_FN, KC_GRV)
 
 #define KC_LCTLT LCTL_T(KC_LT)
 
@@ -69,9 +67,9 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_COLEMAKDHM] = LAYOUT_kc( \
   //,-----------------------------------------.                ,-----------------------------------------.
-      FNESC,     Q,     W,     F,     P,     B,                      J,     L,    U,     Y,   SCLN,  BSPC,\
+        ESC,     Q,     W,     F,     P,     B,                      J,     L,    U,     Y,   SCLN,  BSPC,\
   //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-      UTTAB,     A,     R,     S,     T,     G,                      M,     N,     E,     I,     O,  QUOT,\
+      FNTAB,     A,     R,     S,     T,     G,                      M,     N,     E,     I,     O,  QUOT,\
   //|------+------+------+------+------+------|                |------+------+------+------+------+------|
       CTGUI,     Z,     X,     C,     D,     V,                      K,     H,  COMM,   DOT,  SLSH, CTENT,\
   //|------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
@@ -93,13 +91,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_GAMING_EXT] = LAYOUT_kc( \
   //,-----------------------------------------.                ,-----------------------------------------.
-        GRV,     1,     2, _____,     3,     4,                   VOLU,    F1,    F2,    F3,    F4,    F5,\
+        GRV,     1,     2, _____,     3,     4,                   MINS,    F1,    F2,    F3,    F4,    F5,\
   //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-       LBRC,  RBRC, _____, _____, _____,  BSLS,                   VOLD,    F6,    F7,    F8,    F9,   F10,\
+       LBRC,  RBRC, _____, _____, _____,  BSLS,                    EQL,    F6,    F7,    F8,    F9,   F10,\
   //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-          5,     6,     7,     8,     9,     0,                   MUTE,   F11,   F12,  MINS,   EQL,   ENT,\
+          5,     6,     7,     8,     9,     0,                    DEL,   F11,   F12,   F13,   F14,   F15,\
   //|------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-                                  _____, _____, _____,     CLMK, _____, _____ \
+                                  _____, _____, _____,    _____, _____, _____ \
                               //`--------------------'  `--------------------'
   ),
 
@@ -109,9 +107,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|------+------+------+------+------+------|                |------+------+------+------+------+------|
        TILD,  EXLM,    AT,  HASH,   DLR,  PERC,                   CIRC,  AMPR,  ASTR,  MINS,  PLUS,  PIPE,\
   //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-       LCPO, XXXXX, XXXXX, XXXXX, XXXXX, XXXXX,                  XXXXX, XXXXX, XXXXX,  UNDS,   EQL,  RCPC,\
+      _____, XXXXX, XXXXX, XXXXX, XXXXX, XXXXX,                  XXXXX, XXXXX, XXXXX,  UNDS,   EQL, _____,\
   //|------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-                                  _____, _____, _____,     GAME, _____, RGUI \
+                                  _____, _____, _____,    _____, _____, RGUI \
                               //`--------------------'  `--------------------'
   ),
 
@@ -123,38 +121,38 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|------+------+------+------+------+------|                |------+------+------+------+------+------|
       _____, XXXXX,  WH_L, XXXXX,  WH_R, XXXXX,                  XXXXX,  ACL0,  ACL1,  ACL2, XXXXX, _____,\
   //|------+------+------+------+------+------+------|  |------+------+------+------+------+-----+-------|
-                                  _____, _____,   SPC,    S_NAV, _____,  RGUI \
+                                  _____, _____, _____,    S_NAV, _____,  RGUI \
                               //`--------------------'  `--------------------'
   ),
 
   [_FN] = LAYOUT_kc( \
   //,-----------------------------------------.                ,-----------------------------------------.
-      _____,    F1,    F2,    F3,    F4,    F5,                     F6,    F7,    F8,    F9,   F10,   F11,\
+        ESC,    F1,    F2,    F3,    F4,    F5,                   NLCK,  KP_7,  KP_8,  KP_9,  PSLS,  PAST,\
   //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-        RST, XXXXX, XXXXX, XXXXX,  SLEP,  WAKE,                   LTOG, LFMOD,  LHUI,  LSAI,  LVAI,   F12,\
+      _____,    F6,    F7,    F8,    F9,   F10,                   CAPS,  KP_4,  KP_5,  KP_6,  PMNS,  PPLS,\
   //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-      _____, XXXXX, XXXXX, XXXXX, XXXXX, XXXXX,                  XXXXX, LRMOD,  LHUD,  LSAD,  LVAD, _____,\
+      _____,   F11,   F12, PAUSE,   INS,  PSCR,                   SLCK,  KP_1,  KP_2,  KP_3,  PEQL,  PENT,\
   //|------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-                                  _____, _____,   SPC,    XXXXX, _____, _____ \
+                                  _____, _____,   SPC,     KP_0,  PDOT,  BSPC \
                               //`--------------------'  `--------------------'
   ),
 
   [_UTIL] = LAYOUT_kc( \
   //,-----------------------------------------.                ,-----------------------------------------.
-        ESC, XXXXX,  MSTP,  VOLU,  MNXT,  PAUS,                   NLCK,  KP_7,  KP_8,  KP_9,  PSLS,  PAST,\
+        RST, XXXXX,  MSTP,  VOLU,  MNXT, XXXXX,                   CLMK,  GAME, XXXXX, XXXXX, XXXXX, XXXXX,\
   //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-      _____, XXXXX,  MPRV,  VOLD,  MPLY,   INS,                   CAPS,  KP_4,  KP_5,  KP_6,  PMNS,  PPLS,\
+      XXXXX, XXXXX,  MPRV,  VOLD,  MPLY, XXXXX,                   LTOG, LFMOD,  LHUI,  LSAI,  LVAI, XXXXX,\
   //|------+------+------+------+------+------|                |------+------+------+------+------+------|
-      _____, XXXXX, XXXXX,  MUTE, XXXXX,  PSCR,                   SLCK,  KP_1,  KP_2,  KP_3,  PEQL,  PENT,\
+      XXXXX, XXXXX, XXXXX, XXXXX, XXXXX, XXXXX,                  XXXXX, LRMOD,  LHUD,  LSAD,  LVAD, XXXXX,\
   //|------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-                                  _____, _____,   SPC,     KP_0,  PDOT,  BSPC \
+                                  _____, _____, _____,    _____, _____, _____ \
                               //`--------------------'  `--------------------'
   )
 
 /*
   [_TEMPLATE] = LAYOUT_kc( \
   //,-----------------------------------------.                ,-----------------------------------------.
-      _____, _____, _____, _____, _____, _____,                  _____, _____, _____, _____, _____, _____,\
+      _____, _____, _____, _____, _____, _____,                 _____, _____, _____, _____, _____, _____,\
   //|------+------+------+------+------+------|                |------+------+------+------+------+------|
       _____, _____, _____, _____, _____, _____,                  _____, _____, _____, _____, _____, _____,\
   //|------+------+------+------+------+------|                |------+------+------+------+------+------|
@@ -166,6 +164,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 */
 };
 
+uint32_t layer_state_set_user(uint32_t state) {
+  switch (biton32(default_layer_state)) {
+    case _COLEMAKDHM:
+      state = update_tri_layer_state(state, _SYM, _NAV, _UTIL);
+      break;
+    case _GAMING:
+      state = update_tri_layer_state(state, _GAMING_EXT, _NAV, _UTIL);
+      break;
+  }
+  return state;
+}
+
 #ifdef OLED_DRIVER_ENABLE
 oled_rotation_t oled_init_user(oled_rotation_t rotation) {
   if (is_master) {
@@ -203,20 +213,20 @@ void render_status(void) {
       oled_write_P(PSTR("     "), false);
       break;
     case _FN:
-      oled_write_P(PSTR("Abort"), false);
+      oled_write_P(PSTR("Stage"), false);
       break;
     case _SYM:
       oled_write_P(PSTR("Comm "), false);
       break;
-    case _UTIL:
-      oled_write_P(PSTR("Stage"), false);
-      break;
     case _NAV:
       oled_write_P(PSTR("Gyro "), false);
       break;
     case _GAMING_EXT:
       oled_write_P(PSTR("Ext  "), false);
       break;
+    case _UTIL:
+      oled_write_P(PSTR("Util "), false);
+      break;
     default:
       oled_write_P(PSTR("Unkn "), false);
       break;