From a80441df148c1056837dc1490ae8d42ec9b5ca6a Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Mon, 27 Jan 2014 00:58:53 +0900
Subject: [PATCH] Kate syntax highlight files update - Jan 2014 (cherry picked
 from commit 11e927c557a33c6cd331c39227bb64a1ed900119)

---
 kate/data/cmake.xml        |   20 +-
 kate/data/cpp11.xml        |   33 +-
 kate/data/css.xml          | 1513 +++++++++++++++++++-----------------
 kate/data/rest.xml         |   40 +-
 kate/data/update-files.xml |    8 +-
 5 files changed, 894 insertions(+), 720 deletions(-)

diff --git a/kate/data/cmake.xml b/kate/data/cmake.xml
index 07a6a00d4..7bec01e11 100644
--- a/kate/data/cmake.xml
+++ b/kate/data/cmake.xml
@@ -5,7 +5,7 @@
 
   Copyright 2004 Alexander Neundorf (neundorf@kde.org)
   Copyright 2005 Dominik Haumann (dhdev@gmx.de)
-  Copyright 2007,2008 Matthew Woehlke (mw_triad@users.sourceforge.net)
+  Copyright 2007,2008,2013 Matthew Woehlke (mw_triad@users.sourceforge.net)
   Copyright 2013 Alex Turbov (i.zaufi@gmail.com)
 
  **********************************************************************
@@ -26,7 +26,7 @@
  **********************************************************************
  -->
 <!-- generated for "cmake version 2.8.11.1" -->
-<language name="CMake" version="1.24" kateversion="2.5" section="Other" extensions="CMakeLists.txt;*.cmake;" mimetype="" author="Alexander Neundorf (neundorf@kde.org)" license="LGPL">
+<language name="CMake" version="1.25" kateversion="2.5" section="Other" extensions="CMakeLists.txt;*.cmake;" mimetype="" author="Alexander Neundorf (neundorf@kde.org)" license="LGPL">
   <highlighting>
 
     <!-- ATTENTION Do not change the list name! Or change a generation script accordingly -->
@@ -783,6 +783,7 @@
       <item> TARGET_LINKER_DIR </item>
       <item> TARGET_SONAME_DIR </item>
       <item> TARGET_PROPERTY </item>
+      <item> TARGET_OBJECTS </item>
       <item> TARGET_POLICY </item>
       <item> AND </item>
       <item> OR </item>
@@ -815,6 +816,8 @@
         <keyword attribute="Third-Party Commands" context="#stay" String="itkvtk_commands" insensitive="true"/>
         <RegExpr attribute="Region Marker" context="#stay" String="#\s*BEGIN.*$" beginRegion="block" firstNonSpace="true"/>
         <RegExpr attribute="Region Marker" context="#stay" String="#\s*END.*$" endRegion="block" firstNonSpace="true"/>
+        <RegExpr attribute="Region Marker" context="RST Documentation" String="^#\[(=*)\[\.rst:" column="0" />
+        <RegExpr attribute="Comment" context="Bracketed Comment" String="^#\[(=*)\[" column="0" />
         <DetectChar attribute="Comment" context="Comment" char="#"/>
         <IncludeRules context="Detect Variables"/>
         <RegExpr attribute="Macros" context="Macro Args" String="\w+\s*(?=\()"/>
@@ -900,6 +903,7 @@
         <!-- TODO Hmm... this rule looks strange... being in the Normal context -->
         <StringDetect attribute="Escapes" context="#stay" String="\&quot;"/>
         <DetectChar attribute="Strings" context="String" char="&quot;"/>
+        <RegExpr attribute="Strings" context="Bracketed String" String="\[(=*)\[" />
         <DetectChar attribute="Comment" context="Comment" char="#"/>
         <IncludeRules context="Detect Builtin Variables"/>
         <IncludeRules context="Detect Variables"/>
@@ -909,12 +913,24 @@
         <IncludeRules context="##Alerts" />
         <IncludeRules context="##Modelines" />
       </context>
