diff --git a/data/syntax/prolog.xml b/data/syntax/prolog.xml
--- a/data/syntax/prolog.xml
+++ b/data/syntax/prolog.xml
@@ -105,7 +105,7 @@
     <!ENTITY bs         "\">
 ]>
 <language name="Prolog" section="Sources"
-	  version="7" kateversion="3.4"
+	  version="8" kateversion="3.4"
 	  mimetype="text/x-prolog"
 	  extensions="*.prolog;*.dcg;*.pro"
 	  author="Torsten Eichstädt (torsten.eichstaedt@web.de)"
@@ -674,15 +674,15 @@
 		<IncludeRules context="quoted_last"/>
 	    </context>
 	    <context name="single-quoted" lineEndContext="#stay" attribute="'quo Ted'" >
-		<RegExpr String="'$" context="sq" beginRegion="quoted" attribute="Syntax Error" />
+		<LineContinue char="'" context="sq" beginRegion="quoted" attribute="Syntax Error" />
 		<DetectChar char="'" context="sq" beginRegion="quoted" attribute="'quo Ted'" />
 	    </context>
 	    <context name="double-quoted" lineEndContext="#stay" attribute="&quot;double-quoted&quot;" >
-		<RegExpr String="&quot;$" context="dq" beginRegion="quoted" attribute="Syntax Error" />
+		<LineContinue char="&quot;" context="dq" beginRegion="quoted" attribute="Syntax Error" />
 		<DetectChar char="&quot;" context="dq" beginRegion="quoted" attribute="&quot;double-quoted&quot;" />
 	    </context>
 	    <context name="back-quoted" lineEndContext="#stay" attribute="`back-quoted`" >
-		<RegExpr String="`$" context="bq" beginRegion="quoted" attribute="Syntax Error" />
+		<LineContinue char="`" context="bq" beginRegion="quoted" attribute="Syntax Error" />
 		<DetectChar char="`" context="bq" beginRegion="quoted" attribute="`back-quoted`" />
 	    </context>
 
diff --git a/data/syntax/pug.xml b/data/syntax/pug.xml
--- a/data/syntax/pug.xml
+++ b/data/syntax/pug.xml
@@ -17,7 +17,7 @@
 - Do NOT support multi-line comment or text block
 
 -->
-<language name="Pug" version="4" kateversion="5.0" section="Markup" extensions="*.pug;*.jade" mimetype="" priority="10" author="Guo Yunhe (guoyunhebrave@gmail.com)" license="LGPL">
+<language name="Pug" version="5" kateversion="5.0" section="Markup" extensions="*.pug;*.jade" mimetype="" priority="10" author="Guo Yunhe (guoyunhebrave@gmail.com)" license="LGPL">
   <highlighting>
     <list name="controlflow">
       <item>case</item>
@@ -33,7 +33,7 @@
       <context name="Start" attribute="Normal Text" lineEndContext="#stay">
         <Detect2Chars attribute="Comment" context="Comment" char="/" char1="/"/>
         <StringDetect attribute="Doctype" context="#stay" String="doctype" insensitive="true"/>
-        <RegExpr attribute="ControlFlow" context="JavaScript" String="\belse if\b" firstNonSpace="true"/>
+        <RegExpr attribute="ControlFlow" context="JavaScript" String="\belse\s+if\b" firstNonSpace="true"/>
         <keyword attribute="ControlFlow" context="JavaScript" String="controlflow" firstNonSpace="true"/>
         <DetectIdentifier attribute="Normal Text" context="Element" firstNonSpace="true" lookAhead="true"/>
         <DetectChar attribute="Normal Text" context="Element" char="#" firstNonSpace="true" lookAhead="true"/>
diff --git a/data/syntax/qml.xml b/data/syntax/qml.xml
--- a/data/syntax/qml.xml
+++ b/data/syntax/qml.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
 <!-- Author: Milian Wolff <mail@milianw.de> -->
-<language name="QML" version="5" kateversion="5.0" section="Scripts" extensions="*.qml;*.qmltypes"
+<language name="QML" version="6" kateversion="5.0" section="Scripts" extensions="*.qml;*.qmltypes"
           mimetype="text/x-qml;application/x-qml" indenter="cstyle"
           author="Milian Wolff (mail@milianw.de)" license="LGPL">
   <highlighting>
@@ -129,7 +129,7 @@
         <DetectSpaces />
         <DetectIdentifier />
         <DetectSpaces />
-        <AnyChar String=")" context="#pop"/>
+        <DetectChar char=")" context="#pop"/>
       </context>
       <!-- QML supports multi-line strings, which are not supported by Javascript -->
       <context attribute="String" lineEndContext="#stay" name="String">
diff --git a/data/syntax/r.xml b/data/syntax/r.xml
--- a/data/syntax/r.xml
+++ b/data/syntax/r.xml
@@ -8,7 +8,7 @@
 	R      : http://www.r-project.org/
 	RKWard : http://rkward.sourceforge.net/
 	-->
-<language version="7" kateversion="5.0" name="R Script" section="Scientific" extensions="*.R;*.r;*.S;*.s;*.q" mimetype="" license="GPLv2">
+<language version="8" kateversion="5.0" name="R Script" section="Scientific" extensions="*.R;*.r;*.S;*.s;*.q" mimetype="" license="GPLv2">
 <highlighting>
 
 	<list name="controls">
@@ -79,7 +79,7 @@
 
 		<context attribute="Normal Text" lineEndContext="#stay" name="operator_rhs" fallthrough="true" fallthroughContext="#pop">
 			<!-- While there is nothing of interest, stay in the context -->
-			<StringDetect attribute="Headline" context="Headline" String="##"/>
+			<Detect2Chars attribute="Headline" context="Headline" char="#" char1="#"/>
 			<DetectChar attribute="Comment" context="Comment" char="#"/>
 			<DetectChar attribute="String" context="#stay" char=" "/>
 			<!-- Operators other than +, -, and ! directly after another operator are an error. -->
@@ -104,8 +104,8 @@
 			<Int attribute="Int" context="#stay"/>
 			<RegExpr attribute="Keyword" context="#stay" String="[a-zA-Z_]+[a-zA-Z_\.0-9]*(?=[\s]*[(])"/>
 			<RegExpr attribute="Keyword" context="#stay" String="\.[a-zA-Z_\.]+[a-zA-Z_\.0-9]*(?=[\s]*[(])"/>
-			<RegExpr attribute="Symbol" context="parenthesis" String="\("/>
-			<StringDetect attribute="Headline" context="Headline" String="##"/>
+			<DetectChar attribute="Symbol" context="parenthesis" char="("/>
+			<Detect2Chars attribute="Headline" context="Headline" char="#" char1="#"/>
 			<DetectChar attribute="Comment" context="Comment" char="#"/>
 
 			<!-- For (assignment) operators, enter a new context operator_rhs to check what follows (generally, that should not be another op) -->
diff --git a/data/syntax/rest.xml b/data/syntax/rest.xml
--- a/data/syntax/rest.xml
+++ b/data/syntax/rest.xml
@@ -11,7 +11,7 @@
   Copyright 2010 Matt Williams (matt@milliams.com)
   Copyright 2014 Matthew Woehlke (mw_triad@users.sourceforge.net)
   -->
-<language name="reStructuredText" extensions="*.rst" section="Markup" mimetype="text/x-rst" version="3" kateversion="2.4" casesensitive="1">
+<language name="reStructuredText" extensions="*.rst" section="Markup" mimetype="text/x-rst" version="4" kateversion="2.4" casesensitive="1">
 
   <highlighting>
 
@@ -23,7 +23,7 @@
         <RegExpr attribute="Footnote" context="#stay" String="^\s*\.\. \[(\d+|#|\*|#[&SimpleReferenceNameChars;]+)\]\s" minimal="true" column="0"/>
         <RegExpr attribute="Citation" context="#stay" String="^\s*\.\. \[[&SimpleReferenceNameChars;]+\]\s" minimal="true" column="0"/>
         <RegExpr attribute="HyperlinkTarget" context="#stay" String="^\s*(\.\. (__:|_[&SimpleReferenceNameChars; ]+:(\s|$))|__ )" minimal="true" column="0"/>
-        <RegExpr attribute="Code" String="^\s*\.\. code-block::" context="CodeBlock" column="0"/>
+        <StringDetect attribute="Code" String=".. code-block::" context="CodeBlock" firstNonSpace="true"/>
         <RegExpr attribute="Directive" context="#stay" String="^\s*\.\. [\w\-_\.]+::(\s|$)" minimal="true" column="0"/>
         <RegExpr attribute="Code" String="::$" context="CodeBlock" />
         <RegExpr attribute="SubstitutionDefinition" context="#stay" String="^\s*\.\. \|[&SimpleReferenceNameChars; ]+\|\s+[&SimpleReferenceNameChars;]+::\s" minimal="true" column="0"/>
@@ -36,8 +36,7 @@
         <RegExpr attribute="SubstitutionReference" context="#stay" String="&inlinestart;\|[^\s].*\|&inlineend;" minimal="true"/>
         <RegExpr attribute="InlineInternalTarget" context="#stay" String="&inlinestart;_`[^\s].*`&inlineend;" minimal="true"/>
         <RegExpr attribute="FootnoteReference" context="#stay" String="&inlinestart;\[[&SimpleReferenceNameChars;]+\]_&inlineend;" minimal="true"/>
-        <RegExpr attribute="HyperlinkReference" context="#stay" String="&inlinestart;`[^\s].*`_&inlineend;" minimal="true"/>
-        <RegExpr attribute="HyperlinkReference" context="#stay" String="&inlinestart;\w+_&inlineend;" minimal="true"/>
+        <RegExpr attribute="HyperlinkReference" context="#stay" String="&inlinestart;(`[^\s].*`|\w+)_&inlineend;" minimal="true"/>
         <RegExpr attribute="InterpretedText" context="TrailingRole" String="&inlinestart;`[^\s].*`(?=:[\w\-_\.\+]+:)" minimal="true"/>
         <RegExpr attribute="Role" String=":[\w\-_\.\+]+:(?=`)" context="Role"/>
       </context>
diff --git a/data/syntax/rhtml.xml b/data/syntax/rhtml.xml
--- a/data/syntax/rhtml.xml
+++ b/data/syntax/rhtml.xml
@@ -44,7 +44,7 @@
 -->
 	
 <!-- Hold the "language" opening tag on a single line, as mentioned in "language.dtd". -->
-<language name="Ruby/Rails/RHTML" version="8" kateversion="5.0" section="Markup" extensions="*.rhtml;*.RHTML;*.html.erb" mimetype="" author="Richard Dale rdale@foton.es" license="LGPLv2+">
+<language name="Ruby/Rails/RHTML" version="9" kateversion="5.0" section="Markup" extensions="*.rhtml;*.RHTML;*.html.erb" mimetype="" author="Richard Dale rdale@foton.es" license="LGPLv2+">
 	
 	<highlighting>
 	
@@ -333,7 +333,7 @@
 				<DetectIdentifier/>
 				
 				<RegExpr attribute="Keyword" context="rubysource" String="&lt;%=?" />
-				<StringDetect attribute="Keyword" context="rubysourceline" String="%" />
+				<DetectChar attribute="Keyword" context="rubysourceline" char="%" />
 				
 				<StringDetect attribute="Comment" context="Comment" String="&lt;!--" beginRegion="comment" />
 				<StringDetect attribute="CDATA" context="CDATA" String="&lt;![CDATA[" beginRegion="cdata" />
@@ -550,16 +550,17 @@
 				<RegExpr attribute="Keyword" String="(\=|\(|\[|\{)\s*(if|unless|while|until)\b" context="#stay" beginRegion="def block"/>
 				<RegExpr attribute="Keyword" String="(while|until)\b(?!.*\bdo\b)" context="#stay" beginRegion="def block" firstNonSpace="true"/>
 				<RegExpr attribute="Keyword" String="\;\s*(while|until)\b(?!.*\bdo\b)" context="#stay" beginRegion="def block"/>
-				<RegExpr attribute="Keyword" String="(if|unless)\b" context="#stay" beginRegion="def block" firstNonSpace="true"/>
+				<WordDetect attribute="Keyword" String="if" context="#stay" beginRegion="def block" firstNonSpace="true"/>
+				<WordDetect attribute="Keyword" String="unless" context="#stay" beginRegion="def block" firstNonSpace="true"/>
 				<RegExpr attribute="Keyword" String="\;\s*(if|unless)\b" context="#stay" beginRegion="def block"/>
-				<RegExpr attribute="Keyword" String="\bclass\b" context="#stay" beginRegion="def block"/>
-				<RegExpr attribute="Keyword" String="\bmodule\b" context="#stay" beginRegion="def block"/>
-				<RegExpr attribute="Keyword" String="\bbegin\b" context="#stay" beginRegion="def block"/>
+				<WordDetect attribute="Keyword" String="class" context="#stay" beginRegion="def block"/>
+				<WordDetect attribute="Keyword" String="module" context="#stay" beginRegion="def block"/>
+				<WordDetect attribute="Keyword" String="begin" context="#stay" beginRegion="def block"/>
 				<RegExpr attribute="Keyword" String="\bfor\b(?!.*\bdo\b)" context="#stay" beginRegion="def block"/>
-				<RegExpr attribute="Keyword" String="\bcase\b" context="#stay" beginRegion="def block"/>
-				<RegExpr attribute="Keyword" String="\bdo\b" context="#stay" beginRegion="def block"/>
-				<RegExpr attribute="Keyword" String="\bdef\b" context="#stay" beginRegion="def block"/>
-				<RegExpr attribute="Keyword" String="\bend\b" context="#stay" endRegion="def block"/>
+				<WordDetect attribute="Keyword" String="case" context="#stay" beginRegion="def block"/>
+				<WordDetect attribute="Keyword" String="do" context="#stay" beginRegion="def block"/>
+				<WordDetect attribute="Keyword" String="def" context="#stay" beginRegion="def block"/>
+				<WordDetect attribute="Keyword" String="end" context="#stay" endRegion="def block"/>
 				<!-- elsif/else close the current block and start a new one -->
 				<RegExpr attribute="Keyword" String="(\b|^\s*)(else|elsif|rescue|ensure)(\s+|$)" context="#stay" endRegion="def block" beginRegion="def block"/>
 				
@@ -583,8 +584,7 @@
 				<!-- (global) vars starting with $
 					Match them before $_.
 					-->
-				<RegExpr attribute="Global Variable" String="\$[a-zA-Z_0-9]+" context="#stay"/>
-				<RegExpr attribute="Global Variable" String="\$\-[a-zA-Z_]\b" context="#stay"/>
+				<RegExpr attribute="Global Variable" String="\$(\w+|\-[a-zA-Z_]\b)" context="#stay"/>
 				<!-- special-character globals -->
 				<RegExpr attribute="Default globals" String="\$[\d_*`\!:?'/\\\-\&amp;]" context="#stay"/>
 				<RegExpr attribute="Global Constant" String="\b[_A-Z]+[A-Z_0-9]+\b" context="#stay"/>
@@ -620,20 +620,20 @@
 				<!-- regexp hack -->
 				<RegExpr attribute="Operator" String="\s!" context="#stay"/>
 				<RegExpr attribute="Operator" String="/=\s" context="#stay" insensitive="0"/>
-				<StringDetect attribute="Operator" String="%=" context="#stay" insensitive="0"/>
+				<Detect2Chars attribute="Operator" char="%" char1="=" context="#stay"/>
 				<Detect2Chars attribute="Operator" char=":" char1=":" context="Member Access"/>
 				
 				<RegExpr attribute="Symbol" String=":[a-zA-Z_][a-zA-Z0-9_]*" context="#stay"/>
 				
 				<DetectChar attribute="String" char="&quot;" context="Quoted String"/>
 				<DetectChar attribute="Raw String" char="'" context="Apostrophed String"/>
 				<DetectChar attribute="Command" char="`" context="Command String"/>
 				
-				<StringDetect attribute="Normal Text" String="?#" context="#stay"/>
+				<Detect2Chars attribute="Normal Text" char="?" char1="#" context="#stay"/>
 				
 				<RegExpr attribute="Comment" String="#\s*BEGIN.*$"  context="#stay" beginRegion="marker" column="0"/>
 				<RegExpr attribute="Comment" String="#\s*END.*$"  context="#stay" endRegion="marker" column="0"/>
-				<RegExpr attribute="Comment" String="#"  context="Comment Line" firstNonSpace="true"/>
+				<DetectChar attribute="Comment" char="#"  context="Comment Line" firstNonSpace="true"/>
 				<RegExpr attribute="Comment" String="\s#"  context="General Comment"/>
 				
 				<RegExpr attribute="Delimiter" String="[\[\]]+"  context="#stay"/>
@@ -653,29 +653,30 @@
 			
 			<context name="Line Continue" attribute="Ruby Normal Text" lineEndContext="#pop">
 				<RegExpr attribute="Keyword" String="(while|until)\b(?!.*\bdo\b)" context="#stay" firstNonSpace="true"/>
-				<RegExpr attribute="Keyword" String="(if|unless)\b" context="#stay" firstNonSpace="true"/>
+				<WordDetect attribute="Keyword" String="if" context="#stay" firstNonSpace="true"/>
+				<WordDetect attribute="Keyword" String="unless" context="#stay" firstNonSpace="true"/>
 				<IncludeRules context="rubysource"/>
 			</context>
 			
 			<context name="Quoted String" attribute="String" lineEndContext="#stay">
-				<StringDetect attribute="String" String="\\" context="#stay"/>
-				<RegExpr attribute="String" String="\\\&quot;" context="#stay"/>
+				<Detect2Chars attribute="String" char="\" char1="\" context="#stay"/>
+				<Detect2Chars attribute="String" char="\" char1="&quot;" context="#stay"/>
 				<RegExpr attribute="Substitution" String="#@{1,2}" context="Short Subst"/>
 				<Detect2Chars attribute="Substitution" char="#" char1="{" context="Subst"/>
 				<!--HlCChar attribute="Char" context="#pop"/-->
 				<DetectChar char="&quot;" attribute="String" context="#pop"/>
 			</context>
 			
 			<context name="Apostrophed String" attribute="Raw String" lineEndContext="#stay">
 				<!-- <HlCChar attribute="Char" context="#pop"/> -->
-				<StringDetect attribute="String" String="\\" context="#stay"/>
-				<RegExpr attribute="String" String="\\\'" context="#stay"/>
+				<Detect2Chars attribute="String" char="\" char1="\" context="#stay"/>
+				<Detect2Chars attribute="String" char="\" char1="'" context="#stay"/>
 				<DetectChar char="'" attribute="Raw String" context="#pop"/>
 			</context>
 			
 			<context name="Command String" attribute="Command" lineEndContext="#stay">
