new treesitter highlights

46 files changed, 2484 insertions, 2484 deletions

diff --git a/templates/aquarium.toml b/templates/aquarium.toml
index a49cf64..40ed4ee 100644
--- a/templates/aquarium.toml
+++ b/templates/aquarium.toml
@@ -149,60 +149,60 @@ TabLineSel = 'white line'
 TabLineFill = 'line line'
 
 [Treesitter]
-TSComment = 'link:Comment'
-TSAnnotation = 'base0F'
-TSAttribute = 'base0A'
-TSConstructor = 'base0C'
-# TSType = 'cyan'
-TSTypeBuiltin = 'base0A'
-TSConditional = 'link:Conditional'
-TSException = 'base08'
-TSInclude = 'link:Include'
-TSKeywordReturn = 'base0E'
-TSKeyword = 'base0E'
-TSKeywordFunction = 'base0E'
-# TSLabel = 'cyan'
-TSNamespace = 'base08'
-# TSRepeat = 'yellow'
-# TSConstant = 'orange'
-TSConstBuiltin = 'base09'
-TSFloat = 'base09'
-# TSNumber = 'orange'
-# TSBoolean = 'orange'
-TSCharacter = 'base08'
-TSError = 'base08'
-TSFunction = 'base0D'
-TSFuncBuiltin = 'base0D'
-TSMethod = 'base0D'
-TSConstMacro = 'base08'
-TSFuncMacro = 'base08'
-TSVariable = 'base05'
-TSVariableBuiltin = 'base09'
-TSProperty = 'base08'
-TSField = 'base0D'
-TSParameter = 'base08'
-TSParameterReference = 'base05'
-TSSymbol = 'base0B'
-TSText = 'base05'
-# TSOperator = 'base05'
-TSPunctDelimiter = 'base0F'
-TSTagDelimiter = 'base0F'
-TSTagAttribute = 'link:TSProperty'
-TSPunctBracket = 'base0F'
-TSPunctSpecial = 'base08'
-# TSString = 'green'
-TSStringRegex = 'base0C'
-TSStringEscape = 'base0C'
-# TSTag = 'blue'
-TSEmphasis = 'base09'
-# TSUnderline = '- - u'
-# TSTitle = 'base05 - -'
-TSLiteral = 'base09'
-TSURI = 'base09'
-TSKeywordOperator = 'base0E'
-# TSStructure = 'cyan'
-TSStrong = '- - b'
-# TSQueryLinterError = 'base09'
+"@annotation" = 'base0F'
+"@attribute" = 'base0A'
+"@constructor" = 'base0C'
+#" TSType = 'cyan'
+"@type.builtin" = 'base0A'
+"@conditional" = 'link:Conditional'
+"@exception" = 'base08'
+"@include" = 'link:Include'
+"@keyword.return" = 'base0E'
+"@keyword" = 'base0E'
+"@keyword.function" = 'base0E'
+#" TSLabel = 'cyan'
+"@namespace" = 'base08'
+#" TSRepeat = 'yellow'
+#" TSConstant = 'orange'
+"@constant.builtin" = 'base09'
+"@float" = 'base09'
+#" TSNumber = 'orange'
+#" TSBoolean = 'orange'
+"@character" = 'base08'
+"@error" = 'base08'
+"@function" = 'base0D'
+"@function.builtin" = 'base0D'
+"@method" = 'base0D'
+"@constant.macro" = 'base08'
+"@function.macro" = 'base08'
+"@variable" = 'base05'
+"@variable.builtin" = 'base09'
+"@property" = 'base08'
+"@field" = 'base0D'
+"@parameter" = 'base08'
+"@parameter.reference" = 'base05'
+"@symbol" = 'base0B'
+"@text" = 'base05'
+#" "@Operator = 'base05'
+"@punctuation.delimiter" = 'base0F'
+"@tag.delimiter" = 'base0F'
+"@tag.attribute" = 'link:@Property'
+"@punctuation.bracket" = 'base0F'
+"@punctuation.special" = 'base08'
+#" "@String = 'green'
+"@string.regex" = 'base0C'
+"@string.escape" = 'base0C'
+#" "@Tag = 'blue'
+"@emphasis" = 'base09'
+#" "@Underline = '- - u'
+#" "@Title = 'base05 - -'
+"@literal" = 'base09'
+"@text.uri" = 'base09'
+"@keyword.operator" = 'base0E'
+#" "@Structure = 'cyan'
+"@strong" = '- - b'
+#" "@QueryLinterError = 'base09'
+"@scope" = '- - b'
 TreesitterContext = 'link:CursorLine'
 
 [markdown]
diff --git a/templates/ayu_dark.toml b/templates/ayu_dark.toml
index cd15ac8..89fa882 100644
--- a/templates/ayu_dark.toml
+++ b/templates/ayu_dark.toml
@@ -149,60 +149,60 @@ TabLineSel = 'white line'
 TabLineFill = 'line line'
 
 [Treesitter]
-TSComment = 'link:Comment'
-TSAnnotation = 'base0F'
-TSAttribute = 'base0A'
-TSConstructor = 'base0C'
-# TSType = 'cyan'
-TSTypeBuiltin = 'base0A'
-TSConditional = 'link:Conditional'
-TSException = 'base08'
-TSInclude = 'link:Include'
-TSKeywordReturn = 'base0E'
-TSKeyword = 'base0E'
-TSKeywordFunction = 'base0E'
-# TSLabel = 'cyan'
-TSNamespace = 'base08'
-# TSRepeat = 'yellow'
-# TSConstant = 'orange'
-TSConstBuiltin = 'base09'
-TSFloat = 'base09'
-# TSNumber = 'orange'
-# TSBoolean = 'orange'
-TSCharacter = 'base08'
-TSError = 'base08'
-TSFunction = 'base0D'
-TSFuncBuiltin = 'base0D'
-TSMethod = 'base0D'
-TSConstMacro = 'base08'
-TSFuncMacro = 'base08'
-TSVariable = 'base05'
-TSVariableBuiltin = 'base09'
-TSProperty = 'base08'
-TSField = 'base0D'
-TSParameter = 'base08'
-TSParameterReference = 'base05'
-TSSymbol = 'base0B'
-TSText = 'base05'
-# TSOperator = 'base05'
-TSPunctDelimiter = 'base0F'
-TSTagDelimiter = 'base0F'
-TSTagAttribute = 'link:TSProperty'
-TSPunctBracket = 'base0F'
-TSPunctSpecial = 'base08'
-# TSString = 'green'
-TSStringRegex = 'base0C'
-TSStringEscape = 'base0C'
-# TSTag = 'blue'
-TSEmphasis = 'base09'
-# TSUnderline = '- - u'
-# TSTitle = 'base05 - -'
-TSLiteral = 'base09'
-TSURI = 'base09'
-TSKeywordOperator = 'base0E'
-# TSStructure = 'cyan'
-TSStrong = '- - b'
-# TSQueryLinterError = 'base09'
+"@annotation" = 'base0F'
+"@attribute" = 'base0A'
+"@constructor" = 'base0C'
+#" TSType = 'cyan'
+"@type.builtin" = 'base0A'
+"@conditional" = 'link:Conditional'
+"@exception" = 'base08'
+"@include" = 'link:Include'
+"@keyword.return" = 'base0E'
+"@keyword" = 'base0E'
+"@keyword.function" = 'base0E'
+#" TSLabel = 'cyan'
+"@namespace" = 'base08'
+#" TSRepeat = 'yellow'
+#" TSConstant = 'orange'
+"@constant.builtin" = 'base09'
+"@float" = 'base09'
+#" TSNumber = 'orange'
+#" TSBoolean = 'orange'
+"@character" = 'base08'
+"@error" = 'base08'
+"@function" = 'base0D'
+"@function.builtin" = 'base0D'
+"@method" = 'base0D'
+"@constant.macro" = 'base08'
+"@function.macro" = 'base08'
+"@variable" = 'base05'
+"@variable.builtin" = 'base09'
+"@property" = 'base08'
+"@field" = 'base0D'
+"@parameter" = 'base08'
+"@parameter.reference" = 'base05'
+"@symbol" = 'base0B'
+"@text" = 'base05'
+#" "@Operator = 'base05'
+"@punctuation.delimiter" = 'base0F'
+"@tag.delimiter" = 'base0F'
+"@tag.attribute" = 'link:@Property'
+"@punctuation.bracket" = 'base0F'
+"@punctuation.special" = 'base08'
+#" "@String = 'green'
+"@string.regex" = 'base0C'
+"@string.escape" = 'base0C'
+#" "@Tag = 'blue'
+"@emphasis" = 'base09'
+#" "@Underline = '- - u'
+#" "@Title = 'base05 - -'
+"@literal" = 'base09'
+"@text.uri" = 'base09'
+"@keyword.operator" = 'base0E'
+#" "@Structure = 'cyan'
+"@strong" = '- - b'
+#" "@QueryLinterError = 'base09'
+"@scope" = '- - b'
 TreesitterContext = 'link:CursorLine'
 
 [markdown]
diff --git a/templates/ayu_light.toml b/templates/ayu_light.toml
index f94c67f..bc70cfc 100644
--- a/templates/ayu_light.toml
+++ b/templates/ayu_light.toml
@@ -149,60 +149,60 @@ TabLineSel = 'white line'
 TabLineFill = 'line line'
 
 [Treesitter]
-TSComment = 'link:Comment'
-TSAnnotation = 'base0F'
-TSAttribute = 'base0A'
-TSConstructor = 'base0C'
-# TSType = 'cyan'
-TSTypeBuiltin = 'base0A'
-TSConditional = 'link:Conditional'
-TSException = 'base08'
-TSInclude = 'link:Include'
-TSKeywordReturn = 'base0E'
-TSKeyword = 'base0E'
-TSKeywordFunction = 'base0E'
-# TSLabel = 'cyan'
-TSNamespace = 'base08'
-# TSRepeat = 'yellow'
-# TSConstant = 'orange'
-TSConstBuiltin = 'base09'
-TSFloat = 'base09'
-# TSNumber = 'orange'
-# TSBoolean = 'orange'
-TSCharacter = 'base08'
-TSError = 'base08'
-TSFunction = 'base0D'
-TSFuncBuiltin = 'base0D'
-TSMethod = 'base0D'
-TSConstMacro = 'base08'
-TSFuncMacro = 'base08'
-TSVariable = 'base05'
-TSVariableBuiltin = 'base09'
-TSProperty = 'base08'
-TSField = 'base0D'
-TSParameter = 'base08'
-TSParameterReference = 'base05'
-TSSymbol = 'base0B'
-TSText = 'base05'
-# TSOperator = 'base05'
-TSPunctDelimiter = 'base0F'
-TSTagDelimiter = 'base0F'
-TSTagAttribute = 'link:TSProperty'
-TSPunctBracket = 'base0F'
-TSPunctSpecial = 'base08'
-# TSString = 'green'
-TSStringRegex = 'base0C'
-TSStringEscape = 'base0C'
-# TSTag = 'blue'
-TSEmphasis = 'base09'
-# TSUnderline = '- - u'
-# TSTitle = 'base05 - -'
-TSLiteral = 'base09'
-TSURI = 'base09'
-TSKeywordOperator = 'base0E'
-# TSStructure = 'cyan'
-TSStrong = '- - b'
-# TSQueryLinterError = 'base09'
+"@annotation" = 'base0F'
+"@attribute" = 'base0A'
+"@constructor" = 'base0C'
+#" TSType = 'cyan'
+"@type.builtin" = 'base0A'
+"@conditional" = 'link:Conditional'
+"@exception" = 'base08'
+"@include" = 'link:Include'
+"@keyword.return" = 'base0E'
+"@keyword" = 'base0E'
+"@keyword.function" = 'base0E'
+#" TSLabel = 'cyan'
+"@namespace" = 'base08'
+#" TSRepeat = 'yellow'
+#" TSConstant = 'orange'
+"@constant.builtin" = 'base09'
+"@float" = 'base09'
+#" TSNumber = 'orange'
+#" TSBoolean = 'orange'
+"@character" = 'base08'
+"@error" = 'base08'
+"@function" = 'base0D'
+"@function.builtin" = 'base0D'
+"@method" = 'base0D'
+"@constant.macro" = 'base08'
+"@function.macro" = 'base08'
+"@variable" = 'base05'
+"@variable.builtin" = 'base09'
+"@property" = 'base08'
+"@field" = 'base0D'
+"@parameter" = 'base08'
+"@parameter.reference" = 'base05'
+"@symbol" = 'base0B'
+"@text" = 'base05'
+#" "@Operator = 'base05'
+"@punctuation.delimiter" = 'base0F'
+"@tag.delimiter" = 'base0F'
+"@tag.attribute" = 'link:@Property'
+"@punctuation.bracket" = 'base0F'
+"@punctuation.special" = 'base08'
+#" "@String = 'green'
+"@string.regex" = 'base0C'
+"@string.escape" = 'base0C'
+#" "@Tag = 'blue'
+"@emphasis" = 'base09'
+#" "@Underline = '- - u'
+#" "@Title = 'base05 - -'
+"@literal" = 'base09'
+"@text.uri" = 'base09'
+"@keyword.operator" = 'base0E'
+#" "@Structure = 'cyan'
+"@strong" = '- - b'
+#" "@QueryLinterError = 'base09'
+"@scope" = '- - b'
 TreesitterContext = 'link:CursorLine'
 
 [markdown]
diff --git a/templates/blossom.toml b/templates/blossom.toml
index bdb4f54..97d5ca8 100644
--- a/templates/blossom.toml
+++ b/templates/blossom.toml
@@ -149,60 +149,60 @@ TabLineSel = 'white line'
 TabLineFill = 'line line'
 
 [Treesitter]
-TSComment = 'link:Comment'
-TSAnnotation = 'base0F'
-TSAttribute = 'base0A'
-TSConstructor = 'base0C'
-# TSType = 'cyan'
-TSTypeBuiltin = 'base0A'
-TSConditional = 'link:Conditional'
-TSException = 'base08'
-TSInclude = 'link:Include'
-TSKeywordReturn = 'base0E'
-TSKeyword = 'base0E'
-TSKeywordFunction = 'base0E'
-# TSLabel = 'cyan'
-TSNamespace = 'base08'
-# TSRepeat = 'yellow'
-# TSConstant = 'orange'
-TSConstBuiltin = 'base09'
-TSFloat = 'base09'
-# TSNumber = 'orange'
-# TSBoolean = 'orange'
-TSCharacter = 'base08'
-TSError = 'base08'
-TSFunction = 'base0D'
-TSFuncBuiltin = 'base0D'
-TSMethod = 'base0D'
-TSConstMacro = 'base08'
-TSFuncMacro = 'base08'
-TSVariable = 'base05'
-TSVariableBuiltin = 'base09'
-TSProperty = 'base08'
-TSField = 'base0D'
-TSParameter = 'base08'
-TSParameterReference = 'base05'
-TSSymbol = 'base0B'
-TSText = 'base05'
-# TSOperator = 'base05'
-TSPunctDelimiter = 'base0F'
-TSTagDelimiter = 'base0F'
-TSTagAttribute = 'link:TSProperty'
-TSPunctBracket = 'base0F'
-TSPunctSpecial = 'base08'
-# TSString = 'green'
-TSStringRegex = 'base0C'
-TSStringEscape = 'base0C'
-# TSTag = 'blue'
-TSEmphasis = 'base09'
-# TSUnderline = '- - u'
-# TSTitle = 'base05 - -'
-TSLiteral = 'base09'
-TSURI = 'base09'
-TSKeywordOperator = 'base0E'
-# TSStructure = 'cyan'
-TSStrong = '- - b'
-# TSQueryLinterError = 'base09'
+"@annotation" = 'base0F'
+"@attribute" = 'base0A'
+"@constructor" = 'base0C'
+#" TSType = 'cyan'
+"@type.builtin" = 'base0A'
+"@conditional" = 'link:Conditional'
+"@exception" = 'base08'
+"@include" = 'link:Include'
+"@keyword.return" = 'base0E'
+"@keyword" = 'base0E'
+"@keyword.function" = 'base0E'
+#" TSLabel = 'cyan'
+"@namespace" = 'base08'
+#" TSRepeat = 'yellow'
+#" TSConstant = 'orange'
+"@constant.builtin" = 'base09'
+"@float" = 'base09'
+#" TSNumber = 'orange'
+#" TSBoolean = 'orange'
+"@character" = 'base08'
+"@error" = 'base08'
+"@function" = 'base0D'
+"@function.builtin" = 'base0D'
+"@method" = 'base0D'
+"@constant.macro" = 'base08'
+"@function.macro" = 'base08'
+"@variable" = 'base05'
+"@variable.builtin" = 'base09'
+"@property" = 'base08'
+"@field" = 'base0D'
+"@parameter" = 'base08'
+"@parameter.reference" = 'base05'
+"@symbol" = 'base0B'
+"@text" = 'base05'
+#" "@Operator = 'base05'
+"@punctuation.delimiter" = 'base0F'
+"@tag.delimiter" = 'base0F'
+"@tag.attribute" = 'link:@Property'
+"@punctuation.bracket" = 'base0F'
+"@punctuation.special" = 'base08'
+#" "@String = 'green'
+"@string.regex" = 'base0C'
+"@string.escape" = 'base0C'
+#" "@Tag = 'blue'
+"@emphasis" = 'base09'
+#" "@Underline = '- - u'
+#" "@Title = 'base05 - -'
+"@literal" = 'base09'
+"@text.uri" = 'base09'
+"@keyword.operator" = 'base0E'
+#" "@Structure = 'cyan'
+"@strong" = '- - b'
+#" "@QueryLinterError = 'base09'
+"@scope" = '- - b'
 TreesitterContext = 'link:CursorLine'
 
 [markdown]
diff --git a/templates/catppuccin.toml b/templates/catppuccin.toml
index a34ae0c..ba13384 100644
--- a/templates/catppuccin.toml
+++ b/templates/catppuccin.toml
@@ -150,60 +150,60 @@ TabLineSel = 'white line'
 TabLineFill = 'line line'
 
 [Treesitter]
-TSComment = 'link:Comment'
-TSAnnotation = 'base0F'
-TSAttribute = 'base0A'
-TSConstructor = 'base0C'
-# TSType = 'cyan'
-TSTypeBuiltin = 'base0A'
-TSConditional = 'link:Conditional'
-TSException = 'base08'
-TSInclude = 'link:Include'
-TSKeywordReturn = 'base0E'
-TSKeyword = 'base0E'
-TSKeywordFunction = 'base0E'
-# TSLabel = 'cyan'
-TSNamespace = 'base08'
-# TSRepeat = 'yellow'
-# TSConstant = 'orange'
-TSConstBuiltin = 'base09'
-TSFloat = 'base09'
-# TSNumber = 'orange'
-# TSBoolean = 'orange'
-TSCharacter = 'base08'
-TSError = 'base08'
-TSFunction = 'base0D'
-TSFuncBuiltin = 'base0D'
-TSMethod = 'base0D'
-TSConstMacro = 'base08'
-TSFuncMacro = 'base08'
-TSVariable = 'base05'
-TSVariableBuiltin = 'base09'
-TSProperty = 'base08'
-TSField = 'base0D'
-TSParameter = 'base08'
-TSParameterReference = 'base05'
-TSSymbol = 'base0B'
-TSText = 'base05'
-# TSOperator = 'base05'
-TSPunctDelimiter = 'base0F'
-TSTagDelimiter = 'base0F'
-TSTagAttribute = 'link:TSProperty'
-TSPunctBracket = 'base0F'
-TSPunctSpecial = 'base08'
-# TSString = 'green'
-TSStringRegex = 'base0C'
-TSStringEscape = 'base0C'
-# TSTag = 'blue'
-TSEmphasis = 'base09'
-# TSUnderline = '- - u'
-# TSTitle = 'base05 - -'
-TSLiteral = 'base09'
-TSURI = 'base09'
-TSKeywordOperator = 'base0E'
-# TSStructure = 'cyan'
-TSStrong = '- - b'
-# TSQueryLinterError = 'base09'
+"@annotation" = 'base0F'
+"@attribute" = 'base0A'
+"@constructor" = 'base0C'
+#" TSType = 'cyan'
+"@type.builtin" = 'base0A'
+"@conditional" = 'link:Conditional'
+"@exception" = 'base08'
+"@include" = 'link:Include'
+"@keyword.return" = 'base0E'
+"@keyword" = 'base0E'
+"@keyword.function" = 'base0E'
+#" TSLabel = 'cyan'
+"@namespace" = 'base08'
+#" TSRepeat = 'yellow'
+#" TSConstant = 'orange'
+"@constant.builtin" = 'base09'
+"@float" = 'base09'
+#" TSNumber = 'orange'
+#" TSBoolean = 'orange'
+"@character" = 'base08'
+"@error" = 'base08'
+"@function" = 'base0D'
+"@function.builtin" = 'base0D'
+"@method" = 'base0D'
+"@constant.macro" = 'base08'
+"@function.macro" = 'base08'
+"@variable" = 'base05'
+"@variable.builtin" = 'base09'
+"@property" = 'base08'
+"@field" = 'base0D'
+"@parameter" = 'base08'
+"@parameter.reference" = 'base05'
+"@symbol" = 'base0B'
+"@text" = 'base05'
+#" "@Operator = 'base05'
+"@punctuation.delimiter" = 'base0F'
+"@tag.delimiter" = 'base0F'
+"@tag.attribute" = 'link:@Property'
+"@punctuation.bracket" = 'base0F'
+"@punctuation.special" = 'base08'
+#" "@String = 'green'
+"@string.regex" = 'base0C'
+"@string.escape" = 'base0C'
+#" "@Tag = 'blue'
+"@emphasis" = 'base09'
+#" "@Underline = '- - u'
+#" "@Title = 'base05 - -'
+"@literal" = 'base09'
+"@text.uri" = 'base09'
+"@keyword.operator" = 'base0E'
+#" "@Structure = 'cyan'
+"@strong" = '- - b'
+#" "@QueryLinterError = 'base09'
+"@scope" = '- - b'
 TreesitterContext = 'link:CursorLine'
 
 [markdown]
diff --git a/templates/catppuccin_latte.toml b/templates/catppuccin_latte.toml
index a11ee37..ce2146c 100644
--- a/templates/catppuccin_latte.toml
+++ b/templates/catppuccin_latte.toml
@@ -149,60 +149,60 @@ TabLineSel = 'white line'
 TabLineFill = 'line line'
 
 [Treesitter]
-TSComment = 'link:Comment'
-TSAnnotation = 'base0F'
-TSAttribute = 'base0A'
-TSConstructor = 'base0C'
-# TSType = 'cyan'
-TSTypeBuiltin = 'base0A'
-TSConditional = 'link:Conditional'
-TSException = 'base08'
-TSInclude = 'link:Include'
-TSKeywordReturn = 'base0E'
-TSKeyword = 'base0E'
-TSKeywordFunction = 'base0E'
-# TSLabel = 'cyan'
-TSNamespace = 'base08'
-# TSRepeat = 'yellow'
-# TSConstant = 'orange'
-TSConstBuiltin = 'base09'
-TSFloat = 'base09'
-# TSNumber = 'orange'
-# TSBoolean = 'orange'
-TSCharacter = 'base08'
-TSError = 'base08'
-TSFunction = 'base0D'
-TSFuncBuiltin = 'base0D'
-TSMethod = 'base0D'
-TSConstMacro = 'base08'
-TSFuncMacro = 'base08'
-TSVariable = 'base05'
-TSVariableBuiltin = 'base09'
-TSProperty = 'base08'
-TSField = 'base0D'
-TSParameter = 'base08'
-TSParameterReference = 'base05'
-TSSymbol = 'base0B'
-TSText = 'base05'
-# TSOperator = 'base05'
-TSPunctDelimiter = 'base0F'
-TSTagDelimiter = 'base0F'
-TSTagAttribute = 'link:TSProperty'
-TSPunctBracket = 'base0F'
-TSPunctSpecial = 'base08'
-# TSString = 'green'
-TSStringRegex = 'base0C'
-TSStringEscape = 'base0C'
-# TSTag = 'blue'
-TSEmphasis = 'base09'
-# TSUnderline = '- - u'
-# TSTitle = 'base05 - -'
-TSLiteral = 'base09'
-TSURI = 'base09'
-TSKeywordOperator = 'base0E'
-# TSStructure = 'cyan'
-TSStrong = '- - b'
-# TSQueryLinterError = 'base09'
+"@annotation" = 'base0F'
+"@attribute" = 'base0A'
+"@constructor" = 'base0C'
+#" TSType = 'cyan'
+"@type.builtin" = 'base0A'
+"@conditional" = 'link:Conditional'
+"@exception" = 'base08'
+"@include" = 'link:Include'
+"@keyword.return" = 'base0E'
+"@keyword" = 'base0E'
+"@keyword.function" = 'base0E'
+#" TSLabel = 'cyan'
+"@namespace" = 'base08'
+#" TSRepeat = 'yellow'
+#" TSConstant = 'orange'
+"@constant.builtin" = 'base09'
+"@float" = 'base09'
+#" TSNumber = 'orange'
+#" TSBoolean = 'orange'
+"@character" = 'base08'
+"@error" = 'base08'
+"@function" = 'base0D'
+"@function.builtin" = 'base0D'
+"@method" = 'base0D'
+"@constant.macro" = 'base08'
+"@function.macro" = 'base08'
+"@variable" = 'base05'
+"@variable.builtin" = 'base09'
+"@property" = 'base08'
+"@field" = 'base0D'
+"@parameter" = 'base08'
+"@parameter.reference" = 'base05'
+"@symbol" = 'base0B'
+"@text" = 'base05'
+#" "@Operator = 'base05'
+"@punctuation.delimiter" = 'base0F'
+"@tag.delimiter" = 'base0F'
+"@tag.attribute" = 'link:@Property'
+"@punctuation.bracket" = 'base0F'
+"@punctuation.special" = 'base08'
+#" "@String = 'green'
+"@string.regex" = 'base0C'
+"@string.escape" = 'base0C'
+#" "@Tag = 'blue'
+"@emphasis" = 'base09'
+#" "@Underline = '- - u'
+#" "@Title = 'base05 - -'
+"@literal" = 'base09'
+"@text.uri" = 'base09'
+"@keyword.operator" = 'base0E'
+#" "@Structure = 'cyan'
+"@strong" = '- - b'
+#" "@QueryLinterError = 'base09'
+"@scope" = '- - b'
 TreesitterContext = 'link:CursorLine'
 
 [markdown]
