diff --git a/share/qtcreator/generic-highlighter/alert.xml b/share/qtcreator/generic-highlighter/alert.xml
index 3e1ac03ecb8..8ac5296fc80 100644
--- a/share/qtcreator/generic-highlighter/alert.xml
+++ b/share/qtcreator/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.09" kateversion="2.3" name="Alerts" section="Other" extensions="" mimetype="" author="Dominik Haumann (dhdev@gmx.de)" license="LGPL" hidden="true">
+<language version="1.11" 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>
@@ -59,6 +59,10 @@
     </list>
     <contexts>
       <context attribute="Normal Text" lineEndContext="#pop" name="Normal Text" >
+        <StringDetect attribute="Region Marker" context="#stay" String="{{{" beginRegion="AlertRegion1" />
+        <StringDetect attribute="Region Marker" context="#stay" String="}}}" endRegion="AlertRegion1" />
+        <StringDetect attribute="Region Marker" context="#stay" String="BEGIN" beginRegion="AlertRegion2" />
+        <StringDetect attribute="Region Marker" context="#stay" String="END" endRegion="AlertRegion2" />
         <keyword attribute="Alert Level 1" context="#stay" String="alerts_hi" />
         <keyword attribute="Alert Level 2" context="#stay" String="alerts_mid" />
         <keyword attribute="Alert Level 3" context="#stay" String="alerts_lo" />
@@ -69,6 +73,7 @@
       <itemData name="Alert Level 1" defStyleNum="dsAlert" color="#e85848" selColor="#e85848" backgroundColor="#451e1a" />
       <itemData name="Alert Level 2" defStyleNum="dsAlert" color="#ca9219" selColor="#ca9219" backgroundColor="#451e1a" />
       <itemData name="Alert Level 3" defStyleNum="dsAlert" color="#81ca2d" selColor="#81ca2d" />
+      <itemData name="Region Marker" defStyleNum="dsRegionMarker"/>
     </itemDatas>
   </highlighting>
   <general>
diff --git a/share/qtcreator/generic-highlighter/cmake.xml b/share/qtcreator/generic-highlighter/cmake.xml
index 3c940c51392..d5a7c765a45 100644
--- a/share/qtcreator/generic-highlighter/cmake.xml
+++ b/share/qtcreator/generic-highlighter/cmake.xml
@@ -29,7 +29,7 @@
 <language
     name="CMake"
     version="1.30"
-    kateversion="2.4"
+    kateversion="3.4"
     section="Other"
     extensions="CMakeLists.txt;*.cmake;*.cmake.in"
     style="CMake"
diff --git a/share/qtcreator/generic-highlighter/css.xml b/share/qtcreator/generic-highlighter/css.xml
index 6f274bb50fa..efe07ec6946 100644
--- a/share/qtcreator/generic-highlighter/css.xml
+++ b/share/qtcreator/generic-highlighter/css.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
+<!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])">
+]>
 
 <!--
 
@@ -18,7 +23,7 @@ Changelog:
 
 -->
 
-<language name="CSS" version="2.08" kateversion="2.4" section="Markup" extensions="*.css" indenter="cstyle" mimetype="text/css" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
+<language name="CSS" version="2.09" kateversion="3.4" section="Markup" extensions="*.css" indenter="cstyle" mimetype="text/css" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
 
 	<highlighting>
 		<list name="properties">
@@ -718,7 +723,7 @@ Changelog:
 				<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 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=":" />
@@ -792,6 +797,7 @@ Changelog:
                         
                         <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.]+[%]?" />
diff --git a/share/qtcreator/generic-highlighter/doxygen.xml b/share/qtcreator/generic-highlighter/doxygen.xml
index 2fef62c12c9..abdf3c675fc 100644
--- a/share/qtcreator/generic-highlighter/doxygen.xml
+++ b/share/qtcreator/generic-highlighter/doxygen.xml
@@ -29,7 +29,7 @@
  -->
 
 <language name="Doxygen"
-          version="1.35"
+          version="1.38"
           kateversion="2.4"
           section="Markup"
           extensions="*.dox;*.doxygen"
@@ -53,15 +53,19 @@
       <item> \date </item>             <item> @date </item>
       <item> \deprecated </item>       <item> @deprecated </item>
       <item> \details </item>          <item> @details </item>
+      <item> \docbookonly </item>      <item> @docbookonly </item>
       <item> \else </item>             <item> @else </item>
       <item> \endcond </item>          <item> @endcond </item>
+      <item> \enddocbookonly </item>   <item> @enddocbookonly </item>
       <item> \endhtmlonly </item>      <item> @endhtmlonly </item>
       <item> \endif </item>            <item> @endif </item>
