diff --git a/tmux.conf b/tmux.conf
index cf9788a..19bbb14 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -1,9 +1,3 @@
-# allow resize bigger than the smallest client
-set -g aggressive-resize on
-
-# allow setting overrides of C-Up, ..., C-Right, and other stuff possibly...
-set -g terminal-overrides 'xterm*:smcup@:rmcup@'
-
 # ncurses not polluting scroll history
 set -g alternate-screen on
 
@@ -17,18 +11,17 @@ bind-key C-a last-window
 set -g history-limit 30000
 set-option -g default-shell /usr/bin/zsh
 set-window-option -g utf8 on
-set -g default-terminal "xterm"
+#set -g default-terminal "xterm"
 
 # vi mode
 set-window-option -g mode-keys vi
-set-option -g status-keys vi
 bind-key -t vi-copy 'v' begin-selection
 bind-key -t vi-copy 'y' copy-selection
 
 # escape mode
 unbind [
 bind Escape copy-mode
-set -s escape-time 50
+set -s escape-time 0
 
 # switch windows
 bind -r j previous-window
@@ -37,8 +30,8 @@ bind -r k next-window
 # splitting
 unbind %
 unbind '"'
-bind + split-window -h # horizontal split
-bind - split-window -v # vertical split
+bind + split-window -h
+bind - split-window -v
 bind -r C-h run "tmux select-pane -L"
 bind -r C-j run "tmux select-pane -D"
 bind -r C-k run "tmux select-pane -U"
@@ -53,7 +46,7 @@ bind-key v command-prompt -p "send pane to:"  "join-pane -t ':%%'"
 # window title
 set-option -g set-titles on
 set-option -g set-titles-string '[#H]: #W'
-set-window-option -g automatic-rename off
+set-window-option -g automatic-rename on
 
 # no visual activity
 set -g visual-activity off
@@ -76,8 +69,5 @@ set-window-option -g window-status-current-bg green
 set-window-option -g clock-mode-colour cyan
 set-window-option -g clock-mode-style 24
 
-# titles
-set -g automatic-rename on
-
 # make home and end keys work
-set-window-option -g xterm-keys on
+#set-window-option -g xterm-keys on