diff --git a/runtime/queries/fga/highlights.scm b/runtime/queries/fga/highlights.scm
new file mode 100644
index 0000000000000..8d3093952f556
--- /dev/null
+++ b/runtime/queries/fga/highlights.scm
@@ -0,0 +1,52 @@
+(call_expression
+  function: (identifier) @function)
+
+(call_expression
+  function: (selector_expression
+    field: (identifier) @function.method))
+
+((type_identifier) @type.builtin
+  (#match? @type.builtin "^(string|int|map|uint|list|timestamp|bool|duration|double|ipaddress)$"))
+
+(condition_declaration
+  name: (identifier) @function)
+
+(version) @number
+
+[
+  "*"
+  "/"
+  "%"
+  ">>"
+  "<<"
+  "&"
+  "&^"
+] @operator
+
+[
+  "+"
+  "-"
+  "|"
+  "^"
+] @operator
+
+[
+  "or"
+  "and"
+  "but not"
+] @operator
+
+[
+  "model"
+  "schema"
+  "type"
+  "relations"
+  "define"
+  "from"
+] @keyword
+
+[
+  "condition"
+] @keyword.function
+
+(comment) @comment
diff --git a/runtime/themes/modus_operandi.toml b/runtime/themes/modus_operandi.toml
index e7599c018c0a8..362f97778d33b 100644
--- a/runtime/themes/modus_operandi.toml
+++ b/runtime/themes/modus_operandi.toml
@@ -80,6 +80,7 @@ punctuation = "fg-dim"
 "ui.virtual" = "bg-active"
 "ui.virtual.ruler" = { bg = "bg-dim" }
 "ui.virtual.inlay-hint" = { fg = "fg-dim", modifiers = ["italic"] }
+"ui.virtual.jump-label" = { fg = "yellow-cooler", modifiers = ["bold"] }
 
 "ui.selection" = { fg = "fg-main", bg = "bg-inactive" }
 "ui.selection.primary" = { fg = "fg-main", bg = "bg-active" }
diff --git a/runtime/themes/modus_vivendi.toml b/runtime/themes/modus_vivendi.toml
index 74974bcb2ce32..952683ee72130 100644
--- a/runtime/themes/modus_vivendi.toml
+++ b/runtime/themes/modus_vivendi.toml
@@ -83,6 +83,7 @@ punctuation = "fg-dim"
 "ui.virtual" = "bg-active"
 "ui.virtual.ruler" = { bg = "bg-dim" }
 "ui.virtual.inlay-hint" = { fg = "fg-dim", modifiers = ["italic"] }
+"ui.virtual.jump-label" = { fg = "yellow-cooler", modifiers = ["bold"] }
 
 "ui.selection" = { fg = "fg-main", bg = "bg-inactive" }
 "ui.selection.primary" = { fg = "fg-main", bg = "bg-active" }