From 75ff9a6fdcf809cab9ae649e04320b20a0f47f81 Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Thu, 20 Oct 2016 23:36:02 +0300
Subject: [PATCH] GenericHighlighter: Update from latest KTextEditor source

Change-Id: I0caf19cd7698c9934655483304314b5653b69f21
Reviewed-by: David Schulz <david.schulz@qt.io>
---
 .../3rdparty/generic-highlighter/alert.xml    |    2 +-
 .../3rdparty/generic-highlighter/bash.xml     |   26 +-
 .../3rdparty/generic-highlighter/cmake.xml    |    2 +-
 .../3rdparty/generic-highlighter/css.xml      | 1901 +++++++++--------
 .../3rdparty/generic-highlighter/doxygen.xml  |   10 +-
 .../3rdparty/generic-highlighter/dtd.xml      |    2 +-
 .../3rdparty/generic-highlighter/html.xml     |    4 +-
 .../3rdparty/generic-highlighter/ini.xml      |    4 +-
 .../3rdparty/generic-highlighter/java.xml     |    2 +-
 .../3rdparty/generic-highlighter/javadoc.xml  |    2 +-
 .../3rdparty/generic-highlighter/makefile.xml |    2 +-
 .../3rdparty/generic-highlighter/perl.xml     |    2 +-
 .../3rdparty/generic-highlighter/ruby.xml     |    2 +-
 .../valgrind-suppression.xml                  |    2 +-
 .../3rdparty/generic-highlighter/xml.xml      |    4 +-
 .../3rdparty/generic-highlighter/yacc.xml     |    6 +-
 16 files changed, 1090 insertions(+), 883 deletions(-)

diff --git a/src/share/3rdparty/generic-highlighter/alert.xml b/src/share/3rdparty/generic-highlighter/alert.xml
index 8ac5296fc80..3ed783b35dc 100644
--- a/src/share/3rdparty/generic-highlighter/alert.xml
+++ b/src/share/3rdparty/generic-highlighter/alert.xml
@@ -30,7 +30,7 @@
   Introduce 3 alert levels and sort keywords according importance.
   Few more keywords has been added.
 -->
-<language version="1.11" kateversion="3.1" name="Alerts" section="Other" extensions="" mimetype="" author="Dominik Haumann (dhdev@gmx.de)" license="LGPL" hidden="true">
+<language version="2" kateversion="3.1" name="Alerts" section="Other" extensions="" mimetype="" author="Dominik Haumann (dhdev@gmx.de)" license="LGPL" hidden="true">
   <highlighting>
     <list name="alerts_hi">
       <item> ALERT </item>
diff --git a/src/share/3rdparty/generic-highlighter/bash.xml b/src/share/3rdparty/generic-highlighter/bash.xml
index 2eaec955e03..dc47e04bdfb 100644
--- a/src/share/3rdparty/generic-highlighter/bash.xml
+++ b/src/share/3rdparty/generic-highlighter/bash.xml
@@ -8,7 +8,7 @@
         <!ENTITY noword   "(?![\w$+-])">                <!-- no word, $, + or - following -->
         <!ENTITY pathpart "([\w_@.&#37;*?+-]|\\ )">     <!-- valid character in a file name -->
 ]>
-<language name="Bash" version="2.18" kateversion="5.0" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;.bashrc;.bash_profile;.bash_login;.profile" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
+<language name="Bash" version="3" kateversion="5.0" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;*.nix;.bashrc;.bash_profile;.bash_login;.profile" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
 
 <!-- (c) 2004 by Wilbert Berendsen (wilbert@kde.nl)
     Changes by Matthew Woehlke (mw_triad@users.sourceforge.net)
@@ -312,6 +312,14 @@
       <item> gawk </item>
       <item> gc </item>
       <item> gcc </item>
+      <item> clang </item>
+      <item> valgrind </item>
+      <item> xdg-open </item>
+      <item> cmake </item>
+      <item> qmake </item>
+      <item> svn </item>
+      <item> git </item>
+      <item> rsync </item>
       <item> gdb </item>
       <item> getent </item>
       <item> getopt </item>
@@ -550,7 +558,7 @@
         <RegExpr attribute="Redirection" context="#stay" String="([0-9]*(&gt;{1,2}|&lt;)(&amp;[0-9]+-?)?|&amp;&gt;|&gt;&amp;|[0-9]*&lt;&gt;)" />
         <!-- handle &, &&, | and || -->
         <RegExpr attribute="Control" context="#stay" String="([|&amp;])\1?" />
-      </context>      
+      </context>
       <context attribute="Normal Text" lineEndContext="#stay" name="FindNormalCommands">
         <keyword attribute="Builtin" context="CommandArgs" String="builtins" />
         <keyword attribute="Command" context="CommandArgs" String="unixcommands" />
@@ -559,11 +567,11 @@
         <RegExpr attribute="OtherCommand" context="#stay" String="/&pathpart;*(?=([/);$`'&quot;]|$))" />
         <RegExpr attribute="OtherCommand" context="CommandArgs" String="/&pathpart;*(?=([\s);$`'&quot;]|$))" />
         <!-- This list is not complete. ie, ":" is missing but as it is in bash completition. -->
-        <RegExpr attribute="OtherCommand" context="CommandArgs" String="&pathpart;*" />        
+        <RegExpr attribute="OtherCommand" context="CommandArgs" String="&pathpart;*" />
       </context>
-      
+
       <!-- CommandArgs matches the items after a command -->
-      <context attribute="Normal Text" lineEndContext="#pop" name="CommandArgs">  
+      <context attribute="Normal Text" lineEndContext="#pop" name="CommandArgs">
         <LineContinue />
         <IncludeRules context="FindMost" />
         <RegExpr attribute="Keyword" context="#stay" String="\\$" />
@@ -578,12 +586,12 @@
         <!-- handle redirection -->
         <RegExpr attribute="Redirection" context="#stay" String="([0-9]*(&gt;{1,2}|&lt;)(&amp;[0-9]+-?)?|&amp;&gt;|&gt;&amp;|[0-9]*&lt;&gt;)" />
         <!-- handle &, &&, | and || -->
-        <RegExpr attribute="Control" context="#pop" String="([|&amp;;])\1?" />        
+        <RegExpr attribute="Control" context="#pop" String="([|&amp;;])\1?" />
         <RegExpr attribute="Option" context="#stay" String="-?-[a-z][A-Za-z0-9_-]*" />
         <keyword attribute="Option" context="#stay" String="keywords" />
         <AnyChar String=")}" context="#pop" lookAhead="true"/>
       </context>
-      
+
       <!-- FindCommands matches many items that can be expected outside strings, substitutions etc, when inside a Backquote -->
       <context attribute="Normal Text" lineEndContext="#stay" name="FindCommandsBackq">
         <IncludeRules context="FindSpecialCommands" />
@@ -598,12 +606,12 @@
         <RegExpr attribute="OtherCommand" context="CommandArgsBackq" String="/&pathpart;*(?=([\s);$`'&quot;]|$))" />
         <RegExpr attribute="OtherCommand" context="CommandArgsBackq" String="&pathpart;*" />
       </context>
-      <context attribute="Normal Text" lineEndContext="#pop" name="CommandArgsBackq"> 
+      <context attribute="Normal Text" lineEndContext="#pop" name="CommandArgsBackq">
         <LineContinue />
         <DetectChar attribute="Keyword" context="#pop" char="`" lookAhead="true"/>
         <IncludeRules context="CommandArgs" />
       </context>
-          
+
       <!-- FindOthers contains various rules to mark different shell input -->
       <context attribute="Normal Text" lineEndContext="#stay" name="FindOthers">
         <RegExpr attribute="Escape" context="#stay" String="\\[][;\\$`{}()|&amp;&lt;&gt;* ]" />
diff --git a/src/share/3rdparty/generic-highlighter/cmake.xml b/src/share/3rdparty/generic-highlighter/cmake.xml
index 3cd4893fe3b..c907c32e7ed 100644
--- a/src/share/3rdparty/generic-highlighter/cmake.xml
+++ b/src/share/3rdparty/generic-highlighter/cmake.xml
@@ -28,7 +28,7 @@
 <!-- generated for "cmake version 2.8.12.1, 3.0.2, 3.1.2 and 3.3.0" -->
 <language
     name="CMake"
-    version="1.36"
+    version="2"
     kateversion="5.0"
     section="Other"
     extensions="CMakeLists.txt;*.cmake;*.cmake.in"
diff --git a/src/share/3rdparty/generic-highlighter/css.xml b/src/share/3rdparty/generic-highlighter/css.xml
index 552b259a92e..afb184211d4 100644
--- a/src/share/3rdparty/generic-highlighter/css.xml
+++ b/src/share/3rdparty/generic-highlighter/css.xml
@@ -12,6 +12,9 @@ Kate CSS syntax highlighting definition
 
 Changelog:
 
+- Version 2.13, by Guo Yunhe
+- Add all W3C Work Draft properties
+
 - Version 2.06, by Mte90:
 - CSS3 tag
 
@@ -23,898 +26,1094 @@ Changelog:
 
 -->
 
-<language name="CSS" version="2.12" kateversion="5.0" section="Markup" extensions="*.css" indenter="cstyle" mimetype="text/css" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
+<language name="CSS" version="3" kateversion="5.0" section="Markup" extensions="*.css" indenter="cstyle" mimetype="text/css" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
 