-      <item> \enditernal </item>       <item> @enditernal </item>
+      <item> \endinternal </item>      <item> @endinternal </item>
       <item> \endlatexonly </item>     <item> @endlatexonly </item>
       <item> \endlink </item>          <item> @endlink </item>
       <item> \endmanonly </item>       <item> @endmanonly </item>
+      <item> \endparblock </item>      <item> @endparblock </item>
       <item> \endrtfonly </item>       <item> @endrtfonly </item>
+      <item> \endsecreflist </item>    <item> @endsecreflist </item>
       <item> \endxmlonly </item>       <item> @endxmlonly </item>
       <item> \f[ </item>               <item> @f[ </item>
       <item> \f] </item>               <item> @f] </item>
@@ -78,6 +82,7 @@
       <item> \n </item>                <item> @n </item>
       <item> \nosubgrouping </item>    <item> @nosubgrouping </item>
       <item> \only </item>             <item> @only </item>
+      <item> \parblock </item>         <item> @parblock </item>
       <item> \post </item>             <item> @post </item>
       <item> \pre </item>              <item> @pre </item>
       <item> \private </item>          <item> @pivate </item>
@@ -86,16 +91,20 @@
       <item> \protectedsection </item> <item> @protectedsection </item>
       <item> \public </item>           <item> @public </item>
       <item> \publicsection </item>    <item> @publicsection </item>
+      <item> \pure </item>             <item> @pure </item>
+      <item> \remark </item>           <item> @remark </item>
       <item> \remarks </item>          <item> @remarks </item>
       <item> \return </item>           <item> @return </item>
       <item> \returns </item>          <item> @returns </item>
       <item> \result </item>           <item> @result </item>
       <item> \rtfonly </item>          <item> @rtfonly </item>
       <item> \sa </item>               <item> @sa </item>
+      <item> \secreflist </item>       <item> @secreflist </item>
       <item> \see </item>              <item> @see </item>
       <item> \short </item>            <item> @short </item>
       <item> \showinitializer </item>  <item> @showinitializer </item>
       <item> \since </item>            <item> @since </item>
+      <item> \static </item>           <item> @static </item>
       <item> \tableofcontents </item>  <item> @tableofcontents </item>
       <item> \test </item>             <item> @test </item>
       <item> \version </item>          <item> @version </item>
@@ -112,6 +121,9 @@
       <item> \@ </item>                <item> @@ </item>
       <item> \\ </item>                <item> @\ </item>
       <item> \~ </item>                <item> @~ </item>
+      <item> \. </item>                <item> @. </item>
+      <item> \-- </item>               <item> @-- </item>
+      <item> \--- </item>              <item> @--- </item>
     </list>
 
     <list name="TagWord">
@@ -119,6 +131,7 @@
       <item> \anchor </item>           <item> @anchor </item>
       <item> \b </item>                <item> @b </item>
       <item> \c </item>                <item> @c </item>
+      <item> \cite </item>             <item> @cite </item>
       <item> \cond </item>             <item> @cond </item>
       <item> \copybrief </item>        <item> @copybrief </item>
       <item> \copydetails </item>      <item> @copydetails </item>
@@ -136,11 +149,13 @@
       <item> \extends </item>          <item> @extends </item>
       <item> \file </item>             <item> @file </item>
       <item> \htmlinclude </item>      <item> @htmlinclude </item>
+      <item> \idlexcept </item>        <item> @idlexcept </item>
       <item> \if </item>               <item> @if </item>
       <item> \ifnot </item>            <item> @ifnot </item>
       <item> \implements </item>       <item> @implements </item>
       <item> \include </item>          <item> @include </item>
       <item> \includelineno </item>    <item> @includelineno </item>
+      <item> \latexinclude </item>     <item> @latexinclude </item>
       <item> \link </item>             <item> @link </item>
       <item> \memberof </item>         <item> @memberof </item>
       <item> \namespace </item>        <item> @namespace </item>
@@ -176,6 +191,7 @@
       <item> \addtogroup </item>       <item> @addtogroup </item>
       <item> \category </item>         <item> @category </item>
       <item> \class </item>            <item> @class </item>
+      <item> \diafile </item>          <item> @diafile </item>
       <item> \dotfile </item>          <item> @dotfile </item>
       <item> \defgroup </item>         <item> @defgroup </item>
       <item> \interface </item>        <item> @interface </item>
@@ -209,6 +225,7 @@
       <item> \typedef </item>          <item> @typedef </item>
       <item> \until </item>            <item> @until </item>
       <item> \var </item>              <item> @var </item>
+      <item> \vhdlflow </item>         <item> @vhdlflow </item>
     </list>
     <list name="Note">
       <item> \note </item>             <item> @note </item>
@@ -276,7 +293,7 @@
         <keyword attribute="Tags" context="ML_TagWordWord" String="TagWordWord" />
         <keyword attribute="Tags" context="ML_TagString" String="TagString" />
         <keyword attribute="Tags" context="ML_TagWordString" String="TagWordString" />