-				<StringDetect attribute="String" String="\\" context="#stay"/>
-				<RegExpr attribute="String" String="\\\`" context="#stay"/>
+				<Detect2Chars attribute="String" char="\" char1="\" context="#stay"/>
+				<Detect2Chars attribute="String" char="\" char1="`" context="#stay"/>
 				<RegExpr attribute="Substitution" String="#@{1,2}" context="Short Subst"/>
 				<Detect2Chars attribute="Substitution" char="#" char1="{" context="Subst"/>
 				<HlCChar attribute="Char" context="#pop"/>
@@ -687,7 +688,7 @@
 			</context>
 			
 			<context name="RegEx 1" attribute="Regular Expression" lineEndContext="#stay">
-				<RegExpr attribute="Regular Expression" String="\\\/" context="#stay"/>
+				<Detect2Chars attribute="Regular Expression" char="\" char1="/" context="#stay"/>
 				<RegExpr attribute="Regular Expression" String="[^\\]$" context="#pop"/>
 				<RegExpr attribute="Substitution" String="#@{1,2}" context="Short Subst"/>
 				<Detect2Chars attribute="Substitution" char="#" char1="{" context="Subst"/>
@@ -782,46 +783,50 @@
 			<context name="find_gdl_input" attribute="Ruby Normal Text" lineEndContext="#pop">
 				
 				<!-- handle token arrays -->
-				<RegExpr attribute="GDL input" context="gdl_token_array_1" String="w\(" />
-				<RegExpr attribute="GDL input" context="gdl_token_array_2" String="w\{" />
-				<RegExpr attribute="GDL input" context="gdl_token_array_3" String="w\[" />
-				<RegExpr attribute="GDL input" context="gdl_token_array_4" String="w&lt;" />
+				<Detect2Chars attribute="GDL input" context="gdl_token_array_1" char="w" char1="(" />
+				<Detect2Chars attribute="GDL input" context="gdl_token_array_2" char="w" char1="{" />
+				<Detect2Chars attribute="GDL input" context="gdl_token_array_3" char="w" char1="[" />
+				<Detect2Chars attribute="GDL input" context="gdl_token_array_4" char="w" char1="&lt;" />
 				<!-- then we handle the 'any char' format -->
 				<RegExpr attribute="GDL input" context="gdl_token_array_5" String="w([^\s\w])" />
 				
 				<!-- handle apostrophed strings -->
-				<RegExpr attribute="GDL input" context="gdl_apostrophed_1" String="q\(" />
-				<RegExpr attribute="GDL input" context="gdl_apostrophed_2" String="q\{" />
-				<RegExpr attribute="GDL input" context="gdl_apostrophed_3" String="q\[" />
-				<RegExpr attribute="GDL input" context="gdl_apostrophed_4" String="q&lt;" />
+				<Detect2Chars attribute="GDL input" context="gdl_apostrophed_1" char="q" char1="(" />
+				<Detect2Chars attribute="GDL input" context="gdl_apostrophed_2" char="q" char1="{" />
+				<Detect2Chars attribute="GDL input" context="gdl_apostrophed_3" char="q" char1="[" />
+				<Detect2Chars attribute="GDL input" context="gdl_apostrophed_4" char="q" char1="&lt;" />
 				<!-- then we handle the 'any char' format -->
 				<RegExpr attribute="GDL input" context="gdl_apostrophed_5" String="q([^\s\w])" />
 				
 				<!-- handle shell commands -->
-				<RegExpr attribute="GDL input" context="gdl_shell_command_1" String="x\(" />
-				<RegExpr attribute="GDL input" context="gdl_shell_command_2" String="x\{" />
-				<RegExpr attribute="GDL input" context="gdl_shell_command_3" String="x\[" />
-				<RegExpr attribute="GDL input" context="gdl_shell_command_4" String="x&lt;" />
+				<Detect2Chars attribute="GDL input" context="gdl_shell_command_1" char="x" char1="(" />
+				<Detect2Chars attribute="GDL input" context="gdl_shell_command_2" char="x" char1="{" />
+				<Detect2Chars attribute="GDL input" context="gdl_shell_command_3" char="x" char1="[" />
+				<Detect2Chars attribute="GDL input" context="gdl_shell_command_4" char="x" char1="&lt;" />
 				<!-- then we handle the 'any char' format -->
 				<RegExpr attribute="GDL input" context="gdl_shell_command_5" String="x([^\s\w])" />
 				
 				<!-- handle regular expressions -->
-				<RegExpr attribute="GDL input" context="gdl_regexpr_1" String="r\(" />
-				<RegExpr attribute="GDL input" context="gdl_regexpr_2" String="r\{" />
-				<RegExpr attribute="GDL input" context="gdl_regexpr_3" String="r\[" />
-				<RegExpr attribute="GDL input" context="gdl_regexpr_4" String="r&lt;" />
+				<Detect2Chars attribute="GDL input" context="gdl_regexpr_1" char="r" char1="(" />
+				<Detect2Chars attribute="GDL input" context="gdl_regexpr_2" char="r" char1="{" />
+				<Detect2Chars attribute="GDL input" context="gdl_regexpr_3" char="r" char1="[" />
+				<Detect2Chars attribute="GDL input" context="gdl_regexpr_4" char="r" char1="&lt;" />
 				<!-- then we handle the 'any char' format -->
 				<RegExpr attribute="GDL input" context="gdl_regexpr_5" String="r([^\s\w])" />
 				
 				<!-- handle double-quoted strings -->
 				<!-- 
 					be careful to make this the last GDL ruleset, because the rule for
 					the short form %?foo? will otherwise catch any of the other formats
 					-->
-				<RegExpr attribute="GDL input" context="gdl_dq_string_1" String="Q?\(" />
-				<RegExpr attribute="GDL input" context="gdl_dq_string_2" String="Q?\{" />
-				<RegExpr attribute="GDL input" context="gdl_dq_string_3" String="Q?\[" />
-				<RegExpr attribute="GDL input" context="gdl_dq_string_4" String="Q?&lt;" />
+				<Detect2Chars attribute="GDL input" context="gdl_dq_string_1" char="Q" char1="(" />
+				<Detect2Chars attribute="GDL input" context="gdl_dq_string_2" char="Q" char1="{" />
+				<Detect2Chars attribute="GDL input" context="gdl_dq_string_3" char="Q" char1="[" />
+				<Detect2Chars attribute="GDL input" context="gdl_dq_string_4" char="Q" char1="&lt;" />
+				<DetectChar attribute="GDL input" context="gdl_dq_string_1" char="(" />
+				<DetectChar attribute="GDL input" context="gdl_dq_string_2" char="{" />
+				<DetectChar attribute="GDL input" context="gdl_dq_string_3" char="[" />
+				<DetectChar attribute="GDL input" context="gdl_dq_string_4" char="&lt;" />
 				<!-- then we handle the 'any char' format -->
 				<RegExpr attribute="GDL input" context="gdl_dq_string_5" String="Q?([^\s\w])" />
 				
diff --git a/data/syntax/ruby.xml b/data/syntax/ruby.xml
--- a/data/syntax/ruby.xml
+++ b/data/syntax/ruby.xml
@@ -31,7 +31,7 @@
 
 <!-- Hold the "language" opening tag on a single line, as mentioned in "language.dtd". -->
 <language name="Ruby" section="Scripts"
-	  version="8" kateversion="3.3"
+	  version="9" kateversion="3.3"
 	  extensions="*.rb;*.rjs;*.rxml;*.xml.erb;*.js.erb;*.rake;Rakefile;Gemfile;*.gemspec;Vagrantfile"
 	  mimetype="application/x-ruby"
 	  style="ruby" indenter="ruby"
@@ -274,7 +274,7 @@
 				<!-- regexp hack -->
 				<RegExpr attribute="Operator" String="\s!" context="#stay"/>
 				<RegExpr attribute="Operator" String="/=\s" context="#stay" insensitive="0"/>
-				<StringDetect attribute="Operator" String="%=" context="#stay" insensitive="0"/>
+				<Detect2Chars attribute="Operator" char="%" char1="=" context="#stay"/>
 				<Detect2Chars attribute="Operator" char=":" char1=":" context="Member Access"/>
 
 				<RegExpr attribute="Symbol" String=":(@{1,2}|\$)?[a-zA-Z_][a-zA-Z0-9_]*[=?!]?" context="check_div_1"/>
@@ -287,7 +287,7 @@
 				<DetectChar attribute="Raw String" char="'" context="Apostrophed String"/>
 				<DetectChar attribute="Command" char="`" context="Command String"/>
 
-				<StringDetect attribute="Normal Text" String="?#" context="#stay"/>
+				<Detect2Chars attribute="Normal Text" char="?" char1="#" context="#stay"/>
 
 				<RegExpr attribute="Comment" String="#\s*BEGIN.*$"  context="#stay" beginRegion="marker" column="0"/>
 				<RegExpr attribute="Comment" String="#\s*END.*$"  context="#stay" endRegion="marker" column="0"/>
@@ -364,22 +364,22 @@
 			</context>
 
 			<context name="Quoted String" attribute="String" lineEndContext="#stay">
-				<StringDetect attribute="String" String="\\" context="#stay"/>
-				<RegExpr attribute="String" String="\\\&quot;" context="#stay"/>
+				<Detect2Chars attribute="String" char="\" char1="\" context="#stay"/>
+				<Detect2Chars attribute="String" char="\" char1="&quot;" context="#stay"/>
 				<RegExpr attribute="Substitution" String="#@{1,2}" context="Short Subst"/>
 				<Detect2Chars attribute="Substitution" char="#" char1="{" context="Subst"/>
 				<DetectChar char="&quot;" attribute="String" context="check_div_1_pop"/>
 			</context>
 
 			<context name="Apostrophed String" attribute="Raw String" lineEndContext="#stay">
-				<StringDetect attribute="String" String="\\" context="#stay"/>
-				<RegExpr attribute="String" String="\\\'" context="#stay"/>
+				<Detect2Chars attribute="String" char="\" char1="\" context="#stay"/>
+				<Detect2Chars attribute="String" char="\" char1="'" context="#stay"/>
 				<DetectChar char="'" attribute="Raw String" context="check_div_1_pop"/>
 			</context>
 
 			<context name="Command String" attribute="Command" lineEndContext="#stay">
-				<StringDetect attribute="String" String="\\" context="#stay"/>
-				<RegExpr attribute="String" String="\\\`" context="#stay"/>
+				<Detect2Chars attribute="String" char="\" char1="\" context="#stay"/>
+				<Detect2Chars attribute="String" char="\" char1="`" context="#stay"/>
 				<RegExpr attribute="Substitution" String="#@{1,2}" context="Short Subst"/>
 				<Detect2Chars attribute="Substitution" char="#" char1="{" context="Subst"/>
 				<DetectChar char="`" attribute="Command" context="check_div_1_pop"/>
@@ -391,7 +391,7 @@
 			</context>
 
 			<context name="RegEx 1" attribute="Regular Expression" lineEndContext="#stay">
-				<RegExpr attribute="Regular Expression" String="\\\/" context="#stay"/>
+				<Detect2Chars attribute="Regular Expression" char="\" char1="/" context="#stay"/>
 				<RegExpr attribute="Substitution" String="#@{1,2}" context="Short Subst"/>
 				<Detect2Chars attribute="Substitution" char="#" char1="{" context="Subst"/>
 				<RegExpr attribute="Regular Expression" String="/[uiomxn]*" context="check_div_1_pop"/>
@@ -473,54 +473,58 @@
 			<context name="find_gdl_input" attribute="Normal Text" lineEndContext="#pop">
 
 				<!-- handle token arrays -->
-				<RegExpr attribute="GDL input" context="gdl_token_array_1" String="w\(" />
-				<RegExpr attribute="GDL input" context="gdl_token_array_2" String="w\{" />
-				<RegExpr attribute="GDL input" context="gdl_token_array_3" String="w\[" />
-				<RegExpr attribute="GDL input" context="gdl_token_array_4" String="w&lt;" />
+				<Detect2Chars attribute="GDL input" context="gdl_token_array_1" char="w" char1="(" />
+				<Detect2Chars attribute="GDL input" context="gdl_token_array_2" char="w" char1="{" />
+				<Detect2Chars attribute="GDL input" context="gdl_token_array_3" char="w" char1="[" />
+				<Detect2Chars attribute="GDL input" context="gdl_token_array_4" char="w" char1="&lt;" />
 				<!-- then we handle the 'any char' format -->
 				<RegExpr attribute="GDL input" context="gdl_token_array_5" String="w([^\s\w])" />
 
 				<!-- handle token arrays -->
-				<RegExpr attribute="GDL input" context="gdl_token_array_1" String="W\(" />
-				<RegExpr attribute="GDL input" context="gdl_token_array_2" String="W\{" />
-				<RegExpr attribute="GDL input" context="gdl_token_array_3" String="W\[" />
-				<RegExpr attribute="GDL input" context="gdl_token_array_4" String="W&lt;" />
+				<Detect2Chars attribute="GDL input" context="gdl_token_array_1" char="W" char1="(" />
+				<Detect2Chars attribute="GDL input" context="gdl_token_array_2" char="W" char1="{" />
+				<Detect2Chars attribute="GDL input" context="gdl_token_array_3" char="W" char1="[" />
+				<Detect2Chars attribute="GDL input" context="gdl_token_array_4" char="W" char1="&lt;" />
 				<!-- then we handle the 'any char' format -->
 				<RegExpr attribute="GDL input" context="gdl_token_array_5" String="W([^\s\w])" />
 
 				<!-- handle apostrophed strings -->
-				<RegExpr attribute="GDL input" context="gdl_apostrophed_1" String="q\(" />
-				<RegExpr attribute="GDL input" context="gdl_apostrophed_2" String="q\{" />
-				<RegExpr attribute="GDL input" context="gdl_apostrophed_3" String="q\[" />
-				<RegExpr attribute="GDL input" context="gdl_apostrophed_4" String="q&lt;" />
+				<Detect2Chars attribute="GDL input" context="gdl_apostrophed_1" char="q" char1="(" />
+				<Detect2Chars attribute="GDL input" context="gdl_apostrophed_2" char="q" char1="{" />
+				<Detect2Chars attribute="GDL input" context="gdl_apostrophed_3" char="q" char1="[" />
+				<Detect2Chars attribute="GDL input" context="gdl_apostrophed_4" char="q" char1="&lt;" />
 				<!-- then we handle the 'any char' format -->
 				<RegExpr attribute="GDL input" context="gdl_apostrophed_5" String="q([^\s\w])" />
 
 				<!-- handle shell commands -->
-				<RegExpr attribute="GDL input" context="gdl_shell_command_1" String="x\(" />
-				<RegExpr attribute="GDL input" context="gdl_shell_command_2" String="x\{" />
-				<RegExpr attribute="GDL input" context="gdl_shell_command_3" String="x\[" />
-				<RegExpr attribute="GDL input" context="gdl_shell_command_4" String="x&lt;" />
+				<Detect2Chars attribute="GDL input" context="gdl_shell_command_1" char="x" char1="(" />
+				<Detect2Chars attribute="GDL input" context="gdl_shell_command_2" char="x" char1="{" />
+				<Detect2Chars attribute="GDL input" context="gdl_shell_command_3" char="x" char1="[" />
+				<Detect2Chars attribute="GDL input" context="gdl_shell_command_4" char="x" char1="&lt;" />
 				<!-- then we handle the 'any char' format -->
 				<RegExpr attribute="GDL input" context="gdl_shell_command_5" String="x([^\s\w])" />
 
 				<!-- handle regular expressions -->
-				<RegExpr attribute="GDL input" context="gdl_regexpr_1" String="r\(" />
-				<RegExpr attribute="GDL input" context="gdl_regexpr_2" String="r\{" />
-				<RegExpr attribute="GDL input" context="gdl_regexpr_3" String="r\[" />
-				<RegExpr attribute="GDL input" context="gdl_regexpr_4" String="r&lt;" />
+				<Detect2Chars attribute="GDL input" context="gdl_regexpr_1" char="r" char1="(" />
+				<Detect2Chars attribute="GDL input" context="gdl_regexpr_2" char="r" char1="{" />
+				<Detect2Chars attribute="GDL input" context="gdl_regexpr_3" char="r" char1="[" />
+				<Detect2Chars attribute="GDL input" context="gdl_regexpr_4" char="r" char1="&lt;" />
 				<!-- then we handle the 'any char' format -->
 				<RegExpr attribute="GDL input" context="gdl_regexpr_5" String="r([^\s\w])" />
 
 				<!-- handle double-quoted strings -->
 				<!--
 					  be careful to make this the last GDL ruleset, because the rule for
 					  the short form %?foo? will otherwise catch any of the other formats
 				-->
-				<RegExpr attribute="GDL input" context="gdl_dq_string_1" String="Q?\(" />
-				<RegExpr attribute="GDL input" context="gdl_dq_string_2" String="Q?\{" />
-				<RegExpr attribute="GDL input" context="gdl_dq_string_3" String="Q?\[" />
-				<RegExpr attribute="GDL input" context="gdl_dq_string_4" String="Q?&lt;" />
+				<Detect2Chars attribute="GDL input" context="gdl_dq_string_1" char="Q" char1="(" />
+				<Detect2Chars attribute="GDL input" context="gdl_dq_string_2" char="Q" char1="{" />
+				<Detect2Chars attribute="GDL input" context="gdl_dq_string_3" char="Q" char1="[" />
+				<Detect2Chars attribute="GDL input" context="gdl_dq_string_4" char="Q" char1="&lt;" />
+				<DetectChar attribute="GDL input" context="gdl_dq_string_1" char="(" />
+				<DetectChar attribute="GDL input" context="gdl_dq_string_2" char="{" />
+				<DetectChar attribute="GDL input" context="gdl_dq_string_3" char="[" />
+				<DetectChar attribute="GDL input" context="gdl_dq_string_4" char="&lt;" />
 				<!-- then we handle the 'any char' format -->
 				<RegExpr attribute="GDL input" context="gdl_dq_string_5" String="Q?([^\s\w])" />
 
@@ -650,7 +654,7 @@
 
 			<!-- rules to be included in all token_array contexts -->
 			<context name="token_array_rules" attribute="String" lineEndContext="#stay" >
-				<StringDetect attribute="String" String="\\" context="#stay"/>
+				<Detect2Chars attribute="String" char="\" char1="\" context="#stay"/>
 			</context>
 
 			<!-- apostrophed string specific contexts -->
