diff --git a/keyboards/crkbd/keymaps/sajenim/combos.def b/keyboards/crkbd/keymaps/sajenim/combos.def
index 0fa05e5..3422523 100644
--- a/keyboards/crkbd/keymaps/sajenim/combos.def
+++ b/keyboards/crkbd/keymaps/sajenim/combos.def
@@ -5,14 +5,14 @@ SUBS(LY_CD,       "cd ",                          KC_L,             KC_Y)
 SUBS(YP_LS,       "ls ",                          KC_Y,             KC_P)
 SUBS(FO_HOME,     "~/",                           KC_F,             KC_O)
 SUBS(OU_UPDIR,    "../",                          KC_O,             KC_U)
-COMB(RS_TAB,      KC_TAB,                         LALT_T(KC_R),     LSFT_T(KC_S))
-COMB(ST_BSPC,     KC_BSPC,                        LSFT_T(KC_S),     LCTL_T(KC_T))
-COMB(NE_ESC,      KC_ESC,                         RCTL_T(KC_N),     RSFT_T(KC_E))
-COMB(EI_ENT,      KC_ENT,                         RSFT_T(KC_E),     RALT_T(KC_I))
-SUBS(NEI_SAVE,    SS_TAP(X_ESC)":w"SS_TAP(X_ENT), RCTL_T(KC_N),     RSFT_T(KC_E),   RALT_T(KC_I))
+COMB(RS_TAB,      KC_TAB,                         LCTL_T(KC_R),     LALT_T(KC_S))
+COMB(ST_BSPC,     KC_BSPC,                        LALT_T(KC_S),     LGUI_T(KC_T))
+COMB(NE_ESC,      KC_ESC,                         RGUI_T(KC_N),     RALT_T(KC_E))
+COMB(EI_ENT,      KC_ENT,                         RALT_T(KC_E),     RCTL_T(KC_I))
+SUBS(NEI_SAVE,    SS_TAP(X_ESC)":w"SS_TAP(X_ENT), RGUI_T(KC_N),     RALT_T(KC_E),   RCTL_T(KC_I))
 SUBS(JV_COLN,     ":",                            KC_J,             KC_V)
 SUBS(SLSDOT_SCLN, ";",                            KC_SLSH,          KC_COMM)
-COMB(SE_CAP,      CW_TOGG,                        LSFT_T(KC_S),     RSFT_T(KC_E))
+COMB(CA_CAP,      CW_TOGG,                        LSFT_T(KC_C),     RSFT_T(KC_A))
 
 /* vim: set filetype=c: */
 
diff --git a/keyboards/crkbd/keymaps/sajenim/keymap.c b/keyboards/crkbd/keymaps/sajenim/keymap.c
index fafe4ba..9d5e051 100644
--- a/keyboards/crkbd/keymaps/sajenim/keymap.c
+++ b/keyboards/crkbd/keymaps/sajenim/keymap.c
@@ -41,14 +41,14 @@ enum custom_keycodes {
 /* Home Row Mods:
  * https://precondition.github.io/home-row-mods */
 
-#define HRM_C LGUI_T(KC_C)
-#define HRM_R LALT_T(KC_R)
-#define HRM_S LSFT_T(KC_S)
-#define HRM_T LCTL_T(KC_T)
-#define HRM_N RCTL_T(KC_N)
-#define HRM_E RSFT_T(KC_E)
-#define HRM_I RALT_T(KC_I)
-#define HRM_A RGUI_T(KC_A)
+#define HRM_C LSFT_T(KC_C)
+#define HRM_R LCTL_T(KC_R)
+#define HRM_S LALT_T(KC_S)
+#define HRM_T LGUI_T(KC_T)
+#define HRM_N RGUI_T(KC_N)
+#define HRM_E RALT_T(KC_E)
+#define HRM_I RCTL_T(KC_I)
+#define HRM_A RSFT_T(KC_A)
 #define HRM_D LT(SYM, KC_D)
 #define HRM_H LT(SYM, KC_H)
 
@@ -94,7 +94,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //,-----------------------------------------------------.                    ,-----------------------------------------------------.
       XXXXXXX, KC_MPLY, KC_MSTP, KC_MPRV, KC_MNXT, KC_VOLU,                      WZ_CMOD, KC_HOME,   KC_UP,  KC_END, KC_PGUP,  KC_DEL,
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      XXXXXXX, OS_LGUI, OS_LALT, OS_LSFT, OS_LCTL, KC_VOLD,                      WZ_PSTE, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______,
+      XXXXXXX, OS_LSFT, OS_LCTL, OS_LALT, OS_LGUI, KC_VOLD,                      WZ_PSTE, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______,
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
       XXXXXXX, CK_UNDO,  CK_CUT, CK_COPY, CK_PSTE, KC_CALC,                         KC_0,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,
   //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|