diff --git a/lazy-lock.json b/lazy-lock.json
index cdb2e70..67f771a 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -1,53 +1,57 @@
 {
-  "LazyVim": { "branch": "main", "commit": "a5f8af912de4b334cb900a9f383b6e317568f27f" },
-  "SchemaStore.nvim": { "branch": "main", "commit": "1c2e917655b14dff9ef38466be6fb0b72c4797b2" },
-  "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" },
-  "bufferline.nvim": { "branch": "main", "commit": "99337f63f0a3c3ab9519f3d1da7618ca4f91cffe" },
-  "catppuccin": { "branch": "main", "commit": "5215ea59df6d0a7e27da9a5cd1165e06d1b04cbe" },
-  "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
-  "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
-  "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
-  "conform.nvim": { "branch": "master", "commit": "5541c54cf2ab078a537838e1fb9d96ae47f71255" },
-  "diffview.nvim": { "branch": "main", "commit": "3afa6a053f680e9f1329c4a151db988a482306cd" },
-  "dressing.nvim": { "branch": "master", "commit": "e3714c8049b2243e792492c4149e4cc395c68eb9" },
-  "flit.nvim": { "branch": "main", "commit": "56490317983218b09698f8c960c3669958b12b32" },
-  "friendly-snippets": { "branch": "main", "commit": "e11b09bf10706bb74e16e4c3d11b2274d62e687f" },
-  "fzf-lua": { "branch": "main", "commit": "6acc4c51167f62a4ed1d754db97adc01508e1574" },
-  "gitsigns.nvim": { "branch": "main", "commit": "4a143f13e122ab91abdc88f89eefbe70a4858a56" },
-  "indent-blankline.nvim": { "branch": "master", "commit": "d98f537c3492e87b6dc6c2e3f66ac517528f406f" },
-  "lazy.nvim": { "branch": "main", "commit": "fafe1f7c640aed75e70a10e6649612cd96f39149" },
-  "lazydev.nvim": { "branch": "main", "commit": "7cbb524c85f87017df9c1ea2377a1d840ad8ed51" },
-  "leap.nvim": { "branch": "main", "commit": "0d15057cc47fa49f6609bf364f5ad3842f08c58c" },
-  "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" },
-  "luvit-meta": { "branch": "main", "commit": "ce76f6f6cdc9201523a5875a4471dcfe0186eb60" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "8db12610bcb7ce67013cfdfaba4dd47a23c6e851" },
-  "mason.nvim": { "branch": "main", "commit": "0950b15060067f752fde13a779a994f59516ce3d" },
-  "mini.ai": { "branch": "main", "commit": "a7e90f110e6274262616311b93cef12cd2667a2d" },
-  "mini.pairs": { "branch": "main", "commit": "40261dfcec7623cd57be3c3beb50fa73f2650cdf" },
-  "modus-themes.nvim": { "branch": "master", "commit": "181dc38ddbcf9ad94d454cb06b13c859d4ff28d1" },
-  "neo-tree.nvim": { "branch": "v3.x", "commit": "29f7c215332ba95e470811c380ddbce2cebe2af4" },
-  "neogit": { "branch": "master", "commit": "ade9858cb6c434f3642f0b6296ac8d9d4ee51935" },
-  "noice.nvim": { "branch": "main", "commit": "e5cb20c6e14305d24025ecb77d7d4dd9d61f1a64" },
-  "nui.nvim": { "branch": "main", "commit": "322978c734866996274467de084a95e4f9b5e0b1" },
-  "nvim-cmp": { "branch": "main", "commit": "a110e12d0b58eefcf5b771f533fc2cf3050680ac" },
-  "nvim-lint": { "branch": "master", "commit": "941fa1220a61797a51f3af9ec6b7d74c8c7367ce" },
-  "nvim-lspconfig": { "branch": "master", "commit": "92166b89ab4b3d60f24e58170cac53b7141fd032" },
-  "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" },
-  "nvim-snippets": { "branch": "main", "commit": "cff37a199a92f3c3cd52bb1593a7d01669b35d23" },
-  "nvim-spectre": { "branch": "master", "commit": "ec67d4b5370094b923dfcf6b09b39142f2964861" },
-  "nvim-treesitter": { "branch": "master", "commit": "9ebc589329083522f9594f408fc2652090b41139" },
-  "nvim-treesitter-textobjects": { "branch": "master", "commit": "34867c69838078df7d6919b130c0541c0b400c47" },
-  "nvim-ts-autotag": { "branch": "main", "commit": "6eb4120a1aadef07ac312f1c4bc6456712220007" },
-  "nvim-web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" },
-  "persistence.nvim": { "branch": "main", "commit": "5fe077056c821aab41f87650bd6e1c48cd7dd047" },
-  "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
-  "telescope-file-browser.nvim": { "branch": "master", "commit": "a7ab9a957b17199183388c6f357d614fcaa508e5" },
-  "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" },
-  "telescope.nvim": { "branch": "master", "commit": "f12b15e1b3a33524eb06a1ae7bc852fb1fd92197" },
-  "todo-comments.nvim": { "branch": "main", "commit": "70a93ce66083699571adc361166504b03cc39c2b" },
-  "tokyonight.nvim": { "branch": "main", "commit": "e4df5bb11d5dd419994c87e81e667847f0389c7e" },
-  "trouble.nvim": { "branch": "main", "commit": "75fad301e4a2b9c5d2a3f4befe997d36a8fc8361" },
-  "ts-comments.nvim": { "branch": "main", "commit": "e339090c076871069c00e488b11def49aaf4e413" },
-  "vim-repeat": { "branch": "master", "commit": "24afe922e6a05891756ecf331f39a1f6743d3d5a" },
-  "which-key.nvim": { "branch": "main", "commit": "0099511294f16b81c696004fa6a403b0ae61f7a0" }
-}
\ No newline at end of file
+  "LazyVim": { "branch": "main", "commit": "d1529f650fdd89cb620258bdeca5ed7b558420c7" },
+  "SchemaStore.nvim": { "branch": "main", "commit": "d315a1a99279764f10a4bf175c40d39630212de1" },
+  "alpha-nvim": { "branch": "main", "commit": "de72250e054e5e691b9736ee30db72c65d560771" },
+  "avante.nvim": { "branch": "main", "commit": "225e6f95728e9be3b383f9faaa36483c88976f18" },
+  "blink.cmp": { "branch": "main", "commit": "1cc3b1a908fbcfd15451c4772759549724f38524" },
+  "bufferline.nvim": { "branch": "main", "commit": "9f0826ae6adfd836a23bf8a4910e3c07450211f4" },
+  "catppuccin": { "branch": "main", "commit": "f67b886d65a029f12ffa298701fb8f1efd89295d" },
+  "conform.nvim": { "branch": "master", "commit": "70019124aa4f2e6838be9fbd2007f6d13b27a96d" },
+  "copilot.lua": { "branch": "master", "commit": "886ee73b6d464b2b3e3e6a7ff55ce87feac423a9" },
+  "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
+  "dressing.nvim": { "branch": "master", "commit": "3a45525bb182730fe462325c99395529308f431e" },
+  "flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" },
+  "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" },
+  "fzf-lua": { "branch": "main", "commit": "3746d5e4f4a17b75dfe67b39286aac8b12874a41" },
+  "git-conflict.nvim": { "branch": "main", "commit": "4bbfdd92d547d2862a75b4e80afaf30e73f7bbb4" },
+  "gitsigns.nvim": { "branch": "main", "commit": "2eaa30537365f6889c850bd46ef6f18ddf8fac70" },
+  "grug-far.nvim": { "branch": "main", "commit": "08f32182335754abf461dfb77b2c4e24bfe4d614" },
+  "img-clip.nvim": { "branch": "main", "commit": "5ff183655ad98b5fc50c55c66540375bbd62438c" },
+  "indent-blankline.nvim": { "branch": "master", "commit": "259357fa4097e232730341fa60988087d189193a" },
+  "lazy.nvim": { "branch": "main", "commit": "7e6c863bc7563efbdd757a310d17ebc95166cef3" },
+  "lazydev.nvim": { "branch": "main", "commit": "8620f82ee3f59ff2187647167b6b47387a13a018" },
+  "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "97d9f1d3ad205dece6bcafd1d71cf1507608f3c7" },
+  "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
+  "mini.ai": { "branch": "main", "commit": "ebb04799794a7f94628153991e6334c3304961b8" },
+  "mini.icons": { "branch": "main", "commit": "1c79feb7478ca773fa3dac5cadf43ced9180e861" },
+  "mini.pairs": { "branch": "main", "commit": "7e834c5937d95364cc1740e20d673afe2d034cdb" },
+  "modus-themes.nvim": { "branch": "master", "commit": "9f0343bcb3be4dd5545624db135f2b1c369e7ce4" },
+  "neo-tree.nvim": { "branch": "main", "commit": "e6645ecfcba3e064446a6def1c10d788c9873f51" },
+  "neogit": { "branch": "master", "commit": "a1fc4e50fa494e04097cf2d02e86bcd7ac5760d6" },
+  "noice.nvim": { "branch": "main", "commit": "eaed6cc9c06aa2013b5255349e4f26a6b17ab70f" },
+  "nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" },
+  "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" },
+  "nvim-lint": { "branch": "master", "commit": "dfa45de973c3ce7bd1b9a6d346f896a68ad07e44" },
+  "nvim-lspconfig": { "branch": "master", "commit": "88157521e890fe7fdf18bee22438875edd6300a6" },
+  "nvim-notify": { "branch": "master", "commit": "bd9cd51f9ef2f6326fc2bc9931d0718c1794e247" },
+  "nvim-surround": { "branch": "main", "commit": "ae298105122c87bbe0a36b1ad20b06d417c0433e" },
+  "nvim-treesitter": { "branch": "master", "commit": "6df6e80417b58abe377c90f5e3f7fe94cf7dfc55" },
+  "nvim-treesitter-textobjects": { "branch": "master", "commit": "ad8f0a472148c3e0ae9851e26a722ee4e29b1595" },
+  "nvim-ts-autotag": { "branch": "main", "commit": "1cca23c9da708047922d3895a71032bc0449c52d" },
+  "nvim-web-devicons": { "branch": "master", "commit": "5740b7382429d20b6ed0bbdb0694185af9507d44" },
+  "oil.nvim": { "branch": "master", "commit": "7041528bdedb350ad66e650684deec8456e053cc" },
+  "persistence.nvim": { "branch": "main", "commit": "f6aad7dde7fcf54148ccfc5f622c6d5badd0cc3d" },
+  "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
+  "render-markdown.nvim": { "branch": "main", "commit": "786d643ac7a691515d401930b8850f596992725d" },
+  "snacks.nvim": { "branch": "main", "commit": "14e89401da348f5d14509fca164fb7bcec83e597" },
+  "telescope-fzf-native.nvim": { "branch": "main", "commit": "dae2eac9d91464448b584c7949a31df8faefec56" },
+  "telescope.nvim": { "branch": "master", "commit": "415af52339215926d705cccc08145f3782c4d132" },
+  "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" },
+  "tokyonight.nvim": { "branch": "main", "commit": "7bb270adaa7692c2c33befc35f5567fc596a2504" },
+  "trouble.nvim": { "branch": "main", "commit": "46cf952fc115f4c2b98d4e208ed1e2dce08c9bf6" },
+  "ts-comments.nvim": { "branch": "main", "commit": "872dcfa0418f4a33b7437fb4d9f4e89f2f000d74" },
+  "vim-cucumber": { "branch": "master", "commit": "c0c9f5fd631632d794c6aa6d8d0ab13f834a1113" },
+  "vim-fugitive": { "branch": "master", "commit": "174230d6a7f2df94705a7ffd8d5413e27ec10a80" },
+  "which-key.nvim": { "branch": "main", "commit": "1f8d414f61e0b05958c342df9b6a4c89ce268766" }
+}
diff --git a/lazyvim.json b/lazyvim.json
index 2e70439..82e173e 100644
--- a/lazyvim.json
+++ b/lazyvim.json
@@ -3,7 +3,7 @@
 
   ],
   "news": {
-    "NEWS.md": "5950"
+    "NEWS.md": "10960"
   },