-	<highlighting>
-		<list name="properties">
-			<!-- CSS2 -->
-			<item> azimuth </item>
-			<item> background </item>
-			<item> background-attachment </item>
-			<item> background-break </item>
-			<item> background-clip </item>
-			<item> background-color </item>
-			<item> background-image </item>
-			<item> background-position </item>
-			<item> background-origin </item>
-			<item> background-repeat </item>
-			<item> border </item>
-			<item> border-bottom </item>
-			<item> border-bottom-color </item>
-			<item> border-bottom-style </item>
-			<item> border-bottom-width </item>
-			<item> border-collapse </item>
-			<item> border-color </item>
-			<item> border-left </item>
-			<item> border-left-color </item>
-			<item> border-left-style </item>
-			<item> border-left-width </item>
-			<item> border-right </item>
-			<item> border-right-color </item>
-			<item> border-right-style </item>
-			<item> border-right-width </item>
-			<item> border-spacing </item>
-			<item> border-style </item>
-			<item> border-top </item>
-			<item> border-top-color </item>
-			<item> border-top-style </item>
-			<item> border-top-width </item>
-			<item> border-width </item>
-			<item> bottom </item>
-			<item> caption-side </item>
-			<item> clear </item>
-			<item> clip </item>
-			<item> color </item>
-			<item> content </item>
-			<item> counter-increment </item>
-			<item> counter-reset </item>
-			<item> cue </item>
-			<item> cue-after </item>
-			<item> cue-before </item>
-			<item> cursor </item>
-			<item> direction </item>
-			<item> display </item>
-			<item> elevation </item>
-			<item> empty-cells </item>
-			<item> float </item>
-			<item> font </item>
-			<item> font-family </item>
-			<item> font-size </item>
-			<item> font-size-adjust </item>
-			<item> font-stretch </item>
-			<item> font-style </item>
-			<item> font-variant </item>
-			<item> font-weight </item>
-			<item> font-stretch </item>
-			<item> height </item>
-			<item> left </item>
-			<item> letter-spacing </item>
-			<item> line-height </item>
-			<item> list-style </item>
-			<item> list-style-image </item>
-			<item> list-style-keyword </item>
-			<item> list-style-position </item>
-			<item> list-style-type  </item>
-			<item> margin </item>
-			<item> margin-bottom </item>
-			<item> margin-left </item>
-			<item> margin-right </item>
-			<item> margin-top </item>
-			<item> marker-offset </item>
-			<item> max-height </item>
-			<item> max-width </item>
-			<item> min-height </item>
-			<item> min-width </item>
-			<item> orphans </item>
-			<item> outline </item>
-			<item> outline-color </item>
-			<item> outline-style </item>
-			<item> outline-width </item>
-			<item> overflow </item>
-			<item> padding </item>
-			<item> padding-bottom </item>
-			<item> padding-left </item>
-			<item> padding-right </item>
-			<item> padding-top </item>
-			<item> page </item>
-			<item> page-break-after </item>
-			<item> page-break-before </item>
-			<item> page-break-inside </item>
-			<item> pause </item>
-			<item> pause-after </item>
-			<item> pause-before </item>
-			<item> pitch </item>
-			<item> pitch-range </item>
-			<item> play-during </item>
-			<item> position </item>
-			<item> quotes </item>
-			<item> richness </item>
-			<item> right </item>
-			<item> size </item>
-			<item> speak </item>
-			<item> speak-header </item>
-			<item> speak-numeral </item>
-			<item> speak-punctuation </item>
-			<item> speech-rate </item>
-			<item> stress </item>
-			<item> table-layout </item>
-			<item> text-align </item>
-			<item> text-decoration </item>
-			<item> text-decoration-color </item>
-			<item> text-indent </item>
-			<item> text-shadow </item>
-			<item> text-transform </item>
-			<item> top </item>
-			<item> unicode-bidi </item>
-			<item> vertical-align </item>
-			<item> visibility </item>
-			<item> voice-family </item>
-			<item> volume </item>
-			<item> white-space </item>
-			<item> widows </item>
-			<item> width </item>
-			<item> word-spacing </item>
-			<item> z-index </item>
+    <highlighting>
+        <list name="properties">
+            <!-- W3C > Work Draft, from https://www.w3.org/Style/CSS/all-properties -->
+            <item> azimuth </item>
+            <item> align-content </item>
+            <item> align-items </item>
+            <item> align-self </item>
+            <item> alignment-baseline </item>
+            <item> all </item>
+            <item> animation-name </item>
+            <item> animation-duration </item>
+            <item> animation-iteration-count </item>
+            <item> animation-direction </item>
+            <item> animation-delay </item>
+            <item> animation-play-state </item>
+            <item> animation-fill-mode </item>
+            <item> animation-timing-function </item>
+            <item> backface-visibility </item>
+            <item> background </item>
+            <item> background-attachment </item>
+            <item> background-blend-mode </item>
+            <item> background-break </item>
+            <item> background-clip </item>
+            <item> background-color </item>
+            <item> background-image </item>
+            <item> background-origin </item>
+            <item> background-position </item>
+            <item> background-repeat </item>
+            <item> background-size </item>
+            <item> baseline-shift </item>
+            <item> bookmark-label </item>
+            <item> bookmark-level </item>
+            <item> bookmark-level </item>
+            <item> border </item>
+            <item> border-bottom </item>
+            <item> border-bottom-color </item>
+            <item> border-bottom-image </item>
+            <item> border-bottom-style </item>
+            <item> border-bottom-width </item>
+            <item> border-bottom-left-image </item>
+            <item> border-bottom-left-radius </item>
+            <item> border-bottom-right-image </item>
+            <item> border-bottom-right-radius </item>
+            <item> border-boundary </item>
+            <item> border-collapse </item>
+            <item> border-color </item>
+            <item> border-corner-image </item>
+            <item> border-image </item>
+            <item> border-image-outset </item>
+            <item> border-image-repeat </item>
+            <item> border-image-slice </item>
+            <item> border-image-source </item>
+            <item> border-image-width </item>
+            <item> border-left </item>
+            <item> border-left-color </item>
+            <item> border-left-image </item>
+            <item> border-left-style </item>
+            <item> border-left-width </item>
+            <item> border-radius </item>
+            <item> border-right </item>
+            <item> border-right-color </item>
+            <item> border-right-image </item>
+            <item> border-right-style </item>
+            <item> border-right-width </item>
+            <item> border-spacing </item>
+            <item> border-style </item>
+            <item> border-top </item>
+            <item> border-top-color </item>
+            <item> border-top-image </item>
+            <item> border-top-style </item>
+            <item> border-top-width </item>
+            <item> border-top-left-image </item>
+            <item> border-top-left-radius </item>
+            <item> border-top-right-image </item>
+            <item> border-top-right-radius </item>
+            <item> border-width </item>
+            <item> bottom </item>
+            <item> box-align </item>
+            <item> box-decoration-break </item>
+            <item> box-direction </item>
+            <item> box-flex </item>
+            <item> box-shadow </item>
+            <item> box-sizing </item>
+            <item> box-snap </item>
+            <item> box-suppress </item>
+            <item> break-after </item>
+            <item> break-before </item>
+            <item> break-inside </item>
+            <item> caret-color </item>
+            <item> caption-side </item>
+            <item> chains </item>
+            <item> clear </item>
+            <item> clip </item>
+            <item> clip-path </item>
+            <item> clip-rule </item>
+            <item> color </item>
+            <item> color-interpolation-filters </item>
+            <item> column-count </item>
+            <item> column-fill </item>
+            <item> column-gap </item>
+            <item> column-rule </item>
+            <item> column-rule-color </item>
+            <item> column-rule-style </item>
+            <item> column-rule-width </item>
+            <item> column-span </item>
+            <item> column-width </item>
+            <item> columns </item>
+            <item> content </item>
+            <item> counter-increment </item>
+            <item> counter-reset </item>
+            <item> counter-set </item>
+            <item> cue </item>
+            <item> cue-after </item>
+            <item> cue-before </item>
+            <item> cursor </item>
+            <item> direction </item>
+            <item> display </item>
+            <item> dominant-baseline </item>
+            <item> elevation </item>
+            <item> empty-cells </item>
+            <item> filter </item>
+            <item> flex </item>
+            <item> flex-basis </item>
+            <item> flex-direction </item>
+            <item> flex-flow </item>
+            <item> flex-grow </item>
+            <item> flex-shrink </item>
+            <item> flex-wrap </item>
+            <item> float </item>
+            <item> flood-color </item>
+            <item> flood-opacity </item>
+            <item> flow </item>
+            <item> flow-from </item>
+            <item> flow-into </item>
+            <item> font </item>
+            <item> font-family </item>
+            <item> font-size </item>
+            <item> font-size-adjust </item>
+            <item> font-stretch </item>
+            <item> font-style </item>
+            <item> font-variant </item>
+            <item> font-weight </item>
+            <item> font-stretch </item>
+            <item> font-feature-settings </item>
+            <item> font-kerning </item>
+            <item> font-language-override </item>
+            <item> font-synthesis </item>
+            <item> font-variant-alternates </item>
+            <item> font-variant-caps </item>
+            <item> font-variant-east-asian </item>
+            <item> font-variant-ligatures </item>
+            <item> font-variant-numeric </item>
+            <item> font-variant-position </item>
+            <item> footnote-display </item>
+            <item> footnote-policy </item>
+            <item> glyph-orientation-vertical </item>
+            <item> grid </item>
+            <item> grid-area </item>
+            <item> grid-auto-columns </item>
+            <item> grid-auto-flow </item>
+            <item> grid-auto-rows </item>
+            <item> grid-column </item>
+            <item> grid-column-end </item>
+            <item> grid-column-gap </item>
+            <item> grid-column-start </item>
+            <item> grid-gap </item>
+            <item> grid-row </item>
+            <item> grid-row-end </item>
+            <item> grid-row-gap </item>
+            <item> grid-row-start </item>
+            <item> grid-template </item>
+            <item> grid-template-areas </item>
+            <item> grid-template-columns </item>
+            <item> grid-template-rows </item>
+            <item> hanging-punctuation </item>
+            <item> height </item>
+            <item> hyphens </item>
+            <item> image-orientation </item>
+            <item> image-rendering </item>
+            <item> image-resolution </item>
+            <item> initial-letter </item>
+            <item> initial-letter-align </item>
+            <item> initial-letter-wrap </item>
+            <item> isolation </item>
+            <item> justify-content </item>
+            <item> justify-items </item>
+            <item> justify-self </item>
+            <item> left </item>
+            <item> letter-spacing </item>
+            <item> lighting-color </item>
+            <item> linear-gradient </item>
+            <item> line-grid </item>
+            <item> line-height </item>
+            <item> line-snap </item>
+            <item> list-style </item>
+            <item> list-style-image </item>
+            <item> list-style-keyword </item>
+            <item> list-style-position </item>
+            <item> list-style-type  </item>
+            <item> margin </item>
+            <item> margin-bottom </item>
+            <item> margin-left </item>
+            <item> margin-right </item>
+            <item> margin-top </item>
+            <item> marker-offset </item>
+            <item> marker-side </item>
+            <item> marquee-direction </item>
+            <item> marquee-loop </item>
+            <item> marquee-speed </item>
+            <item> marquee-style </item>
+            <item> mask </item>
+            <item> mask-border </item>
+            <item> mask-border-mode </item>
+            <item> mask-border-outset </item>
+            <item> mask-border-repeat </item>
+            <item> mask-border-slice </item>
+            <item> mask-border-source </item>
+            <item> mask-border-width </item>
+            <item> mask-clip </item>
+            <item> mask-composite </item>
+            <item> mask-image </item>
+            <item> mask-mode </item>
+            <item> mask-origin </item>
+            <item> mask-position </item>
+            <item> mask-repeat </item>
+            <item> mask-size </item>
+            <item> mask-type </item>
+            <item> max-height </item>
+            <item> max-lines </item>
+            <item> max-width </item>
+            <item> min-height </item>
+            <item> min-width </item>
+            <item> mix-blend-mode </item>
+            <item> nav-down </item>
+            <item> nav-left </item>
+            <item> nav-right </item>
+            <item> nav-up </item>
+            <item> object-fit </item>
+            <item> object-position </item>
+            <item> offset-after </item>
+            <item> offset-before </item>
+            <item> offset-end </item>
+            <item> offset-start </item>
+            <item> opacity </item>
+            <item> order </item>
+            <item> orphans </item>
+            <item> outline </item>
+            <item> outline-color </item>
+            <item> outline-offset </item>
+            <item> outline-style </item>
+            <item> outline-width </item>
+            <item> overflow </item>
+            <item> overflow-style </item>
+            <item> overflow-wrap </item>
+            <item> overflow-x </item>
+            <item> overflow-y </item>
+            <item> padding </item>
+            <item> padding-bottom </item>
+            <item> padding-left </item>
+            <item> padding-right </item>
+            <item> padding-top </item>
+            <item> page </item>
+            <item> page-break-after </item>
+            <item> page-break-before </item>
+            <item> page-break-inside </item>
+            <item> pause </item>
+            <item> pause-after </item>
+            <item> pause-before </item>
+            <item> perspective </item>
+            <item> perspective-origin </item>
+            <item> pitch </item>
+            <item> pitch-range </item>
+            <item> play-during </item>
+            <item> pointer-events </item>
+            <item> polar-anchor </item>
+            <item> polar-angle </item>
+            <item> polar-distance </item>
+            <item> polar-origin </item>
+            <item> position </item>
+            <item> presentation-level </item>
+            <item> quotes </item>
+            <item> resize </item>
+            <item> rest </item>
+            <item> rest-after </item>
+            <item> rest-before </item>
+            <item> richness </item>
+            <item> right </item>
+            <item> rotation </item>
+            <item> rotation-point </item>
+            <item> ruby-align </item>
+            <item> ruby-merge </item>
+            <item> ruby-position </item>
+            <item> running </item>
+            <item> scroll-behavior </item>
+            <item> scroll-snap-align </item>
+            <item> scroll-snap-margin </item>
+            <item> scroll-snap-margin-block </item>
+            <item> scroll-snap-margin-block-end </item>
+            <item> scroll-snap-margin-block-start </item>
+            <item> scroll-snap-margin-bottom </item>
+            <item> scroll-snap-margin-inline </item>
+            <item> scroll-snap-margin-inline-end </item>
+            <item> scroll-snap-margin-inline-start </item>
+            <item> scroll-snap-margin-left </item>
+            <item> scroll-snap-margin-right </item>
+            <item> scroll-snap-margin-top </item>
+            <item> scroll-snap-padding </item>
+            <item> scroll-snap-padding-block </item>
+            <item> scroll-snap-padding-block-end </item>
+            <item> scroll-snap-padding-block-start </item>
+            <item> scroll-snap-padding-bottom </item>
+            <item> scroll-snap-padding-inline </item>
+            <item> scroll-snap-padding-inline-end </item>
+            <item> scroll-snap-padding-inline-start </item>
+            <item> scroll-snap-padding-left </item>
+            <item> scroll-snap-padding-right </item>
+            <item> scroll-snap-padding-top </item>
+            <item> scroll-snap-stop </item>
+            <item> scroll-snap-type </item>
+            <item> shape-image-threshold </item>
+            <item> shape-inside </item>
+            <item> shape-margin </item>
+            <item> shape-outside </item>
+            <item> size </item>
+            <item> speak </item>
+            <item> speak-as </item>
+            <item> speak-header </item>
+            <item> speak-numeral </item>
+            <item> speak-punctuation </item>
+            <item> speech-rate </item>
+            <item> stress </item>
+            <item> string-set </item>
+            <item> tab-size </item>
+            <item> table-layout </item>
+            <item> text-align </item>
+            <item> text-align-last </item>
+            <item> text-combine-upright </item>
+            <item> text-decoration </item>
+            <item> text-decoration-color </item>
+            <item> text-decoration-line </item>
+            <item> text-decoration-skip </item>
+            <item> text-decoration-style </item>
+            <item> text-emphasis </item>
+            <item> text-emphasis-color </item>
+            <item> text-emphasis-position </item>
+            <item> text-emphasis-style </item>
+            <item> text-indent </item>
+            <item> text-justify </item>
+            <item> text-orientation </item>
+            <item> text-overflow </item>
+            <item> text-shadow </item>
+            <item> text-transform </item>
+            <item> text-underline-position </item>
+            <item> text-wrap </item>
+            <item> top </item>
+            <item> transform </item>
+            <item> transform-origin </item>
+            <item> transform-style </item>
+            <item> transition </item>
+            <item> transition-delay </item>
+            <item> transition-property </item>
+            <item> transition-duration </item>
+            <item> transition-timing-function </item>
+            <item> unicode-bidi </item>
+            <item> vertical-align </item>
+            <item> visibility </item>
+            <item> voice-balance </item>
+            <item> voice-duration </item>
+            <item> voice-family </item>
+            <item> voice-pitch </item>
+            <item> voice-range </item>
+            <item> voice-rate </item>
+            <item> voice-stress </item>
+            <item> voice-volume </item>
+            <item> volume </item>
+            <item> white-space </item>
+            <item> widows </item>
+            <item> width </item>
+            <item> will-change </item>
+            <item> word-break </item>
+            <item> word-spacing </item>
+            <item> word-wrap </item>
+            <item> wrap-flow </item>
+            <item> wrap-through </item>
+            <item> writing-mode </item>
+            <item> z-index </item>
 
