diff --git a/common/.config/nvim/lua/plugins/code-generic.lua b/common/.config/nvim/lua/plugins/code-generic.lua
index e896e15..497dd8f 100644
--- a/common/.config/nvim/lua/plugins/code-generic.lua
+++ b/common/.config/nvim/lua/plugins/code-generic.lua
@@ -134,6 +134,17 @@ return {
         end,
     },
 
+    {
+        "kylechui/nvim-surround",
+        version = "*", -- Use for stability; omit to use `main` branch for the latest features
+        event = "VeryLazy",
+        config = function()
+            require("nvim-surround").setup({
+                -- Configuration here, or leave empty to use defaults
+            })
+        end,
+    },
+
     -- mini.nvim: Collection of various small independent plugins/modules
     {
         "echasnovski/mini.nvim",
@@ -337,7 +348,8 @@ return {
         config = function()
             require("lspsaga").setup({
                 ui = {
-                    kind = require("config.util").icons.kind_lspsaga,
+                    -- kind = require("config.util").icons.kind_lspsaga,
+                    kind = require("catppuccin.groups.integrations.lsp_saga").custom_kind(),
                 },
                 symbol_in_winbar = {
                     enable = true,
diff --git a/common/.config/nvim/lua/plugins/code-lsp.lua b/common/.config/nvim/lua/plugins/code-lsp.lua
index 0ebdb9f..9311687 100644
--- a/common/.config/nvim/lua/plugins/code-lsp.lua
+++ b/common/.config/nvim/lua/plugins/code-lsp.lua
@@ -253,6 +253,7 @@ return {
             notification = {
                 poll_rate = 2, -- How often to udate and render notifications
                 filter = vim.log.levels.WARN, -- Minimum notifications level
+                window = { winblend = 0 },
             },
         },
     },
diff --git a/common/.config/nvim/lua/plugins/ui.lua b/common/.config/nvim/lua/plugins/ui.lua
index 363d379..c97f5b9 100644
--- a/common/.config/nvim/lua/plugins/ui.lua
+++ b/common/.config/nvim/lua/plugins/ui.lua
@@ -26,7 +26,49 @@ return {
         lazy = false,
         priority = 1000,
         config = function()
-            vim.cmd("colorscheme github_dark_dimmed")
+            -- vim.cmd("colorscheme github_dark_dimmed")
+        end,
+    },
+
+    {
+        "catppuccin/nvim",
+        name = "catppuccin",
+        priority = 1000,
+        config = function()
+            require("catppuccin").setup({
+                compile_path = vim.fn.stdpath("cache") .. "/catppuccin",
+
+                integrations = {
+                    telescope = {
+                        style = "nvchad",
+                    },
+
+                    -- These were disabled by default
+                    diffview = true,
+                    fidget = true,
+                    lsp_saga = true,
+                    mason = true,
+                    neotest = true,
+                    noice = true,
+                    notify = true,
+                    dadbod_ui = true,
+                    nvim_surround = true,
+                    navic = {
+                        enabled = true,
+                    },
+                    illuminate = {
+                        lsp = true,
+                    },
+                    which_key = true,
+                },
+
+                flavour = "mocha",
+            })
+
+            require("nvim-navic").setup({
+                highlight = true,
+            })
+            vim.cmd("colorscheme catppuccin")
         end,
     },
 
@@ -242,7 +284,7 @@ return {
                                 hint = config.icons.diagnostics.Hint,
                             },
                         },
-                        { "filetype", icon_only = true, separator = "", padding = { left = 1, right = 0 } },
+                        { "filetype", padding = { left = 1, right = 1 } },
                         {
                             "filename",
                             file_status = true,
@@ -298,15 +340,11 @@ return {
                         },
                     },
 
-                    lualine_y = {
+                    lualine_y = {},
+                    lualine_z = {
                         { "progress", separator = " ", padding = { left = 1, right = 0 } },
                         { "location", padding = { left = 0, right = 1 } },
                     },
-                    lualine_z = {
-                        function()
-                            return " " .. os.date("%R")
-                        end,
-                    },
                 },
             }
         end,