diff --git a/data/syntax/d.xml b/data/syntax/d.xml
--- a/data/syntax/d.xml
+++ b/data/syntax/d.xml
@@ -96,7 +96,7 @@
   2003.08.11 - D.XML 1.10           - updated.
   2003.07.18 - D.XML 1.00           - First released.
 
-  TODO:- Deliminated strings and Token strings (D2.0) are not supported.
+  TODO:- Deliminated strings (D2.0) are not supported.
 
    ========================================================================
 -->
@@ -155,12 +155,15 @@
       <item>public</item>
       <item>pure</item>
       <item>ref</item>
+      <item>shared</item>
       <item>static</item>
       
       <!-- these may be statements -->
       <!-- in (more common to use as an expression since in attribute is only ever the default) -->
       <item>out</item>
       <item>scope</item>
+      
+      <item>__gshared</item>
     </list>
     
     <list name="expressions">
@@ -408,11 +411,15 @@
         <StringDetect attribute="Pragma" context="LinePragma" String="#line"/>
         
         <!-- Rules for the C-style indenter. Currently problems with /// and /++ comments. -->
-        <DetectChar attribute="Symbol" context="#stay" char="{" beginRegion="BraceA" />
-        <DetectChar attribute="Symbol" context="#stay" char="}" endRegion="BraceA" />
+        <DetectChar attribute="Symbol" context="BraceA" char="{" beginRegion="BraceA" />
         <AnyChar attribute="Symbol" context="#stay" String=":!%&amp;()+,-/.*&lt;=&gt;?[]|~^&#59;"/>
       </context>
 
+      <context name="BraceA" attribute="Normal Text">
+        <DetectChar attribute="Symbol" context="#pop" char="}" endRegion="BraceA" />
+        <IncludeRules context="normal"/>
+      </context>
+
       <context name="StartingLetter" attribute="Normal Text" lineEndContext="#pop">
           <DetectSpaces />
           <!-- fall-through should work now that DetectIdentifier is used (without infinite loops) -->
@@ -446,6 +453,7 @@
           
           <Detect2Chars attribute="RawString" context="RawString" char="r" char1="&quot;"/>
           <Detect2Chars attribute="HexString" context="HexString" char="x" char1="&quot;"/>
+          <Detect2Chars attribute="TokenString" context="TokenString" char="q" char1="{"/>
           
           <!-- user highlighting: last so as not to interfere with anything else -->
           <keyword String="userkeywords"    attribute="UserKeywords"   context="#stay"     />
@@ -512,7 +520,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"/>
@@ -561,8 +569,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"/>
@@ -611,7 +619,11 @@
         <Detect2Chars attribute="EscapeSequence" context="UnicodeLong"   char="\" char1="U"/>
         <Detect2Chars attribute="EscapeSequence" context="HTMLEntity"   char="\" char1="&amp;"/>
       </context>
-
+      <!-- q{...} -->
+      <context name="TokenString" attribute="Normal Text" lineEndContext="#stay">
+        <DetectChar attribute="TokenString" context="#pop" char="}" />
+        <IncludeRules context="normal" />
+      </context>
       <!-- Comments -->
       <context name="CommentRules" attribute="Normal Text" lineEndContext="#pop">
         <IncludeRules context="DdocNormal" />
@@ -800,6 +812,7 @@
       <itemData name="RawString"      defStyleNum="dsVerbatimString"/>
       <itemData name="BQString"       defStyleNum="dsSpecialString"/>
       <itemData name="HexString"      defStyleNum="dsSpecialString"/>
+      <itemData name="TokenString"    defStyleNum="dsSpecialString"/>
       
       <!-- Ddoc specific -->
       <itemData name="Macros"      defStyleNum="dsOthers" color="#bf5fbf" selColor="#ffffff" bold="1" italic="0" />