diff --git a/lazy-lock.json b/lazy-lock.json
index 671466b..6edb065 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -9,7 +9,7 @@
   "flash.nvim": { "branch": "main", "commit": "b6346946d10d07998efee029fb0f7a593806d0cd" },
   "friendly-snippets": { "branch": "main", "commit": "6cd7280adead7f586db6fccbd15d2cac7e2188b9" },
   "gitsigns.nvim": { "branch": "main", "commit": "31d6fb2d618bca1482b9f274751ead5f03461408" },
-  "grug-far.nvim": { "branch": "main", "commit": "0f6a5d0d7a70659b11bbcd6b3673ee0fe61b6024" },
+  "grug-far.nvim": { "branch": "main", "commit": "6e05398cf6cad05b3fb46569db96b1ccfcbbd402" },
   "gruvbox.nvim": { "branch": "main", "commit": "154eb5ff5b96d0641307113fa385eaf0d36d9796" },
   "indent-blankline.nvim": { "branch": "master", "commit": "d28a3f70721c79e3c5f6693057ae929f3d9c0a03" },
   "komau.vim": { "branch": "master", "commit": "f7c7a00c0cbb67ed269b565a4ada47d96dce14f3" },
@@ -18,14 +18,14 @@
   "mason.nvim": { "branch": "main", "commit": "2a6940af80375532e5e9e7c1f2fc6319a1b7a69d" },
   "mini.clue": { "branch": "main", "commit": "4d506660e7030a15748ab073bebfe3ed03884000" },
   "mini.icons": { "branch": "main", "commit": "98faae31e9be1cc054ae63485e58ceb185efcad0" },
-  "neo-tree.nvim": { "branch": "main", "commit": "a4deaea4811b677067f515fb535b47ed3002c849" },
+  "neo-tree.nvim": { "branch": "main", "commit": "6679b9395526b52ddb2b137fcd5255dab71c5a58" },
   "no-neck-pain.nvim": { "branch": "main", "commit": "434fed70b1ee553f8f27e6da7b3899f71b3c6f99" },
   "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
   "nvim-colorizer.lua": { "branch": "master", "commit": "72a05f62c52241bc7441c820eb53946f92b2e6a4" },
   "nvim-lint": { "branch": "master", "commit": "a219b2c9e5b4765e5c845aba119dad55806fcaf1" },
   "nvim-scrollbar": { "branch": "main", "commit": "f8e87b96cd6362ef8579be456afee3b38fd7e2a8" },
   "nvim-treesitter": { "branch": "master", "commit": "cf12346a3414fa1b06af75c79faebe7f76df080a" },
-  "nvim-treesitter-context": { "branch": "master", "commit": "b311b30818951d01f7b4bf650521b868b3fece16" },
+  "nvim-treesitter-context": { "branch": "master", "commit": "f3061339b8eaf9fda873600bc425b8d2d8502533" },
   "nvim-ts-autotag": { "branch": "main", "commit": "88c1453db4ba7dd24131086fe51fdf74e587d275" },
   "nvim-web-devicons": { "branch": "master", "commit": "2ae6958df7ced50baac5035cec0c15799eedfbf7" },
   "nvim-window-picker": { "branch": "main", "commit": "6382540b2ae5de6c793d4aa2e3fe6dbb518505ec" },
diff --git a/lua/config/remap.lua b/lua/config/remap.lua
index 0436368..cab5a6b 100644
--- a/lua/config/remap.lua
+++ b/lua/config/remap.lua
@@ -48,8 +48,8 @@ map("n", "<leader>ct", "<cmd>lua require('blueprints').createFromTemplateTelesco
 
 ---- Git ----
 map("n", "<leader>gb", "<CMD>Gitsigns blame<CR>", { desc = "Git blame" })
-map("n", "<leader>ghr", "<CMD>Gitsigns reset_hunk<CR>", { desc = "Git next change" })
-map("n", "<leader>gha", "<CMD>Gitsigns stage_hunk<CR>", { desc = "Git next change" })
+map("n", "<leader>gr", "<CMD>Gitsigns reset_hunk<CR>", { desc = "Git next change" })
+map("n", "<leader>ga", "<CMD>Gitsigns stage_hunk<CR>", { desc = "Git next change" })
 map("n", "]g", "<CMD>Gitsigns next_hunk<CR>", { desc = "Git next change" })
 map("n", "[g", "<CMD>Gitsigns prev_hunk<CR>", { desc = "Git prev change" })
 map("n", "<leader>gdo", "<CMD>DiffviewOpen<CR>", { desc = "Git diff view open" })
diff --git a/lua/plugins/opts/conformFormat.lua b/lua/plugins/opts/conformFormat.lua
index f059ca4..bec77ea 100644
--- a/lua/plugins/opts/conformFormat.lua
+++ b/lua/plugins/opts/conformFormat.lua
@@ -4,12 +4,12 @@ local config = {
 		rust = { "rustfmt" },
 		lua = { "stylua" },
 		go = { "goimports", "gofmt" },
-		javascript = { "prettierd", "prettier", "biome", stop_after_first = true },
-		javascriptreact = { "prettierd", "prettier", "biome", stop_after_first = true },
-		typescript = { "prettierd", "prettier", "biome", stop_after_first = true },
-		typescriptreact = { "prettierd", "prettier", "biome", stop_after_first = true },
-		css = { "prettierd", "prettier", "biome", stop_after_first = true },
-		scss = { "prettierd", "prettier", "biome", stop_after_first = true },
+		javascript = { "biome", "prettierd", "prettier", stop_after_first = true },
+		javascriptreact = { "biome", "prettierd", "prettier", stop_after_first = true },
+		typescript = { "biome", "prettierd", "prettier", stop_after_first = true },
+		typescriptreact = { "biome", "prettierd", "prettier", stop_after_first = true },
+		css = { "biome", "prettierd", "prettier", stop_after_first = true },
+		scss = { "biome", "prettierd", "prettier", stop_after_first = true },
 		-- python = function(bufnr)
 		--     if require("conform").get_formatter_info("ruff_format", bufnr).available then
 		--         return { "ruff_format" }