diff --git a/templates/chadracula.toml b/templates/chadracula.toml
index 97b61c6..744d9d3 100644
--- a/templates/chadracula.toml
+++ b/templates/chadracula.toml
@@ -149,60 +149,60 @@ TabLineSel = 'white line'
 TabLineFill = 'line line'
 
 [Treesitter]
-TSComment = 'link:Comment'
-TSAnnotation = 'base0F'
-TSAttribute = 'base0A'
-TSConstructor = 'base0C'
-# TSType = 'cyan'
-TSTypeBuiltin = 'base0A'
-TSConditional = 'link:Conditional'
-TSException = 'base08'
-TSInclude = 'link:Include'
-TSKeywordReturn = 'base0E'
-TSKeyword = 'base0E'
-TSKeywordFunction = 'base0E'
-# TSLabel = 'cyan'
-TSNamespace = 'base08'
-# TSRepeat = 'yellow'
-# TSConstant = 'orange'
-TSConstBuiltin = 'base09'
-TSFloat = 'base09'
-# TSNumber = 'orange'
-# TSBoolean = 'orange'
-TSCharacter = 'base08'
-TSError = 'base08'
-TSFunction = 'base0D'
-TSFuncBuiltin = 'base0D'
-TSMethod = 'base0D'
-TSConstMacro = 'base08'
-TSFuncMacro = 'base08'
-TSVariable = 'base05'
-TSVariableBuiltin = 'base09'
-TSProperty = 'base08'
-TSField = 'base0D'
-TSParameter = 'base08'
-TSParameterReference = 'base05'
-TSSymbol = 'base0B'
-TSText = 'base05'
-# TSOperator = 'base05'
-TSPunctDelimiter = 'base0F'
-TSTagDelimiter = 'base0F'
-TSTagAttribute = 'link:TSProperty'
-TSPunctBracket = 'base0F'
-TSPunctSpecial = 'base08'
-# TSString = 'green'
-TSStringRegex = 'base0C'
-TSStringEscape = 'base0C'
-# TSTag = 'blue'
-TSEmphasis = 'base09'
-# TSUnderline = '- - u'
-# TSTitle = 'base05 - -'
-TSLiteral = 'base09'
-TSURI = 'base09'
-TSKeywordOperator = 'base0E'
-# TSStructure = 'cyan'
-TSStrong = '- - b'
-# TSQueryLinterError = 'base09'
+"@annotation" = 'base0F'
+"@attribute" = 'base0A'
+"@constructor" = 'base0C'
+#" TSType = 'cyan'
+"@type.builtin" = 'base0A'
+"@conditional" = 'link:Conditional'
+"@exception" = 'base08'
+"@include" = 'link:Include'
+"@keyword.return" = 'base0E'
+"@keyword" = 'base0E'
+"@keyword.function" = 'base0E'
+#" TSLabel = 'cyan'
+"@namespace" = 'base08'
+#" TSRepeat = 'yellow'
+#" TSConstant = 'orange'
+"@constant.builtin" = 'base09'
+"@float" = 'base09'
+#" TSNumber = 'orange'
+#" TSBoolean = 'orange'
+"@character" = 'base08'
+"@error" = 'base08'
+"@function" = 'base0D'
+"@function.builtin" = 'base0D'
+"@method" = 'base0D'
+"@constant.macro" = 'base08'
+"@function.macro" = 'base08'
+"@variable" = 'base05'
+"@variable.builtin" = 'base09'
+"@property" = 'base08'
+"@field" = 'base0D'
+"@parameter" = 'base08'
+"@parameter.reference" = 'base05'
+"@symbol" = 'base0B'
+"@text" = 'base05'
+#" "@Operator = 'base05'
+"@punctuation.delimiter" = 'base0F'
+"@tag.delimiter" = 'base0F'
+"@tag.attribute" = 'link:@Property'
+"@punctuation.bracket" = 'base0F'
+"@punctuation.special" = 'base08'
+#" "@String = 'green'
+"@string.regex" = 'base0C'
+"@string.escape" = 'base0C'
+#" "@Tag = 'blue'
+"@emphasis" = 'base09'
+#" "@Underline = '- - u'
+#" "@Title = 'base05 - -'
+"@literal" = 'base09'
+"@text.uri" = 'base09'
+"@keyword.operator" = 'base0E'
+#" "@Structure = 'cyan'
+"@strong" = '- - b'
+#" "@QueryLinterError = 'base09'
+"@scope" = '- - b'
 TreesitterContext = 'link:CursorLine'
 
 [markdown]
diff --git a/templates/chadtain.toml b/templates/chadtain.toml
index 9d19e89..8fe6766 100644
--- a/templates/chadtain.toml
+++ b/templates/chadtain.toml
@@ -149,60 +149,60 @@ TabLineSel = 'white line'
 TabLineFill = 'line line'
 
 [Treesitter]
-TSComment = 'link:Comment'
-TSAnnotation = 'base0F'
-TSAttribute = 'base0A'
-TSConstructor = 'base0C'
-# TSType = 'cyan'
-TSTypeBuiltin = 'base0A'
-TSConditional = 'link:Conditional'
-TSException = 'base08'
-TSInclude = 'link:Include'
-TSKeywordReturn = 'base0E'
-TSKeyword = 'base0E'
-TSKeywordFunction = 'base0E'
-# TSLabel = 'cyan'
-TSNamespace = 'base08'
-# TSRepeat = 'yellow'
-# TSConstant = 'orange'
-TSConstBuiltin = 'base09'
-TSFloat = 'base09'
-# TSNumber = 'orange'
-# TSBoolean = 'orange'
-TSCharacter = 'base08'
-TSError = 'base08'
-TSFunction = 'base0D'
-TSFuncBuiltin = 'base0D'
-TSMethod = 'base0D'
-TSConstMacro = 'base08'
-TSFuncMacro = 'base08'
-TSVariable = 'base05'
-TSVariableBuiltin = 'base09'
-TSProperty = 'base08'
-TSField = 'base0D'
-TSParameter = 'base08'
-TSParameterReference = 'base05'
-TSSymbol = 'base0B'
-TSText = 'base05'
-# TSOperator = 'base05'
-TSPunctDelimiter = 'base0F'
-TSTagDelimiter = 'base0F'
-TSTagAttribute = 'link:TSProperty'
-TSPunctBracket = 'base0F'
-TSPunctSpecial = 'base08'
-# TSString = 'green'
-TSStringRegex = 'base0C'
-TSStringEscape = 'base0C'
-# TSTag = 'blue'
-TSEmphasis = 'base09'
-# TSUnderline = '- - u'
-# TSTitle = 'base05 - -'
-TSLiteral = 'base09'
-TSURI = 'base09'
-TSKeywordOperator = 'base0E'
-# TSStructure = 'cyan'
-TSStrong = '- - b'
-# TSQueryLinterError = 'base09'
+"@annotation" = 'base0F'
+"@attribute" = 'base0A'
+"@constructor" = 'base0C'
+#" TSType = 'cyan'
+"@type.builtin" = 'base0A'
+"@conditional" = 'link:Conditional'
+"@exception" = 'base08'
+"@include" = 'link:Include'
+"@keyword.return" = 'base0E'
+"@keyword" = 'base0E'
+"@keyword.function" = 'base0E'
+#" TSLabel = 'cyan'
+"@namespace" = 'base08'
+#" TSRepeat = 'yellow'
+#" TSConstant = 'orange'
+"@constant.builtin" = 'base09'
+"@float" = 'base09'
+#" TSNumber = 'orange'
+#" TSBoolean = 'orange'
+"@character" = 'base08'
+"@error" = 'base08'
+"@function" = 'base0D'
+"@function.builtin" = 'base0D'
+"@method" = 'base0D'
+"@constant.macro" = 'base08'
+"@function.macro" = 'base08'
+"@variable" = 'base05'
+"@variable.builtin" = 'base09'
+"@property" = 'base08'
+"@field" = 'base0D'
+"@parameter" = 'base08'
+"@parameter.reference" = 'base05'
+"@symbol" = 'base0B'
+"@text" = 'base05'
+#" "@Operator = 'base05'
+"@punctuation.delimiter" = 'base0F'
+"@tag.delimiter" = 'base0F'
+"@tag.attribute" = 'link:@Property'
+"@punctuation.bracket" = 'base0F'
+"@punctuation.special" = 'base08'
+#" "@String = 'green'
+"@string.regex" = 'base0C'
+"@string.escape" = 'base0C'
+#" "@Tag = 'blue'
+"@emphasis" = 'base09'
+#" "@Underline = '- - u'
+#" "@Title = 'base05 - -'
+"@literal" = 'base09'
+"@text.uri" = 'base09'
+"@keyword.operator" = 'base0E'
+#" "@Structure = 'cyan'
+"@strong" = '- - b'
+#" "@QueryLinterError = 'base09'
+"@scope" = '- - b'
 TreesitterContext = 'link:CursorLine'
 
 [markdown]
diff --git a/templates/chocolate.toml b/templates/chocolate.toml
index 5e61a13..8233405 100644
--- a/templates/chocolate.toml
+++ b/templates/chocolate.toml
@@ -150,60 +150,60 @@ TabLineSel = 'white line'
 TabLineFill = 'line line'
 
 [Treesitter]
-TSComment = 'link:Comment'
-TSAnnotation = 'base0F'
-TSAttribute = 'base0A'
-TSConstructor = 'base0C'
-# TSType = 'cyan'
-TSTypeBuiltin = 'base0A'
-TSConditional = 'link:Conditional'
-TSException = 'base08'
-TSInclude = 'link:Include'
-TSKeywordReturn = 'base0E'
-TSKeyword = 'base0E'
-TSKeywordFunction = 'base0E'
-# TSLabel = 'cyan'
-TSNamespace = 'base08'
-# TSRepeat = 'yellow'
-# TSConstant = 'orange'
-TSConstBuiltin = 'base09'
-TSFloat = 'base09'
-# TSNumber = 'orange'
-# TSBoolean = 'orange'
-TSCharacter = 'base08'
-TSError = 'base08'
-TSFunction = 'base0D'
-TSFuncBuiltin = 'base0D'
-TSMethod = 'base0D'
-TSConstMacro = 'base08'
-TSFuncMacro = 'base08'
-TSVariable = 'base05'
-TSVariableBuiltin = 'base09'
-TSProperty = 'base08'
-TSField = 'base0D'
-TSParameter = 'base08'
-TSParameterReference = 'base05'
-TSSymbol = 'base0B'
-TSText = 'base05'
-# TSOperator = 'base05'
-TSPunctDelimiter = 'base0F'
-TSTagDelimiter = 'base0F'
-TSTagAttribute = 'link:TSProperty'
-TSPunctBracket = 'base0F'
-TSPunctSpecial = 'base08'
-# TSString = 'green'
-TSStringRegex = 'base0C'
-TSStringEscape = 'base0C'
-# TSTag = 'blue'
-TSEmphasis = 'base09'
-# TSUnderline = '- - u'
-# TSTitle = 'base05 - -'
-TSLiteral = 'base09'
-TSURI = 'base09'
-TSKeywordOperator = 'base0E'
-# TSStructure = 'cyan'
-TSStrong = '- - b'
-# TSQueryLinterError = 'base09'
+"@annotation" = 'base0F'
+"@attribute" = 'base0A'
+"@constructor" = 'base0C'
+#" TSType = 'cyan'
+"@type.builtin" = 'base0A'
+"@conditional" = 'link:Conditional'
+"@exception" = 'base08'
+"@include" = 'link:Include'
+"@keyword.return" = 'base0E'
+"@keyword" = 'base0E'
+"@keyword.function" = 'base0E'
+#" TSLabel = 'cyan'
+"@namespace" = 'base08'
+#" TSRepeat = 'yellow'
+#" TSConstant = 'orange'
+"@constant.builtin" = 'base09'
+"@float" = 'base09'
+#" TSNumber = 'orange'
+#" TSBoolean = 'orange'
+"@character" = 'base08'
+"@error" = 'base08'
+"@function" = 'base0D'
+"@function.builtin" = 'base0D'
+"@method" = 'base0D'
+"@constant.macro" = 'base08'
+"@function.macro" = 'base08'
+"@variable" = 'base05'
+"@variable.builtin" = 'base09'
+"@property" = 'base08'
+"@field" = 'base0D'
+"@parameter" = 'base08'
+"@parameter.reference" = 'base05'
+"@symbol" = 'base0B'
+"@text" = 'base05'
+#" "@Operator = 'base05'
+"@punctuation.delimiter" = 'base0F'
+"@tag.delimiter" = 'base0F'
+"@tag.attribute" = 'link:@Property'
+"@punctuation.bracket" = 'base0F'
+"@punctuation.special" = 'base08'
+#" "@String = 'green'
+"@string.regex" = 'base0C'
+"@string.escape" = 'base0C'
+#" "@Tag = 'blue'
+"@emphasis" = 'base09'
+#" "@Underline = '- - u'
+#" "@Title = 'base05 - -'
+"@literal" = 'base09'
+"@text.uri" = 'base09'
+"@keyword.operator" = 'base0E'
+#" "@Structure = 'cyan'
+"@strong" = '- - b'
+#" "@QueryLinterError = 'base09'
+"@scope" = '- - b'
 TreesitterContext = 'link:CursorLine'
 
 [markdown]
diff --git a/templates/dark_horizon.toml b/templates/dark_horizon.toml
index c913265..b5134a0 100644
--- a/templates/dark_horizon.toml
+++ b/templates/dark_horizon.toml
@@ -149,60 +149,60 @@ TabLineSel = 'white line'
 TabLineFill = 'line line'
 
 [Treesitter]
-TSComment = 'link:Comment'
-TSAnnotation = 'base0F'
-TSAttribute = 'base0A'
-TSConstructor = 'base0C'
-# TSType = 'cyan'
-TSTypeBuiltin = 'base0A'
-TSConditional = 'link:Conditional'
-TSException = 'base08'
-TSInclude = 'link:Include'
-TSKeywordReturn = 'base0E'
-TSKeyword = 'base0E'
-TSKeywordFunction = 'base0E'
-# TSLabel = 'cyan'
-TSNamespace = 'base08'
-# TSRepeat = 'yellow'
-# TSConstant = 'orange'
-TSConstBuiltin = 'base09'
-TSFloat = 'base09'
-# TSNumber = 'orange'
-# TSBoolean = 'orange'
-TSCharacter = 'base08'
-TSError = 'base08'
-TSFunction = 'base0D'
-TSFuncBuiltin = 'base0D'
-TSMethod = 'base0D'
-TSConstMacro = 'base08'
-TSFuncMacro = 'base08'
-TSVariable = 'base05'
-TSVariableBuiltin = 'base09'
-TSProperty = 'base08'
-TSField = 'base0D'
-TSParameter = 'base08'
-TSParameterReference = 'base05'
-TSSymbol = 'base0B'
-TSText = 'base05'
-# TSOperator = 'base05'
-TSPunctDelimiter = 'base0F'
-TSTagDelimiter = 'base0F'
-TSTagAttribute = 'link:TSProperty'
-TSPunctBracket = 'base0F'
-TSPunctSpecial = 'base08'
-# TSString = 'green'
-TSStringRegex = 'base0C'
-TSStringEscape = 'base0C'
-# TSTag = 'blue'
-TSEmphasis = 'base09'
-# TSUnderline = '- - u'
-# TSTitle = 'base05 - -'
-TSLiteral = 'base09'
-TSURI = 'base09'
-TSKeywordOperator = 'base0E'
-# TSStructure = 'cyan'
-TSStrong = '- - b'
-# TSQueryLinterError = 'base09'
+"@annotation" = 'base0F'
+"@attribute" = 'base0A'
+"@constructor" = 'base0C'
+#" TSType = 'cyan'
+"@type.builtin" = 'base0A'
+"@conditional" = 'link:Conditional'
+"@exception" = 'base08'
+"@include" = 'link:Include'
+"@keyword.return" = 'base0E'
+"@keyword" = 'base0E'
+"@keyword.function" = 'base0E'
+#" TSLabel = 'cyan'
+"@namespace" = 'base08'
+#" TSRepeat = 'yellow'
+#" TSConstant = 'orange'
+"@constant.builtin" = 'base09'
+"@float" = 'base09'
+#" TSNumber = 'orange'
+#" TSBoolean = 'orange'
+"@character" = 'base08'
+"@error" = 'base08'
+"@function" = 'base0D'
+"@function.builtin" = 'base0D'
+"@method" = 'base0D'
+"@constant.macro" = 'base08'
+"@function.macro" = 'base08'
+"@variable" = 'base05'
+"@variable.builtin" = 'base09'
+"@property" = 'base08'
+"@field" = 'base0D'
+"@parameter" = 'base08'
+"@parameter.reference" = 'base05'
+"@symbol" = 'base0B'
+"@text" = 'base05'
+#" "@Operator = 'base05'
+"@punctuation.delimiter" = 'base0F'
+"@tag.delimiter" = 'base0F'
+"@tag.attribute" = 'link:@Property'
+"@punctuation.bracket" = 'base0F'
+"@punctuation.special" = 'base08'
+#" "@String = 'green'
+"@string.regex" = 'base0C'
+"@string.escape" = 'base0C'
+#" "@Tag = 'blue'
+"@emphasis" = 'base09'
+#" "@Underline = '- - u'
+#" "@Title = 'base05 - -'
+"@literal" = 'base09'
+"@text.uri" = 'base09'
+"@keyword.operator" = 'base0E'
+#" "@Structure = 'cyan'
+"@strong" = '- - b'
+#" "@QueryLinterError = 'base09'
+"@scope" = '- - b'
 TreesitterContext = 'link:CursorLine'
 
 [markdown]
diff --git a/templates/decay.toml b/templates/decay.toml
index 996856b..d07515c 100644
--- a/templates/decay.toml
+++ b/templates/decay.toml
@@ -149,60 +149,60 @@ TabLineSel = 'white line'
 TabLineFill = 'line line'
 
 [Treesitter]
-TSComment = 'link:Comment'
-TSAnnotation = 'base0F'
-TSAttribute = 'base0A'
-TSConstructor = 'base0C'
-# TSType = 'cyan'
-TSTypeBuiltin = 'base0A'
-TSConditional = 'link:Conditional'
-TSException = 'base08'
-TSInclude = 'link:Include'
-TSKeywordReturn = 'base0E'
-TSKeyword = 'base0E'
-TSKeywordFunction = 'base0E'
-# TSLabel = 'cyan'
-TSNamespace = 'base08'
-# TSRepeat = 'yellow'
-# TSConstant = 'orange'
-TSConstBuiltin = 'base09'
-TSFloat = 'base09'
-# TSNumber = 'orange'
-# TSBoolean = 'orange'
-TSCharacter = 'base08'
-TSError = 'base08'
-TSFunction = 'base0D'
-TSFuncBuiltin = 'base0D'
-TSMethod = 'base0D'
-TSConstMacro = 'base08'
-TSFuncMacro = 'base08'
-TSVariable = 'base05'
-TSVariableBuiltin = 'base09'
-TSProperty = 'base08'
-TSField = 'base0D'
-TSParameter = 'base08'
-TSParameterReference = 'base05'
-TSSymbol = 'base0B'
-TSText = 'base05'
-# TSOperator = 'base05'
-TSPunctDelimiter = 'base0F'
-TSTagDelimiter = 'base0F'
-TSTagAttribute = 'link:TSProperty'
-TSPunctBracket = 'base0F'
-TSPunctSpecial = 'base08'
-# TSString = 'green'
-TSStringRegex = 'base0C'
-TSStringEscape = 'base0C'
-# TSTag = 'blue'
-TSEmphasis = 'base09'
-# TSUnderline = '- - u'
-# TSTitle = 'base05 - -'
-TSLiteral = 'base09'
-TSURI = 'base09'
-TSKeywordOperator = 'base0E'
-# TSStructure = 'cyan'
-TSStrong = '- - b'
-# TSQueryLinterError = 'base09'
+"@annotation" = 'base0F'
+"@attribute" = 'base0A'
+"@constructor" = 'base0C'
+#" TSType = 'cyan'
+"@type.builtin" = 'base0A'
+"@conditional" = 'link:Conditional'
+"@exception" = 'base08'
+"@include" = 'link:Include'
+"@keyword.return" = 'base0E'
+"@keyword" = 'base0E'
+"@keyword.function" = 'base0E'
+#" TSLabel = 'cyan'
+"@namespace" = 'base08'
+#" TSRepeat = 'yellow'
+#" TSConstant = 'orange'
+"@constant.builtin" = 'base09'
+"@float" = 'base09'
+#" TSNumber = 'orange'
+#" TSBoolean = 'orange'
+"@character" = 'base08'
+"@error" = 'base08'
+"@function" = 'base0D'
+"@function.builtin" = 'base0D'
+"@method" = 'base0D'
+"@constant.macro" = 'base08'
+"@function.macro" = 'base08'
+"@variable" = 'base05'
+"@variable.builtin" = 'base09'
+"@property" = 'base08'
+"@field" = 'base0D'
+"@parameter" = 'base08'
+"@parameter.reference" = 'base05'
+"@symbol" = 'base0B'
+"@text" = 'base05'
+#" "@Operator = 'base05'
+"@punctuation.delimiter" = 'base0F'
+"@tag.delimiter" = 'base0F'
+"@tag.attribute" = 'link:@Property'
+"@punctuation.bracket" = 'base0F'
+"@punctuation.special" = 'base08'
+#" "@String = 'green'
+"@string.regex" = 'base0C'
+"@string.escape" = 'base0C'
+#" "@Tag = 'blue'
+"@emphasis" = 'base09'
+#" "@Underline = '- - u'
+#" "@Title = 'base05 - -'
+"@literal" = 'base09'
+"@text.uri" = 'base09'
+"@keyword.operator" = 'base0E'
+#" "@Structure = 'cyan'
+"@strong" = '- - b'
+#" "@QueryLinterError = 'base09'
+"@scope" = '- - b'
 TreesitterContext = 'link:CursorLine'
 
 [markdown]
diff --git a/templates/doomchad.toml b/templates/doomchad.toml
index 8d3be76..124b004 100644
--- a/templates/doomchad.toml
+++ b/templates/doomchad.toml
@@ -149,60 +149,60 @@ TabLineSel = 'white line'
 TabLineFill = 'line line'
 
 [Treesitter]