+      <context attribute="Comment" lineEndContext="#stay" name="RST Documentation" dynamic="true">
+        <RegExpr attribute="Region Marker" context="#pop" String="^#?\]%1\]" dynamic="true" column="0" />
+        <IncludeRules context="##reStructuredText" />
+      </context>
+      <context attribute="Comment" lineEndContext="#stay" name="Bracketed Comment" dynamic="true">
+        <RegExpr attribute="Comment" context="#pop" String="^#?\]%1\]" dynamic="true" column="0" />
+        <IncludeRules context="##Alerts" />
+        <IncludeRules context="##Modelines" />
+      </context>
       <context attribute="Strings" lineEndContext="#stay" name="String">
         <RegExpr attribute="Strings" context="#pop" String="&quot;(?=[ );]|$)" />
         <RegExpr attribute="Escapes" context="#stay" String="\\[&quot;$n\\]" />
         <IncludeRules context="Detect Variables"/>
         <IncludeRules context="Detect Generator Expressions"/>
       </context>
+      <context attribute="Strings" lineEndContext="#stay" name="Bracketed String" dynamic="true">
+        <RegExpr attribute="Strings" context="#pop" String="\]%1\]" dynamic="true" />
+      </context>
 
     </contexts>
     <itemDatas>
diff --git a/kate/data/cpp11.xml b/kate/data/cpp11.xml
index 5e6b16f0b..aff71c10e 100644
--- a/kate/data/cpp11.xml
+++ b/kate/data/cpp11.xml
@@ -11,7 +11,7 @@
 <language
     name="C++11"
     section="Sources"
-    version="1.63"
+    version="1.64"
     kateversion="2.5"
     indenter="cppstyle"
     mimetype="text/x-c++src;text/x-c++hdr;text/x-chdr"
@@ -105,8 +105,11 @@
 
     <!-- 7.6 Attributes -->
     <list name="attributes">
+      <!-- C++11 -->
       <item> noreturn </item>
       <item> carries_dependency </item>
+      <!-- C++1y -->
+      <item> deprecated </item>
     </list>
 
     <!-- QT/TQT extensions -->
@@ -295,18 +298,16 @@
         <!-- Match keywords -->
         <keyword attribute="Keyword" context="#stay" String="keywords" />
         <!-- Detect attributes -->
-        <Detect2Chars attribute="Normal Text" context="Attribute" char="[" char1="[" />
-        <!-- Match GCC extensions -->
-        <IncludeRules context="DetectGccExtensions##GCCExtensions" />
+        <Detect2Chars attribute="Symbol" context="Attribute" char="[" char1="[" />
         <!-- Match numbers -->
-        <!-- ATTENTION Builtin number detectors have strange behaviour and definitely lack of required features
-          -->
+        <!-- ATTENTION Builtin number detectors have strange behaviour and definitely lack of required features -->
         <!-- NOTE Order is important! -->
-        <RegExpr attribute="Hex" context="#stay" String="[\+\-]?0x[0-9A-Fa-f]+([Uu][Ll]{0,2}|[Ll]{0,2}[Uu]?|_[_0-9A-Za-z]*)?\b" />
+        <RegExpr attribute="Hex" context="#stay" String="[\+\-]?0x[0-9A-Fa-f]('?[0-9A-Fa-f]+)*([Uu][Ll]{0,2}|[Ll]{0,2}[Uu]?|_[_0-9A-Za-z]*)?\b" />
+        <RegExpr attribute="Binary" context="#stay" String="0[Bb][01]('?[01]+)*([Uu][Ll]{0,2}|[Ll]{0,2}[Uu]?|_[_0-9A-Za-z]*)?\b" />
         <RegExpr attribute="Float" context="#stay" String="[\+\-]?([0-9]+[Ee][\+\-]?[0-9]+|([0-9]+\.|\.[0-9]+|[0-9]+\.[0-9]+)([Ee][\+\-]?[0-9]+)?)[FfLl]?" />
