diff --git a/colemak_dh_modified/corne/config.h b/colemak_dh_modified/corne/config.h
index a469c6c..2ee0ac8 100644
--- a/colemak_dh_modified/corne/config.h
+++ b/colemak_dh_modified/corne/config.h
@@ -13,12 +13,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-#define UNICODE_SELECTED_MODES UNICODE_MODE_WINCOMPOSE, UNICODE_MODE_MACOS, UNICODE_MODE_LINUX
+#define UNICODE_SELECTED_MODES UNICODE_MODE_LINUX
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_STATIC_GRADIENT
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
 #define RGBLIGHT_EFFECT_TWINKLE
-#define TAPPING_TERM 210
-#define AUTO_SHIFT_TIMEOUT TAPPING_TERM
-#define RETRO_SHIFT
+#undef TAPPING_TERM
+#define TAPPING_TERM 200
+#define AUTO_SHIFT_TIMEOUT TAPPING_TERM + 20
+#define AUTO_SHIFT_NO_SETUP
+#define NO_AUTO_SHIFT_SYMBOLS
+#define RETRO_SHIFT 500
+#define PERMISSIVE_HOLD
diff --git a/colemak_dh_modified/corne/keymap.c b/colemak_dh_modified/corne/keymap.c
index 38855fd..b115740 100644
--- a/colemak_dh_modified/corne/keymap.c
+++ b/colemak_dh_modified/corne/keymap.c
@@ -30,6 +30,24 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     return true;
 }
 
+uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case MT(MOD_LSFT, KC_A):
+        case LT(4, KC_R):
+        case LT(2, KC_S):
+        case LT(1, KC_T):
+        case LT(3, KC_G):
+        case LT(3, KC_M):
+        case LT(1, KC_N):
+        case LT(2, KC_E):
+        case LT(4, KC_I):
+        case MT(MOD_RSFT, KC_O):
+            return TAPPING_TERM + 75;
+        default:
+            return TAPPING_TERM;
+    }
+}
+
 const uint16_t PROGMEM combo1[] = {KC_SPC, KC_S, COMBO_END};
 const uint16_t PROGMEM combo2[] = {CTL_SPC, KC_S, COMBO_END};
 const uint16_t PROGMEM combo3[] = {KC_SPC, KC_T, COMBO_END};
@@ -53,30 +71,30 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	[1] = LAYOUT_split_3x6_3(
             LALT_T(KC_TAB), KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC,    KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
-            LCTL_T(KC_ESC), KC_NO, KC_AMPR, KC_ASTR, KC_CIRC, KC_NO,   KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, KC_GRV,
-            KC_LSFT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,                KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, KC_TILD,
-                                     TO(1), TO(0), CTL_SPC,            RALT_T(KC_TAB), LT(3,KC_ENT), TO(1)
+            LCTL_T(KC_ESC), KC_NO, KC_AMPR, KC_ASTR, KC_CIRC, CW_TOGG,   KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, KC_GRV,
+            KC_LSFT, KC_NO, KC_NO, KC_NO, C(KC_L), KC_NO,                KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, KC_TILD,
+                                     TO(0), KC_SPC, CTL_SPC,            RALT_T(KC_TAB), LT(3,KC_ENT), TO(1)
     ),
 	[2] = LAYOUT_split_3x6_3(
 
             LALT_T(KC_TAB), KC_F1, KC_F2, KC_F3, KC_F4, KC_F5,           KC_CIRC, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
             LCTL_T(KC_ESC), KC_F6, KC_F7, KC_F8, KC_F9, KC_F10,        KC_COMM, KC_4, KC_5, KC_6, KC_MINS, KC_EQL, SC_LSPO,
             KC_NO, KC_NO, KC_DEL, KC_F11, KC_F12,                      KC_DOT, KC_1, KC_2, KC_3, KC_SLSH, KC_ASTR,
-                                 TO(2), TO(0), CTL_SPC,                KC_RSFT, LT(3,KC_ENT), TO(2)
+                                 TO(0), KC_SPC, CTL_SPC,                KC_RSFT, LT(3,KC_ENT), TO(2)
     ),
 
 	[3] = LAYOUT_split_3x6_3(
             KC_MUTE, KC_MPRV, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY,      KC_MS_D, KC_MS_R, KC_WH_R, KC_NO, KC_NO, KC_ACL0,
             LCTL_T(KC_ESC), KC_NO, KC_NO, KC_BTN3, KC_BTN1, KC_BTN2,   KC_NO, KC_WH_U, KC_WH_D, KC_NO, OSL(4), KC_ACL1,
             KC_LSFT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,                KC_MS_U, KC_MS_L, KC_WH_L, KC_NO, KC_NO, KC_ACL2,
-                                              TO(3), TO(0), CTL_SPC,   KC_NO, KC_NO, TO(3)
+                                              TO(0), KC_SPC, CTL_SPC,   KC_NO, KC_NO, TO(3)
     ),
 
 	[4] = LAYOUT_split_3x6_3(
-            RGB_TOG, RGB_M_B, RGB_M_P, RGB_VAD, RGB_VAI, RGB_M_K,      KC_DOWN, KC_RGHT, KC_PGUP, KC_HOME, AS_TOGG, TO(0),
+            RGB_TOG, RGB_M_B, RGB_M_P, RGB_VAD, RGB_VAI, KC_NO,      KC_DOWN, KC_RGHT, KC_PGUP, KC_HOME, AS_TOGG, TO(0),
             LCTL_T(KC_ESC), RGB_M_R, RGB_M_SW, RGB_HUD, RGB_HUI, RGB_M_TW,    KC_NO, KC_NO, KC_NO, KC_NO, KC_PSCR, RCTL_T(KC_QUOT),
-            KC_LSFT, RGB_M_G, RGB_M_SN, RGB_SAD, RGB_SAI, RGB_M_X,     KC_UP, KC_LEFT, KC_PGDN, KC_END, KC_NO, KC_NO,
-                                         KC_NO, TO(0), CTL_SPC,        KC_LGUI, KC_ENT, TO(4)
+            KC_LSFT, RGB_M_G, KC_NO, RGB_SAD, RGB_SAI, KC_NO,     KC_UP, KC_LEFT, KC_PGDN, KC_END, KC_NO, KC_NO,
+                                         TO(0), KC_SPC, CTL_SPC,        KC_LGUI, KC_ENT, TO(4)
     ),
 };
 
diff --git a/colemak_dh_modified/corne/rules.mk b/colemak_dh_modified/corne/rules.mk
index 57a03e2..9ddbd21 100644
--- a/colemak_dh_modified/corne/rules.mk
+++ b/colemak_dh_modified/corne/rules.mk
@@ -22,3 +22,4 @@ LTO_ENABLE      = yes
 UNICODE_ENABLE  = yes
 NKRO_ENABLE = yes
 AUTO_SHIFT_ENABLE = yes
+CAPS_WORD_ENABLE = yes