diff --git a/autotests/html/highlight.d.html b/autotests/html/highlight.d.html
--- a/autotests/html/highlight.d.html
+++ b/autotests/html/highlight.d.html
@@ -19,14 +19,14 @@
 <span style="color:#898887;">+</span><span style="font-style:italic;"> </span><span style="color:#00aa00;font-weight:bold;">#line </span><span style="color:#b08000;">12</span><span style="color:#00aa00;font-weight:bold;"> </span><span style="color:#bf0303;">&quot;hightlighttest.d&quot;</span><span style="color:#00aa00;font-weight:bold;">	</span><span style="color:#898887;">/* block comment */</span>
 <span style="color:#898887;">+</span><span style="font-style:italic;"> </span><span style="color:#00aa00;font-weight:bold;">#line </span><span style="color:#00aa00;">__LINE__</span><span style="color:#00aa00;font-weight:bold;"> </span><span style="color:#00aa00;">__FILE__</span><span style="color:#00aa00;font-weight:bold;">	</span><span style="color:#898887;">/++</span><span style="color:#7f7fff;"> embedded block comment </span><span style="color:#898887;">+/</span>
 <span style="color:#898887;">+</span>
-<span style="color:#898887;">+</span><span style="font-style:italic;"> </span><span style="color:#00aa00;font-weight:bold;">pragma </span><span style="color:#898887;">/* */</span><span style="color:#00aa00;font-weight:bold;"> </span>(<span style="font-weight:bold;">msg</span>,<span style="font-style:italic;"> </span><span style="color:#bf0303;">&quot;what?&quot;</span>);
-<span style="color:#898887;">+</span><span style="font-style:italic;"> </span><span style="color:#00aa00;font-weight:bold;">pragma</span>(<span style="color:#898887;">/++</span><span style="color:#7f7fff;"> </span><span style="color:#898887;">+/</span><span style="color:#00aa00;font-weight:bold;"> </span><span style="font-weight:bold;">lib</span>,<span style="font-style:italic;"> </span><span style="color:#bf0303;">&quot;insane.a&quot;</span>);
-<span style="color:#898887;">+</span><span style="font-style:italic;"> </span><span style="color:#00aa00;font-weight:bold;">pragma</span>(D_Custom_Extension,<span style="font-style:italic;"> </span><span style="color:#bf0303;">&quot;custom data&quot;</span>);
+<span style="color:#898887;">+</span><span style="font-style:italic;"> </span><span style="color:#00aa00;font-weight:bold;">pragma </span><span style="color:#898887;">/* */</span><span style="color:#00aa00;font-weight:bold;"> </span>(<span style="font-weight:bold;">msg</span><span style="color:#bf0303;text-decoration:underline;">,</span> <span style="color:#bf0303;">&quot;what?&quot;</span>);
+<span style="color:#898887;">+</span><span style="font-style:italic;"> </span><span style="color:#00aa00;font-weight:bold;">pragma</span>(<span style="color:#898887;">/++</span><span style="color:#7f7fff;"> </span><span style="color:#898887;">+/</span><span style="color:#00aa00;font-weight:bold;"> </span><span style="font-weight:bold;">lib</span><span style="color:#bf0303;text-decoration:underline;">,</span> <span style="color:#bf0303;">&quot;insane.a&quot;</span>);
+<span style="color:#898887;">+</span><span style="font-style:italic;"> </span><span style="color:#00aa00;font-weight:bold;">pragma</span>(D_Custom_Extension<span style="color:#bf0303;text-decoration:underline;">,</span> <span style="color:#bf0303;">&quot;custom data&quot;</span>);
 <span style="color:#898887;">+</span><span style="font-style:italic;"> </span><span style="color:#898887;">---</span>
 <span style="color:#898887;">+/</span>
 
 <span style="color:#898887;">///</span><span style="color:#7f7fff;"> version condition</span>
