diff --git a/data/syntax/bash.xml b/data/syntax/bash.xml
--- a/data/syntax/bash.xml
+++ b/data/syntax/bash.xml
@@ -8,7 +8,7 @@
         <!ENTITY noword   "(?![\w$+-])">                <!-- no word, $, + or - following -->
         <!ENTITY pathpart "([\w_@.&#37;*?+-]|\\ )">     <!-- valid character in a file name -->
 ]>
-<language name="Bash" version="7" kateversion="5.0" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;*.nix;.bashrc;.bash_profile;.bash_login;.profile;PKGBUILD;APKBUILD" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
+<language name="Bash" version="8" kateversion="5.0" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;*.nix;.bashrc;.bash_profile;.bash_login;.profile;PKGBUILD;APKBUILD" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
 
 <!-- (c) 2004 by Wilbert Berendsen (wilbert@kde.nl)
     Changes by Matthew Woehlke (mw_triad@users.sourceforge.net)
@@ -540,7 +540,7 @@
         <RegExpr attribute="Variable" context="AssignSubscr" String="\b&varname;(?=\[.+\]\+?=)" />
         <!-- handle functions with function keyword before keywords -->
         <StringDetect attribute="Function" context="#stay" String=":()" />
-        <RegExpr attribute="Keyword" context="FunctionDef" String="\bfunction\b" />
+        <WordDetect attribute="Keyword" context="FunctionDef" String="function" />
         <!-- mark function definitions without function keyword -->
         <RegExpr attribute="Function" context="#stay" String="&funcname;\s*\(\)" />
         <!-- handle keywords -->
@@ -551,7 +551,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 -->
@@ -580,7 +580,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 -->
@@ -647,7 +647,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>
@@ -902,7 +902,7 @@
         <RegExpr attribute="Redirection" context="HereDocQ"   String="(&lt;&lt;\s*'(&word;)')" lookAhead="true" />
         <RegExpr attribute="Redirection" context="HereDocQ"   String="(&lt;&lt;\s*\\(&word;))" lookAhead="true" />
         <RegExpr attribute="Redirection" context="HereDocNQ"  String="(&lt;&lt;\s*(&word;))" lookAhead="true" />
-        <StringDetect attribute="Redirection" context="#pop"  String="&lt;&lt;" /><!-- always met -->
+        <Detect2Chars attribute="Redirection" context="#pop"  char="&lt;" char1="&lt;" /><!-- always met -->
       </context>
 
       <context attribute="Normal Text" lineEndContext="#pop" name="HereDocRemainder">
diff --git a/data/syntax/cisco.xml b/data/syntax/cisco.xml
--- a/data/syntax/cisco.xml
+++ b/data/syntax/cisco.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="Cisco" version="4" kateversion="5.0" section="Configuration" extensions="*.cis" mimetype="text/cisco" author="Raphaël GRAPINET" license="LGPL">
+<language name="Cisco" version="5" kateversion="5.0" section="Configuration" extensions="*.cis" mimetype="text/cisco" author="Raphaël GRAPINET" license="LGPL">
 	<highlighting>
 		<list name = "commands">
 			<item>aaa</item>
@@ -245,13 +245,13 @@
 		</list>
 		<contexts>
                         <context name = "Base" attribute = "Normal Text" lineEndContext = "#stay">