-        <RegExpr attribute="Custom Tags" context="#stay" String="[@\\][^@\\ \t]+" />
+        <RegExpr attribute="Custom Tags" context="#stay" String="[@\\]([^@\\ \t\*]|\*(?!/))+" />
         <DetectIdentifier />
         <RegExpr attribute="Tags" context="#stay" String="\\(&lt;|&gt;)" />
         <Detect2Chars attribute="Comment" context="#stay" char="&lt;" char1="&lt;" />
@@ -467,31 +484,31 @@
 
   </contexts>
     <itemDatas>
-      <itemData name="Normal Text"              defStyleNum="dsNormal" />
-      <itemData name="Tags"                     defStyleNum="dsKeyword" />
-      <itemData name="Custom Tags"              defStyleNum="dsKeyword" />
-      <itemData name="Word"                     defStyleNum="dsIdentifier" />
-      <itemData name="HTML Tag"                 defStyleNum="dsKeyword" />
-      <itemData name="Entities"                 defStyleNum="dsOthers" />
-      <itemData name="Description"              defStyleNum="dsString" />
-      <itemData name="Comment"                  defStyleNum="dsComment" />
-      <itemData name="Region"                   defStyleNum="dsRegionMarker" />
-      <itemData name="Identifier"               defStyleNum="dsIdentifier" />
-      <itemData name="HTML Comment"             defStyleNum="dsComment" />
-      <itemData name="Types"                    defStyleNum="dsDataType" />
-      <itemData name="Code"                     defStyleNum="dsComment" />
-      <itemData name="Dot Graph"                defStyleNum="dsComment" />
-      <itemData name="Formulas"                 defStyleNum="dsComment" />
-      <itemData name="Message Sequence Chart"   defStyleNum="dsComment" />
-      <itemData name="Verbatim"                 defStyleNum="dsComment" />
-      <itemData name="Note"                     defStyleNum="dsKeyword" />
-      <itemData name="Warning"                  defStyleNum="dsKeyword" />
-      <itemData name="Attention"                defStyleNum="dsKeyword" />
-      <itemData name="Todo"                     defStyleNum="dsKeyword" />
+      <itemData name="Normal Text"  defStyleNum="dsNormal" />
+      <itemData name="Tags"         defStyleNum="dsKeyword" color="#ca60ca" bold="1" italic="0" />
+      <itemData name="Custom Tags"  defStyleNum="dsNormal"  color="#458C61" bold="1" italic="0" />
+      <itemData name="Word"         defStyleNum="dsKeyword" color="#0095ff" bold="1" italic="0" />
+      <itemData name="HTML Tag"     defStyleNum="dsKeyword" color="#000000" bold="1" italic="0" />
+      <itemData name="Entities"     defStyleNum="dsOthers" color="#4086C0" bold="1" italic="1" />
+      <itemData name="Description"  defStyleNum="dsString"  color="#ff0000" />
+      <itemData name="Comment"      defStyleNum="dsComment" />
+      <itemData name="Region"       defStyleNum="dsRegionMarker" />
+      <itemData name="Identifier"   defStyleNum="dsOthers" />
+      <itemData name="HTML Comment" defStyleNum="dsComment" />
+      <itemData name="Types"        defStyleNum="dsDataType" />
+      <itemData name="Code"         defStyleNum="dsComment" />
+      <itemData name="Dot Graph"    defStyleNum="dsComment" color="#00A000" selColor="#ffffff" italic="1" />
+      <itemData name="Formulas"     defStyleNum="dsComment" color="#00A000" selColor="#ffffff" italic="1" />
+      <itemData name="Message Sequence Chart" defStyleNum="dsComment" color="#00A000" selColor="#ffffff" italic="1" />
+      <itemData name="Verbatim"     defStyleNum="dsComment" />
+      <itemData name="Note"         defStyleNum="dsKeyword" color="#81ca2d" selColor="#81ca2d" bold="1" italic="0" />
+      <itemData name="Warning"      defStyleNum="dsKeyword" color="#ca9219" selColor="#ca9219" bold="1" italic="0" />
+      <itemData name="Attention"    defStyleNum="dsKeyword" color="#e85848" selColor="#e85848" bold="1" italic="0" />
+      <itemData name="Todo"         defStyleNum="dsKeyword" color="#ca60ca" selColor="#ffffff" bold="1" italic="0" />
     </itemDatas>
   </highlighting>
   <general>
-    <keywords casesensitive="0" weakDeliminator="\$~" />
+    <keywords casesensitive="1" weakDeliminator="\$~" />
   </general>
 </language>
 <!-- kate: indent-width 2; -->