-			<!-- CSS3 -->
-			<item> animation-name </item>
-			<item> animation-duration </item>
-			<item> animation-iteration </item>
-			<item> animation-direction </item>
-			<item> animation-delay </item>
-			<item> animation-play-state </item>
-			<item> animation-fill-mode </item>
-			<item> animation-timing-function </item>
-			<item> background-size </item>
-			<item> border-bottom-image </item>
-			<item> border-bottom-left-image </item>
-			<item> border-bottom-left-radius </item>
-			<item> border-bottom-right-image </item>
-			<item> border-bottom-right-radius </item>
-			<item> border-collapse </item>
-			<item> border-corner-image </item>
-			<item> border-image </item>
-			<item> border-left-image </item>
-			<item> border-radius </item>
-			<item> border-right-image </item>
-			<item> border-top-image </item>
-			<item> border-top-left-image </item>
-			<item> border-top-left-radius </item>
-			<item> border-top-right-image </item>
-			<item> border-top-right-radius </item>
-			<item> box-align </item>
-			<item> box-direction </item>
-			<item> box-flex </item>
-			<item> box-shadow </item>
-			<item> box-sizing </item>
-			<item> column-count </item>
-			<item> column-fill </item>
-			<item> column-gap </item>
-			<item> column-rule-color </item>
-			<item> column-rule-style </item>
-			<item> column-rule-width </item>
-			<item> column-span </item>
-			<item> column-width </item>
-			<item> hyphens </item>
-			<item> linear-gradient </item>
-			<item> opacity </item>
-			<item> outline </item>
-			<item> outline-offset </item>
-			<item> overflow-x </item>
-			<item> overflow-y </item>
-			<item> pointer-events </item>
-			<item> resize </item>
-			<item> rotation </item>
-			<item> rotation-point </item>
-			<item> table-layout </item>
-			<item> text-overflow </item>
-			<item> text-shadow </item>
-			<item> text-wrap </item>
-			<item> transform-origin </item>
-			<item> transition </item>
-			<item> transition-property </item>
-			<item> transition-duration </item>
-			<item> word-break </item>
-			<item> word-wrap </item>
+            <!-- Gecko rendering engine CSS property extensions -->
+            <item> -moz-animation-name </item>
+            <item> -moz-animation-duration </item>
+            <item> -moz-animation-iteration </item>
+            <item> -moz-animation-direction </item>
+            <item> -moz-animation-delay </item>
+            <item> -moz-animation-play-state </item>
+            <item> -moz-animation-fill-mode </item>
+            <item> -moz-background-size </item>
+            <item> -moz-border-image </item>
+            <item> -moz-border-bottom-colors </item>
+            <item> -moz-border-left-colors </item>
+            <item> -moz-border-radius </item>
+            <item> -moz-border-radius-topleft </item>
+            <item> -moz-border-radius-topright </item>
+            <item> -moz-border-radius-bottomleft </item>
+            <item> -moz-border-radius-bottomright </item>
+            <item> -moz-border-right-colors </item>
+            <item> -moz-border-top-colors </item>
+            <item> -moz-box </item>
+            <item> -moz-box-flex </item>
+            <item> -moz-box-shadow </item>
+            <item> -moz-box-sizing </item>
+            <item> -moz-column-count </item>
+            <item> -moz-column-gap </item>
+            <item> -moz-hyphens </item>
+            <item> -moz-linear-gradient </item>
+            <item> -moz-opacity </item>
+            <item> -moz-outline-style </item>
+            <item> -moz-perspective </item>
+            <item> -moz-radial-gradient </item>
+            <item> -moz-resize </item>
+            <item> -moz-transform </item>
+            <item> -moz-transform-origin </item>
+            <item> -moz-transform-style </item>
+            <item> -moz-transition </item>
+            <item> -moz-transition-property </item>
+            <item> -moz-transition-duration </item>
 
-			<!-- Gecko rendering engine CSS property extensions -->
-			<item> -moz-animation-name </item>
-			<item> -moz-animation-duration </item>
-			<item> -moz-animation-iteration </item>
-			<item> -moz-animation-direction </item>
-			<item> -moz-animation-delay </item>
-			<item> -moz-animation-play-state </item>
-			<item> -moz-animation-fill-mode </item>
-			<item> -moz-background-size </item>
-			<item> -moz-border-image </item>
-			<item> -moz-border-bottom-colors </item>
-			<item> -moz-border-left-colors </item>
-			<item> -moz-border-radius </item>
-			<item> -moz-border-radius-topleft </item>
-			<item> -moz-border-radius-topright </item>
-			<item> -moz-border-radius-bottomleft </item>
-			<item> -moz-border-radius-bottomright </item>
-			<item> -moz-border-right-colors </item>
-			<item> -moz-border-top-colors </item>
-			<item> -moz-box </item>
-			<item> -moz-box-flex </item>
-			<item> -moz-box-shadow </item>
-			<item> -moz-box-sizing </item>
-			<item> -moz-column-count </item>
-			<item> -moz-column-gap </item>
-			<item> -moz-hyphens </item>
-			<item> -moz-linear-gradient </item>
-			<item> -moz-opacity </item>
-			<item> -moz-outline-style </item>
-			<item> -moz-perspective </item>
-			<item> -moz-radial-gradient </item>
-			<item> -moz-resize </item>
-			<item> -moz-transform </item>
-			<item> -moz-transform-origin </item>
-			<item> -moz-transform-style </item>
-			<item> -moz-transition </item>
-			<item> -moz-transition-property </item>
-			<item> -moz-transition-duration </item>
+            <!-- Opera rendering engine CSS property extensions -->
+            <item> -o-background-size </item>
+            <item> -o-linear-gradient </item>
+            <item> -o-text-overflow </item>
+            <item> -o-transition </item>
+            <item> -o-transform-origin </item>
 
-			<!-- Opera rendering engine CSS property extensions -->
-			<item> -o-background-size </item>
-			<item> -o-linear-gradient </item>
-			<item> -o-text-overflow </item>
-			<item> -o-transition </item>
-			<item> -o-transform-origin </item>
+            <!-- konq specific -->
+            <item> konq_bgpos_x </item>
+            <item> konq_bgpos_y </item>
+            <item> -khtml-background-size </item>
+            <item> -khtml-border-top-left-radius </item>
+            <item> -khtml-border-top-right-radius </item>
+            <item> -khtml-border-bottom-left-radius </item>
+            <item> -khtml-border-bottom-right-radius </item>
+            <item> -khtml-border-radius </item>
+            <item> -khtml-box-shadow </item>
+            <item> -khtml-opacity </item>
 
-			<!-- konq specific -->
-			<item> konq_bgpos_x </item>
-			<item> konq_bgpos_y </item>
-			<item> -khtml-background-size </item>
-			<item> -khtml-border-top-left-radius </item>
-			<item> -khtml-border-top-right-radius </item>
-			<item> -khtml-border-bottom-left-radius </item>
-			<item> -khtml-border-bottom-right-radius </item>
-			<item> -khtml-border-radius </item>
-			<item> -khtml-box-shadow </item>
-			<item> -khtml-opacity </item>
+            <!-- Webkit rendering engine CSS property extensions -->
+            <item> -webkit-appearance </item>
+            <item> -webkit-animation-name </item>
+            <item> -webkit-animation-duration </item>
+            <item> -webkit-animation-iteration </item>
+            <item> -webkit-animation-direction </item>
+            <item> -webkit-animation-delay </item>
+            <item> -webkit-animation-play-state </item>
+            <item> -webkit-animation-fill-mode </item>
+            <item> -webkit-background-size </item>
+            <item> -webkit-border-image </item>
+            <item> -webkit-border-bottom-colors </item>
+            <item> -webkit-border-left-colors </item>
+            <item> -webkit-border-radius </item>
+            <item> -webkit-border-right-colors </item>
+            <item> -webkit-border-top-colors </item>
+            <item> -webkit-border-top-left-radius </item>
+            <item> -webkit-border-top-right-radius </item>
+            <item> -webkit-border-bottom-left-radius </item>
+            <item> -webkit-border-bottom-right-radius </item>
+            <item> -webkit-border-radius-bottomleft </item>
+            <item> -webkit-border-radius-bottomright </item>
+            <item> -webkit-box-flex </item>
+            <item> -webkit-box-reflect</item>
+            <item> -webkit-box-shadow </item>
+            <item> -webkit-box-sizing </item>
+            <item> -webkit-column-count </item>
+            <item> -webkit-column-gap </item>
+            <item> -webkit-hyphens </item>
+            <item> -webkit-linear-gradient </item>
+            <item> -webkit-gradient </item>
+            <item> -webkit-perspective </item>
+            <item> -webkit-text-fill-color </item>
+            <item> -webkit-text-stroke-color </item>
+            <item> -webkit-text-stroke-width </item>
+            <item> -webkit-text-size-adjust </item>
+            <item> -webkit-transform </item>
+            <item> -webkit-transform-origin </item>
+            <item> -webkit-transform-style </item>
+            <item> -webkit-transition </item>
+            <item> -webkit-transition-property </item>
+            <item> -webkit-transition-duration </item>
 
-			<!-- Webkit rendering engine CSS property extensions -->
-			<item> -webkit-appearance </item>
-			<item> -webkit-animation-name </item>
-			<item> -webkit-animation-duration </item>
-			<item> -webkit-animation-iteration </item>
-			<item> -webkit-animation-direction </item>
-			<item> -webkit-animation-delay </item>
-			<item> -webkit-animation-play-state </item>
-			<item> -webkit-animation-fill-mode </item>
-			<item> -webkit-background-size </item>
-			<item> -webkit-border-image </item>
-			<item> -webkit-border-bottom-colors </item>
-			<item> -webkit-border-left-colors </item>
-			<item> -webkit-border-radius </item>
-			<item> -webkit-border-right-colors </item>
-			<item> -webkit-border-top-colors </item>
-			<item> -webkit-border-top-left-radius </item>
-			<item> -webkit-border-top-right-radius </item>
-			<item> -webkit-border-bottom-left-radius </item>
-			<item> -webkit-border-bottom-right-radius </item>
-			<item> -webkit-border-radius-bottomleft </item>
-			<item> -webkit-border-radius-bottomright </item>
-			<item> -webkit-box-flex </item>
-			<item> -webkit-box-reflect</item>
-			<item> -webkit-box-shadow </item>
-			<item> -webkit-box-sizing </item>
-			<item> -webkit-column-count </item>
-			<item> -webkit-column-gap </item>
-			<item> -webkit-hyphens </item>
-			<item> -webkit-linear-gradient </item>
-			<item> -webkit-gradient </item>
-			<item> -webkit-perspective </item>
-			<item> -webkit-text-fill-color </item>
-			<item> -webkit-text-stroke-color </item>
-			<item> -webkit-text-stroke-width </item>
-			<item> -webkit-text-size-adjust </item>
-			<item> -webkit-transform </item>
-			<item> -webkit-transform-origin </item>
-			<item> -webkit-transform-style </item>
-			<item> -webkit-transition </item>
-			<item> -webkit-transition-property </item>
-			<item> -webkit-transition-duration </item>
+            <!-- Trident (a.k.a., MSHTML) CSS property extensions -->
+            <item> zoom </item>
+            <item> -ms-animation-name </item>
+            <item> -ms-animation-duration </item>
+            <item> -ms-animation-iteration </item>
+            <item> -ms-animation-direction </item>
+            <item> -ms-animation-delay </item>
+            <item> -ms-animation-play-state </item>
+            <item> -ms-animation-fill-mode </item>
+            <item> -ms-box-sizing </item>
+            <item> -ms-filter </item>
+            <item> -ms-interpolation-mode </item>
+            <item> -ms-linear-gradient </item>
+            <item> -ms-text-size-adjust </item>
+            <item> -ms-transform </item>
+            <item> -ms-transition </item>
 