-                                <RegExpr attribute="Keyword" context="#stay" String="\bdone\b" insensitive="true" endRegion="dodone1"/>
-                                <RegExpr attribute="Keyword" context="#stay" String="\bdo\b" insensitive="true" beginRegion="dodone1"/>
-                                <RegExpr attribute="Keyword" context="#stay" String="\belif\b" insensitive="true" beginRegion="iffi1" endRegion="iffi1"/>
-                                <RegExpr attribute="Keyword" context="#stay" String="\bif\b" insensitive="true" beginRegion="iffi1"/>
-                                <RegExpr attribute="Keyword" context="#stay" String="\bfi\b" insensitive="true" endRegion="iffi1"/>
-                                <RegExpr attribute="Keyword" context="#stay" String="\bcase\b" insensitive="true" beginRegion="case1"/>
-                                <RegExpr attribute="Keyword" context="#stay" String="\besac\b" insensitive="true" endRegion="case1"/>
+                                <WordDetect attribute="Keyword" context="#stay" String="done" insensitive="true" endRegion="dodone1"/>
+                                <WordDetect attribute="Keyword" context="#stay" String="do" insensitive="true" beginRegion="dodone1"/>
+                                <WordDetect attribute="Keyword" context="#stay" String="elif" insensitive="true" beginRegion="iffi1" endRegion="iffi1"/>
+                                <WordDetect attribute="Keyword" context="#stay" String="if" insensitive="true" beginRegion="iffi1"/>
+                                <WordDetect attribute="Keyword" context="#stay" String="fi" insensitive="true" endRegion="iffi1"/>
+                                <WordDetect attribute="Keyword" context="#stay" String="case" insensitive="true" beginRegion="case1"/>
+                                <WordDetect attribute="Keyword" context="#stay" String="esac" insensitive="true" endRegion="case1"/>
                                 <RegExpr attribute="Keyword" context="#stay" String="[^()]+\)" insensitive="true" beginRegion="subcase1" column="0"/>
                                 <Detect2Chars attribute="Keyword" context="#stay" char=";" char1=";" endRegion="subcase1"/>
                                 <DetectChar attribute="Keyword" context="#stay" char="{" beginRegion="func1"/>
diff --git a/data/syntax/clipper.xml b/data/syntax/clipper.xml
--- a/data/syntax/clipper.xml
+++ b/data/syntax/clipper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="Clipper" version="4" kateversion="5.0" section="Sources" extensions="*.prg;*.PRG;*.ch" mimetype="text/x-clipper-src" priority="2" author="Andrey Cherepanov (sibskull@mail.ru)" license="GPL">
+<language name="Clipper" version="5" kateversion="5.0" section="Sources" extensions="*.prg;*.PRG;*.ch" mimetype="text/x-clipper-src" priority="2" author="Andrey Cherepanov (sibskull@mail.ru)" license="GPL">
   <highlighting>
 
     <list name="keywords">
@@ -408,23 +408,23 @@
 
     <contexts>
       <context attribute="Normal Text" lineEndContext="#stay" name="Normal">
-        <RegExpr attribute="Keyword" context="#stay" String="\bfunction\b" insensitive="true" beginRegion="regFunction" />
-        <RegExpr attribute="Keyword" context="#stay" String="^return\b" insensitive="true" endRegion="regFunction" />
+        <WordDetect attribute="Keyword" context="#stay" String="function" insensitive="true" beginRegion="regFunction" />
+        <WordDetect attribute="Keyword" context="#stay" column="0" String="return" insensitive="true" endRegion="regFunction" />
 	<RegExpr attribute="Keyword" context="#stay" String="\bbegin\s+sequence\b" insensitive="true" beginRegion="regSequence" />
 	<RegExpr attribute="Keyword" context="#stay" String="\bend\s+sequence\b" insensitive="true" endRegion="regSequence" />
         <RegExpr attribute="Keyword" context="#stay" String="\bdo\s+case\b" insensitive="true" beginRegion="regDoCase" />
-        <RegExpr attribute="Keyword" context="#stay" String="\bendcase\b" insensitive="true" endRegion="regDoCase" />
+    <WordDetect attribute="Keyword" context="#stay" String="endcase" insensitive="true" endRegion="regDoCase" />
 	<RegExpr attribute="Keyword" context="#stay" String="\bdo\s+while\b" insensitive="true" beginRegion="regDoWhile" />
