diff --git a/lazy-lock.json b/lazy-lock.json
index 6544fb8..4c5410d 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -43,7 +43,7 @@
   "nvim-ts-context-commentstring": { "branch": "main", "commit": "7ab799a9792f7cf3883cf28c6a00ad431f3d382a" },
   "nvim-ts-rainbow2": { "branch": "master", "commit": "b3120cd5ae9ca524af9cb602f41e12e301fa985f" },
   "nvim-web-devicons": { "branch": "master", "commit": "a55b801b7ef5719ca25692c3a0a5447fdfb692ed" },
-  "onedarkpro.nvim": { "branch": "main", "commit": "ec07364f3cfa9cc6467bf067a490cfd74011efcd" },
+  "onedark.nvim": { "branch": "master", "commit": "1230aaf2a427b2c5b73aba6e4a9a5881d3e69429" },
   "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" },
   "smart-splits.nvim": { "branch": "master", "commit": "f6fcb79527872e9330c554915af2ca511c388390" },
   "telescope.nvim": { "branch": "master", "commit": "7472420f8734c710bd7009081cef9b97f08a3821" },
diff --git a/lua/custom/plugins/onedarkpro.lua b/lua/custom/plugins/onedarkpro.lua
index 742934b..9ad4077 100644
--- a/lua/custom/plugins/onedarkpro.lua
+++ b/lua/custom/plugins/onedarkpro.lua
@@ -1,99 +1,99 @@
 return {
-	{ "navarasu/onedark.nvim", enabled = false },
-	{ "folke/tokyonight.nvim", enabled = false },
-	{
-		"olimorris/onedarkpro.nvim",
-		priority = 1000, -- Ensure it loads first
-		config = function()
-			require("onedarkpro").setup({
-				styles = {
-					types = "NONE",
-					methods = "NONE",
-					numbers = "NONE",
-					strings = "NONE",
-					comments = "italic",
-					keywords = "bold,italic",
-					constants = "NONE",
-					functions = "italic",
-					operators = "NONE",
-					variables = "NONE",
-					parameters = "NONE",
-					conditionals = "italic",
-					virtual_text = "NONE",
-				},
-				colors = {
-					onedark = {
-						green = "#99c379",
-						gray = "#8094b4",
-						red = "#e06c75",
-						purple = "#c678dd",
-						yellow = "#e5c07a",
-						blue = "#61afef",
-						cyan = "#56b6c2",
-						bg_statusline = "#282c34",
-						indentline = "#3b4261",
-						float_bg = "#282c34",
-					},
-				},
-				options = {
-					cursorline = true,
-					transparency = false,
-					terminal_colors = true,
-				},
-				highlights = {
-					-- overide cursor line fill colors
-					LineNr = { fg = "#49505E" }, -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is set.
-					CursorLineNr = { fg = "${blue}" }, -- Like LineNr when 'cursorline' or 'relativenumber' is set for the cursor line.
-					CursorLine = { bg = "#333842" },
-					Cursor = { fg = "${bg}", bg = "${fg}" }, -- character under the cursor
-					lCursor = { fg = "${bg}", bg = "${fg}" }, -- the character under the cursor when |language-mapping| is used (see 'guicursor')
-					CursorIM = { fg = "${bg}", bg = "${fg}" }, -- like Cursor, but used when in IME mode |CursorIM|
-					CursorColumn = { bg = "#333842" }, -- Screen-column at the cursor, when 'cursorcolumn' is set.
-					-- overide nvimtree folder icon fill color
-					NvimTreeFolderIcon = { fg = "${gray}" },
-					-- overide nvimtree text fill color folder opened
-					NvimTreeOpenedFolderName = { fg = "${blue}" },
-					-- overide nvimtree text fill color root folder
-					NvimTreeRootFolder = { fg = "${yellow}" },
-					NvimTreeSpecialFile = { fg = "${yellow}" },
-					NvimTreeWinSeparator = { fg = "#202329" },
-					NvimTreeIndentMarker = { fg = "#3E4450" },
-					-- overide indenline fill color
-					IblIndent = { fg = "#3E4450" },
-					-- overide cmp cursorline fill color with #333842
-					PmenuSel = { bg = "#333842" },
-					illuminatedWord = { bg = "#3b4261" },
-					illuminatedCurWord = { bg = "#3b4261" },
-					IlluminatedWordText = { bg = "#3b4261" },
-					IlluminatedWordRead = { bg = "#3b4261" },
-					IlluminatedWordWrite = { bg = "#3b4261" },
-					StatusLine = { fg = "#f8f8f2", bg = "${bg}" },
-					StatusLineTerm = { fg = "#f8f8f2", bg = "${bg}" },
-					BufferLineFill = { bg = "${bg}" },
-					["@string.special.url.html"] = { fg = "${green}" },
-					["@text.uri.html"] = { fg = "${green}" },
-					Pmenu = { fg = "${fg}", bg = "${bg}" },
-					PmenuThumb = { bg = "${gray}" }, -- Popup menu: Thumb of the scrollbar.
-					-- overide lualine fill color with bg color
-					LualineNormal = { bg = "${bg}" },
-					-- overide lualine_c fill color with bg color
-					LualineC = { bg = "${bg}" },
-					-- overide lualine_x fill color with bg color
-					LualineX = { bg = "${bg}" },
-					-- overide which-key fill color with bg color
-					WhichKey = { bg = "${bg}" },
-					-- overide which-key fill color with bg color
-					WhichKeySeperator = { bg = "${bg}" },
-					-- overide which-key fill color with bg color
-					WhichKeyDesc = { bg = "${bg}" },
-					-- overide which-key fill color with bg color
-					WhichKeyFloat = { bg = "${bg}" },
-					-- overide which-key fill color with bg color
-					WhichKeyValue = { bg = "${bg}" },
-					-- overide which-key fill color with bg color
-					WhichKeyBorder = { bg = "${bg}" },
-				},
-			})
-		end,
-	},
+	-- { "navarasu/onedark.nvim", enabled = false },
+	-- {
+	-- 	"olimorris/onedarkpro.nvim",
+	-- 	priority = 1000, -- Ensure it loads first
+	-- 	config = function()
+	-- 		require("onedarkpro").setup({
+	-- 			styles = {
+	-- 				types = "NONE",
+	-- 				methods = "NONE",
+	-- 				numbers = "NONE",
+	-- 				strings = "NONE",
+	-- 				comments = "italic",
+	-- 				keywords = "bold,italic",
+	-- 				constants = "NONE",
+	-- 				functions = "italic",
+	-- 				operators = "NONE",
+	-- 				variables = "NONE",
+	-- 				parameters = "NONE",
+	-- 				conditionals = "italic",
+	-- 				virtual_text = "NONE",
+	-- 				tags = "italic",
+	-- 			},
+	-- 			colors = {
+	-- 				onedark = {
+	-- 					green = "#99c379",
+	-- 					gray = "#8094b4",
+	-- 					red = "#e06c75",
+	-- 					purple = "#c678dd",
+	-- 					yellow = "#e5c07a",
+	-- 					blue = "#61afef",
+	-- 					cyan = "#56b6c2",
+	-- 					bg_statusline = "#282c34",
+	-- 					indentline = "#3b4261",
+	-- 					float_bg = "#282c34",
+	-- 				},
+	-- 			},
+	-- 			options = {
+	-- 				cursorline = true,
+	-- 				transparency = false,
+	-- 				terminal_colors = true,
+	-- 			},
+	-- 			highlights = {
+	-- 				-- overide cursor line fill colors
+	-- 				LineNr = { fg = "#49505E" }, -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is set.
+	-- 				CursorLineNr = { fg = "${blue}" }, -- Like LineNr when 'cursorline' or 'relativenumber' is set for the cursor line.
+	-- 				CursorLine = { bg = "#333842" },
+	-- 				Cursor = { fg = "${bg}", bg = "${fg}" }, -- character under the cursor
+	-- 				lCursor = { fg = "${bg}", bg = "${fg}" }, -- the character under the cursor when |language-mapping| is used (see 'guicursor')
+	-- 				CursorIM = { fg = "${bg}", bg = "${fg}" }, -- like Cursor, but used when in IME mode |CursorIM|
+	-- 				CursorColumn = { bg = "#333842" }, -- Screen-column at the cursor, when 'cursorcolumn' is set.
+	-- 				-- overide nvimtree folder icon fill color
+	-- 				NvimTreeFolderIcon = { fg = "${gray}" },
+	-- 				-- overide nvimtree text fill color folder opened
+	-- 				NvimTreeOpenedFolderName = { fg = "${blue}" },
+	-- 				-- overide nvimtree text fill color root folder
+	-- 				NvimTreeRootFolder = { fg = "${yellow}" },
+	-- 				NvimTreeSpecialFile = { fg = "${yellow}" },
+	-- 				NvimTreeWinSeparator = { fg = "#202329" },
+	-- 				NvimTreeIndentMarker = { fg = "#3E4450" },
+	-- 				-- overide indenline fill color
+	-- 				IblIndent = { fg = "#3E4450" },
+	-- 				-- overide cmp cursorline fill color with #333842
+	-- 				PmenuSel = { bg = "#333842" },
+	-- 				illuminatedWord = { bg = "#3b4261" },
+	-- 				illuminatedCurWord = { bg = "#3b4261" },
+	-- 				IlluminatedWordText = { bg = "#3b4261" },
+	-- 				IlluminatedWordRead = { bg = "#3b4261" },
+	-- 				IlluminatedWordWrite = { bg = "#3b4261" },
+	-- 				StatusLine = { fg = "#f8f8f2", bg = "${bg}" },
+	-- 				StatusLineTerm = { fg = "#f8f8f2", bg = "${bg}" },
+	-- 				BufferLineFill = { bg = "${bg}" },
+	-- 				["@string.special.url.html"] = { fg = "${green}" },
+	-- 				["@text.uri.html"] = { fg = "${green}" },
+	-- 				Pmenu = { fg = "${fg}", bg = "${bg}" },
+	-- 				PmenuThumb = { bg = "${gray}" }, -- Popup menu: Thumb of the scrollbar.
+	-- 				-- overide lualine fill color with bg color
+	-- 				LualineNormal = { bg = "${bg}" },
+	-- 				-- overide lualine_c fill color with bg color
+	-- 				LualineC = { bg = "${bg}" },
+	-- 				-- overide lualine_x fill color with bg color
+	-- 				LualineX = { bg = "${bg}" },
+	-- 				-- overide which-key fill color with bg color
+	-- 				WhichKey = { bg = "${bg}" },
+	-- 				-- overide which-key fill color with bg color
+	-- 				WhichKeySeperator = { bg = "${bg}" },
+	-- 				-- overide which-key fill color with bg color
+	-- 				WhichKeyDesc = { bg = "${bg}" },
+	-- 				-- overide which-key fill color with bg color
+	-- 				WhichKeyFloat = { bg = "${bg}" },
+	-- 				-- overide which-key fill color with bg color
+	-- 				WhichKeyValue = { bg = "${bg}" },
+	-- 				-- overide which-key fill color with bg color
+	-- 				WhichKeyBorder = { bg = "${bg}" },
+	-- 			},
+	-- 		})
+	-- 	end,
+	-- },
 }
