@@ -28,15 +28,18 @@
 
     # Bookmarks
     - match: '^GRAPH_NAME:.*'
       scope: bookmark
 
-      # Bookmarks
-    - match: '^@@@@GRAPH: *(\w+)@@@@ *'
-      scope: bookmark
+    # Graph
+    - match: '^@@@@GRAPH: *(\w+) *'
+      scope: graphline
       captures:
         1: string.graphname
+
+    - match: '^@@@@(?:END_GRAPH *| *)'
+      scope: graphline
 
     # Keywords are if, else.
     # Note that blackslashes don't need to be escaped within single quoted
     # strings in YAML. When using single quoted strings, only single quotes
     # need to be escaped: this is done by using two single quotes next to each