diff --git a/bombadil.toml b/bombadil.toml
index 531ece9..ceaf3c7 100644
--- a/bombadil.toml
+++ b/bombadil.toml
@@ -26,8 +26,11 @@ zshrc = { source = "zsh/zshrc", target = ".zshrc" }
 
 # vim
 nvim = { source = "nvim", target = ".config/nvim" }
-vimrc = { source = "vim/vimrc", target = ".vimrc" }
+vimrc = { source = "vimrc", target = ".vimrc" }
 
 # tmux
 tmux = { source = "tmux", target = ".config/tmux" }
 tmux_conf = { source = "tmux.conf", target = ".tmux.conf" }
+
+# powerline
+powerline = { source = "powerline", target = ".config/powerline" }
diff --git a/nvim/lightline b/nvim/lightline
index 716f0a2..896fd45 100644
--- a/nvim/lightline
+++ b/nvim/lightline
@@ -63,7 +63,7 @@ endfunction"}}}
 "}}}
 set laststatus=2  " Basic
 set noshowmode  " Disable show mode info
-augroup lightlineCustom
+augroup CustomLightline
   autocmd!
   autocmd BufWritePost * call lightline_gitdiff#query_git() | call lightline#update()
 augroup END
diff --git a/nvim/plugins b/nvim/plugins
index 747557e..cda7d19 100644
--- a/nvim/plugins
+++ b/nvim/plugins
@@ -1,16 +1,28 @@
+" Assorted plugins
 Plug 'tpope/vim-surround'
 Plug 'tpope/vim-fugitive'
-Plug 'neoclide/coc.nvim', {'branch': 'release'} " Git status is provided by coc-git
-Plug 'neoclide/coc-git'
 Plug 'cespare/vim-toml'
-Plug 'itchyny/lightline.vim'
-Plug 'itchyny/vim-gitbranch'
-Plug 'edkolev/tmuxline.vim'
+
+" CoC
+Plug 'neoclide/coc.nvim', {'branch': 'release'} |
+  \ Plug 'neoclide/coc-git'
+
+" Lightline
+Plug 'itchyny/lightline.vim' |
+  \ Plug 'itchyny/vim-gitbranch' |
+  \ Plug 'macthecadillac/lightline-gitdiff' |
+  \ Plug 'albertomontesg/lightline-asyncrun' |
+  \ Plug 'anstadnik/tmuxline.vim'
+  " Using the above fork for lightline truecolor support
+  " \ Plug 'edkolev/tmuxline.vim'
+
+" NerdTree
+Plug 'preservim/nerdtree' |
+  \ Plug 'Xuyuanp/nerdtree-git-plugin' |
+  \ Plug 'ryanoasis/vim-devicons' |
+  \ Plug 'tiagofumo/vim-nerdtree-syntax-highlight'
 
 " sonokai colorscheme + supporting plugins
-Plug 'sainnhe/artify.vim'
-Plug 'macthecadillac/lightline-gitdiff'
-Plug 'albertomontesg/lightline-asyncrun'
-Plug 'rmolin88/pomodoro.vim'
-Plug 'ryanoasis/vim-devicons'
-Plug 'sainnhe/sonokai'
+Plug 'sainnhe/sonokai' |
+  \ Plug 'sainnhe/artify.vim' |
+  \ Plug 'rmolin88/pomodoro.vim'
diff --git a/nvim/tmuxline b/nvim/tmuxline
new file mode 100644
index 0000000..2c7fea8
--- /dev/null
+++ b/nvim/tmuxline
@@ -0,0 +1,23 @@
+let g:tmuxline_separators = {
+    \ 'left' : '',
+    \ 'left_alt': '',
+    \ 'right' : '',
+    \ 'right_alt' : '',
+    \ 'space' : ' '}
+
+let g:tmuxline_preset = {
+      \'a'       : '#S',
+      \'b'       : '%R',
+      \'c'       : '#{sysstat_mem} 祝#{upload_speed}',
+      \'win'     : '#I #W',
+      \'cwin'    : '#I #W',
+      \'x'       : '#{download_speed}  #{sysstat_cpu}',
+      \'y'       : '%a',
+      \'z'       : '#H #{prefix_highlight}',
+      \'options' : {'status-justify' : 'centre'}}
+
+augroup CustomTmuxline
+  autocmd!
+  autocmd InsertEnter * silent! Tmuxline lightline_insert
+  autocmd InsertLeave * silent! Tmuxline lightline
+augroup END
diff --git a/tmux.conf b/tmux.conf
index 2095b51..e92d026 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -48,3 +48,9 @@ set -ga terminal-overrides ",*256col*:Tc"
 
 # Neovim said to...
 set-option -sg escape-time 10
