diff --git a/autotests/folding/highlight.y.fold b/autotests/folding/highlight.y.fold
--- a/autotests/folding/highlight.y.fold
+++ b/autotests/folding/highlight.y.fold
@@ -1,6 +1,6 @@
-/* Yacc / Bison hl test file.
+<beginfold id='9'>/*</beginfold id='9'> Yacc / Bison hl test file.
  * It won't compile :-) Sure !
- */
+ <endfold id='9'>*/</endfold id='9'>
 
 <beginfold id='1'>%{</beginfold id='1'>
 
@@ -87,9 +87,9 @@
 #include <stdio.h>
 
 int main(void)
-<beginfold id='9'>{</beginfold id='9'>
+<beginfold id='10'>{</beginfold id='10'>
   puts("Hello, World!");
   return 0;
-<endfold id='9'>}</endfold id='9'>
+<endfold id='10'>}</endfold id='10'>
 
 // ALERT NOTE
diff --git a/data/syntax/apparmor.xml b/data/syntax/apparmor.xml
--- a/data/syntax/apparmor.xml
+++ b/data/syntax/apparmor.xml
@@ -8,7 +8,7 @@
 	<!-- Characters not allowed in a path -->
 	<!ENTITY noPathChar  "\s\)&quot;">
 	<!ENTITY noPathCharWithoutSpace ")&quot;">
-	<!ENTITY endPath     ",([\s&quot;]|$)">
+	<!ENTITY endPath     ",(?:[\s&quot;]|$)">
 ]>
 
 <!--
@@ -42,6 +42,7 @@
       https://manpages.ubuntu.com/manpages/disco/en/man5/apparmor.d.5.html
 
   Change log:
+   * Version 10 [25-Oct-2019]: Use non-capturing groups in RegExpr.
    * Version 9 [20-Jun-2019]: (AppArmor 2.13.3):
       - Add new network domain keywords.
       - Fixes: drop unsupported 'to' operator for link rules and only highlight the 'in'
@@ -72,7 +73,7 @@
 -->
 
 <language name="AppArmor Security Profile"
-          version="9"
+          version="10"
           kateversion="5.0"
           section="Markup"
           extensions="usr.bin.*;usr.sbin.*;bin.*;sbin.*;usr.lib.*;usr.lib64.*;usr.lib32.*;usr.libx32.*;usr.libexec.*;usr.local.bin.*;usr.local.sbin.*;usr.local.lib*;opt.*;etc.cron.*;snap.*;snap-update-ns.*;snap-confine.*"
@@ -786,7 +787,7 @@
 			      - [Jul 24, 2018] Variables of type "@VAR" will only be highlighted in assignments, as long
 			        as they are not fully supported (apparently, they will be used in conditional expressions). -->
 			<Detect2Chars context="_variable_assignment" attribute="Variable" char="@" char1="{" lookAhead="true" firstNonSpace="true"/>
-			<RegExpr context="_variable_assignment_operator" attribute="Variable" String="@&varName;(?=\s*(\+?\=|$|\s#))" firstNonSpace="true"/>
+			<RegExpr context="_variable_assignment_operator" attribute="Variable" String="@&varName;(?=\s*(?:\+?\=|$|\s#))" firstNonSpace="true"/>
 			<DetectChar context="_variable_assignment_line_general" attribute="Operator 1" char="=" firstNonSpace="true"/>
 			<Detect2Chars context="_variable_assignment_line" attribute="Operator 1" char="+" char1="=" firstNonSpace="true"/>
 			<!-- Alias rule -->
@@ -807,12 +808,12 @@
 		<context name="_default_profile" attribute="Normal Text" lineEndContext="#stay">
 			<!-- Profile Header -->
 			<keyword context="_profile_name" attribute="Profile Head" String="profile_head"/>
-			<RegExpr context="_profile_name" attribute="Profile Head" String="(^|\s)\^(?=\S)"/>
+			<RegExpr context="_profile_name" attribute="Profile Head" String="(?:^|\s)\^(?=\S)"/>
 			<keyword context="#stay" attribute="Option" String="profile_options"/>
 
 			<!-- Line Rules -->
 			<StringDetect context="_include" attribute="Preprocessor" String="#include" insensitive="true"/>
-			<RegExpr context="_include" attribute="Preprocessor" String="(^|\s)include(?=\s)"/>
+			<RegExpr context="_include" attribute="Preprocessor" String="(?:^|\s)include(?=\s)"/>
 			<DetectChar context="_comment" attribute="Comment" char="#"/>
 
 			<!-- Variables -->