-        <RegExpr attribute="Octal" context="#stay" String="[\+\-]?0[0-7]+([Uu][Ll]{0,2}|[Ll]{0,2}[Uu]?|_[_0-9A-Za-z]*)?\b" />
-        <RegExpr attribute="Decimal" context="#stay" String="[\+\-]?(0|[1-9][0-9]*)([Uu][Ll]{0,2}|[Ll]{0,2}[Uu]?|_[_0-9A-Za-z]*)?\b" />
-        <RegExpr attribute="Error" context="#stay" String="[\+\-]?(0|[1-9][0-9]*)[0-9A-Za-z][_0-9A-Za-z]*\b" />
+        <RegExpr attribute="Octal" context="#stay" String="[\+\-]?0'?[0-7]('?[0-7]+)*([Uu][Ll]{0,2}|[Ll]{0,2}[Uu]?|_[_0-9A-Za-z]*)?\b" />
+        <RegExpr attribute="Decimal" context="#stay" String="[\+\-]?(0|[1-9]('?[0-9]+)*)([Uu][Ll]{0,2}|[Ll]{0,2}[Uu]?|_[_0-9A-Za-z]*)?\b" />
+        <RegExpr attribute="Error" context="#stay" String="[\+\-]?(0x?|[1-9][0-9]*)[0-9A-Za-z][_0-9A-Za-z]*\b" />
         <!-- Match string literals -->
         <DetectChar attribute="String" context="String" char="&quot;" />
         <Detect2Chars attribute="String" context="String" char="U" char1="&quot;" />
@@ -319,6 +320,8 @@
         <Detect2Chars attribute="String" context="Char Literal" char="L" char1="'" />
         <Detect2Chars attribute="String" context="U-Char Literal" char="u" char1="'" />
         <Detect2Chars attribute="String" context="U-Char Literal" char="U" char1="'" />
+        <!-- Match GCC extensions -->
+        <IncludeRules context="DetectGccExtensions##GCCExtensions" />
         <!-- Match most used namespaces and styles -->
         <StringDetect attribute="Standard Classes" context="Standard Classes" String="std::" />
         <StringDetect attribute="Boost Stuff" context="Boost Stuff" String="boost::" />
@@ -405,9 +408,11 @@
       </context>
 
       <context name="Attribute" attribute="Attribute" lineEndContext="#stay">
-        <keyword attribute="Attribute" context="#stay" String="attributes" />
-        <Detect2Chars attribute="Normal Text" context="#pop" char="]" char1="]" />
-        <DetectIdentifier context="#stay" attribute="Error" />
+        <keyword attribute="Standard Attribute" context="#stay" String="attributes" />
+        <Detect2Chars attribute="Symbol" context="#pop" char="]" char1="]" />
+        <AnyChar context="#stay" String="&ns_punctuators;" attribute="Symbol" />
+        <!-- Attributes may contain some text: [[deprecated("Reason text")]] -->
+        <DetectChar attribute="String" context="String" char="&quot;" />
       </context>
 
       <context name="RawString" attribute="String" lineEndContext="#stay" dynamic="true">
@@ -567,9 +572,11 @@
       <itemData name="Data Type"          defStyleNum="dsDataType" spellChecking="false" />
       <itemData name="Type Modifiers"     defStyleNum="dsDataType" spellChecking="false" />
       <itemData name="Attribute"          defStyleNum="dsKeyword"  spellChecking="false" bold="false" italic="true" />
+      <itemData name="Standard Attribute" defStyleNum="dsKeyword"  spellChecking="false" bold="false" italic="true" />
       <itemData name="Decimal"            defStyleNum="dsDecVal"   spellChecking="false" />
       <itemData name="Octal"              defStyleNum="dsBaseN"    spellChecking="false" />
       <itemData name="Hex"                defStyleNum="dsBaseN"    spellChecking="false" />
+      <itemData name="Binary"             defStyleNum="dsBaseN"    spellChecking="false" />
       <itemData name="Float"              defStyleNum="dsFloat"    spellChecking="false" />
       <itemData name="Char"               defStyleNum="dsChar"     spellChecking="false" />
       <itemData name="String"             defStyleNum="dsString"   spellChecking="true"  />
diff --git a/kate/data/css.xml b/kate/data/css.xml
index d6a53c963..d2c651681 100644
--- a/kate/data/css.xml
+++ b/kate/data/css.xml
@@ -1,709 +1,824 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd"
-[
-  <!-- http://www.w3.org/TR/CSS21/syndata.html#tokenization -->
-  <!ENTITY nmstart "[_a-zA-Z]|(\\[0-9a-fA-F]{1,6})|(\\[^\n\r\f0-9a-fA-F])">
-  <!ENTITY nmchar  "[_a-zA-Z0-9-]|(\\[0-9a-fA-F]{1,6})|(\\[^\n\r\f0-9a-fA-F])">
-]>
+<!DOCTYPE language SYSTEM "language.dtd">
 
 <!--
 
