diff --git a/tmux.conf b/tmux.conf
index 3ce927d..37d2e5b 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -1,12 +1,33 @@
 # True color support
-set-option -g default-terminal 'tmux-256color'
-set-option -ga terminal-overrides ',xterm-256color:Tc'
+set-option -ga terminal-overrides ',xterm-*:Tc'
 
 # Set encoding to Unicode8
 setw -gq utf8 on
 
+set -g status-interval 5
+set -g display-time 4000
+
+# Numbering changes
+set -g base-index 1
+set -g pane-base-index 1
+set -g renumber-windows on
+
+# History lengthening from the default 2k
+set -g history-limit 50000
+
+setw -g mode-keys vi
+
+set -g focus-events on
+
+# Window resizing on host shell size changes TODO: needs testing with pair coding
+set -g window-size latest
+setw -g aggressive-resize on
+
+# set -g default-command 'reattach-to-user-namespace -l $SHELL' # TODO: Is this necessary for Mac still?
+
 # Allow for external system clipboard
 set-option -g set-clipboard external
+set-option -g allow-passthrough on
 
 # Allow mouse interactions
 set -g mouse on
@@ -37,7 +58,6 @@ bind -n M-l next-window
 
 # Plugins
 set -g @plugin 'tmux-plugins/tpm'
-set -g @plugin 'tmux-plugins/tmux-sensible'
 set -g @plugin 'tmux-plugins/tmux-yank'
 set -g @plugin 'egel/tmux-gruvbox'