diff --git a/.gitignore b/.gitignore
index 9c86c59..e75a222 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,6 @@ files/.vim/swap/
 files/.vim/bundle/
 !files/.vim/bundle/repos/github.com/Shougo/dein.vim/
 
+files/.tmux/plugins/
+!files/.tmux/plugins/tpm
+
diff --git a/files/.config/zsh/custom/200-motd.zsh b/files/.config/zsh/custom/200-motd.zsh
index 60b588d..e7031c0 100644
--- a/files/.config/zsh/custom/200-motd.zsh
+++ b/files/.config/zsh/custom/200-motd.zsh
@@ -33,5 +33,7 @@ esac
 unset -f get_hostname_color
 
 # print motd
-ZSH_THEME_HOSTNAME_COLOR="$ZSH_THEME_HOSTNAME_COLOR" motd
+if [[ ! "$TERM" =~ '^screen|tmux' ]]; then
+    ZSH_THEME_HOSTNAME_COLOR="$ZSH_THEME_HOSTNAME_COLOR" motd
+fi
 
diff --git a/files/.tmux.conf b/files/.tmux.conf
index e4b1bac..729b0cd 100644
--- a/files/.tmux.conf
+++ b/files/.tmux.conf
@@ -31,7 +31,7 @@ bind-key -T copy-mode-vi C-\ select-pane -l
 # Mouse
 set -g mouse on
 
-# tmux-256-color is badly supported on some system, especially servers so we pretend to base screen instead
+# tmux-256-color 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'
 
@@ -63,12 +63,29 @@ set -g status-left '{#[fg=colour6]#S#[fg=default]}'
 
 set -g status-right-length 100
 set -g status-right-fg 'colour7'
-set -g status-right '#(__tmux_status)'
+set -g status-right '#(hostname)'
+
+# Plugins
+# Resurect pane content
+set -g @resurrect-capture-pane-contents 'on'
+
+# Also resurect the vim session
+# for vim
+set -g @resurrect-strategy-vim 'session'
+# for neovim
+set -g @resurrect-strategy-nvim 'session'
+
+# Save every 5 minutes
+set -g @continuum-save-interval '5'
+
+# Restore on session start
+set -g @continuum-restore 'on'
 
 # List of plugins
 set -g @plugin 'tmux-plugins/tpm'
 set -g @plugin 'tmux-plugins/tmux-sensible'
+set -g @plugin 'tmux-plugins/tmux-resurrect'
+set -g @plugin 'tmux-plugins/tmux-continuum'
 
 # Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf)
 run -b '~/.tmux/plugins/tpm/tpm'
-
diff --git a/files/.vim/vimrc b/files/.vim/vimrc
index c4c77cc..965f3bc 100644
--- a/files/.vim/vimrc
+++ b/files/.vim/vimrc
@@ -76,6 +76,7 @@ if dein#load_state(pluginpath)
     "call dein#add('chrisbra/unicode.vim')
     call dein#add('ctrlpvim/ctrlp.vim')
     call dein#add('easymotion/vim-easymotion')
+    call dein#add('tpope/vim-obsession')
 
     " Linting / Completion
     call dein#add('w0rp/ale')