-TSComment = 'link:Comment'
-TSAnnotation = 'base0F'
-TSAttribute = 'base0A'
-TSConstructor = 'base0C'
-# TSType = 'cyan'
-TSTypeBuiltin = 'base0A'
-TSConditional = 'link:Conditional'
-TSException = 'base08'
-TSInclude = 'link:Include'
-TSKeywordReturn = 'base0E'
-TSKeyword = 'base0E'
-TSKeywordFunction = 'base0E'
-# TSLabel = 'cyan'
-TSNamespace = 'base08'
-# TSRepeat = 'yellow'
-# TSConstant = 'orange'
-TSConstBuiltin = 'base09'
-TSFloat = 'base09'
-# TSNumber = 'orange'
-# TSBoolean = 'orange'
-TSCharacter = 'base08'
-TSError = 'base08'
-TSFunction = 'base0D'
-TSFuncBuiltin = 'base0D'
-TSMethod = 'base0D'
-TSConstMacro = 'base08'
-TSFuncMacro = 'base08'
-TSVariable = 'base05'
-TSVariableBuiltin = 'base09'
-TSProperty = 'base08'
-TSField = 'base0D'
-TSParameter = 'base08'
-TSParameterReference = 'base05'
-TSSymbol = 'base0B'
-TSText = 'base05'
-# TSOperator = 'base05'
-TSPunctDelimiter = 'base0F'
-TSTagDelimiter = 'base0F'
-TSTagAttribute = 'link:TSProperty'
-TSPunctBracket = 'base0F'
-TSPunctSpecial = 'base08'
-# TSString = 'green'
-TSStringRegex = 'base0C'
-TSStringEscape = 'base0C'
-# TSTag = 'blue'
-TSEmphasis = 'base09'
-# TSUnderline = '- - u'
-# TSTitle = 'base05 - -'
-TSLiteral = 'base09'
-TSURI = 'base09'
-TSKeywordOperator = 'base0E'
-# TSStructure = 'cyan'
-TSStrong = '- - b'
-# TSQueryLinterError = 'base09'
+"@annotation" = 'base0F'
+"@attribute" = 'base0A'
+"@constructor" = 'base0C'
+#" TSType = 'cyan'
+"@type.builtin" = 'base0A'
+"@conditional" = 'link:Conditional'
+"@exception" = 'base08'
+"@include" = 'link:Include'
+"@keyword.return" = 'base0E'
+"@keyword" = 'base0E'
+"@keyword.function" = 'base0E'
+#" TSLabel = 'cyan'
+"@namespace" = 'base08'
+#" TSRepeat = 'yellow'
+#" TSConstant = 'orange'
+"@constant.builtin" = 'base09'
+"@float" = 'base09'
+#" TSNumber = 'orange'
+#" TSBoolean = 'orange'
+"@character" = 'base08'
+"@error" = 'base08'
+"@function" = 'base0D'
+"@function.builtin" = 'base0D'
+"@method" = 'base0D'
+"@constant.macro" = 'base08'
+"@function.macro" = 'base08'
+"@variable" = 'base05'
+"@variable.builtin" = 'base09'
+"@property" = 'base08'
+"@field" = 'base0D'
+"@parameter" = 'base08'
+"@parameter.reference" = 'base05'
+"@symbol" = 'base0B'
+"@text" = 'base05'
+#" "@Operator = 'base05'
+"@punctuation.delimiter" = 'base0F'
+"@tag.delimiter" = 'base0F'
+"@tag.attribute" = 'link:@Property'
+"@punctuation.bracket" = 'base0F'
+"@punctuation.special" = 'base08'
+#" "@String = 'green'
+"@string.regex" = 'base0C'
+"@string.escape" = 'base0C'
+#" "@Tag = 'blue'
+"@emphasis" = 'base09'
+#" "@Underline = '- - u'
+#" "@Title = 'base05 - -'
+"@literal" = 'base09'
+"@text.uri" = 'base09'
+"@keyword.operator" = 'base0E'
+#" "@Structure = 'cyan'
+"@strong" = '- - b'
+#" "@QueryLinterError = 'base09'
+"@scope" = '- - b'
 TreesitterContext = 'link:CursorLine'
 
 [markdown]
diff --git a/templates/everforest.toml b/templates/everforest.toml
index fc28621..02a4008 100644
--- a/templates/everforest.toml
+++ b/templates/everforest.toml
@@ -149,60 +149,60 @@ TabLineSel = 'white line'
 TabLineFill = 'line line'
 
 [Treesitter]
-TSComment = 'link:Comment'
-TSAnnotation = 'base0F'
-TSAttribute = 'base0A'
-TSConstructor = 'base0C'
-# TSType = 'cyan'
-TSTypeBuiltin = 'base0A'
-TSConditional = 'link:Conditional'
-TSException = 'base08'
-TSInclude = 'link:Include'
-TSKeywordReturn = 'base0E'
-TSKeyword = 'base0E'
-TSKeywordFunction = 'base0E'
-# TSLabel = 'cyan'
-TSNamespace = 'base08'
-# TSRepeat = 'yellow'
-# TSConstant = 'orange'
-TSConstBuiltin = 'base09'
-TSFloat = 'base09'
-# TSNumber = 'orange'
-# TSBoolean = 'orange'
-TSCharacter = 'base08'
-TSError = 'base08'
-TSFunction = 'base0D'
-TSFuncBuiltin = 'base0D'
-TSMethod = 'base0D'
-TSConstMacro = 'base08'
-TSFuncMacro = 'base08'
-TSVariable = 'base05'
-TSVariableBuiltin = 'base09'
-TSProperty = 'base08'
-TSField = 'base0D'
-TSParameter = 'base08'
-TSParameterReference = 'base05'
-TSSymbol = 'base0B'
-TSText = 'base05'
-# TSOperator = 'base05'
-TSPunctDelimiter = 'base0F'
-TSTagDelimiter = 'base0F'
-TSTagAttribute = 'link:TSProperty'
-TSPunctBracket = 'base0F'
-TSPunctSpecial = 'base08'
-# TSString = 'green'
-TSStringRegex = 'base0C'
-TSStringEscape = 'base0C'
-# TSTag = 'blue'
-TSEmphasis = 'base09'
-# TSUnderline = '- - u'
-# TSTitle = 'base05 - -'
-TSLiteral = 'base09'
-TSURI = 'base09'
-TSKeywordOperator = 'base0E'
-# TSStructure = 'cyan'
-TSStrong = '- - b'
-# TSQueryLinterError = 'base09'
+"@annotation" = 'base0F'
+"@attribute" = 'base0A'
+"@constructor" = 'base0C'
+#" TSType = 'cyan'
+"@type.builtin" = 'base0A'
+"@conditional" = 'link:Conditional'
+"@exception" = 'base08'
+"@include" = 'link:Include'
+"@keyword.return" = 'base0E'
+"@keyword" = 'base0E'
+"@keyword.function" = 'base0E'
+#" TSLabel = 'cyan'
+"@namespace" = 'base08'
+#" TSRepeat = 'yellow'
+#" TSConstant = 'orange'
+"@constant.builtin" = 'base09'
+"@float" = 'base09'
+#" TSNumber = 'orange'
+#" TSBoolean = 'orange'
+"@character" = 'base08'
+"@error" = 'base08'
+"@function" = 'base0D'
+"@function.builtin" = 'base0D'
+"@method" = 'base0D'
+"@constant.macro" = 'base08'
+"@function.macro" = 'base08'
+"@variable" = 'base05'
+"@variable.builtin" = 'base09'
+"@property" = 'base08'
+"@field" = 'base0D'
+"@parameter" = 'base08'
+"@parameter.reference" = 'base05'
+"@symbol" = 'base0B'
+"@text" = 'base05'
+#" "@Operator = 'base05'
+"@punctuation.delimiter" = 'base0F'
+"@tag.delimiter" = 'base0F'
+"@tag.attribute" = 'link:@Property'
+"@punctuation.bracket" = 'base0F'
+"@punctuation.special" = 'base08'
+#" "@String = 'green'
+"@string.regex" = 'base0C'
+"@string.escape" = 'base0C'
+#" "@Tag = 'blue'
+"@emphasis" = 'base09'
+#" "@Underline = '- - u'
+#" "@Title = 'base05 - -'
+"@literal" = 'base09'
+"@text.uri" = 'base09'
+"@keyword.operator" = 'base0E'
+#" "@Structure = 'cyan'
+"@strong" = '- - b'
+#" "@QueryLinterError = 'base09'
+"@scope" = '- - b'
 TreesitterContext = 'link:CursorLine'
 
 [markdown]
diff --git a/templates/everforest_light.toml b/templates/everforest_light.toml
index d83c6fc..450cc91 100644
--- a/templates/everforest_light.toml
+++ b/templates/everforest_light.toml
@@ -149,60 +149,60 @@ TabLineSel = 'white line'
 TabLineFill = 'line line'
 
 [Treesitter]
-TSComment = 'link:Comment'
-TSAnnotation = 'base0F'
-TSAttribute = 'base0A'
-TSConstructor = 'base0C'
-# TSType = 'cyan'
-TSTypeBuiltin = 'base0A'
-TSConditional = 'link:Conditional'
-TSException = 'base08'
-TSInclude = 'link:Include'
-TSKeywordReturn = 'base0E'
-TSKeyword = 'base0E'
-TSKeywordFunction = 'base0E'
-# TSLabel = 'cyan'
-TSNamespace = 'base08'
-# TSRepeat = 'yellow'
-# TSConstant = 'orange'
-TSConstBuiltin = 'base09'
-TSFloat = 'base09'
-# TSNumber = 'orange'
-# TSBoolean = 'orange'
-TSCharacter = 'base08'
-TSError = 'base08'
-TSFunction = 'base0D'
-TSFuncBuiltin = 'base0D'
-TSMethod = 'base0D'
-TSConstMacro = 'base08'
-TSFuncMacro = 'base08'
-TSVariable = 'base05'
-TSVariableBuiltin = 'base09'
-TSProperty = 'base08'
-TSField = 'base0D'
-TSParameter = 'base08'
-TSParameterReference = 'base05'
-TSSymbol = 'base0B'
-TSText = 'base05'
-# TSOperator = 'base05'
-TSPunctDelimiter = 'base0F'
-TSTagDelimiter = 'base0F'
-TSTagAttribute = 'link:TSProperty'
-TSPunctBracket = 'base0F'
-TSPunctSpecial = 'base08'
-# TSString = 'green'
-TSStringRegex = 'base0C'
-TSStringEscape = 'base0C'
-# TSTag = 'blue'
-TSEmphasis = 'base09'
-# TSUnderline = '- - u'
-# TSTitle = 'base05 - -'
-TSLiteral = 'base09'
-TSURI = 'base09'
-TSKeywordOperator = 'base0E'
-# TSStructure = 'cyan'
-TSStrong = '- - b'
-# TSQueryLinterError = 'base09'
+"@annotation" = 'base0F'
+"@attribute" = 'base0A'
+"@constructor" = 'base0C'
+#" TSType = 'cyan'
+"@type.builtin" = 'base0A'
+"@conditional" = 'link:Conditional'
+"@exception" = 'base08'
+"@include" = 'link:Include'
+"@keyword.return" = 'base0E'
+"@keyword" = 'base0E'
+"@keyword.function" = 'base0E'
+#" TSLabel = 'cyan'
+"@namespace" = 'base08'
+#" TSRepeat = 'yellow'
+#" TSConstant = 'orange'
+"@constant.builtin" = 'base09'
+"@float" = 'base09'
+#" TSNumber = 'orange'
+#" TSBoolean = 'orange'
+"@character" = 'base08'
+"@error" = 'base08'
+"@function" = 'base0D'
+"@function.builtin" = 'base0D'
+"@method" = 'base0D'
+"@constant.macro" = 'base08'
+"@function.macro" = 'base08'
+"@variable" = 'base05'
+"@variable.builtin" = 'base09'
+"@property" = 'base08'
+"@field" = 'base0D'
+"@parameter" = 'base08'
+"@parameter.reference" = 'base05'
+"@symbol" = 'base0B'
+"@text" = 'base05'
+#" "@Operator = 'base05'
+"@punctuation.delimiter" = 'base0F'
+"@tag.delimiter" = 'base0F'
+"@tag.attribute" = 'link:@Property'
+"@punctuation.bracket" = 'base0F'
+"@punctuation.special" = 'base08'
+#" "@String = 'green'
+"@string.regex" = 'base0C'
+"@string.escape" = 'base0C'
+#" "@Tag = 'blue'
+"@emphasis" = 'base09'
+#" "@Underline = '- - u'
+#" "@Title = 'base05 - -'
+"@literal" = 'base09'
+"@text.uri" = 'base09'
+"@keyword.operator" = 'base0E'
+#" "@Structure = 'cyan'
+"@strong" = '- - b'
+#" "@QueryLinterError = 'base09'
+"@scope" = '- - b'
 TreesitterContext = 'link:CursorLine'
 
 [markdown]
diff --git a/templates/falcon.toml b/templates/falcon.toml
index 94e233b..f130b37 100644
--- a/templates/falcon.toml
+++ b/templates/falcon.toml
@@ -151,60 +151,60 @@ TabLineSel = 'white line'
 TabLineFill = 'line line'
 
 [Treesitter]
-TSComment = 'link:Comment'
-TSAnnotation = 'base0F'
-TSAttribute = 'base0A'
-TSConstructor = 'base0C'
-# TSType = 'cyan'
-TSTypeBuiltin = 'base0A'
-TSConditional = 'link:Conditional'
-TSException = 'base08'
-TSInclude = 'link:Include'
-TSKeywordReturn = 'base0E'
-TSKeyword = 'base0E'
-TSKeywordFunction = 'base0E'
-# TSLabel = 'cyan'
-TSNamespace = 'base08'
-# TSRepeat = 'yellow'
-# TSConstant = 'orange'
-TSConstBuiltin = 'base09'
-TSFloat = 'base09'
-# TSNumber = 'orange'
-# TSBoolean = 'orange'
-TSCharacter = 'base08'
-TSError = 'base08'
-TSFunction = 'base0D'
-TSFuncBuiltin = 'base0D'
-TSMethod = 'base0D'
-TSConstMacro = 'base08'
-TSFuncMacro = 'base08'
-TSVariable = 'base05'
-TSVariableBuiltin = 'base09'
-TSProperty = 'base08'
-TSField = 'base0D'
-TSParameter = 'base08'
-TSParameterReference = 'base05'
-TSSymbol = 'base0B'
-TSText = 'base05'
-# TSOperator = 'base05'
-TSPunctDelimiter = 'base0F'
-TSTagDelimiter = 'base0F'
-TSTagAttribute = 'link:TSProperty'
-TSPunctBracket = 'base0F'
-TSPunctSpecial = 'base08'
-# TSString = 'green'
-TSStringRegex = 'base0C'
-TSStringEscape = 'base0C'
-# TSTag = 'blue'
-TSEmphasis = 'base09'
-# TSUnderline = '- - u'
-# TSTitle = 'base05 - -'
-TSLiteral = 'base09'
-TSURI = 'base09'
-TSKeywordOperator = 'base0E'
-# TSStructure = 'cyan'
-TSStrong = '- - b'
-# TSQueryLinterError = 'base09'
+"@annotation" = 'base0F'
+"@attribute" = 'base0A'
+"@constructor" = 'base0C'
+#" TSType = 'cyan'
+"@type.builtin" = 'base0A'
+"@conditional" = 'link:Conditional'
+"@exception" = 'base08'
+"@include" = 'link:Include'
+"@keyword.return" = 'base0E'
+"@keyword" = 'base0E'
+"@keyword.function" = 'base0E'
+#" TSLabel = 'cyan'
+"@namespace" = 'base08'
+#" TSRepeat = 'yellow'
+#" TSConstant = 'orange'
+"@constant.builtin" = 'base09'
+"@float" = 'base09'
+#" TSNumber = 'orange'
+#" TSBoolean = 'orange'
+"@character" = 'base08'
+"@error" = 'base08'
+"@function" = 'base0D'
+"@function.builtin" = 'base0D'
+"@method" = 'base0D'
+"@constant.macro" = 'base08'
+"@function.macro" = 'base08'
+"@variable" = 'base05'
+"@variable.builtin" = 'base09'
+"@property" = 'base08'
+"@field" = 'base0D'
+"@parameter" = 'base08'
+"@parameter.reference" = 'base05'
+"@symbol" = 'base0B'
+"@text" = 'base05'
+#" "@Operator = 'base05'
+"@punctuation.delimiter" = 'base0F'
+"@tag.delimiter" = 'base0F'
+"@tag.attribute" = 'link:@Property'
+"@punctuation.bracket" = 'base0F'
+"@punctuation.special" = 'base08'
+#" "@String = 'green'
+"@string.regex" = 'base0C'
+"@string.escape" = 'base0C'
+#" "@Tag = 'blue'
+"@emphasis" = 'base09'
+#" "@Underline = '- - u'
+#" "@Title = 'base05 - -'
+"@literal" = 'base09'
+"@text.uri" = 'base09'
+"@keyword.operator" = 'base0E'
+#" "@Structure = 'cyan'
+"@strong" = '- - b'
+#" "@QueryLinterError = 'base09'
+"@scope" = '- - b'
 TreesitterContext = 'link:CursorLine'
 
 [markdown]
diff --git a/templates/gatekeeper.toml b/templates/gatekeeper.toml
index 6c34db7..bfadbd6 100644
--- a/templates/gatekeeper.toml
+++ b/templates/gatekeeper.toml
@@ -149,60 +149,60 @@ TabLineSel = 'white line'
 TabLineFill = 'line line'
 
 [Treesitter]
-TSComment = 'link:Comment'
-TSAnnotation = 'base0F'
-TSAttribute = 'base0A'
-TSConstructor = 'base0C'
-# TSType = 'cyan'
-TSTypeBuiltin = 'base0A'
-TSConditional = 'link:Conditional'
-TSException = 'base08'
-TSInclude = 'link:Include'
-TSKeywordReturn = 'base0E'
-TSKeyword = 'base0E'
-TSKeywordFunction = 'base0E'
-# TSLabel = 'cyan'
-TSNamespace = 'base08'
-# TSRepeat = 'yellow'
-# TSConstant = 'orange'
-TSConstBuiltin = 'base09'
-TSFloat = 'base09'
-# TSNumber = 'orange'
-# TSBoolean = 'orange'
-TSCharacter = 'base08'
-TSError = 'base08'
-TSFunction = 'base0D'
-TSFuncBuiltin = 'base0D'
-TSMethod = 'base0D'
-TSConstMacro = 'base08'
-TSFuncMacro = 'base08'
-TSVariable = 'base05'
-TSVariableBuiltin = 'base09'
-TSProperty = 'base08'
-TSField = 'base0D'
-TSParameter = 'base08'
-TSParameterReference = 'base05'
-TSSymbol = 'base0B'
-TSText = 'base05'
-# TSOperator = 'base05'
-TSPunctDelimiter = 'base0F'
-TSTagDelimiter = 'base0F'
-TSTagAttribute = 'link:TSProperty'
-TSPunctBracket = 'base0F'
-TSPunctSpecial = 'base08'
-# TSString = 'green'
-TSStringRegex = 'base0C'
-TSStringEscape = 'base0C'
-# TSTag = 'blue'
-TSEmphasis = 'base09'
-# TSUnderline = '- - u'
-# TSTitle = 'base05 - -'
-TSLiteral = 'base09'
-TSURI = 'base09'
-TSKeywordOperator = 'base0E'
-# TSStructure = 'cyan'
-TSStrong = '- - b'
-# TSQueryLinterError = 'base09'
+"@annotation" = 'base0F'
+"@attribute" = 'base0A'
+"@constructor" = 'base0C'
+#" TSType = 'cyan'
+"@type.builtin" = 'base0A'
+"@conditional" = 'link:Conditional'
+"@exception" = 'base08'
+"@include" = 'link:Include'
+"@keyword.return" = 'base0E'
+"@keyword" = 'base0E'
+"@keyword.function" = 'base0E'
+#" TSLabel = 'cyan'
+"@namespace" = 'base08'
+#" TSRepeat = 'yellow'
+#" TSConstant = 'orange'
+"@constant.builtin" = 'base09'
+"@float" = 'base09'
+#" TSNumber = 'orange'
+#" TSBoolean = 'orange'
+"@character" = 'base08'
+"@error" = 'base08'
+"@function" = 'base0D'
+"@function.builtin" = 'base0D'
+"@method" = 'base0D'
+"@constant.macro" = 'base08'
+"@function.macro" = 'base08'
+"@variable" = 'base05'
+"@variable.builtin" = 'base09'
+"@property" = 'base08'
+"@field" = 'base0D'
+"@parameter" = 'base08'
+"@parameter.reference" = 'base05'
+"@symbol" = 'base0B'
+"@text" = 'base05'
+#" "@Operator = 'base05'
+"@punctuation.delimiter" = 'base0F'
+"@tag.delimiter" = 'base0F'
+"@tag.attribute" = 'link:@Property'
+"@punctuation.bracket" = 'base0F'
+"@punctuation.special" = 'base08'
+#" "@String = 'green'
+"@string.regex" = 'base0C'
+"@string.escape" = 'base0C'
+#" "@Tag = 'blue'
+"@emphasis" = 'base09'
+#" "@Underline = '- - u'
+#" "@Title = 'base05 - -'
+"@literal" = 'base09'
+"@text.uri" = 'base09'
+"@keyword.operator" = 'base0E'
+#" "@Structure = 'cyan'
+"@strong" = '- - b'
+#" "@QueryLinterError = 'base09'
+"@scope" = '- - b'
 TreesitterContext = 'link:CursorLine'
 
 [markdown]
diff --git a/templates/gruvbox.toml b/templates/gruvbox.toml
index 852ee46..cd489a2 100644
--- a/templates/gruvbox.toml
+++ b/templates/gruvbox.toml
@@ -149,60 +149,60 @@ TabLineSel = 'white line'
 TabLineFill = 'line line'
 
 [Treesitter]
-TSComment = 'link:Comment'
-TSAnnotation = 'base0F'
-TSAttribute = 'base0A'
-TSConstructor = 'base0C'
-# TSType = 'cyan'
-TSTypeBuiltin = 'base0A'
-TSConditional = 'link:Conditional'
-TSException = 'base08'
-TSInclude = 'link:Include'
-TSKeywordReturn = 'base0E'
-TSKeyword = 'base0E'
-TSKeywordFunction = 'base0E'
-# TSLabel = 'cyan'
-TSNamespace = 'base08'
-# TSRepeat = 'yellow'
-# TSConstant = 'orange'
-TSConstBuiltin = 'base09'
-TSFloat = 'base09'
-# TSNumber = 'orange'
-# TSBoolean = 'orange'
-TSCharacter = 'base08'
-TSError = 'base08'
-TSFunction = 'base0D'
-TSFuncBuiltin = 'base0D'
-TSMethod = 'base0D'
-TSConstMacro = 'base08'
-TSFuncMacro = 'base08'
-TSVariable = 'base05'
-TSVariableBuiltin = 'base09'
-TSProperty = 'base08'
-TSField = 'base0D'
-TSParameter = 'base08'
-TSParameterReference = 'base05'
-TSSymbol = 'base0B'
-TSText = 'base05'
-# TSOperator = 'base05'
-TSPunctDelimiter = 'base0F'
-TSTagDelimiter = 'base0F'
-TSTagAttribute = 'link:TSProperty'
-TSPunctBracket = 'base0F'
-TSPunctSpecial = 'base08'
-# TSString = 'green'
-TSStringRegex = 'base0C'
-TSStringEscape = 'base0C'
-# TSTag = 'blue'
-TSEmphasis = 'base09'
-# TSUnderline = '- - u'
-# TSTitle = 'base05 - -'
-TSLiteral = 'base09'
-TSURI = 'base09'
-TSKeywordOperator = 'base0E'
-# TSStructure = 'cyan'
-TSStrong = '- - b'
-# TSQueryLinterError = 'base09'
+"@annotation" = 'base0F'
+"@attribute" = 'base0A'
+"@constructor" = 'base0C'
+#" TSType = 'cyan'
+"@type.builtin" = 'base0A'
+"@conditional" = 'link:Conditional'
+"@exception" = 'base08'
+"@include" = 'link:Include'
+"@keyword.return" = 'base0E'
+"@keyword" = 'base0E'
+"@keyword.function" = 'base0E'
+#" TSLabel = 'cyan'
+"@namespace" = 'base08'
+#" TSRepeat = 'yellow'
+#" TSConstant = 'orange'
+"@constant.builtin" = 'base09'
+"@float" = 'base09'
+#" TSNumber = 'orange'
+#" TSBoolean = 'orange'
+"@character" = 'base08'
+"@error" = 'base08'
+"@function" = 'base0D'
+"@function.builtin" = 'base0D'
+"@method" = 'base0D'
+"@constant.macro" = 'base08'
+"@function.macro" = 'base08'
+"@variable" = 'base05'
+"@variable.builtin" = 'base09'
+"@property" = 'base08'
+"@field" = 'base0D'
+"@parameter" = 'base08'
+"@parameter.reference" = 'base05'
+"@symbol" = 'base0B'
+"@text" = 'base05'
+#" "@Operator = 'base05'
+"@punctuation.delimiter" = 'base0F'
+"@tag.delimiter" = 'base0F'
+"@tag.attribute" = 'link:@Property'
+"@punctuation.bracket" = 'base0F'
+"@punctuation.special" = 'base08'
+#" "@String = 'green'
+"@string.regex" = 'base0C'
+"@string.escape" = 'base0C'
+#" "@Tag = 'blue'
+"@emphasis" = 'base09'
+#" "@Underline = '- - u'
+#" "@Title = 'base05 - -'
+"@literal" = 'base09'
+"@text.uri" = 'base09'
+"@keyword.operator" = 'base0E'
+#" "@Structure = 'cyan'
+"@strong" = '- - b'
+#" "@QueryLinterError = 'base09'
+"@scope" = '- - b'
 TreesitterContext = 'link:CursorLine'
 
 [markdown]
diff --git a/templates/gruvbox_light.toml b/templates/gruvbox_light.toml
index 3cc527d..2833f7b 100644
--- a/templates/gruvbox_light.toml
+++ b/templates/gruvbox_light.toml
@@ -149,60 +149,60 @@ TabLineSel = 'white line'
 TabLineFill = 'line line'
 
 [Treesitter]
