diff --git a/.DS_Store b/.DS_Store
deleted file mode 100644
index a8c63b1..0000000
Binary files a/.DS_Store and /dev/null differ
diff --git a/README.md b/README.md
index cd94a6f..524fffc 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ The **Leader Key** is set to `Space`.
 ### Dashboard
 | Action | Keybinding | Description |
 | :--- | :--- | :--- |
-| **File Explorer** | `cd` | Open Yazi directly from the dashboard. |
+| **File Explorer** | `cd` | Open Netrw directly from the dashboard. |
 | **Find Files** | `ff` | Fuzzy find files via Telescope. |
 | **Live Grep** | `fg` | Search across all files via Telescope. |
 | **Harpoon Menu** | `e` | Open the Harpoon quick menu. |
@@ -37,32 +37,11 @@ The **Leader Key** is set to `Space`.
 | Action | Keybinding | Description |
 | :--- | :--- | :--- |
 | **Dashboard** | `<leader>;` | Open the MzansiVim Dasboard. |
-| **File Explorer (Current Directory)** | `<leader>cd` | Open the Yazi explorer in current directory. |
-| **File Explorer (Working Directory)** | `<leader>cw` | Open the Yazi explorer in working directory. |
+| **File Explorer** | `<leader>cd` | Open the built-in Netrw explorer. |
 | **Find Files** | `<leader>ff` | Fuzzy find files in your project. |
 | **Live Grep** | `<leader>fg` | Search for specific text across all files. |
 | **Help Tags** | `<leader>fh` | Search through Neovim help documentation. |
 
-### Yazi (File Explorer)
-| Action | Keybinding | Description |
-| :--- | :--- | :--- |
-| **File Explorer** | `<leader>cd` | Open the Yazi explorer in file location. |
-| **File Explorer** | `<leader>cw` | Open the Yazi explorer in working directory location. |
-| **Navigation** | `h / j / k / l` | Move left (parent folder)/ down/ up/ or right (enter folder/open file). |
-| **Open file** | `Enter` | Open file in new buffer. |
-| **Open File (Horizontal Split)** | `Ctrl + x` | open file in horizontal split. |
-| **Open File (Vertical Split)** | `Ctrl + v` | open file in horizontal split. |
-| **Add file/ folder** | `a` | Create a new file (append / for a folder). |
-| **Rename file/ folder** | `r` | Rename the highlighted file or directory. |
-| **Delete file/ folder** | `d` | Move the selected item(s) to the system trash. |
-| **Permanent Delete file/ folder** | `D` | Delete item(s) permanently (skips trash). |
-| **Select file/ folder** | `space` | Toggle selection for the current file (allows batch actions). |
-| **Bulk Select file/ folder** | `v` | Enter visual mode to select multiple files with `j/k` |
-| **Copy / Cut** | `y / x` | Copy (Yank) or Cut the selected files. |
-| **Paste** | `p` | Paste copied or cut files into the current directory. |
-| **Help Menu** | `F1` | Open the help menu for keybindings. |
-| **Close / Quit** | `q` | Exit Yazi and return to the Neovim buffer. |
-
 ### Harpoon (Quick-Switching)
 | Action | Keybinding | Description |
 | :--- | :--- | :--- |
@@ -145,7 +124,6 @@ To ensure all plugins (LSP, Tree-sitter, and Telescope) function correctly, plea
 * **Git** (For cloning the repo and managing plugins)
 * **Tree-sitter-cli** (For syntax highlighting)
 * **Ripgrep** (Required for Telescope live grep)
-* **Yazi** (Required for file expolorer)
 * **Node & NPM** (Required for various LSP servers like `html` and `eslint`)
 * **Go** (Required for certain internal tools)
 
diff --git a/lazy-lock.json b/lazy-lock.json
index dced191..a40098d 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -9,26 +9,25 @@
   "copilot.vim": { "branch": "release", "commit": "a12fd5672110c8aa7e3c8419e28c96943ca179be" },
   "dashboard-nvim": { "branch": "master", "commit": "f787e3462c2ee2b6117b17c1aa4ddf66cb6f57fe" },
   "dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" },
