diff --git a/.zshrc b/.zshrc
index 5bfc5fb..aeaa360 100644
--- a/.zshrc
+++ b/.zshrc
@@ -18,7 +18,6 @@ zi snippet 'https://github.com/kalsowerus/zsh-bitwarden/blob/master/zsh-bitwarde
 zi snippet 'https://github.com/walesmd/caniuse.plugin.zsh/blob/master/caniuse.plugin.zsh'
 zi snippet 'https://github.com/mdumitru/fancy-ctrl-z/blob/master/fancy-ctrl-z.zsh'
 zi snippet 'https://github.com/zpm-zsh/ls/blob/master/ls.plugin.zsh'
-zi snippet 'https://github.com/zsh-users/zsh-syntax-highlighting/blob/master/zsh-syntax-highlighting.zsh'
 zi snippet 'https://github.com/laurenkt/zsh-vimto/blob/master/zsh-vimto.zsh'
 # zi snippet 'https://github.com/softmoth/zsh-vim-mode/blob/main/zsh-vim-mode.plugin.zsh'
 zi ice depth=1
diff --git a/README.md b/README.md
index 17afec5..ea3212f 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,7 @@ Designed for MacOS.
 
 ## Setup
 * [Install asdf](https://asdf-vm.com/#/core-manage-asdf) version manager `brew install asdf`
+* `brew install ripgrep`
 * `brew install extraterm`
 * `brew install neovim`
 * `brew install fzf` & `$(brew --prefix)/opt/fzf/install`
@@ -13,3 +14,5 @@ Designed for MacOS.
 npm i -g pyright
 sh init
 ```
+
+First time neovim `nvim` loads it will not be happy haha, so run `:PlugInstall`.
diff --git a/nvim/init.vim b/nvim/init.vim
index ab9a1bd..967a2ad 100644
--- a/nvim/init.vim
+++ b/nvim/init.vim
@@ -25,7 +25,7 @@ set laststatus=0
 set scrolloff=3
 set sidescrolloff=5
 
-" Colors
+" Syntax Colors
 set termguicolors
 
 " Misc
@@ -57,6 +57,9 @@ set showmatch
 " Undo
 set undolevels=1000
 
+" Filetypes
+filetype plugin on
+
 " auto-install vim-plug
 if empty(glob('~/.config/nvim/autoload/plug.vim'))
   silent !curl -fLo ~/.config/nvim/autoload/plug.vim --create-dirs
@@ -82,6 +85,12 @@ call plug#begin('~/.config/nvim/autoload/plugged')
 	Plug 'kyazdani42/nvim-tree.lua'
 
 	Plug 'dense-analysis/ale'
+
+	Plug 'preservim/nerdcommenter'
+
+	Plug 'akinsho/bufferline.nvim', { 'tag': '*' }
+
+	Plug 'skywind3000/asyncrun.vim'
 call plug#end()
 
 " Use aura theme installed above
@@ -91,7 +100,9 @@ colorscheme aura-soft-dark
 "" Map Leader to spacebar
 let mapleader=" "
 "" Shortcut to save
-nnoremap <Leader>w :w<CR>
+nnoremap <Leader>s :w<CR>
+"" Shortcut to close buffer
+nnoremap <Leader>w :bd<CR>
 "" Moving current lines up/down
 nnoremap <Leader>k  :<c-u>execute 'move -1-'. v:count1<cr>
 nnoremap <Leader>j  :<c-u>execute 'move +'. v:count1<cr>
@@ -138,3 +149,20 @@ lua <<EOF
 EOF
 "" Telescope
 nnoremap <leader>ff <cmd>Telescope find_files<cr>
+nnoremap <leader>fb <cmd>Telescope buffers<cr>
+nnoremap <leader>fs <cmd>Telescope spell_suggest<cr>
+nnoremap <leader>fr <cmd>Telescope registers<cr>
+nnoremap <leader>fo <cmd>Telescope oldfiles<cr>
+nnoremap <leader>g <cmd>Telescope live_grep<cr>
+nnoremap <leader>/ <cmd>Telescope current_buffer_fuzzy_find<cr>
+" Bufferline
+lua << EOF
+	require("bufferline").setup {
+		options = {
+			show_buffer_close_icons = false,
+			diagnostics = "nvim_lsp"
+		}
+	}
+EOF
+" Async Run (:AsyncRun)
+let g:asyncrun_open=1