diff --git a/lua/pcode/plugins/theme/evatheme.lua b/lua/pcode/plugins/theme/evatheme.lua
index da0506c..dd932b5 100644
--- a/lua/pcode/plugins/theme/evatheme.lua
+++ b/lua/pcode/plugins/theme/evatheme.lua
@@ -14,20 +14,16 @@ return {
       pattern = "*",
       callback = function()
         local hi = vim.api.nvim_set_hl
-        -- hi(0, "LspInfoBorder", { fg = "#2F3F5C" })
-        -- hi(0, "LspInfoBorder", { fg = "#598DEF" })
-        hi(0, "LspInfoBorder", { fg = "#8A97C3" })
-        -- hi(0, "FloatBorder", { fg = "#2F3F5C" })
-        -- hi(0, "FloatBorder", { fg = "#598DEF" })
-        hi(0, "FloatBorder", { fg = "#8A97C3" })
+        hi(0, "LspInfoBorder", { fg = color.comment })
+        hi(0, "FloatBorder", { fg = color.comment })
         hi(0, "StatusLine", { bg = color.background })
         hi(0, "StatusLineNC", { bg = color.background })
         hi(0, "WinBar", { bg = color.background })
         hi(0, "WinBarNC", { bg = color.background })
         hi(0, "NormalFloat", { bg = color.background })
         hi(0, "NormalNC", { bg = color.background })
-        hi(0, "@tag.delimiter.javascript", { fg = "#838FA7" })
-        hi(0, "@tag.delimiter.tsx", { fg = "#838FA7" })
+        hi(0, "@tag.delimiter.javascript", { fg = color.punctuation })
+        hi(0, "@tag.delimiter.tsx", { fg = color.punctuation })
         -- git
         hi(0, "NvimTreeGitNewIcon", { bg = color.dark, fg = color.git.added })
         hi(0, "NvimTreeGitRenamedIcon", { bg = color.dark, fg = color.git.added })
@@ -40,11 +36,11 @@ return {
         hi(0, "MiniIndentscopeSymbol", { bg = color.dark, fg = color.parameter })
         -- cursor
         -- hi(0, "Cursor", { bg = "#838FA7", fg = "#838FA7" })
-        hi(0, "CursorColumn", { bg = color.dark, fg = "#838FA7" })
-        hi(0, "TermCursor", { bg = "#FF9070", fg = color.dark })
-        hi(0, "TermCursorNC", { bg = "#FF9070", fg = color.dark })
-        hi(0, "MiniIndentscopeSymbol", { fg = "#FF9070" })
-        hi(0, "MiniIndentscopeSymbolOff", { fg = "#FF9070" })
+        hi(0, "CursorColumn", { bg = color.dark, fg = color.punctuation })
+        hi(0, "TermCursor", { bg = color.digit, fg = color.dark })
+        hi(0, "TermCursorNC", { bg = color.digit, fg = color.dark })
+        hi(0, "MiniIndentscopeSymbol", { fg = color.digit })
+        hi(0, "MiniIndentscopeSymbolOff", { fg = color.digit })
       end,
     })
   end,