@@ -108,19 +108,31 @@
         1: keyword.textprocessor.group
     - match: '=>>'
       scope: keyword.disambiguator
 
     # Tokens
-    - match: '>\w+'
+    - match: '(>)\w+'
       scope: string.lemma
+      captures:
+        1: keyword.valid
 
-    - match: '~(?!(?:\d+(?::\d+|)|)>>)[^\s]+'
+    - match: '(~)(?!(?:\d+(?::\d+|)|)>>)[^\s]+'
       scope: string.regex
+      captures:
+        1: keyword.valid
+
+    - match: '(@)([^@][^\s¬]+)'
+      scope: string.morph
+      captures:
+        1: keyword.valid
+        2: string.morph.pattern
 
-    - match: '@[^@][^\s]+'
+    - match: '(¬)(\S+)'
       scope: string.morph
-
+      captures:
+        1: keyword.invalid
+        2: string.morph.antipattern  
 
     # Escaped chars
     - match: '\\(?:\d+|w|d|b|n|s|t)'
       scope: constant.character.escape