diff --git a/init.lua b/init.lua
index 1a3c5276..6182c2f3 100644
--- a/init.lua
+++ b/init.lua
@@ -314,13 +314,15 @@ require('lazy').setup({
 
       -- Document existing key chains
       spec = {
-        { '<leader>c', group = '[C]ode', mode = { 'n', 'x' } },
-        { '<leader>d', group = '[D]ocument' },
-        { '<leader>r', group = '[R]ename' },
-        { '<leader>s', group = '[S]earch' },
-        { '<leader>w', group = '[W]orkspace' },
-        { '<leader>t', group = '[T]oggle' },
-        { '<leader>h', group = 'Git [H]unk', mode = { 'n', 'v' } },
+        { '<leader>a', group = 'Ai' },
+        { '<leader>c', group = 'Code', mode = { 'n', 'x' } },
+        { '<leader>d', group = 'Document' },
+        { '<leader>r', group = 'Rename' },
+        { '<leader>s', group = 'Search' },
+        { '<leader>w', group = 'Workspace' },
+        { '<leader>t', group = 'Tests' },
+        { '<leader>g', group = 'Git' },
+        { '<leader>h', group = 'Git Hunk', mode = { 'n', 'v' } },
       },
     },
   },
@@ -616,38 +618,38 @@ require('lazy').setup({
       local servers = {
         -- clangd = {},
         gopls = {
-          -- gofumpt = true,
-          -- codelenses = {
-          --   gc_details = false,
-          --   generate = true,
-          --   regenerate_cgo = true,
-          --   run_govulncheck = true,
-          --   test = true,
-          --   tidy = true,
-          --   upgrade_dependency = true,
-          --   vendor = true,
-          -- },
-          -- hints = {
-          --   assignVariableTypes = true,
-          --   compositeLiteralFields = true,
-          --   compositeLiteralTypes = true,
-          --   constantValues = true,
-          --   functionTypeParameters = true,
-          --   parameterNames = true,
-          --   rangeVariableTypes = true,
-          -- },
-          -- analyses = {
-          --   fieldalignment = true,
-          --   nilness = true,
-          --   unusedparams = true,
-          --   unusedwrite = true,
-          --   useany = true,
-          -- },
-          -- usePlaceholders = true,
-          -- completeUnimported = true,
-          -- staticcheck = true,
-          -- directoryFilters = { '-.git', '-.vscode', '-.idea', '-.vscode-test', '-node_modules' },
-          -- semanticTokens = true,
+          gofumpt = true,
+          codelenses = {
+            gc_details = false,
+            generate = true,
+            regenerate_cgo = true,
+            run_govulncheck = true,
+            test = true,
+            tidy = true,
+            upgrade_dependency = true,
+            vendor = true,
+          },
+          hints = {
+            assignVariableTypes = true,
+            compositeLiteralFields = true,
+            compositeLiteralTypes = true,
+            constantValues = true,
+            functionTypeParameters = true,
+            parameterNames = true,
+            rangeVariableTypes = true,
+          },
+          analyses = {
+            fieldalignment = true,
+            nilness = true,
+            unusedparams = true,
+            unusedwrite = true,
+            useany = true,
+          },
+          usePlaceholders = true,
+          completeUnimported = true,
+          staticcheck = true,
+          directoryFilters = { '-.git', '-.vscode', '-.idea', '-.vscode-test', '-node_modules' },
+          semanticTokens = true,
         },
         -- pyright = {},
         -- rust_analyzer = {},
@@ -694,7 +696,6 @@ require('lazy').setup({
         'gofumpt',
         'gomodifytags',
         'impl',
-        'delve',
       })
       require('mason-tool-installer').setup { ensure_installed = ensure_installed }
 
diff --git a/lua/custom/plugins/go.lua b/lua/custom/plugins/go.lua
index 8fd67602..adb289ce 100644
--- a/lua/custom/plugins/go.lua
+++ b/lua/custom/plugins/go.lua
@@ -17,10 +17,6 @@ require('lspconfig').gopls.setup {
 }
 
 return {
-  {
-    'leoluz/nvim-dap-go',
-    opts = {},
-  },
   {
     'fredrikaverpil/neotest-golang',
   },
@@ -35,16 +31,6 @@ return {
       },
     },
   },
-  {
-    'mfussenegger/nvim-dap',
-    optional = true,
-    dependencies = {
-      {
-        'leoluz/nvim-dap-go',
-        opts = {},
-      },
-    },
-  },
   {
     'nvim-neotest/neotest',
     optional = true,