-			<!-- Trident (a.k.a., MSHTML) CSS property extensions -->
-			<item> filter </item>
-			<item> zoom </item>
-			<item> -ms-animation-name </item>
-			<item> -ms-animation-duration </item>
-			<item> -ms-animation-iteration </item>
-			<item> -ms-animation-direction </item>
-			<item> -ms-animation-delay </item>
-			<item> -ms-animation-play-state </item>
-			<item> -ms-animation-fill-mode </item>
-			<item> -ms-box-sizing </item>
-			<item> -ms-filter </item>
-			<item> -ms-interpolation-mode </item>
-			<item> -ms-linear-gradient </item>
-			<item> -ms-text-size-adjust </item>
-			<item> -ms-transform </item>
-			<item> -ms-transition </item>
+            <!-- font properties in @font-face -->
+            <item> font-family </item>
+            <item> font-size </item>
+            <item> font-stretch </item>
+            <item> font-style </item>
+            <item> font-variant </item>
+            <item> font-weight </item>
+            <item> unicode-range </item>
+            <item> units-per-em </item>
+            <item> src </item>
+            <item> panose-1 </item>
+            <item> stemv </item>
+            <item> stemh </item>
+            <item> slope </item>
+            <item> cap-height </item>
+            <item> x-height </item>
+            <item> ascent </item>
+            <item> descent </item>
+            <item> widths </item>
+            <item> bbox </item>
+            <item> definition-src </item>
+            <item> baseline </item>
+            <item> centerline </item>
+            <item> mathline </item>
+            <item> topline </item>
+        </list>
 
-			<!-- font properties in @font-face -->
-			<item> font-family </item>
-			<item> font-size </item>
-			<item> font-stretch </item>
-			<item> font-style </item>
-			<item> font-variant </item>
-			<item> font-weight </item>
-			<item> unicode-range </item>
-			<item> units-per-em </item>
-			<item> src </item>
-			<item> panose-1 </item>
-			<item> stemv </item>
-			<item> stemh </item>
-			<item> slope </item>
-			<item> cap-height </item>
-			<item> x-height </item>
-			<item> ascent </item>
-			<item> descent </item>
-			<item> widths </item>
-			<item> bbox </item>
-			<item> definition-src </item>
-			<item> baseline </item>
-			<item> centerline </item>
-			<item> mathline </item>
-			<item> topline </item>
-		</list>
+        <list name="types">
+            <item> inherit </item>
+            <item> none </item>
+            <item> hidden </item>
+            <item> dotted </item>
+            <item> dashed </item>
+            <item> solid </item>
+            <item> double </item>
+            <item> groove </item>
+            <item> ridge </item>
+            <item> inset </item>
+            <item> outset </item>
+            <item> xx-small </item>
+            <item> x-small </item>
+            <item> small </item>
+            <item> medium </item>
+            <item> large </item>
+            <item> x-large </item>
+            <item> xx-large </item>
+            <item> smaller </item>
+            <item> larger </item>
+            <item> italic </item>
+            <item> oblique </item>
+            <item> small-caps </item>
+            <item> normal </item>
+            <item> bold </item>
+            <item> bolder </item>
+            <item> lighter </item>
+            <item> light </item>
+            <item> 100 </item>
+            <item> 200 </item>
+            <item> 300 </item>
+            <item> 400 </item>
+            <item> 500 </item>
+            <item> 600 </item>
+            <item> 700 </item>
+            <item> 800 </item>
+            <item> 900 </item>
+            <item> transparent </item>
+            <item> repeat </item>
+            <item> repeat-x </item>
+            <item> repeat-y </item>
+            <item> no-repeat </item>
+            <item> baseline </item>
+            <item> sub </item>
+            <item> super </item>
+            <item> top </item>
+            <item> text-top </item>
+            <item> middle </item>
+            <item> bottom </item>
+            <item> text-bottom </item>
+            <item> left </item>
+            <item> right </item>
+            <item> center </item>
+            <item> justify </item>
+            <item> konq-center </item>
+            <item> disc </item>
+            <item> circle </item>
+            <item> square </item>
+            <item> box </item>
+            <item> decimal </item>
+            <item> decimal-leading-zero </item>
+            <item> lower-roman </item>
+            <item> upper-roman </item>
+            <item> lower-greek </item>
+            <item> lower-alpha </item>
+            <item> lower-latin </item>
+            <item> upper-alpha </item>
+            <item> upper-latin </item>
+            <item> hebrew </item>
+            <item> armenian </item>
+            <item> georgian </item>
+            <item> cjk-ideographic </item>
+            <item> hiragana </item>
+            <item> katakana </item>
+            <item> hiragana-iroha </item>
+            <item> katakana-iroha </item>
+            <item> inline </item>
+            <item> inline-block </item>
+            <item> block </item>
+            <item> list-item </item>
+            <item> run-in </item>
+            <item> compact </item>
+            <item> marker </item>
+            <item> table </item>
+            <item> inline-table </item>
+            <item> table-row-group </item>
+            <item> table-header-group </item>
+            <item> table-footer-group </item>
+            <item> table-row </item>
+            <item> table-column-group </item>
+            <item> table-column </item>
+            <item> table-cell </item>
+            <item> table-caption </item>
+            <item> auto </item>
+            <item> crosshair </item>
+            <item> default </item>
+            <item> pointer </item>
+            <item> move </item>
+            <item> e-resize </item>
+            <item> ne-resize </item>
+            <item> nw-resize </item>
+            <item> n-resize </item>
+            <item> se-resize </item>
+            <item> sw-resize </item>
+            <item> s-resize </item>
+            <item> w-resize </item>
+            <item> text </item>
+            <item> wait </item>
+            <item> help </item>
+            <item> above </item>
+            <item> absolute </item>
+            <item> always </item>
+            <item> avoid </item>
+            <item> below </item>
+            <item> bidi-override </item>
+            <item> blink </item>
+            <item> both </item>
+            <item> capitalize </item>
+            <item> caption </item>
+            <item> clip </item>
+            <item> close-quote </item>
+            <item> collapse </item>
+            <item> condensed </item>
+            <item> crop </item>
+            <item> cross </item>
+            <item> ellipsis </item>
+            <item> ellipsis-word </item>
+            <item> embed </item>
+            <item> expanded </item>
+            <item> extra-condensed </item>
+            <item> extra-expanded </item>
+            <item> fixed </item>
+            <item> hand </item>
+            <item> hide </item>
+            <item> higher </item>
+            <item> icon </item>
+            <item> inside </item>
+            <item> invert </item>
+            <item> landscape </item>
+            <item> level </item>
+            <item> line-through </item>
+            <item> loud </item>
+            <item> lower </item>
+            <item> lowercase </item>
+            <item> ltr </item>
+            <item> menu </item>
+            <item> message-box </item>
+            <item> mix </item>
+            <item> narrower </item>
+            <item> no-close-quote </item>
+            <item> no-open-quote </item>
+            <item> nowrap </item>
+            <item> open-quote </item>
+            <item> outside </item>
+            <item> overline </item>
+            <item> portrait </item>
+            <item> pre </item>
+            <item> pre-line </item>
+            <item> pre-wrap </item>
+            <item> relative </item>
+            <item> rtl </item>
+            <item> scroll </item>
+            <item> semi-condensed </item>
+            <item> semi-expanded </item>
+            <item> separate </item>
+            <item> show </item>
+            <item> small-caption </item>
+            <item> static </item>
+            <item> static-position </item>
+            <item> status-bar </item>
+            <item> thick </item>
+            <item> thin </item>
+            <item> ultra-condensed </item>
+            <item> ultra-expanded </item>
+            <item> underline </item>
+            <item> uppercase </item>
+            <item> visible </item>
+            <item> wider </item>
+            <item> break </item>
+            <item> serif </item>
+            <item> sans-serif </item>
+            <item> cursive </item>
+            <item> fantasy </item>
+            <item> monospace </item>
+            <item> border-box </item>
+            <item> content-box </item>
+            <item> -epub-hyphens </item>
+        </list>
 
-		<list name="types">
-			<item> inherit </item>
-			<item> none </item>
-			<item> hidden </item>
-			<item> dotted </item>
-			<item> dashed </item>
-			<item> solid </item>
-			<item> double </item>
-			<item> groove </item>
-			<item> ridge </item>
-			<item> inset </item>
-			<item> outset </item>
-			<item> xx-small </item>
-			<item> x-small </item>
-			<item> small </item>
-			<item> medium </item>
-			<item> large </item>
-			<item> x-large </item>
-			<item> xx-large </item>
-			<item> smaller </item>
-			<item> larger </item>
-			<item> italic </item>
-			<item> oblique </item>
-			<item> small-caps </item>
-			<item> normal </item>
-			<item> bold </item>
-			<item> bolder </item>
-			<item> lighter </item>
-			<item> light </item>
-			<item> 100 </item>
-			<item> 200 </item>
-			<item> 300 </item>
-			<item> 400 </item>
-			<item> 500 </item>
-			<item> 600 </item>
-			<item> 700 </item>
-			<item> 800 </item>
-			<item> 900 </item>
-			<item> transparent </item>
-			<item> repeat </item>
-			<item> repeat-x </item>
-			<item> repeat-y </item>
-			<item> no-repeat </item>
-			<item> baseline </item>
-			<item> sub </item>
-			<item> super </item>
-			<item> top </item>
-			<item> text-top </item>
-			<item> middle </item>
-			<item> bottom </item>
-			<item> text-bottom </item>
-			<item> left </item>
-			<item> right </item>
-			<item> center </item>
-			<item> justify </item>
-			<item> konq-center </item>
-			<item> disc </item>
-			<item> circle </item>
-			<item> square </item>
-			<item> box </item>
-			<item> decimal </item>
-			<item> decimal-leading-zero </item>
-			<item> lower-roman </item>
-			<item> upper-roman </item>
-			<item> lower-greek </item>
-			<item> lower-alpha </item>
-			<item> lower-latin </item>
-			<item> upper-alpha </item>
-			<item> upper-latin </item>
-			<item> hebrew </item>
-			<item> armenian </item>
-			<item> georgian </item>
-			<item> cjk-ideographic </item>
-			<item> hiragana </item>
-			<item> katakana </item>
-			<item> hiragana-iroha </item>
-			<item> katakana-iroha </item>
-			<item> inline </item>
-			<item> inline-block </item>
-			<item> block </item>
-			<item> list-item </item>
-			<item> run-in </item>
-			<item> compact </item>
-			<item> marker </item>
-			<item> table </item>
-			<item> inline-table </item>
-			<item> table-row-group </item>
-			<item> table-header-group </item>
-			<item> table-footer-group </item>
-			<item> table-row </item>
-			<item> table-column-group </item>
-			<item> table-column </item>
-			<item> table-cell </item>
-			<item> table-caption </item>
-			<item> auto </item>
-			<item> crosshair </item>
-			<item> default </item>
-			<item> pointer </item>
-			<item> move </item>
-			<item> e-resize </item>
-			<item> ne-resize </item>
-			<item> nw-resize </item>
-			<item> n-resize </item>
-			<item> se-resize </item>
-			<item> sw-resize </item>
-			<item> s-resize </item>
-			<item> w-resize </item>
-			<item> text </item>
-			<item> wait </item>
-			<item> help </item>
-			<item> above </item>
-			<item> absolute </item>
-			<item> always </item>
-			<item> avoid </item>
-			<item> below </item>
-			<item> bidi-override </item>
-			<item> blink </item>
-			<item> both </item>
-			<item> capitalize </item>
-			<item> caption </item>
-			<item> clip </item>
-			<item> close-quote </item>
-			<item> collapse </item>
-			<item> condensed </item>
-			<item> crop </item>
-			<item> cross </item>
-			<item> ellipsis </item>
-			<item> ellipsis-word </item>
-			<item> embed </item>
-			<item> expanded </item>
-			<item> extra-condensed </item>
-			<item> extra-expanded </item>
-			<item> fixed </item>
-			<item> hand </item>
-			<item> hide </item>
-			<item> higher </item>
-			<item> icon </item>
-			<item> inside </item>
-			<item> invert </item>
-			<item> landscape </item>
-			<item> level </item>
-			<item> line-through </item>
-			<item> loud </item>
-			<item> lower </item>
-			<item> lowercase </item>
-			<item> ltr </item>
-			<item> menu </item>
-			<item> message-box </item>
-			<item> mix </item>
-			<item> narrower </item>
-			<item> no-close-quote </item>
-			<item> no-open-quote </item>
-			<item> nowrap </item>
-			<item> open-quote </item>
-			<item> outside </item>
-			<item> overline </item>
-			<item> portrait </item>
-			<item> pre </item>
-			<item> pre-line </item>
-			<item> pre-wrap </item>
-			<item> relative </item>
-			<item> rtl </item>
-			<item> scroll </item>
-			<item> semi-condensed </item>
-			<item> semi-expanded </item>
-			<item> separate </item>
-			<item> show </item>
-			<item> small-caption </item>
-			<item> static </item>
-			<item> static-position </item>
-			<item> status-bar </item>
-			<item> thick </item>
-			<item> thin </item>
-			<item> ultra-condensed </item>
-			<item> ultra-expanded </item>
-			<item> underline </item>
-			<item> uppercase </item>
-			<item> visible </item>
-			<item> wider </item>
-			<item> break </item>
-			<item> serif </item>
-			<item> sans-serif </item>
-			<item> cursive </item>
-			<item> fantasy </item>
-			<item> monospace </item>
-			<item> border-box </item>
-			<item> content-box </item>
-			<item> -epub-hyphens </item>
-		</list>
+        <list name="colors">
+            <item> aqua </item>
+            <item> black </item>
+            <item> blue </item>
+            <item> cyan </item>
+            <item> fuchsia </item>
+            <item> gray </item>
+            <item> green </item>
+            <item> lime </item>
+            <item> maroon </item>
+            <item> navy </item>
+            <item> olive </item>
+            <item> purple </item>
+            <item> red </item>
+            <item> silver </item>
+            <item> teal </item>
+            <item> white </item>
+            <item> yellow </item>
+            <item> ActiveBorder  </item>
+            <item> ActiveCaption  </item>
+            <item> AppWorkspace  </item>
+            <item> Background  </item>
+            <item> ButtonFace  </item>
+            <item> ButtonHighlight  </item>
+            <item> ButtonShadow  </item>
+            <item> ButtonText  </item>
+            <item> CaptionText  </item>
+            <item> GrayText  </item>
+            <item> Highlight  </item>
+            <item> HighlightText  </item>
+            <item> InactiveBorder  </item>
+            <item> InactiveCaption  </item>
+            <item> InactiveCaptionText  </item>
+            <item> InfoBackground  </item>
+            <item> InfoText  </item>
+            <item> Menu  </item>
+            <item> MenuText  </item>
+            <item> Scrollbar  </item>
+            <item> ThreeDDarkShadow  </item>
+            <item> ThreeDFace  </item>
+            <item> ThreeDHighlight  </item>
+            <item> ThreeDLightShadow  </item>
+            <item> ThreeDShadow  </item>
+            <item> Window  </item>
+            <item> WindowFrame  </item>
+            <item> WindowText  </item>
+        </list>
 