-    Kate CSS syntax highlighting definition
+Kate CSS syntax highlighting definition
 
+Changelog:
 
-    Changelog:
+- Version 2.06, by Mte90:
+- CSS3 tag
 
-    - Version 2.03, by Milian Wolff:
-        - Make it spelling aware
-
-    - Version 2.02, by Rafał Miłecki:
-        - Added CSS 3 properties "border-*-image" and "border-*-radius".
-        - Added CSS values "clip", "ellipsis" and "ellipsis-word".
-        - Added CSS 3 properties "overflow-x", "overflow-y", "text-overflow", "box-shadow" and "outline-offset".
-        - Added CSS 3 color values: "rgba", "hsl" and "hsla".
-        - Added Gecko CSS properties: "-moz-border-*-colors".
-        - Added background size properties: "background-size" and prefixes: "-o-", "-webkit-" and "-khtml-".
-
-    - Version 2.01, by Mathieu Bonnet:
-        - Added CSS 3 property "border-radius".
-        - Added Gecko CSS properties "-moz-border-radius" and "-moz-box-flex".
-        - Added Gecko CSS value "-moz-box".
-        - Added Trident CSS functional notation "expression".
-        - Extended the id and class syntax specifications, as per CSS 2.1 grammar.
+- Version 2.03, by Milian Wolff:
+- Make it spelling aware
 
 -->
 
