diff --git a/home/user/.config/tmux/mappings.conf b/home/user/.config/tmux/mappings.conf
index b03b13b..4eb5547 100644
--- a/home/user/.config/tmux/mappings.conf
+++ b/home/user/.config/tmux/mappings.conf
@@ -17,7 +17,7 @@ bind -T off F12 \
 
 
 # Switch new named session
-bind n command-prompt -p "New session:" "new-session -d -s '%1' \; switch-client -t '%1'"
+bind n command-prompt -p "New session:" "new-session -A -d -s '%1' \; switch-client -t '%1'"
 
 # Call prompt via Alt+;
 bind -n 'M-;' command-prompt
@@ -36,16 +36,16 @@ bind -n M-p previous-window
 bind -n M-n next-window
 bind -n M-Tab last-window
 
-bind -n M-1 new-window -n 1 -S
-bind -n M-2 new-window -n 2 -S
-bind -n M-3 new-window -n 3 -S
-bind -n M-4 new-window -n 4 -S
-bind -n M-5 new-window -n 5 -S
-bind -n M-6 new-window -n 6 -S
-bind -n M-7 new-window -n 7 -S
-bind -n M-8 new-window -n 8 -S
-bind -n M-9 new-window -n 9 -S
-bind -n M-0 new-window -n 10 -S
+bind -n M-1 new-window -n 1 -S -c "#{pane_current_path}"
+bind -n M-2 new-window -n 2 -S -c "#{pane_current_path}"
+bind -n M-3 new-window -n 3 -S -c "#{pane_current_path}"
+bind -n M-4 new-window -n 4 -S -c "#{pane_current_path}"
+bind -n M-5 new-window -n 5 -S -c "#{pane_current_path}"
+bind -n M-6 new-window -n 6 -S -c "#{pane_current_path}"
+bind -n M-7 new-window -n 7 -S -c "#{pane_current_path}"
+bind -n M-8 new-window -n 8 -S -c "#{pane_current_path}"
+bind -n M-9 new-window -n 9 -S -c "#{pane_current_path}"
+bind -n M-0 new-window -n 10 -S -c "#{pane_current_path}"
 
 
 # Windows splitting
@@ -62,7 +62,7 @@ bind -n C-M-k resize-pane -U
 
 # Copy mode
 setw -g mode-keys vi
-bind-key v copy-mode
+bind v copy-mode
 bind p paste-buffer
 
 bind -T copy-mode-vi v send-keys -X begin-selection
@@ -75,7 +75,7 @@ bind -T copy-mode-vi C-c send-keys -X cancel
 bind -T copy-mode-vi q send-keys -X cancel
 
 # Lock screen
-bind-key -T prefix l confirm-before -p "lock tmux? (y/n)" lock-session
+bind l confirm-before -p "lock tmux? (y/n)" lock-session
 
 # Reload config
 bind r source-file ~/.config/tmux/tmux.conf \; display-message "Config reloaded..."