diff --git a/data/syntax/sisu.xml b/data/syntax/sisu.xml
--- a/data/syntax/sisu.xml
+++ b/data/syntax/sisu.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="SiSU" version="4" section="Markup" kateversion="2.4" extensions="*.sst;*.ssm;*.ssi;*._sst;*.-sst;" author="Ralph Amissah (ralph.amissah@gmail.com)" license="LGPL" >
+<language name="SiSU" version="5" section="Markup" kateversion="2.4" extensions="*.sst;*.ssm;*.ssi;*._sst;*.-sst;" author="Ralph Amissah (ralph.amissah@gmail.com)" license="LGPL" >
   <highlighting>
     <list name="somename">
       <item>class</item>
@@ -12,115 +12,115 @@
       <DetectChar attribute="String" context="string" char="&quot;" />
       <RegExpr String="^(0~\S+|@\S+)\s.+$" attribute="Header" context="#pop" />
       <RegExpr String="^:?[A-C1-6]~.+$" attribute="Heading" context="#pop" />
-      <StringDetect String="~{" attribute="Endnote" context="footnote"/>
-      <StringDetect String="^~" attribute="Endnote" context="endnote"/>
-      <StringDetect String="!{" attribute="Bold" context="emphasis"/>
-      <StringDetect String="*{" attribute="Bold" context="bold"/>
-      <StringDetect String="/{" attribute="Italic" context="italic"/>
-      <StringDetect String="_{" attribute="Underscore" context="underscore"/>
-      <StringDetect String="^{" attribute="Superscript" context="superscript"/>
-      <StringDetect String=",{" attribute="Subscript" context="subscript"/>
-      <StringDetect String="-{" attribute="Strike" context="strike"/>
-      <StringDetect String="+{" attribute="Insert" context="insert"/>
+      <Detect2Chars char="~" char1="{" attribute="Endnote" context="footnote"/>
+      <Detect2Chars char="^" char1="~" attribute="Endnote" context="endnote"/>
+      <Detect2Chars char="!" char1="{" attribute="Bold" context="emphasis"/>
+      <Detect2Chars char="*" char1="{" attribute="Bold" context="bold"/>
+      <Detect2Chars char="/" char1="{" attribute="Italic" context="italic"/>
+      <Detect2Chars char="_" char1="{" attribute="Underscore" context="underscore"/>
+      <Detect2Chars char="^" char1="{" attribute="Superscript" context="superscript"/>
+      <Detect2Chars char="," char1="{" attribute="Subscript" context="subscript"/>
+      <Detect2Chars char="-" char1="{" attribute="Strike" context="strike"/>
+      <Detect2Chars char="+" char1="{" attribute="Insert" context="insert"/>
       <StringDetect String="&lt;br&gt;" attribute="Break" context="#pop" />
       <RegExpr String="\{.+?\}(http:\/\/\S+|image)" attribute="Link" context="#stay"/>
       <RegExpr String="(^|\s)http:\/\/\S+" attribute="Link" context="#stay"/>
       <RegExpr String="^!_ .+" attribute="Bold" context="boldline"/>
       <RegExpr String="^(_[12]|_\*|_[12]\*)\s" attribute="Indent" context="#stay"/>
-      <RegExpr String="~\^" attribute="Endnote" context="#stay"/>
+      <Detect2Chars char="~" char1="^" attribute="Endnote" context="#stay"/>
       <RegExpr String="^%+\s.+$" attribute="Comment" context="#stay" endRegion="regionMarker" firstNonSpace="true" />
     </context>
     <context attribute="String" lineEndContext="#stay" name="string" >
       <DetectChar attribute="String" context="#pop" char="&quot;" />
     </context>
     <context attribute="Endnote" lineEndContext="#stay" name="footnote" >
-      <StringDetect attribute="Endnote" context="#pop" String="}~" />
-      <StringDetect String="!{" attribute="Bold" context="emphasis"/>
-      <StringDetect String="*{" attribute="Bold" context="bold"/>
-      <StringDetect String="/{" attribute="Italic" context="italic"/>
-      <StringDetect String="_{" attribute="Underscore" context="underscore"/>
-      <StringDetect String="^{" attribute="Superscript" context="superscript"/>
-      <StringDetect String=",{" attribute="Subscript" context="subscript"/>
-      <StringDetect String="-{" attribute="Strike" context="strike"/>
-      <StringDetect String="+{" attribute="Insert" context="insert"/>
+      <Detect2Chars char="}" char1="~" attribute="Endnote" context="#pop" />
+      <Detect2Chars char="!" char1="{" attribute="Bold" context="emphasis"/>
+      <Detect2Chars char="*" char1="{" attribute="Bold" context="bold"/>
+      <Detect2Chars char="/" char1="{" attribute="Italic" context="italic"/>
+      <Detect2Chars char="_" char1="{" attribute="Underscore" context="underscore"/>
+      <Detect2Chars char="^" char1="{" attribute="Superscript" context="superscript"/>
+      <Detect2Chars char="," char1="{" attribute="Subscript" context="subscript"/>
+      <Detect2Chars char="-" char1="{" attribute="Strike" context="strike"/>
+      <Detect2Chars char="+" char1="{" attribute="Insert" context="insert"/>
     </context>
     <context attribute="Bold" lineEndContext="#stay" name="bold" >
-      <StringDetect attribute="Bold" context="#pop" String="}*" />
-      <StringDetect String="/{" attribute="Italic" context="italic"/>
-      <StringDetect String="_{" attribute="Underscore" context="underscore"/>
-      <StringDetect String="^{" attribute="Superscript" context="superscript"/>
-      <StringDetect String=",{" attribute="Subscript" context="subscript"/>
-      <StringDetect String="-{" attribute="Strike" context="strike"/>
-      <StringDetect String="+{" attribute="Insert" context="insert"/>
+      <Detect2Chars char="}" char1="*" attribute="Bold" context="#pop" />
+      <Detect2Chars char="/" char1="{" attribute="Italic" context="italic"/>
+      <Detect2Chars char="_" char1="{" attribute="Underscore" context="underscore"/>
+      <Detect2Chars char="^" char1="{" attribute="Superscript" context="superscript"/>
+      <Detect2Chars char="," char1="{" attribute="Subscript" context="subscript"/>
+      <Detect2Chars char="-" char1="{" attribute="Strike" context="strike"/>
+      <Detect2Chars char="+" char1="{" attribute="Insert" context="insert"/>
     </context>
     <context attribute="Bold" lineEndContext="#stay" name="emphasis" >
-      <StringDetect attribute="Bold" context="#pop" String="}!" />
-      <StringDetect String="/{" attribute="Italic" context="italic"/>
-      <StringDetect String="_{" attribute="Underscore" context="underscore"/>
-      <StringDetect String="^{" attribute="Superscript" context="superscript"/>
-      <StringDetect String=",{" attribute="Subscript" context="subscript"/>
-      <StringDetect String="-{" attribute="Strike" context="strike"/>
-      <StringDetect String="+{" attribute="Insert" context="insert"/>
+      <Detect2Chars char="}" char1="!" attribute="Bold" context="#pop" />
+      <Detect2Chars char="/" char1="{" attribute="Italic" context="italic"/>
+      <Detect2Chars char="_" char1="{" attribute="Underscore" context="underscore"/>
+      <Detect2Chars char="^" char1="{" attribute="Superscript" context="superscript"/>
+      <Detect2Chars char="," char1="{" attribute="Subscript" context="subscript"/>
+      <Detect2Chars char="-" char1="{" attribute="Strike" context="strike"/>
+      <Detect2Chars char="+" char1="{" attribute="Insert" context="insert"/>
     </context>
     <context attribute="Italic" lineEndContext="#stay" name="italic" >
-      <StringDetect attribute="Italic" context="#pop" String="}/" />
-      <StringDetect String="!{" attribute="Bold" context="emphasis"/>
-      <StringDetect String="*{" attribute="Bold" context="bold"/>
-      <StringDetect String="_{" attribute="Underscore" context="underscore"/>
-      <StringDetect String="^{" attribute="Superscript" context="superscript"/>
-      <StringDetect String=",{" attribute="Subscript" context="subscript"/>
-      <StringDetect String="-{" attribute="Strike" context="strike"/>
-      <StringDetect String="+{" attribute="Insert" context="insert"/>
+      <Detect2Chars char="}" char1="/" attribute="Italic" context="#pop" />
+      <Detect2Chars char="!" char1="{" attribute="Bold" context="emphasis"/>
+      <Detect2Chars char="*" char1="{" attribute="Bold" context="bold"/>
+      <Detect2Chars char="_" char1="{" attribute="Underscore" context="underscore"/>
+      <Detect2Chars char="^" char1="{" attribute="Superscript" context="superscript"/>
+      <Detect2Chars char="," char1="{" attribute="Subscript" context="subscript"/>
+      <Detect2Chars char="-" char1="{" attribute="Strike" context="strike"/>
+      <Detect2Chars char="+" char1="{" attribute="Insert" context="insert"/>
     </context>
     <context attribute="Underscore" lineEndContext="#stay" name="underscore" >
-      <StringDetect attribute="Underscore" context="#pop" String="}_" />
-      <StringDetect String="!{" attribute="Bold" context="emphasis"/>
-      <StringDetect String="*{" attribute="Bold" context="bold"/>
-      <StringDetect String="/{" attribute="Italic" context="italic"/>
-      <StringDetect String="^{" attribute="Superscript" context="superscript"/>
-      <StringDetect String=",{" attribute="Subscript" context="subscript"/>
-      <StringDetect String="-{" attribute="Strike" context="strike"/>
-      <StringDetect String="+{" attribute="Insert" context="insert"/>
+      <Detect2Chars char="}" char1="_" attribute="Underscore" context="#pop" />
+      <Detect2Chars char="!" char1="{" attribute="Bold" context="emphasis"/>
+      <Detect2Chars char="*" char1="{" attribute="Bold" context="bold"/>
+      <Detect2Chars char="/" char1="{" attribute="Italic" context="italic"/>
+      <Detect2Chars char="^" char1="{" attribute="Superscript" context="superscript"/>
+      <Detect2Chars char="," char1="{" attribute="Subscript" context="subscript"/>
+      <Detect2Chars char="-" char1="{" attribute="Strike" context="strike"/>
+      <Detect2Chars char="+" char1="{" attribute="Insert" context="insert"/>
     </context>
     <context attribute="Superscript" lineEndContext="#stay" name="superscript" >
-      <StringDetect attribute="Superscript" context="#pop" String="}^" />
-      <StringDetect String="!{" attribute="Bold" context="emphasis"/>
-      <StringDetect String="*{" attribute="Bold" context="bold"/>
-      <StringDetect String="/{" attribute="Italic" context="italic"/>
-      <StringDetect String="_{" attribute="Underscore" context="underscore"/>
-      <StringDetect String=",{" attribute="Subscript" context="subscript"/>
-      <StringDetect String="-{" attribute="Strike" context="strike"/>
-      <StringDetect String="+{" attribute="Insert" context="insert"/>
+      <Detect2Chars char="}" char1="^" attribute="Superscript" context="#pop" />
+      <Detect2Chars char="!" char1="{" attribute="Bold" context="emphasis"/>
+      <Detect2Chars char="*" char1="{" attribute="Bold" context="bold"/>
+      <Detect2Chars char="/" char1="{" attribute="Italic" context="italic"/>
+      <Detect2Chars char="_" char1="{" attribute="Underscore" context="underscore"/>
+      <Detect2Chars char="," char1="{" attribute="Subscript" context="subscript"/>
+      <Detect2Chars char="-" char1="{" attribute="Strike" context="strike"/>
+      <Detect2Chars char="+" char1="{" attribute="Insert" context="insert"/>
     </context>
     <context attribute="Subscript" lineEndContext="#stay" name="subscript" >
-      <StringDetect attribute="Subscript" context="#pop" String="}," />
-      <StringDetect String="!{" attribute="Bold" context="emphasis"/>
-      <StringDetect String="*{" attribute="Bold" context="bold"/>
-      <StringDetect String="/{" attribute="Italic" context="italic"/>
-      <StringDetect String="_{" attribute="Underscore" context="underscore"/>
-      <StringDetect String="^{" attribute="Superscript" context="superscript"/>
-      <StringDetect String="-{" attribute="Strike" context="strike"/>
-      <StringDetect String="+{" attribute="Insert" context="insert"/>
+      <Detect2Chars attribute="Subscript" context="#pop" char="}" char1="," />
+      <Detect2Chars char="!" char1="{" attribute="Bold" context="emphasis"/>
+      <Detect2Chars char="*" char1="{" attribute="Bold" context="bold"/>
+      <Detect2Chars char="/" char1="{" attribute="Italic" context="italic"/>
+      <Detect2Chars char="_" char1="{" attribute="Underscore" context="underscore"/>
+      <Detect2Chars char="^" char1="{" attribute="Superscript" context="superscript"/>
+      <Detect2Chars char="-" char1="{" attribute="Strike" context="strike"/>
+      <Detect2Chars char="+" char1="{" attribute="Insert" context="insert"/>
     </context>
     <context attribute="Strike" lineEndContext="#stay" name="strike" >
-      <StringDetect attribute="Strike" context="#pop" String="}-" />
-      <StringDetect String="!{" attribute="Bold" context="emphasis"/>
-      <StringDetect String="*{" attribute="Bold" context="bold"/>
-      <StringDetect String="/{" attribute="Italic" context="italic"/>
-      <StringDetect String="_{" attribute="Underscore" context="underscore"/>
-      <StringDetect String="^{" attribute="Superscript" context="superscript"/>
-      <StringDetect String=",{" attribute="Subscript" context="subscript"/>
-      <StringDetect String="+{" attribute="Insert" context="insert"/>
+      <Detect2Chars char="}" char1="-" attribute="Strike" context="#pop" />
+      <Detect2Chars char="!" char1="{" attribute="Bold" context="emphasis"/>
+      <Detect2Chars char="*" char1="{" attribute="Bold" context="bold"/>
+      <Detect2Chars char="/" char1="{" attribute="Italic" context="italic"/>
+      <Detect2Chars char="_" char1="{" attribute="Underscore" context="underscore"/>
+      <Detect2Chars char="^" char1="{" attribute="Superscript" context="superscript"/>
+      <Detect2Chars char="," char1="{" attribute="Subscript" context="subscript"/>
+      <Detect2Chars char="+" char1="{" attribute="Insert" context="insert"/>
     </context>
     <context attribute="Insert" lineEndContext="#stay" name="insert" >
-      <StringDetect attribute="Insert" context="#pop" String="}+" />
-      <StringDetect String="!{" attribute="Bold" context="emphasis"/>
-      <StringDetect String="*{" attribute="Bold" context="bold"/>
-      <StringDetect String="/{" attribute="Italic" context="italic"/>
-      <StringDetect String="_{" attribute="Underscore" context="underscore"/>
-      <StringDetect String="^{" attribute="Superscript" context="superscript"/>
-      <StringDetect String=",{" attribute="Subscript" context="subscript"/>
-      <StringDetect String="-{" attribute="Strike" context="strike"/>
+      <Detect2Chars char="}" char1="+" attribute="Insert" context="#pop" />
+      <Detect2Chars char="!" char1="{" attribute="Bold" context="emphasis"/>
+      <Detect2Chars char="*" char1="{" attribute="Bold" context="bold"/>
+      <Detect2Chars char="/" char1="{" attribute="Italic" context="italic"/>
+      <Detect2Chars char="_" char1="{" attribute="Underscore" context="underscore"/>
+      <Detect2Chars char="^" char1="{" attribute="Superscript" context="superscript"/>
+      <Detect2Chars char="," char1="{" attribute="Subscript" context="subscript"/>
+      <Detect2Chars char="-" char1="{" attribute="Strike" context="strike"/>
     </context>
     <context attribute="Endnote" lineEndContext="#pop" name="endnote" />
     <context attribute="Bold" lineEndContext="#pop" name="boldline" />
diff --git a/data/syntax/sql-mysql.xml b/data/syntax/sql-mysql.xml
--- a/data/syntax/sql-mysql.xml
+++ b/data/syntax/sql-mysql.xml
@@ -6,7 +6,7 @@
   modifications by Milian Wolff (mail@milianw.de)
   v3 fix comments by Gene Thomas <gene@genethomas.com>
 -->
-<language name="SQL (MySQL)" version="3" kateversion="3.4" section="Database" extensions="*.sql;*.SQL;*.ddl;*.DDL" mimetype="text/x-sql" casesensitive="0" author="Shane Wright (me@shanewright.co.uk)" license="">
+<language name="SQL (MySQL)" version="4" kateversion="3.4" section="Database" extensions="*.sql;*.SQL;*.ddl;*.DDL" mimetype="text/x-sql" casesensitive="0" author="Shane Wright (me@shanewright.co.uk)" license="">
   <highlighting>
     <list name="keywords">
       <item>ACCESS</item>
@@ -391,6 +391,8 @@
         <Detect2Chars attribute="Comment" context="MultiLineComment" char="/" char1="*" beginRegion="Comment"/>
         <RegExpr attribute="Comment" context="SingleLineComment" String="rem\b" insensitive="true" column="0"/>
 
+        <LineContinue attribute="Symbol" context="#stay" char="/" column="0"/> <!-- conflict with "operators" keywords -->
+
         <!-- problematic special cases -->
         <!-- SET type -->
         <RegExpr attribute="Data Type" context="#stay" insensitive="true" String="SET(?=\s*\()"/>
@@ -415,7 +417,6 @@
         <DetectChar attribute="Name" context="Name" char="`"/>
 
         <AnyChar attribute="Symbol" context="#stay" String=":&#38;"/>
-        <RegExpr attribute="Symbol" context="#stay" String="/$" column="0"/>
         <RegExpr attribute="Preprocessor" context="Preprocessor" String="@@?[^@ \t\r\n]" column="0"/>
         <!-- for something like : SELECT DB.TABLE.ROW ... -->
         <DetectChar attribute="String Char" context="#stay" char="."/>
diff --git a/data/syntax/sql-postgresql.xml b/data/syntax/sql-postgresql.xml
--- a/data/syntax/sql-postgresql.xml
+++ b/data/syntax/sql-postgresql.xml
@@ -3,7 +3,7 @@
 <!-- PostgreSQL SQL, syntax definition based on sql.xml by Yury Lebedev
      v5 fix comments by Gene Thomas <gene@genethomas.com>
   -->
-<language name="SQL (PostgreSQL)" version="5" kateversion="2.4" section="Database" extensions="*.sql;*.SQL;*.ddl;*.DDL" mimetype="text/x-sql" casesensitive="0" author="Shane Wright (me@shanewright.co.uk)" license="">
+<language name="SQL (PostgreSQL)" version="6" kateversion="2.4" section="Database" extensions="*.sql;*.SQL;*.ddl;*.DDL" mimetype="text/x-sql" casesensitive="0" author="Shane Wright (me@shanewright.co.uk)" license="">
   <highlighting>
     <list name="keywords">
       <item>ABORT</item>
