diff --git a/lua/base46/integrations/treesitter.lua b/lua/base46/integrations/treesitter.lua
index 82cb4ad..935b0bf 100644
--- a/lua/base46/integrations/treesitter.lua
+++ b/lua/base46/integrations/treesitter.lua
@@ -5,83 +5,79 @@ return {
     fg = theme.base0F,
   },
 
-  TSAttribute = {
+  ['@attribute'] = {
     fg = theme.base0A,
   },
 
-  TSTagAttribute = {
-    link = "TSProperty",
-  },
-
-  TSCharacter = {
+  ["@character"] = {
     fg = theme.base08,
   },
 
-  TSConstructor = {
+  ["@constructor"] = {
     fg = theme.base0C,
   },
 
-  TSConstBuiltin = {
+  ["@constant.builtin"] = {
     fg = theme.base09,
   },
 
-  TSConstMacro = {
+  ["@constant.macro"] = {
     fg = theme.base08,
   },
 
-  TSError = {
+  ["@error"] = {
     fg = theme.base08,
   },
 
-  TSException = {
+  ["@exception"] = {
     fg = theme.base08,
   },
 
-  TSFloat = {
+  ["@float"] = {
     fg = theme.base09,
   },
 
-  TSKeyword = {
+  ["@keyword"] = {
     fg = theme.base0E,
   },
 
-  TSKeywordFunction = {
+  ["@keyword.function"] = {
     fg = theme.base0E,
   },
 
-  TSKeywordReturn = {
+  ["@keyword.return"] = {
     fg = theme.base0E,
   },
 
-  TSFunction = {
+  ["@function"] = {
     fg = theme.base0D,
   },
 
-  TSFuncBuiltin = {
+  ["@function.builtin"] = {
     fg = theme.base0D,
   },
 
-  TSFuncMacro = {
+  ["@function.macro"] = {
     fg = theme.base08,
   },
 
-  TSKeywordOperator = {
+  ["@keyword.operator"] = {
     fg = theme.base0E,
   },
 
-  TSMethod = {
+  ["@method"] = {
     fg = theme.base0D,
   },
 
-  TSNamespace = {
+  ["@namespace"] = {
     fg = theme.base08,
   },
 
-  TSNone = {
+  ["@none"] = {
     fg = theme.base05,
   },
 
-  TSParameter = {
+  ["@paramter"] = {
     fg = theme.base08,
   },
 
@@ -89,74 +85,81 @@ return {
     fg = theme.base05,
   },
 
-  TSPunctBracket = {
+  ["@punctuation.bracket"] = {
     fg = theme.base0F,
   },
 
-  TSPunctDelimiter = {
+  ["@punctuation.delimiter"] = {
     fg = theme.base0F,
   },
 
-  TSPunctSpecial = {
+  ["@punctuation.special"] = {
     fg = theme.base08,
   },
 
-  TSStringRegex = {
+  ["@string.regex"] = {
     fg = theme.base0C,
   },
 
-  TSStringEscape = {
+  ["@string.escape"] = {
     fg = theme.base0C,
   },
 
-  TSSymbol = {
+  ["@symbol"] = {
     fg = theme.base0B,
   },
 
-  TSTagDelimiter = {
+  -- @tag
+
+  ["@tag.attribute"] = {
+    link = "TSProperty",
+  },
+
+  ["@tag.delimiter"] = {
     fg = theme.base0F,
   },
 
-  TSText = {
+  ["@text"] = {
     fg = theme.base05,
   },
 
-  TSStrong = {
+  ["@text.strong"] = {
     bold = true,
   },
 
-  TSEmphasis = {
+  ["@text.emphasis"] = {
     fg = theme.base09,
   },
 
-  TSStrike = {
+  ["@text.strike"] = {
     fg = theme.base00,
     strikethrough = true,
   },
 
-  TSLiteral = {
+  ["@text.literal"] = {
     fg = theme.base09,
   },
 
-  TSURI = {
+  ["@text.uri"] = {
     fg = theme.base09,
-
     underline = true,
   },
 
-  TSTypeBuiltin = {
+  ["@type.builtin"] = {
     fg = theme.base0A,
   },
 
-  TSVariableBuiltin = {
-    fg = theme.base09,
+  ["@variable"] = {
+    fg = theme.base05,
   },
 
-  TSVariable = {
-    fg = theme.base05,
+  ["@variable.builtin"] = {
+    fg = theme.base09,
   },
 
-  TSDefinition = {
+  -- variable.global
+
+  ["@definition"] = {
     sp = theme.base04,
     underline = true,
   },
@@ -170,23 +173,23 @@ return {
     bold = true,
   },
 
-  luaTSField = {
-    fg = theme.base0D,
+  ["@field"] = {
+    fg = theme.base08,
   },
 
   TSFieldKey = {
-    fg = theme.base08,
+    fg = theme.base0D,
   },
 
-  TSProperty = {
+  ["@property"] = {
     fg = theme.base08,
   },
 
-  TSInclude = {
+  ["@include"] = {
     link = "Include",
   },
 
-  TSConditional = {
+  ["@conditional"] = {
     link = "Conditional",
   },
 }