diff --git a/lazy-lock.json b/lazy-lock.json
index 2c9ef57..a0f145e 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -1,9 +1,14 @@
 {
+  "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
   "gitsigns.nvim": { "branch": "main", "commit": "42d6aed4e94e0f0bbced16bbdcc42f57673bd75e" },
   "gruvbox.nvim": { "branch": "main", "commit": "5e0a460d8e0f7f669c158dedd5f9ae2bcac31437" },
   "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
-  "neo-tree.nvim": { "branch": "v3.x", "commit": "f3df514fff2bdd4318127c40470984137f87b62e" },
-  "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
+  "lazygit.nvim": { "branch": "main", "commit": "a04ad0dbc725134edbee3a5eea29290976695357" },
+  "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" },
+  "mini.icons": { "branch": "main", "commit": "efc85e42262cd0c9e1fdbf806c25cb0be6de115c" },
   "nvim-web-devicons": { "branch": "master", "commit": "803353450c374192393f5387b6a0176d0972b848" },
-  "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }
+  "oil-git.nvim": { "branch": "main", "commit": "d1f27a5982df35b70fb842aa6bbfac10735c7265" },
+  "oil.nvim": { "branch": "master", "commit": "fbbb2a98721da86f46b06994fd3b4833b04c6e9b" },
+  "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
+  "telescope.nvim": { "branch": "master", "commit": "a8c2223ea6b185701090ccb1ebc7f4e41c4c9784" }
 }
diff --git a/lua/core/lazy.lua b/lua/core/lazy.lua
index f00e1d6..df0ad23 100644
--- a/lua/core/lazy.lua
+++ b/lua/core/lazy.lua
@@ -18,8 +18,6 @@ vim.opt.rtp:prepend(lazypath)
 -- Make sure to setup `mapleader` and `maplocalleader` before
 -- loading lazy.nvim so that mappings are correct.
 -- This is also a good place to setup other settings (vim.opt)