-  "version": 6
+  "version": 7
 }
\ No newline at end of file
diff --git a/lua/config/keymaps.lua b/lua/config/keymaps.lua
index d23cbaa..c17c2a3 100644
--- a/lua/config/keymaps.lua
+++ b/lua/config/keymaps.lua
@@ -72,3 +72,13 @@ end, { desc = "AI implement what the comment says" })
 
 -- Oil file explorer
 vim.keymap.set("n", "-", "<CMD>Oil<CR>", { desc = "Open parent directory" })
+
+-- Enable color preview
+vim.keymap.set("n", "<leader>u#", ":ColorizerToggle<CR>", { desc = "Toggle color preview" })
+vim.keymap.set("n", "<C-3>", ":ColorizerToggle<CR>", { desc = "Toggle color preview" })
+
+vim.keymap.set("n", "<C-n>", ":cnext<CR>", { noremap = true, silent = true, desc = "Next Quickfix Item" })
+vim.keymap.set("n", "<C-p>", ":cprev<CR>", { noremap = true, silent = true, desc = "Previous Quickfix Item" })
+
+-- Select all
+vim.keymap.set("n", "VV", "ggVG", { noremap = true, silent = true })
diff --git a/lua/config/multigrep.lua b/lua/config/multigrep.lua
new file mode 100644
index 0000000..832c486
--- /dev/null
+++ b/lua/config/multigrep.lua
@@ -0,0 +1,55 @@
+local pickers = require("telescope.pickers")
+local finders = require("telescope.finders")
+local make_entry = require("telescope.make_entry")
+local conf = require("telescope.config").values
+
+local M = {}
+
+local live_multigrep = function(opts)
+  opts = opts or {}
+  opts.cwd = opts.cwd or vim.uv.cwd()
+
+  local finder = finders.new_async_job({
+    command_generator = function(prompt)
+      if not prompt or prompt == "" then
+        return nil
+      end
+
+      local pieces = vim.split(prompt, "  ")
+      local args = { "rg" }
+      if pieces[1] then
+        table.insert(args, "-e")
+        table.insert(args, pieces[1])
+      end
+
+      if pieces[2] then
+        table.insert(args, "-g")
+        table.insert(args, pieces[2])
+      end
+
+      ---@diagnostic disable-next-line: deprecated
+      return vim.tbl_flatten({
+        args,
+        { "--color=never", "--no-heading", "--with-filename", "--line-number", "--column", "--smart-case" },
+      })
+    end,
+    entry_maker = make_entry.gen_from_vimgrep(opts),
+    cwd = opts.cwd,
+  })
+
+  pickers
+    .new(opts, {
+      debounce = 100,
+      prompt_title = "Multi Grep",
+      finder = finder,
+      previewer = conf.grep_previewer(opts),
+      sorter = require("telescope.sorters").empty(),
+    })
+    :find()
+end
+
+M.setup = function()
+  vim.keymap.set("n", "<leader>fx", live_multigrep)
+end
+
+return M
diff --git a/lua/plugins/alpha.lua b/lua/plugins/alpha.lua
index 31955ab..97c76ba 100644
--- a/lua/plugins/alpha.lua
+++ b/lua/plugins/alpha.lua
@@ -41,7 +41,7 @@ return {
       dashboard.button("r", "  Recent files", ":Telescope oldfiles <CR>"),
       -- dashboard.button('f', '󰥨  Find file', ':Telescope find_files <CR>'),
       -- dashboard.button('g', '󰱼  Find text', ':Telescope live_grep <CR>'),
-      -- dashboard.button('s', '  Restore Session', [[:lua require('persistence').load() <cr>]]),
+      dashboard.button("s", "  Restore Session", [[:lua require('persistence').load() <cr>]]),
       dashboard.button("l", "󰒲  Lazy", ":Lazy<CR>"),
       dashboard.button("q", "  Quit", ":qa<CR>"),
     }
