diff --git a/common/config.h b/common/config.h
index 335ad8a..051640e 100644
--- a/common/config.h
+++ b/common/config.h
@@ -38,7 +38,8 @@
 // details see https://precondition.github.io/home-row-mods
 
 // the default is 200
-#define TAPPING_TERM 200
+#define TAPPING_TERM 175
+#define TAPPING_TERM_PER_KEY
 
 // Enable rapid switch from tap to hold, disables double tap hold auto-repeat.
 #define QUICK_TAP_TERM 0
diff --git a/common/keymap.h b/common/keymap.h
index 14ed359..78b4e78 100644
--- a/common/keymap.h
+++ b/common/keymap.h
@@ -29,36 +29,36 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_BASE] = LAYOUT(
     KC_W,         KC_L,         KC_Y,         KC_P,         KC_B,             KC_Z,           KC_F,         OSL(_MAGIC),  KC_U,         KC_QUOT,
-    LSFT_T(KC_C), LALT_T(KC_R), LCTL_T(KC_S), LSFT_T(KC_T), LGUI_T(KC_G),     RGUI_T(KC_M),   RSFT_T(KC_N), RCTL_T(KC_O), LALT_T(KC_I), RSFT_T(KC_A),
-    KC_Q,         KC_J,         KC_V,         RALT_T(KC_D), KC_K,             KC_X,           RALT_T(KC_H), KC_SLSH,      KC_COMM,      KC_DOT,
+    RALT_T(KC_C), LALT_T(KC_R), LCTL_T(KC_S), LSFT_T(KC_T), KC_G,             KC_M,           RSFT_T(KC_N), RCTL_T(KC_O), LALT_T(KC_I), RALT_T(KC_A),
+    KC_Q,         KC_J,         KC_V,         LGUI_T(KC_D), KC_K,             KC_X,           RGUI_T(KC_H), KC_SLSH,      KC_COMM,      KC_DOT,
                                               MO(_SYM),     LT(_NUM, KC_SPC), LT(_NAV, KC_E), MO(_FN)
 ),
 
 [_NUM] = LAYOUT(
     TO(_BASE),    C(KC_X),      C(KC_C),      C(KC_V),      XXXXXXX,          KC_LBRC,        KC_7,         KC_8,         KC_9,         KC_RBRC,
-    KC_LSFT,      KC_LALT,      KC_LCTL,      KC_LSFT,      KC_LGUI,          KC_EQL,         KC_4,         KC_5,         KC_6,         KC_SCLN,
-    XXXXXXX,      XXXXXXX,      XXXXXXX,      KC_RALT,      XXXXXXX,          KC_BSLS,        KC_1,         KC_2,         KC_3,         KC_GRV,
+    KC_RALT,      KC_LALT,      KC_LCTL,      KC_LSFT,      XXXXXXX,          KC_EQL,         KC_4,         KC_5,         KC_6,         KC_SCLN,
+    XXXXXXX,      XXXXXXX,      XXXXXXX,      KC_LGUI,      XXXXXXX,          KC_BSLS,        KC_1,         KC_2,         KC_3,         KC_GRV,
                                               XXXXXXX,      XXXXXXX,          KC_MINS,        KC_0
 ),
 
 [_NAV] = LAYOUT(
     XXXXXXX,      KC_PGUP,      KC_UP,        KC_PGDN,      XXXXXXX,          QK_BOOT,        XXXXXXX,      XXXXXXX,      XXXXXXX,      TO(_BASE),
-    KC_HOME,      KC_LEFT,      KC_DOWN,      KC_RGHT,      KC_END,           KC_RGUI,        KC_RSFT,      KC_RCTL,      KC_LALT,      KC_RSFT,
-    XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,          XXXXXXX,        KC_RALT,      XXXXXXX,      XXXXXXX,      XXXXXXX,
+    KC_HOME,      KC_LEFT,      KC_DOWN,      KC_RGHT,      KC_END,           XXXXXXX,        KC_RSFT,      KC_RCTL,      KC_LALT,      KC_RALT,
+    XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,          XXXXXXX,        KC_RGUI,      XXXXXXX,      XXXXXXX,      XXXXXXX,
                                               KC_TAB,       KC_ENT,           XXXXXXX,        XXXXXXX
 ),
 
 [_SYM] = LAYOUT(
     TO(_BASE),    C(KC_X),      C(KC_C),      C(KC_V),      XXXXXXX,          KC_LCBR,        KC_AMPR,      KC_ASTR,      KC_LPRN,      KC_RCBR,
-    KC_LSFT,      KC_LALT,      KC_LCTL,      KC_LSFT,      KC_LGUI,          KC_PLUS,        KC_DLR,       KC_PERC,      KC_CIRC,      KC_COLN,
-    XXXXXXX,      XXXXXXX,      XXXXXXX,      KC_RALT,      XXXXXXX,          KC_PIPE,        KC_EXLM,      KC_AT,        KC_HASH,      KC_TILD,
+    KC_RALT,      KC_LALT,      KC_LCTL,      KC_LSFT,      XXXXXXX,          KC_PLUS,        KC_DLR,       KC_PERC,      KC_CIRC,      KC_COLN,
+    XXXXXXX,      XXXXXXX,      XXXXXXX,      KC_LGUI,      XXXXXXX,          KC_PIPE,        KC_EXLM,      KC_AT,        KC_HASH,      KC_TILD,
                                               XXXXXXX,      XXXXXXX,          KC_UNDS,        KC_RPRN
 ),
 
 [_FN] = LAYOUT(
     KC_F12,       KC_F7,        KC_F8,        KC_F9,        KC_PSCR,          QK_BOOT,        XXXXXXX,      XXXXXXX,      XXXXXXX,      TO(_BASE),
-    KC_F11,       KC_F4,        KC_F5,        KC_F6,        KC_DEL,           KC_RGUI,        KC_RSFT,      KC_RCTL,      KC_LALT,      KC_RSFT,
-    KC_F10,       KC_F1,        KC_F2,        KC_F3,        KC_INS,           XXXXXXX,        KC_RALT,      XXXXXXX,      XXXXXXX,      XXXXXXX,
+    KC_F11,       KC_F4,        KC_F5,        KC_F6,        KC_DEL,           XXXXXXX,        KC_RSFT,      KC_RCTL,      KC_LALT,      KC_RALT,
+    KC_F10,       KC_F1,        KC_F2,        KC_F3,        KC_INS,           XXXXXXX,        KC_RGUI,      XXXXXXX,      XXXXXXX,      XXXXXXX,
                                               KC_BSPC,      KC_ESC,           XXXXXXX,        XXXXXXX
 ),
 