-  "flutter-tools.nvim": { "branch": "main", "commit": "7fc434e99297af83cba10deff008be53a008a6d5" },
+  "flutter-tools.nvim": { "branch": "main", "commit": "677cc07c16e8b89999108d2ebeefcfc5f539b73c" },
   "harpoon": { "branch": "harpoon2", "commit": "87b1a3506211538f460786c23f98ec63ad9af4e5" },
   "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
   "log-highlight.nvim": { "branch": "main", "commit": "ca88628f6dd3b9bb46f9a7401669e24cf7de47a4" },
-  "lualine.nvim": { "branch": "master", "commit": "131a558e13f9f28b15cd235557150ccb23f89286" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "0c2823e0418f3d9230ff8b201c976e84de1cb401" },
-  "mason.nvim": { "branch": "main", "commit": "cb8445f8ce85d957416c106b780efd51c6298f89" },
+  "lualine.nvim": { "branch": "master", "commit": "a905eeebc4e63fdc48b5135d3bf8aea5618fb21c" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "0a3b42c3e503df87aef6d6513e13148381495c3a" },
+  "mason.nvim": { "branch": "main", "commit": "b03fb0f20bc1d43daf558cda981a2be22e73ac42" },
   "mini.ai": { "branch": "main", "commit": "bfb26d9072670c3aaefab0f53024b2f3729c8083" },
   "noice.nvim": { "branch": "main", "commit": "7bfd942445fb63089b59f97ca487d605e715f155" },
   "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
   "nvim-autopairs": { "branch": "master", "commit": "59bce2eef357189c3305e25bc6dd2d138c1683f5" },
   "nvim-cmp": { "branch": "main", "commit": "a1d504892f2bc56c2e79b65c6faded2fd21f3eca" },
-  "nvim-lspconfig": { "branch": "master", "commit": "b66a8ce16b141cd26576267e2d1f371d658b7bb7" },
+  "nvim-lspconfig": { "branch": "master", "commit": "4b7fbaa239c5db6b36f424a4521ca9f1a401be33" },
   "nvim-notify": { "branch": "master", "commit": "8701bece920b38ea289b457f902e2ad184131a5d" },
   "nvim-treesitter": { "branch": "main", "commit": "4916d6592ede8c07973490d9322f187e07dfefac" },
-  "nvim-web-devicons": { "branch": "master", "commit": "4fc505ac7bd7692824a142e96e5f529c133862f8" },
+  "nvim-web-devicons": { "branch": "master", "commit": "c72328a5494b4502947a022fe69c0c47e53b6aa6" },
   "plenary.nvim": { "branch": "master", "commit": "74b06c6c75e4eeb3108ec01852001636d85a932b" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "6fea601bd2b694c6f2ae08a6c6fab14930c60e2c" },
   "telescope.nvim": { "branch": "master", "commit": "5255aa27c422de944791318024167ad5d40aad20" },
   "tokyonight.nvim": { "branch": "main", "commit": "cdc07ac78467a233fd62c493de29a17e0cf2b2b6" },
-  "vim-fugitive": { "branch": "master", "commit": "3b753cf8c6a4dcde6edee8827d464ba9b8c4a6f0" },
-  "yazi.nvim": { "branch": "main", "commit": "25f370e6e84ca7ebca5927ec66cd93e2fa16fd3d" }
+  "vim-fugitive": { "branch": "master", "commit": "3b753cf8c6a4dcde6edee8827d464ba9b8c4a6f0" }
 }
diff --git a/lua/.DS_Store b/lua/.DS_Store
deleted file mode 100644
index e37feff..0000000
Binary files a/lua/.DS_Store and /dev/null differ
diff --git a/lua/config/keybinds.lua b/lua/config/keybinds.lua
index 46279a5..5164b9a 100644
--- a/lua/config/keybinds.lua
+++ b/lua/config/keybinds.lua
@@ -1,33 +1,32 @@
 vim.g.mapleader = " "
