diff --git a/keyboards/crkbd/keymaps/sajenim/combos.def b/keyboards/crkbd/keymaps/sajenim/combos.def
index c33b9b0..c8540a2 100644
--- a/keyboards/crkbd/keymaps/sajenim/combos.def
+++ b/keyboards/crkbd/keymaps/sajenim/combos.def
@@ -1,11 +1,18 @@
 // Dictionary management
 
-// name         result    chord keys
-COMB(NE_ESC,    KC_ESC,   RCTL_T(KC_N), RSFT_T(KC_E))
-COMB(FN_MAGIC,  QK_AREP,  KC_F,         RCTL_T(KC_N))
+// name           result    chord keys
+COMB(NE_ESC,      KC_ESC,   RCTL_T(KC_N),    RSFT_T(KC_E))
+COMB(SE_CAP,      CW_TOGG,  LSFT_T(KC_S),    RSFT_T(KC_E))
+COMB(THUMB_SLEEP, KC_SLEP,  LT(NAV, KC_SPC), LSFT_T(KC_ENT))
+COMB(FN_MAGIC,    QK_AREP,  KC_F,            RCTL_T(KC_N))
+
 // substitutions
 SUBS(YP_HOME,   "~/",   KC_Y, KC_P)
 SUBS(FO_UPDIR,  "../",  KC_F, KC_O)
 
+// toggle layers
+TOGG(ST_MOD, MOD, LSFT_T(KC_S), LCTL_T(KC_T))
+TOGG(TP_NUM, NUM, LCTL_T(KC_T), KC_P)
+
 /* vim: set filetype=c: */
 
diff --git a/keyboards/crkbd/keymaps/sajenim/config.h b/keyboards/crkbd/keymaps/sajenim/config.h
index 7161582..0505d01 100644
--- a/keyboards/crkbd/keymaps/sajenim/config.h
+++ b/keyboards/crkbd/keymaps/sajenim/config.h
@@ -22,6 +22,9 @@
 #define ONESHOT_TIMEOUT 3000
 #define CAPS_WORD_IDlE_TIMEOUT 3000
 
+// combos' keys are always checked from layer 0
+#define COMBO_ONLY_FROM_LAYER 0
+
 // RGB
 #ifdef RGBLIGHT_ENABLE
     #define RGBLIGHT_SLEEP
diff --git a/keyboards/crkbd/keymaps/sajenim/keymap.c b/keyboards/crkbd/keymaps/sajenim/keymap.c
index 5c9b93f..ccd4868 100644
--- a/keyboards/crkbd/keymaps/sajenim/keymap.c
+++ b/keyboards/crkbd/keymaps/sajenim/keymap.c
@@ -16,9 +16,6 @@
 
 #include QMK_KEYBOARD_H
 
-// Combo dictionary management
-#include "g/keymap_combo.h"
-
 // Awesome features created by getreuer
 #include "features/sentence_case.h"
 #include "features/achordion.h"
@@ -35,6 +32,9 @@ enum layers {
   MOD,    // Contains keyboard related modifications.
 };
 
+// Combo dictionary management (layer names must be defined before engine include)
+#include "g/keymap_combo.h"
+
 // Our custom keycodes
 enum custom_keycodes {
   SC_TOGG = SAFE_RANGE,