diff --git a/wgsl.xml b/wgsl.xml
index 927964a..b649cfd 100644
--- a/wgsl.xml
+++ b/wgsl.xml
@@ -218,6 +218,25 @@
 			<include>Synchronization Built-in Functions</include>
 		</list>
 
+		<list name="Address Spaces">
+			<item>function</item>
+<!-- 			<item>handle</item> must not be specified -->
+			<item>private</item>
+			<item>storage</item>
+			<item>uniform</item>
+			<item>workgroup</item>
+		</list>
+
+		<list name="Extension Address Spaces">
+			<item>push_constant</item>
+		</list>
+
+		<list name="Access Modes">
+			<item>read</item>
+			<item>write</item>
+			<item>read_write</item>
+		</list>
+
 		<list name="simple_attribute">
 			<item>@compute</item>
 			<item>@const</item>
@@ -288,11 +307,25 @@
 			</context>
 
 			<context name="_Keywords">
+				<WordDetect attribute="Keyword" context="MemMaybe" String="var" />
 				<keyword attribute="Keyword" context="#stay" String="keyword" />
 				<keyword attribute="Control Flow" context="#stay" String="control" />
 				<keyword attribute="Builtin Type" context="#stay" String="type" />
 				<keyword attribute="Builtin Function" context="#stay" String="Built-in Functions" />
 			</context>
+			<context attribute="Error" lineEndContext="#stay" name="MemMaybe">
+				<DetectChar attribute="Normal Text" context="#pop!MemDesc" char="&lt;" />
+				<RegExpr context="#pop" lookAhead="true" String=".?" />
+			</context>
+			<context attribute="Error" lineEndContext="#stay" name="MemDesc">
+				<DetectSpaces attribute="Normal Text" context="#stay" />
+				<DetectChar attribute="Error" context="#pop" char="&lt;" />
+				<DetectChar attribute="Normal Text" context="#pop" char="&gt;" />
+				<DetectChar attribute="Normal Text" context="#stay" char="," />
+				<keyword attribute="Keyword Attribute Value" context="#stay" String="Address Spaces" />
+				<keyword attribute="Keyword Attribute Value" context="#stay" String="Access Modes" />
+				<keyword attribute="Extension Keyword Attribute Value" context="#stay" String="Extension Address Spaces" />
+			</context>
 
 			<context name="_Numbers">
 				<RegExpr attribute="Hexadecimal Float" context="#stay" String="\b0[xX][0-9a-fA-F]*\.[0-9a-fA-F]+([pP][+-]?[0-9]+[fh]?)?" />
@@ -367,6 +400,7 @@
 			<itemData spellChecking="false" name="Known Attribute" defStyleNum="dsAttribute" />
 			<itemData spellChecking="false" name="Attribute Content" defStyleNum="dsAttribute" />
 			<itemData spellChecking="false" name="Keyword Attribute Value" defStyleNum="dsAttribute" italic="true" />
+			<itemData spellChecking="false" name="Extension Keyword Attribute Value" defStyleNum="dsExtension" italic="true" />
 			<itemData spellChecking="true" name="Comment" defStyleNum="dsComment" />
 			<itemData spellChecking="false" name="Decimal Integer" defStyleNum="dsDecVal" />
 			<itemData spellChecking="false" name="Hexadecimal Integer" defStyleNum="dsBaseN" />