diff --git a/TODO b/TODO
index 23be973..1deaa3c 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,3 @@
-- fix C-k expand snippet
 -WARN: finish after/plugin/lspAutostart.lua : read per project lsp settings
 -INFO:using extranl ui process in neovim: check fzflua,iron.nvim
 - add tag="*" to plugins that use tags
@@ -39,3 +38,4 @@
 - [x] fix color/icon of status line diagnostics to match navigator
 -[x] pin all plugins
 - [x] autocommand move current directory when move to new window
+- [done]fix C-k expand snippet - it was alacritty overriding C-k
diff --git a/after/ftplugin/json.vim b/after/ftplugin/json.vim
index f898532..2594917 100644
--- a/after/ftplugin/json.vim
+++ b/after/ftplugin/json.vim
@@ -1,3 +1,4 @@
 augroup my_json
+  au!
   au FileType json set formatprg=jq
 aug END
diff --git a/lua/core/mappings.lua b/lua/core/mappings.lua
index 955fe7e..ce1f6cc 100644
--- a/lua/core/mappings.lua
+++ b/lua/core/mappings.lua
@@ -747,7 +747,7 @@ M.asyncrun = { --{{{
 
 M.vim_bookmarks = {--{{{
   n = {
-    ["<space>m"] = {"<cmd> Telescope vim_bookmarks<CR>", "show bookmarks"},
+    ["<BS>m"] = {"<cmd> Telescope vim_bookmarks<CR>", "show bookmarks"},
     ["mm"] = {"<cmd> BookmarkToggle<CR>", "toggle bookmarks"},
     ["<leader>mm"] = {"<cmd> BookmarkAnnotate<CR>", "annotation bookmarks"},
     ["<leader>mc"] = {"<cmd> BookmarkClear<CR>", "clear bookmarks in buffer"},
diff --git a/lua/custom/plugins/configs/gonvim.lua b/lua/custom/plugins/configs/gonvim.lua
index a0b72cc..b8428b4 100644
--- a/lua/custom/plugins/configs/gonvim.lua
+++ b/lua/custom/plugins/configs/gonvim.lua
@@ -2,7 +2,7 @@ local M = {}
 
 local config = {
   -- verbose = true,
-  run_in_floaterm = true,
+  run_in_floaterm = false,
   icons = false,
   -- icons = { breakpoint = "🧘", currentpos = "🏃" }, -- set to false to disable
   lsp_cfg = false, -- handled handled instead by navigator 
diff --git a/lua/custom/plugins/configs/navigator.lua b/lua/custom/plugins/configs/navigator.lua
index d9732bc..75fccc0 100644
--- a/lua/custom/plugins/configs/navigator.lua
+++ b/lua/custom/plugins/configs/navigator.lua
@@ -7,7 +7,7 @@ end
 M = {}
 
 local config = {
-  debug = true,
+  debug = false,
   transparency = 5,
   lsp_signature_help = false, -- needs plugin lsp_signature 
   default_mapping = false,
@@ -148,7 +148,8 @@ local config = {
     -- disable auto start of lsp per language
     -- set global default on lspconfig (see lspconfig doc)
     gopls = {
-      -- on_attach = require("spike.lsp").custom_attach,
+      -- on_attach = require("spike.lsp.go").custom_attach,
+      on_attach = require("spike.lsp.go").gopls_onattach,
       settings = {
         gopls = {
           hints = {
@@ -167,7 +168,8 @@ local config = {
     ["lua-dev"] = {
       library = {
         enabled = true,
-        plugins = {"navigator.lua", "guihua.lua", "go.nvim", "plenary.nvim"},
+        plugins = {"plenary.nvim"},
+        -- plugins = {"navigator.lua", "guihua.lua", "go.nvim", "plenary.nvim"},
         runtime = true,
         types = true,
       }
diff --git a/lua/custom/plugins/configs/todo-comments.lua b/lua/custom/plugins/configs/todo-comments.lua
index ce9bc47..2f4ef79 100644
--- a/lua/custom/plugins/configs/todo-comments.lua
+++ b/lua/custom/plugins/configs/todo-comments.lua
@@ -7,6 +7,14 @@ end
 M = {}
 
 local config = {
+  keywords = {
+    ["_TODO"] = { color = "warning"},
+  },
+  colors = {
+    info = {"#2563EB"},
+    hint = {"#10B981"},
+    default = {"#8C3AED" },
+  },
 }
 
 M.setup = function()
diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua
index bf554d7..870d43a 100644
--- a/lua/custom/plugins/init.lua
+++ b/lua/custom/plugins/init.lua
@@ -232,7 +232,7 @@ return {
 
   -- snippets 
   ["L3MON4D3/LuaSnip"] = {
-    lock = true,
+    lock = false,
     config = function()
       -- load default config first
       require("plugins.configs.others").luasnip()
@@ -258,6 +258,7 @@ return {
   },
   ["neovim/nvim-lspconfig"] = {
     after = {"lua-dev.nvim", "mason.nvim", "mason-lspconfig.nvim"},
+    module = {"lspconfig"},
     lock = false,
     config = function()
       require("plugins.configs.lspconfig").setup()
@@ -290,7 +291,7 @@ return {
   ["ray-x/navigator.lua"] = {
     lock = true,
     opt = true,
-    module = "navigator.lua",
+    module = "navigator",
     after = { "nvim-lspconfig", "base46", "ui", "mason.nvim", "mason-lspconfig.nvim", "lua-dev.nvim" },
     requires =  {"neovim/nvim-lspconfig", "ray-x/guihua.lua", "nvim-treesitter/nvim-treesitter"},
     setup = function()
diff --git a/lua/plugins/configs/whichkey.lua b/lua/plugins/configs/whichkey.lua
index 89e7c3e..131b550 100644
--- a/lua/plugins/configs/whichkey.lua
+++ b/lua/plugins/configs/whichkey.lua
@@ -33,6 +33,7 @@ local options = {
     -- list of mode / prefixes that should never be hooked by WhichKey
     i = { "j", "k" },
     v = { "j", "k" },
+    n = { "`", "'", "\"", "@"},
   },
 }
 
diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua
index b9ad7e3..1732729 100644
--- a/lua/plugins/init.lua
+++ b/lua/plugins/init.lua
@@ -2,7 +2,10 @@ vim.cmd "packadd packer.nvim"
 
 local plugins = {
 
-  ["nvim-lua/plenary.nvim"] = { module = "plenary" },
+  ["nvim-lua/plenary.nvim"] = {
+    module = "plenary",
+    module_pattern = "plenary*",
+  },
   ["wbthomason/packer.nvim"] = {
     cmd = require("core.lazy_load").packer_cmds,
     config = function()
diff --git a/lua/spike/lsp.lua b/lua/spike/lsp/init.lua
similarity index 100%
rename from lua/spike/lsp.lua
rename to lua/spike/lsp/init.lua
diff --git a/plugin/sp4ke/fzf-marks.lua b/plugin/spike/fzf-marks.lua
similarity index 100%
rename from plugin/sp4ke/fzf-marks.lua
rename to plugin/spike/fzf-marks.lua