diff --git a/lazy-lock.json b/lazy-lock.json
index cf92ce9..39ac9a3 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -7,7 +7,7 @@
   "fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" },
   "flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" },
   "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
-  "fzf-lua": { "branch": "main", "commit": "758173f499d15410ecb50c5519a41b27c33e645d" },
+  "fzf-lua": { "branch": "main", "commit": "29e982dfc96a134fecc80853c8cb8324e43e574b" },
   "gitlinker.nvim": { "branch": "master", "commit": "cc59f732f3d043b626c8702cb725c82e54d35c25" },
   "gitsigns.nvim": { "branch": "main", "commit": "8b729e489f1475615dc6c9737da917b3bc163605" },
   "go.nvim": { "branch": "master", "commit": "e1b763cab2cfd3c60207873dbc925c9be49913c0" },
@@ -17,7 +17,7 @@
   "mason-lspconfig.nvim": { "branch": "main", "commit": "67da97f8c2fd12d05427bb485ce07ee6418e0a51" },
   "mason-tool-installer.nvim": { "branch": "main", "commit": "75d60a8f928decd8b38897f80849768b7c540a5b" },
   "mason.nvim": { "branch": "main", "commit": "8024d64e1330b86044fed4c8494ef3dcd483a67c" },
-  "mini.ai": { "branch": "main", "commit": "7f1fe86277f0e977642cf8fe15f004229f61e61a" },
+  "mini.ai": { "branch": "main", "commit": "4b5348fac5912f1957f4c012c2e0ab0c4b865386" },
   "mini.icons": { "branch": "main", "commit": "397ed3807e96b59709ef3292f0a3e253d5c1dc0a" },
   "mini.statusline": { "branch": "main", "commit": "e331175f10d9f400b42523b3890841aba202ce16" },
   "mini.surround": { "branch": "main", "commit": "f4307f935ad87cfe3e570dbaae485b35cce4e5ec" },
@@ -36,7 +36,7 @@
   "presenterm.nvim": { "branch": "main", "commit": "2db942337aeeca99e33f627459df2264b3987634" },
   "promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" },
   "quicker.nvim": { "branch": "master", "commit": "51d3926f183c2d98fbc237cc237ae0926839af3a" },
-  "render-markdown.nvim": { "branch": "main", "commit": "4a39681990fb515d00dd898de3d7bf2973805f1a" },
+  "render-markdown.nvim": { "branch": "main", "commit": "0b0bec653f47d9d56cb80f426479ef0527814119" },
   "schemastore.nvim": { "branch": "main", "commit": "a9ba109549de51e3b4594d39a1c07f14b9d0cfa5" },
   "snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" },
   "suda.vim": { "branch": "master", "commit": "9adda7d195222d4e2854efb2a88005a120296c47" },