-<span style="color:#808000;font-weight:bold;">version</span> = X;
+<span style="color:#808000;font-weight:bold;">version</span> = X<span style="color:#bf0303;text-decoration:underline;">;</span>
 <span style="color:#808000;font-weight:bold;">version</span> (X) ;
 <span style="color:#808000;font-weight:bold;">version</span>(<span style="font-weight:bold;">linux</span>) {}
 
diff --git a/autotests/reference/highlight.d.ref b/autotests/reference/highlight.d.ref
--- a/autotests/reference/highlight.d.ref
+++ b/autotests/reference/highlight.d.ref
@@ -13,23 +13,23 @@
 <Comment>+</Comment><DdocCode> </DdocCode><Pragma>#line </Pragma><Integer>12</Integer><Pragma> </Pragma><String>"hightlighttest.d"</String><Pragma>	</Pragma><Comment>/* block comment */</Comment><br/>
 <Comment>+</Comment><DdocCode> </DdocCode><Pragma>#line </Pragma><SpecialTokens>__LINE__</SpecialTokens><Pragma> </Pragma><SpecialTokens>__FILE__</SpecialTokens><Pragma>	</Pragma><Comment>/++</Comment><Ddoc> embedded block comment </Ddoc><Comment>+/</Comment><br/>
 <Comment>+</Comment><br/>
-<Comment>+</Comment><DdocCode> </DdocCode><Pragma>pragma </Pragma><Comment>/* */</Comment><Pragma> </Pragma><Normal Text>(</Normal Text><Version Type>msg</Version Type><Symbol>,</Symbol><DdocCode> </DdocCode><String>"what?"</String><Symbol>);</Symbol><br/>
-<Comment>+</Comment><DdocCode> </DdocCode><Pragma>pragma</Pragma><Normal Text>(</Normal Text><Comment>/++</Comment><Ddoc> </Ddoc><Comment>+/</Comment><Pragma> </Pragma><Version Type>lib</Version Type><Symbol>,</Symbol><DdocCode> </DdocCode><String>"insane.a"</String><Symbol>);</Symbol><br/>
-<Comment>+</Comment><DdocCode> </DdocCode><Pragma>pragma</Pragma><Normal Text>(D_Custom_Extension</Normal Text><Symbol>,</Symbol><DdocCode> </DdocCode><String>"custom data"</String><Symbol>);</Symbol><br/>
+<Comment>+</Comment><DdocCode> </DdocCode><Pragma>pragma </Pragma><Comment>/* */</Comment><Pragma> </Pragma><Normal Text>(</Normal Text><Version Type>msg</Version Type><Error>,</Error><Normal Text> </Normal Text><String>"what?"</String><Symbol>);</Symbol><br/>
+<Comment>+</Comment><DdocCode> </DdocCode><Pragma>pragma</Pragma><Normal Text>(</Normal Text><Comment>/++</Comment><Ddoc> </Ddoc><Comment>+/</Comment><Pragma> </Pragma><Version Type>lib</Version Type><Error>,</Error><Normal Text> </Normal Text><String>"insane.a"</String><Symbol>);</Symbol><br/>
+<Comment>+</Comment><DdocCode> </DdocCode><Pragma>pragma</Pragma><Normal Text>(D_Custom_Extension</Normal Text><Error>,</Error><Normal Text> </Normal Text><String>"custom data"</String><Symbol>);</Symbol><br/>
 <Comment>+</Comment><DdocCode> </DdocCode><Comment>---</Comment><br/>
 <Comment>+/</Comment><br/>
 <Normal Text></Normal Text><br/>
 <Comment>///</Comment><Ddoc> version condition</Ddoc><br/>
-<Version>version</Version><Normal Text> = X</Normal Text><Symbol>;</Symbol><br/>
-<Version>version</Version><Normal Text> (X</Normal Text><Symbol>)</Symbol><Normal Text> </Normal Text><Symbol>;</Symbol><br/>
-<Version>version</Version><Normal Text>(</Normal Text><Version Type>linux</Version Type><Symbol>)</Symbol><Normal Text> </Normal Text><Symbol>{}</Symbol><br/>
+<Version>version</Version><Normal Text> = X</Normal Text><Error>;</Error><br/>
+<Version>version</Version><Normal Text> (X) </Normal Text><Symbol>;</Symbol><br/>
+<Version>version</Version><Normal Text>(</Normal Text><Version Type>linux</Version Type><Normal Text>) </Normal Text><Symbol>{}</Symbol><br/>
 <Normal Text></Normal Text><br/>
 <Comment>///</Comment><Ddoc> linkage</Ddoc><br/>
 <Linkage>extern</Linkage><br/>
