diff --git a/init.lua b/init.lua
index 2c06301..2dc0d40 100644
--- a/init.lua
+++ b/init.lua
@@ -53,8 +53,8 @@ vim.keymap.set('n', '<leader>d', builtin.diagnostics, {})
 -- Formating
 vim.keymap.set("n", "<leader>gf", vim.lsp.buf.format, {})
 
--- Neotree
-vim.keymap.set("n", "<C-n>", ":Neotree filesystem reveal right toggle<CR>", {})
+-- Filesystem
+vim.keymap.set("n", "<leader>e", ":Oil<CR>", {})
 
 -- Neotest
 vim.keymap.set("n", "<leader>no", require("neotest").output.open, {})
diff --git a/lazy-lock.json b/lazy-lock.json
index 472d77e..11e9187 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -6,14 +6,14 @@
   "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" },
   "lazydev.nvim": { "branch": "main", "commit": "5231c62aa83c2f8dc8e7ba957aa77098cda1257d" },
   "lualine.nvim": { "branch": "master", "commit": "3946f0122255bc377d14a59b27b609fb3ab25768" },
-  "neo-tree.nvim": { "branch": "v3.x", "commit": "f3df514fff2bdd4318127c40470984137f87b62e" },
+  "mini.icons": { "branch": "main", "commit": "ff2e4f1d29f659cc2bad0f9256f2f6195c6b2428" },
   "neotest": { "branch": "master", "commit": "deadfb1af5ce458742671ad3a013acb9a6b41178" },
   "neotest-python": { "branch": "master", "commit": "b0d3a861bd85689d8ed73f0590c47963a7eb1bf9" },
-  "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
   "nvim-lspconfig": { "branch": "master", "commit": "c8503e63c6afab3ed34b49865a4a4edbb1ebf4a8" },
   "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
   "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
   "nvim-web-devicons": { "branch": "master", "commit": "8dcb311b0c92d460fac00eac706abd43d94d68af" },
+  "oil.nvim": { "branch": "master", "commit": "7e1cd7703ff2924d7038476dcbc04b950203b902" },
   "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
   "tabout.nvim": { "branch": "master", "commit": "9a3499480a8e53dcaa665e2836f287e3b7764009" },
   "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
diff --git a/lua/plugins/neotree.lua b/lua/plugins/neotree.lua
deleted file mode 100644
index b9459a8..0000000
--- a/lua/plugins/neotree.lua
+++ /dev/null
@@ -1,34 +0,0 @@
-return {
-  "nvim-neo-tree/neo-tree.nvim",
-  branch = "v3.x",
-  dependencies = {
-    "nvim-lua/plenary.nvim",
-    "nvim-tree/nvim-web-devicons",
-    "MunifTanjim/nui.nvim",
-  },
-  config = function()
-    require("neo-tree").setup({
-      event_handlers = {
-        {
-          event = "file_opened",
-          handler = function(file_path)
-            require("neo-tree.command").execute({ action = "close" })
-          end,
-        },
-      },
-      filesystem = {
-        filtered_items = {
-          visible = false,
-          show_hidden_count = true,
-          hide_dotfiles = false,
-          hide_gitignored = true,
-          hide_hidden = true,
-          hide_by_name = {
-            '.git',
-            'bin',
-          },
-        },
-      },
-    })
-  end,
-}
diff --git a/lua/plugins/oil.lua b/lua/plugins/oil.lua
new file mode 100644
index 0000000..8d4c7fc
--- /dev/null
+++ b/lua/plugins/oil.lua
@@ -0,0 +1,10 @@
+return {
+  'stevearc/oil.nvim',
+  ---@module 'oil'
+  ---@type oil.SetupOpts
+  opts = {},
+  -- Optional dependencies
+  dependencies = { { "nvim-mini/mini.icons", opts = {} } },
+  -- Lazy loading is not recommended because it is very tricky to make it work correctly in all situations.
+  lazy = false,
+}