-TSComment = 'link:Comment'
-TSAnnotation = 'base0F'
-TSAttribute = 'base0A'
-TSConstructor = 'base0C'
-# TSType = 'cyan'
-TSTypeBuiltin = 'base0A'
-TSConditional = 'link:Conditional'
-TSException = 'base08'
-TSInclude = 'link:Include'
-TSKeywordReturn = 'base0E'
-TSKeyword = 'base0E'
-TSKeywordFunction = 'base0E'
-# TSLabel = 'cyan'
-TSNamespace = 'base08'
-# TSRepeat = 'yellow'
-# TSConstant = 'orange'
-TSConstBuiltin = 'base09'
-TSFloat = 'base09'
-# TSNumber = 'orange'
-# TSBoolean = 'orange'
-TSCharacter = 'base08'
-TSError = 'base08'
-TSFunction = 'base0D'
-TSFuncBuiltin = 'base0D'
-TSMethod = 'base0D'
-TSConstMacro = 'base08'
-TSFuncMacro = 'base08'
-TSVariable = 'base05'
-TSVariableBuiltin = 'base09'
-TSProperty = 'base08'
-TSField = 'base0D'
-TSParameter = 'base08'
-TSParameterReference = 'base05'
-TSSymbol = 'base0B'
-TSText = 'base05'
-# TSOperator = 'base05'
-TSPunctDelimiter = 'base0F'
-TSTagDelimiter = 'base0F'
-TSTagAttribute = 'link:TSProperty'
-TSPunctBracket = 'base0F'
-TSPunctSpecial = 'base08'
-# TSString = 'green'
-TSStringRegex = 'base0C'
-TSStringEscape = 'base0C'
-# TSTag = 'blue'
-TSEmphasis = 'base09'
-# TSUnderline = '- - u'
-# TSTitle = 'base05 - -'
-TSLiteral = 'base09'
-TSURI = 'base09'
-TSKeywordOperator = 'base0E'
-# TSStructure = 'cyan'
-TSStrong = '- - b'
-# TSQueryLinterError = 'base09'
+"@annotation" = 'base0F'
+"@attribute" = 'base0A'
+"@constructor" = 'base0C'
+#" TSType = 'cyan'
+"@type.builtin" = 'base0A'
+"@conditional" = 'link:Conditional'
+"@exception" = 'base08'
+"@include" = 'link:Include'
+"@keyword.return" = 'base0E'
+"@keyword" = 'base0E'
+"@keyword.function" = 'base0E'
+#" TSLabel = 'cyan'
+"@namespace" = 'base08'
+#" TSRepeat = 'yellow'
+#" TSConstant = 'orange'
+"@constant.builtin" = 'base09'
+"@float" = 'base09'
+#" TSNumber = 'orange'
+#" TSBoolean = 'orange'
+"@character" = 'base08'
+"@error" = 'base08'
+"@function" = 'base0D'
+"@function.builtin" = 'base0D'
+"@method" = 'base0D'
+"@constant.macro" = 'base08'
+"@function.macro" = 'base08'
+"@variable" = 'base05'
+"@variable.builtin" = 'base09'
+"@property" = 'base08'
+"@field" = 'base0D'
+"@parameter" = 'base08'
+"@parameter.reference" = 'base05'
+"@symbol" = 'base0B'
+"@text" = 'base05'
+#" "@Operator = 'base05'
+"@punctuation.delimiter" = 'base0F'
+"@tag.delimiter" = 'base0F'
+"@tag.attribute" = 'link:@Property'
+"@punctuation.bracket" = 'base0F'
+"@punctuation.special" = 'base08'
+#" "@String = 'green'
+"@string.regex" = 'base0C'
+"@string.escape" = 'base0C'
+#" "@Tag = 'blue'
+"@emphasis" = 'base09'
+#" "@Underline = '- - u'
+#" "@Title = 'base05 - -'
+"@literal" = 'base09'
+"@text.uri" = 'base09'
+"@keyword.operator" = 'base0E'
+#" "@Structure = 'cyan'
+"@strong" = '- - b'
+#" "@QueryLinterError = 'base09'
+"@scope" = '- - b'
 TreesitterContext = 'link:CursorLine'
 
 [markdown]
diff --git a/templates/gruvbox_material.toml b/templates/gruvbox_material.toml
index 58a4a70..85fcb4b 100644
--- a/templates/gruvbox_material.toml
+++ b/templates/gruvbox_material.toml
@@ -149,60 +149,60 @@ TabLineSel = 'white line'
 TabLineFill = 'line line'
 
 [Treesitter]
-TSComment = 'link:Comment'
-TSAnnotation = 'base0F'
-TSAttribute = 'base0A'
-TSConstructor = 'base0C'
-# TSType = 'cyan'
-TSTypeBuiltin = 'base0A'
-TSConditional = 'link:Conditional'
-TSException = 'base08'
-TSInclude = 'link:Include'
-TSKeywordReturn = 'base0E'
-TSKeyword = 'base0E'
-TSKeywordFunction = 'base0E'
-# TSLabel = 'cyan'
-TSNamespace = 'base08'
-# TSRepeat = 'yellow'
-# TSConstant = 'orange'
-TSConstBuiltin = 'base09'
-TSFloat = 'base09'
-# TSNumber = 'orange'
-# TSBoolean = 'orange'
-TSCharacter = 'base08'
-TSError = 'base08'
-TSFunction = 'base0D'
-TSFuncBuiltin = 'base0D'
-TSMethod = 'base0D'
-TSConstMacro = 'base08'
-TSFuncMacro = 'base08'
-TSVariable = 'base05'
-TSVariableBuiltin = 'base09'
-TSProperty = 'base08'
-TSField = 'base0D'
-TSParameter = 'base08'
-TSParameterReference = 'base05'
-TSSymbol = 'base0B'
-TSText = 'base05'
-# TSOperator = 'base05'
-TSPunctDelimiter = 'base0F'
-TSTagDelimiter = 'base0F'
-TSTagAttribute = 'link:TSProperty'
-TSPunctBracket = 'base0F'
-TSPunctSpecial = 'base08'
-# TSString = 'green'
-TSStringRegex = 'base0C'
-TSStringEscape = 'base0C'
-# TSTag = 'blue'
-TSEmphasis = 'base09'
-# TSUnderline = '- - u'
-# TSTitle = 'base05 - -'
-TSLiteral = 'base09'
-TSURI = 'base09'
-TSKeywordOperator = 'base0E'
-# TSStructure = 'cyan'
-TSStrong = '- - b'
-# TSQueryLinterError = 'base09'
+"@annotation" = 'base0F'
+"@attribute" = 'base0A'
+"@constructor" = 'base0C'
+#" TSType = 'cyan'
+"@type.builtin" = 'base0A'
+"@conditional" = 'link:Conditional'
+"@exception" = 'base08'
+"@include" = 'link:Include'
+"@keyword.return" = 'base0E'
+"@keyword" = 'base0E'
+"@keyword.function" = 'base0E'
+#" TSLabel = 'cyan'
+"@namespace" = 'base08'
+#" TSRepeat = 'yellow'
+#" TSConstant = 'orange'
+"@constant.builtin" = 'base09'
+"@float" = 'base09'
+#" TSNumber = 'orange'
+#" TSBoolean = 'orange'
+"@character" = 'base08'
+"@error" = 'base08'
+"@function" = 'base0D'
+"@function.builtin" = 'base0D'
+"@method" = 'base0D'
+"@constant.macro" = 'base08'
+"@function.macro" = 'base08'
+"@variable" = 'base05'
+"@variable.builtin" = 'base09'
+"@property" = 'base08'
+"@field" = 'base0D'
+"@parameter" = 'base08'
+"@parameter.reference" = 'base05'
+"@symbol" = 'base0B'
+"@text" = 'base05'
+#" "@Operator = 'base05'
+"@punctuation.delimiter" = 'base0F'
+"@tag.delimiter" = 'base0F'
+"@tag.attribute" = 'link:@Property'
+"@punctuation.bracket" = 'base0F'
+"@punctuation.special" = 'base08'
+#" "@String = 'green'
+"@string.regex" = 'base0C'
+"@string.escape" = 'base0C'
+#" "@Tag = 'blue'
+"@emphasis" = 'base09'
+#" "@Underline = '- - u'
+#" "@Title = 'base05 - -'
+"@literal" = 'base09'
+"@text.uri" = 'base09'
+"@keyword.operator" = 'base0E'
+#" "@Structure = 'cyan'
+"@strong" = '- - b'
+#" "@QueryLinterError = 'base09'
+"@scope" = '- - b'
 TreesitterContext = 'link:CursorLine'
 
 [markdown]
diff --git a/templates/gruvchad.toml b/templates/gruvchad.toml
index bd8d093..e09f5c2 100644
--- a/templates/gruvchad.toml
+++ b/templates/gruvchad.toml
@@ -149,60 +149,60 @@ TabLineSel = 'white line'
 TabLineFill = 'line line'
 
 [Treesitter]
-TSComment = 'link:Comment'
-TSAnnotation = 'base0F'
-TSAttribute = 'base0A'
-TSConstructor = 'base0C'
-# TSType = 'cyan'
-TSTypeBuiltin = 'base0A'
-TSConditional = 'link:Conditional'
-TSException = 'base08'
-TSInclude = 'link:Include'
-TSKeywordReturn = 'base0E'
-TSKeyword = 'base0E'
-TSKeywordFunction = 'base0E'
-# TSLabel = 'cyan'
-TSNamespace = 'base08'
-# TSRepeat = 'yellow'
-# TSConstant = 'orange'
-TSConstBuiltin = 'base09'
-TSFloat = 'base09'
-# TSNumber = 'orange'
-# TSBoolean = 'orange'
-TSCharacter = 'base08'
-TSError = 'base08'
-TSFunction = 'base0D'
-TSFuncBuiltin = 'base0D'
-TSMethod = 'base0D'
-TSConstMacro = 'base08'
-TSFuncMacro = 'base08'
-TSVariable = 'base05'
-TSVariableBuiltin = 'base09'
-TSProperty = 'base08'
-TSField = 'base0D'
-TSParameter = 'base08'
-TSParameterReference = 'base05'
-TSSymbol = 'base0B'
-TSText = 'base05'
-# TSOperator = 'base05'
-TSPunctDelimiter = 'base0F'
-TSTagDelimiter = 'base0F'
-TSTagAttribute = 'link:TSProperty'
-TSPunctBracket = 'base0F'
-TSPunctSpecial = 'base08'
-# TSString = 'green'
-TSStringRegex = 'base0C'
-TSStringEscape = 'base0C'
-# TSTag = 'blue'
-TSEmphasis = 'base09'
-# TSUnderline = '- - u'
-# TSTitle = 'base05 - -'
-TSLiteral = 'base09'
-TSURI = 'base09'
-TSKeywordOperator = 'base0E'
-# TSStructure = 'cyan'
-TSStrong = '- - b'
-# TSQueryLinterError = 'base09'
+"@annotation" = 'base0F'
+"@attribute" = 'base0A'
+"@constructor" = 'base0C'
+#" TSType = 'cyan'
+"@type.builtin" = 'base0A'
+"@conditional" = 'link:Conditional'
+"@exception" = 'base08'
+"@include" = 'link:Include'
+"@keyword.return" = 'base0E'
+"@keyword" = 'base0E'
+"@keyword.function" = 'base0E'
+#" TSLabel = 'cyan'
+"@namespace" = 'base08'
+#" TSRepeat = 'yellow'
+#" TSConstant = 'orange'
+"@constant.builtin" = 'base09'
+"@float" = 'base09'
+#" TSNumber = 'orange'
+#" TSBoolean = 'orange'
+"@character" = 'base08'
+"@error" = 'base08'
+"@function" = 'base0D'
+"@function.builtin" = 'base0D'
+"@method" = 'base0D'
+"@constant.macro" = 'base08'
+"@function.macro" = 'base08'
+"@variable" = 'base05'
+"@variable.builtin" = 'base09'
+"@property" = 'base08'
+"@field" = 'base0D'
+"@parameter" = 'base08'
+"@parameter.reference" = 'base05'
+"@symbol" = 'base0B'
+"@text" = 'base05'
+#" "@Operator = 'base05'
+"@punctuation.delimiter" = 'base0F'
+"@tag.delimiter" = 'base0F'
+"@tag.attribute" = 'link:@Property'
+"@punctuation.bracket" = 'base0F'
+"@punctuation.special" = 'base08'
+#" "@String = 'green'
+"@string.regex" = 'base0C'
+"@string.escape" = 'base0C'
+#" "@Tag = 'blue'
+"@emphasis" = 'base09'
+#" "@Underline = '- - u'
+#" "@Title = 'base05 - -'
+"@literal" = 'base09'
+"@text.uri" = 'base09'
+"@keyword.operator" = 'base0E'
+#" "@Structure = 'cyan'
+"@strong" = '- - b'
+#" "@QueryLinterError = 'base09'
+"@scope" = '- - b'
 TreesitterContext = 'link:CursorLine'
 
 [markdown]
diff --git a/templates/jellybeans.toml b/templates/jellybeans.toml
index c449e4b..9d38463 100644
--- a/templates/jellybeans.toml
+++ b/templates/jellybeans.toml
@@ -149,60 +149,60 @@ TabLineSel = 'white line'
 TabLineFill = 'line line'
 
 [Treesitter]
-TSComment = 'link:Comment'
-TSAnnotation = 'base0F'
-TSAttribute = 'base0A'
-TSConstructor = 'base0C'
-# TSType = 'cyan'
-TSTypeBuiltin = 'base0A'
-TSConditional = 'link:Conditional'
-TSException = 'base08'
-TSInclude = 'link:Include'
-TSKeywordReturn = 'base0E'
-TSKeyword = 'base0E'
-TSKeywordFunction = 'base0E'
-# TSLabel = 'cyan'
-TSNamespace = 'base08'
-# TSRepeat = 'yellow'
-# TSConstant = 'orange'
-TSConstBuiltin = 'base09'
-TSFloat = 'base09'
-# TSNumber = 'orange'
-# TSBoolean = 'orange'
-TSCharacter = 'base08'
-TSError = 'base08'
-TSFunction = 'base0D'
-TSFuncBuiltin = 'base0D'
-TSMethod = 'base0D'
-TSConstMacro = 'base08'
-TSFuncMacro = 'base08'
-TSVariable = 'base05'
-TSVariableBuiltin = 'base09'
-TSProperty = 'base08'
-TSField = 'base0D'
-TSParameter = 'base08'
-TSParameterReference = 'base05'
-TSSymbol = 'base0B'
-TSText = 'base05'
-# TSOperator = 'base05'
-TSPunctDelimiter = 'base0F'
-TSTagDelimiter = 'base0F'
-TSTagAttribute = 'link:TSProperty'
-TSPunctBracket = 'base0F'
-TSPunctSpecial = 'base08'
-# TSString = 'green'
-TSStringRegex = 'base0C'
-TSStringEscape = 'base0C'
-# TSTag = 'blue'
-TSEmphasis = 'base09'
-# TSUnderline = '- - u'
-# TSTitle = 'base05 - -'
-TSLiteral = 'base09'
-TSURI = 'base09'
-TSKeywordOperator = 'base0E'
-# TSStructure = 'cyan'
-TSStrong = '- - b'
-# TSQueryLinterError = 'base09'
+"@annotation" = 'base0F'
+"@attribute" = 'base0A'
+"@constructor" = 'base0C'
+#" TSType = 'cyan'
+"@type.builtin" = 'base0A'
+"@conditional" = 'link:Conditional'
+"@exception" = 'base08'
+"@include" = 'link:Include'
+"@keyword.return" = 'base0E'
+"@keyword" = 'base0E'
+"@keyword.function" = 'base0E'
+#" TSLabel = 'cyan'
+"@namespace" = 'base08'
+#" TSRepeat = 'yellow'
+#" TSConstant = 'orange'
+"@constant.builtin" = 'base09'
+"@float" = 'base09'
+#" TSNumber = 'orange'
+#" TSBoolean = 'orange'
+"@character" = 'base08'
+"@error" = 'base08'
+"@function" = 'base0D'
+"@function.builtin" = 'base0D'
+"@method" = 'base0D'
+"@constant.macro" = 'base08'
+"@function.macro" = 'base08'
+"@variable" = 'base05'
+"@variable.builtin" = 'base09'
+"@property" = 'base08'
+"@field" = 'base0D'
+"@parameter" = 'base08'
+"@parameter.reference" = 'base05'
+"@symbol" = 'base0B'
+"@text" = 'base05'
+#" "@Operator = 'base05'
+"@punctuation.delimiter" = 'base0F'
+"@tag.delimiter" = 'base0F'
+"@tag.attribute" = 'link:@Property'
+"@punctuation.bracket" = 'base0F'
+"@punctuation.special" = 'base08'
+#" "@String = 'green'
+"@string.regex" = 'base0C'
+"@string.escape" = 'base0C'
+#" "@Tag = 'blue'
+"@emphasis" = 'base09'
+#" "@Underline = '- - u'
+#" "@Title = 'base05 - -'
+"@literal" = 'base09'
+"@text.uri" = 'base09'
+"@keyword.operator" = 'base0E'
+#" "@Structure = 'cyan'
+"@strong" = '- - b'
+#" "@QueryLinterError = 'base09'
+"@scope" = '- - b'
 TreesitterContext = 'link:CursorLine'
 
 [markdown]
diff --git a/templates/kanagawa.toml b/templates/kanagawa.toml
index 92e5ce4..1ab95e6 100644
--- a/templates/kanagawa.toml
+++ b/templates/kanagawa.toml
@@ -149,60 +149,60 @@ TabLineSel = 'white line'
 TabLineFill = 'line line'
 
 [Treesitter]
-TSComment = 'link:Comment'
-TSAnnotation = 'base0F'
-TSAttribute = 'base0A'
-TSConstructor = 'base0C'
-# TSType = 'cyan'
-TSTypeBuiltin = 'base0A'
-TSConditional = 'link:Conditional'
-TSException = 'base08'
-TSInclude = 'link:Include'
-TSKeywordReturn = 'base0E'
-TSKeyword = 'base0E'
-TSKeywordFunction = 'base0E'
-# TSLabel = 'cyan'
-TSNamespace = 'base08'
-# TSRepeat = 'yellow'
-# TSConstant = 'orange'
-TSConstBuiltin = 'base09'
-TSFloat = 'base09'
-# TSNumber = 'orange'
-# TSBoolean = 'orange'
-TSCharacter = 'base08'
-TSError = 'base08'
-TSFunction = 'base0D'
-TSFuncBuiltin = 'base0D'
-TSMethod = 'base0D'
-TSConstMacro = 'base08'
-TSFuncMacro = 'base08'
-TSVariable = 'base05'
-TSVariableBuiltin = 'base09'
-TSProperty = 'base08'
-TSField = 'base0D'
-TSParameter = 'base08'
-TSParameterReference = 'base05'
-TSSymbol = 'base0B'
-TSText = 'base05'
-# TSOperator = 'base05'
-TSPunctDelimiter = 'base0F'
-TSTagDelimiter = 'base0F'
-TSTagAttribute = 'link:TSProperty'
-TSPunctBracket = 'base0F'
-TSPunctSpecial = 'base08'
-# TSString = 'green'
-TSStringRegex = 'base0C'
-TSStringEscape = 'base0C'
-# TSTag = 'blue'
-TSEmphasis = 'base09'
-# TSUnderline = '- - u'
-# TSTitle = 'base05 - -'
-TSLiteral = 'base09'
-TSURI = 'base09'
-TSKeywordOperator = 'base0E'
-# TSStructure = 'cyan'
-TSStrong = '- - b'
-# TSQueryLinterError = 'base09'
+"@annotation" = 'base0F'
+"@attribute" = 'base0A'
+"@constructor" = 'base0C'
+#" TSType = 'cyan'
+"@type.builtin" = 'base0A'
+"@conditional" = 'link:Conditional'
+"@exception" = 'base08'
+"@include" = 'link:Include'
+"@keyword.return" = 'base0E'
+"@keyword" = 'base0E'
+"@keyword.function" = 'base0E'
+#" TSLabel = 'cyan'
+"@namespace" = 'base08'
+#" TSRepeat = 'yellow'
+#" TSConstant = 'orange'
+"@constant.builtin" = 'base09'
+"@float" = 'base09'
+#" TSNumber = 'orange'
+#" TSBoolean = 'orange'
+"@character" = 'base08'
+"@error" = 'base08'
+"@function" = 'base0D'
+"@function.builtin" = 'base0D'
+"@method" = 'base0D'
+"@constant.macro" = 'base08'
+"@function.macro" = 'base08'
+"@variable" = 'base05'
+"@variable.builtin" = 'base09'
+"@property" = 'base08'
+"@field" = 'base0D'
+"@parameter" = 'base08'
+"@parameter.reference" = 'base05'
+"@symbol" = 'base0B'
+"@text" = 'base05'
+#" "@Operator = 'base05'
+"@punctuation.delimiter" = 'base0F'
+"@tag.delimiter" = 'base0F'
+"@tag.attribute" = 'link:@Property'
+"@punctuation.bracket" = 'base0F'
+"@punctuation.special" = 'base08'
+#" "@String = 'green'
+"@string.regex" = 'base0C'
+"@string.escape" = 'base0C'
+#" "@Tag = 'blue'
+"@emphasis" = 'base09'
+#" "@Underline = '- - u'
+#" "@Title = 'base05 - -'
+"@literal" = 'base09'
+"@text.uri" = 'base09'
+"@keyword.operator" = 'base0E'
+#" "@Structure = 'cyan'
+"@strong" = '- - b'
+#" "@QueryLinterError = 'base09'
+"@scope" = '- - b'
 TreesitterContext = 'link:CursorLine'
 
 [markdown]
diff --git a/templates/monekai.toml b/templates/monekai.toml
index 50fcfe9..edca2d5 100644
--- a/templates/monekai.toml
+++ b/templates/monekai.toml
@@ -149,60 +149,60 @@ TabLineSel = 'white line'
 TabLineFill = 'line line'
 
 [Treesitter]
-TSComment = 'link:Comment'
-TSAnnotation = 'base0F'
-TSAttribute = 'base0A'
-TSConstructor = 'base0C'
-# TSType = 'cyan'
-TSTypeBuiltin = 'base0A'
-TSConditional = 'link:Conditional'
-TSException = 'base08'
-TSInclude = 'link:Include'
-TSKeywordReturn = 'base0E'
-TSKeyword = 'base0E'
-TSKeywordFunction = 'base0E'
-# TSLabel = 'cyan'
-TSNamespace = 'base08'
-# TSRepeat = 'yellow'
-# TSConstant = 'orange'
-TSConstBuiltin = 'base09'
-TSFloat = 'base09'
-# TSNumber = 'orange'
-# TSBoolean = 'orange'
-TSCharacter = 'base08'
-TSError = 'base08'
-TSFunction = 'base0D'
-TSFuncBuiltin = 'base0D'
-TSMethod = 'base0D'
-TSConstMacro = 'base08'
-TSFuncMacro = 'base08'
-TSVariable = 'base05'
-TSVariableBuiltin = 'base09'
-TSProperty = 'base08'
-TSField = 'base0D'
-TSParameter = 'base08'
-TSParameterReference = 'base05'
-TSSymbol = 'base0B'
-TSText = 'base05'
-# TSOperator = 'base05'
-TSPunctDelimiter = 'base0F'
-TSTagDelimiter = 'base0F'
-TSTagAttribute = 'link:TSProperty'
-TSPunctBracket = 'base0F'
-TSPunctSpecial = 'base08'
-# TSString = 'green'
-TSStringRegex = 'base0C'
-TSStringEscape = 'base0C'
-# TSTag = 'blue'
-TSEmphasis = 'base09'
-# TSUnderline = '- - u'
-# TSTitle = 'base05 - -'
-TSLiteral = 'base09'
-TSURI = 'base09'
-TSKeywordOperator = 'base0E'
-# TSStructure = 'cyan'
-TSStrong = '- - b'
-# TSQueryLinterError = 'base09'
+"@annotation" = 'base0F'
+"@attribute" = 'base0A'
+"@constructor" = 'base0C'
+#" TSType = 'cyan'
+"@type.builtin" = 'base0A'
+"@conditional" = 'link:Conditional'
+"@exception" = 'base08'
+"@include" = 'link:Include'
+"@keyword.return" = 'base0E'
+"@keyword" = 'base0E'
+"@keyword.function" = 'base0E'
+#" TSLabel = 'cyan'
+"@namespace" = 'base08'
+#" TSRepeat = 'yellow'
+#" TSConstant = 'orange'
+"@constant.builtin" = 'base09'
+"@float" = 'base09'
+#" TSNumber = 'orange'
+#" TSBoolean = 'orange'
+"@character" = 'base08'
+"@error" = 'base08'
+"@function" = 'base0D'
+"@function.builtin" = 'base0D'
+"@method" = 'base0D'
+"@constant.macro" = 'base08'
+"@function.macro" = 'base08'
+"@variable" = 'base05'
+"@variable.builtin" = 'base09'
+"@property" = 'base08'
+"@field" = 'base0D'
+"@parameter" = 'base08'
+"@parameter.reference" = 'base05'
+"@symbol" = 'base0B'
+"@text" = 'base05'
+#" "@Operator = 'base05'
+"@punctuation.delimiter" = 'base0F'
+"@tag.delimiter" = 'base0F'
+"@tag.attribute" = 'link:@Property'
+"@punctuation.bracket" = 'base0F'
+"@punctuation.special" = 'base08'
+#" "@String = 'green'
+"@string.regex" = 'base0C'
+"@string.escape" = 'base0C'
+#" "@Tag = 'blue'
+"@emphasis" = 'base09'
+#" "@Underline = '- - u'
+#" "@Title = 'base05 - -'
+"@literal" = 'base09'
+"@text.uri" = 'base09'
+"@keyword.operator" = 'base0E'
+#" "@Structure = 'cyan'
+"@strong" = '- - b'
+#" "@QueryLinterError = 'base09'
+"@scope" = '- - b'
 TreesitterContext = 'link:CursorLine'
 
 [markdown]