-<Normal Text>    (</Normal Text><Linkage Type>C</Linkage Type><Symbol>)</Symbol><Normal Text> </Normal Text><Symbol>{}</Symbol><br/>
+<Normal Text>    (</Normal Text><Linkage Type>C</Linkage Type><Normal Text>) </Normal Text><Symbol>{}</Symbol><br/>
 <Linkage>extern</Linkage><Normal Text> </Normal Text><Symbol>:</Symbol><br/>
 <Symbol>;</Symbol><br/>
-<Linkage>extern</Linkage><Normal Text> (</Normal Text><Linkage Type>Windows</Linkage Type><Symbol>)</Symbol><Normal Text> </Normal Text><Symbol>{}</Symbol><br/>
+<Linkage>extern</Linkage><Normal Text> (</Normal Text><Linkage Type>Windows</Linkage Type><Normal Text>) </Normal Text><Symbol>{}</Symbol><br/>
 <Normal Text></Normal Text><br/>
 <Comment>///</Comment><Ddoc> alias & typedef</Ddoc><br/>
 <Declarator>alias</Declarator><Normal Text> </Normal Text><Type>int</Type><Normal Text>.</Normal Text><Property>min</Property><Normal Text> minint</Normal Text><Symbol>;</Symbol><br/>
@@ -77,10 +77,10 @@
 <Normal Text>    </Normal Text><br/>
 <Normal Text>    </Normal Text><Comment>///</Comment><Ddoc> scope (as attribute and as statement)</Ddoc><br/>
 <Normal Text>    </Normal Text><Attribute>scope</Attribute><Normal Text> </Normal Text><Declarator>struct</Declarator><Normal Text> S</Normal Text><Symbol>;</Symbol><br/>
-<Normal Text>    </Normal Text><Statement>scope </Statement><Normal Text>(</Normal Text><Expression>exit</Expression><Symbol>)</Symbol><Normal Text> </Normal Text><Symbol>{}</Symbol><br/>
+<Normal Text>    </Normal Text><Statement>scope </Statement><Normal Text>(</Normal Text><Expression>exit</Expression><Normal Text>) </Normal Text><Symbol>{}</Symbol><br/>
 <Normal Text>    </Normal Text><Attribute>scope</Attribute><Normal Text> </Normal Text><br/>
 <Normal Text>     </Normal Text><Symbol>(</Symbol><Normal Text>success</Normal Text><Symbol>)</Symbol><Normal Text> </Normal Text><Symbol>{}</Symbol><Normal Text>	</Normal Text><Comment>// </Comment><Alert Level 3>NOTE</Alert Level 3><Comment>: rules cannot match across new-lines</Comment><br/>
-<Normal Text>    </Normal Text><Statement>scope </Statement><Normal Text>(</Normal Text><Expression>failure</Expression><Symbol>)</Symbol><Normal Text> </Normal Text><Symbol>{}</Symbol><br/>
+<Normal Text>    </Normal Text><Statement>scope </Statement><Normal Text>(</Normal Text><Expression>failure</Expression><Normal Text>) </Normal Text><Symbol>{}</Symbol><br/>
 <Normal Text>    </Normal Text><br/>
 <Normal Text>    </Normal Text><Comment>///</Comment><Ddoc> Properties</Ddoc><br/>
 <Normal Text>    x </Normal Text><Symbol>=</Symbol><Normal Text> </Normal Text><Type>int</Type><Normal Text>.</Normal Text><Property>min</Property><Symbol>;</Symbol><br/>