@@ -741,24 +741,17 @@
         <RegExpr String="create\s+(or\s+replace\s+)?function" insensitive="true" context="CreateFunction" attribute="Keyword"/>
 
         <RegExpr String="do\s+\$([^\$\n\r]*)\$" insensitive="true" context="FunctionBody" attribute="Keyword"/>
+        <LineContinue attribute="Symbol" context="#stay" char="/" column="0"/>
         <keyword attribute="Keyword" context="#stay" String="keywords"/>
         <keyword attribute="Operator" context="#stay" String="operators"/>
         <keyword attribute="Function" context="#stay" String="functions"/>
         <keyword attribute="Data Type" context="#stay" String="types"/>
-        <RegExpr attribute="Data Type" context="#stay" String="%bulk_exceptions\b" insensitive="true"/>
-        <RegExpr attribute="Data Type" context="#stay" String="%bulk_rowcount\b" insensitive="true"/>
-        <RegExpr attribute="Data Type" context="#stay" String="%found\b" insensitive="true"/>
-        <RegExpr attribute="Data Type" context="#stay" String="%isopen\b" insensitive="true"/>
-        <RegExpr attribute="Data Type" context="#stay" String="%notfound\b" insensitive="true"/>
-        <RegExpr attribute="Data Type" context="#stay" String="%rowcount\b" insensitive="true"/>
-        <RegExpr attribute="Data Type" context="#stay" String="%rowtype\b" insensitive="true"/>
-        <RegExpr attribute="Data Type" context="#stay" String="%type\b" insensitive="true"/>
+        <RegExpr attribute="Data Type" context="#stay" String="%(bulk_(exceptions|rowcount)|(not)?found|isopen|rowcount|(row)?type)\b" insensitive="true"/>
         <Float attribute="Float" context="#stay"/>
         <Int attribute="Decimal" context="#stay"/>
         <DetectChar attribute="String" context="String" char="'"/>
         <DetectChar attribute="Comment" context="Identifier" char="&quot;"/>
         <AnyChar attribute="Symbol" context="#stay" String=":&#38;"/>
-        <RegExpr attribute="Symbol" context="#stay" String="/$" column="0"/>
         <RegExpr attribute="Preprocessor" context="Preprocessor" String="@@?[^@ \t\r\n]" column="0"/>
         <RegExpr attribute="Operator" context="MultiLineString" String="\$([^\$\n\r]*)\$" dynamic="true"/>
       </context>
diff --git a/data/syntax/sql.xml b/data/syntax/sql.xml
--- a/data/syntax/sql.xml
+++ b/data/syntax/sql.xml
@@ -5,7 +5,7 @@
      v3 fix comments by Gene Thomas <gene@genethomas.com>
   -->
 <!-- kate: space-indent on; indent-width 2; replace-tabs on; -->
-<language name="SQL" version="3" kateversion="2.4" section="Database" extensions="*.sql;*.SQL;*.ddl;*.DDL" mimetype="text/x-sql" casesensitive="0" author="Yury Lebedev (yurylebedev@mail.ru)" license="LGPL">
+<language name="SQL" version="4" kateversion="2.4" section="Database" extensions="*.sql;*.SQL;*.ddl;*.DDL" mimetype="text/x-sql" casesensitive="0" author="Yury Lebedev (yurylebedev@mail.ru)" license="LGPL">
   <highlighting>
     <list name="keywords">
       <item>ACCESS</item>
@@ -894,6 +894,7 @@
         <Detect2Chars attribute="Comment" context="Multiline C-style comment" char="/" char1="*" beginRegion="Comment"/>
         <RegExpr attribute="Comment" context="SQL*Plus remark directive" String="^rem\b" insensitive="true" column="0"/>
 
+        <LineContinue attribute="Symbol" context="#stay" char="/" column="0"/> <!-- conflict with "operators" keywords -->
         <keyword attribute="Keyword" String="keywords" context="#stay"/>
         <keyword attribute="Operator" String="operators" context="#stay"/>
         <keyword attribute="Function" String="functions" context="#stay"/>
@@ -911,7 +912,6 @@
 
         <DetectChar attribute="Identifier" context="User-defined identifier" char="&quot;"/>
         <RegExpr attribute="External Variable" context="#stay" String="(:|&amp;&amp;?)\w+"/>
-        <RegExpr attribute="Symbol" context="#stay" String="^/$" column="0"/>
         <RegExpr attribute="Preprocessor" context="SQL*Plus directive to include file" String="^@@?[^@ \t\r\n]" column="0"/>
       </context>
       <context name="String literal" attribute="String" lineEndContext="#stay">
diff --git a/data/syntax/tads3.xml b/data/syntax/tads3.xml
--- a/data/syntax/tads3.xml
+++ b/data/syntax/tads3.xml
@@ -3,7 +3,7 @@
 <!-- TADS 3 syntax highlight definition for Kate. -->
 <!-- Author: Nikos Chantziaras <realnc@gmail.com> -->
 <language name="TADS 3" section="Sources"
-          version="3" kateversion="3.3"
+          version="4" kateversion="3.3"
           indenter="cstyle"
           extensions="*.t;*.h"
           mimetype=""
@@ -82,7 +82,7 @@
 			<DetectChar attribute="Normal Text" context="#stay" char="{" beginRegion="Brace1"/>
 			<DetectChar attribute="Normal Text" context="#stay" char="}" endRegion="Brace1"/>
 			<AnyChar attribute="Symbol" context="#stay" String="!%&amp;()+,-&lt;=&gt;?[]^{|}~"/>
-			<RegExpr attribute="Preprocessor" context="Preprocessor" String="#"/>
+			<DetectChar attribute="Preprocessor" context="Preprocessor" char="#"/>
 		</context>
 
 		<context attribute="String" lineEndContext="#stay" name="String">
diff --git a/data/syntax/tcl.xml b/data/syntax/tcl.xml
--- a/data/syntax/tcl.xml
+++ b/data/syntax/tcl.xml
@@ -28,7 +28,7 @@
 	    - Fixed detection of varaibles with names containing serval namespace delimiters (::)
 -->
 
-<language name="Tcl/Tk" version="3" kateversion="2.4" section="Scripts" extensions="*.tcl;*.tk" mimetype="text/x-tcl" license="BSD">
+<language name="Tcl/Tk" version="4" kateversion="2.4" section="Scripts" extensions="*.tcl;*.tk" mimetype="text/x-tcl" license="BSD">
   <highlighting>
     <list name="keywords">
       <item>after</item>
@@ -511,8 +511,8 @@
         <RegExpr String = "\$(::|\w)+" attribute = "Variable" context="#stay"/>
         
         <!-- Strings -->
-        <RegExpr String = "&quot;{2}" attribute = "String" context="#stay"/>
-        <RegExpr String = "&quot;" attribute = "String" context="String"/>
+        <Detect2Chars char = "&quot;" char1 = "&quot;" attribute = "String" context="#stay"/>
+        <DetectChar char = "&quot;" attribute = "String" context="String"/>
         
         <!-- Comments -->
         <DetectChar char = ";" attribute = "Normal Text" context="New command line" />
diff --git a/data/syntax/template-toolkit.xml b/data/syntax/template-toolkit.xml
--- a/data/syntax/template-toolkit.xml
+++ b/data/syntax/template-toolkit.xml
@@ -16,7 +16,7 @@
     Changelog :)
     0.02 Added highliting for interpolated variables
         -->
-<language version="4" kateversion="5.0"
+<language version="5" kateversion="5.0"
           author="Красимир Беров (k.berov@gmail.com)" license="Artistic"
           name="TT2" section="Markup" extensions="*.tt*;" casesensitive="true">
 <highlighting>
@@ -182,7 +182,7 @@
 
     <contexts>
         <context name="nosource" attribute="Normal Text" lineEndContext="#stay">
-            <StringDetect attribute="Keyword" context="tt2source" String="[%" />
+            <Detect2Chars attribute="Keyword" context="tt2source" char="[" char1="%" />
             <RegExpr attribute="HTML Tag" context="scripts" String="&lt;\s*script(\s|&gt;)" insensitive="true" />
             <RegExpr attribute="HTML Tag" context="htmltag" String="&lt;\s*\/?\s*[a-zA-Z_:][a-zA-Z0-9._:-]*" />
             <StringDetect attribute="HTML Comment" context="htmlcomment" String="&lt;!--" />
@@ -192,7 +192,7 @@
         </context>
         
         <context name="tt2source" attribute="TT2 Text" lineEndContext="#stay">
-            <StringDetect attribute="Keyword" context="#pop" String="%]" />
+            <Detect2Chars attribute="Keyword" context="#pop" char="%" char1="]" />
             <DetectChar attribute="Comment" context="tt2_onelinecomment" char="#" />
             <DetectChar attribute="String" context="doublequotestring" char="&quot;" />
             <DetectChar attribute="String" context="singlequotestring" char="&#39;" />
@@ -206,24 +206,23 @@
             <Int attribute="Decimal" context="#stay" />
             <AnyChar attribute="Other" context="#stay" String=";()}{:,[]" />
 
-            <RegExpr attribute="Control Structures" context="#stay" String="\bELSIF\b" insensitive="false" beginRegion="iffi1" endRegion="iffi1"/>
-            <RegExpr attribute="Control Structures" context="#stay" String="\bELSE\b" insensitive="false" beginRegion="iffi1" endRegion="iffi1"/>
-            <RegExpr attribute="Control Structures" context="#stay" String="\bIF\b" insensitive="false" beginRegion="iffi1"/>
-            <RegExpr attribute="Control Structures" context="#stay" String="\bEND\b" insensitive="false" endRegion="iffi1"/>
+            <WordDetect attribute="Control Structures" context="#stay" String="ELSIF" insensitive="false" beginRegion="iffi1" endRegion="iffi1"/>
+            <WordDetect attribute="Control Structures" context="#stay" String="ELSE" insensitive="false" beginRegion="iffi1" endRegion="iffi1"/>
+            <WordDetect attribute="Control Structures" context="#stay" String="IF" insensitive="false" beginRegion="iffi1"/>
+            <WordDetect attribute="Control Structures" context="#stay" String="END" insensitive="false" endRegion="iffi1"/>
 
-            <RegExpr attribute="Control Structures" context="#stay" String="\bFOREACH\b" insensitive="false" beginRegion="foreachblock"/>
-            <RegExpr attribute="Control Structures" context="#stay" String="\bEND\b" insensitive="false" endRegion="foreachblock"/>
+            <WordDetect attribute="Control Structures" context="#stay" String="FOREACH" insensitive="false" beginRegion="foreachblock"/>
+            <WordDetect attribute="Control Structures" context="#stay" String="END" insensitive="false" endRegion="foreachblock"/>
 
             <keyword attribute="Keyword" context="#stay" String="keywords" />
             <keyword attribute="Control Structures" context="#stay" String="control structures" />
         </context>
         <context name="tt2_onelinecomment" attribute="Comment" lineEndContext="#pop">
-            <StringDetect attribute="Keyword" context="#pop#pop" String="%]" />
+            <Detect2Chars attribute="Keyword" context="#pop#pop" char="%" char1="]" />
         </context>
         <context name="doublequotestring" attribute="String" lineEndContext="#stay">
             <Detect2Chars attribute="Escape Code" context="#stay" char="&quot;" char1="&quot;" />
-            <RegExpr attribute="Escape Code" context="#stay" String="\\[0-7]{1,3}" />
-            <RegExpr attribute="Escape Code" context="#stay" String="\\x[0-9A-Fa-f]{1,2}" />
+            <RegExpr attribute="Escape Code" context="#stay" String="\\([0-7]{1,3}|x[0-9A-Fa-f]{1,2})" />
             <DetectChar attribute="String" context="#pop" char="&quot;" />
             <!-- Interpolated variables -->
             <RegExpr attribute="Variable" context="#stay" String="&var1;" />
@@ -236,14 +235,12 @@
         <context name="htmltag" attribute="Identifier" lineEndContext="#stay">
             <Detect2Chars attribute="HTML Tag" context="#pop" char="/" char1="&gt;" />
             <DetectChar attribute="HTML Tag" context="#pop" char="&gt;"/>
-            <StringDetect attribute="Keyword" context="tt2source" String="[%" />
-            <StringDetect attribute="Keyword" context="tt2source" String="[%" />
+            <Detect2Chars attribute="Keyword" context="tt2source" char="[" char1="%" />
             <RegExpr attribute="Identifier" context="identifiers" String="\s*=\s*"/>
 
         </context>
         <context name="htmlcomment" attribute="HTML Comment" lineEndContext="#stay">
-            <StringDetect attribute="Keyword" context="tt2source" String="[%" />
-            <StringDetect attribute="Keyword" context="tt2source" String="[%" />
+            <Detect2Chars attribute="Keyword" context="tt2source" char="[" char1="%" />
             <StringDetect attribute="HTML Comment" context="#pop" String="--&gt;" />
             <RegExpr attribute="Normal Text" context="identifiers" String="\s*=\s*"/>
         </context>
@@ -254,14 +251,12 @@
         </context>
         
         <context name="types1" attribute="Types" lineEndContext="#stay">
-            <StringDetect attribute="Keyword" context="tt2source" String="[%" />
-            <StringDetect attribute="Keyword" context="tt2source" String="[%" />
+            <Detect2Chars attribute="Keyword" context="tt2source" char="[" char1="%" />
             <DetectChar attribute="Types" context="#pop#pop" char="'" />
         </context>
         
         <context name="types2" attribute="Types" lineEndContext="#stay">
-            <StringDetect attribute="Keyword" context="tt2source" String="[%" />
-            <StringDetect attribute="Keyword" context="tt2source" String="[%" />
+            <Detect2Chars attribute="Keyword" context="tt2source" char="[" char1="%" />
             <DetectChar attribute="Types" context="#pop#pop" char="&quot;" />
         </context>
         
diff --git a/data/syntax/textile.xml b/data/syntax/textile.xml
--- a/data/syntax/textile.xml
+++ b/data/syntax/textile.xml
@@ -16,7 +16,7 @@
 ]>
             
 <language section="Markup" name="Textile" 
-        version="3" kateversion="3.0"
+        version="4" kateversion="3.0"
         extensions="*.textile" priority="15"
         author="Alexander Kabakov (kabakov.as@gmail.com)"
         license="LGPL" >
@@ -26,17 +26,14 @@
                 <StringDetect attribute="comment" context="comment" String="&lt;!--" beginRegion="comment" />
                 <RegExpr attribute="macro" String="\{\{&name;\}\}" />
                 
-                <RegExpr context="sectiontitle_block" String="^h1" />
-                <RegExpr context="sectionheader_block" String="^h2" />                
-                <RegExpr context="sectionheader_block" String="^h3" />
-                <RegExpr context="sectionheader_block" String="^h4" />
-                <RegExpr context="sectionheader_block" String="^h5" />
+                <Detect2Chars context="sectiontitle_block"  char="h" char1="1" column="0" />
+                <Detect2Chars context="sectionheader_block" char="h" char1="2" column="0" />                
+                <Detect2Chars context="sectionheader_block" char="h" char1="3" column="0" />
+                <Detect2Chars context="sectionheader_block" char="h" char1="4" column="0" />
+                <Detect2Chars context="sectionheader_block" char="h" char1="5" column="0" />
                 
-                <RegExpr attribute="textblock" String="^p&blockattrsregex;&formatregex;\." />
-                <RegExpr attribute="textblock" String="^pre&blockattrsregex;&formatregex;\." />
-                <RegExpr attribute="textblock" String="^bq&blockattrsregex;&formatregex;\." />
-                <RegExpr attribute="textblock" String="^bc&blockattrsregex;&formatregex;\." />
-                <RegExpr context="image" String="!"/>
+                <RegExpr attribute="textblock" String="^(p|pre|bq|bc)&blockattrsregex;&formatregex;\." />
+                <DetectChar context="image" char="!"/>
                 
                 <IncludeRules context="inc" />
 
diff --git a/data/syntax/varnishtest.xml b/data/syntax/varnishtest.xml
--- a/data/syntax/varnishtest.xml
+++ b/data/syntax/varnishtest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="Varnish Test Case language" version="3" kateversion="3.4" section="Configuration" extensions="*.vtc;" mimetype="" author="Xavier Guerrin (xavier@tuxfamily.org)" license="WTFPL" priority="3">
+<language name="Varnish Test Case language" version="4" kateversion="3.4" section="Configuration" extensions="*.vtc;" mimetype="" author="Xavier Guerrin (xavier@tuxfamily.org)" license="WTFPL" priority="3">
   <highlighting>
     <contexts>
       <!-- default context: define main keywords -->
@@ -119,7 +119,7 @@
         <IncludeRules context="comments" />
         <RegExpr    attribute="Float"                context="http_expectation_operator" String="[0-9\.]+(\s+|$)" />
         <RegExpr    attribute="Decimal"              context="http_expectation_operator" String="[0-9]+(\s+|$)" />
-        <RegExpr    attribute="Keyword"              context="http_expectation_operator" String="&lt;undef>" />
+        <StringDetect attribute="Keyword"              context="http_expectation_operator" String="&lt;undef&gt;" />
         <!-- Written from cmd_var_resolve() in bin/varnishtest/vtc_http.c. -->
         <RegExpr    attribute="HTTP Property"        context="http_expectation_operator" String="req.(request|url|proto)" />
         <RegExpr    attribute="HTTP Property"        context="http_expectation_operator" String="resp.(proto|status|msg|chunklen|bodylen|body)" />
@@ -142,7 +142,7 @@
         <IncludeRules context="comments" />
         <RegExpr    attribute="Float"                context="common_expectation_end" String="[0-9\.]+(\s+|$)" />
         <RegExpr    attribute="Decimal"              context="common_expectation_end" String="[0-9]+(\s+|$)" />
-        <RegExpr    attribute="Keyword"              context="common_expectation_end" String="&lt;undef>" />
+        <StringDetect attribute="Keyword"              context="common_expectation_end" String="&lt;undef&gt;" />
         <!-- Written from cmd_var_resolve() in bin/varnishtest/vtc_http.c. -->
         <RegExpr    attribute="HTTP Property"        context="common_expectation_end" String="req.(request|url|proto)" />
         <RegExpr    attribute="HTTP Property"        context="common_expectation_end" String="resp.(proto|status|msg|chunklen|bodylen|body)" />
@@ -243,27 +243,27 @@
       <context name="client_options" attribute="Normal Text" lineEndContext="#stay">
         <!-- Extracted from bin/varnishtest/vtc_client.c  -->
         <RegExpr attribute="Keyword" context="#stay" String="\-(?:run|start|wait)" />