diff --git a/lua/custom/plugins/tokyonight.lua b/lua/custom/plugins/tokyonight.lua
index 9950327..0196ea9 100644
--- a/lua/custom/plugins/tokyonight.lua
+++ b/lua/custom/plugins/tokyonight.lua
@@ -36,7 +36,7 @@ return {
 					-- comments = { italic = true },
 					comments = { italic = true },
 					keywords = { italic = true },
-					functions = { italic = true },
+					functions = {},
 					variables = {},
 					-- Background styles. Can be "dark", "transparent" or "normal"
 					sidebars = sidebar, -- style for sidebars, see below
diff --git a/lua/plugins/colorscheme.lua b/lua/plugins/colorscheme.lua
index e8a81af..9c9836c 100644
--- a/lua/plugins/colorscheme.lua
+++ b/lua/plugins/colorscheme.lua
@@ -240,6 +240,7 @@ return {
 					["@keyword"] = { fg = colors.pink, italic = true },
 					["@keyword.function"] = { fg = colors.cyan, italic = true },
 					["@function"] = { fg = colors.green, italic = true },
+					["@tag.attribute"] = { fg = colors.green, italic = true },
 					NvimTreeFolderIcon = { fg = "#6776a7" },
 					CmpItemAbbr = { fg = "#ABB2BF" },
 					CmpItemKind = { fg = "#ABB2BF" },
@@ -347,10 +348,31 @@ return {
 				term_colors = true,
 				style = onedark_style,
 				colors = {
+					green = "#99c379",
+					gray = "#8094b4",
+					red = "#e06c75",
+					purple = "#c678dd",
+					yellow = "#e5c07a",
+					blue = "#61afef",
+					cyan = "#56b6c2",
 					bg_d = "$bg",
+					bg1 = "#282c34",
+				},
+				code_style = {
+					comments = "italic",
+					keywords = "italic",
+					functions = "none",
+					strings = "none",
+					variables = "none",
 				},
 				highlights = {
+					["@markup.link.url"] = { fg = "$cyan", fmt = "italic" },
+					["@text.uri"] = { fg = "$cyan", fmt = "none" },
+					["@tag"] = { fg = "$red" },
+					["@tag.delimiter"] = { fg = "$gray" },
+					["@tag.attribute"] = { fg = "$yellow", fmt = "italic" },
 					-- NvimTreeFolderIcon = { fg = "#FCC76A" },
+					NvimTreeSpecialFile = { fg = "$yellow", fmt = "italic" },
 					BufferLineFill = { bg = "$bg0" },
 					BufferLineUnfocusedFill = { bg = "$bg0" },
 					StatusLine = { fg = "#f8f8f2", bg = "$bg0" },
@@ -360,7 +382,7 @@ return {
 					IlluminatedWordText = { bg = "#3b4261" },
 					IlluminatedWordRead = { bg = "#3b4261" },
 					IlluminatedWordWrite = { bg = "#3b4261" },
-					PmenuSel = { fg = "$fg", bg = "$bg1" },
+					PmenuSel = { fg = "$fg", bg = "#333842" },
 					-- overide lualine fill color with bg color
 					LualineNormal = { bg = "$bg0" },
 					-- overide lualine_c fill color with bg color
@@ -404,6 +426,11 @@ return {
 					-- -- overide Lazy fill color with bg color
 					-- LazyProgress = { bg = "$bg0" },
 					-- Pmenu = { fg = "$fg", bg = "$bg0" },
+					CursorLine = { bg = "#333842" },
+					Cursor = { fg = "$bg0", bg = "$fg" }, -- character under the cursor
+					lCursor = { fg = "$bg0", bg = "$fg" }, -- the character under the cursor when |language-mapping| is used (see 'guicursor')
+					CursorIM = { fg = "$bg0", bg = "$fg" }, -- like Cursor, but used when in IME mode |CursorIM|
+					CursorColumn = { bg = "#333842" }, -- Screen-column at the cursor, when 'cursorcolumn' is set.
 				},
 				transparent = transparent,
 				lualine = {