diff --git a/.gitmodules b/.gitmodules
index 798fcd36..8c8d5a60 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -116,3 +116,6 @@
 [submodule "vim/.vim/bundle/completor.vim"]
 	path = vim/.vim/bundle/completor.vim
 	url = https://github.com/maralla/completor.vim
+[submodule "tmux/.tmux/bundle/tmux-sessionist"]
+	path = tmux/.tmux/bundle/tmux-sessionist
+	url = https://github.com/tmux-plugins/tmux-sessionist
diff --git a/README.md b/README.md
index 47c6fefe..fac26a56 100644
--- a/README.md
+++ b/README.md
@@ -153,6 +153,8 @@ To add your own Vim, Tmux or Zsh plugin you can just clone it to proper
    tmux environment across system restarts
  * [tmux-sensible](https://github.com/tmux-plugins/tmux-sensible): basic tmux
    settings everyone can agree on
+ * [tmux-sessionist](https://github.com/tmux-plugins/tmux-sessionist):
+   Lightweight tmux utils for manipulating sessions
  * [tmux-yank](https://github.com/tmux-plugins/tmux-yank): Plugin for copying to
    system clipboard
  * [vim-tmux-navigator](https://github.com/christoomey/vim-tmux-navigator):
diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index 43c2ca79..31f92273 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -25,9 +25,6 @@ unbind C-b
 set -g prefix C-Space
 bind C-space send-prefix
 
-# Kill current session
-bind X kill-session
-
 # Open new windows and tabs with current path
 bind c new-window -c "#{pane_current_path}"
 bind '"' split-window -h -c "#{pane_current_path}"
@@ -77,10 +74,12 @@ set -g set-titles-string '#T'
 # Status bar
 set -g status on
 set -g status-bg default
-set -g status-fg default
+set -g status-fg cyan
 
-set -g status-left ''
+set -g status-left '#{?client_prefix,#[fg=green]#[bold]-- PREFIX -- ,}#{?pane_in_mode,#[fg=green]#[bold]-- VISUAL -- ,}'
+set -g status-left-length 100
 set -g status-right '#[fg=cyan]#S'
+set -g status-right-length 100
 set -g window-status-format '#[fg=black]#I:#W#F'
 set -g window-status-current-format '#[fg=blue]#I:#W#F'
 
@@ -97,7 +96,7 @@ set -g @continuum-restore 'on'
 set -g @continuum-save-interval '10'
 
 # Pathogen-like loader for plugins
-run-shell 'find -L ~/.tmux/bundle -type f -name "*.tmux" | sort -r | while read f; do bash $f; done'
+run-shell 'find -L ~/.tmux/bundle -type f -name "*.tmux" | sort | while read f; do bash $f; done'
 
 # }}}
 
diff --git a/tmux/.tmux/bundle/tmux-sessionist b/tmux/.tmux/bundle/tmux-sessionist
new file mode 160000
index 00000000..72184068
--- /dev/null
+++ b/tmux/.tmux/bundle/tmux-sessionist
@@ -0,0 +1 @@
+Subproject commit 721840680907e3495fcfec83dc7df1b6aa624015
diff --git a/vim/.vim/bundle/completor.vim b/vim/.vim/bundle/completor.vim
index 53049e08..bb7ede7d 160000
--- a/vim/.vim/bundle/completor.vim
+++ b/vim/.vim/bundle/completor.vim
@@ -1 +1 @@
-Subproject commit 53049e084af33ce3e647c9c3b2783db00085c00e
+Subproject commit bb7ede7de3181e20878399e649331a29910b4b92
diff --git a/vim/.vim/bundle/tsuquyomi b/vim/.vim/bundle/tsuquyomi
index 72681b0b..c5baa326 160000
--- a/vim/.vim/bundle/tsuquyomi
+++ b/vim/.vim/bundle/tsuquyomi
@@ -1 +1 @@
-Subproject commit 72681b0be0415fa406894c712090ef4db27a0b69
+Subproject commit c5baa3263b3c93c22c7b1b558147f43c0f701f99
diff --git a/vim/.vim/bundle/vim-test b/vim/.vim/bundle/vim-test
index c3ed265f..54ebd839 160000
--- a/vim/.vim/bundle/vim-test
+++ b/vim/.vim/bundle/vim-test
@@ -1 +1 @@
-Subproject commit c3ed265f314f03c3d729cac7957246267dadb6e9
+Subproject commit 54ebd839cea9c72a7d217b44201314f6a2abd859
diff --git a/zsh/.fzf b/zsh/.fzf
index a50909e8..a5862d4b 160000
--- a/zsh/.fzf
+++ b/zsh/.fzf
@@ -1 +1 @@
-Subproject commit a50909e8067f5ef5a0aa2bb4637f033fe91df8b2
+Subproject commit a5862d4b9cc5f57ef83174c0d714bfb485094a4f
diff --git a/zsh/.zim b/zsh/.zim
index 53a3cd79..43096df5 160000
--- a/zsh/.zim
+++ b/zsh/.zim
@@ -1 +1 @@
-Subproject commit 53a3cd793357336490ed63d86ee509618f024f5c
+Subproject commit 43096df5cbb148cf574e8057bc2d1b16b28c65cf
diff --git a/zsh/.zsh/bundle/vi-mode.plugin.zsh b/zsh/.zsh/bundle/vi-mode.plugin.zsh
index 1ec2f132..6f68df91 100644
--- a/zsh/.zsh/bundle/vi-mode.plugin.zsh
+++ b/zsh/.zsh/bundle/vi-mode.plugin.zsh
@@ -36,6 +36,7 @@ bindkey '^e' end-of-line
 # if mode indicator wasn't setup by theme, define default
 if [[ "$MODE_INDICATOR" == "" ]]; then
   MODE_INDICATOR="%{$fg_bold[red]%}<%{$fg[red]%}<<%{$reset_color%}"
+  MODE_INDICATOR="%{$FX[bold]%}%{$FG[2]%}-- INSERT --%{$FX[reset]%}"
 fi
 
 vi_mode_prompt_info() {
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 098c3f0d..38e061bc 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -34,6 +34,7 @@ if [ -f ~/.zim/init.zsh ]; then
     archive \
     directory \
     environment \
+    spectrum \
     fasd \
     git \
     git-info \