diff --git a/.gitignore b/.gitignore
index b870a4b..07cd4d1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ nvim/nvim.symlink/plugged/
 plug.vim.old
 vim/vim.symlink/spell/
 nvim/nvim.symlink/spell/
+nvim/nvim.symlink/shada/
diff --git a/nvim/nvimrc.symlink b/nvim/nvimrc.symlink
index 8a43b6d..0c1ab4c 100644
--- a/nvim/nvimrc.symlink
+++ b/nvim/nvimrc.symlink
@@ -111,6 +111,8 @@ set clipboard=unnamed
 " faster redrawing
 set ttyfast
 
+set diffopt+=vertical
+
 " highlight conflicts
 match ErrorMsg '^\(<\|=\|>\)\{7\}\([^=].\+\)\?$'
 
diff --git a/tmux/theme.sh b/tmux/theme.sh
index 0855f31..fb8690e 100644
--- a/tmux/theme.sh
+++ b/tmux/theme.sh
@@ -1,10 +1,11 @@
 #### COLOUR
 
-tm_icon="♟"
-tm_color_active=colour213
+tm_icon="☀"
+tm_color_active=colour82
 tm_color_inactive=colour241
-tm_color_feature=colour4
-tm_color_music=colour203
+tm_color_feature=colour10
+tm_color_music=colour10
+tm_active_border_color=colour10
 
 # separators
 tm_separator_left_bold="◀"
@@ -35,7 +36,7 @@ set-window-option -g  window-status-current-format "#[bold]#I #W"
 
 # pane border
 set-option -g pane-border-fg $tm_color_inactive
-set-option -g pane-active-border-fg $tm_color_active
+set-option -g pane-active-border-fg $tm_active_border_color
 
 # message text
 set-option -g message-bg default
@@ -58,4 +59,4 @@ tm_host="#[fg=$tm_color_feature,bold]#h"
 tm_session_name="#[fg=$tm_color_feature,bold]$tm_icon #S"
 
 set -g status-left $tm_session_name' '
-set -g status-right $tm_itunes' '$tm_rdio' '$tm_spotify' '$tm_date' '$tm_host
+set -g status-right $tm_itunes' '$tm_date' '$tm_host
diff --git a/tmux/tmux.conf.symlink b/tmux/tmux.conf.symlink
index 5cf5fa9..595f1f0 100644
--- a/tmux/tmux.conf.symlink
+++ b/tmux/tmux.conf.symlink
@@ -41,8 +41,8 @@ bind = select-layout tiled
 set -g base-index 1
 setw -g pane-base-index 1
 
-# set-option -g set-titles on
-# set-option -g set-titles-string "#T - #W"
+set-option -g set-titles on
+set-option -g set-titles-string "#T - #W"
 # set-window-option -g automatic-rename on
 
 ######################