diff --git a/templates/mountain.toml b/templates/mountain.toml
index 46649c4..ce8ec67 100644
--- a/templates/mountain.toml
+++ b/templates/mountain.toml
@@ -149,60 +149,60 @@ TabLineSel = 'white line'
 TabLineFill = 'line line'
 
 [Treesitter]
-TSComment = 'link:Comment'
-TSAnnotation = 'base0F'
-TSAttribute = 'base0A'
-TSConstructor = 'base0C'
-# TSType = 'cyan'
-TSTypeBuiltin = 'base0A'
-TSConditional = 'link:Conditional'
-TSException = 'base08'
-TSInclude = 'link:Include'
-TSKeywordReturn = 'base0E'
-TSKeyword = 'base0E'
-TSKeywordFunction = 'base0E'
-# TSLabel = 'cyan'
-TSNamespace = 'base08'
-# TSRepeat = 'yellow'
-# TSConstant = 'orange'
-TSConstBuiltin = 'base09'
-TSFloat = 'base09'
-# TSNumber = 'orange'
-# TSBoolean = 'orange'
-TSCharacter = 'base08'
-TSError = 'base08'
-TSFunction = 'base0D'
-TSFuncBuiltin = 'base0D'
-TSMethod = 'base0D'
-TSConstMacro = 'base08'
-TSFuncMacro = 'base08'
-TSVariable = 'base05'
-TSVariableBuiltin = 'base09'
-TSProperty = 'base08'
-TSField = 'base0D'
-TSParameter = 'base08'
-TSParameterReference = 'base05'
-TSSymbol = 'base0B'
-TSText = 'base05'
-# TSOperator = 'base05'
-TSPunctDelimiter = 'base0F'
-TSTagDelimiter = 'base0F'
-TSTagAttribute = 'link:TSProperty'
-TSPunctBracket = 'base0F'
-TSPunctSpecial = 'base08'
-# TSString = 'green'
-TSStringRegex = 'base0C'
-TSStringEscape = 'base0C'
-# TSTag = 'blue'
-TSEmphasis = 'base09'
-# TSUnderline = '- - u'
-# TSTitle = 'base05 - -'
-TSLiteral = 'base09'
-TSURI = 'base09'
-TSKeywordOperator = 'base0E'
-# TSStructure = 'cyan'
-TSStrong = '- - b'
-# TSQueryLinterError = 'base09'
+"@annotation" = 'base0F'
+"@attribute" = 'base0A'
+"@constructor" = 'base0C'
+#" TSType = 'cyan'
+"@type.builtin" = 'base0A'
+"@conditional" = 'link:Conditional'
+"@exception" = 'base08'
+"@include" = 'link:Include'
+"@keyword.return" = 'base0E'
+"@keyword" = 'base0E'
+"@keyword.function" = 'base0E'
+#" TSLabel = 'cyan'
+"@namespace" = 'base08'
+#" TSRepeat = 'yellow'
+#" TSConstant = 'orange'
+"@constant.builtin" = 'base09'
+"@float" = 'base09'
+#" TSNumber = 'orange'
+#" TSBoolean = 'orange'
+"@character" = 'base08'
+"@error" = 'base08'
+"@function" = 'base0D'
+"@function.builtin" = 'base0D'
+"@method" = 'base0D'
+"@constant.macro" = 'base08'
+"@function.macro" = 'base08'
+"@variable" = 'base05'
+"@variable.builtin" = 'base09'
+"@property" = 'base08'
+"@field" = 'base0D'
+"@parameter" = 'base08'
+"@parameter.reference" = 'base05'
+"@symbol" = 'base0B'
+"@text" = 'base05'
+#" "@Operator = 'base05'
+"@punctuation.delimiter" = 'base0F'
+"@tag.delimiter" = 'base0F'
+"@tag.attribute" = 'link:@Property'
+"@punctuation.bracket" = 'base0F'
+"@punctuation.special" = 'base08'
+#" "@String = 'green'
+"@string.regex" = 'base0C'
+"@string.escape" = 'base0C'
+#" "@Tag = 'blue'
+"@emphasis" = 'base09'
+#" "@Underline = '- - u'
+#" "@Title = 'base05 - -'
+"@literal" = 'base09'
+"@text.uri" = 'base09'
+"@keyword.operator" = 'base0E'
+#" "@Structure = 'cyan'
+"@strong" = '- - b'
+#" "@QueryLinterError = 'base09'
+"@scope" = '- - b'
 TreesitterContext = 'link:CursorLine'
 
 [markdown]
diff --git a/templates/nightfox.toml b/templates/nightfox.toml
index 3eddf5a..425756c 100644
--- a/templates/nightfox.toml
+++ b/templates/nightfox.toml
@@ -149,60 +149,60 @@ TabLineSel = 'white line'
 TabLineFill = 'line line'
 
 [Treesitter]
-TSComment = 'link:Comment'
-TSAnnotation = 'base0F'
-TSAttribute = 'base0A'
-TSConstructor = 'base0C'
-# TSType = 'cyan'
-TSTypeBuiltin = 'base0A'
-TSConditional = 'link:Conditional'
-TSException = 'base08'
-TSInclude = 'link:Include'
-TSKeywordReturn = 'base0E'
-TSKeyword = 'base0E'
-TSKeywordFunction = 'base0E'
-# TSLabel = 'cyan'
-TSNamespace = 'base08'
-# TSRepeat = 'yellow'
-# TSConstant = 'orange'
-TSConstBuiltin = 'base09'
-TSFloat = 'base09'
-# TSNumber = 'orange'
-# TSBoolean = 'orange'
-TSCharacter = 'base08'
-TSError = 'base08'
-TSFunction = 'base0D'
-TSFuncBuiltin = 'base0D'
-TSMethod = 'base0D'
-TSConstMacro = 'base08'
-TSFuncMacro = 'base08'
-TSVariable = 'base05'
-TSVariableBuiltin = 'base09'
-TSProperty = 'base08'
-TSField = 'base0D'
-TSParameter = 'base08'
-TSParameterReference = 'base05'
-TSSymbol = 'base0B'
-TSText = 'base05'
-# TSOperator = 'base05'
-TSPunctDelimiter = 'base0F'
-TSTagDelimiter = 'base0F'
-TSTagAttribute = 'link:TSProperty'
-TSPunctBracket = 'base0F'
-TSPunctSpecial = 'base08'
-# TSString = 'green'
-TSStringRegex = 'base0C'
-TSStringEscape = 'base0C'
-# TSTag = 'blue'
-TSEmphasis = 'base09'
-# TSUnderline = '- - u'
-# TSTitle = 'base05 - -'
-TSLiteral = 'base09'
-TSURI = 'base09'
-TSKeywordOperator = 'base0E'
-# TSStructure = 'cyan'
-TSStrong = '- - b'
-# TSQueryLinterError = 'base09'
+"@annotation" = 'base0F'
+"@attribute" = 'base0A'
+"@constructor" = 'base0C'
+#" TSType = 'cyan'
+"@type.builtin" = 'base0A'
+"@conditional" = 'link:Conditional'
+"@exception" = 'base08'
+"@include" = 'link:Include'
+"@keyword.return" = 'base0E'
+"@keyword" = 'base0E'
+"@keyword.function" = 'base0E'
+#" TSLabel = 'cyan'
+"@namespace" = 'base08'
+#" TSRepeat = 'yellow'
+#" TSConstant = 'orange'
+"@constant.builtin" = 'base09'
+"@float" = 'base09'
+#" TSNumber = 'orange'
+#" TSBoolean = 'orange'
+"@character" = 'base08'
+"@error" = 'base08'
+"@function" = 'base0D'
+"@function.builtin" = 'base0D'
+"@method" = 'base0D'
+"@constant.macro" = 'base08'
+"@function.macro" = 'base08'
+"@variable" = 'base05'
+"@variable.builtin" = 'base09'
+"@property" = 'base08'
+"@field" = 'base0D'
+"@parameter" = 'base08'
+"@parameter.reference" = 'base05'
+"@symbol" = 'base0B'
+"@text" = 'base05'
+#" "@Operator = 'base05'
+"@punctuation.delimiter" = 'base0F'
+"@tag.delimiter" = 'base0F'
+"@tag.attribute" = 'link:@Property'
+"@punctuation.bracket" = 'base0F'
+"@punctuation.special" = 'base08'
+#" "@String = 'green'
+"@string.regex" = 'base0C'
+"@string.escape" = 'base0C'
+#" "@Tag = 'blue'
+"@emphasis" = 'base09'
+#" "@Underline = '- - u'
+#" "@Title = 'base05 - -'
+"@literal" = 'base09'
+"@text.uri" = 'base09'
+"@keyword.operator" = 'base0E'
+#" "@Structure = 'cyan'
+"@strong" = '- - b'
+#" "@QueryLinterError = 'base09'
+"@scope" = '- - b'
 TreesitterContext = 'link:CursorLine'
 
 [markdown]
diff --git a/templates/nightlamp.toml b/templates/nightlamp.toml
index 427ea54..ce0390a 100644
--- a/templates/nightlamp.toml
+++ b/templates/nightlamp.toml
@@ -149,60 +149,60 @@ TabLineSel = 'white line'
 TabLineFill = 'line line'
 
 [Treesitter]
-TSComment = 'link:Comment'
-TSAnnotation = 'base0F'
-TSAttribute = 'base0A'
-TSConstructor = 'base0C'
-# TSType = 'cyan'
-TSTypeBuiltin = 'base0A'
-TSConditional = 'link:Conditional'
-TSException = 'base08'
-TSInclude = 'link:Include'
-TSKeywordReturn = 'base0E'
-TSKeyword = 'base0E'
-TSKeywordFunction = 'base0E'
-# TSLabel = 'cyan'
-TSNamespace = 'base08'
-# TSRepeat = 'yellow'
-# TSConstant = 'orange'
-TSConstBuiltin = 'base09'
-TSFloat = 'base09'
-# TSNumber = 'orange'
-# TSBoolean = 'orange'
-TSCharacter = 'base08'
-TSError = 'base08'
-TSFunction = 'base0D'
-TSFuncBuiltin = 'base0D'
-TSMethod = 'base0D'
-TSConstMacro = 'base08'
-TSFuncMacro = 'base08'
-TSVariable = 'base05'
-TSVariableBuiltin = 'base09'
-TSProperty = 'base08'
-TSField = 'base0D'
-TSParameter = 'base08'
-TSParameterReference = 'base05'
-TSSymbol = 'base0B'
-TSText = 'base05'
-# TSOperator = 'base05'
-TSPunctDelimiter = 'base0F'
-TSTagDelimiter = 'base0F'
-TSTagAttribute = 'link:TSProperty'
-TSPunctBracket = 'base0F'
-TSPunctSpecial = 'base08'
-# TSString = 'green'
-TSStringRegex = 'base0C'
-TSStringEscape = 'base0C'
-# TSTag = 'blue'
-TSEmphasis = 'base09'
-# TSUnderline = '- - u'
-# TSTitle = 'base05 - -'
-TSLiteral = 'base09'
-TSURI = 'base09'
-TSKeywordOperator = 'base0E'
-# TSStructure = 'cyan'
-TSStrong = '- - b'
-# TSQueryLinterError = 'base09'
+"@annotation" = 'base0F'
+"@attribute" = 'base0A'
+"@constructor" = 'base0C'
+#" TSType = 'cyan'
+"@type.builtin" = 'base0A'
+"@conditional" = 'link:Conditional'
+"@exception" = 'base08'
+"@include" = 'link:Include'
+"@keyword.return" = 'base0E'
+"@keyword" = 'base0E'
+"@keyword.function" = 'base0E'
+#" TSLabel = 'cyan'
+"@namespace" = 'base08'
+#" TSRepeat = 'yellow'
+#" TSConstant = 'orange'
+"@constant.builtin" = 'base09'
+"@float" = 'base09'
+#" TSNumber = 'orange'
+#" TSBoolean = 'orange'
+"@character" = 'base08'
+"@error" = 'base08'
+"@function" = 'base0D'
+"@function.builtin" = 'base0D'
+"@method" = 'base0D'
+"@constant.macro" = 'base08'
+"@function.macro" = 'base08'
+"@variable" = 'base05'
+"@variable.builtin" = 'base09'
+"@property" = 'base08'
+"@field" = 'base0D'
+"@parameter" = 'base08'
+"@parameter.reference" = 'base05'
+"@symbol" = 'base0B'
+"@text" = 'base05'
+#" "@Operator = 'base05'
+"@punctuation.delimiter" = 'base0F'
+"@tag.delimiter" = 'base0F'
+"@tag.attribute" = 'link:@Property'
+"@punctuation.bracket" = 'base0F'
+"@punctuation.special" = 'base08'
+#" "@String = 'green'
+"@string.regex" = 'base0C'
+"@string.escape" = 'base0C'
+#" "@Tag = 'blue'
+"@emphasis" = 'base09'
+#" "@Underline = '- - u'
+#" "@Title = 'base05 - -'
+"@literal" = 'base09'
+"@text.uri" = 'base09'
+"@keyword.operator" = 'base0E'
+#" "@Structure = 'cyan'
+"@strong" = '- - b'
+#" "@QueryLinterError = 'base09'
+"@scope" = '- - b'
 TreesitterContext = 'link:CursorLine'
 
 [markdown]
diff --git a/templates/nightowl.toml b/templates/nightowl.toml
index ed5f9d4..2b265c2 100644
--- a/templates/nightowl.toml
+++ b/templates/nightowl.toml
@@ -149,60 +149,60 @@ TabLineSel = 'white line'
 TabLineFill = 'line line'
 
 [Treesitter]
-TSComment = 'link:Comment'
-TSAnnotation = 'base0F'
-TSAttribute = 'base0A'
-TSConstructor = 'base0C'
-# TSType = 'cyan'
-TSTypeBuiltin = 'base0A'
-TSConditional = 'link:Conditional'
-TSException = 'base08'
-TSInclude = 'link:Include'
-TSKeywordReturn = 'base0E'
-TSKeyword = 'base0E'
-TSKeywordFunction = 'base0E'
-# TSLabel = 'cyan'
-TSNamespace = 'base08'
-# TSRepeat = 'yellow'
-# TSConstant = 'orange'
-TSConstBuiltin = 'base09'
-TSFloat = 'base09'
-# TSNumber = 'orange'
-# TSBoolean = 'orange'
-TSCharacter = 'base08'
-TSError = 'base08'
-TSFunction = 'base0D'
-TSFuncBuiltin = 'base0D'
-TSMethod = 'base0D'
-TSConstMacro = 'base08'
-TSFuncMacro = 'base08'
-TSVariable = 'base05'
-TSVariableBuiltin = 'base09'
-TSProperty = 'base08'
-TSField = 'base0D'
-TSParameter = 'base08'
-TSParameterReference = 'base05'
-TSSymbol = 'base0B'
-TSText = 'base05'
-# TSOperator = 'base05'
-TSPunctDelimiter = 'base0F'
-TSTagDelimiter = 'base0F'
-TSTagAttribute = 'link:TSProperty'
-TSPunctBracket = 'base0F'
-TSPunctSpecial = 'base08'
-# TSString = 'green'
-TSStringRegex = 'base0C'
-TSStringEscape = 'base0C'
-# TSTag = 'blue'
-TSEmphasis = 'base09'
-# TSUnderline = '- - u'
-# TSTitle = 'base05 - -'
-TSLiteral = 'base09'
-TSURI = 'base09'
-TSKeywordOperator = 'base0E'
-# TSStructure = 'cyan'
-TSStrong = '- - b'
-# TSQueryLinterError = 'base09'
+"@annotation" = 'base0F'
+"@attribute" = 'base0A'
+"@constructor" = 'base0C'
+#" TSType = 'cyan'
+"@type.builtin" = 'base0A'
+"@conditional" = 'link:Conditional'
+"@exception" = 'base08'
+"@include" = 'link:Include'
+"@keyword.return" = 'base0E'
+"@keyword" = 'base0E'
+"@keyword.function" = 'base0E'
+#" TSLabel = 'cyan'
+"@namespace" = 'base08'
+#" TSRepeat = 'yellow'
+#" TSConstant = 'orange'
+"@constant.builtin" = 'base09'
+"@float" = 'base09'
+#" TSNumber = 'orange'
+#" TSBoolean = 'orange'
+"@character" = 'base08'
+"@error" = 'base08'
+"@function" = 'base0D'
+"@function.builtin" = 'base0D'
+"@method" = 'base0D'
+"@constant.macro" = 'base08'
+"@function.macro" = 'base08'
+"@variable" = 'base05'
+"@variable.builtin" = 'base09'
+"@property" = 'base08'
+"@field" = 'base0D'
+"@parameter" = 'base08'
+"@parameter.reference" = 'base05'
+"@symbol" = 'base0B'
+"@text" = 'base05'
+#" "@Operator = 'base05'
+"@punctuation.delimiter" = 'base0F'
+"@tag.delimiter" = 'base0F'
+"@tag.attribute" = 'link:@Property'
+"@punctuation.bracket" = 'base0F'
+"@punctuation.special" = 'base08'
+#" "@String = 'green'
+"@string.regex" = 'base0C'
+"@string.escape" = 'base0C'
+#" "@Tag = 'blue'
+"@emphasis" = 'base09'
+#" "@Underline = '- - u'
+#" "@Title = 'base05 - -'
+"@literal" = 'base09'
+"@text.uri" = 'base09'
+"@keyword.operator" = 'base0E'
+#" "@Structure = 'cyan'
+"@strong" = '- - b'
+#" "@QueryLinterError = 'base09'
+"@scope" = '- - b'
 TreesitterContext = 'link:CursorLine'
 
 [markdown]
diff --git a/templates/nord.toml b/templates/nord.toml
index 2a386c7..3c8942c 100644
--- a/templates/nord.toml
+++ b/templates/nord.toml
@@ -149,60 +149,60 @@ TabLineSel = 'white line'
 TabLineFill = 'line line'
 
 [Treesitter]
-TSComment = 'link:Comment'
-TSAnnotation = 'base0F'
-TSAttribute = 'base0A'
-TSConstructor = 'base0C'
-# TSType = 'cyan'
-TSTypeBuiltin = 'base0A'
-TSConditional = 'link:Conditional'
-TSException = 'base08'
-TSInclude = 'link:Include'
-TSKeywordReturn = 'base0E'
-TSKeyword = 'base0E'
-TSKeywordFunction = 'base0E'
-# TSLabel = 'cyan'
-TSNamespace = 'base08'
-# TSRepeat = 'yellow'
-# TSConstant = 'orange'
-TSConstBuiltin = 'base09'
-TSFloat = 'base09'
-# TSNumber = 'orange'
-# TSBoolean = 'orange'
-TSCharacter = 'base08'
-TSError = 'base08'
-TSFunction = 'base0D'
-TSFuncBuiltin = 'base0D'
-TSMethod = 'base0D'
-TSConstMacro = 'base08'
-TSFuncMacro = 'base08'
-TSVariable = 'base05'
-TSVariableBuiltin = 'base09'
-TSProperty = 'base08'
-TSField = 'base0D'
-TSParameter = 'base08'
-TSParameterReference = 'base05'
-TSSymbol = 'base0B'
-TSText = 'base05'
-# TSOperator = 'base05'
-TSPunctDelimiter = 'base0F'
-TSTagDelimiter = 'base0F'
-TSTagAttribute = 'link:TSProperty'
-TSPunctBracket = 'base0F'
-TSPunctSpecial = 'base08'
-# TSString = 'green'
-TSStringRegex = 'base0C'
-TSStringEscape = 'base0C'
-# TSTag = 'blue'
-TSEmphasis = 'base09'
-# TSUnderline = '- - u'
-# TSTitle = 'base05 - -'
-TSLiteral = 'base09'
-TSURI = 'base09'
-TSKeywordOperator = 'base0E'
-# TSStructure = 'cyan'
-TSStrong = '- - b'
-# TSQueryLinterError = 'base09'
+"@annotation" = 'base0F'
+"@attribute" = 'base0A'
+"@constructor" = 'base0C'
+#" TSType = 'cyan'
+"@type.builtin" = 'base0A'
+"@conditional" = 'link:Conditional'
+"@exception" = 'base08'
+"@include" = 'link:Include'
+"@keyword.return" = 'base0E'
+"@keyword" = 'base0E'
+"@keyword.function" = 'base0E'
+#" TSLabel = 'cyan'
+"@namespace" = 'base08'
+#" TSRepeat = 'yellow'
+#" TSConstant = 'orange'
+"@constant.builtin" = 'base09'
+"@float" = 'base09'
+#" TSNumber = 'orange'
+#" TSBoolean = 'orange'
+"@character" = 'base08'
+"@error" = 'base08'
+"@function" = 'base0D'
+"@function.builtin" = 'base0D'
+"@method" = 'base0D'
+"@constant.macro" = 'base08'
+"@function.macro" = 'base08'
+"@variable" = 'base05'
+"@variable.builtin" = 'base09'
+"@property" = 'base08'
+"@field" = 'base0D'
+"@parameter" = 'base08'
+"@parameter.reference" = 'base05'
+"@symbol" = 'base0B'
+"@text" = 'base05'
+#" "@Operator = 'base05'
+"@punctuation.delimiter" = 'base0F'
+"@tag.delimiter" = 'base0F'
+"@tag.attribute" = 'link:@Property'
+"@punctuation.bracket" = 'base0F'
+"@punctuation.special" = 'base08'
+#" "@String = 'green'
+"@string.regex" = 'base0C'
+"@string.escape" = 'base0C'
+#" "@Tag = 'blue'
+"@emphasis" = 'base09'
+#" "@Underline = '- - u'
+#" "@Title = 'base05 - -'
+"@literal" = 'base09'
+"@text.uri" = 'base09'
+"@keyword.operator" = 'base0E'
+#" "@Structure = 'cyan'
+"@strong" = '- - b'
+#" "@QueryLinterError = 'base09'
+"@scope" = '- - b'
 TreesitterContext = 'link:CursorLine'
 
 [markdown]
diff --git a/templates/oceanic_next.toml b/templates/oceanic_next.toml
index 4ef187b..7f3aa80 100644
--- a/templates/oceanic_next.toml
+++ b/templates/oceanic_next.toml
@@ -150,60 +150,60 @@ TabLineSel = 'white line'
 TabLineFill = 'line line'
 
 [Treesitter]
-TSComment = 'link:Comment'
-TSAnnotation = 'base0F'
-TSAttribute = 'base0A'
-TSConstructor = 'base0C'
-# TSType = 'cyan'
-TSTypeBuiltin = 'base0A'
-TSConditional = 'link:Conditional'
-TSException = 'base08'
-TSInclude = 'link:Include'
-TSKeywordReturn = 'base0E'
-TSKeyword = 'base0E'
-TSKeywordFunction = 'base0E'
-# TSLabel = 'cyan'
-TSNamespace = 'base08'
-# TSRepeat = 'yellow'
-# TSConstant = 'orange'
-TSConstBuiltin = 'base09'
-TSFloat = 'base09'
-# TSNumber = 'orange'
-# TSBoolean = 'orange'
-TSCharacter = 'base08'
-TSError = 'base08'
-TSFunction = 'base0D'
-TSFuncBuiltin = 'base0D'
-TSMethod = 'base0D'
-TSConstMacro = 'base08'
-TSFuncMacro = 'base08'
-TSVariable = 'base05'
-TSVariableBuiltin = 'base09'
-TSProperty = 'base08'
-TSField = 'base0D'
-TSParameter = 'base08'
-TSParameterReference = 'base05'
-TSSymbol = 'base0B'
-TSText = 'base05'
-# TSOperator = 'base05'
-TSPunctDelimiter = 'base0F'
-TSTagDelimiter = 'base0F'
-TSTagAttribute = 'link:TSProperty'
-TSPunctBracket = 'base0F'
-TSPunctSpecial = 'base08'
-# TSString = 'green'
-TSStringRegex = 'base0C'
-TSStringEscape = 'base0C'
-# TSTag = 'blue'
-TSEmphasis = 'base09'
-# TSUnderline = '- - u'
-# TSTitle = 'base05 - -'
-TSLiteral = 'base09'
-TSURI = 'base09'
-TSKeywordOperator = 'base0E'
-# TSStructure = 'cyan'
-TSStrong = '- - b'
-# TSQueryLinterError = 'base09'
+"@annotation" = 'base0F'
+"@attribute" = 'base0A'
+"@constructor" = 'base0C'
+#" TSType = 'cyan'
+"@type.builtin" = 'base0A'
+"@conditional" = 'link:Conditional'
+"@exception" = 'base08'
+"@include" = 'link:Include'
+"@keyword.return" = 'base0E'
+"@keyword" = 'base0E'
+"@keyword.function" = 'base0E'
+#" TSLabel = 'cyan'
+"@namespace" = 'base08'
+#" TSRepeat = 'yellow'
+#" TSConstant = 'orange'
+"@constant.builtin" = 'base09'
+"@float" = 'base09'
+#" TSNumber = 'orange'
+#" TSBoolean = 'orange'
+"@character" = 'base08'
+"@error" = 'base08'
+"@function" = 'base0D'
+"@function.builtin" = 'base0D'
+"@method" = 'base0D'
+"@constant.macro" = 'base08'
+"@function.macro" = 'base08'
+"@variable" = 'base05'
+"@variable.builtin" = 'base09'
+"@property" = 'base08'
+"@field" = 'base0D'
+"@parameter" = 'base08'
+"@parameter.reference" = 'base05'
+"@symbol" = 'base0B'
+"@text" = 'base05'
+#" "@Operator = 'base05'
+"@punctuation.delimiter" = 'base0F'
+"@tag.delimiter" = 'base0F'
+"@tag.attribute" = 'link:@Property'
+"@punctuation.bracket" = 'base0F'
+"@punctuation.special" = 'base08'
+#" "@String = 'green'
+"@string.regex" = 'base0C'
+"@string.escape" = 'base0C'
+#" "@Tag = 'blue'
+"@emphasis" = 'base09'
+#" "@Underline = '- - u'
+#" "@Title = 'base05 - -'
+"@literal" = 'base09'
+"@text.uri" = 'base09'
+"@keyword.operator" = 'base0E'
+#" "@Structure = 'cyan'
+"@strong" = '- - b'
+#" "@QueryLinterError = 'base09'
+"@scope" = '- - b'
 TreesitterContext = 'link:CursorLine'
 
 [markdown]
