diff --git a/syntaxes/beancount.tmLanguage b/syntaxes/beancount.tmLanguage
index 7811bfd..5147553 100644
--- a/syntaxes/beancount.tmLanguage
+++ b/syntaxes/beancount.tmLanguage
@@ -454,7 +454,7 @@
name
- meta.directive.notetotext.beancount
+ meta.directive.beancount.notetotext
comment
Note as Oneliner Transaction directive
begin
@@ -502,62 +502,91 @@
include
- #account
-
-
- name
- punctuation.separator.beancount
- match
- (?<=\s)\"
-
-
- include
- #cost
+ #comments
include
- #amount
+ #account
- begin
- (\*|\!)
- beginCaptures
+ name
+ meta.directive.arguments.beancount.notetotext
+ match
+ (?<=\s)(\")(.*?)(\s+\*\s+)((.*?)(\s\|\s))?(.*?)(\*\")
+ captures
- 0
+ 1
name
- support.function.directive.beancount
+ punctuation.definition.arguments.begin.beancount.notetotext
-
- end
- (\*\")
- endCaptures
-
- 0
+ 2
+ patterns
+
+
+ include
+ #account
+
+
+ include
+ #amount
+
+
+ include
+ #cost
+
+
+ include
+ #illegal
+
+
+
+ 3
+
+ comment
+ *
name
- punctuation.separator.beancount
+ punctuation.separator.arguments.beancount.notetotext
-
- patterns
-
+ 5
+ comment
+ $payee
name
- constant.character.escape.beancount
- match
- \\.
+ constant.other.payee.beancount.notetotext
+ 6
- include
- #tag
+ comment
+ |
+ name
+ punctuation.separator.arguments.beancount.notetotext
+ 7
name
- string.quoted.double.beancount
- match
- ([^\"])
+ string.unquoted.beancount.notetotext
+ patterns
+
+
+ include
+ #tag
+
+
+ include
+ #link
+
+
-
+ 8
+
+ comment
+ *"
+ name
+ punctuation.definition.arguments.end.beancount.notetotext
+
+
include