diff --git a/.config/nvim/after/plugin/keys.vim b/.config/nvim/after/plugin/keys.vim
index 14d3b6e..a1a3c07 100755
--- a/.config/nvim/after/plugin/keys.vim
+++ b/.config/nvim/after/plugin/keys.vim
@@ -1,5 +1,5 @@
 " Keybindings
-let mapleader=";" 
+let mapleader=" " 
 
 " use ;; for escape
 " http://vim.wikia.com/wiki/Avoid_the_escape_key
@@ -17,13 +17,23 @@ nnoremap <leader>j <C-w>j
 nnoremap <leader>k <C-w>k
 nnoremap <leader>l <C-w>l
 
+" Change 2 split windows from vert to horiz or horiz to vert
+map <leader>th <C-w>t<C-w>H
+map <leader>tk <C-w>t<C-w>K
+
+" Make adjusting split sizes a bit more friendly
+noremap <silent> <C-Left> :vertical resize +3<CR>
+noremap <silent> <C-Right> :vertical resize -3<CR>
+noremap <silent> <C-Up> :resize +3<CR>
+noremap <silent> <C-Down> :resize -3<CR>
+
 " improved keyboard support for navigation (especially terminal)
 " http://neovim.io/doc/user/nvim_terminal_emulator.html
-tnoremap <Esc> <C-\><C-n>
-tnoremap <A-h> <C-\><C-n><C-w>h
-tnoremap <A-j> <C-\><C-n><C-w>j
-tnoremap <A-k> <C-\><C-n><C-w>k
-tnoremap <A-l> <C-\><C-n><C-w>l
+" tnoremap <Esc> <C-\><C-n>
+" tnoremap <A-h> <C-\><C-n><C-w>h
+" tnoremap <A-j> <C-\><C-n><C-w>j
+" tnoremap <A-k> <C-\><C-n><C-w>k
+" tnoremap <A-l> <C-\><C-n><C-w>l
 nnoremap <A-h> <C-w>h
 nnoremap <A-j> <C-w>j
 nnoremap <A-k> <C-w>k
@@ -31,11 +41,11 @@ nnoremap <A-l> <C-w>l
 
 if !exists('g:vscode')
     " Auto start NERD tree when opening a directory
-    autocmd VimEnter * if argc() == 1 && isdirectory(argv()[0]) && !exists("s:std_in") | exe 'NERDTree' argv()[0] | wincmd p | ene | wincmd p | endif
+    " autocmd VimEnter * if argc() == 1 && isdirectory(argv()[0]) && !exists("s:std_in") | exe 'NERDTree' argv()[0] | wincmd p | ene | wincmd p | endif
 
     " Auto start NERD tree if no files are specified
-    autocmd StdinReadPre * let s:std_in=1
-    autocmd VimEnter * if argc() == 0 && !exists("s:std_in") | exe 'NERDTree' | endif
+    " autocmd StdinReadPre * let s:std_in=1
+    " autocmd VimEnter * if argc() == 0 && !exists("s:std_in") | exe 'NERDTree' | endif
 
     " Let quit work as expected if after entering :q the only window left open is NERD Tree itself
     autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTree") && b:NERDTree.isTabTree()) | q | endif
@@ -52,7 +62,7 @@ if !exists('g:vscode')
     " http://stackoverflow.com/questions/7722177/how-do-i-map-ctrl-x-ctrl-o-to-ctrl-space-in-terminal-vim#answer-24550772
     "nnoremap <C-Space> :NERDTreeToggle<CR>
     "nmap <C-@> <C-Space>
-    nnoremap <silent> <Space> :NERDTreeToggle<CR>
+    nnoremap <silent> <M-b> :NERDTreeToggle<CR>
 
     " toggle tagbar
     nnoremap <silent> <leader>tb :TagbarToggle<CR>
@@ -99,14 +109,6 @@ if !exists('g:vscode')
     " Telescope project
     nnoremap <silent> <leader>fp :Telescope project<CR>
 
-    " Start terminal in insert mode
-    " au BufEnter * if &buftype == 'terminal' | :startinsert | endif
-    " nnoremap <silent> <leader>tt :terminal<CR>
-    " nnoremap <silent> <leader>tv :vnew<CR>:terminal<CR>
-    " nnoremap <silent> <leader>th :new<CR>:terminal<CR>
-    " tnoremap <C-x> <C-\><C-n><C-w>q
-
-
     let s:hidden_all = 0
     function! ToggleHiddenAll()
         if s:hidden_all  == 0
diff --git a/.config/nvim/after/plugin/settings.vim b/.config/nvim/after/plugin/settings.vim
index b0ef540..d308649 100755
--- a/.config/nvim/after/plugin/settings.vim
+++ b/.config/nvim/after/plugin/settings.vim
@@ -26,8 +26,7 @@ set splitbelow
 
 " colorscheme nord
 " colorscheme dracula
-colorscheme challenger_deep
-
+colorscheme moonlight
 
 " terminal disable linenumber
 au TermOpen * setlocal nonumber norelativenumber
diff --git a/.config/nvim/coc-settings.json b/.config/nvim/coc-settings.json
index 1c3caa6..6c5e5cc 100755
--- a/.config/nvim/coc-settings.json
+++ b/.config/nvim/coc-settings.json
@@ -18,5 +18,23 @@
     "vue",
     "xml"
   ],
-  "languageserver": {}
-}
\ No newline at end of file
+  "languageserver": {
+    "go": {
+      "command": "gopls",
+      "rootPatterns": [
+        "go.mod"
+      ],
+      "trace.server": "verbose",
+      "filetypes": [
+        "go"
+      ]
+    }
+  },
+  "python.formatting.provider": "black",
+  "python.formatting.blackArgs": [
+    "--line-length",
+    "120"
+  ],
+  "python.linting.flake8Enabled": true,
+  "pyright.enable": true
+}
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index ab6f7ec..3c3300f 100755
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -45,15 +45,16 @@ let g:highlightedyank_highlight_duration = 100
 " Easy commenting for Vim
 Plug 'preservim/nerdcommenter'
 
-" Command line fuzzy finder / also provides :Maps
-Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
-Plug 'junegunn/fzf.vim'
+" Indentation lines
+Plug 'Yggdroot/indentLine'
+Plug 'lukas-reineke/indent-blankline.nvim'
 
 " NERD Tree - tree explorer
 " https://github.com/scrooloose/nerdtree
 " http://usevim.com/2012/07/18/nerdtree/
 " (loaded on first invocation of the command)
 Plug 'scrooloose/nerdtree', { 'on': 'NERDTreeToggle' }
+Plug 'ryanoasis/vim-devicons'
 
 " nerdtree-git-plugin - show git status in NERD Tree
 " https://github.com/Xuyuanp/nerdtree-git-plugi
@@ -96,6 +97,8 @@ let g:nord_bold = 1
 let g:nord_italic = 1
 let g:nord_italic_comments = 1
 
+Plug 'shaunsingh/moonlight.nvim'
+
 call plug#end()