diff --git a/templates/one_light.toml b/templates/one_light.toml
index 0e788ff..dc3406a 100644
--- a/templates/one_light.toml
+++ b/templates/one_light.toml
@@ -149,60 +149,60 @@ TabLineSel = 'white line'
 TabLineFill = 'line line'
 
 [Treesitter]
-TSComment = 'link:Comment'
-TSAnnotation = 'base0F'
-TSAttribute = 'base0A'
-TSConstructor = 'base0C'
-# TSType = 'cyan'
-TSTypeBuiltin = 'base0A'
-TSConditional = 'link:Conditional'
-TSException = 'base08'
-TSInclude = 'link:Include'
-TSKeywordReturn = 'base0E'
-TSKeyword = 'base0E'
-TSKeywordFunction = 'base0E'
-# TSLabel = 'cyan'
-TSNamespace = 'base08'
-# TSRepeat = 'yellow'
-# TSConstant = 'orange'
-TSConstBuiltin = 'base09'
-TSFloat = 'base09'
-# TSNumber = 'orange'
-# TSBoolean = 'orange'
-TSCharacter = 'base08'
-TSError = 'base08'
-TSFunction = 'base0D'
-TSFuncBuiltin = 'base0D'
-TSMethod = 'base0D'
-TSConstMacro = 'base08'
-TSFuncMacro = 'base08'
-TSVariable = 'base05'
-TSVariableBuiltin = 'base09'
-TSProperty = 'base08'
-TSField = 'base0D'
-TSParameter = 'base08'
-TSParameterReference = 'base05'
-TSSymbol = 'base0B'
-TSText = 'base05'
-# TSOperator = 'base05'
-TSPunctDelimiter = 'base0F'
-TSTagDelimiter = 'base0F'
-TSTagAttribute = 'link:TSProperty'
-TSPunctBracket = 'base0F'
-TSPunctSpecial = 'base08'
-# TSString = 'green'
-TSStringRegex = 'base0C'
-TSStringEscape = 'base0C'
-# TSTag = 'blue'
-TSEmphasis = 'base09'
-# TSUnderline = '- - u'
-# TSTitle = 'base05 - -'
-TSLiteral = 'base09'
-TSURI = 'base09'
-TSKeywordOperator = 'base0E'
-# TSStructure = 'cyan'
-TSStrong = '- - b'
-# TSQueryLinterError = 'base09'
+"@annotation" = 'base0F'
+"@attribute" = 'base0A'
+"@constructor" = 'base0C'
+#" TSType = 'cyan'
+"@type.builtin" = 'base0A'
+"@conditional" = 'link:Conditional'
+"@exception" = 'base08'
+"@include" = 'link:Include'
+"@keyword.return" = 'base0E'
+"@keyword" = 'base0E'
+"@keyword.function" = 'base0E'
+#" TSLabel = 'cyan'
+"@namespace" = 'base08'
+#" TSRepeat = 'yellow'
+#" TSConstant = 'orange'
+"@constant.builtin" = 'base09'
+"@float" = 'base09'
+#" TSNumber = 'orange'
+#" TSBoolean = 'orange'
+"@character" = 'base08'
+"@error" = 'base08'
+"@function" = 'base0D'
+"@function.builtin" = 'base0D'
+"@method" = 'base0D'
+"@constant.macro" = 'base08'
+"@function.macro" = 'base08'
+"@variable" = 'base05'
+"@variable.builtin" = 'base09'
+"@property" = 'base08'
+"@field" = 'base0D'
+"@parameter" = 'base08'
+"@parameter.reference" = 'base05'
+"@symbol" = 'base0B'
+"@text" = 'base05'
+#" "@Operator = 'base05'
+"@punctuation.delimiter" = 'base0F'
+"@tag.delimiter" = 'base0F'
+"@tag.attribute" = 'link:@Property'
+"@punctuation.bracket" = 'base0F'
+"@punctuation.special" = 'base08'
+#" "@String = 'green'
+"@string.regex" = 'base0C'
+"@string.escape" = 'base0C'
+#" "@Tag = 'blue'
+"@emphasis" = 'base09'
+#" "@Underline = '- - u'
+#" "@Title = 'base05 - -'
+"@literal" = 'base09'
+"@text.uri" = 'base09'
+"@keyword.operator" = 'base0E'
+#" "@Structure = 'cyan'
+"@strong" = '- - b'
+#" "@QueryLinterError = 'base09'
+"@scope" = '- - b'
 TreesitterContext = 'link:CursorLine'
 
 [markdown]
diff --git a/templates/onedark.toml b/templates/onedark.toml
index 888b6eb..d45d1ec 100644
--- a/templates/onedark.toml
+++ b/templates/onedark.toml
@@ -149,60 +149,60 @@ TabLineSel = 'white line'
 TabLineFill = 'line line'
 
 [Treesitter]
-TSComment = 'link:Comment'
-TSAnnotation = 'base0F'
-TSAttribute = 'base0A'
-TSConstructor = 'base0C'
-# TSType = 'cyan'
-TSTypeBuiltin = 'base0A'
-TSConditional = 'link:Conditional'
-TSException = 'base08'
-TSInclude = 'link:Include'
-TSKeywordReturn = 'base0E'
-TSKeyword = 'base0E'
-TSKeywordFunction = 'base0E'
-# TSLabel = 'cyan'
-TSNamespace = 'base08'
-# TSRepeat = 'yellow'
-# TSConstant = 'orange'
-TSConstBuiltin = 'base09'
-TSFloat = 'base09'
-# TSNumber = 'orange'
-# TSBoolean = 'orange'
-TSCharacter = 'base08'
-TSError = 'base08'
-TSFunction = 'base0D'
-TSFuncBuiltin = 'base0D'
-TSMethod = 'base0D'
-TSConstMacro = 'base08'
-TSFuncMacro = 'base08'
-TSVariable = 'base05'
-TSVariableBuiltin = 'base09'
-TSProperty = 'base08'
-TSField = 'base0D'
-TSParameter = 'base08'
-TSParameterReference = 'base05'
-TSSymbol = 'base0B'
-TSText = 'base05'
-# TSOperator = 'base05'
-TSPunctDelimiter = 'base0F'
-TSTagDelimiter = 'base0F'
-TSTagAttribute = 'link:TSProperty'
-TSPunctBracket = 'base0F'
-TSPunctSpecial = 'base08'
-# TSString = 'green'
-TSStringRegex = 'base0C'
-TSStringEscape = 'base0C'
-# TSTag = 'blue'
-TSEmphasis = 'base09'
-# TSUnderline = '- - u'
-# TSTitle = 'base05 - -'
-TSLiteral = 'base09'
-TSURI = 'base09'
-TSKeywordOperator = 'base0E'
-# TSStructure = 'cyan'
-TSStrong = '- - b'
-# TSQueryLinterError = 'base09'
+"@annotation" = 'base0F'
+"@attribute" = 'base0A'
+"@constructor" = 'base0C'
+#" TSType = 'cyan'
+"@type.builtin" = 'base0A'
+"@conditional" = 'link:Conditional'
+"@exception" = 'base08'
+"@include" = 'link:Include'
+"@keyword.return" = 'base0E'
+"@keyword" = 'base0E'
+"@keyword.function" = 'base0E'
+#" TSLabel = 'cyan'
+"@namespace" = 'base08'
+#" TSRepeat = 'yellow'
+#" TSConstant = 'orange'
+"@constant.builtin" = 'base09'
+"@float" = 'base09'
+#" TSNumber = 'orange'
+#" TSBoolean = 'orange'
+"@character" = 'base08'
+"@error" = 'base08'
+"@function" = 'base0D'
+"@function.builtin" = 'base0D'
+"@method" = 'base0D'
+"@constant.macro" = 'base08'
+"@function.macro" = 'base08'
+"@variable" = 'base05'
+"@variable.builtin" = 'base09'
+"@property" = 'base08'
+"@field" = 'base0D'
+"@parameter" = 'base08'
+"@parameter.reference" = 'base05'
+"@symbol" = 'base0B'
+"@text" = 'base05'
+#" "@Operator = 'base05'
+"@punctuation.delimiter" = 'base0F'
+"@tag.delimiter" = 'base0F'
+"@tag.attribute" = 'link:@Property'
+"@punctuation.bracket" = 'base0F'
+"@punctuation.special" = 'base08'
+#" "@String = 'green'
+"@string.regex" = 'base0C'
+"@string.escape" = 'base0C'
+#" "@Tag = 'blue'
+"@emphasis" = 'base09'
+#" "@Underline = '- - u'
+#" "@Title = 'base05 - -'
+"@literal" = 'base09'
+"@text.uri" = 'base09'
+"@keyword.operator" = 'base0E'
+#" "@Structure = 'cyan'
+"@strong" = '- - b'
+#" "@QueryLinterError = 'base09'
+"@scope" = '- - b'
 TreesitterContext = 'link:CursorLine'
 
 [markdown]
diff --git a/templates/onenord.toml b/templates/onenord.toml
index a5f0f0d..13187de 100644
--- a/templates/onenord.toml
+++ b/templates/onenord.toml
@@ -149,60 +149,60 @@ TabLineSel = 'white line'
 TabLineFill = 'line line'
 
 [Treesitter]
-TSComment = 'link:Comment'
-TSAnnotation = 'base0F'
-TSAttribute = 'base0A'
-TSConstructor = 'base0C'
-# TSType = 'cyan'
-TSTypeBuiltin = 'base0A'
-TSConditional = 'link:Conditional'
-TSException = 'base08'
-TSInclude = 'link:Include'
-TSKeywordReturn = 'base0E'
-TSKeyword = 'base0E'
-TSKeywordFunction = 'base0E'
-# TSLabel = 'cyan'
-TSNamespace = 'base08'
-# TSRepeat = 'yellow'
-# TSConstant = 'orange'
-TSConstBuiltin = 'base09'
-TSFloat = 'base09'
-# TSNumber = 'orange'
-# TSBoolean = 'orange'
-TSCharacter = 'base08'
-TSError = 'base08'
-TSFunction = 'base0D'
-TSFuncBuiltin = 'base0D'
-TSMethod = 'base0D'
-TSConstMacro = 'base08'
-TSFuncMacro = 'base08'
-TSVariable = 'base05'
-TSVariableBuiltin = 'base09'
-TSProperty = 'base08'
-TSField = 'base0D'
-TSParameter = 'base08'
-TSParameterReference = 'base05'
-TSSymbol = 'base0B'
-TSText = 'base05'
-# TSOperator = 'base05'
-TSPunctDelimiter = 'base0F'
-TSTagDelimiter = 'base0F'
-TSTagAttribute = 'link:TSProperty'
-TSPunctBracket = 'base0F'
-TSPunctSpecial = 'base08'
-# TSString = 'green'
-TSStringRegex = 'base0C'
-TSStringEscape = 'base0C'
-# TSTag = 'blue'
-TSEmphasis = 'base09'
-# TSUnderline = '- - u'
-# TSTitle = 'base05 - -'
-TSLiteral = 'base09'
-TSURI = 'base09'
-TSKeywordOperator = 'base0E'
-# TSStructure = 'cyan'
-TSStrong = '- - b'
-# TSQueryLinterError = 'base09'
+"@annotation" = 'base0F'
+"@attribute" = 'base0A'
+"@constructor" = 'base0C'
+#" TSType = 'cyan'
+"@type.builtin" = 'base0A'
+"@conditional" = 'link:Conditional'
+"@exception" = 'base08'
+"@include" = 'link:Include'
+"@keyword.return" = 'base0E'
+"@keyword" = 'base0E'
+"@keyword.function" = 'base0E'
+#" TSLabel = 'cyan'
+"@namespace" = 'base08'
+#" TSRepeat = 'yellow'
+#" TSConstant = 'orange'
+"@constant.builtin" = 'base09'
+"@float" = 'base09'
+#" TSNumber = 'orange'
+#" TSBoolean = 'orange'
+"@character" = 'base08'
+"@error" = 'base08'
+"@function" = 'base0D'
+"@function.builtin" = 'base0D'
+"@method" = 'base0D'
+"@constant.macro" = 'base08'
+"@function.macro" = 'base08'
+"@variable" = 'base05'
+"@variable.builtin" = 'base09'
+"@property" = 'base08'
+"@field" = 'base0D'
+"@parameter" = 'base08'
+"@parameter.reference" = 'base05'
+"@symbol" = 'base0B'
+"@text" = 'base05'
+#" "@Operator = 'base05'
+"@punctuation.delimiter" = 'base0F'
+"@tag.delimiter" = 'base0F'
+"@tag.attribute" = 'link:@Property'
+"@punctuation.bracket" = 'base0F'
+"@punctuation.special" = 'base08'
+#" "@String = 'green'
+"@string.regex" = 'base0C'
+"@string.escape" = 'base0C'
+#" "@Tag = 'blue'
+"@emphasis" = 'base09'
+#" "@Underline = '- - u'
+#" "@Title = 'base05 - -'
+"@literal" = 'base09'
+"@text.uri" = 'base09'
+"@keyword.operator" = 'base0E'
+#" "@Structure = 'cyan'
+"@strong" = '- - b'
+#" "@QueryLinterError = 'base09'
+"@scope" = '- - b'
 TreesitterContext = 'link:CursorLine'
 
 [markdown]
diff --git a/templates/onenord_light.toml b/templates/onenord_light.toml
index 35cb24d..0810dc0 100644
--- a/templates/onenord_light.toml
+++ b/templates/onenord_light.toml
@@ -149,60 +149,60 @@ TabLineSel = 'white line'
 TabLineFill = 'line line'
 
 [Treesitter]
-TSComment = 'link:Comment'
-TSAnnotation = 'base0F'
-TSAttribute = 'base0A'
-TSConstructor = 'base0C'
-# TSType = 'cyan'
-TSTypeBuiltin = 'base0A'
-TSConditional = 'link:Conditional'
-TSException = 'base08'
-TSInclude = 'link:Include'
-TSKeywordReturn = 'base0E'
-TSKeyword = 'base0E'
-TSKeywordFunction = 'base0E'
-# TSLabel = 'cyan'
-TSNamespace = 'base08'
-# TSRepeat = 'yellow'
-# TSConstant = 'orange'
-TSConstBuiltin = 'base09'
-TSFloat = 'base09'
-# TSNumber = 'orange'
-# TSBoolean = 'orange'
-TSCharacter = 'base08'
-TSError = 'base08'
-TSFunction = 'base0D'
-TSFuncBuiltin = 'base0D'
-TSMethod = 'base0D'
-TSConstMacro = 'base08'
-TSFuncMacro = 'base08'
-TSVariable = 'base05'
-TSVariableBuiltin = 'base09'
-TSProperty = 'base08'
-TSField = 'base0D'
-TSParameter = 'base08'
-TSParameterReference = 'base05'
-TSSymbol = 'base0B'
-TSText = 'base05'
-# TSOperator = 'base05'
-TSPunctDelimiter = 'base0F'
-TSTagDelimiter = 'base0F'
-TSTagAttribute = 'link:TSProperty'
-TSPunctBracket = 'base0F'
-TSPunctSpecial = 'base08'
-# TSString = 'green'
-TSStringRegex = 'base0C'
-TSStringEscape = 'base0C'
-# TSTag = 'blue'
-TSEmphasis = 'base09'
-# TSUnderline = '- - u'
-# TSTitle = 'base05 - -'
-TSLiteral = 'base09'
-TSURI = 'base09'
-TSKeywordOperator = 'base0E'
-# TSStructure = 'cyan'
-TSStrong = '- - b'
-# TSQueryLinterError = 'base09'
+"@annotation" = 'base0F'
+"@attribute" = 'base0A'
+"@constructor" = 'base0C'
+#" TSType = 'cyan'
+"@type.builtin" = 'base0A'
+"@conditional" = 'link:Conditional'
+"@exception" = 'base08'
+"@include" = 'link:Include'
+"@keyword.return" = 'base0E'
+"@keyword" = 'base0E'
+"@keyword.function" = 'base0E'
+#" TSLabel = 'cyan'
+"@namespace" = 'base08'
+#" TSRepeat = 'yellow'
+#" TSConstant = 'orange'
+"@constant.builtin" = 'base09'
+"@float" = 'base09'
+#" TSNumber = 'orange'
+#" TSBoolean = 'orange'
+"@character" = 'base08'
+"@error" = 'base08'
+"@function" = 'base0D'
+"@function.builtin" = 'base0D'
+"@method" = 'base0D'
+"@constant.macro" = 'base08'
+"@function.macro" = 'base08'
+"@variable" = 'base05'
+"@variable.builtin" = 'base09'
+"@property" = 'base08'
+"@field" = 'base0D'
+"@parameter" = 'base08'
+"@parameter.reference" = 'base05'
+"@symbol" = 'base0B'
+"@text" = 'base05'
+#" "@Operator = 'base05'
+"@punctuation.delimiter" = 'base0F'
+"@tag.delimiter" = 'base0F'
+"@tag.attribute" = 'link:@Property'
+"@punctuation.bracket" = 'base0F'
+"@punctuation.special" = 'base08'
+#" "@String = 'green'
+"@string.regex" = 'base0C'
+"@string.escape" = 'base0C'
+#" "@Tag = 'blue'
+"@emphasis" = 'base09'
+#" "@Underline = '- - u'
+#" "@Title = 'base05 - -'
+"@literal" = 'base09'
+"@text.uri" = 'base09'
+"@keyword.operator" = 'base0E'
+#" "@Structure = 'cyan'
+"@strong" = '- - b'
+#" "@QueryLinterError = 'base09'
+"@scope" = '- - b'
 TreesitterContext = 'link:CursorLine'
 
 [markdown]
diff --git a/templates/palenight.toml b/templates/palenight.toml
index 5f1b8c3..d848e12 100644
--- a/templates/palenight.toml
+++ b/templates/palenight.toml
@@ -149,60 +149,60 @@ TabLineSel = 'white line'
 TabLineFill = 'line line'
 
 [Treesitter]
-TSComment = 'link:Comment'
-TSAnnotation = 'base0F'
-TSAttribute = 'base0A'
-TSConstructor = 'base0C'
-# TSType = 'cyan'
-TSTypeBuiltin = 'base0A'
-TSConditional = 'link:Conditional'
-TSException = 'base08'
-TSInclude = 'link:Include'
-TSKeywordReturn = 'base0E'
-TSKeyword = 'base0E'
-TSKeywordFunction = 'base0E'
-# TSLabel = 'cyan'
-TSNamespace = 'base08'
-# TSRepeat = 'yellow'
-# TSConstant = 'orange'
-TSConstBuiltin = 'base09'
-TSFloat = 'base09'
-# TSNumber = 'orange'
-# TSBoolean = 'orange'
-TSCharacter = 'base08'
-TSError = 'base08'
-TSFunction = 'base0D'
-TSFuncBuiltin = 'base0D'
-TSMethod = 'base0D'
-TSConstMacro = 'base08'
-TSFuncMacro = 'base08'
-TSVariable = 'base05'
-TSVariableBuiltin = 'base09'
-TSProperty = 'base08'
-TSField = 'base0D'
-TSParameter = 'base08'
-TSParameterReference = 'base05'
-TSSymbol = 'base0B'
-TSText = 'base05'
-# TSOperator = 'base05'
-TSPunctDelimiter = 'base0F'
-TSTagDelimiter = 'base0F'
-TSTagAttribute = 'link:TSProperty'
-TSPunctBracket = 'base0F'
-TSPunctSpecial = 'base08'
-# TSString = 'green'
-TSStringRegex = 'base0C'
-TSStringEscape = 'base0C'
-# TSTag = 'blue'
-TSEmphasis = 'base09'
-# TSUnderline = '- - u'
-# TSTitle = 'base05 - -'
-TSLiteral = 'base09'
-TSURI = 'base09'
-TSKeywordOperator = 'base0E'
-# TSStructure = 'cyan'
-TSStrong = '- - b'
-# TSQueryLinterError = 'base09'
+"@annotation" = 'base0F'
+"@attribute" = 'base0A'
+"@constructor" = 'base0C'
+#" TSType = 'cyan'
+"@type.builtin" = 'base0A'
+"@conditional" = 'link:Conditional'
+"@exception" = 'base08'
+"@include" = 'link:Include'
+"@keyword.return" = 'base0E'
+"@keyword" = 'base0E'
+"@keyword.function" = 'base0E'
+#" TSLabel = 'cyan'
+"@namespace" = 'base08'
+#" TSRepeat = 'yellow'
+#" TSConstant = 'orange'
+"@constant.builtin" = 'base09'
+"@float" = 'base09'
+#" TSNumber = 'orange'
+#" TSBoolean = 'orange'
+"@character" = 'base08'
+"@error" = 'base08'
+"@function" = 'base0D'
+"@function.builtin" = 'base0D'
+"@method" = 'base0D'
+"@constant.macro" = 'base08'
+"@function.macro" = 'base08'
+"@variable" = 'base05'
+"@variable.builtin" = 'base09'
+"@property" = 'base08'
+"@field" = 'base0D'
+"@parameter" = 'base08'
+"@parameter.reference" = 'base05'
+"@symbol" = 'base0B'
+"@text" = 'base05'
+#" "@Operator = 'base05'
+"@punctuation.delimiter" = 'base0F'
+"@tag.delimiter" = 'base0F'
+"@tag.attribute" = 'link:@Property'
+"@punctuation.bracket" = 'base0F'
+"@punctuation.special" = 'base08'
+#" "@String = 'green'
+"@string.regex" = 'base0C'
+"@string.escape" = 'base0C'
+#" "@Tag = 'blue'
+"@emphasis" = 'base09'
+#" "@Underline = '- - u'
+#" "@Title = 'base05 - -'
+"@literal" = 'base09'
+"@text.uri" = 'base09'
+"@keyword.operator" = 'base0E'
+#" "@Structure = 'cyan'
+"@strong" = '- - b'
+#" "@QueryLinterError = 'base09'
+"@scope" = '- - b'
 TreesitterContext = 'link:CursorLine'
 
 [markdown]
diff --git a/templates/pastelDark.toml b/templates/pastelDark.toml
index 41c7c25..f48c378 100644
--- a/templates/pastelDark.toml
+++ b/templates/pastelDark.toml
@@ -149,60 +149,60 @@ TabLineSel = 'white line'
 TabLineFill = 'line line'
 
 [Treesitter]
