diff --git a/.dotbot.conf.yaml b/.dotbot.conf.yaml
index d5f292b..68e1225 100644
--- a/.dotbot.conf.yaml
+++ b/.dotbot.conf.yaml
@@ -26,11 +26,5 @@
 
 - shell:
     - [git submodule update --init --recursive, Installing submodules]
-    - [
-        ~/.tmux/plugins/tpm/scripts/install_plugins.sh >/dev/null 2>&1,
-        Installing tmux plugins,
-      ]
-    - [
-        nvim -u ~/.config/nvim/init.vim +PlugUpgrade +PlugInstall +PlugClean +qall,
-      ]
-    - [nvim --headless -c "lua lsp_install_sync()" -c "quitall"]
+    - [~/.tmux/plugins/tpm/scripts/install_plugins.sh >/dev/null 2>&1, Installing tmux plugins]
+    - [nvim -u ~/.config/nvim/init.vim +PlugUpgrade +PlugInstall +PlugClean +qall]
diff --git a/nvim/plugin-config.vim b/nvim/plugin-config.vim
index a0b78e7..01ef74a 100644
--- a/nvim/plugin-config.vim
+++ b/nvim/plugin-config.vim
@@ -20,7 +20,7 @@ source ~/.config/nvim/plugin-config/lspkind.lua
 source ~/.config/nvim/plugin-config/lualine.lua
 source ~/.config/nvim/plugin-config/neoscroll.lua
 source ~/.config/nvim/plugin-config/pandoc.vim
-source ~/.config/nvim/plugin-config/prettier.vim
+source ~/.config/nvim/plugin-config/neoformat.vim
 source ~/.config/nvim/plugin-config/sidebar.lua
 source ~/.config/nvim/plugin-config/speeddating.vim
 source ~/.config/nvim/plugin-config/telescope.lua
@@ -31,4 +31,3 @@ source ~/.config/nvim/plugin-config/ultisnips.vim
 source ~/.config/nvim/plugin-config/vim-easymotion.vim
 source ~/.config/nvim/plugin-config/vimux.vim
 source ~/.config/nvim/plugin-config/web-devicons.lua
-
diff --git a/nvim/plugin-config/lsp-config.vim b/nvim/plugin-config/lsp-config.vim
index 82fd7c3..0a3729a 100644
--- a/nvim/plugin-config/lsp-config.vim
+++ b/nvim/plugin-config/lsp-config.vim
@@ -1,6 +1,7 @@
 " lspconfig
 " https://github.com/neovim/nvim-lspconfig
 
+" Mappings
 nnoremap <silent> <C-k>      <cmd>lua vim.lsp.buf.signature_help()<CR>
 nnoremap <silent> <leader>D  <cmd>lua vim.lsp.buf.type_definition()<CR>
 nnoremap <silent> <leader>e  <cmd>lua vim.lsp.diagnostic.show_line_diagnostics()<CR>
diff --git a/nvim/plugin-config/lsp-installer.lua b/nvim/plugin-config/lsp-installer.lua
index c63faa1..1524500 100644
--- a/nvim/plugin-config/lsp-installer.lua
+++ b/nvim/plugin-config/lsp-installer.lua
@@ -61,18 +61,3 @@ lsp_installer.on_server_ready(function(server)
 
   vim.cmd([[do User LspAttachBuffers]])
 end)
-
---- Global function to install servers automatically
-function _G.lsp_install_sync()
-  local lsp_installer_servers = require("nvim-lsp-installer.servers")
-
-  local requested = {}
-  for server_name, _ in pairs(servers) do
-    local ok, server = lsp_installer_servers.get_server(server_name)
-    if ok and not server:is_installed() then
-      table.insert(requested, server_name)
-    end
-  end
-
-  lsp_installer.install_sync(requested)
-end
diff --git a/nvim/plugin-config/neoformat.vim b/nvim/plugin-config/neoformat.vim
new file mode 100644
index 0000000..665ef75
--- /dev/null
+++ b/nvim/plugin-config/neoformat.vim
@@ -0,0 +1,17 @@
+" Neoformat
+" https://github.com/sbdchd/neoformat
+
+" Settings
+let g:neoformat_try_node_exe = 1
+let g:neoformat_basic_format_align = 1 " Enable alignment
+let g:neoformat_basic_format_retab = 1 " Enable tab to spaces conversion
+let g:neoformat_basic_format_trim  = 1 " Enable trimmming of trailing whitespace
+
+" Mappings
+nnoremap <silent> nf <cmd>Neoformat<CR>
+
+" Auto Commands
+augroup fmt
+  autocmd!
+  autocmd BufWritePre * undojoin | Neoformat
+augroup END
diff --git a/nvim/plugins.vim b/nvim/plugins.vim
index 9c68358..7d03c1a 100644
--- a/nvim/plugins.vim
+++ b/nvim/plugins.vim
@@ -48,7 +48,7 @@ Plug 'nvim-telescope/telescope-frecency.nvim'
 Plug 'nvim-telescope/telescope-fzf-native.nvim', { 'do': 'make' }
 Plug 'nvim-telescope/telescope-node-modules.nvim'
 Plug 'nvim-telescope/telescope.nvim'
-Plug 'prettier/vim-prettier', { 'do': 'yarn install --frozen-lockfile --production',  'branch': 'release/0.x' }
+Plug 'sbdchd/neoformat'
 Plug 'ruanyl/vim-gh-line'
 Plug 'sidebar-nvim/sidebar.nvim'
 Plug 'sudormrfbin/cheatsheet.nvim'