diff --git a/keyboards/crkbd/keymaps/sajenim/process_record.h b/keyboards/crkbd/keymaps/sajenim/process_record.h
index 5e09f3c..bad778c 100644
--- a/keyboards/crkbd/keymaps/sajenim/process_record.h
+++ b/keyboards/crkbd/keymaps/sajenim/process_record.h
@@ -10,13 +10,12 @@ enum custom_keycodes {
   SC_TOGG,
 };
 
-// Left-hand thumb key layers
-#define BAK_LWR LT(L_LOWER,  KC_BSPC)
-#define SPC_EXT LT(L_EXTEND, KC_SPC)
-
-// Right-hand thumb key layers
-#define ENT_SFT MT(MOD_LSFT, KC_ENT)
-#define DEL_UPR LT(L_UPPER,  KC_DEL)
+// Dual role keys
+#define SPACEFN LT(L_EXTEND, KC_SPC)
+#define ENTERFN LT(L_MACRO, KC_ENT)
+#define TABCTRL MT(MOD_LCTL, KC_TAB)
+#define BAK_LWR LT(L_LOWER, KC_BSPC)
+#define DEL_RSE LT(L_RAISE, KC_DEL)
 
 // One Shot Keys
 #define OS_LCTL OSM(MOD_LCTL)
@@ -35,7 +34,3 @@ enum custom_keycodes {
 #define WZ_COPY LCTL(LSFT(KC_C))
 #define WZ_PSTE LCTL(LSFT(KC_V))
 
-// Misc
-#define TABCTRL MT(MOD_LCTL, KC_TAB)
-#define BSPC_DW MT(MOD_LCTL, KC_BSPC)
-