-        <RegExpr attribute="Keyword" context="int-arg" String="\-repeat" />
-        <RegExpr attribute="Keyword" context="string-arg" String="\-connect" />
-        <RegExpr attribute="Keyword" context="http_expectation" String="-expect" />
+        <StringDetect attribute="Keyword" context="int-arg" String="-repeat" />
+        <StringDetect attribute="Keyword" context="string-arg" String="-connect" />
+        <StringDetect attribute="Keyword" context="http_expectation" String="-expect" />
         <IncludeRules context="common_options" />
       </context>
 
       <context name="server_options" attribute="Normal Text" lineEndContext="#stay" >
         <!-- Extracted from bin/varnishtest/vtc_server.c  -->
         <RegExpr attribute="Keyword" context="#stay" String="\-(?:start|wait)" />
-        <RegExpr attribute="Keyword" context="int-arg" String="\-repeat" />
-        <RegExpr attribute="Keyword" context="string-arg" String="\-listen " />
-        <RegExpr attribute="Keyword" context="http_expectation" String="-expect" />
+        <StringDetect attribute="Keyword" context="int-arg" String="-repeat" />
+        <StringDetect attribute="Keyword" context="string-arg" String="-listen " />
+        <StringDetect attribute="Keyword" context="http_expectation" String="-expect" />
         <IncludeRules context="common_options" />
       </context>
 
       <context name="varnish_options" attribute="Normal Text" lineEndContext="#stay" >
         <!-- Extracted from bin/varnishtest/vtc_varnish.c  -->
         <RegExpr attribute="Keyword" context="#stay" String="\-(?:start|stop|wait|wait-running|wait-stopped)" />
         <RegExpr attribute="Keyword" context="string-arg" String="\-(?:arg|cli|cliok|storage) " />
-        <RegExpr attribute="Keyword" context="clierr_options" String="\-clierr " />
-        <RegExpr attribute="Keyword" context="varnish_expectation" String="-expect" />
+        <StringDetect attribute="Keyword" context="clierr_options" String="-clierr " />
+        <StringDetect attribute="Keyword" context="varnish_expectation" String="-expect" />
         <IncludeRules context="common_options" />
       </context>
 
@@ -287,16 +287,16 @@
       <context name="txreq_options" attribute="String" lineEndContext="#pop">
         <IncludeRules context="tx_options" />
         <RegExpr attribute="TxReq Keyword" context="string-arg" String="\-(?:proto|req|url|hdr|body)" />
-        <RegExpr attribute="TxReq Keyword" context="int-arg" String="\-bodylen" />
+        <StringDetect attribute="TxReq Keyword" context="int-arg" String="-bodylen" />
       </context>
 
       <!-- Define syntax for the server-specific txresp keyword -->
       <context name="txresp_options" attribute="Normal Text" lineEndContext="#pop">
         <IncludeRules context="tx_options" />
-        <RegExpr attribute="TxResp Keyword" String="-nolen" />
+        <StringDetect attribute="TxResp Keyword" String="-nolen" />
         <RegExpr attribute="TxResp Keyword" context="int-arg" String="\-(?:bodylen|gzip(?:len|residual|level))" />
         <RegExpr attribute="TxResp Keyword" context="string-arg" String="\-(?:body|gzipbody|hdr|msg|proto)" />
-        <RegExpr attribute="TxResp Keyword" context="status-arg" String="\-status" />
+        <StringDetect attribute="TxResp Keyword" context="status-arg" String="-status" />
       </context>
 
       <!-- Define syntax for the client-specific rxresp keyword -->
@@ -426,7 +426,7 @@
         <DetectIdentifier attribute="Sema Identifier" context="sema_identified" />
       </context>
       <context name="sema_identified" attribute="Normal Text" lineEndContext="#pop#pop">
-        <RegExpr attribute="Keyword" String="sync" />
+        <StringDetect attribute="Keyword" String="sync" />
         <Int attribute="Decimal" context="#stay" />
         <IncludeRules context="comments" />
       </context>
diff --git a/data/syntax/varnishtest4.xml b/data/syntax/varnishtest4.xml
--- a/data/syntax/varnishtest4.xml
+++ b/data/syntax/varnishtest4.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="Varnish 4 Test Case language" version="3" kateversion="3.4" section="Configuration" extensions="*.vtc;" mimetype="" author="Xavier Guerrin (xavier@tuxfamily.org)" license="WTFPL" priority="4">
+<language name="Varnish 4 Test Case language" version="4" kateversion="3.4" section="Configuration" extensions="*.vtc;" mimetype="" author="Xavier Guerrin (xavier@tuxfamily.org)" license="WTFPL" priority="4">
   <highlighting>
     <list name="VSLGrouping">
       <!-- Extracted from lib/libvarnishapi/vsl_arg.c -->
@@ -195,13 +195,13 @@
         <IncludeRules context="comments" />
         <RegExpr    attribute="Float"                context="http_expectation_operator" String="[0-9\.]+(\s+|$)" />
         <RegExpr    attribute="Decimal"              context="http_expectation_operator" String="[0-9]+(\s+|$)" />
-        <RegExpr    attribute="Keyword"              context="http_expectation_operator" String="&lt;undef>" />
+        <StringDetect attribute="Keyword"            context="http_expectation_operator" String="&lt;undef&gt;" />
         <!-- Written from cmd_var_resolve() in bin/varnishtest/vtc_http.c. -->
-        <RegExpr    attribute="HTTP Property"        context="http_expectation_operator" String="req.(method|url|proto|bodylen)" />
-        <RegExpr    attribute="HTTP Property"        context="http_expectation_operator" String="resp.(proto|status|msg|chunklen|bodylen|body)" />
-        <RegExpr    attribute="HTTP X- Header"       context="http_expectation_operator" String="(req|resp)\.http\.X-[-_A-Za-z0-9]*" />
-        <RegExpr    attribute="HTTP Header"          context="http_expectation_operator" String="(req|resp)\.http\.[A-Za-z][-_A-Za-z0-9]*" />
-        <RegExpr    attribute="HTTP announce"        context="http_expectation_operator" String="HTTP/[0-9.]+" />
+        <RegExpr    attribute="HTTP Property"        context="http_expectation_operator" String="req\.(method|url|proto|bodylen)" />
+        <RegExpr    attribute="HTTP Property"        context="http_expectation_operator" String="resp\.(proto|status|msg|chunklen|bodylen|body)" />
+        <RegExpr    attribute="HTTP X- Header"       context="http_expectation_operator" String="(req|resp)\.http\.X\-[\-_A-Za-z0-9]*" />
+        <RegExpr    attribute="HTTP Header"          context="http_expectation_operator" String="(req|resp)\.http\.[A-Za-z][\-_A-Za-z0-9]*" />
+        <RegExpr    attribute="HTTP announce"        context="http_expectation_operator" String="HTTP/[0-9\.]+" />
         <RegExpr    attribute="HTTP method"          context="http_expectation_operator" String="\s+(GET|HEAD|POST|PUT|DELETE|TRACE|OPTIONS|CONNECT|PATCH)" />
         <RegExpr    attribute="HTTP WebDAV method"   context="http_expectation_operator" String="\s+(PROPFIND|PROPPATCH|MKCOL|COPY|MOVE|LOCK|UNLOCK|CONNECT|PATCH)" />
         <RegExpr    attribute="HTTP custom method"   context="http_expectation_operator" String="\s+(PURGE|PURGESTR)" />
@@ -224,13 +224,13 @@
         <IncludeRules context="comments" />
         <RegExpr    attribute="Float"                context="common_expectation_end" String="[0-9\.]+(\s+|$)" />
         <RegExpr    attribute="Decimal"              context="common_expectation_end" String="[0-9]+(\s+|$)" />
-        <RegExpr    attribute="Keyword"              context="common_expectation_end" String="&lt;undef>" />
+        <StringDetect attribute="Keyword"            context="common_expectation_end" String="&lt;undef&gt;" />
         <!-- Written from cmd_var_resolve() in bin/varnishtest/vtc_http.c. -->
-        <RegExpr    attribute="HTTP Property"        context="common_expectation_end" String="req.(method|url|proto|bodylen)" />
-        <RegExpr    attribute="HTTP Property"        context="common_expectation_end" String="resp.(proto|status|msg|chunklen|bodylen|body)" />
-        <RegExpr    attribute="HTTP X- Header"       context="common_expectation_end" String="(req|resp)\.http\.X-[-_A-Za-z0-9]*" />
-        <RegExpr    attribute="HTTP Header"          context="common_expectation_end" String="(req|resp)\.http\.[A-Za-z][-_A-Za-z0-9]*" />
-        <RegExpr    attribute="HTTP announce"        context="common_expectation_end" String="HTTP/[0-9.]+" />
+        <RegExpr    attribute="HTTP Property"        context="common_expectation_end" String="req\.(method|url|proto|bodylen)" />
+        <RegExpr    attribute="HTTP Property"        context="common_expectation_end" String="resp\.(proto|status|msg|chunklen|bodylen|body)" />
+        <RegExpr    attribute="HTTP X- Header"       context="common_expectation_end" String="(req|resp)\.http\.X\-[\-_A-Za-z0-9]*" />
+        <RegExpr    attribute="HTTP Header"          context="common_expectation_end" String="(req|resp)\.http\.[A-Za-z][\-_A-Za-z0-9]*" />
+        <RegExpr    attribute="HTTP announce"        context="common_expectation_end" String="HTTP/[0-9\.]+" />
         <RegExpr    attribute="HTTP method"          context="common_expectation_end" String="\s+(GET|HEAD|POST|PUT|DELETE|TRACE|OPTIONS|CONNECT|PATCH)" />
         <RegExpr    attribute="HTTP WebDAV method"   context="common_expectation_end" String="\s+(PROPFIND|PROPPATCH|MKCOL|COPY|MOVE|LOCK|UNLOCK|CONNECT|PATCH)" />
         <RegExpr    attribute="HTTP custom method"   context="common_expectation_end" String="\s+(PURGE|PURGESTR)" />
@@ -294,11 +294,11 @@
         <RegExpr attribute="VarnishStat metric"    context="varnish_expectation_operator" String="vsm_(?:cooling|free|overflow(ed)?|user)" />
         <RegExpr attribute="VarnishStat metric"    context="varnish_expectation_operator" String="(?:bans|losthdr|pools|threads|uptime|vmods)" />
         <RegExpr attribute="VarnishStat metric"    context="varnish_expectation_operator" String="LCK\.(?:sm[spaf]|hsl|hcb|hcl|vcl|stat|sessmem|wstat|herder|wq|objhdr|exp|lru|cli|ban|vbp|vbe|backend)\.(?:creat|destroy|locks)" />
-        <RegExpr attribute="VarnishStat metric"    context="varnish_expectation_operator" String="SMA\.[a-zA-Z0-9_-]+\.(?:c_(?:req|fail|bytes|freed)|g_(?:alloc|bytes|space))" />
-        <RegExpr attribute="VarnishStat metric"    context="varnish_expectation_operator" String="SMF\.[a-zA-Z0-9_-]+\.(?:c_(?:req|fail|bytes|freed)|g_(?:alloc|bytes|space|smf|smf_frag|smf_large))" />
+        <RegExpr attribute="VarnishStat metric"    context="varnish_expectation_operator" String="SMA\.[a-zA-Z0-9_\-]+\.(?:c_(?:req|fail|bytes|freed)|g_(?:alloc|bytes|space))" />
+        <RegExpr attribute="VarnishStat metric"    context="varnish_expectation_operator" String="SMF\.[a-zA-Z0-9_\-]+\.(?:c_(?:req|fail|bytes|freed)|g_(?:alloc|bytes|space|smf|smf_frag|smf_large))" />
         <RegExpr attribute="VarnishStat metric"    context="varnish_expectation_operator" String="VBE\..+\.(?:happy|vcls|be(?:req|resp)_(?:body|hdr)bytes|pipe_(?:in|hdrbytes|out))" />
         <!-- Found out in c00050.vtc -->
-        <RegExpr attribute="VarnishStat metric"    context="varnish_expectation_operator" String="MEMPOOL.vbc.(?:pool|surplus|timeout)" />
+        <RegExpr attribute="VarnishStat metric"    context="varnish_expectation_operator" String="MEMPOOL\.vbc\.(?:pool|surplus|timeout)" />
       </context>
       <context name="varnish_expectation_operator" attribute="Normal Text" lineEndContext="#pop#pop">
         <IncludeRules context="comments" />
@@ -332,27 +332,27 @@
       <context name="client_options" attribute="Normal Text" lineEndContext="#stay">
         <!-- Extracted from bin/varnishtest/vtc_client.c  -->
         <RegExpr attribute="Keyword" context="#stay" String="\-(?:run|start|wait)" />
-        <RegExpr attribute="Keyword" context="int-arg" String="\-repeat" />
-        <RegExpr attribute="Keyword" context="string-arg" String="\-connect" />
-        <RegExpr attribute="Keyword" context="http_expectation" String="-expect" />
+        <StringDetect attribute="Keyword" context="int-arg" String="-repeat" />
+        <StringDetect attribute="Keyword" context="string-arg" String="-connect" />
+        <StringDetect attribute="Keyword" context="http_expectation" String="-expect" />
         <IncludeRules context="common_options" />
       </context>
 
       <context name="server_options" attribute="Normal Text" lineEndContext="#stay" >
         <!-- Extracted from bin/varnishtest/vtc_server.c  -->
         <RegExpr attribute="Keyword" context="#stay" String="\-(?:break|start|wait)" />
-        <RegExpr attribute="Keyword" context="int-arg" String="\-repeat" />
-        <RegExpr attribute="Keyword" context="string-arg" String="\-listen " />
-        <RegExpr attribute="Keyword" context="http_expectation" String="-expect" />
+        <StringDetect attribute="Keyword" context="int-arg" String="-repeat" />
+        <StringDetect attribute="Keyword" context="string-arg" String="-listen " />
+        <StringDetect attribute="Keyword" context="http_expectation" String="-expect" />
         <IncludeRules context="common_options" />
       </context>
 
       <context name="varnish_options" attribute="Normal Text" lineEndContext="#stay" >
         <!-- Extracted from bin/varnishtest/vtc_varnish.c  -->
         <RegExpr attribute="Keyword" context="#stay" String="\-(?:start|stop|wait|wait-running|wait-stopped)" />
         <RegExpr attribute="Keyword" context="string-arg" String="\-(?:arg|cli|cliok|storage) " />
-        <RegExpr attribute="Keyword" context="clierr_options" String="\-clierr " />
-        <RegExpr attribute="Keyword" context="varnish_expectation" String="-expect" />
+        <StringDetect attribute="Keyword" context="clierr_options" String="-clierr " />
+        <StringDetect attribute="Keyword" context="varnish_expectation" String="-expect" />
         <IncludeRules context="common_options" />
       </context>
 
@@ -374,7 +374,7 @@
 
       <context name="tx_options" attribute="Normal Text" lineEndContext="#pop">
         <IncludeRules context="comments" />
-        <RegExpr attribute="Tx Keyword" String="-nolen" />
+        <StringDetect attribute="Tx Keyword" String="-nolen" />
         <RegExpr attribute="Tx Keyword" context="string-arg" String="\-(?:body|gzipbody|hdr|proto) " />
         <RegExpr attribute="Tx Keyword" context="int-arg" String="\-(?:bodylen|gzip(?:len|residual|level))" />
         <LineContinue attribute="Normal Text" context="#stay" />
@@ -389,8 +389,8 @@
       <!-- Define syntax for the server-specific txresp keyword -->
       <context name="txresp_options" attribute="Normal Text" lineEndContext="#pop">
         <IncludeRules context="tx_options" />
-        <RegExpr attribute="TxResp Keyword" context="string-arg" String="\-msg" />
-        <RegExpr attribute="TxResp Keyword" context="status-arg" String="\-status" />
+        <StringDetect attribute="TxResp Keyword" context="string-arg" String="-msg" />
+        <StringDetect attribute="TxResp Keyword" context="status-arg" String="-status" />
       </context>
 
       <!-- Define syntax for the client-specific rxresp keyword -->
@@ -580,7 +580,7 @@
         <DetectIdentifier attribute="Sema Identifier" context="sema_identified" />
       </context>
       <context name="sema_identified" attribute="Normal Text" lineEndContext="#pop#pop">
-        <RegExpr attribute="Keyword" String="sync" />
+        <StringDetect attribute="Keyword" String="sync" />
         <Int attribute="Decimal" context="#stay" />
         <IncludeRules context="comments" />
       </context>
diff --git a/data/syntax/vhdl.xml b/data/syntax/vhdl.xml
--- a/data/syntax/vhdl.xml
+++ b/data/syntax/vhdl.xml
@@ -8,7 +8,7 @@
   <!ENTITY label     "((&varname;)\s*:\s*)?">
 
 ]>
-<language name="VHDL" version="5" kateversion="3.0" section="Hardware" extensions="*.vhdl;*.vhd" mimetype="text/x-vhdl" author="Rocky Scaletta (rocky@purdue.edu), Stefan Endrullis (stefan@endrullis.de), Florent Ouchet (outchy@users.sourceforge.net), Chris Higgs (chiggs.99@gmail.com), Jan Michel (jan@mueschelsoft.de), Luigi Calligaris (luigi.calligaris@stfc.ac.uk)">
+<language name="VHDL" version="6" kateversion="3.0" section="Hardware" extensions="*.vhdl;*.vhd" mimetype="text/x-vhdl" author="Rocky Scaletta (rocky@purdue.edu), Stefan Endrullis (stefan@endrullis.de), Florent Ouchet (outchy@users.sourceforge.net), Chris Higgs (chiggs.99@gmail.com), Jan Michel (jan@mueschelsoft.de), Luigi Calligaris (luigi.calligaris@stfc.ac.uk)">
   <highlighting>
     <list name="keywordsToplevel">
       <item>file</item>
@@ -508,10 +508,8 @@
 
       <context name="caseWhen2" attribute="Normal Text" lineEndContext="#stay" dynamic="true">
         <IncludeRules context="preDetection"/>
-        <RegExpr attribute="Control" context="#pop#pop" lookAhead="true" insensitive="true" endRegion="CaseWhenRegion1"
-                 String="^\s*when&eos;"/>
-        <RegExpr attribute="Control" context="#pop#pop" lookAhead="true" insensitive="true" endRegion="CaseWhenRegion1"
-                 String="^\s*end\s+case&eos;"/>
+        <RegExpr attribute="Control" context="#pop#pop" lookAhead="true" insensitive="true" endRegion="CaseWhenRegion1" firstNonSpace="true"
+                 String="(when|end\s+case)&eos;"/>
         <IncludeRules context="proc_rules"/>
       </context>
       <!-- 'when' and 'end case' are checked at the beginning of the line for better code folding -->