diff --git a/share/qtcreator/generic-highlighter/dtd.xml b/share/qtcreator/generic-highlighter/dtd.xml
index 17914d16cab..75d07234d9b 100644
--- a/share/qtcreator/generic-highlighter/dtd.xml
+++ b/share/qtcreator/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="2.4" section="Markup" extensions="*.dtd" mimetype="application/xml-dtd" author="Andriy Lesyuk (s-andy@in.if.ua)" license="LGPL">
+<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">
   <highlighting>
 
     <list name="Category">
diff --git a/share/qtcreator/generic-highlighter/html.xml b/share/qtcreator/generic-highlighter/html.xml
index e2c46db446f..741423f866e 100644
--- a/share/qtcreator/generic-highlighter/html.xml
+++ b/share/qtcreator/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="1.99" kateversion="2.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="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">
 
 <highlighting>
 <contexts>
@@ -17,23 +17,41 @@
     <DetectIdentifier/>
     <StringDetect attribute="Comment" context="Comment" String="&lt;!--" beginRegion="comment" />
     <StringDetect attribute="CDATA" context="CDATA" String="&lt;![CDATA[" beginRegion="cdata" />
-    <RegExpr attribute="Doctype" context="Doctype" String="&lt;!DOCTYPE\s+" beginRegion="doctype" />
+    <RegExpr attribute="Doctype" context="Doctype" String="&lt;!DOCTYPE\s+" insensitive="true" beginRegion="doctype"  />
     <RegExpr attribute="Processing Instruction" context="PI" String="&lt;\?[\w:-]*" beginRegion="pi" />
-    <RegExpr attribute="Element" context="CSS" String="&lt;style\b" insensitive="TRUE" beginRegion="style" />
-    <RegExpr attribute="Element" context="JS" String="&lt;script\b" insensitive="TRUE" beginRegion="script" />
-    <RegExpr attribute="Element" context="El Open" String="&lt;pre\b" insensitive="TRUE" beginRegion="pre" />
-    <RegExpr attribute="Element" context="El Open" String="&lt;div\b" insensitive="TRUE" beginRegion="div" />
-    <RegExpr attribute="Element" context="El Open" String="&lt;table\b" insensitive="TRUE" beginRegion="table" />
-    <RegExpr attribute="Element" context="El Open" String="&lt;ul\b" insensitive="TRUE" beginRegion="ul" />
-    <RegExpr attribute="Element" context="El Open" String="&lt;ol\b" insensitive="TRUE" beginRegion="ol" />
-    <RegExpr attribute="Element" context="El Open" String="&lt;dl\b" insensitive="TRUE" beginRegion="dl" />
+    <RegExpr attribute="Element" context="CSS" String="&lt;style\b" insensitive="true" beginRegion="style" />
+    <RegExpr attribute="Element" context="JS" String="&lt;script\b" insensitive="true" beginRegion="script" />
+    <RegExpr attribute="Element" context="El Open" String="&lt;pre\b" insensitive="true" beginRegion="pre" />
+    <RegExpr attribute="Element" context="El Open" String="&lt;div\b" insensitive="true" beginRegion="div" />
+    <RegExpr attribute="Element" context="El Open" String="&lt;table\b" insensitive="true" beginRegion="table" />
+    <RegExpr attribute="Element" context="El Open" String="&lt;ul\b" insensitive="true" beginRegion="ul" />
+    <RegExpr attribute="Element" context="El Open" String="&lt;ol\b" insensitive="true" beginRegion="ol" />
+    <RegExpr attribute="Element" context="El Open" String="&lt;dl\b" insensitive="true" beginRegion="dl" />
+    <RegExpr attribute="Element" context="El Open" String="&lt;article\b" insensitive="true" beginRegion="article" />
+    <RegExpr attribute="Element" context="El Open" String="&lt;aside\b" insensitive="true" beginRegion="aside" />
+    <RegExpr attribute="Element" context="El Open" String="&lt;details\b" insensitive="true" beginRegion="details" />
+    <RegExpr attribute="Element" context="El Open" String="&lt;figure\b" insensitive="true" beginRegion="figure" />
+    <RegExpr attribute="Element" context="El Open" String="&lt;footer\b" insensitive="true" beginRegion="footer" />
+    <RegExpr attribute="Element" context="El Open" String="&lt;header\b" insensitive="true" beginRegion="header" />
+    <RegExpr attribute="Element" context="El Open" String="&lt;main\b" insensitive="true" beginRegion="main" />
+    <RegExpr attribute="Element" context="El Open" String="&lt;nav\b" insensitive="true" beginRegion="nav" />
+    <RegExpr attribute="Element" context="El Open" String="&lt;section\b" insensitive="true" beginRegion="section" />
     <RegExpr attribute="Element" context="El Open" String="&lt;&name;" />
