diff --git a/nvim/coc-settings.json b/nvim/coc-settings.json
index 077ffb6..5f49ad7 100644
--- a/nvim/coc-settings.json
+++ b/nvim/coc-settings.json
@@ -1,18 +1,13 @@
 {
-  "languageserver": {
-    "ccls": {
-      "command": "ccls",
-      "filetypes": ["c", "cpp", "cuda", "objc", "objcpp"],
-      "rootPatterns": [".ccls-root", "compile_commands.json"],
-      "initializationOptions": {
-        "cache": {
-          "directory": ".ccls-cache"
-        },
-        "client": {
-          "snippetSupport": true
-        }
-      }
-    }
-  }
+  "coc.preferences.formatOnSaveFiletypes": [
+    "css",
+    "markdown",
+    "javascript",
+    "typescript",
+    "svelte",
+    "javascriptreact",
+    "typescriptreact",
+    "json",
+    "jsonc"
+  ]
 }
-
diff --git a/nvim/coc.vim b/nvim/coc.vim
index 173a382..32e3bf2 100644
--- a/nvim/coc.vim
+++ b/nvim/coc.vim
@@ -39,3 +39,25 @@ let g:coc_snippet_next = '<c-j>'
 
 " Use <C-k> for jump to previous placeholder, it's default of coc.nvim
 let g:coc_snippet_prev = '<c-k>'
+
+let g:coc_global_extensions = [
+  \ 'coc-tsserver',
+  \ 'coc-css',
+  \ 'coc-go',
+  \ 'coc-html',
+  \ 'coc-prettier',
+  \ 'coc-sh',
+  \ 'coc-svelte',
+  \ 'coc-pairs',
+  \ 'coc-json',
+  \ 'coc-snippets',
+  \ 'coc-emmet',
+  \ 'coc-highlight',
+  \ 'coc-python'
+  \ ]
+
+" Use <cr> to confirm completion, `<C-g>u` means break undo chain at current position.
+" Coc only does snippet and additional edit on confirm.
+inoremap <expr> <cr> pumvisible() ? "\<C-y>" : "\<C-g>u\<CR>"
+
+command! -nargs=0 Prettier :CocCommand prettier.formatFile
diff --git a/nvim/file-tree.vim b/nvim/file-tree.vim
index fbac225..6cb10b3 100644
--- a/nvim/file-tree.vim
+++ b/nvim/file-tree.vim
@@ -15,5 +15,5 @@ let g:nvim_tree_show_icons = {
     \ }
 
 " Remaps
-nnoremap <leader>b :NvimTreeToggle<CR>
+nnoremap <C-b> :NvimTreeToggle<CR>
 nnoremap <leader>r :NvimTreeRefresh<CR>
diff --git a/nvim/init.vim b/nvim/init.vim
index 8c663d9..236d651 100644
--- a/nvim/init.vim
+++ b/nvim/init.vim
@@ -6,14 +6,7 @@ Plug 'vim-airline/vim-airline'
 Plug 'vim-airline/vim-airline-themes'
 
 Plug 'tpope/vim-commentary'
-Plug 'norcalli/nvim-colorizer.lua'
-Plug 'jiangmiao/auto-pairs'
 Plug 'neoclide/coc.nvim', {'branch': 'release'}
-Plug 'prettier/vim-prettier', {'do': 'yarn install'}
-Plug 'fatih/vim-go'
-Plug 'pangloss/vim-javascript'
-Plug 'leafgarland/typescript-vim'
-Plug 'evanleck/vim-svelte', {'branch': 'main'}
 Plug 'kyazdani42/nvim-tree.lua'
 Plug 'iamcco/markdown-preview.nvim', { 'do': 'cd app && yarn install'  }
 Plug 'akinsho/bufferline.nvim'
@@ -22,6 +15,8 @@ Plug 'turbio/bracey.vim', { 'do': 'npm install --prefix server' }
 Plug 'folke/zen-mode.nvim'
 Plug 'kyazdani42/nvim-web-devicons'
 Plug 'kevinoid/vim-jsonc'
+Plug 'HerringtonDarkholme/yats.vim'
+Plug 'fatih/vim-go'
 
 call plug#end()
 
@@ -58,9 +53,6 @@ colorscheme ayu
 let g:airline#extensions#tabline#enabled = 1
 let g:airline_theme = 'ayu_mirage'
 
-" Color highlighting
-lua require'colorizer'.setup()
-
 " Zen Mode plugin
 lua require'zen-mode'.setup()