@@ -11,8 +11,21 @@
 		<list name='extension-directives'>
 			<item>uses</item>
 			<item>needs</item>
 			<item>inhibits</item>
+		</list>
+		<list name='meta-directives'>
+			<item>author</item>
+			<item>lang</item>
+			<item>pragma</item>
+		</list>
+		<list name='ctl-directives'>
+			<item>when</item>
+			<item>unless</item>
+			<item>cols</item>
+			<item>quote</item>
+			<item>include</item>
+			<item>embed</item>
 		</list>
 		<list name='renderer-directives'>
 			<item>html</item>
 			<item>groff</item>
@@ -27,12 +40,23 @@
 				<RegExpr String='\\.' attribute='Escaped Char'/>
 				<RegExpr attribute='Section Cue' context='sec-ident' String='(#|§)+' firstNonSpace='true' />
 				<StringDetect String='~~~' attribute='Literal Block Cue' firstNonSpace='true' context='literal-block-cue'/>
 				<RegExpr attribute='List' String='[\*:]+' firstNonSpace='true' context='text' />
+				<Detect2Chars char='%' char1='%' attribute='Comment' context='comment'/>
 				<Detect2Chars char='%' char1='!' attribute='Critical Directive Cue' context='directive'/>
 				<DetectChar char='%' attribute='Directive Cue' context='directive'/>
+				<DetectChar char='@' attribute='Resource Cue' context='resource'/>
 				<DetectChar char='&#9;' attribute='Normal Text' context='refdef-id'/>
 			</context>
+
+			<context name='comment' attribute='Comment' lineEndContext='#pop'>
+			</context>
+			<context name='error' attribute='Error' lineEndContext='#pop'>
+			</context>
+
+			<context name='resource' attribute='Resource Identifier' lineEndContext='#pop'>
+				<DetectSpaces context='#pop!error' attribute='Error'/>
+			</context>
 
 			<context name='sec-ident' attribute='Identifier' lineEndContext='#pop'>
 				<DetectSpaces context='#pop!sec' attribute='Normal Text'/>
 			</context>
@@ -86,30 +110,45 @@
 			<context name='span-del' attribute='Deleted Text' lineEndContext='#pop'>
 				<IncludeRules context='span'/>
 			</context>
 
-			<context name='span-cue' attribute='Span Cue' lineEndContext='#pop'>
-				<StringDetect attribute='Span Cue' String='$\' context='#pop!flat-span' />
+			<context name='span-cue' attribute='Span Cue' lineEndContext='#pop' fallthroughContext="error">
+				<StringDetect attribute='Span Cue' String='`\' context='#pop!flat-span' />
 
 				<DetectChar   attribute='Span Cue' char='!' context='#pop!span-emph' />
 				<DetectChar   attribute='Span Cue' char='*' context='#pop!span-strong' />
 				<DetectChar   attribute='Span Cue' char='~' context='#pop!span-del' />
 
-				<AnyChar      attribute='Span Cue' String='$+🔒' context='#pop!span' />
+				<AnyChar      attribute='Span Cue' String='`$+🔒' context='#pop!span' />
 				<StringDetect attribute='Span Cue' String='→' context='#pop!ref' />
 				<StringDetect attribute='Span Cue' String='🔗' context='#pop!ref' />
 				<DetectChar   attribute='Span Cue' char='>' context='#pop!ref' />
+				<DetectChar   attribute='Span Cue' char='^' context='#pop!ref' />
 				<DetectChar   attribute='Span Cue' char='&amp;' context='#pop!ref' />
 				<DetectChar   attribute='Span Cue' char='#' context='#pop!var-ref' />
 				<DetectChar   attribute='Span Cue' char='\' context='#pop!flat-span' />
+				<Detect2Chars attribute='Comment' char='%' char1='%' context='#pop!inline-comment' />
+				<Detect2Chars attribute='Critical Directive Cue' char='%' char1='!' context='#pop!inline-directive' />
+				<DetectChar   attribute='Directive Cue' char='%' context='#pop!inline-directive' />
 			</context>
 
 			<context name='flat-span' attribute='Unstyled Text' lineEndContext='#pop'>
 				<Detect2Chars attribute='Escaped Char' context='#stay' char='\' char1=']'/>
 				<DetectChar attribute='Span Delimiter' context='#pop' char=']'/>
 			</context>
+
+			<context name='inline-comment' attribute='Comment' lineEndContext='#pop'>
+				<IncludeRules context='flat-span'/>
+			</context>
+
+			<context name='inline-directive' attribute='Directive' lineEndContext='#pop'>
+				<IncludeRules context='flat-span'/>
+				<AnyChar String=".:!#$%@~'&quot;" attribute='Directive Cue'/>
+				<DetectSpaces context='#pop!span'/>
+			</context>
 
 			<context name='ref' attribute='Reference' lineEndContext='#pop'>
+				<IncludeRules context='flat-span'/>
 				<DetectSpaces context='#pop!span'/>
 			</context>
 
 			<context name='var-ref' attribute='Reference' lineEndContext='#pop'>
@@ -132,9 +171,9 @@
 			<itemData name='Normal Text' defStyleNum='dsNormal'/>
 			<itemData name='Styled Text' defStyleNum='dsNormal'/>
 			<itemData name='Emphatic Text' defStyleNum='dsNormal' italic='true'/>
 			<itemData name='Strong Text' defStyleNum='dsNormal' bold='true'/>
-			<itemData name='Deleted Text' defStyleNum='dsNormal' strikeout='true'/>
+			<itemData name='Deleted Text' defStyleNum='dsNormal' strikeOut='true'/>
 				
 			<itemData name='Section Cue' defStyleNum='dsKeyword' bold='true'/>
 			<itemData name='Header' defStyleNum='dsControlFlow' underline='true'/>
 			<itemData name='Identifier' defStyleNum='dsVariable'/>
@@ -142,8 +181,10 @@
 			<itemData name='Unstyled Text' defStyleNum='dsVerbatimString'/>
 			<itemData name='Escaped Char' defStyleNum='dsSpecialChar'/>
 			<itemData name='Reference' defStyleNum='dsControlFlow' underline='true'/>
 			<itemData name='Span Cue' defStyleNum='dsKeyword' bold='true'/>
+			<itemData name='Resource Cue' defStyleNum='dsKeyword' bold='true'/>
+			<itemData name='Resource Identifier' defStyleNum='dsVariable' bold='true'/>
 			<itemData name='Span Delimiter' defStyleNum='dsKeyword'/>
 			<itemData name='Directive' defStyleNum='dsAttribute' bold='true'/>
 			<itemData name='Directive Cue' defStyleNum='dsAttribute'/>
 			<itemData name='Critical Directive Cue' defStyleNum='dsImport' bold='true'/>
@@ -150,8 +191,9 @@
 			<itemData name='Extension Directive' defStyleNum='dsImport' bold='true'/>
 			<itemData name='Renderer Directive' defStyleNum='dsExtension' bold='true'/>
 			<itemData name='Standard Namespace' defStyleNum='dsBuiltIn' bold='true'/>
 			<itemData name='Comment' defStyleNum='dsComment'/>
+			<itemData name='Error' defStyleNum='dsError'/>
 			<itemData name='Macro' defStyleNum='dsPreprocessor' bold='true'/>
 			<itemData name='Macro Delimiter' defStyleNum='dsPreprocessor'/>
 			<itemData name='Field Delimiter' defStyleNum='dsPreprocessor' bold='true'/>
 			<itemData name='List' defStyleNum='dsOperator'/>