-<language name="CSS" version="2.07" kateversion="2.5" 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-color </item>
-      <item> background-image </item>
-      <item> background-position </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> 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>
-
-      <!-- CSS3 -->
-      <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-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-shadow </item>
-      <item> box-sizing </item>
-      <item> opacity </item>
-      <item> outline-offset </item>
-      <item> overflow-x </item>
-      <item> overflow-y </item>
-      <item> text-overflow </item>
-      <item> text-shadow </item>
-
-      <!-- Gecko rendering engine CSS property extensions -->
-      <item> -moz-border-bottom-colors </item>
-      <item> -moz-border-left-colors </item>
-      <item> -moz-border-radius </item>
-      <item> -moz-border-right-colors </item>
-      <item> -moz-border-top-colors </item>
-      <item> -moz-box-flex </item>
-
-      <!-- Opera rendering engine CSS property extensions -->
-      <item> -o-background-size </item>
-      <item> -o-text-overflow </item>
-
-      <!-- konq specific -->
-      <item> -khtml-background-size </item>
-      <item> konq_bgpos_x </item>
-      <item> konq_bgpos_y </item>
-
-      <!-- Webkit rendering engine CSS property extensions -->
-      <item> -webkit-background-size </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>
-
-    <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>
-
-      <!-- Gecko rendering engine CSS value extensions -->
-      <item> -moz-box </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>
-
-      <!-- in @font-face -->
-      <item> local </item>
-      <item> format </item>
-
-      <!-- Trident (a.k.a., MSHTML) rendering engine functional notation extensions -->
-      <item> expression </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> tty </item>
-      <item> tv </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>
-
-    <contexts>
-      <context attribute="Normal Text" lineEndContext="#stay" name="Base">
-        <LineContinue/>
-        <DetectSpaces/>
-	<IncludeRules context="FindRuleSets" />
-      </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 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 strings -->
-      <context attribute="Normal Text" lineEndContext="#stay" name="FindStrings">
-	<DetectChar attribute="String" context="StringDQ" char="&quot;" />
-	<DetectChar attribute="String" context="StringSQ" char="'" />
-      </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>
-
-      <!-- other contexts -->
-      <context attribute="Normal Text" lineEndContext="#stay" name="Media">
-        <DetectChar attribute="Media" context="Media2" char="{" beginRegion="media" />
-	<keyword attribute="Media" context="#stay" String="mediatypes" />
-	<DetectChar attribute="Media" context="#stay" char="," />
-	<IncludeRules context="FindComments" />
-	<RegExpr attribute="Error" context="#stay" String="\S+" />
-      </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 Attr" lineEndContext="#stay" name="SelAttr">
-	<DetectChar attribute="Selector Attr" context="#pop" char="]" />
-	<IncludeRules context="FindStrings" />
-      </context>
-
-      <context attribute="Selector Pseudo" lineEndContext="#pop" name="SelPseudo"
-      		fallthrough="true" fallthroughContext="#pop">
-	<keyword attribute="Selector Pseudo" context="#pop" String="pseudoclasses" />
-      </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="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="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="Rule">
-      	<DetectChar attribute="Property" context="Rule2" char=":" />
-	<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="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="PropParen2">
-        <DetectChar attribute="Value" context="#pop#pop" char=")" />
-	<IncludeRules context="FindValues" />
-	<IncludeRules context="FindStrings" />
-	<IncludeRules context="FindComments" />
-      </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="StringSQ">
-        <DetectChar attribute="String" context="#pop" char="'" />
-        <IncludeRules context="InsideString" />
-      </context>
-
-      <context attribute="String" lineEndContext="#stay" name="InsideString">
-        <RegExpr attribute="String" context="#stay" String="\\[&quot;']" />
-	<DetectIdentifier/>
-      </context>
-
-    </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="dsChar" 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="Alert" defStyleNum="dsAlert" 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>
+<language name="CSS" version="2.08" kateversion="2.5" 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>
+
+			<!-- 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-wisth </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-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>
+
+			<!-- 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>
+
+			<!-- 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> 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>
+
+		<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>
+
+			<!-- in @font-face -->
+			<item> local </item>
+			<item> format </item>
+
+			<!-- Trident (a.k.a., MSHTML) rendering engine functional notation extensions -->
+			<item> expression </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> tty </item>
+			<item> tv </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>
+
+		<contexts>
+			<context attribute="Normal Text" lineEndContext="#stay" name="Base">
+				<LineContinue/>
+				<DetectSpaces/>
+				<IncludeRules context="FindRuleSets" />
+			</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="#([a-zA-Z0-9\-_]|[\x80-\xFF]|\\[0-9A-Fa-f]{1,6})*" />
+				<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 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 strings -->
+			<context attribute="Normal Text" lineEndContext="#stay" name="FindStrings">
+				<DetectChar attribute="String" context="StringDQ" char="&quot;" />
+				<DetectChar attribute="String" context="StringSQ" char="'" />
+			</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>
+
+			<!-- other contexts -->
+			<context attribute="Normal Text" lineEndContext="#stay" name="Media">
+				<DetectChar attribute="Media" context="Media2" char="{" beginRegion="media" />
+				<keyword attribute="Media" context="#stay" String="mediatypes" />
+				<DetectChar attribute="Media" context="#stay" char="," />
+				<IncludeRules context="FindComments" />
+				<RegExpr attribute="Error" context="#stay" String="\S+" />
+			</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 Attr" lineEndContext="#stay" name="SelAttr">
+				<DetectChar attribute="Selector Attr" context="#pop" char="]" />
+				<IncludeRules context="FindStrings" />
+			</context>
+
+			<context attribute="Selector Pseudo" lineEndContext="#pop" name="SelPseudo"
+					fallthrough="true" fallthroughContext="#pop">
+					<keyword attribute="Selector Pseudo" context="#pop" String="pseudoclasses" />
+				</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="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="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="Rule">
+					<DetectChar attribute="Property" context="Rule2" char=":" />
+					<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="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="PropParen2">
+					<DetectChar attribute="Value" context="#pop#pop" char=")" />
+					<IncludeRules context="FindValues" />
+					<IncludeRules context="FindStrings" />
+					<IncludeRules context="FindComments" />
+				</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="StringSQ">
+					<DetectChar attribute="String" context="#pop" char="'" />
+					<IncludeRules context="InsideString" />
+				</context>
+
+				<context attribute="String" lineEndContext="#stay" name="InsideString">
+					<RegExpr attribute="String" context="#stay" String="\\[&quot;']" />
+					<DetectIdentifier/>
+				</context>
+
+			</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="dsChar" 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>
diff --git a/kate/data/rest.xml b/kate/data/rest.xml
index ad7900c41..2e6b55b0f 100644
--- a/kate/data/rest.xml
+++ b/kate/data/rest.xml
@@ -6,7 +6,7 @@
         <!ENTITY SimpleReferenceNameChars "\w-_\.:\+">
 ]>
 <!-- Copyright Matt Williams <matt@milliams.com> June 2010 -->