diff --git a/lua/plugins/color-scheme.lua b/lua/plugins/color-scheme.lua
index 770470a..c528af2 100644
--- a/lua/plugins/color-scheme.lua
+++ b/lua/plugins/color-scheme.lua
@@ -55,14 +55,16 @@ return {
         highlights.String = { fg = "#0c703e" }
         highlights["@keyword.import"] = { fg = "#0000b5" }
         highlights["@keyword.function"] = { fg = "#0000b5" }
-        highlights["@lsp.typemod.function.declaration"] = { fg = "#1c2833" }
-        highlights["@lsp.type.function"] = { fg = "#1c2833", italic = true }
+        highlights["@lsp.type.function"] = { fg = colors.cyan_cooler }
+        -- highlights["@lsp.typemod.function.declaration"] = { fg = "#c44601", bold = true }
+        highlights["@lsp.type.type"] = { fg = colors.cyan_faint, bold = true, italic = true }
         highlights["@lsp.type.method"] = { fg = colors.cyan_faint }
         highlights["@function.method.call"] = { bold = true }
-        highlights["@function.call"] = { bold = true }
+        highlights["@function.call"] = { fg = colors.green_faint, bold = true }
         -- highlights["@lsp.typemod.function.readonly.typescript"] = { underline = true }
         highlights.Operator = { fg = "#cf000f" }
         highlights.Underlined = { underline = true, fg = "#444444" }
+        -- highlights["@ibl.scope.underline.1"] = { underline = true, sp = "#444444" }
       end,
     })
 