-    <RegExpr attribute="Element" context="El Close" String="&lt;/pre\b" insensitive="TRUE" endRegion="pre" />
-    <RegExpr attribute="Element" context="El Close" String="&lt;/div\b" insensitive="TRUE" endRegion="div" />
-    <RegExpr attribute="Element" context="El Close" String="&lt;/table\b" insensitive="TRUE" endRegion="table" />
-    <RegExpr attribute="Element" context="El Close" String="&lt;/ul\b" insensitive="TRUE" endRegion="ul" />
-    <RegExpr attribute="Element" context="El Close" String="&lt;/ol\b" insensitive="TRUE" endRegion="ol" />
-    <RegExpr attribute="Element" context="El Close" String="&lt;/dl\b" insensitive="TRUE" endRegion="dl" />
+    <RegExpr attribute="Element" context="El Close" String="&lt;/pre\b" insensitive="true" endRegion="pre" />
+    <RegExpr attribute="Element" context="El Close" String="&lt;/div\b" insensitive="true" endRegion="div" />
+    <RegExpr attribute="Element" context="El Close" String="&lt;/table\b" insensitive="true" endRegion="table" />
+    <RegExpr attribute="Element" context="El Close" String="&lt;/ul\b" insensitive="true" endRegion="ul" />
+    <RegExpr attribute="Element" context="El Close" String="&lt;/ol\b" insensitive="true" endRegion="ol" />
+    <RegExpr attribute="Element" context="El Close" String="&lt;/dl\b" insensitive="true" endRegion="dl" />
+    <RegExpr attribute="Element" context="El Close" String="&lt;/article\b" insensitive="true" endRegion="article" />
+    <RegExpr attribute="Element" context="El Close" String="&lt;/aside\b" insensitive="true" endRegion="aside" />
+    <RegExpr attribute="Element" context="El Close" String="&lt;/details\b" insensitive="true" endRegion="details" />
+    <RegExpr attribute="Element" context="El Close" String="&lt;/figure\b" insensitive="true" endRegion="figure" />
+    <RegExpr attribute="Element" context="El Close" String="&lt;/footer\b" insensitive="true" endRegion="footer" />
+    <RegExpr attribute="Element" context="El Close" String="&lt;/header\b" insensitive="true" endRegion="header" />
+    <RegExpr attribute="Element" context="El Close" String="&lt;/main\b" insensitive="true" endRegion="main" />
+    <RegExpr attribute="Element" context="El Close" String="&lt;/nav\b" insensitive="true" endRegion="nav" />
+    <RegExpr attribute="Element" context="El Close" String="&lt;/section\b" insensitive="true" endRegion="section" />
     <RegExpr attribute="Element" context="El Close" String="&lt;/&name;" />
     <!-- as long as kde gives DTDs the text/html mimetype--><IncludeRules context="FindDTDRules" />
     <IncludeRules context="FindEntityRefs" />
@@ -139,7 +157,7 @@
   </context>
 
   <context name="CSS content" attribute="Other Text" lineEndContext="#stay">
-    <RegExpr attribute="Element" context="El Close 2" String="&lt;/style\b" insensitive="TRUE" endRegion="style" />
+    <RegExpr attribute="Element" context="El Close 2" String="&lt;/style\b" insensitive="true" endRegion="style" />
     <IncludeRules context="##CSS" includeAttrib="true"/>
   </context>
 
@@ -151,13 +169,13 @@
   </context>
 
   <context name="JS content" attribute="Other Text" lineEndContext="#stay">
-    <RegExpr attribute="Element" context="El Close 2" String="&lt;/script\b" insensitive="TRUE" endRegion="script" />
-    <RegExpr attribute="Comment" context="JS comment close" String="//(?=.*&lt;/script\b)" insensitive="TRUE" />
-    <IncludeRules context="##JavaScript" includeAttrib="true"/>
+    <RegExpr attribute="Element" context="El Close 2" String="&lt;/script\b" insensitive="true" endRegion="script" />
+    <RegExpr attribute="Comment" context="JS comment close" String="//(?=.*&lt;/script\b)" insensitive="true" />
+    <IncludeRules context="Normal##JavaScript" includeAttrib="true"/>
   </context>
 
   <context name="JS comment close" attribute="Comment" lineEndContext="#pop">
-    <RegExpr attribute="Element" context="El Close 3" String="&lt;/script\b" insensitive="TRUE" endRegion="script" />
+    <RegExpr attribute="Element" context="El Close 3" String="&lt;/script\b" insensitive="true" endRegion="script" />
     <IncludeRules context="##Alerts" />
   </context>
 
diff --git a/share/qtcreator/generic-highlighter/ini.xml b/share/qtcreator/generic-highlighter/ini.xml
index 3cdcd1f207b..f6f55e2ebe2 100644
--- a/share/qtcreator/generic-highlighter/ini.xml
+++ b/share/qtcreator/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.0" author="Jan Janssen (medhefgo@web.de)" license="LGPL">
+<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">
 
 <highlighting>
 <list name="keywords">
