diff --git a/lazy-lock.json b/lazy-lock.json
index 15813f4..7743fef 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -1,8 +1,10 @@
 {
   "LuaSnip": { "branch": "master", "commit": "8f3d3465ba5c7ade0a8adb41eca5736f291a3fa8" },
   "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" },
+  "bufferline.nvim": { "branch": "main", "commit": "73540cb95f8d95aa1af3ed57713c6720c78af915" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" },
   "conform.nvim": { "branch": "master", "commit": "4660e534bf7678ee0f85879aa75fdcb6855612c2" },
+  "dressing.nvim": { "branch": "master", "commit": "5162edb1442a729a885c45455a07e9a89058be2f" },
   "flash.nvim": { "branch": "main", "commit": "48817af25f51c0590653bbc290866e4890fe1cbe" },
   "friendly-snippets": { "branch": "main", "commit": "ea068f1becd91bcd4591fceb6420d4335e2e14d3" },
   "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" },
@@ -16,13 +18,15 @@
   "mini.pairs": { "branch": "main", "commit": "04f58f2545ed80ac3b52dd4826e93f33e15b2af6" },
   "mini.surround": { "branch": "main", "commit": "a00d69be09e3fe27dfa9e5b0298410d0e148e3e2" },
   "neo-tree.nvim": { "branch": "v3.x", "commit": "7aad1bf3f6b849cbf108e02c55ad4d701cb4d33a" },
+  "noice.nvim": { "branch": "main", "commit": "0cbe3f88d038320bdbda3c4c5c95f43a13c3aa12" },
   "nui.nvim": { "branch": "main", "commit": "cbd2668414331c10039278f558630ed19b93e69b" },
   "nvim-autopairs": { "branch": "master", "commit": "4f41e5940bc0443fdbe5f995e2a596847215cd2a" },
   "nvim-cmp": { "branch": "main", "commit": "8f3c541407e691af6163e2447f3af1bd6e17f9a3" },
   "nvim-lint": { "branch": "master", "commit": "f098232d70cebe90e27404928c9bc19ca7a5a7b5" },
   "nvim-lspconfig": { "branch": "master", "commit": "7133e85c3df14a387da8942c094c7edddcdef309" },
+  "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" },
   "nvim-spectre": { "branch": "master", "commit": "026394a8458d62c6b7b305c076ce675420dbaa4c" },
-  "nvim-treesitter": { "branch": "master", "commit": "ab3b3ff01028fef83cfb79b651bf65afb76ee062" },
+  "nvim-treesitter": { "branch": "master", "commit": "0883ff05655117a3fc79ab295a640c4984cfd415" },
   "nvim-treesitter-context": { "branch": "master", "commit": "4fe0a54e86859744968e1a5c7867b49c86855774" },
   "nvim-ts-context-commentstring": { "branch": "main", "commit": "a6382f744f584bbf71d0a563af789af7190aabda" },
   "nvim-web-devicons": { "branch": "master", "commit": "beb6367ab8496c9e43f22e0252735fdadae1872d" },