diff --git a/lua/plugins/flash.lua b/lua/plugins/flash.lua
index dc6e9a0..0990f66 100644
--- a/lua/plugins/flash.lua
+++ b/lua/plugins/flash.lua
@@ -1,14 +1,23 @@
 return {
   "folke/flash.nvim",
   event = "VeryLazy",
+  vscode = true,
+  config = function()
+    -- disable default flash mappings
+    vim.keymap.del({ "n", "x", "o" }, "s")
+    vim.keymap.del({ "n", "x", "o" }, "S")
+    vim.keymap.del("o", "r")
+    vim.keymap.del({ "x", "o" }, "R")
+    vim.keymap.del({ "c" }, "<c-s>")
+  end,
   ---@type Flash.Config
   opts = {},
-  -- stylua: ignore
-  keys = {
-    { "s", mode = { "n", "x", "o" }, function() require("flash").jump() end, desc = "Flash" },
-    { "S", mode = { "n", "x", "o" }, function() require("flash").treesitter() end, desc = "Flash Treesitter" },
-    { "r", mode = "o", function() require("flash").remote() end, desc = "Remote Flash" },
-    { "R", mode = { "o", "x" }, function() require("flash").treesitter_search() end, desc = "Treesitter Search" },
-    { "<c-s>", mode = { "c" }, function() require("flash").toggle() end, desc = "Toggle Flash Search" },
-  },
+    -- stylua: ignore
+    keys = {
+      { "ss", mode = { "n", "x", "o" }, function() require("flash").jump() end, desc = "Flash" },
+      -- { "S", mode = { "n", "o", "x" }, function() require("flash").treesitter() end, desc = "Flash Treesitter" },
+      -- { "r", mode = "o", function() require("flash").remote() end, desc = "Remote Flash" },
+      -- { "R", mode = { "o", "x" }, function() require("flash").treesitter_search() end, desc = "Treesitter Search" },
+      -- { "<c-s>", mode = { "c" }, function() require("flash").toggle() end, desc = "Toggle Flash Search" },
+    },
 }
