diff --git a/.config/nvim/lua/config/autocmds.lua b/.config/nvim/lua/config/autocmds.lua
index 46c54db8..556f24ec 100644
--- a/.config/nvim/lua/config/autocmds.lua
+++ b/.config/nvim/lua/config/autocmds.lua
@@ -1,13 +1,13 @@
 local ac = vim.api.nvim_create_autocmd
 local ag = vim.api.nvim_create_augroup
 
--- Disable diagnostics in a .env file
-ac("BufRead", {
-  pattern = ".env",
-  callback = function()
-    vim.diagnostic.disable(false)
-  end,
-})
+-- -- Disable diagnostics in a .env file
+-- ac("BufRead", {
+--   pattern = ".env",
+--   callback = function()
+--     vim.diagnostic.disable(false)
+--   end,
+-- })
 
 local auto_close_filetype = {
   "lazy",
@@ -70,14 +70,14 @@ ac("BufEnter", {
   end,
 })
 
--- Disable eslint on node_modules
-ac({ "BufNewFile", "BufRead" }, {
-  group = ag("DisableEslintOnNodeModules", { clear = true }),
-  pattern = { "**/node_modules/**", "node_modules", "/node_modules/*" },
-  callback = function()
-    vim.diagnostic.disable(false)
-  end,
-})
+-- -- Disable eslint on node_modules
+-- ac({ "BufNewFile", "BufRead" }, {
+--   group = ag("DisableEslintOnNodeModules", { clear = true }),
+--   pattern = { "**/node_modules/**", "node_modules", "/node_modules/*" },
+--   callback = function()
+--     vim.diagnostic.disable(false)
+--   end,
+-- })
 
 -- Toggle between relative/absolute line numbers
 local numbertoggle = ag("numbertoggle", { clear = true })
diff --git a/.config/nvim/lua/plugins/extras/coding/blink-extended.lua b/.config/nvim/lua/plugins/extras/coding/blink-extended.lua
index ef356e47..87d0d7ab 100644
--- a/.config/nvim/lua/plugins/extras/coding/blink-extended.lua
+++ b/.config/nvim/lua/plugins/extras/coding/blink-extended.lua
@@ -8,7 +8,6 @@ return {
     completion = {
       menu = {
         border = "rounded",
-        winhighlight = "Normal:BlinkCmpDoc,FloatBorder:BlinkCmpDocBorder,CursorLine:BlinkCmpDocCursorLine,Search:None",
       },
       documentation = {
         window = {
diff --git a/.config/nvim/lua/plugins/extras/coding/yanky-extended.lua b/.config/nvim/lua/plugins/extras/coding/yanky-extended.lua
index 160030f1..a359719a 100644
--- a/.config/nvim/lua/plugins/extras/coding/yanky-extended.lua
+++ b/.config/nvim/lua/plugins/extras/coding/yanky-extended.lua
@@ -34,7 +34,11 @@ return {
       {
         "<leader>sy",
         function()
-          vim.cmd([[YankyRingHistory]])
+          if LazyVim.pick.picker.name == "snacks" then
+            Snacks.picker.yanky()
+          else
+            vim.cmd([[YankyRingHistory]])
+          end
         end,
         mode = { "n", "v" },
         desc = "Yank History",
diff --git a/.config/nvim/lua/plugins/extras/util/hardtime.lua b/.config/nvim/lua/plugins/extras/util/hardtime.lua
index f70aa9a6..b145c995 100644
--- a/.config/nvim/lua/plugins/extras/util/hardtime.lua
+++ b/.config/nvim/lua/plugins/extras/util/hardtime.lua
@@ -1,6 +1,6 @@
 return {
   "m4xshen/hardtime.nvim",
-  dependencies = { "MunifTanjim/nui.nvim", "nvim-lua/plenary.nvim" },
+  dependencies = { "MunifTanjim/nui.nvim" },
   event = "LazyFile",
   keys = {
     { "<leader>uH", "<cmd>Hardtime toggle<CR>", desc = "Toggle Hardtime" },
@@ -20,16 +20,6 @@ return {
       "outline",
     },
     restriction_mode = "hint",
-    restricted_keys = {
-      ["h"] = { "n", "x" },
-      ["l"] = { "n", "x" },
-      ["-"] = { "n", "x" },
-      ["+"] = { "n", "x" },
-      ["gj"] = { "n", "x" },
-      ["gk"] = { "n", "x" },
-      ["<C-N>"] = { "n", "x" },
-      ["<C-P>"] = { "n", "x" },
-    },
     disabled_keys = {
       ["<Up>"] = { "" },
       ["<Down>"] = { "" },
diff --git a/.config/nvim/lua/plugins/extras/util/snacks-extended.lua b/.config/nvim/lua/plugins/extras/util/snacks-extended.lua
index bdfe7bb6..03047bff 100644
--- a/.config/nvim/lua/plugins/extras/util/snacks-extended.lua
+++ b/.config/nvim/lua/plugins/extras/util/snacks-extended.lua
@@ -62,6 +62,7 @@ return {
   keys = {
     { "<leader>fz", function() Snacks.picker.zoxide() end, desc = "Zoxide" },
     { "<leader>S", function() Snacks.picker.spelling() end, desc = "Spelling" },
+    { "<leader>B", function() Snacks.picker.buffers() end, desc = "Buffers" },
     { "<leader>gB", function() Snacks.picker.git_branches() end, desc = "Git Branches" },
     { "<leader>go", function() Snacks.gitbrowse() end, desc = "Git Open Line" },
   },
diff --git a/.config/nvim/lua/plugins/extras/util/yadm.lua b/.config/nvim/lua/plugins/extras/util/yadm.lua
index dde0453b..c3290ef2 100644
--- a/.config/nvim/lua/plugins/extras/util/yadm.lua
+++ b/.config/nvim/lua/plugins/extras/util/yadm.lua
@@ -1,9 +1,10 @@
 return {
+  {
+    "purarue/gitsigns-yadm.nvim",
+    lazy = true,
+  },
   {
     "lewis6991/gitsigns.nvim",
-    dependencies = {
-      "purarue/gitsigns-yadm.nvim",
-    },
     opts = {
       _on_attach_pre = function(bufnr, callback)
         if vim.fn.executable("yadm") == 1 then