+        <list name="paren">
+            <item> url </item>
+            <item> attr </item>
+            <item> rect </item>
+            <item> rgb </item>
+            <item> rgba </item>
+            <item> hsl </item>
+            <item> hsla </item>
+            <item> counter </item>
+            <item> counters </item>
 
-		<list name="colors">
-			<item> aqua </item>
-			<item> black </item>
-			<item> blue </item>
-			<item> cyan </item>
-			<item> fuchsia </item>
-			<item> gray </item>
-			<item> green </item>
-			<item> lime </item>
-			<item> maroon </item>
-			<item> navy </item>
-			<item> olive </item>
-			<item> purple </item>
-			<item> red </item>
-			<item> silver </item>
-			<item> teal </item>
-			<item> white </item>
-			<item> yellow </item>
-			<item> ActiveBorder  </item>
-			<item> ActiveCaption  </item>
-			<item> AppWorkspace  </item>
-			<item> Background  </item>
-			<item> ButtonFace  </item>
-			<item> ButtonHighlight  </item>
-			<item> ButtonShadow  </item>
-			<item> ButtonText  </item>
-			<item> CaptionText  </item>
-			<item> GrayText  </item>
-			<item> Highlight  </item>
-			<item> HighlightText  </item>
-			<item> InactiveBorder  </item>
-			<item> InactiveCaption  </item>
-			<item> InactiveCaptionText  </item>
-			<item> InfoBackground  </item>
-			<item> InfoText  </item>
-			<item> Menu  </item>
-			<item> MenuText  </item>
-			<item> Scrollbar  </item>
-			<item> ThreeDDarkShadow  </item>
-			<item> ThreeDFace  </item>
-			<item> ThreeDHighlight  </item>
-			<item> ThreeDLightShadow  </item>
-			<item> ThreeDShadow  </item>
-			<item> Window  </item>
-			<item> WindowFrame  </item>
-			<item> WindowText  </item>
-		</list>
+            <!-- in @font-face -->
+            <item> local </item>
+            <item> format </item>
 
-		<list name="paren">
-			<item> url </item>
-			<item> attr </item>
-			<item> rect </item>
-			<item> rgb </item>
-			<item> rgba </item>
-			<item> hsl </item>
-			<item> hsla </item>
-			<item> counter </item>
-			<item> counters </item>
+            <!-- Trident (a.k.a., MSHTML) rendering engine functional notation extensions -->
+            <item> expression </item>
 
-			<!-- in @font-face -->
-			<item> local </item>
-			<item> format </item>
+        </list>
 
-			<!-- Trident (a.k.a., MSHTML) rendering engine functional notation extensions -->
-			<item> expression </item>
+        <list name="mediatypes">
+            <item> all </item>
+            <item> aural </item>
+            <item> braille </item>
+            <item> embossed </item>
+            <item> handheld </item>
+            <item> print </item>
+            <item> projection </item>
+            <item> screen </item>
+            <item> speech </item>
+            <item> tty </item>
+            <item> tv </item>
+        </list>
 
-		</list>
+        <list name="mediatypes_op">
+            <item> not </item>
+            <item> only </item>
+        </list>
 
-		<list name="mediatypes">
-			<item> all </item>
-			<item> aural </item>
-			<item> braille </item>
-			<item> embossed </item>
-			<item> handheld </item>
-			<item> print </item>
-			<item> projection </item>
-			<item> screen </item>
-			<item> speech </item>
-			<item> tty </item>
-			<item> tv </item>
-		</list>
+        <list name="media_features">
+            <item> width </item>
+            <item> min-width </item>
+            <item> max-width</item>
+            <item> height </item>
+            <item> min-height </item>
+            <item> max-height </item>
+            <item> device-width </item>
+            <item> min-device-width </item>
+            <item> max-device-width </item>
+            <item> device-height </item>
+            <item> min-device-height </item>
+            <item> max-device-height </item>
+            <item> orientation </item>
+            <item> aspect-ratio </item>
+            <item> min-aspect-ratio </item>
+            <item> max-aspect-ratio </item>
+            <item> device-aspect-ratio </item>
+            <item> min-device-aspect-ratio </item>
+            <item> max-device-aspect-ratio </item>
+            <item> color </item>
+            <item> min-color </item>
+            <item> max-color </item>
+            <item> color-index </item>
+            <item> min-color-index </item>
+            <item> max-color-index </item>
+            <item> monochrome </item>
+            <item> min-monochrome </item>
+            <item> max-monochrome </item>
+            <item> resolution </item>
+            <item> min-resolution </item>
+            <item> max-resolution </item>
+            <item> scan </item>
+            <item> grid </item>
+        </list>
 
-		<list name="mediatypes_op">
-                    <item> not </item>
-                    <item> only </item>
-		</list>
+        <list name="pseudoclasses">
+            <item> hover </item>
+            <item> link </item>
+            <item> visited </item>
+            <item> active </item>
+            <item> focus </item>
+            <item> first-child </item>
+            <item> last-child </item>
+            <item> only-child </item>
+            <item> first-of-type </item>
+            <item> last-of-type </item>
+            <item> only-of-type </item>
+            <item> first-letter </item>
+            <item> first-line </item>
+            <item> before </item>
+            <item> after </item>
+            <item> selection </item>
+            <item> root </item>
+            <item> empty </item>
+            <item> target </item>
+            <item> enabled </item>
+            <item> disabled </item>
+            <item> checked </item>
+            <item> indeterminate </item>
+            <item> nth-child </item>
+            <item> nth-last-child </item>
+            <item> nth-of-type </item>
+            <item> nth-last-of-type </item>
+            <item> not </item>
+        </list>
 
-		<list name="media_features">
-                    <item> width </item>
-                    <item> min-width </item>
-                    <item> max-width</item>
-                    <item> height </item>
-                    <item> min-height </item>
-                    <item> max-height </item>
-                    <item> device-width </item>
-                    <item> min-device-width </item>
-                    <item> max-device-width </item>
-                    <item> device-height </item>
-                    <item> min-device-height </item>
-                    <item> max-device-height </item>
-                    <item> orientation </item>
-                    <item> aspect-ratio </item>
-                    <item> min-aspect-ratio </item>
-                    <item> max-aspect-ratio </item>
-                    <item> device-aspect-ratio </item>
-                    <item> min-device-aspect-ratio </item>
-                    <item> max-device-aspect-ratio </item>
-                    <item> color </item>
-                    <item> min-color </item>
-                    <item> max-color </item>
-                    <item> color-index </item>
-                    <item> min-color-index </item>
-                    <item> max-color-index </item>
-                    <item> monochrome </item>
-                    <item> min-monochrome </item>
-                    <item> max-monochrome </item>
-                    <item> resolution </item>
-                    <item> min-resolution </item>
-                    <item> max-resolution </item>
-                    <item> scan </item>
-                    <item> grid </item>
-		</list>
+        <contexts>
+            <context attribute="Normal Text" lineEndContext="#stay" name="Base">
+                <LineContinue/>
+                <DetectSpaces/>
+                <IncludeRules context="FindRuleSets" />
+            </context>
 
-		<list name="pseudoclasses">
-			<item> hover </item>
-			<item> link </item>
-			<item> visited </item>
-			<item> active </item>
-			<item> focus </item>
-			<item> first-child </item>
-			<item> last-child </item>
-			<item> only-child </item>
-			<item> first-of-type </item>
-			<item> last-of-type </item>
-			<item> only-of-type </item>
-			<item> first-letter </item>
-			<item> first-line </item>
-			<item> before </item>
-			<item> after </item>
-			<item> selection </item>
-			<item> root </item>
-			<item> empty </item>
-			<item> target </item>
-			<item> enabled </item>
-			<item> disabled </item>
-			<item> checked </item>
-			<item> indeterminate </item>
-			<item> nth-child </item>
-			<item> nth-last-child </item>
-			<item> nth-of-type </item>
-			<item> nth-last-of-type </item>
-			<item> not </item>
-		</list>
+            <!-- to be included -->
+            <!-- finds rules and detects nesting -->
+            <context attribute="Normal Text" lineEndContext="#stay" name="FindRuleSets">
+                <RegExpr attribute="Media" context="Media" String="@media\b" />
+                <RegExpr attribute="At Rule" context="Import" String="@import\b" />
+                <RegExpr attribute="At Rule" context="#stay" String="@(font-face|charset)\b" />
+                <DetectChar attribute="Property" context="RuleSet" char="{" beginRegion="ruleset" />
+                <!--parse selectors-->
+                <DetectChar attribute="Selector Attr" context="SelAttr" char="[" />
+                <RegExpr attribute="Selector Id" context="#stay" String="#(-)?(&nmstart;)(&nmchar;)*" />
+                <RegExpr attribute="Selector Class" context="#stay" String="\.([a-zA-Z0-9\-_]|[\x80-\xFF]|\\[0-9A-Fa-f]{1,6})*" />
+                <RegExpr attribute="Selector Pseudo" context="#stay" String=":lang\([\w_-]+\)" />
+                <DetectChar attribute="Selector Pseudo" context="SelPseudo" char=":" />
+                <IncludeRules context="FindStrings" />
+                <IncludeRules context="FindComments" />
+            </context>
 
-		<contexts>
-			<context attribute="Normal Text" lineEndContext="#stay" name="Base">
-				<LineContinue/>
-				<DetectSpaces/>
-				<IncludeRules context="FindRuleSets" />
-			</context>
+            <!-- finds arguments to properties -->
+            <context attribute="Normal Text" lineEndContext="#stay" name="FindValues">
+                <RegExpr attribute="Value" context="#stay" String="[-+]?[0-9.]+(em|ex|ch|rem|vw|vh|vm|px|in|cm|mm|pt|pc|deg|rad|grad|turn|ms|s|Hz|kHz)\b" />
+                <RegExpr attribute="Value" context="#stay" String="[-+]?[0-9.]+[%]?" />
+                <RegExpr attribute="Normal Text" context="#stay" String="[\w\-]+" />
+            </context>
 