-TSComment = 'link:Comment'
-TSAnnotation = 'base0F'
-TSAttribute = 'base0A'
-TSConstructor = 'base0C'
-# TSType = 'cyan'
-TSTypeBuiltin = 'base0A'
-TSConditional = 'link:Conditional'
-TSException = 'base08'
-TSInclude = 'link:Include'
-TSKeywordReturn = 'base0E'
-TSKeyword = 'base0E'
-TSKeywordFunction = 'base0E'
-# TSLabel = 'cyan'
-TSNamespace = 'base08'
-# TSRepeat = 'yellow'
-# TSConstant = 'orange'
-TSConstBuiltin = 'base09'
-TSFloat = 'base09'
-# TSNumber = 'orange'
-# TSBoolean = 'orange'
-TSCharacter = 'base08'
-TSError = 'base08'
-TSFunction = 'base0D'
-TSFuncBuiltin = 'base0D'
-TSMethod = 'base0D'
-TSConstMacro = 'base08'
-TSFuncMacro = 'base08'
-TSVariable = 'base05'
-TSVariableBuiltin = 'base09'
-TSProperty = 'base08'
-TSField = 'base0D'
-TSParameter = 'base08'
-TSParameterReference = 'base05'
-TSSymbol = 'base0B'
-TSText = 'base05'
-# TSOperator = 'base05'
-TSPunctDelimiter = 'base0F'
-TSTagDelimiter = 'base0F'
-TSTagAttribute = 'link:TSProperty'
-TSPunctBracket = 'base0F'
-TSPunctSpecial = 'base08'
-# TSString = 'green'
-TSStringRegex = 'base0C'
-TSStringEscape = 'base0C'
-# TSTag = 'blue'
-TSEmphasis = 'base09'
-# TSUnderline = '- - u'
-# TSTitle = 'base05 - -'
-TSLiteral = 'base09'
-TSURI = 'base09'
-TSKeywordOperator = 'base0E'
-# TSStructure = 'cyan'
-TSStrong = '- - b'
-# TSQueryLinterError = 'base09'
+"@annotation" = 'base0F'
+"@attribute" = 'base0A'
+"@constructor" = 'base0C'
+#" TSType = 'cyan'
+"@type.builtin" = 'base0A'
+"@conditional" = 'link:Conditional'
+"@exception" = 'base08'
+"@include" = 'link:Include'
+"@keyword.return" = 'base0E'
+"@keyword" = 'base0E'
+"@keyword.function" = 'base0E'
+#" TSLabel = 'cyan'
+"@namespace" = 'base08'
+#" TSRepeat = 'yellow'
+#" TSConstant = 'orange'
+"@constant.builtin" = 'base09'
+"@float" = 'base09'
+#" TSNumber = 'orange'
+#" TSBoolean = 'orange'
+"@character" = 'base08'
+"@error" = 'base08'
+"@function" = 'base0D'
+"@function.builtin" = 'base0D'
+"@method" = 'base0D'
+"@constant.macro" = 'base08'
+"@function.macro" = 'base08'
+"@variable" = 'base05'
+"@variable.builtin" = 'base09'
+"@property" = 'base08'
+"@field" = 'base0D'
+"@parameter" = 'base08'
+"@parameter.reference" = 'base05'
+"@symbol" = 'base0B'
+"@text" = 'base05'
+#" "@Operator = 'base05'
+"@punctuation.delimiter" = 'base0F'
+"@tag.delimiter" = 'base0F'
+"@tag.attribute" = 'link:@Property'
+"@punctuation.bracket" = 'base0F'
+"@punctuation.special" = 'base08'
+#" "@String = 'green'
+"@string.regex" = 'base0C'
+"@string.escape" = 'base0C'
+#" "@Tag = 'blue'
+"@emphasis" = 'base09'
+#" "@Underline = '- - u'
+#" "@Title = 'base05 - -'
+"@literal" = 'base09'
+"@text.uri" = 'base09'
+"@keyword.operator" = 'base0E'
+#" "@Structure = 'cyan'
+"@strong" = '- - b'
+#" "@QueryLinterError = 'base09'
+"@scope" = '- - b'
 TreesitterContext = 'link:CursorLine'
 
 [markdown]
diff --git a/templates/radium.toml b/templates/radium.toml
index 3d027a5..b2108dd 100644
--- a/templates/radium.toml
+++ b/templates/radium.toml
@@ -149,60 +149,60 @@ TabLineSel = 'white line'
 TabLineFill = 'line line'
 
 [Treesitter]
-TSComment = 'link:Comment'
-TSAnnotation = 'base0F'
-TSAttribute = 'base0A'
-TSConstructor = 'base0C'
-# TSType = 'cyan'
-TSTypeBuiltin = 'base0A'
-TSConditional = 'link:Conditional'
-TSException = 'base08'
-TSInclude = 'link:Include'
-TSKeywordReturn = 'base0E'
-TSKeyword = 'base0E'
-TSKeywordFunction = 'base0E'
-# TSLabel = 'cyan'
-TSNamespace = 'base08'
-# TSRepeat = 'yellow'
-# TSConstant = 'orange'
-TSConstBuiltin = 'base09'
-TSFloat = 'base09'
-# TSNumber = 'orange'
-# TSBoolean = 'orange'
-TSCharacter = 'base08'
-TSError = 'base08'
-TSFunction = 'base0D'
-TSFuncBuiltin = 'base0D'
-TSMethod = 'base0D'
-TSConstMacro = 'base08'
-TSFuncMacro = 'base08'
-TSVariable = 'base05'
-TSVariableBuiltin = 'base09'
-TSProperty = 'base08'
-TSField = 'base0D'
-TSParameter = 'base08'
-TSParameterReference = 'base05'
-TSSymbol = 'base0B'
-TSText = 'base05'
-# TSOperator = 'base05'
-TSPunctDelimiter = 'base0F'
-TSTagDelimiter = 'base0F'
-TSTagAttribute = 'link:TSProperty'
-TSPunctBracket = 'base0F'
-TSPunctSpecial = 'base08'
-# TSString = 'green'
-TSStringRegex = 'base0C'
-TSStringEscape = 'base0C'
-# TSTag = 'blue'
-TSEmphasis = 'base09'
-# TSUnderline = '- - u'
-# TSTitle = 'base05 - -'
-TSLiteral = 'base09'
-TSURI = 'base09'
-TSKeywordOperator = 'base0E'
-# TSStructure = 'cyan'
-TSStrong = '- - b'
-# TSQueryLinterError = 'base09'
+"@annotation" = 'base0F'
+"@attribute" = 'base0A'
+"@constructor" = 'base0C'
+#" TSType = 'cyan'
+"@type.builtin" = 'base0A'
+"@conditional" = 'link:Conditional'
+"@exception" = 'base08'
+"@include" = 'link:Include'
+"@keyword.return" = 'base0E'
+"@keyword" = 'base0E'
+"@keyword.function" = 'base0E'
+#" TSLabel = 'cyan'
+"@namespace" = 'base08'
+#" TSRepeat = 'yellow'
+#" TSConstant = 'orange'
+"@constant.builtin" = 'base09'
+"@float" = 'base09'
+#" TSNumber = 'orange'
+#" TSBoolean = 'orange'
+"@character" = 'base08'
+"@error" = 'base08'
+"@function" = 'base0D'
+"@function.builtin" = 'base0D'
+"@method" = 'base0D'
+"@constant.macro" = 'base08'
+"@function.macro" = 'base08'
+"@variable" = 'base05'
+"@variable.builtin" = 'base09'
+"@property" = 'base08'
+"@field" = 'base0D'
+"@parameter" = 'base08'
+"@parameter.reference" = 'base05'
+"@symbol" = 'base0B'
+"@text" = 'base05'
+#" "@Operator = 'base05'
+"@punctuation.delimiter" = 'base0F'
+"@tag.delimiter" = 'base0F'
+"@tag.attribute" = 'link:@Property'
+"@punctuation.bracket" = 'base0F'
+"@punctuation.special" = 'base08'
+#" "@String = 'green'
+"@string.regex" = 'base0C'
+"@string.escape" = 'base0C'
+#" "@Tag = 'blue'
+"@emphasis" = 'base09'
+#" "@Underline = '- - u'
+#" "@Title = 'base05 - -'
+"@literal" = 'base09'
+"@text.uri" = 'base09'
+"@keyword.operator" = 'base0E'
+#" "@Structure = 'cyan'
+"@strong" = '- - b'
+#" "@QueryLinterError = 'base09'
+"@scope" = '- - b'
 TreesitterContext = 'link:CursorLine'
 
 [markdown]
diff --git a/templates/rosepine.toml b/templates/rosepine.toml
index 081c916..3bc3891 100644
--- a/templates/rosepine.toml
+++ b/templates/rosepine.toml
@@ -149,60 +149,60 @@ TabLineSel = 'white line'
 TabLineFill = 'line line'
 
 [Treesitter]
-TSComment = 'link:Comment'
-TSAnnotation = 'base0F'
-TSAttribute = 'base0A'
-TSConstructor = 'base0C'
-# TSType = 'cyan'
-TSTypeBuiltin = 'base0A'
-TSConditional = 'link:Conditional'
-TSException = 'base08'
-TSInclude = 'link:Include'
-TSKeywordReturn = 'base0E'
-TSKeyword = 'base0E'
-TSKeywordFunction = 'base0E'
-# TSLabel = 'cyan'
-TSNamespace = 'base08'
-# TSRepeat = 'yellow'
-# TSConstant = 'orange'
-TSConstBuiltin = 'base09'
-TSFloat = 'base09'
-# TSNumber = 'orange'
-# TSBoolean = 'orange'
-TSCharacter = 'base08'
-TSError = 'base08'
-TSFunction = 'base0D'
-TSFuncBuiltin = 'base0D'
-TSMethod = 'base0D'
-TSConstMacro = 'base08'
-TSFuncMacro = 'base08'
-TSVariable = 'base05'
-TSVariableBuiltin = 'base09'
-TSProperty = 'base08'
-TSField = 'base0D'
-TSParameter = 'base08'
-TSParameterReference = 'base05'
-TSSymbol = 'base0B'
-TSText = 'base05'
-# TSOperator = 'base05'
-TSPunctDelimiter = 'base0F'
-TSTagDelimiter = 'base0F'
-TSTagAttribute = 'link:TSProperty'
-TSPunctBracket = 'base0F'
-TSPunctSpecial = 'base08'
-# TSString = 'green'
-TSStringRegex = 'base0C'
-TSStringEscape = 'base0C'
-# TSTag = 'blue'
-TSEmphasis = 'base09'
-# TSUnderline = '- - u'
-# TSTitle = 'base05 - -'
-TSLiteral = 'base09'
-TSURI = 'base09'
-TSKeywordOperator = 'base0E'
-# TSStructure = 'cyan'
-TSStrong = '- - b'
-# TSQueryLinterError = 'base09'
+"@annotation" = 'base0F'
+"@attribute" = 'base0A'
+"@constructor" = 'base0C'
+#" TSType = 'cyan'
+"@type.builtin" = 'base0A'
+"@conditional" = 'link:Conditional'
+"@exception" = 'base08'
+"@include" = 'link:Include'
+"@keyword.return" = 'base0E'
+"@keyword" = 'base0E'
+"@keyword.function" = 'base0E'
+#" TSLabel = 'cyan'
+"@namespace" = 'base08'
+#" TSRepeat = 'yellow'
+#" TSConstant = 'orange'
+"@constant.builtin" = 'base09'
+"@float" = 'base09'
+#" TSNumber = 'orange'
+#" TSBoolean = 'orange'
+"@character" = 'base08'
+"@error" = 'base08'
+"@function" = 'base0D'
+"@function.builtin" = 'base0D'
+"@method" = 'base0D'
+"@constant.macro" = 'base08'
+"@function.macro" = 'base08'
+"@variable" = 'base05'
+"@variable.builtin" = 'base09'
+"@property" = 'base08'
+"@field" = 'base0D'
+"@parameter" = 'base08'
+"@parameter.reference" = 'base05'
+"@symbol" = 'base0B'
+"@text" = 'base05'
+#" "@Operator = 'base05'
+"@punctuation.delimiter" = 'base0F'
+"@tag.delimiter" = 'base0F'
+"@tag.attribute" = 'link:@Property'
+"@punctuation.bracket" = 'base0F'
+"@punctuation.special" = 'base08'
+#" "@String = 'green'
+"@string.regex" = 'base0C'
+"@string.escape" = 'base0C'
+#" "@Tag = 'blue'
+"@emphasis" = 'base09'
+#" "@Underline = '- - u'
+#" "@Title = 'base05 - -'
+"@literal" = 'base09'
+"@text.uri" = 'base09'
+"@keyword.operator" = 'base0E'
+#" "@Structure = 'cyan'
+"@strong" = '- - b'
+#" "@QueryLinterError = 'base09'
+"@scope" = '- - b'
 TreesitterContext = 'link:CursorLine'
 
 [markdown]
diff --git a/templates/rxyhn.toml b/templates/rxyhn.toml
index b98d041..f3cc0f1 100644
--- a/templates/rxyhn.toml
+++ b/templates/rxyhn.toml
@@ -149,60 +149,60 @@ TabLineSel = 'white line'
 TabLineFill = 'line line'
 
 [Treesitter]
-TSComment = 'link:Comment'
-TSAnnotation = 'base0F'
-TSAttribute = 'base0A'
-TSConstructor = 'base0C'
-# TSType = 'cyan'
-TSTypeBuiltin = 'base0A'
-TSConditional = 'link:Conditional'
-TSException = 'base08'
-TSInclude = 'link:Include'
-TSKeywordReturn = 'base0E'
-TSKeyword = 'base0E'
-TSKeywordFunction = 'base0E'
-# TSLabel = 'cyan'
-TSNamespace = 'base08'
-# TSRepeat = 'yellow'
-# TSConstant = 'orange'
-TSConstBuiltin = 'base09'
-TSFloat = 'base09'
-# TSNumber = 'orange'
-# TSBoolean = 'orange'
-TSCharacter = 'base08'
-TSError = 'base08'
-TSFunction = 'base0D'
-TSFuncBuiltin = 'base0D'
-TSMethod = 'base0D'
-TSConstMacro = 'base08'
-TSFuncMacro = 'base08'
-TSVariable = 'base05'
-TSVariableBuiltin = 'base09'
-TSProperty = 'base08'
-TSField = 'base0D'
-TSParameter = 'base08'
-TSParameterReference = 'base05'
-TSSymbol = 'base0B'
-TSText = 'base05'
-# TSOperator = 'base05'
-TSPunctDelimiter = 'base0F'
-TSTagDelimiter = 'base0F'
-TSTagAttribute = 'link:TSProperty'
-TSPunctBracket = 'base0F'
-TSPunctSpecial = 'base08'
-# TSString = 'green'
-TSStringRegex = 'base0C'
-TSStringEscape = 'base0C'
-# TSTag = 'blue'
-TSEmphasis = 'base09'
-# TSUnderline = '- - u'
-# TSTitle = 'base05 - -'
-TSLiteral = 'base09'
-TSURI = 'base09'
-TSKeywordOperator = 'base0E'
-# TSStructure = 'cyan'
-TSStrong = '- - b'
-# TSQueryLinterError = 'base09'
+"@annotation" = 'base0F'
+"@attribute" = 'base0A'
+"@constructor" = 'base0C'
+#" TSType = 'cyan'
+"@type.builtin" = 'base0A'
+"@conditional" = 'link:Conditional'
+"@exception" = 'base08'
+"@include" = 'link:Include'
+"@keyword.return" = 'base0E'
+"@keyword" = 'base0E'
+"@keyword.function" = 'base0E'
+#" TSLabel = 'cyan'
+"@namespace" = 'base08'
+#" TSRepeat = 'yellow'
+#" TSConstant = 'orange'
+"@constant.builtin" = 'base09'
+"@float" = 'base09'
+#" TSNumber = 'orange'
+#" TSBoolean = 'orange'
+"@character" = 'base08'
+"@error" = 'base08'
+"@function" = 'base0D'
+"@function.builtin" = 'base0D'
+"@method" = 'base0D'
+"@constant.macro" = 'base08'
+"@function.macro" = 'base08'
+"@variable" = 'base05'
+"@variable.builtin" = 'base09'
+"@property" = 'base08'
+"@field" = 'base0D'
+"@parameter" = 'base08'
+"@parameter.reference" = 'base05'
+"@symbol" = 'base0B'
+"@text" = 'base05'
+#" "@Operator = 'base05'
+"@punctuation.delimiter" = 'base0F'
+"@tag.delimiter" = 'base0F'
+"@tag.attribute" = 'link:@Property'
+"@punctuation.bracket" = 'base0F'
+"@punctuation.special" = 'base08'
+#" "@String = 'green'
+"@string.regex" = 'base0C'
+"@string.escape" = 'base0C'
+#" "@Tag = 'blue'
+"@emphasis" = 'base09'
+#" "@Underline = '- - u'
+#" "@Title = 'base05 - -'
+"@literal" = 'base09'
+"@text.uri" = 'base09'
+"@keyword.operator" = 'base0E'
+#" "@Structure = 'cyan'
+"@strong" = '- - b'
+#" "@QueryLinterError = 'base09'
+"@scope" = '- - b'
 TreesitterContext = 'link:CursorLine'
 
 [markdown]
diff --git a/templates/solarized_dark.toml b/templates/solarized_dark.toml
index 5f28511..6d49b27 100644
--- a/templates/solarized_dark.toml
+++ b/templates/solarized_dark.toml
@@ -149,60 +149,60 @@ TabLineSel = 'white line'
 TabLineFill = 'line line'
 
 [Treesitter]
-TSComment = 'link:Comment'
-TSAnnotation = 'base0F'
-TSAttribute = 'base0A'
-TSConstructor = 'base0C'
-# TSType = 'cyan'
-TSTypeBuiltin = 'base0A'
-TSConditional = 'link:Conditional'
-TSException = 'base08'
-TSInclude = 'link:Include'
-TSKeywordReturn = 'base0E'
-TSKeyword = 'base0E'
-TSKeywordFunction = 'base0E'
-# TSLabel = 'cyan'
-TSNamespace = 'base08'
-# TSRepeat = 'yellow'
-# TSConstant = 'orange'
-TSConstBuiltin = 'base09'
-TSFloat = 'base09'
-# TSNumber = 'orange'
-# TSBoolean = 'orange'
-TSCharacter = 'base08'
-TSError = 'base08'
-TSFunction = 'base0D'
-TSFuncBuiltin = 'base0D'
-TSMethod = 'base0D'
-TSConstMacro = 'base08'
-TSFuncMacro = 'base08'
-TSVariable = 'base05'
-TSVariableBuiltin = 'base09'
-TSProperty = 'base08'
-TSField = 'base0D'
-TSParameter = 'base08'
-TSParameterReference = 'base05'
-TSSymbol = 'base0B'
-TSText = 'base05'
-# TSOperator = 'base05'
-TSPunctDelimiter = 'base0F'
-TSTagDelimiter = 'base0F'
-TSTagAttribute = 'link:TSProperty'
-TSPunctBracket = 'base0F'
-TSPunctSpecial = 'base08'
-# TSString = 'green'
-TSStringRegex = 'base0C'
-TSStringEscape = 'base0C'
-# TSTag = 'blue'
-TSEmphasis = 'base09'
-# TSUnderline = '- - u'
-# TSTitle = 'base05 - -'
-TSLiteral = 'base09'
-TSURI = 'base09'
-TSKeywordOperator = 'base0E'
-# TSStructure = 'cyan'
-TSStrong = '- - b'
-# TSQueryLinterError = 'base09'
+"@annotation" = 'base0F'
+"@attribute" = 'base0A'
+"@constructor" = 'base0C'
+#" TSType = 'cyan'
+"@type.builtin" = 'base0A'
+"@conditional" = 'link:Conditional'
+"@exception" = 'base08'
+"@include" = 'link:Include'
+"@keyword.return" = 'base0E'
+"@keyword" = 'base0E'
+"@keyword.function" = 'base0E'
+#" TSLabel = 'cyan'
+"@namespace" = 'base08'
+#" TSRepeat = 'yellow'
+#" TSConstant = 'orange'
+"@constant.builtin" = 'base09'
+"@float" = 'base09'
+#" TSNumber = 'orange'
+#" TSBoolean = 'orange'
+"@character" = 'base08'
+"@error" = 'base08'
+"@function" = 'base0D'
+"@function.builtin" = 'base0D'
+"@method" = 'base0D'
+"@constant.macro" = 'base08'
+"@function.macro" = 'base08'
+"@variable" = 'base05'
+"@variable.builtin" = 'base09'
+"@property" = 'base08'
+"@field" = 'base0D'
+"@parameter" = 'base08'
+"@parameter.reference" = 'base05'
+"@symbol" = 'base0B'
+"@text" = 'base05'
+#" "@Operator = 'base05'
+"@punctuation.delimiter" = 'base0F'
+"@tag.delimiter" = 'base0F'
+"@tag.attribute" = 'link:@Property'
+"@punctuation.bracket" = 'base0F'
+"@punctuation.special" = 'base08'
+#" "@String = 'green'
+"@string.regex" = 'base0C'
+"@string.escape" = 'base0C'
+#" "@Tag = 'blue'
+"@emphasis" = 'base09'
+#" "@Underline = '- - u'
+#" "@Title = 'base05 - -'
+"@literal" = 'base09'
+"@text.uri" = 'base09'
+"@keyword.operator" = 'base0E'
+#" "@Structure = 'cyan'
+"@strong" = '- - b'
+#" "@QueryLinterError = 'base09'
+"@scope" = '- - b'
 TreesitterContext = 'link:CursorLine'
 
 [markdown]
diff --git a/templates/sweetpastel.toml b/templates/sweetpastel.toml
index 6c2d60e..686fff9 100644
--- a/templates/sweetpastel.toml
+++ b/templates/sweetpastel.toml
@@ -149,60 +149,60 @@ TabLineSel = 'white line'
 TabLineFill = 'line line'
 
 [Treesitter]
-TSComment = 'link:Comment'
-TSAnnotation = 'base0F'
-TSAttribute = 'base0A'
-TSConstructor = 'base0C'
-# TSType = 'cyan'
-TSTypeBuiltin = 'base0A'
-TSConditional = 'link:Conditional'
-TSException = 'base08'
-TSInclude = 'link:Include'
-TSKeywordReturn = 'base0E'
-TSKeyword = 'base0E'
-TSKeywordFunction = 'base0E'
-# TSLabel = 'cyan'
-TSNamespace = 'base08'
-# TSRepeat = 'yellow'
-# TSConstant = 'orange'
-TSConstBuiltin = 'base09'
-TSFloat = 'base09'
-# TSNumber = 'orange'
-# TSBoolean = 'orange'
-TSCharacter = 'base08'
-TSError = 'base08'
-TSFunction = 'base0D'
-TSFuncBuiltin = 'base0D'
-TSMethod = 'base0D'
-TSConstMacro = 'base08'
-TSFuncMacro = 'base08'
-TSVariable = 'base05'
-TSVariableBuiltin = 'base09'
-TSProperty = 'base08'
-TSField = 'base0D'
-TSParameter = 'base08'
-TSParameterReference = 'base05'
-TSSymbol = 'base0B'
-TSText = 'base05'
-# TSOperator = 'base05'
-TSPunctDelimiter = 'base0F'
-TSTagDelimiter = 'base0F'
-TSTagAttribute = 'link:TSProperty'
-TSPunctBracket = 'base0F'
-TSPunctSpecial = 'base08'
-# TSString = 'green'
-TSStringRegex = 'base0C'
-TSStringEscape = 'base0C'
-# TSTag = 'blue'
-TSEmphasis = 'base09'
-# TSUnderline = '- - u'
-# TSTitle = 'base05 - -'
-TSLiteral = 'base09'
-TSURI = 'base09'
-TSKeywordOperator = 'base0E'
-# TSStructure = 'cyan'
-TSStrong = '- - b'
-# TSQueryLinterError = 'base09'
+"@annotation" = 'base0F'
+"@attribute" = 'base0A'
+"@constructor" = 'base0C'
+#" TSType = 'cyan'
+"@type.builtin" = 'base0A'
+"@conditional" = 'link:Conditional'
+"@exception" = 'base08'
+"@include" = 'link:Include'
+"@keyword.return" = 'base0E'
+"@keyword" = 'base0E'
+"@keyword.function" = 'base0E'
+#" TSLabel = 'cyan'
+"@namespace" = 'base08'
+#" TSRepeat = 'yellow'
+#" TSConstant = 'orange'
+"@constant.builtin" = 'base09'
+"@float" = 'base09'
+#" TSNumber = 'orange'
+#" TSBoolean = 'orange'
+"@character" = 'base08'
+"@error" = 'base08'
+"@function" = 'base0D'
+"@function.builtin" = 'base0D'
+"@method" = 'base0D'
+"@constant.macro" = 'base08'
+"@function.macro" = 'base08'
+"@variable" = 'base05'
+"@variable.builtin" = 'base09'
+"@property" = 'base08'
+"@field" = 'base0D'
+"@parameter" = 'base08'
+"@parameter.reference" = 'base05'
+"@symbol" = 'base0B'
+"@text" = 'base05'
+#" "@Operator = 'base05'
+"@punctuation.delimiter" = 'base0F'
+"@tag.delimiter" = 'base0F'
+"@tag.attribute" = 'link:@Property'
+"@punctuation.bracket" = 'base0F'
+"@punctuation.special" = 'base08'
+#" "@String = 'green'
+"@string.regex" = 'base0C'
+"@string.escape" = 'base0C'
+#" "@Tag = 'blue'
+"@emphasis" = 'base09'
+#" "@Underline = '- - u'
+#" "@Title = 'base05 - -'
+"@literal" = 'base09'
+"@text.uri" = 'base09'
+"@keyword.operator" = 'base0E'
+#" "@Structure = 'cyan'
+"@strong" = '- - b'
+#" "@QueryLinterError = 'base09'
+"@scope" = '- - b'
 TreesitterContext = 'link:CursorLine'
 
 [markdown]
diff --git a/templates/tokyodark.toml b/templates/tokyodark.toml
index b226fdf..170cdb2 100644
--- a/templates/tokyodark.toml
+++ b/templates/tokyodark.toml
@@ -149,60 +149,60 @@ TabLineSel = 'white line'
 TabLineFill = 'line line'
 
 [Treesitter]
