diff --git a/.config/nvim/colors/dln-dim.vim b/.config/nvim/colors/dln-dim.vim
index 28a2304..3e22ec6 100644
--- a/.config/nvim/colors/dln-dim.vim
+++ b/.config/nvim/colors/dln-dim.vim
@@ -336,7 +336,7 @@ call  <sid>hi("ALEInfoSign",     s:blue_grey_500,   "",                "italic")
 
 call  <sid>hi("Statement",       s:blue_grey_200,   "",                "bold")
 call  <sid>hi("String",          s:light_green_400, "",                "italic")
-call  <sid>hi("Comment",         s:blue_grey_600,   "",                "italic")
+call  <sid>hi("Comment",         s:blue_grey_600,   "",                "bold,italic")
 call  <sid>hi("Type",            s:deep_purple_100, "",                "none")
 call  <sid>hi("Identifier",      s:orange_200,      "",                "")
 call  <sid>hi("goFunction",      s:blue_300,        "",                "bold")
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index 356a0c3..f3a2e31 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -1,7 +1,8 @@
 call plug#begin('~/.local/share/nvim/plugged')
 
-Plug 'dln/nvim-highlite'
-Plug 'bluz71/vim-moonfly-colors'
+Plug 'tjdevries/colorbuddy.vim'
+Plug 'tjdevries/gruvbuddy.nvim'
+Plug '~/src/github.com/shelmangroup/nvim-shelman-theme'
 
 Plug 'neovim/nvim-lspconfig'
 Plug 'nvim-lua/completion-nvim'
@@ -156,8 +157,9 @@ let g:miniBufExplMapWindowNavVim = 1
 let g:miniBufExplVSplit = 25
 let g:miniBufExplSplitBelow=1
 
-"" Wayland clipboard copy paste
-map <silent> ,v :r!wl-paste<cr>
+
+"" minimap
+let g:minimap_auto_start = 1
 
 
 "" Searching
@@ -312,24 +314,28 @@ nnoremap <silent> gW    <cmd>lua vim.lsp.buf.workspace_symbol()<CR>
 nnoremap <silent> gd    <cmd>lua vim.lsp.buf.declaration()<CR>
 
 :lua << END
-require'nvim_lsp'.gopls.setup{
+require'lspconfig'.gopls.setup{
   on_attach=require'diagnostic'.on_attach
 }
 
-require'nvim_lsp'.jdtls.setup{
+require'lspconfig'.jdtls.setup{
   on_attach=require'diagnostic'.on_attach
 }
 
-require'nvim_lsp'.terraformls.setup{
+require'lspconfig'.sumneko_lua.setup{
+  cmd = {"lua-language-server"};
+}
+
+require'lspconfig'.terraformls.setup{
   on_attach=require'diagnostic'.on_attach,
   cmd = {'terraform-ls', 'serve'}
 }
 
-require'nvim_lsp'.vimls.setup{
+require'lspconfig'.vimls.setup{
   on_attach=require'diagnostic'.on_attach
 }
 
-require'nvim_lsp'.yamlls.setup{
+require'lspconfig'.yamlls.setup{
   on_attach=require'diagnostic'.on_attach
 }
 
@@ -338,7 +344,7 @@ END
 nmap <tab> <Plug>(completion_smart_tab)
 nmap <s-tab> <Plug>(completion_smart_s_tab)
 let g:completion_chain_complete_list = [
-    \{'complete_items': ['lsp', 'snippet']},
+    \{'complete_items': ['lsp', 'buffers', 'snippet']},
     \{'mode': '<c-p>'},
     \{'mode': '<c-n>'}
 \]
@@ -355,9 +361,9 @@ let g:diagnostic_insert_delay = 1
 let g:diagnostic_virtual_text_prefix = '⟸ '
 
 call sign_define("LspDiagnosticsErrorSign", {"text" : "🔥", "texthl" : "LspDiagnosticsError"})
-call sign_define("LspDiagnosticsWarningSign", {"text" : "⚠", "texthl" : "LspDiagnosticsWarning"})
+call sign_define("LspDiagnosticsWarningSign", {"text" : "🎃", "texthl" : "LspDiagnosticsWarning"})
 call sign_define("LspDiagnosticsInformationSign", {"text" : "I", "texthl" : "LspDiagnosticsInformation"})
-call sign_define("LspDiagnosticsHintSign", {"text" : "H", "texthl" : "LspDiagnosticsHint"})
+call sign_define("LspDiagnosticsHintSign", {"text" : "💡", "texthl" : "LspDiagnosticsHint"})
 
 let g:completion_matching_strategy_list = ['exact', 'substring', 'fuzzy', 'all']
 set completeopt=menuone,noinsert,noselect
@@ -512,5 +518,6 @@ set t_Cs = "\e[4:3m"
 set t_Ce = "\e[4:0m"
 
 
-color dln
-map ,l :color dln<CR>
+lua require('colorbuddy').colorscheme('shelman-dark')
+
+map ,l :luafile %<CR>
diff --git a/.ripgreprc b/.ripgreprc
index 62d919e..fd062d2 100644
--- a/.ripgreprc
+++ b/.ripgreprc
@@ -6,4 +6,3 @@
 --colors=match:style:nobold
 --colors=match:bg:180,150,40
 --colors=match:fg:0,0,0
---max-columns=150
diff --git a/.vault b/.vault
index 9127d18..dae0c95 100644
--- a/.vault
+++ b/.vault
@@ -1 +1 @@
-token_helper = "/home/dln/bin/vault-token-helper.sh"
+token_helper = "/home/dln/bin/vault-token-helper"
\ No newline at end of file
diff --git a/.zshrc b/.zshrc
index 7e460ea..ee3efa9 100644
--- a/.zshrc
+++ b/.zshrc
@@ -109,18 +109,20 @@ export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
 
 
 ## Pager
-export LESS="--mouse --wheel-lines=1 -nRX"
+export LESS="--mouse --wheel-lines=1 -nRXF"
 
 ## Aliases
-alias cdiff='colordiff -u'
 alias dotgit='git --work-tree $HOME --git-dir $HOME/.dot_git'
 alias l=bat
 alias ls=exa
 alias tail='tail -n $LINES'
 alias timestamp='TZ=Z date "+%Y%m%dT%H%M%SZ"'
 alias tree='exa --tree'
+alias v=vgrep
+alias ve='env EDITOR= vgrep -s'
 alias xc='xclip -selection clipboard'
 
+
 ## vim
 export EDITOR=nvim
 export NVIM_LISTEN_ADDRESS=/tmp/nvimsocket
diff --git a/bin/gren b/bin/gren
index fc33c35..2dff535 100755
--- a/bin/gren
+++ b/bin/gren
@@ -11,6 +11,6 @@ hub sync
 if git rev-parse --verify --quiet $1; then
   git checkout $1
 else
-  git checkout -b $1 master
+  git checkout -b $1 main
   git push -u origin $1
 fi
diff --git a/bin/tmux-nvr b/bin/tmux-nvr
new file mode 100755
index 0000000..12e869f
--- /dev/null
+++ b/bin/tmux-nvr
@@ -0,0 +1,5 @@
+#!/bin/bash
+tmux select-window -t1
+FILE="$1"
+shift
+exec nvr --remote "$@" $(readlink -f "$FILE")