@@ -536,8 +534,8 @@
                  String="&bos;end(\s+(entity|component))?(\s+%1)?\s*;"/>
         <RegExpr attribute="Error" context="#pop#pop" dynamic="true" insensitive="true" endRegion="EntityRegion1"
                  String="&bos;end(\s+(entity|component))?(\s+&varname;)?\s*;"/>
-        <RegExpr attribute="Control" context="#stay" insensitive="true" String="generic"/>
-        <RegExpr attribute="Control" context="#stay" insensitive="true" String="port"/>
+        <StringDetect attribute="Control" context="#stay" insensitive="true" String="generic"/>
+        <StringDetect attribute="Control" context="#stay" insensitive="true" String="port"/>
         <IncludeRules context="generalDetection"/>
       </context>
 
diff --git a/data/syntax/wml.xml b/data/syntax/wml.xml
--- a/data/syntax/wml.xml
+++ b/data/syntax/wml.xml
@@ -54,7 +54,7 @@
     * Made the new #ifndef directive be recognized (implemented on Wesnoth 1.3.11 and later)
 -->
 
-<language name="Wesnoth Markup Language" section="Markup" extensions="*.cfg;*.pbl;*.CFG;*.PBL" version="2"
+<language name="Wesnoth Markup Language" section="Markup" extensions="*.cfg;*.pbl;*.CFG;*.PBL" version="3"
           kateversion="2.3" casesensitive="true" author="Zachary Palmer (zep01@bahj.com), modif. by Ignacio Riquelme Morelle (shadowm2006@gmail.com) and Jonathan Schmidt-Dominé (devel@the-user.org)" license="GPL">
     <highlighting>
         <list name="alerts_wml_utils">
@@ -100,7 +100,7 @@
 
                 <!--<DetectChar char="[" attribute="WML Node" context="section" firstNonSpace="true" />-->
                 <RegExpr String="\[(?!/)" attribute="WML Node" context="section" beginRegion="wml_node" />
-                <RegExpr String="\[/" attribute="WML Node" context="section" endRegion="wml_node" />
+                <Detect2Chars char="[" char1="/" attribute="WML Node" context="section" endRegion="wml_node" />
 
                 <RegExpr String="(\w|,| )+=" attribute="WML Attribute" context="value"
                                     lookAhead="true" />
@@ -116,12 +116,12 @@
             </context>
 
             <context attribute="String" name="luastring" lineEndContext="#stay">
-                <RegExpr String="&gt;&gt;" attribute="String" context="#pop" endRegion="wml_lua" />
+                <Detect2Chars char="&gt;" char1="&gt;" attribute="String" context="#pop" endRegion="wml_lua" />
                 <IncludeRules context="##Lua" includeAttrib="true"/>
             </context>
             
             <context attribute="Macro String" name="luamacrostring" lineEndContext="#stay">
-                <RegExpr String="&gt;&gt;" attribute="Macro String" context="#pop" endRegion="wml_lua" />
+                <Detect2Chars char="&gt;" char1="&gt;" attribute="Macro String" context="#pop" endRegion="wml_lua" />
                 <IncludeRules context="##Lua" includeAttrib="true"/>
             </context>
             
diff --git a/data/syntax/xharbour.xml b/data/syntax/xharbour.xml
--- a/data/syntax/xharbour.xml
+++ b/data/syntax/xharbour.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="xHarbour" version="3" kateversion="2.4" section="Sources" extensions="*.prg;*.PRG;*.ch" mimetype="text/x-xharbour-src" priority="5" author="Giancarlo Niccolai (giancarlo@niccolai.ws)" license="GPL">
+<language name="xHarbour" version="4" kateversion="2.4" section="Sources" extensions="*.prg;*.PRG;*.ch" mimetype="text/x-xharbour-src" priority="5" author="Giancarlo Niccolai (giancarlo@niccolai.ws)" license="GPL">
 <highlighting>
 
    <list name="keywords">
@@ -488,7 +488,7 @@
          <keyword attribute="Function" context="#stay" String="functions" />
          <keyword attribute="Preprocessor" context="#stay" String="pragma" />
          <Detect2Chars attribute="Operator" context="#stay" char="-" char1=">" />
-         <RegExpr attribute="Number" context="#stay" String="\d+" />
+         <Int attribute="Number" context="#stay" />
       </context>
 
       <context attribute="Comment" lineEndContext="#pop" name="comment"/>
diff --git a/data/syntax/xmldebug.xml b/data/syntax/xmldebug.xml
--- a/data/syntax/xmldebug.xml
+++ b/data/syntax/xmldebug.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language version="7" kateversion="2.4" name="XML (Debug)" section="Markup" extensions="" mimetype="">
+<language version="8" kateversion="5.0" name="XML (Debug)" section="Markup" extensions="" mimetype="">
   <highlighting>
     <list name="AttType">
         <item>CDATA</item>
@@ -20,58 +20,58 @@
 
 	<context name="1:XMLDecl Version" attribute="Error" lineEndContext="#stay">
 	  <RegExpr attribute="Attribute" context="2:XMLDecl Version Eq" String="\s*version\s*"/>
-	  <RegExpr attribute="Doctype Declaration" String="\s+" context="#stay"/>
+	  <DetectSpaces attribute="Doctype Declaration" context="#stay"/>
 	</context>
 
 	<context name="2:XMLDecl Version Eq" attribute="Error" lineEndContext="5:XMLDecl Encoding Eq">
 	  <RegExpr attribute="Attribute" context="3:XMLDecl Version" String="\s*=\s*"/>
-	  <RegExpr attribute="Attribute" context="#stay" String="\s+"/>
+	  <DetectSpaces attribute="Attribute" context="#stay"/>
 	</context>
 
 	<context name="3:XMLDecl Version" attribute="Error" lineEndContext="#stay">
 	  <RegExpr attribute="Value" context="4:XMLDecl Encoding" String="\s*(&quot;[A-Za-z0-9:._-]*&quot;|'[A-Za-z0-9:._-]*')(?!e)\s*"/>
-	  <RegExpr attribute="Attribute" context="#stay" String="\s+"/>
+	  <DetectSpaces attribute="Attribute" context="#stay"/>
 	</context>
 
 	<context name="4:XMLDecl Encoding" attribute="Error" lineEndContext="#stay">
 	  <RegExpr attribute="Attribute" context="5:XMLDecl Encoding Eq" String="\s*encoding\s*"/>
-	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
-	  <RegExpr attribute="Doctype Declaration" context="11:Misc after XMLDecl" String="\?>"/>
+	  <DetectSpaces attribute="Doctype Declaration" context="#stay"/>
+	  <Detect2Chars attribute="Doctype Declaration" context="11:Misc after XMLDecl" char="?" char1="&gt;"/>
 	</context>
 
 	<context name="5:XMLDecl Encoding Eq" attribute="Error" lineEndContext="#stay">
 	  <RegExpr attribute="Attribute" context="6:XMLDecl Encoding" String="\s*=\s*"/>
-	  <RegExpr attribute="Attribute" context="#stay" String="\s+"/>
+	  <DetectSpaces attribute="Attribute" context="#stay"/>
 	</context>
 
 	<context name="6:XMLDecl Encoding" attribute="Error" lineEndContext="#stay">
 	  <RegExpr attribute="Value" context="7:XMLDecl Standalone" String="\s*(&quot;[A-Za-z][A-Za-z0-9._-]*&quot;|'[A-Za-z][A-Za-z0-9._-]*')(?!s)\s*"/>
-	  <RegExpr attribute="Attribute" context="#stay" String="\s+"/>
+	  <DetectSpaces attribute="Attribute" context="#stay"/>
 	</context>
 
 	<context name="7:XMLDecl Standalone" attribute="Error" lineEndContext="#stay">
 	  <RegExpr attribute="Attribute" context="8:XMLDecl Standalone Eq" String="\s*standalone\s*"/>
-	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
-	  <RegExpr attribute="Doctype Declaration" context="11:Misc after XMLDecl" String="\?>"/>
+	  <DetectSpaces attribute="Doctype Declaration" context="#stay"/>
+	  <Detect2Chars attribute="Doctype Declaration" context="11:Misc after XMLDecl" char="?" char1="&gt;"/>
 	</context>
 
 	<context name="8:XMLDecl Standalone Eq" attribute="Error" lineEndContext="#stay">
 	  <RegExpr attribute="Attribute" context="9:XMLDecl Standalone" String="\s*=\s*"/>
-	  <RegExpr attribute="Attribute" context="#stay" String="\s+"/>
+	  <DetectSpaces attribute="Attribute" context="#stay"/>
 	</context>
 
 	<context name="9:XMLDecl Standalone" attribute="Error" lineEndContext="#stay">
 	  <RegExpr attribute="Value" context="10:XMLDecl Standalone" String="\s*&quot;(yes|no)&quot;|'(yes|no)'\s*"/>
-	  <RegExpr attribute="Attribute" context="#stay" String="\s+"/>
+	  <DetectSpaces attribute="Attribute" context="#stay"/>
 	</context>
 
 	<context name="10:XMLDecl Standalone" attribute="Error" lineEndContext="#stay">
-	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
-	  <RegExpr attribute="Doctype Declaration" context="11:Misc after XMLDecl" String="\?>"/>
+	  <DetectSpaces attribute="Doctype Declaration" context="#stay"/>
+	  <Detect2Chars attribute="Doctype Declaration" context="11:Misc after XMLDecl" char="?" char1="&gt;"/>
 	</context>
 
 	<context name="11:Misc after XMLDecl" attribute="Error" lineEndContext="#stay">
-	  <RegExpr attribute="Normal Text" context="#stay" String="\s+"/>
+	  <DetectSpaces attribute="Normal Text" context="#stay"/>
 	  <RegExpr attribute="Comment" context="12:Comment after XMLDecl" String="\s*&lt;!--\s*"/>
 	  <RegExpr attribute="Processing Instruction" context="13:PI after XMLDecl" String="\s*&lt;\?xml-stylesheet(\s+|$)"/>
 	  <RegExpr attribute="Error" context="13:PI after XMLDecl" String="\s*&lt;\??[xX][mM][lL]"/>
@@ -85,20 +85,20 @@
 	 <RegExpr attribute="Error" context="85:ETag" String="&lt;/(?![&#x0660;-&#x0669;&#x06F0;-&#x06F9;&#x0966;-&#x096F;&#x09E6;-&#x09EF;&#x0A66;-&#x0A6F;&#x0AE6;-&#x0AEF;&#x0B66;-&#x0B6F;&#x0BE7;-&#x0BEF;&#x0C66;-&#x0C6F;&#x0CE6;-&#x0CEF;&#x0D66;-&#x0D6F;&#x0E50;-&#x0E59;&#x0ED0;-&#x0ED9;&#x0F20;-&#x0F29;]|\d)(\w|[:_])(\w|[:_.-])*"/>
 	 <RegExpr attribute="Entity" context="79:Outside" String="&amp;(?![&#x0660;-&#x0669;&#x06F0;-&#x06F9;&#x0966;-&#x096F;&#x09E6;-&#x09EF;&#x0A66;-&#x0A6F;&#x0AE6;-&#x0AEF;&#x0B66;-&#x0B6F;&#x0BE7;-&#x0BEF;&#x0C66;-&#x0C6F;&#x0CE6;-&#x0CEF;&#x0D66;-&#x0D6F;&#x0E50;-&#x0E59;&#x0ED0;-&#x0ED9;&#x0F20;-&#x0F29;]|\d)(\w|[_:])(\w|[_:.-])*;"/>
 	 <RegExpr attribute="Entity" context="79:Outside" String="&amp;#(x[0-9a-fA-F]+|[0-9]+);"/>
-	 <RegExpr attribute="Entity" context="86:CDSect" String="&lt;!\[CDATA\["/>
-	 <RegExpr attribute="Comment" context="87:Comment inside IS" String="&lt;!--"/>
+	 <StringDetect attribute="Entity" context="86:CDSect" String="&lt;![CDATA["/>
+	 <StringDetect attribute="Comment" context="87:Comment inside IS" String="&lt;!--"/>
 	 <RegExpr attribute="Normal Tag" context="88:PI inside IS" String="&lt;\?xml-stylesheet(\s|$)"/>
 	 <RegExpr attribute="Error" context="88:PI inside IS" String="&lt;\?[xX][mM][lL](\w|[_.-])*(:(\w|[_.-])+)?"/>
          <RegExpr attribute="Normal Tag" context="88:PI inside IS" String="&lt;\?(?![&#x0660;-&#x0669;&#x06F0;-&#x06F9;&#x0966;-&#x096F;&#x09E6;-&#x09EF;&#x0A66;-&#x0A6F;&#x0AE6;-&#x0AEF;&#x0B66;-&#x0B6F;&#x0BE7;-&#x0BEF;&#x0C66;-&#x0C6F;&#x0CE6;-&#x0CEF;&#x0D66;-&#x0D6F;&#x0E50;-&#x0E59;&#x0ED0;-&#x0ED9;&#x0F20;-&#x0F29;]|\d)(\w|_)(\w|[_.-])*(:(\w|[_.-])+)?"/>
 	 <RegExpr attribute="Error" context="88:PI inside IS" String="&lt;\?(?![&#x0660;-&#x0669;&#x06F0;-&#x06F9;&#x0966;-&#x096F;&#x09E6;-&#x09EF;&#x0A66;-&#x0A6F;&#x0AE6;-&#x0AEF;&#x0B66;-&#x0B6F;&#x0BE7;-&#x0BEF;&#x0C66;-&#x0C6F;&#x0CE6;-&#x0CEF;&#x0D66;-&#x0D6F;&#x0E50;-&#x0E59;&#x0ED0;-&#x0ED9;&#x0F20;-&#x0F29;]|\d)(\w|[:_])(\w|[:_.-])*"/>
 	 <DetectChar attribute="Error" context="79:Outside" char="&lt;"/>
 	 <DetectChar attribute="Error" context="79:Outside" char="&amp;"/>
-	 <RegExpr attribute="Error" context="79:Outside" String="\]\]>"/>
+	 <StringDetect attribute="Error" context="79:Outside" String="]]>"/>
 	</context>
 
 	<context name="12:Comment after XMLDecl" attribute="Comment" lineEndContext="#stay">
-	  <RegExpr attribute="Error" context="#pop" String="--->"/>
-	  <RegExpr attribute="Comment" context="#pop" String="-->"/>
+	  <StringDetect attribute="Error" context="#pop" String="--->"/>
+	  <StringDetect attribute="Comment" context="#pop" String="-->"/>
 	  <Detect2Chars attribute="Error" context="#stay" char="-" char1="-"/>
 	</context>
 
@@ -108,22 +108,22 @@
 
 	<context name="14:Doctype Decl Name" attribute="Error" lineEndContext="#stay">
 	  <RegExpr attribute="Doctype Declaration" context="15:Doctype Decl ExternalID" String="(?![&#x0660;-&#x0669;&#x06F0;-&#x06F9;&#x0966;-&#x096F;&#x09E6;-&#x09EF;&#x0A66;-&#x0A6F;&#x0AE6;-&#x0AEF;&#x0B66;-&#x0B6F;&#x0BE7;-&#x0BEF;&#x0C66;-&#x0C6F;&#x0CE6;-&#x0CEF;&#x0D66;-&#x0D6F;&#x0E50;-&#x0E59;&#x0ED0;-&#x0ED9;&#x0F20;-&#x0F29;]|\d)(\w|[_:])(\w|[_:.-])*(\s+|$)"/>
-	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
+	  <DetectSpaces attribute="Doctype Declaration" context="#stay"/>
 	</context>
 
 	<context name="15:Doctype Decl ExternalID" attribute="Error" lineEndContext="#stay">
 	  <RegExpr attribute="Doctype Declaration" context="16:Doctype Decl PublicID" String="PUBLIC(\s+|$)"/>
 	  <RegExpr attribute="Doctype Declaration" context="19:Doctype Decl SystemID" String="SYSTEM(\s+|$)"/>
 	  <DetectChar attribute="Doctype Declaration" context="23:Doctype Decl IS" char="["/>
     <!-- rodda: this was originally context="?", so my best guess... most likely wrong -->
     <DetectChar attribute="Doctype Declaration" context="23:Doctype Decl IS" char=">"/>
-	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
+	  <DetectSpaces attribute="Doctype Declaration" context="#stay"/>
 	</context>
 
 	<context name="16:Doctype Decl PublicID" attribute="Error" lineEndContext="#stay">
 	  <DetectChar attribute="Value" context="17:Doctype Decl PublicID qq" char="&quot;"/>
 	  <DetectChar attribute="Value" context="18:Doctype Decl PublicID q" char="'"/>
-	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
+	  <DetectSpaces attribute="Doctype Declaration" context="#stay"/>
 	</context>
 
 	<context name="17:Doctype Decl PublicID qq" attribute="Error" lineEndContext="#stay">
@@ -139,7 +139,7 @@
 	<context name="19:Doctype Decl SystemID" attribute="Error" lineEndContext="#stay">
 	  <DetectChar attribute="Value" context="20:Doctype Decl SystemID qq" char="&quot;"/>
 	  <DetectChar attribute="Value" context="21:Doctype Decl SystemID q" char="'"/>
-	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
+	  <DetectSpaces attribute="Doctype Declaration" context="#stay"/>
 	</context>
 
 	<context name="20:Doctype Decl SystemID qq" attribute="Value" lineEndContext="#stay">
@@ -153,12 +153,12 @@
 	<context name="22:Doctype Decl IS or end" attribute="Error" lineEndContext="#stay">
 	  <DetectChar attribute="Doctype Declaration" context="23:Doctype Decl IS" char="["/>
 	  <DetectChar attribute="Doctype Declaration" context="79:Outside" char=">"/>
-	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
+	  <DetectSpaces attribute="Doctype Declaration" context="#stay"/>
 	</context>
 
 	<context name="23:Doctype Decl IS" attribute="Error" lineEndContext="#stay">
 	  <RegExpr attribute="Entity" context="#stay" String="%(?![&#x0660;-&#x0669;&#x06F0;-&#x06F9;&#x0966;-&#x096F;&#x09E6;-&#x09EF;&#x0A66;-&#x0A6F;&#x0AE6;-&#x0AEF;&#x0B66;-&#x0B6F;&#x0BE7;-&#x0BEF;&#x0C66;-&#x0C6F;&#x0CE6;-&#x0CEF;&#x0D66;-&#x0D6F;&#x0E50;-&#x0E59;&#x0ED0;-&#x0ED9;&#x0F20;-&#x0F29;]|\d)(\w|[_:])(\w|[_:.-])*;"/>