-TSComment = 'link:Comment'
-TSAnnotation = 'base0F'
-TSAttribute = 'base0A'
-TSConstructor = 'base0C'
-# TSType = 'cyan'
-TSTypeBuiltin = 'base0A'
-TSConditional = 'link:Conditional'
-TSException = 'base08'
-TSInclude = 'link:Include'
-TSKeywordReturn = 'base0E'
-TSKeyword = 'base0E'
-TSKeywordFunction = 'base0E'
-# TSLabel = 'cyan'
-TSNamespace = 'base08'
-# TSRepeat = 'yellow'
-# TSConstant = 'orange'
-TSConstBuiltin = 'base09'
-TSFloat = 'base09'
-# TSNumber = 'orange'
-# TSBoolean = 'orange'
-TSCharacter = 'base08'
-TSError = 'base08'
-TSFunction = 'base0D'
-TSFuncBuiltin = 'base0D'
-TSMethod = 'base0D'
-TSConstMacro = 'base08'
-TSFuncMacro = 'base08'
-TSVariable = 'base05'
-TSVariableBuiltin = 'base09'
-TSProperty = 'base08'
-TSField = 'base0D'
-TSParameter = 'base08'
-TSParameterReference = 'base05'
-TSSymbol = 'base0B'
-TSText = 'base05'
-# TSOperator = 'base05'
-TSPunctDelimiter = 'base0F'
-TSTagDelimiter = 'base0F'
-TSTagAttribute = 'link:TSProperty'
-TSPunctBracket = 'base0F'
-TSPunctSpecial = 'base08'
-# TSString = 'green'
-TSStringRegex = 'base0C'
-TSStringEscape = 'base0C'
-# TSTag = 'blue'
-TSEmphasis = 'base09'
-# TSUnderline = '- - u'
-# TSTitle = 'base05 - -'
-TSLiteral = 'base09'
-TSURI = 'base09'
-TSKeywordOperator = 'base0E'
-# TSStructure = 'cyan'
-TSStrong = '- - b'
-# TSQueryLinterError = 'base09'
+"@annotation" = 'base0F'
+"@attribute" = 'base0A'
+"@constructor" = 'base0C'
+#" TSType = 'cyan'
+"@type.builtin" = 'base0A'
+"@conditional" = 'link:Conditional'
+"@exception" = 'base08'
+"@include" = 'link:Include'
+"@keyword.return" = 'base0E'
+"@keyword" = 'base0E'
+"@keyword.function" = 'base0E'
+#" TSLabel = 'cyan'
+"@namespace" = 'base08'
+#" TSRepeat = 'yellow'
+#" TSConstant = 'orange'
+"@constant.builtin" = 'base09'
+"@float" = 'base09'
+#" TSNumber = 'orange'
+#" TSBoolean = 'orange'
+"@character" = 'base08'
+"@error" = 'base08'
+"@function" = 'base0D'
+"@function.builtin" = 'base0D'
+"@method" = 'base0D'
+"@constant.macro" = 'base08'
+"@function.macro" = 'base08'
+"@variable" = 'base05'
+"@variable.builtin" = 'base09'
+"@property" = 'base08'
+"@field" = 'base0D'
+"@parameter" = 'base08'
+"@parameter.reference" = 'base05'
+"@symbol" = 'base0B'
+"@text" = 'base05'
+#" "@Operator = 'base05'
+"@punctuation.delimiter" = 'base0F'
+"@tag.delimiter" = 'base0F'
+"@tag.attribute" = 'link:@Property'
+"@punctuation.bracket" = 'base0F'
+"@punctuation.special" = 'base08'
+#" "@String = 'green'
+"@string.regex" = 'base0C'
+"@string.escape" = 'base0C'
+#" "@Tag = 'blue'
+"@emphasis" = 'base09'
+#" "@Underline = '- - u'
+#" "@Title = 'base05 - -'
+"@literal" = 'base09'
+"@text.uri" = 'base09'
+"@keyword.operator" = 'base0E'
+#" "@Structure = 'cyan'
+"@strong" = '- - b'
+#" "@QueryLinterError = 'base09'
+"@scope" = '- - b'
 TreesitterContext = 'link:CursorLine'
 
 [markdown]
diff --git a/templates/tokyonight.toml b/templates/tokyonight.toml
index 65d7eb9..e61c66e 100644
--- a/templates/tokyonight.toml
+++ b/templates/tokyonight.toml
@@ -149,60 +149,60 @@ TabLineSel = 'white line'
 TabLineFill = 'line line'
 
 [Treesitter]
-TSComment = 'link:Comment'
-TSAnnotation = 'base0F'
-TSAttribute = 'base0A'
-TSConstructor = 'base0C'
-# TSType = 'cyan'
-TSTypeBuiltin = 'base0A'
-TSConditional = 'link:Conditional'
-TSException = 'base08'
-TSInclude = 'link:Include'
-TSKeywordReturn = 'base0E'
-TSKeyword = 'base0E'
-TSKeywordFunction = 'base0E'
-# TSLabel = 'cyan'
-TSNamespace = 'base08'
-# TSRepeat = 'yellow'
-# TSConstant = 'orange'
-TSConstBuiltin = 'base09'
-TSFloat = 'base09'
-# TSNumber = 'orange'
-# TSBoolean = 'orange'
-TSCharacter = 'base08'
-TSError = 'base08'
-TSFunction = 'base0D'
-TSFuncBuiltin = 'base0D'
-TSMethod = 'base0D'
-TSConstMacro = 'base08'
-TSFuncMacro = 'base08'
-TSVariable = 'base05'
-TSVariableBuiltin = 'base09'
-TSProperty = 'base08'
-TSField = 'base0D'
-TSParameter = 'base08'
-TSParameterReference = 'base05'
-TSSymbol = 'base0B'
-TSText = 'base05'
-# TSOperator = 'base05'
-TSPunctDelimiter = 'base0F'
-TSTagDelimiter = 'base0F'
-TSTagAttribute = 'link:TSProperty'
-TSPunctBracket = 'base0F'
-TSPunctSpecial = 'base08'
-# TSString = 'green'
-TSStringRegex = 'base0C'
-TSStringEscape = 'base0C'
-# TSTag = 'blue'
-TSEmphasis = 'base09'
-# TSUnderline = '- - u'
-# TSTitle = 'base05 - -'
-TSLiteral = 'base09'
-TSURI = 'base09'
-TSKeywordOperator = 'base0E'
-# TSStructure = 'cyan'
-TSStrong = '- - b'
-# TSQueryLinterError = 'base09'
+"@annotation" = 'base0F'
+"@attribute" = 'base0A'
+"@constructor" = 'base0C'
+#" TSType = 'cyan'
+"@type.builtin" = 'base0A'
+"@conditional" = 'link:Conditional'
+"@exception" = 'base08'
+"@include" = 'link:Include'
+"@keyword.return" = 'base0E'
+"@keyword" = 'base0E'
+"@keyword.function" = 'base0E'
+#" TSLabel = 'cyan'
+"@namespace" = 'base08'
+#" TSRepeat = 'yellow'
+#" TSConstant = 'orange'
+"@constant.builtin" = 'base09'
+"@float" = 'base09'
+#" TSNumber = 'orange'
+#" TSBoolean = 'orange'
+"@character" = 'base08'
+"@error" = 'base08'
+"@function" = 'base0D'
+"@function.builtin" = 'base0D'
+"@method" = 'base0D'
+"@constant.macro" = 'base08'
+"@function.macro" = 'base08'
+"@variable" = 'base05'
+"@variable.builtin" = 'base09'
+"@property" = 'base08'
+"@field" = 'base0D'
+"@parameter" = 'base08'
+"@parameter.reference" = 'base05'
+"@symbol" = 'base0B'
+"@text" = 'base05'
+#" "@Operator = 'base05'
+"@punctuation.delimiter" = 'base0F'
+"@tag.delimiter" = 'base0F'
+"@tag.attribute" = 'link:@Property'
+"@punctuation.bracket" = 'base0F'
+"@punctuation.special" = 'base08'
+#" "@String = 'green'
+"@string.regex" = 'base0C'
+"@string.escape" = 'base0C'
+#" "@Tag = 'blue'
+"@emphasis" = 'base09'
+#" "@Underline = '- - u'
+#" "@Title = 'base05 - -'
+"@literal" = 'base09'
+"@text.uri" = 'base09'
+"@keyword.operator" = 'base0E'
+#" "@Structure = 'cyan'
+"@strong" = '- - b'
+#" "@QueryLinterError = 'base09'
+"@scope" = '- - b'
 TreesitterContext = 'link:CursorLine'
 
 [markdown]
diff --git a/templates/tomorrow_night.toml b/templates/tomorrow_night.toml
index 7201e78..92629b2 100644
--- a/templates/tomorrow_night.toml
+++ b/templates/tomorrow_night.toml
@@ -149,60 +149,60 @@ TabLineSel = 'white line'
 TabLineFill = 'line line'
 
 [Treesitter]
-TSComment = 'link:Comment'
-TSAnnotation = 'base0F'
-TSAttribute = 'base0A'
-TSConstructor = 'base0C'
-# TSType = 'cyan'
-TSTypeBuiltin = 'base0A'
-TSConditional = 'link:Conditional'
-TSException = 'base08'
-TSInclude = 'link:Include'
-TSKeywordReturn = 'base0E'
-TSKeyword = 'base0E'
-TSKeywordFunction = 'base0E'
-# TSLabel = 'cyan'
-TSNamespace = 'base08'
-# TSRepeat = 'yellow'
-# TSConstant = 'orange'
-TSConstBuiltin = 'base09'
-TSFloat = 'base09'
-# TSNumber = 'orange'
-# TSBoolean = 'orange'
-TSCharacter = 'base08'
-TSError = 'base08'
-TSFunction = 'base0D'
-TSFuncBuiltin = 'base0D'
-TSMethod = 'base0D'
-TSConstMacro = 'base08'
-TSFuncMacro = 'base08'
-TSVariable = 'base05'
-TSVariableBuiltin = 'base09'
-TSProperty = 'base08'
-TSField = 'base0D'
-TSParameter = 'base08'
-TSParameterReference = 'base05'
-TSSymbol = 'base0B'
-TSText = 'base05'
-# TSOperator = 'base05'
-TSPunctDelimiter = 'base0F'
-TSTagDelimiter = 'base0F'
-TSTagAttribute = 'link:TSProperty'
-TSPunctBracket = 'base0F'
-TSPunctSpecial = 'base08'
-# TSString = 'green'
-TSStringRegex = 'base0C'
-TSStringEscape = 'base0C'
-# TSTag = 'blue'
-TSEmphasis = 'base09'
-# TSUnderline = '- - u'
-# TSTitle = 'base05 - -'
-TSLiteral = 'base09'
-TSURI = 'base09'
-TSKeywordOperator = 'base0E'
-# TSStructure = 'cyan'
-TSStrong = '- - b'
-# TSQueryLinterError = 'base09'
+"@annotation" = 'base0F'
+"@attribute" = 'base0A'
+"@constructor" = 'base0C'
+#" TSType = 'cyan'
+"@type.builtin" = 'base0A'
+"@conditional" = 'link:Conditional'
+"@exception" = 'base08'
+"@include" = 'link:Include'
+"@keyword.return" = 'base0E'
+"@keyword" = 'base0E'
+"@keyword.function" = 'base0E'
+#" TSLabel = 'cyan'
+"@namespace" = 'base08'
+#" TSRepeat = 'yellow'
+#" TSConstant = 'orange'
+"@constant.builtin" = 'base09'
+"@float" = 'base09'
+#" TSNumber = 'orange'
+#" TSBoolean = 'orange'
+"@character" = 'base08'
+"@error" = 'base08'
+"@function" = 'base0D'
+"@function.builtin" = 'base0D'
+"@method" = 'base0D'
+"@constant.macro" = 'base08'
+"@function.macro" = 'base08'
+"@variable" = 'base05'
+"@variable.builtin" = 'base09'
+"@property" = 'base08'
+"@field" = 'base0D'
+"@parameter" = 'base08'
+"@parameter.reference" = 'base05'
+"@symbol" = 'base0B'
+"@text" = 'base05'
+#" "@Operator = 'base05'
+"@punctuation.delimiter" = 'base0F'
+"@tag.delimiter" = 'base0F'
+"@tag.attribute" = 'link:@Property'
+"@punctuation.bracket" = 'base0F'
+"@punctuation.special" = 'base08'
+#" "@String = 'green'
+"@string.regex" = 'base0C'
+"@string.escape" = 'base0C'
+#" "@Tag = 'blue'
+"@emphasis" = 'base09'
+#" "@Underline = '- - u'
+#" "@Title = 'base05 - -'
+"@literal" = 'base09'
+"@text.uri" = 'base09'
+"@keyword.operator" = 'base0E'
+#" "@Structure = 'cyan'
+"@strong" = '- - b'
+#" "@QueryLinterError = 'base09'
+"@scope" = '- - b'
 TreesitterContext = 'link:CursorLine'
 
 [markdown]
diff --git a/templates/vscode_dark.toml b/templates/vscode_dark.toml
index 02b41d6..72d50b7 100644
--- a/templates/vscode_dark.toml
+++ b/templates/vscode_dark.toml
@@ -151,60 +151,60 @@ TabLineSel = 'white line'
 TabLineFill = 'line line'
 
 [Treesitter]
-TSComment = 'link:Comment'
-TSAnnotation = 'base0F'
-TSAttribute = 'base0A'
-TSConstructor = 'base0C'
-# TSType = 'cyan'
-TSTypeBuiltin = 'base0A'
-TSConditional = 'link:Conditional'
-TSException = 'base08'
-TSInclude = 'link:Include'
-TSKeywordReturn = 'base0E'
-TSKeyword = 'base0E'
-TSKeywordFunction = 'base0E'
-# TSLabel = 'cyan'
-TSNamespace = 'base08'
-# TSRepeat = 'yellow'
-# TSConstant = 'orange'
-TSConstBuiltin = 'base09'
-TSFloat = 'base09'
-# TSNumber = 'orange'
-# TSBoolean = 'orange'
-TSCharacter = 'base08'
-TSError = 'base08'
-TSFunction = 'base0D'
-TSFuncBuiltin = 'base0D'
-TSMethod = 'base0D'
-TSConstMacro = 'base08'
-TSFuncMacro = 'base08'
-TSVariable = 'base05'
-TSVariableBuiltin = 'base09'
-TSProperty = 'base08'
-TSField = 'base0D'
-TSParameter = 'base08'
-TSParameterReference = 'base05'
-TSSymbol = 'base0B'
-TSText = 'base05'
-# TSOperator = 'base05'
-TSPunctDelimiter = 'base0F'
-TSTagDelimiter = 'base0F'
-TSTagAttribute = 'link:TSProperty'
-TSPunctBracket = 'base0F'
-TSPunctSpecial = 'base08'
-# TSString = 'green'
-TSStringRegex = 'base0C'
-TSStringEscape = 'base0C'
-# TSTag = 'blue'
-TSEmphasis = 'base09'
-# TSUnderline = '- - u'
-# TSTitle = 'base05 - -'
-TSLiteral = 'base09'
-TSURI = 'base09'
-TSKeywordOperator = 'base0E'
-# TSStructure = 'cyan'
-TSStrong = '- - b'
-# TSQueryLinterError = 'base09'
+"@annotation" = 'base0F'
+"@attribute" = 'base0A'
+"@constructor" = 'base0C'
+#" TSType = 'cyan'
+"@type.builtin" = 'base0A'
+"@conditional" = 'link:Conditional'
+"@exception" = 'base08'
+"@include" = 'link:Include'
+"@keyword.return" = 'base0E'
+"@keyword" = 'base0E'
+"@keyword.function" = 'base0E'
+#" TSLabel = 'cyan'
+"@namespace" = 'base08'
+#" TSRepeat = 'yellow'
+#" TSConstant = 'orange'
+"@constant.builtin" = 'base09'
+"@float" = 'base09'
+#" TSNumber = 'orange'
+#" TSBoolean = 'orange'
+"@character" = 'base08'
+"@error" = 'base08'
+"@function" = 'base0D'
+"@function.builtin" = 'base0D'
+"@method" = 'base0D'
+"@constant.macro" = 'base08'
+"@function.macro" = 'base08'
+"@variable" = 'base05'
+"@variable.builtin" = 'base09'
+"@property" = 'base08'
+"@field" = 'base0D'
+"@parameter" = 'base08'
+"@parameter.reference" = 'base05'
+"@symbol" = 'base0B'
+"@text" = 'base05'
+#" "@Operator = 'base05'
+"@punctuation.delimiter" = 'base0F'
+"@tag.delimiter" = 'base0F'
+"@tag.attribute" = 'link:@Property'
+"@punctuation.bracket" = 'base0F'
+"@punctuation.special" = 'base08'
+#" "@String = 'green'
+"@string.regex" = 'base0C'
+"@string.escape" = 'base0C'
+#" "@Tag = 'blue'
+"@emphasis" = 'base09'
+#" "@Underline = '- - u'
+#" "@Title = 'base05 - -'
+"@literal" = 'base09'
+"@text.uri" = 'base09'
+"@keyword.operator" = 'base0E'
+#" "@Structure = 'cyan'
+"@strong" = '- - b'
+#" "@QueryLinterError = 'base09'
+"@scope" = '- - b'
 TreesitterContext = 'link:CursorLine'
 
 [markdown]
diff --git a/templates/wombat.toml b/templates/wombat.toml
index b19882b..f58dbef 100644
--- a/templates/wombat.toml
+++ b/templates/wombat.toml
@@ -149,60 +149,60 @@ TabLineSel = 'white line'
 TabLineFill = 'line line'
 
 [Treesitter]
-TSComment = 'link:Comment'
-TSAnnotation = 'base0F'
-TSAttribute = 'base0A'
-TSConstructor = 'base0C'
-# TSType = 'cyan'
-TSTypeBuiltin = 'base0A'
-TSConditional = 'link:Conditional'
-TSException = 'base08'
-TSInclude = 'link:Include'
-TSKeywordReturn = 'base0E'
-TSKeyword = 'base0E'
-TSKeywordFunction = 'base0E'
-# TSLabel = 'cyan'
-TSNamespace = 'base08'
-# TSRepeat = 'yellow'
-# TSConstant = 'orange'
-TSConstBuiltin = 'base09'
-TSFloat = 'base09'
-# TSNumber = 'orange'
-# TSBoolean = 'orange'
-TSCharacter = 'base08'
-TSError = 'base08'
-TSFunction = 'base0D'
-TSFuncBuiltin = 'base0D'
-TSMethod = 'base0D'
-TSConstMacro = 'base08'
-TSFuncMacro = 'base08'
-TSVariable = 'base05'
-TSVariableBuiltin = 'base09'
-TSProperty = 'base08'
-TSField = 'base0D'
-TSParameter = 'base08'
-TSParameterReference = 'base05'
-TSSymbol = 'base0B'
-TSText = 'base05'
-# TSOperator = 'base05'
-TSPunctDelimiter = 'base0F'
-TSTagDelimiter = 'base0F'
-TSTagAttribute = 'link:TSProperty'
-TSPunctBracket = 'base0F'
-TSPunctSpecial = 'base08'
-# TSString = 'green'
-TSStringRegex = 'base0C'
-TSStringEscape = 'base0C'
-# TSTag = 'blue'
-TSEmphasis = 'base09'
-# TSUnderline = '- - u'
-# TSTitle = 'base05 - -'
-TSLiteral = 'base09'
-TSURI = 'base09'
-TSKeywordOperator = 'base0E'
-# TSStructure = 'cyan'
-TSStrong = '- - b'
-# TSQueryLinterError = 'base09'
+"@annotation" = 'base0F'
+"@attribute" = 'base0A'
+"@constructor" = 'base0C'
+#" TSType = 'cyan'
+"@type.builtin" = 'base0A'
+"@conditional" = 'link:Conditional'
+"@exception" = 'base08'
+"@include" = 'link:Include'
+"@keyword.return" = 'base0E'
+"@keyword" = 'base0E'
+"@keyword.function" = 'base0E'
+#" TSLabel = 'cyan'
+"@namespace" = 'base08'
+#" TSRepeat = 'yellow'
+#" TSConstant = 'orange'
+"@constant.builtin" = 'base09'
+"@float" = 'base09'
+#" TSNumber = 'orange'
+#" TSBoolean = 'orange'
+"@character" = 'base08'
+"@error" = 'base08'
+"@function" = 'base0D'
+"@function.builtin" = 'base0D'
+"@method" = 'base0D'
+"@constant.macro" = 'base08'
+"@function.macro" = 'base08'
+"@variable" = 'base05'
+"@variable.builtin" = 'base09'
+"@property" = 'base08'
+"@field" = 'base0D'
+"@parameter" = 'base08'
+"@parameter.reference" = 'base05'
+"@symbol" = 'base0B'
+"@text" = 'base05'
+#" "@Operator = 'base05'
+"@punctuation.delimiter" = 'base0F'
+"@tag.delimiter" = 'base0F'
+"@tag.attribute" = 'link:@Property'
+"@punctuation.bracket" = 'base0F'
+"@punctuation.special" = 'base08'
+#" "@String = 'green'
+"@string.regex" = 'base0C'
+"@string.escape" = 'base0C'
+#" "@Tag = 'blue'
+"@emphasis" = 'base09'
+#" "@Underline = '- - u'
+#" "@Title = 'base05 - -'
+"@literal" = 'base09'
+"@text.uri" = 'base09'
+"@keyword.operator" = 'base0E'
+#" "@Structure = 'cyan'
+"@strong" = '- - b'
+#" "@QueryLinterError = 'base09'
+"@scope" = '- - b'
 TreesitterContext = 'link:CursorLine'
 
 [markdown]
diff --git a/templates/yoru.toml b/templates/yoru.toml
index 50ad9f0..e59d169 100644
--- a/templates/yoru.toml
+++ b/templates/yoru.toml
@@ -150,60 +150,60 @@ TabLineSel = 'white line'
 TabLineFill = 'line line'
 
 [Treesitter]
-TSComment = 'link:Comment'
-TSAnnotation = 'base0F'
-TSAttribute = 'base0A'
-TSConstructor = 'base0C'
-# TSType = 'cyan'
-TSTypeBuiltin = 'base0A'
-TSConditional = 'link:Conditional'
-TSException = 'base08'
-TSInclude = 'link:Include'
-TSKeywordReturn = 'base0E'
-TSKeyword = 'base0E'
-TSKeywordFunction = 'base0E'
-# TSLabel = 'cyan'
-TSNamespace = 'base08'
-# TSRepeat = 'yellow'
-# TSConstant = 'orange'
-TSConstBuiltin = 'base09'
-TSFloat = 'base09'
-# TSNumber = 'orange'
-# TSBoolean = 'orange'
-TSCharacter = 'base08'
-TSError = 'base08'
-TSFunction = 'base0D'
-TSFuncBuiltin = 'base0D'
-TSMethod = 'base0D'
-TSConstMacro = 'base08'
-TSFuncMacro = 'base08'
-TSVariable = 'base05'
-TSVariableBuiltin = 'base09'
-TSProperty = 'base08'
-TSField = 'base0D'
-TSParameter = 'base08'
-TSParameterReference = 'base05'
-TSSymbol = 'base0B'
-TSText = 'base05'
-# TSOperator = 'base05'
-TSPunctDelimiter = 'base0F'
-TSTagDelimiter = 'base0F'
-TSTagAttribute = 'link:TSProperty'
-TSPunctBracket = 'base0F'
-TSPunctSpecial = 'base08'
-# TSString = 'green'
-TSStringRegex = 'base0C'
-TSStringEscape = 'base0C'
-# TSTag = 'blue'
-TSEmphasis = 'base09'
-# TSUnderline = '- - u'
-# TSTitle = 'base05 - -'
-TSLiteral = 'base09'
-TSURI = 'base09'
-TSKeywordOperator = 'base0E'
-# TSStructure = 'cyan'
-TSStrong = '- - b'
-# TSQueryLinterError = 'base09'
+"@annotation" = 'base0F'
+"@attribute" = 'base0A'
+"@constructor" = 'base0C'
+#" TSType = 'cyan'
+"@type.builtin" = 'base0A'
+"@conditional" = 'link:Conditional'
+"@exception" = 'base08'
+"@include" = 'link:Include'
+"@keyword.return" = 'base0E'
+"@keyword" = 'base0E'
+"@keyword.function" = 'base0E'
+#" TSLabel = 'cyan'
+"@namespace" = 'base08'
+#" TSRepeat = 'yellow'
+#" TSConstant = 'orange'
+"@constant.builtin" = 'base09'
+"@float" = 'base09'
+#" TSNumber = 'orange'
+#" TSBoolean = 'orange'
+"@character" = 'base08'
+"@error" = 'base08'
+"@function" = 'base0D'
+"@function.builtin" = 'base0D'
+"@method" = 'base0D'
+"@constant.macro" = 'base08'
+"@function.macro" = 'base08'
+"@variable" = 'base05'
+"@variable.builtin" = 'base09'
+"@property" = 'base08'
+"@field" = 'base0D'
+"@parameter" = 'base08'
+"@parameter.reference" = 'base05'
+"@symbol" = 'base0B'
+"@text" = 'base05'
+#" "@Operator = 'base05'
+"@punctuation.delimiter" = 'base0F'
+"@tag.delimiter" = 'base0F'
+"@tag.attribute" = 'link:@Property'
+"@punctuation.bracket" = 'base0F'
+"@punctuation.special" = 'base08'
+#" "@String = 'green'
+"@string.regex" = 'base0C'
+"@string.escape" = 'base0C'
+#" "@Tag = 'blue'
+"@emphasis" = 'base09'
+#" "@Underline = '- - u'
+#" "@Title = 'base05 - -'
+"@literal" = 'base09'
+"@text.uri" = 'base09'
+"@keyword.operator" = 'base0E'
+#" "@Structure = 'cyan'
+"@strong" = '- - b'
+#" "@QueryLinterError = 'base09'
+"@scope" = '- - b'
 TreesitterContext = 'link:CursorLine'
 
 [markdown]