diff --git a/lazy-lock.json b/lazy-lock.json
index 2ad97e4..884c754 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -1,7 +1,7 @@
 {
   "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
   "LuaSnip": { "branch": "master", "commit": "c9b9a22904c97d0eb69ccb9bab76037838326817" },
-  "aerial.nvim": { "branch": "master", "commit": "fc1e7a7a31ac835c499d3eec300632ee9f7d2c42" },
+  "aerial.nvim": { "branch": "master", "commit": "a89f5e39bbbd445242eebdbaac971e0c70ddd3b4" },
   "cellular-automaton.nvim": { "branch": "main", "commit": "1606e9d5d04ff254023c3f3c62842d065708d6d3" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
   "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
@@ -9,7 +9,6 @@
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
   "conform.nvim": { "branch": "master", "commit": "8ed162b0637d4c4f69ebe3e8e49b35662a82e137" },
-  "feline.nvim": { "branch": "master", "commit": "3587f57480b88e8009df7b36dc84e9c7ff8f2c49" },
   "fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" },
   "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" },
   "gitsigns.nvim": { "branch": "main", "commit": "2bc3b472bbc2484214549af4d9f38c127b886a55" },
@@ -17,14 +16,15 @@
   "hererocks": { "branch": "master", "commit": "c9c5444dea1e07e005484014a8231aa667be30b6" },
   "lazy.nvim": { "branch": "main", "commit": "f15a93907ddad3d9139aea465ae18336d87f5ce6" },
   "lazydev.nvim": { "branch": "main", "commit": "a1b78b2ac6f978c72e76ea90ae92a94edf380cfc" },
+  "lualine.nvim": { "branch": "master", "commit": "f4f791f67e70d378a754d02da068231d2352e5bc" },
   "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "805c31ec6bfb557975143712ecff6956d3227141" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "a8e6efcf623b86bae6d2223eede7c43883329f80" },
   "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
   "nvim": { "branch": "main", "commit": "0b2437bcc12b4021614dc41fcea9d0f136d94063" },
   "nvim-cmp": { "branch": "main", "commit": "12509903a5723a876abd65953109f926f4634c30" },
-  "nvim-lspconfig": { "branch": "master", "commit": "6c17f8656f667727b27f5f598463afedb7791b18" },
+  "nvim-lspconfig": { "branch": "master", "commit": "7af2c37192deae28d1305ae9e68544f7fb5408e1" },
   "nvim-surround": { "branch": "main", "commit": "ae298105122c87bbe0a36b1ad20b06d417c0433e" },
-  "nvim-treesitter": { "branch": "master", "commit": "6d957c22cb48a734b009a69d03c18d20042c4754" },
+  "nvim-treesitter": { "branch": "master", "commit": "80e6de9d24eec68d82d5f4e6feae94c9c753ebd6" },
   "nvim-web-devicons": { "branch": "master", "commit": "1020869742ecb191f260818234517f4a1515cfe8" },
   "oil.nvim": { "branch": "master", "commit": "7cde5aab10f564408e9ac349d457d755422d58cd" },
   "plenary": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
@@ -43,5 +43,5 @@
   "vim-fugitive": { "branch": "master", "commit": "b068eaf1e6cbe35d1ac100d435cd7f7b74a5c87d" },
   "vim-suda": { "branch": "master", "commit": "9adda7d195222d4e2854efb2a88005a120296c47" },
   "vim-tmux-navigator": { "branch": "master", "commit": "d847ea942a5bb4d4fab6efebc9f30d787fd96e65" },
-  "which-key.nvim": { "branch": "main", "commit": "0e76a87ac51772569aec678dc74baa8e2a86100c" }
+  "which-key.nvim": { "branch": "main", "commit": "5bf7a73fe851896d5ac26d313db849bf00f45b78" }
 }
