diff --git a/.config/nvim/lazyvim.json b/.config/nvim/lazyvim.json
index 6449116c..0abdd7c1 100644
--- a/.config/nvim/lazyvim.json
+++ b/.config/nvim/lazyvim.json
@@ -1,14 +1,12 @@
 {
   "extras": [
     "lazyvim.plugins.extras.coding.yanky",
-    "lazyvim.plugins.extras.dap.core",
     "lazyvim.plugins.extras.formatting.black",
     "lazyvim.plugins.extras.formatting.prettier",
     "lazyvim.plugins.extras.lang.python",
     "lazyvim.plugins.extras.lang.python-semshi",
     "lazyvim.plugins.extras.lang.yaml",
     "lazyvim.plugins.extras.linting.eslint",
-    "lazyvim.plugins.extras.test.core",
     "lazyvim.plugins.extras.ui.edgy",
     "lazyvim.plugins.extras.util.dot",
     "plugins.extras.coding.ai.codeium",
@@ -25,6 +23,7 @@
     "plugins.extras.coding.treesitter.node-action",
     "plugins.extras.coding.treesitter.puppeteer",
     "plugins.extras.coding.treesitter.text-case",
+    "plugins.extras.dap.core",
     "plugins.extras.dap.persistent-breakpoints",
     "plugins.extras.editor.color",
     "plugins.extras.editor.docs.devdocs",
@@ -57,6 +56,7 @@
     "plugins.extras.lsp.inc-rename",
     "plugins.extras.lsp.lens",
     "plugins.extras.lsp.lightbulb",
+    "plugins.extras.test.core",
     "plugins.extras.ui.breadcrumbs",
     "plugins.extras.ui.context",
     "plugins.extras.ui.highlight-undo",
diff --git a/.config/nvim/lua/plugins/extras/coding/ai/gpt.lua b/.config/nvim/lua/plugins/extras/coding/ai/gpt.lua
index d4be49f5..c41723c1 100644
--- a/.config/nvim/lua/plugins/extras/coding/ai/gpt.lua
+++ b/.config/nvim/lua/plugins/extras/coding/ai/gpt.lua
@@ -112,7 +112,7 @@ return {
     "folke/which-key.nvim",
     opts = {
       defaults = {
-        ["<leader>C"] = { name = "+chatGPT" },
+        ["<leader>C"] = { name = "󰚩 chatGPT" },
       },
     },
   },
diff --git a/.config/nvim/lua/plugins/extras/coding/annotation.lua b/.config/nvim/lua/plugins/extras/coding/annotation.lua
index 26e00f52..f5df9396 100644
--- a/.config/nvim/lua/plugins/extras/coding/annotation.lua
+++ b/.config/nvim/lua/plugins/extras/coding/annotation.lua
@@ -18,7 +18,7 @@ return {
     "folke/which-key.nvim",
     opts = {
       defaults = {
-        ["<leader>a"] = { name = "+annotation" },
+        ["<leader>a"] = { name = " annotation" },
       },
     },
   },
diff --git a/.config/nvim/lua/plugins/dap.lua b/.config/nvim/lua/plugins/extras/dap/core.lua
similarity index 53%
rename from .config/nvim/lua/plugins/dap.lua
rename to .config/nvim/lua/plugins/extras/dap/core.lua
index f0cd302b..ae146b18 100644
--- a/.config/nvim/lua/plugins/dap.lua
+++ b/.config/nvim/lua/plugins/extras/dap/core.lua
@@ -1,16 +1,17 @@
 return {
-  "mfussenegger/nvim-dap",
-  optional = true,
-  opts = {
-    defaults = {
-      fallback = {
-        external_terminal = {
-          command = "/usr/bin/kitty",
-          args = { "--class", "kitty-dap", "--hold", "--detach", "nvim-dap", "-c", "DAP" },
+  { import = "lazyvim.plugins.extras.dap.core" },
+  {
+    "mfussenegger/nvim-dap",
+    opts = {
+      defaults = {
+        fallback = {
+          external_terminal = {
+            command = "/usr/bin/kitty",
+            args = { "--class", "kitty-dap", "--hold", "--detach", "nvim-dap", "-c", "DAP" },
+          },
         },
       },
     },
-  },
   -- stylua: ignore
   keys = {
     { "<F5>", function() require("dap").continue() end, desc = "Debug: Continue" },
@@ -19,4 +20,13 @@ return {
     { "<F12>", function() require("dap").step_out() end, desc = "Debug: Step out" },
     { "<F2>", function() require("dap").toggle_breakpoint() end, desc = "Debug: Toggle breakpoint" },
   },
+  },
+  {
+    "folke/which-key.nvim",
+    opts = {
+      defaults = {
+        ["<leader>d"] = { name = " debug" },
+      },
+    },
+  },
 }
diff --git a/.config/nvim/lua/plugins/extras/editor/git/github.lua b/.config/nvim/lua/plugins/extras/editor/git/github.lua
index aaaab32a..c306547d 100644
--- a/.config/nvim/lua/plugins/extras/editor/git/github.lua
+++ b/.config/nvim/lua/plugins/extras/editor/git/github.lua
@@ -14,7 +14,7 @@ return {
     "folke/which-key.nvim",
     opts = {
       defaults = {
-        ["<leader>G"] = { name = "+github" },
+        ["<leader>G"] = { name = " github" },
         ["<leader>Gc"] = { name = "+comments" },
         ["<leader>Gt"] = { name = "+threads" },
         ["<leader>Gi"] = { name = "+issues" },
diff --git a/.config/nvim/lua/plugins/extras/editor/package-info.lua b/.config/nvim/lua/plugins/extras/editor/package-info.lua
index 1b2d0b59..0060bce3 100644
--- a/.config/nvim/lua/plugins/extras/editor/package-info.lua
+++ b/.config/nvim/lua/plugins/extras/editor/package-info.lua
@@ -30,7 +30,7 @@ return {
     "folke/which-key.nvim",
     opts = {
       defaults = {
-        ["<leader>p"] = { name = "+packages" },
+        ["<leader>p"] = { name = " packages" },
       },
     },
   },
diff --git a/.config/nvim/lua/plugins/extras/editor/terminal/floaterm.lua b/.config/nvim/lua/plugins/extras/editor/terminal/floaterm.lua
index 0dba14dd..8aa8fc9e 100644
--- a/.config/nvim/lua/plugins/extras/editor/terminal/floaterm.lua
+++ b/.config/nvim/lua/plugins/extras/editor/terminal/floaterm.lua
@@ -48,7 +48,7 @@ return {
       defaults = {
         ["<leader>ce"] = { name = "+r[e]pl" },
         ["<leader>ft"] = { name = "+terminals" },
-        ["<leader>T"] = { name = "+tools" },
+        ["<leader>T"] = { name = " tools" },
       },
     },
   },
diff --git a/.config/nvim/lua/plugins/extras/lang/sql.lua b/.config/nvim/lua/plugins/extras/lang/sql.lua
index a417c68e..51270cd4 100644
--- a/.config/nvim/lua/plugins/extras/lang/sql.lua
+++ b/.config/nvim/lua/plugins/extras/lang/sql.lua
@@ -65,7 +65,7 @@ return {
     "folke/which-key.nvim",
     opts = {
       defaults = {
-        ["<leader>D"] = { name = "+database" },
+        ["<leader>D"] = { name = " database" },
       },
     },
   },
diff --git a/.config/nvim/lua/plugins/neotest.lua b/.config/nvim/lua/plugins/extras/test/core.lua
similarity index 63%
rename from .config/nvim/lua/plugins/neotest.lua
rename to .config/nvim/lua/plugins/extras/test/core.lua
index 9ae1088e..f0def530 100644
--- a/.config/nvim/lua/plugins/neotest.lua
+++ b/.config/nvim/lua/plugins/extras/test/core.lua
@@ -1,10 +1,20 @@
 return {
-  "nvim-neotest/neotest",
-  optional = true,
+  { import = "lazyvim.plugins.extras.test.core" },
+  {
+    "nvim-neotest/neotest",
   -- stylua: ignore
   keys = {
     { "<leader>tl", function() require("neotest").run.run_last() end, desc = "Run Last Test" },
     { "<leader>tL", function() require("neotest").run.run_last({ strategy = "dap" }) end, desc = "Debug Last Test" },
     { "<leader>tw", "<cmd>lua require('neotest').run.run({ jestCommand = 'jest --watch ' })<cr>", desc = "Run Watch" },
   },
+  },
+  {
+    "folke/which-key.nvim",
+    opts = {
+      defaults = {
+        ["<leader>t"] = { name = "󰙨 test" },
+      },
+    },
+  },
 }
diff --git a/.config/nvim/lua/plugins/which-key.lua b/.config/nvim/lua/plugins/which-key.lua
index 597d38e7..556f491a 100644
--- a/.config/nvim/lua/plugins/which-key.lua
+++ b/.config/nvim/lua/plugins/which-key.lua
@@ -3,6 +3,16 @@ return {
   opts = {
     defaults = {
       ["<leader>ci"] = { name = "+info" },
+      ["<leader><tab>"] = { name = "󰓩 tabs" },
+      ["<leader>b"] = { name = "󰖯 buffer" },
+      ["<leader>c"] = { name = " code" },
+      ["<leader>f"] = { name = "󰈔 file/find" },
+      ["<leader>g"] = { name = " git" },
+      ["<leader>q"] = { name = "󰗼 quit/session" },
+      ["<leader>s"] = { name = " search" },
+      ["<leader>u"] = { name = " ui" },
+      ["<leader>w"] = { name = "󱂬 windows" },
+      ["<leader>x"] = { name = "󰁨 diagnostics/quickfix" },
     },
   },
 }