-			<!-- to be included -->
-			<!-- finds rules and detects nesting -->
-			<context attribute="Normal Text" lineEndContext="#stay" name="FindRuleSets">
-				<RegExpr attribute="Media" context="Media" String="@media\b" />
-				<RegExpr attribute="At Rule" context="Import" String="@import\b" />
-				<RegExpr attribute="At Rule" context="#stay" String="@(font-face|charset)\b" />
-				<DetectChar attribute="Property" context="RuleSet" char="{" beginRegion="ruleset" />
-				<!--parse selectors-->
-				<DetectChar attribute="Selector Attr" context="SelAttr" char="[" />
-				<RegExpr attribute="Selector Id" context="#stay" String="#(-)?(&nmstart;)(&nmchar;)*" />
-				<RegExpr attribute="Selector Class" context="#stay" String="\.([a-zA-Z0-9\-_]|[\x80-\xFF]|\\[0-9A-Fa-f]{1,6})*" />
-				<RegExpr attribute="Selector Pseudo" context="#stay" String=":lang\([\w_-]+\)" />
-				<DetectChar attribute="Selector Pseudo" context="SelPseudo" char=":" />
-				<IncludeRules context="FindStrings" />
-				<IncludeRules context="FindComments" />
-			</context>
+            <!-- finds strings -->
+            <context attribute="Normal Text" lineEndContext="#stay" name="FindStrings">
+                <DetectChar attribute="String" context="StringDQ" char="&quot;" />
+                <DetectChar attribute="String" context="StringSQ" char="'" />
+            </context>
 
-			<!-- finds arguments to properties -->
-			<context attribute="Normal Text" lineEndContext="#stay" name="FindValues">
-				<RegExpr attribute="Value" context="#stay" String="[-+]?[0-9.]+(em|ex|ch|rem|vw|vh|vm|px|in|cm|mm|pt|pc|deg|rad|grad|turn|ms|s|Hz|kHz)\b" />
-				<RegExpr attribute="Value" context="#stay" String="[-+]?[0-9.]+[%]?" />
-				<RegExpr attribute="Normal Text" context="#stay" String="[\w\-]+" />
-			</context>
+            <!-- finds comments -->
+            <context attribute="Normal Text" lineEndContext="#stay" name="FindComments">
+                <RegExpr attribute="Region Marker" context="#stay" String="/\*BEGIN.*\*/" beginRegion="UserDefined" />
+                <RegExpr attribute="Region Marker" context="#stay" String="/\*END.*\*/" endRegion="UserDefined" />
+                <Detect2Chars attribute="Comment" context="Comment" char="/" char1="*" beginRegion="comment" />
+            </context>
 
-			<!-- finds strings -->
-			<context attribute="Normal Text" lineEndContext="#stay" name="FindStrings">
-				<DetectChar attribute="String" context="StringDQ" char="&quot;" />
-				<DetectChar attribute="String" context="StringSQ" char="'" />
-			</context>
+            <!-- other contexts -->
+            <context attribute="Normal Text" lineEndContext="#stay" name="Media">
+                <DetectChar attribute="Media" context="Media2" char="{" beginRegion="media" />
+                <DetectChar attribute="Media" context="MediaQueryExpression" char="(" />
+                <keyword attribute="Media" context="MediaQueries" String="mediatypes"/>
+                <keyword attribute="Media" context="MediaTypes" String="mediatypes_op" />
+                <DetectChar attribute="Media" context="#stay" char="," />
+                <IncludeRules context="FindComments" />
+                <RegExpr attribute="Error" context="#stay" String="\S+" />
+            </context>
 
-			<!-- finds comments -->
-			<context attribute="Normal Text" lineEndContext="#stay" name="FindComments">
-				<RegExpr attribute="Region Marker" context="#stay" String="/\*BEGIN.*\*/" beginRegion="UserDefined" />
-				<RegExpr attribute="Region Marker" context="#stay" String="/\*END.*\*/" endRegion="UserDefined" />
-				<Detect2Chars attribute="Comment" context="Comment" char="/" char1="*" beginRegion="comment" />
-			</context>
+            <context attribute="Media" lineEndContext="#stay" name="MediaTypes">
+                <keyword attribute="Media" context="MediaQueries" String="mediatypes"/>
+                <DetectChar attribute="Media" context="#pop" char= "{" lookAhead="true"/>
+                <DetectChar attribute="Media" context="#pop" char= "," lookAhead="true"/>
+                <DetectSpaces/>
+                <IncludeRules context="FindComments"/>
+                <RegExpr attribute="Error" context="#stay" String="\S+"/>
+            </context>
 
-			<!-- other contexts -->
-			<context attribute="Normal Text" lineEndContext="#stay" name="Media">
-				<DetectChar attribute="Media" context="Media2" char="{" beginRegion="media" />
-                                <DetectChar attribute="Media" context="MediaQueryExpression" char="(" />
-				<keyword attribute="Media" context="MediaQueries" String="mediatypes"/>
-				<keyword attribute="Media" context="MediaTypes" String="mediatypes_op" />
-				<DetectChar attribute="Media" context="#stay" char="," />
-				<IncludeRules context="FindComments" />
-				<RegExpr attribute="Error" context="#stay" String="\S+" />
-			</context>
+            <context attribute="Media" lineEndContext="#stay" name="MediaQueries">
+                <RegExpr attribute="Media" context="MediaQueryExpression" String="\s+and\s+\("/>
+                <DetectChar attribute="Media" context="#pop" char= "{" lookAhead="true"/>
+                <DetectChar attribute="Media" context="#pop" char= "," lookAhead="true"/>
+                <DetectSpaces/>
+                <IncludeRules context="FindComments"/>
+                <RegExpr attribute="Error" context="#stay" String="\S+"/>
+            </context>
 
-			<context attribute="Media" lineEndContext="#stay" name="MediaTypes">
-                            <keyword attribute="Media" context="MediaQueries" String="mediatypes"/>
-                            <DetectChar attribute="Media" context="#pop" char= "{" lookAhead="true"/>
-                            <DetectChar attribute="Media" context="#pop" char= "," lookAhead="true"/>
-                            <DetectSpaces/>
-                            <IncludeRules context="FindComments"/>
-                            <RegExpr attribute="Error" context="#stay" String="\S+"/>
-			</context>
+            <context attribute="Media" lineEndContext="#stay" name="MediaQueryExpression">
+                <DetectSpaces/>
+                <keyword attribute="Media" context="MQEE" String="media_features"/>
+                <IncludeRules context="FindComments"/>
+                <RegExpr attribute="Error" context="#stay" String="\S+"/>
+            </context>
 
-			<context attribute="Media" lineEndContext="#stay" name="MediaQueries">
-			    <RegExpr attribute="Media" context="MediaQueryExpression" String="\s+and\s+\("/>
-			    <DetectChar attribute="Media" context="#pop" char= "{" lookAhead="true"/>
-                            <DetectChar attribute="Media" context="#pop" char= "," lookAhead="true"/>
-                            <DetectSpaces/>
-                            <IncludeRules context="FindComments"/>
-                            <RegExpr attribute="Error" context="#stay" String="\S+"/>
-			</context>
+            <context attribute="Media" lineEndContext="#stay" name="MQEE" fallthrough="true" fallthroughContext="#pop">
+                <DetectSpaces/>
+                <IncludeRules context="FindComments"/>
+                <DetectChar attribute="Media" context="MQEV" char=":"/>
+                <RegExpr attribute="Media" context="#pop" String="\)\s+and\s+\("/>
+                <DetectChar attribute="Media" context="#pop#pop" char=")"/>
+            </context>
 
-                        <context attribute="Media" lineEndContext="#stay" name="MediaQueryExpression">
-                            <DetectSpaces/>
-                            <keyword attribute="Media" context="MQEE" String="media_features"/>
-                            <IncludeRules context="FindComments"/>
-                            <RegExpr attribute="Error" context="#stay" String="\S+"/>
-                        </context>
+            <context attribute="Media" lineEndContext="#stay" name="MQEV">
+                <!-- this should be seperate for different features, for now it is all the same -->
+                <DetectSpaces/>
+                <RegExpr attribute="Value" context="#pop" String="[1-9][0-9.]*\s*/\s*[1-9][0-9.]*" />
+                <RegExpr attribute="Value" context="#pop" String="[0-9.]+(em|ex|ch|rem|vw|vh|vm|px|in|cm|mm|pt|pc|deg|rad|grad|turn|ms|s|Hz|kHz|dpi|dpcm)\b" />
+                <RegExpr attribute="Value" context="#pop" String="[0-9.]+[%]?" />
+                <RegExpr attribute="Value" context="#pop" String="(portrait|landscape)" />
+                <RegExpr attribute="Error" context="#stay" String=".*"/>
+            </context>
 
-                        <context attribute="Media" lineEndContext="#stay" name="MQEE" fallthrough="true" fallthroughContext="#pop">
-                            <DetectSpaces/>
-                            <IncludeRules context="FindComments"/>
-                            <DetectChar attribute="Media" context="MQEV" char=":"/>
-                            <RegExpr attribute="Media" context="#pop" String="\)\s+and\s+\("/>
-                            <DetectChar attribute="Media" context="#pop#pop" char=")"/>
-                        </context>
+            <context attribute="Normal Text" lineEndContext="#stay" name="Media2">
+                <DetectChar attribute="Media" context="#pop#pop" char="}" endRegion="media" />
+                <IncludeRules context="FindRuleSets" />
+            </context>
 
-                        <context attribute="Media" lineEndContext="#stay" name="MQEV">
-                        <!-- this should be seperate for different features, for now it is all the same -->
-                            <DetectSpaces/>
-                            <RegExpr attribute="Value" context="#pop" String="[1-9][0-9.]*\s*/\s*[1-9][0-9.]*" />
-                            <RegExpr attribute="Value" context="#pop" String="[0-9.]+(em|ex|ch|rem|vw|vh|vm|px|in|cm|mm|pt|pc|deg|rad|grad|turn|ms|s|Hz|kHz|dpi|dpcm)\b" />
-                            <RegExpr attribute="Value" context="#pop" String="[0-9.]+[%]?" />
-                            <RegExpr attribute="Value" context="#pop" String="(portrait|landscape)" />
-                            <RegExpr attribute="Error" context="#stay" String=".*"/>
-                        </context>
+            <context attribute="Selector Attr" lineEndContext="#stay" name="SelAttr">
+                <DetectChar attribute="Selector Attr" context="#pop" char="]" />
+                <IncludeRules context="FindStrings" />
+            </context>
 
-			<context attribute="Normal Text" lineEndContext="#stay" name="Media2">
-				<DetectChar attribute="Media" context="#pop#pop" char="}" endRegion="media" />
-				<IncludeRules context="FindRuleSets" />
-			</context>
+            <context attribute="Selector Pseudo" lineEndContext="#pop" name="SelPseudo"
+                     fallthrough="true" fallthroughContext="#pop">
+                <keyword attribute="Selector Pseudo" context="#pop" String="pseudoclasses" />
+            </context>
 
-			<context attribute="Selector Attr" lineEndContext="#stay" name="SelAttr">
-				<DetectChar attribute="Selector Attr" context="#pop" char="]" />
-				<IncludeRules context="FindStrings" />
-			</context>
+            <context attribute="Normal Text" lineEndContext="#stay" name="Import">
+                <DetectChar attribute="At Rule" context="#pop" char=";" />
+                <keyword attribute="Media" context="#stay" String="mediatypes" />
+                <IncludeRules context="FindValues" />
+                <IncludeRules context="FindStrings" />
+                <IncludeRules context="FindComments" />
+            </context>
 
-			<context attribute="Selector Pseudo" lineEndContext="#pop" name="SelPseudo"
-					fallthrough="true" fallthroughContext="#pop">
-					<keyword attribute="Selector Pseudo" context="#pop" String="pseudoclasses" />
-				</context>
+            <context attribute="Comment" lineEndContext="#stay" name="Comment">
+                <DetectSpaces/>
+                <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" endRegion="comment" />
+                <IncludeRules context="##Alerts" />
+                <DetectIdentifier/>
+            </context>
 
-				<context attribute="Normal Text" lineEndContext="#stay" name="Import">
-					<DetectChar attribute="At Rule" context="#pop" char=";" />
-					<keyword attribute="Media" context="#stay" String="mediatypes" />
-					<IncludeRules context="FindValues" />
-					<IncludeRules context="FindStrings" />
-					<IncludeRules context="FindComments" />
-				</context>
+            <context attribute="Normal Text" lineEndContext="#stay" name="RuleSet">
+                <DetectChar attribute="Property" context="#pop" char="}" endRegion="ruleset" />
+                <keyword attribute="Property" context="Rule" String="properties" />
+                <RegExpr attribute="Unknown Property" context="Rule" String="-?[A-Za-z_-]+(?=\s*:)" />
+                <IncludeRules context="FindComments" />
+                <RegExpr attribute="Error" context="#stay" String="\S" />
+            </context>
 
