diff --git a/lua/tokyonight/treesitter.lua b/lua/tokyonight/treesitter.lua
index 4834afd..d2548d3 100644
--- a/lua/tokyonight/treesitter.lua
+++ b/lua/tokyonight/treesitter.lua
@@ -24,84 +24,55 @@ end
 -- taken from https://github.com/nvim-treesitter/nvim-treesitter/blob/master/lua/nvim-treesitter/highlight.lua
 M.fallbacks = {
   ["annotation"] = "TSAnnotation",
-
   ["attribute"] = "TSAttribute",
-
   ["boolean"] = "TSBoolean",
-
   ["character"] = "TSCharacter",
   ["character.special"] = "TSCharacterSpecial",
-
   ["comment"] = "TSComment",
-
   ["conditional"] = "TSConditional",
-
   ["constant"] = "TSConstant",
   ["constant.builtin"] = "TSConstBuiltin",
   ["constant.macro"] = "TSConstMacro",
-
   ["constructor"] = "TSConstructor",
-
   ["debug"] = "TSDebug",
   ["define"] = "TSDefine",
-
   ["error"] = "TSError",
   ["exception"] = "TSException",
-
   ["field"] = "TSField",
-
   ["float"] = "TSFloat",
-
   ["function"] = "TSFunction",
   ["function.call"] = "TSFunctionCall",
   ["function.builtin"] = "TSFuncBuiltin",
   ["function.macro"] = "TSFuncMacro",
-
   ["include"] = "TSInclude",
-
   ["keyword"] = "TSKeyword",
   ["keyword.function"] = "TSKeywordFunction",
   ["keyword.operator"] = "TSKeywordOperator",
   ["keyword.return"] = "TSKeywordReturn",
-
   ["label"] = "TSLabel",
-
   ["method"] = "TSMethod",
   ["method.call"] = "TSMethodCall",
-
   ["namespace"] = "TSNamespace",
-
   ["none"] = "TSNone",
   ["number"] = "TSNumber",
-
   ["operator"] = "TSOperator",
-
   ["parameter"] = "TSParameter",
   ["parameter.reference"] = "TSParameterReference",
-
   ["preproc"] = "TSPreProc",
-
   ["property"] = "TSProperty",
-
   ["punctuation.delimiter"] = "TSPunctDelimiter",
   ["punctuation.bracket"] = "TSPunctBracket",
   ["punctuation.special"] = "TSPunctSpecial",
-
   ["repeat"] = "TSRepeat",
-
   ["storageclass"] = "TSStorageClass",
-
   ["string"] = "TSString",
   ["string.regex"] = "TSStringRegex",
   ["string.escape"] = "TSStringEscape",
   ["string.special"] = "TSStringSpecial",
-
   ["symbol"] = "TSSymbol",
-
   ["tag"] = "TSTag",
   ["tag.attribute"] = "TSTagAttribute",
   ["tag.delimiter"] = "TSTagDelimiter",
-
   ["text"] = "TSText",
   ["text.strong"] = "TSStrong",
   ["text.emphasis"] = "TSEmphasis",
@@ -114,18 +85,14 @@ M.fallbacks = {
   ["text.reference"] = "TSTextReference",
   ["text.environment"] = "TSEnvironment",
   ["text.environment.name"] = "TSEnvironmentName",
-
   ["text.note"] = "TSNote",
   ["text.warning"] = "TSWarning",
   ["text.danger"] = "TSDanger",
-
   ["todo"] = "TSTodo",
-
   ["type"] = "TSType",
   ["type.builtin"] = "TSTypeBuiltin",
   ["type.qualifier"] = "TSTypeQualifier",
   ["type.definition"] = "TSTypeDefinition",
-
   ["variable"] = "TSVariable",
   ["variable.builtin"] = "TSVariableBuiltin",
 }
@@ -205,7 +172,7 @@ M.defaults = {
   },
   ["@function.call"] = {
     default = true,
-    link = "TSFunction",
+    link = "@function",
   },
   ["@function.macro"] = {
     default = true,
@@ -225,11 +192,11 @@ M.defaults = {
   },
   ["@keyword.operator"] = {
     default = true,
-    link = "TSOperator",
+    link = "@operator",
   },
   ["@keyword.return"] = {
     default = true,
-    link = "TSKeyword",
+    link = "@keyword",
   },
   ["@label"] = {
     default = true,
@@ -241,7 +208,7 @@ M.defaults = {
   },
   ["@method.call"] = {
     default = true,
-    link = "TSMethod",
+    link = "@method",
   },
   ["@namespace"] = {
     default = true,
@@ -264,7 +231,7 @@ M.defaults = {
   },
   ["@parameter.reference"] = {
     default = true,
-    link = "TSParameter",
+    link = "@parameter",
   },
   ["@preproc"] = {
     default = true,
@@ -320,7 +287,7 @@ M.defaults = {
   },
   ["@tag.attribute"] = {
     default = true,
-    link = "TSProperty",
+    link = "@property",
   },
   ["@tag.delimiter"] = {
     default = true,
@@ -328,7 +295,7 @@ M.defaults = {
   },
   ["@text"] = {
     default = true,
-    link = "TSNone",
+    link = "@none",
   },
   ["@text.danger"] = {
     default = true,