-vim.g.mapleader = " "
-vim.g.maplocalleader = "\\"
 
 -- Setup lazy.nvim
 require("lazy").setup({
@@ -31,5 +29,5 @@ require("lazy").setup({
   -- colorscheme that will be used when installing plugins.
   install = { colorscheme = { "grovbox" } },
   -- automatically check for plugin updates
-  checker = { enabled = true },
+  checker = { enabled = false},
 })
diff --git a/lua/core/mappings.lua b/lua/core/mappings.lua
index 12f985b..ec53ac6 100644
--- a/lua/core/mappings.lua
+++ b/lua/core/mappings.lua
@@ -14,19 +14,16 @@ vim.keymap.set("n", "<c-s>", ":wincmd j<cr>")
 vim.keymap.set("n", "<c-d>", ":wincmd l<cr>")
 vim.keymap.set("n", "<c-a>", ":wincmd h<cr>")
 
--- Splits
-vim.keymap.set("n", "<c-w>", ":wincmd k<cr>")
-vim.keymap.set("n", "<c-s>", ":wincmd j<cr>")
-vim.keymap.set("n", "<c-d>", ":wincmd l<cr>")
-vim.keymap.set("n", "<c-a>", ":wincmd h<cr>")
-
 -- Navidation
 vim.keymap.set("n", "<S-w>", "k")
 vim.keymap.set("n", "<S-s>", "j")
 vim.keymap.set("n", "<S-d>", "l")
 vim.keymap.set("n", "<S-a>", "h")
 
--- Neo-tree
-vim.keymap.set("n", "<leader>e", "<cmd>Neotree toggle<cr>")
-
+-- Oil
+vim.keymap.set("n", "-", "<CMD>Oil<CR>", { desc = "Open parent directory" })
 
+-- Tabs
+vim.keymap.set("n", "<Tab>", "<cmd>BufferLineCycleNext<cr>")
+vim.keymap.set("n", "<S-Tab>", "<cmd>BufferLineCyclePrev<cr>")
+vim.keymap.set("n", "<M-q>", "<cmd>BufferLineCycleNext<cr>")
diff --git a/lua/plugins/bufferline.lua b/lua/plugins/bufferline.lua
new file mode 100644
index 0000000..8763888
--- /dev/null
+++ b/lua/plugins/bufferline.lua
@@ -0,0 +1,8 @@
+return {
+	'akinsho/bufferline.nvim',
+	version = "*", 
+	dependencies = 'nvim-tree/nvim-web-devicons',
+	config = function()
+		require("bufferline").setup{}
+	end
+}
diff --git a/lua/plugins/lazygit.lua b/lua/plugins/lazygit.lua
new file mode 100644
index 0000000..5c77df0
--- /dev/null
+++ b/lua/plugins/lazygit.lua
@@ -0,0 +1,20 @@
+return {
+    "kdheepak/lazygit.nvim",
+    lazy = true,
+    cmd = {
+        "LazyGit",
+        "LazyGitConfig",
+        "LazyGitCurrentFile",
+        "LazyGitFilter",
+        "LazyGitFilterCurrentFile",
+    },
+    -- optional for floating window border decoration
+    dependencies = {
+        "nvim-lua/plenary.nvim",
+    },
+    -- setting the keybinding for LazyGit with 'keys' is recommended in
+    -- order to load the plugin when the command is run for the first time
+    keys = {
+        { "<leader>lg", "<cmd>LazyGit<cr>", desc = "LazyGit" }
+    }
+}
diff --git a/lua/plugins/lualine.lua b/lua/plugins/lualine.lua
new file mode 100644
index 0000000..f9b56da
--- /dev/null
+++ b/lua/plugins/lualine.lua
@@ -0,0 +1,9 @@
+return {
+    'nvim-lualine/lualine.nvim',
+    dependencies = { 'nvim-tree/nvim-web-devicons' },
+	config = function()
+		require('lualine').setup({
+			options = { theme = 'gruvbox' }
+		})
+	end
+}
diff --git a/lua/plugins/neo-tree.lua b/lua/plugins/neo-tree.lua
deleted file mode 100644
index ac8c49c..0000000
--- a/lua/plugins/neo-tree.lua
+++ /dev/null
@@ -1,10 +0,0 @@
-return {
-	    "nvim-neo-tree/neo-tree.nvim",
-    branch = "v3.x",
-    dependencies = {
-      "nvim-lua/plenary.nvim",
-      "MunifTanjim/nui.nvim",
-      "nvim-tree/nvim-web-devicons", -- optional, but recommended
-    },
-    lazy = false, -- neo-tree will lazily load itself
-}
diff --git a/lua/plugins/oil-git.lua b/lua/plugins/oil-git.lua
new file mode 100644
index 0000000..90dd64f
--- /dev/null
+++ b/lua/plugins/oil-git.lua
@@ -0,0 +1,5 @@
+return {
+  "benomahony/oil-git.nvim",
+  dependencies = { "stevearc/oil.nvim" },
+  -- No opts or config needed! Works automatically
+}
diff --git a/lua/plugins/oil.lua b/lua/plugins/oil.lua
new file mode 100644
index 0000000..8f5d6ff
--- /dev/null
+++ b/lua/plugins/oil.lua
@@ -0,0 +1,11 @@
+return {
+  'stevearc/oil.nvim',
+  ---@module 'oil'
+  ---@type oil.SetupOpts
+  opts = {},
+  -- Optional dependencies
+  dependencies = { { "nvim-mini/mini.icons", opts = {} } },
+  -- dependencies = { "nvim-tree/nvim-web-devicons" }, -- use if you prefer nvim-web-devicons
+  -- Lazy loading is not recommended because it is very tricky to make it work correctly in all situations.
+  lazy = false,
+}
diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua
new file mode 100644
index 0000000..73af1e2
--- /dev/null
+++ b/lua/plugins/telescope.lua
@@ -0,0 +1,11 @@
+return {
+    'nvim-telescope/telescope.nvim', tag = '0.1.8',
+      dependencies = { 'nvim-lua/plenary.nvim' },
+	config = function()
+		require('telescope').setup({})
+		local builtin = require('telescope.builtin')
+		vim.keymap.set('n', 'ff', builtin.find_files, {})
+		vim.keymap.set('n', 'fw', builtin.live_grep, {})
+		vim.keymap.set('n', 'fb', builtin.buffers, {})
+	end
+}