diff --git a/aspects/dotfiles/files/.local/share/autojump/autojump.txt b/aspects/dotfiles/files/.local/share/autojump/autojump.txt
index 50056cfc..547698f3 100644
Binary files a/aspects/dotfiles/files/.local/share/autojump/autojump.txt and b/aspects/dotfiles/files/.local/share/autojump/autojump.txt differ
diff --git a/aspects/dotfiles/files/.local/share/autojump/autojump.txt.bak b/aspects/dotfiles/files/.local/share/autojump/autojump.txt.bak
index fe323804..8d855591 100644
Binary files a/aspects/dotfiles/files/.local/share/autojump/autojump.txt.bak and b/aspects/dotfiles/files/.local/share/autojump/autojump.txt.bak differ
diff --git a/aspects/dotfiles/files/.local/share/newsboat/cache.db b/aspects/dotfiles/files/.local/share/newsboat/cache.db
index de76ee5a..96dc16c5 100644
Binary files a/aspects/dotfiles/files/.local/share/newsboat/cache.db and b/aspects/dotfiles/files/.local/share/newsboat/cache.db differ
diff --git a/aspects/dotfiles/files/.local/share/zathura/bookmarks.sqlite b/aspects/dotfiles/files/.local/share/zathura/bookmarks.sqlite
index 9a22f8ac..841e594d 100644
Binary files a/aspects/dotfiles/files/.local/share/zathura/bookmarks.sqlite and b/aspects/dotfiles/files/.local/share/zathura/bookmarks.sqlite differ
diff --git a/aspects/nvim/files/.config/nvim/ftplugin/cpp.lua b/aspects/nvim/files/.config/nvim/ftplugin/cpp.lua
index 518afd6a..fe8fa047 100644
--- a/aspects/nvim/files/.config/nvim/ftplugin/cpp.lua
+++ b/aspects/nvim/files/.config/nvim/ftplugin/cpp.lua
@@ -6,15 +6,13 @@ options = vim.tbl_deep_extend("force", {
   buffer = vim.api.nvim_get_current_buf(),
 }, options)
 
