diff --git a/lazy-lock.json b/lazy-lock.json
index 741690b6..b948f5cf 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -16,12 +16,12 @@
   "mason-lspconfig.nvim": { "branch": "main", "commit": "21d33d69a81f6351e5a5f49078b2e4f0075c8e73" },
   "mason.nvim": { "branch": "main", "commit": "3b5068f0fc565f337d67a2d315d935f574848ee7" },
   "mini.nvim": { "branch": "main", "commit": "b5645ac6eefce8e7af9d7dd4e5e296a81cba8a10" },
-  "neodev.nvim": { "branch": "main", "commit": "3157f2e876fd6223d36cfa76bee4709247d62fa5" },
+  "neodev.nvim": { "branch": "main", "commit": "84e0290f5600e8b89c0dfcafc864f45496a53400" },
   "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" },
-  "nvim-lspconfig": { "branch": "master", "commit": "b1a11b042d015df5b8f7f33aa026e501b639c649" },
-  "nvim-surround": { "branch": "main", "commit": "703ec63aa798e5e07d309b35e42def34bebe0174" },
-  "nvim-treesitter": { "branch": "master", "commit": "db12bd416e2764420047e4a5d6b96fe44e4377d5" },
-  "nvim-treesitter-textobjects": { "branch": "master", "commit": "7f00d94543f1fd37cab2afa2e9a6cd54e1c6b9ef" },
+  "nvim-lspconfig": { "branch": "master", "commit": "9553725789be682ecd945a527ec552e489ea8534" },
+  "nvim-surround": { "branch": "main", "commit": "d47001f8ddf9646c24f16d2732d4d0255acd2121" },
+  "nvim-treesitter": { "branch": "master", "commit": "62b0bb4f24ad09f535efe44cc9d088f90dcd2498" },
+  "nvim-treesitter-textobjects": { "branch": "master", "commit": "95933e762e28f9d38b572d65e7e4da9d2f4d90cb" },
   "nvim-web-devicons": { "branch": "master", "commit": "0bb67ef952ea3eb7b1bac9c011281471d99a27bc" },
   "onedark.nvim": { "branch": "master", "commit": "1230aaf2a427b2c5b73aba6e4a9a5881d3e69429" },
   "plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" },
diff --git a/lua/custom/options.lua b/lua/custom/options.lua
index 3cc251ca..bf78aa40 100644
--- a/lua/custom/options.lua
+++ b/lua/custom/options.lua
@@ -2,24 +2,6 @@ vim.o.mouse = ""
 vim.wo.relativenumber = true
 vim.go.tabstop = 2
 
--- Terminal UI
-vim.g.terminal_color_0 = "#45475A"
-vim.g.terminal_color_1 = "#F38BA8"
-vim.g.terminal_color_2 = "#A6E3A1"
-vim.g.terminal_color_3 = "#F9E2AF"
-vim.g.terminal_color_4 = "#89B4FA"
-vim.g.terminal_color_5 = "#F5C2E7"
-vim.g.terminal_color_6 = "#94E2D5"
-vim.g.terminal_color_7 = "#BAC2DE"
-vim.g.terminal_color_8 = "#585B70"
-vim.g.terminal_color_9 = "#F38BA8"
-vim.g.terminal_color_10 = "#A6E3A1"
-vim.g.terminal_color_11 = "#F9E2AF"
-vim.g.terminal_color_12 = "#89B4FA"
-vim.g.terminal_color_13 = "#F5C2E7"
-vim.g.terminal_color_14 = "#94E2D5"
-vim.g.terminal_color_15 = "#A6ADC8"
-
 vim.api.nvim_create_autocmd("TermOpen", { command = "setlocal nonumber norelativenumber" })
 
 return {}
diff --git a/lua/custom/plugins/theme.lua b/lua/custom/plugins/theme.lua
index 1699e073..b2dbb1fa 100644
--- a/lua/custom/plugins/theme.lua
+++ b/lua/custom/plugins/theme.lua
@@ -4,6 +4,16 @@ return {
 		name = 'catppuccin',
 		priority = 900,
 		config = function()
+			require('catppuccin').setup({
+				term_colors = true,
+				styles = {
+					comments = { "italic" },
+					conditionals = {},
+				},
+				integrations = {
+					treesitter = true,
+				},
+			})
 			vim.cmd.colorscheme 'catppuccin'
 		end,
 	},