--- vim.keymap.set("n", "<leader>cd", vim.cmd.Ex)
+vim.keymap.set("n", "<leader>cd", vim.cmd.Ex)
 vim.keymap.set("n", "<leader>;", ":Dashboard<CR>", { desc = "Return to Dashboard", silent = true })
 vim.api.nvim_create_autocmd("FileType", {
-	pattern = "netrw",
-	callback = function(event)
-		vim.schedule(function()
-			vim.keymap.set("n", "<Esc>", function()
-				vim.cmd("enew")
-				vim.cmd("Dashboard")
-			end, {
-				buffer = event.buf,
-				nowait = true,
-				desc = "Return to Dashboard"
-			})
-		end)
-	end,
+  pattern = "netrw",
+  callback = function(event)
+    vim.schedule(function()
+      vim.keymap.set("n", "<Esc>", function()
+        vim.cmd("enew")
+        vim.cmd("Dashboard")
+      end, { 
+        buffer = event.buf, 
+        nowait = true,
+        desc = "Return to Dashboard" 
+      })
+    end)
+  end,
 })
 vim.api.nvim_create_autocmd("FileType", {
-	pattern = "netrw",
-	callback = function(event)
-		vim.schedule(function()
-			vim.keymap.set("n", "<leader>;", function()
-				vim.cmd("enew")
-				vim.cmd("Dashboard")
-			end, {
-				buffer = event.buf,
-				nowait = true,
-				desc = "Return to Dashboard"
-			})
-		end)
-	end,
+  pattern = "netrw",
+  callback = function(event)
+    vim.schedule(function()
+      vim.keymap.set("n", "<leader>;", function()
+        vim.cmd("enew")
+        vim.cmd("Dashboard")
+      end, { 
+        buffer = event.buf, 
+        nowait = true,        desc = "Return to Dashboard" 
+      })
+    end)
+  end,
 })
diff --git a/lua/config/options.lua b/lua/config/options.lua
index cae66cd..6937b88 100644
--- a/lua/config/options.lua
+++ b/lua/config/options.lua
@@ -2,8 +2,3 @@ vim.opt.number = true
 vim.opt.cursorline = true
 vim.opt.relativenumber = true
 vim.opt.shiftwidth = 4