@@ -73,6 +73,22 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 #include "achordion.h"
 
+uint16_t get_tapping_term(uint16_t keycode, keyrecord_t* record) {
+  switch (keycode) {
+    // Increase the tapping term a little for alt/algr/win.
+    case RALT_T(KC_C):
+    case LALT_T(KC_R):
+    case LGUI_T(KC_D):
+    case RGUI_T(KC_H):
+    case LALT_T(KC_I):
+    case RALT_T(KC_A):
+      return TAPPING_TERM + 50;
+
+    default:
+      return TAPPING_TERM;
+  }
+}
+
 bool process_record_user(uint16_t keycode, keyrecord_t* record) {
   if (!process_achordion(keycode, record)) { return false; }
   return true;
@@ -100,3 +116,17 @@ bool achordion_chord(uint16_t tap_hold_keycode,
   return on_left_hand(tap_hold_record->event.key) !=
          on_left_hand(other_record->event.key);
 }
+
+uint16_t achordion_streak_timeout(uint16_t tap_hold_keycode) {
+  if (IS_QK_LAYER_TAP(tap_hold_keycode)) {
+    return 0;  // Disable streak detection on layer-tap keys.
+  }
+
+  // Otherwise, tap_hold_keycode is a mod-tap key.
+  const uint8_t mod = mod_config(QK_MOD_TAP_GET_MODS(tap_hold_keycode));
+  if ((mod & (MOD_LSFT | MOD_RSFT)) != 0) {
+    return 0;  // Disable for Shift mod-tap keys.
+  } else {
+    return 100;
+  }
+}