diff --git a/config/helix/config.toml b/config/helix/config.toml
index 32b5ff0..254b7d1 100644
--- a/config/helix/config.toml
+++ b/config/helix/config.toml
@@ -2,6 +2,15 @@ theme = "gruvbox_dark_hard"
 
 [editor]
 true-color = true
+color-modes = true
+scrolloff = 30
+default-yank-register = "+"
+
+[editor.statusline]
+mode = { normal = "NORMAL", insert = "INSERT", select = "SELECT" }
+
+[editor.file-picker]
+hidden = false
 
 [editor.indent-guides]
 render = true
@@ -10,9 +19,12 @@ skip-levels = 1
 
 # command list here: https://github.com/helix-editor/helix/blob/master/helix-term/src/commands.rs
 [keys.normal]
-esc = [ "collapse_selection",  "keep_primary_selection" ]
+ret = "goto_word"
 X = "extend_line_above"
-D = "kill_to_line_end"
+D = ["goto_line_start", "extend_to_line_end", "yank", "goto_line_start", "kill_to_line_end"]
+Y = ["goto_line_start", "extend_to_line_end_newline", "yank", "goto_line_start"]
+esc = [ "collapse_selection",  "keep_primary_selection" ]
 
 [keys.normal.'space']
 "p" = "goto_last_accessed_file"
+"z" = "@\"%p\"+yd" 
diff --git a/config/tmux/.tmux.conf b/config/tmux/.tmux.conf
index 04eab55..8ec6f98 100644
--- a/config/tmux/.tmux.conf
+++ b/config/tmux/.tmux.conf
@@ -4,7 +4,7 @@ set -as terminal-features ",xterm*:RGB"
 set -g mouse on
 set -g base-index 1
 set -g pane-base-index 1
-set -sg escape-time 0
+set -s escape-time 10
 
 # remap prefix from 'C-b' to 'C-f'
 unbind l
@@ -42,12 +42,12 @@ bind m command-prompt "new-session -s %1"
 unbind '"'
 unbind %
 
-bind '\' split-window -h -l 40% -c "#{pane_current_path}"
-bind '`' split-window -v -l 35% -c "#{pane_current_path}"
+bind '`' split-window -h -l 40% -c "#{pane_current_path}"
+bind '\' split-window -v -l 35% -c "#{pane_current_path}"
 
-bind-key -n 'C-\' run-shell -b "~/.local/bin/tmux-toggle-term"
+bind-key -n 'C-\' run-shell -b "~/.local/bin/tmux-toggle-term float"
 bind g run-shell 'tmux popup -d "#{pane_current_path}" -xC -yC -w90% -h90% -E gitu'
-bind f run-shell 'tmux popup -d "#{pane_current_path}" -xC -yC -w90% -h90% -E "~/.local/bin/tmux-lf-helix"'
+bind e run-shell 'tmux popup -d "#{pane_current_path}" -xC -yC -w90% -h90% -E "~/.local/bin/tmux-lf-helix"'
 
 ## STATUS BAR ##################################################################