diff --git a/.config/nvim/lua/plugins/noirbuddy.lua b/.config/nvim/lua/plugins/noirbuddy.lua
index a1815b5c..715e62db 100644
--- a/.config/nvim/lua/plugins/noirbuddy.lua
+++ b/.config/nvim/lua/plugins/noirbuddy.lua
@@ -68,8 +68,13 @@ return {
         Group.new("@markup.link", colors.secondary)
         Group.new("@markup.list", colors.complement)
         Group.new("@variable", colors.complement)
-        Group.new("@type.builtin", colors.complement)
+        Group.new("@type.builtin", colors.primary)
+        Group.new("@number", colors.secondary)
+        Group.new("NonText", colors.noir_7)
+        Group.new("Comment", colors.noir_6)
+        Group.new("@comment", colors.noir_6)
         Group.new("@boolean.go", colors.complement)
+        -- Group.new("gotype", colors.primary)
         Group.new("Boolean", colors.complement)
         Group.new("Constant", colors.complement)
         Group.new("NotifyINFOBorder", colors.infoborder)
@@ -86,6 +91,8 @@ return {
         Group.new("SpellCap", nil, nil, styles.undercurl)
         Group.new("String", colors.primary, nil, nil)
         Group.new("Title", colors.primary, nil, styles.bold)
+        local linkhl = require("link-hl")
+        linkhl.link(linkhl.go_map, "go")
 
         -- Group.new("ObsidianExtLinkIcon", colors.primary, nil, styles.bold)
         -- Group.new("ObsidianRef", colors.primary, nil, styles.underline + styles.bold)