diff --git a/lua/astrobox/highlights/modules/syntax.lua b/lua/astrobox/highlights/modules/syntax.lua
index cfebbe7..122e6d2 100644
--- a/lua/astrobox/highlights/modules/syntax.lua
+++ b/lua/astrobox/highlights/modules/syntax.lua
@@ -95,7 +95,7 @@ return function(theme, palette)
         ["@operator"] = { link = "@keyword.operator" }, -- Deprecated?
         ["@parameter"] = { link = "@variable.parameter" }, -- Deprecated
         ["@preproc"] = { link = "PreProc" },
-        ["@property"] = { link = "@field" },
+        ["@property"] = { link = "@variable.member" },
         ["@punctuation.bracket"] = { link = "Identifier" },
         ["@punctuation.delimiter"] = { fg = palette.orange },
         ["@punctuation.special"] = { link = "Special" },
@@ -118,7 +118,7 @@ return function(theme, palette)
         ["@typeParameter"] = { fg = palette.yellow },
         ["@variable"] = { link = "Identifier" },
         ["@variable.builtin"] = { bold = true },
-        ["@variable.member"] = { link = "Identifier" },
+        ["@variable.member"] = theme.highlight,
         ["@variable.parameter"] = { fg = palette.fg_gradiant[2] },
 
         -- LSP
@@ -137,7 +137,7 @@ return function(theme, palette)
         ["@lsp.type.namespace"] = { fg = palette.fg_gradiant[2] },
         ["@lsp.type.operator"] = { link = "Operator" },
         ["@lsp.type.parameter"] = { link = "@parameter" },
-        ["@lsp.type.property"] = { link = "@property" },
+        ["@lsp.type.property"] = { link = "@variable.member" },
         ["@lsp.type.selfTypeKeyword"] = { fg = palette.green, bold = true },
         ["@lsp.type.string"] = { link = "@string" },
         ["@lsp.type.struct"] = { link = "@struct" },
@@ -147,7 +147,7 @@ return function(theme, palette)
         ["@lsp.typemod.comment.documentation"] = { link = "@comment.documentation" },
         ["@lsp.typemod.derive.attribute"] = { fg = palette.blue },
         ["@lsp.typemod.method"] = { link = "@method" },
-        ["@lsp.typemod.selfKeyword"] = { fg = palette.fg, bold = true },
+        ["@lsp.typemod.selfKeyword"] = theme.highlight_bold,
         ["@lsp.typemod.string.attribute"] = { link = "String" }, -- Hmmmm
         ["@lsp.typemod.variable.readonly"] = { link = "Constant" },
     }
diff --git a/lua/astrobox/theme.lua b/lua/astrobox/theme.lua
index 16427fd..0f6f53c 100644
--- a/lua/astrobox/theme.lua
+++ b/lua/astrobox/theme.lua
@@ -9,6 +9,8 @@ function M.make_theme(P, C)
     local T = {
         none = { fg = P.none, bg = P.none },
         normal = { fg = P.fg, bg = P.bg },
+        highlight = { fg = P.fg_gradiant[1], bg = P.none },
+        highlight_bold = { fg = P.fg_gradiant[1], bg = P.none, bold = true },
         inverted = { fg = P.bg, bg = P.fg },
         inactive = { fg = P.fg_gradiant[4] },
         conceal = { fg = P.bg_gradiant[3], bg = P.harder_bg },