-				<context attribute="Comment" lineEndContext="#stay" name="Comment">
-					<DetectSpaces/>
-					<Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" endRegion="comment" />
-					<IncludeRules context="##Alerts" />
-					<DetectIdentifier/>
-				</context>
+            <context attribute="Normal Text" lineEndContext="#stay" name="Rule">
+                <DetectChar attribute="Property" context="Rule2" char=":" />
+                <RegExpr attribute="Error" context="#stay" String="\S" />
+            </context>
 
-				<context attribute="Normal Text" lineEndContext="#stay" name="RuleSet">
-					<DetectChar attribute="Property" context="#pop" char="}" endRegion="ruleset" />
-					<keyword attribute="Property" context="Rule" String="properties" />
-					<RegExpr attribute="Unknown Property" context="Rule" String="-?[A-Za-z_-]+(?=\s*:)" />
-					<IncludeRules context="FindComments" />
-					<RegExpr attribute="Error" context="#stay" String="\S" />
-				</context>
+            <context attribute="Normal Text" lineEndContext="#stay" name="Rule2">
+                <DetectChar attribute="Property" context="#pop#pop" char=";" />
+                <DetectChar attribute="Property" context="#pop#pop#pop" char="}" endRegion="ruleset" />
+                <!-- parse property values -->
+                <keyword attribute="Value" context="#stay" String="types" />
+                <keyword attribute="Value" context="#stay" String="colors" />
+                <RegExpr attribute="Value" context="#stay" String="#([0-9A-Fa-f]{3}){1,4}\b" />
+                <keyword attribute="Value" context="PropParen" String="paren" />
+                <RegExpr attribute="Important" context="#stay" String="!important\b" />
+                <IncludeRules context="FindValues" />
+                <IncludeRules context="FindStrings" />
+                <IncludeRules context="FindComments" />
+            </context>
 
-				<context attribute="Normal Text" lineEndContext="#stay" name="Rule">
-					<DetectChar attribute="Property" context="Rule2" char=":" />
-					<RegExpr attribute="Error" context="#stay" String="\S" />
-				</context>
+            <context attribute="Normal Text" lineEndContext="#stay" name="PropParen">
+                <DetectChar attribute="Value" context="PropParen2" char="(" />
+                <IncludeRules context="FindComments" />
+                <RegExpr attribute="Error" context="#stay" String="\S" />
+            </context>
 
-				<context attribute="Normal Text" lineEndContext="#stay" name="Rule2">
-					<DetectChar attribute="Property" context="#pop#pop" char=";" />
-					<DetectChar attribute="Property" context="#pop#pop#pop" char="}" endRegion="ruleset" />
-					<!-- parse property values -->
-					<keyword attribute="Value" context="#stay" String="types" />
-					<keyword attribute="Value" context="#stay" String="colors" />
-					<RegExpr attribute="Value" context="#stay" String="#([0-9A-Fa-f]{3}){1,4}\b" />
-					<keyword attribute="Value" context="PropParen" String="paren" />
-					<RegExpr attribute="Important" context="#stay" String="!important\b" />
-					<IncludeRules context="FindValues" />
-					<IncludeRules context="FindStrings" />
-					<IncludeRules context="FindComments" />
-				</context>
+            <context attribute="Normal Text" lineEndContext="#stay" name="PropParen2">
+                <DetectChar attribute="Value" context="#pop#pop" char=")" />
+                <IncludeRules context="FindValues" />
+                <IncludeRules context="FindStrings" />
+                <IncludeRules context="FindComments" />
+            </context>
 
-				<context attribute="Normal Text" lineEndContext="#stay" name="PropParen">
-					<DetectChar attribute="Value" context="PropParen2" char="(" />
-					<IncludeRules context="FindComments" />
-					<RegExpr attribute="Error" context="#stay" String="\S" />
-				</context>
+            <!-- string contexts -->
+            <context attribute="String" lineEndContext="#stay" name="StringDQ">
+                <DetectChar attribute="String" context="#pop" char="&quot;" />
+                <IncludeRules context="InsideString" />
+            </context>
 
-				<context attribute="Normal Text" lineEndContext="#stay" name="PropParen2">
-					<DetectChar attribute="Value" context="#pop#pop" char=")" />
-					<IncludeRules context="FindValues" />
-					<IncludeRules context="FindStrings" />
-					<IncludeRules context="FindComments" />
-				</context>
+            <context attribute="String" lineEndContext="#stay" name="StringSQ">
+                <DetectChar attribute="String" context="#pop" char="'" />
+                <IncludeRules context="InsideString" />
+            </context>
 
-				<!-- string contexts -->
-				<context attribute="String" lineEndContext="#stay" name="StringDQ">
-					<DetectChar attribute="String" context="#pop" char="&quot;" />
-					<IncludeRules context="InsideString" />
-				</context>
+            <context attribute="String" lineEndContext="#stay" name="InsideString">
+                <RegExpr attribute="String" context="#stay" String="\\[&quot;']" />
+                <DetectIdentifier/>
+            </context>
 
-				<context attribute="String" lineEndContext="#stay" name="StringSQ">
-					<DetectChar attribute="String" context="#pop" char="'" />
-					<IncludeRules context="InsideString" />
-				</context>
+        </contexts>
 
-				<context attribute="String" lineEndContext="#stay" name="InsideString">
-					<RegExpr attribute="String" context="#stay" String="\\[&quot;']" />
-					<DetectIdentifier/>
-				</context>
+        <itemDatas>
+            <itemData name="Normal Text" defStyleNum="dsNormal" spellChecking="false"/>
+            <itemData name="Property"  defStyleNum="dsKeyword" spellChecking="false"/>
+            <itemData name="Unknown Property"  defStyleNum="dsKeyword" italic="1" spellChecking="false"/>
+            <itemData name="Media"  defStyleNum="dsDecVal" bold="1" spellChecking="false"/>
+            <itemData name="At Rule"  defStyleNum="dsDecVal" spellChecking="false"/>
+            <itemData name="String"  defStyleNum="dsString"/>
+            <itemData name="Value"  defStyleNum="dsDataType" spellChecking="false"/>
+            <itemData name="Important" defStyleNum="dsKeyword" spellChecking="false"/>
+            <itemData name="Selector Attr" defStyleNum="dsAttribute" spellChecking="false"/>
+            <itemData name="Selector Id"  defStyleNum="dsFloat" bold="1" spellChecking="false"/>
+            <itemData name="Selector Class"  defStyleNum="dsFloat" spellChecking="false"/>
+            <itemData name="Selector Pseudo"  defStyleNum="dsDecVal" spellChecking="false"/>
+            <itemData name="Comment" defStyleNum="dsComment" />
+            <itemData name="Region Marker" defStyleNum="dsRegionMarker" spellChecking="false"/>
+            <itemData name="Error" defStyleNum="dsError" spellChecking="false"/>
+        </itemDatas>
+    </highlighting>
 
-			</contexts>
-			<itemDatas>
-				<itemData name="Normal Text" defStyleNum="dsNormal" spellChecking="false"/>
-				<itemData name="Property"  defStyleNum="dsKeyword" spellChecking="false"/>
-				<itemData name="Unknown Property"  defStyleNum="dsKeyword" italic="1" spellChecking="false"/>
-				<itemData name="Media"  defStyleNum="dsDecVal" bold="1" spellChecking="false"/>
-				<itemData name="At Rule"  defStyleNum="dsDecVal" spellChecking="false"/>
-				<itemData name="String"  defStyleNum="dsString"/>
-				<itemData name="Value"  defStyleNum="dsDataType" spellChecking="false"/>
-				<itemData name="Important" defStyleNum="dsKeyword" spellChecking="false"/>
-				<itemData name="Selector Attr" defStyleNum="dsAttribute" spellChecking="false"/>
-				<itemData name="Selector Id"  defStyleNum="dsFloat" bold="1" spellChecking="false"/>
-				<itemData name="Selector Class"  defStyleNum="dsFloat" spellChecking="false"/>
-				<itemData name="Selector Pseudo"  defStyleNum="dsDecVal" spellChecking="false"/>
-				<itemData name="Comment" defStyleNum="dsComment" />
-				<itemData name="Region Marker" defStyleNum="dsRegionMarker" spellChecking="false"/>
-				<itemData name="Error" defStyleNum="dsError" spellChecking="false"/>
-			</itemDatas>
-		</highlighting>
-		<general>
-			<keywords casesensitive="0" weakDeliminator="-%"/>
-			<comments>
-				<comment name="multiLine" start="/*" end="*/" />
-			</comments>
-		</general>
-	</language>
+    <general>
+        <keywords casesensitive="0" weakDeliminator="-%"/>
+        <comments>
+            <comment name="multiLine" start="/*" end="*/" />
+        </comments>
+    </general>
+
+</language>
diff --git a/src/share/3rdparty/generic-highlighter/doxygen.xml b/src/share/3rdparty/generic-highlighter/doxygen.xml
index 302df7146cc..d07c1650b41 100644
--- a/src/share/3rdparty/generic-highlighter/doxygen.xml
+++ b/src/share/3rdparty/generic-highlighter/doxygen.xml
@@ -29,7 +29,7 @@
  -->
 
 <language name="Doxygen"
-          version="1.41"
+          version="2"
           kateversion="5.0"
           section="Markup"
           extensions="*.dox;*.doxygen"
@@ -278,7 +278,7 @@
         <DetectIdentifier />
         <StringDetect attribute="HTML Comment" context="SL_htmlcomment" String="&lt;!--" />
         <Detect2Chars attribute="Comment" context="#stay" char="&lt;" char1="&lt;" />
-        <RegExpr attribute="HTML Tag" context="SL_htmltag" String="&lt;\/?[a-zA-Z_:][a-zA-Z0-9._:-]*" />
+        <RegExpr attribute="HTML Tag" context="SL_htmltag" String="&lt;\/?[\w0-9._:-@]+" />
       </context>
       <context attribute="Comment" lineEndContext="#stay" name="BlockComment">
         <DetectSpaces />
@@ -297,7 +297,7 @@
         <DetectIdentifier />
         <RegExpr attribute="Tags" context="#stay" String="\\(&lt;|&gt;)" />
         <Detect2Chars attribute="Comment" context="#stay" char="&lt;" char1="&lt;" />
-        <RegExpr attribute="HTML Tag" context="ML_htmltag" String="&lt;\/?[a-zA-Z_:][a-zA-Z0-9._:-]*" />
+        <RegExpr attribute="HTML Tag" context="ML_htmltag" String="&lt;\/?[\w0-9._:-@]+" />
         <StringDetect attribute="HTML Comment" context="ML_htmlcomment" String="&lt;!--" />
       </context>
 
@@ -339,7 +339,7 @@
         <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" lookAhead="true" />
         <StringDetect attribute="HTML Comment" context="ML_htmlcomment" String="&lt;!--" />
         <Detect2Chars attribute="Comment" context="#stay" char="&lt;" char1="&lt;" />
-        <RegExpr attribute="HTML Tag" context="ML_htmltag" String="&lt;\/?[a-zA-Z_:][a-zA-Z0-9._:-]*" />
+        <RegExpr attribute="HTML Tag" context="ML_htmltag" String="&lt;\/?[\w0-9._:-@]+" />
         <RegExpr attribute="Description" context="#stay" String="." />
       </context>
       <context attribute="Comment" lineEndContext="#pop" name="ML_TagWordString">
@@ -405,7 +405,7 @@
         <DetectSpaces />
         <StringDetect attribute="HTML Comment" context="SL_htmlcomment" String="&lt;!--" />
         <Detect2Chars attribute="Comment" context="#stay" char="&lt;" char1="&lt;" />
-        <RegExpr attribute="HTML Tag" context="SL_htmltag" String="&lt;\/?[a-zA-Z_:][a-zA-Z0-9._:-]*" />
+        <RegExpr attribute="HTML Tag" context="SL_htmltag" String="&lt;\/?[\w0-9._:-@]+" />
         <RegExpr attribute="Description" context="#stay" String="." />
       </context>
       <context attribute="Comment" lineEndContext="#pop" name="SL_TagWordString">
diff --git a/src/share/3rdparty/generic-highlighter/dtd.xml b/src/share/3rdparty/generic-highlighter/dtd.xml
index 75d07234d9b..5c39c1b5970 100644
--- a/src/share/3rdparty/generic-highlighter/dtd.xml
+++ b/src/share/3rdparty/generic-highlighter/dtd.xml
@@ -3,7 +3,7 @@
   <!ENTITY nmtoken "[\-\w\d\.:_]+">
   <!ENTITY entref  "(#[0-9]+|#[xX][0-9A-Fa-f]+|&nmtoken;);">
 ]>
