diff --git a/lua/base46/integrations/treesitter.lua b/lua/base46/integrations/treesitter.lua
index 064a022..04a47e0 100644
--- a/lua/base46/integrations/treesitter.lua
+++ b/lua/base46/integrations/treesitter.lua
@@ -1,37 +1,57 @@
 local theme = require("base46").get_theme_tb "base_16"
 local base30 = require("base46").get_theme_tb "base_30"
-local colors = require("base46").get_theme_tb "base_30"
 
 return {
-  ["@annotation"] = { fg = theme.base0F },
-  ["@attribute"] = { fg = theme.base0A },
-  ["@character"] = { fg = theme.base08 },
-  ["@constructor"] = { fg = theme.base0C },
+
+  ["@variable"] = { fg = theme.base05 },
+  ["@variable.builtin"] = { fg = theme.base09 },
+  ["@variable.parameter"] = { fg = theme.base08 },
+  ["@variable.member"] = { fg = theme.base08 },
+  ["@variable.member.key"] = { fg = theme.base08 },
+
+  ["@module"] = { fg = theme.base08 },
+  -- ["@module.builtin"] = { fg = theme.base08 },
+
   ["@constant"] = { fg = theme.base08 },
   ["@constant.builtin"] = { fg = theme.base09 },
   ["@constant.macro"] = { fg = theme.base08 },
+
+  ["@string"] = { fg = theme.base0B },
+  ["@string.regex"] = { fg = theme.base0C },
+  ["@string.escape"] = { fg = theme.base0C },
+  ["@character"] = { fg = theme.base08 },
+  -- ["@character.special"] = { fg = theme.base08 },
+  ["@number.float"] = { fg = theme.base09 },
+
+  ["@annotation"] = { fg = theme.base0F },
+  ["@attribute"] = { fg = theme.base0A },
   ["@error"] = { fg = theme.base08 },
+
   ["@keyword.exception"] = { fg = theme.base08 },
-  ["@number.float"] = { fg = theme.base09 },
   ["@keyword"] = { fg = theme.base0E },
   ["@keyword.function"] = { fg = theme.base0E },
   ["@keyword.return"] = { fg = theme.base0E },
+  ["@keyword.operator"] = { fg = theme.base0E },
+  ["@keyword.import"] = { link = "Include" },
+  ["@keyword.conditional"] = { fg = theme.base0E },
+  ["@keyword.conditional.ternary"] = { fg = theme.base0E },
+  ["@keyword.repeat"] = { fg = theme.base0A },
+  ["@keyword.storage"] = { fg = theme.base0A },
+  ["@keyword.directive.define"] = { fg = theme.base0E },
+  ["@keyword.directive"] = { fg = theme.base0A },
+
   ["@function"] = { fg = theme.base0D },
   ["@function.builtin"] = { fg = theme.base0D },
   ["@function.macro"] = { fg = theme.base08 },
   ["@function.call"] = { fg = theme.base0D },
-  ["@operator"] = { fg = theme.base05 },
-  ["@keyword.operator"] = { fg = theme.base0E },
   ["@function.method"] = { fg = theme.base0D },
   ["@function.method.call"] = { fg = theme.base0D },
-  ["@module"] = { fg = theme.base08 },
-  ["@variable.parameter"] = { fg = theme.base08 },
+  ["@constructor"] = { fg = theme.base0C },
+
+  ["@operator"] = { fg = theme.base05 },
   ["@reference"] = { fg = theme.base05 },
   ["@punctuation.bracket"] = { fg = theme.base0F },
   ["@punctuation.delimiter"] = { fg = theme.base0F },
-  ["@string"] = { fg = theme.base0B },
-  ["@string.regex"] = { fg = theme.base0C },
-  ["@string.escape"] = { fg = theme.base0C },
   ["@symbol"] = { fg = theme.base0B },
   ["@tag"] = { fg = theme.base0A },
   ["@tag.attribute"] = { fg = theme.base08 },
@@ -39,23 +59,10 @@ return {
   ["@text"] = { fg = theme.base05 },
   ["@text.emphasis"] = { fg = theme.base09 },
   ["@text.strike"] = { fg = theme.base0F, strikethrough = true },
-  ["@string.special.url"] = { fg = theme.base09, underline = true },
   ["@type.builtin"] = { fg = theme.base0A },
-  ["@variable"] = { fg = theme.base05 },
-  ["@variable.builtin"] = { fg = theme.base09 },
   ["@definition"] = { sp = theme.base04, underline = true },
   ["@scope"] = { bold = true },
-  ["@variable.member"] = { fg = theme.base08 },
-  ["@variable.member.key"] = { fg = theme.base08 },
   ["@property"] = { fg = theme.base08 },
-  ["@keyword.import"] = { link = "Include" },
-  ["@keyword.conditional"] = { fg = theme.base0E },
-  ["@keyword.conditional.ternary"] = { fg = theme.base0E },
-  ["@comment"] = { fg = base30.grey_fg },
-  ["@keyword.repeat"] = { fg = theme.base0A },
-  ["@keyword.storage"] = { fg = theme.base0A },
-  ["@keyword.directive.define"] = { fg = theme.base0E },
-  ["@keyword.directive"] = { fg = theme.base0A },
 
   -- markup
   ["@markup.heading"] = { fg = theme.base0D },
@@ -67,13 +74,15 @@ return {
   ["@markup.strong"] = { bold = true },
   ["@markup.italic"] = { italic = true },
   ["@markup.strikethrough"] = { strikethrough = true },
+  ["@markup.quote"] = { bg = base30.black2 },
 
-  ["@comment.todo"] = { fg = colors.grey, bg = colors.white },
-  ["@comment.warning"] = { fg = colors.black2, bg = theme.base09 },
-  ["@comment.note"] = { fg = colors.black2, bg = colors.white },
-  ["@comment.danger"] = { fg = colors.black2, bg = colors.red },
+  ["@comment"] = { fg = base30.grey_fg },
+  ["@comment.todo"] = { fg = base30.grey, bg = base30.white },
+  ["@comment.warning"] = { fg = base30.black2, bg = theme.base09 },
+  ["@comment.note"] = { fg = base30.black2, bg = base30.white },
+  ["@comment.danger"] = { fg = base30.black2, bg = base30.red },
 
-  ["@diff.plus"] = { fg = colors.green },
-  ["@diff.minus"] = { fg = colors.red },
-  ["@diff.delta"] = { fg = colors.light_grey },
+  ["@diff.plus"] = { fg = base30.green },
+  ["@diff.minus"] = { fg = base30.red },
+  ["@diff.delta"] = { fg = base30.light_grey },
 }