diff --git a/conf/tmux.conf b/conf/tmux.conf
index 3022db0..e1c8a85 100644
--- a/conf/tmux.conf
+++ b/conf/tmux.conf
@@ -8,7 +8,8 @@
 
 set -g default-terminal "screen-256color" # colors!
 setw -g xterm-keys on
-set -g escape-time 10                     # faster command sequences
+
+set -s escape-time 0                      # address vim mode switching delay (http://superuser.com/a/252717/65504)
 set -g repeat-time 600                    # increase repeat timeout
 set -g focus-events on
 
@@ -18,7 +19,12 @@ bind C-b send-prefix -2
 set -q -g status-utf8 on                  # expect UTF-8 (tmux < 2.2)
 setw -q -g utf8 on
 
-set -g history-limit 5000                 # boost history
+set -g history-limit 50000                # boost history
+
+set -g status-keys emacs                  # emacs key bindings in tmux command prompt (prefix + :) are better than
+                                          # vi keys, even for vim users
+
+setw -g aggressive-resize on              # super useful when using "grouped sessions" and multi-monitor setup
 
 # edit configuration
 bind e new-window -n "~/.tmux.conf" "EDITOR=\${EDITOR//mvim/vim} && EDITOR=\${EDITOR//gvim/vim} && \${EDITOR:-vim} ~/.tmux.conf && tmux source ~/.tmux.conf && tmux display \"~/.tmux.conf sourced\""
@@ -38,9 +44,9 @@ set -g renumber-windows on    # renumber windows when a window is closed
 set -g set-titles on          # set terminal title
 
 set -g display-panes-time 800 # slightly longer pane indicators display time
-set -g display-time 1000      # slightly longer status messages display time
+set -g display-time 4000      # slightly longer status messages display time
 
-set -g status-interval 10     # redraw status line every 10 seconds
+set -g status-interval 5      # redraw status line every 10 seconds
 
 # clear both screen and history
 bind -n C-l send-keys C-l \; run 'sleep 0.1' \; clear-history\; display 'screen and history cleared'
diff --git a/conf/tmux.conf.local b/conf/tmux.conf.local
index 53f703b..a030b3f 100644
--- a/conf/tmux.conf.local
+++ b/conf/tmux.conf.local
@@ -36,32 +36,38 @@ set -g prefix C-a
 bind C-a send-prefix
 
 # move status line to top
-#set -g status-position top
+# set -g status-right '%Y-%m-%d %H:%M #{tmux_mode_indicator}'
 
 
 # -- plugins configuration -----------------------------------------------------
 #
+set-environment -g TMUX_PLUGIN_MANAGER_PATH '$HOME/.tmux/plugins'
 
-if "test ! -d ~/.tmux/plugins/tpm" \
-   "run 'git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm && ~/.tmux/plugins/tpm/bin/install_plugins'"
-
-set -g @tpm_plugins '          \
-  tmux-plugins/tpm             \
-  # jimeh/tmux-themepack         \
-  dracula/tmux                 \
-  tmux-plugins/tmux-resurrect  \
-  tmux-plugins/tmux-continuum  \
+set -g @tpm_plugins '             \
+  tmux-plugins/tpm                \
+  odedlaz/tmux-onedark-theme      \
+  # dracula/tmux                    \
+  MunifTanjim/tmux-mode-indicator \
+  tmux-plugins/tmux-resurrect     \
+  tmux-plugins/tmux-continuum     \
 '
 
-set -g @dracula-show-fahrenheit false
-set -g @dracula-day-month true
-set -g @dracula-show-powerline true
-set -g @dracula-show-network false
-set -g @dracula-show-powerline true
-set -g @dracula-show-battery false
-set -g @dracula-show-timezone false
-set -g @dracula-military-time true
-set -g @dracula-show-left-icon session
+set -g @onedark_widgets "#(date +%s)"
+
+# set -g @dracula-refresh-rate 5
+# set -g @dracula-show-fahrenheit false
+# set -g @dracula-day-month true
+# set -g @dracula-show-powerline true
+# set -g @dracula-show-network false
+# set -g @dracula-show-powerline true
+# set -g @dracula-show-battery false
+# set -g @dracula-show-timezone false
+# set -g @dracula-military-time true
+# set -g @dracula-show-left-icon session
+
+
+if "test ! -d ~/.tmux/plugins/tpm" \
+ "run 'git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm && ~/.tmux/plugins/tpm/bin/install_plugins'"
 
 
 run '~/.tmux/plugins/tpm/tpm'