diff --git a/lua/plugins/git-conflict.lua b/lua/plugins/git-conflict.lua
index 2cfe7d3..1abb95f 100644
--- a/lua/plugins/git-conflict.lua
+++ b/lua/plugins/git-conflict.lua
@@ -1,6 +1,5 @@
 return {
   "akinsho/git-conflict.nvim",
-  enabled = false,
   version = "*",
   config = true,
   opts = {
diff --git a/lua/plugins/indent-line.lua b/lua/plugins/indent-line.lua
new file mode 100644
index 0000000..96c1e95
--- /dev/null
+++ b/lua/plugins/indent-line.lua
@@ -0,0 +1,7 @@
+return {
+  "lukas-reineke/indent-blankline.nvim",
+  main = "ibl",
+  opts = {
+    indent = { highlight = { "CursorColumn" }, char = "" },
+  },
+}
diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua
index 85be2d3..e12cd4b 100644
--- a/lua/plugins/lsp.lua
+++ b/lua/plugins/lsp.lua
@@ -47,7 +47,7 @@ return {
             inlayHints = {
               enumMemberValues = { enabled = true },
               functionLikeReturnTypes = { enabled = true },
-              parameterNames = { enabled = "literals" },
+              parameterNames = { enabled = "all" },
               parameterTypes = { enabled = true },
               propertyDeclarationTypes = { enabled = true },
               variableTypes = { enabled = true },
diff --git a/lua/plugins/lua-line.lua b/lua/plugins/lua-line.lua
index 87fd345..70abb00 100644
--- a/lua/plugins/lua-line.lua
+++ b/lua/plugins/lua-line.lua
@@ -22,6 +22,7 @@ local colors = {
   brown = "#c44601",
 }
 
+---@diagnostic disable-next-line: unused-local
 local custom16Colors = {
   normal = {
     a = { fg = colors.white, bg = colors.blue, gui = "bold" },
@@ -37,6 +38,7 @@ local custom16Colors = {
     c = { fg = colors.silver, bg = colors.black },
   },
 }
+---@diagnostic disable-next-line: unused-local
 local modernDark = {
   normal = {
     a = { fg = colors.white, bg = colors.grey, gui = "bold" },
@@ -44,8 +46,8 @@ local modernDark = {
     c = { fg = colors.white, bg = colors.black },
   },
   insert = { a = { fg = colors.white, bg = colors.green, gui = "bold" } },
-  visual = { a = { fg = colors.black, bg = colors.hlGreen, gui = "bold" } },
-  replace = { a = { fg = colors.white, bg = colors.red, gui = "bold" } },
+  visual = { a = { fg = colors.black, bg = colors.hlGreen } },
+  replace = { a = { fg = colors.white, bg = colors.red } },
   inactive = {
     a = { fg = colors.silver, bg = colors.gray, gui = "bold" },
     b = { fg = colors.gray, bg = colors.black },
@@ -53,6 +55,7 @@ local modernDark = {
   },
 }
 
+---@diagnostic disable-next-line: unused-local
 local modernVibrant = {
   normal = {
     a = { fg = colors.white, bg = colors.brown, gui = "bold" },
@@ -60,8 +63,37 @@ local modernVibrant = {
     c = { fg = colors.white, bg = colors.black },
   },
   insert = { a = { fg = colors.black, bg = colors.lgreen, gui = "bold" } },
-  visual = { a = { fg = colors.black, bg = colors.hlGreen, gui = "bold" } },
-  replace = { a = { fg = colors.white, bg = colors.red, gui = "bold" } },
+  visual = { a = { fg = colors.black, bg = colors.hlGreen } },
+  replace = { a = { fg = colors.white, bg = colors.red } },
+  inactive = {
+    a = { fg = colors.silver, bg = colors.gray, gui = "bold" },
+    b = { fg = colors.gray, bg = colors.black },
+    c = { fg = colors.silver, bg = colors.black },
+  },
+}
+
+---@diagnostic disable-next-line: unused-local
+local plainColors = {
+  normal = {
+    a = { fg = colors.white, bg = colors.brown, gui = "bold" },
+    b = { fg = colors.white, bg = colors.brown },
+    c = { fg = colors.white, bg = colors.brown },
+  },
+  insert = {
+    a = { fg = colors.black, bg = colors.lgreen, gui = "bold" },
+    b = { fg = colors.black, bg = colors.lgreen },
+    c = { fg = colors.black, bg = colors.lgreen },
+  },
+  visual = {
+    a = { fg = colors.black, bg = colors.hlGreen, gui = "bold" },
+    b = { fg = colors.black, bg = colors.hlGreen },
+    c = { fg = colors.black, bg = colors.hlGreen },
+  },
+  replace = {
+    a = { fg = colors.white, bg = colors.red, gui = "bold" },
+    b = { fg = colors.white, bg = colors.red },
+    c = { fg = colors.white, bg = colors.red },
+  },
   inactive = {
     a = { fg = colors.silver, bg = colors.gray, gui = "bold" },
     b = { fg = colors.gray, bg = colors.black },
@@ -79,7 +111,7 @@ return {
     require("lualine").setup({
       options = {
         icons_enabled = true,
-        theme = modernVibrant,
+        theme = plainColors,
         component_separators = { left = "", right = "" },
         section_separators = { left = "", right = "" },
         disabled_filetypes = {
@@ -98,10 +130,10 @@ return {
       sections = {
         lualine_a = {
           {
-            "mode",
-            fmt = function(str)
-              return " " .. str
+            function()
+              return vim.fn.fnamemodify(vim.fn.getcwd(), ":t")
             end,
+            icon = " ", -- Git repository folder icon
           },
         },
         lualine_b = {}, -- { "branch", "diff", "diagnostics" },
diff --git a/lua/plugins/neo-tree.lua b/lua/plugins/neo-tree.lua
index e04615c..38ab11c 100644
--- a/lua/plugins/neo-tree.lua
+++ b/lua/plugins/neo-tree.lua
@@ -1,5 +1,6 @@
 return {
   "nvim-neo-tree/neo-tree.nvim",
+  enabled = false,
   opts = {
     default_component_configs = {
       indent = {
diff --git a/lua/plugins/neogit.lua b/lua/plugins/neogit.lua
index 4d0e758..ed0fa1e 100644
--- a/lua/plugins/neogit.lua
+++ b/lua/plugins/neogit.lua
@@ -1,6 +1,5 @@
 return {
   "NeogitOrg/neogit",
-  enabled = false,
   dependencies = {
     "nvim-lua/plenary.nvim", -- required
     "sindrets/diffview.nvim", -- optional - Diff integration
diff --git a/lua/plugins/noice.lua b/lua/plugins/noice.lua
index a9b7aef..643cd8f 100644
--- a/lua/plugins/noice.lua
+++ b/lua/plugins/noice.lua
@@ -29,9 +29,9 @@ return {
           cmdline = { pattern = "^:", icon = "", lang = "vim" },
           search_down = { kind = "search", pattern = "^/", icon = " ", lang = "regex" },
           search_up = { kind = "search", pattern = "^%?", icon = " ", lang = "regex" },
-          filter = { pattern = "^:%s*!", icon = "", lang = "bash" },
+          filter = { pattern = "^:%s*!", icon = "", lang = "bash", title = "Bash" },
           lua = { pattern = { "^:%s*lua%s+", "^:%s*lua%s*=%s*", "^:%s*=%s*" }, icon = "", lang = "lua" },
-          help = { pattern = "^:%s*he?l?p?%s+", icon = "" },
+          help = { pattern = "^:%s*he?l?p?%s+", icon = "󰱽" },
           input = {}, -- Used by input()
           -- lua = false, -- to disable a format, set to `false`
         },
diff --git a/lua/plugins/nvim-surround.lua b/lua/plugins/nvim-surround.lua
new file mode 100644
index 0000000..4857513
--- /dev/null
+++ b/lua/plugins/nvim-surround.lua
@@ -0,0 +1,16 @@
+return {
+  "kylechui/nvim-surround",
+  version = "*", -- Use for stability; omit to use `main` branch for the latest features
+  event = "VeryLazy",
+  config = function()
+    require("nvim-surround").setup({
+      -- Configuration here, or leave empty to use defaults
+      keymaps = {
+        normal = "as",
+        normal_cur = "ass",
+        normal_line = "aS",
+        normal_cur_line = "aSS",
+      },
+    })
+  end,
+}
diff --git a/lua/plugins/oil.lua b/lua/plugins/oil.lua
index 19950ea..1f39b35 100644
--- a/lua/plugins/oil.lua
+++ b/lua/plugins/oil.lua
@@ -9,8 +9,14 @@ return {
       -- "size",
       -- "mtime",
     },
+    -- Skip the confirmation popup for simple operations (:help oil.skip_confirm_for_simple_edits)
+    skip_confirm_for_simple_edits = false,
+    keymaps = {
+      ["<C-j>"] = "actions.select",
+      ["<C-k>"] = { "actions.parent" },
+    },
   },
   -- Optional dependencies
-  dependencies = { { "echasnovski/mini.icons", opts = {} } },
-  -- dependencies = { "nvim-tree/nvim-web-devicons" }, -- use if prefer nvim-web-devicons
+  -- dependencies = { { "echasnovski/mini.icons", opts = {} } },
+  dependencies = { "nvim-tree/nvim-web-devicons" }, -- use if prefer nvim-web-devicons
 }
diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua
index b02bb7e..f81c232 100644
--- a/lua/plugins/telescope.lua
+++ b/lua/plugins/telescope.lua
@@ -1,13 +1,39 @@
 return {
-  "nvim-telescope/telescope-file-browser.nvim",
-  keys = {
-    {
-      "<leader>fB",
-      ":Telescope file_browser path=%:p:h=%:p:h<cr>",
-      desc = "Browse Files",
+  {
+    "nvim-telescope/telescope.nvim",
+    tag = "0.1.8",
+    dependencies = {
+      "nvim-lua/plenary.nvim",
+      { "nvim-telescope/telescope-fzf-native.nvim", build = "make" },
     },
+    config = function()
+      require("telescope").setup({
+        pickers = {
+          find_files = {
+            theme = "ivy",
+          },
+        },
+        extensions = {
+          fzf = {},
+        },
+      })
+
+      require("telescope").load_extension("fzf")
+
+      vim.keymap.set("n", "<space>fh", require("telescope.builtin").help_tags)
+      vim.keymap.set("n", "<space>fd", require("telescope.builtin").find_files)
+      vim.keymap.set("n", "<space>en", function()
+        require("telescope.builtin").find_files({
+          cwd = vim.fn.stdpath("config"),
+        })
+      end)
+      vim.keymap.set("n", "<space>ep", function()
+        require("telescope.builtin").find_files({
+          cwd = vim.fs.joinpath(vim.fn.stdpath("data"), "lazy"),
+        })
+      end)
+
+      require("config.multigrep").setup()
+    end,
   },
-  config = function()
-    require("telescope").load_extension("file_browser")
-  end,
 }
diff --git a/lua/plugins/vim-cucumber.lua b/lua/plugins/vim-cucumber.lua
new file mode 100644
index 0000000..3f1daa0
--- /dev/null
+++ b/lua/plugins/vim-cucumber.lua
@@ -0,0 +1,11 @@
+return {
+  "tpope/vim-cucumber",
+  ft = { "feature" }, -- Load only for feature files
+  enabled = false,
+  config = function()
+    vim.g.cucumber_step_definitions = {
+      "features/steps/**/*.ts",
+      "test/v1/acceptance/*.step.ts",
+    }
+  end,
+}
diff --git a/shell/zsh-env.sh b/shell/zsh-env.sh
index 419aa14..a185960 100644
--- a/shell/zsh-env.sh
+++ b/shell/zsh-env.sh
@@ -7,3 +7,6 @@ export PATH="/Applications/WebStorm.app/Contents/MacOS:$PATH"
 # Chromium location
 export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true
 export PUPPETEER_EXECUTABLE_PATH=$(which chromium)
+
+# Boundary
+export BOUNDARY_ADDR="https://boundary.orion.hcommgmt.com"
diff --git a/shell/zsh-omz.sh b/shell/zsh-omz.sh
index 70bcdcf..259848d 100644
--- a/shell/zsh-omz.sh
+++ b/shell/zsh-omz.sh
@@ -68,7 +68,7 @@ ZSH_THEME="powerlevel10k/powerlevel10k"
 # Custom plugins may be added to $ZSH_CUSTOM/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)
 # Add wisely, as too many plugins slow down shell startup.
-plugins=(git fzf aliases)
+plugins=(git fzf aliases direnv)
 
 source $ZSH/oh-my-zsh.sh