diff --git a/share/qtcreator/generic-highlighter/java.xml b/share/qtcreator/generic-highlighter/java.xml
index 1039ba77998..02534508e28 100644
--- a/share/qtcreator/generic-highlighter/java.xml
+++ b/share/qtcreator/generic-highlighter/java.xml
@@ -3766,7 +3766,7 @@
 				<HlCOct attribute="Octal" context="#stay"/>
 				<HlCHex attribute="Hex" context="#stay"/>
 				<Int attribute="Decimal" context="#stay">
-					<StringDetect attribute="Decimal" context="#stay" String="L" insensitive="TRUE"/>
+					<StringDetect attribute="Decimal" context="#stay" String="L" insensitive="true"/>
 				</Int>
 				<HlCChar attribute="Char" context="#stay"/>
 				<RegExpr attribute="Char" context="#stay" String="'\\u[0-9a-fA-F]{4}'"/>
diff --git a/share/qtcreator/generic-highlighter/javadoc.xml b/share/qtcreator/generic-highlighter/javadoc.xml
index 2fa40ea912f..25eab95e111 100644
--- a/share/qtcreator/generic-highlighter/javadoc.xml
+++ b/share/qtcreator/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.04" kateversion="2.4" section="Markup" extensions="" license="LGPL" author="Alfredo Luiz Foltran Fialho (alfoltran@ig.com.br)">
+<language name="Javadoc" version="1.05" 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">
@@ -78,12 +78,12 @@
 				<RegExpr attribute="JavadocParam" context="#pop#pop" String="\S*(?=\*/)" />
 				<RegExpr attribute="JavadocParam" context="#pop" String="\S*(\s|$)" />
 			</context>
-			<context attribute="InlineTag" name="InlineTagar">
+			<context attribute="InlineTag" name="InlineTagar" lineEndContext="#stay">
 				<DetectChar attribute="InlineTag" context="#pop" char="}" />
 				<Detect2Chars attribute="JavadocFS" context="#pop#pop#pop" char="*" char1="/" />
 				<IncludeRules context="##HTML"/>
 			</context>
-			<context attribute="InlineTag" name="LiteralTagar">
+			<context attribute="InlineTag" name="LiteralTagar" lineEndContext="#stay">
 				<DetectChar attribute="InlineTag" context="#pop" char="}" />
 				<Detect2Chars attribute="JavadocFS" context="#pop#pop#pop" char="*" char1="/" />
 			</context>
diff --git a/share/qtcreator/generic-highlighter/makefile.xml b/share/qtcreator/generic-highlighter/makefile.xml
index 573359208f1..fbf96eae927 100644
--- a/share/qtcreator/generic-highlighter/makefile.xml
+++ b/share/qtcreator/generic-highlighter/makefile.xml
@@ -5,8 +5,10 @@
 <!-- Modified by Rui Santana <santana.rui@gmail.com> -->
 <!-- v2.0 by Andreas Nordal <andreas.nordal@gmail.com> -->
 <!-- small priority to allow for example Makefile.cpp to be detected as cpp file -->
+<!-- v2.1 by Alex Turbov <i.zaufi@gmail.com>
+     improve comments handling -->
 <language name="Makefile" section="Other"
-          version="2.0" kateversion="2.4"
+          version="2.1" kateversion="3.4"
           extensions="GNUmakefile;Makefile;makefile;GNUmakefile.*;Makefile.*;makefile.*;*.mk"
           mimetype="text/x-makefile"
           author="Per Wigren (wigren@home.se)" license="">
@@ -64,7 +66,7 @@
     <contexts>
       <context name="normal" attribute="Normal" lineEndContext="#stay">
         <DetectSpaces/>
-        <RegExpr attribute="Comment"  context="#stay" String="#.*$"/>
+        <DetectChar attribute="Comment" context="Comment" char="#"/>
         <keyword attribute="Keyword"  context="#stay" String="keywords"/>
         <RegExpr attribute="Variable" context="assign" String="[^\s:+?]*\s*(?=:=|=|\+=|\?=)"/>
         <RegExpr attribute="Section"  context="prereq" String="^\.[^.][^:]*:"/>
@@ -85,7 +87,7 @@
         <DetectChar attribute="Operator" context="dollar" char="$"/>
         <Detect2Chars attribute="Special" context="#stay" char="\" char1="#"/>
         <Detect2Chars attribute="Special" context="#stay" char="\" char1="\"/>
-        <RegExpr attribute="Comment"  context="#stay" String="#.*$"/>
+        <DetectChar attribute="Comment" context="Comment" char="#"/>
       </context>
 
       <context name="rule" attribute="Normal" lineEndContext="#stay">