diff --git a/lua/plugins/lsp/init.lua b/lua/plugins/lsp/init.lua
index 4671e94..9bc55db 100644
--- a/lua/plugins/lsp/init.lua
+++ b/lua/plugins/lsp/init.lua
@@ -1,8 +1,8 @@
 local M = {
-  "mson-org/mason-lspconfig.nvim",
+  "WhoIsSethDaniel/mason-tool-installer.nvim",
   dependencies = {
-    "mson-org/mason.nvim",
-    "WhoIsSethDaniel/mason-tool-installer.nvim",
+    "mason-org/mason-lspconfig.nvim",
+    "mason-org/mason.nvim",
     "j-hui/fidget.nvim",
     "ibhagwan/fzf-lua",
     require("plugins.lsp.extras.lazydev"),
@@ -10,36 +10,64 @@ local M = {
   },
 }
 
+local servers = {
+  "gopls",
+  "jsonls",
+  "lua_ls",
+  "yamlls",
+  "graphql",
+  "html",
+  "omnisharp",
+  "svelte",
+  "vtsls",
+  "ccls",
+  "templ",
+}
+
+local tools = {
+  "prettierd",
+  "shfmt",
+  "stylua",
+  "latexindent",
+  "clang-format",
+  "csharpier",
+  "quick-lint-js",
+}
+
 local function setup_keymaps(bufnr)
-  local opts = { buffer = bufnr, noremap = true, silent = true }
-  local keymaps = {
-    { "K", vim.lsp.buf.hover, desc = "Hover Doc", border = "rounded" },
-    { "<C-h>", vim.lsp.buf.signature_help, desc = "Signature Help", border = "rounded" },
-    { "<leader>rn", vim.lsp.buf.rename, desc = "Rename" },
-    { "<leader>ca", vim.lsp.buf.code_action, desc = "Code Action" },
-    { "gd", require("fzf-lua").lsp_definitions, desc = "Go to Definition" },
-    { "gr", require("fzf-lua").lsp_references, desc = "Go to References" },
-    { "gD", vim.lsp.buf.declaration, desc = "Go to Declaration" },
-    { "gi", require("fzf-lua").lsp_implementations, desc = "Go to Implementation" },
-    { "gt", require("fzf-lua").lsp_typedefs, desc = "Go to Type Definition" },
-    { "<leader>vd", vim.diagnostic.open_float, desc = "View Diagnostics" },
-    { "<leader>dl", require("fzf-lua").diagnostics_document, desc = "Document Diagnostics" },
-    { "<leader>dw", require("fzf-lua").diagnostics_workspace, desc = "Workspace Diagnostics" },
-    { "<leader>ds", require("fzf-lua").lsp_document_symbols, desc = "Document Symbols" },
-    { "<leader>ws", require("fzf-lua").lsp_workspace_symbols, desc = "Workspace Symbols" },
-    { "<leader>lr", ":LspRestart<CR>", desc = "Restart LSP" },
-    { "<leader>li", ":LspInfo<CR>", desc = "LSP Info" },
-  }
-  for _, map in ipairs(keymaps) do
-    nmap(map[1], map[2], vim.tbl_extend("force", opts, { desc = map[3], border = map[4] }))
-  end
+  local fzf = require("fzf-lua")
+  local opts = { buffer = bufnr }
+
+  -- Basic LSP
+  nmap("K", vim.lsp.buf.hover, vim.tbl_extend("force", opts, { desc = "Hover Doc" }))
+  nmap("<C-h>", vim.lsp.buf.signature_help, vim.tbl_extend("force", opts, { desc = "Signature Help" }))
+  nmap("<leader>r", vim.lsp.buf.rename, vim.tbl_extend("force", opts, { desc = "Rename" }))
+  nmap("<leader>ca", vim.lsp.buf.code_action, vim.tbl_extend("force", opts, { desc = "Code Action" }))
+
+  -- Navigation
+  nmap("gd", fzf.lsp_definitions, vim.tbl_extend("force", opts, { desc = "Go to Definition" }))
+  nmap("gr", fzf.lsp_references, vim.tbl_extend("force", opts, { desc = "Go to References" }))
+  nmap("gD", vim.lsp.buf.declaration, vim.tbl_extend("force", opts, { desc = "Go to Declaration" }))
+  nmap("gi", fzf.lsp_implementations, vim.tbl_extend("force", opts, { desc = "Go to Implementation" }))
+  nmap("gt", fzf.lsp_typedefs, vim.tbl_extend("force", opts, { desc = "Go to Type Definition" }))
+
+  -- Diagnostics
+  nmap("vd", vim.diagnostic.open_float, vim.tbl_extend("force", opts, { desc = "View Diagnostics" }))
+  nmap("<leader>dl", fzf.diagnostics_document, vim.tbl_extend("force", opts, { desc = "Document Diagnostics" }))
+  nmap("<leader>dw", fzf.diagnostics_workspace, vim.tbl_extend("force", opts, { desc = "Workspace Diagnostics" }))
+  nmap("<leader>ds", fzf.lsp_document_symbols, vim.tbl_extend("force", opts, { desc = "Document Symbols" }))
+  nmap("<leader>ws", fzf.lsp_workspace_symbols, vim.tbl_extend("force", opts, { desc = "Workspace Symbols" }))
+
+  -- LSP management
+  nmap("<leader>lr", ":LspRestart<CR>", vim.tbl_extend("force", opts, { desc = "Restart LSP" }))
+  nmap("<leader>li", ":LspInfo<CR>", vim.tbl_extend("force", opts, { desc = "LSP Info" }))
 end
 
 function M.config()
   require("mason").setup({ max_concurrent_installers = 4 })
   require("fidget").setup({})
 
-  -- Diagnostic configuration
+  -- Diagnostics
   vim.diagnostic.config({
     virtual_text = { spacing = 2, source = "if_many" },
     float = { border = "rounded", source = "if_many" },
@@ -54,51 +82,17 @@ function M.config()
     } or {},
   })
 
