diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index 0f0d3ff..067f587 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -2,8 +2,12 @@ require("user.plugins")
 
 require("user.themes.kanagawa")
 
+require("user.bufferline")
+
+
 require("user.options")
 require("user.keymaps")
+
 require("user.cmp")
 require("user.lsp")
 require("user.treesitter")
@@ -13,7 +17,6 @@ require("user.telescope")
 require("user.lsp_format")
 require("user.neoscroll")
 require("user.dropbar")
-require("user.bufferline")
 require("user.nvim_scrollbar")
 require("user.gitsigns")
 require("user.lualine")
diff --git a/.config/nvim/lua/user/options.lua b/.config/nvim/lua/user/options.lua
index 6678fca..8220115 100644
--- a/.config/nvim/lua/user/options.lua
+++ b/.config/nvim/lua/user/options.lua
@@ -19,6 +19,8 @@ vim.opt.ttimeoutlen = 5
 
 vim.g.netrw_banner = 0
 
+vim.cmd("set showtabline=1")
+
 vim.api.nvim_create_autocmd("FileType", {
 	pattern = "cs",
 	command = "setlocal shiftwidth=4 tabstop=4"
diff --git a/.config/nvim/lua/user/plugins.lua b/.config/nvim/lua/user/plugins.lua
index 04d8581..1b4816d 100644
--- a/.config/nvim/lua/user/plugins.lua
+++ b/.config/nvim/lua/user/plugins.lua
@@ -21,7 +21,7 @@ end
 
 lazy.setup({
 
-	"nvim-lua/popup.nvim", -- An implementation of the Popup API from vim in Neovim
+	"nvim-lua/popup.nvim",  -- An implementation of the Popup API from vim in Neovim
 	"nvim-lua/plenary.nvim", -- Useful lua functions used ny lots of plugins
 	"navarasu/onedark.nvim",
 	"morhetz/gruvbox",
@@ -30,42 +30,41 @@ lazy.setup({
 
 	"windwp/nvim-autopairs",
 
-	"hrsh7th/nvim-cmp", -- The completion plugin
-	"hrsh7th/cmp-buffer", -- buffer completions
-	"hrsh7th/cmp-path", -- path completions
-	"hrsh7th/cmp-cmdline", -- cmdline completions
+	"hrsh7th/nvim-cmp",        -- The completion plugin
+	"hrsh7th/cmp-buffer",      -- buffer completions
+	"hrsh7th/cmp-path",        -- path completions
+	"hrsh7th/cmp-cmdline",     -- cmdline completions
 	"saadparwaiz1/cmp_luasnip", -- snippet completions
 	"hrsh7th/cmp-nvim-lsp",
 
 	-- snippets
-	"L3MON4D3/LuaSnip", --snippet engine
+	"L3MON4D3/LuaSnip",            --snippet engine
 	"rafamadriz/friendly-snippets", -- a bunch of snippets to use
 	{ "dsznajder/vscode-es7-javascript-react-snippets", run = "yarn install --frozen-lockfile && yarn compile" },
 
 	-- LSP
 	"williamboman/mason.nvim", -- simple to use language server installer
 	"williamboman/mason-lspconfig.nvim",
-	"neovim/nvim-lspconfig", -- enable LSP
+	"neovim/nvim-lspconfig",  -- enable LSP
 	-- "williamboman/nvim-lsp-installer") -- simple to use language server installer
 	"nvim-treesitter/nvim-treesitter-refactor",
 
 	-- file explorer
 	{
 		"nvim-neo-tree/neo-tree.nvim",
-		branch = "v2.x",
+		branch = "v3.x",
 		dependencies = {
 			"nvim-lua/plenary.nvim",
-			"nvim-tree/nvim-web-devicons", -- not strictly required, but recommended
+			"nvim-tree/nvim-web-devicons",
 			"MunifTanjim/nui.nvim",
-		},
+		}
 	},
-
 	{
 		"kyazdani42/nvim-tree.lua",
 		dependencies = {
 			"kyazdani42/nvim-web-devicons", -- optional, for file icons
 		},
-		tag = "nightly", -- optional, updated every week. (see issue #1193)
+		tag = "nightly",               -- optional, updated every week. (see issue #1193)
 	},
 
 	{