@@ -102,7 +104,7 @@
         <Detect2Chars attribute="Special" context="#stay" char="\" char1="#"/>
         <Detect2Chars attribute="Special" context="#stay" char="\" char1="\"/>
         <AnyChar attribute="Operator" context="silent" String="@-" firstNonSpace="1"/>
-        <RegExpr attribute="Comment" context="#stay" String="#.*$"/>
+        <DetectChar attribute="Comment" context="Comment" char="#"/>
       </context>
 
       <context name="silent" attribute="Silent" lineEndContext="#pop">
@@ -114,7 +116,7 @@
         <DetectChar attribute="Operator" context="dollar" char="$"/>
         <Detect2Chars attribute="Special" context="#stay" char="\" char1="#"/>
         <Detect2Chars attribute="Special" context="#stay" char="\" char1="\"/>
-        <RegExpr attribute="Comment" context="#stay" String="#.*$"/>
+        <DetectChar attribute="Comment" context="Comment" char="#"/>
       </context>
 
       <context name="string&quot;" attribute="String" lineEndContext="#pop">
@@ -182,6 +184,12 @@
         <DetectChar attribute="String" context="string'" char="'"/>
       </context>
 
+      <context attribute="Comment" lineEndContext="#pop" name="Comment">
+        <LineContinue attribute="Comment" context="#stay" />
+        <IncludeRules context="##Alerts" />
+        <IncludeRules context="##Modelines" />
+      </context>
+
     </contexts>
     <itemDatas>
       <itemData name="Normal"    defStyleNum="dsNormal" spellChecking="0"/>
diff --git a/share/qtcreator/generic-highlighter/perl.xml b/share/qtcreator/generic-highlighter/perl.xml
index 402064c40e5..ba286327024 100644
--- a/share/qtcreator/generic-highlighter/perl.xml
+++ b/share/qtcreator/generic-highlighter/perl.xml
@@ -39,7 +39,7 @@
 
    Enhance tr/// and y/// support.
 -->
-<language name="Perl" version="1.29" 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="1.31" 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>
@@ -346,7 +346,7 @@
         <keyword attribute="Operator" context="#stay" String="operators" />
         <keyword attribute="Function" context="#stay" String="functions" />
         <keyword attribute="Pragma" context="#stay" String="pragmas" />
-        <RegExpr attribute="Pod" context="pod" String="\=(?:head[1-6]|over|back|item|for|begin|end|pod)(\s|$)" column="0" beginRegion="POD"/>
+        <RegExpr attribute="Pod" context="pod" String="\=\w+(\s|$)" column="0" beginRegion="POD"/>
         <DetectSpaces />
         <DetectChar attribute="Comment" context="comment" char="#" />
 
@@ -620,14 +620,14 @@
       </context>
 
       <!-- rules internal stuff wrt regex patterns -->
-      <context name="regex_pattern_internal_rules_1" lineEndContext="#stay">
+      <context name="regex_pattern_internal_rules_1" attribute="Pattern" lineEndContext="#stay">
         <RegExpr attribute="Comment" context="#stay" String="#.*$" firstNonSpace="true" />
         <RegExpr attribute="Pattern Character Class" context="#stay" String="\\[anDdSsWw]" />
         <RegExpr attribute="Pattern Internal Operator" context="#stay" String="\\[ABbEGLlNUuQdQZz]" />
         <RegExpr attribute="Special Variable" context="#stay" String="\\[\d]+" />
         <RegExpr attribute="Pattern" context="#stay" String="\\." />
       </context>
-      <context name="regex_pattern_internal_rules_2" lineEndContext="#stay">
+      <context name="regex_pattern_internal_rules_2" attribute="Pattern" lineEndContext="#stay">
         <Detect2Chars attribute="Pattern Internal Operator" context="pat_ext" char="(" char1="?" />
         <DetectChar attribute="Pattern Internal Operator" context="pat_char_class" char="[" />
         <RegExpr attribute="Pattern Internal Operator" context="#stay" String="[()?^*+|]" />
@@ -745,7 +745,7 @@
       </context>
       <context name="here_document" attribute="String (interpolated)" lineEndContext="#stay" dynamic="true">
         <DetectSpaces />
-        <RegExpr attribute="Keyword" context="#pop#pop" String="%1" column="0" dynamic="true" endRegion="HereDocument"/>
+        <RegExpr attribute="Keyword" context="#pop#pop" String="^%1\b" column="0" dynamic="true" endRegion="HereDocument"/>
         <RegExpr attribute="Keyword" context="here_document" String="\=\s*&lt;&lt;\s*[&quot;']?([A-Z0-9_\-]+)[&quot;']?" beginRegion="HEREDoc" />
         <IncludeRules context="ipstring_internal" />
       </context>
