diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json
index 41d93fa..c4788ff 100644
--- a/nvim/lazy-lock.json
+++ b/nvim/lazy-lock.json
@@ -1,4 +1,5 @@
 {
+  "barbar.nvim": { "branch": "master", "commit": "53b5a2f34b68875898f0531032fbf090e3952ad7" },
   "blink.cmp": { "branch": "main", "commit": "022521a8910a5543b0251b21c9e1a1e989745796" },
   "catppuccin": { "branch": "main", "commit": "a0c769bc7cd04bbbf258b3d5f01e2bdce744108d" },
   "conform.nvim": { "branch": "master", "commit": "b529dd4897c85c3188cc787084089a9d55843093" },
@@ -11,9 +12,10 @@
   "mason-tool-installer.nvim": { "branch": "main", "commit": "93a9ff9b34c91c0cb0f7de8d5f7e4abce51d8903" },
   "mason.nvim": { "branch": "main", "commit": "8024d64e1330b86044fed4c8494ef3dcd483a67c" },
   "mini.nvim": { "branch": "main", "commit": "5a10dfb3ab49b3ee2425bc2c215b5067ccce1c79" },
+  "neo-tree.nvim": { "branch": "main", "commit": "7bc06b5efc5554d10f73a8aa508e02c03a83c2a0" },
+  "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
   "nvim-lspconfig": { "branch": "master", "commit": "8adb3b5938f6074a1bcc36d3c3916f497d2e8ec4" },
   "nvim-notify": { "branch": "master", "commit": "b5825cf9ee881dd8e43309c93374ed5b87b7a896" },
-  "nvim-tree.lua": { "branch": "master", "commit": "1c733e8c1957dc67f47580fe9c458a13b5612d5b" },
   "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
   "nvim-treesitter-textobjects": { "branch": "master", "commit": "0f051e9813a36481f48ca1f833897210dbcfffde" },
   "nvim-web-devicons": { "branch": "master", "commit": "1fb58cca9aebbc4fd32b086cb413548ce132c127" },
diff --git a/nvim/lua/config/lazy/31-tabs.lua b/nvim/lua/config/lazy/31-tabs.lua
new file mode 100644
index 0000000..49c8ea5
--- /dev/null
+++ b/nvim/lua/config/lazy/31-tabs.lua
@@ -0,0 +1,19 @@
+return {
+	{
+		"romgrk/barbar.nvim",
+		version = "^1.9.0",
+		dependencies = {
+			"lewis6991/gitsigns.nvim",
+			"nvim-tree/nvim-web-devicons",
+		},
+		init = function()
+			vim.g.barbar_auto_setup = false
+		end,
+		opts = {
+			focus_on_close = "previous",
+			sidebar_filetypes = {
+				["neo-tree"] = { event = "BufWipeout" },
+			},
+		},
+	},
+}
diff --git a/nvim/lua/config/lazy/31-tree.lua b/nvim/lua/config/lazy/31-tree.lua
deleted file mode 100644
index 81c122c..0000000
--- a/nvim/lua/config/lazy/31-tree.lua
+++ /dev/null
@@ -1,17 +0,0 @@
-return {
-	"nvim-tree/nvim-tree.lua",
-	dependencies = {
-		"nvim-tree/nvim-web-devicons",
-	},
-	lazy = false,
-	config = true,
-	opts = {
-		filters = {
-			custom = { "^.git$" },
-		},
-	},
-	keys = {
-		{ "<leader>et", "<cmd>NvimTreeToggle<CR>", desc = "[T]oggle Explorer" },
-		{ "<leader>ee", "<cmd>NvimTreeFocus<CR>", desc = "Open [E]xplorer" },
-	},
-}
diff --git a/nvim/lua/config/lazy/32-tree.lua b/nvim/lua/config/lazy/32-tree.lua
new file mode 100644
index 0000000..0e49984
--- /dev/null
+++ b/nvim/lua/config/lazy/32-tree.lua
@@ -0,0 +1,27 @@
+return {
+	"nvim-neo-tree/neo-tree.nvim",
+	dependencies = {
+		"nvim-lua/plenary.nvim",
+		"nvim-tree/nvim-web-devicons",
+		"MunifTanjim/nui.nvim",
+	},
+	lazy = false,
+	opts = {
+		close_if_last_window = true,
+		filesystem = {
+			follow_current_file = { enabled = true },
+		},
+		modified = {
+			symbol = "[󰏫] ",
+			highlight = "NeoTreeModified",
+		},
+	},
+	keys = {
+		{
+			"<leader>te",
+			"<cmd>Neotree toggle<CR>",
+			mode = "n",
+			desc = "Toggle [E]xplorer",
+		},
+	},
+}
diff --git a/nvim/lua/config/lazy/32-terminal.lua b/nvim/lua/config/lazy/33-terminal.lua
similarity index 100%
rename from nvim/lua/config/lazy/32-terminal.lua
rename to nvim/lua/config/lazy/33-terminal.lua
diff --git a/nvim/lua/config/lazy/42-autocomplete.lua b/nvim/lua/config/lazy/42-autocomplete.lua
index 6ad0501..f092a0a 100644
--- a/nvim/lua/config/lazy/42-autocomplete.lua
+++ b/nvim/lua/config/lazy/42-autocomplete.lua
@@ -5,8 +5,6 @@ return {
 	dependencies = {
 		"folke/lazydev.nvim",
 	},
-	--- @module 'blink.cmp'
-	--- @type blink.cmp.Config
 	opts = {
 		keymap = {
 			-- See `:help ins-completion`