-	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
+	  <DetectSpaces attribute="Doctype Declaration" context="#stay"/>
 	  <RegExpr attribute="Doctype Declaration" context="24:elementdecl" String="&lt;!ELEMENT(\s+|$)"/>
 	  <RegExpr attribute="Doctype Declaration" context="38:AttlistDecl" String="&lt;!ATTLIST(\s+|$)"/>
 	  <RegExpr attribute="Doctype Declaration" context="50:EntityDecl" String="&lt;!ENTITY(\s+|$)"/>
@@ -172,147 +172,147 @@
 
 	<context name="24:elementdecl" attribute="Error" lineEndContext="#stay">
 	  <RegExpr attribute="Normal Tag" context="25:contentspec" String="(?![&#x0660;-&#x0669;&#x06F0;-&#x06F9;&#x0966;-&#x096F;&#x09E6;-&#x09EF;&#x0A66;-&#x0A6F;&#x0AE6;-&#x0AEF;&#x0B66;-&#x0B6F;&#x0BE7;-&#x0BEF;&#x0C66;-&#x0C6F;&#x0CE6;-&#x0CEF;&#x0D66;-&#x0D6F;&#x0E50;-&#x0E59;&#x0ED0;-&#x0ED9;&#x0F20;-&#x0F29;]|\d)(\w|[_:])(\w|[_:.-])*"/>
-	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
+	  <DetectSpaces attribute="Doctype Declaration" context="#stay"/>
 	</context>
 
 	<context name="25:contentspec" attribute="Error" lineEndContext="#stay">
 	  <RegExpr attribute="Attribute" context="37:element end" String="(EMPTY|ANY)"/>
 	  <DetectChar attribute="Attribute" context="26:MixedOrChildren" char="("/>
-	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
+	  <DetectSpaces attribute="Doctype Declaration" context="#stay"/>
 	</context>
 
 	<context name="26:MixedOrChildren" attribute="Error" lineEndContext="#stay">
-	  <RegExpr attribute="Attribute" context="27:MixedShort" String="#PCDATA"/>
-	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
+	  <StringDetect attribute="Attribute" context="27:MixedShort" String="#PCDATA"/>
+	  <DetectSpaces attribute="Doctype Declaration" context="#stay"/>
 	  <DetectChar attribute="Doctype Declaration" context="30:children unknown" char="("/>
 	  <RegExpr attribute="Value" context="30:children unknown" String="(?![&#x0660;-&#x0669;&#x06F0;-&#x06F9;&#x0966;-&#x096F;&#x09E6;-&#x09EF;&#x0A66;-&#x0A6F;&#x0AE6;-&#x0AEF;&#x0B66;-&#x0B6F;&#x0BE7;-&#x0BEF;&#x0C66;-&#x0C6F;&#x0CE6;-&#x0CEF;&#x0D66;-&#x0D6F;&#x0E50;-&#x0E59;&#x0ED0;-&#x0ED9;&#x0F20;-&#x0F29;]|\d)(\w|[_:])(\w|[_:.-])*[\?\*\+]?"/>
 	</context>
 
 	<context name="27:MixedShort" attribute="Error" lineEndContext="#stay">
 	  <DetectChar attribute="Doctype Declaration" context="28:MixedLong" char="|"/>
-	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
+	  <DetectSpaces attribute="Doctype Declaration" context="#stay"/>
 	  <DetectChar attribute="Doctype Declaration" context="37:element end" char=")"/>
 	</context>
 
 	<context name="28:MixedLong" attribute="Error" lineEndContext="#stay">
 	  <RegExpr attribute="Value" context="29:MixedLong endOrContinue" String="(?![&#x0660;-&#x0669;&#x06F0;-&#x06F9;&#x0966;-&#x096F;&#x09E6;-&#x09EF;&#x0A66;-&#x0A6F;&#x0AE6;-&#x0AEF;&#x0B66;-&#x0B6F;&#x0BE7;-&#x0BEF;&#x0C66;-&#x0C6F;&#x0CE6;-&#x0CEF;&#x0D66;-&#x0D6F;&#x0E50;-&#x0E59;&#x0ED0;-&#x0ED9;&#x0F20;-&#x0F29;]|\d)(\w|[_:])(\w|[_:.-])*"/>
-	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
+	  <DetectSpaces attribute="Doctype Declaration" context="#stay"/>
 	</context>
 
 	<context name="29:MixedLong endOrContinue" attribute="Error" lineEndContext="#stay">
 	  <DetectChar attribute="Doctype Declaration" context="#pop" char="|"/>
-	  <RegExpr attribute="Doctype Declaration" context="#pop#pop" String="\s+"/>
+	  <DetectSpaces attribute="Doctype Declaration" context="#pop#pop"/>
 	  <Detect2Chars attribute="Doctype Declaration" context="37:element end" char=")" char1="*"/>
 	</context>
 
 	<context name="30:children unknown" attribute="Error" lineEndContext="#stay">
 	  <DetectChar attribute="Doctype Declaration" context="33:children choice" char="|"/>
 	  <DetectChar attribute="Doctype Declaration" context="35:children seq" char=","/>
-	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
+	  <DetectSpaces attribute="Doctype Declaration" context="#stay"/>
 	  <RegExpr attribute="Doctype Declaration" context="31:children unknownOrEnd" String="\)[\?\*\+]?"/>
 	</context>
 
 	<context name="31:children unknownOrEnd" attribute="Error" lineEndContext="#stay">
 	  <DetectChar attribute="Doctype Declaration" context="33:children choice" char="|"/>
 	  <DetectChar attribute="Doctype Declaration" context="35:children seq" char=","/>
-	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
+	  <DetectSpaces attribute="Doctype Declaration" context="#stay"/>
 	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\)[\?\*\+]?"/>
 	  <DetectChar attribute="Doctype Declaration" context="23:Doctype Decl IS" char=">"/>
 	</context>
 
 	<context name="32:children unknownName" attribute="Error" lineEndContext="#stay">
 	  <RegExpr attribute="Value" context="30:children unknown" String="(?![&#x0660;-&#x0669;&#x06F0;-&#x06F9;&#x0966;-&#x096F;&#x09E6;-&#x09EF;&#x0A66;-&#x0A6F;&#x0AE6;-&#x0AEF;&#x0B66;-&#x0B6F;&#x0BE7;-&#x0BEF;&#x0C66;-&#x0C6F;&#x0CE6;-&#x0CEF;&#x0D66;-&#x0D6F;&#x0E50;-&#x0E59;&#x0ED0;-&#x0ED9;&#x0F20;-&#x0F29;]|\d)(\w|[_:])(\w|[_:.-])*[\?\*\+]?"/>
 	  <DetectChar attribute="Doctype Declaration" context="#stay" char="("/>
-	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
+	  <DetectSpaces attribute="Doctype Declaration" context="#stay"/>
 	</context>
 
 	<context name="33:children choice" attribute="Error" lineEndContext="#stay">
 	  <RegExpr attribute="Value" context="34:children choiceOrEnd" String="(?![&#x0660;-&#x0669;&#x06F0;-&#x06F9;&#x0966;-&#x096F;&#x09E6;-&#x09EF;&#x0A66;-&#x0A6F;&#x0AE6;-&#x0AEF;&#x0B66;-&#x0B6F;&#x0BE7;-&#x0BEF;&#x0C66;-&#x0C6F;&#x0CE6;-&#x0CEF;&#x0D66;-&#x0D6F;&#x0E50;-&#x0E59;&#x0ED0;-&#x0ED9;&#x0F20;-&#x0F29;]|\d)(\w|[_:])(\w|[_:.-])*[\?\*\+]?"/>
 	  <DetectChar attribute="Doctype Declaration" context="32:children unknownName" char="("/>
-	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
+	  <DetectSpaces attribute="Doctype Declaration" context="#stay"/>
 	</context>
 
 	<context name="34:children choiceOrEnd" attribute="Error" lineEndContext="#stay">
 	  <DetectChar attribute="Doctype Declaration" context="#pop" char="|"/>
-	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
+	  <DetectSpaces attribute="Doctype Declaration" context="#stay"/>
 	  <RegExpr attribute="Doctype Declaration" context="31:children unknownOrEnd" String="\)[\?\*\+]?"/>
 	</context>
 
 	<context name="35:children seq" attribute="Error" lineEndContext="#stay">
 	  <RegExpr attribute="Value" context="36:children seqOrEnd" String="(?![&#x0660;-&#x0669;&#x06F0;-&#x06F9;&#x0966;-&#x096F;&#x09E6;-&#x09EF;&#x0A66;-&#x0A6F;&#x0AE6;-&#x0AEF;&#x0B66;-&#x0B6F;&#x0BE7;-&#x0BEF;&#x0C66;-&#x0C6F;&#x0CE6;-&#x0CEF;&#x0D66;-&#x0D6F;&#x0E50;-&#x0E59;&#x0ED0;-&#x0ED9;&#x0F20;-&#x0F29;]|\d)(\w|[_:])(\w|[_:.-])*[\?\*\+]?"/>
 	  <DetectChar attribute="Doctype Declaration" context="32:children unknownName" char="("/>
-	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
+	  <DetectSpaces attribute="Doctype Declaration" context="#stay"/>
 	</context>
 
 	<context name="36:children seqOrEnd" attribute="Error" lineEndContext="#stay">
 	  <DetectChar attribute="Doctype Declaration" context="#pop" char=","/>
-	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
+	  <DetectSpaces attribute="Doctype Declaration" context="#stay"/>
 	  <RegExpr attribute="Doctype Declaration" context="31:children unknownOrEnd" String="\)[\?\*\+]?"/>
 	</context>
 
 	<context name="37:element end" attribute="Error" lineEndContext="#stay">
 	  <DetectChar attribute="Doctype Declaration" context="23:Doctype Decl IS" char=">"/>
-	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
+	  <DetectSpaces attribute="Doctype Declaration" context="#stay"/>
 	</context>
 
 	<context name="38:AttlistDecl" attribute="Error" lineEndContext="#stay">
 	  <RegExpr attribute="Normal Tag" context="39:AttDef" String="(?![&#x0660;-&#x0669;&#x06F0;-&#x06F9;&#x0966;-&#x096F;&#x09E6;-&#x09EF;&#x0A66;-&#x0A6F;&#x0AE6;-&#x0AEF;&#x0B66;-&#x0B6F;&#x0BE7;-&#x0BEF;&#x0C66;-&#x0C6F;&#x0CE6;-&#x0CEF;&#x0D66;-&#x0D6F;&#x0E50;-&#x0E59;&#x0ED0;-&#x0ED9;&#x0F20;-&#x0F29;]|\d)(\w|[_:])(\w|[_:.-])*(\s+|$)"/>
 	  <RegExpr attribute="Normal Tag" context="23:Doctype Decl IS" String="(?![&#x0660;-&#x0669;&#x06F0;-&#x06F9;&#x0966;-&#x096F;&#x09E6;-&#x09EF;&#x0A66;-&#x0A6F;&#x0AE6;-&#x0AEF;&#x0B66;-&#x0B6F;&#x0BE7;-&#x0BEF;&#x0C66;-&#x0C6F;&#x0CE6;-&#x0CEF;&#x0D66;-&#x0D6F;&#x0E50;-&#x0E59;&#x0ED0;-&#x0ED9;&#x0F20;-&#x0F29;]|\d)(\w|[_:])(\w|[_:.-])*>"/>
-	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
+	  <DetectSpaces attribute="Doctype Declaration" context="#stay"/>
 	</context>
 
 	<context name="39:AttDef" attribute="Error" lineEndContext="#stay">
 	  <RegExpr attribute="Attribute" context="40:AttType" String="(?![&#x0660;-&#x0669;&#x06F0;-&#x06F9;&#x0966;-&#x096F;&#x09E6;-&#x09EF;&#x0A66;-&#x0A6F;&#x0AE6;-&#x0AEF;&#x0B66;-&#x0B6F;&#x0BE7;-&#x0BEF;&#x0C66;-&#x0C6F;&#x0CE6;-&#x0CEF;&#x0D66;-&#x0D6F;&#x0E50;-&#x0E59;&#x0ED0;-&#x0ED9;&#x0F20;-&#x0F29;]|\d)(\w|[_:])(\w|[_:.-])*(\s+|$)"/>
-	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
+	  <DetectSpaces attribute="Doctype Declaration" context="#stay"/>
 	  <DetectChar attribute="Doctype Declaration" context="23:Doctype Decl IS" char=">"/>
 	</context>
 
 	<context name="40:AttType" attribute="Error" lineEndContext="#stay">
           <keyword attribute="Doctype Declaration" context="46:DefaultDecl" String="AttType"/>
 	  <RegExpr attribute="Doctype Declaration" context="41:NotationStart" String="NOTATION(\s+|$)"/>
           <DetectChar attribute="Doctype Declaration" context="42:Notation" char="("/>
-	  <RegExpr attribute="Doctype Declaration" context="#pop" String="\s+"/>
+	  <DetectSpaces attribute="Doctype Declaration" context="#pop"/>
 	</context>
 
 	<context name="41:NotationStart" attribute="Error" lineEndContext="#stay">
 	  <DetectChar attribute="Doctype Declaration" context="42:Notation" char="("/>
-	  <RegExpr attribute="Doctype Declaration" context="#pop#pop" String="\s+"/>
+	  <DetectSpaces attribute="Doctype Declaration" context="#pop#pop"/>
 	</context>
 
 	<context name="42:Notation" attribute="Error" lineEndContext="#stay">
 	  <RegExpr attribute="Value" context="43:Notation or End" String="(?![&#x0660;-&#x0669;&#x06F0;-&#x06F9;&#x0966;-&#x096F;&#x09E6;-&#x09EF;&#x0A66;-&#x0A6F;&#x0AE6;-&#x0AEF;&#x0B66;-&#x0B6F;&#x0BE7;-&#x0BEF;&#x0C66;-&#x0C6F;&#x0CE6;-&#x0CEF;&#x0D66;-&#x0D6F;&#x0E50;-&#x0E59;&#x0ED0;-&#x0ED9;&#x0F20;-&#x0F29;]|\d)(\w|[_:])(\w|[_:.-])*"/>
-	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
+	  <DetectSpaces attribute="Doctype Declaration" context="#stay"/>
 	</context>
 
 	<context name="43:Notation or End" attribute="Error" lineEndContext="#stay">
 	  <DetectChar attribute="Doctype Declaration" context="#pop" char="|"/>
 	  <RegExpr attribute="Doctype Declaration" context="46:DefaultDecl" String="\)(\s+|$)"/>
-	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
+	  <DetectSpaces attribute="Doctype Declaration" context="#stay"/>
 	</context>
 
 <!--
 	<context name="44:Enumeration" attribute="Error" lineEndContext="#stay">
 	  <RegExpr attribute="Value" context="#stay" String="(\w|[_:.-])+"/>
-	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
+	  <DetectSpaces attribute="Doctype Declaration" context="#stay"/>
 	</context>
 
 	<context name="45:Enumeration or End" attribute="Error" lineEndContext="#stay">
 	  <DetectChar attribute="Doctype Declaration" context="44:Enumeration" char="|"/>
 	  <RegExpr attribute="Doctype Declaration" context="46:DefaultDecl" String="\)(\s+|$)"/>
-	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
+	  <DetectSpaces attribute="Doctype Declaration" context="#stay"/>
 	</context>-->
 
 	<context name="46:DefaultDecl" attribute="Error" lineEndContext="#stay">
 	  <RegExpr attribute="Attribute" context="39:AttDef" String="(#REQUIRED|#IMPLIED)(\s+|$)"/>
 	  <RegExpr attribute="Attribute" context="47:DefaultDecl AttValue" String="#FIXED(\s+|$)"/>
-	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
-	  <RegExpr attribute="Value" context="48:DefaultDecl AttValue qq" String="&quot;"/>
-	  <RegExpr attribute="Value" context="49:DefaultDecl AttValue q" String="'"/>
+	  <DetectSpaces attribute="Doctype Declaration" context="#stay"/>
+	  <DetectChar attribute="Value" context="48:DefaultDecl AttValue qq" char="&quot;"/>
+	  <DetectChar attribute="Value" context="49:DefaultDecl AttValue q" char="'"/>
 	</context>
 
 	<context name="47:DefaultDecl AttValue" attribute="Error" lineEndContext="#stay">
-	  <RegExpr attribute="Value" context="48:DefaultDecl AttValue qq" String="&quot;"/>
-	  <RegExpr attribute="Value" context="49:DefaultDecl AttValue q" String="'"/>
+	  <DetectChar attribute="Value" context="48:DefaultDecl AttValue qq" char="&quot;"/>
+	  <DetectChar attribute="Value" context="49:DefaultDecl AttValue q" char="'"/>
 	</context>
 
  	<context name="48:DefaultDecl AttValue qq" attribute="Value" lineEndContext="#stay">
@@ -334,14 +334,14 @@
 	<context name="50:EntityDecl" attribute="Error" lineEndContext="#stay">
 	  <RegExpr attribute="Entity" context="52:GEDecl EntityValueOrExternalID" String="(?![&#x0660;-&#x0669;&#x06F0;-&#x06F9;&#x0966;-&#x096F;&#x09E6;-&#x09EF;&#x0A66;-&#x0A6F;&#x0AE6;-&#x0AEF;&#x0B66;-&#x0B6F;&#x0BE7;-&#x0BEF;&#x0C66;-&#x0C6F;&#x0CE6;-&#x0CEF;&#x0D66;-&#x0D6F;&#x0E50;-&#x0E59;&#x0ED0;-&#x0ED9;&#x0F20;-&#x0F29;]|\d)(\w|[_:])(\w|[_:.-])*(\s+|$)"/>
 	  <DetectChar attribute="Entity" context="61:PEDecl" char="%"/>
-	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
+	  <DetectSpaces attribute="Doctype Declaration" context="#stay"/>
 	</context>
 
 <!-- 	<context name="51:unused" attribute="Error" lineEndContext="#stay" /> -->
 
 	<context name="52:GEDecl EntityValueOrExternalID" attribute="Error" lineEndContext="#stay">
-	  <RegExpr attribute="Value" context="53:GEDecl EntityValue qq" String="&quot;"/>
-	  <RegExpr attribute="Value" context="54:GEDecl EntityValue q" String="'"/>
+	  <DetectChar attribute="Value" context="53:GEDecl EntityValue qq" char="&quot;"/>
+	  <DetectChar attribute="Value" context="54:GEDecl EntityValue q" char="'"/>
 	  <RegExpr attribute="Doctype Declaration" context="55:GEDecl PublicID" String="PUBLIC(\s+|$)"/>
 	  <RegExpr attribute="Doctype Declaration" context="58:GEDecl SystemID" String="SYSTEM(\s+|$)"/>
 	</context>
