diff --git a/conf/tmux.conf b/conf/tmux.conf
index a149e006..6f2824d2 100644
--- a/conf/tmux.conf
+++ b/conf/tmux.conf
@@ -26,5 +26,18 @@ set -g base-index 1
 # Sets 0 as window 10 (in my keyboard, numbers are 1234567890)
 bind-key 0 select-window -t :10
 
-# Enables additional colours
+# Terminal supports 256colors
+# This should be tmux-256color since ncurses 6.0, consider changing it
+# when ncurses 6.0 hits Debian Stable or is in all systems I have access
+# to.
 set -g default-terminal "screen-256color"
+
+# Start non-login shell
+set -g default-command "${SHELL}"
+
+# Resize window (not session) based on the smallest client viewing it
+setw -g aggressive-resize on
+
+# Prevent freezing when lots of text is sent to output
+setw -g c0-change-trigger 10
+setw -g c0-change-interval 250