diff --git a/lua/config/plugins/gitsigns.lua b/lua/config/plugins/gitsigns.lua
index 0f8c307..749844e 100644
--- a/lua/config/plugins/gitsigns.lua
+++ b/lua/config/plugins/gitsigns.lua
@@ -33,9 +33,6 @@ function M.config()
       delay = 1000,
       ignore_whitespace = false,
     },
-    current_line_blame_formatter_opts = {
-      relative_time = false,
-    },
     sign_priority = 6,
     update_debounce = 100,
     status_formatter = nil, -- Use default
@@ -48,9 +45,6 @@ function M.config()
       row = 0,
       col = 1,
     },
-    yadm = {
-      enable = false,
-    },
   })
 end
 
diff --git a/lua/config/plugins/lsp-zero.lua b/lua/config/plugins/lsp-zero.lua
index a44b330..bb5d71d 100644
--- a/lua/config/plugins/lsp-zero.lua
+++ b/lua/config/plugins/lsp-zero.lua
@@ -69,7 +69,7 @@ function M.config()
   mason.setup({})
   mason_settings.set({ ui = { border = "rounded" } })
   mason_lspconfig.setup({
-    ensure_installed = { "solargraph", "lua_ls", "tsserver" },
+    ensure_installed = { "solargraph", "lua_ls", "ts_ls" },
     handlers = {
       lsp_zero.default_setup,
     },
diff --git a/lua/config/plugins/which-key.lua b/lua/config/plugins/which-key.lua
index ae9fec6..7749a46 100644
--- a/lua/config/plugins/which-key.lua
+++ b/lua/config/plugins/which-key.lua
@@ -9,240 +9,147 @@ function M.config()
     return
   end
 
-  local setup = {
-    plugins = {
-      marks = false, -- shows a list of your marks on ' and `
-      registers = false, -- shows your registers on " in NORMAL or <C-r> in INSERT mode
-      spelling = {
-        enabled = true, -- enabling this will show WhichKey when pressing z= to select spelling suggestions
-        suggestions = 20, -- how many suggestions should be shown in the list?
-      },
-      -- the presets plugin, adds help for a bunch of default keybindings in Neovim
-      -- No actual key bindings are created
-      presets = {
-        operators = false, -- adds help for operators like d, y, ... and registers them for motion / text object completion
-        motions = true, -- adds help for motions
-        text_objects = true, -- help for text objects triggered after entering an operator
-        windows = true, -- default bindings on <c-w>
-        nav = false, -- misc bindings to work with windows
-        z = true, -- bindings for folds, spelling and others prefixed with z
-        g = true, -- bindings for prefixed with g
-      },
-    },
-    -- add operators that will trigger motion and text object completion
-    -- to enable all native operators, set the preset / operators plugin above
-    -- operators = { gc = "Comments" },
-    key_labels = {
-      -- override the label used to display some keys. It doesn't effect WK in any other way.
-      -- For example:
-      -- ["<space>"] = "SPC",
-      -- ["<cr>"] = "RET",
-      -- ["<tab>"] = "TAB",
-    },
+  which_key.setup({
+    preset = "modern",
+    filter = function(mapping)
+      return mapping.desc and mapping.desc ~= ""
+    end,
     icons = {
-      breadcrumb = "»", -- symbol used in the command line area that shows your active key combo
-      separator = "➜", -- symbol used between a key and it's label
-      group = "+", -- symbol prepended to a group
-    },
-    popup_mappings = {
-      scroll_down = "<c-d>", -- binding to scroll down inside the popup
-      scroll_up = "<c-u>", -- binding to scroll up inside the popup
-    },
-    window = {
-      border = "rounded", -- none, single, double, shadow
-      position = "bottom", -- bottom, top
-      margin = { 1, 0, 1, 0 }, -- extra window margin [top, right, bottom, left]
-      padding = { 2, 2, 2, 2 }, -- extra window padding [top, right, bottom, left]
-      winblend = 0,
-    },
-    layout = {
-      height = { min = 4, max = 25 }, -- min and max height of the columns
-      width = { min = 20, max = 50 }, -- min and max width of the columns
-      spacing = 3, -- spacing between columns
-      align = "left", -- align columns left, center or right
-    },
-    ignore_missing = true, -- enable this to hide mappings for which you didn't specify a label
-    hidden = { "<silent>", "<cmd>", "<Cmd>", "<CR>", "call", "lua", "^:", "^ " }, -- hide mapping boilerplate
-    show_help = true, -- show help message on the command line when the popup is visible
-    triggers = "auto", -- automatically setup triggers
-    -- triggers = {"<leader>"}, -- or specify a list manually
-    triggers_blacklist = {
-      -- list of mode / prefixes that should never be hooked by WhichKey
-      -- this is mostly relevant for key maps that start with a native binding
-      -- most people should not need to change this
-      i = { "j", "k" },
-      v = { "j", "k" },
-    },
-  }
-
-  local opts = {
-    mode = "n", -- NORMAL mode
-    prefix = "<leader>",
-    buffer = nil, -- Global mappings. Specify a buffer number for buffer local mappings
-    silent = true, -- use `silent` when creating keymaps
-    noremap = true, -- use `noremap` when creating keymaps
-    nowait = true, -- use `nowait` when creating keymaps
-  }
-
-  -- stylua: ignore
-  local mappings = {
-    ["a"] = { "<cmd>lua require('neogen').generate({})<cr>", "Annotate" },
-    ["w"] = { "<cmd>w!<CR>", "Save" },
-    ["q"] = { "<cmd>q!<CR>", "Quit" },
-    ["c"] = { "<cmd>lua require('bufdelete').bufdelete(0, false)<CR>", "Close Buffer" },
-    ["C"] = { "<cmd>lua require('bufdelete').bufdelete(0, true)<cr>", "Close Unsaved Buffer" },
-    ["h"] = { "<cmd>set invhlsearch<CR>", "Toggle Highlight" },
-    ["f"] = { "<cmd>lua require('telescope.builtin').find_files(require('telescope.themes').get_dropdown{previewer = false})<cr>", "Find File" },
-    ["P"] = { "<cmd>lua require('telescope').extensions.projects.projects()<cr>", "Projects" },
-    ["r"] = { "<cmd>Telescope frecency theme=dropdown previewer=false<cr>", "Recent Files" },
-    ["u"] = { "<cmd>lua require('undotree').toggle()<cr>", "Undotree" },
-    ["z"] = { "<cmd>:NoNeckPain<cr>", "No Neck Pain" },
-    ["?"] = { "<cmd>Cheatsheet<cr>", "Cheatsheet" },
-
-    b = {
-      name = "Buffers",
-      j = { "<cmd>BufferLinePick<cr>", "Jump" },
-      f = { "<cmd>Neotree buffers position=float<cr>", "Find" },
-      b = { "<cmd>BufferLineCyclePrev<cr>", "Previous" },
-      e = { "<cmd>BufferLinePickClose<cr>", "Pick which buffer to close" },
-      h = { "<cmd>BufferLineCloseLeft<cr>", "Close all to the left" },
-      l = { "<cmd>BufferLineCloseRight<cr>", "Close all to the right" },
-      D = { "<cmd>BufferLineSortByDirectory<cr>", "Sort by directory" },
-      L = { "<cmd>BufferLineSortByExtension<cr>", "Sort by language" },
-    },
-
-    d = {
-      name = "Debug",
-      t = { "<cmd>lua require('dap').toggle_breakpoint()<cr>", "Toggle Breakpoint" },
-      b = { "<cmd>lua require('dap').step_back()<cr>", "Step Back" },
-      c = { "<cmd>lua require('dap').continue()<cr>", "Continue" },
-      C = { "<cmd>lua require('dap').run_to_cursor()<cr>", "Run To Cursor" },
-      d = { "<cmd>lua require('dap').disconnect()<cr>", "Disconnect" },
-      g = { "<cmd>lua require('dap').session()<cr>", "Get Session" },
-      i = { "<cmd>lua require('dap').step_into()<cr>", "Step Into" },
-      o = { "<cmd>lua require('dap').step_over()<cr>", "Step Over" },
-      u = { "<cmd>lua require('dap').step_out()<cr>", "Step Out" },
-      p = { "<cmd>lua require('dap').pause.toggle()<cr>", "Pause" },
-      r = { "<cmd>lua require('dap').repl.toggle()<cr>", "Toggle Repl" },
-      s = { "<cmd>lua require('dap').continue()<cr>", "Start" },
-      q = { "<cmd>lua require('dap').close(); require('dap.repl').close(); require('dapui').close()<cr>", "Quit" },
-    },
-
-    p = {
-      name = "Lazy",
-      o = { "<cmd>lua require('lazy').home()<cr>", "Home" },
-      i = { "<cmd>lua require('lazy').install()<cr>", "Install" },
-      u = { "<cmd>lua require('lazy').update()<cr>", "Update" },
-      s = { "<cmd>lua require('lazy').sync()<cr>", "Sync" },
-      x = { "<cmd>lua require('lazy').clean()<cr>", "Clean" },
-      c = { "<cmd>lua require('lazy').check()<cr>", "Check" },
-      L = { "<cmd>lua require('lazy').log()<cr>", "Log" },
-      R = { "<cmd>lua require('lazy').restore()<cr>", "Restore" },
-      p = { "<cmd>lua require('lazy').profile()<cr>", "Profile" },
-      D = { "<cmd>lua require('lazy').debug()<cr>", "Debug" },
-      H = { "<cmd>lua require('lazy').help()<cr>", "Help" },
-      B = { "<cmd>lua require('lazy').clear()<cr>", "Clear" },
-      n = { "<cmd>Telescope notify theme=ivy<cr>", "Notifications" },
-      m = { "<cmd>Mason<cr>", "Mason" },
+      mappings = false,
     },
-
-    g = {
-      name = "Git",
-      g = { "<cmd>lua require('neogit').open({ kind = 'split' })<cr>", "Neogit" },
-      j = { "<cmd>lua require('gitsigns').next_hunk()<cr>", "Next hunk" },
-      k = { "<cmd>lua require('gitsigns').prev_hunk()<cr>", "Prev hunk" },
-      l = { "<cmd>lua require('gitsigns').blame_line()<cr>", "Blame line" },
-      p = { "<cmd>lua require('gitsigns').preview_hunk()<cr>", "Preview hunk" },
-      R = { "<cmd>lua require('gitsigns').reset_buffer()<cr>", "Reset buffer" },
-      r = { "<cmd>lua require('gitsigns').reset_hunk()<cr>", "Reset hunk" },
-      s = { "<cmd>lua require('gitsigns').stage_hunk()<cr>", "Stage hunk" },
-      u = { "<cmd>lua require('gitsigns').undo_stage_hunk()<cr>", "Undo stage hunk" },
-      o = { "<cmd>Telescope git_status<cr>", "Open changed file" },
-      b = { "<cmd>Telescope git_branches<cr>", "Checkout branch" },
-      c = { "<cmd>Telescope git_commits<cr>", "Checkout commit" },
-      d = { "<cmd>Gitsigns diffthis HEAD<cr>", "Diff" },
-      O = { "<cmd>GitBlameOpenCommitURL<cr>", "Open in browser" },
-      h = { "<cmd>GitBlameCopySHA<cr>", "Copy hash" },
-    },
-
-    l = {
-      name = "LSP",
-      a = { "<cmd>lua vim.lsp.buf.code_action()<cr>", "Code Action" },
-      A = { "<cmd>lua vim.lsp.codelens.run()<cr>", "CodeLens Action" },
-      d = { "<cmd>Telescope diagnostics bufnr=0 theme=ivy<cr>", "Buffer Diagnostics" },
-      D = { "<cmd>Telescope diagnostics<cr>", "Diagnostics" },
-      f = { "<cmd>Format<cr>", "Format" },
-      q = { "<cmd>lua vim.diagnostic.setloclist()<cr>", "Quickfix" },
-      r = { "<cmd>lua vim.lsp.buf.rename()<cr>", "Rename" },
-      s = { "<cmd>Telescope lsp_document_symbols<cr>", "Document Symbols" },
-      S = { "<cmd>Telescope lsp_dynamic_workspace_symbols<cr>", "Workspace Symbols" },
-    },
-
-    s = {
-      name = "Search",
-      f = { "<cmd>Telescope find_files theme=dropdown previewer=false<cr>", "Find files" },
-      g = { "<cmd>Telescope live_grep theme=ivy<cr>", "Live Grep" },
-      b = { "<cmd>Telescope git_branches<cr>", "Checkout branch" },
-      c = { "<cmd>Cheatsheet<cr>", "Cheatsheet" },
-      h = { "<cmd>Telescope help_tags<cr>", "Help" },
-      l = { "<cmd>Telescope resume<cr>", "Last Search" },
-      M = { "<cmd>Telescope man_pages<cr>", "Man Pages" },
-      R = { "<cmd>Telescope registers<cr>", "Registers" },
-      k = { "<cmd>Telescope keymaps<cr>", "Keymaps" },
-      C = { "<cmd>Telescope commands<cr>", "Commands" },
-      p = { "<cmd>lua require('telescope').extensions.projects.projects()<cr>", "Projects" },
-      y = { "<cmd>Telescope yank_history<cr>", "Yank History" },
-      G = { "<cmd>GrepAppInput<cr>", "Web Grep" },
-    },
-
-    t = {
-      name = "Tabs",
-      c = { "<cmd>tabclose<cr>", "Close tab" },
-      h = { "<cmd>-tabmove<cr>", "Move tab left" },
-      j = { "<cmd>tabnext<cr>", "Next tab" },
-      k = { "<cmd>tabprevious<cr>", "Previous tab" },
-      l = { "<cmd>+tabmove<cr>", "Move tab right" },
-      t = { "<cmd>tab sb %<cr>", "Move buffer to a new tab" },
-    },
-
-    n = {
-      name = "Neotest",
-      o = { "<cmd>lua require('neotest').summary.toggle()<CR>", "Toggle summary" },
-      n = { "<cmd>lua require('neotest').run.run()<CR>", "Test nearest" },
-      f = { "<cmd>lua require('neotest').run.run(vim.fn.expand('%'))<CR>", "Test file" },
-      l = { "<cmd>lua require('neotest').run.run_last()<CR>", "Run last test" },
-      s = { function()
-        local neotest = require("neotest")
-        for _, adapter_id in ipairs(neotest.state.adapter_ids()) do
-          neotest.run.run({ suite = true, adapter = adapter_id })
-        end
-      end, "Test suite" },
+    win = {
+      title = false,
     }
-  }
-
-  local vopts = {
-    mode = "v", -- VISUAL mode
-    prefix = "<leader>",
-    buffer = nil, -- Global mappings. Specify a buffer number for buffer local mappings
-    silent = true, -- use `silent` when creating keymaps
-    noremap = true, -- use `noremap` when creating keymaps
-    nowait = true, -- use `nowait` when creating keymaps
-  }
-
-  -- stylua: ignore
-  local vmappings = {
-    ["/"] = { "<esc><cmd>lua require('Comment.api').toggle.linewise(vim.fn.visualmode())<cr>", "Comment" },
-    g = {
-      name = "Git",
-      o = { "<cmd>lua require('gitlinker').get_buf_range_url('v', { action_callback = require('gitlinker.actions').open_in_browser })<CR>", "Open in browser" },
-      c = { "<cmd>lua require('gitlinker').get_buf_range_url('v', { action_callback = require('gitlinker.actions').copy_to_clipboard })<CR>", "Copy to clipboard" },
-    },
-  }
-
-  -- Register which-key bindings
-  which_key.setup(setup)
-  which_key.register(mappings, opts)
-  which_key.register(vmappings, vopts)
+  })
+
+  which_key.add({
+    -- General mappings
+    { "<leader>a", "<cmd>lua require('neogen').generate({})<cr>", desc = "Annotate" },
+    { "<leader>w", "<cmd>w!<CR>", desc = "Save" },
+    { "<leader>q", "<cmd>q!<CR>", desc = "Quit" },
+    { "<leader>c", "<cmd>lua require('bufdelete').bufdelete(0, false)<CR>", desc = "Close Buffer" },
+    { "<leader>C", "<cmd>lua require('bufdelete').bufdelete(0, true)<cr>", desc = "Close Unsaved Buffer" },
+    { "<leader>h", "<cmd>set invhlsearch<CR>", desc = "Toggle Highlight" },
+    { "<leader>f", "<cmd>lua require('telescope.builtin').find_files(require('telescope.themes').get_dropdown{previewer = false})<cr>", desc = "Find File", },
+    { "<leader>P", "<cmd>lua require('telescope').extensions.projects.projects()<cr>", desc = "Projects" },
+    { "<leader>r", "<cmd>Telescope frecency theme=dropdown previewer=false<cr>", desc = "Recent Files" },
+    { "<leader>u", "<cmd>lua require('undotree').toggle()<cr>", desc = "Undotree" },
+    { "<leader>z", "<cmd>:NoNeckPain<cr>", desc = "No Neck Pain" },
+    { "<leader>?", "<cmd>Cheatsheet<cr>", desc = "Cheatsheet" },
+
+    -- Buffers
+    { "<leader>b", group = "Buffers" },
+    { "<leader>bj", "<cmd>BufferLinePick<cr>", desc = "Jump" },
+    { "<leader>bf", "<cmd>Neotree buffers position=float<cr>", desc = "Find" },
+    { "<leader>bb", "<cmd>BufferLineCyclePrev<cr>", desc = "Previous" },
+    { "<leader>be", "<cmd>BufferLinePickClose<cr>", desc = "Pick which buffer to close" },
+    { "<leader>bh", "<cmd>BufferLineCloseLeft<cr>", desc = "Close all to the left" },
+    { "<leader>bl", "<cmd>BufferLineCloseRight<cr>", desc = "Close all to the right" },
+    { "<leader>bD", "<cmd>BufferLineSortByDirectory<cr>", desc = "Sort by directory" },
+    { "<leader>bL", "<cmd>BufferLineSortByExtension<cr>", desc = "Sort by language" },
+
+    -- Debug
+    { "<leader>d", group = "Debug" },
+    { "<leader>dt", "<cmd>lua require('dap').toggle_breakpoint()<cr>", desc = "Toggle Breakpoint" },
+    { "<leader>db", "<cmd>lua require('dap').step_back()<cr>", desc = "Step Back" },
+    { "<leader>dc", "<cmd>lua require('dap').continue()<cr>", desc = "Continue" },
+    { "<leader>dC", "<cmd>lua require('dap').run_to_cursor()<cr>", desc = "Run To Cursor" },
+    { "<leader>dd", "<cmd>lua require('dap').disconnect()<cr>", desc = "Disconnect" },
+    { "<leader>dg", "<cmd>lua require('dap').session()<cr>", desc = "Get Session" },
+    { "<leader>di", "<cmd>lua require('dap').step_into()<cr>", desc = "Step Into" },
+    { "<leader>do", "<cmd>lua require('dap').step_over()<cr>", desc = "Step Over" },
+    { "<leader>du", "<cmd>lua require('dap').step_out()<cr>", desc = "Step Out" },
+    { "<leader>dp", "<cmd>lua require('dap').pause.toggle()<cr>", desc = "Pause" },
+    { "<leader>dr", "<cmd>lua require('dap').repl.toggle()<cr>", desc = "Toggle Repl" },
+    { "<leader>ds", "<cmd>lua require('dap').continue()<cr>", desc = "Start" },
+    { "<leader>dq", "<cmd>lua require('dap').close(); require('dap.repl').close(); require('dapui').close()<cr>", desc = "Quit", },
+
+    -- Lazy
+    { "<leader>p", group = "Lazy" },
+    { "<leader>po", "<cmd>lua require('lazy').home()<cr>", desc = "Home" },
+    { "<leader>pi", "<cmd>lua require('lazy').install()<cr>", desc = "Install" },
+    { "<leader>pu", "<cmd>lua require('lazy').update()<cr>", desc = "Update" },
+    { "<leader>ps", "<cmd>lua require('lazy').sync()<cr>", desc = "Sync" },
+    { "<leader>px", "<cmd>lua require('lazy').clean()<cr>", desc = "Clean" },
+    { "<leader>pc", "<cmd>lua require('lazy').check()<cr>", desc = "Check" },
+    { "<leader>pL", "<cmd>lua require('lazy').log()<cr>", desc = "Log" },
+    { "<leader>pR", "<cmd>lua require('lazy').restore()<cr>", desc = "Restore" },
+    { "<leader>pp", "<cmd>lua require('lazy').profile()<cr>", desc = "Profile" },
+    { "<leader>pD", "<cmd>lua require('lazy').debug()<cr>", desc = "Debug" },
+    { "<leader>pH", "<cmd>lua require('lazy').help()<cr>", desc = "Help" },
+    { "<leader>pB", "<cmd>lua require('lazy').clear()<cr>", desc = "Clear" },
+    { "<leader>pn", "<cmd>Telescope notify theme=ivy<cr>", desc = "Notifications" },
+    { "<leader>pm", "<cmd>Mason<cr>", desc = "Mason" },
+
+    -- Git
+    { "<leader>g", group = "Git" },
+    { "<leader>gg", "<cmd>lua require('neogit').open({ kind = 'split' })<cr>", desc = "Neogit" },
+    { "<leader>gj", "<cmd>lua require('gitsigns').next_hunk()<cr>", desc = "Next hunk" },
+    { "<leader>gk", "<cmd>lua require('gitsigns').prev_hunk()<cr>", desc = "Prev hunk" },
+    { "<leader>gl", "<cmd>lua require('gitsigns').blame_line()<cr>", desc = "Blame line" },
+    { "<leader>gp", "<cmd>lua require('gitsigns').preview_hunk()<cr>", desc = "Preview hunk" },
+    { "<leader>gR", "<cmd>lua require('gitsigns').reset_buffer()<cr>", desc = "Reset buffer" },
+    { "<leader>gr", "<cmd>lua require('gitsigns').reset_hunk()<cr>", desc = "Reset hunk" },
+    { "<leader>gs", "<cmd>lua require('gitsigns').stage_hunk()<cr>", desc = "Stage hunk" },
+    { "<leader>gu", "<cmd>lua require('gitsigns').undo_stage_hunk()<cr>", desc = "Undo stage hunk" },
+    { "<leader>go", "<cmd>Telescope git_status<cr>", desc = "Open changed file" },
+    { "<leader>gb", "<cmd>Telescope git_branches<cr>", desc = "Checkout branch" },
+    { "<leader>gc", "<cmd>Telescope git_commits<cr>", desc = "Checkout commit" },
+    { "<leader>gd", "<cmd>Gitsigns diffthis HEAD<cr>", desc = "Diff" },
+    { "<leader>gO", "<cmd>GitBlameOpenCommitURL<cr>", desc = "Open in browser" },
+    { "<leader>gh", "<cmd>GitBlameCopySHA<cr>", desc = "Copy hash" },
+
+    -- LSP
+    { "<leader>l", group = "LSP" },
+    { "<leader>la", "<cmd>lua vim.lsp.buf.code_action()<cr>", desc = "Code Action" },
+    { "<leader>lA", "<cmd>lua vim.lsp.codelens.run()<cr>", desc = "CodeLens Action" },
+    { "<leader>ld", "<cmd>Telescope diagnostics bufnr=0 theme=ivy<cr>", desc = "Buffer Diagnostics" },
+    { "<leader>lD", "<cmd>Telescope diagnostics<cr>", desc = "Diagnostics" },
+    { "<leader>lf", "<cmd>Format<cr>", desc = "Format" },
+    { "<leader>lq", "<cmd>lua vim.diagnostic.setloclist()<cr>", desc = "Quickfix" },
+    { "<leader>lr", "<cmd>lua vim.lsp.buf.rename()<cr>", desc = "Rename" },
+    { "<leader>ls", "<cmd>Telescope lsp_document_symbols<cr>", desc = "Document Symbols" },
+    { "<leader>lS", "<cmd>Telescope lsp_dynamic_workspace_symbols<cr>", desc = "Workspace Symbols" },
+
+    -- Search
+    { "<leader>s", group = "Search" },
+    { "<leader>sf", "<cmd>Telescope find_files theme=dropdown previewer=false<cr>", desc = "Find files" },
+    { "<leader>sg", "<cmd>Telescope live_grep theme=ivy<cr>", desc = "Live Grep" },
+    { "<leader>sb", "<cmd>Telescope git_branches<cr>", desc = "Checkout branch" },
+    { "<leader>sc", "<cmd>Cheatsheet<cr>", desc = "Cheatsheet" },
+    { "<leader>sh", "<cmd>Telescope help_tags<cr>", desc = "Help" },
+    { "<leader>sl", "<cmd>Telescope resume<cr>", desc = "Last Search" },
+    { "<leader>sM", "<cmd>Telescope man_pages<cr>", desc = "Man Pages" },
+    { "<leader>sR", "<cmd>Telescope registers<cr>", desc = "Registers" },
+    { "<leader>sk", "<cmd>Telescope keymaps<cr>", desc = "Keymaps" },
+    { "<leader>sC", "<cmd>Telescope commands<cr>", desc = "Commands" },
+    { "<leader>sp", "<cmd>lua require('telescope').extensions.projects.projects()<cr>", desc = "Projects" },
+    { "<leader>sy", "<cmd>Telescope yank_history<cr>", desc = "Yank History" },
+    { "<leader>sG", "<cmd>GrepAppInput<cr>", desc = "Web Grep" },
+
+    -- Tabs
+    { "<leader>t", group = "Tabs" },
+    { "<leader>tc", "<cmd>tabclose<cr>", desc = "Close tab" },
+    { "<leader>th", "<cmd>-tabmove<cr>", desc = "Move tab left" },
+    { "<leader>tj", "<cmd>tabnext<cr>", desc = "Next tab" },
+    { "<leader>tk", "<cmd>tabprevious<cr>", desc = "Previous tab" },
+    { "<leader>tl", "<cmd>+tabmove<cr>", desc = "Move tab right" },
+    { "<leader>tt", "<cmd>tab sb %<cr>", desc = "Move buffer to a new tab" },
+
+    -- Neotest
+    { "<leader>n", group = "Neotest" },
+    { "<leader>no", "<cmd>lua require('neotest').summary.toggle()<CR>", desc = "Toggle summary" },
+    { "<leader>nn", "<cmd>lua require('neotest').run.run()<CR>", desc = "Test nearest" },
+    { "<leader>nf", "<cmd>lua require('neotest').run.run(vim.fn.expand('%'))<CR>", desc = "Test file" },
+    { "<leader>nl", "<cmd>lua require('neotest').run.run_last()<CR>", desc = "Run last test" },
+    { "<leader>ns", "<cmd>lua require('neotest').run.run({ suite = true })<CR>", desc = "Test suite" },
+
+    -- Visual mode mappings
+    { "<leader>/", "<esc><cmd>lua require('Comment.api').toggle.linewise(vim.fn.visualmode())<cr>", desc = "Comment", mode = "v", },
+    { "<leader>g", group = "Git", mode = "v" },
+    { "<leader>go", "<cmd>lua require('gitlinker').get_buf_range_url('v', { action_callback = require('gitlinker.actions').open_in_browser })<CR>", desc = "Open in browser", mode = "v", },
+    { "<leader>gc", "<cmd>lua require('gitlinker').get_buf_range_url('v', { action_callback = require('gitlinker.actions').copy_to_clipboard })<CR>", desc = "Copy to clipboard", mode = "v", },
+  })
 end
 
 return M