diff --git a/after/queries/comment/highlights.scm b/after/queries/comment/highlights.scm
new file mode 100644
index 0000000..abade2f
--- /dev/null
+++ b/after/queries/comment/highlights.scm
@@ -0,0 +1,11 @@
+((tag ((name) @text.note))
+ (#any-of? @text.note "TODO"))
+
+("text" @text.note
+ (#any-of? @text.note "TODO"))
+
+((tag ((name) @text.danger))
+ (#any-of? @text.danger "FIX"))
+
+("text" @text.danger
+ (#any-of? @text.danger "FIX"))
diff --git a/lua/tokyodark/highlights.lua b/lua/tokyodark/highlights.lua
index 13e235e..415768b 100644
--- a/lua/tokyodark/highlights.lua
+++ b/lua/tokyodark/highlights.lua
@@ -25,9 +25,10 @@ hl.predef = {
     Blue = {fg = p.blue},
     Purple = {fg = p.purple},
     BlueItalic = {fg = p.blue, italic = cfg.italic},
-    RedItalic = {fg = p.red, italic = cfg.italic},
     GreenItalic = {fg = p.green, italic = cfg.italic},
-    OrangeItalic = {fg = p.orange, italic = cfg.italic}
+    OrangeItalic = {fg = p.orange, italic = cfg.italic},
+    RedItalic = {fg = p.red, italic = cfg.italic},
+    YellowItalic = {fg = p.yellow, italic = cfg.italic}
 }
 
 hl.common = {
@@ -182,6 +183,12 @@ hl.plugins.diffview = {
     DiffviewStatusBroken = hl.predef.Red
 }
 
+hl.plugins.treesitter = {
+    commentTSDanger = hl.predef.RedItalic,
+    commentTSNote = hl.predef.BlueItalic,
+    commentTSWarning = hl.predef.YellowItalic
+}
+
 hl.plugins.gitsigns = {
     GitSignsAdd = hl.predef.Green,
     GitSignsAddLn = hl.predef.Green,
diff --git a/lua/tokyodark/terminal.lua b/lua/tokyodark/terminal.lua
index f991d76..da5e163 100644
--- a/lua/tokyodark/terminal.lua
+++ b/lua/tokyodark/terminal.lua
@@ -1,5 +1,5 @@
 local M = {}
-local p = require 'tokyodark.palette'
+local p = require("tokyodark.palette")
 
 function M.setup()
     vim.g.terminal_color_0 = p.black