diff --git a/files/.config/zsh/custom/100-alias.zsh b/files/.config/zsh/custom/100-alias.zsh
index 559039a..352e5bb 100644
--- a/files/.config/zsh/custom/100-alias.zsh
+++ b/files/.config/zsh/custom/100-alias.zsh
@@ -9,11 +9,11 @@ alias rename="perl-rename"
 alias userctl="systemctl --user"
 
 # ls
-alias ls='lsd --group-dirs=first '
+alias ls='lsd --group-dirs=first'
 alias l='ls -l'
-alias la='ls -a '
-alias lla='ls -la '
-alias lt='ls --tree '
+alias la='ls -a'
+alias lla='ls -la'
+alias lt='ls --tree'
 
 # powershell seems to have trouble with xterm-256color
 alias pwsh="TERM=xterm pwsh"
diff --git a/files/.config/zsh/custom/300-tmux.zsh b/files/.config/zsh/custom/300-tmux.zsh
new file mode 100644
index 0000000..846dc86
--- /dev/null
+++ b/files/.config/zsh/custom/300-tmux.zsh
@@ -0,0 +1,2 @@
+export ZSH_TMUX_AUTOSTART=true
+export ZSH_TMUX_FIXTERM_WITH_256COLOR=true
diff --git a/files/.tmux.conf b/files/.tmux.conf
index 6663670..1c8f8bc 100644
--- a/files/.tmux.conf
+++ b/files/.tmux.conf
@@ -16,10 +16,6 @@ set -s escape-time 0
 # Mouse
 set -g mouse on
 
-# tmux-256color is badly supported on some system, especially servers so we pretend to be screen instead
-set -g default-terminal 'screen-256color'
-set -ga terminal-overrides ',screen-256color:Tc'
-
 # Window
 set -g base-index 1
 
diff --git a/files/.zshrc b/files/.zshrc
index 21fcff0..086f8ae 100644
--- a/files/.zshrc
+++ b/files/.zshrc
@@ -3,7 +3,6 @@ if [ -z "$WAYLAND_DISPLAY" ] && [ "$(tty)" = "/dev/tty1" ]; then
     exec ~/bin/sway
 fi
 
-
 # If you come from bash you might have to change your $PATH.
 # export PATH=$HOME/bin:/usr/local/bin:$PATH