-<language name="reStructuredText" extensions="*.rst" section="Markup" mimetype="text/x-rst" version="1.02" kateversion="2.5" casesensitive="1">
+<language name="reStructuredText" extensions="*.rst" section="Markup" mimetype="text/x-rst" version="1.03" kateversion="2.5" casesensitive="1">
 	
 	<highlighting>
 		
@@ -21,24 +21,56 @@
 				<RegExpr attribute="FootnoteReference" context="#stay" String="&inlinestart;\[[^\s].*\]_&inlineend;" minimal="true"/>
 				<RegExpr attribute="HyperlinkRefOrInterpretedText" context="#stay" String="&inlinestart;`[^\s].*(`|`_)&inlineend;" minimal="true"/>
 				<RegExpr attribute="HyperlinkReference" context="#stay" String="\w+_(\s|$)" minimal="true"/>
+        <RegExpr attribute="Role" String=":[^:]+:" context="Role" />
 				<DetectChar attribute="Field" context="Field" firstNonSpace="true" char=":"/>
 				<RegExpr attribute="Footnote" context="#stay" String="^\s*\.\. \[(\d+|#|\*|#[&SimpleReferenceNameChars;]+)\]\s" minimal="true" firstNonSpace="true"/>
 				<RegExpr attribute="Citation" context="#stay" String="^\s*\.\. \[[&SimpleReferenceNameChars;]+\]\s" minimal="true" firstNonSpace="true"/>
 				<RegExpr attribute="HyperlinkTarget" context="#stay" String="^\s*(\.\. (__:|_[&SimpleReferenceNameChars; ]+:(\s|$))|__ )" minimal="true" firstNonSpace="true"/>
+        <RegExpr attribute="CMakeCode" String="\s*\.\. code-block::\s*cmake$" context="CMakeCodeBlock" />
+        <RegExpr attribute="CppCode" String="\s*\.\. code-block::\s*c\+\+" context="CppCodeBlock" />
 				<RegExpr attribute="Directive" context="#stay" String="^\s*\.\. [\w-_\.]+::(\s|$)" minimal="true" firstNonSpace="true"/>
+				<RegExpr attribute="Code" String="::$" context="CodeBlock" />
 				<RegExpr attribute="SubstitutionDefinition" context="#stay" String="^\s*\.\. \|[&SimpleReferenceNameChars; ]+\|\s+[&SimpleReferenceNameChars;]+::\s" minimal="true" firstNonSpace="true"/>
 			</context>
 			<context name="Field" attribute="Field" lineEndContext="#stay">
 				<DetectChar attribute="Field" context="#pop" char=":"/>
 				<Detect2Chars attribute="Field" context="#stay" char="\" char1=":"/>
 			</context>
+      <context name="HyperlinkRefOrInterpretedText" attribute="HyperlinkRefOrInterpretedText" lineEndContext="#pop">
+        <DetectChar attribute="HyperlinkRefOrInterpretedText" char="`" context="#pop" />
+      </context>
+      <context name="Role" attribute="Role" lineEndContext="#pop">
+        <RegExpr attribute="Keyword" String="\w+" context="#stay" />
+        <DetectChar attribute="HyperlinkRefOrInterpretedText" char="`" context="#pop!HyperlinkRefOrInterpretedText" />
+      </context>
+      <context name="CMakeCodeBlock" attribute="CMakeCode" lineEndContext="#stay">
+        <RegExpr attribute="CMakeCode" String="^\s" context="CMakeCode" />
+      </context>
+      <context name="CppCodeBlock" attribute="CppCode" lineEndContext="#stay">
+        <RegExpr attribute="CppCode" String="^\s" context="CppCode" />
+      </context>
+      <context name="CodeBlock" attribute="Code" lineEndContext="#stay">
+        <RegExpr attribute="Code" String="^\s" context="Code" />
+      </context>
+
+      <context name="CMakeCode" attribute="CMakeCode" lineEndContext="#stay">
+        <RegExpr attribute="Normal" String="^\S" lookAhead="true" context="#pop#pop" />
+        <IncludeRules context="##CMake" includeAttrib="true"/>
+      </context>
+      <context name="CppCode" attribute="CppCode" lineEndContext="#stay">
+        <RegExpr attribute="Normal" String="^\S" lookAhead="true" context="#pop#pop" />
+        <IncludeRules context="##C++" includeAttrib="true"/>
+      </context>
+      <context name="Code" attribute="Code" lineEndContext="#stay">
+        <RegExpr attribute="Normal" String="^\S" lookAhead="true" context="#pop#pop" />
+      </context>
 		</contexts>
 		
 		<itemDatas>
 			<itemData name="Normal" defStyleNum="dsNormal" />
 			<itemData name="Bold" defStyleNum="dsNormal" bold="1" />
 			<itemData name="Italic" defStyleNum="dsNormal" italic="1" />
