diff --git a/bash/.bashrc b/bash/.bashrc
index 2821b3f..7b21964 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -166,7 +166,6 @@ alias ssh="TERM=xterm-256color ssh"
 alias vim="nvim"
 alias vi="nvim"
 
-alias k9s="/home/jfm/Tools/k9s/k9s"
 alias kubectx="/home/jfm/Repositories/GitHub/kubectx/kubectx"
 
 alias buildtool="/home/jfm/.buildtool/bin/buildtool"
@@ -174,11 +173,11 @@ alias buildtool="/home/jfm/.buildtool/bin/buildtool"
 alias vpnup="nmcli con up id \"YouSee VPN\""
 alias vpndown="nmcli con down id \"YouSee VPN\""
 
-alias k9t="k9s --context onboarding-test/master-int-liquid-tdk-dk:443/m78311"
-alias k9p="k9s --context onboarding-prod/liquid-tdk-dk:443/m78311"
+alias k9t="k9s --context onboarding-test/master-int-liquid-tdk-dk:443/m78311 --command dp"
+alias k9p="k9s --context onboarding-prod/liquid-tdk-dk:443/m78311 --command dp"
 
-alias dtmux="tmux new \; split-window -h -p 40"
-alias ptmux="tmux new \; split-window -h -p 40 \; split-window -v -p 25"
+alias dtmux="tmux split-window -h -p 40"
+alias ptmux="tmux split-window -h -p 40 \; split-window -v -p 25"
 
 [ -f ~/.fzf.bash ] && source ~/.fzf.bash
 
diff --git a/neovim/.config/nvim/init.vim b/neovim/.config/nvim/init.vim
index 458be07..aeed757 100644
--- a/neovim/.config/nvim/init.vim
+++ b/neovim/.config/nvim/init.vim
@@ -13,7 +13,7 @@ set number
 set autoread
 set hidden
 set termguicolors
-set background=light
+set background=dark
 set rtp^=/usr/share/vim/vimfiles/
 set undodir=~/.local/share/nvim/undodir
 set undofile
@@ -24,6 +24,7 @@ set relativenumber
 
 "Plugins
 call plug#begin('~/.local/share/nvim/plugged')
+
 " Colorschemes
 Plug 'chriskempson/base16-vim'
 Plug 'arcticicestudio/nord-vim'
@@ -61,6 +62,9 @@ Plug 'alvan/vim-closetag'
 
 " Testing
 Plug 'janko/vim-test'
+
+" Editing
+Plug 'tpope/vim-surround'
 call plug#end()
 
 
@@ -76,7 +80,7 @@ let g:airline_theme='nord'
 let g:airline_symbols.maxlinenr = ''
 
 " BufExplorer
-nnoremap <silent> <F36> :BufExplorerVerticalSplit<CR>
+nnoremap <silent> <C-F12> :BufExplorerVerticalSplit<CR>
 nnoremap <silent> <F12> :bn<CR>
 nnoremap <silent> <F24> :bp<CR>
 
@@ -88,9 +92,9 @@ nmap <silent> gr <Plug>(coc-references)
 inoremap <silent><expr> <c-space> coc#refresh()
 
 " Testing
-nmap <silent> <F34> :TestNearest<CR>
+nmap <silent> <C-F10> :TestNearest<CR>
 nmap <silent> t<C-n> :TestNearest<CR>
-nmap <silent> <F22> :TestFile<CR>
+nmap <silent> <S-F10> :TestFile<CR>
 nmap <silent> t<C-f> :TestFile<CR>
 nmap <silent> t<C-s> :TestSuite<CR>
 nmap <silent> t<C-l> :TestLast<CR>
@@ -133,7 +137,7 @@ map <M-3> :HFiles<CR>
 :vmap r "_dP
 :nmap <c-s> :w<CR>
 :imap <c-s> <Esc>:w<CR>a
-:nmap <silent> <F28> :bd<CR>
+:nmap <silent> <C-F4> :bd<CR>
 nnoremap <C-J> <C-W><C-J>
 nnoremap <C-K> <C-W><C-K>
 nnoremap <C-L> <C-W><C-L>
diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index 429b1ce..a5db98f 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -1,4 +1,13 @@
 set -g default-terminal 'screen-256color'
-set-option -sa terminal-overrides ',xterm-termite:RGB'
+set-option -sa terminal-overrides ',xterm-termite:RGB:smcup@:rmcup@'
 set-option -sg escape-time 10
+set-option -g set-titles on
+set-option -g set-titles-string "tmux - #W"
 set -g prefix C-a
+set -g mouse on
+set -g base-index 1
+setw -g pane-base-index 1
+bind h select-pane -L
+bind j select-pane -D
+bind k select-pane -U
+bind l select-pane -R