diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json
index 381c925..c4f9836 100644
--- a/.config/nvim/lazy-lock.json
+++ b/.config/nvim/lazy-lock.json
@@ -3,6 +3,7 @@
   "LuaSnip": { "branch": "master", "commit": "b152822e1a4bafb6bdf11a16cc26525cbd95ee00" },
   "SchemaStore.nvim": { "branch": "main", "commit": "35a0998728380a17b8590447e8207391411c667a" },
   "alabaster.nvim": { "branch": "main", "commit": "ff1a9e07718506e45b94b2088366c5a8ab1ee1ea" },
+  "bufferline.nvim": { "branch": "main", "commit": "73540cb95f8d95aa1af3ed57713c6720c78af915" },
   "catppuccin": { "branch": "main", "commit": "d97387aea8264f484bb5d5e74f2182a06c83e0d8" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
   "cmp-emoji": { "branch": "main", "commit": "e8398e2adf512a03bb4e1728ca017ffeac670a9f" },
@@ -22,6 +23,7 @@
   "incline.nvim": { "branch": "main", "commit": "3e8edbc457daab8dba087dbba319865a912be7f9" },
   "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" },
   "lazy.nvim": { "branch": "main", "commit": "bef521ac89c8d423f9d092e37b58e8af0c099309" },
+  "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" },
   "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "05744f0f1967b5757bd05c08df4271ab8ec990aa" },
   "mason-nvim-dap.nvim": { "branch": "main", "commit": "67210c0e775adec55de9826b038e8b62de554afc" },
@@ -31,7 +33,6 @@
   "mini.comment": { "branch": "main", "commit": "f9f1a646fd3d9df7397aa1b9550a875fe8189eb0" },
   "mini.indentscope": { "branch": "main", "commit": "a8274b6ea2d868198d27bd91a31ed5ea3a6a5744" },
   "mini.surround": { "branch": "main", "commit": "0f528eb2e1bab420c0569d9e52615144c51db920" },
-  "modes.nvim": { "branch": "main", "commit": "4035a46aaabe43faf1b54740575af9dd5bb03809" },
   "neo-tree.nvim": { "branch": "v3.x", "commit": "7aad1bf3f6b849cbf108e02c55ad4d701cb4d33a" },
   "neocodeium": { "branch": "main", "commit": "666d4f57e8bf0789c58957a9483dd671bc038123" },
   "neoconf.nvim": { "branch": "main", "commit": "d4a48c2a6fdeec138605cee4eb6f8c6fafd0b3ed" },
@@ -51,7 +52,7 @@
   "nvim-noirbuddy": { "branch": "master", "commit": "9cb20d2a649153d07649c9c85c092c0533d4883d" },
   "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" },
   "nvim-spectre": { "branch": "master", "commit": "4651801ba37a9407b7257287aec45b6653ffc5e9" },
-  "nvim-treesitter": { "branch": "master", "commit": "1b2f0067035c3d3ae7e0642614b8b03a2f19f49d" },
+  "nvim-treesitter": { "branch": "master", "commit": "707b0dcf7641fa3a2aaad5053b215503f54f89aa" },
   "nvim-treesitter-context": { "branch": "master", "commit": "2650e6431f7daba5d9c2c64134fa5eb2312eb3d7" },
   "nvim-treesitter-textobjects": { "branch": "master", "commit": "23b820146956b3b681c19e10d3a8bc0cbd9a1d4c" },
   "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" },