-			<itemData name="InlineLiteral" defStyleNum="dsString" />
+			<itemData name="InlineLiteral" defStyleNum="dsDataType" />
 			<itemData name="SubstitutionReference" defStyleNum="dsFunction" />
 			<itemData name="InlineInternalTarget" defStyleNum="dsFunction" />
 			<itemData name="FootnoteReference" defStyleNum="dsOthers" />
@@ -51,6 +83,10 @@
 			<itemData name="HyperlinkTarget" defStyleNum="dsDataType" />
 			<itemData name="Directive" defStyleNum="dsDataType" />
 			<itemData name="SubstitutionDefinition" defStyleNum="dsDataType" />
+      <itemData name="Role" defStyleNum="dsNormal" bold="1" />
+      <itemData name="CMakeCode" defStyleNum="dsDataType" />
+      <itemData name="CppCode" defStyleNum="dsDataType" />
+      <itemData name="Code" defStyleNum="dsDataType" />
 		</itemDatas>
 		
 	</highlighting>
diff --git a/kate/data/update-files.xml b/kate/data/update-files.xml
index 3fa7bf3e5..9884a9e71 100644
--- a/kate/data/update-files.xml
+++ b/kate/data/update-files.xml
@@ -32,18 +32,18 @@
 <Definition name="Cisco" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/cisco.xml" version="1.11"/>
 <Definition name="Clipper" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/clipper.xml" version="1.06"/>
 <Definition name="Clojure" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/clojure.xml" version="2.01"/>
-<Definition name="CMake" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/cmake.xml" version="1.24"/>
+<Definition name="CMake" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/cmake.xml" version="1.25"/>
 <Definition name="CoffeeScript" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/coffee.xml" version="1.5"/>
 <Definition name="ColdFusion" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/coldfusion.xml" version="1.05"/>
 <Definition name="Common Lisp" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/commonlisp.xml" version="1.06"/>
 <Definition name="Component-Pascal" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/component-pascal.xml" version="1.06"/>
 <Definition name="ConTeXt" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/context.xml" version="1.2"/>
 <Definition name="C++" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/cpp.xml" version="1.52"/>
-<Definition name="C++11" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/cpp11.xml" version="1.63"/>
+<Definition name="C++11" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/cpp11.xml" version="1.64"/>
 <Definition name="Crack" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/crk.xml" version="1.2"/>
 <Definition name="C#" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/cs.xml" version="1.16"/>
 <Definition name="CSS/PHP" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/css-php.xml" version="2.07"/>
-<Definition name="CSS" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/css.xml" version="2.07"/>
+<Definition name="CSS" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/css.xml" version="2.08"/>
 <Definition name="CUE Sheet" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/cue.xml" version="0.92"/>
 <Definition name="Curry" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/curry.xml" version="0.4"/>
 <Definition name="D" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/d.xml" version="1.63"/>
@@ -161,7 +161,7 @@
 <Definition name="RapidQ" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/rapidq.xml" version="1.02"/>
 <Definition name="RELAX NG" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/relaxng.xml" version="0.9"/>
 <Definition name="RelaxNG-Compact" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/relaxngcompact.xml" version="0.3"/>
-<Definition name="reStructuredText" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/rest.xml" version="1.02"/>
+<Definition name="reStructuredText" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/rest.xml" version="1.03"/>
 <Definition name="Restructured Text" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/restructuredtext.xml" version="1.01"/>
 <Definition name="REXX" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/rexx.xml" version="1.02"/>
 <Definition name="Ruby/Rails/RHTML" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/rhtml.xml" version="1.02"/>