diff --git a/lua/base46/themes/gruvbox_material.lua b/lua/base46/themes/gruvbox_material.lua
index 8005e31..9340972 100644
--- a/lua/base46/themes/gruvbox_material.lua
+++ b/lua/base46/themes/gruvbox_material.lua
@@ -54,9 +54,9 @@ M.base_16 = {
 
 M.polish_hl = {
   Include = { fg = M.base_16.base0E },
-  TSVariable = { fg = M.base_16.base08 },
-  TSProperty = { fg = M.base_16.base0C },
   Repeat = { fg = M.base_16.base0E },
+  ["@variable"] = { fg = M.base_16.base08 },
+  ["@property"] = { fg = M.base_16.base0C },
 }
 
 vim.opt.bg = "dark"
diff --git a/lua/base46/themes/kanagawa.lua b/lua/base46/themes/kanagawa.lua
index 22285a7..df8a4bd 100644
--- a/lua/base46/themes/kanagawa.lua
+++ b/lua/base46/themes/kanagawa.lua
@@ -53,9 +53,9 @@ M.base_16 = {
 }
 
 M.polish_hl = {
-  TSInclude = { fg = M.base_30.purple },
-  TSURI = { fg = M.base_30.blue },
-  TSTagDelimiter = { fg = M.base_30.red },
+  ["@include"] = { fg = M.base_30.purple },
+  ["@uri"] = { fg = M.base_30.blue },
+  ["@tag.delimiter"] = { fg = M.base_30.red },
   Number = {
     fg = M.base_30.baby_pink,
   },
diff --git a/lua/base46/themes/monekai.lua b/lua/base46/themes/monekai.lua
index 25bf15c..6d444f7 100644
--- a/lua/base46/themes/monekai.lua
+++ b/lua/base46/themes/monekai.lua
@@ -53,8 +53,8 @@ M.base_16 = {
 }
 
 M.polish_hl = {
-  TSParameter = { fg = M.base_30.blue },
-  TSFieldKey = { fg = M.base_30.red },
+  ["@parameter"] = { fg = M.base_30.blue },
+  ["@field.key"] = { fg = M.base_30.red },
 }
 
 vim.opt.bg = "dark"
diff --git a/lua/base46/themes/mountain.lua b/lua/base46/themes/mountain.lua
index b5d6ec6..8ce5729 100644
--- a/lua/base46/themes/mountain.lua
+++ b/lua/base46/themes/mountain.lua
@@ -53,7 +53,7 @@ M.base_16 = {
 }
 
 M.polish_hl = {
-  TSVariable = { fg = M.base_16.base05 },
+  ["@variable"] = { fg = M.base_16.base05 },
 }
 
 vim.opt.bg = "dark"
diff --git a/lua/base46/themes/nightowl.lua b/lua/base46/themes/nightowl.lua
index 827ad8e..2af749f 100644
--- a/lua/base46/themes/nightowl.lua
+++ b/lua/base46/themes/nightowl.lua
@@ -53,9 +53,9 @@ M.base_16 = {
 }
 
 M.polish_hl = {
-  TSParameter = { fg = M.base_30.orange },
-  TSKeywordReturn = { fg = M.base_30.cyan },
-  TSConditional = { fg = M.base_30.cyan },
+  ["@parameter"] = { fg = M.base_30.orange },
+  ["@keyword.return"] = { fg = M.base_30.cyan },
+  ["@conditional"] = { fg = M.base_30.cyan },
   PmenuSel = { bg = M.base_30.blue },
 }
 
diff --git a/lua/base46/themes/nord.lua b/lua/base46/themes/nord.lua
index 2693d38..7332381 100644
--- a/lua/base46/themes/nord.lua
+++ b/lua/base46/themes/nord.lua
@@ -53,8 +53,8 @@ M.base_16 = {
 }
 
 M.polish_hl = {
-  TSPunctBracket = { fg = M.base_30.white },
-  TSPunctDelimiter = { fg = M.base_30.white },
+  ["@punctuation.bracket"] = { fg = M.base_30.white },
+  ["@punctuation.delimiter"] = { fg = M.base_30.white },
 }
 vim.opt.bg = "dark"
 
diff --git a/lua/base46/themes/oceanic-next.lua b/lua/base46/themes/oceanic-next.lua
index 7a7562c..864926d 100644
--- a/lua/base46/themes/oceanic-next.lua
+++ b/lua/base46/themes/oceanic-next.lua
@@ -57,7 +57,7 @@ M.base_16 = {
 }
 
 M.polish_hl = {
-  TSParameter = {
+  ["@parameter"] = {
     fg = M.base_16.base0A,
   },
   Constant = {
diff --git a/lua/base46/themes/one_light.lua b/lua/base46/themes/one_light.lua
index 9590651..99bf3fd 100644
--- a/lua/base46/themes/one_light.lua
+++ b/lua/base46/themes/one_light.lua
@@ -57,7 +57,7 @@ vim.opt.bg = "light"
 M.polish_hl = {
   TelescopePromptPrefix = { fg = M.base_30.white },
   TelescopeSelection = { bg = M.base_30.one_bg, fg = M.base_30.white },
-  TSPunctBracket = { fg = M.base_30.nord_blue },
+  ["@punctuation.bracket"] = { fg = M.base_30.nord_blue },
   FloatBorder = { fg = M.base_16.base05 },
   DiffAdd = { fg = M.base_16.base05 },
   TbLineThemeToggleBtn = { bg = M.base_30.one_bg3 },
diff --git a/lua/base46/themes/onenord_light.lua b/lua/base46/themes/onenord_light.lua
index 6010435..ef98fa7 100644
--- a/lua/base46/themes/onenord_light.lua
+++ b/lua/base46/themes/onenord_light.lua
@@ -57,7 +57,7 @@ M.polish_hl = {
   WhichKey = { fg = M.base_30.white },
   TelescopePromptPrefix = { fg = M.base_30.white },
   TelescopeSelection = { bg = M.base_30.one_bg, fg = M.base_30.white },
-  TSPunctBracket = { fg = M.base_30.nord_blue },
+  ["@punctuation.bracket"] = { fg = M.base_30.nord_blue },
   FloatBorder = { fg = M.base_16.base05 },
   DiffAdd = { fg = M.base_16.base05 },
   St_pos_text = { fg = M.base_30.white },
diff --git a/lua/base46/themes/palenight.lua b/lua/base46/themes/palenight.lua
index d332466..273e003 100644
--- a/lua/base46/themes/palenight.lua
+++ b/lua/base46/themes/palenight.lua
@@ -53,8 +53,8 @@ M.base_16 = {
 }
 
 M.polish_hl = {
-  TSInclude = { fg = M.base_30.purple },
-  TSFieldKey = { fg = M.base_30.orange },
+  ["@include"] = { fg = M.base_30.purple },
+  ["@field.key"] = { fg = M.base_30.orange },
 }
 
 vim.opt.bg = "dark"
diff --git a/lua/base46/themes/radium.lua b/lua/base46/themes/radium.lua
index 5c18dec..294e580 100644
--- a/lua/base46/themes/radium.lua
+++ b/lua/base46/themes/radium.lua
@@ -53,8 +53,8 @@ M.base_16 = {
 }
 
 M.polish_hl = {
-  TSPunctBracket = { fg = M.base_16.base07 },
-  TSParenthesis = { link = "TSPunctBracket" },
+  ["@punctuation.bracket"] = { fg = M.base_16.base07 },
+  ["@parenthesis"] = { link = "@punctuation.bracket" },
 }
 
 vim.opt.bg = "dark"
diff --git a/lua/base46/themes/tokyonight.lua b/lua/base46/themes/tokyonight.lua
index a52165a..0ad4265 100644
--- a/lua/base46/themes/tokyonight.lua
+++ b/lua/base46/themes/tokyonight.lua
@@ -53,9 +53,9 @@ M.base_16 = {
 }
 
 M.polish_hl = {
-  TSVariable = { fg = M.base_30.red },
-  TSFuncBuiltin = { fg = M.base_30.cyan },
-  TSParameter = { fg = M.base_30.white },
+  ["@variable"] = { fg = M.base_30.red },
+  ["@function.builtin"] = { fg = M.base_30.cyan },
+  ["@parameter"] = { fg = M.base_30.white },
 }
 
 vim.opt.bg = "dark"
diff --git a/lua/base46/themes/wombat.lua b/lua/base46/themes/wombat.lua
index a59addf..462a6e3 100644
--- a/lua/base46/themes/wombat.lua
+++ b/lua/base46/themes/wombat.lua
@@ -53,10 +53,10 @@ M.base_16 = {
 }
 
 M.polish_hl = {
-  TSInclude = { fg = M.base_30.red },
-  TSConstructor = { fg = M.base_30.orange },
-  TSVariable = { link = "TSConstructor" },
-  TSConditional = { link = "TSInclude" },
+  ["@include"] = { fg = M.base_30.red },
+  ["@constructor"] = { fg = M.base_30.orange },
+  ["@variable"] = { link = "@constructor" },
+  ["@conditional"] = { link = "@include" },
 }
 
 vim.opt.bg = "dark"