-	<RegExpr attribute="Keyword" context="#stay" String="\benddo\b" insensitive="true" endRegion="regDoWhile" />
-        <RegExpr attribute="Keyword" context="#stay" String="\bfor\b" insensitive="true" beginRegion="regFor" />
-        <RegExpr attribute="Keyword" context="#stay" String="\bnext\b" insensitive="true" endRegion="regFor" />
-        <RegExpr attribute="Keyword" context="#stay" String="\bif\b" insensitive="true" beginRegion="regIf" />
-        <RegExpr attribute="Keyword" context="#stay" String="\belseif\b" insensitive="true" endRegion="regIf" beginRegion="regIf" />
-	<RegExpr attribute="Keyword" context="#stay" String="\belse\b" insensitive="true" endRegion="regIf" beginRegion="regIf" />
-        <RegExpr attribute="Keyword" context="#stay" String="\bendif\b" insensitive="true" endRegion="regIf" />
-	<RegExpr attribute="Keyword" context="#stay" String="\bswitch\b" insensitive="true" beginRegion="regSwitch" />
-	<RegExpr attribute="Keyword" context="#stay" String="\bendswitch\b" insensitive="true" endRegion="regSwitch" />
-        
+	<WordDetect attribute="Keyword" context="#stay" String="enddo" insensitive="true" endRegion="regDoWhile" />
+        <WordDetect attribute="Keyword" context="#stay" String="for" insensitive="true" beginRegion="regFor" />
+        <WordDetect attribute="Keyword" context="#stay" String="next" insensitive="true" endRegion="regFor" />
+        <WordDetect attribute="Keyword" context="#stay" String="if" insensitive="true" beginRegion="regIf" />
+        <WordDetect attribute="Keyword" context="#stay" String="elseif" insensitive="true" endRegion="regIf" beginRegion="regIf" />
+	<WordDetect attribute="Keyword" context="#stay" String="else" insensitive="true" endRegion="regIf" beginRegion="regIf" />
+        <WordDetect attribute="Keyword" context="#stay" String="endif" insensitive="true" endRegion="regIf" />
+	<WordDetect attribute="Keyword" context="#stay" String="switch" insensitive="true" beginRegion="regSwitch" />
+	<WordDetect attribute="Keyword" context="#stay" String="endswitch" insensitive="true" endRegion="regSwitch" />
+
 	<keyword attribute="Keyword" context="#stay" String="keywords"/>
         <keyword attribute="Command" context="#stay" String="commands"/>
         <keyword attribute="Function" context="#stay" String="functions"/>
@@ -436,7 +436,7 @@
 	<RegExpr attribute="Comment" context="LineComment" String="^\s*\*.*$"/>
         <Detect2Chars attribute="Comment" context="BlockComment" char="/" char1="*" beginRegion="Comment2" />
         <AnyChar attribute="Symbol" context="#stay" String="!%&amp;()+,-&lt;:=&gt;[]^~"/>
-        <RegExpr attribute="Preprocessor" context="Preprocessor" String="#"/>
+        <DetectChar attribute="Preprocessor" context="Preprocessor" char="#"/>
         <Detect2Chars attribute="Eval Block" context="EvalBlock" char="{" char1="|"/>
         <DetectChar attribute="String" context="String2" char="'"/>
 
diff --git a/data/syntax/coffee.xml b/data/syntax/coffee.xml
--- a/data/syntax/coffee.xml
+++ b/data/syntax/coffee.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE language SYSTEM "language.dtd">
 
 <language name="CoffeeScript"
-          version="2"
+          version="3"
           kateversion="3.4"
           section="Scripts"
           extensions="Cakefile;*.coffee;*.coco"
@@ -171,7 +171,7 @@
         <StringDetect attribute="Comment" context="Multiline Comment" String="###" beginRegion="Comment"/>
         <DetectChar attribute="Comment" context="Comment" char="#"/>
         <!-- Regular expressions. -->
-        <RegExpr attribute="Regex" context="Multiline Regex" String="///" beginRegion="Multiline Regex"/>
+        <StringDetect attribute="Regex" context="Multiline Regex" String="///" beginRegion="Multiline Regex"/>
         <RegExpr attribute="Regex" context="#stay" String="/([^/\\\r\n]|\\.)*/[mig]{0,3}"/>
         <!-- Operators and other non-alphanumeric symbols. -->
         <AnyChar attribute="Symbol" context="#stay" String="():!%&amp;+,-/.*&lt;=&gt;?[]|~^&#59;{}"/>
diff --git a/data/syntax/gap.xml b/data/syntax/gap.xml
--- a/data/syntax/gap.xml
+++ b/data/syntax/gap.xml
@@ -14,7 +14,7 @@
 	-->
 
 