--- disable netrw at the very start
-vim.g.loaded_netrw = 1
-vim.g.loaded_netrwPlugin = 1
-vim.opt.splitbelow = true -- Opens horizontal splits below
-vim.opt.splitright = true -- Opens vertical splits to the right
diff --git a/lua/plugins/cmd_popup.lua b/lua/plugins/cmd_popup.lua
index 1c813ee..c7cab48 100644
--- a/lua/plugins/cmd_popup.lua
+++ b/lua/plugins/cmd_popup.lua
@@ -5,15 +5,6 @@ return {
 		cmdline = {
 			view = "cmdline_popup", -- This ensures it's a popup and not at the bottom
 		},
-		routes = {
-			{
-				filter = {
-					event = "lsp",
-					kind = "progress",
-				},
-				opts = { skip = true },
-			},
-		},
 		presets = {
 			bottom_search = false, -- use a classic bottom cmdline for search
 			command_palette = true, -- position the cmdline and popupmenu together
diff --git a/lua/plugins/copilot.lua b/lua/plugins/copilot.lua
index 5d076c6..c4c3ab2 100644
--- a/lua/plugins/copilot.lua
+++ b/lua/plugins/copilot.lua
@@ -2,7 +2,6 @@ return {
 	"github/copilot.vim",
 	lazy = false,
 	config = function()
-		vim.g.copilot_enabled = false
 		vim.g.copilot_no_tab_map = true
 		vim.keymap.set('i', '<C-l>', 'copilot#Accept("\\<CR>")', {
 			expr = true,
diff --git a/lua/plugins/dashboard.lua b/lua/plugins/dashboard.lua
index 0fc5ee8..b45789c 100644
--- a/lua/plugins/dashboard.lua
+++ b/lua/plugins/dashboard.lua
@@ -19,14 +19,7 @@ return {
 				header = vim.split(logo, "\n"),
 				center = {
 					-- Aligned to Mzansi Vim Essential Keybindings
-					{
-						icon = "󰉓 ",
-						desc = " File Explorer    ",
-						key = "cd",
-						action = function()
-							require("yazi").yazi(nil, vim.fn.getcwd())
-						end
-					},
+					{ icon = "󰉓 ", desc = " File Explorer    ", key = "cd", action = "Explore" },
 					{ icon = " ", desc = " Find Files       ", key = "ff", action = "Telescope find_files" },
 					{ icon = " ", desc = " Live Grep        ", key = "fg", action = "Telescope live_grep" },
 					{
diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua
index 603a3ee..213dcf9 100644
--- a/lua/plugins/lsp.lua
+++ b/lua/plugins/lsp.lua
@@ -45,9 +45,7 @@ return {
 					})
 				end
 				-- Activate the server
-				if server_name ~= "dartls" then
-					vim.lsp.enable(server_name)
-				end
+				vim.lsp.enable(server_name)
 			end
 
 			-- Diagnostic display config
diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua
index 49abeaa..72d053c 100644
--- a/lua/plugins/treesitter.lua
+++ b/lua/plugins/treesitter.lua
@@ -1,30 +1,34 @@
 return {
 	"nvim-treesitter/nvim-treesitter",
-	lazy = false, -- Treesitter must not be lazy-loaded in the new version
+	lazy = false,
 	build = ":TSUpdate",
 	config = function()
-		local ts = require("nvim-treesitter")
-		local supported_languages = {
-			"lua", "vim", "vimdoc", "query", "dart", "python",
-			"dockerfile", "yaml", "bash", "json", "html",
-			"css", "javascript", "sql", "markdown", "markdown_inline",
-		}
-		-- 1. Global Settings
-		ts.setup({
+		require("nvim-treesitter").setup({
 			install_dir = vim.fn.stdpath("data") .. "/site",
-			auto_install = true,
-		})
-		-- 2. Bulk Install Parsers (Asynchronous)
-		ts.install(supported_languages)
-		-- 3. Enable Highlighting	
-		vim.api.nvim_create_autocmd("FileType", {
-			pattern = supported_languages,
-			callback = function()
-				local lang = vim.treesitter.language.get_lang(vim.bo.filetype)
-				if lang then
-					vim.treesitter.start()
-				end
-			end,
+			highlight = {
+				enable = true,
+				-- additional_vim_regex_highlighting = false,
+			},
+			indent = { enable = true },
+			autotag = { enable = true },
+			ensure_installed = {
+				"lua",
+				"vim",
+				"vimdoc",
+				"query",
+				"dart",
+				"python",
+				"dockerfile",
+				"yaml",
+				"bash",
+				"json",
+				"html",
+				"css",
+				"javascript",
+				"sql",
+				"markdown",
+				"markdown_inline",
+			},
 		})
 	end,
 }
diff --git a/lua/plugins/yazi.lua b/lua/plugins/yazi.lua
deleted file mode 100644
index c1fad7e..0000000
--- a/lua/plugins/yazi.lua
+++ /dev/null
@@ -1,29 +0,0 @@
-return {
-	"mikavilpas/yazi.nvim",
-	event = "VeryLazy",
-	keys = {
-		-- Customize these keymaps to your liking!
-		{
-			"<leader>cd",
-			function()
-				require("yazi").yazi()
-			end,
-			desc = "Open yazi at the current file",
-		},
-		{
-			-- Open in the current working directory
-			"<leader>cw",
-			function()
-				require("yazi").yazi(nil, vim.fn.getcwd())
-			end,
-			desc = "Open yazi in cwd",
-		},
-	},
-	opts = {
-		-- if you want to replace netrw entirely with yazi
-		open_for_directories = true,
-		keymaps = {
-			show_help = "<f1>",
-		},
-	},
-}