-<language name="DTD" version="1.02" kateversion="3.4" section="Markup" extensions="*.dtd" mimetype="application/xml-dtd" author="Andriy Lesyuk (s-andy@in.if.ua)" license="LGPL">
+<language name="DTD" version="2" kateversion="3.4" section="Markup" extensions="*.dtd" mimetype="application/xml-dtd" author="Andriy Lesyuk (s-andy@in.if.ua)" license="LGPL">
   <highlighting>
 
     <list name="Category">
diff --git a/src/share/3rdparty/generic-highlighter/html.xml b/src/share/3rdparty/generic-highlighter/html.xml
index 741423f866e..d1017aad1d3 100644
--- a/src/share/3rdparty/generic-highlighter/html.xml
+++ b/src/share/3rdparty/generic-highlighter/html.xml
@@ -4,7 +4,7 @@
 	<!ENTITY name    "[A-Za-z_:][\w.:_-]*">
 	<!ENTITY entref  "&amp;(#[0-9]+|#[xX][0-9A-Fa-f]+|&name;);">
 ]>
-<language name="HTML" version="2.1" kateversion="3.4" section="Markup" extensions="*.htm;*.html;*.shtml;*.shtm" mimetype="text/html"  author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL" priority="10">
+<language name="HTML" version="4" kateversion="3.4" section="Markup" extensions="*.htm;*.html;*.shtml;*.shtm" mimetype="text/html"  author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL" priority="10">
 
 <highlighting>
 <contexts>
@@ -211,7 +211,7 @@
   <itemData name="Doctype" defStyleNum="dsDataType" bold="1" spellChecking="false" />
   <itemData name="Element" defStyleNum="dsKeyword" spellChecking="false" />
   <itemData name="Attribute" defStyleNum="dsOthers" spellChecking="false" />
-  <itemData name="Value" defStyleNum="dsString" color="#a00" spellChecking="false" />
+  <itemData name="Value" defStyleNum="dsString" spellChecking="false" />
   <itemData name="EntityRef" defStyleNum="dsDecVal" spellChecking="false" />
   <itemData name="PEntityRef" defStyleNum="dsDecVal" spellChecking="false" />
   <itemData name="Error" defStyleNum="dsError" spellChecking="false" />
diff --git a/src/share/3rdparty/generic-highlighter/ini.xml b/src/share/3rdparty/generic-highlighter/ini.xml
index f6f55e2ebe2..dba0e204cbc 100644
--- a/src/share/3rdparty/generic-highlighter/ini.xml
+++ b/src/share/3rdparty/generic-highlighter/ini.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="INI Files" section="Configuration" extensions="*.ini;*.pls;*.kcfgc" mimetype="" version="1.1" kateversion="2.4" author="Jan Janssen (medhefgo@web.de)" license="LGPL">
+<language name="INI Files" section="Configuration" extensions="*.ini;*.pls;*.kcfgc" mimetype="" version="2" kateversion="2.4" author="Jan Janssen (medhefgo@web.de)" license="LGPL">
 
 <highlighting>
 <list name="keywords">
@@ -34,7 +34,7 @@
 
 <contexts>
  <context name="ini" attribute="Normal Text" lineEndContext="#stay">
-  <RangeDetect attribute="Section" context="#pop" char="["  char1="]" beginRegion="Section" endRegion="Section" />
+  <RangeDetect attribute="Section" context="#stay" char="["  char1="]" beginRegion="Section" endRegion="Section" />
   <DetectChar attribute="Assignment" context="Value" char="=" />
   <DetectChar char=";" attribute="Comment" context="Comment" firstNonSpace="true" />
   <DetectChar char="#" attribute="Comment" context="Comment" firstNonSpace="true" />
diff --git a/src/share/3rdparty/generic-highlighter/java.xml b/src/share/3rdparty/generic-highlighter/java.xml
index e06ec6bd864..64c97eefd78 100644
--- a/src/share/3rdparty/generic-highlighter/java.xml
+++ b/src/share/3rdparty/generic-highlighter/java.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="Java" version="1.22" kateversion="5.0" section="Sources" extensions="*.java" mimetype="text/x-java" license="LGPL" author="Alfredo Luiz Foltran Fialho (alfoltran@ig.com.br)">
+<language name="Java" version="2" kateversion="5.0" section="Sources" extensions="*.java" mimetype="text/x-java" license="LGPL" author="Alfredo Luiz Foltran Fialho (alfoltran@ig.com.br)">
 	<highlighting>
 		<list name="java15">
 			<item> ACTIVE </item>
diff --git a/src/share/3rdparty/generic-highlighter/javadoc.xml b/src/share/3rdparty/generic-highlighter/javadoc.xml
index 25eab95e111..c16cba3428b 100644
--- a/src/share/3rdparty/generic-highlighter/javadoc.xml
+++ b/src/share/3rdparty/generic-highlighter/javadoc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="Javadoc" version="1.05" kateversion="2.4" section="Markup" extensions="" license="LGPL" author="Alfredo Luiz Foltran Fialho (alfoltran@ig.com.br)">
+<language name="Javadoc" version="2" kateversion="2.4" section="Markup" extensions="" license="LGPL" author="Alfredo Luiz Foltran Fialho (alfoltran@ig.com.br)">
 	<highlighting>
 		<contexts>
 			<context name="Start" attribute="Normal Text" lineEndContext="#stay">
diff --git a/src/share/3rdparty/generic-highlighter/makefile.xml b/src/share/3rdparty/generic-highlighter/makefile.xml
index fbf96eae927..9baeb508ecf 100644
--- a/src/share/3rdparty/generic-highlighter/makefile.xml
+++ b/src/share/3rdparty/generic-highlighter/makefile.xml
@@ -8,7 +8,7 @@
 <!-- v2.1 by Alex Turbov <i.zaufi@gmail.com>
      improve comments handling -->
 <language name="Makefile" section="Other"
-          version="2.1" kateversion="3.4"
+          version="3" kateversion="3.4"
           extensions="GNUmakefile;Makefile;makefile;GNUmakefile.*;Makefile.*;makefile.*;*.mk"
           mimetype="text/x-makefile"
           author="Per Wigren (wigren@home.se)" license="">
diff --git a/src/share/3rdparty/generic-highlighter/perl.xml b/src/share/3rdparty/generic-highlighter/perl.xml
index 2f6e823bfb6..a3c6bdb21b0 100644
--- a/src/share/3rdparty/generic-highlighter/perl.xml
+++ b/src/share/3rdparty/generic-highlighter/perl.xml
@@ -39,7 +39,7 @@
 
    Enhance tr/// and y/// support.
 -->
-<language name="Perl" version="1.32" kateversion="2.4" section="Scripts" extensions="*.pl;*.PL;*.pm" mimetype="application/x-perl;text/x-perl" priority="5" author="Anders Lund (anders@alweb.dk)" license="LGPL">
+<language name="Perl" version="2" kateversion="2.4" section="Scripts" extensions="*.pl;*.PL;*.pm" mimetype="application/x-perl;text/x-perl" priority="5" author="Anders Lund (anders@alweb.dk)" license="LGPL">
   <highlighting>
     <list name="keywords">
       <item> if </item>
diff --git a/src/share/3rdparty/generic-highlighter/ruby.xml b/src/share/3rdparty/generic-highlighter/ruby.xml
index c4110ccd754..5c6dca335bc 100644
--- a/src/share/3rdparty/generic-highlighter/ruby.xml
+++ b/src/share/3rdparty/generic-highlighter/ruby.xml
@@ -31,7 +31,7 @@
 
 <!-- Hold the "language" opening tag on a single line, as mentioned in "language.dtd". -->
 <language name="Ruby" section="Scripts"
-	  version="1.29" kateversion="3.3"
+	  version="2" kateversion="3.3"
 	  extensions="*.rb;*.rjs;*.rxml;*.xml.erb;*.js.erb;*.rake;Rakefile;Gemfile;*.gemspec;Vagrantfile"
 	  mimetype="application/x-ruby"
 	  style="ruby" indenter="ruby"
diff --git a/src/share/3rdparty/generic-highlighter/valgrind-suppression.xml b/src/share/3rdparty/generic-highlighter/valgrind-suppression.xml
index 6ba52085c38..7fe3dd474ef 100644
--- a/src/share/3rdparty/generic-highlighter/valgrind-suppression.xml
+++ b/src/share/3rdparty/generic-highlighter/valgrind-suppression.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="Valgrind Suppression" section="Other" extensions="*.supp;" mimetype="" version="1.0" kateversion="2.4" author="Milian Wolff (mail@milianw.de)" license="LGPL">
+<language name="Valgrind Suppression" section="Other" extensions="*.supp;" mimetype="" version="2" kateversion="2.4" author="Milian Wolff (mail@milianw.de)" license="LGPL">
 <highlighting>
 <contexts>
   <context name="File" attribute="Normal Text" lineEndContext="#stay">
diff --git a/src/share/3rdparty/generic-highlighter/xml.xml b/src/share/3rdparty/generic-highlighter/xml.xml
index 3d92a563cd1..622c2a41e7f 100644
--- a/src/share/3rdparty/generic-highlighter/xml.xml
+++ b/src/share/3rdparty/generic-highlighter/xml.xml
@@ -6,7 +6,7 @@
 	<!ENTITY name    "(?![0-9])[\w_:][\w.:_-]*">
 	<!ENTITY entref  "&amp;(#[0-9]+|#[xX][0-9A-Fa-f]+|&name;);">
 ]>
-<language name="XML" version="2.03" kateversion="3.4" section="Markup" extensions="*.docbook;*.xml;*.rc;*.daml;*.rdf;*.rss;*.xspf;*.xsd;*.svg;*.ui;*.kcfg;*.qrc;*.wsdl" mimetype="text/xml;text/book;text/daml;text/rdf;application/rss+xml;application/xspf+xml;image/svg+xml;application/x-designer;application/xml" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
+<language name="XML" version="4" kateversion="3.4" section="Markup" extensions="*.docbook;*.xml;*.rc;*.daml;*.rdf;*.rss;*.xspf;*.xsd;*.svg;*.ui;*.kcfg;*.qrc;*.wsdl" mimetype="text/xml;text/book;text/daml;text/rdf;application/rss+xml;application/xspf+xml;image/svg+xml;application/x-designer;application/xml" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
 
 <highlighting>
 <contexts>
@@ -134,7 +134,7 @@
   <itemData name="Doctype" defStyleNum="dsDataType" bold="1" spellChecking="false" />
   <itemData name="Element" defStyleNum="dsKeyword" spellChecking="false" />
   <itemData name="Attribute" defStyleNum="dsOthers" spellChecking="false" />
-  <itemData name="Value" defStyleNum="dsString" color="#a00" spellChecking="false" />
+  <itemData name="Value" defStyleNum="dsString" spellChecking="false" />
   <itemData name="EntityRef" defStyleNum="dsDecVal" spellChecking="false" />
   <itemData name="PEntityRef" defStyleNum="dsDecVal" spellChecking="false" />
   <itemData name="Error" defStyleNum="dsError" spellChecking="false" />
diff --git a/src/share/3rdparty/generic-highlighter/yacc.xml b/src/share/3rdparty/generic-highlighter/yacc.xml
index add68e96a8d..c8b3153218b 100644
--- a/src/share/3rdparty/generic-highlighter/yacc.xml
+++ b/src/share/3rdparty/generic-highlighter/yacc.xml
@@ -25,7 +25,7 @@ This code is released under the LGPL as part of kdelibs/kate.
 
 ========================================================================
 -->
-<language name="Yacc/Bison" version="1.04" kateversion="2.4" section="Sources" extensions="*.y;*.yy" author="Jan Villat (jan.villat@net2000.ch)" license="LGPL">
+<language name="Yacc/Bison" version="3" kateversion="2.4" section="Sources" extensions="*.y;*.yy" author="Jan Villat (jan.villat@net2000.ch)" license="LGPL">
 
 <highlighting>
 <contexts>
@@ -92,7 +92,7 @@ This code is released under the LGPL as part of kdelibs/kate.
     <IncludeRules context="Comment" />
     <RegExpr attribute="Normal Text" context="Percent Command In" String="\W" lookAhead="true" />
   </context>
-  <context name="Percent Command In" attribute="NormalText" lineEndContext="#pop#pop">
+  <context name="Percent Command In" attribute="Normal Text" lineEndContext="#pop#pop">
     <IncludeRules context="StringOrChar" />
     <DetectChar attribute="Data Type" context="PC type" char="&lt;" />
   </context>
@@ -112,7 +112,7 @@ This code is released under the LGPL as part of kdelibs/kate.
     <RegExpr attribute="Comment" context="#pop" String="[^\\]$" />
   </context>
 
-  <context name="StringOrChar" attribute="NormalText" lineEndContext="#stay">
+  <context name="StringOrChar" attribute="Normal Text" lineEndContext="#stay">
     <DetectChar attribute="String Char" context="Char" char="'" />
     <DetectChar attribute="String" context="String" char="&quot;" />
   </context>