-  -- List of servers to enable (matching files in ~/.config/nvim/lsp/)
-  local servers = {
-    "gopls",
-    "jsonls",
-    "lua_ls",
-    "yamlls",
-    "graphql",
-    "html",
-    "omnisharp",
-    "svelte",
-    "vtsls",
-    "ccls",
-    "templ",
-  }
-
-  -- Servers not supported by mason-lspconfig
-  local mason_unsupported = { "ccls" }
-
-  -- Filter supported servers for mason-lspconfig
-  local mason_servers = vim.tbl_filter(function(server)
-    return not vim.tbl_contains(mason_unsupported, server)
+  -- Mason setup
+  local mason_servers = vim.tbl_filter(function(s)
+    return s ~= "ccls"
   end, servers)
-
-  -- Tools
-  local tools = {
-    "prettierd",
-    "shfmt",
-    "stylua",
-    "latexindent",
-    "clang-format",
-    "csharpier",
-    "quick-lint-js",
-  }
-
-  -- Mason-LSPconfig setup for automatic installation
   require("mason-lspconfig").setup({
     ensure_installed = mason_servers,
     automatic_installation = true,
     automatic_enable = true,
   })
-
-  -- Mason tool installer for tools and ccls
   require("mason-tool-installer").setup({ ensure_installed = tools })
 
-  -- Enable LSP servers
   vim.lsp.enable(servers)
 
   -- LSP Attach
@@ -106,25 +100,27 @@ function M.config()
     group = vim.api.nvim_create_augroup("UserLspConfig", { clear = true }),
     callback = function(args)
       local client = vim.lsp.get_client_by_id(args.data.client_id)
-      local bufnr = args.buf
+      if not client then
+        return
+      end
 
-      setup_keymaps(bufnr)
+      setup_keymaps(args.buf)
 
       -- Inlay hints
-      if client.supports_method(vim.lsp.protocol.Methods.textDocument_inlayHint) then
-        vim.keymap.set("n", "<leader>th", function()
-          vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled({ bufnr = bufnr }))
-        end, { buffer = bufnr, desc = "Toggle Inlay Hints" })
+      if client:supports_method(vim.lsp.protocol.Methods.textDocument_inlayHint, args.buf) then
+        nmap("<leader>th", function()
+          vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled({ bufnr = args.buf }), { bufnr = args.buf })
+        end, { buffer = args.buf, desc = "Toggle Inlay Hints" })
       end
 
       -- Document highlights
       if client.server_capabilities.documentHighlightProvider then
         vim.api.nvim_create_autocmd({ "CursorHold", "CursorHoldI" }, {
-          buffer = bufnr,
+          buffer = args.buf,
           callback = vim.lsp.buf.document_highlight,
         })
         vim.api.nvim_create_autocmd({ "CursorMoved", "CursorMovedI" }, {
-          buffer = bufnr,
+          buffer = args.buf,
           callback = vim.lsp.buf.clear_references,
         })
       end