@@ -367,7 +367,7 @@
 	<context name="55:GEDecl PublicID" attribute="Error" lineEndContext="#stay">
 	  <DetectChar attribute="Value" context="56:GEDecl PublicID qq" char="&quot;"/>
 	  <DetectChar attribute="Value" context="57:GEDecl PublicID q" char="'"/>
-	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
+	  <DetectSpaces attribute="Doctype Declaration" context="#stay"/>
 	</context>
 
 	<context name="56:GEDecl PublicID qq" attribute="Error" lineEndContext="#stay">
@@ -383,7 +383,7 @@
 	<context name="58:GEDecl SystemID" attribute="Error" lineEndContext="#stay">
 	  <DetectChar attribute="Value" context="59:GEDecl SystemID qq" char="&quot;"/>
 	  <DetectChar attribute="Value" context="60:GEDecl SystemID q" char="'"/>
-	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
+	  <DetectSpaces attribute="Doctype Declaration" context="#stay"/>
 	</context>
 
 	<context name="59:GEDecl SystemID qq" attribute="Value" lineEndContext="#stay">
@@ -396,20 +396,20 @@
 
 	<context name="61:PEDecl" attribute="Error" lineEndContext="#stay">
 	  <RegExpr attribute="Entity" context="62:PEDecl EntityValueOrExternalID" String="(?![&#x0660;-&#x0669;&#x06F0;-&#x06F9;&#x0966;-&#x096F;&#x09E6;-&#x09EF;&#x0A66;-&#x0A6F;&#x0AE6;-&#x0AEF;&#x0B66;-&#x0B6F;&#x0BE7;-&#x0BEF;&#x0C66;-&#x0C6F;&#x0CE6;-&#x0CEF;&#x0D66;-&#x0D6F;&#x0E50;-&#x0E59;&#x0ED0;-&#x0ED9;&#x0F20;-&#x0F29;]|\d)(\w|[_:])(\w|[_:.-])*(\s+|$)"/>
-	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
+	  <DetectSpaces attribute="Doctype Declaration" context="#stay"/>
 	</context>
 
 	<context name="62:PEDecl EntityValueOrExternalID" attribute="Error" lineEndContext="#stay">
-	  <RegExpr attribute="Value" context="53:GEDecl EntityValue qq" String="&quot;"/>
-	  <RegExpr attribute="Value" context="54:GEDecl EntityValue q" String="'"/>
+	  <DetectChar attribute="Value" context="53:GEDecl EntityValue qq" char="&quot;"/>
+	  <DetectChar attribute="Value" context="54:GEDecl EntityValue q" char="'"/>
 	  <RegExpr attribute="Doctype Declaration" context="63:PEDecl PublicID" String="PUBLIC(\s+|$)"/>
 	  <RegExpr attribute="Doctype Declaration" context="66:PEDecl SystemID" String="SYSTEM(\s+|$)"/>
 	</context>
 
 	<context name="63:PEDecl PublicID" attribute="Error" lineEndContext="#stay">
 	  <DetectChar attribute="Value" context="64:PEDecl PublicID qq" char="&quot;"/>
 	  <DetectChar attribute="Value" context="65:PEDecl PublicID q" char="'"/>
-	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
+	  <DetectSpaces attribute="Doctype Declaration" context="#stay"/>
 	</context>
 
 	<context name="64:PEDecl PublicID qq" attribute="Error" lineEndContext="#stay">
@@ -425,7 +425,7 @@
 	<context name="66:PEDecl SystemID" attribute="Error" lineEndContext="#stay">
 	  <DetectChar attribute="Value" context="67:PEDecl SystemID qq" char="&quot;"/>
 	  <DetectChar attribute="Value" context="68:PEDecl SystemID q" char="'"/>
-	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
+	  <DetectSpaces attribute="Doctype Declaration" context="#stay"/>
 	</context>
 
 	<context name="67:PEDecl SystemID qq" attribute="Value" lineEndContext="#stay">
@@ -439,29 +439,29 @@
 	<context name="69:GEDecl endOrNDATA" attribute="Error" lineEndContext="#stay">
 	  <DetectChar attribute="Doctype Declaration" context="23:Doctype Decl IS" char=">"/>
 	  <RegExpr attribute="Doctype Declaration" context="70:GEDecl NDATA" String="NDATA(\s+|$)"/>
-	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
+	  <DetectSpaces attribute="Doctype Declaration" context="#stay"/>
 	</context>
 
 	<context name="70:GEDecl NDATA" attribute="Error" lineEndContext="#stay">
 	  <RegExpr attribute="Entity" context="37:element end" String="(?![&#x0660;-&#x0669;&#x06F0;-&#x06F9;&#x0966;-&#x096F;&#x09E6;-&#x09EF;&#x0A66;-&#x0A6F;&#x0AE6;-&#x0AEF;&#x0B66;-&#x0B6F;&#x0BE7;-&#x0BEF;&#x0C66;-&#x0C6F;&#x0CE6;-&#x0CEF;&#x0D66;-&#x0D6F;&#x0E50;-&#x0E59;&#x0ED0;-&#x0ED9;&#x0F20;-&#x0F29;]|\d)(\w|[_:])(\w|[_:.-])*"/>
-	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
+	  <DetectSpaces attribute="Doctype Declaration" context="#stay"/>
 	</context>
 
 	<context name="71:NotationDecl Name" attribute="Error" lineEndContext="#stay">
 	  <RegExpr attribute="Entity" context="72:NotationDecl ExternalID" String="(?![&#x0660;-&#x0669;&#x06F0;-&#x06F9;&#x0966;-&#x096F;&#x09E6;-&#x09EF;&#x0A66;-&#x0A6F;&#x0AE6;-&#x0AEF;&#x0B66;-&#x0B6F;&#x0BE7;-&#x0BEF;&#x0C66;-&#x0C6F;&#x0CE6;-&#x0CEF;&#x0D66;-&#x0D6F;&#x0E50;-&#x0E59;&#x0ED0;-&#x0ED9;&#x0F20;-&#x0F29;]|\d)(\w|[_:])(\w|[_:.-])*(\s+|$)"/>
-	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
+	  <DetectSpaces attribute="Doctype Declaration" context="#stay"/>
 	</context>
 
 	<context name="72:NotationDecl ExternalID" attribute="Error" lineEndContext="#stay">
 	  <RegExpr attribute="Doctype Declaration" context="73:NotationDecl PublicID" String="PUBLIC(\s+|$)"/>
 	  <RegExpr attribute="Doctype Declaration" context="66:PEDecl SystemID" String="SYSTEM(\s+|$)"/>
-	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
+	  <DetectSpaces attribute="Doctype Declaration" context="#stay"/>
 	</context>
 
 	<context name="73:NotationDecl PublicID" attribute="Error" lineEndContext="#stay">
 	  <DetectChar attribute="Value" context="74:NotationDecl PublicID qq" char="&quot;"/>
 	  <DetectChar attribute="Value" context="75:NotationDecl PublicID q" char="'"/>
-	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
+	  <DetectSpaces attribute="Doctype Declaration" context="#stay"/>
 	</context>
 
 	<context name="74:NotationDecl PublicID qq" attribute="Error" lineEndContext="#stay">
@@ -478,12 +478,12 @@
 	  <DetectChar attribute="Value" context="67:PEDecl SystemID qq" char="&quot;"/>
 	  <DetectChar attribute="Value" context="68:PEDecl SystemID q" char="'"/>
 	  <DetectChar attribute="Doctype Declaration" context="23:Doctype Decl IS" char=">"/>
-	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
+	  <DetectSpaces attribute="Doctype Declaration" context="#stay"/>
 	</context>
 
 	<context name="77:Comment inside IS" attribute="Comment" lineEndContext="#stay">
-	  <RegExpr attribute="Error" context="23:Doctype Decl IS" String="--->"/>
-	  <RegExpr attribute="Comment" context="23:Doctype Decl IS" String="-->"/>
+	  <StringDetect attribute="Error" context="23:Doctype Decl IS" String="--->"/>
+	  <StringDetect attribute="Comment" context="23:Doctype Decl IS" String="-->"/>
 	  <Detect2Chars attribute="Error" context="#stay" char="-" char1="-"/>
 	</context>
 
@@ -500,15 +500,15 @@
 	 <RegExpr attribute="Error" context="85:ETag" String="&lt;/(?![&#x0660;-&#x0669;&#x06F0;-&#x06F9;&#x0966;-&#x096F;&#x09E6;-&#x09EF;&#x0A66;-&#x0A6F;&#x0AE6;-&#x0AEF;&#x0B66;-&#x0B6F;&#x0BE7;-&#x0BEF;&#x0C66;-&#x0C6F;&#x0CE6;-&#x0CEF;&#x0D66;-&#x0D6F;&#x0E50;-&#x0E59;&#x0ED0;-&#x0ED9;&#x0F20;-&#x0F29;]|\d)(\w|[:_])(\w|[:_.-])*"/>
 	 <RegExpr attribute="Entity" context="#stay" String="&amp;(?![&#x0660;-&#x0669;&#x06F0;-&#x06F9;&#x0966;-&#x096F;&#x09E6;-&#x09EF;&#x0A66;-&#x0A6F;&#x0AE6;-&#x0AEF;&#x0B66;-&#x0B6F;&#x0BE7;-&#x0BEF;&#x0C66;-&#x0C6F;&#x0CE6;-&#x0CEF;&#x0D66;-&#x0D6F;&#x0E50;-&#x0E59;&#x0ED0;-&#x0ED9;&#x0F20;-&#x0F29;]|\d)(\w|[_:])(\w|[_:.-])*;"/>
 	 <RegExpr attribute="Entity" context="#stay" String="&amp;#(x[0-9a-fA-F]+|[0-9]+);"/>
-	 <RegExpr attribute="Entity" context="86:CDSect" String="&lt;!\[CDATA\["/>
-	 <RegExpr attribute="Comment" context="87:Comment inside IS" String="&lt;!--"/>
+	 <StringDetect attribute="Entity" context="86:CDSect" String="&lt;![CDATA["/>
+	 <StringDetect attribute="Comment" context="87:Comment inside IS" String="&lt;!--"/>
 	 <RegExpr attribute="Normal Tag" context="88:PI inside IS" String="&lt;\?xml-stylesheet(\s|$)"/>
 	 <RegExpr attribute="Error" context="88:PI inside IS" String="&lt;\?[xX][mM][lL](\w|[_.-])*(:(\w|[_.-])+)?"/>
          <RegExpr attribute="Normal Tag" context="88:PI inside IS" String="&lt;\?(?![&#x0660;-&#x0669;&#x06F0;-&#x06F9;&#x0966;-&#x096F;&#x09E6;-&#x09EF;&#x0A66;-&#x0A6F;&#x0AE6;-&#x0AEF;&#x0B66;-&#x0B6F;&#x0BE7;-&#x0BEF;&#x0C66;-&#x0C6F;&#x0CE6;-&#x0CEF;&#x0D66;-&#x0D6F;&#x0E50;-&#x0E59;&#x0ED0;-&#x0ED9;&#x0F20;-&#x0F29;]|\d)(\w|_)(\w|[_.-])*(:(\w|[_.-])+)?"/>
 	 <RegExpr attribute="Error" context="88:PI inside IS" String="&lt;\?(?![&#x0660;-&#x0669;&#x06F0;-&#x06F9;&#x0966;-&#x096F;&#x09E6;-&#x09EF;&#x0A66;-&#x0A6F;&#x0AE6;-&#x0AEF;&#x0B66;-&#x0B6F;&#x0BE7;-&#x0BEF;&#x0C66;-&#x0C6F;&#x0CE6;-&#x0CEF;&#x0D66;-&#x0D6F;&#x0E50;-&#x0E59;&#x0ED0;-&#x0ED9;&#x0F20;-&#x0F29;]|\d)(\w|[:_])(\w|[:_.-])*"/>
 	 <DetectChar attribute="Error" context="#stay" char="&lt;"/>
 	 <DetectChar attribute="Error" context="#stay" char="&amp;"/>
-	 <RegExpr attribute="Error" context="#stay" String="\]\]>"/>
+	 <StringDetect attribute="Error" context="#stay" String="]]>"/>
        </context>
 
        <context name="80:STag" attribute="Error" lineEndContext="#stay">
@@ -518,18 +518,18 @@
 	 <RegExpr attribute="Error" context="81:STag Attribute" String="[xX][mM][lL](\w|[_.-])*(:(\w|[_.-])+)?"/>
          <RegExpr attribute="Attribute" context="81:STag Attribute" String="(?![&#x0660;-&#x0669;&#x06F0;-&#x06F9;&#x0966;-&#x096F;&#x09E6;-&#x09EF;&#x0A66;-&#x0A6F;&#x0AE6;-&#x0AEF;&#x0B66;-&#x0B6F;&#x0BE7;-&#x0BEF;&#x0C66;-&#x0C6F;&#x0CE6;-&#x0CEF;&#x0D66;-&#x0D6F;&#x0E50;-&#x0E59;&#x0ED0;-&#x0ED9;&#x0F20;-&#x0F29;]|\d)(\w|_)(\w|[_.-])*(:(\w|[_.-])+)?"/>
 	 <RegExpr attribute="Error" context="81:STag Attribute" String="(?![&#x0660;-&#x0669;&#x06F0;-&#x06F9;&#x0966;-&#x096F;&#x09E6;-&#x09EF;&#x0A66;-&#x0A6F;&#x0AE6;-&#x0AEF;&#x0B66;-&#x0B6F;&#x0BE7;-&#x0BEF;&#x0C66;-&#x0C6F;&#x0CE6;-&#x0CEF;&#x0D66;-&#x0D6F;&#x0E50;-&#x0E59;&#x0ED0;-&#x0ED9;&#x0F20;-&#x0F29;]|\d)(\w|[:_])(\w|[:_.-])*"/>
-         <RegExpr attribute="Normal Tag" context="#stay" String="\s+"/>
+         <DetectSpaces attribute="Normal Tag" context="#stay"/>
        </context>
 
        <context name="81:STag Attribute" attribute="Error" lineEndContext="#stay">
 	 <DetectChar attribute="Attribute" context="82:STag Attribute Value" char="="/>
-         <RegExpr attribute="Normal Tag" context="#stay" String="\s+"/>
+         <DetectSpaces attribute="Normal Tag" context="#stay"/>
        </context>
 
        <context name="82:STag Attribute Value" attribute="Error" lineEndContext="#stay">
          <DetectChar attribute="Value" context="83:STag Value qq" char="&quot;"/>
          <DetectChar attribute="Value" context="84:STag Value q" char="'"/>
-         <RegExpr attribute="Normal Tag" context="#stay" String="\s+"/>
+         <DetectSpaces attribute="Normal Tag" context="#stay"/>
        </context>
 
        <context name="83:STag Value qq" attribute="Value" lineEndContext="#stay">
@@ -552,16 +552,16 @@
 
        <context name="85:ETag" attribute="Error" lineEndContext="#stay">
 	 <DetectChar attribute="Normal Tag" context="79:Outside" char="&gt;"/>
-         <RegExpr attribute="Normal Tag" context="#stay" String="\s+"/>
+         <DetectSpaces attribute="Normal Tag" context="#stay"/>
        </context>
 
        <context name="86:CDSect" attribute="Normal Text" lineEndContext="#stay">
-         <RegExpr attribute="Entity" context="79:Outside" String="\]\]>"/>
+         <StringDetect attribute="Entity" context="79:Outside" String="]]>"/>
        </context>
 
 	<context name="87:Comment inside IS" attribute="Comment" lineEndContext="#stay">
-	  <RegExpr attribute="Error" context="79:Outside" String="--->"/>
-	  <RegExpr attribute="Comment" context="79:Outside" String="-->"/>
+	  <StringDetect attribute="Error" context="79:Outside" String="--->"/>
+	  <StringDetect attribute="Comment" context="79:Outside" String="-->"/>
 	  <Detect2Chars attribute="Error" context="#stay" char="-" char1="-"/>
 	</context>
 
diff --git a/data/syntax/zsh.xml b/data/syntax/zsh.xml
--- a/data/syntax/zsh.xml
+++ b/data/syntax/zsh.xml
@@ -8,7 +8,7 @@
         <!ENTITY noword   "(?![\w$+-])">                <!-- no word, $, + or - following -->
         <!ENTITY pathpart "([\w_@.&#37;*?+-]|\\ )">     <!-- valid character in a file name -->
 ]>
-<language name="Zsh" version="2" kateversion="2.4" section="Scripts" extensions="*.sh;*.zsh;.zshrc;.zprofile;.zlogin;.zlogout;.profile" mimetype="application/x-shellscript" casesensitive="1" author="Jonathan Kolberg (bulldog98@kubuntu-de.org)" license="LGPL">
+<language name="Zsh" version="3" kateversion="2.4" section="Scripts" extensions="*.sh;*.zsh;.zshrc;.zprofile;.zlogin;.zlogout;.profile" mimetype="application/x-shellscript" casesensitive="1" author="Jonathan Kolberg (bulldog98@kubuntu-de.org)" license="LGPL">
 
 <!-- (c) 2011 by Jonathan Kolberg (bulldog98@kubuntu-de.org)
   modified for zsh -->
@@ -598,7 +598,7 @@
         <!-- handle here-string -->
         <RegExpr attribute="Redirection" context="#stay" String="\d*&lt;&lt;&lt;" />
         <!-- handle here document -->
-        <StringDetect attribute="Redirection" context="HereDoc" String="&lt;&lt;" lookAhead="true" />
+        <Detect2Chars attribute="Redirection" context="HereDoc" char="&lt;" char1="&lt;" lookAhead="true" />
         <!-- handle process subst -->
         <RegExpr attribute="Redirection" context="ProcessSubst" String="[&lt;&gt;]\(" />
         <!-- handle redirection -->
@@ -642,7 +642,7 @@
         <RegExpr attribute="Variable" context="VarBrace" String="\$\{[*@#?$!_0-9-](?=[:#%/=?+-])" />
         <StringDetect attribute="Variable" context="ExprDblParenSubst" String="$((" beginRegion="expression" />
         <StringDetect attribute="Redirection" context="SubstFile" String="$(&lt;" />
-        <StringDetect attribute="Variable" context="SubstCommand" String="$(" />
+        <Detect2Chars attribute="Variable" context="SubstCommand" char="$" char1="(" />
         <DetectChar attribute="Backquote" context="SubstBackq" char="`" />
         <RegExpr attribute="Escape" context="#stay" String="\\[`$\\]" />
       </context>