diff --git a/queries/beancount/highlights.scm b/queries/beancount/highlights.scm
index 7fa78d84e..1f0cf8a48 100644
--- a/queries/beancount/highlights.scm
+++ b/queries/beancount/highlights.scm
@@ -1,23 +1,21 @@
-
 (date) @field
 (txn) @attribute
-
 (account) @type
-
 (amount) @number
 (incomplete_amount) @number
+(compound_amount) @number
 (amount_tolerance) @number
-
 (currency) @property
-
 (key) @label
-(string) @string
-
+(string) @string @spell
+(narration) @string @spell
+(payee) @string @spell
 (tag) @constant
 (link) @constant
-
-(comment) @comment
-
+[
+ (minus) (plus) (slash) (asterisk)
+] @operator
+(comment) @comment @spell
 [
     (balance) (open) (close) (commodity) (pad)
     (event) (price) (note) (document) (query)