+
+# Plugins
+set -g @plugin 'samoshkin/tmux-plugin-sysstat'
+set -g @plugin 'tmux-plugins/tmux-net-speed'
+set -g @plugin 'tmux-plugins/tmux-prefix-highlight'
+run '~/.tmux/plugins/tpm/tpm'
diff --git a/tmux/sonokai.conf b/tmux/sonokai.conf
index 305b549..24193a1 100644
--- a/tmux/sonokai.conf
+++ b/tmux/sonokai.conf
@@ -1,21 +1,21 @@
 # This tmux statusbar config was created by tmuxline.vim
 # on Wed, 16 Jun 2021
 
-set -g status-justify "left"
+set -g status-justify "centre"
 set -g status "on"
 set -g status-left-style "none"
-set -g message-command-style "fg=colour250,bg=colour237"
+set -g message-command-style "fg=#e2e2e3,bg=#414550"
 set -g status-right-style "none"
-set -g pane-active-border-style "fg=colour110"
-set -g status-style "none,bg=colour236"
-set -g message-style "fg=colour250,bg=colour237"
-set -g pane-border-style "fg=colour237"
+set -g pane-active-border-style "fg=#85d3f2"
+set -g status-style "none,bg=#33353f"
+set -g message-style "fg=#e2e2e3,bg=#414550"
+set -g pane-border-style "fg=#414550"
 set -g status-right-length "100"
 set -g status-left-length "100"
-setw -g window-status-activity-style "none"
+setw -g window-status-activity-style "none,fg=#85d3f2,bg=#33353f"
 setw -g window-status-separator ""
-setw -g window-status-style "none,fg=colour250,bg=colour236"
-set -g status-left "#[fg=colour235,bg=colour110,bold] #S #[fg=colour110,bg=colour236,nobold,nounderscore,noitalics]"
-set -g status-right "#[fg=colour237,bg=colour236,nobold,nounderscore,noitalics]#[fg=colour250,bg=colour237] %Y-%m-%d  %H:%M #[fg=colour110,bg=colour237,nobold,nounderscore,noitalics]#[fg=colour235,bg=colour110,bold] #h "
-setw -g window-status-format "#[fg=colour250,bg=colour236] #I #[fg=colour250,bg=colour236] #W "
-setw -g window-status-current-format "#[fg=colour236,bg=colour237,nobold,nounderscore,noitalics]#[fg=colour250,bg=colour237] #I #[fg=colour250,bg=colour237] #W #[fg=colour237,bg=colour236,nobold,nounderscore,noitalics]"
+setw -g window-status-style "none,fg=#e2e2e3,bg=#33353f"
+set -g status-left "#[fg=#2c2e34,bg=#85d3f2,bold] #S #[fg=#85d3f2,bg=#414550,nobold,nounderscore,noitalics]#[fg=#e2e2e3,bg=#414550] %R #[fg=#414550,bg=#33353f,nobold,nounderscore,noitalics]#[fg=#e2e2e3,bg=#33353f] #{sysstat_mem} 祝#{upload_speed} #[fg=#33353f,bg=#33353f,nobold,nounderscore,noitalics]"
+set -g status-right "#[fg=#33353f,bg=#33353f,nobold,nounderscore,noitalics]#[fg=#e2e2e3,bg=#33353f] #{download_speed}  #{sysstat_cpu} #[fg=#414550,bg=#33353f,nobold,nounderscore,noitalics]#[fg=#e2e2e3,bg=#414550] %a #[fg=#85d3f2,bg=#414550,nobold,nounderscore,noitalics]#[fg=#2c2e34,bg=#85d3f2,bold] #H #{prefix_highlight} "
+setw -g window-status-format "#[fg=#33353f,bg=#33353f,nobold,nounderscore,noitalics]#[default] #I #W #[fg=#33353f,bg=#33353f,nobold,nounderscore,noitalics]"
+setw -g window-status-current-format "#[fg=#33353f,bg=#414550,nobold,nounderscore,noitalics]#[fg=#e2e2e3,bg=#414550] #I #W #[fg=#414550,bg=#33353f,nobold,nounderscore,noitalics]"
diff --git a/vim/vimrc b/vimrc
similarity index 93%
rename from vim/vimrc
rename to vimrc
index 24d6d2d..f5f9ecc 100644
--- a/vim/vimrc
+++ b/vimrc
@@ -78,6 +78,11 @@ if filereadable(expand("~/.config/nvim/lightline"))
   source ~/.config/nvim/lightline
 endif
 
+" Tmuxline setup
+if filereadable(expand("~/.config/nvim/tmuxline"))
+  source ~/.config/nvim/tmuxline
+endif
+
 " Color setup
 if filereadable(expand("~/.config/nvim/colors"))
   source ~/.config/nvim/colors