diff --git a/.config/nvim/lua/core/keymaps.lua b/.config/nvim/lua/core/keymaps.lua
index 7b74c42..e45227c 100644
--- a/.config/nvim/lua/core/keymaps.lua
+++ b/.config/nvim/lua/core/keymaps.lua
@@ -30,7 +30,9 @@ keymap("n", "<C-Right>", ":vertical resize +2<CR>", opts)
 
 -- Navigate buffers
 keymap("n", "<S-l>", ":bnext<CR>", opts)
+keymap("n", "<C-PageDown>", ":bnext<CR>", opts)
 keymap("n", "<S-h>", ":bprevious<CR>", opts)
+keymap("n", "<C-PageUp>", ":bprevious<CR>", opts)
 
 -- Clear highlights
 keymap("n", "<leader>h", "<cmd>nohlsearch<CR>", opts)
@@ -53,6 +55,8 @@ keymap("n", "<leader>lj", "<cmd>Lspsaga diagnostic_jump_next<cr>", opts)
 keymap("n", "<leader>lk", "<cmd>Lspsaga diagnostic_jump_prev<cr>", opts)
 keymap("n", "<leader>lr", "<cmd>Lspsaga rename<cr>", opts)
 keymap("n", "<leader>lp", "<cmd>Lspsaga peek_definition<cr>", opts)
+keymap("n", "<leader>lf", "<cmd>lua vim.lsp.buf.format{ async=true }<cr>", opts)
+keymap("n", "<leader>ls", "<cmd>lua vim.lsp.buf.signature_help()<cr>", opts)
 
 -- Better paste
 keymap("v", "p", '"_dP', opts)
diff --git a/.config/nvim/lua/core/options.lua b/.config/nvim/lua/core/options.lua
index ce6f4e6..0f3c4b6 100644
--- a/.config/nvim/lua/core/options.lua
+++ b/.config/nvim/lua/core/options.lua
@@ -48,6 +48,6 @@ vim.opt.cmdheight = 0 -- Number of screen lines to use for the command-line
 
 -- neovide
 if vim.fn.exists("g:neovide") ~= 0 then
-	vim.g.neovide_cursor_animation_length=0
+	vim.g.neovide_cursor_animation_length = 0
 	vim.g.neovide_cursor_trail_size = 0
 end
diff --git a/.config/nvim/lua/plugins/gitsigns.lua b/.config/nvim/lua/plugins/gitsigns.lua
index 9d48799..85eebbe 100644
--- a/.config/nvim/lua/plugins/gitsigns.lua
+++ b/.config/nvim/lua/plugins/gitsigns.lua
@@ -28,8 +28,8 @@ gitsigns.setup({
 		map({ "n", "v" }, "<leader>hr", ":Gitsigns reset_hunk<CR>")
 		map("n", "<leader>hp", gs.preview_hunk)
 		map("n", "<leader>hR", gs.reset_buffer)
-		map('n', '<leader>hd', gs.diffthis)
-		map('n', '<leader>hj', gs.next_hunk)
-		map('n', '<leader>hk', gs.prev_hunk)
+		map("n", "<leader>hd", gs.diffthis)
+		map("n", "<leader>hj", gs.next_hunk)
+		map("n", "<leader>hk", gs.prev_hunk)
 	end,
 })
diff --git a/.config/nvim/lua/plugins/lsp/handlers.lua b/.config/nvim/lua/plugins/lsp/handlers.lua
index a47c3a4..bcee668 100644
--- a/.config/nvim/lua/plugins/lsp/handlers.lua
+++ b/.config/nvim/lua/plugins/lsp/handlers.lua
@@ -49,15 +49,7 @@ M.setup = function()
 	})
 end
 
-local function lsp_keymaps(bufnr)
-	local opts = { noremap = true, silent = true }
-	local keymap = vim.api.nvim_buf_set_keymap
-
-	keymap(bufnr, "n", "<leader>lf", "<cmd>lua vim.lsp.buf.format{ async=true }<cr>", opts)
-	keymap(bufnr, "n", "<leader>ls", "<cmd>lua vim.lsp.buf.signature_help()<CR>", opts)
-end
-
-M.on_attach = function(client, bufnr)
+M.on_attach = function(client)
 	if client.name == "tsserver" then
 		client.server_capabilities.document_formatting = false
 	end
@@ -66,7 +58,6 @@ M.on_attach = function(client, bufnr)
 		client.server_capabilities.document_formatting = false
 	end
 
-	lsp_keymaps(bufnr)
 	local status_ok, illuminate = pcall(require, "illuminate")
 	if not status_ok then
 		return