diff --git a/nvim/lua/kogakure/cmp.lua b/nvim/lua/kogakure/cmp.lua
index fe121da..890ca3e 100644
--- a/nvim/lua/kogakure/cmp.lua
+++ b/nvim/lua/kogakure/cmp.lua
@@ -114,8 +114,8 @@ cmp.setup({
 	},
 	sources = {
 		{ name = "nvim_lsp" },
-		{ name = "luasnip" },
 		{ name = "nvim_lsp_signature_help" },
+		{ name = "luasnip" },
 		{ name = "buffer" },
 		{ name = "path" },
 		{ name = "dictionary" },
diff --git a/nvim/lua/kogakure/keymaps.lua b/nvim/lua/kogakure/keymaps.lua
index cb9547f..4461fc4 100644
--- a/nvim/lua/kogakure/keymaps.lua
+++ b/nvim/lua/kogakure/keymaps.lua
@@ -128,3 +128,6 @@ keymap("o", "il", ":<c-u>normal! $v^<CR>", opts)
 keymap("x", "il", ":<c-u>normal! $v^<CR>", opts)
 keymap("o", "al", ":<c-u>normal! $v0<CR>", opts)
 keymap("x", "al", ":<c-u>normal! $v0<CR>", opts)
+
+-- LSP formatting
+keymap("n", "<leader>o", "<cmd>lua vim.lsp.buf.formatting_sync()<CR>", opts)
diff --git a/nvim/lua/kogakure/lsp/configs.lua b/nvim/lua/kogakure/lsp/configs.lua
index 9d5c58b..b045969 100644
--- a/nvim/lua/kogakure/lsp/configs.lua
+++ b/nvim/lua/kogakure/lsp/configs.lua
@@ -7,11 +7,21 @@ local lspconfig = require("lspconfig")
 
 local servers = {
 	"cssls",
+	"cssmodules_ls",
 	"diagnosticls",
 	"emmet_ls",
+	"graphql",
+	"html",
+	"jsonls",
 	"pyright",
+	"remark_ls",
+	"sourcery",
+	"stylelint_lsp",
 	"sumneko_lua",
-	-- 'tsserver',
+	"svelte",
+	"theme_check",
+	"tsserver",
+	"vuels",
 }
 
 lsp_installer.settings({
diff --git a/nvim/lua/kogakure/lsp/handlers.lua b/nvim/lua/kogakure/lsp/handlers.lua
index 0c1d3f0..587e549 100644
--- a/nvim/lua/kogakure/lsp/handlers.lua
+++ b/nvim/lua/kogakure/lsp/handlers.lua
@@ -74,9 +74,10 @@ local function lsp_keymaps(bufnr)
 end
 
 -- TODO: Neovim 0.8 https://github.com/jose-elias-alvarez/null-ls.nvim/wiki/Avoiding-LSP-formatting-conflicts
+-- https://github.com/jose-elias-alvarez/null-ls.nvim/wiki/Formatting-on-save
 local lsp_formatting = function(bufnr)
 	-- vim.lsp.buf.format({})
-	vim.lsp.buf.formatting({
+	vim.lsp.buf.formatting_sync({
 		filter = function(client)
 			return client.name == "null-ls"
 		end,
@@ -104,6 +105,11 @@ M.on_attach = function(client, bufnr)
 		client.resolved_capabilities.document_formatting = false
 	end
 
+	-- Stylelint
+	if client.name == "stylelint_lsp" then
+		client.resolved_capabilities.document_formatting = false
+	end
+
 	-- Lua
 	if client.name == "sumneko_lua" then
 		client.resolved_capabilities.document_formatting = false
diff --git a/nvim/lua/kogakure/lsp/null-ls.lua b/nvim/lua/kogakure/lsp/null-ls.lua
index 83189fa..a6967c8 100644
--- a/nvim/lua/kogakure/lsp/null-ls.lua
+++ b/nvim/lua/kogakure/lsp/null-ls.lua
@@ -21,9 +21,10 @@ null_ls.setup({
 		code_actions.gitsigns,
 		code_actions.proselint,
 		completion.luasnip,
-		completion.spell,
+		-- completion.spell,
 		-- diagnostics.codespell,
-		diagnostics.eslint_d, -- Eslint
+		diagnostics.eslint, -- Eslint
+		-- diagnostics.eslint_d, -- Eslint
 		diagnostics.flake8, -- Python
 		diagnostics.gitlint,
 		diagnostics.jsonlint,
diff --git a/nvim/lua/kogakure/whichkey.lua b/nvim/lua/kogakure/whichkey.lua
index 4ff0a9f..5136b3e 100644
--- a/nvim/lua/kogakure/whichkey.lua
+++ b/nvim/lua/kogakure/whichkey.lua
@@ -13,8 +13,8 @@ local mappings = {
 	e = { "<CMD>NvimTreeToggle<CR>", "Explorer" },
 	f = { "<CMD>FzfLua files<CR>", "Find Files" },
 	h = { "<CMD>nohlsearch<CR>", "No Highlight" },
-	j = { "<CMD>b#<CR>", "Toggle Buffers" },
 	i = { "<CMD>silent !open -a iA\\ Writer.app '%:p'<CR>", "Open in iA Writer" },
+	j = { "<CMD>b#<CR>", "Toggle Buffers" },
 	p = { "<CMD>Telescope projects<CR>", "Projects" },
 	q = { "<CMD>Bdelete!<CR>", "Close Buffer" },
 	s = {