diff --git a/tmux/tmux.conf b/tmux/tmux.conf
index 28523be..805d729 100644
--- a/tmux/tmux.conf
+++ b/tmux/tmux.conf
@@ -1,5 +1,9 @@
 set -g default-command "${SHELL}"
-set -g default-terminal "tmux-256color"
+set -g default-terminal "rxvt-unicode"
+
+set -g set-titles on
+set -g set-titles-string '#S'
+setw -g automatic-rename
 
 set -g prefix C-a
 unbind C-b
@@ -26,7 +30,7 @@ bind l select-pane -R
 
 set -g bell-action any
 
-set -g history-limit 5000
+set -g history-limit 50000
 
 set -g base-index 1
 set-window-option -g pane-base-index 1
@@ -85,7 +89,6 @@ bind-key c new-window -c "#{pane_current_path}"
 bind-key -n S-down new-window
 bind-key -n S-left prev
 bind-key -n S-right next
-bind-key -n C-q detach
 
 bind-key -n C-F1 command-prompt "split-window -h 'exec man %%'"
 bind-key -n C-F2 split-window -h "exec htop"