-which_key.register({
-  ["L"] = {
-    name = "Language",
-    a = { "<CMD>ClangdAST<CR>", "Toggle AST" },
-    i = { "<CMD>ClangdToggleInlayHints<CR>", "Toggle Inlay Hints" },
-    s = { "<CMD>ClangdSwitchSourceHeader<CR>", "Switch Source Header" },
-    K = { "<CMD>ClangdSymbolInfo<CR>", "Symbol Info" },
-    h = { "<CMD>ClangdTypeHierarchy<CR>", "Type Hierarchy" },
-  },
+which_key.add({
+  { "<Leader>L", group = "Language" },
+  { "<Leader>La", "<CMD>ClangdAST<CR>", desc = "Toggle AST" },
+  { "<Leader>Li", "<CMD>ClangdToggleInlayHints<CR>", desc = "Toggle Inlay Hints" },
+  { "<Leader>Ls", "<CMD>ClangdSwitchSourceHeader<CR>", desc = "Switch Source Header" },
+  { "<Leader>LK", "<CMD>ClangdSymbolInfo<CR>", desc = "Symbol Info" },
+  { "<Leader>Lh", "<CMD>ClangdTypeHierarchy<CR>", desc = "Type Hierarchy" },
 }, options)
 
 local dap = require("dap")
diff --git a/aspects/nvim/files/.config/nvim/ftplugin/dart.lua b/aspects/nvim/files/.config/nvim/ftplugin/dart.lua
index 677f9bd7..1a0ee263 100644
--- a/aspects/nvim/files/.config/nvim/ftplugin/dart.lua
+++ b/aspects/nvim/files/.config/nvim/ftplugin/dart.lua
@@ -6,22 +6,20 @@ options = vim.tbl_deep_extend("force", {
   buffer = vim.api.nvim_get_current_buf(),
 }, options)
 
-which_key.register({
-  ["L"] = {
-    name = "Language",
-    p = { "<CMD>FlutterRun<CR>", "Run project" },
-    d = { "<CMD>FlutterDevices<CR>", "List connected devices" },
-    e = { "<CMD>FlutterEmulators<CR>", "List of emulators" },
-    q = { "<CMD>FlutterQuit<CR>", "End running session" },
-    D = { "<CMD>FlutterDetach<CR>", "End running session locally" },
-    o = { "<CMD>FlutterOutlineToggle<CR>", "Toggle outline window" },
-    t = { "<CMD>FlutterDevTools<CR>", "Start Dart Dev Tools server" },
-    a = { "<CMD>FlutterDevToolsActivate<CR>", "Start Dart Dev Tools server" },
-    P = { "<CMD>FlutterCopyProfilerUrl<CR>", "Copy profiler url to system clipboard" },
-    l = { "<CMD>FlutterLspRestart<CR>", "Restart LSP" },
-    s = { "<CMD>FlutterSuper<CR>", "Go to super class" },
-    r = { "<CMD>FlutterRename<CR>", "Rename and updates imports" },
-  },
+which_key.add({
+  { "<Leader>L", group = "Language" },
+  { "<Leader>Lp", "<CMD>FlutterRun<CR>", desc = "Run project" },
+  { "<Leader>Ld", "<CMD>FlutterDevices<CR>", desc = "List connected devices" },
+  { "<Leader>Le", "<CMD>FlutterEmulators<CR>", desc = "List of emulators" },
+  { "<Leader>Lq", "<CMD>FlutterQuit<CR>", desc = "End running session" },
+  { "<Leader>LD", "<CMD>FlutterDetach<CR>", desc = "End running session locally" },
+  { "<Leader>Lo", "<CMD>FlutterOutlineToggle<CR>", desc = "Toggle outline window" },
+  { "<Leader>Lt", "<CMD>FlutterDevTools<CR>", desc = "Start Dart Dev Tools server" },
+  { "<Leader>La", "<CMD>FlutterDevToolsActivate<CR>", desc = "Start Dart Dev Tools server" },
+  { "<Leader>LP", "<CMD>FlutterCopyProfilerUrl<CR>", desc = "Copy profiler url to system clipboard" },
+  { "<Leader>Ll", "<CMD>FlutterLspRestart<CR>", desc = "Restart LSP" },
+  { "<Leader>Ls", "<CMD>FlutterSuper<CR>", desc = "Go to super class" },
+  { "<Leader>Lr", "<CMD>FlutterRename<CR>", desc = "Rename and updates imports" },
 }, options)
 
 local dap = require("dap")
diff --git a/aspects/nvim/files/.config/nvim/ftplugin/go.lua b/aspects/nvim/files/.config/nvim/ftplugin/go.lua
index 69a0fa08..a5018f3e 100644
--- a/aspects/nvim/files/.config/nvim/ftplugin/go.lua
+++ b/aspects/nvim/files/.config/nvim/ftplugin/go.lua
@@ -6,76 +6,65 @@ options = vim.tbl_deep_extend("force", {
   buffer = vim.api.nvim_get_current_buf(),
 }, options)
 
-which_key.register({
-  ["L"] = {
-    name = "Language",
-    o = { "<CMD>GoPkgOutline<CR>", "Package Outline" },
-    m = { "<CMD>GoMockGen<CR>", "Generate mocks for current file" },
-    I = { "<CMD>GoToggleInlay<CR>", "Toggle inlay hints" },
-    r = { "<CMD>GoGenReturn<CR>", "Create return value for current function" },
-    f = {
-      name = "Auto Fill",
-      s = { "<CMD>GoFillStruct<CR>", "Auto fill struct" },
-      w = { "<CMD>GoFillSwitch<CR>", "Fill switch" },
-      e = { "<CMD>GoIfErr<CR>", "Add if err" },
-      p = { "<CMD>GoFillPlurals<CR>", "change func foo(b int, a int, r int) -> func foo(b, a, r int)" },
-    },
-    i = {
-      name = "Install",
-      i = { "<CMD>GoInstallBinaries<CR>", "Install all tools, skip the ones installed" },
-      u = { "<CMD>GoUpdateBinaries<CR>", "Update all tools to the latest version" },
-    },
-    b = {
-      name = "Build",
-      m = { "<CMD>GoMake<CR>", "Make" },
-      g = { "<CMD>GoBuild<CR>", "Build" },
-      r = { "<CMD>GoGenerate<CR>", "Generate" },
-      s = { "<CMD>GoStop<CR>", "Stop job GoRun started" },
-    },
-    t = {
-      name = "Test",
-      t = { "<CMD>GoTest<CR>", "Test" },
-      w = { "<CMD>GoTestSum -w<CR>", "Test in watch mode" },
-      v = { "<CMD>GoTest -v<CR>", "Test -v current file path" },
-      c = { "<CMD>GoTest -c<CR>", "Test -c current file path" },
-      n = { "<CMD>GoTest -n<CR>", "Test nearest" },
-      f = { "<CMD>GoTest -f<CR>", "Test current file" },
-      p = { "<CMD>GoTest -p<CR>", "Test current package" },
-      v = { "<CMD>GoVet<CR>", "Vet" },
-      C = { "<CMD>GoCoverage<CR>", "Test cover profile" },
-      P = { "<CMD>GoCoverage -p<CR>", "Test package for current buffer" },
-    },
-    T = {
-      name = "Tags",
-      a = { "<CMD>GoAddTag<CR>", "Add tag" },
-      r = { "<CMD>GoRmTag<CR>", "Remove tag" },
-      c = { "<CMD>GoClearTag<CR>", "Clear tag" },
-    },
-    f = {
-      name = "Format",
-      f = { "<CMD>GoFmt<CR>", "Format" },
-      i = { "<CMD>GoImport<CR>", "Import" },
-    },
-    s = {
-      name = "Switch between go and test file",
-      a = { "<CMD>GoAlt!<CR>", "Alternate file" },
-      s = { "<CMD>GoAltS!<CR>", "Alternate file (horizontal split)" },
-      v = { "<CMD>GoAltv!<CR>", "Alternate file (vertical split)" },
-    },
-    m = {
-      name = "Mod",
-      i = { "<CMD>GoModInit<CR>", "Run go mod init" },
-      t = { "<CMD>GoModInit<CR>", "Run go mod tidy" },
-      v = { "<CMD>GoModInit<CR>", "Run go mod vendor" },
-    },
-    u = {
-      name = "Unit Tests",
-      f = { "<CMD><CR>", "Run tests for current function" },
-      F = { "<CMD><CR>", "Run tests for current file" },
-      s = { "<CMD><CR>", "Select test function" },
-      p = { "<CMD><CR>", "Run tests for package" },
-    },
-  },
+which_key.add({
+  { "<Leader>L", group = "Language" },
+  { "<Leader>Lo", "<CMD>GoPkgOutline<CR>", desc = "Package Outline" },
+  { "<Leader>LM", "<CMD>GoMockGen<CR>", desc = "Generate mocks for current file" },
+  { "<Leader>LI", "<CMD>GoToggleInlay<CR>", desc = "Toggle inlay hints" },
+  { "<Leader>Lr", "<CMD>GoGenReturn<CR>", desc = "Create return value for current function" },
+
+  { "<Leader>LF", group = "Auto Fill" },
+  { "<Leader>LFs", "<CMD>GoFillStruct<CR>", desc = "Auto fill struct" },
+  { "<Leader>LFw", "<CMD>GoFillSwitch<CR>", desc = "Fill switch" },
+  { "<Leader>LFe", "<CMD>GoIfErr<CR>", desc = "Add if err" },
+  { "<Leader>LFp", "<CMD>GoFillPlurals<CR>", desc = "change func foo(b int, a int, r int) -> func foo(b, a, r int)" },
+
+  { "<Leader>Li", group = "Install" },
+  { "<Leader>Lii", "<CMD>GoInstallBinaries<CR>", desc = "Install all tools, skip the ones installed" },
+  { "<Leader>Liu", "<CMD>GoUpdateBinaries<CR>", desc = "Update all tools to the latest version" },
+
+  { "<Leader>Lb", group = "Build" },
+  { "<Leader>Lbm", "<CMD>GoMake<CR>", desc = "Make" },
+  { "<Leader>Lbg", "<CMD>GoBuild<CR>", desc = "Build" },
+  { "<Leader>Lbr", "<CMD>GoGenerate<CR>", desc = "Generate" },
+  { "<Leader>Lbs", "<CMD>GoStop<CR>", desc = "Stop job GoRun started" },
+
+  { "<Leader>Lt", group = "Test" },
+  { "<Leader>Ltt", "<CMD>GoTest<CR>", desc = "Test" },
+  { "<Leader>Ltw", "<CMD>GoTestSum -w<CR>", desc = "Test in watch mode" },
+  { "<Leader>Ltv", "<CMD>GoTest -v<CR>", desc = "Test -v current file path" },
+  { "<Leader>Ltc", "<CMD>GoTest -c<CR>", desc = "Test -c current file path" },
+  { "<Leader>Ltn", "<CMD>GoTest -n<CR>", desc = "Test nearest" },
+  { "<Leader>Ltf", "<CMD>GoTest -f<CR>", desc = "Test current file" },
+  { "<Leader>Ltp", "<CMD>GoTest -p<CR>", desc = "Test current package" },
+  { "<Leader>Ltv", "<CMD>GoVet<CR>", desc = "Vet" },
+  { "<Leader>LtC", "<CMD>GoCoverage<CR>", desc = "Test cover profile" },
+  { "<Leader>LtP", "<CMD>GoCoverage -p<CR>", desc = "Test package for current buffer" },
+
+  { "<Leader>LT", group = "Tags" },
+  { "<Leader>LTa", "<CMD>GoAddTag<CR>", desc = "Add tag" },
+  { "<Leader>LTr", "<CMD>GoRmTag<CR>", desc = "Remove tag" },
+  { "<Leader>LTc", "<CMD>GoClearTag<CR>", desc = "Clear tag" },
+
+  { "<Leader>Lf", group = "Format" },
+  { "<Leader>Lff", "<CMD>GoFmt<CR>", desc = "Format" },
+  { "<Leader>Lfi", "<CMD>GoImport<CR>", desc = "Import" },
+
+  { "<Leader>Ls", group = "Switch between go and test file" },
+  { "<Leader>Lsa", "<CMD>GoAlt!<CR>", desc = "Alternate file" },
+  { "<Leader>Lss", "<CMD>GoAltS!<CR>", desc = "Alternate file (horizontal split)" },
+  { "<Leader>Lsv", "<CMD>GoAltv!<CR>", desc = "Alternate file (vertical split)" },
+
+  { "<Leader>Lm", group = "Mod" },
+  { "<Leader>Lmi", "<CMD>GoModInit<CR>", desc = "Run go mod init" },
+  { "<Leader>Lmt", "<CMD>GoModInit<CR>", desc = "Run go mod tidy" },
+  { "<Leader>Lmv", "<CMD>GoModInit<CR>", desc = "Run go mod vendor" },
+
+  { "<Leader>Lu", group = "Unit Tests" },
+  { "<Leader>Luf", "<CMD><CR>", desc = "Run tests for current function" },
+  { "<Leader>LuF", "<CMD><CR>", desc = "Run tests for current file" },
+  { "<Leader>Lus", "<CMD><CR>", desc = "Select test function" },
+  { "<Leader>Lup", "<CMD><CR>", desc = "Run tests for package" },
 }, options)
 
 local dap = require("dap")
diff --git a/aspects/nvim/files/.config/nvim/ftplugin/java.lua b/aspects/nvim/files/.config/nvim/ftplugin/java.lua
index 0ad6ac4e..43bb590f 100644
--- a/aspects/nvim/files/.config/nvim/ftplugin/java.lua
+++ b/aspects/nvim/files/.config/nvim/ftplugin/java.lua
@@ -161,29 +161,25 @@ voptions = vim.tbl_deep_extend("force", {
   buffer = vim.api.nvim_get_current_buf(),
 }, voptions)
 
-which_key.register({
-  ["L"] = {
-    name = "Lanage",
-    o = { "<cmd>lua require('jdtls').organize_imports()<cr>", "Organize Imports" },
-    v = { "<cmd>lua require('jdtls').extract_variable()<cr>", "Extract Variable" },
-    c = { "<cmd>lua require('jdtls').extract_constant()<cr>", "Extract Constant" },
-    m = { "<cmd>lua require('jdtls').extract_method()<cr>", "Extract Method" },
-    t = { "<cmd>lua require('jdtls').test_class()<cr>", "Test Class" },
-    n = { "<cmd>lua require('jdtls').test_nearest_method()<cr>", "Test Nearest Method" },
-    u = { "<CMD>JdtUpdateConfig<CR>", "Update Config" },
-    d = { "<CMD>JdtRefreshDebugConfigs<CR>", "Refresh debug config" },
-    e = { "<CMD>Jaq<CR>", "Execute Java" },
-    r = { "<CMD>JdtWipeDataAndRestart<CR>", "Wipe project data and Restart server" },
-    x = { "<CMD>JdtRestart<CR>", "Restart server" },
-    s = { "<CMD>JdtSetRuntime<CR>", "Set runtime" },
-  },
+which_key.add({
+  { "<Leader>L", group = "Language" },
+  { "<Leader>Lo", "<cmd>lua require('jdtls').organize_imports()<cr>", desc = "Organize Imports" },
+  { "<Leader>Lv", "<cmd>lua require('jdtls').extract_variable()<cr>", desc = "Extract Variable" },
+  { "<Leader>Lc", "<cmd>lua require('jdtls').extract_constant()<cr>", desc = "Extract Constant" },
+  { "<Leader>Lm", "<cmd>lua require('jdtls').extract_method()<cr>", desc = "Extract Method" },
+  { "<Leader>Lt", "<cmd>lua require('jdtls').test_class()<cr>", desc = "Test Class" },
+  { "<Leader>Ln", "<cmd>lua require('jdtls').test_nearest_method()<cr>", desc = "Test Nearest Method" },
+  { "<Leader>Lu", "<CMD>JdtUpdateConfig<CR>", desc = "Update Config" },
+  { "<Leader>Ld", "<CMD>JdtRefreshDebugConfigs<CR>", desc = "Refresh debug config" },
+  { "<Leader>Le", "<CMD>Jaq<CR>", desc = "Execute Java" },
+  { "<Leader>Lr", "<CMD>JdtWipeDataAndRestart<CR>", desc = "Wipe project data and Restart server" },
+  { "<Leader>Lx", "<CMD>JdtRestart<CR>", desc = "Restart server" },
+  { "<Leader>Ls", "<CMD>JdtSetRuntime<CR>", desc = "Set runtime" },
 }, options)
 
-which_key.register({
-  ["L"] = {
-    name = "Language",
-    v = { "<cmd>lua require('jdtls').extract_variable(true)<cr>", "Extract Variable" },
-    c = { "<cmd>lua require('jdtls').extract_constant(true)<cr>", "Extract Constant" },
-    m = { "<cmd>lua require('jdtls').extract_method(true)<cr>", "Extract Method" },
-  },
+which_key.add({
+  { "<Leader>L", group = "Language" },
+  { "<Leader>Lv", "<cmd>lua require('jdtls').extract_variable(true)<cr>", desc = "Extract Variable" },
+  { "<Leader>Lc", "<cmd>lua require('jdtls').extract_constant(true)<cr>", desc = "Extract Constant" },
+  { "<Leader>Lm", "<cmd>lua require('jdtls').extract_method(true)<cr>", desc = "Extract Method" },
 }, voptions)
diff --git a/aspects/nvim/files/.config/nvim/ftplugin/mail.lua b/aspects/nvim/files/.config/nvim/ftplugin/mail.lua
index a3228b0e..d71f73fa 100644
--- a/aspects/nvim/files/.config/nvim/ftplugin/mail.lua
+++ b/aspects/nvim/files/.config/nvim/ftplugin/mail.lua
@@ -17,14 +17,12 @@ options = vim.tbl_deep_extend("force", {
   buffer = vim.api.nvim_get_current_buf(),
 }, options)
 
-which_key.register({
-  ["L"] = {
-    name = "Language",
-    f = { "1G0f:C: ", "From" },
-    t = { "2G0f:C: ", "To" },
-    c = { "3G0f:C: ", "CC" },
-    b = { "4G0f:C: ", "BCC" },
-    s = { "5G0f:C: ", "Subject" },
-    r = { "6G0f:C: ", "Reply To" },
-  },
+which_key.add({
+  { "<Leader>L", group = "Language" },
+  { "<Leader>Lf", "1G0f:C: ", desc = "From" },
+  { "<Leader>Lt", "2G0f:C: ", desc = "To" },
+  { "<Leader>Lc", "3G0f:C: ", desc = "CC" },
+  { "<Leader>Lb", "4G0f:C: ", desc = "BCC" },
+  { "<Leader>Ls", "5G0f:C: ", desc = "Subject" },
+  { "<Leader>Lr", "6G0f:C: ", desc = "Reply To" },
 }, options)
diff --git a/aspects/nvim/files/.config/nvim/ftplugin/markdown.lua b/aspects/nvim/files/.config/nvim/ftplugin/markdown.lua
index eecc22a3..aea87ec7 100644
--- a/aspects/nvim/files/.config/nvim/ftplugin/markdown.lua
+++ b/aspects/nvim/files/.config/nvim/ftplugin/markdown.lua
@@ -7,31 +7,25 @@ options = vim.tbl_deep_extend("force", {
   buffer = buffer,
 }, options)
 
-which_key.register({
-  ["L"] = {
-    name = "Language",
-    g = { "<cmd>Glow<CR>", "Toggle Glow" },
-    p = { "<cmd>MarkdownPreviewToggle<CR>", "Toggle Markdown Preview" },
-    t = {
-      name = "Table",
-      t = { "<cmd>TableModeToggle<CR>", "Enable/Disable Table Mode" },
-      n = { "<Leader>ti", "Get cell info" },
-      f = {
-        name = "Formula",
-        a = { "<cmd>TableAddFormula<CR>", "Add formula" },
-        e = { "<Leader>tfe", "Evaluate formula on current row" },
-      },
-      d = {
-        name = "Delete",
-        r = { "<Leader>tdr", "Delete row" },
-        c = { "<Leader>tdc", "Delete column" },
-      },
-      i = {
-        name = "Insert",
-        c = { "<Leader>tic", "Insert column" },
-      },
-    },
-  },
+which_key.add({
+  { "<Leader>L", group = "Language" },
+  { "<Leader>Lg", "<CMD>Glow<CR>", desc = "Toggle Glow" },
+  { "<Leader>Lp", "<CMD>MarkdownPreviewToggle<CR>", desc = "Toggle Markdown Preview" },
+
+  { "<Leader>Lt", group = "Table" },
+  { "<Leader>Ltt", "<CMD>TableModeToggle<CR>", desc = "Enable/Disable Table Mode" },
+  { "<Leader>Ltn", "<Leader>ti", desc = "Get cell info" },
+
+  { "<Leader>Lf", group = "Formula" },
+  { "<Leader>Lfa", "<CMD>TableAddFormula<CR>", desc = "Add formula" },
+  { "<Leader>Lfe", "<Leader>tfe", desc = "Evaluate formula on current row" },
+
+  { "<Leader>Ld", group = "Delete" },
+  { "<Leader>Ldr", "<Leader>tdr", desc = "Delete row" },
+  { "<Leader>Ldc", "<Leader>tdc", desc = "Delete column" },
+
+  { "<Leader>Li", group = "Insert" },
+  { "<Leader>Lic", "<Leader>tic", desc = "Insert column" },
 }, options)
 
 vim.keymap.set(
diff --git a/aspects/nvim/files/.config/nvim/ftplugin/python.lua b/aspects/nvim/files/.config/nvim/ftplugin/python.lua
index 990b16e1..56193829 100644
--- a/aspects/nvim/files/.config/nvim/ftplugin/python.lua
+++ b/aspects/nvim/files/.config/nvim/ftplugin/python.lua
@@ -7,27 +7,20 @@ options = vim.tbl_deep_extend("force", {
   buffer = vim.api.nvim_get_current_buf(),
 }, options)
 
-which_key.register({
-  ["L"] = {
-    name = "Language",
-    j = {
-      name = "Jupyter",
-      l = { "<Cmd>MoltenLoad<CR>", "Load Molten" },
-      i = { "<Cmd>MoltenInit<CR>", "Init Molten" },
-      I = { "<Cmd>MoltenInfo<CR>", "Info Molten" },
-      e = { "<Cmd>MoltenEvaluateLine<CR>", "Evaluate Line Molten" },
-      r = { "<Cmd>MoltenReevaluateCell<CR>", "Reevaluate Cell Molten" },
-    },
-    p = { "<Cmd>PyrightOrganizeImports<CR>", "Organize Imports" },
-  },
+which_key.add({
+  { "<Leader>L", group = "Language" },
+  { "<Leader>Lp", "<Cmd>PyrightOrganizeImports<CR>", desc = "Organize Imports" },
+
+  { "<Leader>Lj", group = "Jupyter" },
+  { "<Leader>Ljl", "<Cmd>MoltenLoad<CR>", desc = "Load Molten" },
+  { "<Leader>Lji", "<Cmd>MoltenInit<CR>", desc = "Init Molten" },
+  { "<Leader>LjI", "<Cmd>MoltenInfo<CR>", desc = "Info Molten" },
+  { "<Leader>Lje", "<Cmd>MoltenEvaluateLine<CR>", desc = "Evaluate Line Molten" },
+  { "<Leader>Ljr", "<Cmd>MoltenReevaluateCell<CR>", desc = "Reevaluate Cell Molten" },
 }, options)
 
-which_key.register({
-  ["L"] = {
-    name = "Language",
-    j = {
-      name = "Jupyter",
-      e = { "<Esc><Cmd>MoltenEvaluateVisual<cr>", "Evaluate Highlighted Line" },
-    },
-  },
+which_key.add({
+  { "<Leader>L", group = "Language" },
+  { "<Leader>Lj", group = "Jupyter" },
+  { "<Leader>Lje", "<Esc><Cmd>MoltenEvaluateVisual<cr>", desc = "Evaluate Highlighted Line" },
 }, voptions)
diff --git a/aspects/nvim/files/.config/nvim/ftplugin/rust.lua b/aspects/nvim/files/.config/nvim/ftplugin/rust.lua
index 8e16d671..4d23e422 100644
--- a/aspects/nvim/files/.config/nvim/ftplugin/rust.lua
+++ b/aspects/nvim/files/.config/nvim/ftplugin/rust.lua
@@ -1,8 +1,6 @@
 local which_key = require("which-key")
 local options = require("config.global").which_key_vars.options
 
-local keymap = require("config.global").keymap
-local opts = require("config.global").opts
 local bufnr = vim.api.nvim_get_current_buf()
 
 options = vim.tbl_deep_extend("force", {
@@ -10,27 +8,24 @@ options = vim.tbl_deep_extend("force", {
   buffer = bufnr,
 }, options)
 
-which_key.register({
-  ["L"] = {
-    name = "Language",
-    H = {
-      name = "Hints",
-      e = { "<cmd>RustEnableInlayHints<CR>", "Enable Inlay Hints" },
-      d = { "<cmd>RustDisableInlayHints<CR>", "Disable Inlay Hints" },
-    },
-    d = { "<cmd>RustOpenExternalDocs<CR>", "Open Docs" },
-    s = { "<cmd>RustSSR<CR>", "Structural Search Replace" },
-    r = { "<cmd>RustRunnables<CR>", "Run Runnables" },
-    R = { "<cmd>RustHoverRange<CR>", "Show Type in hover" },
-    h = { "<cmd>RustHoverActions<CR>", "Hover Actions" },
-    o = { "<cmd>RustOpenCargo<CR>", "Open Cargo" },
-    p = { "<cmd>RustParentModule<CR>", "Parent Module" },
-    j = { "<cmd>RustJoinLines<CR>", "Join Lines" },
-    e = { "<cmd>RustExpandMacro<CR>", "Expand Macro" },
-    U = { "<cmd>RustMoveItemUp<CR>", "Move Item Up" },
-    D = { "<cmd>RustMoveItemDown<CR>", "Move Item Down" },
-    v = { "<cmd>RustViewCrateGraph<CR>", "View Crate Graph" },
-  },
+which_key.add({
+  { "<Leader>L", group = "Language" },
+  { "<Leader>Ld", "<cmd>RustOpenExternalDocs<CR>", desc = "Open Docs" },
+  { "<Leader>Ls", "<cmd>RustSSR<CR>", desc = "Structural Search Replace" },
+  { "<Leader>Lr", "<cmd>RustRunnables<CR>", desc = "Run Runnables" },
+  { "<Leader>LR", "<cmd>RustHoverRange<CR>", desc = "Show Type in hover" },
+  { "<Leader>Lh", "<cmd>RustHoverActions<CR>", desc = "Hover Actions" },
+  { "<Leader>Lo", "<cmd>RustOpenCargo<CR>", desc = "Open Cargo" },
+  { "<Leader>Lp", "<cmd>RustParentModule<CR>", desc = "Parent Module" },
+  { "<Leader>Lj", "<cmd>RustJoinLines<CR>", desc = "Join Lines" },
+  { "<Leader>Le", "<cmd>RustExpandMacro<CR>", desc = "Expand Macro" },
+  { "<Leader>LU", "<cmd>RustMoveItemUp<CR>", desc = "Move Item Up" },
+  { "<Leader>LD", "<cmd>RustMoveItemDown<CR>", desc = "Move Item Down" },
+  { "<Leader>Lv", "<cmd>RustViewCrateGraph<CR>", desc = "View Crate Graph" },
+
+  { "<Leader>LH", group = "Hints" },
+  { "<Leader>LHe", "<cmd>RustEnableInlayHints<CR>", desc = "Enable Inlay Hints" },
+  { "<Leader>LHd", "<cmd>RustDisableInlayHints<CR>", desc = "Disable Inlay Hints" },
 }, options)
 
 local dap = require("dap")
diff --git a/aspects/nvim/files/.config/nvim/ftplugin/sql.lua b/aspects/nvim/files/.config/nvim/ftplugin/sql.lua
index 893cb0c5..0ec523ea 100644
--- a/aspects/nvim/files/.config/nvim/ftplugin/sql.lua
+++ b/aspects/nvim/files/.config/nvim/ftplugin/sql.lua
@@ -11,12 +11,10 @@ voptions = vim.tbl_deep_extend("force", {
   buffer = vim.api.nvim_get_current_buf(),
 }, voptions)
 
-which_key.register({
-  ["L"] = {
-    name = "Language",
-    u = { "<Cmd>DBUIToggle<Cr>", "Toggle UI" },
-    f = { "<Cmd>DBUIFindBuffer<Cr>", "Find buffer" },
-    r = { "<Cmd>DBUIRenameBuffer<Cr>", "Rename buffer" },
-    q = { "<Cmd>DBUILastQueryInfo<Cr>", "Last query info" },
-  },
+which_key.add({
+  { "<Leader>L", group = "Language" },
+  { "<Leader>Lu", "<Cmd>DBUIToggle<Cr>", desc = "Toggle UI" },
+  { "<Leader>Lf", "<Cmd>DBUIFindBuffer<Cr>", desc = "Find buffer" },
+  { "<Leader>Lr", "<Cmd>DBUIRenameBuffer<Cr>", desc = "Rename buffer" },
+  { "<Leader>Lq", "<Cmd>DBUILastQueryInfo<Cr>", desc = "Last query info" },
 }, options)
diff --git a/aspects/nvim/files/.config/nvim/ftplugin/tex.lua b/aspects/nvim/files/.config/nvim/ftplugin/tex.lua
index 4c02ed9a..3dc6b4f1 100644
--- a/aspects/nvim/files/.config/nvim/ftplugin/tex.lua
+++ b/aspects/nvim/files/.config/nvim/ftplugin/tex.lua
@@ -15,45 +15,36 @@ options = vim.tbl_deep_extend("force", {
   buffer = vim.api.nvim_get_current_buf(),
 }, options)
 
-which_key.register({
-  ["L"] = {
-    name = "Language",
-    m = { "<cmd>VimtexContextMenu<CR>", "Open Context Menu" },
-    u = { "<cmd>VimtexCountLetters<CR>", "Count Letters" },
-    w = { "<cmd>VimtexCountWords<CR>", "Count Words" },
-    d = { "<cmd>VimtexDocPackage<CR>", "Open Doc for package" },
-    e = { "<cmd>VimtexErrors<CR>", "Look at the errors" },
-    s = { "<cmd>VimtexStatus<CR>", "Look at the status" },
-    a = { "<cmd>VimtexToggleMain<CR>", "Toggle Main" },
-    v = { "<cmd>VimtexView<CR>", "View pdf" },
-    i = { "<cmd>VimtexInfo<CR>", "Vimtex Info" },
-    t = { "<cmd>VimtexTocToggle<CR>", "Toggle TOC" },
-    l = {
-      name = "Clean",
-      l = { "<cmd>VimtexClean<CR>", "Clean Project" },
-      c = { "<cmd>VimtexClean<CR>", "Clean Cache" },
-    },
-    c = {
-      name = "Compile",
-      c = { "<cmd>VimtexCompile<CR>", "Compile Project" },
-      o = {
-        "<cmd>VimtexCompileOutput<CR>",
-        "Compile Project and Show Output",
-      },
-      s = { "<cmd>VimtexCompileSS<CR>", "Compile project super fast" },
-      e = { "<cmd>VimtexCompileSelected<CR>", "Compile Selected" },
-    },
-    r = {
-      name = "Reload",
-      r = { "<cmd>VimtexReload<CR>", "Reload" },
-      s = { "<cmd>VimtexReloadState<CR>", "Reload State" },
-    },
-    o = {
-      name = "Stop",
-      p = { "<cmd>VimtexStop<CR>", "Stop" },
-      a = { "<cmd>VimtexStopAll<CR>", "Stop All" },
-    },
-  },
+which_key.add({
+  { "<Leader>L", group = "Language" },
+  { "<Leader>Lm", "<CMD>VimtexContextMenu<CR>", desc = "Open Context Menu" },
+  { "<Leader>Lu", "<CMD>VimtexCountLetters<CR>", desc = "Count Letters" },
+  { "<Leader>Lw", "<CMD>VimtexCountWords<CR>", desc = "Count Words" },
+  { "<Leader>Ld", "<CMD>VimtexDocPackage<CR>", desc = "Open Doc for package" },
+  { "<Leader>Le", "<CMD>VimtexErrors<CR>", desc = "Look at the errors" },
+  { "<Leader>Ls", "<CMD>VimtexStatus<CR>", desc = "Look at the status" },
+  { "<Leader>La", "<CMD>VimtexToggleMain<CR>", desc = "Toggle Main" },
+  { "<Leader>Lv", "<CMD>VimtexView<CR>", desc = "View pdf" },
+  { "<Leader>Li", "<CMD>VimtexInfo<CR>", desc = "Vimtex Info" },
+  { "<Leader>Lt", "<CMD>VimtexTocToggle<CR>", desc = "Toggle TOC" },
+
+  { "<Leader>Ll", group = "Clean" },
+  { "<Leader>Lll", "<CMD>VimtexClean<CR>", desc = "Clean Project" },
+  { "<Leader>Llc", "<CMD>VimtexClean<CR>", desc = "Clean Cache" },
+
+  { "<Leader>Lc", group = "Compile" },
+  { "<Leader>Lcc", "<CMD>VimtexCompile<CR>", desc = "Compile Project" },
+  { "<Leader>Lco", "<CMD>VimtexCompileOutput<CR>", desc = "Compile Project and Show Output", },
+  { "<Leader>Lcs", "<CMD>VimtexCompileSS<CR>", desc = "Compile project super fast" },
+  { "<Leader>Lce", "<CMD>VimtexCompileSelected<CR>", desc = "Compile Selected" },
+
+  { "<Leader>Lr", group = "Reload" },
+  { "<Leader>Lrr", "<CMD>VimtexReload<CR>", desc = "Reload" },
+  { "<Leader>Lrs", "<CMD>VimtexReloadState<CR>", desc = "Reload State" },
+
+  { "<Leader>Lo", group = "Stop" },
+  { "<Leader>Lop", "<CMD>VimtexStop<CR>", desc = "Stop" },
+  { "<Leader>Loa", "<CMD>VimtexStopAll<CR>", desc = "Stop All" },
 }, options)
 
 keymap(
diff --git a/aspects/nvim/files/.config/nvim/ftplugin/toml.lua b/aspects/nvim/files/.config/nvim/ftplugin/toml.lua
deleted file mode 100644
index f11c9144..00000000
--- a/aspects/nvim/files/.config/nvim/ftplugin/toml.lua
+++ /dev/null
@@ -1,13 +0,0 @@
-local which_key = require("which-key")
-local options = require("config.global").which_key_vars.options
-
-options = vim.tbl_deep_extend("force", {
-  filetype = "toml",
-  buffer = vim.api.nvim_get_current_buf(),
-}, options)
-
-which_key.register({
-  ["L"] = {
-    name = "Language",
-  },
-}, options)
diff --git a/aspects/nvim/files/.config/nvim/ftplugin/typescript.lua b/aspects/nvim/files/.config/nvim/ftplugin/typescript.lua
index f74cd074..23f66179 100644
--- a/aspects/nvim/files/.config/nvim/ftplugin/typescript.lua
+++ b/aspects/nvim/files/.config/nvim/ftplugin/typescript.lua
@@ -6,20 +6,17 @@ options = vim.tbl_deep_extend("force", {
   buffer = vim.api.nvim_get_current_buf(),
 }, options)
 
-which_key.register({
-  ["L"] = {
-    name = "Language",
-    d = { "<cmd>TSToolsGoToSourceDefinition<cr>", "Go to Source Definition" },
-    f = { "<cmd>TSToolsFixAll<cr>", "Fix all fixable errors" },
-    i = {
-      name = "Imports",
-      a = { "<cmd>TSToolsAddMissingImports<cr>", "Add missing imports" },
-      o = { "<cmd>TSToolsOrganizeImports<cr>", "Organize imports" },
-      r = { "<cmd>TSToolsRemoveUnusedImports<cr>", "Remove Unused Imports" },
-      s = { "<cmd>TSToolsSortImports<cr>", "Sort Imports" },
-    },
-    r = { "<cmd>TSToolsRemoveUnused<cr>", "Removed Unused Statements" },
-  },
+which_key.add({
+  { "<Leader>L", group = "Language" },
+  { "<Leader>Ld", "<cmd>TSToolsGoToSourceDefinition<cr>", desc = "Go to Source Definition" },
+  { "<Leader>Lf", "<cmd>TSToolsFixAll<cr>", desc = "Fix all fixable errors" },
+  { "<Leader>Lr", "<cmd>TSToolsRemoveUnused<cr>", desc = "Removed Unused Statements" },
+
+  { "<Leader>Li", group = "Imports" },
+  { "<Leader>Lia", "<cmd>TSToolsAddMissingImports<cr>", desc = "Add missing imports" },
+  { "<Leader>Lio", "<cmd>TSToolsOrganizeImports<cr>", desc = "Organize imports" },
+  { "<Leader>Lir", "<cmd>TSToolsRemoveUnusedImports<cr>", desc = "Remove Unused Imports" },
+  { "<Leader>Lis", "<cmd>TSToolsSortImports<cr>", desc = "Sort Imports" },
 }, options)
 
 local dap = require("dap")
diff --git a/aspects/nvim/files/.config/nvim/lua/config/keymaps.lua b/aspects/nvim/files/.config/nvim/lua/config/keymaps.lua
index db79e719..d5aff100 100644
--- a/aspects/nvim/files/.config/nvim/lua/config/keymaps.lua
+++ b/aspects/nvim/files/.config/nvim/lua/config/keymaps.lua
@@ -38,7 +38,6 @@ keymap("n", "<C-a>", "ggVG", opts, "Highlight everything.")
 keymap("n", ";", ":nohl<CR>", opts, "Clear search highlight.")
 keymap("n", "<Tab>", "za", opts, "Toggle tab.")
 keymap("n", "<CR>", "ciw", opts, "Detele entire word.")
-keymap("n", "<Leader>-", "<CMD>lua require('lir.float').toggle()<CR>", opts, "Toggle Lir.")
 
 -- Insert Mode
 keymap("i", "<C-l>", "<c-g>u<Esc>[s1z=`]a<c-g>u", opts, "Correct spelling mistake.")
diff --git a/aspects/nvim/files/.config/nvim/lua/config/lazy.lua b/aspects/nvim/files/.config/nvim/lua/config/lazy.lua
index e346888e..a82696b6 100644
--- a/aspects/nvim/files/.config/nvim/lua/config/lazy.lua
+++ b/aspects/nvim/files/.config/nvim/lua/config/lazy.lua
@@ -67,10 +67,10 @@ function Lazyload()
     vim.cmd([[syntax manual]])
   end
 
-  local load_go = vim.tbl_contains({ "go", "gomod" }, vim.bo.filetype)
-  if load_go then
-    loader("go.nvim")
-  end
+  -- local load_go = vim.tbl_contains({ "go", "gomod" }, vim.bo.filetype)
+  -- if load_go then
+  --   loader("go.nvim")
+  -- end
 
   loader("plenary.nvim")
 
diff --git a/aspects/nvim/files/.config/nvim/lua/modules/editor/config.lua b/aspects/nvim/files/.config/nvim/lua/modules/editor/config.lua
index ca2489b1..b575e3be 100644
--- a/aspects/nvim/files/.config/nvim/lua/modules/editor/config.lua
+++ b/aspects/nvim/files/.config/nvim/lua/modules/editor/config.lua
@@ -474,76 +474,4 @@ function config.neo_tree()
   })
 end
 
-function config.lir()
-  local lir = require("lir")
-
-  local actions = require("lir.actions")
-  local mark_actions = require("lir.mark.actions")
-  local clipboard_actions = require("lir.clipboard.actions")
-  local setup = {
-    show_hidden_files = false,
-    devicons = { enable = true },
-    mappings = {
-      ["<CR>"] = actions.edit,
-      ["l"] = actions.edit,
-      ["<C-s>"] = actions.split,
-      ["v"] = actions.vsplit,
-      ["<C-t>"] = actions.tabedit,
-      ["h"] = actions.up,
-      ["q"] = actions.quit,
-      ["A"] = actions.mkdir,
-      ["a"] = actions.newfile,
-      ["r"] = actions.rename,
-      ["@"] = actions.cd,
-      ["Y"] = actions.yank_path,
-      ["i"] = actions.toggle_show_hidden,
-      ["d"] = actions.delete,
-      ["J"] = function()
-        mark_actions.toggle_mark()
-        vim.cmd("normal! j")
-      end,
-      ["c"] = clipboard_actions.copy,
-      ["x"] = clipboard_actions.cut,
-      ["p"] = clipboard_actions.paste,
-    },
-    float = {
-      winblend = 0,
-      curdir_window = {
-        enable = false,
-        highlight_dirname = true,
-      },
-
-      win_opts = function()
-        local width = math.floor(vim.o.columns * 0.7)
-        local height = math.floor(vim.o.lines * 0.7)
-        return {
-          border = "rounded",
-          width = width,
-          height = height,
-        }
-      end,
-    },
-    hide_cursor = false,
-    on_init = function()
-      vim.api.nvim_buf_set_keymap(
-        0,
-        "x",
-        "J",
-        ":<C-u>lua require('lir.mark.actions').toggle_mark('v')<CR>",
-        { noremap = true, silent = true }
-      )
-    end,
-  }
-
-  lir.setup(setup)
-
-  require("nvim-web-devicons").set_icon({
-    lir_folder_icon = {
-      icon = "",
-      color = "#42A5F5",
-      name = "LirFolderNode",
-    },
-  })
-end
-
 return config
diff --git a/aspects/nvim/files/.config/nvim/lua/modules/git/config.lua b/aspects/nvim/files/.config/nvim/lua/modules/git/config.lua
index 13974410..2108ee06 100644
--- a/aspects/nvim/files/.config/nvim/lua/modules/git/config.lua
+++ b/aspects/nvim/files/.config/nvim/lua/modules/git/config.lua
@@ -2,8 +2,7 @@ local config = {}
 
 function config.gitsigns()
   local gitsigns = require("gitsigns")
-
-  gitsigns.setup({
+  local setup = {
     signs = {
       add = { text = "▎" },
       change = { text = "▎" },
@@ -32,8 +31,9 @@ function config.gitsigns()
     sign_priority = 6,
     update_debounce = 200,
     status_formatter = nil,
-    yadm = { enable = false },
-  })
+  }
+
+  gitsigns.setup(setup)
 end
 
 return config
diff --git a/aspects/nvim/files/.config/nvim/lua/modules/lsp/config.lua b/aspects/nvim/files/.config/nvim/lua/modules/lsp/config.lua
index 6d82792e..de6a34c7 100644
--- a/aspects/nvim/files/.config/nvim/lua/modules/lsp/config.lua
+++ b/aspects/nvim/files/.config/nvim/lua/modules/lsp/config.lua
@@ -223,7 +223,6 @@ function config.navigator()
           "typescriptreact",
         },
       },
-      golangci_lint_ls = { filetypes = { "go", "gomod" } },
       gopls = require("modules.lsp.settings.gopls"),
       jdtls = { filetypes = { "java" } },
       solidity_ls = { filetypes = { "solidity" }, install_server_name = "solidity" },
@@ -235,6 +234,14 @@ function config.navigator()
     },
   }
 
+  -- nav_cfg.lsp.gopls = function()
+  --   if vim.tbl_contains({ "go", "gomod" }, vim.bo.filetype) then
+  --     if pcall(require, "go") then
+  --       return require("go.lsp").config()
+  --     end
+  --   end
+  -- end
+
   require("navigator").setup(nav_cfg)
   -- require("navigator").setup()
 end
@@ -259,6 +266,53 @@ function config.glance()
   })
 end
 
+function config.go()
+  local setup = {
+    fillstruct = "gopls",
+    log_path = "/tmp/gonvim.log",
+    lsp_codelens = false, -- use navigator
+    lsp_gofumpt = true,
+    dap_debug = true,
+    gofmt = "gopls",
+    goimports = "gopls",
+    dap_debug_vt = true,
+    dap_debug_gui = true,
+    diagnostic = false,
+    test_runner = "go",
+    run_in_floaterm = true,
+    lsp_document_formatting = true,
+    preludes = {
+      default = function()
+        return { "AWS_PROFILE=test" }
+      end,
+      GoRun = function()
+        local pwd = vim.fn.getcwd()
+        local cmdl = { "watchexec", "--restart", "-v", "-e", "go" }
+        -- if current folder contains sub folder with name pattern .\w+-env
+        -- list all subfolders see if match .\w+-env
+        local hasenv = false
+        for _, v in ipairs(vim.fn.readdir(pwd)) do
+          if string.match(v, "%p%a+%p*env") then
+            hasenv = true
+            break
+          end
+        end
+
+        if hasenv then
+          local cwdl = vim.split(pwd, "/")
+          local cwd = cwdl[#cwdl]
+          local cwdp = vim.split(cwd, "-")
+          local cwdps = cwdp[#cwdp]
+          return vim.list_extend(cmdl, { "awsenv", cwdps })
+        end
+        return {}
+      end,
+    },
+  }
+
+  require("go").setup(setup)
+end
+
 function config.flutter_tools()
   local line = { "╭", "─", "╮", "│", "╯", "─", "╰", "│" }
 
diff --git a/aspects/nvim/files/.config/nvim/lua/modules/lsp/handlers.lua b/aspects/nvim/files/.config/nvim/lua/modules/lsp/handlers.lua
index dc70a6be..64538e2b 100644
--- a/aspects/nvim/files/.config/nvim/lua/modules/lsp/handlers.lua
+++ b/aspects/nvim/files/.config/nvim/lua/modules/lsp/handlers.lua
@@ -38,43 +38,50 @@ lsp.attach_mappings = function(_, bufnr)
     buffer = bufnr,
   }, options)
 
-  which_key.register({
-    l = {
-      name = "LSP",
-      c = { "<CMD>lua vim.lsp.buf.code_action()<CR>", "Show code actions" },
-      e = { "<CMD>lua vim.diagnostic.open_float()<CR>", "Show line diagnostics" },
-      E = { "<CMD>Telescope diagnostics<CR>", "Show all diagnostics" },
-      f = { "<CMD>lua vim.lsp.buf.format { async = true }<CR>", "Format" },
-      r = { "<CMD>lua vim.lsp.buf.rename()<CR>", "Rename" },
-      i = { "<CMD>LspInfo<CR>", "LSP info" },
-      o = { "<CMD>OutlineOpen<CR>", "Symbols Outline" },
-      j = { "<CMD>lua vim.diagnostic.goto_next()<CR>", "Go to next diagnostic" },
-      k = { "<CMD>lua vim.diagnostic.goto_prev()<CR>", "Go to previous diagnostic" },
-      l = { "<CMD>lua require('lsp_lines').toggle()<CR>", "Toggle LSP Lines" },
-      s = { "<CMD>lua vim.lsp.buf.signature_help()<CR>", "Signature" },
-      D = { "<cmd>Telescope lsp_document_symbols<cr>", "Document Symbols" },
-      d = {
-        name = "Definition",
-        d = { "<CMD>Glance definitions<CR>", "Definition" },
-        p = {
-          function()
-            require("nvim-treesitter.textobjects.lsp_interop").peek_definition_code("@function.outer", nil, "textDocument/typeDefinition")
-          end,
-          "Preview Definition"
-        },
-        r = { "<CMD>Glance references<CR>", "References" },
-        t = { "<CMD>Glance type_definitions<CR>", "Type Definition" },
-        i = { "<CMD>Glance implementations<CR>", "Implementation" },
-      },
-      w = {
-        name = "Workspace",
-        s = { "<CMD>Telescope lsp_workspace_symbols<CR>", "Symbols" },
-        a = { "<CMD>lua vim.lsp.buf.add_workspace_folder()<CR>", "Add workspace folder" },
-        r = { "<CMD>lua vim.lsp.buf.remove_workspace_folder()<CR>", "Remove workspace folder" },
-        l = { "<CMD>lua vim.lsp.buf.list_workspace_folders()<CR>", "List workspace folders" },
-      },
+  which_key.add({
+    { "<Leader>l", group = "LSP" },
+    { "<Leader>lc", vim.lsp.buf.code_action, desc = "Show code actions" },
+    { "<Leader>le", vim.diagnostic.open_float, desc = "Show line diagnostics" },
+    { "<Leader>lE", "<CMD>Telescope diagnostics<CR>", desc = "Show all diagnostics" },
+    {
+      "<Leader>lf",
+      function()
+        vim.lsp.buf.format({ async = true })
+      end,
+      desc = "Format",
     },
-  }, options)
+    { "<Leader>lr", vim.lsp.buf.rename, desc = "Rename" },
+    { "<Leader>li", vim.cmd.LspInfo, desc = "LSP info" },
+    { "<Leader>lo", vim.cmd.OutlineOpen, desc = "Symbols Outline" },
+    { "<Leader>lj", vim.diagnostic.goto_next, desc = "Go to next diagnostic" },
+    { "<Leader>lk", vim.diagnostic.goto_prev, desc = "Go to previous diagnostic" },
+    { "<Leader>ll", require("lsp_lines").toggle, desc = "Toggle LSP Lines" },
+    { "<Leader>ls", vim.lsp.buf.signature_help, desc = "Signature" },
+    { "<Leader>lD", "<cmd>Telescope lsp_document_symbols<cr>", desc = "Document Symbols" },
+
+    { "<Leader>ld", group = "Definition" },
+    { "<Leader>ldd", "<CMD>Glance definitions<CR>", desc = "Definition" },
+    {
+      "<Leader>ldp",
+      function()
+        require("nvim-treesitter.textobjects.lsp_interop").peek_definition_code(
+          "@function.outer",
+          nil,
+          "textDocument/typeDefinition"
+        )
+      end,
+      desc = "Preview Definition",
+    },
+    { "<Leader>ldr", "<CMD>Glance references<CR>", desc = "References" },
+    { "<Leader>ldt", "<CMD>Glance type_definitions<CR>", desc = "Type Definition" },
+    { "<Leader>ldi", "<CMD>Glance implementations<CR>", desc = "Implementation" },
+
+    { "<Leader>lw", group = "Workspace" },
+    { "<Leader>lws", vim.diagnostic.LspSymbols, desc = "Symbols" },
+    { "<Leader>lwa", vim.lsp.buf.add_workspace_folder, desc = "Add workspace folder" },
+    { "<Leader>lwr", vim.lsp.buf.remove_workspace_folder, desc = "Remove workspace folder" },
+    { "<Leader>lwl", vim.lsp.buf.list_workspace_folders, desc = "List workspace folders" },
+  })
 end
 
 lsp.on_attach = function(client, bufnr)
@@ -92,7 +99,7 @@ lsp.on_attach = function(client, bufnr)
     require("modules.lsp.filetypes.cpp").clangd_extensions()
   end
 
-  -- require("inlay-hints").on_attach(client, bufnr)
+  require("inlay-hints").on_attach(client, bufnr)
   lsp.setup_codelens_refresh(client, bufnr)
   lsp.attach_mappings(client, bufnr)
 
@@ -121,24 +128,10 @@ lsp.on_attach = function(client, bufnr)
   client.config.capabilities.textDocument.completion.completionItem.snippetSupport = true
   client.config.capabilities.textDocument.foldingRange = {
     dynamicRegistration = false,
-    lineFoldingOnly = true
+    lineFoldingOnly = true,
   }
 
   lsp.capabilities = client.config.capabilities
-
-  -- if client.resolved_capabilities.code_lens then
-  --   local codelens = vim.api.nvim_create_augroup(
-  --     "LSPCodeLens",
-  --     { clear = true }
-  --   )
-  --   vim.api.nvim_create_autocmd({ "BufEnter", "InsertLeave", "CursorHold" }, {
-  --     group = codelens,
-  --     callback = function()
-  --       vim.lsp.codelens.refresh()
-  --     end,
-  --     buffer = bufnr,
-  --   })
-  -- end
 end
 
 return lsp
diff --git a/aspects/nvim/files/.config/nvim/lua/modules/lsp/plugins.lua b/aspects/nvim/files/.config/nvim/lua/modules/lsp/plugins.lua
index b8f73531..ccf54b33 100644
--- a/aspects/nvim/files/.config/nvim/lua/modules/lsp/plugins.lua
+++ b/aspects/nvim/files/.config/nvim/lua/modules/lsp/plugins.lua
@@ -202,9 +202,7 @@ return function(use)
       "nvim-lspconfig",
       "nvim-treesitter",
     },
-    config = function()
-      require("go").setup()
-    end,
+    config = conf.go,
     ft = { "go", "gomod" },
     build = ":lua require('go.install').update_all_sync()",
   })
diff --git a/aspects/nvim/files/.config/nvim/lua/modules/lsp/settings/gopls.lua b/aspects/nvim/files/.config/nvim/lua/modules/lsp/settings/gopls.lua
index ab6d861d..cb0d926b 100644
--- a/aspects/nvim/files/.config/nvim/lua/modules/lsp/settings/gopls.lua
+++ b/aspects/nvim/files/.config/nvim/lua/modules/lsp/settings/gopls.lua
@@ -1,5 +1,6 @@
 return {
   filtypes = { "go", "gomod", "gowork", "gotmpl" },
+  cmd = {'gopls', '--remote=auto'},
   settings = {
     gopls = {
       analyses = {
diff --git a/aspects/nvim/files/.config/nvim/lua/modules/ui/which-key.lua b/aspects/nvim/files/.config/nvim/lua/modules/ui/which-key.lua
index 7aeff7d1..e85787d7 100644
--- a/aspects/nvim/files/.config/nvim/lua/modules/ui/which-key.lua
+++ b/aspects/nvim/files/.config/nvim/lua/modules/ui/which-key.lua
@@ -1,9 +1,11 @@
+local which_key = require("which-key")
+
 local setup = {
   plugins = {
-    marks = true,
-    registers = true,
+    marks = false,
+    registers = false,
     spelling = {
-      enabled = true,
+      enabled = false,
       suggestions = 20,
     },
     presets = {
@@ -16,24 +18,14 @@ local setup = {
       g = true,
     },
   },
-  key_labels = {
-    ["<leader>"] = "SPC",
-  },
   icons = {
     breadcrumb = "»",
     separator = "➜",
     group = "+",
+    mappings = false,
   },
-  popup_mappings = {
-    scroll_down = "<c-d>",
-    scroll_up = "<c-u>",
-  },
-  window = {
+  win = {
     border = "rounded",
-    position = "bottom",
-    margin = { 1, 0, 1, 0 },
-    padding = { 2, 2, 2, 2 },
-    winblend = 0,
   },
   layout = {
     height = { min = 4, max = 25 },
@@ -41,15 +33,11 @@ local setup = {
     spacing = 3,
     align = "center",
   },
-  ignore_missing = true,
-  hidden = { "<silent>", "<CMD>", "<CMD>", "<CR>", "call", "lua", "^:", "^ " },
   show_help = false,
-  triggers_blacklist = {
-    i = { "j", "k" },
-    v = { "j", "k" },
-  },
 }
 
+which_key.setup(setup)
+
 local vars = require("config.global").which_key_vars
 
 local function search_config_files()
@@ -57,151 +45,163 @@ local function search_config_files()
   builtin.find_files({ cwd = vim.fn.stdpath("config") })
 end
 
-vars.vmappings["/"] = {
-  "<ESC><CMD>lua require('Comment.api').toggle.linewise(vim.fn.visualmode())<CR>",
-  "Comment",
-}
+vars.mappings[1] = {
+  { "<Leader>d", group = "Debugging" },
 
-vars.mappings[" "] = { "<CMD>normal <C-^><CR>", "Jump to previous buffer" }
--- vars.mappings["-"] = { require("lir.float").toggle, "Toggle Lir" }
-vars.mappings["/"] = { require("Comment.api").toggle.linewise, "Comment out current line" }
-vars.mappings["a"] = { require("harpoon.mark").add_file, "Add file to harpoon" }
--- vars.mappings["e"] = { "<CMD>Neotree toggle<CR>", "Toggle NeoTree" }
-vars.mappings["h"] = { vim.cmd.split, "Horizontal Split" }
-vars.mappings["t"] = { require("alternate-toggler").toggleAlternate, "Alternate" }
-vars.mappings["v"] = { vim.cmd.vsplit, "Vertical Split" }
-vars.mappings["z"] = { vim.cmd.ZenMode, "Zen Mode" }
-
-vars.mappings["d"] = {
-  name = "Debug",
-  t = { require("dap").toggle_breakpoint, "Toggle Breakpoint" },
-  b = { require("dap").step_back, "Step Back" },
-  c = { require("dap").continue, "Continue" },
-  C = { require("dap").run_to_cursor, "Run To Cursor" },
-  d = { require("dap").disconnect, "Disconnect" },
-  g = { require("dap").session, "Get Session" },
-  i = { require("dap").step_into, "Step Into" },
-  o = { require("dap").step_over, "Step Over" },
-  u = { require("dap").step_out, "Step Out" },
-  p = { require("dap").pause, "Pause" },
-  r = { require("dap").repl.toggle, "Toggle Repl" },
-  s = { require("dap").continue, "Start" },
-  q = { require("dap").close, "Quit" },
-  U = { require("dapui").toggle, "Enable/Disable UI" },
+  { "<Leader>dt", require("dap").toggle_breakpoint, desc = "Toggle Breakpoint" },
+  { "<Leader>db", require("dap").step_back, desc = "Step Back" },
+  { "<Leader>dc", require("dap").continue, desc = "Continue" },
+  { "<Leader>dC", require("dap").run_to_cursor, desc = "Run To Cursor" },
+  { "<Leader>dd", require("dap").disconnect, desc = "Disconnect" },
+  { "<Leader>dg", require("dap").session, desc = "Get Session" },
+  { "<Leader>di", require("dap").step_into, desc = "Step Into" },
+  { "<Leader>do", require("dap").step_over, desc = "Step Over" },
+  { "<Leader>du", require("dap").step_out, desc = "Step Out" },
+  { "<Leader>dp", require("dap").pause, desc = "Pause" },
+  { "<Leader>dr", require("dap").repl.toggle, desc = "Toggle Repl" },
+  { "<Leader>ds", require("dap").continue, desc = "Start" },
+  { "<Leader>dq", require("dap").close, desc = "Quit" },
+  { "<Leader>dU", require("dapui").toggle, desc = "Enable/Disable UI" },
 }
 
-vars.mappings["g"] = {
-  name = "Git",
-  j = { require("gitsigns").next_hunk, "Next Hunk" },
-  k = { require("gitsigns").prev_hunk, "Prev Hunk" },
-  l = { require("gitsigns").blame_line, "Blame" },
-  p = { require("gitsigns").preview_hunk, "Preview Hunk" },
-  m = { vim.cmd.GitMessenger, "View message" },
-  r = { require("gitsigns").reset_hunk, "Reset Hunk" },
-  R = { require("gitsigns").reset_buffer, "Reset Buffer" },
-  s = { require("gitsigns").stage_hunk, "Stage Hunk" },
-  u = { require("gitsigns").undo_stage_hunk, "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" },
-  C = { "<CMD>Telescope git_bcommits<CR>", "Checkout commit" },
-  d = { "<CMD>Gitsigns diffthis HEAD<CR>", "Git Diff" },
+vars.mappings[2] = {
+  { "<Leader>g", group = "Git" },
+
+  { "<Leader>gj", require("gitsigns").next_hunk, desc = "Next Hunk" },
+  { "<Leader>gk", require("gitsigns").prev_hunk, desc = "Prev Hunk" },
+  { "<Leader>gl", require("gitsigns").blame_line, desc = "Blame" },
+  { "<Leader>gp", require("gitsigns").preview_hunk, desc = "Preview Hunk" },
+  { "<Leader>gm", vim.cmd.GitMessenger, desc = "View message" },
+  { "<Leader>gr", require("gitsigns").reset_hunk, desc = "Reset Hunk" },
+  { "<Leader>gR", require("gitsigns").reset_buffer, desc = "Reset Buffer" },
+  { "<Leader>gs", require("gitsigns").stage_hunk, desc = "Stage Hunk" },
+  { "<Leader>gu", require("gitsigns").undo_stage_hunk, 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>gC", "<CMD>Telescope git_bcommits<CR>", desc = "Checkout commit" },
+  { "<Leader>gd", "<CMD>Gitsigns diffthis HEAD<CR>", desc = "Git Diff" },
 }
 
-vars.mappings["G"] = {
-  name = "ChatGPT",
-  a = { vim.cmd.ChatGPTActAs, "Have ChatGPT act as" },
-  c = { vim.cmd.ChatGPTCompleteCode, "Have ChatGPT complete code" },
-  t = { vim.cmd.ChatGPT, "Toggle ChatGPT" },
-  i = { vim.cmd.ChatGPTEditWithInstructions, "Have ChatGPT edit with instructions" },
-  r = {
-    name = "Run",
-    a = { "<CMD>ChatGPTRun add_test<CR>", "Implement tests for the code" },
-    c = { "<CMD>ChatGPTRun code_readability_analysis<CR>", "Identify any readability issues in the code" },
-    C = { "<CMD>ChatGPTRun complete_code<CR>", "Complete the code" },
-    d = { "<CMD>ChatGPTRun docstring<CR>", "Write docstring for the code" },
-    e = { "<CMD>ChatGPTRun explain_code<CR>", "Explain the code" },
-    f = { "<CMD>ChatGPTRun fix_bugs<CR>", "Fix bugs in the code" },
-    g = { "<CMD>ChatGPTRun grammar_correction<CR>", "Correct grammar" },
-    k = { "<CMD>ChatGPTRun keywords<CR>", "Extract the main keywords from the code" },
-    o = { "<CMD>ChatGPTRun optimize_code<CR>", "Optimize the code" },
-    r = { "<CMD>ChatGPTRun optimize_code<CR>", "Insert a roxygen skeleton to code" },
-    s = { "<CMD>ChatGPTRun summarize<CR>", "Summarize the code" },
-    t = { "<CMD>ChatGPTRun translate<CR>", "Translate code" },
+vars.mappings[3] = {
+  { "<Leader>G", group = "ChatGPT" },
+
+  { "<Leader>Ga", vim.cmd.ChatGPTActAs, desc = "Have ChatGPT act as" },
+  { "<Leader>Gc", vim.cmd.ChatGPTCompleteCode, desc = "Have ChatGPT complete code" },
+  { "<Leader>Gt", vim.cmd.ChatGPT, desc = "Toggle ChatGPT" },
+  { "<Leader>Gi", vim.cmd.ChatGPTEditWithInstructions, desc = "Have ChatGPT edit with instructions" },
+  { "<Leader>Gr", group = "Run" },
+  { "<Leader>Gra", "<CMD>ChatGPTRun add_test<CR>", desc = "Implement tests for the code" },
+  {
+    "<Leader>Grc",
+    "<CMD>ChatGPTRun code_readability_analysis<CR>",
+    desc = "Identify any readability issues in the code",
   },
+  { "<Leader>GrC", "<CMD>ChatGPTRun complete_code<CR>", desc = "Complete the code" },
+  { "<Leader>Grd", "<CMD>ChatGPTRun docstring<CR>", desc = "Write docstring for the code" },
+  { "<Leader>Gre", "<CMD>ChatGPTRun explain_code<CR>", desc = "Explain the code" },
+  { "<Leader>Grf", "<CMD>ChatGPTRun fix_bugs<CR>", desc = "Fix bugs in the code" },
+  { "<Leader>Grg", "<CMD>ChatGPTRun grammar_correction<CR>", desc = "Correct grammar" },
+  { "<Leader>Grk", "<CMD>ChatGPTRun keywords<CR>", desc = "Extract the main keywords from the code" },
+  { "<Leader>Gro", "<CMD>ChatGPTRun optimize_code<CR>", desc = "Optimize the code" },
+  { "<Leader>Grr", "<CMD>ChatGPTRun optimize_code<CR>", desc = "Insert a roxygen skeleton to code" },
+  { "<Leader>Grs", "<CMD>ChatGPTRun summarize<CR>", desc = "Summarize the code" },
+  { "<Leader>Grt", "<CMD>ChatGPTRun translate<CR>", desc = "Translate code" },
 }
 
-vars.mappings["n"] = {
-  name = "Neotest",
-  a = { require("neotest").run.attach, "Attach to the nearest test" },
-  c = {
+vars.mappings[4] = {
+  { "<Leader>n", group = "NeoTest" },
+
+  { "<Leader>na", require("neotest").run.attach, desc = "Attach to the nearest test" },
+  {
+    "<Leader>nc",
     function()
       require("neotest").run.run(vim.fn.expand("%"))
     end,
-    "Run the current file",
+    desc = "Run the current file",
   },
-  d = {
+  {
+    "<Leader>nd",
     function()
       require("neotest").run.run({ strategy = "dap" })
     end,
-    "Debug the nearest test",
+    desc = "Debug the nearest test",
   },
-  e = {
+  {
+    "<Leader>ne",
     function()
       require("neotest").output.open({ enter = true, auto_close = true })
     end,
-    "Open the output of a test result",
+    desc = "Open the output of a test result",
   },
-  j = {
+  {
+    "<Leader>nj",
     function()
       require("neotest").jump.prev({ status = "failed" })
     end,
-    "Jump to next error",
+    desc = "Jump to next error",
   },
-  k = {
+  {
+    "<Leader>nk",
     function()
       require("neotest").jump.next({ status = "failed" })
     end,
-    "Jump to previous error",
+    desc = "Jump to previous error",
   },
-  n = { require("neotest").run.run, "Run the nearest test" },
-  s = { require("neotest").run.stop, "Stop the nearest test" },
-  S = { require("neotest").summary.toggle, "Toggle the summary window" },
+  { "<Leader>nn", require("neotest").run.run, desc = "Run the nearest test" },
+  { "<Leader>ns", require("neotest").run.stop, desc = "Stop the nearest test" },
+  { "<Leader>nS", require("neotest").summary.toggle, desc = "Toggle the summary window" },
 }
 
-vars.mappings["r"] = {
-  name = "Refactor",
-  e = { "<CMD>lua require('refactoring').refactor('Extract Function')<CR>", "Extract Function" },
-  f = { "<CMD>lua require('refactoring').refactor('Extract Function to File')<CR>", "Extract Function to File" },
-  v = { "<CMD>lua require('refactoring').refactor('Extract Variable')<CR>", "Extract Variable" },
-  i = { "<CMD>lua require('refactoring').refactor('Inline Variable')<CR>", "Inline Variable" },
-  r = { "<CMD>lua require('telescope').extensions.refactoring.refactors()<CR>", "Refactor" },
-  V = { "<CMD>lua require('refactoring').debug.print_var({})<CR>", "Debug Print Var" },
+vars.mappings[5] = {
+  { "<Leader>r", group = "Refactor" },
+
+  { "<Leader>re", "<CMD>lua require('refactoring').refactor('Extract Function')<CR>", desc = "Extract Function" },
+  {
+    "<Leader>rf",
+    "<CMD>lua require('refactoring').refactor('Extract Function to File')<CR>",
+    desc = "Extract Function to File",
+  },
+  { "<Leader>rv", "<CMD>lua require('refactoring').refactor('Extract Variable')<CR>", desc = "Extract Variable" },
+  { "<Leader>ri", "<CMD>lua require('refactoring').refactor('Inline Variable')<CR>", desc = "Inline Variable" },
+  { "<Leader>rr", "<CMD>lua require('telescope').extensions.refactoring.refactors()<CR>", desc = "Refactor" },
+  { "<Leader>rV", "<CMD>lua require('refactoring').debug.print_var({})<CR>", desc = "Debug Print Var" },
 }
 
-vars.mappings["s"] = {
-  name = "Search",
-  f = { "<CMD>Telescope find_files<CR>", "Fuzzy find files" },
-  g = { "<CMD>Telescope grep_string<CR>", "Fuzzy find string" },
-  b = { "<CMD>Telescope buffers<CR>", "Fuzzy find buffers" },
-  l = { "<CMD>Telescope live_grep<CR>", "Fuzzy find words" },
-  s = { "<CMD>Telescope symbols<CR>", "Fuzzy find symbols" },
-  h = { "<CMD>Telescope harpoon marks<CR>", "View harpoon" },
-  d = { "<CMD>Telescope diagnostics<CR>", "Fuzzy find diagnostics" },
-  n = { search_config_files, "Fuzzy find config files" },
-  c = {
+vars.mappings[6] = {
+  { "<Leader>s", group = "Search" },
+
+  { "<Leader>sf", "<CMD>Telescope find_files<CR>", desc = "Fuzzy find files" },
+  { "<Leader>sg", "<CMD>Telescope grep_string<CR>", desc = "Fuzzy find string" },
+  { "<Leader>sb", "<CMD>Telescope buffers<CR>", desc = "Fuzzy find buffers" },
+  { "<Leader>sl", "<CMD>Telescope live_grep<CR>", desc = "Fuzzy find words" },
+  { "<Leader>ss", "<CMD>Telescope symbols<CR>", desc = "Fuzzy find symbols" },
+  { "<Leader>sh", "<CMD>Telescope harpoon marks<CR>", desc = "View harpoon" },
+  { "<Leader>sd", "<CMD>Telescope diagnostics<CR>", desc = "Fuzzy find diagnostics" },
+  { "<Leader>sn", search_config_files, desc = "Fuzzy find config files" },
+  {
+    "<Leader>sc",
     function()
       require("telescope.builtin").current_buffer_fuzzy_find(require("telescope.themes").get_dropdown({
         winblend = 10,
         previewer = false,
       }))
     end,
-    "Fuzzily search in current buffer",
+    desc = "Fuzzily search in current buffer",
   },
 }
 
-local which_key = require("which-key")
+which_key.add(vars.mappings)
+which_key.add({
+  { "<Leader> ", "<CMD>normal <C-^><CR>", desc = "Jump to previous buffer" },
+  { "<Leader>/", "<CMD>lua require('Comment.api').toggle.linewise()<CR>", desc = "Comment out current line" },
+  { "<Leader>a", require("harpoon.mark").add_file, desc = "Add file to harpoon" },
+  { "<Leader>h", vim.cmd.split, desc = "Horizontal Split" },
+  { "<Leader>t", require("alternate-toggler").toggleAlternate, desc = "Toggle Alternate" },
+  { "<Leader>v", vim.cmd.vsplit, desc = "Vertical Split" },
+  { "<Leader>z", vim.cmd.ZenMode, desc = "Zen Mode" },
+})
 
-which_key.setup(setup)
-which_key.register(vars.mappings, vars.options)
-which_key.register(vars.vmappings, vars.voptions)
+which_key.add({
+    { "<Leader>/", "<ESC><CMD>lua require('Comment.api').toggle.linewise(vim.fn.visualmode())<CR>", desc = "Comment", mode = "v" },
+})