diff --git a/keyboards/crkbd/keymaps/sajenim/combos.def b/keyboards/crkbd/keymaps/sajenim/combos.def
index bcd6157..268ba16 100644
--- a/keyboards/crkbd/keymaps/sajenim/combos.def
+++ b/keyboards/crkbd/keymaps/sajenim/combos.def
@@ -1,7 +1,6 @@
 //   name       result      chord keys
 COMB(NE_ESC,    KC_ESC,     KC_N, KC_E)
 COMB(SE_CAPS,   CW_TOGG,    KC_S, KC_E)
-COMB(ST_CTLW,   LCTL(KC_W), KC_S, KC_T)
 // unix shell
 SUBS(YP_HOME,   "~/",       KC_Y, KC_P)
 SUBS(FO_UPDIR,  "../",      KC_F, KC_O)
diff --git a/keyboards/crkbd/keymaps/sajenim/keymap.c b/keyboards/crkbd/keymaps/sajenim/keymap.c
index 48cd817..c7752eb 100644
--- a/keyboards/crkbd/keymaps/sajenim/keymap.c
+++ b/keyboards/crkbd/keymaps/sajenim/keymap.c
@@ -33,7 +33,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
       OS_LSFT,    KC_Q,    KC_J,    KC_V,    KC_D,    KC_K,                         KC_X,    KC_H, KC_SLSH, KC_COMM,  KC_DOT, OS_RSFT,
   //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          GUI_EXT, BAK_LWR, SPC_EXT,    ENT_SFT, DEL_UPR, ALT_EXT
+                                          QK_LEAD, BAK_LWR, SPC_EXT,    ENT_SFT, DEL_UPR,  QK_REP
+                                      //`--------------------------'  `--------------------------'
+  ),
+
+  [L_EXTEND] = LAYOUT_split_3x6_3(
+  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
+      _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      KC_PGUP, KC_HOME,   KC_UP,  KC_END,  KC_DEL,  KC_ESC,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      XXXXXXX, OS_LGUI, OS_LALT, OS_LSFT, OS_LCTL, XXXXXXX,                      KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_BSPC, XXXXXXX,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                         KC_0,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,
+  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
+                                          XXXXXXX, XXXXXXX, XXXXXXX,    _______, WZ_CMOD, WZ_PSTE
                                       //`--------------------------'  `--------------------------'
   ),
 
@@ -72,18 +84,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                           XXXXXXX, _______, XXXXXXX,    XXXXXXX, _______, XXXXXXX
                                       //`--------------------------'  `--------------------------'
   ),
-
-  [L_EXTEND] = LAYOUT_split_3x6_3(
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-      _______, XXXXXXX, KC_HOME,   KC_UP,  KC_END, KC_PGUP,                      KC_PGUP, KC_HOME,   KC_UP,  KC_END, XXXXXXX, _______,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN,                      KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-         KC_5,    KC_4,    KC_3,    KC_2,    KC_1,    KC_0,                         KC_0,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          XXXXXXX, XXXXXXX, XXXXXXX,    _______, WZ_CMOD, WZ_PSTE
-                                      //`--------------------------'  `--------------------------'
-  ),
 };
 
 /* Layer Change */
diff --git a/keyboards/crkbd/keymaps/sajenim/process_record.c b/keyboards/crkbd/keymaps/sajenim/process_record.c
index 2711a04..eb7d145 100644
--- a/keyboards/crkbd/keymaps/sajenim/process_record.c
+++ b/keyboards/crkbd/keymaps/sajenim/process_record.c
@@ -6,32 +6,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     if (!process_sentence_case(keycode, record)) { return false; }
     
     switch (keycode) {
-        case GUI_EXT:
-            if (record->tap.count && record->event.pressed) {
-                set_oneshot_mods(MOD_BIT(KC_LGUI));
-                return false;
-            } else if (record->event.pressed) {
-                register_mods(MOD_BIT(KC_LGUI));
-                layer_on(L_EXTEND);
-            } else {
-                unregister_mods(MOD_BIT(KC_LGUI));
-                layer_off(L_EXTEND);
-            }
-            return false;
-
-        case ALT_EXT:
-            if (record->tap.count && record->event.pressed) {
-                set_oneshot_mods(MOD_BIT(KC_LALT));
-                return false;
-            } else if (record->event.pressed) {
-                register_mods(MOD_BIT(KC_LALT));
-                layer_on(L_EXTEND);
-            } else {
-                unregister_mods(MOD_BIT(KC_LALT));
-                layer_off(L_EXTEND);
-            }
-            return false;
-
         case BSPC_DW:
             if (record->tap.count && record->event.pressed) {
                 tap_code(KC_BSPC);
diff --git a/keyboards/crkbd/keymaps/sajenim/process_record.h b/keyboards/crkbd/keymaps/sajenim/process_record.h
index 4cd19da..a41ec6e 100644
--- a/keyboards/crkbd/keymaps/sajenim/process_record.h
+++ b/keyboards/crkbd/keymaps/sajenim/process_record.h
@@ -9,14 +9,12 @@ enum custom_keycodes {
 };
 
 // Left-hand thumb key layers
-#define GUI_EXT LT(L_EXTEND, KC_LGUI)
 #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)
-#define ALT_EXT LT(L_EXTEND, KC_LALT)
 
 // One Shot Keys
 #define OS_LCTL OSM(MOD_LCTL)
diff --git a/keyboards/crkbd/keymaps/sajenim/rules.mk b/keyboards/crkbd/keymaps/sajenim/rules.mk
index e786b99..b32c636 100644
--- a/keyboards/crkbd/keymaps/sajenim/rules.mk
+++ b/keyboards/crkbd/keymaps/sajenim/rules.mk
@@ -8,6 +8,8 @@ LTO_ENABLE = yes
 # Optional features
 OLED_ENABLE 				= yes
 RGBLIGHT_ENABLE			= yes
+REPEAT_KEY_ENABLE		= yes
+LEADER_ENABLE				= yes
 # Toggleable through keymap
 AUTO_SHIFT_ENABLE		= yes
 AUTOCORRECT_ENABLE	= yes