diff --git a/share/qtcreator/generic-highlighter/ruby.xml b/share/qtcreator/generic-highlighter/ruby.xml
index 4b60a1951b2..9eecb5ad483 100644
--- a/share/qtcreator/generic-highlighter/ruby.xml
+++ b/share/qtcreator/generic-highlighter/ruby.xml
@@ -31,8 +31,8 @@
 
 <!-- Hold the "language" opening tag on a single line, as mentioned in "language.dtd". -->
 <language name="Ruby" section="Scripts"
-	  version="1.27" kateversion="2.4"
-	  extensions="*.rb;*.rjs;*.rxml;*.xml.erb;*.js.erb;*.rake;Rakefile;Gemfile;*.gemspec"
+	  version="1.28" kateversion="3.3"
+	  extensions="*.rb;*.rjs;*.rxml;*.xml.erb;*.js.erb;*.rake;Rakefile;Gemfile;*.gemspec;Vagrantfile"
 	  mimetype="application/x-ruby"
 	  style="ruby" indenter="ruby"
 	  author="Stefan Lang (langstefan@gmx.at), Sebastian Vuorinen (sebastian.vuorinen@helsinki.fi), Robin Pedersen (robinpeder@gmail.com), Miquel Sabaté (mikisabate@gmail.com)" license="LGPL">
diff --git a/share/qtcreator/generic-highlighter/valgrind-suppression.xml b/share/qtcreator/generic-highlighter/valgrind-suppression.xml
index 9ac949841dc..6ba52085c38 100644
--- a/share/qtcreator/generic-highlighter/valgrind-suppression.xml
+++ b/share/qtcreator/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.0" author="Milian Wolff (mail@milianw.de)" license="LGPL">
+<language name="Valgrind Suppression" section="Other" extensions="*.supp;" mimetype="" version="1.0" kateversion="2.4" author="Milian Wolff (mail@milianw.de)" license="LGPL">
 <highlighting>
 <contexts>
   <context name="File" attribute="Normal Text" lineEndContext="#stay">
diff --git a/share/qtcreator/generic-highlighter/xml.xml b/share/qtcreator/generic-highlighter/xml.xml
index 65e9be2b6b6..3d92a563cd1 100644
--- a/share/qtcreator/generic-highlighter/xml.xml
+++ b/share/qtcreator/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="2.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="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">
 
 <highlighting>
 <contexts>
diff --git a/share/qtcreator/generic-highlighter/yacc.xml b/share/qtcreator/generic-highlighter/yacc.xml
index 3a10b1efd07..add68e96a8d 100644
--- a/share/qtcreator/generic-highlighter/yacc.xml
+++ b/share/qtcreator/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.03" kateversion="2.4" section="Sources" extensions="*.y;*.yy" author="Jan Villat (jan.villat@net2000.ch)" license="LGPL">
+<language name="Yacc/Bison" version="1.04" kateversion="2.4" section="Sources" extensions="*.y;*.yy" author="Jan Villat (jan.villat@net2000.ch)" license="LGPL">
 
 <highlighting>
 <contexts>
@@ -100,7 +100,7 @@ This code is released under the LGPL as part of kdelibs/kate.
     <DetectChar attribute="Data Type" context="#pop" char="&gt;" />
   </context>
 
-  <context name="Comment" attribute="Comment">
+  <context name="Comment" attribute="Comment" lineEndContext="#stay">
     <Detect2Chars attribute="Comment" context="CommentStar" char="/" char1="*" />
     <!-- not sure that strict yacc allows that ... but I saw it in some sources ... -->
     <Detect2Chars attribute="Comment" context="CommentSlash" char="/" char1="/" />
@@ -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">
+  <context name="StringOrChar" attribute="NormalText" lineEndContext="#stay">
     <DetectChar attribute="String Char" context="Char" char="'" />
     <DetectChar attribute="String" context="String" char="&quot;" />
   </context>
@@ -131,10 +131,10 @@ This code is released under the LGPL as part of kdelibs/kate.
     <IncludeRules context="##C++" />
     <DetectChar attribute="Directive" context="Dol" char="$" />
   </context>
-  <context name="Dol" attribute="Normal Text" fallthrough="true" fallthroughContext="DolEnd">
+  <context name="Dol" attribute="Normal Text" fallthrough="true" fallthroughContext="DolEnd" lineEndContext="#stay">
     <RegExpr attribute="Data Type" context="DolEnd" String="&lt;[^&gt;]+&gt;" />
   </context>
-  <context name="DolEnd" attribute="Normal Text">
+  <context name="DolEnd" attribute="Normal Text" lineEndContext="#stay">
     <RegExpr attribute="Directive" context="#pop#pop" String="\d+" />
     <DetectChar attribute="Directive" context="#pop#pop" char="$" />
   </context>