diff --git a/data/syntax/d.xml b/data/syntax/d.xml
--- a/data/syntax/d.xml
+++ b/data/syntax/d.xml
@@ -101,7 +101,7 @@
    ========================================================================
 -->
 
-<language name="D" version="3" kateversion="5.0" section="Sources" extensions="*.d;*.D;*.di;*.DI;" mimetype="text/x-dsrc" casesensitive="true" author="Diggory Hardy (diggory.hardy@gmail.com), Aziz Köksal (aziz.koeksal@gmail.com), Jari-Matti Mäkelä (jmjm@iki.fi), Simon J Mackenzie (project.katedxml@smackoz.fastmail.fm)" license="LGPL">
+<language name="D" version="4" kateversion="5.0" section="Sources" extensions="*.d;*.D;*.di;*.DI;" mimetype="text/x-dsrc" casesensitive="true" author="Diggory Hardy (diggory.hardy@gmail.com), Aziz Köksal (aziz.koeksal@gmail.com), Jari-Matti Mäkelä (jmjm@iki.fi), Simon J Mackenzie (project.katedxml@smackoz.fastmail.fm)" license="LGPL">
   <highlighting>
     <!-- User-defined keywords (add identifiers you'd like highlighted here) -->
     <list name="userkeywords">
@@ -512,7 +512,7 @@
       <context name="Linkage2" attribute="Normal Text" lineEndContext="#stay">
         <DetectSpaces/>
         <StringDetect attribute="Linkage Type" context="#pop#pop" String="C++"/>
-        <keyword    attribute="Linkage Type" context="#pop#pop" String="ltypes"/>
+        <keyword    attribute="Linkage Type" context="#stay" String="ltypes"/>
         <IncludeRules context="CommentRules" />
         <!-- Fall-through rules, highlighting errors: -->
         <DetectChar char=")" attribute="Normal Text" context="#pop#pop"/>
@@ -529,9 +529,9 @@
       </context>
       <context name="Version2" attribute="Normal Text" lineEndContext="#stay">
         <DetectSpaces/>
-        <keyword    attribute="Version Type" context="#pop#pop" String="vtypes"/>
-        <DetectIdentifier attribute="Normal Text" context="#pop#pop"/>
-        <RegExpr attribute="Integer" context="#pop#pop" String="\d+[\d_]*(L[uU]?|[uU]L?)?"/>
+        <keyword    attribute="Version Type" context="#stay" String="vtypes"/>
+        <DetectIdentifier attribute="Normal Text" context="#stay"/>
+        <RegExpr attribute="Integer" context="#stay" String="\d+[\d_]*(L[uU]?|[uU]L?)?"/>
         <IncludeRules context="CommentRules" />
         <!-- Fall-through rules, highlighting errors: -->
         <DetectChar char=")" attribute="Normal Text" context="#pop#pop"/>
@@ -545,7 +545,7 @@
       </context>
       <context name="Scope2" attribute="Normal Text" lineEndContext="#stay">
         <DetectSpaces/>
-        <keyword String="scope_keywords" attribute="Expression" context="#pop#pop"/>
+        <keyword String="scope_keywords" attribute="Expression" context="#stay"/>
         <IncludeRules context="CommentRules" />
         <!-- Fall-through rules, highlighting errors: -->
         <DetectChar char=")" attribute="Normal Text" context="#pop#pop"/>
@@ -561,8 +561,8 @@
       </context>
       <context name="Pragma2" attribute="Pragma" lineEndContext="#stay">
         <DetectSpaces/>
-        <keyword    attribute="Version Type" context="#pop#pop" String="ptypes"/>
-        <DetectIdentifier attribute="Normal Text" context="#pop#pop"/>
+        <keyword    attribute="Version Type" context="#stay" String="ptypes"/>
+        <DetectIdentifier attribute="Normal Text" context="#stay"/>
         <IncludeRules context="CommentRules" />
         <!-- Fall-through rules, highlighting errors: -->
         <DetectChar char=")" attribute="Normal Text" context="#pop#pop"/>