-<language name="GAP" section="Scientific" extensions="*.gd;*.gi;*.g" mimetype="text/gap" version="2" kateversion="5.0" author="Jose Joao Morais" license="GPL">
+<language name="GAP" section="Scientific" extensions="*.gd;*.gi;*.g" mimetype="text/gap" version="3" kateversion="5.0" author="Jose Joao Morais" license="GPL">
 
 	<highlighting>
 
@@ -7769,30 +7769,30 @@
 
 
 			<context name="Code_Folding" attribute="Normal Text" lineEndContext="Top_Level">
-				<RegExpr context="#stay" attribute="Control Statements" String="\b(for)\b" beginRegion="do_block" />
-				<RegExpr context="#stay" attribute="Control Statements" String="\b(while)\b" beginRegion="do_block" />
-				<RegExpr context="#stay" attribute="Control Statements" String="\b(od)\b" endRegion="do_block" />
+				<WordDetect context="#stay" attribute="Control Statements" String="for" beginRegion="do_block" />
+				<WordDetect context="#stay" attribute="Control Statements" String="while" beginRegion="do_block" />
+				<WordDetect context="#stay" attribute="Control Statements" String="od" endRegion="do_block" />
 
-				<RegExpr context="#stay" attribute="Control Statements" String="\b(repeat)\b" beginRegion="repeat_block" />
-				<RegExpr context="#stay" attribute="Control Statements" String="\b(until)\b" endRegion="repeat_block" />
+				<WordDetect context="#stay" attribute="Control Statements" String="repeat" beginRegion="repeat_block" />
+				<WordDetect context="#stay" attribute="Control Statements" String="until" endRegion="repeat_block" />
 
-				<RegExpr context="#stay" attribute="Control Statements" String="\b(if)\b" beginRegion="if_block" />
-				<RegExpr context="#stay" attribute="Control Statements" String="\b(fi)\b" endRegion="if_block" />
+				<WordDetect context="#stay" attribute="Control Statements" String="if" beginRegion="if_block" />
+				<WordDetect context="#stay" attribute="Control Statements" String="fi" endRegion="if_block" />
 
-				<RegExpr context="#stay" attribute="Function" String="\b(function)\b" beginRegion="func_block" />
-				<RegExpr context="#stay" attribute="Function" String="\b(end)\b" endRegion="func_block" />
+				<WordDetect context="#stay" attribute="Function" String="function" beginRegion="func_block" />
+				<WordDetect context="#stay" attribute="Function" String="end" endRegion="func_block" />
 			</context>
 
 
 
 			<context name="Two Char Operators" attribute="Normal Text" lineEndContext="#stay">
-				<StringDetect context="#stay" attribute="Operator2" String=".."/>
-				<StringDetect context="#stay" attribute="Operator2" String="!."/>
-				<StringDetect context="#stay" attribute="Operator2" String=":="/>
-				<StringDetect context="#stay" attribute="Operator2" String="-&gt;"/>
-				<StringDetect context="#stay" attribute="Operator2" String="&lt;="/>
-				<StringDetect context="#stay" attribute="Operator2" String="&gt;="/>
-				<StringDetect context="#stay" attribute="Operator2" String="&lt;&gt;"/>
+				<Detect2Chars context="#stay" attribute="Operator2" char="." char1="."/>
+				<Detect2Chars context="#stay" attribute="Operator2" char="!" char1="."/>
+				<Detect2Chars context="#stay" attribute="Operator2" char=":" char1="="/>
+				<Detect2Chars context="#stay" attribute="Operator2" char="-" char1="&gt;"/>
+				<Detect2Chars context="#stay" attribute="Operator2" char="&lt;" char1="="/>
+				<Detect2Chars context="#stay" attribute="Operator2" char="&gt;" char1="="/>
+				<Detect2Chars context="#stay" attribute="Operator2" char="&lt;" char1="&gt;"/>
 			</context>
 
 
diff --git a/data/syntax/haml.xml b/data/syntax/haml.xml
--- a/data/syntax/haml.xml
+++ b/data/syntax/haml.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="Haml" version="6" kateversion="3.0" section="Markup"
+<language name="Haml" version="7" kateversion="5.0" section="Markup"
           extensions="*.haml"
           author="Cies Breijs (cies_at_kde_nl)" license="LGPL"
           mimetype="text/x-haml">
@@ -259,14 +259,14 @@
         <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"/>
         <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"/>