diff --git a/users/t4corun/features/combo.c b/users/t4corun/features/combo.c
index ad70d2b7..4cdb78e0 100644
--- a/users/t4corun/features/combo.c
+++ b/users/t4corun/features/combo.c
@@ -17,12 +17,13 @@ bool get_combo_must_tap(uint16_t index, combo_t *combo) {
   switch (index) {
 
 #if defined(MOUSEKEY_ENABLE)
+    case MOUSE_BUTTON3:
+    case MOUSE_BUTTON4:
+    case MOUSE_BUTTON5:
     case MOUSE_DRGTOG:
 #endif //MOUSEKEY_ENABLE
 
-    case KEY_ESC:
     case KEY_TAB:
-    case KEY_ENT:
     case KEY_BWRD:
       return true;
 
@@ -40,16 +41,12 @@ bool get_combo_must_press_in_order(uint16_t combo_index, combo_t *combo) {
     * return false means they do not have to be pressed in order
     * */
 
-#if defined(MOUSEKEY_ENABLE)
+#if defined(MOUSEKEY_ENABLE2222)
     case MOUSE_BUTTON1:
     case MOUSE_BUTTON2:
-    case MOUSE_BUTTON3:
     case MOUSE_BUTTON4:
-    case MOUSE_BUTTON5:
-#endif //MOUSEKEY_ENABLE
-
-    case KEY_ESC:
       return true;
+#endif //MOUSEKEY_ENABLE
 
     default:
       return false;
diff --git a/users/t4corun/features/combo.h b/users/t4corun/features/combo.h
index e2f5ed81..1b219016 100644
--- a/users/t4corun/features/combo.h
+++ b/users/t4corun/features/combo.h
@@ -13,9 +13,7 @@ enum combos {
   MOUSE_DRGTOG,
 #endif //MOUSEKEY_ENABLE
 
-  KEY_ESC,
   KEY_TAB,
-  KEY_ENT,
   LYR_FUNCTION,
 
   // right hand combos
@@ -30,22 +28,22 @@ enum combos {
 
 // left hand combos
 #if defined(MOUSEKEY_ENABLE)
-const uint16_t PROGMEM mou_btn1_combo[] = { KC_D,    KC_F,    COMBO_END };
-const uint16_t PROGMEM mou_btn2_combo[] = { KC_S,    KC_F,    COMBO_END };
-const uint16_t PROGMEM mou_btn3_combo[] = { KC_S,    KC_D,    COMBO_END };
-const uint16_t PROGMEM mou_btn4_combo[] = { KC_E,    KC_R,    COMBO_END };
-const uint16_t PROGMEM mou_btn5_combo[] = { KC_W,    KC_R,    COMBO_END };
-const uint16_t PROGMEM mou_drg_combo[]  = { TR_MOUA, KC_S,    COMBO_END };
+const uint16_t PROGMEM mou_btn1_combo[] = { KC_D,    KC_F,                      COMBO_END };
+const uint16_t PROGMEM mou_btn2_combo[] = { KC_S,    KC_D,                      COMBO_END };
+const uint16_t PROGMEM mou_btn3_combo[] = { KC_S,    KC_D,    KC_F,             COMBO_END };
+const uint16_t PROGMEM mou_btn4_combo[] = { KC_E,    KC_R,                      COMBO_END };
+const uint16_t PROGMEM mou_btn5_combo[] = { KC_W,    KC_E,                      COMBO_END };
+const uint16_t PROGMEM mou_drg_combo[]  = { TR_MOUA, KC_S,    KC_D,    KC_F,    COMBO_END };
 #endif //MOUSEKEY_ENABLE
 
-const uint16_t PROGMEM key_tab_combo[]  = { KC_C,    KC_V,    COMBO_END };
-const uint16_t PROGMEM lyr_fun_combo[]  = { NUM,     TR_LSFT, COMBO_END };
+const uint16_t PROGMEM key_tab_combo[]  = { KC_C,    KC_V,                      COMBO_END };
+const uint16_t PROGMEM lyr_fun_combo[]  = { NUM,     TR_LSFT,                   COMBO_END };
 
-// right hand combos
-const uint16_t PROGMEM key_del_combo[]  = { TR_COMM, TR_DOT,  COMBO_END };
-const uint16_t PROGMEM key_bspc_combo[] = { KC_M,    TR_COMM, COMBO_END };
-const uint16_t PROGMEM key_bwrd_combo[] = { KC_M,    TR_DOT,  COMBO_END };
-const uint16_t PROGMEM lyr_cfg_combo[]  = { KC_SPC,  NAV,     COMBO_END };
+// right hand combos 
+const uint16_t PROGMEM key_del_combo[]  = { TR_COMM, TR_DOT,                    COMBO_END };
+const uint16_t PROGMEM key_bspc_combo[] = { KC_M,    TR_COMM,                   COMBO_END };
+const uint16_t PROGMEM key_bwrd_combo[] = { KC_M,    TR_DOT,                    COMBO_END };
+const uint16_t PROGMEM lyr_cfg_combo[]  = { KC_SPC,  NAV,                       COMBO_END };
 
 
 combo_t key_combos[COMBO_LENGTH] = {