diff --git a/config/base.keymap b/config/base.keymap
index 547c65f..6f783fd 100644
--- a/config/base.keymap
+++ b/config/base.keymap
@@ -130,20 +130,14 @@ ZMK_BEHAVIOR(ss_cw, mod_morph,
     mods = <(MOD_LSFT)>;
 )
 
-// tap: backspace | lshft + tap: delete | rshft + tap: shift-delete | hold: fn layer
+// tap: backspace | lshft + tap: delete | rshft + tap: shift-delete
 ZMK_BEHAVIOR(bs_del, mod_morph,
     bindings = <&kp BSPC>, <&kp DEL>;
     mods = <(MOD_LSFT|MOD_RSFT)>;
-    keep-mods = <MOD_LSFT>;
-)
-ZMK_BEHAVIOR(lt_bspc, hold_tap,
-    flavor = "balanced";
-    tapping-term-ms = <200>;
-    quick-tap-ms = <QUICK_TAP_MS>;
-    bindings = <&mo>, <&bs_del>;
+    keep-mods = <MOD_RSFT>;
 )
 
-// tap: space | space + tap: dot -> space -> sticky shift | hold: activate layer
+// tap: space | shift + tap: dot -> space -> sticky shift | hold: activate layer
 ZMK_BEHAVIOR(dot_spc, macro,
     wait-ms = <0>;
     tap-ms = <5>;
@@ -229,7 +223,7 @@ ZMK_LAYER(base,
 //├──────┤ ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤ ├──────┤ ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤ ├──────┤
     X_LB     &kp Z         &kp X         &kp C         &kp D         &kp V           X_MB     &kp K         &kp H         &comma_morph  &dot_morph    &qexcl          X_RB
 //├──────┤ ╰─────────────┼─────────────┴─────────────┼─────────────┼─────────────┤ ├──────┤ ├─────────────┼─────────────┼─────────────┴───────────────────────────╯ ├──────┤
-    X_LH                                               &lt_spc NAV 0 &lt_bspc FN 0   X_MH     NUM_WORD      &ss_cw                                                    X_RH
+    X_LH                                               &lt_spc NAV 0 &lt FN RET     X_MH     NUM_WORD      &ss_cw                                                    X_RH
 //╰──────╯                                           ╰─────────────┴─────────────╯ ╰──────╯ ╰─────────────┴─────────────╯                                           ╰──────╯
 )
 
diff --git a/config/combos.dtsi b/config/combos.dtsi
index 0b08612..b36d3fb 100644
--- a/config/combos.dtsi
+++ b/config/combos.dtsi
@@ -18,8 +18,8 @@
 ZMK_COMBO(esc,   &kp ESC,       LT3 LT2,     DEF NAV NUM, COMBO_TERM_FAST)
 ZMK_COMBO(tab,   &kp TAB,       LT2 LT1,     DEF NAV NUM, COMBO_TERM_FAST)
 
-ZMK_COMBO(repeat,&key_repeat,   LM3 LM2,     DEF NAV NUM, COMBO_TERM_FAST)
-ZMK_COMBO(ret,   &kp RETURN,    LM2 LM1,     DEF NAV NUM, COMBO_TERM_FAST)
+ZMK_COMBO(ret,   &kp RETURN,    LM3 LM2,     DEF NAV NUM, COMBO_TERM_FAST)
+ZMK_COMBO(repeat,&key_repeat,   LM2 LM1,     DEF NAV NUM, COMBO_TERM_FAST)
 
 ZMK_COMBO(cut,   &kp LC(X),     LB3 LB1,     DEF NAV NUM, COMBO_TERM_SLOW)
 ZMK_COMBO(copy,  &kp LC(INS),   LB3 LB2,     DEF NAV NUM, COMBO_TERM_FAST)
diff --git a/config/corneish_zen.keymap b/config/corneish_zen.keymap
index 022d91c..ed6e8d2 100644
--- a/config/corneish_zen.keymap
+++ b/config/corneish_zen.keymap
@@ -3,7 +3,7 @@
 
 /* map Zen's extra keys */
 #define X_LH  &smart_mouse  // thumb row, left
-#define X_RH  &kp RET       // thumb row, right
+#define X_RH  &bs_del       // thumb row, right
 
 /* activate bluetooth */
 #define CONFIG_WIRELESS 1
diff --git a/config/planck_rev6.keymap b/config/planck_rev6.keymap
index d9507c3..e3f50c0 100644
--- a/config/planck_rev6.keymap
+++ b/config/planck_rev6.keymap
@@ -7,7 +7,7 @@
 #define X_MB  &none   &none                  // bottom row, middle
 #define X_LH  &none   &kp LGUI &smart_mouse  // thumb row, left
 #define X_MH  &none   &none                  // thumb row, middle
-#define X_RH  &kp RET U_WH_D   U_WH_U        // thumb row, right
+#define X_RH  &bs_del U_WH_D   U_WH_U        // thumb row, right
 
 /* source the main keymap */
 #include "base.keymap"