diff --git a/lua/options.lua b/lua/options.lua
index 68e05f4..e08d218 100644
--- a/lua/options.lua
+++ b/lua/options.lua
@@ -42,3 +42,5 @@ vim.opt.fillchars = {
 
 vim.opt.foldlevel = 99
 vim.opt.foldmethod = "indent"
+
+vim.opt.termguicolors = true
diff --git a/lua/plugins/alpha-nvim.lua b/lua/plugins/alpha-nvim.lua
deleted file mode 100644
index 3f407db..0000000
--- a/lua/plugins/alpha-nvim.lua
+++ /dev/null
@@ -1,43 +0,0 @@
-return {
-	"goolord/alpha-nvim",
-	dependencies = { "nvim-tree/nvim-web-devicons" },
-	config = function()
-		local alpha = require("alpha")
-		local dashboard = require("alpha.themes.dashboard")
-
-		-- https://github.com/MaximilianLloyd/ascii.nvim
-		dashboard.section.header.val = {
-			"                                                                          ",
-			"                   ░░░  ▄▄▄▄▄▄███▄▄▄▄▄ ",
-			"                    ▄███████▀▀▀▀▀▀█▓▓▓▓▓▓██▄▄▄▄ ",
-			"                   ▐████▄▄    ■▓▓▓▓▀▀▀▀▀▀▀▀▀█████■                ██▄ ",
-			"                    ▀█████████▄▄▄▄▄███████████▀▀             ▄▄  ████░▄▄▄ ",
-			"    ▐██▄            ▄▄▄▄▄▄▀▀▀▀▀▀▀▀▓▓▓▀░░░▄▄▄   ▄▄          ▐███▏▐██▓▄████ ",
-			" ▄█▓░███▓ ▄▓▓▓▄▄████████████▄█████▄ ▄█████████▐███         ████▏██▀████▀ ",
-			" ▐███▄███░▀████████▀▀   ▀▓█████▓▀██▓████▀▀  ███████      ▄█████ ■ ██▀ ",
-			"  ▀████▓██ ▐██████       ▐████   ▐████▀    ▒████████▄  ▄███████ ",
-			"    ▀███    ▀▀█████▄    ▄████   ▄████▏    ▄█████▀█████████▀ ███ ",
-			"               ▀████▄ ▄████▐██▄███████▄▄▄███▓██▏ ▀██████▀   ▐██ ",
-			"                ▀████████▀  ▀████▀▀████████▀▐██▏  ▀██▀▀     ▐██▏ ",
-			"          ▓▓█    ▀████ ▀            ■███▄▄  ███              ██▏ ",
-			"          ▀▀▀      ▀▀                ▀█████▄▓▀               ██▏ ",
-			"            ░░     ▄████████████▄▄▄▄▄▄▄ ▀▀▀████▄▄   ▒▒▒      ██▏  ▄▄ ",
-			"                   ▀▀████▀▀▀▀▀▀████████████▄▄▓▓▓███▄    ░░░░ ▐█▏ ■▀▀ ",
-			"                                      ▀▀▀▀▀▀█████▓▓▓▓█▄▄     ▐█ ",
-			"                                                ▄█████████▄▄ ",
-			"                                       ▄▄▄▄████████▀▀▀▀▀▀▀███▏ ",
-			"                                   ▄▄█████▀▀▀▀              ▀■ ",
-			"                                ▄███▀▀▀▀ ",
-			"                              ■▀▀ ",
-			"                                                                          ",
-		}
-
-		dashboard.section.buttons.val = {
-			dashboard.button("e", "  > New File", "<cmd>ene<CR>"),
-			dashboard.button("SPC ee", "  > File explorer", "<cmd>Neotree<CR>"),
-			dashboard.button("q", "  > Quit", "<cmd>qa<CR>"),
-		}
-
-		alpha.setup(dashboard.opts)
-	end,
-}
diff --git a/lua/plugins/lualine.lua b/lua/plugins/lualine.lua
deleted file mode 100644
index 9f40934..0000000
--- a/lua/plugins/lualine.lua
+++ /dev/null
@@ -1,12 +0,0 @@
-return {
-	"nvim-lualine/lualine.nvim",
-	dependencies = { "nvim-tree/nvim-web-devicons" },
-	config = function()
-		require("lualine").setup({
-			options = {
-				icons_enabled = true,
-				theme = "tokyonight",
-			},
-		})
-	end,
-}
diff --git a/lua/plugins/ui.lua b/lua/plugins/ui.lua
index 9d2083d..cd7c73b 100644
--- a/lua/plugins/ui.lua
+++ b/lua/plugins/ui.lua
@@ -1,55 +1,156 @@
 return {
-	{
-		"lukas-reineke/indent-blankline.nvim",
-		opts = {
-			indent = {
-				char = "│",
-				tab_char = "│",
-			},
-			scope = { enabled = false },
-			exclude = {
-				filetypes = {
-					"help",
-					"alpha",
-					"dashboard",
-					"neo-tree",
-					"Trouble",
-					"trouble",
-					"lazy",
-					"mason",
-					"notify",
-					"toggleterm",
-					"lazyterm",
-				},
-			},
-		},
-		main = "ibl",
-	},
-	{
-		"echasnovski/mini.indentscope",
-		opts = {
-			symbol = "│",
-			options = { try_as_border = true },
-		},
-		init = function()
-			vim.api.nvim_create_autocmd("FileType", {
-				pattern = {
-					"help",
-					"alpha",
-					"dashboard",
-					"neo-tree",
-					"Trouble",
-					"trouble",
-					"lazy",
-					"mason",
-					"notify",
-					"toggleterm",
-					"lazyterm",
-				},
-				callback = function()
-					vim.b.miniindentscope_disable = true
-				end,
-			})
-		end,
-	},
+    {
+        "nvim-lualine/lualine.nvim",
+        dependencies = { "nvim-tree/nvim-web-devicons" },
+        opts = {
+            options = {
+                icons_enabled = true,
+                theme = "tokyonight",
+                disabled_filetypes = {
+                    statusline = {
+                        "alpha",
+                        "neo-tree",
+                    }
+                }
+            }
+        },
+    },
+    {
+        "akinsho/bufferline.nvim",
+        event = "VeryLazy",
+        keys = {
+            { "[b", "<cmd>BufferLineCyclePrev<cr>", desc = "Prev Buffer" },
+            { "]b", "<cmd>BufferLineCycleNext<cr>", desc = "Next Buffer" },
+        },
+        opts = {
+            options = {
+                diagnostics = "nvim_lsp",
+                offsets = {
+                    {
+                        filetype = "neo-tree",
+                        text = "Neo-tree",
+                        highlight = "Directory",
+                        text_align = "left",
+                    },
+                },
+            }
+        }
+    },
+    {
+        "lukas-reineke/indent-blankline.nvim",
+        opts = {
+            indent = {
+                char = "│",
+                tab_char = "│",
+            },
+            scope = { enabled = false },
+            exclude = {
+                filetypes = {
+                    "help",
+                    "alpha",
+                    "dashboard",
+                    "neo-tree",
+                    "Trouble",
+                    "trouble",
+                    "lazy",
+                    "mason",
+                    "notify",
+                    "toggleterm",
+                    "lazyterm",
+                },
+            },
+        },
+        main = "ibl",
+    },
+    {
+        "echasnovski/mini.indentscope",
+        opts = {
+            symbol = "│",
+            options = { try_as_border = true },
+        },
+        init = function()
+            vim.api.nvim_create_autocmd("FileType", {
+                pattern = {
+                    "help",
+                    "alpha",
+                    "dashboard",
+                    "neo-tree",
+                    "Trouble",
+                    "trouble",
+                    "lazy",
+                    "mason",
+                    "notify",
+                    "toggleterm",
+                    "lazyterm",
+                },
+                callback = function()
+                    vim.b.miniindentscope_disable = true
+                end,
+            })
+        end,
+    },
+    {
+        "stevearc/dressing.nvim",
+        event = "VeryLazy",
+        opts = {}
+    },
+    {
+        "rcarriga/nvim-notify",
+        opts = {}
+    },
+    {
+        "MunifTanjim/nui.nvim"
+    },
+    {
+        "folke/noice.nvim",
+        event = "VeryLazy",
+        opts = {},
+        dependencies = {
+            "MunifTanjim/nui.nvim",
+            "rcarriga/nvim-notify",
+        }
+    },
+    {
+        "goolord/alpha-nvim",
+        dependencies = { "nvim-tree/nvim-web-devicons" },
+        config = function()
+            local alpha = require("alpha")
+            local dashboard = require("alpha.themes.dashboard")
+
+            -- https://github.com/MaximilianLloyd/ascii.nvim
+            dashboard.section.header.val = {
+                "                                                                          ",
+                "                   ░░░  ▄▄▄▄▄▄███▄▄▄▄▄ ",
+                "                    ▄███████▀▀▀▀▀▀█▓▓▓▓▓▓██▄▄▄▄ ",
+                "                   ▐████▄▄    ■▓▓▓▓▀▀▀▀▀▀▀▀▀█████■                ██▄ ",
+                "                    ▀█████████▄▄▄▄▄███████████▀▀             ▄▄  ████░▄▄▄ ",
+                "    ▐██▄            ▄▄▄▄▄▄▀▀▀▀▀▀▀▀▓▓▓▀░░░▄▄▄   ▄▄          ▐███▏▐██▓▄████ ",
+                " ▄█▓░███▓ ▄▓▓▓▄▄████████████▄█████▄ ▄█████████▐███         ████▏██▀████▀ ",
+                " ▐███▄███░▀████████▀▀   ▀▓█████▓▀██▓████▀▀  ███████      ▄█████ ■ ██▀ ",
+                "  ▀████▓██ ▐██████       ▐████   ▐████▀    ▒████████▄  ▄███████ ",
+                "    ▀███    ▀▀█████▄    ▄████   ▄████▏    ▄█████▀█████████▀ ███ ",
+                "               ▀████▄ ▄████▐██▄███████▄▄▄███▓██▏ ▀██████▀   ▐██ ",
+                "                ▀████████▀  ▀████▀▀████████▀▐██▏  ▀██▀▀     ▐██▏ ",
+                "          ▓▓█    ▀████ ▀            ■███▄▄  ███              ██▏ ",
+                "          ▀▀▀      ▀▀                ▀█████▄▓▀               ██▏ ",
+                "            ░░     ▄████████████▄▄▄▄▄▄▄ ▀▀▀████▄▄   ▒▒▒      ██▏  ▄▄ ",
+                "                   ▀▀████▀▀▀▀▀▀████████████▄▄▓▓▓███▄    ░░░░ ▐█▏ ■▀▀ ",
+                "                                      ▀▀▀▀▀▀█████▓▓▓▓█▄▄     ▐█ ",
+                "                                                ▄█████████▄▄ ",
+                "                                       ▄▄▄▄████████▀▀▀▀▀▀▀███▏ ",
+                "                                   ▄▄█████▀▀▀▀              ▀■ ",
+                "                                ▄███▀▀▀▀ ",
+                "                              ■▀▀ ",
+                "                                                                          ",
+            }
+
+            dashboard.section.buttons.val = {
+                dashboard.button("e", "  > New File", "<cmd>ene<CR>"),
+                dashboard.button("SPC ee", "  > File explorer", "<cmd>Neotree<CR>"),
+                dashboard.button("q", "  > Quit", "<cmd>qa<CR>"),
+            }
+
+            alpha.setup(dashboard.opts)
+        end,
+    }
 }