diff --git a/.config/nvim/lua/config/lazy.lua b/.config/nvim/lua/config/lazy.lua
index 6fe0e9e..1fc7c73 100644
--- a/.config/nvim/lua/config/lazy.lua
+++ b/.config/nvim/lua/config/lazy.lua
@@ -42,8 +42,8 @@ require("lazy").setup({
 			-- disable some rtp plugins
 			disabled_plugins = {
 				"gzip",
-				"matchit",
-				"matchparen",
+				-- "matchit",
+				-- "matchparen",
 				"netrwPlugin",
 				"tarPlugin",
 				"tohtml",
diff --git a/.config/nvim/lua/config/options.lua b/.config/nvim/lua/config/options.lua
index cb6f5b5..3690f7d 100644
--- a/.config/nvim/lua/config/options.lua
+++ b/.config/nvim/lua/config/options.lua
@@ -4,7 +4,7 @@
 
 vim.opt.number = true
 vim.opt.relativenumber = false
--- vim.opt.clipboard = "unnamed" --"unnamedplus"
+vim.opt.clipboard = "unnamed" --"unnamedplus"
 
 vim.g.do_filetype_lua = 1
 vim.g.root_spec = { { ".git", "lua" }, "lsp", "cwd" }
diff --git a/.config/nvim/lua/plugins/colorscheme.lua b/.config/nvim/lua/plugins/colorscheme.lua
index 0a81937..1047171 100644
--- a/.config/nvim/lua/plugins/colorscheme.lua
+++ b/.config/nvim/lua/plugins/colorscheme.lua
@@ -80,6 +80,7 @@ return {
 				Group.new("ModesVisualVisual", nil, colors.Visual)
 				Group.new("Visual", nil, colors.Visual)
 				Group.new("VisualNOS", nil, colors.Visual)
+				Group.new("MatchParen", nil, colors.Visual)
 
 				Color.new("NeoCodeiumLabelBg", "#eda92d")
 				Color.new("NeoCodeiumLabelFg", "#000000")
@@ -88,6 +89,15 @@ return {
 				Color.new("NeoCodeiumSuggestion", "#996611")
 				Group.new("NeoCodeiumSuggestion", colors.NeoCodeiumSuggestion, nil, styles.italic)
 
+				Color.new("NoiceCmdLineBg", "#112233")
+				Color.new("NoiceCmdLineFg", "#99ccff")
+				Group.new("NoiceCmdLine", colors.NoiceCmdLineFg, colors.NoiceCmdLineBg)
+
+				Color.new("NoiceFormatProgressTodo", "#223344")
+				Group.new("NoiceFormatProgressTodo", nil, colors.NoiceFormatProgressTodo)
+				Color.new("NoiceFormatProgressDone", "#446699")
+				Group.new("NoiceFormatProgressDone", nil, colors.NoiceFormatProgressDone)
+
 				Color.new("WinSeparator", "#223344")
 				Group.new("WinSeparator", colors.WinSeparator, nil)
 
diff --git a/.config/nvim/lua/plugins/ui.lua b/.config/nvim/lua/plugins/ui.lua
index d554be2..390de3b 100644
--- a/.config/nvim/lua/plugins/ui.lua
+++ b/.config/nvim/lua/plugins/ui.lua
@@ -84,12 +84,49 @@ return {
 		},
 	},
 
+	{
+		"folke/noice.nvim",
+		event = "VeryLazy",
+		keys = {
+			{ "<leader>sna", "<cmd>NoiceTelescope<cr>", desc = "Show all messages in Telescope" },
+		},
+		opts = function()
+			local enable_conceal = true -- Hide command text if true
+			return {
+				presets = { bottom_search = true }, -- The kind of popup used for /
+				cmdline = {
+					view = "cmdline", -- The kind of popup used for :
+					format = {
+						cmdline = { conceal = enable_conceal },
+						search_down = { conceal = enable_conceal },
+						search_up = { conceal = enable_conceal },
+						filter = { conceal = enable_conceal },
+						lua = { conceal = enable_conceal },
+						help = { conceal = enable_conceal },
+						input = { conceal = enable_conceal },
+					},
+				},
+
+				messages = { enabled = true },
+				lsp = {
+					hover = { enabled = false },
+					signature = { enabled = false },
+					progress = { enabled = true, view = "cmdline" },
+					message = { enabled = false },
+					smart_move = { enabled = false },
+				},
+			}
+		end,
+	},
+
 	{
 		"rcarriga/nvim-notify",
 		opts = {
-			timeout = 2000,
+			stages = "fade_in_slide_out",
+			timeout = 1000,
 			background_colour = "#1e2835",
 			render = "wrapped-compact",
+			top_down = false,
 		},
 	},