@@ -876,7 +877,7 @@
 			<!-- URL -->
 			<RegExpr context="#stay" attribute="URL in Comment" String="\bhttps?://[^\s&lt;&gt;&quot;&apos;`]*[^\s&lt;&gt;&quot;&apos;`\}\)\]\.,;\|]"/>
 			<!-- Email (Source: http://emailregex.com) -->
-			<RegExpr context="#stay" attribute="URL in Comment" String="(([^&lt;&gt;\(\)\[\]\\\.,;:\s@&quot;]+(\.[^&lt;&gt;\(\)\[\]\\\.,;:\s@&quot;]+)*)|(&quot;[^&quot;]+&quot;))@((\[\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}])|(([a-zA-Z\-\d]+\.)+[a-zA-Z]{2,}))\b"/>
+			<RegExpr context="#stay" attribute="URL in Comment" String="(?:(?:[^&lt;&gt;\(\)\[\]\\\.,;:\s@&quot;]+(?:\.[^&lt;&gt;\(\)\[\]\\\.,;:\s@&quot;]+)*)|(?:&quot;[^&quot;]+&quot;))@(?:(?:\[\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}])|(?:(?:[a-zA-Z\-\d]+\.)+[a-zA-Z]{2,}))\b"/>
 		</context>
 
 		<!-- Profile Header:
@@ -886,8 +887,8 @@
 			<DetectSpaces context="#stay" attribute="Normal Text"/>
 			<!-- Not highlighting paths and paths quoted.
 			     NOTE: Some profile labels may contain "/" (like [/]). These cases are not considered. -->
-			<RegExpr context="#pop" attribute="Normal Text" String="&quot;([^/&quot;\\]|\\.)*/" lookAhead="true"/>
-			<RegExpr context="#pop!_path_content" attribute="Path" String="([^\s&quot;\\]|\\.)*/" lookAhead="true"/>
+			<RegExpr context="#pop" attribute="Normal Text" String="&quot;(?:[^/&quot;\\]|\\.)*/" lookAhead="true"/>
+			<RegExpr context="#pop!_path_content" attribute="Path" String="(?:[^\s&quot;\\]|\\.)*/" lookAhead="true"/>
 			<DetectChar context="#pop!_profile_name_quoted" attribute="Profile Name" char="&quot;"/>
 			<!-- First word (the profile name) -->
 			<RegExpr context="#pop!_profile_name_content" attribute="Normal Text" String="[^\s/\^\{]" lookAhead="true"/>
@@ -1021,25 +1022,25 @@
 		<!-- Access Modes / File Permissions -->
 		<context name="_permissions" attribute="Normal Text" lineEndContext="#stay">
 			<IncludeRules context="_permissions_correction"/>
-			<RegExpr context="#stay" attribute="Permissions" String="(^|\s)([rwkml]|&exec;)+(?=[\s,]|$)"/>
-			<RegExpr context="#stay" attribute="Permissions" String="(^|\s)([rakml]|&exec;)+(?=[\s,]|$)"/>
+			<RegExpr context="#stay" attribute="Permissions" String="(?:^|\s)(?:[rwkml]|&exec;)+(?=[\s,]|$)"/>
+			<RegExpr context="#stay" attribute="Permissions" String="(?:^|\s)(?:[rakml]|&exec;)+(?=[\s,]|$)"/>
 		</context>
 		<context name="_file_rule_permissions" attribute="Normal Text" lineEndContext="#stay">
 			<IncludeRules context="_permissions_correction"/>
-			<RegExpr context="_rule_file" attribute="Permissions" String="(^|\s)([rwkml]|&exec;)+(?=[\s,]|$)"/>
-			<RegExpr context="_rule_file" attribute="Permissions" String="(^|\s)([rakml]|&exec;)+(?=[\s,]|$)"/>
+			<RegExpr context="_rule_file" attribute="Permissions" String="(?:^|\s)(?:[rwkml]|&exec;)+(?=[\s,]|$)"/>
+			<RegExpr context="_rule_file" attribute="Permissions" String="(?:^|\s)(?:[rakml]|&exec;)+(?=[\s,]|$)"/>
 		</context>
 		<context name="_permissions_correction" attribute="Normal Text" lineEndContext="#stay">
 			<!-- Incompatible execution modes -->
-			<RegExpr context="_perm_correction_in" String="(^|\s)[rwakml]*p[iUu]?x([rwakml]|p[iUu]?x)*[PcC]?[iUu]?x([rwakml]|&exec;)*([\s,]|$)" lookAhead="true"/> <!-- p -->
-			<RegExpr context="_perm_correction_in" String="(^|\s)[rwakml]*P[iUu]?x([rwakml]|P[iUu]?x)*[pcC]?[iUu]?x([rwakml]|&exec;)*([\s,]|$)" lookAhead="true"/> <!-- P -->
-			<RegExpr context="_perm_correction_in" String="(^|\s)[rwakml]*c[iUu]?x([rwakml]|c[iUu]?x)*[PpC]?[iUu]?x([rwakml]|&exec;)*([\s,]|$)" lookAhead="true"/> <!-- c -->
-			<RegExpr context="_perm_correction_in" String="(^|\s)[rwakml]*C[iUu]?x([rwakml]|C[iUu]?x)*[Ppc]?[iUu]?x([rwakml]|&exec;)*([\s,]|$)" lookAhead="true"/> <!-- C -->
-			<RegExpr context="_perm_correction_in" String="(^|\s)[rwakml]*[PpCc]?ix([rwakml]|[PpCc]?ix)*[PpCc]?[Uu]?x([rwakml]|&exec;)*([\s,]|$)" lookAhead="true"/> <!-- i -->
-			<RegExpr context="_perm_correction_in" String="(^|\s)[rwakml]*[PpCc]?ux([rwakml]|[PpCc]?ux)*[PpCc]?[iU]?x([rwakml]|&exec;)*([\s,]|$)" lookAhead="true"/> <!-- u -->
-			<RegExpr context="_perm_correction_in" String="(^|\s)[rwakml]*[PpCc]?Ux([rwakml]|[PpCc]?Ux)*[PpCc]?[iu]?x([rwakml]|&exec;)*([\s,]|$)" lookAhead="true"/> <!-- U -->
-			<RegExpr context="_perm_correction_in" String="(^|\s)[rwakml]*[iuU]?x([rwakml]|[iuU]?x)*[PpCc][iuU]?x([rwakml]|&exec;)*([\s,]|$)" lookAhead="true"/> <!-- x, ix, ux or Ux followed by P, p, C or c -->
-			<RegExpr context="_perm_correction_in" String="(^|\s)[rwakml]*x[rwakmlx]*[iuU]x([rwakml]|&exec;)*([\s,]|$)" lookAhead="true"/> <!-- x followed by ix, ux or Ux -->
+			<RegExpr context="_perm_correction_in" String="(?:^|\s)[rwakml]*p[iUu]?x(?:[rwakml]|p[iUu]?x)*[PcC]?[iUu]?x(?:[rwakml]|&exec;)*(?:[\s,]|$)" lookAhead="true"/> <!-- p -->
+			<RegExpr context="_perm_correction_in" String="(?:^|\s)[rwakml]*P[iUu]?x(?:[rwakml]|P[iUu]?x)*[pcC]?[iUu]?x(?:[rwakml]|&exec;)*(?:[\s,]|$)" lookAhead="true"/> <!-- P -->
+			<RegExpr context="_perm_correction_in" String="(?:^|\s)[rwakml]*c[iUu]?x(?:[rwakml]|c[iUu]?x)*[PpC]?[iUu]?x(?:[rwakml]|&exec;)*(?:[\s,]|$)" lookAhead="true"/> <!-- c -->
+			<RegExpr context="_perm_correction_in" String="(?:^|\s)[rwakml]*C[iUu]?x(?:[rwakml]|C[iUu]?x)*[Ppc]?[iUu]?x(?:[rwakml]|&exec;)*(?:[\s,]|$)" lookAhead="true"/> <!-- C -->
+			<RegExpr context="_perm_correction_in" String="(?:^|\s)[rwakml]*[PpCc]?ix(?:[rwakml]|[PpCc]?ix)*[PpCc]?[Uu]?x(?:[rwakml]|&exec;)*(?:[\s,]|$)" lookAhead="true"/> <!-- i -->
+			<RegExpr context="_perm_correction_in" String="(?:^|\s)[rwakml]*[PpCc]?ux(?:[rwakml]|[PpCc]?ux)*[PpCc]?[iU]?x(?:[rwakml]|&exec;)*(?:[\s,]|$)" lookAhead="true"/> <!-- u -->
+			<RegExpr context="_perm_correction_in" String="(?:^|\s)[rwakml]*[PpCc]?Ux(?:[rwakml]|[PpCc]?Ux)*[PpCc]?[iu]?x(?:[rwakml]|&exec;)*(?:[\s,]|$)" lookAhead="true"/> <!-- U -->
+			<RegExpr context="_perm_correction_in" String="(?:^|\s)[rwakml]*[iuU]?x(?:[rwakml]|[iuU]?x)*[PpCc][iuU]?x(?:[rwakml]|&exec;)*(?:[\s,]|$)" lookAhead="true"/> <!-- x, ix, ux or Ux followed by P, p, C or c -->
+			<RegExpr context="_perm_correction_in" String="(?:^|\s)[rwakml]*x[rwakmlx]*[iuU]x(?:[rwakml]|&exec;)*(?:[\s,]|$)" lookAhead="true"/> <!-- x followed by ix, ux or Ux -->
 		</context>
 		<context name="_perm_correction_in" attribute="Normal Text" lineEndContext="#pop">
 			<!-- Highlight the previous space or the full permission -->
@@ -1055,17 +1056,17 @@
 		</context>
 		<context name="_operators_in" attribute="Normal Text" lineEndContext="#stay">
 			<!-- Only in mount rules -->
-			<RegExpr context="#stay" attribute="Operator 2" String="\b(in)(?=[\s\(\{\[&quot;/@\$]|$)"/>
+			<RegExpr context="#stay" attribute="Operator 2" String="\b(?:in)(?=[\s\(\{\[&quot;/@\$]|$)"/>
 		</context>
 
 		<!-- RULES -->
 
 		<!-- For all rules -->
 		<!-- Also see: _default_parentheses_block_rule -->
 		<context name="_common_rule" attribute="Normal Text" lineEndContext="#stay">
 			<!-- Highlight as path the text after the '=' operator, except keywords or simple words ([\w\-\+]+) -->
-			<RegExpr context="#stay" attribute="Error" String="\=(?=\s*($|&endPath;))"/>
-			<RegExpr context="_path_content" attribute="Operator 1" String="\=\s*(?=[^\s&quot;\(]*([^&noPathChar;\]\}\=\w\+\-\(,]|,[^&noPathChar;]))"/>
+			<RegExpr context="#stay" attribute="Error" String="\=(?=\s*(?:$|&endPath;))"/>
+			<RegExpr context="_path_content" attribute="Operator 1" String="\=\s*(?=[^\s&quot;\(]*(?:[^&noPathChar;\]\}\=\w\+\-\(,]|,[^&noPathChar;]))"/>
 			<Detect2Chars context="_variable" attribute="Variable" char="@" char1="{" lookAhead="true"/>
 			<IncludeRules context="_find_path"/>
 
@@ -1163,7 +1164,7 @@
 			<keyword context="#stay" attribute="Flags" String="rule_signal"/>
 			<keyword context="#stay" attribute="Permissions" String="rule_signal_access"/>
 			<keyword context="#stay" attribute="Permissions" String="base_accesses"/>
-			<RegExpr context="#stay" attribute="Flags" String="\b(rtmin\+)0*(3[012]|[12]?\d)\b"/>
+			<RegExpr context="#stay" attribute="Flags" String="\brtmin\+0*(?:3[012]|[12]?\d)\b"/> <!-- rtmin+0 ... rtmin+32 -->
 		</context>
 
 		<!-- DBus Rule -->
@@ -1213,14 +1214,14 @@
 		<context name="_rule_rlimit" attribute="Normal Text" lineEndContext="#stay">
 			<keyword context="#stay" attribute="Data" String="rule_rlimit"/>
 			<Detect2Chars context="#stay" attribute="Operator 2" char="&lt;" char1="="/>
-			<RegExpr context="#stay" attribute="Number" String="\-(20|1?\d)\b"/>
+			<RegExpr context="#stay" attribute="Number" String="\-(?:20|1?\d)\b"/>
 			<RegExpr context="_number_unit" attribute="Number" String="\b\d+"/> <!-- Rules Int don't use '-' as a delimiter -->
 			<WordDetect context="#stay" attribute="Number" String="infinity"/>
-			<RegExpr context="#stay" attribute="Numerical Unit" String="\b([KMG]B?|[shd]|us|ms|min|sec|(minute|day|hour|week|second)(s?)|(milli|micro)second(s?))\b"/>
+			<RegExpr context="#stay" attribute="Numerical Unit" String="\b(?:[KMG]B?|[shd]|us|ms|min|sec|(?:minute|day|hour|week|second)(?:s?)|(?:milli|micro)second(?:s?))\b"/>
 			<IncludeRules context="_default_rule"/>
 		</context>
 		<context name="_number_unit" attribute="Normal Text" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
-			<RegExpr context="#pop" attribute="Numerical Unit" String="([KMG]B?|[shd]|us|ms|min|sec|(minute|day|hour|week|second)(s?)|(milli|micro)second(s?))\b"/>
+			<RegExpr context="#pop" attribute="Numerical Unit" String="(?:[KMG]B?|[shd]|us|ms|min|sec|(?:minute|day|hour|week|second)(?:s?)|(?:milli|micro)second(?:s?))\b"/>
 		</context>
 
 		<!-- Link Rule -->
@@ -1248,14 +1249,14 @@
 		<context name="_profile_transition" attribute="Transition Profile Name" lineEndContext="#stay" fallthrough="true" fallthroughContext="#pop">
 			<DetectSpaces context="#stay" attribute="Normal Text"/>
 			<!-- Not highlighting paths and paths quoted -->
-			<RegExpr context="#pop!_default_rule_with_comments" attribute="Path" String="([^\s/\[\\]|//|\\.|\[([^\s\]\\]|\\.)*\])*/($|[^/])" lookAhead="true"/>
-			<RegExpr context="#pop!_default_rule_with_comments" attribute="Normal Text" String="&quot;([^/&quot;\[\\]|//|\\.|\[([^&quot;\]\\]|\\.)*\])*/($|[^/])" lookAhead="true"/>
+			<RegExpr context="#pop!_default_rule_with_comments" attribute="Path" String="(?:[^\s/\[\\]|//|\\.|\[(?:[^\s\]\\]|\\.)*\])*/(?:$|[^/])" lookAhead="true"/>
+			<RegExpr context="#pop!_default_rule_with_comments" attribute="Normal Text" String="&quot;(?:[^/&quot;\[\\]|//|\\.|\[(?:[^&quot;\]\\]|\\.)*\])*/(?:$|[^/])" lookAhead="true"/>
 
 			<DetectChar context="#pop!_t_profile_name_quoted" attribute="Transition Profile Name" char="&quot;"/>
 			<RegExpr context="#pop!_profile_transition_content" attribute="Normal Text" String="[^\s/]" lookAhead="true"/> <!-- First word -->
 		</context>
 		<context name="_profile_transition_content" attribute="Transition Profile Name" lineEndContext="#pop!_default_rule_with_comments">
-			<RegExpr context="#pop!_default_rule_with_comments" attribute="Error" String="\(\S*(?=,([&noPathChar;]|$))"/>
+			<RegExpr context="#pop!_default_rule_with_comments" attribute="Error" String="\(\S*(?=,(?:[&noPathChar;]|$))"/>
 			<RegExpr context="#pop!_default_rule_with_comments" attribute="Normal Text" String="&endPath;" lookAhead="true"/> <!-- End rule -->
 			<DetectSpaces context="#pop" attribute="Normal Text" lookAhead="true"/> <!-- End of the profile name -->
 
@@ -1279,15 +1280,15 @@
 		     NOTE: Old style (name^HAT) not included -->
 		<context name="_hat_path" attribute="Path" lineEndContext="#pop">
 			<RegExpr context="#pop" attribute="Path" String="/(?=/&endPath;)"/>
-			<RegExpr context="#pop!_hat_path_content" attribute="SubProfile/Hat Operator" String="//(?=([^\s&quot;/\\]|\\.)+([\s&quot;]|$))"/>
+			<RegExpr context="#pop!_hat_path_content" attribute="SubProfile/Hat Operator" String="//(?=(?:[^\s&quot;/\\]|\\.)+(?:[\s&quot;]|$))"/>
 			<DetectChar context="#pop" attribute="Path" char="/"/>
 		</context>
 		<context name="_hat_path_parentheses" attribute="Path" lineEndContext="#pop">
-			<RegExpr context="#pop!_hat_path_parentheses_content" attribute="SubProfile/Hat Operator" String="//(?=([^&noPathChar;/\\,]|\\.)+([&noPathChar;,]|$))"/>
+			<RegExpr context="#pop!_hat_path_parentheses_content" attribute="SubProfile/Hat Operator" String="//(?=(?:[^&noPathChar;/\\,]|\\.)+(?:[&noPathChar;,]|$))"/>
 			<DetectChar context="#pop" attribute="Path" char="/"/>
 		</context>
 		<context name="_hat_path_quoted" attribute="Text Quoted" lineEndContext="#pop">
-			<RegExpr context="#pop!_hat_path_quoted_content" attribute="SubProfile/Hat Operator" String="//(?=([^&quot;/\\]|\\.)+&quot;)"/>
+			<RegExpr context="#pop!_hat_path_quoted_content" attribute="SubProfile/Hat Operator" String="//(?=(?:[^&quot;/\\]|\\.)+&quot;)"/>
 			<DetectChar context="#pop" attribute="Text Quoted" char="/"/>
 		</context>
 
@@ -1309,7 +1310,7 @@
 		<context name="_common_parentheses_block" attribute="Normal Text" lineEndContext="#stay">
 			<DetectChar context="#pop" attribute="Normal Text" char=")"/>
 			<!-- Highlight as path the text after the '=' operator, except keywords or simple words ([\w\-\+]+) -->
-			<RegExpr context="#stay" attribute="Error" String="\=(?=\s*($|[,\)]))"/>
+			<RegExpr context="#stay" attribute="Error" String="\=(?=\s*(?:$|[,\)]))"/>
 			<RegExpr context="_parentheses_path_content" attribute="Operator 1" String="\=\s*(?=[^\s&quot;\(\),]*[^&noPathChar;\]\}\=\w\+\-\(,])"/>
 			<DetectChar context="_parentheses_path_content" attribute="Path" char="/" lookAhead="true"/>
 			<Detect2Chars context="_parentheses_variable" attribute="Variable" char="@" char1="{" lookAhead="true"/>
@@ -1323,7 +1324,7 @@
 		<context name="_parentheses_block_profile" attribute="Normal Text" lineEndContext="#stay">
 			<keyword context="#stay" attribute="Flags" String="profile_flags"/>
 			<!-- Used by xattrs -->
-			<RegExpr context="#stay" attribute="Other Option" String="\b[a-zA-Z](\.?[\w\-])*(?=\s*\=)"/>
+			<RegExpr context="#stay" attribute="Other Option" String="\b[a-zA-Z](?:\.?[\w\-])*(?=\s*\=)"/>
 			<IncludeRules context="_common_parentheses_block"/>
 			<IncludeRules context="_end_rule_irnc"/>
 		</context>
@@ -1335,7 +1336,7 @@
 
 		<!-- Finding the end of a rule -->
 		<context name="_end_rule" attribute="Normal Text" lineEndContext="#stay">
-			<RegExpr context="#stay" attribute="Normal Text" String=",(?=(\)|[\w\-]+[^\s\w\-,#\(&quot;]))"/> <!-- Fix possible incorrect rule closures -->
+			<RegExpr context="#stay" attribute="Normal Text" String=",(?=\)|[\w\-]+[^\s\w\-,#\(&quot;])"/> <!-- Fix possible incorrect rule closures -->
 			<DetectChar  context="#pop" attribute="End of Rule Char" char="," endRegion="Rule"/>
 			<IncludeRules context="_end_rule_irnc"/>
 		</context>
@@ -1390,7 +1391,7 @@
 
 		<context name="_find_path" attribute="Normal Text" lineEndContext="#stay">
 			<DetectChar context="_path_content" attribute="Path" char="/" lookAhead="true"/>
-			<RegExpr context="_path_content" String=":([^:&noPathChar;\(\\]|\\.)+:" lookAhead="true"/> <!-- :namespace: -->
+			<RegExpr context="_path_content" String=":(?:[^\:&noPathChar;\(\\]|\\.)+:" lookAhead="true"/> <!-- :namespace: -->
 		</context>
 		<context name="_path_content" attribute="Path" lineEndContext="#pop">
 			<RegExpr context="#pop" String="&endPath;" lookAhead="true"/>
@@ -1424,10 +1425,10 @@
 		<!-- Escapes: Hexadecimal (\xNN), decimal (\dNNN) & octal (\NNN). Also make literal any character.
 		     NOTE: Reserved character escape sequences: \\&quot;aefnrt0 -->
 		<context name="_escape" attribute="Normal Text" lineEndContext="#stay">
-			<RegExpr context="#stay" attribute="Escape Char" String="\\(x[a-fA-F\d]{1,2}|d\d{1,3}|[0-3][0-7]{0,2}|[4-7][0-7]?|.)"/>
+			<RegExpr context="#stay" attribute="Escape Char" String="\\(?:x[a-fA-F\d]{1,2}|d\d{1,3}|[0-3][0-7]{0,2}|[4-7][0-7]?|.)"/>
 		</context>
 		<context name="_profile_transition_escape" attribute="Transition Profile Name" lineEndContext="#stay">
-			<RegExpr context="#stay" attribute="Globbing Char in Tran. Prof." String="\\(x[a-fA-F\d]{1,2}|d\d{1,3}|[0-3][0-7]{0,2}|[4-7][0-7]?|.)"/>
+			<RegExpr context="#stay" attribute="Globbing Char in Tran. Prof." String="\\(?:x[a-fA-F\d]{1,2}|d\d{1,3}|[0-3][0-7]{0,2}|[4-7][0-7]?|.)"/>
 		</context>
 
 		<!-- Groups of brackets: { }, [ ] and ( ) -->
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="10"
+          version="11"
           kateversion="5.0"
           section="Scripts"
           extensions="Cakefile;*.coffee;*.coco;*.cson"
@@ -155,9 +155,9 @@
         <keyword attribute="Browser Globals" context="#stay" String="browser_globals"/>
         <keyword attribute="Node.js Globals" context="#stay" String="nodejs_globals"/>
         <!-- Member accessors. -->
-        <RegExpr attribute="Accessor" context="#stay" String="(@[_$a-zA-Z][$\w]*|\bthis)\b" insensitive="false"/>
+        <RegExpr attribute="Accessor" context="#stay" String="(?:@[_$a-zA-Z][$\w]*|\bthis)\b" insensitive="false"/>
         <!-- Function definitions. Matches an optional argument list followed by a function arrow (normal or fat). -->
-        <RegExpr attribute="Function" context="#stay" String="(\((\'[^']*'|&quot;[^&quot;]*&quot;|[^()])*\))?\s*(-|=)&gt;" insensitive="true"/>
+        <RegExpr attribute="Function" context="#stay" String="(?:\((?:\'[^']*'|&quot;[^&quot;]*&quot;|[^()])*\))?\s*(?:\-|=)&gt;" insensitive="true"/>
         <!-- Generic identifiers. -->
         <RegExpr attribute="Identifier" context="#stay" String="[_$a-z][$\w]*\b" insensitive="true"/>
         <!-- Strings. -->
@@ -173,7 +173,7 @@
         <DetectChar attribute="Comment" context="Comment" char="#"/>
         <!-- Regular expressions. -->
         <StringDetect attribute="Regex" context="Multiline Regex" String="///" beginRegion="Multiline Regex"/>
-        <RegExpr attribute="Regex" context="#stay" String="/([^/\\\r\n]|\\.)*/[mig]{0,3}"/>
+        <RegExpr attribute="Regex" context="#stay" String="/(?:[^/\\\r\n]|\\.)*/[mig]{0,3}"/>
         <!-- Member objects. -->
         <DetectChar attribute="Symbol" context="Member Object" char="."/>
         <!-- Operators and other non-alphanumeric symbols. -->
@@ -197,10 +197,12 @@
       <!-- Comments. -->
       <context name="Comment" attribute="Comment" lineEndContext="#pop">
         <IncludeRules context="##Alerts"/>
+        <IncludeRules context="##Modelines"/>
       </context>
       <context name="Multiline Comment" attribute="Comment" lineEndContext="#stay" noIndentationBasedFolding="1">
         <StringDetect attribute="Comment" context="#pop" String="###" endRegion="Comment"/>
         <IncludeRules context="##Alerts"/>
+        <IncludeRules context="##Modelines"/>
       </context>
       <!-- Single-line strings. -->
       <context name="String" attribute="String" lineEndContext="#stay">
@@ -225,7 +227,7 @@
       <!-- Escaped characters. -->
       <context name="Escape" attribute="String" lineEndContext="#stay">
         <!-- Hexadecimal, unicode & reserved character escape sequences. -->
-        <RegExpr attribute="Escape" context="#stay" String="\\(x[0-9a-fA-F]{2}|u[0-9a-fA-F]{4}|u\{[0-9a-fA-F]+\}|[\\0bfnrtv&quot;&apos;])"/>
+        <RegExpr attribute="Escape" context="#stay" String="\\(?:x[0-9a-fA-F]{2}|u[0-9a-fA-F]{4}|u\{[0-9a-fA-F]+\}|[\\0bfnrtv&quot;&apos;])"/>
         <!-- Invalid escapes. Octal escape sequences are not allowed. -->
         <RegExpr attribute="Error" context="#stay" String="\\[ux1-7]"/>
         <!-- Make any character literal. -->
diff --git a/data/syntax/fortran-fixed.xml b/data/syntax/fortran-fixed.xml
--- a/data/syntax/fortran-fixed.xml
+++ b/data/syntax/fortran-fixed.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="Fortran (Fixed Format)" version="6" kateversion="5.0" section="Sources" extensions="*.f;*.F;*.for;*.FOR;*.fpp;*.FPP;" mimetype="text/x-fortran-src" casesensitive="0" author="Franchin Matteo (fnch@libero.it)" license="MIT" priority="9">
+<language name="Fortran (Fixed Format)" version="7" kateversion="5.44" section="Sources" extensions="*.f;*.F;*.for;*.FOR;*.fpp;*.FPP;" mimetype="text/x-fortran-src" casesensitive="0" author="Franchin Matteo (fnch@libero.it)" license="MIT" priority="9">
 <!-- by Franchin Matteo, fnch@libero.it -->
 <!-- NOTE: Keep in sync with the "Fortran (Free Format)" highlighter! (fortran-free.xml) -->
   <highlighting>
@@ -427,7 +427,7 @@
 
 <!-- This context highlights the continuation character -->
       <context attribute="Normal Text" lineEndContext="#stay" name="find_continue">
-        <RegExpr attribute="Continuation character" context="#stay" String="^     [^0-9\s]"/>
+        <RegExpr attribute="Continuation character" context="#stay" String="^     [^0-9\s]" column="0"/>
       </context>
 
 <!-- This context highlights items inside the parentesis of a function -->
@@ -441,7 +441,7 @@
 
 <!-- The following two contexts match input/output statements -->
       <context attribute="Normal Text" lineEndContext="#stay" name="find_io_stmnts">
-        <RegExpr attribute="IO Function" context="find_io_paren" String="\b(read|write|backspace|rewind|end\s*file|close|open|inquire)\s*[(]" insensitive="true"/>
+        <RegExpr attribute="IO Function" context="find_io_paren" String="\b(?:read|write|backspace|rewind|end\s*file|close|open|inquire)\s*[(]" insensitive="true"/>
         <RegExpr attribute="IO Function" context="format_stmnt" String="\bformat\s*[(]" insensitive="true"/>
         <RegExpr attribute="IO Function" context="#stay" String="\bend\s*file\b" insensitive="true"/>
         <keyword attribute="IO Function" context="#stay" String="io_functions"/>
@@ -472,35 +472,35 @@
 <!-- The following context matches the begin of program units -->
       <context attribute="Normal Text" lineEndContext="#stay" name="find_begin_stmnts">
         <RegExpr attribute="Keyword" context="#stay" String="\bmodule\s+procedure\b" insensitive="true"/>
-        <RegExpr attribute="Keyword" context="#stay" String="\b(subroutine|function|block\s*data|program|module)\b" insensitive="true" beginRegion="Routine"/>
-        <RegExpr attribute="Keyword" context="#stay" String="\b(then|do|select\s+case)\b" insensitive="true" beginRegion="Block"/>
+        <RegExpr attribute="Keyword" context="#stay" String="\b(?:subroutine|function|block\s*data|program|module)\b" insensitive="true" beginRegion="Routine"/>
+        <RegExpr attribute="Keyword" context="#stay" String="\b(?:then|do|select\s+case)\b" insensitive="true" beginRegion="Block"/>
       </context>
 <!-- The following context matches the end of program units -->
       <context attribute="Normal Text" lineEndContext="#stay" name="find_end_stmnts">
-        <RegExpr attribute="Keyword" context="#stay" String="\bend\s*(subroutine|function|block\s*data|program|module)\b" insensitive="true" endRegion="Routine"/>
-        <RegExpr attribute="Keyword" context="#stay" String="\bend\s*(do|if)\b" insensitive="true" endRegion="Block"/>
-        <RegExpr attribute="Keyword" context="#stay" String="\bend\s*(select|where|forall|interface)\b" insensitive="true"/>
+        <RegExpr attribute="Keyword" context="#stay" String="\bend\s*(?:subroutine|function|block\s*data|program|module)\b" insensitive="true" endRegion="Routine"/>
+        <RegExpr attribute="Keyword" context="#stay" String="\bend\s*(?:do|if)\b" insensitive="true" endRegion="Block"/>
+        <RegExpr attribute="Keyword" context="#stay" String="\bend\s*(?:select|where|forall|interface)\b" insensitive="true"/>
         <RegExpr attribute="Keyword" context="#stay" String="\belse\s*if\b" insensitive="true" endRegion="Block"/>
         <WordDetect attribute="Keyword" context="#stay" String="end" insensitive="true" endRegion="Routine"/>
       </context>
 <!-- The following context matches the mid of program units -->
       <context attribute="Normal Text" lineEndContext="#stay" name="find_mid_stmnts">
         <WordDetect attribute="Keyword" context="#stay" String="else" insensitive="true" endRegion="Block" beginRegion="Block"/>
-        <RegExpr attribute="Keyword" context="#stay" String="\bcase(\s+default)?\b" insensitive="true" endRegion="Block" beginRegion="Block"/>
+        <RegExpr attribute="Keyword" context="#stay" String="\bcase(?:\s+default)?\b" insensitive="true" endRegion="Block" beginRegion="Block"/>
         <WordDetect attribute="Keyword" context="#stay" String="contains" insensitive="true" endRegion="Routine" beginRegion="Routine"/>
       </context>
 
 <!-- The following two contexts match declarations -->
       <context attribute="Normal Text" lineEndContext="#stay" name="find_decls">
-        <RegExpr attribute="Data Type" context="#stay" String="\b(integer|real|complex)[\*]\d{1,2}" insensitive="true"/>
+        <RegExpr attribute="Data Type" context="#stay" String="\b(?:integer|real|complex)[\*]\d{1,2}" insensitive="true"/>
         <RegExpr attribute="Data Type" context="#stay" String="\bend\s*type\b" insensitive="true"/>
         <keyword attribute="Data Type" context="#stay" String="types"/>
         <WordDetect attribute="Data Type" context="#stay" String="data" firstNonSpace="true" insensitive="true"/>
         <!--<RegExpr attribute="Data Type" context="find_paren" String="real\s*[(]" firstNonSpace="true" insensitive="true"/>
         <RegExpr attribute="Data Type" context="#stay" String="real(?![\w\*])" firstNonSpace="true" insensitive="true"/>-->
         <RegExpr attribute="Data Type" context="#stay" String="\bcharacter[*][0-9]+\b" insensitive="true"/>
-        <RegExpr attribute="Data Type" context="find_paren" String="\b(type|integer|real|complex|character|logical|intent|dimension)\s*[(]" insensitive="true"/>
-        <RegExpr attribute="Data Type" context="#stay" String="\b(type|integer|real|complex|character|logical|double\s*precision|intent|dimension)\b" insensitive="true"/>
+        <RegExpr attribute="Data Type" context="find_paren" String="\b(?:type|integer|real|complex|character|logical|intent|dimension)\s*[(]" insensitive="true"/>
+        <RegExpr attribute="Data Type" context="#stay" String="\b(?:type|integer|real|complex|character|logical|double\s*precision|intent|dimension)\b" insensitive="true"/>
         <Detect2Chars attribute="Data Type" context="#stay" char=":" char1=":"/>
       </context>
 <!-- This context matches parenthesis in data type declarations, such as in 'real(...)'-->
@@ -522,13 +522,13 @@
 <!-- The following context matches integer and real numbers -->
       <context attribute="Normal Text" lineEndContext="#stay" name="find_numbers">
         <!-- Floating-point numbers with optional kind -->
-        <RegExpr attribute="Float" context="#stay" String="[0-9]*\.[0-9]+([de][+-]?[0-9]+)?([_]([0-9]+|[a-z][\w_]*))?" insensitive="true"/>
-        <RegExpr attribute="Float" context="#stay" String="\b[0-9]+\.[0-9]*([de][+-]?[0-9]+)?([_]([0-9]+|[a-z][\w_]*))?(?![a-z])" insensitive="true"/>
-        <RegExpr attribute="Float" context="#stay" String="\b[0-9]+[de][+-]?[0-9]+([_]([0-9]+|[a-z][\w_]*))?" insensitive="true"/>
+        <RegExpr attribute="Float" context="#stay" String="[0-9]*\.[0-9]+(?:[de][+-]?[0-9]+)?(?:[_](?:[0-9]+|[a-z][\w_]*))?" insensitive="true"/>
+        <RegExpr attribute="Float" context="#stay" String="\b[0-9]+\.[0-9]*(?:[de][+-]?[0-9]+)?(?:[_](?:[0-9]+|[a-z][\w_]*))?(?![a-z])" insensitive="true"/>
+        <RegExpr attribute="Float" context="#stay" String="\b[0-9]+[de][+-]?[0-9]+(?:[_](?:[0-9]+|[a-z][\w_]*))?" insensitive="true"/>
         <!-- Integers with optional kind specifier -->
-        <RegExpr attribute="Decimal" context="#stay" String="\b[0-9]+([_]([0-9]+|[a-zA-Z][\w_]*))?"/>
+        <RegExpr attribute="Decimal" context="#stay" String="\b[0-9]+(?:[_](?:[0-9]+|[a-zA-Z][\w_]*))?"/>
         <!-- Integers in binary, octal and hexadecimal notations -->
-        <RegExpr attribute="Decimal" context="#stay" String="\b[bozx]([&apos;][0-9a-f]+[&apos;]|[&quot;][0-9a-f]+[&quot;])" insensitive="true"/>
+        <RegExpr attribute="Decimal" context="#stay" String="\b[bozx](?:[&apos;][0-9a-f]+[&apos;]|[&quot;][0-9a-f]+[&quot;])" insensitive="true"/>
       </context>
 
 <!-- The following four contexts implement the complex string multi-line declarations -->
diff --git a/data/syntax/fortran-free.xml b/data/syntax/fortran-free.xml
--- a/data/syntax/fortran-free.xml
+++ b/data/syntax/fortran-free.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="Fortran (Free Format)" version="2" kateversion="5.53" section="Sources" extensions="*.f90;*.F90;*.f95;*.F95;*.f03;*.F03;*.f08;*.F08;" mimetype="text/x-fortran-src" casesensitive="0" author="Franchin Matteo (fnch@libero.it), Janus Weil" license="MIT" priority="10">
+<language name="Fortran (Free Format)" version="3" kateversion="5.53" section="Sources" extensions="*.f90;*.F90;*.f95;*.F95;*.f03;*.F03;*.f08;*.F08;" mimetype="text/x-fortran-src" casesensitive="0" author="Franchin Matteo (fnch@libero.it), Janus Weil" license="MIT" priority="10">
 <!-- Original author: Franchin Matteo (fnch@libero.it).
      Adaptation to free & fixed format: Janus Weil.
 -->
@@ -164,9 +164,9 @@
 
 <!-- The following two contexts match input/output statements -->
       <context attribute="Normal Text" lineEndContext="#stay" name="find_io_stmnts">
-        <RegExpr attribute="IO Function" context="find_io_paren" String="\b(flush|wait)\s*[(]" insensitive="true"/>
+        <RegExpr attribute="IO Function" context="find_io_paren" String="\b(?:flush|wait)\s*[(]" insensitive="true"/>
       <!-- find_io_stmnts##Fortran (Fixed Format) -->
-        <RegExpr attribute="IO Function" context="find_io_paren" String="\b(read|write|backspace|rewind|end\s*file|close|open|inquire)\s*[(]" insensitive="true"/>
+        <RegExpr attribute="IO Function" context="find_io_paren" String="\b(?:read|write|backspace|rewind|end\s*file|close|open|inquire)\s*[(]" insensitive="true"/>
         <RegExpr attribute="IO Function" context="format_stmnt" String="\bformat\s*[(]" insensitive="true"/>
         <RegExpr attribute="IO Function" context="#stay" String="\bend\s*file\b" insensitive="true"/>
         <keyword attribute="IO Function" context="#stay" String="io_functions"/>
@@ -197,44 +197,44 @@
 <!-- The following context matches the begin of program units -->
       <context attribute="Normal Text" lineEndContext="#stay" name="find_begin_stmnts">
         <WordDetect attribute="Keyword" context="#stay" String="submodule" insensitive="true" beginRegion="Routine"/>
-        <RegExpr attribute="Keyword" context="#stay" String="\b(do\s*(,|\s)\s*concurrent|select\s+type|block|critical)\b" insensitive="true" beginRegion="Block"/>
+        <RegExpr attribute="Keyword" context="#stay" String="\b(?:do\s*[,\s]\s*concurrent|select\s+type|block|critical)\b" insensitive="true" beginRegion="Block"/>
       <!-- Here IncludeRules: find_begin_stmnts##Fortran (Fixed Format) -->
         <RegExpr attribute="Keyword" context="#stay" String="\bmodule\s+procedure\b" insensitive="true"/>
-        <RegExpr attribute="Keyword" context="#stay" String="\b(subroutine|function|block\s*data|program|module)\b" insensitive="true" beginRegion="Routine"/>
-        <RegExpr attribute="Keyword" context="#stay" String="\b(then|do|select\s+case)\b" insensitive="true" beginRegion="Block"/>
+        <RegExpr attribute="Keyword" context="#stay" String="\b(?:subroutine|function|block\s*data|program|module)\b" insensitive="true" beginRegion="Routine"/>
+        <RegExpr attribute="Keyword" context="#stay" String="\b(?:then|do|select\s+case)\b" insensitive="true" beginRegion="Block"/>
       </context>
 <!-- The following context matches the end of program units -->
       <context attribute="Normal Text" lineEndContext="#stay" name="find_end_stmnts">
-        <RegExpr attribute="Keyword" context="#stay" String="\bend\s*(procedure|submodule)\b" insensitive="true" endRegion="Routine"/>
-        <RegExpr attribute="Keyword" context="#stay" String="\bend\s*(block|critical)\b" insensitive="true" endRegion="Block"/>
-        <RegExpr attribute="Keyword" context="#stay" String="\bend\s*(associate)\b" insensitive="true"/>
-        <RegExpr attribute="Data Type" context="#stay" String="\bend\s*(type|enum)\b" insensitive="true"/>
+        <RegExpr attribute="Keyword" context="#stay" String="\bend\s*(?:procedure|submodule)\b" insensitive="true" endRegion="Routine"/>
+        <RegExpr attribute="Keyword" context="#stay" String="\bend\s*(?:block|critical)\b" insensitive="true" endRegion="Block"/>
+        <RegExpr attribute="Keyword" context="#stay" String="\bend\s*(?:associate)\b" insensitive="true"/>
+        <RegExpr attribute="Data Type" context="#stay" String="\bend\s*(?:type|enum)\b" insensitive="true"/>
       <!-- Here IncludeRules: find_end_stmnts##Fortran (Fixed Format) -->
-        <RegExpr attribute="Keyword" context="#stay" String="\bend\s*(subroutine|function|block\s*data|program|module)\b" insensitive="true" endRegion="Routine"/>
-        <RegExpr attribute="Keyword" context="#stay" String="\bend\s*(do|if)\b" insensitive="true" endRegion="Block"/>
-        <RegExpr attribute="Keyword" context="#stay" String="\bend\s*(select|where|forall|interface)\b" insensitive="true"/>
+        <RegExpr attribute="Keyword" context="#stay" String="\bend\s*(?:subroutine|function|block\s*data|program|module)\b" insensitive="true" endRegion="Routine"/>
+        <RegExpr attribute="Keyword" context="#stay" String="\bend\s*(?:do|if)\b" insensitive="true" endRegion="Block"/>
+        <RegExpr attribute="Keyword" context="#stay" String="\bend\s*(?:select|where|forall|interface)\b" insensitive="true"/>
         <RegExpr attribute="Keyword" context="#stay" String="\belse\s*if\b" insensitive="true" endRegion="Block"/>
         <WordDetect attribute="Keyword" context="#stay" String="end" insensitive="true" endRegion="Routine"/>
       </context>
 <!-- The following context matches the mid of program units -->
       <context attribute="Normal Text" lineEndContext="#stay" name="find_mid_stmnts">
-        <RegExpr attribute="Keyword" context="#stay" String="\b(type\s+is|class\s+(is|default))\b" insensitive="true" endRegion="Block" beginRegion="Block"/>
+        <RegExpr attribute="Keyword" context="#stay" String="\b(?:type\s+is|class\s+(?:is|default))\b" insensitive="true" endRegion="Block" beginRegion="Block"/>
       <!-- Here IncludeRules: find_mid_stmnts##Fortran (Fixed Format) -->
         <WordDetect attribute="Keyword" context="#stay" String="else" insensitive="true" endRegion="Block" beginRegion="Block"/>
-        <RegExpr attribute="Keyword" context="#stay" String="\bcase(\s+default)?\b" insensitive="true" endRegion="Block" beginRegion="Block"/>
+        <RegExpr attribute="Keyword" context="#stay" String="\bcase(?:\s+default)?\b" insensitive="true" endRegion="Block" beginRegion="Block"/>
         <WordDetect attribute="Keyword" context="#stay" String="contains" insensitive="true" endRegion="Routine" beginRegion="Routine"/>
       </context>
 
 <!-- The following two contexts match declarations -->
       <context attribute="Normal Text" lineEndContext="#stay" name="find_decls">
-        <RegExpr attribute="Data Type" context="find_paren" String="\b(class|extends|procedure|pass|codimension)\s*[(]" insensitive="true"/>
+        <RegExpr attribute="Data Type" context="find_paren" String="\b(?:class|extends|procedure|pass|codimension)\s*[(]" insensitive="true"/>
         <WordDetect attribute="Data Type" context="#stay" String="codimension" insensitive="true"/>
         <WordDetect attribute="Data Type" context="#stay" String="procedure" insensitive="true"/>
         <WordDetect attribute="Data Type" context="#stay" String="pass" insensitive="true"/>
       <!-- find_decls##Fortran (Fixed Format) -->
         <keyword attribute="Data Type" context="#stay" String="types"/>
         <!--<RegExpr attribute="Data Type" context="find_paren" String="real\s*[(]" firstNonSpace="true" insensitive="true"/>-->
-        <RegExpr attribute="Data Type" context="find_paren" String="\b(type|integer|real|complex|character|logical|intent|dimension)\s*[(]" insensitive="true"/>
+        <RegExpr attribute="Data Type" context="find_paren" String="\b(?:type|integer|real|complex|character|logical|intent|dimension)\s*[(]" insensitive="true"/>
         <IncludeRules context="find_decls##Fortran (Fixed Format)"/>
       </context>
 <!-- This context matches parenthesis in data type declarations, such as in 'real(...)'-->
diff --git a/data/syntax/html.xml b/data/syntax/html.xml
--- a/data/syntax/html.xml
+++ b/data/syntax/html.xml
@@ -3,9 +3,9 @@
 [
 	<!ENTITY name          "[A-Za-z_:][\w.:_-]*">
 	<!ENTITY attributeName "[A-Za-z_:*#\(\[][\)\]\w.:_-]*">
-	<!ENTITY entref        "&amp;(#[0-9]+|#[xX][0-9A-Fa-f]+|&name;);">
+	<!ENTITY entref        "&amp;(?:#[0-9]+|#[xX][0-9A-Fa-f]+|&name;);">
 ]>
-<language name="HTML" version="10" kateversion="5.53" section="Markup" extensions="*.htm;*.html;*.shtml;*.shtm" mimetype="text/html"  author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL" priority="10">
+<language name="HTML" version="11" kateversion="5.53" section="Markup" extensions="*.htm;*.html;*.shtml;*.shtm" mimetype="text/html"  author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL" priority="10">
 
 <highlighting>
 <contexts>
@@ -33,37 +33,37 @@
   </context>
 
   <context name="FindHTMLTags" attribute="Normal Text" lineEndContext="#stay">
-    <RegExpr attribute="Element" context="El Open" String="&lt;pre\b" insensitive="true" beginRegion="pre" />
-    <RegExpr attribute="Element" context="El Open" String="&lt;div\b" insensitive="true" beginRegion="div" />
-    <RegExpr attribute="Element" context="El Open" String="&lt;table\b" insensitive="true" beginRegion="table" />
-    <RegExpr attribute="Element" context="El Open" String="&lt;ul\b" insensitive="true" beginRegion="ul" />
-    <RegExpr attribute="Element" context="El Open" String="&lt;ol\b" insensitive="true" beginRegion="ol" />
-    <RegExpr attribute="Element" context="El Open" String="&lt;dl\b" insensitive="true" beginRegion="dl" />
-    <RegExpr attribute="Element" context="El Open" String="&lt;article\b" insensitive="true" beginRegion="article" />
-    <RegExpr attribute="Element" context="El Open" String="&lt;aside\b" insensitive="true" beginRegion="aside" />
-    <RegExpr attribute="Element" context="El Open" String="&lt;details\b" insensitive="true" beginRegion="details" />
-    <RegExpr attribute="Element" context="El Open" String="&lt;figure\b" insensitive="true" beginRegion="figure" />
-    <RegExpr attribute="Element" context="El Open" String="&lt;footer\b" insensitive="true" beginRegion="footer" />
-    <RegExpr attribute="Element" context="El Open" String="&lt;header\b" insensitive="true" beginRegion="header" />
-    <RegExpr attribute="Element" context="El Open" String="&lt;main\b" insensitive="true" beginRegion="main" />
-    <RegExpr attribute="Element" context="El Open" String="&lt;nav\b" insensitive="true" beginRegion="nav" />
-    <RegExpr attribute="Element" context="El Open" String="&lt;section\b" insensitive="true" beginRegion="section" />
+    <WordDetect attribute="Element" context="El Open" String="&lt;pre" insensitive="true" beginRegion="pre" />
+    <WordDetect attribute="Element" context="El Open" String="&lt;div" insensitive="true" beginRegion="div" />
+    <WordDetect attribute="Element" context="El Open" String="&lt;table" insensitive="true" beginRegion="table" />
+    <WordDetect attribute="Element" context="El Open" String="&lt;ul" insensitive="true" beginRegion="ul" />
+    <WordDetect attribute="Element" context="El Open" String="&lt;ol" insensitive="true" beginRegion="ol" />
+    <WordDetect attribute="Element" context="El Open" String="&lt;dl" insensitive="true" beginRegion="dl" />
+    <WordDetect attribute="Element" context="El Open" String="&lt;article" insensitive="true" beginRegion="article" />
+    <WordDetect attribute="Element" context="El Open" String="&lt;aside" insensitive="true" beginRegion="aside" />
+    <WordDetect attribute="Element" context="El Open" String="&lt;details" insensitive="true" beginRegion="details" />
+    <WordDetect attribute="Element" context="El Open" String="&lt;figure" insensitive="true" beginRegion="figure" />
+    <WordDetect attribute="Element" context="El Open" String="&lt;footer" insensitive="true" beginRegion="footer" />
+    <WordDetect attribute="Element" context="El Open" String="&lt;header" insensitive="true" beginRegion="header" />
+    <WordDetect attribute="Element" context="El Open" String="&lt;main" insensitive="true" beginRegion="main" />
+    <WordDetect attribute="Element" context="El Open" String="&lt;nav" insensitive="true" beginRegion="nav" />
+    <WordDetect attribute="Element" context="El Open" String="&lt;section" insensitive="true" beginRegion="section" />
     <RegExpr attribute="Element" context="El Open" String="&lt;&name;" />
-    <RegExpr attribute="Element" context="El Close" String="&lt;/pre\b" insensitive="true" endRegion="pre" />
-    <RegExpr attribute="Element" context="El Close" String="&lt;/div\b" insensitive="true" endRegion="div" />
-    <RegExpr attribute="Element" context="El Close" String="&lt;/table\b" insensitive="true" endRegion="table" />
-    <RegExpr attribute="Element" context="El Close" String="&lt;/ul\b" insensitive="true" endRegion="ul" />
-    <RegExpr attribute="Element" context="El Close" String="&lt;/ol\b" insensitive="true" endRegion="ol" />
-    <RegExpr attribute="Element" context="El Close" String="&lt;/dl\b" insensitive="true" endRegion="dl" />
-    <RegExpr attribute="Element" context="El Close" String="&lt;/article\b" insensitive="true" endRegion="article" />
-    <RegExpr attribute="Element" context="El Close" String="&lt;/aside\b" insensitive="true" endRegion="aside" />
-    <RegExpr attribute="Element" context="El Close" String="&lt;/details\b" insensitive="true" endRegion="details" />
-    <RegExpr attribute="Element" context="El Close" String="&lt;/figure\b" insensitive="true" endRegion="figure" />
-    <RegExpr attribute="Element" context="El Close" String="&lt;/footer\b" insensitive="true" endRegion="footer" />
-    <RegExpr attribute="Element" context="El Close" String="&lt;/header\b" insensitive="true" endRegion="header" />
-    <RegExpr attribute="Element" context="El Close" String="&lt;/main\b" insensitive="true" endRegion="main" />
-    <RegExpr attribute="Element" context="El Close" String="&lt;/nav\b" insensitive="true" endRegion="nav" />
-    <RegExpr attribute="Element" context="El Close" String="&lt;/section\b" insensitive="true" endRegion="section" />
+    <WordDetect attribute="Element" context="El Close" String="&lt;/pre" insensitive="true" endRegion="pre" />
+    <WordDetect attribute="Element" context="El Close" String="&lt;/div" insensitive="true" endRegion="div" />
+    <WordDetect attribute="Element" context="El Close" String="&lt;/table" insensitive="true" endRegion="table" />
+    <WordDetect attribute="Element" context="El Close" String="&lt;/ul" insensitive="true" endRegion="ul" />
+    <WordDetect attribute="Element" context="El Close" String="&lt;/ol" insensitive="true" endRegion="ol" />
+    <WordDetect attribute="Element" context="El Close" String="&lt;/dl" insensitive="true" endRegion="dl" />
+    <WordDetect attribute="Element" context="El Close" String="&lt;/article" insensitive="true" endRegion="article" />
+    <WordDetect attribute="Element" context="El Close" String="&lt;/aside" insensitive="true" endRegion="aside" />
+    <WordDetect attribute="Element" context="El Close" String="&lt;/details" insensitive="true" endRegion="details" />
+    <WordDetect attribute="Element" context="El Close" String="&lt;/figure" insensitive="true" endRegion="figure" />
+    <WordDetect attribute="Element" context="El Close" String="&lt;/footer" insensitive="true" endRegion="footer" />
+    <WordDetect attribute="Element" context="El Close" String="&lt;/header" insensitive="true" endRegion="header" />
+    <WordDetect attribute="Element" context="El Close" String="&lt;/main" insensitive="true" endRegion="main" />
+    <WordDetect attribute="Element" context="El Close" String="&lt;/nav" insensitive="true" endRegion="nav" />
+    <WordDetect attribute="Element" context="El Close" String="&lt;/section" insensitive="true" endRegion="section" />
     <RegExpr attribute="Element" context="El Close" String="&lt;/&name;" />
   </context>
 
@@ -85,16 +85,16 @@
   </context>
 
   <context name="FindDTDRules" attribute="Other Text" lineEndContext="#stay">
-    <RegExpr attribute="Doctype" context="Doctype Markupdecl" String="&lt;!(ELEMENT|ENTITY|ATTLIST|NOTATION)\b" />
+    <RegExpr attribute="Doctype" context="Doctype Markupdecl" String="&lt;!(?:ELEMENT|ENTITY|ATTLIST|NOTATION)\b" />
   </context>
 
 
   <context name="Comment" attribute="Comment" lineEndContext="#stay">
     <DetectSpaces/>
     <IncludeRules context="##Alerts" />
     <DetectIdentifier/>
     <StringDetect attribute="Comment" context="#pop" String="--&gt;" endRegion="comment" />
-    <RegExpr attribute="Error" context="#stay" String="-(-(?!-&gt;))+" />
+    <RegExpr attribute="Error" context="#stay" String="-(?:-(?!-&gt;))+" />
   </context>
 
   <context name="CDATA" attribute="Other Text" lineEndContext="#stay">
@@ -172,7 +172,7 @@
   </context>
 
   <context name="JS" attribute="Other Text" lineEndContext="#stay">
-    <RegExpr attribute="Attribute" context="Script-Type" String="(\s+|^)type(?=\=|\s|$)" insensitive="true"/>
+    <RegExpr attribute="Attribute" context="Script-Type" String="(?:\s+|^)type(?=\=|\s|$)" insensitive="true"/>
     <DetectChar attribute="Element" context="JS content" char="&gt;" />
     <IncludeRules context="DefaultJS" />
   </context>
@@ -310,7 +310,7 @@
 </highlighting>
 <general>
   <comments>
-    <comment name="multiLine" start="&lt;!--" end="--&gt;" />
+    <comment name="multiLine" start="&lt;!--" end="--&gt;" region="comment" />
   </comments>
 </general>
 </language>
diff --git a/data/syntax/logcat.xml b/data/syntax/logcat.xml
--- a/data/syntax/logcat.xml
+++ b/data/syntax/logcat.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd"
 [
-	<!ENTITY datetime "((.\[)?(\d{1,2};){2}\d{1,3}m\s*)?((\d{4}\-)?\d{2}\-\d{2}\s\d{2}(:\d{2}){2}\.\d{3,6}(\s[\-\+]\d{4})?|\d+\.\d{3,6}):?">
-	<!ENTITY priority_tag "([/\s][^:\(]*(\([^\)]+\))?:|\([^\)]+\):?)"> <!-- Tag/PID/Threads -->
+	<!ENTITY datetime "(?:(?:.\[)?(?:\d{1,2};){2}\d{1,3}m\s*)?(?:(?:\d{4}\-)?\d{2}\-\d{2}\s\d{2}(?:\:\d{2}){2}\.\d{3,6}(?:\s[\-\+]\d{4})?|\d+\.\d{3,6})\:?">
+	<!ENTITY priority_tag "(?:[/\s][^:\(]*(?:\([^\)]+\))?:|\([^\)]+\):?)"> <!-- Tag/PID/Threads -->
 	<!ENTITY delim        "[/\(\s]"> <!-- Delimiter between priority and tag -->
 ]>
 
@@ -30,11 +30,11 @@
    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
   ==========================================================================================
 
-  Last update: August 30, 2019 (v4)
+  Last update: October 25, 2019 (v5)
 -->
 
 <language name="Logcat"
-          version="4"
+          version="5"
           kateversion="5.0"
           section="Other"
           extensions="*.logcat"
@@ -55,13 +55,13 @@
 				<RegExpr context="#stay" attribute="DateTime" String="&datetime;" firstNonSpace="true" />
 
 				<!-- Priority & Tag -->
-				<RegExpr context="VerboseMsg" attribute="Verbose Tag" String="(^|\s)[V\?](&priority_tag;|(?=&delim;))" />
-				<RegExpr context="DebugMsg"   attribute="Debug Tag"   String="(^|\s)D(&priority_tag;|(?=&delim;))" />
-				<RegExpr context="InfoMsg"    attribute="Info Tag"    String="(^|\s)I(&priority_tag;|(?=&delim;))" />
-				<RegExpr context="WarningMsg" attribute="Warning Tag" String="(^|\s)W(&priority_tag;|(?=&delim;))" />
-				<RegExpr context="AssertMsg"  attribute="Assert Tag"  String="(^|\s)A(&priority_tag;|(?=&delim;))" />
-				<RegExpr context="SilentMsg"  attribute="Silent Tag"  String="(^|\s)S(&priority_tag;|(?=&delim;))" />
-				<RegExpr context="ErrorMsg"   attribute="Error Tag"   String="(^|\s)E(&priority_tag;|(?=&delim;))" />
+				<RegExpr context="VerboseMsg" attribute="Verbose Tag" String="(?:^|\s)[V\?](?:&priority_tag;|(?=&delim;))" />
+				<RegExpr context="DebugMsg"   attribute="Debug Tag"   String="(?:^|\s)D(?:&priority_tag;|(?=&delim;))" />
+				<RegExpr context="InfoMsg"    attribute="Info Tag"    String="(?:^|\s)I(?:&priority_tag;|(?=&delim;))" />
+				<RegExpr context="WarningMsg" attribute="Warning Tag" String="(?:^|\s)W(?:&priority_tag;|(?=&delim;))" />
+				<RegExpr context="AssertMsg"  attribute="Assert Tag"  String="(?:^|\s)A(?:&priority_tag;|(?=&delim;))" />
+				<RegExpr context="SilentMsg"  attribute="Silent Tag"  String="(?:^|\s)S(?:&priority_tag;|(?=&delim;))" />
+				<RegExpr context="ErrorMsg"   attribute="Error Tag"   String="(?:^|\s)E(?:&priority_tag;|(?=&delim;))" />
 
 				<RegExpr context="#stay"      attribute="Error Tag"   String="\sF&delim;.*\033\[\d{1,3}m$" />
 				<RegExpr context="FatalMsg"   attribute="Fatal"       String="^F&delim;" />
@@ -155,7 +155,7 @@
 				<StringDetect context="#pop!CommentLine" attribute="Comment" String="---------" firstNonSpace="true" />
 				<RegExpr context="#pop" attribute="Comment" String="\*\s.+\s\*$" column="0" />
 				<RegExpr context="#pop!LongLog" attribute="Normal Text" String="\[(?=\s+&datetime;\s.+\s\]$)" column="0" />
-				<RegExpr context="EmptyLine" attribute="Normal Text" String="^\s*$" />
+				<RegExpr context="EmptyLine" attribute="Normal Text" String="^\s*$" column="0" />
 			</context>
 			<context name="EmptyLine" attribute="Normal Text" lineEndContext="#stay" fallthrough="true" fallthroughContext="#pop">
 				<DetectChar context="#pop#pop!CommentLine" attribute="Comment" char="#" firstNonSpace="true" />
@@ -198,6 +198,10 @@
 		<comments>
 			<comment name="singleLine" start="#" />
 		</comments>
+
+		<emptyLines>
+			<emptyLine regexpr="\s+"/>
+		</emptyLines>
 	</general>
 
 </language>
diff --git a/data/syntax/mustache.xml b/data/syntax/mustache.xml
--- a/data/syntax/mustache.xml
+++ b/data/syntax/mustache.xml
@@ -42,7 +42,7 @@
      * v1 [2019-02-10]: Initial version
 -->
 
-<language name="Mustache/Handlebars (HTML)" version="3" kateversion="5.44"
+<language name="Mustache/Handlebars (HTML)" version="4" kateversion="5.44"
           section="Markup" priority="1" mimetype=""
           extensions="*.mustache;*.handlebars;*.hbs;*.ractive;*.hogan;*.hulk;*.html.mst;*.html.mu;*.html.rac"
           author="Nibaldo González (nibgonz@gmail.com), based on the HTML highlighter by Wilbert Berendsen (wilbert@kde.nl)"
@@ -84,8 +84,8 @@
 			<RegExpr context="#pop!MustacheRawBlockContent" attribute="Mustache Block" String="\{{4}[^/].*\}{4}" minimal="true" beginRegion="HandlebarsRawBlock" />
 			<!-- Sections -->
 			<!-- For helpers (not included because it's redundant):
-			       Start: \{\{~?#?\s*(?=(if|unless|with|link\-to|each(\-in)?)\b)
-			       End:   \{\{~?/\s*(?=(if|unless|with|link\-to|each(\-in)?)\b)  -->
+			       Start: \{\{~?#?\s*(?=(?:if|unless|with|link\-to|each(?:\-in)?)\b)
+			       End:   \{\{~?/\s*(?=(?:if|unless|with|link\-to|each(?:\-in)?)\b)  -->
 			<RegExpr context="#pop!MustacheVariableBlock" attribute="Mustache Block" String="\{\{~?\s*else(?:\s+(?:if|unless|with|link\-to|each(?:\-in)?))?\b" />
 			<RegExpr context="#pop!MustacheVariableBlock" attribute="Mustache Block" String="\{\{~?[#\^][&gt;\*]?\s*&identifier;\b" beginRegion="MustacheBlock" />
 			<RegExpr context="#pop" attribute="Mustache Block" String="\{\{~?/\s*&identifier;\s*\}\}" endRegion="MustacheBlock" />
@@ -463,7 +463,7 @@
 
 <general>
 	<comments>
-		<comment name="multiLine" start="{{!" end="}}" />
+		<comment name="multiLine" start="{{!" end="}}" region="MustacheInlineComment" />
 	</comments>
 </general>
 
diff --git a/data/syntax/rust.xml b/data/syntax/rust.xml
--- a/data/syntax/rust.xml
+++ b/data/syntax/rust.xml
@@ -28,12 +28,12 @@
 -->
 <!DOCTYPE language SYSTEM "language.dtd"
 [
-	<!ENTITY rustIdent "([a-zA-Z_]|[^[:ascii:]])(\w|[^[:ascii:]])*">
-	<!ENTITY rustIntSuf "([iu](8|16|32|64|128|size)?)?">
-	<!ENTITY commonEscape "([trn0&apos;&quot;\\]|x[0-9a-fA-F]{2})">
-	<!ENTITY unicodeEscape "u\{([0-9a-fA-F]_*){1,6}\}">
+	<!ENTITY rustIdent "(?:[a-zA-Z_]|[^[:ascii:]])(?:\w|[^[:ascii:]])*">
+	<!ENTITY rustIntSuf "(?:[iu](?:8|16|32|64|128|size)?)?">
+	<!ENTITY commonEscape "(?:[trn0&apos;&quot;\\]|x[0-9a-fA-F]{2})">
+	<!ENTITY unicodeEscape "u\{(?:[0-9a-fA-F]_*){1,6}\}">
 ]>
-<language name="Rust" version="7" kateversion="5.0" section="Sources" extensions="*.rs" mimetype="text/rust" priority="15" license="MIT" author="The Rust Project Developers">
+<language name="Rust" version="8" kateversion="5.0" section="Sources" extensions="*.rs" mimetype="text/rust" priority="15" license="MIT" author="The Rust Project Developers">
 <highlighting>
 	<list name="fn">
 		<item>fn</item>
@@ -372,11 +372,11 @@
 			<keyword String="traits" attribute="Trait" context="#stay"/>
 			<IncludeRules context="FindComments"/>
 			<!-- Hexadecimal, Octal & Binary -->
-			<RegExpr String="\b0(x[0-9a-fA-F_]+|o[0-7_]+|b[01_]+)&rustIntSuf;\b" attribute="Number" context="#stay"/>
+			<RegExpr String="\b0(?:x[0-9a-fA-F_]+|o[0-7_]+|b[01_]+)&rustIntSuf;\b" attribute="Number" context="#stay"/>
 			<!-- Float & Decimal -->
-			<RegExpr String="\b[0-9][0-9_]*((\.[0-9][0-9_]*)?([eE][\+\-]?[0-9_]+)?(f32|f64)?|&rustIntSuf;)\b" attribute="Number" context="#stay"/>
+			<RegExpr String="\b[0-9][0-9_]*(?:(?:\.[0-9][0-9_]*)?(?:[eE][\+\-]?[0-9_]+)?(?:f32|f64)?|&rustIntSuf;)\b" attribute="Number" context="#stay"/>
 			<!-- Invalid number -->
-			<RegExpr String="\b0(b[01_]*[^01_]|o[0-7_]*[^0-7_]|x[0-9a-fA-F_]*[^0-9a-fA-F_])\w*&rustIntSuf;\b" attribute="Error" context="#stay"/>
+			<RegExpr String="\b0(?:b[01_]*[^01_]|o[0-7_]*[^0-7_]|x[0-9a-fA-F_]*[^0-9a-fA-F_])\w*&rustIntSuf;\b" attribute="Error" context="#stay"/>
 			<Detect2Chars char="#" char1="[" attribute="Attribute" context="Attribute" beginRegion="Attribute"/>
 			<StringDetect String="#![" attribute="Attribute" context="Attribute" beginRegion="Attribute"/>
 			<RegExpr String="&rustIdent;::" attribute="Scope"/>
@@ -386,13 +386,13 @@
 			<DetectChar char="{" attribute="Symbol" context="#stay" beginRegion="Brace" />
 			<DetectChar char="}" attribute="Symbol" context="#stay" endRegion="Brace" />
 			<!-- Raw Strings -->
-			<RegExpr String="b?r(#*)&quot;" attribute="String" context="RawString" dynamic="true"/>
+			<RegExpr String="b?r(#*)&quot;" attribute="String" context="RawString"/>
 			<!-- Byte Strings -->
 			<Detect2Chars char="b" char1="&quot;" attribute="String" context="ByteString"/>
 			<!-- Strings -->
 			<DetectChar char="&quot;" attribute="String" context="String"/>
 			<!-- Byte -->
-			<RegExpr String="b&apos;(?=([^&apos;\\]|\\&commonEscape;)&apos;)" attribute="Character" context="Character"/>
+			<RegExpr String="b&apos;(?=(?:[^&apos;\\]|\\&commonEscape;)&apos;)" attribute="Character" context="Character"/>
 			<!-- Character -->
 			<DetectChar char="&apos;" attribute="Character" context="Character"/>
 			<DetectChar char="[" attribute="Normal Text" context="#stay" beginRegion="Bracket" />
@@ -429,14 +429,14 @@
 			<DetectChar char="\" attribute="CharEscape" context="CharEscape"/>
 			<DetectChar attribute="String" context="#pop" char="&quot;"/>
 		</context>
-		<context attribute="String" lineEndContext="#stay" name="RawString" dynamic="true">
-			<RegExpr String="&quot;%1" attribute="String" context="#pop" dynamic="true"/>
+		<context attribute="String" lineEndContext="#stay" name="RawString">
+			<StringDetect String="&quot;%1" attribute="String" context="#pop" dynamic="true"/>
 		</context>
 		<context attribute="Character" lineEndContext="#pop" name="Character" fallthrough="true" fallthroughContext="#pop">
 			<RegExpr String="[^&apos;\\](?=&apos;)" attribute="Character" context="#stay"/>
-			<RegExpr String="\\(&unicodeEscape;|&commonEscape;)(?=&apos;)" attribute="CharEscape" context="#stay"/>
+			<RegExpr String="\\(?:&unicodeEscape;|&commonEscape;)(?=&apos;)" attribute="CharEscape" context="#stay"/>
 			<DetectChar attribute="Character" context="#pop" char="&apos;"/>
-			<RegExpr String="(\\.|[^&apos;\\])[^&apos;]*(?=&apos;([\d\s!&quot;#&#036;&#037;&amp;&#039;\(\)\*\+,\-\./:;&lt;\=&gt;\?@\[\\\]\^&#096;\{\|\}~[:cntrl:]]|$))" attribute="Error" context="#stay"/>
+			<RegExpr String="(?:\\.|[^&apos;\\])[^&apos;]*(?=&apos;(?:[\d\s!&quot;#&#036;&#037;&amp;&#039;\(\)\*\+,\-\./:;&lt;\=&gt;\?@\[\\\]\^&#096;\{\|\}~[:cntrl:]]|$))" attribute="Error" context="#stay"/>
 		</context>
 		<context attribute="CharEscape" lineEndContext="#pop" name="CharEscape">
 			<RegExpr String="&commonEscape;" attribute="CharEscape" context="#pop"/>
diff --git a/data/syntax/selinux-cil.xml b/data/syntax/selinux-cil.xml
--- a/data/syntax/selinux-cil.xml
+++ b/data/syntax/selinux-cil.xml
@@ -5,8 +5,8 @@
 	<!ENTITY identifier     "[a-zA-Z][\w\-]*">
 	<!ENTITY statementchar  "[a-z_\-]">
 
-	<!ENTITY fullIdentifier "[a-zA-Z][\w\-]*(\.?[\w\-])*">
-	<!ENTITY mlsLevel       "&fullIdentifier;(:&fullIdentifier;(\s*,\s*&fullIdentifier;)*)?">
+	<!ENTITY fullIdentifier "[a-zA-Z][\w\-]*(?:\.?[\w\-])*">
+	<!ENTITY mlsLevel       "&fullIdentifier;(?:\:&fullIdentifier;(?:\s*,\s*&fullIdentifier;)*)?">
 ]>
 
 <!--
@@ -54,7 +54,7 @@
 -->
 
 <language name="SELinux CIL Policy"
-          version="4"
+          version="5"
           kateversion="5.0"
           section="Sources"
           extensions="*.cil"
@@ -334,9 +334,9 @@
 			<DetectChar context="#stay" attribute="Special Char" char="*"/>
 
 			<!-- File Contexts: user_u:role_r:type_t:s0:c0 -->
-			<RegExpr context="_file_contexts" attribute="File Contexts" String="\b&fullIdentifier;(:&fullIdentifier;){2}(:&mlsLevel;(\s*\-\s*&mlsLevel;)?)?([^&symbol;:]|\s|$)" lookAhead="true"/>
+			<RegExpr context="_file_contexts" attribute="File Contexts" String="\b&fullIdentifier;(?:\:&fullIdentifier;){2}(?:\:&mlsLevel;(?:\s*\-\s*&mlsLevel;)?)?(?:[^&symbol;:]|\s|$)" lookAhead="true"/>
 			<!-- Global Namespace (this avoids highlighting keywords) -->
-			<RegExpr context="#stay" String="(\b&identifier;)?(\.&identifier;)+(?=\s|[^&symbol;]|$)"/>
+			<RegExpr context="#stay" String="(?:\b&identifier;)?(?:\.&identifier;)+(?=\s|[^&symbol;]|$)"/>
 
 			<!-- Numbers -->
 			<HlCHex context="#stay" attribute="Hexadecimal"/>
@@ -372,7 +372,7 @@
 		</context>
 		<context name="_square_brackets_cil_path" attribute="RegExp Brackets (Paths)"
 		         lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop!_square_brackets_cil_path_content">
-		<RegExpr context="#pop!_square_brackets_cil_path_content" attribute="Special Char of Brackets (Paths)" String="\^(?=[&symbol;])"/>
+			<RegExpr context="#pop!_square_brackets_cil_path_content" attribute="Special Char of Brackets (Paths)" String="\^(?=[&symbol;])"/>
 		</context>
 		<context name="_square_brackets_cil_path_content" attribute="RegExp Brackets (Paths)" lineEndContext="#pop">
 			<DetectChar context="#pop" attribute="RegExp Brackets (Paths)" char="]"/>
@@ -426,7 +426,7 @@
 			     (permissionx permissionx_id (ioctl class_id (permission ... | expr ...))) -->
 			<RegExpr context="#pop" attribute="Type Name Statements" String="ioctl(?=\s+[&symbol;]+\s*\()"/>
 			<!-- ioctl can be a kind of permissionx or AV permission -->
-			<RegExpr context="#pop!_av_permissions_statement" attribute="Type Name Statements" String="ioctl(?=(\s+[&symbol;]+)?\s*($|;))"/>
+			<RegExpr context="#pop!_av_permissions_statement" attribute="Type Name Statements" String="ioctl(?=(?:\s+[&symbol;]+)?\s*(?:$|;))"/>
 			<RegExpr context="#pop!_av_permissions_statement" attribute="Type Name Statements" String="ioctl(?=\s+[&symbol;]+\s+\d)"/>
 		</context>
 
@@ -438,7 +438,7 @@
 			<WordDetect context="_portcon_statement" attribute="Statements" String="portcon"/>
 			<!-- Fix permissions list if the keywords "ioctl" or "call" are not statements,
 			     but a permissions (see "av_permissions" keyword list of "selinux.xml"). -->
-			<RegExpr context="_av_permissions_statement" String="\b(call|ioctl)\s*\)" lookAhead="true"/>
+			<RegExpr context="_av_permissions_statement" String="\b(?:call|ioctl)\s*\)" lookAhead="true"/>
 			<WordDetect context="_find_ioctl_kind" String="ioctl" lookAhead="true"/>
 			<WordDetect context="_av_permissions_statement" attribute="Statements" String="call"/>
 
@@ -598,7 +598,7 @@
 			<DetectSpaces context="#pop" attribute="Normal Text" lookAhead="true"/>
 		</context>
 		<context name="_fc_type" attribute="File Contexts (Type Enforcement)" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
-			<RegExpr context="#pop!_fc_mls" attribute="File Contexts (Type Enforcement)" String="&fullIdentifier;(?=:&mlsLevel;)"/> <!-- Find Level/Range -->
+			<RegExpr context="#pop!_fc_mls" attribute="File Contexts (Type Enforcement)" String="&fullIdentifier;(?=\:&mlsLevel;)"/> <!-- Find Level/Range -->
 			<RegExpr context="#pop" attribute="File Contexts (Type Enforcement)" String="&fullIdentifier;"/>
 		</context>
 		<!-- (MLS/MCS) user:role:type:level -->
@@ -613,7 +613,7 @@
 		</context>
 		<context name="_fc_level_range_cat" attribute="File Contexts" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
 			<RegExpr context="#pop!_fc_level_sen" attribute="Normal Text" String="\s*\-\s*(?=&mlsLevel;)"/> <!-- Find Range -->
-			<RegExpr context="#stay" attribute="Normal Text" String="(\.|\s*,\s*)(?=&identifier;)"/>
+			<RegExpr context="#stay" attribute="Normal Text" String="(?:\.|\s*,\s*)(?=&identifier;)"/>
 			<IncludeRules context="_default_fc_level"/>
 		</context>
 		<!-- (MLS/MCS) user:role:type:level-level -->
@@ -623,7 +623,7 @@
 			<IncludeRules context="_default_fc_level"/>
 		</context>
 		<context name="_fc_level_cat" attribute="File Contexts" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
-			<RegExpr context="#stay" attribute="Normal Text" String="(\.|\s*,\s*)(?=&identifier;)"/>
+			<RegExpr context="#stay" attribute="Normal Text" String="(?:\.|\s*,\s*)(?=&identifier;)"/>
 			<IncludeRules context="_default_fc_level"/>
 		</context>
 		<context name="_default_fc_level" attribute="File Contexts" lineEndContext="#pop">
diff --git a/data/syntax/selinux-fc.xml b/data/syntax/selinux-fc.xml
--- a/data/syntax/selinux-fc.xml
+++ b/data/syntax/selinux-fc.xml
@@ -2,11 +2,11 @@
 <!DOCTYPE language SYSTEM "language.dtd"
 [
 	<!-- Identifier with M4 Arg. or variables -->
-	<!ENTITY charIden         "(\$[@#]|[\w\-\$\*\{\}&#037;])">
-	<!ENTITY simpleIdentifier "(\$[@#]|[a-zA-Z\$&#037;])&charIden;*">
-	<!ENTITY identifier       "&simpleIdentifier;(\.?&charIden;)*">
-	<!ENTITY startIdentifier  "(\b[a-zA-Z]|\$[@#]|[\$&#037;])&charIden;*(\.?&charIden;)*">
-	<!ENTITY mlsLevel         "&identifier;(\s*:\s*&identifier;(\s*,\s*&identifier;)*)?">
+	<!ENTITY charIden         "(?:\$[@#]|[\w\-\$\*\{\}&#037;])">
+	<!ENTITY simpleIdentifier "(?:\$[@#]|[a-zA-Z\$&#037;])&charIden;*">
+	<!ENTITY identifier       "&simpleIdentifier;(?:\.?&charIden;)*">
+	<!ENTITY startIdentifier  "(?:\b[a-zA-Z]|\$[@#]|[\$&#037;])&charIden;*(?:\.?&charIden;)*">
+	<!ENTITY mlsLevel         "&identifier;(?:\s*\:\s*&identifier;(?:\s*,\s*&identifier;)*)?">
 ]>
 
 <!--
@@ -54,7 +54,7 @@
 -->
 
 <language name="SELinux File Contexts"
-          version="5"
+          version="6"
           kateversion="5.0"
           section="Other"
           extensions="*.fc;file_contexts;file_contexts_*;file_contexts.local;file_contexts.homedirs;file_contexts.template;homedir_template;property_contexts;service_contexts;hwservice_contexts;initial_sid_contexts;genfs_contexts;fs_use"
@@ -70,7 +70,7 @@
 		<context name="_normal" attribute="Normal Text" lineEndContext="#stay">
 			<IncludeRules context="_m4_preprocessor##SELinux Policy"/>
 			<IncludeRules context="_find_comments##SELinux Policy"/>
-			<RegExpr context="#stay" attribute="File Type" String="(\s|^)\-[bcdpls\-](?=\s|$)"/>
+			<RegExpr context="#stay" attribute="File Type" String="(?:\s|^)\-[bcdpls\-](?=\s|$)"/>
 
 			<DetectChar context="_path_content" attribute="Path" char="/"/>
 			<DetectChar context="_quoted" attribute="Text Quoted" char="&quot;"/>
@@ -82,11 +82,11 @@
 			<IncludeRules context="_m4_quotes##SELinux Policy"/>
 
 			<!-- File Contexts:  user:role:type:s0:c0 -->
-			<RegExpr context="_fc_user" attribute="User" String="&startIdentifier;(?=(\s*:\s*&identifier;){2}(\s*:\s*&mlsLevel;(\s*\-\s*&mlsLevel;)?)?\b)"/>
+			<RegExpr context="_fc_user" attribute="User" String="&startIdentifier;(?=(?:\s*\:\s*&identifier;){2}(?:\s*\:\s*&mlsLevel;(?:\s*\-\s*&mlsLevel;)?)?\b)"/>
 			<StringDetect context="#stay" attribute="Other Keywords" String="&lt;&lt;none&gt;&gt;"/>
 
 			<!-- Java-Language-Style Package Name & other Names, for SE Android (this avoid highlighting keywords) -->
-			<RegExpr context="#stay" attribute="Path" String="\.?[a-zA-Z]\w*((\.|::)\w+)+(?=[^\(]|$)" firstNonSpace="true"/>
+			<RegExpr context="#stay" attribute="Path" String="\.?[a-zA-Z]\w*(?:(?:\.|::)\w+)+(?=[^\(]|$)" firstNonSpace="true"/>
 
 			<!-- Functions -->
 			<DetectChar context="_parentheses_content" attribute="Normal Text" char="(" beginRegion="ParenthesesBlock"/>
@@ -112,15 +112,15 @@
 
 			<!-- Highlight only the statements that contain definition of file contexts -->
 			<IncludeRules context="_statements_file_contexts##SELinux Policy"/>
-			<RegExpr context="#stay" String="[a-zA-Z](\.?[\w\-]+)*"/>
+			<RegExpr context="#stay" String="[a-zA-Z](?:\.?[\w\-]+)*"/>
 			<HlCHex context="#pop" attribute="Number"/>
 			<Int context="#pop" attribute="Number"/>
 		</context>
 
 		<context name="_parentheses_content" attribute="Normal Text" lineEndContext="#stay">
 			<DetectChar context="#pop" attribute="Normal Text" char=")" endRegion="ParenthesesBlock"/>
 			<!-- File Contexts:  (user:role:type,s0) -->
-			<RegExpr context="_gen_context_fc_user" attribute="User" String="&startIdentifier;(\s*:\s*&identifier;){2}(\s*,\s*&identifier;)*\b" lookAhead="true"/>
+			<RegExpr context="_gen_context_fc_user" attribute="User" String="&startIdentifier;(?:\s*\:\s*&identifier;){2}(?:\s*,\s*&identifier;)*\b" lookAhead="true"/>
 			<IncludeRules context="_normal"/>
 		</context>
 
diff --git a/data/syntax/selinux.xml b/data/syntax/selinux.xml
--- a/data/syntax/selinux.xml
+++ b/data/syntax/selinux.xml
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd"
 [
-	<!ENTITY identifier        "[a-zA-Z][\w\-]*(\.?[\w\-])*">
-	<!ENTITY versionIdentifier "\d+(\.[\d_\.]*)?">
+	<!ENTITY identifier        "[a-zA-Z][\w\-]*(?:\.?[\w\-])*">
+	<!ENTITY versionIdentifier "\d+(?:\.[\d_\.]*)?">
 	<!-- Documentation -->
-	<!ENTITY tagName           "([a-zA-Z_]([\w\-\.]*\w)?:)?[a-zA-Z_]([\w\-\.]*\w)?">
+	<!ENTITY tagName           "(?:[a-zA-Z_](?:[\w\-\.]*\w)?\:)?[a-zA-Z_](?:[\w\-\.]*\w)?">
 	<!-- PCRE 2 RegExp -->
 	<!ENTITY specialChars      "*?.+">
-	<!ENTITY capGroup          "\?(&lt;[\=!]|P?&lt;\w+&gt;|&apos;\w+&apos;|[\=!:&gt;\|R&amp;\-#])"> <!-- Capturing & Groups -->
+	<!ENTITY capGroup          "\?(?:&lt;[\=!]|P?&lt;\w+&gt;|&apos;\w+&apos;|[\=!:&gt;\|R&amp;\-#])"> <!-- Capturing & Groups -->
 	<!-- M4 Macros -->
-	<!ENTITY m4Args            "\$([1-9]\d*|0|[\#\*\@]|\{([1-9]\d*|0)\})">
+	<!ENTITY m4Args            "\$(?:[1-9]\d*|0|[\#\*\@]|\{(?:[1-9]\d*|0)\})">
 	<!ENTITY m4Quotes          "`'‘’“”"> <!-- Default Quotes (`') & Other Common Quotes -->
 	<!-- For File Contexts -->
-	<!ENTITY identifierWithArg "([a-zA-Z]|&m4Args;)(\.?([\w\-]|&m4Args;))*">
-	<!ENTITY mlsLevel          "&identifierWithArg;(:&identifierWithArg;(\s*,\s*&identifierWithArg;)*)?">
+	<!ENTITY identifierWithArg "(?:[a-zA-Z]|&m4Args;)(?:\.?(?:[\w\-]|&m4Args;))*">
+	<!ENTITY mlsLevel          "&identifierWithArg;(?:\:&identifierWithArg;(?:\s*,\s*&identifierWithArg;)*)?">
 ]>
 
 <!--
   SELinux Security Policies Syntax Highlighting Definition for Kate
   ==========================================================================================
    This file is part of the KDE's KSyntaxHighlighting framework.
 
-   Copyright (c) 2018 Nibaldo González S. (nibgonz@gmail.com)
+   Copyright (c) 2018-2019 Nibaldo González S. (nibgonz@gmail.com)
 
    Permission is hereby granted, free of charge, to any person obtaining a copy of this
    software and associated documentation files (the "Software"), to deal in the Software
@@ -55,14 +55,15 @@
     file contexts are highlighted by "selinux-fc.xml".
 
   Change log:
+	* Version 3 [25-Oct-2019]: Use non-capturing groups in RegExpr.
 	* Version 2 [09-Sep-2018]:
 		- Update itemData's style for the new Solarized color schemes.
 	* Version 1 [28-Aug-2018, by Nibaldo González]:
 		- Initial version. Syntax based on checkpolicy v2.8.
 -->
 
 <language name="SELinux Policy"
-          version="2"
+          version="3"
           kateversion="5.0"
           section="Sources"
           extensions="*.te;*.if;*.spt;policy.conf;access_vectors;mls;mcs;mls_macros;te_macros;policy_capabilities;seapp_contexts;port_contexts"
@@ -454,7 +455,7 @@
 		<item>load_module</item>
 		<item>load_policy</item>
 		<item>lock</item>
-		<item>mac_admin</item> <!-- Unused by SELinux -->
+		<item>mac_admin</item>
 		<item>mac_override</item> <!-- Unused by SELinux -->
 		<item>manage</item>
 		<item>manage_subnet</item>
@@ -952,7 +953,7 @@
 			<IncludeRules context="_line_continue_escape"/>
 
 			<!-- File Contexts -->
-			<RegExpr context="_file_contexts" attribute="File Contexts" String="\b&identifierWithArg;(:&identifierWithArg;){2}(:&mlsLevel;(\s*\-\s*&mlsLevel;)?)?\b" lookAhead="true"/>
+			<RegExpr context="_file_contexts" attribute="File Contexts" String="\b&identifierWithArg;(?:\:&identifierWithArg;){2}(?:\:&mlsLevel;(?:\s*\-\s*&mlsLevel;)?)?\b" lookAhead="true"/>
 
 			<!-- This avoids highlighting numbers in identifiers -->
 			<RegExpr context="#stay" String="&identifier;"/>
@@ -962,7 +963,7 @@
 			<Float context="#stay" attribute="Number"/>
 			<Int context="#stay" attribute="Number"/>
 
-			<RegExpr context="#stay" attribute="Reserved Keywords" String="(\s|^)\-[bcdpls\-](?=\s|$)"/>
+			<RegExpr context="#stay" attribute="Reserved Keywords" String="(?:\s|^)\-[bcdpls\-](?=\s|$)"/>
 			<DetectChar context="#stay" attribute="Symbol" char="."/>
 		</context>
 
@@ -1008,8 +1009,8 @@
 			<DetectChar context="#pop" attribute="Symbol" char=";" lookAhead="true"/>
 			<RegExpr context="_class_range_transition_statement" String="&identifierWithArg;\s*:\s*&identifierWithArg;\s+[a-zA-Z\$]" lookAhead="true"/>
 
-			<RegExpr context="#pop!_mls_level_range" String="&identifierWithArg;(\s*:\s*&identifierWithArg;(\s*,\s*&identifierWithArg;)*)?\s+\-\s+&identifierWithArg;(\s*:\s*&identifierWithArg;(\s*,\s*&identifierWithArg;)*)?" lookAhead="true"/>
-			<RegExpr context="#pop!_mls_level_range" String="&identifierWithArg;(\s*:\s*&identifierWithArg;(\s*,\s*&identifierWithArg;)*)?(\s*\-\s*&identifierWithArg;(\s*:\s*&identifierWithArg;(\s*,\s*&identifierWithArg;)*)?)?(?=\s*;)" lookAhead="true"/>
+			<RegExpr context="#pop!_mls_level_range" String="&identifierWithArg;(?:\s*\:\s*&identifierWithArg;(?:\s*,\s*&identifierWithArg;)*)?\s+\-\s+&identifierWithArg;(?:\s*\:\s*&identifierWithArg;(?:\s*,\s*&identifierWithArg;)*)?" lookAhead="true"/>
+			<RegExpr context="#pop!_mls_level_range" String="&identifierWithArg;(?:\s*\:\s*&identifierWithArg;(?:\s*,\s*&identifierWithArg;)*)?(?:\s*\-\s*&identifierWithArg;(?:\s*\:\s*&identifierWithArg;(?:\s*,\s*&identifierWithArg;)*)?)?(?=\s*;)" lookAhead="true"/>
 			<IncludeRules context="_normal"/>
 		</context>
 		<context name="_class_range_transition_statement" attribute="Normal Text" lineEndContext="#pop">
@@ -1049,7 +1050,7 @@
 		</context>
 		<context name="_mls_level_range_cat" attribute="MLS/MCS Level/Range" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
 			<RegExpr context="#pop!_mls_level" attribute="Symbol" String="\s*\-\s*(?=&mlsLevel;)"/> <!-- Find Range -->
-			<RegExpr context="#stay" attribute="Symbol" String="(\.|\s*,\s*)(?=&identifierWithArg;)"/>
+			<RegExpr context="#stay" attribute="Symbol" String="(?:\.|\s*,\s*)(?=&identifierWithArg;)"/>
 			<IncludeRules context="_default_mls_level"/>
 		</context>
 		<!-- MLS/MCS Level: Sensitivity:Category -->
@@ -1059,7 +1060,7 @@
 			<IncludeRules context="_default_mls_level"/>
 		</context>
 		<context name="_mls_level_cat" attribute="MLS/MCS Level/Range" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
-			<RegExpr context="#stay" attribute="Symbol" String="(\.|\s*,\s*)(?=&identifierWithArg;)"/>
+			<RegExpr context="#stay" attribute="Symbol" String="(?:\.|\s*,\s*)(?=&identifierWithArg;)"/>
 			<IncludeRules context="_default_mls_level"/>
 		</context>
 		<context name="_default_mls_level" attribute="MLS/MCS Level/Range" lineEndContext="#pop">
@@ -1101,7 +1102,7 @@
 			<keyword context="#pop" attribute="Booleans" String="booleans"/>
 			<keyword context="#pop" attribute="Special Keys" String="self"/>
 			<DetectChar context="#pop" char="&quot;" lookAhead="true"/>
-			<RegExpr context="#pop" attribute="Normal Text" String="&identifier;(?=[,;]?(\s|$))"/>
+			<RegExpr context="#pop" attribute="Normal Text" String="&identifier;(?=[,;]?(?:\s|$))"/>
 			<!-- Find RegExp -->
 			<AnyChar context="#pop!_path" String="[(" lookAhead="true"/>
 			<RegExpr context="#pop!_path" String="[^\=\s&quot;\{\}\[\]\(\);#]+[\{\[\(\*\+\?]" lookAhead="true"/>
@@ -1114,7 +1115,7 @@
 		</context>
 		<context name="_function_gen_context_find_fc" attribute="File Contexts"
 		         lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop!_function_gen_context_content">
-			<RegExpr context="_file_contexts" String="&identifierWithArg;(:&identifierWithArg;){2}\b" lookAhead="true"/>
+			<RegExpr context="_file_contexts" String="&identifierWithArg;(?:\:&identifierWithArg;){2}\b" lookAhead="true"/>
 			<DetectSpaces context="#stay"/>
 		</context>
 		<context name="_function_gen_context_content" attribute="File Contexts" lineEndContext="#pop">
@@ -1153,7 +1154,7 @@
 		</context>
 		<context name="_fc_level_range_cat" attribute="File Contexts" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop!_after_fc">
 			<RegExpr context="#pop!_fc_level" attribute="Symbol" String="\s*\-\s*(?=&mlsLevel;)"/> <!-- Find Range -->
-			<RegExpr context="#stay" attribute="Symbol" String="(\.|\s*,\s*)(?=&identifierWithArg;)"/>
+			<RegExpr context="#stay" attribute="Symbol" String="(?:\.|\s*,\s*)(?=&identifierWithArg;)"/>
 			<IncludeRules context="_default_fc_level"/>
 		</context>
 		<!-- (MLS/MCS) user:role:type:level-level -->
@@ -1163,7 +1164,7 @@
 			<IncludeRules context="_default_fc_level"/>
 		</context>
 		<context name="_fc_level_cat" attribute="File Contexts" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop!_after_fc">
-			<RegExpr context="#stay" attribute="Symbol" String="(\.|\s*,\s*)(?=&identifierWithArg;)"/>
+			<RegExpr context="#stay" attribute="Symbol" String="(?:\.|\s*,\s*)(?=&identifierWithArg;)"/>
 			<IncludeRules context="_default_fc_level"/>
 		</context>
 		<context name="_default_fc_level" attribute="File Contexts" lineEndContext="#pop">
@@ -1212,7 +1213,7 @@
 			<RegExpr context="#stay" attribute="Doc. Element Tag" String="&lt;/\s*&tagName;\s*&gt;" endRegion="DocElement"/>
 		</context>
 		<context name="_find_entityrefs" attribute="Documentation" lineEndContext="#pop">
-			<RegExpr context="#stay" attribute="Doc. EntityRef" String="&amp;(#[0-9]+|#[xX][0-9A-Fa-f]+|[a-zA-Z_]([\w\-]*\w)?);"/>
+			<RegExpr context="#stay" attribute="Doc. EntityRef" String="&amp;(?:#[0-9]+|#[xX][0-9A-Fa-f]+|[a-zA-Z_](?:[\w\-]*\w)?);"/>
 		</context>
 
 		<context name="_element_tag" attribute="Documentation" lineEndContext="#pop">
@@ -1254,16 +1255,16 @@
 			<!-- URLs -->
 			<RegExpr context="#stay" attribute="URL in Comment" String="\bhttps?://[^\s&lt;&gt;&quot;&apos;`]*[^\s&lt;&gt;&quot;&apos;`\}\)\]\.,;\|]"/>
 			<!-- Email (Source: http://emailregex.com) -->
-			<RegExpr context="#stay" attribute="URL in Comment" String="(([^&lt;&gt;\(\)\[\]\\\.,;:\s@&quot;]+(\.[^&lt;&gt;\(\)\[\]\\\.,;:\s@&quot;]+)*)|(&quot;[^&quot;]+&quot;))@((\[\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}])|(([a-zA-Z\-\d]+\.)+[a-zA-Z]{2,}))\b"/>
+			<RegExpr context="#stay" attribute="URL in Comment" String="(?:(?:[^&lt;&gt;\(\)\[\]\\\.,;:\s@&quot;]+(?:\.[^&lt;&gt;\(\)\[\]\\\.,;:\s@&quot;]+)*)|(?:&quot;[^&quot;]+&quot;))@(?:(?:\[\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}])|(?:(?:[a-zA-Z\-\d]+\.)+[a-zA-Z]{2,}))\b"/>
 		</context>
 
 		<!-- IP Addresses -->
 		<context name="_ip_addr" attribute="Normal Text" lineEndContext="#stay">
 			<!-- IPv4 -->
-			<RegExpr context="#stay" attribute="IP Address" String="\b((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\b"/>
+			<RegExpr context="#stay" attribute="IP Address" String="\b(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\b"/>
 			<!-- IPv6 (Source: https://community.helpsystems.com/forums/intermapper/miscellaneous-topics/5acc4fcf-fa83-e511-80cf-0050568460e4 ) -->
-			<RegExpr context="#stay" attribute="IP Address" String="((\b([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(\b([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(\b([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(\b([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(\b([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(\b([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(\b([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:)))"/> <!-- End: (\%\w+\b)? -->
-			<!-- NOTE: IPv6 in the SELinux parser ("selinux/checkpolicy/policy_scan.l"): "([\da-fA-F]{0,4}:){2}[\da-fA-F:\.]*" -->
+			<RegExpr context="#stay" attribute="IP Address" String="(?:(?:\b(?:[0-9A-Fa-f]{1,4}\:){7}(?:[0-9A-Fa-f]{1,4}|\:))|(?:\b(?:[0-9A-Fa-f]{1,4}\:){6}(?:\:[0-9A-Fa-f]{1,4}|(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|\:))|(?:\b(?:[0-9A-Fa-f]{1,4}\:){5}(?:(?:(?:\:[0-9A-Fa-f]{1,4}){1,2})|\:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|\:))|(?:\b(?:[0-9A-Fa-f]{1,4}\:){4}(?:(?:(?:\:[0-9A-Fa-f]{1,4}){1,3})|(?:(?:\:[0-9A-Fa-f]{1,4})?\:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|\:))|(?:\b(?:[0-9A-Fa-f]{1,4}\:){3}(?:(?:(?:\:[0-9A-Fa-f]{1,4}){1,4})|(?:(?:\:[0-9A-Fa-f]{1,4}){0,2}\:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|\:))|(?:\b(?:[0-9A-Fa-f]{1,4}\:){2}(?:(?:(?:\:[0-9A-Fa-f]{1,4}){1,5})|(?:(?:\:[0-9A-Fa-f]{1,4}){0,3}\:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|\:))|(?:\b(?:[0-9A-Fa-f]{1,4}\:){1}(?:(?:(?:\:[0-9A-Fa-f]{1,4}){1,6})|(?:(?:\:[0-9A-Fa-f]{1,4}){0,4}\:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|\:))|(?:\:(?:(?:(?:\:[0-9A-Fa-f]{1,4}){1,7})|(?:(?:\:[0-9A-Fa-f]{1,4}){0,5}\:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|\:)))"/> <!-- End: (\%\w+\b)? -->
+			<!-- NOTE: IPv6 in the SELinux parser ("selinux/checkpolicy/policy_scan.l"): "(?:[\da-fA-F]{0,4}\:){2}[\da-fA-F:\.]*" -->
 		</context>
 
 		<!-- AV Permissions Keywords -->
@@ -1277,7 +1278,7 @@
 			<keyword context="#stay" attribute="Policy Capability" String="policy_capabilities"/>
 		</context>
 
-		<!-- Filsystem Keywords -->
+		<!-- Filesystem Keywords -->
 		<context name="_filesystem" attribute="Normal Text" lineEndContext="#stay">
 			<keyword context="#stay" attribute="Filesystem" String="filesystem"/>
 		</context>
@@ -1340,7 +1341,7 @@
 			<DetectChar context="#pop" attribute="Normal Text" char=")" endRegion="ParenthesesBlock"/>
 			<DetectChar context="#stay" attribute="Normal Text" char=","/>
 			<!-- Default Quote: `text' -->
-			<RegExpr context="_simple_string_regexp" attribute="Text Quoted" String="`(?=(&m4Args;|[\w\-\s])*')"/>
+			<RegExpr context="_simple_string_regexp" attribute="Text Quoted" String="`(?=(?:&m4Args;|[\w\-\s])*')"/>
 			<IncludeRules context="_m4_quotes"/>
 
 			<IncludeRules context="_m4_special_arguments"/>
@@ -1357,7 +1358,7 @@
 			<DetectChar context="_find_m4_string_simple" char="`" lookAhead="true"/>
 		</context>
 		<context name="_find_m4_string_simple" attribute="Text Quoted" lineEndContext="#pop">
-			<RegExpr context="#pop!_block_quoted_simple" attribute="Text Quoted" String="`(?=(&m4Args;|[\w\-\.\s]|\(\))*&apos;)"/>
+			<RegExpr context="#pop!_block_quoted_simple" attribute="Text Quoted" String="`(?=(?:&m4Args;|[\w\-\.\s]|\(\))*&apos;)"/>
 			<DetectChar context="#pop" attribute="Default M4 Quote" char="`"/> <!-- &m4Quotes; -->
 		</context>
 		<context name="_block_quoted_simple" attribute="Text Quoted" lineEndContext="#pop">
@@ -1411,45 +1412,45 @@
 		<!-- Escapes -->
 		<context name="_escape" attribute="Normal Text" lineEndContext="#stay">
 			<!-- Escapes Not Supported by SELinux -->
-			<RegExpr context="#stay" attribute="Error" String="\\([LlUu]|N\{\w+\})"/>
+			<RegExpr context="#stay" attribute="Error" String="\\(?:[LlUu]|N\{\w+\})"/>
 			<!-- Hexadecimal -->
-			<RegExpr context="#stay" attribute="Escape Char" String="\\x(\{[\da-fA-F]+\}|[\da-fA-F]{2})"/>
+			<RegExpr context="#stay" attribute="Escape Char" String="\\x(?:\{[\da-fA-F]+\}|[\da-fA-F]{2})"/>
 			<!-- Octal. NOTE: only ASCII chars. for \ddd -->
-			<RegExpr context="#stay" attribute="Escape Char" String="\\(o\{[0-7]+\}|[0-3][0-7]{0,2}|[4-7][0-7]?)"/>
+			<RegExpr context="#stay" attribute="Escape Char" String="\\(?:o\{[0-7]+\}|[0-3][0-7]{0,2}|[4-7][0-7]?)"/>
 			<!-- References -->
-			<RegExpr context="#stay" attribute="Escape Char" String="\\[kg](&lt;\w+&gt;|&apos;\w+&apos;|\{\w+\})"/>
-			<RegExpr context="#stay" attribute="Escape Char" String="\\g(&lt;[\+\-]?\d+&gt;|&apos;[\+\-]?\d+&apos;|\{[\+\-]?\d+\}|[\+\-]?\d)"/>
+			<RegExpr context="#stay" attribute="Escape Char" String="\\[kg](?:&lt;\w+&gt;|&apos;\w+&apos;|\{\w+\})"/>
+			<RegExpr context="#stay" attribute="Escape Char" String="\\g(?:&lt;[\+\-]?\d+&gt;|&apos;[\+\-]?\d+&apos;|\{[\+\-]?\d+\}|[\+\-]?\d)"/>
 			<!-- Category Properties -->
-			<RegExpr context="#stay" attribute="Escape Char" String="\\[pP](C[cfnos]?|L[lmotu&amp;]?|M[cen]?|N[dlo]?|P[cdefios]?|S[ckmo]?|Z[lps]?)"/>
-			<RegExpr context="#stay" attribute="Escape Char" String="\\[pP]\{(Xan|Xps|Xsp|Xuc|Xwd|C[cfnos]?|L[lmotu&amp;]?|M[cen]?|N[dlo]?|P[cdefios]?|S[ckmo]?|Z[lps]?)\}"/>
+			<RegExpr context="#stay" attribute="Escape Char" String="\\[pP](?:C[cfnos]?|L[lmotu&amp;]?|M[cen]?|N[dlo]?|P[cdefios]?|S[ckmo]?|Z[lps]?)"/>
+			<RegExpr context="#stay" attribute="Escape Char" String="\\[pP]\{(?:Xan|Xps|Xsp|Xuc|Xwd|C[cfnos]?|L[lmotu&amp;]?|M[cen]?|N[dlo]?|P[cdefios]?|S[ckmo]?|Z[lps]?)\}"/>
 			<!-- Script Names -->
-			<RegExpr context="#stay" attribute="Escape Char" String="\\[pP]\{(Ahom|Anatolian_Hieroglyphs|Arabic|Armenian|Avestan|Balinese|Bamum|Bassa_Vah|Batak|Bengali|Bopomofo|Brahmi|Braille|Buginese|Buhid|Canadian_Aboriginal|Carian|Caucasian_Albanian|Chakma|Cham|Cherokee|Common|Coptic|Cuneiform|Cypriot|Cyrillic|Deseret|Devanagari|Duployan|Egyptian_Hieroglyphs|Elbasan|Ethiopic|Georgian|Glagolitic|Gothic|Grantha|Greek|Gujarati|Gurmukhi|Han|Hangul|Hanunoo|Hatran|Hebrew|Hiragana|Imperial_Aramaic|Inherited|Inscriptional_Pahlavi|Inscriptional_Parthian|Javanese|Kaithi|Kannada|Katakana|Kayah_Li|Kharoshthi|Khmer|Khojki|Khudawadi|Lao|Latin|Lepcha|Limbu|Linear_A|Linear_B|Lisu|Lycian|Lydian|Mahajani|Malayalam|Mandaic|Manichaean|Meetei_Mayek|Mende_Kikakui|Meroitic_Cursive|Meroitic_Hieroglyphs|Miao|Modi|Mongolian|Mro|Multani|Myanmar|Nabataean|New_Tai_Lue|Nko|Ogham|Ol_Chiki|Old_Hungarian|Old_Italic|Old_North_Arabian|Old_Permic|Old_Persian|Old_South_Arabian|Old_Turkic|Oriya|Osmanya|Pahawh_Hmong|Palmyrene|Pau_Cin_Hau|Phags_Pa|Phoenician|Psalter_Pahlavi|Rejang|Runic|Samaritan|Saurashtra|Sharada|Shavian|Siddham|SignWriting|Sinhala|Sora_Sompeng|Sundanese|Syloti_Nagri|Syriac|Tagalog|Tagbanwa|Tai_Le|Tai_Tham|Tai_Viet|Takri|Tamil|Telugu|Thaana|Thai|Tibetan|Tifinagh|Tirhuta|Ugaritic|Vai|Warang_Citi|Yi)\}"/>
+			<RegExpr context="#stay" attribute="Escape Char" String="\\[pP]\{(?:Ahom|Anatolian_Hieroglyphs|Arabic|Armenian|Avestan|Balinese|Bamum|Bassa_Vah|Batak|Bengali|Bopomofo|Brahmi|Braille|Buginese|Buhid|Canadian_Aboriginal|Carian|Caucasian_Albanian|Chakma|Cham|Cherokee|Common|Coptic|Cuneiform|Cypriot|Cyrillic|Deseret|Devanagari|Duployan|Egyptian_Hieroglyphs|Elbasan|Ethiopic|Georgian|Glagolitic|Gothic|Grantha|Greek|Gujarati|Gurmukhi|Han|Hangul|Hanunoo|Hatran|Hebrew|Hiragana|Imperial_Aramaic|Inherited|Inscriptional_Pahlavi|Inscriptional_Parthian|Javanese|Kaithi|Kannada|Katakana|Kayah_Li|Kharoshthi|Khmer|Khojki|Khudawadi|Lao|Latin|Lepcha|Limbu|Linear_A|Linear_B|Lisu|Lycian|Lydian|Mahajani|Malayalam|Mandaic|Manichaean|Meetei_Mayek|Mende_Kikakui|Meroitic_Cursive|Meroitic_Hieroglyphs|Miao|Modi|Mongolian|Mro|Multani|Myanmar|Nabataean|New_Tai_Lue|Nko|Ogham|Ol_Chiki|Old_Hungarian|Old_Italic|Old_North_Arabian|Old_Permic|Old_Persian|Old_South_Arabian|Old_Turkic|Oriya|Osmanya|Pahawh_Hmong|Palmyrene|Pau_Cin_Hau|Phags_Pa|Phoenician|Psalter_Pahlavi|Rejang|Runic|Samaritan|Saurashtra|Sharada|Shavian|Siddham|SignWriting|Sinhala|Sora_Sompeng|Sundanese|Syloti_Nagri|Syriac|Tagalog|Tagbanwa|Tai_Le|Tai_Tham|Tai_Viet|Takri|Tamil|Telugu|Thaana|Thai|Tibetan|Tifinagh|Tirhuta|Ugaritic|Vai|Warang_Citi|Yi)\}"/>
 			<!-- Escaped Characters -->
-			<RegExpr context="#stay" attribute="Escape Char" String="\\(Q.*\\E|c[a-zA-Z])"/>
+			<RegExpr context="#stay" attribute="Escape Char" String="\\(?:Q.*\\E|c[a-zA-Z])"/>
 			<!-- Reserved characters -->
 			<RegExpr context="#stay" attribute="Escape Char" String="\\[\ssSdDwWbBAZcCtrnaefvxhGHKNQRVXpPz\d]"/>
 			<!-- Punctuation Characters -->
 			<RegExpr context="#stay" attribute="Escape Char" String="\\[[:punct:]]"/>
 			<RegExpr context="#stay" attribute="Escape Char" String="\\[\041-\057\072-\100\133-\140\173-\176]"/>
 		</context>
 		<context name="_fix_escape" attribute="Normal Text" lineEndContext="#stay">
 			<AnyChar context="#stay" attribute="Special Char" String="^$"/>
-			<RegExpr context="#stay" attribute="Escape Char" String="\\(u[\da-fA-F]{4}|[LlUu]|N\{\w+\}|[0-7]{1,3})"/>
+			<RegExpr context="#stay" attribute="Escape Char" String="\\(?:u[\da-fA-F]{4}|[LlUu]|N\{\w+\}|[0-7]{1,3})"/>
 		</context>
 
 		<!-- Special Characters in Groups: (?...). Also see: &capGroup; -->
 		<context name="_special_group_round_brackets" attribute="Normal Text" lineEndContext="#stay">
 			<!-- References & Option Settings -->
-			<RegExpr context="#stay" attribute="Special Char of Brackets" String="\?(&amp;|P[&gt;\=])\w+(?=\))"/>
-			<RegExpr context="#stay" attribute="Special Char of Brackets" String="\?(xx|[iJmnsUxR]|C\d*|C&quot;[^\s&quot;]*&quot;|[\-\+]?\d+)(?=\))"/>
+			<RegExpr context="#stay" attribute="Special Char of Brackets" String="\?(?:&amp;|P[&gt;\=])\w+(?=\))"/>
+			<RegExpr context="#stay" attribute="Special Char of Brackets" String="\?(?:xx|[iJmnsUxR]|C\d*|C&quot;[^\s&quot;]*&quot;|[\-\+]?\d+)(?=\))"/>
 			<!-- Conditional Patterns -->
-			<RegExpr context="#stay" attribute="Special Char of Brackets" String="\?\((Rn?|R&amp;\w+|[\+\-]?\d+|&lt;\w+&gt;|&apos;\w+&apos;|VERSION&gt;?\=\d+(\.\d+)*|\w+)\)"/>
+			<RegExpr context="#stay" attribute="Special Char of Brackets" String="\?\((?:Rn?|R&amp;\w+|[\+\-]?\d+|&lt;\w+&gt;|&apos;\w+&apos;|VERSION&gt;?\=\d+(?:\.\d+)*|\w+)\)"/>
 			<RegExpr context="#stay" attribute="Special Char of Brackets" String="\?(?=\()"/>
 		</context>
 
 		<!-- {n} {min,} {,max} {min,max} -->
 		<context name="_quantification_brackets" attribute="Normal Text" lineEndContext="#stay">
-			<RegExpr context="_quantification_brackets_content" attribute="RegExp Brackets" String="\{(?=(\d+(,\d*)?|,\d+)\})"/>
+			<RegExpr context="_quantification_brackets_content" attribute="RegExp Brackets" String="\{(?=(?:\d+(?:,\d*)?|,\d+)\})"/>
 		</context>
 		<context name="_quantification_brackets_content" attribute="RegExp Brackets Content" lineEndContext="#pop">
 			<DetectChar context="#stay" attribute="Special Char of Brackets" char=","/>
@@ -1505,7 +1506,7 @@
 		<context name="_square_brackets_quoted_content" attribute="RegExp Brackets Content" lineEndContext="#pop">
 			<DetectChar context="#pop" attribute="RegExp Brackets" char="]"/>
 			<DetectChar context="#pop" char="&quot;" lookAhead="true"/>
-			<RegExpr context="#stay" attribute="Open RegExp Brackets" String="[^\s\[\]&quot;\\](?=\s*(&quot;|$))"/>
+			<RegExpr context="#stay" attribute="Open RegExp Brackets" String="[^\s\[\]&quot;\\](?=\s*(?:&quot;|$))"/>
 			<IncludeRules context="_default_square_brackets"/>
 		</context>
 
@@ -1518,7 +1519,7 @@
 		<context name="_round_brackets_quoted_content" attribute="RegExp Brackets Content" lineEndContext="#pop">
 			<DetectChar context="#pop" attribute="RegExp Brackets" char=")"/>
 			<DetectChar context="#pop" char="&quot;" lookAhead="true"/>
-			<RegExpr context="#stay" attribute="Open RegExp Brackets" String="[^\s\[\(\)&quot;\\](?=\s*(&quot;|$))"/>
+			<RegExpr context="#stay" attribute="Open RegExp Brackets" String="[^\s\[\(\)&quot;\\](?=\s*(?:&quot;|$))"/>
 			<IncludeRules context="_default_round_brackets"/>
 			<DetectChar context="_square_brackets_quoted" attribute="RegExp Brackets" char="["/>
 			<DetectChar context="_round_brackets_quoted" attribute="RegExp Brackets" char="("/>
@@ -1547,7 +1548,7 @@
 			<IncludeRules context="_line_continue_escape"/>
 			<DetectChar context="_square_brackets_otherquote" attribute="RegExp Brackets" char="["/>
 			<DetectChar context="_round_brackets_otherquote" attribute="RegExp Brackets" char="("/>
-			<RegExpr context="_comment" attribute="Comment" String="(^|\s)\#"/>
+			<RegExpr context="_comment" attribute="Comment" String="(?:^|\s)\#"/>
 		</context>
 
 	</contexts>
diff --git a/data/syntax/xml.xml b/data/syntax/xml.xml
--- a/data/syntax/xml.xml
+++ b/data/syntax/xml.xml
@@ -4,9 +4,9 @@
 	<!-- names must start with a letter, ideogram or underscore. \w matches any
 		 word character *or* a number, hence the lookahead -->
 	<!ENTITY name    "(?![0-9])[\w_:][\w.:_-]*">
-	<!ENTITY entref  "&amp;(#[0-9]+|#[xX][0-9A-Fa-f]+|&name;);">
+	<!ENTITY entref  "&amp;(?:#[0-9]+|#[xX][0-9A-Fa-f]+|&name;);">
 ]>
-<language name="XML" version="9" kateversion="3.4" section="Markup" extensions="*.docbook;*.xml;*.rc;*.daml;*.rdf;*.rss;*.xspf;*.xsd;*.svg;*.ui;*.kcfg;*.qrc;*.wsdl;*.scxml;*.xbel;*.dae;*.sch;*.brd" mimetype="text/xml;text/book;text/daml;text/rdf;application/rss+xml;application/xspf+xml;image/svg+xml;application/x-designer;application/x-xbel;application/xml;application/scxml+xml" casesensitive="1" indenter="xml" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
+<language name="XML" version="10" kateversion="3.4" section="Markup" extensions="*.docbook;*.xml;*.rc;*.daml;*.rdf;*.rss;*.xspf;*.xsd;*.svg;*.ui;*.kcfg;*.qrc;*.wsdl;*.scxml;*.xbel;*.dae;*.sch;*.brd" mimetype="text/xml;text/book;text/daml;text/rdf;application/rss+xml;application/xspf+xml;image/svg+xml;application/x-designer;application/x-xbel;application/xml;application/scxml+xml" casesensitive="1" indenter="xml" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
 
 <highlighting>
 <contexts>
@@ -40,8 +40,9 @@
   <context name="Comment" attribute="Comment" lineEndContext="#stay">
     <DetectSpaces />
     <StringDetect attribute="Comment" context="#pop" String="--&gt;" endRegion="comment" />
-    <RegExpr attribute="Error" context="#stay" String="-(-(?!-&gt;))+" />
+    <RegExpr attribute="Error" context="#stay" String="-(?:\-(?!-&gt;))+" />
     <IncludeRules context="##Alerts" />
+    <IncludeRules context="##Modelines" />
     <DetectIdentifier />
   </context>
 
@@ -63,7 +64,7 @@
 
   <context name="Doctype Internal Subset" attribute="Other Text" lineEndContext="#stay">
     <DetectChar attribute="Doctype" context="#pop" char="]" endRegion="int_subset" />
-    <RegExpr attribute="Doctype" context="Doctype Markupdecl" String="&lt;!(ELEMENT|ENTITY|ATTLIST|NOTATION)\b" />
+    <RegExpr attribute="Doctype" context="Doctype Markupdecl" String="&lt;!(?:ELEMENT|ENTITY|ATTLIST|NOTATION)\b" />
     <StringDetect attribute="Comment" context="Comment" String="&lt;!--" beginRegion="comment" />
     <RegExpr attribute="Processing Instruction" context="PI" String="&lt;\?[\w:_-]*" beginRegion="pi" />
     <IncludeRules context="FindPEntityRefs" />
@@ -88,8 +89,7 @@
   <context name="Element" attribute="Other Text" lineEndContext="#stay">
     <Detect2Chars attribute="Element" context="#pop" char="/" char1="&gt;" endRegion="element" />
     <DetectChar attribute="Element" context="El Content" char="&gt;" />
-    <RegExpr attribute="Attribute" context="Attribute" String="^&name;" />
-    <RegExpr attribute="Attribute" context="Attribute" String="\s+&name;" />
+    <RegExpr attribute="Attribute" context="Attribute" String="(?:^|\s+)&name;" />
     <RegExpr attribute="Error" context="#stay" String="\S" />
   </context>
 
@@ -143,7 +143,7 @@
 </highlighting>
 <general>
   <comments>
-    <comment name="multiLine" start="&lt;!--" end="--&gt;" />
+    <comment name="multiLine" start="&lt;!--" end="--&gt;" region="comment" />
   </comments>
 </general>
 </language>
diff --git a/data/syntax/yacc.xml b/data/syntax/yacc.xml
--- a/data/syntax/yacc.xml
+++ b/data/syntax/yacc.xml
@@ -12,12 +12,12 @@
 == UPDATE HISTORY ==
 2018-02-20 // Nibaldo González <nibgonz@gmail.com>
 
-  Fix '$' symbol, highlighted as 'dsError' by C++ (isocpp.xml). 
+  Fix '$' symbol, highlighted as 'dsError' by C++ (isocpp.xml).
   Update syntax for Bison (3.0.4):
    - Add declarations, directives in rules and the '@' variable.
-   - Allow a tag in '%union', declarations in multiple lines and 
+   - Allow a tag in '%union', declarations in multiple lines and
      grammar declarations in the grammar rules section.
-   - The ';' char is not necessary to finish a rule. Allow '; |' 
+   - The ';' char is not necessary to finish a rule. Allow '; |'
      within rules.
   Add mimetypes and extensions '*.ypp' & '*.y++'.
 
@@ -32,7 +32,7 @@
 
 ========================================================================
 -->
-<language name="Yacc/Bison" version="5" kateversion="5.0" section="Sources" extensions="*.y;*.yy;*.ypp;*.y++" mimetype="text/x-yacc;text/x-bison" priority="5" author="Jan Villat (jan.villat@net2000.ch)" license="LGPL">
+<language name="Yacc/Bison" version="6" kateversion="5.0" section="Sources" extensions="*.y;*.yy;*.ypp;*.y++" mimetype="text/x-yacc;text/x-bison" priority="5" author="Jan Villat (jan.villat@net2000.ch)" license="LGPL">
 
 <highlighting>
 <contexts>
@@ -62,7 +62,7 @@
     <WordDetect attribute="Directive" context="Percent Command In" String="%&lt;flag&gt;" />
     <!-- Any word followed by '%' (End with ';' or '%') -->
     <DetectChar attribute="Directive" context="Percent Command" char="%" />
-  </context>  
+  </context>
   <context name="Grammar Declarations" attribute="Normal Text" lineEndContext="#stay">
     <WordDetect attribute="Directive" context="Union Start" String="%union" />
     <WordDetect attribute="Directive" context="Union Start" String="%code" />
@@ -74,7 +74,7 @@
     <IncludeRules context="Comment" />
     <DetectSpaces />
     <DetectChar attribute="Normal Text" context="Union In" char="{" beginRegion="union" />
-    <RegExpr attribute="Normal Text" context="#pop!Union Tag" String="[^\s\{](?=(\s|$|//))" />
+    <RegExpr attribute="Normal Text" context="#pop!Union Tag" String="[^\s\{](?=\s|$|//)" />
   </context>
   <context name="Union Tag" attribute="Normal Text" lineEndContext="#stay">
     <IncludeRules context="Comment" />
@@ -141,9 +141,9 @@
     <!-- Finish rule without the ';' character (see the 'rhses.1' rule in the 'src/parse-gram.y' file, from the Bison source) -->
     <RegExpr attribute="Open Rule" context="#pop" String="[\w\-\.](?=[\w\-\.]*:)" column="0" endRegion="rule" />
     <Detect2Chars attribute="Content-Type Delimiter" context="#pop" char="%" char1="%" lookAhead="true" firstNonSpace="true" endRegion="rule" />
-    <RegExpr attribute="Directive" context="#pop" String="%(union|code|destructor|printer|start|(no\-)?default\-prec|nterm|token|type|left|right|nonassoc|precedence)\b" lookAhead="true" column="0" endRegion="rule" />
+    <RegExpr attribute="Directive" context="#pop" String="%(?:union|code|destructor|printer|start|(?:no\-)?default\-prec|nterm|token|type|left|right|nonassoc|precedence)\b" lookAhead="true" column="0" endRegion="rule" />
   </context>
-  <!-- The Bison parser allows to have ';' followed by '|', without the rule ending. 
+  <!-- The Bison parser allows to have ';' followed by '|', without the rule ending.
        The problem here is that the ';' char has endRegion="rule" (although it is not very relevant). -->
   <context name="Rule End" attribute="Normal Text" lineEndContext="#stay" fallthrough="true" fallthroughContext="#pop#pop">
     <DetectSpaces />
@@ -164,7 +164,7 @@
     <WordDetect attribute="Directive" context="Percent Command In" String="%left" />
     <WordDetect attribute="Directive" context="Percent Command In" String="%right" />
     <WordDetect attribute="Directive" context="Percent Command In" String="%nonassoc" />
-    <WordDetect attribute="Directive" context="Percent Command In" String="%precedence" /> 
+    <WordDetect attribute="Directive" context="Percent Command In" String="%precedence" />
 
     <DetectChar attribute="Rule" context="#pop" char="%" /> <!-- End when there is an invalid declaration -->
     <DetectChar attribute="Normal Text" context="#pop" char=";" />
@@ -195,11 +195,11 @@
   </context>
 
   <context name="Comment" attribute="Comment" lineEndContext="#stay">
-    <Detect2Chars attribute="Comment" context="CommentStar" char="/" char1="*" />
+    <Detect2Chars attribute="Comment" context="CommentStar" char="/" char1="*" beginRegion="comment" />
     <Detect2Chars attribute="Comment" context="CommentSlash" char="/" char1="/" />
   </context>
   <context name="CommentStar" attribute="Comment" lineEndContext="#stay">
-    <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" />
+    <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" endRegion="comment" />
     <IncludeRules context="##Alerts" />
     <IncludeRules context="##Modelines" />
   </context>
@@ -229,7 +229,7 @@
   </context>
   <context name="Symbol-Variable" attribute="Normal Text" lineEndContext="#stay">
     <DetectChar attribute="Directive" context="Dol" char="$" />
-    <RegExpr attribute="Directive" context="#stay" String="@(\$?)(\d+|[A-Za-z_]\w*)?" />
+    <RegExpr attribute="Directive" context="#stay" String="@\$?(?:\d+|[A-Za-z_]\w*)?" />
   </context>
   <context name="Dol" attribute="Normal Text" fallthrough="true" fallthroughContext="DolEnd" lineEndContext="#stay">
     <RegExpr attribute="Data Type" context="DolEnd" String="&lt;[^&gt;]+&gt;" />
@@ -259,7 +259,7 @@
 </highlighting>
 <general>
   <comments>
-    <comment name="multiLine" start="/*" end="*/" />
+    <comment name="multiLine" start="/*" end="*/" region="comment" />
     <comment name="singleLine" start="//" />
   </comments>
 </general>
diff --git a/data/syntax/yaml.xml b/data/syntax/yaml.xml
--- a/data/syntax/yaml.xml
+++ b/data/syntax/yaml.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd"
 [
-  <!ENTITY null "(null|Null|NULL|~)">
-  <!ENTITY bool "(y|Y|yes|Yes|YES|n|N|no|No|NO|true|True|TRUE|false|False|FALSE|on|On|ON|off|Off|OFF)">
+  <!ENTITY null "(?:null|Null|NULL|~)">
+  <!ENTITY bool "(?:y|Y|yes|Yes|YES|n|N|no|No|NO|true|True|TRUE|false|False|FALSE|on|On|ON|off|Off|OFF)">
 
-  <!ENTITY int         "(0|[\-\+]?[1-9][0-9_]*)">
-  <!ENTITY intOther    "[\-\+]?0(x_*[0-9a-fA-F][0-9a-fA-F_]*|o?_*[0-7][0-7_]*|b_*[01][01_]*)"> <!-- Hex, Octal, Binary -->
-  <!ENTITY intBase60   "[\-\+]?[1-9][0-9_]*(:[0-5]?[0-9])+">
-  <!ENTITY allInt      "(&intBase60;|&intOther;|&int;)">
+  <!ENTITY int         "(?:0|[\-\+]?[1-9][0-9_]*)">
+  <!ENTITY intOther    "[\-\+]?0(?:x_*[0-9a-fA-F][0-9a-fA-F_]*|o?_*[0-7][0-7_]*|b_*[01][01_]*)"> <!-- Hex, Octal, Binary -->
+  <!ENTITY intBase60   "[\-\+]?[1-9][0-9_]*(?:\:[0-5]?[0-9])+">
+  <!ENTITY allInt      "(?:&intBase60;|&intOther;|&int;)">
 
-  <!ENTITY float       "[\-\+]?([0-9][0-9_]*\.[0-9\._]*|\._*[0-9][0-9\._]*)([eE][\-\+]?[0-9]+)?">
+  <!ENTITY float       "[\-\+]?(?:[0-9][0-9_]*\.[0-9\._]*|\._*[0-9][0-9\._]*)(?:[eE][\-\+]?[0-9]+)?">
   <!ENTITY floatExp    "[\-\+]?[0-9][0-9_]*[eE][\-\+]?[0-9]+">
-  <!ENTITY floatBase60 "[\-\+]?[0-9][0-9_]*(:[0-5]?[0-9])+\.[0-9_]*">
-  <!ENTITY inf         "[\-\+]?\.(inf|Inf|INF)\b">
-  <!ENTITY nan         "\.(nan|NaN|NAN)\b">
-  <!ENTITY allFloat    "(&float;|&floatExp;|&floatBase60;|&inf;|&nan;)">
+  <!ENTITY floatBase60 "[\-\+]?[0-9][0-9_]*(?:\:[0-5]?[0-9])+\.[0-9_]*">
+  <!ENTITY inf         "[\-\+]?\.(?:inf|Inf|INF)\b">
+  <!ENTITY nan         "\.(?:nan|NaN|NAN)\b">
+  <!ENTITY allFloat    "(?:&float;|&floatExp;|&floatBase60;|&inf;|&nan;)">
 
   <!ENTITY endValue       "(?:\s*$|\s+#)">
   <!ENTITY endValueInline "\s*[:,\[\]\{\}]">
@@ -37,7 +37,7 @@
 <!-- Modifications (YAML 1.2), values & support for literal/folded style:
        Nibaldo González S. <nibgonz@gmail.com>
        These modifications are under the MIT license. //-->
-<language name="YAML" version="6" kateversion="5.0" section="Markup"
+<language name="YAML" version="7" kateversion="5.0" section="Markup"
           extensions="*.yaml;*.yml" mimetype="text/yaml" priority="9"
           author="Dr Orlovsky MA (dr.orlovsky@gmail.com), Nibaldo González (nibgonz@gmail.com)" license="LGPL">
   <highlighting>
@@ -47,7 +47,7 @@
         <RegExpr attribute="End of Document" context="EOD" String="^\.\.\.$" column="0"/>
         <DetectChar attribute="Directive" context="directive" char="%" column="0"/>
 
-        <RegExpr attribute="Comment" context="comment" String="(^|\s+)#" />
+        <RegExpr attribute="Comment" context="comment" String="(?:^|\s+)#" />
 
         <!-- Literal/Folded Style -->
         <IncludeRules context="find-literal-block" />
@@ -62,10 +62,10 @@
         <RegExpr attribute="Alias" firstNonSpace="true" context="after-data" String="&alias;" />
         <RegExpr attribute="Reference" firstNonSpace="true" context="after-data" String="&reference;" />
 
-        <RegExpr attribute="Key" context="dpoints-attribute-pre" String="[^&quot;'#\-\s][^:#]*(?=:(\s|$))"/>
-        <RegExpr attribute="Key" context="dpoints-attribute-pre" String="\-([^\s:#][^:#]*)?(?=:(\s|$))"/>
-        <RegExpr attribute="Key" context="dpoints-attribute-pre" String="&keyDQ;(?=:(\s|$))"/>
-        <RegExpr attribute="Key" context="dpoints-attribute-pre" String="&keySQ;(?=:(\s|$))"/>
+        <RegExpr attribute="Key" context="dpoints-attribute-pre" String="[^&quot;'#\-\s][^:#]*(?=\:(?:\s|$))"/>
+        <RegExpr attribute="Key" context="dpoints-attribute-pre" String="\-(?:[^\s:#][^:#]*)?(?=\:(?:\s|$))"/>
+        <RegExpr attribute="Key" context="dpoints-attribute-pre" String="&keyDQ;(?=\:(?:\s|$))"/>
+        <RegExpr attribute="Key" context="dpoints-attribute-pre" String="&keySQ;(?=\:(?:\s|$))"/>
         <RegExpr attribute="Key Points Operator" context="attribute-pre" String=":(?=\s|$)"/>
 
         <DetectChar attribute="String" firstNonSpace="true" context="string" char="'" beginRegion="String" />
@@ -75,7 +75,7 @@
       </context>
 
       <context attribute="Normal Text" lineEndContext="#pop" name="mapping-key" fallthrough="true" fallthroughContext="#pop">
-        <RegExpr attribute="Comment" context="#pop!comment" String="(^|\s+)#" />
+        <RegExpr attribute="Comment" context="#pop!comment" String="(?:^|\s+)#" />
         <DetectSpaces />
         <RegExpr attribute="Operator" context="#pop!dash" String="\-(?=\s|$)" />
         <RegExpr attribute="Data Types" context="#pop!after-data" String="&dataTypes;" />
@@ -89,7 +89,7 @@
       </context>
 
       <context attribute="Normal Text" lineEndContext="#pop" name="dash" fallthrough="true" fallthroughContext="#pop">
-        <RegExpr attribute="Comment" context="comment" String="(^|\s+)#" />
+        <RegExpr attribute="Comment" context="comment" String="(?:^|\s+)#" />
         <DetectSpaces/>
         <RegExpr attribute="Data Types" context="#stay" String="&dataTypes;" />
         <RegExpr attribute="Alias" context="#stay" String="&alias;" />
@@ -106,7 +106,7 @@
 
       <!-- Highlight lists, hashes and strings after a data type, reference or alias -->
       <context attribute="Normal Text" lineEndContext="#pop" name="after-data" fallthrough="true" fallthroughContext="#pop">
-        <RegExpr attribute="Comment" context="#pop!comment" String="(^|\s+)#" />
+        <RegExpr attribute="Comment" context="#pop!comment" String="(?:^|\s+)#" />
         <DetectSpaces />
         <RegExpr attribute="Data Types" context="#stay" String="&dataTypes;" />
         <RegExpr attribute="Alias" context="#stay" String="&alias;" />
@@ -119,7 +119,7 @@
       </context>
 
       <context attribute="Document Header" lineEndContext="#pop" name="header">
-        <RegExpr attribute="Comment" context="comment" String="(^|\s+)#" />
+        <RegExpr attribute="Comment" context="comment" String="(?:^|\s+)#" />
         <RegExpr attribute="Literal/Folded Operator" context="header-literal-operator" String="\s&literalOp;(?=&endValue;)" lookAhead="true" />
       </context>
       <context attribute="Document Header" lineEndContext="#pop#pop" name="header-literal-operator" fallthrough="true" fallthroughContext="#pop">
@@ -134,24 +134,24 @@
       </context>
 
       <context attribute="Attribute" lineEndContext="#pop#pop" name="attribute">
-        <RegExpr attribute="Comment" context="comment" String="(^|\s+)#" />
+        <RegExpr attribute="Comment" context="comment" String="(?:^|\s+)#" />
       </context>
 
       <context attribute="Attribute" lineEndContext="#stay" name="list-attribute-inline">
         <AnyChar attribute="Operator" context="#pop#pop" lookAhead="true" String=",]" />
-        <RegExpr attribute="Comment" context="comment" String="(^|\s+)#" />
+        <RegExpr attribute="Comment" context="comment" String="(?:^|\s+)#" />
       </context>
       <context attribute="Attribute" lineEndContext="#stay" name="hash-attribute-inline">
         <AnyChar attribute="Operator" context="#pop#pop" lookAhead="true" String=",}" />
-        <RegExpr attribute="Comment" context="comment" String="(^|\s+)#" />
+        <RegExpr attribute="Comment" context="comment" String="(?:^|\s+)#" />
       </context>
 
       <!-- Attribute -->
       <context attribute="Attribute" lineEndContext="#pop" name="dpoints-attribute-pre" fallthrough="true" fallthroughContext="#pop!attribute-pre">
         <DetectChar attribute="Key Points Operator" context="#pop!attribute-pre" char=":" /> <!-- Highlight two points after Key -->
       </context>
       <context attribute="Attribute" lineEndContext="#pop" name="attribute-pre" fallthrough="true" fallthroughContext="attribute">
-        <RegExpr attribute="Comment" context="comment" String="(^|\s+)#" />
+        <RegExpr attribute="Comment" context="comment" String="(?:^|\s+)#" />
         <DetectSpaces/>
         <DetectChar attribute="Operator" context="#stay" char="?" />
         <RegExpr attribute="Data Types" context="#stay" String="&dataTypes;" />
@@ -168,7 +168,7 @@
       </context>
 
       <context attribute="Attribute" lineEndContext="#pop" name="default-attribute-pre-inline">
-        <RegExpr attribute="Comment" context="comment" String="(^|\s+)#" />
+        <RegExpr attribute="Comment" context="comment" String="(?:^|\s+)#" />
         <DetectSpaces/>
 
         <DetectChar attribute="Operator" context="#stay" char="?" />
@@ -210,21 +210,21 @@
       <!-- List -->
       <!-- Context "find-values-list" highlights values and then sends to "list-element" -->
       <context attribute="List" lineEndContext="#stay" name="list" fallthrough="true" fallthroughContext="#pop!find-values-list" noIndentationBasedFolding="true">
-        <RegExpr attribute="Comment" context="comment" String="(^|\s+)#" />
+        <RegExpr attribute="Comment" context="comment" String="(?:^|\s+)#" />
         <DetectSpaces />
         <DetectChar attribute="Operator" context="#pop!find-values-list" char="?" />
       </context>
       <context attribute="List" lineEndContext="#stay" name="list-element" noIndentationBasedFolding="true">
-        <RegExpr attribute="Comment" context="comment" String="(^|\s+)#" />
+        <RegExpr attribute="Comment" context="comment" String="(?:^|\s+)#" />
 
         <DetectChar attribute="Operator" context="#pop" char="]" endRegion="List" />
         <DetectChar attribute="Operator" context="list" char="[" beginRegion="List" />
         <DetectChar attribute="Operator" context="hash" char="{" beginRegion="Hash" />
 
-        <RegExpr attribute="Key" context="dpoints-list-attribute-pre-inline" String="[^&quot;'#\-,\]\s][^:#,\]]*(?=:(\s|$))"/>
-        <RegExpr attribute="Key" context="dpoints-list-attribute-pre-inline" String="\-([^\s:#,\]][^:#,\]]*)?(?=:(\s|$))"/>
-        <RegExpr attribute="Key" context="dpoints-list-attribute-pre-inline" String="&keyDQ;(?=:(\s|$))"/>
-        <RegExpr attribute="Key" context="dpoints-list-attribute-pre-inline" String="&keySQ;(?=:(\s|$))"/>
+        <RegExpr attribute="Key" context="dpoints-list-attribute-pre-inline" String="[^&quot;'#\-,\]\s][^:#,\]]*(?=\:(?:\s|$))"/>
+        <RegExpr attribute="Key" context="dpoints-list-attribute-pre-inline" String="\-(?:[^\s:#,\]][^:#,\]]*)?(?=\:(?:\s|$))"/>
+        <RegExpr attribute="Key" context="dpoints-list-attribute-pre-inline" String="&keyDQ;(?=\:(?:\s|$))"/>
+        <RegExpr attribute="Key" context="dpoints-list-attribute-pre-inline" String="&keySQ;(?=\:(?:\s|$))"/>
         <RegExpr attribute="Key Points Operator" context="list-attribute-pre-inline" String=":(?=\s|$)" firstNonSpace="true" />
 
         <RegExpr attribute="Data Types" context="#stay" String="&dataTypes;" />
@@ -239,18 +239,18 @@
 
       <!-- Hash -->
       <context attribute="Hash" lineEndContext="#stay" name="hash" fallthrough="true" fallthroughContext="#pop!hash-element" noIndentationBasedFolding="true">
-        <RegExpr attribute="Comment" context="comment" String="(^|\s+)#" />
+        <RegExpr attribute="Comment" context="comment" String="(?:^|\s+)#" />
         <DetectSpaces />
         <DetectChar attribute="Operator" context="#pop!hash-element" char="?" />
       </context>
       <context attribute="Hash" lineEndContext="#stay" name="hash-element" noIndentationBasedFolding="true">
-        <RegExpr attribute="Comment" context="comment" String="(^|\s+)#" />
+        <RegExpr attribute="Comment" context="comment" String="(?:^|\s+)#" />
         <DetectSpaces/>
 
-        <RegExpr attribute="Key" context="dpoints-hash-attribute-pre-inline" String="[^\s&quot;'#\-,\}\s][^:#,\}]*(?=:(\s|$))"/>
-        <RegExpr attribute="Key" context="dpoints-hash-attribute-pre-inline" String="\-([^\s:#,\}][^:#,\}]*)?(?=:(\s|$))"/>
-        <RegExpr attribute="Key" context="dpoints-hash-attribute-pre-inline" String="&keyDQ;(?=:(\s|$))"/>
-        <RegExpr attribute="Key" context="dpoints-hash-attribute-pre-inline" String="&keySQ;(?=:(\s|$))"/>
+        <RegExpr attribute="Key" context="dpoints-hash-attribute-pre-inline" String="[^\s&quot;'#\-,\}\s][^:#,\}]*(?=\:(?:\s|$))"/>
+        <RegExpr attribute="Key" context="dpoints-hash-attribute-pre-inline" String="\-(?:[^\s:#,\}][^:#,\}]*)?(?=\:(?:\s|$))"/>
+        <RegExpr attribute="Key" context="dpoints-hash-attribute-pre-inline" String="&keyDQ;(?=\:(?:\s|$))"/>
+        <RegExpr attribute="Key" context="dpoints-hash-attribute-pre-inline" String="&keySQ;(?=\:(?:\s|$))"/>
         <RegExpr attribute="Key Points Operator" context="hash-attribute-pre-inline" String=":(?=\s|$)"/>
 
         <DetectChar attribute="Operator" context="#pop" char="}" endRegion="Hash" />
@@ -290,12 +290,12 @@
       </context>
 
       <context attribute="Error" lineEndContext="#pop#pop#pop" name="attribute-end">
-          <RegExpr attribute="Comment" context="comment" String="(^|\s+)#" />
+          <RegExpr attribute="Comment" context="comment" String="(?:^|\s+)#" />
           <DetectSpaces attribute="Normal Text" context="#stay"/>
       </context>
 
       <context attribute="Error" lineEndContext="#pop#pop#pop" name="attribute-end-inline">
-          <RegExpr attribute="Comment" context="comment" String="(^|\s+)#" />
+          <RegExpr attribute="Comment" context="comment" String="(?:^|\s+)#" />
           <DetectSpaces attribute="Normal Text" context="#stay"/>
           <AnyChar attribute="String" context="#pop#pop#pop"  lookAhead="true" String="}]"/>
           <DetectChar attribute="Operator" context="#pop#pop#pop" lookAhead="true" char="," />
@@ -314,7 +314,7 @@
       </context>
 
       <context attribute="Normal Text" lineEndContext="#stay" name="escaped-char-doubleq">
-        <RegExpr attribute="Escaped Character" context="#stay" String="\\([\s0abtnvfre&quot;/\\N_Lp]|x[a-fA-F0-9]{2}|u[a-fA-F0-9]{4}|U[a-fA-F0-9]{8})"/>
+        <RegExpr attribute="Escaped Character" context="#stay" String="\\(?:[\s0abtnvfre&quot;/\\N_Lp]|x[a-fA-F0-9]{2}|u[a-fA-F0-9]{4}|U[a-fA-F0-9]{8})"/>
       </context>
 
       <context attribute="Normal Text" lineEndContext="#stay" name="escaped-char-singleq">
@@ -347,10 +347,10 @@
       </context>
 
       <context attribute="Normal Text" lineEndContext="#stay" name="values-list">
-        <RegExpr attribute="Null" context="#stay" String="(\s|^)&null;(?=&endValueInline;|&endValue;)"/>
-        <RegExpr attribute="Boolean" context="#stay" String="(\s|^)&bool;(?=&endValueInline;|&endValue;)"/>
-        <RegExpr attribute="Float" context="#stay" String="(\s|^)&allFloat;(?=&endValueInline;|&endValue;)"/>
-        <RegExpr attribute="Integer" context="#stay" String="(\s|^)&allInt;(?=&endValueInline;|&endValue;)"/>
+        <RegExpr attribute="Null" context="#stay" String="(?:\s|^)&null;(?=&endValueInline;|&endValue;)"/>
+        <RegExpr attribute="Boolean" context="#stay" String="(?:\s|^)&bool;(?=&endValueInline;|&endValue;)"/>
+        <RegExpr attribute="Float" context="#stay" String="(?:\s|^)&allFloat;(?=&endValueInline;|&endValue;)"/>
+        <RegExpr attribute="Integer" context="#stay" String="(?:\s|^)&allInt;(?=&endValueInline;|&endValue;)"/>
       </context>
       <!-- If the value is found immediately at the beginning of the list item -->
       <context attribute="Normal Text" lineEndContext="#pop!list-element" name="find-values-list" fallthrough="true" fallthroughContext="#pop!list-element">
@@ -365,7 +365,7 @@
       <context attribute="Normal Text" lineEndContext="#stay" name="find-literal-block">
         <!-- Do not allow indentation with tabs: -->
         <RegExpr attribute="Alert" context="#stay" column="0"
-                 String="^&space;*\t+\s*(?=((&keyDQ;|&keySQ;|[^#])*[^#\w\|&lt;&gt;&quot;'])?&literalOp;&endValue;)" />
+                 String="^&space;*\t+\s*(?=(?:(?:&keyDQ;|&keySQ;|[^#])*[^#\w\|&lt;&gt;&quot;'])?&literalOp;&endValue;)" />
 
         <!-- CASE 1: The literal/folded operator is the first character of a line.
              The text after a space is considered literal.
@@ -421,7 +421,7 @@
              >             ^Start the literal text
         -->
         <RegExpr context="start-literal-block-withdash" lookAhead="true" column="0"
-                 String="^&space;*(\?&space;*|\-&space;+){1,6}((&keyDQ;|&keySQ;|[^#\-\?\s]|\-[^\s#])((&keyDQ;|&keySQ;|[^#])*[^#\w\|&lt;&gt;&quot;'])?)?&literalOp;&endValue;" />
+                 String="^&space;*(?:\?&space;*|\-&space;+){1,6}(?:(?:&keyDQ;|&keySQ;|[^#\-\?\s]|\-[^\s#])(?:(?:&keyDQ;|&keySQ;|[^#])*[^#\w\|&lt;&gt;&quot;'])?)?&literalOp;&endValue;" />
 
         <!-- CASE 5: Literal/folded operator after a data type or other content.
              Ex:
@@ -433,7 +433,7 @@
              >    ^Start the literal text
         -->
         <RegExpr context="start-literal-block-other" lookAhead="true" column="0"
-                 String="^&space;*(([&amp;\*]|!!)\S+\s+)+&literalOp;&endValue;" />
+                 String="^&space;*(?:(?:[&amp;\*]|!!)\S+\s+)+&literalOp;&endValue;" />
       </context>
 
       <!-- If the line with the literal operator starts with the "-" or "?" operator.
@@ -471,7 +471,7 @@
       <context attribute="Attribute" lineEndContext="#pop#pop" name="before-literal-operator" noIndentationBasedFolding="true">
         <RegExpr attribute="Literal/Folded Operator" context="#pop!end-literal-operator" String="&literalOp;(?=&endValue;)" beginRegion="Literal" />
 
-        <RegExpr attribute="Error" context="#pop#pop" String="([&amp;\*]|!!)\S*&literalOp;(?=&endValue;)" />
+        <RegExpr attribute="Error" context="#pop#pop" String="(?:[&amp;\*]|!!)\S*&literalOp;(?=&endValue;)" />
         <RegExpr attribute="Data Types" context="#stay" String="&dataTypes;" />
         <RegExpr attribute="Alias" context="#stay" String="&alias;" />
         <RegExpr attribute="Reference" context="#stay" String="&reference;" />
@@ -490,7 +490,7 @@
         <DetectChar attribute="Operator" context="#stay" char="?" />
       </context>
       <context attribute="Attribute" lineEndContext="#pop" name="end-literal-operator" noIndentationBasedFolding="true">
-        <RegExpr attribute="Comment" context="#pop!comment" String="(^|\s+)#" />
+        <RegExpr attribute="Comment" context="#pop!comment" String="(?:^|\s+)#" />
       </context>
 
       <!-- Common rules for the content of the literal blocks -->
@@ -515,15 +515,15 @@
         <RegExpr attribute="Literal/Folded Block" context="#stay" String="^%1.*$" dynamic="true" column="0" />
 
         <RegExpr attribute="Normal Text" context="#pop" String="^\s*\S" lookAhead="true" column="0" endRegion="Literal" />
-        <RegExpr attribute="Comment" context="comment" String="(^|\s)#" />
+        <RegExpr attribute="Comment" context="comment" String="(?:^|\s)#" />
         <RegExpr context="#pop" String="\S" lookAhead="true" endRegion="Literal" />
       </context>
       <!-- If the literal operator is the first character of a line (or after header) -->
       <context attribute="Normal Text" lineEndContext="#stay" name="literal-block-simple" noIndentationBasedFolding="true">
         <RegExpr attribute="Literal/Folded Block" context="#stay" String="^\s.*$" column="0" />
 
         <RegExpr attribute="Normal Text" context="#pop" String="^\s*\S" lookAhead="true" column="0" endRegion="Literal" />
-        <RegExpr attribute="Comment" context="comment" String="(^|\s)#" />
+        <RegExpr attribute="Comment" context="comment" String="(?:^|\s)#" />
       </context>
       <!-- If there is a data type or other content before the liretal operator (use block indentation) -->
       <context attribute="Normal Text" lineEndContext="#stay" name="literal-block-after-data" dynamic="true" noIndentationBasedFolding="true">