diff --git a/lua/haelnorr/lazy/catppuccin.lua b/lua/haelnorr/lazy/catppuccin.lua
new file mode 100644
index 0000000..3cf147e
--- /dev/null
+++ b/lua/haelnorr/lazy/catppuccin.lua
@@ -0,0 +1,43 @@
+return {
+	"catppuccin/nvim",
+	config = function()
+		require("catppuccin").setup({
+			integrations = {
+				aerial = true,
+				cmp = true,
+				fidget = true,
+				gitsigns = true,
+				harpoon = true,
+				mason = true,
+				lsp_trouble = true,
+				native_lsp = {
+					enabled = true,
+					virtual_text = {
+						errors = { "italic" },
+						hints = { "italic" },
+						warnings = { "italic" },
+						information = { "italic" },
+						ok = { "italic" },
+					},
+					underlines = {
+						errors = { "underline" },
+						hints = { "underline" },
+						warnings = { "underline" },
+						information = { "underline" },
+						ok = { "underline" },
+					},
+					inlay_hints = {
+						background = true,
+					},
+				},
+				telescope = {
+					enabled = true,
+				},
+				treesitter = true,
+			},
+		})
+		vim.cmd("colorscheme catppuccin-mocha")
+		vim.api.nvim_set_hl(0, "Normal", { bg = "none" })
+		vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" })
+	end,
+}
diff --git a/lua/haelnorr/lazy/colors.lua b/lua/haelnorr/lazy/colors.lua
deleted file mode 100644
index 01e1634..0000000
--- a/lua/haelnorr/lazy/colors.lua
+++ /dev/null
@@ -1,42 +0,0 @@
-return {
-    "catppuccin/nvim",
-    config = function()
-        require("catppuccin").setup({
-            integrations = {
-                gitsigns = true,
-                treesitter = true,
-                harpoon = true,
-                mason = true,
-                cmp = true,
-                native_lsp = {
-                    enabled = true,
-                    virtual_text = {
-                        errors = { "italic" },
-                        hints = { "italic" },
-                        warnings = { "italic" },
-                        information = { "italic" },
-                        ok = { "italic" },
-                    },
-                    underlines = {
-                        errors = { "underline" },
-                        hints = { "underline" },
-                        warnings = { "underline" },
-                        information = { "underline" },
-                        ok = { "underline" },
-                    },
-                    inlay_hints = {
-                        background = true,
-                    },
-                },
-                fidget = true,
-                telescope = {
-                    enabled = true,
-                },
-                lsp_trouble = true,
-            },
-        })
-        vim.cmd('colorscheme catppuccin-mocha')
-        vim.api.nvim_set_hl(0, "Normal", { bg = "none" })
-        vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" })
-    end,
-}
diff --git a/lua/haelnorr/lazy/feline.lua b/lua/haelnorr/lazy/feline.lua
deleted file mode 100644
index c941fe5..0000000
--- a/lua/haelnorr/lazy/feline.lua
+++ /dev/null
@@ -1,12 +0,0 @@
-return {
-	"feline-nvim/feline.nvim",
-	config = function()
-		local ctp_feline = require("catppuccin.groups.integrations.feline")
-
-		ctp_feline.setup()
-
-		require("feline").setup({
-			components = ctp_feline.get(),
-		})
-	end,
-}
diff --git a/lua/haelnorr/lazy/fidget.lua b/lua/haelnorr/lazy/fidget.lua
new file mode 100644
index 0000000..a8ff432
--- /dev/null
+++ b/lua/haelnorr/lazy/fidget.lua
@@ -0,0 +1,12 @@
+return {
+	"j-hui/fidget.nvim",
+	config = function()
+		require("fidget").setup({
+			notification = {
+				window = {
+					winblend = 0,
+				},
+			},
+		})
+	end,
+}
diff --git a/lua/haelnorr/lazy/lualine.lua b/lua/haelnorr/lazy/lualine.lua
new file mode 100644
index 0000000..3cc8e66
--- /dev/null
+++ b/lua/haelnorr/lazy/lualine.lua
@@ -0,0 +1,11 @@
+return {
+	"nvim-lualine/lualine.nvim",
+	dependencies = { "nvim-tree/nvim-web-devicons" },
+	config = function()
+		require("lualine").setup({
+			options = {
+				theme = "catppuccin",
+			},
+		})
+	end,
+}